lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andr...@apache.org
Subject svn commit: r178138 - in /lenya/trunk/src: java/org/apache/lenya/cms/ac/usecases/AccessControl.java webapp/lenya/usecases/tab/ac/ac.jx
Date Tue, 24 May 2005 08:21:09 GMT
Author: andreas
Date: Tue May 24 01:21:07 2005
New Revision: 178138

URL: http://svn.apache.org/viewcvs?rev=178138&view=rev
Log:
showing existing credentials on AC tabs

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
    lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx

Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java?rev=178138&r1=178137&r2=178138&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java Tue May 24 01:21:07
2005
@@ -16,9 +16,13 @@
  */
 package org.apache.lenya.cms.ac.usecases;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.cocoon.ProcessingException;
+import org.apache.lenya.cms.ac.cocoon.CredentialWrapper;
 import org.apache.lenya.cms.publication.Document;
 import org.apache.lenya.cms.publication.DocumentIdentityMap;
 import org.apache.lenya.cms.publication.URLInformation;
@@ -33,6 +37,7 @@
 import org.apache.lenya.ac.Policy;
 import org.apache.lenya.ac.Role;
 import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.impl.Credential;
 import org.apache.lenya.ac.impl.DefaultAccessController;
 import org.apache.lenya.ac.impl.DefaultPolicy;
 import org.apache.lenya.ac.impl.InheritingPolicyManager;
@@ -58,6 +63,8 @@
     protected static final String SSL = "ssl";
     protected static final String ANCESTOR_SSL = "ancestorSsl";
     protected static final String DOCUMENT = "document";
+    protected static final String URL_CREDENTIALS = "urlCredentials";
+    protected static final String PARENT_CREDENTIALS = "parentCredentials";
     private String COMPLETE_AREA = "private.completeArea";
 
     /**
@@ -83,7 +90,7 @@
 
             setParameter(SSL, Boolean.toString(isSSLProtected()));
             setParameter(ANCESTOR_SSL, Boolean.toString(isAncestorSSLProtected()));
-            
+
             User[] users = getUserManager().getUsers();
             String[] userIds = new String[users.length];
             for (int i = 0; i < users.length; i++) {
@@ -91,7 +98,7 @@
             }
             Arrays.sort(userIds);
             setParameter("users", userIds);
-            
+
             Group[] groups = getGroupManager().getGroups();
             String[] groupIds = new String[groups.length];
             for (int i = 0; i < groups.length; i++) {
@@ -99,7 +106,7 @@
             }
             Arrays.sort(groupIds);
             setParameter("groups", groupIds);
-            
+
             IPRange[] ipRanges = getIpRangeManager().getIPRanges();
             String[] ipRangeIds = new String[ipRanges.length];
             for (int i = 0; i < ipRanges.length; i++) {
@@ -107,7 +114,6 @@
             }
             Arrays.sort(ipRangeIds);
             setParameter("ipRanges", ipRangeIds);
-            
 
             Role[] roles = getRoleManager().getRoles();
             String visitorRole = "";
@@ -121,9 +127,9 @@
             Arrays.sort(roleIds);
             setParameter("roles", roleIds);
             setParameter("visitorRole", visitorRole);
-
-            //FIXME expects the component manager
-            // helper.setup(objectModel, this.manager, area);
+            
+            setParameter(URL_CREDENTIALS, getURICredentials());
+            setParameter(PARENT_CREDENTIALS, getParentCredentials());
 
             for (int i = 0; i < types.length; i++) {
                 Item[] _items = null;
@@ -161,7 +167,7 @@
             }
         } catch (final Exception e) {
             addErrorMessage("Could not read a value.");
-            getLogger().error("Could not read value for AccessControl usecase. " + e.toString());
+            getLogger().error("Could not read value for AccessControl usecase. ", e);
         }
 
     }
@@ -231,9 +237,9 @@
         boolean ssl;
         try {
             String ancestorUrl = "";
-            int lastSlashIndex = getSourceURL().lastIndexOf("/");
+            int lastSlashIndex = getPolicyURL().lastIndexOf("/");
             if (lastSlashIndex != -1) {
-                ancestorUrl = getSourceURL().substring(0, lastSlashIndex);
+                ancestorUrl = getPolicyURL().substring(0, lastSlashIndex);
             }
 
             Policy policy = getPolicyManager().getPolicy(getAccreditableManager(), ancestorUrl);
@@ -252,7 +258,7 @@
     protected boolean isSSLProtected() throws ProcessingException {
         boolean ssl;
         try {
-            Policy policy = getPolicyManager().getPolicy(getAccreditableManager(), getSourceURL());
+            Policy policy = getPolicyManager().getPolicy(getAccreditableManager(), getPolicyURL());
             ssl = policy.isSSLProtected();
         } catch (AccessControlException e) {
             throw new ProcessingException("Resolving policy failed: ", e);
@@ -268,9 +274,9 @@
     protected void setSSLProtected(boolean ssl) throws ProcessingException {
         try {
             DefaultPolicy policy = getPolicyManager().buildSubtreePolicy(getAccreditableManager(),
-                    getSourceURL());
+                    getPolicyURL());
             policy.setSSL(ssl);
-            getPolicyManager().saveSubtreePolicy(getSourceURL(), policy);
+            getPolicyManager().saveSubtreePolicy(getPolicyURL(), policy);
         } catch (AccessControlException e) {
             throw new ProcessingException("Resolving policy failed: ", e);
         }
@@ -297,7 +303,7 @@
 
         try {
             DefaultPolicy policy = getPolicyManager().buildSubtreePolicy(getAccreditableManager(),
-                    getSourceURL());
+                    getPolicyURL());
             Accreditable accreditable = (Accreditable) item;
 
             if (operation.equals(ADD)) {
@@ -306,10 +312,106 @@
                 policy.removeRole(accreditable, role);
             }
 
-            getPolicyManager().saveSubtreePolicy(getSourceURL(), policy);
+            getPolicyManager().saveSubtreePolicy(getPolicyURL(), policy);
 
         } catch (Exception e) {
             throw new ProcessingException("Manipulating credential failed: ", e);
         }
     }
+
+    /**
+     * Returns the URI credential wrappers for the request of this object model.
+     * @return An array of CredentialWrappers.
+     * @throws ProcessingException when something went wrong.
+     */
+    public CredentialWrapper[] getURICredentials() throws ProcessingException {
+        return getCredentials(true);
+    }
+
+    /**
+     * Returns the credential wrappers for the parent URI of the URL belonging to the request
of
+     * this object model.
+     * @return An array of CredentialWrappers.
+     * @throws ProcessingException when something went wrong.
+     */
+    public CredentialWrapper[] getParentCredentials() throws ProcessingException {
+        return getCredentials(false);
+    }
+
+    /**
+     * Returns the credentials of the policy of the selected URL.
+     * @param urlOnly If true, the URL policy credentials are returned. If false, the credentials
of
+     *            all ancestor policies are returned.
+     * @return An array of CredentialWrappers.
+     * @throws ProcessingException when something went wrong.
+     */
+    public CredentialWrapper[] getCredentials(boolean urlOnly) throws ProcessingException
{
+
+        List credentials = new ArrayList();
+
+        DefaultPolicy policies[] = getPolicies(urlOnly);
+        List policyCredentials = new ArrayList();
+        for (int i = 0; i < policies.length; i++) {
+            Credential[] creds = policies[i].getCredentials();
+            for (int j = 0; j < creds.length; j++) {
+                policyCredentials.add(creds[j]);
+            }
+        }
+        for (Iterator i = policyCredentials.iterator(); i.hasNext();) {
+            Credential credential = (Credential) i.next();
+            Accreditable accreditable = credential.getAccreditable();
+            Role[] roles = credential.getRoles();
+            for (int j = 0; j < roles.length; j++) {
+                credentials.add(new CredentialWrapper(accreditable, roles[j]));
+            }
+        }
+        return (CredentialWrapper[]) credentials.toArray(new CredentialWrapper[credentials.size()]);
+    }
+
+    /**
+     * Returns the policies for a certain URL.
+     * @param onlyUrl If true, only the URL policies are returned. Otherwise, all ancestor
policies
+     *            are returned.
+     * @return An array of DefaultPolicy objects.
+     * @throws ProcessingException when something went wrong.
+     */
+    protected DefaultPolicy[] getPolicies(boolean onlyUrl) throws ProcessingException {
+
+        DefaultPolicy[] policies;
+
+        try {
+            if (onlyUrl) {
+                policies = new DefaultPolicy[1];
+                AccreditableManager policyManager = getAccreditableManager();
+                policies[0] = getPolicyManager().buildSubtreePolicy(policyManager, getPolicyURL());
+            } else {
+                String ancestorUrl = "";
+
+                String currentUrl = getPolicyURL();
+                if (currentUrl.endsWith("/")) {
+                    currentUrl = currentUrl.substring(0, currentUrl.length() - 1);
+                }
+
+                int lastSlashIndex = currentUrl.lastIndexOf("/");
+                if (lastSlashIndex != -1) {
+                    ancestorUrl = currentUrl.substring(0, lastSlashIndex);
+                }
+                policies = getPolicyManager().getPolicies(getAccreditableManager(), ancestorUrl);
+            }
+        } catch (AccessControlException e) {
+            throw new ProcessingException(e);
+        }
+
+        return policies;
+    }
+    
+    protected String getPolicyURL() {
+        String infoUrl = getSourceURL();
+        URLInformation info = new URLInformation(infoUrl);
+        
+        String area = getParameterAsString("acArea");
+        String url = "/" + info.getPublicationId() + "/" + area + info.getDocumentUrl();
+        return url;
+    }
+
 }

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx?rev=178138&r1=178137&r2=178138&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx Tue May 24 01:21:07 2005
@@ -52,7 +52,7 @@
                 <form method="get">
                   <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
                   <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
-                  <td><i18n:text>User</i18n:text></td>
+                  <td><i18n:text>user</i18n:text></td>
                   <td>
                     <select name="user" class="lenya-form-element-narrow">
                       <jx:forEach var="user" items="${usecase.getParameter('users')}">
@@ -68,7 +68,7 @@
                     </select>
                   </td>
                   <td>
-                    <input i18n:attr="value" type="submit" name="add_credential_user"
value="Add"/>
+                    <input i18n:attr="value" type="submit" name="addCredential_user" value="Add"/>
                   </td>
                 </form>
                           
@@ -77,7 +77,7 @@
                 <form method="get">
                   <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
                   <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
-                  <td><i18n:text>Group</i18n:text></td>
+                  <td><i18n:text>group</i18n:text></td>
                   <td>
                     <select name="group" class="lenya-form-element-narrow">
                       <jx:forEach var="group" items="${usecase.getParameter('groups')}">
@@ -93,7 +93,7 @@
                     </select>
                   </td>
                   <td>
-                    <input i18n:attr="value" type="submit" name="add_credential_group"
value="Add"/>
+                    <input i18n:attr="value" type="submit" name="addCredential_group"
value="Add"/>
                   </td>
                 </form>
               </tr>
@@ -118,16 +118,45 @@
                       </select>
                     </td>
                     <td>
-                      <input i18n:attr="value" type="submit" name="add_credential_ipRange"
value="Add"/>
+                      <input i18n:attr="value" type="submit" name="addCredential_ipRange"
value="Add"/>
                     </td>
                   </form>
                 </tr>
               </jx:if>
-              <!--
-              <jx:apply-templates select="lenya-info:credential">
-                <jx:with-param name="larea" select="@area"/>
-              </jx:apply-templates>
-              -->
+              
+              <jx:forEach var="credential" items="${usecase.getParameter('urlCredentials')}">
+                <form>
+                  <tr>
+                    <td>
+                      <i18n:text><jx:out value="${credential.getType()}"/></i18n:text>
+                    </td>
+                    <td>
+                      <jx:out value="${credential.getAccreditableId()}"/>
+                    </td>
+                    <td>
+                      <jx:out value="${credential.getRoleId()}"/>
+                    </td>
+                    <td>
+                      <input type="submit" name="deleteCredential" i18n:attr="value" value="Delete"/>
+                    </td>
+                  </tr>
+                </form>
+              </jx:forEach>
+              
+              <jx:forEach var="credential" items="${usecase.getParameter('parentCredentials')}">
+                <tr>
+                  <td>
+                    <i18n:text><jx:out value="${credential.getType()}"/></i18n:text>
+                  </td>
+                  <td>
+                    <jx:out value="${credential.getAccreditableId()}"/>
+                  </td>
+                  <td colspan="2">
+                    <jx:out value="${credential.getRoleId()}"/>
+                  </td>
+                </tr>
+              </jx:forEach>
+              
             </table>
           </td>
         </tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org


Mime
View raw message