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:37:53 UTC
svn commit: r1684438 - in /tomcat/trunk/java/javax/security/auth/message: ./
callback/ config/ module/
Author: markt
Date: Tue Jun 9 14:37:53 2015
New Revision: 1684438
URL: http://svn.apache.org/r1684438
Log:
Line lengths
Patch by fjodorver
Modified:
tomcat/trunk/java/javax/security/auth/message/ClientAuth.java
tomcat/trunk/java/javax/security/auth/message/MessagePolicy.java
tomcat/trunk/java/javax/security/auth/message/ServerAuth.java
tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigProvider.java
tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
Modified: tomcat/trunk/java/javax/security/auth/message/ClientAuth.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/ClientAuth.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/ClientAuth.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/ClientAuth.java Tue Jun 9 14:37:53 2015
@@ -24,5 +24,6 @@ public interface ClientAuth {
AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) throws AuthException;
- AuthStatus validateResponse(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) throws AuthException;
+ AuthStatus validateResponse(MessageInfo messageInfo, Subject clientSubject,
+ Subject serviceSubject) throws AuthException;
}
Modified: tomcat/trunk/java/javax/security/auth/message/MessagePolicy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/MessagePolicy.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/MessagePolicy.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/MessagePolicy.java Tue Jun 9 14:37:53 2015
@@ -21,7 +21,8 @@ public class MessagePolicy {
private final TargetPolicy[] targetPolicies;
private final boolean mandatory;
- public MessagePolicy(TargetPolicy[] targetPolicies, boolean mandatory) throws IllegalArgumentException {
+ public MessagePolicy(TargetPolicy[] targetPolicies, boolean mandatory)
+ throws IllegalArgumentException {
if (targetPolicies == null) {
throw new IllegalArgumentException("targetPolicies is null");
}
@@ -63,7 +64,8 @@ public class MessagePolicy {
private final Target[] targets;
private final ProtectionPolicy protectionPolicy;
- public TargetPolicy(Target[] targets, ProtectionPolicy protectionPolicy) throws IllegalArgumentException {
+ public TargetPolicy(Target[] targets, ProtectionPolicy protectionPolicy)
+ throws IllegalArgumentException {
if (protectionPolicy == null) {
throw new IllegalArgumentException("protectionPolicy is null");
}
Modified: tomcat/trunk/java/javax/security/auth/message/ServerAuth.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/ServerAuth.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/ServerAuth.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/ServerAuth.java Tue Jun 9 14:37:53 2015
@@ -24,5 +24,6 @@ public interface ServerAuth {
AuthStatus secureResponse(MessageInfo messageInfo, Subject serviceSubject) throws AuthException;
- AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) throws AuthException;
+ AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject,
+ Subject serviceSubject) throws AuthException;
}
Modified: tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java Tue Jun 9 14:37:53 2015
@@ -22,7 +22,8 @@ import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
/**
- * Callback that enables an authentication module to inform the runtime of the call principal or name of the caller principal.
+ * Callback that enables an authentication module to inform the runtime of the
+ * call principal or name of the caller principal.
*/
public class CallerPrincipalCallback implements Callback {
Modified: tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java Tue Jun 9 14:37:53 2015
@@ -21,7 +21,8 @@ import java.security.cert.CertStore;
import javax.security.auth.callback.Callback;
/**
- * Callback that enables a runtime to inform authentication modules of the CertStore to use.
+ * Callback that enables a runtime to inform authentication modules of the
+ * CertStore to use.
*/
public class CertStoreCallback implements Callback {
Modified: tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java Tue Jun 9 14:37:53 2015
@@ -23,8 +23,8 @@ import javax.security.auth.callback.Call
/**
- * Callback that enables an authentication module to supply a username and password (to a runtime?) and determine if
- * the result of validation.
+ * Callback that enables an authentication module to supply a user name and
+ * password (to a runtime?) and determine if the result of validation.
*/
public class PasswordValidationCallback implements Callback {
Modified: tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java Tue Jun 9 14:37:53 2015
@@ -24,9 +24,10 @@ import javax.security.auth.callback.Call
import javax.security.auth.x500.X500Principal;
/**
- * Callback that enables an authentication module to request a certificate chain and private key from the runtime.
- * The information specifying the chain and key may be an alias, a digest, a subject key, or an issuer ID.
- * Other request types may be supported.
+ * Callback that enables an authentication module to request a certificate chain
+ * and private key from the runtime. The information specifying the chain and
+ * key may be an alias, a digest, a subject key, or an issuer ID. Other request
+ * types may be supported.
*/
public class PrivateKeyCallback implements Callback {
Modified: tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java Tue Jun 9 14:37:53 2015
@@ -20,8 +20,8 @@ import javax.crypto.SecretKey;
import javax.security.auth.callback.Callback;
/**
- * A callback enabling an authentication module to request a secret key from the runtime, by supplying an alias.
- * Other request types may also be supported.
+ * A callback enabling an authentication module to request a secret key from the
+ * runtime, by supplying an alias. Other request types may also be supported.
*/
public class SecretKeyCallback implements Callback {
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=1684438&r1=1684437&r2=1684438&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:37:53 2015
@@ -16,7 +16,11 @@
*/
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;
@@ -24,7 +28,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_AUTHCONFIGFACTORYIMPL = "org.apache.geronimo.components.jaspi.AuthConfigFactoryImpl";
+ private static final String DEFAULT_JASPI_AUTH_CONFIG_FACTORY_IMPL = "org.apache.geronimo.components.jaspi.AuthConfigFactoryImpl";
private static AuthConfigFactory factory;
private static ClassLoader contextClassLoader;
@@ -45,25 +49,15 @@ public abstract class AuthConfigFactory
sm.checkPermission(new AuthPermission("getAuthConfigFactory"));
}
if (factory == null) {
- 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;
- }
+ final String className = getFactoryClassName();
try {
- final String finalClassName = className;
- factory = java.security.AccessController
- .doPrivileged(new java.security.PrivilegedExceptionAction<AuthConfigFactory>() {
+ return AccessController
+ .doPrivileged(new PrivilegedExceptionAction<AuthConfigFactory>() {
@Override
- public AuthConfigFactory run() throws ClassNotFoundException, InstantiationException,
- IllegalAccessException {
+ public AuthConfigFactory run() throws ClassNotFoundException,
+ InstantiationException, IllegalAccessException {
// TODO Review this
- Class<?> clazz = Class.forName(finalClassName, true, contextClassLoader);
+ Class<?> clazz = Class.forName(className, true, contextClassLoader);
return (AuthConfigFactory) clazz.newInstance();
}
});
@@ -72,14 +66,27 @@ 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) {
Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfigProvider.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigProvider.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigProvider.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigProvider.java Tue Jun 9 14:37:53 2015
@@ -21,10 +21,11 @@ import javax.security.auth.message.AuthE
public interface AuthConfigProvider {
- ClientAuthConfig getClientAuthConfig(String layer, String appContext, CallbackHandler handler) throws AuthException, SecurityException;
+ ClientAuthConfig getClientAuthConfig(String layer, String appContext, CallbackHandler handler)
+ throws AuthException, SecurityException;
- ServerAuthConfig getServerAuthConfig(String layer, String appContext, CallbackHandler handler) throws AuthException, SecurityException;
+ ServerAuthConfig getServerAuthConfig(String layer, String appContext, CallbackHandler handler)
+ throws AuthException, SecurityException;
void refresh();
}
-
Modified: tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java Tue Jun 9 14:37:53 2015
@@ -21,9 +21,9 @@ import java.util.Map;
import javax.security.auth.Subject;
import javax.security.auth.message.AuthException;
-
public interface ClientAuthConfig extends AuthConfig {
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
- ClientAuthContext getAuthContext(String authContextID, Subject clientSubject, Map properties) throws AuthException;
+ ClientAuthContext getAuthContext(String authContextID, Subject clientSubject, Map properties)
+ throws AuthException;
}
Modified: tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java Tue Jun 9 14:37:53 2015
@@ -23,12 +23,12 @@ import javax.security.auth.message.AuthE
import javax.security.auth.message.ClientAuth;
import javax.security.auth.message.MessagePolicy;
-
public interface ClientAuthModule extends ClientAuth {
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
Class[] getSupportedMessageTypes();
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
- void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException;
+ void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy,
+ CallbackHandler handler, Map options) throws AuthException;
}
Modified: tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java?rev=1684438&r1=1684437&r2=1684438&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java Tue Jun 9 14:37:53 2015
@@ -29,5 +29,6 @@ public interface ServerAuthModule extend
Class[] getSupportedMessageTypes();
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
- void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException;
+ void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy,
+ CallbackHandler handler, Map options) throws AuthException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org