Author: markt Date: Wed Jun 10 09:25:25 2015 New Revision: 1684613 URL: http://svn.apache.org/r1684613 Log: Re-order methods in JASPIC API classes to align with order used in reference implementation make it easier to check for differences using javap Patch provided by fjodorver
Modified: tomcat/trunk/java/javax/security/auth/message/AuthStatus.java tomcat/trunk/java/javax/security/auth/message/ClientAuth.java tomcat/trunk/java/javax/security/auth/message/MessageInfo.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/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/callback/TrustStoreCallback.java tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.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/AuthStatus.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/AuthStatus.java?rev=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/AuthStatus.java (original) +++ tomcat/trunk/java/javax/security/auth/message/AuthStatus.java Wed Jun 10 09:25:25 2015 @@ -18,11 +18,11 @@ package javax.security.auth.message; public class AuthStatus { + public static final AuthStatus SUCCESS = new AuthStatus("SUCCESS"); public static final AuthStatus FAILURE = new AuthStatus("FAILURE"); - public static final AuthStatus SEND_CONTINUE = new AuthStatus("SEND_CONTINUE"); - public static final AuthStatus SEND_FAILURE = new AuthStatus("SEND_FAILURE"); public static final AuthStatus SEND_SUCCESS = new AuthStatus("SEND_SUCCESS"); - public static final AuthStatus SUCCESS = new AuthStatus("SUCCESS"); + public static final AuthStatus SEND_FAILURE = new AuthStatus("SEND_FAILURE"); + public static final AuthStatus SEND_CONTINUE = new AuthStatus("SEND_CONTINUE"); private final String name; 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/ClientAuth.java (original) +++ tomcat/trunk/java/javax/security/auth/message/ClientAuth.java Wed Jun 10 09:25:25 2015 @@ -20,10 +20,11 @@ import javax.security.auth.Subject; public interface ClientAuth { - void cleanSubject(MessageInfo messageInfo, Subject subject) throws AuthException; - AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) throws AuthException; AuthStatus validateResponse(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) throws AuthException; + + void cleanSubject(MessageInfo messageInfo, Subject subject) throws AuthException; } + Modified: tomcat/trunk/java/javax/security/auth/message/MessageInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/MessageInfo.java?rev=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/MessageInfo.java (original) +++ tomcat/trunk/java/javax/security/auth/message/MessageInfo.java Wed Jun 10 09:25:25 2015 @@ -20,9 +20,6 @@ import java.util.Map; public interface MessageInfo { - @SuppressWarnings("rawtypes") // JASPIC API uses raw types - Map getMap(); - Object getRequestMessage(); Object getResponseMessage(); @@ -30,4 +27,7 @@ public interface MessageInfo { void setRequestMessage(Object request); void setResponseMessage(Object response); + + @SuppressWarnings("rawtypes") // JASPIC API uses raw types + Map getMap(); } 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/MessagePolicy.java (original) +++ tomcat/trunk/java/javax/security/auth/message/MessagePolicy.java Wed Jun 10 09:25:25 2015 @@ -30,6 +30,10 @@ public class MessagePolicy { this.mandatory = mandatory; } + public boolean isMandatory() { + return mandatory; + } + public TargetPolicy[] getTargetPolicies() { if (targetPolicies.length == 0) { return null; @@ -37,15 +41,11 @@ public class MessagePolicy { return targetPolicies; } - public boolean isMandatory() { - return mandatory; - } - public static interface ProtectionPolicy { + static String AUTHENTICATE_SENDER = "#authenticateSender"; static String AUTHENTICATE_CONTENT = "#authenticateContent"; static String AUTHENTICATE_RECIPIENT = "#authenticateRecipient"; - static String AUTHENTICATE_SENDER = "#authenticateSender"; String getID(); } @@ -54,9 +54,9 @@ public class MessagePolicy { Object get(MessageInfo messageInfo); - void put(MessageInfo messageInfo, Object data); - void remove(MessageInfo messageInfo); + + void put(MessageInfo messageInfo, Object data); } public static class TargetPolicy { 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/ServerAuth.java (original) +++ tomcat/trunk/java/javax/security/auth/message/ServerAuth.java Wed Jun 10 09:25:25 2015 @@ -20,10 +20,10 @@ import javax.security.auth.Subject; public interface ServerAuth { - void cleanSubject(MessageInfo messageInfo, Subject subject) throws AuthException; + AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, + Subject serviceSubject) throws AuthException; AuthStatus secureResponse(MessageInfo messageInfo, Subject serviceSubject) throws AuthException; - AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, - Subject serviceSubject) throws AuthException; + void cleanSubject(MessageInfo messageInfo, Subject subject) throws AuthException; } 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java Wed Jun 10 09:25:25 2015 @@ -28,11 +28,14 @@ public class CertStoreCallback implement private CertStore certStore; - public CertStore getCertStore() { - return certStore; + public CertStoreCallback() { } public void setCertStore(CertStore certStore) { this.certStore = certStore; } + + public CertStore getCertStore() { + return certStore; + } } 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java Wed Jun 10 09:25:25 2015 @@ -55,11 +55,11 @@ public class PasswordValidationCallback password = new char[0]; } - public boolean getResult() { - return result; - } - public void setResult(boolean result) { this.result = result; } + + public boolean getResult() { + return result; + } } 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java Wed Jun 10 09:25:25 2015 @@ -43,17 +43,17 @@ public class PrivateKeyCallback implemen return request; } - public Certificate[] getChain() { - return chain; + public void setKey(PrivateKey key, Certificate[] chain) { + this.key = key; + this.chain = chain; } public PrivateKey getKey() { return key; } - public void setKey(PrivateKey key, Certificate[] chain) { - this.key = key; - this.chain = chain; + public Certificate[] getChain() { + return chain; } public static interface Request { @@ -76,7 +76,6 @@ public class PrivateKeyCallback implemen private final byte[] digest; private final String algorithm; - public DigestRequest(byte[] digest, String algorithm) { this.digest = digest; this.algorithm = algorithm; 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java Wed Jun 10 09:25:25 2015 @@ -36,14 +36,14 @@ public class SecretKeyCallback implement return request; } - public SecretKey getKey() { - return key; - } - public void setKey(SecretKey key) { this.key = key; } + public SecretKey getKey() { + return key; + } + public static interface Request { } Modified: tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java?rev=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java Wed Jun 10 09:25:25 2015 @@ -28,11 +28,11 @@ public class TrustStoreCallback implemen private KeyStore trustStore; - public KeyStore getTrustStore() { - return trustStore; - } - public void setTrustStore(KeyStore trustStore) { this.trustStore = trustStore; } + + public KeyStore getTrustStore() { + return trustStore; + } } Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java?rev=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java (original) +++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java Wed Jun 10 09:25:25 2015 @@ -20,13 +20,13 @@ import javax.security.auth.message.Messa public interface AuthConfig { + String getMessageLayer(); + String getAppContext(); String getAuthContextID(MessageInfo messageInfo) throws IllegalArgumentException; - String getMessageLayer(); + void refresh(); boolean isProtected(); - - void refresh(); } 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java (original) +++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java Wed Jun 10 09:25:25 2015 @@ -43,7 +43,10 @@ public abstract class AuthConfigFactory }); } - public static AuthConfigFactory getFactory() { + public AuthConfigFactory() { + } + + public static synchronized AuthConfigFactory getFactory() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(new AuthPermission("getAuthConfigFactory")); @@ -84,7 +87,7 @@ public abstract class AuthConfigFactory return factory; } - public static void setFactory(AuthConfigFactory factory) { + public static synchronized void setFactory(AuthConfigFactory factory) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(new AuthPermission("setAuthConfigFactory")); @@ -92,39 +95,35 @@ public abstract class AuthConfigFactory AuthConfigFactory.factory = factory; } + public abstract AuthConfigProvider getConfigProvider(String layer, String appContext, + RegistrationListener listener); - public AuthConfigFactory() { - } + @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(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 AuthConfigProvider getConfigProvider(String layer, String appContext, - RegistrationListener listener); + public abstract String[] getRegistrationIDs(AuthConfigProvider provider); public abstract RegistrationContext getRegistrationContext(String registrationID); - public abstract String[] getRegistrationIDs(AuthConfigProvider provider); - public abstract void refresh(); - public abstract String registerConfigProvider(AuthConfigProvider provider, String layer, - String appContext, String description); - - @SuppressWarnings("rawtypes") // JASPIC API uses raw types - public abstract String registerConfigProvider(String className, Map properties, String layer, - String appContext, String description); - - public abstract boolean removeRegistration(String registrationID); - public static interface RegistrationContext { + String getMessageLayer(); + String getAppContext(); String getDescription(); - String getMessageLayer(); - boolean isPersistent(); } } 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java (original) +++ tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java Wed Jun 10 09:25:25 2015 @@ -26,9 +26,9 @@ import javax.security.auth.message.Messa 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; + + @SuppressWarnings("rawtypes") // JASPIC API uses raw types + Class[] getSupportedMessageTypes(); } 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=1684613&r1=1684612&r2=1684613&view=diff ============================================================================== --- tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java (original) +++ tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java Wed Jun 10 09:25:25 2015 @@ -26,9 +26,9 @@ import javax.security.auth.message.Serve public interface ServerAuthModule extends ServerAuth { @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; + + @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