tdraier 2005/04/27 11:22:01 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/apache/slide/security JahiaWebdavSecurity.java
src/java/org/jahia/services/webdav/stores CachedStore.java
JahiaJDBCAdapter.java
src/java/org/jahia/services/webdav DAVFileAccess.java
src/java JahiaEnginesResources.properties
JahiaEnginesResources_en.properties
JahiaEnginesResources_fr.properties
Log:
fixed permission bug when revoking rights on guest/user
Revision Changes Path
1.58.2.5.2.5 +1 -0 jahia/src/java/JahiaEnginesResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources.properties.diff?r1=1.58.2.5.2.4&r2=1.58.2.5.2.5&f=h
1.26.2.5.2.5 +1 -0 jahia/src/java/JahiaEnginesResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_en.properties.diff?r1=1.26.2.5.2.4&r2=1.26.2.5.2.5&f=h
1.35.2.9.2.6 +1 -0 jahia/src/java/JahiaEnginesResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_fr.properties.diff?r1=1.35.2.9.2.5&r2=1.35.2.9.2.6&f=h
1.1.2.2 +4 -4
jahia/src/java/org/apache/slide/security/JahiaWebdavSecurity.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/apache/slide/security/JahiaWebdavSecurity.java.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.22.2.2.2.4 +7 -7
jahia/src/java/org/jahia/services/webdav/DAVFileAccess.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/DAVFileAccess.java.diff?r1=1.22.2.2.2.3&r2=1.22.2.2.2.4&f=h
1.7.4.5.2.3 +1 -8
jahia/src/java/org/jahia/services/webdav/stores/CachedStore.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/CachedStore.java.diff?r1=1.7.4.5.2.2&r2=1.7.4.5.2.3&f=h
1.1.2.4 +4 -4
jahia/src/java/org/jahia/services/webdav/stores/JahiaJDBCAdapter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/JahiaJDBCAdapter.java.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
Index: JahiaWebdavSecurity.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/apache/slide/security/Attic/JahiaWebdavSecurity.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JahiaWebdavSecurity.java 25 Mar 2005 15:10:30 -0000 1.1.2.1
+++ JahiaWebdavSecurity.java 27 Apr 2005 09:21:59 -0000 1.1.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/repository/jahia/src/java/org/apache/slide/security/Attic/JahiaWebdavSecurity.java,v
1.1.2.1 2005/03/25 15:10:30 tdraier Exp $
- * $Revision: 1.1.2.1 $
- * $Date: 2005/03/25 15:10:30 $
+ * $Header:
/home/cvs/repository/jahia/src/java/org/apache/slide/security/Attic/JahiaWebdavSecurity.java,v
1.1.2.2 2005/04/27 09:21:59 tdraier Exp $
+ * $Revision: 1.1.2.2 $
+ * $Date: 2005/04/27 09:21:59 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
* Security helper.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
*/
public class JahiaWebdavSecurity implements Security {
Index: CachedStore.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/stores/Attic/CachedStore.java,v
retrieving revision 1.7.4.5.2.2
retrieving revision 1.7.4.5.2.3
diff -u -r1.7.4.5.2.2 -r1.7.4.5.2.3
--- CachedStore.java 6 Apr 2005 15:42:08 -0000 1.7.4.5.2.2
+++ CachedStore.java 27 Apr 2005 09:21:59 -0000 1.7.4.5.2.3
@@ -223,15 +223,8 @@
throws ServiceAccessException {
super.revokePermission (uri, permission);
if (securityStore.cacheResults ()) {
- Object value = internalCache.get (
+ internalCache.remove (
"p" + uri.getNamespace ().getName () + uri.toString ());
- Vector permissionsVector = null;
- if (value != null) {
- permissionsVector = (Vector) value;
- permissionsVector.removeElement (permission);
- internalCache.put (
- "p" + uri.getNamespace ().getName () + uri.toString (),
value);
- }
}
}
Index: JahiaJDBCAdapter.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/stores/Attic/JahiaJDBCAdapter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JahiaJDBCAdapter.java 7 Apr 2005 16:30:42 -0000 1.1.2.3
+++ JahiaJDBCAdapter.java 27 Apr 2005 09:21:59 -0000 1.1.2.4
@@ -36,10 +36,10 @@
* Time: 17:28:45
* <p/>
* $Author: tdraier $
- * $Date: 2005/04/07 16:30:42 $
- * $Id: JahiaJDBCAdapter.java,v 1.1.2.3 2005/04/07 16:30:42 tdraier Exp $
+ * $Date: 2005/04/27 09:21:59 $
+ * $Id: JahiaJDBCAdapter.java,v 1.1.2.4 2005/04/27 09:21:59 tdraier Exp $
* $RCSfile: JahiaJDBCAdapter.java,v $
- * $Revision: 1.1.2.3 $
+ * $Revision: 1.1.2.4 $
* $Source:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/stores/Attic/JahiaJDBCAdapter.java,v
$
* $State: Exp $
*/
@@ -414,7 +414,7 @@
int exclusive = lock.isExclusive() ? 1 : 0;
long lockid = assureUriId(connection, lock.getLockId());
long objectId = getUriId(connection, lock.getObjectUri());
- long subjectId = getUriId(connection, lock.getSubjectUri());
+ long subjectId = assureUriId(connection, lock.getSubjectUri());
long typeId = getUriId(connection, lock.getTypeUri());
statement =
Index: DAVFileAccess.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/DAVFileAccess.java,v
retrieving revision 1.22.2.2.2.3
retrieving revision 1.22.2.2.2.4
diff -u -r1.22.2.2.2.3 -r1.22.2.2.2.4
--- DAVFileAccess.java 15 Apr 2005 09:39:57 -0000 1.22.2.2.2.3
+++ DAVFileAccess.java 27 Apr 2005 09:22:00 -0000 1.22.2.2.2.4
@@ -15,6 +15,7 @@
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.security.NodePermission;
import org.apache.slide.security.Security;
+import org.apache.slide.security.JahiaWebdavSecurity;
import org.apache.slide.structure.*;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.util.WebdavUtils;
@@ -912,14 +913,13 @@
// Prevent dirty reads
slideToken.setForceStoreEnlistment (true);
+ NodePermission r = new NodePermission (objectNode.getUri (), user,
"/actions/read");
+ NodePermission w = new NodePermission (objectNode.getUri (), user,
"/actions/write");
+ NodePermission a = new NodePermission (objectNode.getUri (), user,
"/actions/manage");
try {
- Enumeration en = ns.security.enumeratePermissions(slideToken,
objectNode);
- while (en.hasMoreElements()) {
- NodePermission nodePermission = (NodePermission)
en.nextElement();
- if (nodePermission.getSubjectUri().equals(user)) {
- ns.security.revokePermission (slideToken,
nodePermission);
- }
- }
+ ns.security.revokePermission (slideToken, r);
+ ns.security.revokePermission (slideToken, w);
+ ns.security.revokePermission (slideToken, a);
} catch (Exception e) {
logger.debug("Exception occured during permission change",e);
return false;
Index: JahiaEnginesResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources.properties,v
retrieving revision 1.58.2.5.2.4
retrieving revision 1.58.2.5.2.5
diff -u -r1.58.2.5.2.4 -r1.58.2.5.2.5
--- JahiaEnginesResources.properties 1 Apr 2005 15:36:23 -0000
1.58.2.5.2.4
+++ JahiaEnginesResources.properties 27 Apr 2005 09:22:00 -0000
1.58.2.5.2.5
@@ -580,6 +580,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.moveDenied.label
= You cannot move this folder because it
contains elements that cannot be moved.
org.jahia.engines.filemanager.Filemanager_Engine.deleteDenied.label
= You cannot delete this folder because it
contains elements that cannot be deleted.
org.jahia.engines.filemanager.Filemanager_Engine.renameDenied.label
= You cannot rename this folder because it
contains elements that cannot be renamed.
+org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label
= You cannot change permissions on this
directory.
org.jahia.engines.filemanager.Filemanager_Engine.fileName.label
= File Name
org.jahia.engines.filemanager.Filemanager_Engine.dirName.label
= Directory Name
org.jahia.engines.filemanager.Filemanager_Engine.newName.label
= New Name
Index: JahiaEnginesResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_en.properties,v
retrieving revision 1.26.2.5.2.4
retrieving revision 1.26.2.5.2.5
diff -u -r1.26.2.5.2.4 -r1.26.2.5.2.5
--- JahiaEnginesResources_en.properties 1 Apr 2005 15:36:23 -0000
1.26.2.5.2.4
+++ JahiaEnginesResources_en.properties 27 Apr 2005 09:22:00 -0000
1.26.2.5.2.5
@@ -580,6 +580,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.moveDenied.label
= You cannot move this folder because it
contains elements that cannot be moved.
org.jahia.engines.filemanager.Filemanager_Engine.deleteDenied.label
= You cannot delete this folder because it
contains elements that cannot be deleted.
org.jahia.engines.filemanager.Filemanager_Engine.renameDenied.label
= You cannot rename this folder because it
contains elements that cannot be renamed.
+org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label
= You cannot change permissions on this
directory.
org.jahia.engines.filemanager.Filemanager_Engine.fileName.label
= File Name
org.jahia.engines.filemanager.Filemanager_Engine.dirName.label
= Directory Name
org.jahia.engines.filemanager.Filemanager_Engine.newName.label
= New Name
Index: JahiaEnginesResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_fr.properties,v
retrieving revision 1.35.2.9.2.5
retrieving revision 1.35.2.9.2.6
diff -u -r1.35.2.9.2.5 -r1.35.2.9.2.6
--- JahiaEnginesResources_fr.properties 5 Apr 2005 14:15:17 -0000
1.35.2.9.2.5
+++ JahiaEnginesResources_fr.properties 27 Apr 2005 09:22:00 -0000
1.35.2.9.2.6
@@ -274,6 +274,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.moveDenied.label
= Vous ne pouvez pas déplacer ce
répertoire car il contient des éléments qui ne peuvent
être déplacés
org.jahia.engines.filemanager.Filemanager_Engine.deleteDenied.label
= Vous ne pouvez pas supprimer ce
répertoire car il contient des éléments qui ne peuvent
être supprimés
org.jahia.engines.filemanager.Filemanager_Engine.renameDenied.label
= Vous ne pouvez pas renommer ce
répertoire car il contient des éléments qui ne peuvent
être renommés
+org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label
= Vous ne pouvez pas changer les permissions
sur ce répertoire.
org.jahia.engines.filemanager.Filemanager_Engine.fileName.label
= Nom du fichier
org.jahia.engines.filemanager.Filemanager_Engine.dirName.label
= Nom du répertoire
org.jahia.engines.filemanager.Filemanager_Engine.newName.label
= Nouveau nom
