Author: markt
Date: Tue Jun 23 11:15:27 2015
New Revision: 1687027
URL: http://svn.apache.org/r1687027
Log:
Fix i18n for unknown JASPIC authentication type
Patch by fjodorver
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatServerAuthContext.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties?rev=1687027&r1=1687026&r2=1687027&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
Tue Jun 23 11:15:27 2015
@@ -15,3 +15,4 @@
authenticator.jaspic.unauthorized=Cannot authenticate with the provided
credentials
authenticator.jaspic.unknownCallback=Unknown JASPIC callback: [{0}]
+authenticator.jaspic.unknownAuthType=Unknown authentication type: [{0}]
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatServerAuthContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatServerAuthContext.java?rev=1687027&r1=1687026&r2=1687027&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatServerAuthContext.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatServerAuthContext.java
Tue Jun 23 11:15:27 2015
@@ -31,12 +31,15 @@ import javax.security.auth.message.modul
import org.apache.catalina.authenticator.jaspic.MessageInfoImpl;
import
org.apache.catalina.authenticator.jaspic.provider.modules.TomcatAuthModule;
+import org.apache.tomcat.util.res.StringManager;
/**
* This class contains references to different JASPIC modules.
*/
public class TomcatServerAuthContext implements ServerAuthContext {
+ protected static final StringManager sm =
StringManager.getManager(TomcatServerAuthContext.class);
+
private Map<String, ServerAuthModule> serverAuthModules = new HashMap<>();
@@ -85,7 +88,8 @@ public class TomcatServerAuthContext imp
String authenticationType = (String)
properties.get(MessageInfoImpl.AUTH_METHOD);
ServerAuthModule module = serverAuthModules.get(authenticationType);
if (module == null) {
- throw new AuthException("Unknown auth module");// TODO message i18n
+ throw new
AuthException(sm.getString("authenticator.jaspic.unknownAuthType",
+ authenticationType));
}
return module;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
