diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/authentication')
16 files changed, 318 insertions, 275 deletions
diff --git a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java index e4f700054..e0a37eb4b 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java @@ -18,15 +18,23 @@ package com.netscape.cms.authentication; -import java.util.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import java.io.*; -import java.security.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.ldap.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVA; +import netscape.security.x509.LdapV3DNStrConverter; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.ECompSyntaxErr; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java index bef5e8c2a..0b8bad8f3 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java @@ -18,29 +18,35 @@ package com.netscape.cms.authentication; -import netscape.ldap.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; - -import javax.servlet.http.HttpServletRequest; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authentication.ISSLClientCertProvider; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java index eb09e5b47..e102f18f8 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java +++ b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java @@ -26,59 +26,72 @@ package com.netscape.cms.authentication; /////////////////////// /* cert server imports */ -import com.netscape.cms.authentication.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.logging.ILogger; - -import com.netscape.cmsutil.util.*; -import netscape.security.x509.*; - -/* java sdk imports */ -import java.io.*; -import java.util.*; -import java.util.Properties; -import java.util.Vector; -import com.netscape.certsrv.apps.*; -import java.util.Hashtable; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.PublicKey; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; -import org.mozilla.jss.asn1.SET; -import org.mozilla.jss.asn1.SEQUENCE; +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.asn1.OCTET_STRING; -import org.mozilla.jss.pkix.crmf.CertTemplate; -import org.mozilla.jss.pkix.crmf.CertReqMsg; -import org.mozilla.jss.pkix.crmf.CertRequest; -import org.mozilla.jss.pkix.crmf.ChallengeResponseException; -import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import org.mozilla.jss.pkix.primitive.Name; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; import org.mozilla.jss.asn1.InvalidBERException; import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; -import org.mozilla.jss.asn1.ANY; -import org.mozilla.jss.pkix.cms.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.DigestAlgorithm; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkcs11.PK11PubKey; import org.mozilla.jss.pkix.cert.Certificate; import org.mozilla.jss.pkix.cert.CertificateInfo; -import org.mozilla.jss.asn1.ASN1Util; -import org.mozilla.jss.pkcs11.*; - -import com.netscape.certsrv.usrgrp.*; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmc.TaggedCertificationRequest; +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; +import org.mozilla.jss.pkix.cms.IssuerAndSerialNumber; +import org.mozilla.jss.pkix.cms.SignedData; +import org.mozilla.jss.pkix.cms.SignerIdentifier; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.CertRequest; +import org.mozilla.jss.pkix.crmf.CertTemplate; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; +import org.mozilla.jss.pkix.primitive.Name; -import netscape.security.pkcs.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import java.math.BigInteger; -import org.mozilla.jss.CryptoManager; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmsutil.util.Utils; //import com.netscape.cmscore.util.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java index 80d51c4f5..1f2eb69ad 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java @@ -18,13 +18,15 @@ package com.netscape.cms.authentication; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.publish.*; -import netscape.ldap.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Vector; + +import netscape.ldap.LDAPEntry; + +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java index 1b1394175..3260af6e7 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java @@ -19,37 +19,43 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; - -// cert server imports. -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.certsrv.authentication.*; -import com.netscape.cmsutil.util.*; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.CertificateExtensions; import netscape.security.x509.CertificateSubjectName; import netscape.security.x509.CertificateValidity; -import netscape.security.x509.CertificateExtensions; -import java.security.cert.CertificateException; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; -// java sdk imports. -import java.util.Locale; -import java.util.Hashtable; -import java.util.Vector; -import java.util.Enumeration; -import java.util.StringTokenizer; -import java.util.Date; -import java.io.IOException; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EFormSubjectDN; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java index a03b298e6..ab59c499d 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java +++ b/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java @@ -25,28 +25,29 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Enumeration; import java.util.Hashtable; import java.util.Locale; import java.util.StringTokenizer; -import java.util.Date; -import java.text.SimpleDateFormat; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; import com.netscape.certsrv.authentication.AuthToken; import com.netscape.certsrv.authentication.EInvalidCredentials; import com.netscape.certsrv.authentication.EMissingCredential; import com.netscape.certsrv.authentication.IAuthCredentials; -import com.netscape.certsrv.authentication.IAuthManager; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java index fe05dec9d..99ed45bb4 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java +++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java @@ -21,7 +21,6 @@ package com.netscape.cms.authentication; // java sdk imports. import java.util.Hashtable; import java.util.Vector; -import java.io.IOException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java index 12ea8f041..24a10e0a2 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java @@ -19,27 +19,26 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; - -// cert server imports. -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.IConfigStore; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.cmsutil.util.*; - -// cert server x509 imports -import netscape.security.x509.*; -import java.security.cert.*; -import java.security.*; - -// java sdk imports. -import java.util.*; -import java.io.IOException; +import com.netscape.cmsutil.util.Utils; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java index 9f49c2fd1..56c8739a8 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java +++ b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java @@ -19,29 +19,35 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -// cert server imports. -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPObjectClassSchema; +import netscape.ldap.LDAPSchema; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthInternalError; +import com.netscape.certsrv.authentication.EAuthUserError; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.BaseResources; import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; +import com.netscape.certsrv.ldap.ILdapConnFactory; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; - -// java sdk imports. -import java.util.Locale; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Vector; -import java.util.StringTokenizer; -import java.io.IOException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java index ee011b0e2..1f21bc1d7 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java @@ -18,14 +18,16 @@ package com.netscape.cms.authentication; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.publish.*; -import netscape.ldap.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Vector; + +import netscape.ldap.LDAPEntry; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java index 7a3993cde..3092d00a1 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java @@ -18,30 +18,34 @@ package com.netscape.cms.authentication; -import netscape.ldap.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; import java.security.Principal; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; - -import javax.servlet.http.HttpServletRequest; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authentication.ISSLClientCertProvider; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.usrgrp.Certificates; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java b/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java index 98bf72f47..8b0a7b9b3 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java +++ b/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java @@ -18,7 +18,9 @@ package com.netscape.cms.authentication; import java.math.BigInteger; + import org.mozilla.jss.pkix.cmc.PKIData; + import com.netscape.certsrv.authentication.ISharedToken; public class SharedSecret implements ISharedToken { diff --git a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java index 937531933..bb3937670 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java @@ -17,30 +17,33 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.authentication; -import java.io.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmsutil.http.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; -import javax.servlet.http.HttpServletRequest; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import java.io.ByteArrayInputStream; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cmsutil.http.HttpClient; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.HttpResponse; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.xml.XMLObject; /** * Token authentication. diff --git a/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java index 07f072914..565bca1a4 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java @@ -19,28 +19,19 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; - -// cert server imports. -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; - -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; -import netscape.security.x509.CertificateSubjectName; -import java.security.cert.CertificateException; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.io.IOException; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java index 41f178163..e97fee8b6 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java @@ -19,33 +19,33 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -// cert server imports. -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; -import netscape.security.x509.CertificateSubjectName; -import java.security.cert.CertificateException; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.util.Locale; -import java.util.Enumeration; -import java.io.IOException; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java index 7b6e41da0..116054181 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java @@ -19,38 +19,39 @@ package com.netscape.cms.authentication; // ldap java sdk -import netscape.ldap.*; -import java.util.*; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; -// cert server imports. -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.base.IConfigStore; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; -import com.netscape.certsrv.ldap.LdapResources; +import com.netscape.certsrv.ldap.ILdapConnFactory; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; - -// cert server x509 imports -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X500Name; -import netscape.security.x509.CertificateSubjectName; -import java.security.cert.CertificateException; -import java.security.NoSuchAlgorithmException; -import java.security.MessageDigest; - -// java sdk imports. -import java.util.Hashtable; -import java.util.Vector; -import java.util.Enumeration; -import java.io.IOException; -import java.io.*; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** |