Author: remm
Date: Fri Oct 23 10:58:26 2015
New Revision: 1710170
URL: http://svn.apache.org/viewvc?rev=1710170&view=rev
Log:
Add an empty non login, add the modules to the list, cleanup.
Added:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/NonLoginAuthModule.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
tomcat/trunk/java/org/apache/catalina/startup/Authenticators.properties
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicBasicAuthenticator.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=1710170&r1=1710169&r2=1710170&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
Fri Oct 23 10:58:26 2015
@@ -31,6 +31,9 @@ import org.apache.catalina.Realm;
import
org.apache.catalina.authenticator.jaspic.provider.modules.BasicAuthModule;
import
org.apache.catalina.authenticator.jaspic.provider.modules.DigestAuthModule;
import
org.apache.catalina.authenticator.jaspic.provider.modules.FormAuthModule;
+import
org.apache.catalina.authenticator.jaspic.provider.modules.NonLoginAuthModule;
+import org.apache.catalina.authenticator.jaspic.provider.modules.SSLAuthModule;
+import
org.apache.catalina.authenticator.jaspic.provider.modules.SpnegoAuthModule;
import
org.apache.catalina.authenticator.jaspic.provider.modules.TomcatAuthModule;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.res.StringManager;
@@ -123,20 +126,22 @@ public class TomcatAuthConfig implements
private TomcatAuthModule getModule() throws AuthException {
String authMethod = getAuthMethod();
switch (authMethod) {
- case "BASIC": {
+ case "BASIC":
return new BasicAuthModule(context);
- }
- case "DIGEST": {
+ case "DIGEST":
return new DigestAuthModule(context);
- }
- case "FORM": {
+ case "FORM":
return new FormAuthModule(context);
- }
- default: {
+ case "NONE":
+ return new NonLoginAuthModule(context);
+ case "SPNEGO":
+ return new SpnegoAuthModule(context);
+ case "CLIENT-CERT":
+ return new SSLAuthModule(context);
+ default:
throw new AuthException(
sm.getString("authenticator.jaspic.unknownAuthType",
authMethod));
}
- }
}
Added:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/NonLoginAuthModule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/NonLoginAuthModule.java?rev=1710170&view=auto
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/NonLoginAuthModule.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/NonLoginAuthModule.java
Fri Oct 23 10:58:26 2015
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.authenticator.jaspic.provider.modules;
+
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.message.AuthException;
+import javax.security.auth.message.AuthStatus;
+import javax.security.auth.message.MessageInfo;
+import javax.security.auth.message.MessagePolicy;
+
+import org.apache.catalina.Context;
+
+public class NonLoginAuthModule extends TomcatAuthModule {
+
+ public NonLoginAuthModule(Context context) {
+ super(context);
+ }
+
+
+ @Override
+ public void initializeModule(MessagePolicy requestPolicy, MessagePolicy
responsePolicy,
+ CallbackHandler handler, Map<String, String> options) throws
AuthException {
+ }
+
+
+ @Override
+ public AuthStatus validateRequest(MessageInfo messageInfo, Subject
clientSubject,
+ Subject serviceSubject) throws AuthException {
+ return AuthStatus.SUCCESS;
+ }
+
+}
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Authenticators.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Authenticators.properties?rev=1710170&r1=1710169&r2=1710170&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Authenticators.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Authenticators.properties Fri
Oct 23 10:58:26 2015
@@ -19,4 +19,3 @@ DIGEST=org.apache.catalina.authenticator
FORM=org.apache.catalina.authenticator.FormAuthenticator
NONE=org.apache.catalina.authenticator.NonLoginAuthenticator
SPNEGO=org.apache.catalina.authenticator.SpnegoAuthenticator
-JASPIC-BASIC=org.apache.catalina.authenticator.jaspic.JaspicAuthenticator
\ No newline at end of file
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicBasicAuthenticator.java?rev=1710170&r1=1710169&r2=1710170&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicBasicAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicBasicAuthenticator.java
Fri Oct 23 10:58:26 2015
@@ -63,7 +63,7 @@ public class TestJaspicBasicAuthenticato
super.setUp();
Tomcat tomcat = getTomcatInstance();
- Context ctxt = tomcat.addContext("/", null);
+ Context ctxt = tomcat.addContext("", null);
// Add protected servlet
Tomcat.addServlet(ctxt, "TesterServlet", new TesterServlet());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
