From 07e593a49b18945d65607502ec07cbed331e35f6 Mon Sep 17 00:00:00 2001 From: Michal Kuperman Date: Sun, 24 Nov 2019 16:14:03 +0200 Subject: [PATCH 1/3] ignore `URL` in AuthToken generation if `ACL` is provided --- .../src/test/java/com/cloudinary/AuthTokenTest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java index 86ce6164..ce33a091 100644 --- a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java +++ b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java @@ -116,4 +116,15 @@ public void testUrlInTag() { assertThat(url, Matchers.matchesPattern("")); } -} \ No newline at end of file + + @Test + public void testIgnoreUrlIfAclIsProvided(){ + + String user = "foobar"; // username taken from elsewhere + AuthToken token = new AuthToken(KEY).duration(300).acl("/*/t_" + user).startTime(222222222); + String cookieToken = token.generate(); + AuthToken aclToken = new AuthToken(KEY).duration(300).acl("/*/t_" + user).startTime(222222222); + String cookieAclToken = aclToken.generate("http://res.cloudinary.com/test123/image/authenticated/v1486020273/sample.jpg"); + assertEquals(cookieToken, cookieAclToken); + } +} From 1563f5dfb5829fce6da9a78847ff0a6f56593f5a Mon Sep 17 00:00:00 2001 From: michalkuperman Date: Sun, 24 Nov 2019 18:37:52 +0200 Subject: [PATCH 2/3] "Ignore `/URL`/ in AuthToken generation if `/ACL`/ is provided"" --- cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java index ce33a091..aa98152f 100644 --- a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java +++ b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java @@ -124,7 +124,7 @@ public void testIgnoreUrlIfAclIsProvided(){ AuthToken token = new AuthToken(KEY).duration(300).acl("/*/t_" + user).startTime(222222222); String cookieToken = token.generate(); AuthToken aclToken = new AuthToken(KEY).duration(300).acl("/*/t_" + user).startTime(222222222); - String cookieAclToken = aclToken.generate("http://res.cloudinary.com/test123/image/authenticated/v1486020273/sample.jpg"); + String cookieAclToken = aclToken.generate("http://res.cloudinary.com/test123/image/upload/v1486020273/sample.jpg"); assertEquals(cookieToken, cookieAclToken); } } From aaad3a29ebebed4899084a99de34ba8e0b6c68b8 Mon Sep 17 00:00:00 2001 From: michalkuperman Date: Sun, 24 Nov 2019 18:42:11 +0200 Subject: [PATCH 3/3] "Ignore \`URL\` in AuthToken generation if \`ACL\` is provided" --- .../src/test/java/com/cloudinary/AuthTokenTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java index aa98152f..90b278ee 100644 --- a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java +++ b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java @@ -118,8 +118,7 @@ public void testUrlInTag() { } @Test - public void testIgnoreUrlIfAclIsProvided(){ - + public void testIgnoreUrlIfAclIsProvided() { String user = "foobar"; // username taken from elsewhere AuthToken token = new AuthToken(KEY).duration(300).acl("/*/t_" + user).startTime(222222222); String cookieToken = token.generate();