You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/06/30 22:23:44 UTC
svn commit: r789931 - in
/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7:
JettyContainerImpl.java security/BuiltInAuthMethod.java
security/JettySecurityHandlerFactory.java
Author: gawor
Date: Tue Jun 30 20:23:43 2009
New Revision: 789931
URL: http://svn.apache.org/viewvc?rev=789931&view=rev
Log:
some fixes for ejb web service authentication - thing still fail but at least they deploy (GERONIMO-4645)
Modified:
geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/BuiltInAuthMethod.java
geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java?rev=789931&r1=789930&r2=789931&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java Tue Jun 30 20:23:43 2009
@@ -229,9 +229,9 @@
String[] protectedMethods, //allowed methods?
ClassLoader classLoader) throws Exception {
SecurityHandler securityHandler = null;
- if (realmName != null) {
+ if (configurationFactory != null) {
JettySecurityHandlerFactory factory = new JettySecurityHandlerFactory(BuiltInAuthMethod.valueOf(authMethod), null, null, realmName, configurationFactory);
- Permission permission = new WebUserDataPermission("/*", protectedMethods, ":" + transportGuarantee);
+ Permission permission = new WebUserDataPermission("/*", protectedMethods, transportGuarantee);
securityHandler = factory.buildEJBSecurityHandler(permission);
}
ServletHandler servletHandler = new EJBServletHandler(webServiceContainer);
Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/BuiltInAuthMethod.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/BuiltInAuthMethod.java?rev=789931&r1=789930&r2=789931&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/BuiltInAuthMethod.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/BuiltInAuthMethod.java Tue Jun 30 20:23:43 2009
@@ -21,8 +21,8 @@
package org.apache.geronimo.jetty7.security;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public enum BuiltInAuthMethod {
- BASIC, DIGEST, FORM, CLIENTCERT
+ NONE, BASIC, DIGEST, FORM, CLIENTCERT
}
Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java?rev=789931&r1=789930&r2=789931&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java Tue Jun 30 20:23:43 2009
@@ -103,6 +103,8 @@
authenticator = new ClientCertAuthenticator();
} else if (authMethod == BuiltInAuthMethod.FORM) {
authenticator = new SessionCachingAuthenticator(new FormAuthenticator(loginPage, errorPage));
+ } else if (authMethod == BuiltInAuthMethod.NONE) {
+ return null;
} else {
throw new IllegalStateException("someone added a new BuiltInAuthMethod without telling us");
}