From 5e53c639d1e0508a4f8307d1dcd9c01a0994bd5e Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Tue, 12 Jan 2016 12:28:10 +1100 Subject: [PATCH] Remove vestiges of NISAuth plugin Fixes: https://fedorahosted.org/pki/ticket/1674 --- base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html | 508 --------------------- .../webapps/ca/ee/ca/policyEnrollment/index.html | 9 - .../netscape/admin/certsrv/certsrv-help.properties | 2 - .../netscape/admin/certsrv/ug/AuthBaseDialog.java | 2 - .../admin/certsrv/ug/AuthConfigDialog.java | 3 - base/kra/shared/conf/CS.cfg.in | 1 - base/ocsp/shared/conf/CS.cfg.in | 2 - base/server/cmsbundle/src/LogMessages.properties | 2 - base/server/cmsbundle/src/UserMessages.properties | 2 - .../src/com/netscape/cmscore/apps/Setup.java | 1 - base/tks/shared/conf/CS.cfg.in | 1 - base/tps/shared/conf/CS.cfg.in | 1 - 12 files changed, 534 deletions(-) delete mode 100644 base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html diff --git a/base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html deleted file mode 100644 index d671b4b22ab33d6333742448d20399d8cacbcd79..0000000000000000000000000000000000000000 --- a/base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html +++ /dev/null @@ -1,508 +0,0 @@ - - - - -NIS Based User Enrollment Form - - - - - - - - - - - - - - - - - - -NIS Based User Enrollment
- - - Use this form to submit a request for a personal certificate through your - organization's NIS. With NIS based enrollment, you need only - supply your user ID and password for the NIS; the directory - supplies the rest of the information needed for certificate issuance. - If the user ID and password are correct your certificate will be issued - automatically. - - - - - - -
 
- - - - - -
- Important: - - Be sure to request your certificate on the same computer on which you - plan to use your certificate.
- - - - -
 
- - - - - User's Identity
-Enter your user ID and password for your organization's NIS. This -information will be used to verify your identity and to obtain -information from the directory to fill in the certificate. -
- - - - - - -
-
- User ID: -
- 		- -
- - - - - - - - -
-
- Password: -
- 		- -
- - - - - - - -
- - - - - - - -
- -
- - - - - - - diff --git a/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html index 74c3080f0d97da38075aaa737002018288291cd7..75fffe901d938ee7a94717137e1fae5b6efb2c7a 100644 --- a/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html +++ b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html @@ -177,15 +177,6 @@ function initEnrollMenu() count++; } - // NISAuth - authenticates against NIS - if ( isAuthMgrEnabled("NISAuth") ) { - item = 'nisuser'; - menuItems[count] = top.EnrollMenu[count] = - new menuItem(item, 'NISUserEnroll.html', 'NIS'); - - count++; - } - // Kerberos - authenticates against a Kerberos server if ( isAuthMgrEnabled("KerberosAuth") ) { item = 'kerberos'; diff --git a/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties b/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties index 1faf8ef6833fb5b8d3ed12990d18ce5e72d4b615..c5b97af2a5e0bb7a2dfa8fbb0a1bd10b989f7e92 100644 --- a/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties +++ b/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties @@ -315,7 +315,6 @@ authentication-certsrv-register-authplugin-dbox-help = cert authentication-certsrv-auth-dialog-help = cert ;OOTB Auth plugins configuration-authrules-kerberosauth = cert -configuration-authrules-nisauth = cert configuration-authrules-portalauth = cert configuration-authrules-uidpwddirauth = cert configuration-authrules-uidpwdpindirauth = cert @@ -323,7 +322,6 @@ configuration-authrules-uidpwdpindirauth = cert ;authentication implementations 1/1/2000 authentication-certsrv-impl-ldap = cert authentication-certsrv-impl-ldappin = cert -authentication-certsrv-impl-nis = cert authentication-certsrv-impl-portal= cert ;Certificate server status diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java index 78d89bb9c9d06c51a675de1207552394e510c385..c3c4b2cc3eea5488c46c68550939ab29a187ac4a 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java @@ -114,8 +114,6 @@ public class AuthBaseDialog extends JDialog mAuthName.setText("UserDnEnrollment"); else if (!userDirExist && str.equals("UserPwdDirAuth")) mAuthName.setText("UserDirAuth"); - else if (str.equals("NISAuth")) - mAuthName.setText("NISAuth"); // Inserted by beomsuk else if (!portalExist && str.equals("PortalEnroll")) mAuthName.setText("PortalEnrollment"); diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java index 22454e241ac71317644b64c1c7895c83eab33d60..da14c676b6b1eb8a65dbb0d646031644f07e6b38 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java @@ -78,9 +78,6 @@ public class AuthConfigDialog extends CMSBaseConfigDialog else if (implName.equals("UserPwdDirAuth")) { instanceName = "UserDirAuth"; } - else if (implName.equals("NISAuth")) { - instanceName = "NISAuth"; - } else if (implName.equals("PortalEnroll")) { instanceName = "PortalEnrollment"; } diff --git a/base/kra/shared/conf/CS.cfg.in b/base/kra/shared/conf/CS.cfg.in index 64a369e0a3822b9284f694c961ba9d178bb7e376..9435daa1823dc07358ab2ae9395bd95b1352dc3a 100644 --- a/base/kra/shared/conf/CS.cfg.in +++ b/base/kra/shared/conf/CS.cfg.in @@ -144,7 +144,6 @@ auths.impl._001=## authentication manager implementations auths.impl._002=## auths.impl.AgentCertAuth.class=com.netscape.cms.authentication.AgentCertAuthentication auths.impl.CMCAuth.class=com.netscape.cms.authentication.CMCAuth -auths.impl.NISAuth.class=com.netscape.cms.authentication.NISAuth auths.impl.PortalEnroll.class=com.netscape.cms.authentication.PortalEnroll auths.impl.TokenAuth.class=com.netscape.cms.authentication.TokenAuthentication auths.impl.UdnPwdDirAuth.class=com.netscape.cms.authentication.UdnPwdDirAuthentication diff --git a/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in index cea8e651215755dacd898d0b115192968d323309..9968bb06d7265dfe36744233a8b70e2f2cb0b518 100644 --- a/base/ocsp/shared/conf/CS.cfg.in +++ b/base/ocsp/shared/conf/CS.cfg.in @@ -131,8 +131,6 @@ auths.impl._001=## authentication manager implementations auths.impl._002=## auths.impl.AgentCertAuth.class=com.netscape.cms.authentication.AgentCertAuthentication auths.impl.CMCAuth.class=com.netscape.cms.authentication.CMCAuth -auths.impl.NISAuth.class=com.netscape.cms.authentication.NISAuth -auths.impl.PortalEnroll.class=com.netscape.cms.authentication.PortalEnroll auths.impl.TokenAuth.class=com.netscape.cms.authentication.TokenAuthentication auths.impl.UdnPwdDirAuth.class=com.netscape.cms.authentication.UdnPwdDirAuthentication auths.impl.UidPwdDirAuth.class=com.netscape.cms.authentication.UidPwdDirAuthentication diff --git a/base/server/cmsbundle/src/LogMessages.properties b/base/server/cmsbundle/src/LogMessages.properties index e0e926ccb43a94c01bcb40cad81f7f04ee437f45..1be16736213cf7473f3fc85dcef601bfbead5b9d 100644 --- a/base/server/cmsbundle/src/LogMessages.properties +++ b/base/server/cmsbundle/src/LogMessages.properties @@ -42,8 +42,6 @@ CMS_AUTH_CREATE_CERTINFO_ERROR=Could not create certinfo for {0}. Error - {1} CMS_AUTH_READ_ENTRIES=Read entries from password file - {0} CMS_AUTH_USER_NOT_FOUND=User not found in password file. CMS_AUTH_INVALID_FINGER_PRINT=Invalid fingerprint. -CMS_AUTH_INVALID_NIS_SERVER=Invalid NIS Server - {0} -CMS_AUTH_INVALID_NIS_SERVER_NAME=Invalid NIS Server Name - {0} CMS_AUTH_INVALID_DOMAIN=Invalid Domain Name - {0} CMS_AUTH_EMPTY_PASSWORD=UID {0} attempted a login with an empty password. CMS_AUTH_EMPTY_PIN=UID {0} attempted a login with an empty pin. diff --git a/base/server/cmsbundle/src/UserMessages.properties b/base/server/cmsbundle/src/UserMessages.properties index 7c5c77d5b589886d0a8c6323436a1fdcdd4ce8f9..75aac4d7960cba03e83b6af37795b75eb9950450 100644 --- a/base/server/cmsbundle/src/UserMessages.properties +++ b/base/server/cmsbundle/src/UserMessages.properties @@ -306,8 +306,6 @@ CMS_ADMIN_SRVLT_CERT_VALIDATE_FAILED=Imported cert has not been verified to be v # ProfileSubmitServlet ####################################################### CMS_POP_VERIFICATION_ERROR=Proof-of-Possession Verification Failed -CMS_AUTHENTICATION_NIS_NAME=NIS Authentication -CMS_AUTHENTICATION_NIS_TEXT=This plugin authenticates a user using NIS. CMS_AUTHENTICATION_AGENT_NAME=Agent Authentication CMS_AUTHENTICATION_AGENT_TEXT=This plugin authenticates agents using a certificate. CMS_AUTHENTICATION_SSL_CLIENT_NAME=SSL Client Authentication diff --git a/base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java b/base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java index fecf024de4374161f2bdf2f69b0a2b4f8b7bcdf6..cddcfca50a0e6e5230edbc7284bfdfc0da08ae54 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java +++ b/base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java @@ -41,7 +41,6 @@ public class Setup { { "auths.impl.UidPwdDirAuth.class", "com.netscape.cms.authentication.UidPwdDirAuthentication" }, { "auths.impl.UidPwdPinDirAuth.class", "com.netscape.cms.authentication.UidPwdPinDirAuthentication" }, { "auths.impl.UdnPwdDirAuth.class", "com.netscape.cms.authentication.UdnPwdDirAuthentication" }, - { "auths.impl.NISAuth.class", "com.netscape.cms.authentication.NISAuth" }, { "auths.impl.CMCAuth.class", "com.netscape.cms.authentication.CMCAuth" }, { "auths.impl.AgentCertAuth.class", "com.netscape.cms.authentication.AgentCertAuthentication" }, { "auths.impl.PortalEnroll.class", "com.netscape.cms.authentication.PortalEnroll" diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in index e63f07d134719d1c1326fbe939c12157c0109bad..ae77fbe24b0f4c4e0c432ea49b262a9686a3751c 100644 --- a/base/tks/shared/conf/CS.cfg.in +++ b/base/tks/shared/conf/CS.cfg.in @@ -122,7 +122,6 @@ auths.impl._001=## authentication manager implementations auths.impl._002=## auths.impl.AgentCertAuth.class=com.netscape.cms.authentication.AgentCertAuthentication auths.impl.CMCAuth.class=com.netscape.cms.authentication.CMCAuth -auths.impl.NISAuth.class=com.netscape.cms.authentication.NISAuth auths.impl.PortalEnroll.class=com.netscape.cms.authentication.PortalEnroll auths.impl.TokenAuth.class=com.netscape.cms.authentication.TokenAuthentication auths.impl.UdnPwdDirAuth.class=com.netscape.cms.authentication.UdnPwdDirAuthentication diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in index 48fd8fe43d5f2e5016e27cbb231f462c6e6a7b1d..41af0259824a950d835964ef6f357e4a60a30cd6 100644 --- a/base/tps/shared/conf/CS.cfg.in +++ b/base/tps/shared/conf/CS.cfg.in @@ -28,7 +28,6 @@ auths.impl._001=## authentication manager implementations auths.impl._002=## auths.impl.AgentCertAuth.class=com.netscape.cms.authentication.AgentCertAuthentication auths.impl.CMCAuth.class=com.netscape.cms.authentication.CMCAuth -auths.impl.NISAuth.class=com.netscape.cms.authentication.NISAuth auths.impl.PortalEnroll.class=com.netscape.cms.authentication.PortalEnroll auths.impl.SSLclientCertAuth.class=com.netscape.cms.authentication.SSLclientCertAuthentication auths.impl.TokenAuth.class=com.netscape.cms.authentication.TokenAuthentication -- 2.5.0