remm        01/02/09 19:17:58

  Modified:    src/share/org/apache/slide/security SecurityImpl.java
  Log:
  - The test for self permissions was broken.
  
  Revision  Changes    Path
  1.15      +8 -8      
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SecurityImpl.java 2001/02/09 19:05:33     1.14
  +++ SecurityImpl.java 2001/02/10 03:17:58     1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.14 
2001/02/09 19:05:33 remm Exp $
  - * $Revision: 1.14 $
  - * $Date: 2001/02/09 19:05:33 $
  + * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.15 
2001/02/10 03:17:58 remm Exp $
  + * $Revision: 1.15 $
  + * $Date: 2001/02/10 03:17:58 $
    *
    * ====================================================================
    *
  @@ -75,7 +75,7 @@
    * Security helper.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public final class SecurityImpl implements Security {
       
  @@ -394,13 +394,13 @@
                           
                           // Self permission
                           granted = (!permission.isNegative())
  -                            && (subjectUri.toString()
  -                                .startsWith(permission.getObjectUri())) 
  +                            && (object.getUri().startsWith
  +                                (subjectUri.toString())) 
                               && (actionUri.toString()
                                   .startsWith(permission.getActionUri()));
                           denied = (permission.isNegative())
  -                            && (subjectUri.toString()
  -                                .startsWith(permission.getObjectUri())) 
  +                            &&  (object.getUri().startsWith
  +                                 (subjectUri.toString())) 
                               && (actionUri.toString()
                                   .startsWith(permission.getActionUri()));
                           
  
  
  

Reply via email to