nacho 00/10/23 08:17:58
Modified: src/share/org/apache/tomcat/request JDBCRealm.java
SimpleRealm.java
src/share/org/apache/tomcat/startup Main.java
Log:
Porting a patch done for 3.2, into the main branch,
it solves a bug in authorization handling.
Revision Changes Path
1.22 +9 -5
jakarta-tomcat/src/share/org/apache/tomcat/request/JDBCRealm.java
Index: JDBCRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/JDBCRealm.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JDBCRealm.java 2000/09/29 21:10:02 1.21
+++ JDBCRealm.java 2000/10/23 15:17:57 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/JDBCRealm.java,v 1.21
2000/09/29 21:10:02 costin Exp $
- * $Revision: 1.21 $
- * $Date: 2000/09/29 21:10:02 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/JDBCRealm.java,v 1.22
2000/10/23 15:17:57 nacho Exp $
+ * $Revision: 1.22 $
+ * $Date: 2000/10/23 15:17:57 $
*
* The Apache Software License, Version 1.1
*
@@ -292,7 +292,7 @@
* @param algorithm the Encode type
*/
- public void setEncode(String algorithm) {
+ public void setDigest(String algorithm) {
digest = algorithm;
}
@@ -535,7 +535,10 @@
if( checkPassword( user, password ) ) {
if( debug > 0 ) log( "Auth ok, user=" + user );
- req.setRemoteUser( user );
+ Context ctx = req.getContext();
+ if (ctx != null)
+ req.setAuthType(ctx.getAuthMethod());
+ req.setRemoteUser( user );
req.setNote(reqRealmSignNote,this);
}
return 0;
@@ -579,6 +582,7 @@
return 401; //HttpServletResponse.SC_UNAUTHORIZED
// XXX check transport
}
+
/**
* Digest password using the algorithm especificied and
* convert the result to a corresponding hex string.
1.10 +4 -1
jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleRealm.java
Index: SimpleRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleRealm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleRealm.java 2000/09/01 00:48:12 1.9
+++ SimpleRealm.java 2000/10/23 15:17:57 1.10
@@ -136,9 +136,12 @@
if( debug > 0 ) log( "Verify user=" + user + " pass=" + password );
if( memoryRealm.checkPassword( user, password ) ) {
+ if( debug > 0 ) log( "Auth ok, user=" + user );
+ Context ctx = req.getContext();
+ if (ctx != null)
+ req.setAuthType(ctx.getAuthMethod());
req.setRemoteUser( user );
req.setNote(reqRealmSignNote,this);
- if( debug > 0 ) log( "Auth ok, user=" + user );
}
return 0;
}
1.12 +2 -3 jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Main.java 2000/10/13 00:58:37 1.11
+++ Main.java 2000/10/23 15:17:58 1.12
@@ -379,13 +379,12 @@
File dir = new File(ld);
String[] names = dir.list( new FilenameFilter(){
public boolean accept(File dir, String name) {
- if (name.endsWith(".jar"))
- {
+ if (name.endsWith(".jar")){
return true;
}
return false;
}
- } );
+ });
return names;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
