Security clean up 2 - adding @Override and organize imports
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
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 762797a..88cb6c0 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
@@ -16,13 +16,13 @@
package com.iplanet.ias.security.auth.login;
+import javax.security.auth.login.LoginException;
+
import com.sun.enterprise.security.BasePasswordLoginModule;
import com.sun.enterprise.security.auth.AuthenticationStatus;
import com.sun.enterprise.security.auth.AuthenticationStatusImpl;
import com.sun.enterprise.security.auth.realm.Realm;
-import javax.security.auth.login.LoginException;
-
/**
* Provided for backward compatibility with SunOne 7.0 Newer implementations should extend
* com.sun.appserv.security.BasePasswordLoginModule
@@ -33,6 +33,7 @@
*
* @throws LoginException
*/
+ @Override
protected final void authenticateUser() throws LoginException {
AuthenticationStatus as = authenticate();
if (as.getStatus() == as.AUTH_SUCCESS)
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 79649a2..7e62bd8 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
@@ -16,11 +16,11 @@
package com.sun.enterprise.common.iiop.security;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+
import com.sun.enterprise.security.SecurityLoggerInfo;
import com.sun.enterprise.security.common.Util;
-import java.util.*;
-import java.util.logging.*;
-import com.sun.logging.*;
/**
* This class implements the GSSAPI exported name functionality as required by CSIV2.
@@ -226,6 +226,7 @@
return username;
}
+ @Override
public boolean equals(Object o) {
if (o instanceof GSSUPName) {
GSSUPName nm = (GSSUPName) o;
@@ -236,11 +237,13 @@
}
/* Return the hashCode. */
+ @Override
public int hashCode() {
return username.hashCode() + realm.hashCode();
}
/* String representation of the GSSUPname */
+ @Override
public String toString() {
String s = "Username = " + username;
s = s + " Realm = " + realm;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/SecurityContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/SecurityContext.java
index df82c23..c606a12 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/SecurityContext.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/SecurityContext.java
@@ -20,7 +20,7 @@
package com.sun.enterprise.common.iiop.security;
-import javax.security.auth.*;
+import javax.security.auth.Subject;
/*
* This interface is part of the contract between CSIV2 interceptors
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java
index f02df96..fb47683 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java
@@ -16,11 +16,11 @@
package com.sun.enterprise.security;
-import org.glassfish.security.common.CNonceCache;
import java.util.HashMap;
-import java.util.Map;
+import org.glassfish.security.common.CNonceCache;
import org.jvnet.hk2.annotations.Service;
+
import jakarta.inject.Singleton;
/**
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 17cbc53..da90673 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
@@ -16,9 +16,6 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm;
-import com.sun.enterprise.security.PrincipalGroupFactory;
-import com.sun.enterprise.security.PrincipalGroupFactory;
import java.security.Principal;
import java.security.cert.X509Certificate;
import java.util.Iterator;
@@ -27,6 +24,7 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -37,6 +35,8 @@
import org.glassfish.internal.api.Globals;
import org.glassfish.security.common.Group;
+import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm;
+
/**
* Abstract base class for certificate-based login modules.
*
@@ -67,6 +67,7 @@
private X500Principal x500Principal;
private String appName = null;
+ @Override
public final void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
this.subject = subject;
this._sharedState = sharedState;
@@ -77,6 +78,7 @@
}
}
+ @Override
public final boolean login() throws LoginException {
//Extract the certificates from the subject.
extractCredentials();
@@ -89,6 +91,7 @@
return true;
}
+ @Override
public final boolean commit() throws LoginException {
if (!success) {
return false;
@@ -110,6 +113,7 @@
return true;
}
+ @Override
final public boolean abort() throws LoginException {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "JAAS authentication aborted.");
@@ -140,6 +144,7 @@
}
+ @Override
final public boolean logout() throws LoginException {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "JAAS logout for: {0}", subject.toString());
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 963317c..9417e96 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
@@ -16,24 +16,27 @@
package com.sun.enterprise.security;
-import java.util.*;
-import java.util.logging.Logger;
+import java.security.Principal;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
import java.util.logging.Level;
+import java.util.logging.Logger;
-import com.sun.enterprise.security.PrincipalGroupFactory;
-import com.sun.enterprise.util.i18n.StringManager;
-import javax.security.auth.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.login.*;
-import javax.security.auth.spi.*;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
import org.glassfish.internal.api.Globals;
-import org.glassfish.security.common.PrincipalImpl;
import org.glassfish.security.common.Group;
+import org.glassfish.security.common.PrincipalImpl;
+
import com.sun.enterprise.security.auth.login.LoginCallbackHandler;
-import com.sun.enterprise.security.auth.realm.Realm;
import com.sun.enterprise.security.auth.login.common.PasswordCredential;
-import java.security.Principal;
+import com.sun.enterprise.security.auth.realm.Realm;
+import com.sun.enterprise.util.i18n.StringManager;
/**
* Abstract base class for password-based login modules.
@@ -80,6 +83,7 @@
* @param options - options specified in the login Configuration for this particular LoginModule.
*
*/
+ @Override
final public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
_subject = subject;
_sharedState = sharedState;
@@ -101,6 +105,7 @@
* @throws LoginException Thrown if login failed, or on other problems.
*
*/
+ @Override
final public boolean login() throws LoginException {
//Extract the username and password
extractCredentials();
@@ -123,6 +128,7 @@
* @throws LoginException If commit fails.
*
*/
+ @Override
public boolean commit() throws LoginException {
if (_succeeded == false) {
return false;
@@ -177,6 +183,7 @@
* Abort the authentication process.
*
*/
+ @Override
final public boolean abort() throws LoginException {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "JAAS authentication aborted.");
@@ -207,6 +214,7 @@
* Log out the subject.
*
*/
+ @Override
final public boolean logout() throws LoginException {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "JAAS logout for: " + _subject.toString());
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 509bf7a..ea0ca41 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
@@ -16,10 +16,14 @@
package com.sun.enterprise.security;
-import java.util.*;
+import java.util.Enumeration;
-import com.sun.enterprise.security.auth.realm.*;
-
+import com.sun.enterprise.security.auth.realm.AuthenticationHandler;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.IASRealm;
+import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+import com.sun.enterprise.security.auth.realm.Realm;
+import com.sun.enterprise.security.auth.realm.User;
import com.sun.enterprise.security.util.IASSecurityException;
import com.sun.enterprise.util.i18n.StringManager;
@@ -48,6 +52,7 @@
* @return An AuthenticationHandler object for this realm (always null)
*
*/
+ @Override
public AuthenticationHandler getAuthenticationHandler() {
_logger.warning("iasrealm.noauth");
return null;
@@ -64,6 +69,7 @@
* @exception com.sun.enterprise.security.auth.realm.BadRealmException if realm data structures are bad
*
*/
+ @Override
public Enumeration getUserNames() throws BadRealmException {
String msg = sm.getString("iasrealm.notsupported");
throw new BadRealmException(msg);
@@ -82,6 +88,7 @@
* @exception com.sun.enterprise.security.auth.realm.BadRealmException if realm data structures are bad
*
*/
+ @Override
public User getUser(String name) throws NoSuchUserException, BadRealmException {
String msg = sm.getString("iasrealm.notsupported");
throw new BadRealmException(msg);
@@ -98,6 +105,7 @@
* @exception com.sun.enterprise.security.auth.realm.BadRealmException if realm data structures are bad
*
*/
+ @Override
public Enumeration getGroupNames() throws BadRealmException {
String msg = sm.getString("iasrealm.notsupported");
throw new BadRealmException(msg);
@@ -113,6 +121,7 @@
* @exception com.sun.enterprise.security.auth.realm.BadRealmException if realm data structures are bad
*
*/
+ @Override
public void refresh() throws BadRealmException {
String msg = sm.getString("iasrealm.notsupported");
throw new BadRealmException(msg);
@@ -127,6 +136,7 @@
* @throws BadRealmException If there are problems adding user.
*
*/
+ @Override
public void addUser(String name, char[] password, String[] groupList) throws BadRealmException, IASSecurityException {
String msg = sm.getString("iasrealm.notsupported");
throw new BadRealmException(msg);
@@ -150,6 +160,7 @@
* @throws NoSuchUserException If user does not exist.
*
*/
+ @Override
public void removeUser(String name) throws NoSuchUserException, BadRealmException {
String msg = sm.getString("iasrealm.notsupported");
throw new BadRealmException(msg);
@@ -180,6 +191,7 @@
* @throws NoSuchUserException If user does not exist.
*
*/
+ @Override
public void updateUser(String name, String newName, char[] password, String[] groups)
throws NoSuchUserException, BadRealmException, IASSecurityException {
String msg = sm.getString("iasrealm.notsupported");
@@ -189,6 +201,7 @@
/**
* @return true if the realm implementation support User Management (add,remove,update user)
*/
+ @Override
public boolean supportsUserManagement() {
//false by default.
return false;
@@ -199,6 +212,7 @@
*
* @throws com.sun.enterprise.security.auth.realm.BadRealmException
*/
+ @Override
public void persist() throws BadRealmException {
//NOOP for realms that do not support UserManagement
}
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java
index d9e35f2..616fec6 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java
@@ -16,18 +16,18 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.config.serverbeans.SecurityService;
import java.io.File;
import java.io.IOException;
import java.util.List;
+
+import javax.xml.stream.XMLStreamException;
+
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.ServiceLocator;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import org.jvnet.hk2.annotations.Contract;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+
/**
* Utility contact to copy the security related config files from the passed non-embedded instanceDir to the embedded server
* instance's config. This is implemented by the EmbeddedSecurityUtil class
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUIErrorDialog.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUIErrorDialog.java
index d171683..7eeac9d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUIErrorDialog.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUIErrorDialog.java
@@ -24,8 +24,13 @@
package com.sun.enterprise.security;
-import javax.swing.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.BoxLayout;
+import javax.swing.JFrame;
public class GUIErrorDialog extends javax.swing.JDialog {
String message;
@@ -48,6 +53,7 @@
errorLbl.setAlignmentX(CENTER_ALIGNMENT);
getContentPane().setLayout(new javax.swing.BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
addWindowListener(new java.awt.event.WindowAdapter() {
+ @Override
public void windowClosing(java.awt.event.WindowEvent evt) {
closeDialog(evt);
}
@@ -55,11 +61,13 @@
okButton.setActionCommand("okButton");
okButton.setText("OK");
okButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
dispose();
}
});
super.addWindowListener(new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent we) {
dispose();
}
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 1e00c91..1b51d45 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
@@ -16,19 +16,37 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.security.ssl.SSLUtils;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.security.auth.callback.*;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-
-import java.util.logging.*;
-
-import com.sun.logging.*;
+import java.awt.CardLayout;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.util.Arrays;
+import java.util.logging.Logger;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.ChoiceCallback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
+
import org.glassfish.internal.api.Globals;
+import com.sun.enterprise.security.ssl.SSLUtils;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
/**
* An implementation of a LoginDialog that presents a swing based GUI for querying username and password.
*
@@ -71,6 +89,7 @@
/**
* @return The username of the user.
*/
+ @Override
public String getUserName() {
return passphraseDialog.username;
}
@@ -78,6 +97,7 @@
/**
* @return The password of the user in plain text...
*/
+ @Override
public final char[] getPassword() {
char[] temp = passphraseDialog.passphrase;
return (temp == null) ? null : Arrays.copyOf(temp, temp.length);
@@ -218,6 +238,7 @@
okForKP.setActionCommand("ok");
okForKP.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ae) {
char[] passKPFromUser = keystorePassword.getPassword();
if (sslUtils.verifyMasterPassword(passKPFromUser)) {
@@ -240,6 +261,7 @@
cancelForKP.setActionCommand("cancel");
cancelForKP.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ae) {
if (choiceCallback != null)
choiceCallback.setSelectedIndex(-1);
@@ -275,6 +297,7 @@
// XXX I18N
okButton.setActionCommand("ok");
okButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ae) {
username = userField.getText();
if (username.trim().length() > 0)
@@ -299,6 +322,7 @@
cancelButton = new JButton(localStrings.getLocalString("enterprise.security.cancel", "Cancel"));
cancelButton.setActionCommand("cancel");
cancelButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ae) {
if (choiceCallback != null) {
choiceCallback.setSelectedIndex(-1);
@@ -313,6 +337,7 @@
});
super.addWindowListener(new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent we) {
//System.out.println("IN WINDOW CLOSING");
//_logger.log(Level.FINE,"IN WINDOW CLOSING");
@@ -439,6 +464,7 @@
okButton = new JButton(localStrings.getLocalString("enterprise.security.ok", " OK ")); // XXX I18N
okButton.setActionCommand("ok");
okButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ae) {
// System.out.println("OK Action");
//_logger.log(Level.FINE,"OK Action");
@@ -454,6 +480,7 @@
cancelButton = new JButton(localStrings.getLocalString("enterprise.security.cancel", "Cancel")); // XXX I18N
cancelButton.setActionCommand("cancel");
cancelButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ae) {
// System.out.println("Cancel Action");
// _logger.log(Level.FINE,"Cancel Action");
@@ -465,6 +492,7 @@
});
super.addWindowListener(new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent we) {
// System.out.println("IN WINDOW CLOSING");
// _logger.log(Level.FINE,"IN WINDOW CLOSING");
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GroupPrincipal.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GroupPrincipal.java
index 3d1b639..17559ae 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GroupPrincipal.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GroupPrincipal.java
@@ -15,8 +15,8 @@
*/
package com.sun.enterprise.security;
-import java.util.Enumeration;
import java.security.Principal;
+import java.util.Enumeration;
/**
* A group of principals.
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 a418337..1141dbc 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
@@ -16,15 +16,14 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.security.auth.login.common.LoginException;
-import com.sun.enterprise.security.common.AppservAccessController;
import java.security.PrivilegedAction;
+import java.util.logging.Logger;
import com.sun.enterprise.security.auth.login.ClientPasswordLoginModule;
import com.sun.enterprise.security.auth.login.LoginContextDriver;
+import com.sun.enterprise.security.auth.login.common.LoginException;
+import com.sun.enterprise.security.common.AppservAccessController;
import com.sun.enterprise.security.common.SecurityConstants;
-import java.util.logging.*;
-import com.sun.logging.*;
/**
* This class is kept for CTS. Ideally we should move away from it. The login can be done via the following call:
@@ -72,6 +71,7 @@
final String username = user;
final String password = pass;
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
System.setProperty(ClientPasswordLoginModule.LOGIN_NAME, username);
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 ace9965..6a7d366 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
@@ -16,32 +16,38 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import org.jvnet.hk2.config.*;
-import org.jvnet.hk2.config.types.Property;
-
-import jakarta.inject.Singleton;
-import org.jvnet.hk2.annotations.Service;
-import jakarta.inject.Inject;
-
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.JaccProvider;
-import com.sun.enterprise.config.serverbeans.AuditModule;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
-
-import com.sun.enterprise.security.audit.BaseAuditManager;
-import com.sun.enterprise.security.auth.realm.Realm;
-import com.sun.enterprise.security.auth.realm.RealmsManager;
import java.beans.PropertyChangeEvent;
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
-import jakarta.inject.Named;
+
import javax.security.auth.login.Configuration;
+
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.PostConstruct;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.Changed;
+import org.jvnet.hk2.config.ConfigBeanProxy;
+import org.jvnet.hk2.config.ConfigListener;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.NotProcessed;
+import org.jvnet.hk2.config.UnprocessedChangeEvents;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AuditModule;
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.JaccProvider;
+import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.audit.BaseAuditManager;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.Realm;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
/**
*
@@ -79,6 +85,7 @@
*
* @param events list of changes
*/
+ @Override
public UnprocessedChangeEvents changed(PropertyChangeEvent[] events) {
// I am not so interested with the list of events, just sort who got added or removed for me.
ConfigSupport.sortAndDispatch(events, new Changed() {
@@ -90,6 +97,7 @@
* @param changedType type of the configuration object
* @param changedInstance changed instance.
*/
+ @Override
public <T extends ConfigBeanProxy> NotProcessed changed(TYPE type, Class<T> changedType, T changedInstance) {
NotProcessed np = null;
switch (type) {
@@ -341,6 +349,7 @@
Configuration.getConfiguration().refresh();
}
+ @Override
public void postConstruct() {
if (securityService == null) {
//should never happen
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 fd35d1f..8a69f38 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
@@ -16,27 +16,26 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.security.audit.AuditManager;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.jvnet.hk2.annotations.Optional;
-import org.glassfish.hk2.api.PostConstruct;
-import org.glassfish.hk2.api.PreDestroy;
-import org.glassfish.hk2.api.ServiceLocator;
-
-import com.sun.enterprise.security.auth.realm.RealmsManager;
-import com.sun.enterprise.security.common.Util;
-import com.sun.enterprise.security.ssl.SSLUtils;
-import org.glassfish.internal.api.ServerContext;
import org.glassfish.api.event.EventListener;
import org.glassfish.api.event.EventTypes;
import org.glassfish.api.event.Events;
-import jakarta.inject.Inject;
-
+import org.glassfish.hk2.api.PostConstruct;
+import org.glassfish.hk2.api.PreDestroy;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.internal.api.ServerContext;
+import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.security.audit.AuditManager;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.security.common.Util;
+import com.sun.enterprise.security.ssl.SSLUtils;
+
+import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.jvnet.hk2.config.ConfigListener;
/**
* This class extends default implementation of ServerLifecycle interface. It provides security initialization and setup for the
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLoggerInfo.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLoggerInfo.java
index 3da11f2..824ad86 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLoggerInfo.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLoggerInfo.java
@@ -17,6 +17,7 @@
package com.sun.enterprise.security;
import java.util.logging.Logger;
+
import org.glassfish.logging.annotation.LogMessageInfo;
import org.glassfish.logging.annotation.LogMessagesResourceBundle;
import org.glassfish.logging.annotation.LoggerInfo;
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 5a2ce2b..83e7747 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
@@ -20,20 +20,22 @@
*/
package com.sun.enterprise.security;
-import com.sun.enterprise.security.audit.AuditManager;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import org.glassfish.api.admin.ServerEnvironment;
import java.util.logging.Logger;
-import javax.security.auth.callback.CallbackHandler;
-import org.jvnet.hk2.annotations.Service;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
+import javax.security.auth.callback.CallbackHandler;
import org.glassfish.api.admin.ProcessEnvironment;
import org.glassfish.api.admin.ProcessEnvironment.ProcessType;
+import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.api.Globals;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.security.audit.AuditManager;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
@Service
@Singleton
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java
index c5c1238..4735c21 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java
@@ -16,22 +16,29 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.config.serverbeans.*;
import java.beans.PropertyVetoException;
import java.io.File;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
-import jakarta.inject.Inject;
-import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
+import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Configs;
+import com.sun.enterprise.config.serverbeans.JaccProvider;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+
+import jakarta.inject.Inject;
+
/**
* The only thing that needs to added Extra for SecurityService migration is the addition of the new JACC provider. This would be
* required when migrating from V2, for V3-Prelude it is already present.
@@ -60,6 +67,7 @@
public static final String PARAM_DIGEST_ALGORITHM = "digest-algorithm";
private static final Logger _logger = SecurityLoggerInfo.getLogger();
+ @Override
public void postConstruct() {
for (Config config : configs.getConfig()) {
SecurityService service = config.getSecurityService();
@@ -98,6 +106,7 @@
}
} else {
ConfigSupport.apply(new SingleConfigCode<AuthRealm>() {
+ @Override
public Object run(AuthRealm updatedAuthRealm) throws PropertyVetoException, TransactionFailure {
Property prop1 = updatedAuthRealm.createChild(Property.class);
prop1.setName(PARAM_DIGEST_ALGORITHM);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java
index b5438b0..7b8f2ac 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java
@@ -16,22 +16,27 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.security.ssl.SSLUtils;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PushbackInputStream;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.Arrays;
-import java.util.logging.*;
-import javax.security.auth.callback.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.logging.*;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.ChoiceCallback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+
import org.glassfish.internal.api.Globals;
+import com.sun.enterprise.security.ssl.SSLUtils;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
/**
* This implementation of LoginDialog If these are not set, then it queries the user in the command window.
*
@@ -144,6 +149,7 @@
/**
* @return The username of the user.
*/
+ @Override
public String getUserName() {
return username;
}
@@ -151,6 +157,7 @@
/**
* @return The password of the user in plain text...
*/
+ @Override
public final char[] getPassword() {
return (password == null) ? null : Arrays.copyOf(password, password.length);
}
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java
index 39fd8a6..1ac1d8f 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java
@@ -16,10 +16,10 @@
package com.sun.enterprise.security;
-import com.sun.enterprise.security.common.ClientSecurityContext;
-import java.util.logging.*;
-import com.sun.logging.*;
import java.util.Arrays;
+import java.util.logging.Logger;
+
+import com.sun.enterprise.security.common.ClientSecurityContext;
/**
* This class is used to share information between either of the following scenarios 1. Different points of execution of a single
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 346f6da..1c0552d 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
@@ -16,14 +16,14 @@
package com.sun.enterprise.security;
-import org.glassfish.external.statistics.CountStatistic;
-import org.glassfish.external.statistics.impl.CountStatisticImpl;
-import org.glassfish.gmbal.Description;
-import org.glassfish.gmbal.AMXMetadata;
-import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.gmbal.ManagedObject;
import org.glassfish.external.probe.provider.annotations.ProbeListener;
import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.gmbal.AMXMetadata;
+import org.glassfish.gmbal.Description;
+import org.glassfish.gmbal.ManagedAttribute;
+import org.glassfish.gmbal.ManagedObject;
/**
*
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 e4dd489..1873d43 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
@@ -16,19 +16,19 @@
package com.sun.enterprise.security.admin.cli;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-
import java.util.Iterator;
+
import org.glassfish.api.I18n;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
import org.glassfish.api.admin.RuntimeType;
-
-import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.security.SecurityLoggerInfo;
/**
* Adjusts the DAS configuration to turn off secure admin, as if by executing these commands:
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 e680ac6..3e5b666 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
@@ -16,13 +16,6 @@
package com.sun.enterprise.security.admin.cli;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.SecureAdmin;
-import com.sun.enterprise.config.serverbeans.SecureAdminHelper;
-import com.sun.enterprise.config.serverbeans.SecureAdminHelper.SecureAdminCommandException;
-import com.sun.enterprise.config.serverbeans.SecureAdminPrincipal;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.security.ssl.SSLUtils;
import java.io.IOException;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -31,19 +24,28 @@
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
+
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
import org.glassfish.api.admin.RuntimeType;
-import jakarta.inject.Inject;
-import org.glassfish.api.admin.AccessRequired;
-
-import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.TransactionFailure;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecureAdmin;
+import com.sun.enterprise.config.serverbeans.SecureAdminHelper;
+import com.sun.enterprise.config.serverbeans.SecureAdminHelper.SecureAdminCommandException;
+import com.sun.enterprise.config.serverbeans.SecureAdminPrincipal;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.security.ssl.SSLUtils;
+
+import jakarta.inject.Inject;
+
/**
* Records that secure admin is to be used and adjusts each admin listener configuration in the domain to use secure admin.
*
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 2001853..c71df3b 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
@@ -16,15 +16,16 @@
package com.sun.enterprise.security.admin.cli;
-import com.sun.enterprise.config.serverbeans.AdminService;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.JmxConnector;
-import com.sun.enterprise.config.serverbeans.SecureAdmin;
-import com.sun.enterprise.config.serverbeans.SecureAdminHelper.SecureAdminCommandException;
-import com.sun.enterprise.security.SecurityLoggerInfo;
+import java.beans.PropertyVetoException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.grizzly.config.dom.FileCache;
import org.glassfish.grizzly.config.dom.Http;
import org.glassfish.grizzly.config.dom.HttpRedirect;
@@ -35,21 +36,22 @@
import org.glassfish.grizzly.config.dom.ProtocolFinder;
import org.glassfish.grizzly.config.dom.Protocols;
import org.glassfish.grizzly.config.dom.Ssl;
-import java.beans.PropertyVetoException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.glassfish.api.ActionReport;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import jakarta.inject.Inject;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.Transaction;
import org.jvnet.hk2.config.TransactionFailure;
+import com.sun.enterprise.config.serverbeans.AdminService;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Configs;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.JmxConnector;
+import com.sun.enterprise.config.serverbeans.SecureAdmin;
+import com.sun.enterprise.config.serverbeans.SecureAdminHelper.SecureAdminCommandException;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+
+import jakarta.inject.Inject;
+
/**
* Provides common behavior for the enable and disable secure admin commands.
* <p>
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java
index 5c769e2..65ba769 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java
@@ -16,16 +16,11 @@
package com.sun.enterprise.security.admin.cli;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.SecureAdmin;
-import com.sun.enterprise.security.SecurityLoggerInfo;
import java.beans.PropertyChangeEvent;
import java.util.logging.Logger;
import org.glassfish.hk2.runlevel.RunLevel;
import org.glassfish.internal.api.PostStartupRunLevel;
-import jakarta.inject.Inject;
-
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.Changed;
import org.jvnet.hk2.config.Changed.TYPE;
@@ -35,6 +30,12 @@
import org.jvnet.hk2.config.NotProcessed;
import org.jvnet.hk2.config.UnprocessedChangeEvents;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecureAdmin;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+
+import jakarta.inject.Inject;
+
/**
* Tracks changes to secure admin configuration, basically so it can report restart-required.
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java
index 990e8a1..e8242b2 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java
@@ -16,21 +16,6 @@
package com.sun.enterprise.security.admin.cli;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.HttpService;
-import com.sun.enterprise.config.serverbeans.SecureAdmin;
-import com.sun.enterprise.config.serverbeans.SecureAdminHelper.SecureAdminCommandException;
-import com.sun.enterprise.config.serverbeans.VirtualServer;
-import com.sun.enterprise.security.SecurityUpgradeService;
-import com.sun.enterprise.universal.process.ProcessManager;
-import com.sun.enterprise.universal.process.ProcessManagerException;
-import com.sun.enterprise.util.net.NetUtils;
-import org.glassfish.grizzly.config.dom.NetworkConfig;
-import org.glassfish.grizzly.config.dom.NetworkListener;
-import org.glassfish.grizzly.config.dom.NetworkListeners;
-import org.glassfish.grizzly.config.dom.Protocol;
-import org.glassfish.grizzly.config.dom.Ssl;
import java.beans.PropertyVetoException;
import java.io.BufferedInputStream;
import java.io.File;
@@ -49,18 +34,36 @@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
import org.glassfish.config.support.GrizzlyConfigSchemaMigrator;
-import jakarta.inject.Inject;
-import org.jvnet.hk2.annotations.Service;
+import org.glassfish.grizzly.config.dom.NetworkConfig;
+import org.glassfish.grizzly.config.dom.NetworkListener;
+import org.glassfish.grizzly.config.dom.NetworkListeners;
+import org.glassfish.grizzly.config.dom.Protocol;
+import org.glassfish.grizzly.config.dom.Ssl;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.internal.api.Globals;
import org.glassfish.security.common.MasterPassword;
+import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.RetryableException;
import org.jvnet.hk2.config.Transaction;
import org.jvnet.hk2.config.TransactionFailure;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Configs;
+import com.sun.enterprise.config.serverbeans.HttpService;
+import com.sun.enterprise.config.serverbeans.SecureAdmin;
+import com.sun.enterprise.config.serverbeans.SecureAdminHelper.SecureAdminCommandException;
+import com.sun.enterprise.config.serverbeans.VirtualServer;
+import com.sun.enterprise.security.SecurityUpgradeService;
+import com.sun.enterprise.universal.process.ProcessManager;
+import com.sun.enterprise.universal.process.ProcessManagerException;
+import com.sun.enterprise.util.net.NetUtils;
+
+import jakarta.inject.Inject;
+
/**
* Upgrades older config to current.
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java
index f1bbb52..eb78031 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java
@@ -16,6 +16,19 @@
package com.sun.enterprise.security.admin.cli;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Enumeration;
+
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
import com.sun.enterprise.config.serverbeans.AdminService;
import com.sun.enterprise.config.serverbeans.AuthRealm;
import com.sun.enterprise.config.serverbeans.SecureAdminHelper;
@@ -26,21 +39,10 @@
import com.sun.enterprise.security.auth.realm.file.FileRealmUser;
import com.sun.enterprise.security.ssl.SSLUtils;
import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.Enumeration;
-import org.glassfish.api.admin.ServerEnvironment;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.jvnet.hk2.annotations.Service;
-import org.glassfish.hk2.api.PerLookup;
-
/**
* Various utility methods which support secure admin operations.
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java
index 338dbe5..3affb11 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java
@@ -16,6 +16,21 @@
package com.sun.enterprise.security.admin.cli;
+import java.io.IOException;
+import java.security.KeyStoreException;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.glassfish.grizzly.config.dom.NetworkConfig;
+import org.glassfish.grizzly.config.dom.Protocol;
+import org.glassfish.hk2.api.PerLookup;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.RetryableException;
+import org.jvnet.hk2.config.Transaction;
+import org.jvnet.hk2.config.TransactionFailure;
+
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.SecureAdmin;
@@ -26,21 +41,8 @@
import com.sun.enterprise.security.admin.cli.SecureAdminCommand.TopLevelContext;
import com.sun.enterprise.security.admin.cli.SecureAdminCommand.Work;
import com.sun.enterprise.security.ssl.SSLUtils;
-import java.io.IOException;
-import java.security.KeyStoreException;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.UUID;
-import org.glassfish.grizzly.config.dom.NetworkConfig;
-import org.glassfish.grizzly.config.dom.Protocol;
-import jakarta.inject.Inject;
-import org.jvnet.hk2.annotations.Service;
-import org.glassfish.hk2.api.PerLookup;
-import org.glassfish.hk2.api.ServiceLocator;
-import org.jvnet.hk2.config.RetryableException;
-import org.jvnet.hk2.config.Transaction;
-import org.jvnet.hk2.config.TransactionFailure;
+import jakarta.inject.Inject;
/**
* Common logic for formal upgrade (i.e., start-domain --upgrade) and silent upgrade (starting a newer version of GlassFish using
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 7a6d82bd..e9dd496 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
@@ -22,19 +22,16 @@
package com.sun.enterprise.security.audit;
-import com.sun.enterprise.security.BaseAuditModule;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.config.serverbeans.AuditModule;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Map;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.SecurityService;
+import org.glassfish.api.admin.ServerEnvironment;
/*V3:Commented
import com.sun.enterprise.config.serverbeans.ServerBeansFactory;
import com.sun.enterprise.config.serverbeans.ElementProperty;
@@ -42,12 +39,15 @@
import com.sun.enterprise.server.ApplicationServer;
*/
import org.glassfish.internal.api.ServerContext;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import java.util.List;
-import org.glassfish.api.admin.ServerEnvironment;
-import jakarta.inject.Inject;
-
import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.BaseAuditModule;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
+import jakarta.inject.Inject;
import jakarta.inject.Singleton;
/**
@@ -259,6 +259,7 @@
*
* @see com.sun.appserv.security.BaseAuditModule.authentication
*/
+ @Override
public void authentication(final String user, final String realm, final boolean success) {
if (auditOn) {
for (BaseAuditModule am : instances) {
@@ -274,6 +275,7 @@
}
}
+ @Override
public void serverStarted() {
if (auditOn) {
for (BaseAuditModule am : instances) {
@@ -289,6 +291,7 @@
}
}
+ @Override
public void serverShutdown() {
if (auditOn) {
for (BaseAuditModule am : instances) {
@@ -308,6 +311,7 @@
this.auditOn = auditOn;
}
+ @Override
public boolean isAuditOn() {
return auditOn;
}
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 d9339b2..58191aa 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
@@ -48,6 +48,7 @@
*
* @return An integer value indicating the status of the authentication
*/
+ @Override
public int getStatus() {
return status;
}
@@ -58,6 +59,7 @@
*
* @return A byte array of zero length.
*/
+ @Override
public byte[] getContinuationData() {
return new byte[0];
}
@@ -68,6 +70,7 @@
*
* @return A byte array of zero length.
*/
+ @Override
public byte[] getAuthSpecificData() {
return new byte[0];
}
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 8fc07be..a309c0e 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
@@ -16,8 +16,6 @@
package com.sun.enterprise.security.auth;
-import java.rmi.*;
-
/**
* This remote interface enables the deployment tool to query the details of the Privilege.
*
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 dc0b5ab..178c747 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
@@ -16,8 +16,6 @@
package com.sun.enterprise.security.auth;
-import java.rmi.*;
-
/**
* This method provides an implementation a Privilege
*
@@ -38,6 +36,7 @@
/**
* Returns the hashCode ..
*/
+ @Override
public int hashCode() {
return name.hashCode();
}
@@ -47,6 +46,7 @@
*
* @return The name of the name of the Privilege.
*/
+ @Override
public String getName() {
return name;
}
@@ -54,6 +54,7 @@
/**
* Compares equality...
*/
+ @Override
public boolean equals(Object obj) {
if (obj instanceof Privilege) {
Privilege priv = (Privilege) obj;
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 60b1d9a..406a424 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
@@ -16,9 +16,9 @@
package com.sun.enterprise.security.auth;
-import com.sun.enterprise.util.*;
import javax.rmi.PortableRemoteObject;
import javax.rmi.CORBA.Tie;
+
import org.omg.CORBA.ORB;
/**
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java
index 052be11..c5d3fbf 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java
@@ -16,25 +16,30 @@
package com.sun.enterprise.security.auth.login;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.security.auth.login.common.X509CertificateCredential;
-import java.util.Map;
-import java.util.Enumeration;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
-import javax.security.auth.*;
-import javax.security.auth.callback.*;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.ChoiceCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+
+import org.glassfish.internal.api.Globals;
+import org.glassfish.security.common.PrincipalImpl;
+
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.security.auth.login.common.X509CertificateCredential;
+import com.sun.enterprise.security.integration.AppClientSSL;
//V3:Commented import com.sun.enterprise.config.clientbeans.Ssl;
import com.sun.enterprise.security.ssl.SSLUtils;
-import com.sun.enterprise.security.integration.AppClientSSL;
-
-import org.glassfish.security.common.PrincipalImpl;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import java.util.logging.*;
-import com.sun.logging.*;
-import org.glassfish.internal.api.Globals;
/**
* <p>
@@ -101,6 +106,7 @@
*
* @param options options specified in the login <code>Configuration</code> for this particular <code>LoginModule</code>.
*/
+ @Override
public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
this.subject = subject;
@@ -122,6 +128,7 @@
*
* @exception LoginException if this <code>LoginModule</code> is unable to perform the authentication.
*/
+ @Override
public boolean login() throws LoginException {
// prompt for a username and password
@@ -202,6 +209,7 @@
*
* @return true if this LoginModule's own login and commit attempts succeeded, or false otherwise.
*/
+ @Override
public boolean commit() throws LoginException {
if (succeeded == false) {
return false;
@@ -253,6 +261,7 @@
*
* @return false if this LoginModule's own login and/or commit attempts failed, and true otherwise.
*/
+ @Override
public boolean abort() throws LoginException {
if (succeeded == false) {
return false;
@@ -281,6 +290,7 @@
*
* @return true in all cases since this <code>LoginModule</code> should not be ignored.
*/
+ @Override
public boolean logout() throws LoginException {
// unset the alias
ssl = null;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java
index e52bf70..f00fff8 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java
@@ -16,19 +16,26 @@
package com.sun.enterprise.security.auth.login;
-import java.util.*;
-import javax.security.auth.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.login.*;
-import javax.security.auth.spi.*;
-import com.sun.enterprise.security.auth.login.common.PasswordCredential;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
import org.glassfish.security.common.PrincipalImpl;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import java.util.logging.*;
-import com.sun.logging.*;
import com.sun.enterprise.security.SecurityLoggerInfo;
import com.sun.enterprise.security.UsernamePasswordStore;
+import com.sun.enterprise.security.auth.login.common.PasswordCredential;
+import com.sun.enterprise.util.LocalStringManagerImpl;
/**
* <p>
@@ -83,6 +90,7 @@
*
* @param options options specified in the login <code>Configuration</code> for this particular <code>LoginModule</code>.
*/
+ @Override
public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
this.subject = subject;
@@ -104,6 +112,7 @@
*
* @exception LoginException if this <code>LoginModule</code> is unable to perform the authentication.
*/
+ @Override
public boolean login() throws LoginException {
// prompt for a username and password
@@ -201,6 +210,7 @@
*
* @return true if this LoginModule's own login and commit attempts succeeded, or false otherwise.
*/
+ @Override
public boolean commit() throws LoginException {
if (succeeded == false) {
return false;
@@ -247,6 +257,7 @@
*
* @return false if this LoginModule's own login and/or commit attempts failed, and true otherwise.
*/
+ @Override
public boolean abort() throws LoginException {
if (succeeded == false) {
return false;
@@ -281,6 +292,7 @@
*
* @return true in all cases since this <code>LoginModule</code> should not be ignored.
*/
+ @Override
public boolean logout() throws LoginException {
subject.getPrincipals().remove(userPrincipal);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/DistinguishedPrincipalCredential.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/DistinguishedPrincipalCredential.java
index 90aa80e..8f11b5e 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/DistinguishedPrincipalCredential.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/DistinguishedPrincipalCredential.java
@@ -29,6 +29,7 @@
return prin;
}
+ @Override
public String toString() {
return "DistingushedPrincipal: " + prin;
}
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java
index fc3644e..572d1c1 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java
@@ -16,15 +16,12 @@
package com.sun.enterprise.security.auth.login;
-import java.util.*;
import java.util.logging.Level;
-import javax.security.auth.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.login.*;
-import javax.security.auth.spi.*;
-import com.sun.enterprise.security.auth.realm.file.FileRealm;
+
import javax.security.auth.login.LoginException;
+import com.sun.enterprise.security.auth.realm.file.FileRealm;
+
/**
* File realm login module.
*
@@ -43,6 +40,7 @@
* @throws LoginException If login fails (JAAS login() behavior).
*
*/
+ @Override
protected void authenticate() throws LoginException {
if (!(_currentRealm instanceof FileRealm)) {
String msg = sm.getString("filelm.badrealm");
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java
index e8ae812..a3769b2 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java
@@ -16,8 +16,7 @@
package com.sun.enterprise.security.auth.login;
-import com.sun.enterprise.security.auth.login.PasswordLoginModule;
-import javax.security.auth.login.*;
+import javax.security.auth.login.LoginException;
import com.sun.enterprise.security.auth.realm.ldap.LDAPRealm;
@@ -54,6 +53,7 @@
* Performs authentication for the current user.
*
*/
+ @Override
protected void authenticate() throws LoginException {
if (!(_currentRealm instanceof LDAPRealm)) {
String msg = sm.getString("ldaplm.badrealm");
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 73d328b..c7075d4 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
@@ -16,12 +16,16 @@
package com.sun.enterprise.security.auth.login;
-import java.io.*;
-import javax.security.auth.callback.*;
+import java.io.IOException;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.security.TextLoginDialog;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
import com.sun.enterprise.security.GUILoginDialog;
+import com.sun.enterprise.security.TextLoginDialog;
+import com.sun.enterprise.util.LocalStringManagerImpl;
/**
* This is the default callback handler provided by the application client container. The container tries to use the application
@@ -62,6 +66,7 @@
*
* @param the callback object instances supported by the login module.
*/
+ @Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
if (isGUI) {
String user = localStrings.getLocalString("login.user", "user");
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 993d4d0..4a06d2d 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
@@ -16,36 +16,40 @@
package com.sun.enterprise.security.auth.login;
-import org.glassfish.security.common.Group;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Enumeration;
import java.security.Principal;
-import java.util.logging.*;
import java.security.PrivilegedAction;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.x500.X500Principal;
-import com.sun.enterprise.common.iiop.security.GSSUPName;
+
+import org.glassfish.internal.api.Globals;
+import org.glassfish.security.common.Group;
+
import com.sun.enterprise.common.iiop.security.AnonCredential;
+import com.sun.enterprise.common.iiop.security.GSSUPName;
import com.sun.enterprise.security.SecurityContext;
import com.sun.enterprise.security.SecurityLoggerInfo;
import com.sun.enterprise.security.SecurityServicesUtil;
import com.sun.enterprise.security.audit.AuditManager;
-import com.sun.enterprise.security.common.AppservAccessController;
-import com.sun.enterprise.security.auth.login.common.PasswordCredential;
-import com.sun.enterprise.security.auth.login.common.X509CertificateCredential;
-import com.sun.enterprise.security.auth.login.common.ServerLoginCallbackHandler;
import com.sun.enterprise.security.auth.login.common.LoginException;
-import com.sun.enterprise.security.auth.realm.Realm;
-import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm;
+import com.sun.enterprise.security.auth.login.common.PasswordCredential;
+import com.sun.enterprise.security.auth.login.common.ServerLoginCallbackHandler;
+import com.sun.enterprise.security.auth.login.common.X509CertificateCredential;
// FIXME: ACC methods need to be moved to ACC-specific class.
import com.sun.enterprise.security.auth.realm.InvalidOperationException;
import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+import com.sun.enterprise.security.auth.realm.Realm;
+import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm;
+import com.sun.enterprise.security.common.AppservAccessController;
import com.sun.enterprise.security.common.ClientSecurityContext;
import com.sun.enterprise.security.common.SecurityConstants;
-import org.glassfish.internal.api.Globals;
/**
*
@@ -110,6 +114,7 @@
final PasswordCredential pc = new PasswordCredential(username, password, realmName);
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
fs.getPrivateCredentials().add(pc);
return fs;
@@ -230,6 +235,7 @@
final GSSUPName name = new GSSUPName(username, realmName);
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
s.getPrincipals().add(p);
s.getPublicCredentials().add(name);
@@ -370,6 +376,7 @@
final PasswordCredential pc = new PasswordCredential(username, password, realmName);
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
fs.getPrivateCredentials().add(pc);
return fs;
@@ -433,6 +440,7 @@
userName = x500Principal.getName();
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
fs.getPublicCredentials().add(x500Principal);
return fs;
@@ -491,6 +499,7 @@
if (groups != null && groups.hasMoreElements()) {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
while (groups.hasMoreElements()) {
String grp = (String) groups.nextElement();
@@ -663,6 +672,7 @@
Object obj = null;
try {
obj = AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
return iter.next();
}
@@ -690,6 +700,7 @@
final Class<?> cl = cls;
final Set credset = (Set) AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
return s.getPrivateCredentials(cl);
}
@@ -709,6 +720,7 @@
Object obj = null;
try {
obj = AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
return iter.next();
}
@@ -764,6 +776,7 @@
if (type == SecurityConstants.USERNAME_PASSWORD) {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lg = new LoginContext(SecurityConstants.CLIENT_JAAS_PASSWORD, subject, handler);
@@ -779,6 +792,7 @@
return subject;
} else if (type == SecurityConstants.CERTIFICATE) {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lg = new LoginContext(SecurityConstants.CLIENT_JAAS_CERTIFICATE, subject, handler);
@@ -794,6 +808,7 @@
return subject;
} else if (type == SecurityConstants.ALL) {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lgup = new LoginContext(SecurityConstants.CLIENT_JAAS_PASSWORD, subject, handler);
@@ -813,6 +828,7 @@
return subject;
} else {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lg = new LoginContext(SecurityConstants.CLIENT_JAAS_PASSWORD, subject, handler);
@@ -893,6 +909,7 @@
final Class<?> clas = clazz;
final Subject fs = subject;
Set credset = (Set) AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
if (_logger.isLoggable(Level.FINEST)) {
_logger.log(Level.FINEST, "LCD post login subject :" + fs);
@@ -905,6 +922,7 @@
Object obj = null;
try {
obj = AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
return iter.next();
}
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 7685e35..064689d 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
@@ -16,9 +16,10 @@
package com.sun.enterprise.security.auth.login;
+import javax.security.auth.login.LoginException;
+
import com.sun.enterprise.security.BasePasswordLoginModule;
import com.sun.enterprise.security.auth.realm.Realm;
-import javax.security.auth.login.LoginException;
/**
* Abstract base class for password-based login modules. This class is provided for backward compatibility and is a candidate for
@@ -74,6 +75,7 @@
*
* @throws LoginException
*/
+ @Override
protected final void authenticateUser() throws LoginException {
authenticate();
}
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java
index ece84d8..96d3726 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java
@@ -16,26 +16,12 @@
package com.sun.enterprise.security.auth.login;
-import java.util.*;
-
-import java.util.logging.Logger;
import java.util.logging.Level;
-import javax.security.auth.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.login.*;
-import javax.security.auth.spi.*;
+import javax.security.auth.login.LoginException;
import com.sun.enterprise.security.auth.realm.solaris.SolarisRealm;
-// limit RI imports
-import com.sun.enterprise.security.auth.Privilege;
-import com.sun.enterprise.security.auth.PrivilegeImpl;
-
-import com.sun.enterprise.security.auth.realm.Realm;
-import com.sun.enterprise.security.auth.login.common.PasswordCredential;
-import javax.security.auth.login.LoginException;
-
/**
* Solaris realm login module.
*
@@ -54,6 +40,7 @@
* @throws LoginException If login fails (JAAS login() behavior).
*
*/
+ @Override
protected void authenticate() throws LoginException {
if (!(_currentRealm instanceof SolarisRealm)) {
String msg = sm.getString("solarislm.badrealm");
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 a6c85b8..c3d53bb 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
@@ -118,6 +118,7 @@
* @param the object that this instance is being compared to.
* @return true if the instances are equal, false otherwise
*/
+ @Override
public boolean equals(Object o) {
if (o instanceof PasswordCredential) {
PasswordCredential pc = (PasswordCredential) o;
@@ -133,6 +134,7 @@
*
* @return the hash code.
*/
+ @Override
public int hashCode() {
return username.hashCode() + Arrays.hashCode(password) + realm.hashCode();
}
@@ -140,6 +142,7 @@
/**
* The string representation of the credential.
*/
+ @Override
public String toString() {
String s = "Realm=" + realm;
s = s + " Username=" + username;
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 456f05b..c78e2be 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
@@ -16,11 +16,17 @@
package com.sun.enterprise.security.auth.login.common;
-import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm;
-import java.io.*;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import javax.security.auth.callback.*;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm;
/**
* This is the default callback handler provided by the application client container. The container tries to use the application
@@ -67,6 +73,7 @@
*
* @param the callback object instances supported by the login module.
*/
+ @Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof NameCallback) {
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 0a89c6c..54aa6d6 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
@@ -75,6 +75,7 @@
*
* @return true if the instances are equal, false otherwise.
*/
+ @Override
public boolean equals(Object o) {
if (o instanceof X509CertificateCredential) {
X509CertificateCredential pc = (X509CertificateCredential) o;
@@ -96,6 +97,7 @@
*
* @return the hash code.
*/
+ @Override
public int hashCode() {
return Arrays.hashCode(certChain) + realm.hashCode() + ((alias != null) ? alias.hashCode() : 0);
}
@@ -103,6 +105,7 @@
/**
* String representation of the credential.
*/
+ @Override
public String toString() {
String s = "Realm=" + realm;
s = s + " alias=" + alias;
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 a427a48..2fca353 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
@@ -16,9 +16,6 @@
package com.sun.enterprise.security.auth.realm;
-import java.security.Principal;
-import com.sun.enterprise.security.auth.*;
-
/**
* This interface is used by the Authentication Service to have the Principal authenticated by the realm. A realm provides an
* implementation of this interface.
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 b487b75..18daa17 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
@@ -16,14 +16,20 @@
package com.sun.enterprise.security.auth.realm;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.security.util.IASSecurityException;
-import java.io.*;
-import java.util.*;
-import com.sun.enterprise.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.glassfish.external.probe.provider.PluginPoint;
import org.glassfish.external.probe.provider.StatsProviderManager;
import org.glassfish.hk2.api.ServiceLocator;
@@ -31,6 +37,10 @@
import org.glassfish.internal.api.Globals;
import org.jvnet.hk2.annotations.Contract;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.security.util.IASSecurityException;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
/**
* javadoc
*
@@ -119,6 +129,7 @@
* objects (i.e. there's only a partial order defined, in the case that those other objects compare themselves "before" a realm
* object).
*/
+ @Override
public int compareTo(Object realm) {
if (!(realm instanceof Realm)) {
return 1;
@@ -206,6 +217,7 @@
* @param realmName Name of the new realm.
* @param f File containing Properties for the new realm.
*/
+ @Deprecated
public static synchronized Realm instantiate(String realmName, File f)
throws NoSuchRealmException, BadRealmException, FileNotFoundException {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java
index 9b87b8d..fac3d14 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java
@@ -16,15 +16,16 @@
package com.sun.enterprise.security.auth.realm;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-
-import org.jvnet.hk2.config.types.Property;
import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+
/**
* RealmConfig usable by standalone : Admin CLI for creating Realms It has a subset of functionality defined in
* com.sun.enterprise.security.RealmConfig
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java
index 90e1af0..e02c5a8 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java
@@ -16,12 +16,14 @@
package com.sun.enterprise.security.auth.realm;
-import org.glassfish.external.statistics.CountStatistic;
-import org.glassfish.external.statistics.impl.CountStatisticImpl;
import org.glassfish.external.probe.provider.annotations.ProbeListener;
import org.glassfish.external.probe.provider.annotations.ProbeParam;
-
-import org.glassfish.gmbal.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.gmbal.AMXMetadata;
+import org.glassfish.gmbal.Description;
+import org.glassfish.gmbal.ManagedAttribute;
+import org.glassfish.gmbal.ManagedObject;
/**
*
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 c79fc52..07eac0f 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
@@ -27,10 +27,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.inject.Singleton;
-
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.ServiceLocator;
@@ -44,6 +40,10 @@
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.security.SecurityLoggerInfo;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+
/**
*
* @author kumar.jayanti
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java
index 9351da6..97349b1 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java
@@ -16,9 +16,9 @@
package com.sun.enterprise.security.auth.realm;
-import org.glassfish.external.probe.provider.annotations.ProbeProvider;
import org.glassfish.external.probe.provider.annotations.Probe;
import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java
index f9a352e..cba811a 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java
@@ -17,7 +17,6 @@
package com.sun.enterprise.security.auth.realm;
import java.security.Principal;
-
import java.util.Enumeration;
/**
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 f517e26..b33ee5a 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
@@ -16,26 +16,28 @@
package com.sun.enterprise.security.auth.realm.certificate;
-import com.sun.enterprise.security.SecurityContext;
-import com.sun.enterprise.security.auth.login.DistinguishedPrincipalCredential;
-import java.util.*;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Vector;
import java.util.logging.Level;
import javax.security.auth.Subject;
-
-import org.glassfish.security.common.Group;
-import com.sun.enterprise.security.auth.realm.BadRealmException;
-import com.sun.enterprise.security.auth.realm.NoSuchUserException;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import com.sun.enterprise.security.auth.realm.InvalidOperationException;
-
-import com.sun.enterprise.security.auth.realm.IASRealm;
-import java.security.Principal;
import javax.security.auth.callback.Callback;
import javax.security.auth.x500.X500Principal;
+import org.glassfish.security.common.Group;
import org.jvnet.hk2.annotations.Service;
+import com.sun.enterprise.security.SecurityContext;
+import com.sun.enterprise.security.auth.login.DistinguishedPrincipalCredential;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.IASRealm;
+import com.sun.enterprise.security.auth.realm.InvalidOperationException;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+
/**
* Realm wrapper for supporting certificate authentication.
*
@@ -87,6 +89,7 @@
* @exception NoSuchRealmException If the configuration parameters specify a realm which doesn't exist.
*
*/
+ @Override
protected void init(Properties props) throws BadRealmException, NoSuchRealmException {
super.init(props);
String[] groups = addAssignGroups(null);
@@ -138,6 +141,7 @@
*
* @return Description of the kind of authentication that is directly supported by this realm.
*/
+ @Override
public String getAuthType() {
return AUTH_TYPE;
}
@@ -151,6 +155,7 @@
* support this operation.
*
*/
+ @Override
public Enumeration getGroupNames(String username) throws NoSuchUserException, InvalidOperationException {
// This is called during web container role check, not during
// EJB container role cheks... fix RI for consistency.
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java
index ca52790..d6315b7 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java
@@ -16,12 +16,14 @@
package com.sun.enterprise.security.auth.realm.file;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.glassfish.security.common.FileRealmHelper;
import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
import com.sun.enterprise.security.auth.realm.Realm;
import com.sun.enterprise.security.auth.realm.User;
-import org.glassfish.security.common.FileRealmHelper;
/**
* Represents a FileRealm user.
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java
index 1df7e20..8f213ac 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java
@@ -16,23 +16,24 @@
package com.sun.enterprise.security.auth.realm.ldap;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.security.SecurityServicesUtil;
-import com.sun.enterprise.security.ssl.SSLUtils;
-import com.sun.enterprise.util.i18n.StringManager;
import java.io.IOException;
+import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.Comparator;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
-import java.net.InetAddress;
import org.glassfish.internal.api.Globals;
import org.glassfish.internal.api.SharedSecureRandom;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.security.ssl.SSLUtils;
+import com.sun.enterprise.util.i18n.StringManager;
+
/**
* Custom socket factory for ldaps (SSL).
*
@@ -65,6 +66,7 @@
/**
* @see javax.net.SocketFactory#createSocket(java.lang.String, int)
*/
+ @Override
public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException {
return socketFactory.createSocket(arg0, arg1);
}
@@ -72,6 +74,7 @@
/**
* @see javax.net.SocketFactory#createSocket(java.net.InetAddress, int)
*/
+ @Override
public Socket createSocket(InetAddress arg0, int arg1) throws IOException {
return socketFactory.createSocket(arg0, arg1);
}
@@ -79,6 +82,7 @@
/**
* @see javax.net.SocketFactory#createSocket(java.lang.String, int, java.net.InetAddress, int)
*/
+ @Override
public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, UnknownHostException {
return socketFactory.createSocket(arg0, arg1, arg2, arg3);
}
@@ -86,10 +90,12 @@
/**
* @see javax.net.SocketFactory#createSocket(java.net.InetAddress, int, java.net.InetAddress, int)
*/
+ @Override
public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException {
return socketFactory.createSocket(arg0, arg1, arg2, arg3);
}
+ @Override
public int compare(SocketFactory s1, SocketFactory s2) {
return s1.getClass().toString().compareTo(s2.getClass().toString());
}
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 97525c0..aa8aea4 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
@@ -16,8 +16,16 @@
package com.sun.enterprise.security.auth.realm.ldap;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+import java.util.Vector;
import java.util.logging.Level;
+import java.util.regex.Matcher;
+
import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.InvalidNameException;
@@ -28,20 +36,19 @@
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import javax.security.auth.login.LoginException;
-import com.sun.enterprise.security.auth.realm.BadRealmException;
-import com.sun.enterprise.security.auth.realm.NoSuchUserException;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import com.sun.enterprise.security.auth.realm.InvalidOperationException;
-
-import com.sun.enterprise.security.auth.realm.IASRealm;
-import java.lang.StringBuffer;
-import java.util.regex.Matcher;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
+import javax.security.auth.login.LoginException;
+
import org.glassfish.internal.api.RelativePathResolver;
import org.jvnet.hk2.annotations.Service;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.IASRealm;
+import com.sun.enterprise.security.auth.realm.InvalidOperationException;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+
/**
* Realm wrapper for supporting LDAP authentication.
*
@@ -151,6 +158,7 @@
* @exception NoSuchRealmException If the configuration parameters specify a realm which doesn't exist.
*
*/
+ @Override
public synchronized void init(Properties props) throws BadRealmException, NoSuchRealmException {
super.init(props);
String url = props.getProperty(PARAM_DIRURL);
@@ -275,6 +283,7 @@
*
* @return Description of the kind of authentication that is directly supported by this realm.
*/
+ @Override
public String getAuthType() {
return AUTH_TYPE;
}
@@ -372,6 +381,7 @@
* @exception InvalidOperationException thrown if the realm does not support this operation - e.g. Certificate realm does not
* support this operation.
*/
+ @Override
public Enumeration getGroupNames(String username) throws InvalidOperationException, NoSuchUserException {
Vector v = (Vector) groupCache.get(username);
if (v == null) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java
index 974df3d..7a3a70a 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java
@@ -16,17 +16,20 @@
package com.sun.enterprise.security.auth.realm.solaris;
-import java.util.*;
-
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.Vector;
import java.util.logging.Level;
-import com.sun.enterprise.security.auth.realm.IASRealm;
-import com.sun.enterprise.security.auth.realm.BadRealmException;
-import com.sun.enterprise.security.auth.realm.NoSuchUserException;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import com.sun.enterprise.security.auth.realm.InvalidOperationException;
import org.jvnet.hk2.annotations.Service;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.IASRealm;
+import com.sun.enterprise.security.auth.realm.InvalidOperationException;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+
/**
* Realm wrapper for supporting Solaris authentication.
*
@@ -70,6 +73,7 @@
* @exception NoSuchRealmException If the configuration parameters specify a realm which doesn't exist.
*
*/
+ @Override
public synchronized void init(Properties props) throws BadRealmException, NoSuchRealmException {
super.init(props);
String jaasCtx = props.getProperty(IASRealm.JAAS_CONTEXT_PARAM);
@@ -97,6 +101,7 @@
*
* @return Description of the kind of authentication that is directly supported by this realm.
*/
+ @Override
public String getAuthType() {
return AUTH_TYPE;
}
@@ -110,6 +115,7 @@
* @exception InvalidOperationException thrown if the realm does not support this operation - e.g. Certificate realm does not
* support this operation.
*/
+ @Override
public Enumeration getGroupNames(String username) throws InvalidOperationException, NoSuchUserException {
Vector v = (Vector) groupCache.get(username);
if (v == null) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java
index ffac22a..542e584 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java
@@ -16,6 +16,10 @@
package com.sun.enterprise.security.cli;
+import java.util.List;
+
+import org.glassfish.api.ActionReport;
+
import com.sun.enterprise.config.serverbeans.AuthRealm;
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
@@ -24,8 +28,6 @@
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.config.serverbeans.Server;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import java.util.List;
-import org.glassfish.api.ActionReport;
/**
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java
index c2837bc..de383ae 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java
@@ -16,41 +16,35 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.AdminService;
-import java.lang.annotation.Annotation;
import java.util.Enumeration;
+import java.util.List;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.SecureAdmin;
-import com.sun.enterprise.security.auth.realm.file.FileRealm;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.security.auth.realm.RealmsManager;
-import com.sun.enterprise.util.SystemPropertyConstants;
-import java.util.List;
import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
-import org.glassfish.api.admin.ServerEnvironment;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
-import org.glassfish.internal.api.Target;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AdminService;
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Configs;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecureAdmin;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.security.auth.realm.file.FileRealm;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
+import jakarta.inject.Inject;
/**
* Change Admin Password Command
@@ -137,6 +131,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java
index 4d48c89..ed0e6a7 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java
@@ -16,41 +16,38 @@
package com.sun.enterprise.security.cli;
-import org.jvnet.hk2.config.types.Property;
+import java.beans.PropertyVetoException;
import java.util.List;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.AuditModule;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.security.SecurityConfigListener;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.util.SystemPropertyConstants;
-
-import java.beans.PropertyVetoException;
import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AuditModule;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.SecurityConfigListener;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Create Audit Module Command
@@ -111,6 +108,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
@@ -130,6 +128,7 @@
try {
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
AuditModule newAuditModule = param.createChild(AuditModule.class);
populateAuditModuleElement(newAuditModule);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java
index 3b1bd91..8316334 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java
@@ -16,45 +16,40 @@
package com.sun.enterprise.security.cli;
-import java.util.List;
+import java.beans.PropertyVetoException;
import java.util.Properties;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.security.SecurityConfigListener;
-import com.sun.enterprise.security.common.Util;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-
-import com.sun.enterprise.util.SystemPropertyConstants;
-import java.beans.PropertyVetoException;
import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.PropertyResolver;
import org.glassfish.config.support.TargetType;
-import org.glassfish.internal.api.RelativePathResolver;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Configs;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.SecurityConfigListener;
+import com.sun.enterprise.security.common.Util;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* CLI command to create JACC Provider
@@ -130,6 +125,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
@@ -137,6 +133,7 @@
try {
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
AuthRealm newAuthRealm = param.createChild(AuthRealm.class);
populateAuthRealmElement(newAuthRealm);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
index 3dcf567..0445479 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
@@ -16,40 +16,48 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.AdminService;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.SecureAdmin;
-import com.sun.enterprise.security.auth.realm.file.FileRealm;
-import com.sun.enterprise.security.auth.realm.Realm;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.security.auth.realm.BadRealmException;
-import com.sun.enterprise.security.auth.realm.RealmsManager;
-import com.sun.enterprise.util.SystemPropertyConstants;
import java.beans.PropertyVetoException;
import java.io.File;
-import org.glassfish.api.admin.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RestParam;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AdminService;
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecureAdmin;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.Realm;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.security.auth.realm.file.FileRealm;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Create File User Command Usage: create-file-user [--terse=false] [--echo=false] [--interactive=true] [--host localhost]
@@ -138,6 +146,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
@@ -202,6 +211,7 @@
//hypothetically ?.
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
try {
realmsManager.createRealms(config);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java
index 263d0dc..ce2f628 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java
@@ -16,34 +16,36 @@
package com.sun.enterprise.security.cli;
+import java.beans.PropertyVetoException;
+import java.util.Properties;
+
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.JaccProvider;
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.SystemPropertyConstants;
-import java.beans.PropertyVetoException;
-import java.util.Properties;
-import org.glassfish.api.ActionReport;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.ExecuteOn;
-import org.glassfish.api.admin.RuntimeType;
-import org.glassfish.api.admin.ServerEnvironment;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.glassfish.api.admin.AccessRequired;
-import org.glassfish.api.admin.AdminCommandSecurity;
-
-import org.jvnet.hk2.annotations.Service;
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
/**
* Create Jacc Provider Command
@@ -119,6 +121,7 @@
try {
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
JaccProvider newJacc = param.createChild(JaccProvider.class);
newJacc.setName(jaccProviderName);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java
index b862b1a..4d2a71d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java
@@ -16,43 +16,41 @@
package com.sun.enterprise.security.cli;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.RequestPolicy;
+import java.beans.PropertyVetoException;
import java.util.List;
import java.util.Properties;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
-import com.sun.enterprise.config.serverbeans.ProviderConfig;
-import com.sun.enterprise.config.serverbeans.ResponsePolicy;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.util.SystemPropertyConstants;
-
-import java.beans.PropertyVetoException;
import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import org.jvnet.hk2.config.ConfigListener;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
+import com.sun.enterprise.config.serverbeans.ProviderConfig;
+import com.sun.enterprise.config.serverbeans.RequestPolicy;
+import com.sun.enterprise.config.serverbeans.ResponsePolicy;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Create Message Security Provider Command
@@ -153,6 +151,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
@@ -186,6 +185,7 @@
// No duplicate message security providers found. So add one.
try {
ConfigSupport.apply(new SingleConfigCode<MessageSecurityConfig>() {
+ @Override
public Object run(MessageSecurityConfig param) throws PropertyVetoException, TransactionFailure {
ProviderConfig newPC = param.createChild(ProviderConfig.class);
populateProviderConfigElement(newPC);
@@ -222,6 +222,7 @@
else {
try {
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
MessageSecurityConfig newMSC = param.createChild(MessageSecurityConfig.class);
newMSC.setAuthLayer(authLayer);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java
index 5dbc0db..6e63617 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java
@@ -16,20 +16,25 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import org.glassfish.api.admin.*;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
import jakarta.inject.Inject;
/**
@@ -77,6 +82,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java
index f844825..9f23b20 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java
@@ -16,38 +16,36 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.AuditModule;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import java.beans.PropertyVetoException;
+
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.security.SecurityConfigListener;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.util.SystemPropertyConstants;
-
-import java.beans.PropertyVetoException;
import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+
+import com.sun.enterprise.config.serverbeans.AuditModule;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.SecurityConfigListener;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Delete Audit Module Command
@@ -99,6 +97,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
ActionReport report = context.getActionReport();
@@ -112,6 +111,7 @@
}
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
param.getAuditModule().remove(auditModule);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java
index 729eef7..e5b2b75 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java
@@ -16,36 +16,36 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Domain;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import java.beans.PropertyVetoException;
+
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.security.SecurityConfigListener;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-
-import com.sun.enterprise.util.SystemPropertyConstants;
-import java.beans.PropertyVetoException;
import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.SecurityConfigListener;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Delete Auth Realm Command
@@ -106,11 +106,13 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
ActionReport report = context.getActionReport();
try {
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
param.getAuthRealm().remove(authRealm);
//temporary fix - since the SecurityConfigListener is not being called on an realm delete.
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
index 0a8951e..57074a9 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
@@ -16,39 +16,45 @@
package com.sun.enterprise.security.cli;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.auth.realm.file.FileRealm;
-import com.sun.enterprise.security.auth.realm.BadRealmException;
-import com.sun.enterprise.security.auth.realm.NoSuchUserException;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.security.auth.realm.RealmsManager;
-import com.sun.enterprise.util.SystemPropertyConstants;
import java.beans.PropertyVetoException;
import java.io.File;
-import org.glassfish.api.admin.*;
+
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RestParam;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.security.auth.realm.file.FileRealm;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
/**
* Delete File User Command Usage: delete-file-user [--terse=false] [--echo=false] [--interactive=true] [--host localhost]
* [--port 4848|4849] [--secure | -s] [--user admin_user] [--passwordfile file_name] [--authrealmname authrealm_name] [--target
@@ -120,6 +126,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
@@ -162,6 +169,7 @@
//hypothetically ?.
try {
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
try {
realmsManager.createRealms(config);
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java
index dddce0b..26116cd 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java
@@ -16,34 +16,36 @@
package com.sun.enterprise.security.cli;
+import java.beans.PropertyVetoException;
+import java.util.List;
+
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.JaccProvider;
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.SystemPropertyConstants;
-import java.beans.PropertyVetoException;
-import java.util.List;
-import org.glassfish.api.ActionReport;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.ExecuteOn;
-import org.glassfish.api.admin.RuntimeType;
-import org.glassfish.api.admin.ServerEnvironment;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.glassfish.api.admin.AccessRequired;
-import org.glassfish.api.admin.AdminCommandSecurity;
-
-import org.jvnet.hk2.annotations.Service;
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
/**
* Usage: delete-jacc-provider [--help] [--user admin_user] [--passwordfile file_name] [ --target target_name] jacc_provider_name
@@ -116,6 +118,7 @@
final JaccProvider jaccprov = jprov;
ConfigSupport.apply(new SingleConfigCode<SecurityService>() {
+ @Override
public Object run(SecurityService param) throws PropertyVetoException, TransactionFailure {
param.getJaccProvider().remove(jaccprov);
return null;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java
index 384b2ef..e2161e8 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java
@@ -16,38 +16,37 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Domain;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.ConfigSupport;
-import org.jvnet.hk2.config.SingleConfigCode;
-import org.jvnet.hk2.config.TransactionFailure;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
-import com.sun.enterprise.config.serverbeans.ProviderConfig;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.util.SystemPropertyConstants;
-
import java.beans.PropertyVetoException;
import java.util.List;
+
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.admin.ExecuteOn;
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import org.jvnet.hk2.config.ConfigListener;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.ConfigSupport;
+import org.jvnet.hk2.config.SingleConfigCode;
+import org.jvnet.hk2.config.TransactionFailure;
+
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
+import com.sun.enterprise.config.serverbeans.ProviderConfig;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Delete Message Security Provider Command
@@ -115,6 +114,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
ActionReport report = context.getActionReport();
@@ -126,6 +126,7 @@
try {
ConfigSupport.apply(new SingleConfigCode<MessageSecurityConfig>() {
+ @Override
public Object run(MessageSecurityConfig param) throws PropertyVetoException, TransactionFailure {
if ((param.getDefaultProvider() != null) && param.getDefaultProvider().equals(thePC.getProviderId())) {
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java
index d100a68..091bcf9 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java
@@ -16,19 +16,27 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
-import com.sun.enterprise.util.LocalStringManagerImpl;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.admin.*;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import jakarta.inject.Inject;
-
-import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
+import jakarta.inject.Inject;
/**
* Delete Password Alias Command
@@ -88,6 +96,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java
index e8ad057..978565e 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java
@@ -16,30 +16,34 @@
package com.sun.enterprise.security.cli;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
+import com.sun.enterprise.config.serverbeans.AuditModule;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.AuditModule;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.util.SystemPropertyConstants;
-import org.glassfish.api.admin.*;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
-
/**
* List Audit Modules Command Usage: list-audit-modules [--terse=false] [--echo=false] [--interactive=true] [--host localhost]
* [--port 4848|4849] [--secure | -s] [--user admin_user] [--passwordfile file_name] [target(Default server)]
@@ -85,6 +89,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java
index 1e0d750..651a568 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java
@@ -16,28 +16,34 @@
package com.sun.enterprise.security.cli;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.SystemPropertyConstants;
-import org.glassfish.api.admin.*;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* List Auth Realms Command Usage: list-auth-realms [--terse=false] [--echo=false] [--interactive=true] [--host localhost]
@@ -90,6 +96,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java
index a76a04a..22b9a57 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java
@@ -18,36 +18,41 @@
import java.util.Enumeration;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Configs;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.security.auth.realm.file.FileRealm;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.auth.realm.file.FileRealm;
-import com.sun.enterprise.security.auth.realm.BadRealmException;
-import com.sun.enterprise.security.auth.realm.NoSuchUserException;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.security.auth.realm.RealmsManager;
-import com.sun.enterprise.util.SystemPropertyConstants;
-import org.glassfish.api.admin.*;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
-
/**
* List File GroupsCommand Usage: list-file-groups [--terse={true|false}][ --echo={true|false} ] [ --interactive={true|false} ]
* [--host host] [--port port] [--secure| -s ] [--user admin_user] [--passwordfile filename] [--help] [--name username]
@@ -124,6 +129,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
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 80e6110..2e242b7 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
@@ -16,43 +16,49 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.security.auth.realm.NoSuchUserException;
-import java.util.Enumeration;
-
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.CommandLock;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.auth.realm.file.FileRealm;
-import com.sun.enterprise.security.auth.realm.BadRealmException;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.security.auth.realm.RealmsManager;
-import com.sun.enterprise.util.SystemPropertyConstants;
import java.io.File;
-import org.glassfish.api.admin.ExecuteOn;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.glassfish.api.admin.*;
+
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RestParam;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.auth.realm.BadRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.NoSuchUserException;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.security.auth.realm.file.FileRealm;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* List File Users Command Usage: list-file-users [--terse=false] [--echo=false] [--interactive=true] [--host localhost] [--port
@@ -125,6 +131,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java
index 2c20c1f..f1ea923 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java
@@ -16,27 +16,37 @@
package com.sun.enterprise.security.cli;
+import java.util.List;
+
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Configs;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.JaccProvider;
import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.Server;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.SystemPropertyConstants;
-import java.util.List;
-import org.glassfish.api.ActionReport;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.admin.*;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.jvnet.hk2.annotations.Service;
-import org.glassfish.hk2.api.PerLookup;
-
/**
* Usage: list-jacc-providers [--help] [--user admin_user] [--passwordfile file_name] [target(Default server)]
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java
index 39381cc..eb1cd00 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java
@@ -16,29 +16,35 @@
package com.sun.enterprise.security.cli;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
+import com.sun.enterprise.config.serverbeans.ProviderConfig;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.MessageSecurityConfig;
-import com.sun.enterprise.config.serverbeans.ProviderConfig;
-import com.sun.enterprise.util.SystemPropertyConstants;
-import org.glassfish.api.admin.*;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
-
/**
* List Message Security Providers Command
*
@@ -93,6 +99,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java
index 507f566..8980eaa 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java
@@ -16,23 +16,27 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
import java.util.Iterator;
-import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.CommandLock;
-import org.glassfish.api.I18n;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import org.glassfish.api.admin.*;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
import jakarta.inject.Inject;
/**
@@ -75,6 +79,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java
index 5406c20..b202e4d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java
@@ -16,20 +16,28 @@
package com.sun.enterprise.security.cli;
+import org.glassfish.api.ActionReport;
+import org.glassfish.api.I18n;
+import org.glassfish.api.Param;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.CommandLock;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.security.ssl.SSLUtils;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.SystemPropertyConstants;
-import org.glassfish.api.ActionReport;
-import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
-import org.glassfish.api.admin.*;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
-import jakarta.inject.Inject;
-import org.jvnet.hk2.annotations.Service;
-import org.glassfish.hk2.api.PerLookup;
+import jakarta.inject.Inject;
/**
* author - Nithya Subramanian
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
index 5546411..6e7af49 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
@@ -16,38 +16,43 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.AdminService;
+import java.io.File;
import java.util.List;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.AdminCommandSecurity;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RestParam;
+import org.glassfish.api.admin.RuntimeType;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.config.support.CommandTarget;
+import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.config.types.Property;
+
+import com.sun.enterprise.config.serverbeans.AdminService;
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.Config;
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.config.serverbeans.SecureAdmin;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
+import com.sun.enterprise.security.auth.realm.RealmsManager;
+import com.sun.enterprise.security.auth.realm.file.FileRealm;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+import com.sun.enterprise.util.SystemPropertyConstants;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.glassfish.hk2.api.PerLookup;
-import org.jvnet.hk2.config.types.Property;
-import com.sun.enterprise.config.serverbeans.Config;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.Configs;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.config.serverbeans.SecureAdmin;
-import com.sun.enterprise.security.auth.realm.file.FileRealm;
-import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.security.auth.realm.RealmsManager;
-import com.sun.enterprise.util.SystemPropertyConstants;
-import java.io.File;
-import org.glassfish.api.admin.*;
-import org.glassfish.config.support.CommandTarget;
-import org.glassfish.config.support.TargetType;
-
/**
* Update File User Command
*
@@ -136,6 +141,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java
index 8ccfb6c..af05d87 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java
@@ -16,20 +16,25 @@
package com.sun.enterprise.security.cli;
-import com.sun.enterprise.config.serverbeans.Domain;
-import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
-import org.glassfish.api.ActionReport;
-import org.jvnet.hk2.annotations.Service;
-
-import org.glassfish.hk2.api.PerLookup;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import org.glassfish.api.admin.*;
+import org.glassfish.api.admin.AccessRequired;
+import org.glassfish.api.admin.AdminCommand;
+import org.glassfish.api.admin.AdminCommandContext;
+import org.glassfish.api.admin.ExecuteOn;
+import org.glassfish.api.admin.RestEndpoint;
+import org.glassfish.api.admin.RestEndpoints;
+import org.glassfish.api.admin.RuntimeType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
+import org.glassfish.hk2.api.PerLookup;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.config.serverbeans.Domain;
+import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore;
+import com.sun.enterprise.util.LocalStringManagerImpl;
+
import jakarta.inject.Inject;
/**
@@ -75,6 +80,7 @@
*
* @param context information
*/
+ @Override
public void execute(AdminCommandContext context) {
final ActionReport report = context.getActionReport();
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 e68e648..4a4d9a6 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
@@ -16,10 +16,12 @@
package com.sun.enterprise.security.common;
-import com.sun.enterprise.security.integration.AppServSecurityContext;
import java.security.Principal;
+
import javax.security.auth.Subject;
+import com.sun.enterprise.security.integration.AppServSecurityContext;
+
/**
* This base class defines the methods that Security Context should exhibit. There are two places where a derived class are used.
* They are on the appclient side and ejb side. The derived classes can use thread local storage to store the security contexts.
@@ -37,6 +39,7 @@
*
* @return The caller Principal.
*/
+ @Override
abstract public Principal getCallerPrincipal();
/**
@@ -44,5 +47,6 @@
*
* @return A credentials object associated with the current client invocation.
*/
+ @Override
abstract public Subject getSubject();
}
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 18b52c7..d0663db 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
@@ -16,16 +16,17 @@
package com.sun.enterprise.security.common;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.security.integration.AppServSecurityContext;
import java.security.Principal;
+import java.util.logging.Logger;
+
import javax.security.auth.Subject;
import org.glassfish.security.common.PrincipalImpl;
//V3:Comment import com.sun.enterprise.ServerConfiguration;
-import java.util.logging.*;
-import com.sun.logging.*;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.security.UsernamePasswordStore;
+import com.sun.enterprise.security.integration.AppServSecurityContext;
/**
* This class represents the security context on the client side. For usage of the IIOP_CLIENT_PER_THREAD_FLAG flag, see
@@ -140,14 +141,17 @@
*
* @return The caller Principal.
*/
+ @Override
public Principal getCallerPrincipal() {
return initiator;
}
+ @Override
public Subject getSubject() {
return subject;
}
+ @Override
public String toString() {
return "ClientSecurityContext[ " + "Initiator: " + initiator + "Subject " + subject + " ]";
}
@@ -167,15 +171,18 @@
return false;
}
+ @Override
public AppServSecurityContext newInstance(String userName, Subject subject, String realm) {
//TODO:V3 ignoring realm in this case
return new ClientSecurityContext(userName, subject);
}
+ @Override
public AppServSecurityContext newInstance(String userName, Subject subject) {
return new ClientSecurityContext(userName, subject);
}
+ @Override
public void setCurrentSecurityContext(AppServSecurityContext context) {
if (context instanceof ClientSecurityContext) {
setCurrent((ClientSecurityContext) context);
@@ -184,14 +191,17 @@
throw new IllegalArgumentException("Expected ClientSecurityContext, found " + context);
}
+ @Override
public AppServSecurityContext getCurrentSecurityContext() {
return getCurrent();
}
+ @Override
public void setUnauthenticatedSecurityContext() {
throw new UnsupportedOperationException("Not supported yet in V3.");
}
+ @Override
public void setSecurityContextWithPrincipal(Principal principal) {
throw new UnsupportedOperationException("Not supported yet in V3.");
}
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java
index 3fff1c1..7482f4d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java
@@ -16,25 +16,27 @@
package com.sun.enterprise.security.common;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.security.EmbeddedSecurity;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.server.pluggable.SecuritySupport;
-import com.sun.enterprise.util.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.internal.embedded.EmbeddedFileSystem;
import org.glassfish.internal.embedded.EmbeddedLifecycle;
import org.glassfish.internal.embedded.Server;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.EmbeddedSecurity;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.server.pluggable.SecuritySupport;
+import com.sun.enterprise.util.io.FileUtils;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.jvnet.hk2.annotations.Service;
-
/**
*
* @author Nithya Subramanian
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java
index 3fd0517..4d35590 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java
@@ -21,16 +21,17 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
+
import javax.security.auth.callback.CallbackHandler;
+
import org.glassfish.api.admin.ProcessEnvironment;
import org.glassfish.api.admin.ProcessEnvironment.ProcessType;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.api.Globals;
import org.glassfish.internal.embedded.Server;
-import jakarta.inject.Inject;
-
import org.jvnet.hk2.annotations.Service;
+import jakarta.inject.Inject;
import jakarta.inject.Singleton;
/**
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java
index 224bf5a..43171b6 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java
@@ -16,12 +16,6 @@
package com.sun.enterprise.security.embedded;
-import com.sun.enterprise.config.serverbeans.AuthRealm;
-import com.sun.enterprise.config.serverbeans.SecurityService;
-import com.sun.enterprise.security.EmbeddedSecurity;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.util.StringUtils;
-import com.sun.enterprise.util.io.FileUtils;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
@@ -30,18 +24,27 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.server.ServerEnvironmentImpl;
-
import org.jvnet.hk2.annotations.Service;
-import jakarta.inject.Singleton;
import org.jvnet.hk2.config.types.Property;
+import com.sun.enterprise.config.serverbeans.AuthRealm;
+import com.sun.enterprise.config.serverbeans.SecurityService;
+import com.sun.enterprise.security.EmbeddedSecurity;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.util.StringUtils;
+import com.sun.enterprise.util.io.FileUtils;
+
+import jakarta.inject.Singleton;
+
/**
* Utility file to copy the security related config files from the passed non-embedded instanceDir to the embedded server
* instance's config. This is a service that is protected. This implements the Contract EmbeddedSecurity
@@ -55,6 +58,7 @@
private static final Logger _logger = SecurityLoggerInfo.getLogger();
+ @Override
public void copyConfigFiles(ServiceLocator habitat, File fromInstanceDir, File domainXml) {
//For security reasons, permit only an embedded server instance to carry out the copy operations
ServerEnvironment se = habitat.getService(ServerEnvironment.class);
@@ -116,6 +120,7 @@
}
+ @Override
public String parseFileName(String fullFilePath) {
if (fullFilePath == null) {
return null;
@@ -125,6 +130,7 @@
}
+ @Override
public boolean isEmbedded(ServerEnvironment se) {
if (se.getRuntimeType() == RuntimeType.EMBEDDED) {
return true;
@@ -132,6 +138,7 @@
return false;
}
+ @Override
public List<String> getKeyFileNames(SecurityService securityService) {
List<String> keyFileNames = new ArrayList<String>();
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLImpl.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLImpl.java
index b6ac2dc..f80bddc 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLImpl.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLImpl.java
@@ -17,8 +17,10 @@
package com.sun.enterprise.security.ssl;
import java.net.Socket;
+
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSocket;
+
import org.glassfish.grizzly.config.ssl.SSLImplementation;
import org.glassfish.grizzly.config.ssl.ServerSocketFactory;
import org.glassfish.grizzly.ssl.SSLSupport;
@@ -35,14 +37,17 @@
public GlassfishSSLImpl() {
}
+ @Override
public String getImplementationName() {
return "Glassfish";
}
+ @Override
public ServerSocketFactory getServerSocketFactory() {
return new GlassfishServerSocketFactory();
}
+ @Override
public SSLSupport getSSLSupport(Socket socket) {
if (socket instanceof SSLSocket) {
return new GlassfishSSLSupport((SSLSocket) socket);
@@ -50,6 +55,7 @@
return null;
}
+ @Override
public SSLSupport getSSLSupport(SSLEngine ssle) {
return new GlassfishSSLSupport(ssle);
}
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java
index 07443d8..b89d7bf 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java
@@ -16,18 +16,20 @@
package com.sun.enterprise.security.ssl;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import org.glassfish.grizzly.ssl.SSLSupport;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.cert.CertificateFactory;
import java.util.logging.Level;
-import javax.security.cert.X509Certificate;
import java.util.logging.Logger;
+
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
+import javax.security.cert.X509Certificate;
+
+import org.glassfish.grizzly.ssl.SSLSupport;
+
+import com.sun.enterprise.security.SecurityLoggerInfo;
/**
*
@@ -64,6 +66,7 @@
}
}
+ @Override
public String getCipherSuite() throws IOException {
if (session == null) {
return null;
@@ -71,10 +74,12 @@
return session.getCipherSuite();
}
+ @Override
public Object[] getPeerCertificateChain() throws IOException {
return getPeerCertificateChain(false);
}
+ @Override
public Object[] getPeerCertificateChain(boolean force) throws IOException {
if (session == null) {
return null;
@@ -97,6 +102,7 @@
return getX509Certs();
}
+ @Override
public Integer getKeySize() throws IOException {
if (session == null) {
return null;
@@ -117,6 +123,7 @@
return keySize;
}
+ @Override
public String getSessionId() throws IOException {
if (session == null) {
return null;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishServerSocketFactory.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishServerSocketFactory.java
index c2e2d76..96d381d 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishServerSocketFactory.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishServerSocketFactory.java
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.security.KeyStore;
import java.util.logging.Level;
+
import javax.net.ssl.KeyManager;
import javax.net.ssl.X509KeyManager;
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 522a1d8..3c366dd 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
@@ -17,34 +17,34 @@
package com.sun.enterprise.security.ssl;
import java.net.Socket;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.PrivilegedAction;
+import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.net.ssl.SSLEngine;
+import javax.net.ssl.X509ExtendedKeyManager;
import javax.net.ssl.X509KeyManager;
import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
import com.sun.enterprise.security.SecurityLoggerInfo;
-//import com.sun.enterprise.Switch;
-import com.sun.enterprise.security.common.ClientSecurityContext;
-import com.sun.enterprise.security.auth.login.common.X509CertificateCredential;
//copied code from LoginContextDriver to break dependency
//import com.sun.enterprise.security.auth.login.common.LoginContextDriver;
import com.sun.enterprise.security.auth.login.common.LoginException;
import com.sun.enterprise.security.auth.login.common.PasswordCredential;
+import com.sun.enterprise.security.auth.login.common.X509CertificateCredential;
import com.sun.enterprise.security.common.AppservAccessController;
+//import com.sun.enterprise.Switch;
+import com.sun.enterprise.security.common.ClientSecurityContext;
import com.sun.enterprise.security.common.SecurityConstants;
import com.sun.enterprise.security.common.Util;
-
-import java.util.logging.*;
-import com.sun.logging.*;
-import java.security.PrivilegedAction;
-import java.util.Set;
-import javax.net.ssl.X509ExtendedKeyManager;
-import javax.security.auth.login.LoginContext;
import com.sun.enterprise.security.ssl.manager.UnifiedX509KeyManager;
/**
@@ -84,10 +84,12 @@
}
}
+ @Override
public String chooseEngineClientAlias(String[] keyType, Principal[] issuers, SSLEngine engine) {
return mgr.chooseClientAlias(keyType, issuers, null);
}
+ @Override
public String chooseEngineServerAlias(String keyType, Principal[] issuers, SSLEngine engine) {
return alias;
}
@@ -101,6 +103,7 @@
* alias to use.
* @return the alias.
*/
+ @Override
public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
String clientAlias = null;
@@ -158,6 +161,7 @@
* alias to use.
* @return the alias
*/
+ @Override
public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
String serverAlias = null;
@@ -178,6 +182,7 @@
* @param the alias.
* @return the chain of X509 Certificates.
*/
+ @Override
public X509Certificate[] getCertificateChain(String alias) {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "Getting certificate chain");
@@ -198,6 +203,7 @@
* @param the certificate issuers.
* @return the array of aliases.
*/
+ @Override
public String[] getClientAliases(String keyType, Principal[] issuers) {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "Getting client aliases");
@@ -212,6 +218,7 @@
* @param the certificate issuers.
* @return the array of aliases.
*/
+ @Override
public String[] getServerAliases(String keyType, Principal[] issuers) {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "Getting server aliases");
@@ -225,6 +232,7 @@
* @param the alias.
* @return the private key.
*/
+ @Override
public PrivateKey getPrivateKey(String alias) {
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, "Getting private key for alias:{0}", alias);
@@ -275,6 +283,7 @@
//V3:Commented : TODO uncomment later for Appcontainer
if (type == SecurityConstants.USERNAME_PASSWORD) {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lg = new LoginContext(SecurityConstants.CLIENT_JAAS_PASSWORD, subject, handler);
@@ -290,6 +299,7 @@
return subject;
} else if (type == SecurityConstants.CERTIFICATE) {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lg = new LoginContext(SecurityConstants.CLIENT_JAAS_CERTIFICATE, subject, handler);
@@ -305,6 +315,7 @@
return subject;
} else if (type == SecurityConstants.ALL) {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lgup = new LoginContext(SecurityConstants.CLIENT_JAAS_PASSWORD, subject, handler);
@@ -324,6 +335,7 @@
return subject;
} else {
AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
try {
LoginContext lg = new LoginContext(SecurityConstants.CLIENT_JAAS_PASSWORD, subject, handler);
@@ -351,6 +363,7 @@
final Class<?> clas = clazz;
final Subject fs = subject;
Set credset = (Set) AppservAccessController.doPrivileged(new PrivilegedAction<Set>() {
+ @Override
public Set run() {
if (_logger.isLoggable(Level.FINEST)) {
_logger.log(Level.FINEST, "LCD post login subject :{0}", fs);
@@ -363,6 +376,7 @@
Object obj = null;
try {
obj = AppservAccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public java.lang.Object run() {
return iter.next();
}
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 42a7976..47e36ba 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
@@ -16,40 +16,41 @@
package com.sun.enterprise.security.ssl;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-import com.sun.enterprise.security.common.Util;
import java.io.IOException;
-import java.security.Key;
+import java.security.AccessControlException;
+import java.security.AccessController;
import java.security.KeyStore;
import java.security.KeyStore.PrivateKeyEntry;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
+import java.security.Permission;
import java.security.PrivateKey;
import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.util.Enumeration;
-import java.security.cert.Certificate;
+import java.util.PropertyPermission;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509KeyManager;
-//V3:Commented import com.sun.enterprise.config.clientbeans.Ssl
-import com.sun.enterprise.server.pluggable.SecuritySupport;
+import org.glassfish.hk2.api.PostConstruct;
+import org.jvnet.hk2.annotations.Service;
+
+import com.sun.enterprise.security.SecurityLoggerInfo;
+import com.sun.enterprise.security.common.Util;
//V3:Commented import com.sun.web.security.SSLSocketFactory;
import com.sun.enterprise.security.integration.AppClientSSL;
-import java.util.logging.*;
-import com.sun.logging.*;
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.Permission;
-import java.util.PropertyPermission;
-import javax.net.ssl.SSLSocketFactory;
-import org.jvnet.hk2.annotations.Service;
-import jakarta.inject.Inject;
-import org.glassfish.hk2.api.PostConstruct;
+//V3:Commented import com.sun.enterprise.config.clientbeans.Ssl
+import com.sun.enterprise.server.pluggable.SecuritySupport;
+import jakarta.inject.Inject;
import jakarta.inject.Singleton;
/**
@@ -76,6 +77,7 @@
private AppClientSSL appclientSsl = null;
private SSLContext ctx = null;
+ @Override
public void postConstruct() {
try {
//TODO: To check the right implementation once we support EE.
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/util/IASSecurityException.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/util/IASSecurityException.java
index 00596bf..cf8404a 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/util/IASSecurityException.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/util/IASSecurityException.java
@@ -16,8 +16,6 @@
package com.sun.enterprise.security.util;
-import java.lang.*;
-
/**
* General exception class for iAS security failures.
*
@@ -73,6 +71,7 @@
* @return Message containing information about the exception.
*
*/
+ @Override
public String getMessage() {
StringBuffer sb = new StringBuffer();
sb.append(super.getMessage());
