Changeset 5341

Timestamp:

09/04/10 22:05:44 (17 months ago)

Author:

ffray

Message:

Added navigateTo-elements to auth-constraints allowing to create
conditional navigation-cases.

Location:

branches/release-0.13.x/pfixcore

Files:

• pom.xml (modified) (1 diff)
• projects/core/schema/context-xml-service-config.xsd (modified) (3 diffs)
• res/META-INF/org/pustefixframework/config/context-xml-service/parser/context-xml-service-config.xml (modified) (3 diffs)
• src/de/schlund/pfixcore/auth/AuthConstraint.java (modified) (3 diffs)
• src/de/schlund/pfixcore/auth/AuthConstraintImpl.java (modified) (4 diffs)
• src/de/schlund/pfixcore/auth/conditions/NavigationCase.java (added)
• src/de/schlund/pfixcore/util/TransformerCallback.java (modified) (1 diff)
• src/de/schlund/pfixcore/workflow/context/RequestContextImpl.java (modified) (3 diffs)
• src/org/pustefixframework/config/contextxmlservice/parser/AuthConstraintParsingHandler.java (modified) (1 diff)
• src/org/pustefixframework/config/contextxmlservice/parser/ConditionParsingHandler.java (modified) (7 diffs)
• src/org/pustefixframework/config/contextxmlservice/parser/internal/ContextConfigImpl.java (modified) (2 diffs)
• tests/junit/de/schlund/pfixcore/auth (added)
• tests/junit/de/schlund/pfixcore/auth/AuthConstraintImplTest.java (added)
• tests/junit/de/schlund/pfixcore/auth/conditions (added)
• tests/junit/de/schlund/pfixcore/auth/conditions/BooleanCondition.java (added)
• tests/junit/de/schlund/pfixcore/auth/conditions/BooleanConditionTest.java (added)
• tests/junit/de/schlund/pfixcore/auth/conditions/NavigationCaseTest.java (added)

branches/release-0.13.x/pfixcore/pom.xml

@@ -5 +5 @@
   <artifactId>pfixcore</artifactId>
   <name>pfixcore</name>
-  <version>0.13.23</version>
+  <version>0.13.24-SNAPSHOT</version>
   <dependencies>
     <dependency>

branches/release-0.13.x/pfixcore/projects/core/schema/context-xml-service-config.xsd

@@ -140 +140 @@
 
   <xs:complexType name="authconstraintTopLevelType">
-    <xs:choice minOccurs="0">
-      <xs:element ref="prop:abstractcondition" minOccurs="0"/>
-      <xs:element name="authconstraint" type="prop:authconstraintRefType"/>
-    </xs:choice>
+    <xs:sequence>
+      <xs:choice minOccurs="0">
+        <xs:element ref="prop:abstractcondition" minOccurs="0"/>
+        <xs:element name="authconstraint" type="prop:authconstraintRefType"/>
+      </xs:choice>
+      <xs:element ref="prop:navigateTo" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
     <xs:attribute name="id" type="xs:ID" use="required"/>
     <xs:attribute name="authpage" type="xs:string" use="optional"/>
@@ -205 +208 @@
   </xs:complexType>
   
+  <xs:element name="navigateTo" type="prop:navigateToType" />
+  <xs:complexType name="navigateToType">
+    <xs:complexContent>
+      <xs:extension base="prop:abstractconditionType">
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="prop:abstractcondition"/>
+          <xs:element name="condition" type="prop:conditionType"/>
+        </xs:choice>
+        <xs:attribute name="page" type="xs:string" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <xs:element name="condition" type="prop:conditionTopLevelType"/>
   
@@ -324 +340 @@
   <xs:complexType name="implementsType">
     <xs:attribute name="class" use="required"/>
+    <xs:attribute name="bean-name" use="optional" />
+    <xs:attribute name="scope" use="optional" />
+    <xs:attribute name="parent-bean-ref" use="optional"/>
   </xs:complexType>
   <!-- </context> -->

branches/release-0.13.x/pfixcore/res/META-INF/org/pustefixframework/config/context-xml-service/parser/context-xml-service-config.xml

@@ -79 +79 @@
     <match>/c:context-xml-service-config/c:authconstraint//c:authconstraint</match>
     <match>/c:context-xml-service-config/c:authconstraint//c:hasrole</match>
+    <match>/c:context-xml-service-config/c:authconstraint//c:navigateTo</match>
     <match>/c:context-xml-service-config/c:pagerequest/c:authconstraint//c:and</match>
     <match>/c:context-xml-service-config/c:pagerequest/c:authconstraint//c:or</match>
@@ -85 +86 @@
     <match>/c:context-xml-service-config/c:pagerequest/c:authconstraint//c:authconstraint</match>
     <match>/c:context-xml-service-config/c:pagerequest/c:authconstraint//c:hasrole</match>
+    <match>/c:context-xml-service-config/c:pagerequest/c:authconstraint//c:navigateTo</match>
     <match>/c:context-xml-service-config/c:pagerequest/*[self::default or self::variant]/c:authconstraint//c:and</match>
     <match>/c:context-xml-service-config/c:pagerequest/*[self::default or self::variant]/c:authconstraint//c:or</match>
@@ -91 +93 @@
     <match>/c:context-xml-service-config/c:pagerequest/*[self::default or self::variant]/c:authconstraint//c:authconstraint</match>
     <match>/c:context-xml-service-config/c:pagerequest/*[self::default or self::variant]/c:authconstraint//c:hasrole</match>
+    <match>/c:context-xml-service-config/c:pagerequest/*[self::default or self::variant]/c:authconstraint//c:navigateTo</match>
   </handler>
  

branches/release-0.13.x/pfixcore/src/de/schlund/pfixcore/auth/AuthConstraint.java

@@ -18 +18 @@
 package de.schlund.pfixcore.auth;
 
+import java.util.List;
+
+import de.schlund.pfixcore.auth.conditions.NavigationCase;
 import de.schlund.pfixcore.workflow.Context;
 
@@ -30 +33 @@
 
     public Condition getCondition();
+    
+    public List<NavigationCase> getNavigation();
 
     public void setCondition(Condition condition);
@@ -35 +40 @@
     public String getId();
 
-    public String getAuthPage();
+    public String getAuthPage(Context context);
+    
+    public String getDefaultAuthPage();
 
 }

branches/release-0.13.x/pfixcore/src/de/schlund/pfixcore/auth/AuthConstraintImpl.java

@@ -18 +18 @@
 package de.schlund.pfixcore.auth;
 
+import java.util.LinkedList;
+import java.util.List;
+
+import de.schlund.pfixcore.auth.conditions.NavigationCase;
 import de.schlund.pfixcore.workflow.Context;
 
@@ -28 +32 @@
 
     private Condition condition;
-    private String authPage;
+    private String defaultAuthPage;
     private String id;
+
+    private List<NavigationCase> navigation = new LinkedList<NavigationCase>();
 
     public AuthConstraintImpl(String id) {
         this.id = id;
+    }
+    
+    public void addNavigationCase(NavigationCase navigationCase) {
+        navigation.add(navigationCase);
+    }
+
+    public List<NavigationCase> getNavigation() {
+        return navigation;
     }
 
@@ -47 +61 @@
     }
 
-    public void setAuthPage(String authPage) {
-        this.authPage = authPage;
+    public String getDefaultAuthPage() {
+        return defaultAuthPage;
     }
 
-    public String getAuthPage() {
-        return authPage;
+    public void setDefaultAuthPage(String authPage) {
+        this.defaultAuthPage = authPage;
+    }
+
+    public String getAuthPage(Context context) {
+        for (NavigationCase navcase : navigation) {
+            if (navcase.evaluate(context)) {
+                return navcase.getPage();
+            }
+        }
+        return defaultAuthPage;
     }
 
@@ -72 +95 @@
         sb.append("{");
         sb.append("id=" + id);
-        sb.append(",authpage=" + authPage);
+        sb.append(",authpage=" + defaultAuthPage);
         sb.append("}");
         sb.append("[");

branches/release-0.13.x/pfixcore/src/de/schlund/pfixcore/util/TransformerCallback.java

@@ -347 +347 @@
                 if(authConst != null) {
                     if(authConst.isAuthorized(context)) result = 1;
-                    else if(authConst.getAuthPage()!=null) result = 2;
+                    else if(authConst.getAuthPage(context)!=null) result = 2;
                     else result = 3;
                 }

branches/release-0.13.x/pfixcore/src/de/schlund/pfixcore/workflow/context/RequestContextImpl.java

@@ -374 +374 @@
                 authConst = getParentContext().getContextConfig().getDefaultAuthConstraint();
             if (authConst != null) {
-                String authPageName = authConst.getAuthPage();
+                String authPageName = authConst.getAuthPage(parentcontext);
                 if (authPageName != null) {
                     currentpagerequest = createPageRequest(authPageName);
@@ -742 +742 @@
             AuthConstraint authConstraint = pageConfig.getAuthConstraint();
             if (authConstraint == null) authConstraint = parentcontext.getContextConfig().getDefaultAuthConstraint();
-            if (authConstraint != null && !authConstraint.isAuthorized(parentcontext) && authConstraint.getAuthPage()==null) return false;
+            if (authConstraint != null && !authConstraint.isAuthorized(parentcontext) && authConstraint.getAuthPage(parentcontext)==null) return false;
         }
         return true;
@@ -771 +771 @@
                 authConstraint = parentcontext.getContextConfig().getDefaultAuthConstraint();
             if (authConstraint != null) {
-                String authPageName = authConstraint.getAuthPage();
+                String authPageName = authConstraint.getAuthPage(parentcontext);
                 if (authPageName != null)
                     localAuthPage = createPageRequest(authPageName);

branches/release-0.13.x/pfixcore/src/org/pustefixframework/config/contextxmlservice/parser/AuthConstraintParsingHandler.java

@@ -78 +78 @@
         }
         String authPage = element.getAttribute("authpage").trim();
-        if (!authPage.equals("")) constraint.setAuthPage(authPage);
-        
+        if (!authPage.equals("")) constraint.setDefaultAuthPage(authPage);
     }
 

branches/release-0.13.x/pfixcore/src/org/pustefixframework/config/contextxmlservice/parser/ConditionParsingHandler.java

@@ -38 +38 @@
 import de.schlund.pfixcore.auth.conditions.ConditionGroup;
 import de.schlund.pfixcore.auth.conditions.HasRole;
+import de.schlund.pfixcore.auth.conditions.NavigationCase;
 import de.schlund.pfixcore.auth.conditions.Not;
 import de.schlund.pfixcore.auth.conditions.Or;
@@ -47 +48 @@
  */
 public class ConditionParsingHandler implements ParsingHandler {
-
-    public void handleNode(HandlerContext context) throws ParserException {
-
-        Element element = (Element)context.getNode();
-        ParsingUtils.checkAttributes(element, null, new String[] {"name", "class", "ref", "id"});
-        
-        ContextXMLServletConfigImpl config = ParsingUtils.getSingleTopObject(ContextXMLServletConfigImpl.class, context);
-        
+    
+    private Condition findParentCondition(HandlerContext context) {
         Iterator<Condition> parentConditions = context.getObjectTreeElement().getObjectsOfTypeFromTopTree(Condition.class).iterator();
         Condition parentCondition = null;
         if(parentConditions.hasNext()) parentCondition = parentConditions.next();
-        boolean inCondition = ( parentCondition != null);
-        boolean inPageRequest = isInPageRequest(element);
-        
-        String name = element.getNodeName();
-        Condition condition = null;
+        return parentCondition;
+    }
+
+    public void handleNode(HandlerContext context) throws ParserException {
+        Condition condition = parseCondition(context);
+
+        //assemble the parent element by setting or adding the parsed condition
+        Condition parentCondition = findParentCondition(context);
+        if(parentCondition != null) {
+            if (parentCondition instanceof NavigationCase) {
+                ((NavigationCase) parentCondition).setCondition(condition);
+            } else if (parentCondition instanceof AuthConstraint) {
+                AuthConstraintImpl authConstraint = (AuthConstraintImpl) parentCondition;
+                if (condition instanceof NavigationCase) {
+                    authConstraint.addNavigationCase(((NavigationCase) condition));
+                } else {
+                    authConstraint.setCondition(condition);
+                }
+            } else if (parentCondition instanceof ConditionGroup) {
+                ((ConditionGroup) parentCondition).add(condition);
+            } else if (parentCondition instanceof Not) {
+                ((Not) parentCondition).set(condition);
+            } else throw new ParserException("Illegal object: " + parentCondition.getClass().getName());
+        }
+
+        context.getObjectTreeElement().addObject(condition);
+    }
+
+    private ContextXMLServletConfigImpl getConfig(HandlerContext context) throws ParserException {
+        return ParsingUtils.getSingleTopObject(ContextXMLServletConfigImpl.class, context);
+    }
+
+    private Condition parseCondition(HandlerContext context) throws ParserException {
+
+        Element element = (Element)context.getNode();
+        ParsingUtils.checkAttributes(element, null, new String[] {"page", "name", "class", "ref", "id"});
+
+        String name = element.getTagName();
+
+        Condition condition;
         if (name.equals("or")) {
             condition = new Or();
@@ -70 +100 @@
             condition = new Not();
         } else if (name.equals("hasrole")) {
+            ContextXMLServletConfigImpl config = getConfig(context);
             String roleName = element.getAttribute("name").trim();
             if(roleName.equals("")) throw new ParserException("Element 'hasrole' requires 'name' attribute value.");
@@ -76 +107 @@
             if (role == null) throw new ParserException("Condition hasrole references unknown role: " + roleName);
         } else if (name.equals("condition")) {
-            if (!inCondition) {
+            if (findParentCondition(context) == null) {
                 String id = element.getAttribute("id").trim();
                 condition = createCondition(element);
+                ContextXMLServletConfigImpl config = getConfig(context);
                 config.getContextConfig().addCondition(id, condition);
             } else {
                 String ref = element.getAttribute("ref").trim();
                 if (ref != null) {
+                    ContextXMLServletConfigImpl config = ParsingUtils.getSingleTopObject(ContextXMLServletConfigImpl.class, context);
                     condition = config.getContextConfig().getCondition(ref);
                     if (condition == null) throw new ParserException("Condition reference not found: " + ref);
@@ -92 +125 @@
             String ref = element.getAttribute("ref").trim();
             if(ref.equals("")) throw new ParserException("Nested authconstraint requires 'ref' attribute.");
-            if(inPageRequest) {
+            if(isInPageRequest(element)) {
+                ContextXMLServletConfigImpl config = getConfig(context);
                 AuthConstraint constraint = config.getContextConfig().getAuthConstraint(ref);
                 if(constraint == null) throw new ParserException("Referenced authconstraint not found: "+ref);
@@ -99 +133 @@
                 condition = new AuthConstraintRef(ref);
             }
-        } else throw new ParserException("Unsupported condition: " + name);
-      
-        if(inCondition) {
-            if (parentCondition instanceof AuthConstraint) {
-                ((AuthConstraintImpl) parentCondition).setCondition(condition);
-            } else if (parentCondition instanceof ConditionGroup) {
-                ((ConditionGroup) parentCondition).add(condition);
-            } else if (parentCondition instanceof Not) {
-                ((Not) parentCondition).set(condition);
-            } else throw new ParserException("Illegal object: " + parentCondition.getClass().getName());
+        } else if (name.equals("navigateTo")) {
+            String page = element.getAttribute("page").trim();
+            if (page.equals("")) {
+                throw new ParserException("Element navigation requires 'page' attribute.");
+            }
+            NavigationCase navigationCase = new NavigationCase(page);
+            condition = navigationCase;
+        } else {
+            throw new ParserException("Unsupported condition: " + name);
         }
-        
+
         PropertyParsingUtils.setProperties(condition, element);
-        
-        context.getObjectTreeElement().addObject(condition);
+
+        return condition;
     }
-    
+
     private Condition createCondition(Element element) throws ParserException {
         String className = element.getAttribute("class").trim();
@@ -128 +161 @@
         }
     }
-    
+
     private boolean isInPageRequest(Element element) {
         Node parent = element.getParentNode();

branches/release-0.13.x/pfixcore/src/org/pustefixframework/config/contextxmlservice/parser/internal/ContextConfigImpl.java

@@ -45 +45 @@
 import de.schlund.pfixcore.auth.conditions.ConditionGroup;
 import de.schlund.pfixcore.auth.conditions.HasRole;
+import de.schlund.pfixcore.auth.conditions.NavigationCase;
 import de.schlund.pfixcore.auth.conditions.Not;
 import de.schlund.pfixcore.workflow.ContextInterceptor;
@@ -468 +469 @@
     
     private void checkAuthConstraint(AuthConstraint authConstraint, Set<String> authPages, String lastAuthPage) throws Exception {
-        String authPage = authConstraint.getAuthPage();
-        if (authPage != null && !authPage.equals(lastAuthPage)) {
-            if (authPages.contains(authPage)) {
-                StringBuilder sb = new StringBuilder();
-                for (String s : authPages)
-                    sb.append(s + " -> ");
-                sb.append(authPage);
-                throw new Exception("Circular authconstraint@authpage reference: " + sb.toString());
-            }
-            PageRequestConfigImpl cfg = getPageRequestConfig(authPage);
-            if (cfg != null) {
-                AuthConstraint ac = cfg.getAuthConstraint();
-                if (ac == null) ac = getDefaultAuthConstraint();
-                if (ac != null) {
-                    authPages.add(authPage);
-                    checkAuthConstraint(ac, authPages, authPage);
+        for (String authPage : traverseAuthPages(authConstraint)) {
+            if (authPage != null && !authPage.equals(lastAuthPage)) {
+                if (authPages.contains(authPage)) {
+                    StringBuilder sb = new StringBuilder();
+                    for (String s : authPages)
+                        sb.append(s + " -> ");
+                    sb.append(authPage);
+                    throw new Exception("Circular authconstraint@authpage reference: " + sb.toString());
                 }
-            } else throw new Exception("Authpage not configured: " + authPage);
-        }
-    }
-    
+                PageRequestConfigImpl cfg = getPageRequestConfig(authPage);
+                if (cfg != null) {
+                    AuthConstraint ac = cfg.getAuthConstraint();
+                    if (ac == null) ac = getDefaultAuthConstraint();
+                    if (ac != null) {
+                        authPages.add(authPage);
+                        checkAuthConstraint(ac, authPages, authPage);
+                    }
+                } else throw new Exception("Authpage not configured: " + authPage);
+            }
+        }
+    }
+
+    private Iterable<String> traverseAuthPages(final AuthConstraint authConstraint) {
+        return new Iterable<String>() {
+            @Override
+            public Iterator<String> iterator() {
+                return new Iterator<String>() {
+
+                    private Iterator<NavigationCase> navCases =
+                        authConstraint.getNavigation().iterator();
+
+                    private boolean visitedDefaultAuthPage;
+
+                    private boolean isDefaultPageVisitable() {
+                        return !visitedDefaultAuthPage && authConstraint.getDefaultAuthPage() != null;
+                    }
+
+                    @Override
+                    public boolean hasNext() {
+                        return isDefaultPageVisitable() ||
+                               navCases.hasNext();
+                    }
+
+                    @Override
+                    public String next() {
+                        if (isDefaultPageVisitable()) {
+                            String result = authConstraint.getDefaultAuthPage();
+                            visitedDefaultAuthPage = true;
+                            return result;
+                        }
+                        return navCases.next().getPage();
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException(); 
+                    }
+                };
+            }
+        };
+    }
+
 }