Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory
james.mmbase.org:/tmp/cvs-serv23109/src/org/mmbase/security/implementation/cloudcontext/builders
Modified Files:
Contexts.java
Log Message:
MMB-1757
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
See also: http://www.mmbase.org/jira/browse/MMB-1757
Index: Contexts.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- Contexts.java 4 Jan 2009 18:57:14 -0000 1.64
+++ Contexts.java 5 Jan 2009 12:09:24 -0000 1.65
@@ -28,7 +28,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.64 2009/01/04 18:57:14 nklasens Exp $
+ * @version $Id: Contexts.java,v 1.65 2009/01/05 12:09:24 michiel Exp $
* @see org.mmbase.security.implementation.cloudcontext.Verify
* @see org.mmbase.security.Authorization
*/
@@ -44,22 +44,6 @@
public final static Parameter<String> PARAMETER_OPERATION = new
Parameter<String>("operation", String.class);
public final static Parameter<String> PARAMETER_GROUPORUSER = new
Parameter<String>("grouporuser", String.class);
- private final static Parameter[] ALLOWS_PARAMETERS = {
- PARAMETER_GROUPORUSER,
- PARAMETER_OPERATION
- };
-
-
- public final static Parameter[] GRANT_PARAMETERS = {
- PARAMETER_GROUPORUSER,
- PARAMETER_OPERATION,
- Parameter.USER
- };
-
- public final static Parameter[] REVOKE_PARAMETERS = GRANT_PARAMETERS;
- public final static Parameter[] MAYREVOKE_PARAMETERS = REVOKE_PARAMETERS;
-
-
public final static Parameter[] MAY_PARAMETERS = {
Parameter.USER,
new Parameter<String>("usertocheck", String.class),
@@ -169,13 +153,6 @@
//********************************************************************************
- /**
- * @javadoc
- */
- protected boolean grant(MMObjectNode contextNode, MMObjectNode
groupOrUserNode, Operation operation, User user) {
- return provider.grant(user, contextNode, groupOrUserNode, operation);
- }
-
/**
* Makes sure unique values and not-null's are filed
@@ -189,21 +166,6 @@
/**
- */
- protected boolean mayRevoke(MMObjectNode contextNode, MMObjectNode
groupOrUserNode, Operation operation, User user) {
- return provider.mayRevoke(user, contextNode, groupOrUserNode,
operation);
- }
-
-
-
- /**
- * @javadoc
- */
- protected boolean revoke(MMObjectNode contextNode, MMObjectNode
groupOrUserNode, Operation operation, User user) {
- return provider.revoke(user, contextNode, groupOrUserNode, operation);
- }
-
- /**
* @javadoc
*/
protected MMObjectNode getUserNode(UserContext user) {
@@ -229,9 +191,6 @@
if (function.equals("info")) {
List<Object> empty = new ArrayList<Object>();
Map<String,String> info = (Map<String,String>)
super.executeFunction(node, function, empty);
- info.put("grant", "" + GRANT_PARAMETERS + " Grant a right");
- info.put("revoke", "" + REVOKE_PARAMETERS + " Revoke a
right");
- info.put("mayrevoke", "" + MAYREVOKE_PARAMETERS + " Check if
user may revoke a right");
info.put("may", "" + MAY_PARAMETERS + " Checks a right
for another user than yourself");
if (args == null || args.size() == 0) {
@@ -239,19 +198,6 @@
} else {
return info.get(args.get(0));
}
- } else if (function.equals("grant")) {
- Parameters a = Functions.buildParameters(GRANT_PARAMETERS, args);
- return grant(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)), (User) a.get("user"));
- } else if (function.equals("revoke")) {
- Parameters a = Functions.buildParameters(REVOKE_PARAMETERS, args);
- return revoke(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)), (User) a.get("user"));
- } else if (function.equals("mayrevoke")) {
- Parameters a = Functions.buildParameters(MAYREVOKE_PARAMETERS,
args);
- if (mayRevoke(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)), (User)
a.get("user"))) {
- return Boolean.TRUE;
- } else {
- return Boolean.FALSE;
- }
} else if (function.equals("may")) {
Parameters a = Functions.buildParameters(MAY_PARAMETERS, args);
MMObjectNode checkingUser = getUserNode(a.get(Parameter.USER));
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
