From 158f91cccb2990d2210c2f90859abacd6e2f3a98 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 7 Sep 2006 16:05:47 +0000 Subject: [PATCH] starting to use the plexus-security bits now, the store-model.xml file will eventually going away, the login and logout actions now work and you can register a user now and login. doing so doesn't do anything for you atm, but its the start showing the security system being used in actions. next will come authorization implementation and usage git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@441128 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-webapp/pom.xml | 41 +++++++++++++ archiva-webapp/rbac-store-model.xml | 1 + .../resources/META-INF/plexus/application.xml | 36 +++++++++++ archiva-webapp/src/main/resources/xwork.xml | 15 +++++ .../webapp/WEB-INF/jsp/decorators/default.jsp | 10 +++- .../src/main/webapp/WEB-INF/jsp/login.jsp | 57 ++++++++++++++++++ .../src/main/webapp/WEB-INF/jsp/logout.jsp | 37 ++++++++++++ .../src/main/webapp/WEB-INF/jsp/register.jsp | 60 +++++++++++++++++++ 8 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 archiva-webapp/rbac-store-model.xml create mode 100644 archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp create mode 100644 archiva-webapp/src/main/webapp/WEB-INF/jsp/logout.jsp create mode 100644 archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml index 26c5f59d4..5a900b8a8 100644 --- a/archiva-webapp/pom.xml +++ b/archiva-webapp/pom.xml @@ -109,6 +109,47 @@ org.apache.maven maven-project + + + org.codehaus.plexus.security + plexus-security-system + 1.0-SNAPSHOT + + + org.codehaus.plexus.security + plexus-security-ui-web + 1.0-SNAPSHOT + + + org.codehaus.plexus.security + plexus-security-authorization-rbac-ui-web + 1.0-SNAPSHOT + + + org.codehaus.plexus.security + plexus-security-authentication-provider-memory + 1.0-SNAPSHOT + + + org.codehaus.plexus.security + plexus-security-user-management-provider-memory + 1.0-SNAPSHOT + + + org.codehaus.plexus.security + plexus-security-authorization-rbac-store-memory + 1.0-SNAPSHOT + + + org.codehaus.plexus.security + plexus-security-authorization-api + 1.0-SNAPSHOT + + + org.codehaus.plexus.security + plexus-security-authorization-rbac-authorizer + 1.0-SNAPSHOT + diff --git a/archiva-webapp/rbac-store-model.xml b/archiva-webapp/rbac-store-model.xml new file mode 100644 index 000000000..5923107bb --- /dev/null +++ b/archiva-webapp/rbac-store-model.xml @@ -0,0 +1 @@ + diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml index 4ce70d697..c17d9b2be 100644 --- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -59,6 +59,42 @@ + + + + + org.codehaus.plexus.security.system.SecuritySystem + org.codehaus.plexus.security.system.DefaultSecuritySystem + default + + + org.codehaus.plexus.security.authentication.Authenticator + memory + + + org.codehaus.plexus.security.authorization.Authorizer + rbac + + + org.codehaus.plexus.security.user.UserManager + memory + + + + + + org.codehaus.plexus.security.authorization.Authorizer + rbac + org.codehaus.plexus.security.authorization.rbac.RbacAuthorizer + + + org.codehaus.plexus.security.authorization.rbac.store.RbacStore + memory + + + + + diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml index c90d005bf..382b15631 100644 --- a/archiva-webapp/src/main/resources/xwork.xml +++ b/archiva-webapp/src/main/resources/xwork.xml @@ -124,6 +124,21 @@ 404 + + + + /WEB-INF/jsp/login.jsp + browse + + + + /WEB-INF/jsp/logout.jsp + + + + /WEB-INF/jsp/register.jsp + login + diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp index 5a9dff1a1..20476d744 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp @@ -58,7 +58,15 @@