cvs commit: jahia/core/src/java/org/apache/slide/security JahiaWebdavSecurity.java

[Thomas Draier]

tdraier     2005/09/21 11:43:20 CEST

  Modified files:
    core/src/java/org/apache/slide/security 
                                            JahiaWebdavSecurity.java 
  Log:
  fixed files security
  
  Revision  Changes    Path
  1.11      +7 -6      
jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java.diff?r1=1.10&r2=1.11&f=h
  
  
  
  Index: JahiaWebdavSecurity.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JahiaWebdavSecurity.java  16 Sep 2005 17:13:08 -0000      1.10
  +++ JahiaWebdavSecurity.java  21 Sep 2005 09:43:20 -0000      1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/repository/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java,v
 1.10 2005/09/16 17:13:08 tdraier Exp $
  - * $Revision: 1.10 $
  - * $Date: 2005/09/16 17:13:08 $
  + * $Header: 
/home/cvs/repository/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java,v
 1.11 2005/09/21 09:43:20 tdraier Exp $
  + * $Revision: 1.11 $
  + * $Date: 2005/09/21 09:43:20 $
    *
    * ====================================================================
    *
  @@ -67,7 +67,7 @@
    * Security helper.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class JahiaWebdavSecurity extends SecurityImpl {
   
  @@ -881,11 +881,11 @@
       public boolean hasRole(ObjectNode object, String role)
           throws ServiceAccessException, ObjectNotFoundException {
   
  -        if (role.equals(namespaceConfig.NOBODY))
  +        if (role.equals(namespaceConfig.NOBODY) || role.equals("all"))
               return true;
           String associatedRole = namespaceConfig.getRoleMapping(role);
           if ((associatedRole != null)
  -            && (associatedRole.equals(namespaceConfig.NOBODY)))
  +            && (associatedRole.equals(namespaceConfig.NOBODY) || 
role.equals("all")))
               return true;
   
           Class roleClass = (Class) rolesCache.get(role);
  @@ -928,6 +928,7 @@
   
           Vector result = new Vector();
           result.addElement(namespaceConfig.NOBODY);
  +        result.addElement("all");
   
           Class currentObjectClass = object.getClass();