diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/apps')
4 files changed, 142 insertions, 86 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index afaa5c9fc..a760f4fc1 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -18,94 +18,160 @@ package com.netscape.cmscore.apps; -import java.util.*; -import java.math.*; -import java.text.*; -import java.io.*; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Vector; -import java.util.Date; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.text.MessageFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.StringTokenizer; +import java.util.Timer; +import java.util.Vector; -import netscape.ldap.*; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.extensions.CertInfo; +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; -import com.netscape.cms.servlet.csadmin.*; -import com.netscape.cmsutil.net.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.security.NoSuchAlgorithmException; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.password.*; +import org.apache.xerces.parsers.DOMParser; +import org.mozilla.jss.CryptoManager.CertificateUsage; +import org.mozilla.jss.util.PasswordCallback; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import com.netscape.certsrv.acls.ACL; +import com.netscape.certsrv.acls.ACLEntry; +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.apps.ICMSEngine; +import com.netscape.certsrv.apps.ICommandQueue; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.base.ICertPrettyPrint; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtPrettyPrint; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.profile.IEnrollProfile; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.connector.*; +import com.netscape.certsrv.base.ITimeSource; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; import com.netscape.certsrv.logging.ELogException; import com.netscape.certsrv.logging.ILogEvent; -import com.netscape.certsrv.logging.ILogQueue; import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogQueue; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.common.Constants; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; - +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.password.IPasswordCheck; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.csadmin.LDAPSecurityDomainSessionTable; +import com.netscape.cms.servlet.csadmin.SecurityDomainSessionTable; +import com.netscape.cms.servlet.csadmin.SessionTimer; +import com.netscape.cmscore.authentication.AuthSubsystem; +import com.netscape.cmscore.authentication.VerifiedCert; +import com.netscape.cmscore.authentication.VerifiedCerts; +import com.netscape.cmscore.authorization.AuthzSubsystem; +import com.netscape.cmscore.base.ArgBlock; +import com.netscape.cmscore.base.FileConfigStore; +import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.cert.CertPrettyPrint; +import com.netscape.cmscore.cert.CertUtils; +import com.netscape.cmscore.cert.CrlCachePrettyPrint; import com.netscape.cmscore.cert.CrlPrettyPrint; import com.netscape.cmscore.cert.ExtPrettyPrint; -import com.netscape.cmscore.policy.*; -import com.netscape.cmscore.time.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmscore.util.Debug; -import com.netscape.cmscore.connector.*; -import com.netscape.cmscore.notification.*; -import com.netscape.cmscore.request.*; -import com.netscape.cmscore.cert.*; +import com.netscape.cmscore.cert.OidLoaderSubsystem; +import com.netscape.cmscore.cert.X500NameSubsystem; +import com.netscape.cmscore.connector.HttpConnection; +import com.netscape.cmscore.connector.HttpPKIMessage; +import com.netscape.cmscore.connector.HttpRequestEncoder; +import com.netscape.cmscore.connector.Resender; +import com.netscape.cmscore.dbs.CRLIssuingPointRecord; +import com.netscape.cmscore.dbs.CertificateRepository; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.dbs.RepositoryRecord; +import com.netscape.cmscore.jobs.JobsScheduler; +import com.netscape.cmscore.ldapconn.LdapAnonConnFactory; +import com.netscape.cmscore.ldapconn.LdapAuthInfo; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapBoundConnection; +import com.netscape.cmscore.ldapconn.LdapConnInfo; +import com.netscape.cmscore.ldapconn.LdapJssSSLSocketFactory; import com.netscape.cmscore.logging.LogSubsystem; import com.netscape.cmscore.logging.Logger; import com.netscape.cmscore.logging.SignedAuditLogger; -import com.netscape.cmscore.util.OsSubsystem; +import com.netscape.cmscore.notification.EmailFormProcessor; +import com.netscape.cmscore.notification.EmailResolverKeys; +import com.netscape.cmscore.notification.EmailTemplate; +import com.netscape.cmscore.notification.ReqCertSANameEmailResolver; +import com.netscape.cmscore.policy.GeneralNameUtil; +import com.netscape.cmscore.registry.PluginRegistry; +import com.netscape.cmscore.request.CertRequestConstants; +import com.netscape.cmscore.request.RequestSubsystem; import com.netscape.cmscore.security.JssSubsystem; -import com.netscape.cmscore.dbs.DBSubsystem; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.authentication.*; -import com.netscape.cmscore.authorization.AuthzSubsystem; +import com.netscape.cmscore.security.PWCBsdr; +import com.netscape.cmscore.security.PWsdrCache; +import com.netscape.cmscore.time.SimpleTimeSource; import com.netscape.cmscore.usrgrp.UGSubsystem; -import com.netscape.cmscore.request.RequestSubsystem; -import com.netscape.cmscore.jobs.JobsScheduler; -import com.netscape.osutil.*; - -import com.netscape.cmscore.cert.OidLoaderSubsystem; -import com.netscape.cmscore.cert.X500NameSubsystem; - -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.CryptoManager.CertificateUsage; -import netscape.security.pkcs.*; -import com.netscape.cmscore.security.*; -import com.netscape.cmscore.registry.*; -import com.netscape.cmsutil.password.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; +import com.netscape.cmscore.util.Debug; +import com.netscape.cmscore.util.OsSubsystem; +import com.netscape.cmsutil.net.ISocketFactory; +import com.netscape.cmsutil.password.IPasswordStore; +import com.netscape.osutil.OSUtil; public class CMSEngine implements ICMSEngine { private static final String ID = "MAIN"; diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java index 638eae082..e9f1f77aa 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java @@ -19,9 +19,8 @@ package com.netscape.cmscore.apps; import java.util.Hashtable; -import java.util.Enumeration; -import java.util.TimeZone; -import com.netscape.certsrv.apps.*; + +import com.netscape.certsrv.apps.ICommandQueue; /*--------------------------------------------------------------- diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java b/pki/base/common/src/com/netscape/cmscore/apps/Setup.java index 21a39ec8f..3eb897cc4 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/Setup.java @@ -18,12 +18,8 @@ package com.netscape.cmscore.apps; -import java.io.File; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; import com.netscape.certsrv.base.EBaseException; -import netscape.ldap.*; -import java.io.*; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java index f04eb1869..b77c8a7da 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java @@ -18,16 +18,11 @@ package com.netscape.cmscore.apps; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.cmscore.util.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.util.ConsolePasswordCallback; import java.io.File; -import java.lang.*; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cmscore.util.OsSubsystem; public final class Upgrade { |