Author: markt
Date: Tue Feb 14 09:23:57 2017
New Revision: 1782934
URL: http://svn.apache.org/viewvc?rev=1782934&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60694
Prevent NPE during authentication when no JASPIC AuthConfigFactory is available.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1782934&r1=1782933&r2=1782934&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Feb 14 09:23:57 2017
@@ -1194,14 +1194,21 @@ public abstract class AuthenticatorBase
return provider.orElse(null);
}
+
private Optional<AuthConfigProvider> findJaspicProvider() {
AuthConfigFactory factory = AuthConfigFactory.getFactory();
- Optional<AuthConfigProvider> provider =
- Optional.ofNullable(factory.getConfigProvider("HttpServlet",
jaspicAppContextID, this));
+ Optional<AuthConfigProvider> provider;
+ if (factory == null) {
+ provider = Optional.empty();
+ } else {
+ provider = Optional.ofNullable(
+ factory.getConfigProvider("HttpServlet",
jaspicAppContextID, this));
+ }
jaspicProvider = provider;
return provider;
}
+
@Override
public void notify(String layer, String appContext) {
findJaspicProvider();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1782934&r1=1782933&r2=1782934&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb 14 09:23:57 2017
@@ -80,6 +80,10 @@
code. (markt)
</fix>
<fix>
+ <bug>60694</bug>: Prevent NPE during authentication when no JASPIC
+ <code>AuthConfigFactory</code> is available. (markt)
+ </fix>
+ <fix>
<bug>60720</bug>: Replace "WWW-Authenticate" literal with static final
AUTH_HEADER_NAME in SpnegoAuthenticator. Patch provided by Michael
Osipov. (violetagg)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
