luehe 2005/03/02 11:27:11
Modified: catalina/src/share/org/apache/catalina/realm RealmBase.java
Log:
Consider the case where original request was mapped to welcome page.
In this case, the mapped welcome page (and not the original request
URI!) needs to be the target of hasResourcePermission().
This is consistent with the change that had been made in
findSecurityConstraints().
BTW, shouldn't request.getDecodedRequestURI() return the mapped
welcome page (instead of the original URI) in this case?
In other words, shouldn't the path passed to
mappingData.requestPath.setString(pathStr)
in Mapper.java be propagated to the request object associatd with the
mappingData?
Revision Changes Path
1.49 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- RealmBase.java 23 Feb 2005 19:27:56 -0000 1.48
+++ RealmBase.java 2 Mar 2005 19:27:11 -0000 1.49
@@ -702,7 +702,7 @@
LoginConfig config = context.getLoginConfig();
if ((config != null) &&
(Constants.FORM_METHOD.equals(config.getAuthMethod()))) {
- String requestURI = request.getDecodedRequestURI();
+ String requestURI = request.getRequestPathMB().toString();
String loginPage = context.getPath() + config.getLoginPage();
if (loginPage.equals(requestURI)) {
if (log.isDebugEnabled())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
