Author: michiel
Date: 2009-05-19 10:18:59 +0200 (Tue, 19 May 2009)
New Revision: 35302
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
Log:
Because of all these changes the correct determination of the 'defaultcontext'
of a user got broken
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-19 02:36:24 UTC (rev 35301)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-19 08:18:59 UTC (rev 35302)
@@ -106,14 +106,8 @@
}
- /**
- * @param node User node
- */
- public String getContext(MMObjectNode node) throws SecurityException {
- MMObjectNode contextNode = getContextNode(node);
+ public String getContextName(MMObjectNode contextNode) throws
SecurityException {
return
contextNode.getStringValue(getContextNameField(contextNode.getBuilder().getTableName()));
- //log.debug("check if we may read the node with # " + i + " nodeid?");
- //return Contexts.getBuilder().getContext((User) userContext, nodeId);
}
public void setContext(User user, MMObjectNode node, String context) {
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
2009-05-19 02:36:24 UTC (rev 35301)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
2009-05-19 08:18:59 UTC (rev 35302)
@@ -354,12 +354,18 @@
* @param node User node
*/
public String getDefaultContext(MMObjectNode node) {
- if (node == null) return "system";
+ if (node == null) {
+ return "system";
+ }
MMObjectNode contextNode = node.getNodeValue(getDefaultContextField());
if (contextNode == null) {
log.warn("Node " + node + " has no default context ( " +
getDefaultContextField() + " is null). Returning system. " +
Verify.getInstance().getContextProvider());
+ return "system";
}
- return contextNode == null ? "system" :
Verify.getInstance().getContextProvider().getContext(contextNode);
+ if (log.isDebugEnabled()) {
+ log.debug("Default context node " + contextNode);
+ }
+ return
Verify.getInstance().getContextProvider().getContextName(contextNode);
}
public boolean isOwnNode(User user, MMObjectNode node) {
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
2009-05-19 02:36:24 UTC (rev 35301)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
2009-05-19 08:18:59 UTC (rev 35302)
@@ -31,10 +31,20 @@
void setContext(User user, MMObjectNode node, String context);
- String getContext(MMObjectNode node);
+ /**
+ * Returns the name of the context belonging to a certain context node.
+ */
+ String getContextName(MMObjectNode context);
+ /**
+ * Returns the MMObjectNode representing the 'context' of a certain other
node
+ */
MMObjectNode getContextNode(MMObjectNode node);
+
+ /**
+ * Returns the MMObjectNode representing the 'context' of a certain other
node
+ */
MMObjectNode getContextNode(String context);
Set<String> getPossibleContexts(User user, MMObjectNode node) throws
SecurityException;
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
2009-05-19 02:36:24 UTC (rev 35301)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
2009-05-19 08:18:59 UTC (rev 35302)
@@ -83,7 +83,7 @@
@Override public String getContext(UserContext userContext, int nodeId)
throws org.mmbase.security.SecurityException {
// userContext ignored
- return getContextProvider().getContext(getContextNode(nodeId, true));
+ return getContextProvider().getContextName(getContextNode(nodeId,
true));
}
@Override public void setContext(UserContext user, int nodeId, String
context) throws org.mmbase.security.SecurityException {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
