luehe 2004/04/19 16:13:08
Modified: catalina/src/share/org/apache/catalina/realm RealmBase.java
Log:
Reverted previous patch
Revision Changes Path
1.32 +2 -27
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- RealmBase.java 19 Apr 2004 20:42:01 -0000 1.31
+++ RealmBase.java 19 Apr 2004 23:13:08 -0000 1.32
@@ -411,12 +411,7 @@
// Check each defined security constraint
HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
String uri = request.getRequestPathMB().toString();
-
- // Welcome files are exempted from any security-constraint checks
- if (isWelcomeFile(uri, context)) {
- return null;
- }
-
+
String method = hreq.getMethod();
int i;
boolean found = false;
@@ -587,27 +582,7 @@
return array;
}
-
- /*
- * Returns true of the given <tt>uri</tt> identifies a welcome file.
- *
- * @param uri The URI to check against the context's list of welcome files
- * @param ctx The web context
- *
- * @return true if the given <tt>uri</tt> identifies a welcome file,
- * false otherwise
- */
- private boolean isWelcomeFile(String uri, Context ctx) {
-
- int slash = uri.indexOf('/');
- if (slash == 0 && uri.length() > 1) {
- return ctx.findWelcomeFile(uri.substring(1));
- } else {
- return false;
- }
- }
-
-
+
/**
* Perform access control based on the specified authorization constraint.
* Return <code>true</code> if this constraint is satisfied and processing
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
