Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 80745 invoked from network); 10 Aug 2006 06:04:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Aug 2006 06:04:10 -0000 Received: (qmail 22302 invoked by uid 500); 10 Aug 2006 06:04:10 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 22163 invoked by uid 500); 10 Aug 2006 06:04:10 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 22152 invoked by uid 99); 10 Aug 2006 06:04:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 23:04:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 23:04:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4451C1A981D; Wed, 9 Aug 2006 23:03:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: adc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060810060349.4451C1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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) {