geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r704682 - in /geronimo/specs/trunk/geronimo-jacc_1.1_spec/src: main/java/javax/security/jacc/URLPatternSpec.java test/java/javax/security/jacc/WebResourcePermissionTest.java test/java/javax/security/jacc/WebUserDataPermissionTest.java
Date Tue, 14 Oct 2008 21:04:18 GMT
Author: djencks
Date: Tue Oct 14 14:04:18 2008
New Revision: 704682

URL: http://svn.apache.org/viewvc?rev=704682&view=rev
Log:
GERONIMO-4357 don't double escape pre-escaped colons in web permissions

Modified:
    geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/main/java/javax/security/jacc/URLPatternSpec.java
    geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebResourcePermissionTest.java
    geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java

Modified: geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/main/java/javax/security/jacc/URLPatternSpec.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/main/java/javax/security/jacc/URLPatternSpec.java?rev=704682&r1=704681&r2=704682&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/main/java/javax/security/jacc/URLPatternSpec.java
(original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/main/java/javax/security/jacc/URLPatternSpec.java
Tue Oct 14 14:04:18 2008
@@ -161,7 +161,6 @@
     static String encodeColons(HttpServletRequest request) {
         String result = request.getServletPath() + (request.getPathInfo() == null ? "" :
request.getPathInfo());
 
-        if (result.indexOf("%3A") > -1) result = result.replaceAll("%3A", "%3A%3A");
         if (result.indexOf(":") > -1) result = result.replaceAll(":", "%3A");
 
         return result;

Modified: geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebResourcePermissionTest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebResourcePermissionTest.java?rev=704682&r1=704681&r2=704682&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebResourcePermissionTest.java
(original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebResourcePermissionTest.java
Tue Oct 14 14:04:18 2008
@@ -386,7 +386,7 @@
         p = new WebResourcePermission(new MockHttpServletRequest("/foo", "/foo:bar", "BAR"));
         checkPermission(p, "/foo/foo%3Abar", "BAR");
         p = new WebResourcePermission(new MockHttpServletRequest("/foo", "/foo%3Abar", "BAR"));
-        checkPermission(p, "/foo/foo%3A%3Abar", "BAR");
+        checkPermission(p, "/foo/foo%3Abar", "BAR");
     }
 
     private void checkPermission(Permission p, String name, String actions) {

Modified: geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java?rev=704682&r1=704681&r2=704682&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java
(original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java
Tue Oct 14 14:04:18 2008
@@ -129,7 +129,7 @@
         p = new WebUserDataPermission(new MockHttpServletRequest("/foo", "/foo:bar", "BAR"));
         checkPermission(p, "/foo/foo%3Abar", "BAR");
         p = new WebUserDataPermission(new MockHttpServletRequest("/foo", "/foo%3Abar", "BAR"));
-        checkPermission(p, "/foo/foo%3A%3Abar", "BAR");
+        checkPermission(p, "/foo/foo%3Abar", "BAR");
     }
 
     private void checkPermission(Permission p, String name, String actions) {



Mime
View raw message