geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r430274 - in /geronimo/branches/1.1.1/modules: jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
Date Thu, 10 Aug 2006 06:03:48 GMT
Author: adc
Date: Wed Aug  9 23:03:48 2006
New Revision: 430274

URL: http://svn.apache.org/viewvc?rev=430274&view=rev
Log:
GERONIMO-2295 Need to include path info

Modified:
    geronimo/branches/1.1.1/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
    geronimo/branches/1.1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java

Modified: geronimo/branches/1.1.1/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java?rev=430274&r1=430273&r2=430274&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
(original)
+++ geronimo/branches/1.1.1/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
Wed Aug  9 23:03:48 2006
@@ -191,7 +191,8 @@
             } else {
                 transportType = "NONE";
             }
-            WebUserDataPermission wudp = new WebUserDataPermission(servletHttpRequest.getServletPath(),
new String[]{servletHttpRequest.getMethod()}, transportType);
+            WebUserDataPermission wudp = new WebUserDataPermission(servletHttpRequest.getServletPath()
+ (servletHttpRequest.getPathInfo() == null ? "" : servletHttpRequest.getPathInfo()),
+                                                                   new String[]{servletHttpRequest.getMethod()},
transportType);
             WebResourcePermission webResourcePermission = new WebResourcePermission(servletHttpRequest);
             Principal user = obtainUser(pathInContext, request, response, webResourcePermission,
wudp);
 

Modified: geronimo/branches/1.1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java?rev=430274&r1=430273&r2=430274&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
(original)
+++ geronimo/branches/1.1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
Wed Aug  9 23:03:48 2006
@@ -128,7 +128,7 @@
             } else {
                 transportType = "NONE";
             }
-            WebUserDataPermission wudp = new WebUserDataPermission(request.getServletPath(),
new String[]{request.getMethod()}, transportType);
+            WebUserDataPermission wudp = new WebUserDataPermission(request.getServletPath()
+ (request.getPathInfo() == null ? "" : request.getPathInfo()), new String[]{request.getMethod()},
transportType);
             acc.checkPermission(wudp);
 
         } catch (AccessControlException ace) {



Mime
View raw message