[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders Contexts.java Users.java

[Michiel Meeuwissen]

Update of 
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv25363/cloudcontext/builders

Modified Files:
      Tag: MMBase-1_8
        Contexts.java Users.java 
Log Message:
renamed Provider to UserProvider


See also: 
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders


Index: Contexts.java
===================================================================
RCS file: 
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
diff -u -b -r1.48.2.5 -r1.48.2.6
--- Contexts.java       9 Dec 2008 11:21:15 -0000       1.48.2.5
+++ Contexts.java       22 Dec 2008 15:27:05 -0000      1.48.2.6
@@ -35,7 +35,7 @@
  * @author Eduard Witteveen
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.48.2.5 2008/12/09 11:21:15 michiel Exp $
+ * @version $Id: Contexts.java,v 1.48.2.6 2008/12/22 15:27:05 michiel Exp $
  * @see    org.mmbase.security.implementation.cloudcontext.Verify
  * @see    org.mmbase.security.Authorization
  */
@@ -524,7 +524,7 @@
                         Constraint newConstraint = 
query.createConstraint(field, ac.contexts);
                         if (ac.inverse) query.setInverse(newConstraint, true);
 
-                        Provider users = 
Authenticate.getInstance().getUserProvider();
+                        UserProvider users = 
Authenticate.getInstance().getUserProvider();
 
                         if 
(step.getTableName().equals(users.getUserBuilder().getTableName())) { // 
anybody may see own node
                             Constraint own = 
query.createConstraint(query.createStepField(step, "number"),
@@ -794,7 +794,7 @@
     /**
      */
     protected boolean mayGrant(MMObjectNode contextNode, MMObjectNode 
groupOrUserNode, Operation operation, MMObjectNode user) {
-        Provider users = Authenticate.getInstance().getUserProvider();
+        UserProvider users = Authenticate.getInstance().getUserProvider();
         if (users.getRank(user).getInt() >= Rank.ADMIN.getInt()) return true; 
// admin may do everything
         Groups groups = Groups.getBuilder();
 
@@ -858,7 +858,7 @@
      */
 
     protected boolean mayRevoke(MMObjectNode contextNode, MMObjectNode 
groupOrUserNode, Operation operation, MMObjectNode user) {
-        Provider users = Authenticate.getInstance().getUserProvider();
+        UserProvider users = Authenticate.getInstance().getUserProvider();
         if (users.getRank(user).getInt() >= Rank.ADMIN.getInt()) return true; 
// admin may do everything
         if (groupOrUserNode.getBuilder() instanceof Groups) {
             if (! Groups.getBuilder().contains(groupOrUserNode, 
user.getNumber()) || users.getRank(user).getInt() <= Rank.BASICUSER.getInt()) 
return false; // must be 'high rank' member of group
@@ -1002,7 +1002,7 @@
                 throw new SecurityException("Self was not supplied");
             }
             // find the user first, the check if the current user actually has 
rights on the objec
-            Provider users = Authenticate.getInstance().getUserProvider();
+            UserProvider users = Authenticate.getInstance().getUserProvider();
             MMObjectNode userToCheck = 
users.getUserBuilder().getNode(a.getString("usertocheck"));
             if (userToCheck == null) { // the user is null?
                 // I don't know then,


Index: Users.java
===================================================================
RCS file: 
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Users.java,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
diff -u -b -r1.48.2.5 -r1.48.2.6
--- Users.java  8 Dec 2008 16:30:55 -0000       1.48.2.5
+++ Users.java  22 Dec 2008 15:27:05 -0000      1.48.2.6
@@ -32,10 +32,10 @@
  * @author Eduard Witteveen
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: Users.java,v 1.48.2.5 2008/12/08 16:30:55 michiel Exp $
+ * @version $Id: Users.java,v 1.48.2.6 2008/12/22 15:27:05 michiel Exp $
  * @since  MMBase-1.7
  */
-public class Users extends MMObjectBuilder implements Provider {
+public class Users extends MMObjectBuilder implements UserProvider {
 
     private static final Logger log = Logging.getLoggerInstance(Users.class);
 
@@ -615,6 +615,11 @@
     }
 
 
+    public boolean isOwnNode(User user, MMObjectNode node) {
+        MMObjectNode userNode = user.getNode();
+        return  (userNode != null && 
getUserBuilder().getClass().isInstance(userNode.getBuilder()) && 
userNode.equals(node));
+    }
+
 
 
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs