You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/06/09 16:45:24 UTC
svn commit: r1684440 -
/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Author: markt
Date: Tue Jun 9 14:45:24 2015
New Revision: 1684440
URL: http://svn.apache.org/r1684440
Log:
Revert original line lengths patch - it included refactoring that did not pass review
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1684440&r1=1684439&r2=1684440&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java Tue Jun 9 14:45:24 2015
@@ -16,11 +16,7 @@
*/
package javax.security.auth.message.config;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.Security;
import java.util.Map;
import javax.security.auth.AuthPermission;
@@ -28,7 +24,7 @@ import javax.security.auth.AuthPermissio
public abstract class AuthConfigFactory {
public static final String DEFAULT_FACTORY_SECURITY_PROPERTY = "authconfigprovider.factory";
- private static final String DEFAULT_JASPI_AUTH_CONFIG_FACTORY_IMPL = "org.apache.geronimo.components.jaspi.AuthConfigFactoryImpl";
+ private static final String DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL = "org.apache.geronimo.components.jaspi.AuthConfigFactoryImpl";
private static AuthConfigFactory factory;
private static ClassLoader contextClassLoader;
@@ -49,15 +45,25 @@ public abstract class AuthConfigFactory
sm.checkPermission(new AuthPermission("getAuthConfigFactory"));
}
if (factory == null) {
- final String className = getFactoryClassName();
+ String className = java.security.AccessController
+ .doPrivileged(new java.security.PrivilegedAction<String>() {
+ @Override
+ public String run() {
+ return java.security.Security.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
+ }
+ });
+ if (className == null) {
+ className = DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL;
+ }
try {
- return AccessController
- .doPrivileged(new PrivilegedExceptionAction<AuthConfigFactory>() {
+ final String finalClassName = className;
+ factory = java.security.AccessController
+ .doPrivileged(new java.security.PrivilegedExceptionAction<AuthConfigFactory>() {
@Override
- public AuthConfigFactory run() throws ClassNotFoundException,
- InstantiationException, IllegalAccessException {
+ public AuthConfigFactory run() throws ClassNotFoundException, InstantiationException,
+ IllegalAccessException {
// TODO Review this
- Class<?> clazz = Class.forName(className, true, contextClassLoader);
+ Class<?> clazz = Class.forName(finalClassName, true, contextClassLoader);
return (AuthConfigFactory) clazz.newInstance();
}
});
@@ -66,27 +72,14 @@ public abstract class AuthConfigFactory
if (inner instanceof InstantiationException) {
throw (SecurityException) new SecurityException("AuthConfigFactory error:"
+ inner.getCause().getMessage()).initCause(inner.getCause());
+ } else {
+ throw (SecurityException) new SecurityException("AuthConfigFactory error: " + inner).initCause(inner);
}
- throw (SecurityException) new SecurityException("AuthConfigFactory error: " + inner)
- .initCause(inner);
}
}
return factory;
}
- private static String getFactoryClassName() {
- String className = AccessController.doPrivileged(new PrivilegedAction<String>() {
- @Override
- public String run() {
- return Security.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
- }
- });
- if (className != null) {
- return className;
- }
- return DEFAULT_JASPI_AUTH_CONFIG_FACTORY_IMPL;
- }
-
public static void setFactory(AuthConfigFactory factory) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org