msmith 02/02/05 18:35:34
Modified: src/share/org/apache/slide/security SecurityImpl.java
Log:
Bugfix to previous security fix - typo made group permissions more or less
completely broken.
Revision Changes Path
1.29 +9 -6
jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java
Index: SecurityImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SecurityImpl.java 31 Jan 2002 05:36:11 -0000 1.28
+++ SecurityImpl.java 6 Feb 2002 02:35:34 -0000 1.29
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.28
2002/01/31 05:36:11 msmith Exp $
- * $Revision: 1.28 $
- * $Date: 2002/01/31 05:36:11 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.29
2002/02/06 02:35:34 msmith Exp $
+ * $Revision: 1.29 $
+ * $Date: 2002/02/06 02:35:34 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Security helper.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.28 $
+ * @version $Revision: 1.29 $
*/
public final class SecurityImpl implements Security {
@@ -527,13 +527,16 @@
.getLinkedUri() :
childNode.getUri() ;
+ String testUri;
if(!childSubjectUri.endsWith("/"))
- childSubjectUri = childSubjectUri+"/";
+ testUri = childSubjectUri+"/";
+ else
+ testUri = childSubjectUri;
boolean match = subjectUri.toString().
equals(childSubjectUri) ||
subjectUri.toString().
- startsWith(childSubjectUri+"/");
+ startsWith(testUri);
match &= actionUri.toString().
startsWith(permission.getActionUri());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
