geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1331047 [2/2] - in /geronimo/server/branches/3.0-beta: ./ framework/modules/geronimo-security/ framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaspi/ framework/modules/geronimo-security/src/main/java/org/apac...
Date Thu, 26 Apr 2012 19:40:52 GMT
Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java
Thu Apr 26 19:40:50 2012
@@ -32,12 +32,12 @@ import org.apache.catalina.authenticator
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.coyote.ActionCode;
+import org.apache.geronimo.security.jaspi.LoginService;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.Authenticator;
-import org.apache.geronimo.tomcat.security.LoginService;
 import org.apache.geronimo.tomcat.security.ServerAuthException;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 import org.apache.tomcat.util.res.StringManager;
 
 /**

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/DigestAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/DigestAuthenticator.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/DigestAuthenticator.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/DigestAuthenticator.java
Thu Apr 26 19:40:50 2012
@@ -32,12 +32,12 @@ import javax.servlet.http.HttpServletRes
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.util.MD5Encoder;
+import org.apache.geronimo.security.jaspi.LoginService;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
 import org.apache.geronimo.tomcat.security.Authenticator;
-import org.apache.geronimo.tomcat.security.LoginService;
 import org.apache.geronimo.tomcat.security.ServerAuthException;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java
Thu Apr 26 19:40:50 2012
@@ -38,12 +38,12 @@ import org.apache.catalina.authenticator
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.coyote.ActionCode;
+import org.apache.geronimo.security.jaspi.LoginService;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.Authenticator;
-import org.apache.geronimo.tomcat.security.LoginService;
 import org.apache.geronimo.tomcat.security.ServerAuthException;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.MessageBytes;

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/GenericHeaderAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/GenericHeaderAuthenticator.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/GenericHeaderAuthenticator.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/GenericHeaderAuthenticator.java
Thu Apr 26 19:40:50 2012
@@ -27,13 +27,13 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
+import org.apache.geronimo.security.jaspi.LoginService;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.security.realm.providers.RequestCallbackHandler;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.Authenticator;
-import org.apache.geronimo.tomcat.security.LoginService;
 import org.apache.geronimo.tomcat.security.ServerAuthException;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 
 public class GenericHeaderAuthenticator implements Authenticator {
 

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/NoneAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/NoneAuthenticator.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/NoneAuthenticator.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/NoneAuthenticator.java
Thu Apr 26 19:40:50 2012
@@ -25,11 +25,11 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.Authenticator;
 import org.apache.geronimo.tomcat.security.ServerAuthException;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/SpnegoAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/SpnegoAuthenticator.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/SpnegoAuthenticator.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/SpnegoAuthenticator.java
Thu Apr 26 19:40:50 2012
@@ -23,12 +23,12 @@ import javax.servlet.http.HttpServletRes
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.util.Base64;
+import org.apache.geronimo.security.jaspi.LoginService;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.Authenticator;
-import org.apache.geronimo.tomcat.security.LoginService;
 import org.apache.geronimo.tomcat.security.ServerAuthException;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.MessageBytes;

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/jaspic/JaspicAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/jaspic/JaspicAuthenticator.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/jaspic/JaspicAuthenticator.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/jaspic/JaspicAuthenticator.java
Thu Apr 26 19:40:50 2012
@@ -21,34 +21,31 @@
 package org.apache.geronimo.tomcat.security.authentication.jaspic;
 
 import java.io.IOException;
-import java.security.Principal;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.message.AuthException;
 import javax.security.auth.message.AuthStatus;
 import javax.security.auth.message.MessageInfo;
-import javax.security.auth.message.callback.CallerPrincipalCallback;
-import javax.security.auth.message.callback.GroupPrincipalCallback;
 import javax.security.auth.message.callback.PasswordValidationCallback;
 import javax.security.auth.message.config.ServerAuthConfig;
 import javax.security.auth.message.config.ServerAuthContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.jaspi.IdentityService;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.Authenticator;
-import org.apache.geronimo.tomcat.security.IdentityService;
 import org.apache.geronimo.tomcat.security.ServerAuthException;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 
 import static org.apache.geronimo.tomcat.security.SecurityValve.CACHED_IDENTITY_KEY;
 
@@ -62,11 +59,11 @@ public class JaspicAuthenticator impleme
     private final ServerAuthConfig serverAuthConfig;
     private final Map authProperties;
     private final Subject serviceSubject;
-    private final JaspicCallbackHandler callbackHandler;
+    private final CallbackHandler callbackHandler;
     private final IdentityService identityService;
     private final boolean containerCaching;
 
-    public JaspicAuthenticator(ServerAuthConfig serverAuthConfig, Map authProperties, Subject
serviceSubject, JaspicCallbackHandler callbackHandler, IdentityService identityService) {
+    public JaspicAuthenticator(ServerAuthConfig serverAuthConfig, Map authProperties, Subject
serviceSubject, CallbackHandler callbackHandler, IdentityService identityService) {
         this.serverAuthConfig = serverAuthConfig;
         this.authProperties = authProperties;
         this.serviceSubject = serviceSubject;

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCAuthorizer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCAuthorizer.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCAuthorizer.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCAuthorizer.java
Thu Apr 26 19:40:50 2012
@@ -27,9 +27,10 @@ import javax.security.jacc.WebResourcePe
 import javax.security.jacc.WebUserDataPermission;
 
 import org.apache.catalina.connector.Request;
+import org.apache.geronimo.security.jaspi.UserIdentity;
+import org.apache.geronimo.security.jaspi.impl.JACCUserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
 import org.apache.geronimo.tomcat.security.Authorizer;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 
 /**
  * @version $Rev$ $Date$
@@ -69,7 +70,7 @@ public class JACCAuthorizer implements A
             return false;
         }
 
-        AccessControlContext acc = ((JACCUserIdentity)userIdentity).getAccessControlContext();
+        AccessControlContext acc = userIdentity.getAccessControlContext();
         try {
             acc.checkPermission(new WebResourcePermission(request));
             return true;

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCEJBWebServiceAuthorizer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCEJBWebServiceAuthorizer.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCEJBWebServiceAuthorizer.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCEJBWebServiceAuthorizer.java
Thu Apr 26 19:40:50 2012
@@ -23,8 +23,8 @@ package org.apache.geronimo.tomcat.secur
 import java.security.AccessControlContext;
 
 import org.apache.catalina.connector.Request;
+import org.apache.geronimo.security.jaspi.UserIdentity;
 import org.apache.geronimo.tomcat.security.AuthResult;
-import org.apache.geronimo.tomcat.security.UserIdentity;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCSecurityValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCSecurityValve.java?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCSecurityValve.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCSecurityValve.java
Thu Apr 26 19:40:50 2012
@@ -26,10 +26,10 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.security.jacc.PolicyContext;
 
+import org.apache.geronimo.security.jaspi.IdentityService;
 import org.apache.geronimo.tomcat.security.SecurityValve;
 import org.apache.geronimo.tomcat.security.Authenticator;
 import org.apache.geronimo.tomcat.security.Authorizer;
-import org.apache.geronimo.tomcat.security.IdentityService;
 import org.apache.geronimo.security.jacc.PolicyContextHandlerHttpServletRequest;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;

Modified: geronimo/server/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/pom.xml?rev=1331047&r1=1331046&r2=1331047&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/pom.xml Thu Apr 26 19:40:50 2012
@@ -367,7 +367,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
-                <version>1.1.1</version>
+                <version>2.0-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.geronimo.bundles</groupId>



Mime
View raw message