Trimmed trailing whitespaces
diff --git a/nucleus/security/core/src/main/java/com/iplanet/ias/security/auth/login/PasswordLoginModule.java b/nucleus/security/core/src/main/java/com/iplanet/ias/security/auth/login/PasswordLoginModule.java
index 755a2cd..762797a 100644
--- a/nucleus/security/core/src/main/java/com/iplanet/ias/security/auth/login/PasswordLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/iplanet/ias/security/auth/login/PasswordLoginModule.java
@@ -30,7 +30,7 @@
public abstract class PasswordLoginModule extends BasePasswordLoginModule {
/**
* authenticateUser calls authenticate which is implemented by the implementation of this subclass
- *
+ *
* @throws LoginException
*/
protected final void authenticateUser() throws LoginException {
@@ -49,7 +49,7 @@
/**
* Called at the end of the authenticate method by the user
- *
+ *
* @return AuthenticationStatus indicating success/failure
*/
public final AuthenticationStatus commitAuthentication(String username, char[] password, Realm theRealm, String[] groups) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java b/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java
index b1d3b70..79649a2 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java
@@ -193,10 +193,10 @@
/**
* Do not append realm name: this ensures that we dont sent "default" or "certificate" to another appserver.
- *
+ *
* // append an AT-CHAR only if realm is not null. // NOTe: In the current implementation, realm will never // be null. It is
* either "certificate" or "default".
- *
+ *
* if (realm.length() > 0) { strbuf.append(AT_CHAR); strbuf.append(realm); }
**/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseAuditModule.java
index 8d6f78b..b9a47e6 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseAuditModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseAuditModule.java
@@ -26,7 +26,7 @@
/**
* Base class that should be extended by all classes that wish to provide their own Audit support.
- *
+ *
* @author Harpreet Singh
* @version
*/
@@ -36,7 +36,7 @@
/**
* Method is invoked at server startup, during AuditModule initialization. If method returns without any exception then S1AS
* assumes that the module is ready to serve any requests.
- *
+ *
* @param props the properties for the AuditModule. These properties are defined in the domain.xml
*/
public void init(Properties props) {
@@ -45,7 +45,7 @@
/**
* Invoked post authentication request for a user in a given realm
- *
+ *
* @param user username for whom the authentication request was made
* @param realm the realm name under which the user is authenticated.
* @param success the status of the authentication
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseCertificateLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseCertificateLoginModule.java
index d359153..17cbc53 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseCertificateLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseCertificateLoginModule.java
@@ -220,7 +220,7 @@
*
* <p>
* Must be overridden to add custom functionality.
- *
+ *
* @throws LoginException on authentication failure.
*
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java
index c97b0fc..963317c 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java
@@ -263,7 +263,7 @@
/**
* Method to extract container-provided username and password
- *
+ *
* @throws javax.security.auth.login.LoginException
*/
final public void extractCredentials() throws LoginException {
@@ -318,7 +318,7 @@
* Perform authentication decision.
*
* Method returns silently on success and returns a LoginException on failure.
- *
+ *
* @throws LoginException on authentication failure.
*
*/
@@ -340,7 +340,7 @@
/**
* Used for setting the username obtained from the container internally, to be made available to the custom login module
* implementation
- *
+ *
* @param username
*/
private void setUsername(String username) {
@@ -376,7 +376,7 @@
/**
* Used for setting the password obtained from the container internally, to be made available to the custom login module
* implementation Password is preferred to be a char[] instead of a string
- *
+ *
* @param password
*/
private void setPasswordChar(char[] password) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseRealm.java
index d1e302f..509bf7a 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BaseRealm.java
@@ -196,7 +196,7 @@
/**
* Persist the realm data to permanent storage
- *
+ *
* @throws com.sun.enterprise.security.auth.realm.BadRealmException
*/
public void persist() throws BadRealmException {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java
index dead95b..1e00c91 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java
@@ -31,7 +31,7 @@
/**
* An implementation of a LoginDialog that presents a swing based GUI for querying username and password.
- *
+ *
* @author Harish Prabandham
* @author Harpreet Singh
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/IRealmManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/IRealmManager.java
index 01ae30f..f6f4f30 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/IRealmManager.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/IRealmManager.java
@@ -18,7 +18,7 @@
/**
* This is an remote interface provided to the RealmManager This allows the realms to be updated while the server is running.
- *
+ *
* @author Harpreet Singh (harpreet.singh@sun.com)
*/
public interface IRealmManager extends java.rmi.Remote {
@@ -28,7 +28,7 @@
* information and then calls this method. This then updates the realm information in an already running server. If the server is
* not running the call should not be made. This interface is obtained by looking up the <i>RealmManager</> from the Naming
* service.
- *
+ *
* @param String realmName
*/
public void refreshRealms(String realmName) throws java.rmi.RemoteException;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java
index 3636c6a..a418337 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java
@@ -28,7 +28,7 @@
/**
* This class is kept for CTS. Ideally we should move away from it. The login can be done via the following call:
- *
+ *
* <pre>
* // Initialize the ORB.
* try {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java
index 1fdf43e..ace9965 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java
@@ -205,7 +205,7 @@
/**
* New auth realm created. It is called whenever a AuthRealmEvent with action of AuthRealmEvent.ACTION_CREATE is received.
- *
+ *
* @throws AdminEventListenerException when the listener is unable to process the event.
*/
public static void authRealmCreated(AuthRealm instance) {
@@ -218,7 +218,7 @@
/**
* New auth realm created. It is called whenever a AuthRealmEvent with action of AuthRealmEvent.ACTION_CREATE is received.
- *
+ *
* @throws AdminEventListenerException when the listener is unable to process the event.
*/
public static void authRealmCreated(Config config, AuthRealm instance) {
@@ -231,7 +231,7 @@
/**
* Auth realm deleted. It is called whenever a AuthRealmEvent with action of AuthRealmEvent.ACTION_DELETE is received.
- *
+ *
* @throws AdminEventListenerException when the listener is unable to process the event.
*/
public static void authRealmDeleted(Config config, AuthRealm instance) {
@@ -252,7 +252,7 @@
/**
* Auth realm deleted. It is called whenever a AuthRealmEvent with action of AuthRealmEvent.ACTION_DELETE is received.
- *
+ *
* @throws AdminEventListenerException when the listener is unable to process the event.
*/
public static void authRealmDeleted(AuthRealm instance) {
@@ -274,7 +274,7 @@
/**
* Auth realm updated (attributes change). It is called whenever a AuthRealmEvent with action of AuthRealmEvent.ACTION_UPDATE is
* received.
- *
+ *
* @throws AdminEventListenerException when the listener is unable to process the event.
*/
public void authRealmUpdated(AuthRealm instance) {
@@ -289,7 +289,7 @@
/**
* Auth realm updated (attributes change). It is called whenever a AuthRealmEvent with action of AuthRealmEvent.ACTION_UPDATE is
* received.
- *
+ *
* @throws AdminEventListenerException when the listener is unable to process the event.
*/
public void authRealmUpdated(Config config, AuthRealm instance) {
@@ -303,7 +303,7 @@
/**
* This method will create or replace existing realm with a new one in cache.
- *
+ *
* @param event
* @exception for instance, BadRealmException, ConfigException, SynchronizationException
*/
@@ -323,7 +323,7 @@
/**
* This method will create or replace existing realm with a new one in cache.
- *
+ *
* @param event
* @exception for instance, BadRealmException, ConfigException, SynchronizationException
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java
index dd22aa1..7f1789d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java
@@ -47,7 +47,7 @@
* This class is used on the server side to represent the security context.
*
* Thread Local Storage is a concept introduced in JDK1.2.
- *
+ *
* @see java.lang.ThreadLocal
* @see java.lang.InheritableThreadLocal
*
@@ -103,7 +103,7 @@
/**
* Create a SecurityContext with given subject having DistinguishedPrincipalCredential. This is used for JMAC environment.
- *
+ *
* @param subject
*/
public SecurityContext(Subject subject) {
@@ -264,7 +264,7 @@
/**
* This method gets the SecurityContext stored in the Thread Local Store (TLS) of the current thread.
- *
+ *
* @return The current Security Context stored in TLS. It returns null if SecurityContext could not be found in the current
* thread.
*/
@@ -278,7 +278,7 @@
/**
* This method sets the SecurityContext stored in the TLS.
- *
+ *
* @param sc The Security Context that should be stored in TLS. This public static method needs to be protected such that it can
* only be called by container code. Otherwise it can be called by application code to set its subject (which the EJB security
* manager will use to create a domain combiner, and then everything the ejb does will be run as the corresponding subject.
@@ -334,7 +334,7 @@
/**
* This method returns the caller principal. This information may be redundant since the same information can be inferred by
* inspecting the Credentials of the caller.
- *
+ *
* @return The caller Principal.
*/
@Override
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
index 6d5566a..fd35d1f 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
@@ -41,7 +41,7 @@
/**
* This class extends default implementation of ServerLifecycle interface. It provides security initialization and setup for the
* server.
- *
+ *
* @author Shing Wai Chan
*/
@Service
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java
index a55a564..5a2ce2b 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java
@@ -99,7 +99,7 @@
/**
* read the secure random number from the file. If the seed is not present, the default expensive SecureRandom seed generation
* algorithm is invoked to return a new seed number
- *
+ *
* @param fname the file to be read - here secure.seed file.
*/
// private long readSecureSeed(File fname) {
@@ -131,7 +131,7 @@
/**
* write the new secure seed to the secure.seed file to speed up startup the next time the server is started.
- *
+ *
* @param fname secure.seed file
* @param seed seed the value of the 8 byte seed.
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java
index 4cdefcc..8044358 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java
@@ -27,7 +27,7 @@
public void webDeploymentStartedEvent(
@ProbeParam("appName") String appName) {
}
-
+
@Probe(name = "webDeploymentEndedEvent")
public void webDeploymentEndedEvent(
@ProbeParam("appName") String appName) {
@@ -45,7 +45,7 @@
public void webUndeploymentStartedEvent(
@ProbeParam("appName") String appName) {
}
-
+
@Probe(name = "webUndeploymentEndedEvent")
public void webUndeploymentEndedEvent(
@ProbeParam("appName") String appName) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java
index f66b1c7..346f6da 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java
@@ -37,11 +37,11 @@
//Commenting the TimeStatistics to be implemented later
/* TimeStatisticImpl deploymentTime = new TimeStatisticImpl(0, 0, 0, 0, "DeploymentTime", "milliseconds", "Deployment Time", 0, 0);
-
+
TimeStatisticImpl generationTime = new TimeStatisticImpl(0, 0, 0, 0, "GenerationTime", "milliseconds", "Generation Time", 0, 0);
-
+
TimeStatisticImpl undeploymentTime = new TimeStatisticImpl(0, 0, 0, 0, "UndeploymentTime", "milliseconds", "Undeployment Time", 0, 0);
-
+
TimeStatisticImpl removalTime = new TimeStatisticImpl(0, 0, 0, 0, "RemovalTime", "milliseconds", "Removal Time", 0, 0);*/
CountStatisticImpl secMgrCount = new CountStatisticImpl("WebSecurityManagerCount", "count", "No of Web security managers");
@@ -53,18 +53,18 @@
public TimeStatistic getDeploymentTime() {
return deploymentTime.getStatistic();
}
-
+
@ManagedAttribute(id="generationtime")
public TimeStatistic getGenerationTime() {
return generationTime.getStatistic();
}
-
+
@ManagedAttribute(id="undepolymenttime")
public TimeStatistic getUndeploymentTime() {
return undeploymentTime.getStatistic();
}
-
-
+
+
@ManagedAttribute(id="removaltime")
public TimeStatistic getRemovalTime() {
return removalTime.getStatistic();
@@ -84,10 +84,10 @@
public void webDeploymentStartedEvent(@ProbeParam("appName")String appName){
deploymentTime.setStartTime(System.currentTimeMillis());
}
-
+
@ProbeListener("glassfish:core:web:webDeploymentEndedEvent")
public void webDeploymentEndedEvent(@ProbeParam("appName")String appName){
-
+
}*/
@ProbeListener("glassfish:security:web:securityManagerCreationEvent")
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java
index 9632bae..e4dd489 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java
@@ -32,7 +32,7 @@
/**
* Adjusts the DAS configuration to turn off secure admin, as if by executing these commands:
- *
+ *
* <pre>
* {@code
@@ -71,7 +71,7 @@
/**
* Iterator which returns array elements from back to front.
- *
+ *
* @param <T>
* @param steps
* @return
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java
index df4fbc6..e680ac6 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java
@@ -48,7 +48,7 @@
* Records that secure admin is to be used and adjusts each admin listener configuration in the domain to use secure admin.
*
* The command changes the admin-listener set-up within each separate configuration as if by running these commands:
- *
+ *
* <pre>
* {@code
###
@@ -141,7 +141,7 @@
/**
* Iterator which returns array elements from front to back.
- *
+ *
* @param <T>
* @param steps
* @return
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java
index 441d5d2..2001853 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java
@@ -101,7 +101,7 @@
/**
* Work to be performed - either for enable or disable - in a step.
- *
+ *
* @param <T>
*/
interface Work<T extends Context> {
@@ -864,7 +864,7 @@
/**
* Executes the particular xxx-secure-admin command (enable or disable).
- *
+ *
* @param context
*/
@Override
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminStartupCheck.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminStartupCheck.java
index 79a7401..4caae5d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminStartupCheck.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminStartupCheck.java
@@ -29,7 +29,7 @@
* start-up performance. (Upgrades from 2.x are handled by the SecureAdminConfigUpgrade upgrade service.)
* <p>
* For 3.1.2 and later the configuration needs to include:
- *
+ *
* <pre>
* {@code
* <secure-admin special-admin-indicator="xxx">
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/Strings.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/Strings.java
index 5b95ad3..df84b17 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/Strings.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/Strings.java
@@ -21,7 +21,7 @@
/**
* Strings -- Get your Strings here. One file with Strings So one class for messing with them! Nothing in here is public
* protected. Only for use by this one java package.
- *
+ *
* @author Byron Nevins
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java
index 0a70687..7a6d82bd 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java
@@ -163,7 +163,7 @@
/**
* Add the given audit module to the list of loaded audit module. Adding the same name twice will override previous one.
- *
+ *
* @param name of auditModule
* @param am an instance of a class extending BaseAuditModule that has been successfully loaded into the system.
* @exception
@@ -203,7 +203,7 @@
/**
* Remove the audit module of given name from the loaded list.
- *
+ *
* @param name of auditModule
*/
public BaseAuditModule removeAuditModule(String name) {
@@ -222,7 +222,7 @@
/**
* Get the audit module of given name from the loaded list.
- *
+ *
* @param name of auditModule
*/
BaseAuditModule getAuditModule(String name) {
@@ -231,7 +231,7 @@
/**
* This method return auditModule with given classname and properties.
- *
+ *
* @param classname
* @param props
* @exception
@@ -256,7 +256,7 @@
/**
* logs the authentication call for all the loaded modules.
- *
+ *
* @see com.sun.appserv.security.BaseAuditModule.authentication
*/
public void authentication(final String user, final String realm, final boolean success) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatus.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatus.java
index 1f63918..28ee085 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatus.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatus.java
@@ -18,7 +18,7 @@
/**
* This interface stores the status of the authentication.
- *
+ *
* @author Harish Prabandham
*/
@@ -30,7 +30,7 @@
/**
* This method returns the status of the authentication
- *
+ *
* @return An integer value indicating the status of the authentication
*/
public int getStatus();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatusImpl.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatusImpl.java
index b1a9867..d9339b2 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatusImpl.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/AuthenticationStatusImpl.java
@@ -18,7 +18,7 @@
/**
* This class implements an AuthenticationStatus object.
- *
+ *
* @author Harish Prabandham
*/
@@ -30,7 +30,7 @@
/**
* This constructs a new AuthenticationStatus object.
- *
+ *
* @param The name of the principal
* @param The name of the realm that authenticated the principal
* @param The method used for authenticating the principal
@@ -45,7 +45,7 @@
/**
* This method returns the status of the authentication
- *
+ *
* @return An integer value indicating the status of the authentication
*/
public int getStatus() {
@@ -55,7 +55,7 @@
/**
* This method returns a byte array of zero length, since there's no continuation data needed for passphrase based
* authentication.
- *
+ *
* @return A byte array of zero length.
*/
public byte[] getContinuationData() {
@@ -65,7 +65,7 @@
/**
* This method returns a byte array of zero length, since there's no auth specific data needed for passphrase based
* authentication.
- *
+ *
* @return A byte array of zero length.
*/
public byte[] getAuthSpecificData() {
@@ -74,7 +74,7 @@
/**
* This method returns the name of realm where the authentication was performed.
- *
+ *
* @return A java.lang.String representation of the realm.
*/
public String getRealmName() {
@@ -83,7 +83,7 @@
/**
* This method returns the "method" used to perform authentication
- *
+ *
* @return A java.lang.String representation of the method used. In passphrase based authentication it returns the string
* "password".
*/
@@ -93,7 +93,7 @@
/**
* This method returns the string representation of the principal that was authenticated.
- *
+ *
* @return A java.lang.String representation of the Principal.
*/
public String getPrincipalName() {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrincipalMapper.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrincipalMapper.java
index 47043fb..bc4fc8d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrincipalMapper.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrincipalMapper.java
@@ -23,7 +23,7 @@
*
* Enables formatting of principal retrieved from message eg: P-Asserted-Identity values. eg: "Cullen Jennings"
* <sip:fluffy@cisco.com> value can be mapped/formatted to "CullenJ".
- *
+ *
* @author k.venugopal@sun.com
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/Privilege.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/Privilege.java
index 9da8bab..8fc07be 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/Privilege.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/Privilege.java
@@ -20,13 +20,13 @@
/**
* This remote interface enables the deployment tool to query the details of the Privilege.
- *
+ *
* @author Harish Prabandham
*/
public interface Privilege extends java.io.Serializable {
/**
* Returns the name of the name of the Privilege.
- *
+ *
* @return The name of the name of the Privilege.
*/
public String getName();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrivilegeImpl.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrivilegeImpl.java
index 4411100..dc0b5ab 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrivilegeImpl.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/PrivilegeImpl.java
@@ -20,7 +20,7 @@
/**
* This method provides an implementation a Privilege
- *
+ *
* @author Harish Prabandham
*/
@@ -44,7 +44,7 @@
/**
* Returns the name of the name of the Privilege.
- *
+ *
* @return The name of the name of the Privilege.
*/
public String getName() {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/RemoteObject.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/RemoteObject.java
index 161bcb0..60b1d9a 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/RemoteObject.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/RemoteObject.java
@@ -23,7 +23,7 @@
/**
* Just a Base class to make exporting remote objects a bit easier...
- *
+ *
* @author Harish Prabandham
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/TimestampValidator.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/TimestampValidator.java
index 9dfa530..9a03839 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/TimestampValidator.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/TimestampValidator.java
@@ -21,14 +21,14 @@
/**
* validate Timestamp received in messages.
- *
+ *
* @author k.venugopal@sun.com
*/
public interface TimestampValidator {
/**
* validate given time against current time.
- *
+ *
* @param created created time
* @param maxClockSkew maximum difference allowed between the system clocks of the sender and recipient.
* @param freshnessLimit maximum duration of time after which the Timestamp becomes stale
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/DigestAlgorithmParameter.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/DigestAlgorithmParameter.java
index 3447f07..30b5fef 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/DigestAlgorithmParameter.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/DigestAlgorithmParameter.java
@@ -20,7 +20,7 @@
/**
* Interface to Digest algorithm parameters
- *
+ *
* @author K.Venugopal@sun.com
*/
public interface DigestAlgorithmParameter extends AlgorithmParameterSpec {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/NestedDigestAlgoParam.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/NestedDigestAlgoParam.java
index 2ffcf31..aa08e58 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/NestedDigestAlgoParam.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/NestedDigestAlgoParam.java
@@ -20,7 +20,7 @@
/**
* Interface representing nested DigestAlgorithm parameter values
- *
+ *
* @author K.Venugopal@sun.com
*/
public interface NestedDigestAlgoParam extends DigestAlgorithmParameter {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/Password.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/Password.java
index 12488f7..1f5158d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/Password.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/digest/api/Password.java
@@ -18,7 +18,7 @@
/**
* represents plain text password and pre hashed(username+realmname+password) password.
- *
+ *
* @author K.Venuopal@sun.com
*/
public interface Password {
@@ -27,14 +27,14 @@
/**
* returns PLAIN_TEXT or HASHED.
- *
+ *
* @returns int
*/
public int getType();
/**
* returns password.
- *
+ *
* @returns byte[]
*/
public byte[] getValue();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java
index ba0bcb3..73d328b 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java
@@ -38,7 +38,7 @@
/**
* Check whether the authentication was cancelled by the user.
- *
+ *
* @return boolean indicating whether the authentication was cancelled.
*/
public boolean getCancelStatus() {
@@ -59,7 +59,7 @@
/**
* This is the callback method called when authentication data is required. It either pops up a dialog box to request
* authentication data or use text input.
- *
+ *
* @param the callback object instances supported by the login module.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginContextDriver.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginContextDriver.java
index ff91a96..993d4d0 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginContextDriver.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginContextDriver.java
@@ -350,7 +350,7 @@
* will succeed in the given realm. It does not set the result of the authentication in the appserver runtime environment A
* silent return from this method means that the given user succeeding in authenticating with the given password in the given
* realm
- *
+ *
* @param subject
* @param username
* @param password
@@ -726,7 +726,7 @@
/**
* This method sets the security context on the current Thread Local Storage
- *
+ *
* @param String username is the user who authenticated
* @param Subject is the subject representation of the user
* @param Credentials the credentials that the server associated with it
@@ -748,7 +748,7 @@
/**
* Perform login on the client side. It just simulates the login on the client side. The method uses the callback handlers and
* generates correct credential information that will be later sent to the server
- *
+ *
* @param int type whether it is <i> username_password</i> or <i> certificate </i> based login.
* @param CallbackHandler the callback handler to gather user information.
* @exception LoginException the exception thrown by the callback handler.
@@ -830,7 +830,7 @@
/**
* Perform logout on the client side.
- *
+ *
* @exception LoginException
*/
public static void doClientLogout() throws LoginException {
@@ -937,7 +937,7 @@
/**
* Sets the security context on the appclient side. It sets the relevant information into the TLS
- *
+ *
* @param String username is the user who authenticated
* @param Subject is the subject representation of the user
* @param Credentials the credentials that the server associated with it
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/PasswordLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/PasswordLoginModule.java
index 9612fcd..7685e35 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/PasswordLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/PasswordLoginModule.java
@@ -71,7 +71,7 @@
/**
* Older implementations can implement authenticate. While new implementation calls authenticateUser
- *
+ *
* @throws LoginException
*/
protected final void authenticateUser() throws LoginException {
@@ -81,7 +81,7 @@
/**
* Perform authentication decision. Method returns silently on success and returns a LoginException on failure. To be implmented
* by sub-classes
- *
+ *
* @return void authenticate returns silently on successful authentication.
* @throws com.sun.enterprise.security.LoginException on authentication failure.
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/LoginException.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/LoginException.java
index 367790f..7e1684e 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/LoginException.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/LoginException.java
@@ -23,7 +23,7 @@
* <UL>
* <LI>If the client is unable to authenticate successfully with the
* </UL>
- *
+ *
* @see com.sun.enterprise.security.auth.AuthenticationStatus
* @author Harish Prabandham
* @author Harpreet Singh
@@ -37,7 +37,7 @@
/**
* Create a new LoginException object with the given message
- *
+ *
* @param The message indicating why authentication failed.
*/
public LoginException(String message) {
@@ -46,7 +46,7 @@
/**
* Create a new LoginException object with the given authentication value.
- *
+ *
* @param The AuthenticationStatus object
*/
public LoginException(boolean as) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/PasswordCredential.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/PasswordCredential.java
index 1074a21..a6c85b8 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/PasswordCredential.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/PasswordCredential.java
@@ -36,7 +36,7 @@
/**
* Construct a credential with the specified password and realm name.
- *
+ *
* @param the password.
* @param the realm name. The only value supported for now is "default".
*/
@@ -70,7 +70,7 @@
/**
* Return the realm name.
- *
+ *
* @return the realm name. Only value supported for now is "default".
*/
public String getRealm() {
@@ -79,7 +79,7 @@
/**
* Return the username.
- *
+ *
* @return the user name.
*/
public String getUser() {
@@ -94,7 +94,7 @@
/**
* Return the password.
- *
+ *
* @return the password.
*/
public char[] getPassword() {
@@ -105,7 +105,7 @@
/**
* Return the target_name
- *
+ *
* @return the target_name
*/
public byte[] getTargetName() {
@@ -114,7 +114,7 @@
/**
* Compare two instances of the credential and return true if they are the same and false otherwise.
- *
+ *
* @param the object that this instance is being compared to.
* @return true if the instances are equal, false otherwise
*/
@@ -130,7 +130,7 @@
/**
* Return the hashCode computed from the password and realm name.
- *
+ *
* @return the hash code.
*/
public int hashCode() {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java
index c7f9a58..456f05b 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java
@@ -64,7 +64,7 @@
/**
* This is the callback method called when authentication data is required. It either pops up a dialog box to request
* authentication data or use text input.
- *
+ *
* @param the callback object instances supported by the login module.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/X509CertificateCredential.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/X509CertificateCredential.java
index 2793c22..0a89c6c 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/X509CertificateCredential.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/X509CertificateCredential.java
@@ -31,7 +31,7 @@
/**
* Construct a credential with the specified X509Certificate certificate chain, realm name and alias.
- *
+ *
* @param the X509Certificate.
* @param the alias for the certificate
* @param the realm name. The only value supported for now is "certificate".
@@ -45,7 +45,7 @@
/**
* Return the alias for the certificate.
- *
+ *
* @return the alias.
*/
public String getAlias() {
@@ -54,7 +54,7 @@
/**
* Return the realm name.
- *
+ *
* @return the realm name. Only value supported for now is "certificate".
*/
public String getRealm() {
@@ -63,7 +63,7 @@
/**
* Return the chain of certificates.
- *
+ *
* @return the chain of X509Certificates.
*/
public X509Certificate[] getX509CertificateChain() {
@@ -72,7 +72,7 @@
/**
* Compare two instances of the credential and return true if they are the same and false otherwise.
- *
+ *
* @return true if the instances are equal, false otherwise.
*/
public boolean equals(Object o) {
@@ -93,7 +93,7 @@
/**
* Return the hashCode computed from the certificate, realm and alias.
- *
+ *
* @return the hash code.
*/
public int hashCode() {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AuthenticationHandler.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AuthenticationHandler.java
index 161aa9b..a427a48 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AuthenticationHandler.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AuthenticationHandler.java
@@ -22,14 +22,14 @@
/**
* This interface is used by the Authentication Service to have the Principal authenticated by the realm. A realm provides an
* implementation of this interface.
- *
+ *
* @author Harish Prabandham
* @author Harpreet Singh
*/
public interface AuthenticationHandler {
/**
* Returns the Realm that this Authentication Handler is authenticating in.
- *
+ *
* @return The Realm object in which this handler is authenticating in.
*/
public Realm getRealm();
@@ -37,7 +37,7 @@
/**
* This method authenticates the given principal using the specified authentication data and the Principal's Credentials. The
* result of the authentication is returned back.
- *
+ *
* @param The principal (user) being authenticated.
* @param The data needed for authentication.
* @return boolean denoting true for success and false for failure authentication.
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java
index 0550675..9c432c0 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java
@@ -104,7 +104,7 @@
}*/
/**
* @param args the command line arguments
- *
+ *
* public static void main(String[] args) { // TODO code application logic here GroupMapper mapper = new GroupMapper();
* mapper.parse(mappingStr); mapper.traverse(); }
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/InvalidOperationException.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/InvalidOperationException.java
index bbbb32e..f13537e 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/InvalidOperationException.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/InvalidOperationException.java
@@ -19,7 +19,7 @@
/**
* Exception thrown when an operation is invoked on a realm that does not support it. e.g. Invoking getGroups (username) is not
* supported by a certificate realm.
- *
+ *
* @author Harpreet Singh
*/
public class InvalidOperationException extends Exception {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java
index 7b42f0b..b487b75 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java
@@ -201,7 +201,7 @@
/**
* Instantiate a Realm with the given name, loading properties from the given file. This method is only used by RI and is not
* called anywhere in iAS. Note : this method stands unused in V3.1 but keeping it since it is a public method.
- *
+ *
* @deprecated
* @param realmName Name of the new realm.
* @param f File containing Properties for the new realm.
@@ -393,7 +393,7 @@
/**
* Remove realm with given name from cache.
- *
+ *
* @param realmName
* @exception NoSuchRealmException
*/
@@ -411,7 +411,7 @@
/**
* Remove realm with given name from cache.
- *
+ *
* @param realmName
* @exception NoSuchRealmException
*/
@@ -512,7 +512,7 @@
/**
* This is a private method for getting realm instance. If realm does not exist, then it will not return null rather than throw
* exception.
- *
+ *
* @param name identifies the realm
* @return the requested realm
*/
@@ -528,7 +528,7 @@
/**
* This is a private method for getting realm instance. If realm does not exist, then it will not return null rather than throw
* exception.
- *
+ *
* @param name identifies the realm
* @return the requested realm
*/
@@ -543,7 +543,7 @@
/**
* Returns the names of accessible realms.
- *
+ *
* @return set of realm names
*/
public static synchronized Enumeration getRealmNames() {
@@ -614,7 +614,7 @@
/**
* Checks if the given realm name is loaded/valid.
- *
+ *
* @param String name of the realm to check.
* @return true if realm present, false otherwise.
*/
@@ -628,7 +628,7 @@
/**
* Checks if the given realm name is loaded/valid.
- *
+ *
* @param String name of the realm to check.
* @return true if realm present, false otherwise.
*/
@@ -642,7 +642,7 @@
/**
* Add assign groups to given Vector of groups. To be used by getGroupNames.
- *
+ *
* @param grps
*/
protected String[] addAssignGroups(String[] grps) {
@@ -719,7 +719,7 @@
/**
* Returns the name of all the groups that this user belongs to
- *
+ *
* @param username name of the user in this realm whose group listing is needed.
* @return enumeration of group names (strings)
* @exception InvalidOperationException thrown if the realm does not support this operation - e.g. Certificate realm does not
@@ -786,7 +786,7 @@
/**
* Persist the realm data to permanent storage
- *
+ *
* @throws com.sun.enterprise.security.auth.realm.BadRealmException
*/
public abstract void persist() throws BadRealmException;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java
index 0008a51..c79fc52 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java
@@ -77,7 +77,7 @@
/**
* Checks if the given realm name is loaded/valid.
- *
+ *
* @param name of the realm to check.
* @return true if realm present, false otherwise.
*/
@@ -91,7 +91,7 @@
/**
* Checks if the given realm name is loaded/valid.
- *
+ *
* @param name of the realm to check.
* @return true if realm present, false otherwise.
*/
@@ -105,7 +105,7 @@
/**
* Returns the names of accessible realms.
- *
+ *
* @return set of realm names
*/
public Enumeration<String> getRealmNames() {
@@ -164,7 +164,7 @@
/**
* Returns names of predefined AuthRealms' classes supported by security service.
- *
+ *
* @returns array of predefind AuthRealms' classes
*
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/certificate/CertificateRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/certificate/CertificateRealm.java
index 167a7f2..f517e26 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/certificate/CertificateRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/certificate/CertificateRealm.java
@@ -109,11 +109,11 @@
Util.debug(log, "CertificateRealm: No "+PARAM_NAMEFIELD+
" provided, will use X.500 name.");
} else {
-
+
StringTokenizer st = new StringTokenizer(nameLink, LINK_SEP);
int n = st.countTokens();
nameFields = new String[n];
-
+
for (int i=0; i<n; i++) {
nameFields[i] = (String)st.nextToken();
}
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java
index bd8e331..59de9fe 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java
@@ -226,7 +226,7 @@
/**
* Returns the name of all the groups that this user belongs to.
- *
+ *
* @param username Name of the user in this realm whose group listing is needed.
* @return Enumeration of group names (strings).
* @exception InvalidOperationException thrown if the realm does not support this operation - e.g. Certificate realm does not
@@ -275,7 +275,7 @@
* A new FileRealm instance is created and initialized from the keyfile on disk. The new instance is installed in the Realm
* registry so future Realm.getInstance() calls will obtain the new data. Any existing references to this instance (e.g. in
* active LoginModule sessions) are unaffected.
- *
+ *
* @param config
* @exception BadRealmException if realm data structures are bad
*
@@ -381,7 +381,7 @@
/**
* Persist the realm data to permanent storage
- *
+ *
* @throws com.sun.enterprise.security.auth.realm.BadRealmException
*/
@Override
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java
index 2b99280..97525c0 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java
@@ -686,7 +686,7 @@
/**
* Escape special chars in search filter, according to RFC2254
- *
+ *
* @param inName
* @return
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java
index 4ff27ca..80e6110 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java
@@ -58,7 +58,7 @@
* List File Users Command Usage: list-file-users [--terse=false] [--echo=false] [--interactive=true] [--host localhost] [--port
* 4848|4849] [--secure | -s] [--user admin_user] [--passwordfile file_name] [--authrealmname authrealm_name] [target(Default
* server)]
- *
+ *
* @author Nandini Ektare
*/
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java
index facea2c..e68e648 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java
@@ -34,14 +34,14 @@
/**
* This method should be implemented by the subclasses to return the caller principal. This information may be redundant since
* the same information can be inferred by inspecting the Credentials of the caller.
- *
+ *
* @return The caller Principal.
*/
abstract public Principal getCallerPrincipal();
/**
* This method should be implemented by the subclasses to return the Credentials of the caller principal.
- *
+ *
* @return A credentials object associated with the current client invocation.
*/
abstract public Subject getSubject();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AppservAccessController.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AppservAccessController.java
index 0175937..50b3668 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AppservAccessController.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AppservAccessController.java
@@ -23,7 +23,7 @@
/**
* This class provides an optimization for some methods in java.security.AccessController.
- *
+ *
* @author Shing Wai Chan
*/
public final class AppservAccessController {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/ClientSecurityContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/ClientSecurityContext.java
index fa23582..18b52c7 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/ClientSecurityContext.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/ClientSecurityContext.java
@@ -50,7 +50,7 @@
/**
* This creates a new ClientSecurityContext object.
- *
+ *
* @param The name of the user.
* @param The Credentials of the user.
*/
@@ -62,7 +62,7 @@
/**
* Initialize the SecurityContext & handle the unauthenticated principal case
- *
+ *
* public static ClientSecurityContext init() { ClientSecurityContext sc = getCurrent(); if (sc == null) { // there is no current
* security context // create a default one if sc = generateDefaultSecurityContext(); } return sc; }
*/
@@ -71,12 +71,12 @@
private static ClientSecurityContext generateDefaultSecurityContext() {
final String PRINCIPAL_NAME = "auth.default.principal.name";
final String PRINCIPAL_PASS = "auth.default.principal.password";
-
-
+
+
//ServerConfiguration config = ServerConfiguration.getConfiguration();
//String username = config.getProperty(PRINCIPAL_NAME, "guest");
//String password = config.getProperty(PRINCIPAL_PASS, "guest123");
-
+
//Temporary hardcoding to make V3 code for WebProfile compile
String username ="guest";
char[] password = new char[]{'g','e','t','s','t','1','2','3'};
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/J2EEKeyManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/J2EEKeyManager.java
index f18bdd7..522a1d8 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/J2EEKeyManager.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/J2EEKeyManager.java
@@ -50,7 +50,7 @@
/**
* This a J2EE specific Key Manager class that is used to select user certificates for SSL client authentication. It delegates
* most of the functionality to the provider specific KeyManager class.
- *
+ *
* @author Vivek Nagar
* @author Harpreet Singh
*/
@@ -94,7 +94,7 @@
/**
* Choose the client alias that will be used to select the client certificate for SSL client auth.
- *
+ *
* @param the keytype
* @param the certificate issuers.
* @param the socket used for this connection. This parameter can be null, in which case the method will return the most generic
@@ -151,7 +151,7 @@
/**
* Choose the server alias that will be used to select the server certificate for SSL server auth.
- *
+ *
* @param the keytype
* @param the certificate issuers.
* @param the socket used for this connection. This parameter can be null, in which case the method will return the most generic
@@ -174,7 +174,7 @@
/**
* Return the certificate chain for the specified alias.
- *
+ *
* @param the alias.
* @return the chain of X509 Certificates.
*/
@@ -193,7 +193,7 @@
/**
* Return all the available client aliases for the specified key type.
- *
+ *
* @param the keytype
* @param the certificate issuers.
* @return the array of aliases.
@@ -207,7 +207,7 @@
/**
* Return all the available server aliases for the specified key type.
- *
+ *
* @param the keytype
* @param the certificate issuers.
* @return the array of aliases.
@@ -221,7 +221,7 @@
/**
* Return the private key for the specified alias.
- *
+ *
* @param the alias.
* @return the private key.
*/
@@ -240,7 +240,7 @@
/**
* Find the corresponding X509KeyManager associated to token in alias. It returns null if there is n
- *
+ *
* @param tokenAlias of the form <tokenName>:<aliasName>
*/
private X509KeyManager getManagerFromToken(String tokenAlias) {
@@ -259,7 +259,7 @@
/**
* Perform login on the client side. It just simulates the login on the client side. The method uses the callback handlers and
* generates correct credential information that will be later sent to the server
- *
+ *
* @param int type whether it is <i> username_password</i> or <i> certificate </i> based login.
* @param CallbackHandler the callback handler to gather user information.
* @exception LoginException the exception thrown by the callback handler.
@@ -395,7 +395,7 @@
/**
* Sets the security context on the appclient side. It sets the relevant information into the TLS
- *
+ *
* @param String username is the user who authenticated
* @param Subject is the subject representation of the user
* @param Credentials the credentials that the server associated with it
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java
index b376206..42a7976 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java
@@ -54,7 +54,7 @@
/**
* Handy class containing static functions.
- *
+ *
* @author Harpreet Singh
* @author Vivek Nagar
* @author Shing Wai Chan
@@ -207,7 +207,7 @@
/**
* Check whether given String is of the form [<TokenName>:]alias where alias is an key entry.
- *
+ *
* @param certNickname
* @return boolean
*/
@@ -245,7 +245,7 @@
/**
* Get a PrivateKeyEntry with certNickName is of the form [<TokenName>:]alias where alias is an key entry.
- *
+ *
* @param certNickname
* @return PrivateKeyEntry
*/
diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
index 830696d..c089449 100644
--- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
+++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
@@ -67,7 +67,7 @@
/**
* This implements SecuritySupport used in PluggableFeatureFactory.
- *
+ *
* @author Shing Wai Chan
*/
// TODO: when we have two SecuritySupport implementations,
@@ -90,13 +90,13 @@
private static final String SSL_CERT_EXPIRED = "NCLS-SECURITY-05054";
private static boolean initialized = false;
- protected static final List<KeyStore> keyStores = new ArrayList<KeyStore>();
- protected static final List<KeyStore> trustStores = new ArrayList<KeyStore>();
- protected static final List<char[]> keyStorePasswords = new ArrayList<char[]>();
- protected static final List<String> tokenNames = new ArrayList<String>();
+ protected static final List<KeyStore> keyStores = new ArrayList<>();
+ protected static final List<KeyStore> trustStores = new ArrayList<>();
+ protected static final List<char[]> keyStorePasswords = new ArrayList<>();
+ protected static final List<String> tokenNames = new ArrayList<>();
private MasterPasswordImpl masterPasswordHelper = null;
private static boolean instantiated = false;
- private Date initDate = new Date();
+ private final Date initDate = new Date();
@Inject
private ServiceLocator habitat;
@@ -180,7 +180,7 @@
/**
* This method will load keystore and truststore and add into corresponding list.
- *
+ *
* @param tokenName
* @param provider
* @param keyStorePass
@@ -212,7 +212,7 @@
/**
* This method load keystore with given keystore file and keystore password for a given keystore type and provider. It always
* return a non-null keystore.
- *
+ *
* @param keyStoreType
* @param provider
* @param keyStoreFile
@@ -255,10 +255,12 @@
/**
* This method returns an array of keystores containing keys and certificates.
*/
+ @Override
public KeyStore[] getKeyStores() {
return keyStores.toArray(new KeyStore[keyStores.size()]);
}
+ @Override
public KeyStore loadNullStore(String type, int index)
throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
KeyStore ret = KeyStore.getInstance(type);
@@ -266,10 +268,11 @@
return ret;
}
+ @Override
public KeyManager[] getKeyManagers(String algorithm)
throws IOException, KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException {
KeyStore[] kstores = getKeyStores();
- ArrayList<KeyManager> keyManagers = new ArrayList<KeyManager>();
+ ArrayList<KeyManager> keyManagers = new ArrayList<>();
for (int i = 0; i < kstores.length; i++) {
checkCertificateDates(kstores[i]);
KeyManagerFactory kmf = KeyManagerFactory
@@ -285,9 +288,10 @@
return new KeyManager[] { keyManager };
}
+ @Override
public TrustManager[] getTrustManagers(String algorithm) throws IOException, KeyStoreException, NoSuchAlgorithmException {
KeyStore[] tstores = getTrustStores();
- ArrayList<TrustManager> trustManagers = new ArrayList<TrustManager>();
+ ArrayList<TrustManager> trustManagers = new ArrayList<>();
for (KeyStore tstore : tstores) {
checkCertificateDates(tstore);
TrustManagerFactory tmf = TrustManagerFactory
@@ -326,10 +330,12 @@
/**
* This method returns an array of truststores containing certificates.
*/
+ @Override
public KeyStore[] getTrustStores() {
return trustStores.toArray(new KeyStore[trustStores.size()]);
}
+ @Override
public boolean verifyMasterPassword(final char[] masterPass) {
return Arrays.equals(masterPass, keyStorePasswords.get(0));
}
@@ -337,6 +343,7 @@
/**
* This method returns an array of token names in order corresponding to array of keystores.
*/
+ @Override
public String[] getTokenNames() {
return tokenNames.toArray(new String[tokenNames.size()]);
}
@@ -345,6 +352,7 @@
* @param token
* @return a keystore
*/
+ @Override
public KeyStore getKeyStore(String token) {
int idx = getTokenIndex(token);
if (idx < 0) {
@@ -357,6 +365,7 @@
* @param token
* @return a truststore
*/
+ @Override
public KeyStore getTrustStore(String token) {
int idx = getTokenIndex(token);
if (idx < 0) {
@@ -379,10 +388,12 @@
return idx;
}
+ @Override
public void synchronizeKeyFile(Object configContext, String fileRealmName) throws Exception {
//throw new UnsupportedOperationException("Not supported yet in V3.");
}
+ @Override
public void checkPermission(String key) {
try {
// Checking a random permission to check if it is server.
@@ -409,6 +420,7 @@
return penv.getProcessType().equals(ProcessType.Other);
}
+ @Override
public PrivateKey getPrivateKeyForAlias(String alias, int keystoreIndex)
throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException {
checkPermission(KEYSTORE_PASS_PROP);
diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java
index ea11ab9..a786389 100644
--- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java
+++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java
@@ -26,12 +26,12 @@
/**
* This class combines an array of X509KeyManagers into one.
- *
+ *
* @author Shing Wai Chan
**/
public class UnifiedX509KeyManager implements X509KeyManager /* extends X509ExtendedKeyManager*/ {
- private X509KeyManager[] mgrs = null;
- private String[] tokenNames = null;
+ private final X509KeyManager[] mgrs;
+ private final String[] tokenNames;
/**
* @param mgrs
@@ -49,10 +49,11 @@
}
// ---------- implements X509KeyManager ----------
+ @Override
public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
String alias = null;
- for (int i = 0; i < mgrs.length; i++) {
- alias = mgrs[i].chooseClientAlias(keyType, issuers, socket);
+ for (X509KeyManager mgr : mgrs) {
+ alias = mgr.chooseClientAlias(keyType, issuers, socket);
if (alias != null) {
break;
}
@@ -60,10 +61,11 @@
return alias;
}
+ @Override
public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
String alias = null;
- for (int i = 0; i < mgrs.length; i++) {
- alias = mgrs[i].chooseServerAlias(keyType, issuers, socket);
+ for (X509KeyManager mgr : mgrs) {
+ alias = mgr.chooseServerAlias(keyType, issuers, socket);
if (alias != null) {
break;
}
@@ -71,10 +73,11 @@
return alias;
}
+ @Override
public X509Certificate[] getCertificateChain(String alias) {
X509Certificate[] chain = null;
- for (int i = 0; i < mgrs.length; i++) {
- chain = mgrs[i].getCertificateChain(alias);
+ for (X509KeyManager mgr : mgrs) {
+ chain = mgr.getCertificateChain(alias);
if (chain != null) {
break;
}
@@ -82,13 +85,14 @@
return chain;
}
+ @Override
public String[] getClientAliases(String keyType, Principal[] issuers) {
ArrayList clientAliases = new ArrayList();
- for (int i = 0; i < mgrs.length; i++) {
- String[] clAliases = mgrs[i].getClientAliases(keyType, issuers);
+ for (X509KeyManager mgr : mgrs) {
+ String[] clAliases = mgr.getClientAliases(keyType, issuers);
if (clAliases != null && clAliases.length > 0) {
- for (int j = 0; j < clAliases.length; j++) {
- clientAliases.add(clAliases[j]);
+ for (String element : clAliases) {
+ clientAliases.add(element);
}
}
}
@@ -96,10 +100,11 @@
return (clientAliases.size() == 0) ? null : (String[]) clientAliases.toArray(new String[clientAliases.size()]);
}
+ @Override
public PrivateKey getPrivateKey(String alias) {
PrivateKey privKey = null;
- for (int i = 0; i < mgrs.length; i++) {
- privKey = mgrs[i].getPrivateKey(alias);
+ for (X509KeyManager mgr : mgrs) {
+ privKey = mgr.getPrivateKey(alias);
if (privKey != null) {
break;
}
@@ -107,13 +112,14 @@
return privKey;
}
+ @Override
public String[] getServerAliases(String keyType, Principal[] issuers) {
ArrayList serverAliases = new ArrayList();
- for (int i = 0; i < mgrs.length; i++) {
- String[] serAliases = mgrs[i].getServerAliases(keyType, issuers);
+ for (X509KeyManager mgr : mgrs) {
+ String[] serAliases = mgr.getServerAliases(keyType, issuers);
if (serAliases != null && serAliases.length > 0) {
- for (int j = 0; j < serAliases.length; j++) {
- serverAliases.add(serAliases[j]);
+ for (String element : serAliases) {
+ serverAliases.add(element);
}
}
}
diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java
index 6b3add5..e3b778a 100644
--- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java
+++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java
@@ -24,12 +24,12 @@
/**
* This class combines an array of X509TrustManagers into one.
- *
+ *
* @author Shing Wai Chan
**/
public class UnifiedX509TrustManager implements X509TrustManager {
- private X509TrustManager[] mgrs = null;
- private X509Certificate[] issuers = {};
+ private final X509TrustManager[] mgrs;
+ private final X509Certificate[] issuers;
public UnifiedX509TrustManager(X509TrustManager[] mgrs) {
if (mgrs == null) {
@@ -38,11 +38,11 @@
this.mgrs = mgrs;
HashSet tset = new HashSet(); //for uniqueness
- for (int i = 0; i < mgrs.length; i++) {
- X509Certificate[] tcerts = mgrs[i].getAcceptedIssuers();
+ for (X509TrustManager mgr : mgrs) {
+ X509Certificate[] tcerts = mgr.getAcceptedIssuers();
if (tcerts != null && tcerts.length > 0) {
- for (int j = 0; j < tcerts.length; j++) {
- tset.add(tcerts[j]);
+ for (X509Certificate tcert : tcerts) {
+ tset.add(tcert);
}
}
}
@@ -54,12 +54,13 @@
}
// ---------- implements X509TrustManager -----------
+ @Override
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
CertificateException cex = null;
- for (int i = 0; i < mgrs.length; i++) {
+ for (X509TrustManager mgr : mgrs) {
try {
cex = null; //reset exception status
- mgrs[i].checkClientTrusted(chain, authType);
+ mgr.checkClientTrusted(chain, authType);
break;
} catch (CertificateException ex) {
cex = ex;
@@ -70,12 +71,13 @@
}
}
+ @Override
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
CertificateException cex = null;
- for (int i = 0; i < mgrs.length; i++) {
+ for (X509TrustManager mgr : mgrs) {
try {
cex = null; //reset exception status
- mgrs[i].checkServerTrusted(chain, authType);
+ mgr.checkServerTrusted(chain, authType);
break;
} catch (CertificateException ex) {
cex = ex;
@@ -86,6 +88,7 @@
}
}
+ @Override
public X509Certificate[] getAcceptedIssuers() {
return issuers;
}
diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/server/pluggable/SecuritySupport.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/server/pluggable/SecuritySupport.java
index a211a40..9d497b1 100644
--- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/server/pluggable/SecuritySupport.java
+++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/server/pluggable/SecuritySupport.java
@@ -31,7 +31,7 @@
/**
* SecuritySupport is part of PluggableFeature that provides access to internal services managed by application server.
- *
+ *
* @author Shing Wai Chan
*/
@Contract
@@ -44,7 +44,7 @@
public static final String keyStoreProp = "javax.net.ssl.keyStore";
public static final String trustStoreProp = "javax.net.ssl.trustStore";
- private static volatile SecuritySupport defaultInstance = null;
+ private static volatile SecuritySupport defaultInstance;
public static SecuritySupport getDefaultInstance() {
if (defaultInstance == null) {
@@ -129,7 +129,7 @@
/**
* This method synchronize key file for given realm.
- *
+ *
* @param config the ConfigContextx
* @param fileRealmName
* @exception if fail to synchronize, a known exception is com.sun.enterprise.ee.synchronization.SynchronizationException
@@ -140,7 +140,7 @@
/**
* Check permission for the given key.
- *
+ *
* @param key
*/
abstract public void checkPermission(String key);
