This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5a570986850c2bdfd4cbc050e4e651720a9e0a62
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 14 14:18:48 2023 +0100
Code clean-up - no functional change
---
java/javax/security/auth/message/ClientAuth.java | 4 +--
java/javax/security/auth/message/ServerAuth.java | 4 +--
.../message/callback/CallerPrincipalCallback.java | 4 +--
.../auth/message/callback/CertStoreCallback.java | 3 +-
.../message/callback/GroupPrincipalCallback.java | 3 +-
.../callback/PasswordValidationCallback.java | 4 +--
.../auth/message/callback/PrivateKeyCallback.java | 5 ++--
.../auth/message/callback/SecretKeyCallback.java | 4 +--
.../auth/message/callback/TrustStoreCallback.java | 3 +-
.../auth/message/config/AuthConfigFactory.java | 34 +++++++++-------------
.../auth/message/config/AuthConfigProvider.java | 6 ++--
.../auth/message/config/ClientAuthConfig.java | 3 +-
.../auth/message/config/ServerAuthConfig.java | 3 +-
.../auth/message/module/ClientAuthModule.java | 4 +--
.../auth/message/module/ServerAuthModule.java | 4 +--
15 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/java/javax/security/auth/message/ClientAuth.java
b/java/javax/security/auth/message/ClientAuth.java
index a537ef2a17..a8f9a77ae7 100644
--- a/java/javax/security/auth/message/ClientAuth.java
+++ b/java/javax/security/auth/message/ClientAuth.java
@@ -22,8 +22,8 @@ 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;
void cleanSubject(MessageInfo messageInfo, Subject subject) throws
AuthException;
}
diff --git a/java/javax/security/auth/message/ServerAuth.java
b/java/javax/security/auth/message/ServerAuth.java
index bb404f558b..23f5c66ecb 100644
--- a/java/javax/security/auth/message/ServerAuth.java
+++ b/java/javax/security/auth/message/ServerAuth.java
@@ -20,8 +20,8 @@ import javax.security.auth.Subject;
public interface ServerAuth {
- AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject,
- Subject serviceSubject) throws AuthException;
+ AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject,
Subject serviceSubject)
+ throws AuthException;
AuthStatus secureResponse(MessageInfo messageInfo, Subject serviceSubject)
throws AuthException;
diff --git
a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
b/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
index 2c7010f680..803856d67b 100644
--- a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
+++ b/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
@@ -22,8 +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 {
diff --git a/java/javax/security/auth/message/callback/CertStoreCallback.java
b/java/javax/security/auth/message/callback/CertStoreCallback.java
index 13734e8ce0..963d7b29dc 100644
--- a/java/javax/security/auth/message/callback/CertStoreCallback.java
+++ b/java/javax/security/auth/message/callback/CertStoreCallback.java
@@ -21,8 +21,7 @@ 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 {
diff --git
a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
b/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
index f44c04629a..4261f9d791 100644
--- a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
+++ b/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
@@ -20,8 +20,7 @@ import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
/**
- * Callback that enables an authentication module to inform the runtime of the
- * groups a user is in.
+ * Callback that enables an authentication module to inform the runtime of the
groups a user is in.
*/
public class GroupPrincipalCallback implements Callback {
diff --git
a/java/javax/security/auth/message/callback/PasswordValidationCallback.java
b/java/javax/security/auth/message/callback/PasswordValidationCallback.java
index 2eaad2d898..9cdbc081ad 100644
--- a/java/javax/security/auth/message/callback/PasswordValidationCallback.java
+++ b/java/javax/security/auth/message/callback/PasswordValidationCallback.java
@@ -22,8 +22,8 @@ import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
/**
- * Callback that enables an authentication module to supply a user name 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 {
diff --git a/java/javax/security/auth/message/callback/PrivateKeyCallback.java
b/java/javax/security/auth/message/callback/PrivateKeyCallback.java
index 473450384b..d4dbd89303 100644
--- a/java/javax/security/auth/message/callback/PrivateKeyCallback.java
+++ b/java/javax/security/auth/message/callback/PrivateKeyCallback.java
@@ -24,9 +24,8 @@ import javax.security.auth.callback.Callback;
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
+ * 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 {
diff --git a/java/javax/security/auth/message/callback/SecretKeyCallback.java
b/java/javax/security/auth/message/callback/SecretKeyCallback.java
index 0a88a5ca4f..a0122d01f9 100644
--- a/java/javax/security/auth/message/callback/SecretKeyCallback.java
+++ b/java/javax/security/auth/message/callback/SecretKeyCallback.java
@@ -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 {
diff --git a/java/javax/security/auth/message/callback/TrustStoreCallback.java
b/java/javax/security/auth/message/callback/TrustStoreCallback.java
index 8312e44fd9..8bc1d943a8 100644
--- a/java/javax/security/auth/message/callback/TrustStoreCallback.java
+++ b/java/javax/security/auth/message/callback/TrustStoreCallback.java
@@ -21,8 +21,7 @@ import java.security.KeyStore;
import javax.security.auth.callback.Callback;
/**
- * A Callback enabling an authentication module to request a truststore from
the
- * runtime.
+ * A Callback enabling an authentication module to request a truststore from
the runtime.
*/
public class TrustStoreCallback implements Callback {
diff --git a/java/javax/security/auth/message/config/AuthConfigFactory.java
b/java/javax/security/auth/message/config/AuthConfigFactory.java
index b87d66b3e1..6a235b7dee 100644
--- a/java/javax/security/auth/message/config/AuthConfigFactory.java
+++ b/java/javax/security/auth/message/config/AuthConfigFactory.java
@@ -27,14 +27,10 @@ import java.util.Map;
public abstract class AuthConfigFactory {
- public static final String DEFAULT_FACTORY_SECURITY_PROPERTY =
- "authconfigprovider.factory";
- public static final String GET_FACTORY_PERMISSION_NAME =
- "getProperty.authconfigprovider.factory";
- public static final String SET_FACTORY_PERMISSION_NAME =
- "setProperty.authconfigprovider.factory";
- public static final String PROVIDER_REGISTRATION_PERMISSION_NAME =
- "setProperty.authconfigfactory.provider";
+ public static final String DEFAULT_FACTORY_SECURITY_PROPERTY =
"authconfigprovider.factory";
+ public static final String GET_FACTORY_PERMISSION_NAME =
"getProperty.authconfigprovider.factory";
+ public static final String SET_FACTORY_PERMISSION_NAME =
"setProperty.authconfigprovider.factory";
+ public static final String PROVIDER_REGISTRATION_PERMISSION_NAME =
"setProperty.authconfigfactory.provider";
public static final SecurityPermission getFactorySecurityPermission =
new SecurityPermission(GET_FACTORY_PERMISSION_NAME);
@@ -63,11 +59,10 @@ public abstract class AuthConfigFactory {
if (factory == null) {
final String className = getFactoryClassName();
try {
- factory = AccessController.doPrivileged(
- new PrivilegedExceptionAction<AuthConfigFactory>()
{
+ factory = AccessController.doPrivileged(new
PrivilegedExceptionAction<AuthConfigFactory>() {
@Override
- public AuthConfigFactory run() throws
ReflectiveOperationException,
- IllegalArgumentException, SecurityException {
+ public AuthConfigFactory run()
+ throws ReflectiveOperationException,
IllegalArgumentException, SecurityException {
// Load this class with the same class loader as
used for
// this class. Note that the Thread context class
loader
// should not be used since that would trigger a
memory leak
@@ -79,8 +74,8 @@ public abstract class AuthConfigFactory {
} catch (PrivilegedActionException e) {
Exception inner = e.getException();
if (inner instanceof InstantiationException) {
- throw new SecurityException("AuthConfigFactory error:"
+
- inner.getCause().getMessage(),
inner.getCause());
+ throw new SecurityException("AuthConfigFactory error:"
+ inner.getCause().getMessage(),
+ inner.getCause());
} else {
throw new SecurityException("AuthConfigFactory error:
" + inner, inner);
}
@@ -100,16 +95,15 @@ public abstract class AuthConfigFactory {
RegistrationListener listener);
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
- public abstract String registerConfigProvider(String className, Map
properties, String layer,
- String appContext, String description);
+ public abstract String registerConfigProvider(String className, Map
properties, String layer, String appContext,
+ String description);
- public abstract String registerConfigProvider(AuthConfigProvider provider,
String layer,
- String appContext, String description);
+ public abstract String registerConfigProvider(AuthConfigProvider provider,
String layer, String appContext,
+ String description);
public abstract boolean removeRegistration(String registrationID);
- public abstract String[] detachListener(RegistrationListener listener,
String layer,
- String appContext);
+ public abstract String[] detachListener(RegistrationListener listener,
String layer, String appContext);
public abstract String[] getRegistrationIDs(AuthConfigProvider provider);
diff --git a/java/javax/security/auth/message/config/AuthConfigProvider.java
b/java/javax/security/auth/message/config/AuthConfigProvider.java
index ddde485f7b..335e617acf 100644
--- a/java/javax/security/auth/message/config/AuthConfigProvider.java
+++ b/java/javax/security/auth/message/config/AuthConfigProvider.java
@@ -21,11 +21,9 @@ import javax.security.auth.message.AuthException;
public interface AuthConfigProvider {
- ClientAuthConfig getClientAuthConfig(String layer, String appContext,
CallbackHandler handler)
- throws AuthException;
+ ClientAuthConfig getClientAuthConfig(String layer, String appContext,
CallbackHandler handler) throws AuthException;
- ServerAuthConfig getServerAuthConfig(String layer, String appContext,
CallbackHandler handler)
- throws AuthException;
+ ServerAuthConfig getServerAuthConfig(String layer, String appContext,
CallbackHandler handler) throws AuthException;
void refresh();
}
diff --git a/java/javax/security/auth/message/config/ClientAuthConfig.java
b/java/javax/security/auth/message/config/ClientAuthConfig.java
index 2c135845e4..f1a486e979 100644
--- a/java/javax/security/auth/message/config/ClientAuthConfig.java
+++ b/java/javax/security/auth/message/config/ClientAuthConfig.java
@@ -24,6 +24,5 @@ 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;
}
diff --git a/java/javax/security/auth/message/config/ServerAuthConfig.java
b/java/javax/security/auth/message/config/ServerAuthConfig.java
index de22a513d7..6c207eb4e1 100644
--- a/java/javax/security/auth/message/config/ServerAuthConfig.java
+++ b/java/javax/security/auth/message/config/ServerAuthConfig.java
@@ -24,6 +24,5 @@ import javax.security.auth.message.AuthException;
public interface ServerAuthConfig extends AuthConfig {
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
- ServerAuthContext getAuthContext(String authContextID, Subject
serviceSubject, Map properties)
- throws AuthException;
+ ServerAuthContext getAuthContext(String authContextID, Subject
serviceSubject, Map properties) throws AuthException;
}
diff --git a/java/javax/security/auth/message/module/ClientAuthModule.java
b/java/javax/security/auth/message/module/ClientAuthModule.java
index 6cb5c4ee10..c0bccfef40 100644
--- a/java/javax/security/auth/message/module/ClientAuthModule.java
+++ b/java/javax/security/auth/message/module/ClientAuthModule.java
@@ -26,8 +26,8 @@ import javax.security.auth.message.MessagePolicy;
public interface ClientAuthModule extends ClientAuth {
@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;
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
Class[] getSupportedMessageTypes();
diff --git a/java/javax/security/auth/message/module/ServerAuthModule.java
b/java/javax/security/auth/message/module/ServerAuthModule.java
index 4b3a6fb891..6e82000907 100644
--- a/java/javax/security/auth/message/module/ServerAuthModule.java
+++ b/java/javax/security/auth/message/module/ServerAuthModule.java
@@ -26,8 +26,8 @@ import javax.security.auth.message.ServerAuth;
public interface ServerAuthModule extends ServerAuth {
@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;
@SuppressWarnings("rawtypes") // JASPIC API uses raw types
Class[] getSupportedMessageTypes();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
