diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin')
63 files changed, 1160 insertions, 1137 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java index 876cd2a0..a2509287 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java @@ -18,25 +18,26 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; - -import com.netscape.cms.servlet.wizard.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.X509Certificate; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class AdminAuthenticatePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index c205dad9..78bb9485 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -18,44 +18,52 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.net.URLEncoder; +import java.security.cert.X509Certificate; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPException; +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + import org.apache.velocity.context.Context; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.cmsutil.http.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import com.netscape.cmsutil.xml.*; -import org.xml.sax.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; - -import com.netscape.cms.servlet.wizard.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; +import org.mozilla.jss.asn1.SEQUENCE; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; +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; public class AdminPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java index 18741bfb..a62b22b7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java @@ -18,23 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class AgentAuthenticatePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java index 77aa5bda..ceab1d8d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java @@ -18,23 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class AuthenticatePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java index 7e2aedad..77977808 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java @@ -18,37 +18,56 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.ByteArrayOutputStream; +import java.io.CharConversionException; +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.cert.CertificateEncodingException; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.util.Password; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.PBEAlgorithm; import org.mozilla.jss.crypto.PrivateKey; -import com.netscape.cmsutil.crypto.*; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; +import org.mozilla.jss.util.Password; -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class BackupKeyCertPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java index 9bbb0900..f5f4441a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java @@ -18,15 +18,17 @@ package com.netscape.cms.servlet.csadmin; +import java.io.IOException; +import java.util.Enumeration; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; +import org.apache.velocity.servlet.VelocityServlet; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; public class BaseServlet extends VelocityServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java index 316c5706..33a0ff69 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java @@ -18,32 +18,24 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.net.URL; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import org.xml.sax.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.crypto.*; -import java.io.*; -import java.util.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.cmsutil.http.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class CAInfoPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java index 4aca6cec..fb8c2d9c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java @@ -18,8 +18,6 @@ package com.netscape.cms.servlet.csadmin; -import java.util.StringTokenizer; -import java.util.Vector; public class Cert { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java index bd489391..30bcc78d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java @@ -18,33 +18,26 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.*; -import java.security.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.cmsutil.crypto.*; +import java.io.IOException; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.pkcs11.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; +import netscape.security.util.CertPrettyPrint; -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class CertPrettyPrintPanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java index 1a67cf12..5e783b1a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java @@ -18,38 +18,41 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.*; -import java.security.*; -import java.math.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.Principal; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.pkcs.PKCS10; +import netscape.security.util.CertPrettyPrint; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.InternalCertificate; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.pkcs11.*; +import org.mozilla.jss.crypto.X509Certificate; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class CertRequestPanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index dc8adaf9..3725149d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -17,37 +17,52 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.security.*; -import java.security.cert.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.http.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.usrgrp.*; -import netscape.security.x509.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.crypto.PrivateKey; -import com.netscape.cmsutil.xml.*; -import org.mozilla.jss.crypto.KeyPairGenerator; -import netscape.security.pkcs.*; -import netscape.ldap.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.math.BigInteger; +import java.util.Date; + +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPException; +import netscape.security.pkcs.PKCS10; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + import org.apache.velocity.context.Context; -import org.xml.sax.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.X509Certificate; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.profile.CertInfoProfile; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmsutil.crypto.CryptoUtil; +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; public class CertUtil { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java index 829e46a4..41e583be 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java @@ -17,23 +17,24 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class CheckIdentity extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java index 8017a893..6deea259 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java @@ -18,15 +18,15 @@ package com.netscape.cms.servlet.csadmin; +import java.util.Enumeration; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; public abstract class ConfigBaseServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java index 6acb7127..d95c85d1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java @@ -17,10 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.ssl.*; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; public class ConfigCertApprovalCallback diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java index 0a9d9a9c..b9f129fd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class ConfigCertReqServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java index 73150946..0a0e5f08 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class ConfigCloneServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java index 56da3a23..0a54dd47 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java @@ -18,14 +18,15 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import java.io.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; public class ConfigDatabaseServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java index caee8c1d..a3198414 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java @@ -18,30 +18,29 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import javax.servlet.*; +import java.io.FileNotFoundException; +import java.io.IOException; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.property.*; -import com.netscape.cmsutil.crypto.*; -import java.util.*; -import java.io.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.util.IncorrectPasswordException; -import com.netscape.cmsutil.password.*; +import org.mozilla.jss.util.Password; -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.password.PlainPasswordReader; +import com.netscape.cmsutil.password.PlainPasswordWriter; public class ConfigHSMLoginPanel extends WizardPanelBase { private CryptoManager mCryptoManager = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java index 536dfe77..3cd54854 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java @@ -18,20 +18,26 @@ package com.netscape.cms.servlet.csadmin; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import javax.servlet.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmsutil.crypto.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs11.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkcs11.PK11Module; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cmsutil.crypto.Module; public class ConfigHSMServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java index 892d2458..e8ca8a08 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class ConfigImportCertServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java index b22178b4..b960b233 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java @@ -18,27 +18,17 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.profile.*; -import com.netscape.cmsutil.crypto.*; - -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import java.util.*; -import java.io.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cmsutil.crypto.CryptoUtil; public class ConfigJoinServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java index e07ea3c3..a28dbbdf 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java @@ -18,17 +18,19 @@ package com.netscape.cms.servlet.csadmin; +import java.util.Vector; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.profile.*; -import java.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.profile.CertInfoProfile; public class ConfigRootCAServlet extends ConfigBaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java index a9996988..daf14c9e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java @@ -18,27 +18,24 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.net.URL; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.crypto.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.crypto.*; -import java.net.*; -import java.io.*; -import java.util.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.xml.sax.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class CreateSubsystemPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java index bdd0b0d0..17a4bae6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java @@ -18,27 +18,48 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; +import java.util.Enumeration; +import java.util.Random; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv3; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.ca.*; -import java.io.*; -import java.util.*; -import com.netscape.cmsutil.ldap.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.ldap.LDAPUtil; public class DatabasePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java index 03f8f2f8..8f1b6160 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class DatabaseServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java index cf25ab0e..1e1b6dec 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java @@ -18,34 +18,27 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import org.xml.sax.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.xml.*; -import java.io.*; -import java.net.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.cmsutil.http.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import netscape.security.util.*; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.util.CertPrettyPrint; import netscape.security.x509.X509CertImpl; -import com.netscape.cmsutil.crypto.*; -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class DisplayCertChainPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java index 2c0184f2..f9725294 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class DisplayServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index fa5840dc..9669ddb1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -18,34 +18,40 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.math.BigInteger; +import java.net.URLEncoder; +import java.security.cert.X509Certificate; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.security.x509.X509CertImpl; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.ocsp.IDefStore; +import com.netscape.certsrv.ocsp.IOCSPAuthority; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.password.IPasswordStore; import com.netscape.cmsutil.util.Cert; -import com.netscape.cmsutil.util.*; -import com.netscape.cmsutil.password.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import java.net.*; -import java.io.*; -import java.math.*; -import java.security.cert.*; -import org.w3c.dom.*; -import java.util.*; - -import com.netscape.cms.servlet.wizard.*; +import com.netscape.cmsutil.util.Utils; public class DonePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java index ecc1e7e4..bfea4d64 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java @@ -17,38 +17,22 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmsutil.crypto.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.crypto.CryptoUtil; public class DownloadPKCS12 extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java index 3a9a36e9..24652db2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java @@ -18,30 +18,27 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.CertificateChain; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class GetCertChain extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java index c47bfdc1..d7d32f06 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java @@ -17,22 +17,31 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.password.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.password.IPasswordStore; +import com.netscape.cmsutil.xml.XMLObject; public class GetConfigEntries extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java index 7b3e69dc..962f87bf 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -17,25 +17,33 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URL; +import java.net.URLDecoder; +import java.util.Locale; +import java.util.Random; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; public class GetCookie extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java index f2b4589e..5957151f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java @@ -18,36 +18,35 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class GetDomainXML extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java index 5f533fbe..69666963 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -18,30 +18,23 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class GetStatus extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java index ab6a1aa0..05882ad5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java @@ -18,34 +18,26 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.crypto.*; -import org.w3c.dom.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.X509Certificate; +import org.w3c.dom.Node; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.crypto.CryptoUtil; +import com.netscape.cmsutil.xml.XMLObject; public class GetSubsystemCert extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java index 442826c4..c7fcd6a4 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java @@ -17,22 +17,25 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.password.*; -import org.w3c.dom.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class GetTokenInfo extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java index 21e64086..4e98c4d4 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java @@ -18,41 +18,31 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.security.cert.CertificateEncodingException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.util.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; /** * This servlet retrieves the transport certificate from DRM. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java index 653387bf..a00b0fb7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java @@ -18,33 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.io.*; -import java.net.URL; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; - -import java.util.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; - -import netscape.security.x509.*; -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class HierarchyPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java index 9b4a3ae3..d4f93a9b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java @@ -18,36 +18,32 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.math.BigInteger; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPException; +import netscape.security.x509.X509CertImpl; + import org.apache.velocity.context.Context; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import org.mozilla.jss.asn1.*; -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class ImportAdminCertPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java index 8a730d51..0c2e7fa0 100755 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java @@ -18,36 +18,21 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.template.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; - -import org.mozilla.jss.asn1.*; -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class ImportCAChainPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java index 1d884856..b480d854 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java @@ -18,49 +18,29 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.mozilla.jss.CryptoManager; +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.PrivateKey.Type; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.primitive.Attribute; -import java.security.interfaces.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; /** * This servlet imports DRM's transport certificate into TKS. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java index 5c89e588..da2a3ccb 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java @@ -17,12 +17,23 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import netscape.ldap.*; -import com.netscape.cmsutil.password.*; +import java.io.IOException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +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.base.IConfigStore; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.cmsutil.password.IPasswordStore; /** * This object stores the values for IP, uid and group based on the cookie id in LDAP. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java index ca3879ad..c16238e7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java @@ -18,13 +18,12 @@ package com.netscape.cms.servlet.csadmin; -import java.util.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; import com.netscape.certsrv.apps.CMS; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java index ff8d08b8..efb76596 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java @@ -18,19 +18,25 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.template.ArgList; -import com.netscape.certsrv.template.ArgSet; -import com.netscape.cms.servlet.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; public class MainPageServlet extends CMSServlet { private static final String PROP_AUTHORITY_ID="authorityId"; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java index e5852cf5..38185a33 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java @@ -18,27 +18,31 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import com.netscape.certsrv.apps.CMS; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; -import com.netscape.cmsutil.crypto.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs11.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.pkcs11.PK11Module; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.Module; public class ModulePanel extends WizardPanelBase { private CryptoManager mCryptoManager = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java index 9230ef5b..84097846 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; import com.netscape.certsrv.apps.CMS; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java index 9e0b3c86..ec3686e9 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java @@ -18,34 +18,37 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.net.URL; +import java.net.URLEncoder; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; - -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; - -import com.netscape.cmsutil.crypto.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.base.*; -import java.net.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; - -import netscape.security.x509.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class NamePanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java index e7a1286c..e63782a7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -18,38 +18,36 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; /** * This servlet creates a TPS user in the CA, diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index d9ee171d..76f5a749 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -18,35 +18,61 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.Principal; +import java.security.PublicKey; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPDN; +import netscape.security.x509.X509CertImpl; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import java.security.*; -import java.math.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.PrivateKey.Type; -import org.mozilla.jss.pkix.primitive.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.Cipher; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.EncryptionAlgorithm; +import org.mozilla.jss.crypto.IVParameterSpec; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.KeyGenAlgorithm; +import org.mozilla.jss.crypto.KeyGenerator; +import org.mozilla.jss.crypto.KeyWrapAlgorithm; +import org.mozilla.jss.crypto.KeyWrapper; +import org.mozilla.jss.crypto.SymmetricKey; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11Store; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; import org.mozilla.jss.pkix.primitive.Attribute; -import com.netscape.cms.servlet.wizard.*; -import netscape.ldap.*; -import java.security.interfaces.*; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; +import org.mozilla.jss.util.Password; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class RestoreKeyCertPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java index f336cd84..854e8f10 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java @@ -17,36 +17,20 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.util.Password; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import java.io.*; -import java.net.URL; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import java.security.KeyPair; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import org.mozilla.jss.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.crypto.PrivateKey; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class SavePKCS12Panel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java index 4f0a19d8..ac202566 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java @@ -18,16 +18,18 @@ package com.netscape.cms.servlet.csadmin; -import java.util.*; -import java.net.*; +import java.net.URL; +import java.net.URLDecoder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; public class SecurityDomainLogin extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java index 160cc74c..90a6aeb0 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java @@ -18,27 +18,24 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.StringTokenizer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; -import org.mozilla.jss.crypto.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.crypto.*; -import java.net.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; - -import com.netscape.cms.servlet.wizard.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; public class SecurityDomainPanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java index b4ee2721..3d3530f2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.ISecurityDomainSessionTable; /** * This object stores the values for IP, uid and group based on the cookie id. diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java index 92f2e256..c3a1e325 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.TimerTask; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; import com.netscape.certsrv.logging.ILogger; public class SessionTimer extends TimerTask { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java index 48601629..0e6a507a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java @@ -18,29 +18,33 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.interfaces.RSAPublicKey; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.cmsutil.crypto.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import java.security.interfaces.RSAPublicKey; -import java.util.*; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.pkcs11.PK11KeyPairGenerator; - -import com.netscape.cms.servlet.wizard.*; +import org.apache.velocity.context.Context; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.crypto.TokenException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.certsrv.util.HttpInput; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; public class SizePanel extends WizardPanelBase { private Vector mCerts = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java index ebcafe86..c4373ebc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java @@ -17,21 +17,24 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import javax.servlet.http.*; -import java.net.*; -import org.w3c.dom.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cms.servlet.*; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import com.netscape.cmsutil.xml.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.xml.XMLObject; public class TokenAuthenticate extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java index d5c4f017..93bcc1fb 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java @@ -18,37 +18,32 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ca.*; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICAService; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateConnector extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index 78763dfb..a41fae5f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -18,36 +18,42 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateDomainXML extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java index 77650dbf..cf0f3a09 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java @@ -18,39 +18,32 @@ package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.repository.IRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateNumberRange extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java index b2b8b5d2..34074cb5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java @@ -17,31 +17,28 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; -import java.io.*; -import java.util.*; -import java.math.*; -import javax.servlet.*; -import java.security.cert.*; -import javax.servlet.http.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.w3c.dom.Node; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.cms.servlet.*; -import com.netscape.cmsutil.xml.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; -import org.apache.xerces.dom.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.xml.XMLObject; public class UpdateOCSPConfig extends CMSServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java index cb3cf754..7b1c9959 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java @@ -18,19 +18,20 @@ package com.netscape.cms.servlet.csadmin; -import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.context.Context; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; +import org.apache.velocity.context.Context; -import com.netscape.cms.servlet.wizard.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.wizard.WizardServlet; public class WelcomePanel extends WizardPanelBase { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java index 2871b9e4..1dbec399 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java @@ -18,11 +18,12 @@ package com.netscape.cms.servlet.csadmin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.velocity.Template; -import org.apache.velocity.servlet.VelocityServlet; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; -import javax.servlet.http.*; public class WelcomeServlet extends BaseServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java index 2ec81f7b..a2a7d5df 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java @@ -18,33 +18,49 @@ package com.netscape.cms.servlet.csadmin; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.ConnectException; +import java.net.URLEncoder; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; + import org.apache.velocity.context.Context; -import javax.servlet.http.*; -import javax.servlet.*; -import java.io.*; -import java.util.*; -import java.net.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.base.*; -import com.netscape.cms.servlet.wizard.*; -import com.netscape.cms.servlet.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.Base64OutputStream; -import org.mozilla.jss.pkcs11.*; -import netscape.security.x509.*; -import com.netscape.cmsutil.xml.*; -import com.netscape.cmsutil.http.*; -import org.w3c.dom.*; -import org.xml.sax.*; -import java.security.cert.*; -import java.security.*; -import netscape.ldap.*; - -import com.netscape.cmsutil.crypto.*; -import com.netscape.cms.servlet.wizard.*; +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.pkcs11.PK11Store; +import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.PropertySet; +import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cms.servlet.wizard.IWizardPanel; +import com.netscape.cms.servlet.wizard.WizardServlet; +import com.netscape.cmsutil.crypto.CryptoUtil; +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; public class WizardPanelBase implements IWizardPanel { public static String PCERT_PREFIX = "preop.cert."; |