continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r450567 - in /maven/continuum/branches/rbac-integration: continuum-security/src/main/java/org/apache/maven/continuum/security/ continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ continuum-security/src/main/resourc...
Date Wed, 27 Sep 2006 20:42:36 GMT
Author: jmcconnell
Date: Wed Sep 27 13:42:35 2006
New Revision: 450567

URL: http://svn.apache.org/viewvc?view=rev&rev=450567
Log:
matchs the commit on p-sec for the guest user to manage authz for unauthn folks content viewing
pleasure.  if the the guest user is not locked then things that are authz for the guest user
are available to all viewers...if it is locked then normal rules of authz apply

Added:
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGuestRoleProfile.java
  (with props)
Modified:
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java
    maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configuration.jsp
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp

Modified: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
(original)
+++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
Wed Sep 27 13:42:35 2006
@@ -39,13 +39,13 @@
     public static final String CONTINUUM_MANAGE_SCHEDULES = "continuum-manage-schedules";
     public static final String CONTINUUM_MANAGE_CONFIGURATION = "continuum-manage-configuration";
     public static final String CONTINUUM_MANAGE_USERS = "continuum-manage-users";
+    public static final String CONTINUUM_ACTIVE_GUEST_OPERATION = "continuum-guest";
 
     // dynamic operations
     public static final String CONTINUUM_VIEW_GROUP_OPERATION = "continuum-view-group";
     public static final String CONTINUUM_ADD_GROUP_OPERATION = "continuum-add-group";
     public static final String CONTINUUM_REMOVE_GROUP_OPERATION = "continuum-remove-group";
     public static final String CONTINUUM_BUILD_GROUP_OPERATION = "continuum-build-group";
-
     public static final String CONTINUUM_MODIFY_GROUP_OPERATION = "continuum-modify-group";
     public static final String CONTINUUM_ADD_PROJECT_TO_GROUP_OPERATION = "continuum-add-project-to-group";
     public static final String CONTINUUM_REMOVE_PROJECT_FROM_GROUP_OPERATION ="continuum-remove-project-from-group";

Modified: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java
(original)
+++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java
Wed Sep 27 13:42:35 2006
@@ -37,6 +37,7 @@
     {
         mergeRoleProfiles( "system-administrator", "continuum-system-administrator" );
         mergeRoleProfiles( "user-administrator", "continuum-user-administrator" );
+        mergeRoleProfiles( "guest", "continuum-guest" );
         setInitialized( true ); //todo remove the initialization idea from profile managers
     }
 }

Added: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGuestRoleProfile.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGuestRoleProfile.java?view=auto&rev=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGuestRoleProfile.java
(added)
+++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGuestRoleProfile.java
Wed Sep 27 13:42:35 2006
@@ -0,0 +1,57 @@
+package org.apache.maven.continuum.security.profile;
+
+import org.codehaus.plexus.rbac.profile.AbstractRoleProfile;
+import org.apache.maven.continuum.security.ContinuumRoleConstants;
+
+import java.util.List;
+import java.util.ArrayList;
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * ContinuumSystemAdministratorRoleProfile:
+ *
+ * @author: Jesse McConnell <jmcconnell@apache.org>
+ * @version: $ID:$
+ *
+ * @plexus.component
+ *   role="org.codehaus.plexus.rbac.profile.RoleProfile"
+ *   role-hint="continuum-guest"
+ */
+public class ContinuumGuestRoleProfile
+    extends AbstractRoleProfile
+{
+
+    public String getRoleName()
+    {
+        return ContinuumRoleConstants.GUEST_ROLE;
+    }
+
+    public List getOperations()
+    {
+        List operations = new ArrayList();
+
+        operations.add(  ContinuumRoleConstants.CONTINUUM_ACTIVE_GUEST_OPERATION );
+
+        return operations;
+    }
+
+
+    public boolean isAssignable()
+    {
+        return false;
+    }
+}

Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumGuestRoleProfile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml
Wed Sep 27 13:42:35 2006
@@ -54,5 +54,33 @@
         </requirement>
       </requirements>
     </component>
+    <component>
+      <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
+      <role-hint>continuum-user-administrator</role-hint>
+      <implementation>org.apache.maven.continuum.security.profile.ContinuumUserAdministratorRoleProfile</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.PlexusContainer</role>
+          <field-name>container</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
+      <role-hint>continuum-guest</role-hint>
+      <implementation>org.apache.maven.continuum.security.profile.ContinuumGuestRoleProfile</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.PlexusContainer</role>
+          <field-name>container</field-name>
+        </requirement>
+      </requirements>
+    </component>
   </components>
 </component-set>

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml Wed Sep 27 13:42:35
2006
@@ -340,6 +340,16 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-keys-jdo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+     <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authentication-provider-keystore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-authorization-api</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
Wed Sep 27 13:42:35 2006
@@ -28,6 +28,7 @@
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
 import org.codehaus.plexus.security.rbac.Resource;
+import org.codehaus.plexus.security.user.UserManager;
 
 import java.io.File;
 import java.util.Collections;
@@ -50,6 +51,11 @@
      */
     private ContinuumStore store;
 
+    /**
+     * @plexus.requirement
+     */
+    private UserManager userManager;
+
     private boolean guestAccountEnabled;
 
     private String workingDirectory;
@@ -88,10 +94,12 @@
     {
         
         ConfigurationService configuration = getContinuum().getConfiguration();
-
+        
         if ( guestAccountEnabled )
         {
             configuration.setGuestAccountEnabled( guestAccountEnabled );
+
+
         }
         else
         {

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
Wed Sep 27 13:42:35 2006
@@ -19,6 +19,7 @@
 import org.codehaus.plexus.security.system.check.EnvironmentCheck;
 import org.codehaus.plexus.rbac.profile.RoleProfileManager;
 import org.codehaus.plexus.rbac.profile.RoleProfileException;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.util.List;
 
@@ -33,6 +34,7 @@
  *   role-hint="continuum-role-profile-check"
  */
 public class RoleProfileEnvironmentCheck
+    extends AbstractLogEnabled
     implements EnvironmentCheck
 {
     /**
@@ -51,6 +53,7 @@
         }
         catch ( RoleProfileException rpe )
         {
+            rpe.printStackTrace();
             list.add( "error inititalizing the continuum role manager" );
         }
     }

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Wed Sep 27 13:42:35 2006
@@ -240,35 +240,49 @@
       </configuration>
     </component>
 
+
     <component>
       <role>org.codehaus.plexus.jdo.JdoFactory</role>
-      <implementation>org.codehaus.plexus.jdo.DefaultJdoFactory</implementation>
+      <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
       <configuration>
-        <properties>
-          <!-- JPOX and JDO configuration -->
-          <property>
-            <name>javax.jdo.PersistenceManagerFactoryClass</name>
-            <value>org.jpox.PersistenceManagerFactoryImpl</value>
-          </property>
+
+        <!-- HSQLDB Configuration -->
+        <!--
+          NOTE: NO NOT USE THIS CONFIGURATION FOR A PRODUCTION SYSTEM.
+          HSQLDB keeps all data in memory at all times.
+
+          NOTE: JPOX 1.1.1 won't create the tables on start
+          http://www.jpox.org/servlet/jira/browse/CORE-2946
+        -->
+        <!--
+        <driverName>org.hsqldb.jdbcDriver</driverName>
+        <url>jdbc:hsqldb:mem:test</url>
+        <userName>sa</userName>
+        <password></password>
+            -->
+
+        <!-- Apache Derby Configuration -->
+        <driverName>org.apache.derby.jdbc.EmbeddedDriver</driverName>
+        <url>jdbc:derby:${plexus.home}/database;create=true</url>
+        <userName>sa</userName>
+        <password></password>
+
+        <!-- Postgresql Configuration -->
+        <!--
+        <driverName>org.postgresql.Driver</driverName>
+        <url>jdbc:postgresql://localhost/continuum</url>
+        <userName>username</userName>
+        <password></password>
+        -->
+
+        <!-- JPOX and JDO configuration -->
+        <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+        <otherProperties>
           <property>
             <name>org.jpox.autoCreateSchema</name>
             <value>true</value>
           </property>
           <property>
-            <name>org.jpox.validateTables</name>
-            <value>false</value>
-          </property>
-          <property>
-            <name>org.jpox.validateColumns</name>
-            <value>false</value>
-          </property>
-          <property>
-            <name>org.jpox.validateConstraints</name>
-            <value>false</value>
-          </property>
-
-<!--
-          <property>
             <name>org.jpox.autoStartMechanism</name>
             <value>SchemaTable</value>
           </property>
@@ -276,68 +290,14 @@
             <name>org.jpox.autoStartMechanismMode</name>
             <value>Ignored</value>
           </property>
--->
-          <!-- Apache Derby Configuration -->
-          <property>
-            <name>javax.jdo.option.ConnectionDriverName</name>
-            <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-          </property>
-          <property>
-            <name>javax.jdo.option.ConnectionURL</name>
-            <value>jdbc:derby:${plexus.home}/database;create=true</value>
-          </property>
-          <property>
-            <name>javax.jdo.option.ConnectionUserName</name>
-            <value>sa</value>
-          </property>
-          <property>
-            <name>javax.jdo.option.ConnectionPassword</name>
-            <value></value>
-          </property>
-
-          <!-- Postgresql Configuration -->
-          <!--
-          <property>
-            <name>javax.jdo.option.ConnectionDriverName</name>
-            <value>org.postgresql.Driver</value>
-          </property>
           <property>
-            <name>javax.jdo.option.ConnectionURL</name>
-            <value>jdbc:postgresql://localhost/continuum</value>
-          </property>
-          <property>
-            <name>javax.jdo.option.ConnectionUserName</name>
-            <value>trygvis</value>
-          </property>
-          <property>
-            <name>javax.jdo.option.ConnectionPassword</name>
-            <value></value>
-          </property>
-          -->
-
-          <!-- HSQLDB Configuration -->
-          <!--
-            NOTE: NO NOT USE THIS CONFIGURATION FOR A PRODUCTION SYSTEM.
-            HSQLDB keeps all data in memory at all times.
-          -->
-          <!--
-          <property>
-            <name>javax.jdo.option.ConnectionDriverName</name>
-            <value>org.hsqldb.jdbcDriver</value>
-          </property>
-          <property>
-            <name>javax.jdo.option.ConnectionURL</name>
-            <value>jdbc:hsqldb:${plexus.home}/database</value>
-          </property>
-          <property>
-            <name>javax.jdo.option.ConnectionUserName</name>
-            <value>sa</value>
+            <name>org.jpox.validateTables</name>
+            <value>false</value>
           </property>
           <property>
-            <name>javax.jdo.option.ConnectionPassword</name>
-            <value></value>
+            <name>org.jpox.validateConstraints</name>
+            <value>false</value>
           </property>
-
           <property>
             <name>org.jpox.transactionIsolation</name>
             <value>READ_UNCOMMITTED</value>
@@ -346,16 +306,11 @@
             <name>org.jpox.poid.transactionIsolation</name>
             <value>READ_UNCOMMITTED</value>
           </property>
-          -->
           <property>
-            <name>org.jpox.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
+            <name>org.jpox.rdbms.dateTimezone</name>
+            <value>JDK_DEFAULT_TIMEZONE</value>
           </property>
-          <property>
-            <name>org.jpox.poid.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
-          </property>
-        </properties>
+        </otherProperties>
       </configuration>
     </component>
 
@@ -457,41 +412,228 @@
 
 
     <!-- plexus security components -->
-         <component>
-          <role>org.codehaus.plexus.security.system.SecuritySystem</role>
-          <implementation>org.codehaus.plexus.security.system.DefaultSecuritySystem</implementation>
-          <role-hint>default</role-hint>
-          <requirements>
-            <requirement>
-              <role>org.codehaus.plexus.security.authentication.AuthenticationManager</role>
-              <role-hint>default</role-hint>
-            </requirement>
-            <requirement>
-              <role>org.codehaus.plexus.security.authorization.Authorizer</role>
-              <role-hint>rbac</role-hint>
-            </requirement>
-            <requirement>
-              <role>org.codehaus.plexus.security.user.UserManager</role>
-              <role-hint>jdo</role-hint>
-            </requirement>
-          </requirements>
-        </component>
+            <component>
+      <role>org.codehaus.plexus.security.system.ApplicationDetails</role>
+      <implementation>org.codehaus.plexus.security.system.DefaultApplicationDetails</implementation>
+      <description>DefaultApplicationDetails</description>
+      <configuration>
+        <application-name>Unconfigured Application Name</application-name>
+        <!-- Do not include the trailing '/' on the url. -->
+        <application-url>http://localhost:9090</application-url>
+        <timestamp-format>EEE, d MMM yyyy HH:mm:ss Z</timestamp-format>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.system.EmailSettings</role>
+      <implementation>org.codehaus.plexus.security.system.DefaultEmailSettings</implementation>
+      <description>DefaultEmailSettings</description>
+      <configuration>
+        <feedback>/feedback.action</feedback>
+        <from-address>security@unconfigured.com</from-address>
+        <from-username>Unconfigured Username</from-username>
+      </configuration>
+    </component>
 
-        <component>
+    <component>
+      <role>org.codehaus.plexus.security.system.SecuritySystem</role>
+      <implementation>org.codehaus.plexus.security.system.DefaultSecuritySystem</implementation>
+      <role-hint>default</role-hint>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.authentication.AuthenticationManager</role>
+          <role-hint>default</role-hint>
+          <field-name>authnManager</field-name>
+        </requirement>
+        <requirement>
           <role>org.codehaus.plexus.security.authorization.Authorizer</role>
           <role-hint>rbac</role-hint>
-          <implementation>org.codehaus.plexus.security.authorization.rbac.RbacAuthorizer</implementation>
-          <requirements>
-            <requirement>
-              <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-              <role-hint>jdo</role-hint>
-            </requirement>
-            <requirement>
-              <role>org.codehaus.plexus.security.authorization.rbac.evaluator.PermissionEvaluator</role>
-              <role-hint>default</role-hint>
-            </requirement>
-          </requirements>
-        </component>
+          <field-name>authorizer</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.user.UserManager</role>
+          <role-hint>jdo</role-hint>
+          <field-name>userManager</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.keys.KeyManager</role>
+          <role-hint>jdo</role-hint>
+          <field-name>keyManager</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.policy.UserSecurityPolicy</role>
+          <role-hint>default</role-hint>
+          <field-name>policy</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.system.ApplicationDetails</role>
+          <field-name>applicationDetails</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.system.EmailSettings</role>
+          <field-name>emailSettings</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.authorization.Authorizer</role>
+      <role-hint>rbac</role-hint>
+      <implementation>org.codehaus.plexus.security.authorization.rbac.RbacAuthorizer</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>jdo</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.user.UserManager</role>
+          <role-hint>jdo</role-hint>
+          <field-name>userManager</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.authorization.rbac.evaluator.PermissionEvaluator</role>
+          <role-hint>default</role-hint>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
+      <role-hint>character-length</role-hint>
+      <implementation>org.codehaus.plexus.security.policy.rules.CharacterLengthPasswordRule</implementation>
+      <description>Basic Password Rule, Checks for non-empty passwords that have between
{@link #setMinimumCharacters(int)} and {@link #setMaximumCharacters(int)} characters in length.</description>
+      <configuration>
+        <enabled>true</enabled>
+        <minimum-characters>1</minimum-characters>
+        <maximum-characters>8</maximum-characters>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
+      <role-hint>reuse</role-hint>
+      <implementation>org.codehaus.plexus.security.policy.rules.ReusePasswordRule</implementation>
+      <description>Password Rule, Checks supplied password found at {@link User#getPassword()}
against the {@link User#getPreviousEncodedPasswords()} to ensure that a password is not reused.</description>
+      <configuration>
+        <enabled>true</enabled>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
+      <role-hint>numerical-count</role-hint>
+      <implementation>org.codehaus.plexus.security.policy.rules.NumericalPasswordRule</implementation>
+      <description>Basic Password Rule, Checks for non-empty passwords that have at
least {@link #setMinimumCount(int)} of numerical characters contained within.</description>
+      <configuration>
+        <enabled>true</enabled>
+        <minimum-count>1</minimum-count>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
+      <role-hint>must-have</role-hint>
+      <implementation>org.codehaus.plexus.security.policy.rules.MustHavePasswordRule</implementation>
+      <description>Basic Password Rule, Checks for non-empty Passwords in non guest
users.</description>
+      <configuration>
+        <enabled>true</enabled>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
+      <role-hint>alpha-count</role-hint>
+      <implementation>org.codehaus.plexus.security.policy.rules.AlphaPasswordRule</implementation>
+      <description>Basic Password Rule, Checks for non-empty passwords that have at
least {@link #setMinimumCount(int)} of alpha characters contained within.</description>
+      <configuration>
+        <enabled>true</enabled>
+        <minimum-count>1</minimum-count>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.policy.UserSecurityPolicy</role>
+      <role-hint>default</role-hint>
+      <implementation>org.codehaus.plexus.security.policy.DefaultUserSecurityPolicy</implementation>
+      <description>User Security Policy.</description>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.policy.PasswordEncoder</role>
+          <role-hint>sha256</role-hint>
+          <field-name>passwordEncoder</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.policy.UserValidationSettings</role>
+          <field-name>userValidationSettings</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.policy.PasswordRule</role>
+          <field-name>rules</field-name>
+        </requirement>
+         <requirement>
+          <role>org.codehaus.plexus.security.policy.RememberMeSettings</role>
+          <field-name>rememberMeSettings</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.security.policy.SingleSignOnSettings</role>
+          <field-name>singleSignOnSettings</field-name>
+        </requirement>
+      </requirements>
+      <configuration>
+        <previous-passwords-count>6</previous-passwords-count>
+        <login-attempt-count>3</login-attempt-count>
+        <password-expiration-days>90</password-expiration-days>
+      </configuration>
+    </component>
+
+    <component>
+         <role>org.codehaus.plexus.security.policy.RememberMeSettings</role>
+         <implementation>org.codehaus.plexus.security.policy.DefaultRememberMeSettings</implementation>
+         <description>DefaultRememberMeSettings</description>
+         <configuration>
+           <enabled>true</enabled>
+           <cookie-timeout>525600</cookie-timeout>
+         </configuration>
+       </component>
+
+       <component>
+         <role>org.codehaus.plexus.security.policy.SingleSignOnSettings</role>
+         <implementation>org.codehaus.plexus.security.policy.DefaultSingleSignOnSettings</implementation>
+         <description>DefaultSingleSignOnSettings</description>
+         <configuration>
+           <enabled>true</enabled>
+           <cookie-timeout>30</cookie-timeout>
+           <cookie-domain>localhost</cookie-domain>
+         </configuration>
+       </component>
+
+    <component>
+      <role>org.codehaus.plexus.security.policy.UserValidationSettings</role>
+      <implementation>org.codehaus.plexus.security.policy.DefaultUserValidationSettings</implementation>
+      <description>DefaultUserValidationSettings</description>
+      <configuration>
+        <email-validation-required>true</email-validation-required>
+        <!-- This is a timeout for the validation url (in minutes) - 2880 = 48 hours -->
+        <email-validation-timeout>2880</email-validation-timeout>
+        <email-login-path>/security/login!login.action</email-login-path>
+        <email-subject>Unconfigured Subject Line</email-subject>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.mailsender.MailSender</role>
+      <implementation>org.codehaus.plexus.mailsender.javamail.JavamailMailSender</implementation>
+      <configuration>
+        <smtp-host>localhost</smtp-host>
+        <smtp-port>25</smtp-port>
+        <sslProvider>com.sun.net.ssl.internal.ssl.Provider</sslProvider>
+        <!--
+        <username>mylogin</username>
+        <password>mypassword</password>
+        <sslMode>true</sslMode>
+        -->
+      </configuration>
+    </component>
 
   </components>
 

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configuration.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configuration.jsp?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configuration.jsp
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configuration.jsp
Wed Sep 27 13:42:35 2006
@@ -29,7 +29,7 @@
             <c1:data label="%{getText('configuration.companyUrl.label')}" name="companyUrl"/>
           </table>
           <div class="functnbar3">
-            <ww:form action="configuration!edit.action" method="post">
+            <ww:form action="configuration!input.action" method="post">
               <ww:submit value="%{getText('edit')}"/>
             </ww:form>
           </div>

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp?view=diff&rev=450567&r1=450566&r2=450567
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
Wed Sep 27 13:42:35 2006
@@ -1,4 +1,7 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+
 <ww:i18n name="localization.Continuum">
 <div id="banner">
   <table border="1" cellpadding="8" cellspacing="0" width="100%">
@@ -22,10 +25,13 @@
 <div id="breadcrumbs">
 
   <div style="float: right;">
+    <pss:ifAuthorized permission="continuum-guest">
+      Guest Enabled!
+    </pss:ifAuthorized>
     <a href="http://maven.apache.org/continuum">Continuum</a> |
     <a href="http://maven.apache.org/">Maven</a> |
     <a href="http://www.apache.org/">Apache</a>
   </div>
-  <%@include file="/WEB-INF/jsp/pss/include/securityLinks.jsp" %>
+  <c:import url="/WEB-INF/jsp/pss/include/securityLinks.jsp"/>
 </div>
 </ww:i18n>



Mime
View raw message