Author: markt
Date: Tue Jun 23 09:45:34 2015
New Revision: 1687011
URL: http://svn.apache.org/r1687011
Log:
Added realm support for embedded JASPIC modules
Patch by fjodorver
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfigProvider.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java?rev=1687011&r1=1687010&r2=1687011&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
Tue Jun 23 09:45:34 2015
@@ -28,6 +28,7 @@ import javax.security.auth.message.Messa
import javax.security.auth.message.config.ServerAuthConfig;
import javax.security.auth.message.config.ServerAuthContext;
+import org.apache.catalina.Realm;
import
org.apache.catalina.authenticator.jaspic.provider.modules.TomcatAuthModule;
public class TomcatAuthConfig implements ServerAuthConfig {
@@ -36,12 +37,15 @@ public class TomcatAuthConfig implements
private String appContext;
private CallbackHandler handler;
private TomcatServerAuthContext tomcatServerAuthContext;
+ private Realm realm;
- public TomcatAuthConfig(String layer, String appContext, CallbackHandler
callbackHandler) {
+ public TomcatAuthConfig(String layer, String appContext, CallbackHandler
callbackHandler,
+ Realm realm) {
this.messageLayer = layer;
this.appContext = appContext;
this.handler = callbackHandler;
+ this.realm = realm;
}
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfigProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfigProvider.java?rev=1687011&r1=1687010&r2=1687011&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfigProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfigProvider.java
Tue Jun 23 09:45:34 2015
@@ -25,16 +25,24 @@ import javax.security.auth.message.confi
import javax.security.auth.message.config.ClientAuthConfig;
import javax.security.auth.message.config.ServerAuthConfig;
+import org.apache.catalina.Realm;
+
public class TomcatAuthConfigProvider implements AuthConfigProvider {
private Map<String, String> providerProperties;
private ServerAuthConfig serverAuthConfig;
+ private Realm realm;
public TomcatAuthConfigProvider() {
}
+ public TomcatAuthConfigProvider(Realm realm) {
+ this.realm = realm;
+ }
+
+
public TomcatAuthConfigProvider(Map<String, String> properties,
AuthConfigFactory factory) {
this.providerProperties = properties;
if (factory != null) {
@@ -54,7 +62,7 @@ public class TomcatAuthConfigProvider im
public synchronized ServerAuthConfig getServerAuthConfig(String layer,
String appContext,
CallbackHandler handler) throws AuthException {
if (this.serverAuthConfig == null) {
- this.serverAuthConfig = new TomcatAuthConfig(layer, appContext,
handler);
+ this.serverAuthConfig = new TomcatAuthConfig(layer, appContext,
handler, realm);
}
return this.serverAuthConfig;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1687011&r1=1687010&r2=1687011&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jun 23
09:45:34 2015
@@ -452,7 +452,8 @@ public class ContextConfig implements Li
*/
private JaspicAuthenticator configureDefaultJaspicAuthModules() {
AuthConfigFactory authConfigFactory = AuthConfigFactory.getFactory();
- authConfigFactory.registerConfigProvider(new
TomcatAuthConfigProvider(),
+ TomcatAuthConfigProvider provider = new
TomcatAuthConfigProvider(context.getRealm());
+ authConfigFactory.registerConfigProvider(provider,
JaspicAuthenticator.MESSAGE_LAYER, null, "Tomcat Jaspic");
return new JaspicAuthenticator();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
