shuber 2005/04/13 15:08:06 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/acl JahiaACL.java
JahiaAbstractACL.java
Added files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/acl ParentACLFinder.java
Log:
JAHIA-281 : Allow ACLs to use other trees than it's own to resolve permissions
- First implementation of resolving permissions using other trees than the
default ACL tree. To be used to solve JAHIA-282 for Categories ACLs.
Revision Changes Path
1.20.4.4.2.3 +11 -4 jahia/src/java/org/jahia/services/acl/JahiaACL.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/acl/JahiaACL.java.diff?r1=1.20.4.4.2.2&r2=1.20.4.4.2.3&f=h
1.10.4.3.2.2 +1 -1
jahia/src/java/org/jahia/services/acl/JahiaAbstractACL.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/acl/JahiaAbstractACL.java.diff?r1=1.10.4.3.2.1&r2=1.10.4.3.2.2&f=h
1.1.2.1 +21 -0
jahia/src/java/org/jahia/services/acl/ParentACLFinder.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/acl/ParentACLFinder.java?rev=1.1.2.1&content-type=text/plain
Index: JahiaACL.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/acl/Attic/JahiaACL.java,v
retrieving revision 1.20.4.4.2.2
retrieving revision 1.20.4.4.2.3
diff -u -r1.20.4.4.2.2 -r1.20.4.4.2.3
--- JahiaACL.java 13 Apr 2005 12:46:29 -0000 1.20.4.4.2.2
+++ JahiaACL.java 13 Apr 2005 13:08:05 -0000 1.20.4.4.2.3
@@ -273,6 +273,13 @@
boolean result = false;
try {
result = AclDBUtils.getInstance ().removeACLEntries (mID, type);
+ if (result) {
+ if (type == USER_TYPE_ENTRY) {
+ mUserEntries.clear();
+ } else if (type == GROUP_TYPE_ENTRY) {
+ mGroupEntries.clear();
+ }
+ }
} catch (JahiaDatabaseException ex) {
}
@@ -706,11 +713,11 @@
adminGroup = ServicesRegistry.getInstance()
.getJahiaGroupManagerService().getAdministratorGroup(
contextSiteID);
- if (adminGroup != null) {
- if (adminGroup.isMember (user)) {
- result = 1;
+ if (adminGroup != null) {
+ if (adminGroup.isMember(user)) {
+ result = 1;
+ }
}
- }
} else {
logger.warn("User comes from LDAP, so we can test it's
apartanence to the administrators group when we have no site ID");
}
Index: JahiaAbstractACL.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/acl/Attic/JahiaAbstractACL.java,v
retrieving revision 1.10.4.3.2.1
retrieving revision 1.10.4.3.2.2
diff -u -r1.10.4.3.2.1 -r1.10.4.3.2.2
--- JahiaAbstractACL.java 13 Apr 2005 12:46:29 -0000 1.10.4.3.2.1
+++ JahiaAbstractACL.java 13 Apr 2005 13:08:05 -0000 1.10.4.3.2.2
@@ -579,7 +579,7 @@
* @param permission Bit index of the requested access, this index
should be defined as
* a constant in the derived classes.
*
- * @return True if the specified group has the requested rights in the
ACL,
+ * @return True if the specified user has the requested rights in the
ACL,
* or in one of the parent's ACLs.
*
* @throws JahiaACLException Throws an exception if the current ACL
object was not initialized
