Improve inital Jackrabbit login

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / core / OsAuthenticationProvider.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java
index fa70489fc4397b2f64e60358f9c185ea042cb62e..524e73f8f7cdf4d440d7eb7b5e0fc89aab492868 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java
@@ -1,18 +1,14 @@
 package org.argeo.security.core;
 
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.security.auth.Subject;
-
 import org.argeo.security.OsAuthenticationToken;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.providers.AuthenticationProvider;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 /** Validates an OS authentication. */
 public class OsAuthenticationProvider implements AuthenticationProvider {
@@ -24,22 +20,8 @@ public class OsAuthenticationProvider implements AuthenticationProvider {
 
        public Authentication authenticate(Authentication authentication)
                        throws AuthenticationException {
-               final OsAuthenticationToken oat;
-               // if (authentication instanceof UsernamePasswordAuthenticationToken) {
-               // Subject subject = Subject.getSubject(AccessController.getContext());
-               // if (subject == null)
-               // return null;
-               // oat = new OsAuthenticationToken();
-               // } else
-               if (authentication instanceof OsAuthenticationToken) {
-                       oat = (OsAuthenticationToken) authentication;
-               } else {
+               if (!(authentication instanceof OsAuthenticationToken))
                        return null;
-               }
-
-               // not OS authenticated
-//             if (oat.getUser() == null)
-//                     return null;
 
                List<GrantedAuthority> auths = new ArrayList<GrantedAuthority>();
                auths.add(new GrantedAuthorityImpl(osUserRole));
@@ -59,6 +41,10 @@ public class OsAuthenticationProvider implements AuthenticationProvider {
                this.osUserRole = osUserRole;
        }
 
+       public void setUserRole(String userRole) {
+               this.userRole = userRole;
+       }
+
        public void setAdminRole(String adminRole) {
                this.adminRole = adminRole;
        }