Consolidate constants for LDAP-based profile auth

dogtagpki · Apr 2, 2024 · f0bf163 · f0bf163
1 parent 3a6346e
commit f0bf163
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 22 deletions.
diff --git a/base/ca/src/main/java/com/netscape/cms/authentication/SharedSecret.java b/base/ca/src/main/java/com/netscape/cms/authentication/SharedSecret.java
@@ -76,8 +76,7 @@ public class SharedSecret extends DirBasedAuthentication
      * required credentials to authenticate. Though for this
      * special impl it will be unused.
      */
-    public static final String CRED_ShrTok = "shrTok";
-    protected static String[] mRequiredCreds = { CRED_ShrTok};
+    protected static String[] mRequiredCreds = { CRED_ShrTok };
 
     protected static final String PROP_DNPATTERN = "dnpattern";
     protected static final String PROP_LDAPSTRINGATTRS = "ldapStringAttributes";

diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestDAO.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestDAO.java
@@ -42,6 +42,7 @@
 import com.netscape.certsrv.request.CMSRequestInfos;
 import com.netscape.certsrv.request.RequestId;
 import com.netscape.certsrv.request.RequestNotFoundException;
+import com.netscape.cms.authentication.DirBasedAuthentication;
 import com.netscape.cms.profile.common.Profile;
 import com.netscape.cms.realm.PKIPrincipal;
 import com.netscape.cms.servlet.cert.CertRequestInfoFactory;
@@ -193,13 +194,13 @@ public CertRequestInfos submitRequest(
         CertRequestInfos ret = new CertRequestInfos();
 
         AuthCredentials credentials = new AuthCredentials();
-        String uid = data.getAttribute("uid");
+        String uid = data.getAttribute(DirBasedAuthentication.CRED_UID);
         if (uid != null) {
-            credentials.set("uid", uid);
+            credentials.set(DirBasedAuthentication.CRED_UID, uid);
         }
-        String password = data.getAttribute("pwd");
+        String password = data.getAttribute(DirBasedAuthentication.CRED_PWD);
         if (password != null) {
-            credentials.set("pwd", password);
+            credentials.set(DirBasedAuthentication.CRED_PWD, password);
         }
 
         CAEngine engine = CAEngine.getInstance();

diff --git a/base/server/src/main/java/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/server/src/main/java/com/netscape/cms/authentication/DirBasedAuthentication.java
@@ -75,6 +75,12 @@ public abstract class DirBasedAuthentication extends AuthManager implements IExt
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DirBasedAuthentication.class);
 
+    public static final String CRED_UID = "uid";
+    public static final String CRED_PWD = "pwd";
+    public static final String CRED_USER_PASSWORD = "userPassword";
+    public static final String CRED_PIN = "pin";
+    public static final String CRED_ShrTok = "shrTok";
+
     protected static final String USER_DN = "userDN";
 
     /* configuration parameter keys */

diff --git a/base/server/src/main/java/com/netscape/cms/authentication/PortalEnroll.java b/base/server/src/main/java/com/netscape/cms/authentication/PortalEnroll.java
@@ -72,9 +72,7 @@ public class PortalEnroll extends DirBasedAuthentication {
     protected static final String PROP_OBJECTCLASS = "objectclass";
 
     /* required credentials to authenticate. uid and pwd are strings. */
-    public static final String CRED_UID = "uid";
-    public static final String CRED_PWD = "userPassword";
-    protected static String[] mRequiredCreds = { CRED_UID, CRED_PWD };
+    protected static String[] mRequiredCreds = { CRED_UID, CRED_USER_PASSWORD };
 
     /* ldap configuration sub-store */
     private ArgBlock argblk;
@@ -197,9 +195,9 @@ protected String authenticate(LDAPConnection conn,
             }
 
             // get the password.
-            pwd = (String) authCreds.get(CRED_PWD);
+            pwd = (String) authCreds.get(CRED_USER_PASSWORD);
             if (pwd == null) {
-                throw new EMissingCredential(CMS.getUserMessage("CMS_AUTHENTICATION_NULL_CREDENTIAL", CRED_PWD));
+                throw new EMissingCredential(CMS.getUserMessage("CMS_AUTHENTICATION_NULL_CREDENTIAL", CRED_USER_PASSWORD));
             }
             if (pwd.equals("")) {
                 // anonymous binding not allowed

diff --git a/base/server/src/main/java/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/base/server/src/main/java/com/netscape/cms/authentication/UidPwdDirAuthentication.java
@@ -59,8 +59,6 @@ public class UidPwdDirAuthentication extends DirBasedAuthentication {
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(UidPwdDirAuthentication.class);
 
     /* required credentials to authenticate. uid and pwd are strings. */
-    public static final String CRED_UID = "uid";
-    public static final String CRED_PWD = "pwd";
     protected static String[] mRequiredCreds = { CRED_UID, CRED_PWD };
 
     /* Holds configuration parameters accepted by this implementation.

diff --git a/base/server/src/main/java/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/server/src/main/java/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
@@ -55,18 +55,12 @@
 
 /**
  * uid/pwd/pin directory based authentication manager
- * <P>
- *
- * @version $Revision$, $Date$
  */
 public class UidPwdPinDirAuthentication extends DirBasedAuthentication {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(UidPwdPinDirAuthentication.class);
 
     /* required credentials to authenticate. uid and pwd are strings. */
-    public static final String CRED_UID = "uid";
-    public static final String CRED_PWD = "pwd";
-    public static final String CRED_PIN = "pin";
     protected static String[] mRequiredCreds = { CRED_UID, CRED_PWD, CRED_PIN };
 
     public static final String PROP_REMOVE_PIN = "removePin";

diff --git a/base/server/src/main/java/com/netscape/cms/authentication/UserPwdDirAuthentication.java b/base/server/src/main/java/com/netscape/cms/authentication/UserPwdDirAuthentication.java
@@ -65,10 +65,7 @@ public class UserPwdDirAuthentication extends DirBasedAuthentication {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(UserPwdDirAuthentication.class);
     /* required credentials to authenticate. uid and pwd are strings. */
-    public static final String CRED_UID = "uid";
-    public static final String CRED_PWD = "pwd";
     public String mAttr = CRED_UID;
-
     protected String[] mRequiredCreds = { mAttr, CRED_PWD };
 
     protected String mAttrName = null;