diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 14:49:11 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:03:25 -0500 |
| commit | 7c7b9d023cd466c1771068badc020dab36beb553 (patch) | |
| tree | 178877eb83e25336be7577953945fbdb0b9e1a15 /base/common/src/com/netscape/cms | |
| parent | da1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff) | |
| download | pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz pki-7c7b9d023cd466c1771068badc020dab36beb553.zip | |
Removed whitespaces from Java code.
Whitespaces in Java code have been removed with the following command:
find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \;
Ticket #134
Diffstat (limited to 'base/common/src/com/netscape/cms')
389 files changed, 2144 insertions, 2144 deletions
diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java index 6a8bbcbf2..55c62eeb1 100644 --- a/base/common/src/com/netscape/cms/authentication/AVAPattern.java +++ b/base/common/src/com/netscape/cms/authentication/AVAPattern.java @@ -39,45 +39,45 @@ import com.netscape.certsrv.authentication.ECompSyntaxErr; * class for parsing a DN pattern used to construct a certificate * subject name from ldap attributes and dn. * <p> - * + * * dnpattern is a string representing a subject name pattern to formulate from the directory attributes and entry dn. If * empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$attr" "." attrName [ "." attrNumber ] | - * name "=" "$dn" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$attr" "." attrName [ "." attrNumber ] | + * name "=" "$dn" "." attrName [ "." attrNumber ] | * "$dn" "." "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US </i> * Ldap entry: dn: UID=jjames, OU=IS, OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example2: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. note multiple AVAs @@ -86,40 +86,40 @@ import com.netscape.certsrv.authentication.ECompSyntaxErr; * C = the string "US" * <p> * </pre> - * + * * <pre> * Example3: <i>CN=$attr.cn, $rdn.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=IS+OU=people, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * followed by the second RDN in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example4: <i>CN=$attr.cn, OU=$dn.ou.2+OU=$dn.ou.1, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=people+OU=IS, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> - * OU = the second 'ou' value in the user's entry DN followed by the + * OU = the second 'ou' value in the user's entry DN followed by the * first 'ou' value in the user's entry. note multiple AVAs * in a RDN in this example. <br> * O = the (first) 'o' value in the user's entry DN. <br> * C = the string "US" * <p> * </pre> - * + * * If an attribute or subject DN component does not exist the attribute is skipped. - * + * * @version $Revision$, $Date$ */ class AVAPattern { @@ -184,7 +184,7 @@ class AVAPattern { if (c == -1) throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "All blank")); - // $rdn "." number syntax. + // $rdn "." number syntax. if (c == '$') { //System.out.println("$rdn syntax"); @@ -228,9 +228,9 @@ class AVAPattern { return; } - // name "=" ... syntax. + // name "=" ... syntax. - // read name + // read name //System.out.println("reading name"); StringBuffer attrBuf = new StringBuffer(); @@ -250,10 +250,10 @@ class AVAPattern { throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "Missing \"=\" in ava pattern")); - // read value + // read value //System.out.println("reading value"); - // skip spaces + // skip spaces //System.out.println("skip spaces for value"); try { while ((c = in.read()) == ' ' || c == '\t') {//System.out.println("spaces2 read "+(char)c); @@ -267,7 +267,7 @@ class AVAPattern { "no value after = in ava pattern")); if (c == '$') { - // check for $dn or $attr + // check for $dn or $attr try { c = in.read(); //System.out.println("check $dn or $attr read "+(char)c); @@ -306,7 +306,7 @@ class AVAPattern { "unknown keyword. expecting $dn or $attr.")); } - // get attr name of dn pattern from above. + // get attr name of dn pattern from above. String attrName = attrBuf.toString().trim(); //System.out.println("----- attrName "+attrName); @@ -333,7 +333,7 @@ class AVAPattern { valueBuf.append((char) c); } if (c == '+' || c == ',') // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } catch (IOException e) { throw new EAuthException(CMS.getUserMessage("CMS_AUTHENTICATION_INTERNAL_ERROR", e.toString())); } @@ -375,7 +375,7 @@ class AVAPattern { // value is constant. treat as regular ava. mType = TYPE_CONSTANT; //System.out.println("----- mType constant"); - // parse ava value. + // parse ava value. StringBuffer valueBuf = new StringBuffer(); valueBuf.append((char) c); diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java index 65ef434a9..03428102d 100644 --- a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java @@ -52,7 +52,7 @@ import com.netscape.certsrv.usrgrp.IUser; * Maps a SSL client authenticate certificate to a user (agent) entry in the * internal database. * <P> - * + * * @version $Revision$, $Date$ */ public class AgentCertAuthentication implements IAuthManager, @@ -90,7 +90,7 @@ public class AgentCertAuthentication implements IAuthManager, * initializes the CertUserDBAuthentication auth manager * <p> * called by AuthSubsystem init() method, when initializing all available authentication managers. - * + * * @param name The name of this authentication manager instance. * @param implName The name of the authentication manager plugin. * @param config The configuration store for this authentication manager. @@ -127,11 +127,11 @@ public class AgentCertAuthentication implements IAuthManager, * authenticates user(agent) by certificate * <p> * called by other subsystems or their servlets to authenticate users (agents) - * + * * @param authCred - authentication credential that contains * an usrgrp.Certificates of the user (agent) * @return the authentication token that contains the following - * + * * @exception EMissingCredential If a required credential for this * authentication manager is missing. * @exception EInvalidCredentials If credentials cannot be authenticated. @@ -207,7 +207,7 @@ public class AgentCertAuthentication implements IAuthManager, e.toString())); } - // any unexpected error occurs like internal db down, + // any unexpected error occurs like internal db down, // UGSubsystem only returns null for user. if (user == null) { throw new EInvalidCredentials(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_CREDENTIAL")); @@ -248,7 +248,7 @@ public class AgentCertAuthentication implements IAuthManager, * the servlets that handle agent operations to authenticate its * users. It calls this method to know which are the * required credentials from the user (e.g. Javascript form data) - * + * * @return attribute names in Vector */ public String[] getRequiredCreds() { @@ -261,7 +261,7 @@ public class AgentCertAuthentication implements IAuthManager, * the Certificate Server Console to display the table for * configuration purposes. CertUserDBAuthentication is currently not * exposed in this case, so this method is not to be used. - * + * * @return configuration parameter names in Hashtable of Vectors * where each hashtable entry's key is the substore name, value is a * Vector of parameter names. If no substore, the parameter name @@ -280,7 +280,7 @@ public class AgentCertAuthentication implements IAuthManager, /** * gets the configuretion substore used by this authentication * manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cms/authentication/Crypt.java b/base/common/src/com/netscape/cms/authentication/Crypt.java index e6dd7087d..867181138 100644 --- a/base/common/src/com/netscape/cms/authentication/Crypt.java +++ b/base/common/src/com/netscape/cms/authentication/Crypt.java @@ -178,7 +178,7 @@ public class Crypt { /** * Create a Crypt object with specified salt. Use setPasswd() before * getEncryptedPasswd(). - * + * * @param salt the salt string for encryption */ public Crypt(String salt) { @@ -191,7 +191,7 @@ public class Crypt { * Create a Crypt object with specified passwd and salt (often the * already encypted passwd). Get the encrypted result with * getEncryptedPasswd(). - * + * * @param passwd the passwd to encrypt * @param salt the salt string for encryption */ @@ -203,7 +203,7 @@ public class Crypt { /** * Retrieve the passwd string currently being encrypted. - * + * * @return the current passwd string */ public String getPasswd() { @@ -212,7 +212,7 @@ public class Crypt { /** * Retrieve the salt string currently being used for encryption. - * + * * @return the current salt string */ public String getSalt() { @@ -222,7 +222,7 @@ public class Crypt { /** * Retrieve the resulting encrypted string from the current passwd and * salt settings. - * + * * @return the encrypted passwd */ public String getEncryptedPasswd() { @@ -232,7 +232,7 @@ public class Crypt { /** * Set a new passwd string for encryption. Use getEncryptedPasswd() to * retrieve the new result. - * + * * @param passwd the new passwd string */ public void setPasswd(String passwd) { @@ -243,7 +243,7 @@ public class Crypt { /** * Set a new salt string for encryption. Use getEncryptedPasswd() to * retrieve the new result. - * + * * @param salt the new salt string */ public void setSalt(String salt) { diff --git a/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/common/src/com/netscape/cms/authentication/DNPattern.java index 480b5b909..e44f40e9d 100644 --- a/base/common/src/com/netscape/cms/authentication/DNPattern.java +++ b/base/common/src/com/netscape/cms/authentication/DNPattern.java @@ -31,45 +31,45 @@ import com.netscape.certsrv.base.EBaseException; * class for parsing a DN pattern used to construct a certificate * subject name from ldap attributes and dn. * <p> - * + * * dnpattern is a string representing a subject name pattern to formulate from the directory attributes and entry dn. If * empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$attr" "." attrName [ "." attrNumber ] | - * name "=" "$dn" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$attr" "." attrName [ "." attrNumber ] | + * name "=" "$dn" "." attrName [ "." attrNumber ] | * "$dn" "." "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US </i> * Ldap entry: dn: UID=jjames, OU=IS, OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example2: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. note multiple AVAs @@ -78,40 +78,40 @@ import com.netscape.certsrv.base.EBaseException; * C = the string "US" * <p> * </pre> - * + * * <pre> * Example3: <i>CN=$attr.cn, $rdn.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=IS+OU=people, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * followed by the second RDN in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example4: <i>CN=$attr.cn, OU=$dn.ou.2+OU=$dn.ou.1, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=people+OU=IS, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> - * OU = the second 'ou' value in the user's entry DN followed by the + * OU = the second 'ou' value in the user's entry DN followed by the * first 'ou' value in the user's entry. note multiple AVAs * in a RDN in this example. <br> * O = the (first) 'o' value in the user's entry DN. <br> * C = the string "US" * <p> * </pre> - * + * * If an attribute or subject DN component does not exist the attribute is skipped. - * + * * @version $Revision$, $Date$ */ public class DNPattern { @@ -129,14 +129,14 @@ public class DNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattern the DN pattern * @exception EBaseException If parsing error occurs. */ public DNPattern(String pattern) throws EAuthException { if (pattern == null || pattern.equals("")) { - // create an attribute list that is the dn. + // create an attribute list that is the dn. mLdapAttrs = new String[] { "dn" }; } else { mPatternString = pattern; @@ -185,7 +185,7 @@ public class DNPattern { /** * Form a Ldap v3 DN string from results of a ldap search. - * + * * @param entry LDAPentry from a ldap search * @return Ldap v3 DN string to use for a subject name. */ diff --git a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java index da8d5bd51..f52904718 100644 --- a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java @@ -61,9 +61,9 @@ import com.netscape.cmsutil.util.Utils; * Uses a pattern for formulating subject names. * The pattern is read from configuration file. * Syntax of the pattern is described in the init() method. - * + * * <P> - * + * * @version $Revision$, $Date$ */ public abstract class DirBasedAuthentication @@ -78,7 +78,7 @@ public abstract class DirBasedAuthentication protected static final String PROP_LDAPSTRINGATTRS = "ldapStringAttributes"; protected static final String PROP_LDAPBYTEATTRS = "ldapByteAttributes"; - // members + // members /* name of this authentication manager instance */ protected String mName = null; @@ -104,11 +104,11 @@ public abstract class DirBasedAuthentication /* the subject DN pattern */ protected DNPattern mPattern = null; - /* the list of LDAP attributes with string values to retrieve to + /* the list of LDAP attributes with string values to retrieve to * save in the auth token including ones from the dn pattern. */ protected String[] mLdapStringAttrs = null; - /* the list of LDAP attributes with byte[] values to retrive to save + /* the list of LDAP attributes with byte[] values to retrive to save * in authtoken. */ protected String[] mLdapByteAttrs = null; @@ -160,14 +160,14 @@ public abstract class DirBasedAuthentication /** * Initializes the UidPwdDirBasedAuthentication auth manager. - * + * * Takes the following configuration parameters: <br> - * + * * <pre> * ldap.basedn - the ldap base dn. * ldap.ldapconn.host - the ldap host. - * ldap.ldapconn.port - the ldap port - * ldap.ldapconn.secureConn - whether port should be secure + * ldap.ldapconn.port - the ldap port + * ldap.ldapconn.secureConn - whether port should be secure * ldap.minConns - minimum connections * ldap.maxConns - max connections * dnpattern - dn pattern. @@ -177,33 +177,33 @@ public abstract class DirBasedAuthentication * attributes and entry dn. If empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> * The syntax is - * + * * <pre> * dnpattern = SubjectNameComp *[ "," SubjectNameComp ] - * - * SubjectNameComponent = DnComp | EntryComp | ConstantComp + * + * SubjectNameComponent = DnComp | EntryComp | ConstantComp * DnComp = CertAttr "=" "$dn" "." DnAttr "." Num * EntryComp = CertAttr "=" "$attr" "." EntryAttr "." Num * ConstantComp = CertAttr "=" Constant * DnAttr = an attribute in the Ldap entry dn - * EntryAttr = an attribute in the Ldap entry + * EntryAttr = an attribute in the Ldap entry * CertAttr = a Component in the Certificate Subject Name - * (multiple AVA in one RDN not supported) + * (multiple AVA in one RDN not supported) * Num = the nth value of tha attribute in the dn or entry. * Constant = Constant String, with any accepted ldap string value. - * + * * </pre> * <p> * <b>Example:</b> - * + * * <pre> - * dnpattern: + * dnpattern: * E=$attr.mail.1, CN=$attr.cn, OU=$attr.ou.2, O=$dn.o, C=US * <br> - * Ldap entry dn: + * Ldap entry dn: * UID=joesmith, OU=people, O=Acme.com * <br> - * Ldap attributes: + * Ldap attributes: * cn: Joe Smith * sn: Smith * mail: joesmith@acme.com @@ -214,17 +214,17 @@ public abstract class DirBasedAuthentication * </pre> * <p> * The subject name formulated in the cert will be : <br> - * + * * <pre> * E=joesmith@acme.com, CN=Joe Smith, OU=Human Resources, O=Acme.com, C=US - * - * E = the first 'mail' ldap attribute value in user's entry - joesmithe@acme.com - * CN = the (first) 'cn' ldap attribute value in the user's entry - Joe Smith + * + * E = the first 'mail' ldap attribute value in user's entry - joesmithe@acme.com + * CN = the (first) 'cn' ldap attribute value in the user's entry - Joe Smith * OU = the second 'ou' value in the ldap entry - IS - * O = the (first) 'o' value in the user's entry DN - "Acme.com" + * O = the (first) 'o' value in the user's entry DN - "Acme.com" * C = the constant string "US" * </pre> - * + * * @param name The name for this authentication manager instance. * @param implName The name of the authentication manager plugin. * @param config - The configuration store for this instance. @@ -326,7 +326,7 @@ public abstract class DirBasedAuthentication * Authenticates user through LDAP by a set of credentials. * Resulting AuthToken a TOKEN_CERTINFO field of a X509CertInfo * <p> - * + * * @param authCred Authentication credentials, CRED_UID and CRED_PWD. * @return A AuthToken with a TOKEN_SUBJECT of X500name type. * @exception com.netscape.certsrv.authentication.EMissingCredential @@ -374,14 +374,14 @@ public abstract class DirBasedAuthentication } catch (IOException e) { } - // set validity if any + // set validity if any try { CertificateValidity validity = (CertificateValidity) certInfo.get(X509CertInfo.VALIDITY); if (validity != null) { - // the gets throws IOException but only if attribute - // not recognized. In these cases they are always. + // the gets throws IOException but only if attribute + // not recognized. In these cases they are always. authToken.set(AuthToken.TOKEN_CERT_NOTBEFORE, (Date) validity.get(CertificateValidity.NOT_BEFORE)); authToken.set(AuthToken.TOKEN_CERT_NOTAFTER, @@ -414,7 +414,7 @@ public abstract class DirBasedAuthentication /** * get the list of required credentials. - * + * * @return list of required credentials as strings. */ public abstract String[] getRequiredCreds(); @@ -423,7 +423,7 @@ public abstract class DirBasedAuthentication * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public abstract String[] getConfigParams(); @@ -445,7 +445,7 @@ public abstract class DirBasedAuthentication /** * Gets the configuration substore used by this authentication manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -454,7 +454,7 @@ public abstract class DirBasedAuthentication /** * Authenticates a user through directory based a set of credentials. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -466,7 +466,7 @@ public abstract class DirBasedAuthentication /** * Formulate the cert info. - * + * * @param conn A LDAP Connection authenticated to user to use. * @param userdn The user's dn. * @param certinfo A certinfo object to fill. @@ -482,7 +482,7 @@ public abstract class DirBasedAuthentication // get ldap attributes to retrieve. String[] attrs = getLdapAttrs(); - // retrieve the attributes. + // retrieve the attributes. try { if (conn != null) { LDAPEntry entry = null; @@ -496,7 +496,7 @@ public abstract class DirBasedAuthentication } entry = results.next(); - // formulate the subject dn + // formulate the subject dn try { dn = formSubjectName(entry); } catch (EBaseException e) { @@ -510,7 +510,7 @@ public abstract class DirBasedAuthentication } // add anything else in cert info such as validity, extensions - // (nothing now) + // (nothing now) // pack the dn into X500name and set subject name. if (dn.length() == 0) { @@ -610,7 +610,7 @@ public abstract class DirBasedAuthentication /** * Return a list of LDAP attributes with String values to retrieve. * Subclasses can override to return any set of attributes. - * + * * @return Array of LDAP attributes to retrieve from the directory. */ protected String[] getLdapAttrs() { @@ -620,7 +620,7 @@ public abstract class DirBasedAuthentication /** * Return a list of LDAP attributes with byte[] values to retrieve. * Subclasses can override to return any set of attributes. - * + * * @return Array of LDAP attributes to retrieve from the directory. */ protected String[] getLdapByteAttrs() { @@ -629,7 +629,7 @@ public abstract class DirBasedAuthentication /** * Formulate the subject name - * + * * @param entry The LDAP entry * @return The subject name string. * @exception EBaseException If an internal error occurs. @@ -654,7 +654,7 @@ public abstract class DirBasedAuthentication /** * Logs a message for this class in the system log file. - * + * * @param level The log level. * @param msg The message to log. * @see com.netscape.certsrv.logging.ILogger diff --git a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java index f60110b0b..2394ede4c 100644 --- a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java +++ b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java @@ -51,7 +51,7 @@ import com.netscape.certsrv.request.IRequest; /** * This represents the authentication manager that authenticates * user against a file where id, and password are stored. - * + * * @version $Revision$, $Date$ */ public class FlatFileAuth @@ -110,7 +110,7 @@ public class FlatFileAuth /** * This array is created as to include all the requested attributes - * + * */ String[] reqCreds = null; @@ -127,7 +127,7 @@ public class FlatFileAuth * Get the named property * If the property is not set, use s as the default, and create * a new value for the property in the config file. - * + * * @param propertyName Property name * @param s The default value of the property */ @@ -152,7 +152,7 @@ public class FlatFileAuth * Get the named property, * If the property is not set, use b as the default, and create * a new value for the property in the config file. - * + * * @param propertyName Property name * @param b The default value of the property */ @@ -220,7 +220,7 @@ public class FlatFileAuth /** * Log a message. - * + * * @param level The logging level. * @param msg The message to log. */ @@ -398,7 +398,7 @@ public class FlatFileAuth /** * Read a file with the following format: * <p> - * + * * <pre> * param1: valuea * param2: valueb @@ -406,7 +406,7 @@ public class FlatFileAuth * param1: valuec * param2: valued * </pre> - * + * * @param f The file to read * @param keys The parameters to concat together to form the hash * key @@ -506,7 +506,7 @@ public class FlatFileAuth /** * Compare attributes provided by the user with those in * in flat file. - * + * */ private IAuthToken doAuthentication(Hashtable<String, String> user, IAuthCredentials authCred) @@ -543,7 +543,7 @@ public class FlatFileAuth /** * Authenticate the request - * + * */ public IAuthToken authenticate(IAuthCredentials authCred) throws EMissingCredential, EInvalidCredentials, EBaseException { @@ -586,7 +586,7 @@ public class FlatFileAuth } } - // if a dn was specified in the password file for this user, + // if a dn was specified in the password file for this user, // replace the requested dn with the one in the pwfile if (user != null) { String dn = (String) user.get("dn"); @@ -610,7 +610,7 @@ public class FlatFileAuth /** * Return a list of HTTP parameters which will be taken from the * request posting and placed into the AuthCredentials block - * + * * Note that this method will not be called until after the * init() method is called */ diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/base/common/src/com/netscape/cms/authentication/HashAuthData.java index 3a447d282..0635c445a 100644 --- a/base/common/src/com/netscape/cms/authentication/HashAuthData.java +++ b/base/common/src/com/netscape/cms/authentication/HashAuthData.java @@ -26,7 +26,7 @@ import java.util.Vector; * the agent-initiated user enrollment, and whom agents enable this feature, * and the value of the timeout. * <P> - * + * * @version $Revision$, $Date$ */ public class HashAuthData extends Hashtable<String, Vector<Object>> { diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java index 2537efa10..b9808e639 100644 --- a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java @@ -42,7 +42,7 @@ import com.netscape.cmsutil.util.Utils; /** * Hash uid/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { @@ -210,7 +210,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { /** * Authenticates a user based on uid, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -238,7 +238,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { @@ -247,7 +247,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { /** * Gets the configuration substore used by this authentication manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -279,7 +279,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { diff --git a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java index 38a3e6fcf..2e5b9d394 100644 --- a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java +++ b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java @@ -51,7 +51,7 @@ import com.netscape.certsrv.logging.ILogger; /** * uid/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class PortalEnroll extends DirBasedAuthentication { @@ -125,7 +125,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * Initializes the PortalEnrollment auth manager. * <p> - * + * * @param name - The name for this authentication manager instance. * @param implName - The name of the authentication manager plugin. * @param config - The configuration store for this instance. @@ -161,7 +161,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * Authenticates a user based on uid, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -259,7 +259,7 @@ public class PortalEnroll extends DirBasedAuthentication { * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { @@ -306,7 +306,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { @@ -315,7 +315,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * adds a user to the directory. - * + * * @return dn upon success and null upon failure. * @param token authentication token * @param uid the user's id. diff --git a/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/common/src/com/netscape/cms/authentication/RDNPattern.java index 722aefbc3..35e3eb59a 100644 --- a/base/common/src/com/netscape/cms/authentication/RDNPattern.java +++ b/base/common/src/com/netscape/cms/authentication/RDNPattern.java @@ -32,45 +32,45 @@ import com.netscape.certsrv.base.EBaseException; * class for parsing a DN pattern used to construct a certificate * subject name from ldap attributes and dn. * <p> - * + * * dnpattern is a string representing a subject name pattern to formulate from the directory attributes and entry dn. If * empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$attr" "." attrName [ "." attrNumber ] | - * name "=" "$dn" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$attr" "." attrName [ "." attrNumber ] | + * name "=" "$dn" "." attrName [ "." attrNumber ] | * "$dn" "." "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US </i> * Ldap entry: dn: UID=jjames, OU=IS, OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example2: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. note multiple AVAs @@ -79,40 +79,40 @@ import com.netscape.certsrv.base.EBaseException; * C = the string "US" * <p> * </pre> - * + * * <pre> * Example3: <i>CN=$attr.cn, $rdn.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=IS+OU=people, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * followed by the second RDN in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example4: <i>CN=$attr.cn, OU=$dn.ou.2+OU=$dn.ou.1, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=people+OU=IS, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> - * OU = the second 'ou' value in the user's entry DN followed by the + * OU = the second 'ou' value in the user's entry DN followed by the * first 'ou' value in the user's entry. note multiple AVAs * in a RDN in this example. <br> * O = the (first) 'o' value in the user's entry DN. <br> * C = the string "US" * <p> * </pre> - * + * * If an attribute or subject DN component does not exist the attribute is skipped. - * + * * @version $Revision$, $Date$ */ class RDNPattern { @@ -130,14 +130,14 @@ class RDNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattenr the DN pattern * @exception EBaseException If parsing error occurs. */ public RDNPattern(String pattern) throws EAuthException { if (pattern == null || pattern.equals("")) { - // create an attribute list that is the dn. + // create an attribute list that is the dn. mLdapAttrs = new String[] { "dn" }; } else { mPatternString = pattern; @@ -179,7 +179,7 @@ class RDNPattern { if (lastChar != -1) { try { - in.unread(lastChar); // pushback last , + in.unread(lastChar); // pushback last , } catch (IOException e) { throw new EAuthException(CMS.getUserMessage("CMS_AUTHENTICATION_INTERNAL_ERROR", e.toString())); } @@ -203,7 +203,7 @@ class RDNPattern { /** * Form a Ldap v3 DN string from results of a ldap search. - * + * * @param entry LDAPentry from a ldap search * @return Ldap v3 DN string to use for a subject name. */ diff --git a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java index 35c23bd0f..dbae4a1ca 100644 --- a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java @@ -48,10 +48,10 @@ import com.netscape.certsrv.usrgrp.Certificates; /** * Certificate server SSL client authentication. - * + * * @author Christina Fu * <P> - * + * */ public class SSLclientCertAuthentication implements IAuthManager, IProfileAuthenticator { @@ -85,7 +85,7 @@ public class SSLclientCertAuthentication implements IAuthManager, * initializes the SSLClientCertAuthentication auth manager * <p> * called by AuthSubsystem init() method, when initializing all available authentication managers. - * + * * @param name The name of this authentication manager instance. * @param implName The name of the authentication manager plugin. * @param config The configuration store for this authentication manager. @@ -119,11 +119,11 @@ public class SSLclientCertAuthentication implements IAuthManager, * authenticates user by certificate * <p> * called by other subsystems or their servlets to authenticate users - * + * * @param authCred - authentication credential that contains * an usrgrp.Certificates of the user (agent) * @return the authentication token that contains the following - * + * * @exception EMissingCredential If a required credential for this * authentication manager is missing. * @exception EInvalidCredentials If credentials cannot be authenticated. @@ -270,7 +270,7 @@ public class SSLclientCertAuthentication implements IAuthManager, * the servlets that handle agent operations to authenticate its * users. It calls this method to know which are the * required credentials from the user (e.g. Javascript form data) - * + * * @return attribute names in Vector */ public String[] getRequiredCreds() { @@ -283,7 +283,7 @@ public class SSLclientCertAuthentication implements IAuthManager, * the Certificate Server Console to display the table for * configuration purposes. CertUserDBAuthentication is currently not * exposed in this case, so this method is not to be used. - * + * * @return configuration parameter names in Hashtable of Vectors * where each hashtable entry's key is the substore name, value is a * Vector of parameter names. If no substore, the parameter name @@ -302,7 +302,7 @@ public class SSLclientCertAuthentication implements IAuthManager, /** * gets the configuretion substore used by this authentication * manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java index f8e0669e9..10cb94299 100644 --- a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java @@ -49,7 +49,7 @@ import com.netscape.cmsutil.xml.XMLObject; * Token authentication. * Checked if the given token is valid. * <P> - * + * * @version $Revision$, $Date$ */ public class TokenAuthentication implements IAuthManager, @@ -80,7 +80,7 @@ public class TokenAuthentication implements IAuthManager, * initializes the TokenAuthentication auth manager * <p> * called by AuthSubsystem init() method, when initializing all available authentication managers. - * + * * @param name The name of this authentication manager instance. * @param implName The name of the authentication manager plugin. * @param config The configuration store for this authentication manager. @@ -116,7 +116,7 @@ public class TokenAuthentication implements IAuthManager, * authenticates user(agent) by certificate * <p> * called by other subsystems or their servlets to authenticate users (agents) - * + * * @param authCred - authentication credential that contains * an usrgrp.Certificates of the user (agent) * @return the authentication token that contains the following @@ -217,7 +217,7 @@ public class TokenAuthentication implements IAuthManager, * the servlets that handle agent operations to authenticate its * users. It calls this method to know which are the * required credentials from the user (e.g. Javascript form data) - * + * * @return attribute names in Vector */ public String[] getRequiredCreds() { @@ -230,7 +230,7 @@ public class TokenAuthentication implements IAuthManager, * the Certificate Server Console to display the table for * configuration purposes. CertUserDBAuthentication is currently not * exposed in this case, so this method is not to be used. - * + * * @return configuration parameter names in Hashtable of Vectors * where each hashtable entry's key is the substore name, value is a * Vector of parameter names. If no substore, the parameter name @@ -249,7 +249,7 @@ public class TokenAuthentication implements IAuthManager, /** * gets the configuretion substore used by this authentication * manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java index c9fbbf9ac..2f9fc43bd 100644 --- a/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.logging.ILogger; /** * udn/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class UdnPwdDirAuthentication extends DirBasedAuthentication { @@ -81,7 +81,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { /** * Initializes the UdnPwdDirAuthentication auth manager. * <p> - * + * * @param name - The name for this authentication manager instance. * @param implName - The name of the authentication manager plugin. * @param config - The configuration store for this instance. @@ -94,7 +94,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { /** * Authenticates a user based on udn, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the udn and password are not valid @@ -170,7 +170,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { @@ -179,7 +179,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java index d4a9de108..ffa8ea42f 100644 --- a/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java @@ -49,7 +49,7 @@ import com.netscape.certsrv.request.IRequest; /** * uid/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class UidPwdDirAuthentication extends DirBasedAuthentication @@ -96,7 +96,7 @@ public class UidPwdDirAuthentication extends DirBasedAuthentication /** * Authenticates a user based on uid, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -185,7 +185,7 @@ public class UidPwdDirAuthentication extends DirBasedAuthentication * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { @@ -194,7 +194,7 @@ public class UidPwdDirAuthentication extends DirBasedAuthentication /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java index 880b7c767..65cf75651 100644 --- a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java @@ -55,7 +55,7 @@ import com.netscape.certsrv.request.IRequest; /** * uid/pwd/pin directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class UidPwdPinDirAuthentication extends DirBasedAuthentication @@ -179,7 +179,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication /** * Authenticates a user based on its uid, pwd, pin in the directory. - * + * * @param authCreds The authentication credentials with uid, pwd, pin. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -242,7 +242,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication log(ILogger.LL_SECURITY, CMS.getLogMessage("CMS_AUTH_AUTHENTICATED", uid)); // log(ILogger.LL_SECURITY, "found user : " + userdn); - // check pin. + // check pin. checkpin(conn, userdn, uid, pin); // set uid in the token. @@ -376,7 +376,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { @@ -385,7 +385,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { diff --git a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java index 570fe3a88..2e6636f27 100644 --- a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java @@ -45,19 +45,19 @@ import com.netscape.cmsutil.util.Utils; * actions. * <P> * Here is a sample resourceACLS for a resource - * + * * <PRE> * certServer.UsrGrpAdminServlet: * execute: * deny (execute) user="tempAdmin"; * allow (execute) group="Administrators"; * </PRE> - * + * * To perform permission checking, code call authz mgr authorize() method to verify access. See AuthzMgr for calling * example. * <P> * default "evaluators" are used to evaluate the "group=.." or "user=.." rules. See evaluator for more info - * + * * @version $Revision$, $Date$ * @see <A HREF="http://developer.netscape.com/library/documentation/enterprise/admnunix/aclfiles.htm">ACL Files</A> */ @@ -122,7 +122,7 @@ public abstract class AAclAuthz { type + "." + PROP_CLASS)); } - // instantiate evaluator + // instantiate evaluator try { evaluator = (IAccessEvaluator) Class.forName(evalClassPath).newInstance(); @@ -152,7 +152,7 @@ public abstract class AAclAuthz { * <resource ID>:right-1[,right-n]:[allow,deny](right(s))<evaluatorType>=<value>:<comment for this resource acl * <P> * Example: resTurnKnob:left,right:allow(left) group="lefties":door knobs for lefties - * + * * @param resACLs same format as the resourceACLs attribute * @throws EBaseException parsing error from <code>parseACL</code> */ @@ -200,7 +200,7 @@ public abstract class AAclAuthz { * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { @@ -244,7 +244,7 @@ public abstract class AAclAuthz { * <p> * If there are multiple aci's for a resource, ALL aci's will be checked, and only if all passed permission checks, * will the eventual access be granted. - * + * * @param name resource name * @param perm permission requested * @exception EACLsException access permission denied @@ -301,7 +301,7 @@ public abstract class AAclAuthz { * negative ("deny") aclEntries are treated differently than positive ("allow") statements. If a negative aclEntries * fails the acl check, the permission check will return "false" right away; while in the case of a positive * aclEntry, if the the aclEntry fails the acl check, the next aclEntry will be evaluated. - * + * * @param name resource name * @param perm permission requested * @return true if access allowed @@ -463,7 +463,7 @@ public abstract class AAclAuthz { * <p> * If there are multiple aci's for a resource, ALL aci's will be checked, and only if all passed permission checks, * will the eventual access be granted. - * + * * @param authToken authentication token gotten from authentication * @param name resource name * @param perm permission requested @@ -768,7 +768,7 @@ public abstract class AAclAuthz { /** * gets an enumeration of resources - * + * * @return an enumeration of resources contained in the ACL table */ public Enumeration<ACL> aclResElements() { @@ -777,7 +777,7 @@ public abstract class AAclAuthz { /** * gets an enumeration of access evaluators - * + * * @return an enumeraton of access evaluators */ public Enumeration<IAccessEvaluator> aclEvaluatorElements() { @@ -786,7 +786,7 @@ public abstract class AAclAuthz { /** * gets the access evaluators - * + * * @return handle to the access evaluators table */ public Hashtable<String, IAccessEvaluator> getAccessEvaluators() { @@ -795,7 +795,7 @@ public abstract class AAclAuthz { /** * is this resource name unique - * + * * @return true if unique; false otherwise */ public boolean isTypeUnique(String type) { @@ -828,7 +828,7 @@ public abstract class AAclAuthz { * an abstract class that enforces implementation of the * authorize() method that will authorize an operation on a * particular resource - * + * * @param authToken the authToken associated with a user * @param resource - the protected resource name * @param operation - the protected resource operation name diff --git a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java index f6b1b6713..dae24678d 100644 --- a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A class for basic acls authorization manager - * + * * @version $Revision$, $Date$ */ public class BasicAclAuthz extends AAclAuthz @@ -112,7 +112,7 @@ public class BasicAclAuthz extends AAclAuthz * Example: * <p> * For example, if UsrGrpAdminServlet needs to authorize the caller it would do be done in the following fashion: - * + * * <PRE> * try { * authzTok = mAuthz.authorize("DirACLBasedAuthz", authToken, RES_GROUP, "read"); @@ -120,7 +120,7 @@ public class BasicAclAuthz extends AAclAuthz * log(ILogger.LL_FAILURE, "authorize call: " + e.toString()); * } * </PRE> - * + * * @param authToken the authToken associated with a user * @param resource - the protected resource name * @param operation - the protected resource operation name @@ -143,7 +143,7 @@ public class BasicAclAuthz extends AAclAuthz authzToken.set(AuthzToken.TOKEN_AUTHZ_STATUS, AuthzToken.AUTHZ_STATUS_SUCCESS); } catch (EACLsException e) { - // audit here later + // audit here later log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_AUTHORIZATION_FAILED")); String params[] = { resource, operation }; @@ -165,7 +165,7 @@ public class BasicAclAuthz extends AAclAuthz /** * This currently does not flush to permanent storage - * + * * @param id is the resource id * @param strACLs */ @@ -203,7 +203,7 @@ public class BasicAclAuthz extends AAclAuthz /** * Logs a message for this class in the system log file. - * + * * @param level The log level. * @param msg The message to log. * @see com.netscape.certsrv.logging.ILogger diff --git a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java index acc3ffbb7..040ff5297 100644 --- a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java @@ -46,7 +46,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A class for ldap acls based authorization manager * The ldap server used for acls is the cms internal ldap db. - * + * * @version $Revision$, $Date$ */ public class DirAclAuthz extends AAclAuthz @@ -203,7 +203,7 @@ public class DirAclAuthz extends AAclAuthz * Example: * <p> * For example, if UsrGrpAdminServlet needs to authorize the caller it would do be done in the following fashion: - * + * * <PRE> * try { * authzTok = mAuthz.authorize("DirAclAuthz", authToken, RES_GROUP, "read"); @@ -211,7 +211,7 @@ public class DirAclAuthz extends AAclAuthz * log(ILogger.LL_FAILURE, "authorize call: " + e.toString()); * } * </PRE> - * + * * @param authToken the authToken associated with a user * @param resource - the protected resource name * @param operation - the protected resource operation name @@ -230,7 +230,7 @@ public class DirAclAuthz extends AAclAuthz authzToken.set(AuthzToken.TOKEN_AUTHZ_STATUS, AuthzToken.AUTHZ_STATUS_SUCCESS); CMS.debug("DirAclAuthz: authorization passed"); } catch (EACLsException e) { - // audit here later + // audit here later log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_AUTHORIZATION_FAILED")); String params[] = { resource, operation }; @@ -256,7 +256,7 @@ public class DirAclAuthz extends AAclAuthz * Currently, it is possible that when the memory is updated successfully, and the ldap isn't, the memory upates * lingers. The result is that the changes will only be done on ldap at the next update, or when the system shuts * down, another flush will be attempted. - * + * * @param id is the resource id * @param rights The allowable rights for this resource * @param strACLs has the same format as a resourceACLs entry acis @@ -352,7 +352,7 @@ public class DirAclAuthz extends AAclAuthz /** * Logs a message for this class in the system log file. - * + * * @param level The log level. * @param msg The message to log. * @see com.netscape.certsrv.logging.ILogger diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java index d4cef0148..8a8de4174 100644 --- a/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a Authority Information Access CRL extension. - * + * * @version $Revision$, $Date$ */ public class CMSAuthInfoAccessExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java index 26c8c1d0e..3f5ea2399 100644 --- a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents an authority key identifier extension. - * + * * @version $Revision$, $Date$ */ public class CMSAuthorityKeyIdentifierExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java index e7f4e7b3f..4e51b5c9b 100644 --- a/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a CRL number extension. - * + * * @version $Revision$, $Date$ */ public class CMSCRLNumberExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java index 6ed993d54..02bd40927 100644 --- a/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a CRL reason extension. - * + * * @version $Revision$, $Date$ */ public class CMSCRLReasonExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java index b0bf20856..84181a8dd 100644 --- a/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a certificate issuer extension. - * + * * @version $Revision$, $Date$ */ public class CMSCertificateIssuerExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java index 8672502ab..e3e8d2311 100644 --- a/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a delta CRL indicator extension. - * + * * @version $Revision$, $Date$ */ public class CMSDeltaCRLIndicatorExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java index 72dbe5502..50031c61a 100644 --- a/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a freshest CRL extension. - * + * * @version $Revision$, $Date$ */ public class CMSFreshestCRLExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java index 4023e3b2f..b7945c0b6 100644 --- a/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a hold instruction extension. - * + * * @version $Revision$, $Date$ */ public class CMSHoldInstructionExtension @@ -116,7 +116,7 @@ public class CMSHoldInstructionExtension } if (instruction != null) { if (!(instruction.equalsIgnoreCase(PROP_INSTR_NONE) || - instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || + instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || instruction.equalsIgnoreCase(PROP_INSTR_REJECT))) { instruction = PROP_INSTR_NONE; } diff --git a/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java index 083873c31..6ff61fb44 100644 --- a/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a invalidity date extension. - * + * * @version $Revision$, $Date$ */ public class CMSInvalidityDateExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java index 64252a0b9..fb2a6e0d5 100644 --- a/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java @@ -48,7 +48,7 @@ import com.netscape.cmsutil.util.Utils; /** * This represents a issuer alternative name extension. - * + * * @version $Revision$, $Date$ */ public class CMSIssuerAlternativeNameExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java index 4253584ce..02cc129c4 100644 --- a/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a issuing distribution point extension. - * + * * @version $Revision$, $Date$ */ public class CMSIssuingDistributionPointExtension diff --git a/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java index 530ca9447..e8a32d752 100644 --- a/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java @@ -30,7 +30,7 @@ import com.netscape.cmsutil.util.Utils; /** * A class represents a group acls evaluator. * <P> - * + * * @version $Revision$, $Date$ */ public class GroupAccessEvaluator implements IAccessEvaluator { @@ -60,7 +60,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: "group" or "at_group" */ public String getType() { @@ -69,7 +69,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -87,7 +87,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * evaluates uid in AuthToken to see if it has membership in * group value - * + * * @param authToken authentication token * @param type must be "at_group" * @param op must be "=" @@ -145,7 +145,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * evaluates uid in SessionContext to see if it has membership in * group value - * + * * @param type must be "group" * @param op must be "=" * @param value the group name diff --git a/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java index 17d383688..fe784f3a9 100644 --- a/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java @@ -27,7 +27,7 @@ import com.netscape.cmsutil.util.Utils; /** * A class represents a IP address acls evaluator. * <P> - * + * * @version $Revision$, $Date$ */ public class IPAddressAccessEvaluator implements IAccessEvaluator { @@ -49,7 +49,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: ipaddress */ public String getType() { @@ -58,7 +58,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -75,7 +75,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * Gets the IP address from session context - * + * * @param authToken authentication token * @param type must be "ipaddress" * @param op must be "=" or "!=" @@ -89,7 +89,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * evaluates uid in SessionContext to see if it has membership in * group value - * + * * @param type must be "group" * @param op must be "=" * @param value the group name diff --git a/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java index bf7727c92..c343b110a 100644 --- a/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java @@ -28,7 +28,7 @@ import com.netscape.cmsutil.util.Utils; /** * A class represents a user acls evaluator. * <P> - * + * * @version $Revision$, $Date$ */ public class UserAccessEvaluator implements IAccessEvaluator { @@ -54,7 +54,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: "user" or "at_user" */ public String getType() { @@ -63,7 +63,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -80,7 +80,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in AuthToken to see if it's equal to value - * + * * @param authToken AuthToken from authentication * @param type must be "at_user" * @param op must be "=" @@ -116,7 +116,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in session context to see if it's equal to value - * + * * @param type must be "user" * @param op must be "=" * @param value the user id diff --git a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java index 442828e75..d3f004619 100644 --- a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java @@ -31,7 +31,7 @@ import com.netscape.cmsutil.util.Utils; * uid is placed in the SessionContext of the renewal session context * to be evaluated by this evaluator * <P> - * + * * @author Christina Fu * @version $Revision$, $Date$ */ @@ -58,7 +58,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: "user_origreq" or "at_user_origreq" */ public String getType() { @@ -67,7 +67,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -84,7 +84,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in AuthToken to see if it's equal to value - * + * * @param authToken AuthToken from authentication * @param type must be "at_userreq" * @param op must be "=" @@ -132,7 +132,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in session context to see if it's equal to value - * + * * @param type must be "user_origreq" * @param op must be "=" * @param value the user id diff --git a/base/common/src/com/netscape/cms/jobs/AJobBase.java b/base/common/src/com/netscape/cms/jobs/AJobBase.java index 0da5d2028..bd319b94e 100644 --- a/base/common/src/com/netscape/cms/jobs/AJobBase.java +++ b/base/common/src/com/netscape/cms/jobs/AJobBase.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; /** * This abstract class is a base job for real job extentions for the * Jobs Scheduler. - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.jobs.IJob */ @@ -55,7 +55,7 @@ public abstract class AJobBase implements IJob, Runnable { protected static final String STATUS_FAILURE = "failed"; protected static final String STATUS_SUCCESS = "succeeded"; - // variables used by the Job Scheduler Daemon + // variables used by the Job Scheduler Daemon protected String mImplName = null; protected IConfigStore mConfig; protected String mId = null; @@ -81,7 +81,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * tells if the job is enabled - * + * * @return a boolean value indicating whether the job is enabled * or not */ @@ -109,7 +109,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * get instance id. - * + * * @return a String identifier */ public String getId() { @@ -118,7 +118,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * set instance id. - * + * * @param id String id of the instance */ public void setId(String id) { @@ -127,7 +127,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * get cron string associated with this job - * + * * @return a JobCron object that represents the schedule of this job */ public IJobCron getJobCron() { @@ -136,7 +136,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * gets the plugin name of this job. - * + * * @return a String that is the name of this implementation */ public String getImplName() { @@ -145,7 +145,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * Gets the configuration substore used by this job - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -265,7 +265,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * logs an entry in the log file. Used by classes extending this class. - * + * * @param level log level * @param msg log message in String */ @@ -278,7 +278,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * capable of logging multiline entry in the log file. Used by classes extending this class. - * + * * @param level log level * @param msg log message in String * @param multiline boolean indicating whether the message is a diff --git a/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java b/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java index 28268dfab..25c80817b 100644 --- a/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java +++ b/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java @@ -56,7 +56,7 @@ import com.netscape.certsrv.request.RequestId; * <UL> * $SerialNumber $IssuerDN $SubjectDN $NotAfter $NotBefore $RequestorEmail $CertType * </UL> - * + * * @version $Revision$, $Date$ */ public class PublishCertsJob extends AJobBase @@ -383,7 +383,7 @@ public class PublishCertsJob extends AJobBase * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { diff --git a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java index 5ca581445..2f1d479a4 100644 --- a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java +++ b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java @@ -50,7 +50,7 @@ import com.netscape.certsrv.request.RequestId; * A job for the Jobs Scheduler. This job checks in the internal ldap * db for certs about to expire within the next configurable days and * sends email notifications to the appropriate recipients. - * + * * the $TOKENS that are available for the this jobs's summary outer form are:<br > * <UL> @@ -75,7 +75,7 @@ import com.netscape.certsrv.request.RequestId; * <LI>$HttpHost * <LI>$HttpPort * </UL> - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.jobs.IJob * @see com.netscape.cms.jobs.AJobBase @@ -248,7 +248,7 @@ public class RenewalNotificationJob /** * Initialize from the configuration file. - * + * * @param id String name of this instance * @param implName string name of this implementation * @param config configuration store for this instance @@ -289,7 +289,7 @@ public class RenewalNotificationJob mHttpHost = CMS.getEEHost(); mHttpPort = CMS.getEESSLPort(); - // read from the configuration file + // read from the configuration file try { mPreDays = mConfig.getInteger(PROP_NOTIFYTRIGGEROFFSET, 30); // in days mPostDays = mConfig.getInteger(PROP_NOTIFYENDOFFSET, 15); // in days @@ -354,7 +354,7 @@ public class RenewalNotificationJob // All cert records which: // 1) expire before the deadline // 2) have not already been renewed - // filter format: + // filter format: // (& (notafter<='time')(!(certAutoRenew=DONE))(!certAutoRenew=DISABLED)) StringBuffer f = new StringBuffer(); @@ -480,7 +480,7 @@ public class RenewalNotificationJob /** * get instance id. - * + * * @return a String identifier */ public String getId() { @@ -489,7 +489,7 @@ public class RenewalNotificationJob /** * set instance id. - * + * * @param id String id of the instance */ public void setId(String id) { @@ -498,7 +498,7 @@ public class RenewalNotificationJob /** * get cron string associated with this job - * + * * @return a JobCron object that represents the schedule of this job */ public IJobCron getJobCron() { @@ -507,7 +507,7 @@ public class RenewalNotificationJob /** * gets the plugin name of this job. - * + * * @return a String that is the name of this implementation */ public String getImplName() { @@ -516,7 +516,7 @@ public class RenewalNotificationJob /** * Gets the configuration substore used by this job - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -585,7 +585,7 @@ public class RenewalNotificationJob * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { diff --git a/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java b/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java index b04461941..5d1ea2f2b 100644 --- a/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java +++ b/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.request.RequestStatus; * <UL> * $InstanceID $SummaryTotalNum $ExecutionTime * </UL> - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.jobs.IJob * @see com.netscape.cms.jobs.AJobBase @@ -104,7 +104,7 @@ public class RequestInQueueJob extends AJobBase /** * initialize from the configuration file - * + * * @param id String name of this instance * @param implName string name of this implementation * @param config configuration store for this instance @@ -208,7 +208,7 @@ public class RequestInQueueJob extends AJobBase * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { diff --git a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java index 2f4a6ad75..cddb8d56a 100644 --- a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java +++ b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java @@ -57,7 +57,7 @@ import com.netscape.certsrv.request.RequestId; * <UL> * $SerialNumber $IssuerDN $SubjectDN $NotAfter $NotBefore $RequestorEmail $CertType * </UL> - * + * * @version $Revision$, $Date$ */ public class UnpublishExpiredJob extends AJobBase @@ -376,7 +376,7 @@ public class UnpublishExpiredJob extends AJobBase * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { diff --git a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java index 91526d583..dc0222dda 100644 --- a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java +++ b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java @@ -68,7 +68,7 @@ import com.netscape.certsrv.request.RequestId; * <LI>$RequestId * <LI>$InstanceID * </UL> - * + * * @version $Revision$, $Date$ */ public class CertificateIssuedListener implements IRequestListener { diff --git a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java index da041b85d..ad91738e9 100644 --- a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java +++ b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java @@ -70,7 +70,7 @@ import com.netscape.certsrv.request.RequestId; * <LI>$RequestId * <LI>$InstanceID * </UL> - * + * * @version $Revision$, $Date$ */ public class CertificateRevokedListener implements IRequestListener { diff --git a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java index 662e762b0..2f82307f2 100644 --- a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java +++ b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.RequestId; /** * This represnets a listener that removes pin from LDAP directory. - * + * * @version $Revision$, $Date$ */ public class PinRemovalListener implements IRequestListener { diff --git a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java index 7ff13db54..3d236baea 100644 --- a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java +++ b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java @@ -52,7 +52,7 @@ import com.netscape.cms.profile.input.SubmitterInfoInput; * <LI>$SenderEmail * <LI>$RecipientEmail * </UL> - * + * */ public class RequestInQListener implements IRequestListener { protected static final String PROP_ENABLED = "enabled"; @@ -127,7 +127,7 @@ public class RequestInQListener implements IRequestListener { /** * carries out the operation when the listener is triggered. - * + * * @param r IRequest structure holding the request information * @see com.netscape.certsrv.request.IRequest */ @@ -203,8 +203,8 @@ public class RequestInQListener implements IRequestListener { if (profileId == null) { val = r.getExtDataInString(IRequest.HTTP_PARAMS, "csrRequestorEmail"); } else { - // use the submitter info if available, otherwise, use the - // subject name input email + // use the submitter info if available, otherwise, use the + // subject name input email val = r.getExtDataInString(SubmitterInfoInput.EMAIL); if ((val == null) || (((String) val).compareTo("") == 0)) { @@ -250,7 +250,7 @@ public class RequestInQListener implements IRequestListener { /** * sets the configurable parameters - * + * * @param name a String represents the name of the configuration parameter to be set * @param val a String containing the value to be set for name */ diff --git a/base/common/src/com/netscape/cms/logging/LogEntry.java b/base/common/src/com/netscape/cms/logging/LogEntry.java index d91bd7406..ac8d16f54 100644 --- a/base/common/src/com/netscape/cms/logging/LogEntry.java +++ b/base/common/src/com/netscape/cms/logging/LogEntry.java @@ -25,7 +25,7 @@ import java.util.Vector; /** * A log entry of LogFile - * + * * @version $Revision$, $Date$ */ public class LogEntry { @@ -41,7 +41,7 @@ public class LogEntry { /** * Constructor for a LogEntry. - * + * */ public LogEntry(String entry) throws ParseException { mEntry = entry; @@ -50,7 +50,7 @@ public class LogEntry { /** * parse a log entry - * + * * return a vector of the segments of the entry */ diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java index 5144bf16d..fa5531a8e 100644 --- a/base/common/src/com/netscape/cms/logging/LogFile.java +++ b/base/common/src/com/netscape/cms/logging/LogFile.java @@ -80,7 +80,7 @@ import com.netscape.cmsutil.util.Utils; /** * A log event listener which write logs to log files - * + * * @version $Revision$, $Date$ **/ public class LogFile implements ILogEventListener, IExtendedPluginInfo { @@ -229,7 +229,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Constructor for a LogFile. - * + * */ public LogFile() { } @@ -310,7 +310,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * add the event to the selected events list - * + * * @param event to be selected */ public void selectEvent(String event) { @@ -320,7 +320,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * remove the event from the selected events list - * + * * @param event to be de-selected */ public void deselectEvent(String event) { @@ -330,7 +330,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * replace the selected events list - * + * * @param events comma-separated event list */ public void replaceEvents(String events) { @@ -386,7 +386,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Initialize and open the log using the parameters from a config store - * + * * @param config The property config store to find values in */ public void init(IConfigStore config) throws IOException, @@ -506,7 +506,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Initialize and open the log - * + * * @param bufferSize The buffer size for the output stream in bytes * @param flushInterval The interval in seconds to flush the log */ @@ -628,11 +628,11 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Startup the instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUDIT_LOG_STARTUP used at audit function startup * </ul> - * + * * @exception EBaseException if an internal error occurred */ public void startup() throws EBaseException { @@ -690,12 +690,12 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Record that the signed audit log has been signed * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_SIGNING used when a signature on the audit log is generated (same as * "flush" time) * </ul> - * + * * @exception IOException for input/output problems * @exception ELogException when plugin implementation fails * @exception SignatureException when signing fails @@ -756,7 +756,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Open the log file. This creates the buffered FileWriter - * + * */ protected synchronized void open() throws IOException { RandomAccessFile out; @@ -804,7 +804,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Flush the log file. Also update the MAC for hash protected logs - * + * */ public synchronized void flush() { try { @@ -838,7 +838,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Close the log file - * + * */ protected synchronized void close() { try { @@ -855,7 +855,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Shutdown this log file. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUDIT_LOG_SHUTDOWN used at audit function shutdown * </ul> @@ -881,7 +881,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Set the flush interval * <P> - * + * * @param flushInterval The amount of time in seconds until the log * is flush. A value of 0 will disable autoflush. This will also set * the update period for hash protected logs. @@ -940,7 +940,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Synchronized method to write a string to the log file. All I18N * should take place before this call. - * + * * @param entry The log entry string */ protected synchronized void log(String entry) throws ELogException { @@ -1053,7 +1053,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Write an event to the log file - * + * * @param ev The event to be logged. */ public void log(ILogEvent ev) throws ELogException { @@ -1116,7 +1116,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * change multi-line log entry by replace "\n" with "\n " - * + * * @param original The original multi-line log entry. */ private String prepareMultiline(String original) { @@ -1134,7 +1134,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { * Read all entries whose logLevel>=lowLevel && log source = source * to at most maxLine entries(from end) * If the parameter is -1, it's ignored and return all entries - * + * * @param maxLine The maximum lines to be returned * @param lowLevel The lowest log level to be returned * @param source The particular log source to be returned @@ -1302,7 +1302,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Retrieves the configuration store of this subsystem. * <P> - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -1510,11 +1510,11 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Signed Audit Log - * + * * This method is inherited by all classes that extend this "LogFile" * class, and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java index 93455e9fe..312978fae 100644 --- a/base/common/src/com/netscape/cms/logging/RollingLogFile.java +++ b/base/common/src/com/netscape/cms/logging/RollingLogFile.java @@ -44,7 +44,7 @@ import com.netscape.cmsutil.util.Utils; * A rotating log file for Certificate log events. This class loosely follows * the Netscape Common Log API implementing rollover interval, size and file * naming conventions. It does not yet implement Disk Usage. - * + * * @version $Revision$, $Date$ */ public class RollingLogFile extends LogFile { @@ -113,7 +113,7 @@ public class RollingLogFile extends LogFile { /** * Initialize and open a RollingLogFile using the prop config store - * + * * @param config The property config store to find values in */ public void init(IConfigStore config) throws IOException, @@ -151,7 +151,7 @@ public class RollingLogFile extends LogFile { /** * Set the rollover interval - * + * * @param rolloverSeconds The amount of time in seconds until the log * is rotated. A value of 0 will disable log rollover. **/ @@ -169,7 +169,7 @@ public class RollingLogFile extends LogFile { /** * Get the rollover interval - * + * * @return The interval in seconds in which the log is rotated **/ public synchronized int getRolloverTime() { @@ -178,7 +178,7 @@ public class RollingLogFile extends LogFile { /** * Set the file expiration time - * + * * @param expirationSeconds The amount of time in seconds until log files * are deleted **/ @@ -203,7 +203,7 @@ public class RollingLogFile extends LogFile { /** * Get the expiration time - * + * * @return The age in seconds in which log files are delete **/ public int getExpirationTime() { @@ -280,15 +280,15 @@ public class RollingLogFile extends LogFile { * Remove any log files which have not been modified in the specified * time * <P> - * + * * NOTE: automatic removal of log files is currently NOT supported! * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_LOG_DELETE used AFTER audit log expires (authorization should not allow, * but in case authorization gets compromised make sure it is written AFTER the log expiration happens) * </ul> - * + * * @param expirationSeconds The number of seconds since the expired files * have been modified. * @return the time in milliseconds when the next file expires @@ -496,7 +496,7 @@ public class RollingLogFile extends LogFile { /** * Write an event to the log file - * + * * @param ev The event to be logged. **/ public synchronized void log(ILogEvent ev) throws ELogException { @@ -531,7 +531,7 @@ public class RollingLogFile extends LogFile { /** * Get the log file list in the log directory - * + * * @return an array of filenames with related path to cert server root */ protected String[] fileList() { diff --git a/base/common/src/com/netscape/cms/notification/MailNotification.java b/base/common/src/com/netscape/cms/notification/MailNotification.java index ef09d8f71..cd4ee431c 100644 --- a/base/common/src/com/netscape/cms/notification/MailNotification.java +++ b/base/common/src/com/netscape/cms/notification/MailNotification.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.notification.IMailNotification; * This class uses <b>smtp.host</b> in the configuration for smtp * host. The port default (25) is used. If no smtp specified, local * host is used - * + * * @version $Revision$, $Date$ */ public class MailNotification implements IMailNotification { @@ -134,7 +134,7 @@ public class MailNotification implements IMailNotification { /** * sets the "From" field - * + * * @param from email address of the sender */ public void setFrom(String from) { @@ -143,7 +143,7 @@ public class MailNotification implements IMailNotification { /** * sets the "Subject" field - * + * * @param subject subject of the email */ public void setSubject(String subject) { @@ -152,7 +152,7 @@ public class MailNotification implements IMailNotification { /** * sets the "Content-Type" field - * + * * @param contentType content type of the email */ public void setContentType(String contentType) { @@ -161,7 +161,7 @@ public class MailNotification implements IMailNotification { /** * sets the content of the email - * + * * @param content the message content */ public void setContent(String content) { @@ -170,7 +170,7 @@ public class MailNotification implements IMailNotification { /** * sets the recipients' email addresses - * + * * @param addresses a list of email addresses of the recipients */ public void setTo(Vector<String> addresses) { @@ -180,7 +180,7 @@ public class MailNotification implements IMailNotification { /** * sets the recipient's email address - * + * * @param to address of the recipient email address */ public void setTo(String to) { diff --git a/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/common/src/com/netscape/cms/ocsp/DefStore.java index 21f7023d8..f9798270a 100644 --- a/base/common/src/com/netscape/cms/ocsp/DefStore.java +++ b/base/common/src/com/netscape/cms/ocsp/DefStore.java @@ -76,13 +76,13 @@ import com.netscape.cmsutil.ocsp.UnknownInfo; /** * This is the default OCSP store that stores revocation information * as certificate record (CMS internal data structure). - * + * * @version $Revision$, $Date$ */ public class DefStore implements IDefStore, IExtendedPluginInfo { // refreshInSec is useful in the master-clone situation. - // clone does not know that the CRL has been updated in + // clone does not know that the CRL has been updated in // the master (by default no refresh) private static final String PROP_USE_CACHE = "useCache"; diff --git a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java index bca02f4a6..c9f97c541 100644 --- a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java +++ b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java @@ -74,7 +74,7 @@ import com.netscape.cmsutil.ocsp.UnknownInfo; /** * This is the LDAP OCSP store. It reads CA certificate and * revocation list attributes from the CA entry. - * + * * @version $Revision$, $Date$ */ public class LDAPStore implements IDefStore, IExtendedPluginInfo { diff --git a/base/common/src/com/netscape/cms/password/PasswordChecker.java b/base/common/src/com/netscape/cms/password/PasswordChecker.java index 847f3a2c1..ae379761d 100644 --- a/base/common/src/com/netscape/cms/password/PasswordChecker.java +++ b/base/common/src/com/netscape/cms/password/PasswordChecker.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.password.IPasswordCheck; * For example, it can also specify the format of the password which has to * be 8 characters long and must be in alphanumeric. * <P> - * + * * @version $Revision$, $Date$ */ public class PasswordChecker implements IPasswordCheck, IConfigPasswordCheck { @@ -67,7 +67,7 @@ public class PasswordChecker implements IPasswordCheck, IConfigPasswordCheck { /** * Returns true if the given password meets the quality requirement; * otherwise returns false. - * + * * @param mPassword The given password being checked. * @return true if the password meets the quality requirement; otherwise * returns false. @@ -83,7 +83,7 @@ public class PasswordChecker implements IPasswordCheck, IConfigPasswordCheck { /** * Returns a reason if the password doesnt meet the quality requirement. - * + * * @return string as a reason if the password quality requirement is not met. */ public String getReason(String mPassword) { diff --git a/base/common/src/com/netscape/cms/policy/APolicyRule.java b/base/common/src/com/netscape/cms/policy/APolicyRule.java index 0faf7591d..8ed943503 100644 --- a/base/common/src/com/netscape/cms/policy/APolicyRule.java +++ b/base/common/src/com/netscape/cms/policy/APolicyRule.java @@ -45,12 +45,12 @@ import com.netscape.certsrv.request.PolicyResult; * The abstract policy rule that concrete implementations will * extend. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -67,7 +67,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Initializes the policy rule. * <P> - * + * * @param config The config store reference */ public abstract void init(ISubsystem owner, IConfigStore config) @@ -76,7 +76,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Gets the description for this policy rule. * <P> - * + * * @return The Description for this rule. */ public String getDescription() { @@ -86,7 +86,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Sets a predicate expression for rule matching. * <P> - * + * * @param exp The predicate expression for the rule. */ public void setPredicate(IExpression exp) { @@ -96,7 +96,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the predicate expression for the rule. * <P> - * + * * @return The predicate expression for the rule. */ public IExpression getPredicate() { @@ -106,7 +106,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the name of the policy rule. * <P> - * + * * @return The name of the policy class. */ public String getName() { @@ -116,7 +116,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Sets the instance name for a policy rule. * <P> - * + * * @param instanceName The name of the rule instance. */ public void setInstanceName(String instanceName) { @@ -126,7 +126,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the name of the policy rule instance. * <P> - * + * * @return The name of the policy rule instance if set, else * the name of the rule class. */ @@ -137,7 +137,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -145,14 +145,14 @@ public abstract class APolicyRule implements IPolicyRule { /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public abstract Vector<String> getInstanceParams(); /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public abstract Vector<String> getDefaultParams(); @@ -263,7 +263,7 @@ public abstract class APolicyRule implements IPolicyRule { * Form a byte array of octet string key identifier from the sha-1 hash of * the Subject Public Key INFO. (including algorithm ID, etc.) * <p> - * + * * @param certInfo cert info of the certificate. * @return A Key identifier with the sha-1 hash of subject public key. */ @@ -314,7 +314,7 @@ public abstract class APolicyRule implements IPolicyRule { * Form a byte array of octet string key identifier from the sha-1 hash of * the Subject Public Key BIT STRING. * <p> - * + * * @param certInfo cert info of the certificate. * @return A Key identifier with the sha-1 hash of subject public key. */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java index b7a24bd65..f8cd03f75 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java @@ -36,12 +36,12 @@ import com.netscape.cms.policy.APolicyRule; * for agent approvals is done. If any are found, the request * is approved. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -55,13 +55,13 @@ public class AgentPolicy extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=AgentPolicy ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com ra.Policy.rule.<ruleName>.class=xxxx * ra.Policy.rule.<ruleName>.params.* - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -105,7 +105,7 @@ public class AgentPolicy extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -141,7 +141,7 @@ public class AgentPolicy extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -150,7 +150,7 @@ public class AgentPolicy extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java index 93327445e..4ee689915 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java @@ -46,12 +46,12 @@ import com.netscape.cms.policy.APolicyRule; /** * This checks if attribute present. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java index 387b702bf..9b5fbd152 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * DSAKeyConstraints policy enforces min and max size of the key. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -94,12 +94,12 @@ public class DSAKeyConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=DSAKeyConstraints * ra.Policy.rule.<ruleName>.enable=true ra.Policy.rule.<ruleName>.minSize=512 * ra.Policy.rule.<ruleName>.maxSize=1024 ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == * netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -157,7 +157,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -226,7 +226,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -243,7 +243,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java index 2af145475..fecb59049 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java +++ b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java @@ -34,12 +34,12 @@ import com.netscape.cms.policy.APolicyRule; * nothing. We can later add checks like whether or not to * revoke expired certs ..etc here. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -53,12 +53,12 @@ public class DefaultRevocation extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=DefaultRevocation ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -68,7 +68,7 @@ public class DefaultRevocation extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -78,7 +78,7 @@ public class DefaultRevocation extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -87,7 +87,7 @@ public class DefaultRevocation extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java index a08bde78c..43b7e1fd6 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java @@ -38,12 +38,12 @@ import com.netscape.cms.policy.APolicyRule; * IssuerConstraints is a rule for restricting the issuers of the * certificates used for certificate-based enrollments. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$ $Date$ */ @@ -81,7 +81,7 @@ public class IssuerConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -108,7 +108,7 @@ public class IssuerConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -190,7 +190,7 @@ public class IssuerConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -203,7 +203,7 @@ public class IssuerConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java index 3779b16e3..d656ed463 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java @@ -41,12 +41,12 @@ import com.netscape.cms.policy.APolicyRule; * honor only the keys generated using one of the permitted algorithms * such as RSA, DSA or DH. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -86,11 +86,11 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=KeyAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=RSA,DSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -151,7 +151,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -197,7 +197,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -216,7 +216,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java index 3af9e636f..56b96f95f 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java +++ b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java @@ -34,12 +34,12 @@ import com.netscape.cms.policy.APolicyRule; * is present. The policy rejects a request if any of the auth tokens * indicates authentication failure. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -53,12 +53,12 @@ public class ManualAuthentication extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ManualAuthentication ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -68,7 +68,7 @@ public class ManualAuthentication extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -83,7 +83,7 @@ public class ManualAuthentication extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -92,7 +92,7 @@ public class ManualAuthentication extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java index 7c53808c5..a1f0805d0 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * RSAKeyConstraints policy enforces min and max size of the key. * Optionally checks the exponents. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -97,13 +97,13 @@ public class RSAKeyConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=RSAKeyConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minSize=512 ra.Policy.rule.<ruleName>.maxSize=2048 * ra.Policy.rule.<ruleName>.predicate=ou==Marketing - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -158,7 +158,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -249,7 +249,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -271,7 +271,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java index f3e5efc9b..3ff977df5 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java @@ -38,15 +38,15 @@ import com.netscape.cms.policy.APolicyRule; /** * Whether to allow renewal of an expired cert. - * + * * @version $Revision$, $Date$ * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -93,12 +93,12 @@ public class RenewalConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.allowExpiredCerts=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -125,7 +125,7 @@ public class RenewalConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -218,7 +218,7 @@ public class RenewalConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -233,7 +233,7 @@ public class RenewalConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java index 0265ff855..2810fae10 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java @@ -42,19 +42,19 @@ import com.netscape.cmsutil.util.Utils; * currently active certificate can be renewed and sets new validity * period for the renewed certificate starting from the the ending * period in the old certificate. - * + * * The main parameters are: - * + * * The renewal leadtime in days: - i.e how many days before the * expiry of the current certificate can one request the renewal. * min and max validity duration. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -112,13 +112,13 @@ public class RenewalValidityConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minValidity=30 ra.Policy.rule.<ruleName>.maxValidity=180 * ra.Policy.rule.<ruleName>.renewalInterval=15 ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -177,7 +177,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -253,7 +253,7 @@ public class RenewalValidityConstraints extends APolicyRule Date renewedNotAfter = new Date(notAfter.getTime() + mMaxValidity); - // If the new notAfter is within renewal interval days from + // If the new notAfter is within renewal interval days from // today or already expired, set the notBefore to today. if (renewedNotAfter.before(now) || (renewedNotAfter.getTime() - now.getTime()) <= @@ -278,7 +278,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -295,7 +295,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java index 513e199c4..88c59b2fd 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java @@ -40,12 +40,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Whether to allow revocation of an expired cert. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -88,12 +88,12 @@ public class RevocationConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.allowExpiredCerts=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -115,7 +115,7 @@ public class RevocationConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -191,7 +191,7 @@ public class RevocationConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -206,7 +206,7 @@ public class RevocationConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java index 8b504eb50..90a8cc167 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * SigningAlgorithmConstraints enforces that only a supported * signing algorithm be requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -93,11 +93,11 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=SigningAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=SHA-1WithRSA, SHA-1WithDSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -183,7 +183,7 @@ public class SigningAlgorithmConstraints extends APolicyRule ((ICertAuthority) mAuthority).getCASigningAlgorithms(); if (allowedByKey != null) { - // don't show algorithms that don't match CA's key in UI. + // don't show algorithms that don't match CA's key in UI. mDefaultAllowedAlgs = new String[allowedByKey.length]; for (int i = 0; i < allowedByKey.length; i++) mDefaultAllowedAlgs[i] = allowedByKey[i]; @@ -200,7 +200,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Winnows out of mAllowedAlgorithms those algorithms that aren't allowed * for some reason. - * + * * @param allowed An array of allowed algorithms. Only algorithms in this * list will survive the winnowing process. * @param reason A string describing the problem with an algorithm @@ -247,7 +247,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -321,7 +321,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -340,7 +340,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java index da63f6f24..07cc3b956 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * This simple policy checks the subordinate CA CSR to see * if it is the same as the local CA. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -77,11 +77,11 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=KeyAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=RSA,DSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -121,7 +121,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -154,7 +154,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli if (certSubjectName.equalsIgnoreCase(mIssuerNameStr)) { log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_SUBJECT_NAME_EXIST_1", mIssuerNameStr)); - setError(req, + setError(req, CMS.getUserMessage("CMS_POLICY_SUBJECT_NAME_EXIST", NAME + ":" + "Same As Issuer Name " + mIssuerNameStr), ""); result = PolicyResult.REJECTED; @@ -173,7 +173,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -184,7 +184,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java index 9afbf7650..27b5d1a92 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java +++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java @@ -20,12 +20,12 @@ package com.netscape.cms.policy.constraints; /** * This class is used to help migrate CMS4.1 to CMS4.2. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java index 8c106800a..fb52b1302 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java @@ -47,22 +47,22 @@ import com.netscape.cms.policy.APolicyRule; * Checks the uniqueness of the subject name. This policy * can only be used (installed) in Certificate Authority * subsystem. - * + * * This policy can perform pre-agent-approval checking or * post-agent-approval checking based on configuration * setting. - * + * * In some situations, user may want to have 2 certificates with * the same subject name. For example, one key for encryption, * and one for signing. This policy does not deal with this case * directly. But it can be easily extended to do that. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -103,13 +103,13 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ca.Policy.rule.<ruleName>.implName=UniqueSubjectName ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.enable=true ca.Policy.rule.<ruleName>.enablePreAgentApprovalChecking=true * ca.Policy.rule.<ruleName>.enableKeyUsageExtensionChecking=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -146,7 +146,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -195,15 +195,15 @@ public class UniqueSubjectNameConstraints extends APolicyRule if (status.equals(ICertRecord.STATUS_REVOKED) || status.equals(ICertRecord.STATUS_EXPIRED) || status.equals(ICertRecord.STATUS_REVOKED_EXPIRED)) { - // accept this only if we have a REVOKED, + // accept this only if we have a REVOKED, // EXPIRED or REVOKED_EXPIRED certificate continue; } // you already have an VALID or INVALID (not yet valid) certificate if (mKeyUsageExtensionChecking && agentApproved(req)) { - // This request is agent approved which - // means all requested extensions are finalized + // This request is agent approved which + // means all requested extensions are finalized // to the request, // We will accept duplicated subject name with // different keyUsage extension if @@ -285,7 +285,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -300,7 +300,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java index 0409f3c33..72be9d75a 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java @@ -38,17 +38,17 @@ import com.netscape.cms.policy.APolicyRule; * ValidityConstraints is a default rule for Enrollment and * Renewal that enforces minimum and maximum validity periods * and changes them if not met. - * + * * Optionally the lead and lag times - i.e how far back into the * front or back the notBefore date could go in minutes can also * be specified. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -115,13 +115,13 @@ public class ValidityConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minValidity=30 ra.Policy.rule.<ruleName>.maxValidity=180 * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -171,7 +171,7 @@ public class ValidityConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -257,7 +257,7 @@ public class ValidityConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -278,7 +278,7 @@ public class ValidityConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -287,10 +287,10 @@ public class ValidityConstraints extends APolicyRule /** * Create a default validity value for a request - * + * * This code can be easily overridden in a derived class, if the * calculations here aren't accepatble. - * + * * TODO: it might be good to base this calculation on the creation * time of the request. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java index fea126567..21e4ad920 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java @@ -47,9 +47,9 @@ import com.netscape.cms.policy.APolicyRule; * Authority Information Access extension policy. * If this policy is enabled, it adds an authority * information access extension to the certificate. - * + * * The following listed sample configuration parameters: - * + * * ca.Policy.impl.AuthInfoAccess.class=com.netscape.certsrv.policy.AuthInfoAccessExt * ca.Policy.rule.aia.ad0_location=uriName:http://ocsp1.netscape.com * ca.Policy.rule.aia.ad0_method=ocsp @@ -66,16 +66,16 @@ import com.netscape.cms.policy.APolicyRule; * ca.Policy.rule.aia.enable=true * ca.Policy.rule.aia.implName=AuthInfoAccess * ca.Policy.rule.aia.predicate= - * + * * Currently, this policy only supports the following location: * uriName:[URI], dirName:[DN] * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -134,12 +134,12 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=AuthInfoAccessExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -214,7 +214,7 @@ public class AuthInfoAccessExt extends APolicyRule implements * If this policy is enabled, add the authority information * access extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -305,7 +305,7 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -367,7 +367,7 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java index 971379a46..d7e058bf8 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java @@ -48,12 +48,12 @@ import com.netscape.cms.policy.APolicyRule; * Authority Public Key Extension Policy * Adds the subject public key id extension to certificates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -76,7 +76,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule protected boolean mCritical = DEF_CRITICAL; protected String mAltKeyIdType = DEF_ALT_KEYID_TYPE; - // the extension to add to certs. + // the extension to add to certs. protected AuthorityKeyIdentifierExtension mTheExtension = null; // instance params for console @@ -105,13 +105,13 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * (what communicator expects if the CA does not have a subject key * identifier extension) or (2) No extension set (3) Empty sequence * in Authority Key Identifier extension. - * + * * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate= ca.Policy.rule.<ruleName>.implName= ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -181,7 +181,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule } else { } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement(PROP_ALT_KEYID_TYPE + "=" + mAltKeyIdType); } @@ -190,7 +190,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * Adds Authority Key Identifier Extension to a certificate. * If the extension is already there, accept it if it's from the agent, * else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -216,7 +216,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule public PolicyResult applyCert(IRequest req, X509CertInfo certInfo) { try { - // if authority key id extension already exists, leave it if + // if authority key id extension already exists, leave it if // from agent. else replace it. AuthorityKeyIdentifierExtension authorityKeyIdExt = null; CertificateExtensions extensions = (CertificateExtensions) @@ -228,7 +228,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule extensions.get(AuthorityKeyIdentifierExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (authorityKeyIdExt != null) { if (agentApproved(req)) { @@ -245,8 +245,8 @@ public class AuthorityKeyIdentifierExt extends APolicyRule } } - // if no authority key identifier should be set b/c CA does not - // have a subject key identifier, return here. + // if no authority key identifier should be set b/c CA does not + // have a subject key identifier, return here. if (mTheExtension == null) return PolicyResult.ACCEPTED; @@ -281,7 +281,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * Form the Key Identifier in the Authority Key Identifier extension. * from the CA's cert. * <p> - * + * * @param caCertImpl Certificate Info * @return A Key Identifier. * @throws com.netscape.certsrv.base.EBaseException on error @@ -335,7 +335,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Get the Key Identifier in a subject key identifier extension from a * CertInfo. - * + * * @param certInfo the CertInfo structure. * @return Key Identifier in a Subject Key Identifier extension if any. */ @@ -375,7 +375,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule keyId = (KeyIdentifier) subjKeyIdExt.get( SubjectKeyIdentifierExtension.KEY_ID); } catch (IOException e) { - // no key identifier in subject key id extension. + // no key identifier in subject key id extension. String msg = NAME + ": " + "Bad Subject Key Identifier Extension found. Error: " + e; @@ -387,7 +387,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -396,7 +396,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java index f830b7e3d..eeee26994 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java @@ -50,12 +50,12 @@ import com.netscape.cms.policy.APolicyRule; * Basic Constraints policy. * Adds the Basic constraints extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -95,10 +95,10 @@ public class BasicConstraintsExt extends APolicyRule * Initializes this policy rule. * <p> * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=BasicConstraintsExtImpl ca.Policy.rule.<ruleName>.pathLen=<n>, -1 for * undefined. ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -127,21 +127,21 @@ public class BasicConstraintsExt extends APolicyRule mCAPathLen = caCert.getBasicConstraints(); } - // set default to one less than the CA's pathlen or 0 if CA's - // pathlen is 0. + // set default to one less than the CA's pathlen or 0 if CA's + // pathlen is 0. // If it's unlimited default the max pathlen also to unlimited. if (mCAPathLen < 0) mDefaultMaxPathLen = -1; else if (mCAPathLen > 0) mDefaultMaxPathLen = mCAPathLen - 1; - else // (mCAPathLen == 0) + else // (mCAPathLen == 0) { log(ILogger.LL_WARN, CMS.getLogMessage("POLICY_PATHLEN_ZERO")); //return; } - // get configured max path len, use defaults if not configured. + // get configured max path len, use defaults if not configured. boolean pathLenConfigured = true; try { @@ -173,9 +173,9 @@ public class BasicConstraintsExt extends APolicyRule // check if configured path len is valid. if (pathLenConfigured) { - // if CA's pathlen is unlimited, any max pathlen is ok. - // else maxPathlen must be at most one less than the CA's - // pathlen or 0 if CA's pathlen is 0. + // if CA's pathlen is unlimited, any max pathlen is ok. + // else maxPathlen must be at most one less than the CA's + // pathlen or 0 if CA's pathlen is 0. if (mCAPathLen > 0 && (mMaxPathLen >= mCAPathLen || mMaxPathLen < 0)) { @@ -205,7 +205,7 @@ public class BasicConstraintsExt extends APolicyRule * Checks if the basic contraints extension in certInfo is valid and * add the basic constraints extension for CA certs if none exists. * Non-CA certs do not get a basic constraints extension. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -263,7 +263,7 @@ public class BasicConstraintsExt extends APolicyRule // no extensions or basic constraints extension. } - // for non-CA certs, pkix says it SHOULD NOT have the extension + // for non-CA certs, pkix says it SHOULD NOT have the extension // so remove it. if (!isCA) { if (extensions == null) { @@ -275,7 +275,7 @@ public class BasicConstraintsExt extends APolicyRule certInfo.set(X509CertInfo.EXTENSIONS, extensions); } catch (CertificateException e) { } catch (IOException e) { - // not possible + // not possible } } if (basicExt != null) { @@ -309,11 +309,11 @@ public class BasicConstraintsExt extends APolicyRule } // For CA certs, check if existing extension is valid, and adjust. - // Extension must be marked critial and pathlen must be < CA's pathlen. + // Extension must be marked critial and pathlen must be < CA's pathlen. // if CA's pathlen is 0 all ca certs are rejected. if (mCAPathLen == 0) { - // reject all subordinate CA cert requests because CA's + // reject all subordinate CA cert requests because CA's // path length is 0. log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_NO_SUB_CA_CERTS_ALLOWED_1", NAME)); @@ -399,7 +399,7 @@ public class BasicConstraintsExt extends APolicyRule } catch (CertificateException e) { // not possible } catch (IOException e) { - // not possible + // not possible } } @@ -460,7 +460,7 @@ public class BasicConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -476,7 +476,7 @@ public class BasicConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java index 1ede3d5d0..7cf50385e 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java @@ -55,12 +55,12 @@ import com.netscape.cms.policy.APolicyRule; * to tell whether the simple string should be stored in an X.500 Name, * a URL, or an RDN. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -475,7 +475,7 @@ public class CRLDistributionPointsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java index 597357318..4124d430d 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java @@ -53,12 +53,12 @@ import com.netscape.cms.policy.APolicyRule; * Certificate Policies. * Adds certificate policies extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -90,12 +90,12 @@ public class CertificatePoliciesExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -115,7 +115,7 @@ public class CertificatePoliciesExt extends APolicyRule "value must be greater than or equal to 1")); } - // init Policy Mappings, check values if enabled. + // init Policy Mappings, check values if enabled. mCertPolicies = new CertPolicy[mNumCertPolicies]; for (int i = 0; i < mNumCertPolicies; i++) { String subtreeName = PROP_CERTPOLICY + i; @@ -147,7 +147,7 @@ public class CertificatePoliciesExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_CERTPOLICIES + "=" + mNumCertPolicies); @@ -159,7 +159,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -203,7 +203,7 @@ public class CertificatePoliciesExt extends APolicyRule extensions.delete(CertificatePoliciesExtension.NAME); } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.5.29.32"); } catch (IOException ee) { @@ -236,7 +236,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -271,7 +271,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -335,7 +335,7 @@ class CertPolicy { /** * forms policy map parameters. - * + * * @param name name of this policy map, for example certPolicy0 * @param config parent's config from where we find this configuration. * @param enabled whether policy was enabled. diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java index 28366ade8..58ce112f3 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Certificate Renewal Window Extension Policy * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -74,7 +74,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Initializes this policy rule. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -88,7 +88,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -139,7 +139,7 @@ public class CertificateRenewalWindowExt extends APolicyRule } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.16.840.1.113730.1.15"); } catch (IOException ee) { @@ -218,7 +218,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -240,7 +240,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java index b385923af..779be165b 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java @@ -46,12 +46,12 @@ import com.netscape.cms.policy.APolicyRule; * Certificate Scope Of Use extension policy. This extension * is defined in draft-thayes-cert-scope-00.txt * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -100,12 +100,12 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=AuthInfoAccessExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -157,7 +157,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements * If this policy is enabled, add the authority information * access extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -244,7 +244,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -300,7 +300,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java index 65ef6b937..93267bd1e 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * This implements the extended key usage extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java index 0202ee784..eb8ab2285 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java +++ b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java @@ -49,9 +49,9 @@ import com.netscape.cms.policy.APolicyRule; * Private Integer extension policy. * If this policy is enabled, it adds an Private Integer * extension to the certificate. - * + * * The following listed sample configuration parameters: - * + * * ca.Policy.impl.privateInteger.class=com.netscape.certsrv.policy.genericASNExt * ca.Policy.rule.genericASNExt.enable=true * ca.Policy.rule.genericASNExt.name=myIntegerExtension @@ -76,12 +76,12 @@ import com.netscape.cms.policy.APolicyRule; * ca.Policy.rule.genericASNExt.implName=genericASNExt * ca.Policy.rule.genericASNExt.predicate= * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -210,12 +210,12 @@ public class GenericASN1Ext extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=genericASNExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -256,7 +256,7 @@ public class GenericASN1Ext extends APolicyRule implements log(ILogger.LL_FAILURE, "" + e.toString()); } - // Check OID value + // Check OID value CMS.checkOID(name, oid); pattern = mConfig.getString(PROP_PATTERN, null); checkOID(0); @@ -341,7 +341,7 @@ public class GenericASN1Ext extends APolicyRule implements * If this policy is enabled, add the private Integer * information extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -453,7 +453,7 @@ public class GenericASN1Ext extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -485,7 +485,7 @@ public class GenericASN1Ext extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java index bb9abd9cf..9ceaf99bd 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java @@ -42,16 +42,16 @@ import com.netscape.cms.policy.APolicyRule; /** * Issuer Alt Name Extension policy. - * + * * This extension is used to associate Internet-style identities * with the Certificate issuer. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -101,7 +101,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Initializes this policy rule. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -139,7 +139,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Adds a extension if none exists. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -224,7 +224,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return Empty Vector since this policy has no configuration parameters. * for this policy instance. */ @@ -234,7 +234,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return Empty Vector since this policy implementation has no * configuration parameters. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java index 6594cc4a2..24e5f45ed 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Policy to add Key Usage Extension. * Adds the key usage extension based on what's requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -96,11 +96,11 @@ public class KeyUsageExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=KeyUsageExt ca.Policy.rule.<ruleName>.enable=true ca.Policy.rule.<ruleName>. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -120,9 +120,9 @@ public class KeyUsageExt extends APolicyRule CertificateChain caChain = certAuthority.getCACertChain(); X509Certificate caCert = null; - // Note that in RA the chain could be null if CA was not up when - // RA was started. In that case just set the length to -1 and let - // CA reject if it does not allow any subordinate CA certs. + // Note that in RA the chain could be null if CA was not up when + // RA was started. In that case just set the length to -1 and let + // CA reject if it does not allow any subordinate CA certs. if (caChain != null) { caCert = caChain.getFirstCertificate(); mCAPathLen = caCert.getBasicConstraints(); @@ -147,14 +147,14 @@ public class KeyUsageExt extends APolicyRule * or RA could have set the extension.) * If not set, set from http input parameters or use default if * no http input parameters are set. - * + * * Note: this allows any bits requested - does not check if user * authenticated is allowed to have a Key Usage Extension with * those bits. Unless the CA's certificate path length is 0, then * we do not allow CA sign or CRL sign bits in any request. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -191,7 +191,7 @@ public class KeyUsageExt extends APolicyRule // extension isn't there. ext = null; } - // check if CA does not allow subordinate CA certs. + // check if CA does not allow subordinate CA certs. // otherwise accept existing key usage extension. if (ext != null) { if (mCAPathLen == 0) { @@ -239,7 +239,7 @@ public class KeyUsageExt extends APolicyRule bits[KeyUsageExtension.DECIPHER_ONLY_BIT] = getBit("decipher_only", mDecipherOnly, req); - // don't allow no bits set or the extension does not + // don't allow no bits set or the extension does not // encode/decode properlly. boolean bitset = false; @@ -278,7 +278,7 @@ public class KeyUsageExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -344,7 +344,7 @@ public class KeyUsageExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java index ecc084d29..ca18b8023 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Netscape comment * Adds Netscape comment policy * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -89,10 +89,10 @@ public class NSCCommentExt extends APolicyRule * Initializes this policy rule. * <p> * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=NSCCommentExtImpl ca.Policy.rule.<ruleName>.displayText=<n> * ca.Policy.rule.<ruleName>.commentFile=<n> ca.Policy.rule.<ruleName>.enable=false - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -147,7 +147,7 @@ public class NSCCommentExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -199,7 +199,7 @@ public class NSCCommentExt extends APolicyRule } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.16.840.1.113730.1.13"); } catch (IOException ee) { @@ -269,7 +269,7 @@ public class NSCCommentExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -278,7 +278,7 @@ public class NSCCommentExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java index 2fb09b2b7..c5daabed9 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java @@ -49,12 +49,12 @@ import com.netscape.cms.policy.APolicyRule; * NS Cert Type policy. * Adds the ns cert type extension depending on cert type requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -70,20 +70,20 @@ public class NSCertTypeExt extends APolicyRule protected static final boolean[] DEF_BITS = new boolean[NSCertTypeExtension.NBITS]; - // XXX for future use. currenlty always allow. + // XXX for future use. currenlty always allow. protected static final String PROP_AGENT_OVERR = "allowAgentOverride"; protected static final String PROP_EE_OVERR = "AllowEEOverride"; - // XXX for future use. currently always critical - // (standard says SHOULD be marked critical if included.) + // XXX for future use. currently always critical + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; - // XXX for future use to allow overrides from forms. + // XXX for future use to allow overrides from forms. // request must be agent approved or authenticated. protected boolean mAllowAgentOverride = false; protected boolean mAllowEEOverride = false; - // XXX for future use. currently always non-critical + // XXX for future use. currently always non-critical protected boolean mCritical = false; protected int mCAPathLen = -1; @@ -111,11 +111,11 @@ public class NSCertTypeExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=nsCertTypeExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -153,7 +153,7 @@ public class NSCertTypeExt extends APolicyRule * reads ns cert type choices from form. If no choices from form * will defaults to all. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -224,7 +224,7 @@ public class NSCertTypeExt extends APolicyRule bits = getBitsFromRequest(req, mSetDefaultBits); - // check if ca doesn't allow any subordinate ca + // check if ca doesn't allow any subordinate ca if (mCAPathLen == 0 && bits != null) { if (bits[NSCertTypeExtension.SSL_CA_BIT] || bits[NSCertTypeExtension.EMAIL_CA_BIT] || @@ -283,7 +283,7 @@ public class NSCertTypeExt extends APolicyRule // always return false for now to make sure minimum is set. // agents and ee can add others. - // must be agent approved or authenticated for allowing extensions + // must be agent approved or authenticated for allowing extensions // which is always the case if we get to this point. IAuthToken token = req.getExtDataInAuthToken(IRequest.AUTH_TOKEN); @@ -448,7 +448,7 @@ public class NSCertTypeExt extends APolicyRule if (certType.equals(IRequest.CLIENT_CERT)) { CMS.debug("NSCertTypeExt: setting bits for client cert"); - // we can only guess here when it's client. + // we can only guess here when it's client. // sets all client bit for default. bits[NSCertTypeExtension.SSL_CLIENT_BIT] = true; bits[NSCertTypeExtension.EMAIL_BIT] = true; @@ -488,7 +488,7 @@ public class NSCertTypeExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -526,7 +526,7 @@ public class NSCertTypeExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java index f010bf3f1..1b132e835 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the name constraints extension to a (CA) certificate. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -89,21 +89,21 @@ public class NameConstraintsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((IPolicyProcessor)owner).getAuthority(); @@ -192,7 +192,7 @@ public class NameConstraintsExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_PERMITTEDSUBTREES + "=" + mNumPermittedSubtrees); @@ -225,15 +225,15 @@ public class NameConstraintsExt extends APolicyRule /** * Adds Name Constraints Extension to a (CA) certificate. - * + * * If a Name constraints Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mNameConstraintsExtension == null) { //setError(req, PolicyResources.EXTENSION_NOT_INITED_1, NAME); @@ -275,7 +275,7 @@ public class NameConstraintsExt extends APolicyRule extensions.get(NameConstraintsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (nameConstraintsExt != null) { @@ -320,7 +320,7 @@ public class NameConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -350,7 +350,7 @@ public class NameConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java index 33f2f85e0..aece9664a 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; * This implements an OCSP Signing policy, it * adds the OCSP Signing extension to the certificate. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$ $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java index 861107b8e..0bb77e207 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the policy constraints extension to (CA) certificates. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -90,21 +90,21 @@ public class PolicyConstraintsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((GenericPolicyProcessor)owner).mAuthority; @@ -136,7 +136,7 @@ public class PolicyConstraintsExt extends APolicyRule if (mInhibitPolicyMapping < -1) mInhibitPolicyMapping = -1; - // create instance of policy constraings extension + // create instance of policy constraings extension try { mPolicyConstraintsExtension = new PolicyConstraintsExtension(mCritical, @@ -152,7 +152,7 @@ public class PolicyConstraintsExt extends APolicyRule "Could not init Policy Constraints Extension. Error: " + e)); } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_REQ_EXPLICIT_POLICY + "=" + mReqExplicitPolicy); @@ -162,15 +162,15 @@ public class PolicyConstraintsExt extends APolicyRule /** * Adds Policy Constraints Extension to a (CA) certificate. - * + * * If a Policy constraints Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mPolicyConstraintsExtension == null) { return PolicyResult.ACCEPTED; @@ -210,7 +210,7 @@ public class PolicyConstraintsExt extends APolicyRule extensions.get(PolicyConstraintsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (policyConstraintsExt != null) { @@ -247,7 +247,7 @@ public class PolicyConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -256,7 +256,7 @@ public class PolicyConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java index 7623f455f..0af8b86ca 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the Policy Mappings extension to a (CA) certificate. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -84,21 +84,21 @@ public class PolicyMappingsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((IPolicyProcessor)owner).getAuthority(); @@ -129,7 +129,7 @@ public class PolicyMappingsExt extends APolicyRule "value must be greater than or equal to 1")); } - // init Policy Mappings, check values if enabled. + // init Policy Mappings, check values if enabled. mPolicyMaps = new PolicyMap[mNumPolicyMappings]; for (int i = 0; i < mNumPolicyMappings; i++) { String subtreeName = PROP_POLICYMAP + i; @@ -161,7 +161,7 @@ public class PolicyMappingsExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_POLICYMAPPINGS + "=" + mNumPolicyMappings); @@ -172,15 +172,15 @@ public class PolicyMappingsExt extends APolicyRule /** * Adds policy mappings Extension to a (CA) certificate. - * + * * If a policy mappings Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mPolicyMappingsExtension == null) { //setError(req, PolicyResources.EXTENSION_NOT_INITED_1, NAME); @@ -221,7 +221,7 @@ public class PolicyMappingsExt extends APolicyRule extensions.get(PolicyMappingsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (policyMappingsExt != null) { @@ -258,7 +258,7 @@ public class PolicyMappingsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -286,7 +286,7 @@ public class PolicyMappingsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -338,7 +338,7 @@ class PolicyMap { /** * forms policy map parameters. - * + * * @param name name of this policy map, for example policyMap0 * @param config parent's config from where we find this configuration. * @param enabled whether policy was enabled. diff --git a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java index e13a7a84c..b586c8bdf 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java @@ -31,12 +31,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Checks extension presence. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -148,7 +148,7 @@ public class PresenceExt extends APolicyRule { /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java index 3b80246a9..fd52e9bb1 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; /** * PrivateKeyUsagePeriod Identifier Extension policy. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -124,7 +124,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule * ra.Policy.rule.<ruleName>.notAfter=180 * ra.Policy.rule.<ruleName>.critical=false * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -151,7 +151,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Adds a private key usage extension if none exists. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -222,7 +222,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return Empty Vector since this policy has no configuration parameters. * for this policy instance. */ @@ -237,7 +237,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return Empty Vector since this policy implementation has no * configuration parameters. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java index 2a5af4240..b5d6d8eec 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java @@ -40,12 +40,12 @@ import com.netscape.cms.policy.APolicyRule; * Remove Basic Constraints policy. * Adds the Basic constraints extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -109,7 +109,7 @@ public class RemoveBasicConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -120,7 +120,7 @@ public class RemoveBasicConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java index 63bd8804c..e1ae7d074 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java @@ -42,50 +42,50 @@ import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; /** - * + * * THIS POLICY HAS BEEN DEPRECATED SINCE CMS 4.2. * New Policy is com.netscape.certsrv.policy.SubjectAltNameExt. * <p> - * + * * Subject Alternative Name extension policy in CMS 4.1. - * + * * Adds the subject alternative name extension depending on the certificate type requested. - * + * * Two forms are supported. 1) For S/MIME certificates, email addresses are copied from data stored in the request by * the authentication component. Both 'e' and 'altEmail' are supported so that both the primary address and alternative * forms may be certified. Only the primary goes in the subjectName position (which should be phased out). - * + * * e mailAlternateAddress * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ public class SubjAltNameExt extends APolicyRule implements IEnrollmentPolicy, IExtendedPluginInfo { - // for future use. currently always allow. + // for future use. currently always allow. protected static final String PROP_AGENT_OVERR = "allowAgentOverride"; protected static final String PROP_EE_OVERR = "AllowEEOverride"; protected static final String PROP_ENABLE_MANUAL_VALUES = "enableManualValues"; - // for future use. currently always non-critical - // (standard says SHOULD be marked critical if included.) + // for future use. currently always non-critical + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; - // for future use to allow overrides from forms. + // for future use to allow overrides from forms. // request must be agent approved or authenticated. protected boolean mAllowAgentOverride = false; protected boolean mAllowEEOverride = false; protected boolean mEnableManualValues = false; - // for future use. currently always critical - // (standard says SHOULD be marked critical if included.) + // for future use. currently always critical + // (standard says SHOULD be marked critical if included.) protected boolean mCritical = false; public SubjAltNameExt() { @@ -116,11 +116,11 @@ public class SubjAltNameExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=SubjAltNameExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -134,9 +134,9 @@ public class SubjAltNameExt extends APolicyRule /** * Adds the subject alternative names extension if not set already. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -303,7 +303,7 @@ public class SubjAltNameExt extends APolicyRule /** * Create a new SET of extensions in the certificate info * object. - * + * * This should be a method in the X509CertInfo object */ protected CertificateExtensions @@ -323,7 +323,7 @@ public class SubjAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -339,7 +339,7 @@ public class SubjAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java index 62f0b21da..0d89d8876 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java @@ -46,31 +46,31 @@ import com.netscape.cms.policy.APolicyRule; /** * Subject Alternative Name extension policy. - * + * * Adds the subject alternative name extension as configured. - * + * * Two forms are supported. 1) For S/MIME certificates, email * addresses are copied from data stored in the request by the * authentication component. Both 'e' and 'altEmail' are supported * so that both the primary address and alternative forms may be * certified. Only the primary goes in the subjectName position (which * should be phased out). - * + * * e * mailAlternateAddress * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ public class SubjectAltNameExt extends APolicyRule implements IEnrollmentPolicy, IExtendedPluginInfo { - // (standard says SHOULD be marked critical if included.) + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; protected static final boolean DEF_CRITICAL = false; @@ -106,11 +106,11 @@ public class SubjectAltNameExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=SubjectAltNameExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -150,9 +150,9 @@ public class SubjectAltNameExt extends APolicyRule /** * Adds the subject alternative names extension if not set already. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -187,7 +187,7 @@ public class SubjectAltNameExt extends APolicyRule certInfo.get(X509CertInfo.EXTENSIONS); // Remove any previously computed version of the extension - // unless it is from RA. If from RA, accept what RA put in + // unless it is from RA. If from RA, accept what RA put in // request and don't add our own. if (extensions != null) { String sourceId = req.getSourceId(); @@ -232,7 +232,7 @@ public class SubjectAltNameExt extends APolicyRule curCritical = true; } - // make the extension + // make the extension SubjectAlternativeNameExtension sa = new SubjectAlternativeNameExtension(curCritical, gns); // add it to certInfo. @@ -265,7 +265,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Create a new SET of extensions in the certificate info * object. - * + * * This should be a method in the X509CertInfo object */ protected CertificateExtensions @@ -285,7 +285,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -294,7 +294,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java index 6b4e7ead9..bcd9c9885 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Policy to add the subject directory attributes extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java index 32d254c40..16fc73347 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java @@ -49,12 +49,12 @@ import com.netscape.cms.policy.APolicyRule; * Subject Public Key Extension Policy * Adds the subject public key id extension to certificates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -101,11 +101,11 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate= ca.Policy.rule.<ruleName>.implName= ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -145,7 +145,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule KEYID_TYPE_SPKISHA1)); } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement(PROP_KEYID_TYPE + "=" + mKeyIdType); @@ -157,7 +157,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Adds Subject Key identifier Extension to a certificate. * If the extension is already there, accept it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -194,7 +194,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule extensions.get(SubjectKeyIdentifierExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (subjectKeyIdExt != null) { if (agentApproved(req)) { @@ -253,7 +253,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Form the Key Identifier in the Subject Key Identifier extension. * <p> - * + * * @param certInfo Certificate Info * @param req request * @return A Key Identifier. @@ -284,7 +284,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule * the least significate 60 bits of the sha-1 hash of the subject * public key BIT STRING in accordance with RFC 2459. * <p> - * + * * @param certInfo - certificate info * @return A Key Identifier with value formulatd as described. */ @@ -339,7 +339,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -348,7 +348,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/base/common/src/com/netscape/cms/profile/common/BasicProfile.java index 696d0cd13..0c60f081c 100644 --- a/base/common/src/com/netscape/cms/profile/common/BasicProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/BasicProfile.java @@ -50,7 +50,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This class implements a basic profile. - * + * * @version $Revision$, $Date$ */ public abstract class BasicProfile implements IProfile { @@ -206,7 +206,7 @@ public abstract class BasicProfile implements IProfile { // policy.p1.constraint.params.x1=x1 // policy.p1.constraint.params.x2=x2 - // handle profile authentication plugins + // handle profile authentication plugins try { mAuthInstanceId = config.getString("auth." + PROP_INSTANCE_ID, null); mAuthzAcl = config.getString("authz.acl", ""); @@ -742,7 +742,7 @@ public abstract class BasicProfile implements IProfile { throws EProfileException { // String setId ex: policyset.set1 - // String id Id of policy : examples: p1,p2,p3 + // String id Id of policy : examples: p1,p2,p3 // String defaultClassId : id of the default plugin ex: validityDefaultImpl // String constraintClassId : if of the constraint plugin ex: basicConstraintsExtConstraintImpl // boolean createConfig : true : being called from the console. false: being called from server startup code @@ -847,7 +847,7 @@ public abstract class BasicProfile implements IProfile { // noDefaultImpl, genericExtDefaultImpl if ((curDefaultClassId.equals(defaultClassId) && - !curDefaultClassId.equals(PROP_NO_DEFAULT) && + !curDefaultClassId.equals(PROP_NO_DEFAULT) && !curDefaultClassId.equals(PROP_GENERIC_EXT_DEFAULT))) { matches++; @@ -1110,11 +1110,11 @@ public abstract class BasicProfile implements IProfile { /** * Signed Audit Log - * + * * This method is inherited by all extended "BasicProfile"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1134,12 +1134,12 @@ public abstract class BasicProfile implements IProfile { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "BasicProfile"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { diff --git a/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java index b95b22339..1ae2f0853 100644 --- a/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; /** * This class implements a Certificate Manager enrollment * profile for CA Certificates. - * + * * @version $Revision$, $Date$ */ public class CACertCAEnrollProfile extends CAEnrollProfile @@ -44,7 +44,7 @@ public class CACertCAEnrollProfile extends CAEnrollProfile NameValuePairs inputParams2 = new NameValuePairs(); createProfileInput("i2", "submitterInfoInputImpl", inputParams2); - // create outputs + // create outputs NameValuePairs outputParams1 = new NameValuePairs(); createProfileOutput("o1", "certOutputImpl", outputParams1); diff --git a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java index c03f90a4b..46bc1a787 100644 --- a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This class implements a Certificate Manager enrollment * profile. - * + * * @version $Revision$, $Date$ */ public class CAEnrollProfile extends EnrollProfile { @@ -181,7 +181,7 @@ public class CAEnrollProfile extends EnrollProfile { X509CertInfo info = request.getExtDataInCertInfo(REQUEST_CERTINFO); X509CertImpl theCert = null; - // #615460 - added audit log (transaction) + // #615460 - added audit log (transaction) SessionContext sc = SessionContext.getExistingContext(); sc.put("profileId", getId()); String setId = request.getExtDataInString("profileSetId"); diff --git a/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java index 3610520fd..444024b94 100644 --- a/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java +++ b/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.profile.IProfileContext; /** * This class implements an enrollment profile context * that carries information for request creation. - * + * * @version $Revision$, $Date$ */ public class EnrollProfileContext extends ProfileContext diff --git a/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/base/common/src/com/netscape/cms/profile/common/ProfileContext.java index 7d0686378..d07cdfc27 100644 --- a/base/common/src/com/netscape/cms/profile/common/ProfileContext.java +++ b/base/common/src/com/netscape/cms/profile/common/ProfileContext.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.profile.IProfileContext; /** * This class implements the profile context. - * + * * @version $Revision$, $Date$ */ public class ProfileContext implements IProfileContext { diff --git a/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java index a8a90aef9..157914927 100644 --- a/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java +++ b/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; * This class implements a profile policy that * contains a default policy and a constraint * policy. - * + * * @version $Revision$, $Date$ */ public class ProfilePolicy implements IProfilePolicy { diff --git a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java index 36bac1fa7..8bcb59c86 100644 --- a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This class implements a Registration Manager * enrollment profile. - * + * * @version $Revision$, $Date$ */ public class RAEnrollProfile extends EnrollProfile { diff --git a/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java index 9be1e43c4..a1a83a49f 100644 --- a/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; /** * This class implements a Certificate Manager enrollment * profile for Server Certificates. - * + * * @version $Revision$, $Date$ */ public class ServerCertCAEnrollProfile extends CAEnrollProfile diff --git a/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java index 3f1cdfb21..710a4616d 100644 --- a/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; /** * This class implements a Certificate Manager enrollment * profile for User Certificates. - * + * * @version $Revision$, $Date$ */ public class UserCertCAEnrollProfile extends CAEnrollProfile diff --git a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java index f924c587f..ca2668f7d 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java @@ -42,7 +42,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the basic constraints extension constraint. * It checks if the basic constraint in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class BasicConstraintsExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java index e118fa215..a7a159de3 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java @@ -41,7 +41,7 @@ import com.netscape.cms.profile.def.ValidityDefault; * This class implements the validity constraint. * It checks if the validity in the certificate * template is within the CA's validity. - * + * * @version $Revision$, $Date$ */ public class CAValidityConstraint extends CAEnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java index 40c2153a8..eb3eb14f6 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the generic enrollment constraint. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollConstraint implements IPolicyConstraint { @@ -114,7 +114,7 @@ public abstract class EnrollConstraint implements IPolicyConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * @param request enrollment request * @param info certificate template * @exception ERejectException request is rejected due @@ -126,11 +126,11 @@ public abstract class EnrollConstraint implements IPolicyConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * The current implementation of this method calls * into the subclass's validate(request, info) * method for validation checking. - * + * * @param request request * @exception ERejectException request is rejected due * to violation of constraint diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java index 3c737e8a5..7821964b9 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the extended key usage extension constraint. * It checks if the extended key usage extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java index 1562fddb8..97dc358e3 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the general extension constraint. * It checks if the extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ExtensionConstraint extends EnrollConstraint { @@ -110,7 +110,7 @@ public class ExtensionConstraint extends EnrollConstraint { getConfig(CONFIG_OID))); } - // check criticality + // check criticality String value = getConfig(CONFIG_CRITICAL); if (!isOptional(value)) { diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java index e6f5019a0..2d1f44751 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java @@ -46,7 +46,7 @@ import com.netscape.cms.profile.def.UserKeyDefault; /** * This constraint is to check the key type and * key length. - * + * * @version $Revision$, $Date$ */ @SuppressWarnings("serial") @@ -454,7 +454,7 @@ public class KeyConstraint extends EnrollConstraint { CMS.debug("algId: " + algid); - //Get raw string representation of alg parameters, will give + //Get raw string representation of alg parameters, will give //us the curve OID. String params = null; @@ -582,7 +582,7 @@ public class KeyConstraint extends EnrollConstraint { if (keyType.equals("")) return; } - // All the params we need for validation have been collected, + // All the params we need for validation have been collected, // we don't know which order they will show up if (keyType.length() > 0 && keyParams.length() > 0) { String[] params = keyParams.split(","); diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java index 927c64ec2..f7ec42215 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the key usage extension constraint. * It checks if the key usage constraint in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class KeyUsageExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java index 843360542..066553275 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java @@ -39,7 +39,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the Netscape certificate type extension constraint. * It checks if the Netscape certificate type extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class NSCertTypeExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java index 459e9f219..17f6e0b37 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements no constraint. - * + * * @version $Revision$, $Date$ */ public class NoConstraint implements IPolicyConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java index fb01d7d14..d1403962e 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java @@ -38,13 +38,13 @@ import com.netscape.cms.profile.def.NoDefault; /** * This class supports renewal grace period, which has two * parameters: graceBefore and graceAfter - * + * * @author Christina Fu * @version $Revision$, $Date$ */ public class RenewGracePeriodConstraint extends EnrollConstraint { - // for renewal: # of days before the orig cert expiration date + // for renewal: # of days before the orig cert expiration date public static final String CONFIG_RENEW_GRACE_BEFORE = "renewal.graceBefore"; // for renewal: # of days after the orig cert expiration date public static final String CONFIG_RENEW_GRACE_AFTER = "renewal.graceAfter"; diff --git a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java index 4dbe329b3..4ccb9ad8f 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.UserSigningAlgDefault; * This class implements the signing algorithm constraint. * It checks if the signing algorithm in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class SigningAlgConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java index 477e99b98..6ecac885b 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java @@ -41,7 +41,7 @@ import com.netscape.cms.profile.def.UserSubjectNameDefault; * This class implements the subject name constraint. * It checks if the subject name in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class SubjectNameConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java index f10130aa6..8d7a67a77 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java @@ -46,13 +46,13 @@ import com.netscape.cms.profile.def.NoDefault; * The config param "allowSameKeyRenewal" enables the * situation where if the publickey is not unique, and if * the subject DN is the same, that is a "renewal". - * + * * Another "feature" that is quoted out of this code is the * "revokeDupKeyCert" option, which enables the revocation * of certs that bear the same publickey as the enrolling * request. Since this can potentially be abused, it is taken * out and preserved in comments to allow future refinement. - * + * * @version $Revision$, $Date$ */ public class UniqueKeyConstraint extends EnrollConstraint { @@ -166,7 +166,7 @@ public class UniqueKeyConstraint extends EnrollConstraint { BigInteger serialNum = cert.getSerialNumber(); ICAService service = (ICAService) mCA.getCAService(); - RevokedCertImpl crlEntry = + RevokedCertImpl crlEntry = formCRLEntry(serialNum, RevocationReason.KEY_COMPROMISE); service.revokeCert(crlEntry); CMS.debug("UniqueKeyConstraint: certificate with duplicate publickey revoked successfully"); @@ -234,28 +234,28 @@ public class UniqueKeyConstraint extends EnrollConstraint { /** * make a CRL entry from a serial number and revocation reason. - * + * * @return a RevokedCertImpl that can be entered in a CRL. - * + * * protected RevokedCertImpl formCRLEntry( * BigInteger serialNo, RevocationReason reason) * throws EBaseException { * CRLReasonExtension reasonExt = new CRLReasonExtension(reason); * CRLExtensions crlentryexts = new CRLExtensions(); - * + * * try { * crlentryexts.set(CRLReasonExtension.NAME, reasonExt); * } catch (IOException e) { * CMS.debug("CMSGW_ERR_CRL_REASON "+e.toString()); - * + * * // throw new ECMSGWException( * // CMS.getLogMessage("CMSGW_ERROR_SETTING_CRLREASON")); - * + * * } * RevokedCertImpl crlentry = * new RevokedCertImpl(serialNo, CMS.getCurrentDate(), * crlentryexts); - * + * * return crlentry; * } */ diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java index 7a985b631..6545b81fd 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java @@ -55,7 +55,7 @@ import com.netscape.cms.profile.def.UserSubjectNameDefault; * It checks if the subject name in the certificate is * unique in the internal database, ie, no two certificates * have the same subject name. - * + * * @version $Revision$, $Date$ */ public class UniqueSubjectNameConstraint extends EnrollConstraint { @@ -143,7 +143,7 @@ public class UniqueSubjectNameConstraint extends EnrollConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * Rules are as follows: * If the subject name is not unique, then the request will be rejected unless: * 1. the certificate is expired or expired_revoked diff --git a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java index 98a7b4f96..b7588aa4d 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.ValidityDefault; * This class implements the validity constraint. * It checks if the validity in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ValidityConstraint extends EnrollConstraint { @@ -154,11 +154,11 @@ public class ValidityConstraint extends EnrollConstraint { Integer.toString(days))); } - // 613828 - // The validity field shall specify a notBefore value - // that does not precede the current time and a notAfter - // value that does not precede the value specified in - // notBefore (test can be automated; try entering violating + // 613828 + // The validity field shall specify a notBefore value + // that does not precede the current time and a notAfter + // value that does not precede the value specified in + // notBefore (test can be automated; try entering violating // time values and check result). String notBeforeCheckStr = getConfig(CONFIG_CHECK_NOT_BEFORE); boolean notBeforeCheck; diff --git a/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java index 4e4f951f7..36818a907 100644 --- a/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that populates Authuority Info Access extension. - * + * * @version $Revision$, $Date$ */ public class AuthInfoAccessExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java index 6c0f6e9fc..e789625e4 100644 --- a/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy that * populates subject name based on the attribute values * in the authentication token (AuthToken) object. - * + * * @version $Revision$, $Date$ */ public class AuthTokenSubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java index 6ec75990c..77fd0a5fd 100644 --- a/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Authority Key Identifier extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class AuthorityKeyIdentifierExtDefault extends CAEnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java b/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java index 043cf029b..f685a4f59 100644 --- a/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that automatically assign request to agent. - * + * * @version $Revision$, $Date$ */ public class AutoAssignDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java index c442bf576..a827b7eaf 100644 --- a/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Basic Constraint extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class BasicConstraintsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java index 872e32960..1d1d05ed5 100644 --- a/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.ca.ICertificateAuthority; * This class implements an abstract CA specific * Enrollment default. This policy can only be * used with CA subsystem. - * + * * @version $Revision$, $Date$ */ public abstract class CAEnrollDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java index d1def3d5d..4bbd215a2 100644 --- a/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java @@ -48,7 +48,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a CRL Distribution points extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class CRLDistributionPointsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java index 8d4ae2288..e68ffca07 100644 --- a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java @@ -50,7 +50,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a policy mappings extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class CertificatePoliciesExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java index d30f971dd..752d99cbb 100644 --- a/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape comment extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class CertificateVersionDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java index 67ebadbe4..162d1647c 100644 --- a/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java @@ -62,7 +62,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements an enrollment default policy. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDefault { @@ -125,7 +125,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Retrieves the localizable description of this policy. - * + * * @param locale locale of the end user * @return localized description of this default policy */ @@ -145,7 +145,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Populates attributes into the certificate template. - * + * * @param request enrollment request * @param info certificate template * @exception EProfileException failed to populate attributes @@ -156,7 +156,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Sets values from the approval page into certificate template. - * + * * @param name name of the attribute * @param locale user locale * @param info certificate template @@ -171,7 +171,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Retrieves certificate template values and returns them to * the approval page. - * + * * @param name name of the attribute * @param locale user locale * @param info certificate template @@ -184,10 +184,10 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Populates the request with this policy default. - * + * * The current implementation extracts enrollment specific attributes * and calls the populate() method of the subclass. - * + * * @param request request to be populated * @exception EProfileException failed to populate */ @@ -220,10 +220,10 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Sets the value of the given value property by name. - * + * * The current implementation extracts enrollment specific attributes * and calls the setValue() method of the subclass. - * + * * @param name name of property * @param locale locale of the end user * @param request request @@ -244,10 +244,10 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Retrieves the value of the given value * property by name. - * + * * The current implementation extracts enrollment specific attributes * and calls the getValue() method of the subclass. - * + * * @param name name of property * @param locale locale of the end user * @param request request @@ -604,7 +604,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Check if a object identifier in string form is valid, * that is a string in the form n.n.n.n and der encode and decode-able. - * + * * @param oid object identifier string. * @return true if the oid is valid */ diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java index 24f79cdec..da395871b 100644 --- a/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java @@ -21,7 +21,7 @@ package com.netscape.cms.profile.def; * This class implements an enrollment extension * default policy that extension into the certificate * template. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollExtDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java index f1d63a348..22f00eb94 100644 --- a/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Extended Key Usage extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java b/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java index acbbd1089..b78f0e6cf 100644 --- a/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Freshest CRL extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class FreshestCRLExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java index 1797091b7..d5d88c29e 100644 --- a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape comment extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class GenericExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/ImageDefault.java b/base/common/src/com/netscape/cms/profile/def/ImageDefault.java index 16a7ac402..c1e69c9f4 100644 --- a/base/common/src/com/netscape/cms/profile/def/ImageDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/ImageDefault.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that shows an image in the approval page. - * + * * @version $Revision$, $Date$ */ public class ImageDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java index 97cfb3ff4..cba06023f 100644 --- a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an inhibit Any-Policy extension - * + * * @version $Revision$, $Date$ */ public class InhibitAnyPolicyExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java index 251d8a3e7..3feddd628 100644 --- a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a issuer alternative name extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class IssuerAltNameExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java index 1bfda9ad9..bbc4f5227 100644 --- a/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Key Usage extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class KeyUsageExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java index cc96f3e90..f6da8aede 100644 --- a/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape comment extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class NSCCommentExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java index 0677ef69f..1ad86ea5f 100644 --- a/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape Certificate Type extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class NSCertTypeExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java index e57d04067..929878de3 100644 --- a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a name constraint extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class NameConstraintsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/base/common/src/com/netscape/cms/profile/def/NoDefault.java index 4678f4487..2e80aee2f 100644 --- a/base/common/src/com/netscape/cms/profile/def/NoDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NoDefault.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements no default policy. - * + * * @version $Revision$, $Date$ */ public class NoDefault implements IPolicyDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java b/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java index 382f3cec3..ab5b8c62b 100644 --- a/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates an OCSP No Check extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class OCSPNoCheckExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java index db9b95a04..ced6096a3 100644 --- a/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a policy constraints extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class PolicyConstraintsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java index 712641c0d..55a9e420e 100644 --- a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a policy mappings extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class PolicyMappingsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java index 20285567e..6532a13f0 100644 --- a/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Private Key Usage Period extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class PrivateKeyUsagePeriodExtDefault extends EnrollExtDefault { @@ -290,7 +290,7 @@ public class PrivateKeyUsagePeriodExtDefault extends EnrollExtDefault { try { boolean critical = getConfigBoolean(CONFIG_CRITICAL); - // always + 60 seconds + // always + 60 seconds String startTimeStr = getConfig(CONFIG_START_TIME); if (startTimeStr == null || startTimeStr.equals("")) { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java index d3838577e..0aa92937f 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a subject alternative name extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectAltNameExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java index cca5ab234..813e92a28 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java @@ -46,7 +46,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a subject directory attributes extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectDirAttributesExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java index 8ea7533cc..d850147a4 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that populates Subject Info Access extension. - * + * * @version $Revision$, $Date$ */ public class SubjectInfoAccessExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java index 9476e45f6..a8f6a7415 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a subject key identifier extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectKeyIdentifierExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java index 479219b84..31aee6dd6 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java index 46a78c731..a78992a74 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserExtensionDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java index b1dc9d116..f6bc488b2 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user supplied key * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserKeyDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java index 4aeed6ba3..7625f9a34 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied signing algorithm * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserSigningAlgDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java index 65456e256..77d743334 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserSubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java index 3fadb81fd..8d5ca7d55 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied validity * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserValidityDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java index ad06400f3..0c31fb0a8 100644 --- a/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a server-side configurable validity * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class ValidityDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java index 6b5ab6bc0..bd935fb53 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsHKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java index cc1a8de81..c90b76c5d 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsNKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java index 77fa417f6..9dfda47b5 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsTokenDeviceKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java index 65adabfad..dff36748c 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsTokenUserKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java index 77d4b1ce0..901cf5c71 100644 --- a/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java @@ -39,9 +39,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment page: * 1/ Certificate Request Type, 2/ Certificate Request * <p> - * + * * This input usually is used by an enrollment profile for certificate requests. - * + * * @version $Revision$, $Date$ */ public class CMCCertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/CertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CertReqInput.java index 0b7e9f071..50fac5a41 100644 --- a/base/common/src/com/netscape/cms/profile/input/CertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/CertReqInput.java @@ -42,9 +42,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment page: * 1/ Certificate Request Type, 2/ Certificate Request * <p> - * + * * This input usually is used by an enrollment profile for certificate requests. - * + * * @version $Revision$, $Date$ */ public class CertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java index 18b9ecf52..3205fca0a 100644 --- a/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * pages so that a CRMF request containing 2 certificate * requests will be generated. * <p> - * + * * This input can only be used with Netscape 7.x or later clients. * <p> - * + * * @version $Revision$, $Date$ */ public class DualKeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java index d59629f78..63c18483c 100644 --- a/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * populates parameters to the enrollment page for * key generation. * <p> - * + * * This input normally is used with user-based or non certificate request profile. * <p> - * + * * @version $Revision$, $Date$ */ public class EncryptionKeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/base/common/src/com/netscape/cms/profile/input/EnrollInput.java index c4269ba7d..b4ed31223 100644 --- a/base/common/src/com/netscape/cms/profile/input/EnrollInput.java +++ b/base/common/src/com/netscape/cms/profile/input/EnrollInput.java @@ -42,7 +42,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the base enrollment input. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollInput implements IProfileInput { @@ -72,7 +72,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Populates the request with this policy default. - * + * * @param ctx profile context * @param request request * @exception EProfileException failed to populate @@ -82,7 +82,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Retrieves the localizable name of this policy. - * + * * @param locale user locale * @return localized input name */ @@ -90,7 +90,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Retrieves the localizable description of this policy. - * + * * @param locale user locale * @return localized input description */ @@ -99,7 +99,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Retrieves the descriptor of the given value * property by name. - * + * * @param locale user locale * @param name property name * @return descriptor of the property @@ -242,11 +242,11 @@ public abstract class EnrollInput implements IProfileInput { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -266,12 +266,12 @@ public abstract class EnrollInput implements IProfileInput { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { diff --git a/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java b/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java index 357488186..f62a5964c 100644 --- a/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java +++ b/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements the image * input that collects a picture. * <p> - * + * * @version $Revision$, $Date$ */ public class FileSigningInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/base/common/src/com/netscape/cms/profile/input/GenericInput.java index e8edfaa6d..e92fbe93e 100644 --- a/base/common/src/com/netscape/cms/profile/input/GenericInput.java +++ b/base/common/src/com/netscape/cms/profile/input/GenericInput.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements a generic input. * <p> - * + * * @version $Revision$, $Date$ */ public class GenericInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/ImageInput.java b/base/common/src/com/netscape/cms/profile/input/ImageInput.java index 30570b56c..5874cc07f 100644 --- a/base/common/src/com/netscape/cms/profile/input/ImageInput.java +++ b/base/common/src/com/netscape/cms/profile/input/ImageInput.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements the image * input that collects a picture. * <p> - * + * * @version $Revision$, $Date$ */ public class ImageInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java index c2b3cf0d5..8be954024 100644 --- a/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * populates parameters to the enrollment page for * key generation. * <p> - * + * * This input normally is used with user-based or non certificate request profile. * <p> - * + * * @version $Revision$, $Date$ */ public class KeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java b/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java index 542a2c940..c2566139a 100644 --- a/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements the serial number input * for renewal * <p> - * + * * @author Christina Fu */ public class SerialNumRenewInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java index aa471d4f6..d60ed551f 100644 --- a/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * populates parameters to the enrollment page for * key generation. * <p> - * + * * This input normally is used with user-based or non certificate request profile. * <p> - * + * * @version $Revision$, $Date$ */ public class SigningKeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java b/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java index db70da666..2c0de4486 100644 --- a/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java @@ -44,7 +44,7 @@ import com.netscape.cms.profile.common.EnrollProfile; * <p> * The collected parameters could be used for fomulating the subject name in the certificate. * <p> - * + * * @version $Revision$, $Date$ */ public class SubjectNameInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java b/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java index 984706f42..e15e13e91 100644 --- a/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.IRequest; * input that collects certificate requestor's * information such as name, email and phone. * <p> - * + * * @version $Revision$, $Date$ */ public class SubmitterInfoInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java index 3c6067891..15f296a9e 100644 --- a/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java @@ -37,9 +37,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment "page": * 1/ token cuid, 2/ publickey * <p> - * + * * This input usually is used by an enrollment profile for certificate requests coming from TPS. - * + * * @version $Revision$, $Date$ */ public class nsHKeyCertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java index 196798683..f14df1a80 100644 --- a/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java @@ -37,9 +37,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment "page": * 1/ id, 2/ publickey * <p> - * + * * This input usually is used by an enrollment profile for certificate requests coming from TPS. - * + * * @version $Revision$, $Date$ */ public class nsNKeyCertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java index 2253460b1..9c04e6962 100644 --- a/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java @@ -47,7 +47,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the output plugin that outputs * CMMF response for the issued certificate. - * + * * @version $Revision$, $Date$ */ public class CMMFOutput extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/base/common/src/com/netscape/cms/profile/output/CertOutput.java index 1293c055c..a556d4a44 100644 --- a/base/common/src/com/netscape/cms/profile/output/CertOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/CertOutput.java @@ -36,7 +36,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the pretty print certificate output * that displays the issued certificate in a pretty print format. - * + * * @version $Revision$, $Date$ */ public class CertOutput extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java index 25a4b4908..06c940e8c 100644 --- a/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements the basic enrollment output. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollOutput implements IProfileOutput { @@ -58,7 +58,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Populates the request with this policy default. - * + * * @param ctx profile context * @param request request * @exception EProfileException failed to populate @@ -69,7 +69,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Retrieves the descriptor of the given value * parameter by name. - * + * * @param locale user locale * @param name property name * @return property descriptor @@ -78,7 +78,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Retrieves the localizable name of this policy. - * + * * @param locale user locale * @return output policy name */ @@ -86,7 +86,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Retrieves the localizable description of this policy. - * + * * @param locale user locale * @return output policy description */ diff --git a/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java index 0e01e15dd..c412eb2fd 100644 --- a/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java +++ b/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java @@ -44,7 +44,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the output plugin that outputs * PKCS7 for the issued certificate. - * + * * @version $Revision$, $Date$ */ public class PKCS7Output extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java index 6bf03f436..571022ad8 100644 --- a/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java @@ -35,7 +35,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the output plugin that outputs * DER for the issued certificate for token keys - * + * * @version $Revision$, $Date$ */ public class nsNKeyOutput extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java index 52c87113d..cfe35df39 100644 --- a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java +++ b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java @@ -45,7 +45,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This updater class will create the new user to the subsystem group and * then add the subsystem certificate to the user. - * + * * @version $Revision$, $Date$ */ public class SubsystemGroupUpdater implements IProfileUpdater { diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java index 7f70722d0..acac975cb 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java @@ -57,16 +57,16 @@ import com.netscape.certsrv.request.IRequest; * attribute formulated from the certificate * subject name, extension or request attributes. * <p> - * + * * The syntax is - * + * * <pre> - * avaPattern := constant-value | - * "$subj" "." attrName [ "." attrNumber ] | - * "$req" "." [ prefix .] attrName [ "." attrNumber ] | + * avaPattern := constant-value | + * "$subj" "." attrName [ "." attrNumber ] | + * "$req" "." [ prefix .] attrName [ "." attrNumber ] | * "$ext" "." extName [ "." nameType ] [ "." attrNumber ] * </pre> - * + * * <pre> * Example: <i>$ext.SubjectAlternativeName.RFC822Name.1</i> * cert subjectAltName is rfc822Name: jjames@mcom.com @@ -77,9 +77,9 @@ import com.netscape.certsrv.request.IRequest; * The first rfc822name value in the subjAltName extension. <br> * <p> * </pre> - * + * * If a request attribute or subject DN component does not exist, the attribute is skipped. - * + * * @version $Revision$, $Date$ */ class AVAPattern { @@ -117,12 +117,12 @@ class AVAPattern { /* value type */ protected String mType = null; - /* value - could be name of a request attribute or + /* value - could be name of a request attribute or * cert subject attribute or extension name. */ protected String mValue = null; - /* value type - general name type of an + /* value type - general name type of an * extension attribute if any. */ protected String mGNType = null; @@ -174,7 +174,7 @@ class AVAPattern { } if (c == '$') { - // check for $subj $ext or $req + // check for $subj $ext or $req try { c = in.read(); } catch (IOException e) { @@ -252,7 +252,7 @@ class AVAPattern { } if (c == '+' || c == ',') { // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } } catch (IOException e) { throw new ELdapException( @@ -350,7 +350,7 @@ class AVAPattern { // value is constant. treat as regular ava. mType = TYPE_CONSTANT; - // parse ava value. + // parse ava value. StringBuffer valueBuf = new StringBuffer(); valueBuf.append((char) c); @@ -362,7 +362,7 @@ class AVAPattern { } if (c == '+' || c == ',') { // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } } catch (IOException e) { throw new ELdapException( @@ -371,9 +371,9 @@ class AVAPattern { mValue = valueBuf.toString().trim(); - /* try { + /* try { * AVA ava = mLdapDNStrConverter.parseAVA( - * valueBuf.toString()); + * valueBuf.toString()); * mValue = ava.toLdapDNString(); * //System.out.println("----- mValue "+mValue); * } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java index bbf641540..a1a65a342 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java @@ -54,7 +54,7 @@ import com.netscape.certsrv.request.IRequest; * in the directory to publish the cert or crl. * The restriction of this mapper is that the ldap dn components must * be part of certificate subject name or request attributes or constant. - * + * * @version $Revision$, $Date$ */ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { @@ -82,7 +82,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Constructor. - * + * * @param dnPattern The base DN. */ public LdapCaSimpleMap(String dnPattern) { @@ -157,7 +157,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occured. @@ -170,7 +170,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param req the request to map. * @param obj the object to map. @@ -277,7 +277,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * form a dn from component in the request and cert subject name - * + * * @param req The request * @param obj The certificate or crl */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java index 2373e3c66..d1a734b82 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @version $Revision$, $Date$ */ public class LdapCertCompsMap @@ -57,14 +57,14 @@ public class LdapCertCompsMap /** * Constructor. - * + * * The DN comps are used to form a LDAP entry to begin a subtree search. * The filter comps are used to form a search filter for the subtree. * If none of the DN comps matched, baseDN is used for the subtree. * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @param baseDN The base DN. * @param dnComps Components to form the LDAP base dn for search. * @param filterComps Components to form the LDAP search filter. @@ -116,7 +116,7 @@ public class LdapCertCompsMap * If the formed DN is null and baseDN is null an error is thrown. * If the filter is null a base search is performed. * If both are null an error is thrown. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java index 11b53a797..5c085481d 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; /** * Maps a X509 certificate to a LDAP entry by using the subject name * of the certificate as the LDAP entry DN. - * + * * @version $Revision$, $Date$ */ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { @@ -103,7 +103,7 @@ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { /** * Finds the entry for the certificate by looking for the cert * subject name in the subject name attribute. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. */ @@ -172,13 +172,13 @@ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { /* catch (IOException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_GET_SUBJECT", e.toString())); throw new ELdapException( LdapResources.GET_CERT_SUBJECT_DN_FAILED, e); } catch (CertificateEncodingException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_DECODE_CERT", e.toString())); throw new ELdapException( LdapResources.GET_DER_ENCODED_CERT_FAILED, e); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java index 4d5ff38c8..61ffef947 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; /** * Maps a X509 certificate to a LDAP entry by finding an LDAP entry * which has an attribute whose contents are equal to the cert subject name. - * + * * @version $Revision$, $Date$ */ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { @@ -62,7 +62,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /** * constructs a certificate subject name mapper with search base. - * + * * @param searchBase the dn to start searching for the certificate * subject name. */ @@ -76,7 +76,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /** * Constructor using non-ES cert map attribute name. - * + * * @param searchBase entry to start search. * @param certSubjNameAttr attribute for certificate subject names. * @param certAttr attribute to find certificate. @@ -172,7 +172,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /** * Finds the entry for the certificate by looking for the cert * subject name in the subject name attribute. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. */ @@ -242,13 +242,13 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /* catch (IOException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_GET_SUBJECT", e.toString())); throw new ELdapException( LdapResources.GET_CERT_SUBJECT_DN_FAILED, e); } catch (CertificateEncodingException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_DECODE_CERT", e.toString())); throw new ELdapException( LdapResources.GET_DER_ENCODED_CERT_FAILED, e); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java index 654de5d30..7c4c3c4b0 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; * Default crl mapper. * maps the crl to a ldap entry by using components in the issuer name * to find the CA's entry. - * + * * @version $Revision$, $Date$ */ public class LdapCrlIssuerCompsMap @@ -49,14 +49,14 @@ public class LdapCrlIssuerCompsMap /** * Constructor. - * + * * The DN comps are used to form a LDAP entry to begin a subtree search. * The filter comps are used to form a search filter for the subtree. * If none of the DN comps matched, baseDN is used for the subtree. * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @param baseDN The base DN. * @param dnComps Components to form the LDAP base dn for search. * @param filterComps Components to form the LDAP search filter. @@ -110,7 +110,7 @@ public class LdapCrlIssuerCompsMap * If the formed DN is null and baseDN is null an error is thrown. * If the filter is null a base search is performed. * If both are null an error is thrown. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. * @return the result. LdapCertMapResult is also used for CRL. diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java index 73549f1b5..1f7f06f69 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java @@ -55,7 +55,7 @@ import com.netscape.certsrv.publish.ILdapPlugin; * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @version $Revision$, $Date$ */ public class LdapDNCompsMap @@ -71,14 +71,14 @@ public class LdapDNCompsMap /** * Constructor. - * + * * The DN comps are used to form a LDAP entry to begin a subtree search. * The filter comps are used to form a search filter for the subtree. * If none of the DN comps matched, baseDN is used for the subtree. * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @param baseDN The base DN. * @param dnComps Components to form the LDAP base dn for search. * @param filterComps Components to form the LDAP search filter. @@ -209,7 +209,7 @@ public class LdapDNCompsMap * If the formed DN is null and baseDN is null an error is thrown. * If the filter is null a base search is performed. * If both are null an error is thrown. - * + * * @param conn the LDAP connection. * @param x500name the dn to map. * @param obj the object @@ -234,8 +234,8 @@ public class LdapDNCompsMap // if (filter == null) { // log(ILogger.LL_FAILURE, "No dn and filter formed"); // throw new ELdapException( - // LdapResources.NO_DN_AND_FILTER_COMPS, - // x500name.toString()); + // LdapResources.NO_DN_AND_FILTER_COMPS, + // x500name.toString()); // } if (mBaseDN == null) { log(ILogger.LL_FAILURE, @@ -302,7 +302,7 @@ public class LdapDNCompsMap /** * form a dn and filter from component in the cert subject name - * + * * @param subjName subject name */ public String[] formDNandFilter(X500Name subjName) @@ -359,7 +359,7 @@ public class LdapDNCompsMap } } - // XXX should be an error when string is null? + // XXX should be an error when string is null? // return to caller to decide. if (dnRdns.size() != 0) { dnStr = new X500Name(dnRdns).toLdapDNString(); @@ -417,7 +417,7 @@ public class LdapDNCompsMap * arrays of objectidentifiers. * The string is expected to be comma separated AVA attribute names. * For example, "uid,cn,o,ou". Attribute names are case insensitive. - * + * * @param val the string specifying the comps * @exception ELdapException if any error occurs. */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java index c9a7f867c..d94032071 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java @@ -72,7 +72,7 @@ import com.netscape.certsrv.request.IRequest; * entry is not found, it has the option to create * the ldap entry given the dn and attributes * formulated. - * + * * @version $Revision$, $Date$ */ public class LdapEnhancedMap @@ -105,7 +105,7 @@ public class LdapEnhancedMap /* mapper plug-in fields */ protected static final String PROP_DNPATTERN = "dnPattern"; protected static final String PROP_CREATE = "createEntry"; - // the object class of the entry to be created. xxxx not done yet + // the object class of the entry to be created. xxxx not done yet protected static final String PROP_OBJCLASS = "objectClass"; // req/cert/ext attribute --> directory attribute table protected static final String PROP_ATTRNUM = "attrNum"; @@ -206,7 +206,7 @@ public class LdapEnhancedMap /** * form a dn from component in the request and cert subject name - * + * * @param req The request * @param obj The certificate or crl */ @@ -332,7 +332,7 @@ public class LdapEnhancedMap /** * for initializing from config store. - * + * * implementation for extended * ILdapPlugin interface method */ @@ -439,7 +439,7 @@ public class LdapEnhancedMap /** * Maps an X500 subject name to an LDAP entry. * Uses DN pattern to form a DN for an LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occurred. @@ -452,7 +452,7 @@ public class LdapEnhancedMap /** * Maps an X500 subject name to an LDAP entry. * Uses DN pattern to form a DN for an LDAP base search. - * + * * @param conn the LDAP connection. * @param req the request to map. * @param obj the object to map. diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java index 642729673..67d98f4cc 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java @@ -51,7 +51,7 @@ import com.netscape.certsrv.request.IRequest; * in the directory to publish the cert or crl. * The restriction of this mapper is that the ldap dn components must * be part of certificate subject name or request attributes or constant. - * + * * @version $Revision$, $Date$ */ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { @@ -77,7 +77,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Constructor. - * + * * @param dnPattern The base DN. */ public LdapSimpleMap(String dnPattern) { @@ -151,7 +151,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occured. @@ -164,7 +164,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param req the request to map. * @param obj the object to map. @@ -201,7 +201,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { LDAPEntry entry = results.next(); if (results.hasMoreElements()) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? "" : + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? "" : req.getRequestId().toString()))); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_MORE_THAN_ONE_ENTRY", ((req == null) ? "" : req.getRequestId().toString()))); @@ -237,7 +237,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * form a dn from component in the request and cert subject name - * + * * @param req The request * @param obj The certificate or crl */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java index 7aeb672d0..ef7fa9d13 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java @@ -45,41 +45,41 @@ import com.netscape.certsrv.request.IRequest; * class for parsing a DN pattern used to construct a ldap dn from * request attributes and cert subject name. * <p> - * + * * dnpattern is a string representing a ldap dn pattern to formulate from the certificate subject name attributes and * request attributes . If empty or not set, the certificate subject name will be used as the ldap dn. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$subj" "." attrName [ "." attrNumber ] | - * name "=" "$ext" "." extName [ "." nameType ] [ "." attrNumber ] - * name "=" "$req" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$subj" "." attrName [ "." attrNumber ] | + * name "=" "$ext" "." extName [ "." nameType ] [ "." attrNumber ] + * name "=" "$req" "." attrName [ "." attrNumber ] | * "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>cn=Certificate Manager,ou=people,o=mcom.com</i> * cert subject name: dn: CN=Certificate Manager, OU=people, O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * CN=Certificate Manager, OU=people, O=mcom.com * <p> * note: Subordinate ca enrollment will use ca mapper. Use predicate * to distinguish the ca itself and the subordinates. - * + * * Example2: <i>UID=$req.HTTP_PARAMS.uid, OU=$subj.ou, OU=people, , O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, OU=people, , O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, OU=IS, OU=people, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * OU = the 'ou' value in the cert subject name. <br> * O = the string mcom.com. <br> @@ -87,20 +87,20 @@ import com.netscape.certsrv.request.IRequest; * Example3: <i>UID=$req.HTTP_PARAMS.uid, E=$ext.SubjectAlternativeName.RFC822Name.1, O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, OU=people, O=mcom.com * cert subjectAltName is rfc822Name: jjames@mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, E=jjames@mcom.com, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * E = The first rfc822name value in the subjAltName extension. <br> * O = the string mcom.com. <br> * <p> * </pre> - * + * * If an request attribute or subject DN component does not exist, the attribute is skipped. There is potential risk * that a wrong dn will be mapped into. - * + * * @version $Revision$, $Date$ */ class MapAVAPattern { @@ -138,7 +138,7 @@ class MapAVAPattern { /* the attribute in the AVA pair */ protected String mAttr = null; - /* value - could be name of a request attribute or + /* value - could be name of a request attribute or * cert subject dn attribute. */ protected String mValue = null; @@ -185,7 +185,7 @@ class MapAVAPattern { if (c == -1) throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "All blank")); - // $rdn "." number syntax. + // $rdn "." number syntax. if (c == '$') { //System.out.println("$rdn syntax"); @@ -230,9 +230,9 @@ class MapAVAPattern { return; } - // name "=" ... syntax. + // name "=" ... syntax. - // read name + // read name //System.out.println("reading name"); StringBuffer attrBuf = new StringBuffer(); @@ -253,10 +253,10 @@ class MapAVAPattern { throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "Missing \"=\" in ava pattern")); - // read value + // read value //System.out.println("reading value"); - // skip spaces + // skip spaces //System.out.println("skip spaces for value"); try { while ((c = in.read()) == ' ' || c == '\t') {//System.out.println("spaces2 read "+(char)c); @@ -271,7 +271,7 @@ class MapAVAPattern { "no value after = in ava pattern")); if (c == '$') { - // check for $subj $ext or $req + // check for $subj $ext or $req try { c = in.read(); //System.out.println("check $dn or $attr read "+(char)c); @@ -327,7 +327,7 @@ class MapAVAPattern { "unknown keyword. expecting $subj $ext or $req.")); } - // get request attr name of subject dn pattern from above. + // get request attr name of subject dn pattern from above. String attrName = attrBuf.toString().trim(); //System.out.println("----- attrName "+attrName); @@ -337,10 +337,10 @@ class MapAVAPattern { mAttr = attrName; /* - try { - ObjectIdentifier attrOid = - mLdapDNStrConverter.parseAVAKeyword(attrName); - mAttr = mLdapDNStrConverter.encodeOID(attrOid); + try { + ObjectIdentifier attrOid = + mLdapDNStrConverter.parseAVAKeyword(attrName); + mAttr = mLdapDNStrConverter.encodeOID(attrOid); //System.out.println("----- mAttr "+mAttr); } catch (IOException e) { @@ -359,7 +359,7 @@ class MapAVAPattern { valueBuf.append((char) c); } if (c == '+' || c == ',') // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } catch (IOException e) { throw new ELdapException( CMS.getUserMessage("CMS_LDAP_INTERNAL_ERROR", e.toString())); @@ -439,7 +439,7 @@ class MapAVAPattern { // value is constant. treat as regular ava. mType = TYPE_CONSTANT; //System.out.println("----- mType constant"); - // parse ava value. + // parse ava value. StringBuffer valueBuf = new StringBuffer(); valueBuf.append((char) c); @@ -450,7 +450,7 @@ class MapAVAPattern { valueBuf.append((char) c); } if (c == '+' || c == ',') { // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } } catch (IOException e) { throw new ELdapException( diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java index 7a9025b1d..dc446a7b7 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java @@ -34,49 +34,49 @@ import com.netscape.certsrv.request.IRequest; * class for parsing a DN pattern used to construct a ldap dn from * request attributes and cert subject name. * <p> - * + * * dnpattern is a string representing a ldap dn pattern to formulate from the certificate subject name attributes and * request attributes . If empty or not set, the certificate subject name will be used as the ldap dn. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$subj" "." attrName [ "." attrNumber ] | - * name "=" "$req" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$subj" "." attrName [ "." attrNumber ] | + * name "=" "$req" "." attrName [ "." attrNumber ] | * "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>cn=Certificate Manager,ou=people,o=mcom.com</i> * cert subject name: dn: CN=Certificate Manager, OU=people, O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * CN=Certificate Manager, OU=people, O=mcom.com * <p> * note: Subordinate ca enrollment will use ca mapper. Use predicate * to distinguish the ca itself and the subordinates. - * + * * Example2: <i>UID=$req.HTTP_PARAMS.uid, OU=$subj.ou, O=people, , O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, O=people, , O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, OU=IS, OU=people, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * OU = the 'ou' value in the cert subject name. <br> * O = the string people, mcom.com. <br> * <p> * </pre> - * + * * If an request attribute or subject DN component does not exist, the attribute is skipped. There is potential risk * that a wrong dn will be mapped into. - * + * * @version $Revision$, $Date$ */ public class MapDNPattern { @@ -97,7 +97,7 @@ public class MapDNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattern the DN pattern * @exception EBaseException If parsing error occurs. */ @@ -166,7 +166,7 @@ public class MapDNPattern { /** * Form a Ldap v3 DN string from a request and a cert subject name. - * + * * @param req the request for (un)publish * @param subject the subjectDN of the certificate * @return Ldap v3 DN string to use for base ldap search. diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java index c1688345b..61da1d7d2 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java @@ -33,49 +33,49 @@ import com.netscape.certsrv.request.IRequest; * class for parsing a DN pattern used to construct a ldap dn from * request attributes and cert subject name. * <p> - * + * * dnpattern is a string representing a ldap dn pattern to formulate from the certificate subject name attributes and * request attributes . If empty or not set, the certificate subject name will be used as the ldap dn. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$subj" "." attrName [ "." attrNumber ] | - * name "=" "$req" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$subj" "." attrName [ "." attrNumber ] | + * name "=" "$req" "." attrName [ "." attrNumber ] | * "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>cn=Certificate Manager,ou=people,o=mcom.com</i> * cert subject name: dn: CN=Certificate Manager, OU=people, O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * CN=Certificate Manager, OU=people, O=mcom.com * <p> * note: Subordinate ca enrollment will use ca mapper. Use predicate * to distinguish the ca itself and the subordinates. - * + * * Example2: <i>UID=$req.HTTP_PARAMS.uid, OU=$subj.ou, O=people, , O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, O=people, , O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, OU=IS, OU=people, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * OU = the 'ou' value in the cert subject name. <br> * O = the string people, mcom.com. <br> * <p> * </pre> - * + * * If an request attribute or subject DN component does not exist, the attribute is skipped.There is potential risk that * a wrong dn will be mapped into. - * + * * @version $Revision$, $Date$ */ class MapRDNPattern { @@ -96,7 +96,7 @@ class MapRDNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattenr the DN pattern * @exception ELdapException If parsing error occurs. */ @@ -146,7 +146,7 @@ class MapRDNPattern { if (lastChar != -1) { try { - in.unread(lastChar); // pushback last , + in.unread(lastChar); // pushback last , } catch (IOException e) { throw new ELdapException( CMS.getUserMessage("CMS_LDAP_INTERNAL_ERROR", e.toString())); @@ -183,7 +183,7 @@ class MapRDNPattern { /** * Form a Ldap v3 DN string from a request and a cert subject name. - * + * * @param req the request for (un)publish * @param subject the subjectDN of the certificate * @return Ldap v3 DN string to use for base ldap search. diff --git a/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/base/common/src/com/netscape/cms/publish/mappers/NoMap.java index 155c54ce0..cc12714e2 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/NoMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/NoMap.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.request.IRequest; /** * No Map - * + * * @version $Revision$, $Date$ */ public class NoMap implements ILdapMapper, IExtendedPluginInfo { @@ -68,7 +68,7 @@ public class NoMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occured. diff --git a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java index cb13b2452..c41025b54 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Utils; /** * This publisher writes certificate and CRL into * a directory. - * + * * @version $Revision$, $Date$ */ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { @@ -257,7 +257,7 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { oldLink.delete(); } File link = new File(linkName); - if (link.exists()) { // current link becomes an old link + if (link.exists()) { // current link becomes an old link link.renameTo(new File(linkName + ".old")); } File newLink = new File(linkName + ".new"); @@ -275,7 +275,7 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { /** * Publishs a object to the ldap directory. - * + * * @param conn a Ldap connection * (null if LDAP publishing is not enabled) * @param dn dn of the ldap entry to publish cert @@ -391,7 +391,7 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { /** * Unpublishs a object to the ldap directory. - * + * * @param conn the Ldap connection * (null if LDAP publishing is not enabled) * @param dn dn of the ldap entry to unpublish cert diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java index e47318b76..cbc77560f 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * Interface for publishing a CA certificate to - * + * * @version $Revision$, $Date$ */ public class LdapCaCertPublisher @@ -152,7 +152,7 @@ public class LdapCaCertPublisher * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. * Converts the class to certificateAuthority. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java index 9000f6834..ac2b64973 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java @@ -47,7 +47,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; * Interface for mapping a X509 certificate to a LDAP entry * Publishes a certificate as binary and its subject name. * there is one subject name value for each certificate. - * + * * @version $Revision$, $Date$ */ public class LdapCertSubjPublisher implements ILdapPublisher { @@ -136,7 +136,7 @@ public class LdapCertSubjPublisher implements ILdapPublisher { * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. * Then adds the subject name of the cert to the subject name attribute. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. @@ -298,7 +298,7 @@ public class LdapCertSubjPublisher implements ILdapPublisher { return; } - // delete cert if there. + // delete cert if there. LDAPModificationSet modSet = new LDAPModificationSet(); if (hasCert) { diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java index c65ff79d5..014cc0e5e 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java @@ -41,7 +41,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * module for publishing a cross certificate pair to ldap * crossCertificatePair attribute - * + * * @version $Revision$, $Date$ */ public class LdapCertificatePairPublisher @@ -153,7 +153,7 @@ public class LdapCertificatePairPublisher /** * publish a certificatePair * -should not be called from listeners. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the XcertificatePair * @param pair the Xcertificate bytes object. @@ -166,7 +166,7 @@ public class LdapCertificatePairPublisher /** * publish a certificatePair * -should not be called from listeners. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the XcertificatePair * @param pair the cross cert bytes diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java index 6826cc801..51bebe236 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * For publishing master or global CRL. * Publishes (replaces) the CRL in the CA's LDAP entry. - * + * * @version $Revision$, $Date$ */ public class LdapCrlPublisher implements ILdapPublisher, IExtendedPluginInfo { diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java index d2c488620..8dada61fb 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java @@ -52,7 +52,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * Interface for mapping a X509 certificate to a LDAP entry - * + * * @version $Revision$, $Date$ */ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPluginInfo { @@ -125,7 +125,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin * publish a user certificate * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. @@ -155,7 +155,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin return; } - // publish + // publish LDAPModification mod = new LDAPModification(LDAPModification.REPLACE, attr); conn.modify(dn, mod); diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java index e31ce674c..020c25552 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * Interface for mapping a X509 certificate to a LDAP entry - * + * * @version $Revision$, $Date$ */ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInfo { @@ -114,7 +114,7 @@ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInf * publish a user certificate * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. @@ -176,7 +176,7 @@ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInf return; } - // publish + // publish LDAPModification mod = null; if (deleteCert) { mod = new LDAPModification(LDAPModification.REPLACE, diff --git a/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java b/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java index af8d283dd..280a0ce97 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java +++ b/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java @@ -30,7 +30,7 @@ import java.util.Vector; /** * Publisher utility class. - * + * * @version $Revision$, $Date$ */ public class PublisherUtils { @@ -105,7 +105,7 @@ public class PublisherUtils { /** * strips out double quotes around String parameter - * + * * @param s the string potentially bracketed with double quotes * @return string stripped of surrounding double quotes */ diff --git a/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/common/src/com/netscape/cms/request/RequestScheduler.java index e0ebaefc4..073bdcce4 100644 --- a/base/common/src/com/netscape/cms/request/RequestScheduler.java +++ b/base/common/src/com/netscape/cms/request/RequestScheduler.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.request.IRequestScheduler; * the threads based on the request processing order. * The request that enters the request queue first should * be processed first. - * + * * @version $Revision$, $Date$ */ public class RequestScheduler implements IRequestScheduler { @@ -35,7 +35,7 @@ public class RequestScheduler implements IRequestScheduler { /** * Request entered the request queue processing. - * + * * @param r request */ public synchronized void requestIn(IRequest r) { @@ -49,7 +49,7 @@ public class RequestScheduler implements IRequestScheduler { /** * Request exited the request queue processing. - * + * * @param r request */ public synchronized void requestOut(IRequest r) { diff --git a/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/common/src/com/netscape/cms/selftests/ASelfTest.java index cdd86ccaf..6857f3c46 100644 --- a/base/common/src/com/netscape/cms/selftests/ASelfTest.java +++ b/base/common/src/com/netscape/cms/selftests/ASelfTest.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.selftests.ISelfTestSubsystem; /** * This class implements an individual self test. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -79,7 +79,7 @@ public abstract class ASelfTest * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -136,7 +136,7 @@ public abstract class ASelfTest /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public abstract void startupSelfTest() @@ -153,7 +153,7 @@ public abstract class ASelfTest * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -164,7 +164,7 @@ public abstract class ASelfTest * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -175,7 +175,7 @@ public abstract class ASelfTest * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -184,7 +184,7 @@ public abstract class ASelfTest /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java b/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java index c9c12bb42..83caa0099 100644 --- a/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java @@ -49,7 +49,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for CA presence. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -80,7 +80,7 @@ public class CAPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -134,7 +134,7 @@ public class CAPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -155,7 +155,7 @@ public class CAPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -166,7 +166,7 @@ public class CAPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -177,7 +177,7 @@ public class CAPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -189,7 +189,7 @@ public class CAPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java b/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java index 9325208f9..b1751ecb4 100644 --- a/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java +++ b/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java @@ -49,7 +49,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check the validity of the CA. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -80,7 +80,7 @@ public class CAValidity * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -134,7 +134,7 @@ public class CAValidity /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -155,7 +155,7 @@ public class CAValidity * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -166,7 +166,7 @@ public class CAValidity * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -177,7 +177,7 @@ public class CAValidity * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -189,7 +189,7 @@ public class CAValidity /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java b/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java index 57afffdf2..f5b0939f1 100644 --- a/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java +++ b/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java @@ -45,7 +45,7 @@ import com.netscape.cms.selftests.ASelfTest; * This class implements a self test to check the system certs * of the subsystem * <P> - * + * * @version $Revision: $, $Date: $ */ public class SystemCertsVerification @@ -74,7 +74,7 @@ public class SystemCertsVerification * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -128,7 +128,7 @@ public class SystemCertsVerification /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -149,7 +149,7 @@ public class SystemCertsVerification * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -160,7 +160,7 @@ public class SystemCertsVerification * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -171,7 +171,7 @@ public class SystemCertsVerification * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -183,7 +183,7 @@ public class SystemCertsVerification /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java index 01f5609bf..7183db613 100644 --- a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java @@ -46,7 +46,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for KRA presence. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -77,7 +77,7 @@ public class KRAPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -131,7 +131,7 @@ public class KRAPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -152,7 +152,7 @@ public class KRAPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -163,7 +163,7 @@ public class KRAPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -174,7 +174,7 @@ public class KRAPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -186,7 +186,7 @@ public class KRAPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java index c862362a2..a3d9e3ad3 100644 --- a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java +++ b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java @@ -50,7 +50,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for OCSP presence. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -81,7 +81,7 @@ public class OCSPPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -135,7 +135,7 @@ public class OCSPPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -156,7 +156,7 @@ public class OCSPPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -167,7 +167,7 @@ public class OCSPPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -178,7 +178,7 @@ public class OCSPPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -190,7 +190,7 @@ public class OCSPPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java index 478746827..383779d22 100644 --- a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java +++ b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java @@ -50,7 +50,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check the validity of the OCSP. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -81,7 +81,7 @@ public class OCSPValidity * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -135,7 +135,7 @@ public class OCSPValidity /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -156,7 +156,7 @@ public class OCSPValidity * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -167,7 +167,7 @@ public class OCSPValidity * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -178,7 +178,7 @@ public class OCSPValidity * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -190,7 +190,7 @@ public class OCSPValidity /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java index 9790bf619..e279cf608 100644 --- a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java @@ -46,7 +46,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for RA presence. * <P> - * + * * <PRE> * NOTE: This self-test is for Registration Authorities prior to * Netscape Certificate Management System 7.0. It does NOT @@ -55,7 +55,7 @@ import com.netscape.cms.selftests.ASelfTest; * ALL versions of Dogtag Certificate System). * </PRE> * <P> - * + * * @deprecated * @author mharmsen * @author thomask @@ -87,7 +87,7 @@ public class RAPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -141,7 +141,7 @@ public class RAPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -162,7 +162,7 @@ public class RAPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -173,7 +173,7 @@ public class RAPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -184,7 +184,7 @@ public class RAPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -196,7 +196,7 @@ public class RAPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java index 69edeb24f..bee89a59c 100644 --- a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java +++ b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java @@ -47,7 +47,7 @@ import com.netscape.symkey.SessionKey; /** * This class implements a self test to check for TKS known session key. * <P> - * + * * @author mharmsen * @author thomask * @author awnuk @@ -72,7 +72,7 @@ public class TKSKnownSessionKey * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -216,7 +216,7 @@ public class TKSKnownSessionKey /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -237,7 +237,7 @@ public class TKSKnownSessionKey * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -248,7 +248,7 @@ public class TKSKnownSessionKey * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -259,7 +259,7 @@ public class TKSKnownSessionKey * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -270,7 +270,7 @@ public class TKSKnownSessionKey /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 12575675c..7a08ce966 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.usrgrp.IUGSubsystem; /** * Manage Access Control List configuration - * + * * @version $Revision$, $Date$ */ public class ACLAdminServlet extends AdminServlet { @@ -80,7 +80,7 @@ public class ACLAdminServlet extends AdminServlet { * <LI>"evaluatorTypes" ACL evaluators. * </ul> * </ul> - * + * * @param config servlet configuration, read from the web.xml file */ public void init(ServletConfig config) throws ServletException { @@ -97,7 +97,7 @@ public class ACLAdminServlet extends AdminServlet { /** * Process the HTTP request. - * + * * @param req the object holding the request information * @param resp the object holding the response information */ @@ -320,11 +320,11 @@ public class ACLAdminServlet extends AdminServlet { /** * modify acls information for a resource * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ACL used when configuring Access Control List (ACL) information * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -484,11 +484,11 @@ public class ACLAdminServlet extends AdminServlet { /** * add access evaluators * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ACL used when configuring Access Control List (ACL) information * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this ACL evaluator's @@ -721,11 +721,11 @@ public class ACLAdminServlet extends AdminServlet { /** * remove access evaluators * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ACL used when configuring Access Control List (ACL) information * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this ACL evaluator's @@ -876,7 +876,7 @@ public class ACLAdminServlet extends AdminServlet { */ /* - private void getACLs(HttpServletRequest req, + private void getACLs(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException, EBaseException { NameValuePairs params = new NameValuePairs(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java index a36c859d9..19b537854 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java @@ -21,7 +21,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the remote admin. - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index ce4c966ad..5e6e7889f 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -62,27 +62,27 @@ import com.netscape.cmsutil.util.Utils; * A class represents an administration servlet that * is responsible to serve administrative * operation such as configuration parameter updates. - * + * * Since each administration servlet needs to perform * authentication information parsing and response * formulation, it makes sense to encapsulate the * commonalities into this class. - * + * * By extending this serlvet, the subclass does not * need to re-implement the request parsing code * (i.e. authentication information parsing). - * + * * If a subsystem needs to expose configuration * parameters management, it should create an * administration servlet (i.e. CAAdminServlet) * and register it to RemoteAdmin subsystem. - * + * * <code> * public class CAAdminServlet extends AdminServlet { * ... * } * </code> - * + * * @version $Revision$, $Date$ */ public class AdminServlet extends HttpServlet { @@ -214,7 +214,7 @@ public class AdminServlet extends HttpServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -280,13 +280,13 @@ public class AdminServlet extends HttpServlet { * Authenticates to the identity scope with the given * userid and password via identity manager. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_FAIL used when authentication fails (in case of SSL-client auth, only * webserver env can pick up the SSL violation; CMS authMgr can pick up cert mis-match, so this event is used) * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_SUCCESS used when authentication succeeded * </ul> - * + * * @exception IOException an input/output error has occurred */ protected void authenticate(HttpServletRequest req) throws @@ -611,14 +611,14 @@ public class AdminServlet extends HttpServlet { /** * Authorize must occur after Authenticate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_FAIL used when authorization has failed * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS used when authorization is successful * <li>signed.audit LOGGING_SIGNED_AUDIT_ROLE_ASSUME used when user assumes a role (in current CMS that's when one * accesses a role port) * </ul> - * + * * @param req HTTP servlet request * @return the authorization token */ @@ -773,7 +773,7 @@ public class AdminServlet extends HttpServlet { /** * Sends response. - * + * * @param returnCode return code * @param errorMsg localized error message * @param params result parameters @@ -1007,11 +1007,11 @@ public class AdminServlet extends HttpServlet { /** * FileConfigStore functionality - * + * * The original config file is moved to <filename>.<date>. * Commits the current properties to the configuration file. * <P> - * + * * @param createBackup true if a backup file should be created */ protected void commit(boolean createBackup) throws EBaseException { @@ -1027,11 +1027,11 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended admin servlets * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1051,12 +1051,12 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { @@ -1088,13 +1088,13 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Parameters - * + * * This method is inherited by all extended admin servlets and * is called to extract parameters from the HttpServletRequest * and return a string of name;;value pairs separated by a '+' * if more than one name;;value pair exists. * <P> - * + * * @param req HTTP servlet request * @return a delimited string of one or more delimited name/value pairs */ @@ -1213,11 +1213,11 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Groups - * + * * This method is called to extract all "groups" associated * with the "auditSubjectID()". * <P> - * + * * @param SubjectID string containing the signed audit log message SubjectID * @return a delimited string of groups associated * with the "auditSubjectID()" diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java index cacd0b5d0..6ccfcdca9 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -49,8 +49,8 @@ import com.netscape.certsrv.logging.ILogger; * A class representing an administration servlet for the * Authentication Management subsystem. This servlet is responsible * to serve configuration requests for the Auths Management subsystem. - * - * + * + * * @version $Revision$, $Date$ */ public class AuthAdminServlet extends AdminServlet { @@ -198,7 +198,7 @@ public class AuthAdminServlet extends AdminServlet { null, resp); return; } - // for the rest + // for the rest try { super.authenticate(req); if (op.equals(OpDef.OP_AUTH)) { // for admin authentication only @@ -354,11 +354,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Add authentication manager plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -611,11 +611,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Add authentication manager instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -960,11 +960,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Delete authentication manager plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1132,11 +1132,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Delete authentication manager instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1203,7 +1203,7 @@ public class AuthAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mAuths.getInstances().remove(id); // remove the configuration. @@ -1382,11 +1382,11 @@ public class AuthAdminServlet extends AdminServlet { * The old instance is left running, so this is very expensive. * Restart of server recommended. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1469,7 +1469,7 @@ public class AuthAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation AuthMgrPlugin plugin = (AuthMgrPlugin) mAuths.getPlugins().get(implname); @@ -1491,7 +1491,7 @@ public class AuthAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. IAuthManager oldinst = (IAuthManager) mAuths.get(id); diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java index 69cfd9aaf..42c8da175 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Authentication Credentials as input to the authMgr * <P> - * + * * @version $Revision$, $Date$ */ public class AuthCredentials implements IAuthCredentials { @@ -36,7 +36,7 @@ public class AuthCredentials implements IAuthCredentials { */ private static final long serialVersionUID = -6938644716486895814L; private Hashtable<String, Object> authCreds = null; - // Inserted by bskim + // Inserted by bskim private IArgBlock argblk = null; // Insert end @@ -47,7 +47,7 @@ public class AuthCredentials implements IAuthCredentials { /** * sets a credential with credential name and the credential - * + * * @param name credential name * @param cred credential * @exception com.netscape.certsrv.base.EBaseException NullPointerException @@ -63,7 +63,7 @@ public class AuthCredentials implements IAuthCredentials { /** * returns the credential to which the specified name is mapped in this * credential set - * + * * @param name credential name * @return the named authentication credential */ @@ -75,7 +75,7 @@ public class AuthCredentials implements IAuthCredentials { * removes the name and its corresponding credential from this * credential set. This method does nothing if the named * credential is not in the credential set. - * + * * @param name credential name */ public void delete(String name) { @@ -86,7 +86,7 @@ public class AuthCredentials implements IAuthCredentials { * returns an enumeration of the credential names in this credential * set. Use the Enumeration methods on the returned object to * fetch the elements sequentially. - * + * * @return an enumeration of the names in this credential set * @see java.util.Enumeration */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java index e7b32e844..27cd91c30 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java @@ -48,7 +48,7 @@ import com.netscape.cmsutil.util.Utils; * Authority. This servlet is responsible to serve CA * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class CAAdminServlet extends AdminServlet { @@ -514,12 +514,12 @@ public class CAAdminServlet extends AdminServlet { /** * Add CRL issuing points configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -670,12 +670,12 @@ public class CAAdminServlet extends AdminServlet { /** * Set CRL issuing points configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -831,12 +831,12 @@ public class CAAdminServlet extends AdminServlet { /** * Delete CRL issuing points configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -974,12 +974,12 @@ public class CAAdminServlet extends AdminServlet { /** * Delete CRL extensions configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1193,12 +1193,12 @@ public class CAAdminServlet extends AdminServlet { /** * Set CRL configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1472,11 +1472,11 @@ public class CAAdminServlet extends AdminServlet { String value = "false"; /* - ISubsystem eeGateway = + ISubsystem eeGateway = SubsystemRegistry.getInstance().get("eeGateway"); if (eeGateway != null) { IConfigStore eeConfig = eeGateway.getConfigStore(); - if (eeConfig != null) + if (eeConfig != null) value = eeConfig.getString("enabled", "true"); String ocspValue = "true"; ocspValue = eeConfig.getString("enableOCSP", "true"); @@ -1529,7 +1529,7 @@ public class CAAdminServlet extends AdminServlet { IOException, EBaseException { /* - ISubsystem eeGateway = + ISubsystem eeGateway = SubsystemRegistry.getInstance().get("eeGateway"); */ @@ -1547,7 +1547,7 @@ public class CAAdminServlet extends AdminServlet { /* if (eeConfig != null) { if (((EEGateway)eeGateway).isEnabled() && - value.equals("false") || + value.equals("false") || !((EEGateway)eeGateway).isEnabled() && value.equals("true")) { restart=true;; diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 3a2ae0a11..5aa422730 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -85,7 +85,7 @@ import com.netscape.symkey.SessionKey; * servlet is responsible to serve Certificate Server * level administrative operations such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public final class CMSAdminServlet extends AdminServlet { @@ -505,12 +505,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Modify encryption configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION used when configuring encryption (cert settings and SSL * cipher preferences) * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to modify encryption configuration @@ -935,7 +935,7 @@ public final class CMSAdminServlet extends AdminServlet { } } } - // String symKeys = new String("key1,key2"); + // String symKeys = new String("key1,key2"); String symKeys = SessionKey.ListSymmetricKeys(selectedToken); params.put(Constants.PR_TOKEN_LIST, symKeys); @@ -1072,11 +1072,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Retrieve a certificate request * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_GEN_ASYMMETRIC used when asymmetric keys are generated * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to retrieve certificate request @@ -1444,12 +1444,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Issue import certificate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import CA certs into the certificate database * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to issue an import certificate @@ -1860,12 +1860,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Install certificates * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import CA certs into the certificate database * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to install a certificate @@ -2018,15 +2018,15 @@ public final class CMSAdminServlet extends AdminServlet { // 600124 - renewal of SSL crash the server // we now do not delete previously installed certificates. - // Same Subject | Same Nickname | Same Key | Legal - // ----------------------------------------------------------- - // 1. Yes Yes No Yes - // 2. Yes Yes Yes Yes - // 3. No No Yes Yes - // 4. No No No Yes - // 5. No Yes Yes No - // 6. No Yes No No - // 7. Yes No Yes No + // Same Subject | Same Nickname | Same Key | Legal + // ----------------------------------------------------------- + // 1. Yes Yes No Yes + // 2. Yes Yes Yes Yes + // 3. No No Yes Yes + // 4. No No No Yes + // 5. No Yes Yes No + // 6. No Yes No No + // 7. Yes No Yes No // 8. Yes No No No // Based on above table, the following cases are permitted: @@ -2280,12 +2280,12 @@ public final class CMSAdminServlet extends AdminServlet { * For "importing" cross-signed cert into internal db for further * cross pair matching and publishing * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import a CA cross-signed certificate into the database * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to import a cross-certificate pair @@ -2809,7 +2809,7 @@ public final class CMSAdminServlet extends AdminServlet { nickname = value.substring(0, index); date = value.substring(index + 1); - // cant use this one now since jss doesnt have the interface to + // cant use this one now since jss doesnt have the interface to // do it. jssSubSystem.deleteCert(nickname, date); // jssSubsystem.deleteCACert(nickname, date); @@ -2997,12 +2997,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Establish trust of a CA certificate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Manage Certificate" is used to edit * the trustness of certs and deletion of certs * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to establish CA certificate trust @@ -3092,11 +3092,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Execute all self tests specified to be run on demand. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION used when self tests are run on demand * </ul> - * + * * @exception EMissingSelfTestException a self test plugin instance * property name was missing * @exception ESelfTestException a self test is missing a required @@ -3394,11 +3394,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "KeyPair" object for a signed audit log message. * <P> - * + * * @param object a Key Pair Object * @return key string containing the public key */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java index 42ff32ebe..a89933c69 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A class representing an administration servlet for the * Jobs Scheduler and it's scheduled jobs. - * + * * @version $Revision$, $Date$ */ public class JobsAdminServlet extends AdminServlet { @@ -639,7 +639,7 @@ public class JobsAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mJobsSched.getInstances().remove(id); // remove the configuration. @@ -791,7 +791,7 @@ public class JobsAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation JobPlugin plugin = (JobPlugin) mJobsSched.getPlugins().get(implname); @@ -803,7 +803,7 @@ public class JobsAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. IJob oldinst = (IJob) mJobsSched.getInstances().get((Object) id); diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java index eaa5a95c4..c6e6f9e1c 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.logging.ILogger; * Recovery Authority. This servlet is responsible to serve * KRA administrative operation such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public class KRAAdminServlet extends AdminServlet { @@ -71,7 +71,7 @@ public class KRAAdminServlet extends AdminServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -80,7 +80,7 @@ public class KRAAdminServlet extends AdminServlet { /** * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ @@ -153,7 +153,7 @@ public class KRAAdminServlet extends AdminServlet { } else if (scope.equals(ScopeDef.SC_NOTIFICATION_RIQ)) { setNotificationRIQConfig(req, resp); return; - } else + } else */ if (scope.equals(ScopeDef.SC_GENERAL)) { setGeneralConfig(req, resp); diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java index 1b32018bc..fb73cec98 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -49,7 +49,7 @@ import com.netscape.certsrv.logging.LogPlugin; * subsystem. This servlet is responsible to serve * logging administrative operation such as configuration * parameter updates and log retriever. - * + * * @version $Revision$, $Date$ */ public class LogAdminServlet extends AdminServlet { @@ -407,11 +407,11 @@ public class LogAdminServlet extends AdminServlet { /** * Add log plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -680,11 +680,11 @@ public class LogAdminServlet extends AdminServlet { /** * Add log instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1072,11 +1072,11 @@ public class LogAdminServlet extends AdminServlet { /** * Delete log instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1146,7 +1146,7 @@ public class LogAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mSys.getLogInsts().remove(id); // remove the configuration. @@ -1234,11 +1234,11 @@ public class LogAdminServlet extends AdminServlet { /** * Delete log plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1415,7 +1415,7 @@ public class LogAdminServlet extends AdminServlet { /** * Modify log instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * <li>signed.audit LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE used when log file name (including any path changes) for @@ -1424,7 +1424,7 @@ public class LogAdminServlet extends AdminServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE used when log expiration time change is attempted * (authorization should not allow, but make sure it's written after the attempt) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1716,7 +1716,7 @@ public class LogAdminServlet extends AdminServlet { newExpirationTime = val; if (!val.equals(origVal.trim())) { if (id.equals(SIGNED_AUDIT_LOG_TYPE)) { - AUTHZ_RES_NAME = + AUTHZ_RES_NAME = "certServer.log.configuration.signedAudit.expirationTime"; } mOp = "modify"; @@ -2284,10 +2284,10 @@ public class LogAdminServlet extends AdminServlet { /** * Signed Audit Check Log Path - * + * * This method is called to extract the log file path. * <P> - * + * * @param req http servlet request * @return a string containing the log file path */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index 0e6784413..4149fae94 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.ocsp.IOCSPStore; * Authority. This servlet is responsible to serve OCSP * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class OCSPAdminServlet extends AdminServlet { @@ -227,12 +227,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set default OCSP store * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -317,12 +317,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set OCSP store configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -467,12 +467,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set general OCSP configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index 0bcb962ea..c1da868c8 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -45,11 +45,11 @@ import com.netscape.certsrv.ra.IRegistrationAuthority; /** * This class is an administration servlet for policy management. - * + * * Each service (CA, KRA, RA) should be responsible * for registering an instance of this with the remote * administration subsystem. - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -114,14 +114,14 @@ public class PolicyAdminServlet extends AdminServlet { // NOTE: The "Certificate Policies" framework ONLY applied to // to CA, KRA, and legacy RA (pre-CMS 7.0) subsystems. // - // Further, the "PolicyAdminServlet.java" servlet is ONLY used + // Further, the "PolicyAdminServlet.java" servlet is ONLY used // by the CA Console for the following: // // SERVLET-NAME URL-PATTERN // ==================================================== // capolicy ca/capolicy // - // Finally, the "PolicyAdminServlet.java" servlet is ONLY used + // Finally, the "PolicyAdminServlet.java" servlet is ONLY used // by the KRA Console for the following: // // SERVLET-NAME URL-PATTERN @@ -480,12 +480,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Delete policy implementation * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -602,12 +602,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Add policy implementation * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -709,12 +709,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Delete policy instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -849,12 +849,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Add policy instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1006,12 +1006,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Change ordering of policy instances * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1097,12 +1097,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Modify policy instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1182,7 +1182,7 @@ public class PolicyAdminServlet extends AdminServlet { sendResponse(ERROR, INVALID_POLICY_IMPL_ID, null, resp); return; } - // XXX + // XXX for (@SuppressWarnings("unchecked") Enumeration<String> n = req.getParameterNames(); n.hasMoreElements();) { String p = n.nextElement(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index 94235f532..3ca222135 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -54,11 +54,11 @@ import com.netscape.cms.profile.common.ProfilePolicy; /** * This class is an administration servlet for policy management. - * + * * Each service (CA, KRA, RA) should be responsible * for registering an instance of this with the remote * administration subsystem. - * + * * @version $Revision$, $Date$ */ public class ProfileAdminServlet extends AdminServlet { @@ -396,12 +396,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add policy profile * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -539,12 +539,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile input * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -665,12 +665,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile output * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -792,12 +792,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete policy profile * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -913,12 +913,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile input * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1031,12 +1031,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile output * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1149,12 +1149,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add default policy profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1286,12 +1286,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add policy constraints profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1425,12 +1425,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify default policy profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1557,12 +1557,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile input configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1677,12 +1677,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile output configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1798,12 +1798,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify policy constraints profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2272,12 +2272,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2410,12 +2410,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2573,12 +2573,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java index 483ac42ef..8daadbce0 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -71,7 +71,7 @@ import com.netscape.cmsutil.password.IPasswordStore; * A class representing an publishing servlet for the * Publishing subsystem. This servlet is responsible * to serve configuration requests for the Publishing subsystem. - * + * * @version $Revision$, $Date$ */ public class PublisherAdminServlet extends AdminServlet { @@ -138,7 +138,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // for the rest + // for the rest try { super.authenticate(req); @@ -571,7 +571,7 @@ public class PublisherAdminServlet extends AdminServlet { commit(true); - /* Do a "PUT" of the new pw to the watchdog" + /* Do a "PUT" of the new pw to the watchdog" ** do not remove - cfu if (pwd != null) CMS.putPasswordCache(PW_TAG_CA_LDAP_PUBLISHING, pwd); @@ -921,7 +921,7 @@ public class PublisherAdminServlet extends AdminServlet { CMS.debug("PublisherAdminServlet: testSetLDAPDest(): authInfo null"); */ } - //params.add(Constants.PR_SAVE_OK, + //params.add(Constants.PR_SAVE_OK, // "\n \nConfiguration changes are now committed."); mProcessor.shutdown(); @@ -1322,7 +1322,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getMapperInsts().remove(id); // remove the configuration. @@ -2014,7 +2014,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getRuleInsts().remove(id); // remove the configuration. @@ -2140,7 +2140,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation RulePlugin plugin = (RulePlugin) mProcessor.getRulePlugins().get(implname); @@ -2152,7 +2152,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. ILdapRule oldinst = (ILdapRule) mProcessor.getRuleInsts().get((Object) id); @@ -2666,7 +2666,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getPublisherInsts().remove(id); // remove the configuration. @@ -2818,7 +2818,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation PublisherPlugin plugin = (PublisherPlugin) mProcessor.getPublisherPlugins().get(implname); @@ -2831,7 +2831,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. ILdapPublisher oldinst = mProcessor.getPublisherInstance(id); Vector<String> oldConfigParms = oldinst.getInstanceParams(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java index 5bdb14177..b2e271236 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.IRequestListener; * Authority. This servlet is responsible to serve RA * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class RAAdminServlet extends AdminServlet { @@ -571,10 +571,10 @@ public class RAAdminServlet extends AdminServlet { while (enum.hasMoreElements()) { String key = (String)enum.nextElement(); if (key.equals(Constants.PR_EE_ENABLED)) { - if (eeConfig != null) + if (eeConfig != null) eeConfig.putString("enabled", req.getParameter(Constants.PR_EE_ENABLED)); - } + } } */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java index 4bebe85d3..4f5afbb20 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.registry.IPluginRegistry; /** * This implements the administration servlet for registry subsystem. - * + * * @version $Revision$, $Date$ */ public class RegistryAdminServlet extends AdminServlet { diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java index 4dccb141f..72106a903 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java @@ -31,9 +31,9 @@ import com.netscape.cms.servlet.cert.model.CertificateData; /** * This is the class used to list, retrieve and modify system certificates for all Java subsystems. - * + * * @author alee - * + * */ public class SystemCertificateResourceService extends CMSResourceService implements SystemCertificateResource { diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index e5a6dd3c4..90dc92221 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -63,10 +63,10 @@ import com.netscape.cmsutil.util.Utils; * User/Group Manager. It communicates with client * SDK to allow remote administration of User/Group * manager. - * + * * This servlet will be registered to remote * administration subsystem by usrgrp manager. - * + * * @version $Revision$, $Date$ */ public class UsrGrpAdminServlet extends AdminServlet { @@ -167,11 +167,11 @@ public class UsrGrpAdminServlet extends AdminServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_FAIL_AUTHS")); - sendResponse(ERROR, + sendResponse(ERROR, MessageFormatter.getLocalizedString( getLocale(req), AdminResources.class.getName(), - AdminResources.SRVLT_FAIL_AUTHS), + AdminResources.SRVLT_FAIL_AUTHS), null, resp); return; } @@ -333,7 +333,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Searches for users in LDAP directory. List uids only - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -381,7 +381,7 @@ public class UsrGrpAdminServlet extends AdminServlet { * List user information. Certificates covered in a separate * protocol for findUserCerts(). List of group memberships are * also provided. - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -462,7 +462,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * List user certificate(s) - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -542,7 +542,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Searchess for groups in LDAP server - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group @@ -648,16 +648,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a new user to LDAP server * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -973,16 +973,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a certificate to a user * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1327,19 +1327,19 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Removes a certificate for a user * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * In this method, "certDN" is actually a combination of version, serialNumber, issuerDN, and SubjectDN. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1473,16 +1473,16 @@ public class UsrGrpAdminServlet extends AdminServlet { * any group he/she belongs to before trying to remove the user * itself. * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1643,16 +1643,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a new group in local scope. * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1783,16 +1783,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * removes a group * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1886,18 +1886,18 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * modifies a group * <P> - * + * * last person of the super power group "Certificate Server Administrators" can never be removed. * <P> - * + * * http://warp.mcom.com/server/certificate/columbo/design/ ui/admin-protocol-definition.html#group * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2126,16 +2126,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Modifies an existing user in local scope. * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java b/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java index 24c3cd74d..36f33b6f8 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java @@ -32,9 +32,9 @@ import com.netscape.cms.servlet.cert.model.CertificateData; /** * Base class for CMS RESTful resources - * + * * @author alee - * + * */ public class CMSResourceService { diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index c0931ee2f..f1de3ce4a 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -101,7 +101,7 @@ import com.netscape.cmsutil.xml.XMLObject; /** * This is the base class of all CS servlet. - * + * * @version $Revision$, $Date$ */ public abstract class CMSServlet extends HttpServlet { @@ -132,7 +132,7 @@ public abstract class CMSServlet extends HttpServlet { private final static String FAILED = "1"; private final static String HDR_LANG = "accept-language"; - // final error message - if error and exception templates don't work + // final error message - if error and exception templates don't work // send out this text string directly to output. public final static String PROP_FINAL_ERROR_MSG = "finalErrorMsg"; @@ -206,7 +206,7 @@ public abstract class CMSServlet extends HttpServlet { public static final String CERT_ATTR = "javax.servlet.request.X509Certificate"; - // members. + // members. protected boolean mRenderResult = true; protected String mFinalErrorMsg = FINAL_ERROR_MSG; @@ -222,7 +222,7 @@ public abstract class CMSServlet extends HttpServlet { protected String mId = null; protected IConfigStore mConfig = null; - // the authority, RA, CA, KRA this servlet is serving. + // the authority, RA, CA, KRA this servlet is serving. protected IAuthority mAuthority = null; protected IRequestQueue mRequestQueue = null; @@ -317,7 +317,7 @@ public abstract class CMSServlet extends HttpServlet { } try { - // get final error message. + // get final error message. // used when templates can't even be loaded. String eMsg = sc.getInitParameter(PROP_FINAL_ERROR_MSG); @@ -350,12 +350,12 @@ public abstract class CMSServlet extends HttpServlet { } } - // get http params NOT to store in a IRequest and - // get http headers TO store in a IRequest. + // get http params NOT to store in a IRequest and + // get http headers TO store in a IRequest. getDontSaveHttpParams(sc); getSaveHttpHeaders(sc); } catch (Exception e) { - // should never occur since we provide defaults above. + // should never occur since we provide defaults above. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_CONF_TEMP_PARAMS", e.toString())); @@ -393,7 +393,7 @@ public abstract class CMSServlet extends HttpServlet { while (paramNames.hasMoreElements()) { String pn = (String) paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -447,10 +447,10 @@ public abstract class CMSServlet extends HttpServlet { } CMS.debug("CMSServlet: " + mId + " start to service."); - // get a cms request + // get a cms request CMSRequest cmsRequest = newCMSRequest(); - // set argblock + // set argblock cmsRequest.setHttpParams(CMS.createArgBlock("http-request-params", toHashtable(httpReq))); // set http request @@ -522,7 +522,7 @@ public abstract class CMSServlet extends HttpServlet { /** * Create a new CMSRequest object. This should be overriden by servlets * implementing different types of request - * + * * @return a new CMSRequest object */ protected CMSRequest newCMSRequest() { @@ -532,7 +532,7 @@ public abstract class CMSServlet extends HttpServlet { /** * process an HTTP request. Servlets must override this with their * own implementation - * + * * @throws EBaseException if the servlet was unable to satisfactorily * process the request */ @@ -544,7 +544,7 @@ public abstract class CMSServlet extends HttpServlet { * Output a template. * If an error occurs while outputing the template the exception template * is used to display the error. - * + * * @param cmsReq the CS request */ protected void renderResult(CMSRequest cmsReq) @@ -688,7 +688,7 @@ public abstract class CMSServlet extends HttpServlet { * In others if an exception occurs while rendering the template the * exception template (this) is called. * <p> - * + * * @param cmsReq the CS request to pass to template filler if any. * @param e the unexpected exception */ @@ -705,8 +705,8 @@ public abstract class CMSServlet extends HttpServlet { // When an exception occurs the exit is non-local which probably // will leave the requestStatus value set to something other - // than CMSRequest.EXCEPTION, so force the requestStatus to - // EXCEPTION since it must be that if we're here. + // than CMSRequest.EXCEPTION, so force the requestStatus to + // EXCEPTION since it must be that if we're here. cmsReq.setStatus(CMSRequest.EXCEPTION); if (filler != null) { @@ -743,14 +743,14 @@ public abstract class CMSServlet extends HttpServlet { public void renderFinalError(CMSRequest cmsReq, Exception ex) throws IOException { - // this template is the last resort for all other unexpected - // errors in other templates so we can only output text. + // this template is the last resort for all other unexpected + // errors in other templates so we can only output text. HttpServletResponse httpResp = cmsReq.getHttpResp(); httpResp.setContentType("text/html"); ServletOutputStream out = httpResp.getOutputStream(); - // replace $ERRORMSG with exception message if included. + // replace $ERRORMSG with exception message if included. String finalErrMsg = mFinalErrorMsg; int tokenIdx = mFinalErrorMsg.indexOf(ERROR_MSG_TOKEN); @@ -772,10 +772,10 @@ public abstract class CMSServlet extends HttpServlet { /* try { - s = (SSLSocket) ((HTTPRequest) httpReq).getConnection().getSocket(); + s = (SSLSocket) ((HTTPRequest) httpReq).getConnection().getSocket(); } catch (ClassCastException e) { CMS.getLogger().log( - ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_WARN, + ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_WARN, CMS.getLogMessage("CMSGW_SSL_NO_INVALIDATE")); // ignore. return; @@ -831,7 +831,7 @@ public abstract class CMSServlet extends HttpServlet { mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_INFO, CMS.getLogMessage("CMSGW_GETTING_SSL_CLIENT_CERT")); - // iws60 support Java Servlet Spec V2.2, attribute + // iws60 support Java Servlet Spec V2.2, attribute // javax.servlet.request.X509Certificate now contains array // of X509Certificates instead of one X509Certificate object X509Certificate[] allCerts = (X509Certificate[]) httpReq.getAttribute(CERT_ATTR); @@ -1125,7 +1125,7 @@ public abstract class CMSServlet extends HttpServlet { /** * instantiate a new filler from a class name, - * + * * @return null if can't be instantiated, new instance otherwise. */ protected ICMSTemplateFiller newFillerObject(String fillerClass) { @@ -1153,12 +1153,12 @@ public abstract class CMSServlet extends HttpServlet { */ protected void setDefaultTemplates(ServletConfig sc) { // Subclasses should override these for diff templates and params in - // their constructors. - // Set a template name to null to not use these standard ones. - // When template name is set to null nothing will be displayed. + // their constructors. + // Set a template name to null to not use these standard ones. + // When template name is set to null nothing will be displayed. // Servlet is assumed to have rendered its own output. - // The only exception is the unexpected error template where the - // default one will always be used if template name is null. + // The only exception is the unexpected error template where the + // default one will always be used if template name is null. String successTemplate = null; String errorTemplate = null; String unauthorizedTemplate = null; @@ -1237,7 +1237,7 @@ public abstract class CMSServlet extends HttpServlet { unexpectedErrorTemplate = "/" + gateway + unexpectedErrorTemplate; } } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -1319,7 +1319,7 @@ public abstract class CMSServlet extends HttpServlet { private static final String IMPORT_CERT = "importCert"; private static final String IMPORT_CHAIN = "importCAChain"; private static final String IMPORT_CERT_MIME_TYPE = "importCertMimeType"; - // default mime type + // default mime type private static final String NS_X509_USER_CERT = "application/x-x509-user-cert"; private static final String NS_X509_EMAIL_CERT = "application/x-x509-email-cert"; @@ -1391,7 +1391,7 @@ public abstract class CMSServlet extends HttpServlet { caChain = ((ICertAuthority) mAuthority).getCACertChain(); caCerts = caChain.getChain(); - // set user + CA cert chain in pkcs7 + // set user + CA cert chain in pkcs7 X509CertImpl[] userChain = new X509CertImpl[caCerts.length + 1]; @@ -1511,7 +1511,7 @@ public abstract class CMSServlet extends HttpServlet { /** * make a CRL entry from a serial number and revocation reason. - * + * * @return a RevokedCertImpl that can be entered in a CRL. */ protected RevokedCertImpl formCRLEntry( @@ -1536,7 +1536,7 @@ public abstract class CMSServlet extends HttpServlet { /** * check if a certificate (serial number) is revoked on a CA. - * + * * @return true if cert is marked revoked in the CA's database. * @return false if cert is not marked revoked. */ @@ -1676,13 +1676,13 @@ public abstract class CMSServlet extends HttpServlet { /** * Authentication * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_FAIL used when authentication fails (in case of SSL-client auth, only * webserver env can pick up the SSL violation; CS authMgr can pick up cert mis-match, so this event is used) * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_SUCCESS used when authentication succeeded * </ul> - * + * * @exception EBaseException an error has occurred */ public IAuthToken authenticate(HttpServletRequest httpReq, String authMgrName) @@ -1724,7 +1724,7 @@ public abstract class CMSServlet extends HttpServlet { // // check authentication by auth manager if any. - // + // if (authMgrName == null) { // Fixed Blackflag Bug #613900: Since this code block does @@ -1873,14 +1873,14 @@ public abstract class CMSServlet extends HttpServlet { /** * Authorize must occur after Authenticate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_FAIL used when authorization has failed * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS used when authorization is successful * <li>signed.audit LOGGING_SIGNED_AUDIT_ROLE_ASSUME used when user assumes a role (in current CS that's when one * accesses a role port) * </ul> - * + * * @param authzMgrName string representing the name of the authorization * manager * @param authToken the authentication token @@ -2033,11 +2033,11 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -2057,12 +2057,12 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { @@ -2097,12 +2097,12 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Log Group ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "gid" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditGroupID() { @@ -2137,11 +2137,11 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Groups - * + * * This method is called to extract all "groups" associated * with the "auditSubjectID()". * <P> - * + * * @param SubjectID string containing the signed audit log message SubjectID * @return a delimited string of groups associated * with the "auditSubjectID()" diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java index 4bfc74607..6f9f43d3a 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java @@ -34,7 +34,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet is started by the web server at startup, and * it starts the CMS framework. - * + * * @version $Revision$, $Date$ */ public class CMSStartServlet extends HttpServlet { diff --git a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java index 54e453f30..a6cb97908 100644 --- a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java @@ -33,7 +33,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * This is the servlet that displays the html page for the corresponding input id. - * + * * @version $Revision$, $Date$ */ public class DisplayHtmlServlet extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java index 0bf726879..ceba2fc72 100644 --- a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.base.IConfigStore; * <p> * This allows the requestor (browser) to make decisions about what to present in the UI, depending on how CMS is * configured - * + * * @version $Revision$, $Date$ */ public class DynamicVariablesServlet extends CMSServlet { @@ -137,7 +137,7 @@ public class DynamicVariablesServlet extends CMSServlet { * <li>clacrlurl() - the URL to get the CRL from, in the case of a Clone CA. This is defined in the CMS * configuration parameter 'cloning.cloneMasterCrlUrl' * </ul> - * + * * @see javax.servlet.Servlet#init(ServletConfig) */ diff --git a/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/base/common/src/com/netscape/cms/servlet/base/GetStats.java index c21b56835..8c32e78c3 100644 --- a/base/common/src/com/netscape/cms/servlet/base/GetStats.java +++ b/base/common/src/com/netscape/cms/servlet/base/GetStats.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve information. - * + * * @version $Revision$, $Date$ */ public class GetStats extends CMSServlet { @@ -62,7 +62,7 @@ public class GetStats extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "getOCSPInfo.template" to render the result page. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -79,7 +79,7 @@ public class GetStats extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java index 95dbf2abf..b5f94bd19 100644 --- a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java @@ -34,7 +34,7 @@ import com.netscape.cms.servlet.common.IndexTemplateFiller; /** * This is the servlet that builds the index page in * various ports. - * + * * @version $Revision$, $Date$ */ public class IndexServlet extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java index fced583a2..a0587229a 100644 --- a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java @@ -33,7 +33,7 @@ import com.netscape.cmsutil.xml.XMLObject; /** * This servlet returns port information. - * + * * @version $Revision$, $Date$ */ public class PortsServlet extends CMSServlet { @@ -49,7 +49,7 @@ public class PortsServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); - // override these to output directly ourselves. + // override these to output directly ourselves. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); } diff --git a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java index 41666ab31..4d7ff24f5 100644 --- a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java @@ -22,31 +22,31 @@ import com.netscape.certsrv.apps.CMS; /** * This is a servlet that proxies request to another servlet. - * + * * SERVLET REDIRECTION * Specify the URL of a servlet to forward the request to * destServlet: /ee/ca/newservlet - * + * * PARAMETER MAPPING * In the servlet configuration (as an init-param in web.xml) you * can optionally specify a value for the parameter 'parameterMap' * which contains a list of HTTP parameters which should be * translated to new names. - * + * * parameterMap: name1->newname1,name2->newname2 - * + * * Optionally, names can be set to static values: - * + * * parameterMap: name1->name2=value - * + * * Examples: * Consider the following HTTP input parameters: * vehicle:car make:ford model:explorer - * + * * The following config strings will have this effect: * parameterMap: make->manufacturer,model->name=expedition,->suv=true * output: vehicle:car manufactuer:ford model:expedition suv:true - * + * * @version $Revision$, $Date$ */ public class ProxyServlet extends HttpServlet { @@ -222,7 +222,7 @@ class ProxyWrapper extends HttpServletRequestWrapper { } } } - // Now, deal with static values set in the config + // Now, deal with static values set in the config // which weren't set in the HTTP request Set<Map.Entry<String, String[]>> s2 = mValueMap.entrySet(); Iterator<Map.Entry<String, String[]>> i2 = s2.iterator(); diff --git a/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java index f883fd373..24210f377 100644 --- a/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.apps.CMS; * thread. * <p> * Also allows user to trigger a new garbage collection - * + * * @version $Revision$, $Date$ */ public class SystemInfoServlet extends HttpServlet { @@ -62,7 +62,7 @@ public class SystemInfoServlet extends HttpServlet { * <li>op = general - display information about memory, and other JVM informatino * <li>op = thread - display details about each thread. * </UL> - * + * * @see javax.servlet.http.HttpServlet#service(HttpServletRequest, HttpServletResponse) */ public void service(HttpServletRequest request, diff --git a/base/common/src/com/netscape/cms/servlet/base/UserInfo.java b/base/common/src/com/netscape/cms/servlet/base/UserInfo.java index dd8f69613..b509409da 100644 --- a/base/common/src/com/netscape/cms/servlet/base/UserInfo.java +++ b/base/common/src/com/netscape/cms/servlet/base/UserInfo.java @@ -20,7 +20,7 @@ package com.netscape.cms.servlet.base; /** * This class represents information about the client e.g. version, * langauge, vendor. - * + * * @version $Revision$, $Date$ */ public class UserInfo { @@ -35,7 +35,7 @@ public class UserInfo { /** * Returns the user language. - * + * * @param s user language info from the browser * @return user language */ @@ -52,7 +52,7 @@ public class UserInfo { /** * Returns the user country. - * + * * @param s user language info from the browser * @return user country */ @@ -69,7 +69,7 @@ public class UserInfo { /** * Returns the users agent. - * + * * @param s user language info from the browser * @return user agent */ diff --git a/base/common/src/com/netscape/cms/servlet/base/model/Link.java b/base/common/src/com/netscape/cms/servlet/base/model/Link.java index 7fd850a22..336092abe 100644 --- a/base/common/src/com/netscape/cms/servlet/base/model/Link.java +++ b/base/common/src/com/netscape/cms/servlet/base/model/Link.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; /** * @author alee - * + * */ @XmlRootElement(name = "Link") public class Link { diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index 5af09ad0d..fc9a97be2 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -69,7 +69,7 @@ import com.netscape.cmsutil.util.Utils; /** * Revoke a certificate with a CMC-formatted revocation request - * + * * @version $Revision$, $Date$ */ public class CMCRevReqServlet extends CMSServlet { @@ -96,7 +96,7 @@ public class CMCRevReqServlet extends CMSServlet { private final static String LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED = "LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED_7"; - // http params + // http params public static final String SERIAL_NO = TOKEN_CERT_SERIAL; public static final String REASON_CODE = "reasonCode"; public static final String CHALLENGE_PHRASE = "challengePhrase"; @@ -110,7 +110,7 @@ public class CMCRevReqServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -136,11 +136,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Process the HTTP request. - * + * * <ul> * <li>http.param cmcRequest the base-64 encoded CMC request * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -315,20 +315,20 @@ public class CMCRevReqServlet extends CMSServlet { * Process cert status change request using the Certificate Management * protocol using CMS (CMC) * <P> - * + * * (Certificate Request - an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - an "EE" cert status change request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -965,11 +965,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -995,11 +995,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -1028,11 +1028,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index f056047cc..94c8f1207 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -69,7 +69,7 @@ import com.netscape.cmsutil.util.Utils; /** * Takes the certificate info (serial number) and optional challenge phrase, creates a * revocation request and submits it to the authority subsystem for processing - * + * * @version $Revision$, $Date$ */ public class ChallengeRevocationServlet1 extends CMSServlet { @@ -88,7 +88,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { private IPublisherProcessor mPublisherProcessor = null; private String mRequestID = null; - // http params + // http params public static final String SERIAL_NO = TOKEN_CERT_SERIAL; public static final String REASON_CODE = "reasonCode"; public static final String CHALLENGE_PHRASE = "challengePhrase"; @@ -103,7 +103,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { /** * Initialize the servlet. This servlet uses the file * revocationResult.template for the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -130,7 +130,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { * <li>http.param REASON_CODE the revocation reason * <li>http.param b64eCertificate the base-64 encoded certificate to revoke * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -370,7 +370,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; diff --git a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java index d17fd959b..aa7abc92e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; * Redirect a request to the Master. This servlet is used in * a clone when a requested service (such as CRL) is not available. * It redirects the user to the master. - * + * * @version $Revision$, $Date$ */ public class CloneRedirect extends CMSServlet { @@ -69,7 +69,7 @@ public class CloneRedirect extends CMSServlet { /** * Initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java index ced92ba85..aa48a7ca9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Face-to-face' certificate enrollment. - * + * * @version $Revision$, $Date$ */ public class DirAuthServlet extends CMSServlet { @@ -64,7 +64,7 @@ public class DirAuthServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -83,7 +83,7 @@ public class DirAuthServlet extends CMSServlet { /** * Process the HTTP request. This servlet reads configuration information * from the hashDirEnrollment configuration substore - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java index a5cdc98e8..46863c098 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * For Face-to-face enrollment, disable EE enrollment feature - * + * * @version $Revision$, $Date$ * @see com.netscape.cms.servlet.cert.EnableEnrollResult */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java index 5a1e4ed65..105fc66a1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -69,10 +69,10 @@ import com.netscape.cmsutil.util.Utils; /** * Display detailed information about a certificate - * + * * The template 'displayBySerial.template' is used to * render the response for this servlet. - * + * * @version $Revision$, $Date$ */ public class DisplayBySerial extends CMSServlet { @@ -98,7 +98,7 @@ public class DisplayBySerial extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -118,7 +118,7 @@ public class DisplayBySerial extends CMSServlet { if (mOutputTemplatePath != null) mForm1Path = mOutputTemplatePath; - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); } @@ -353,11 +353,11 @@ public class DisplayBySerial extends CMSServlet { /* String scheme = req.getScheme(); - if (scheme.equals("http") && connectionIsSSL(req)) + if (scheme.equals("http") && connectionIsSSL(req)) scheme = "https"; String requestURI = req.getRequestURI(); int i = requestURI.indexOf('?'); - String newRequestURI = + String newRequestURI = (i > -1)? requestURI.substring(0, i): requestURI; header.addStringValue("serviceURL", scheme +"://"+ req.getServerName() + ":"+ @@ -384,7 +384,7 @@ public class DisplayBySerial extends CMSServlet { /* String userAgent = req.getHeader("user-agent"); - String agent = + String agent = (userAgent != null)? UserInfo.getUserAgent(userAgent): ""; */ // Now formulate a PKCS#7 blob @@ -428,7 +428,7 @@ public class DisplayBySerial extends CMSServlet { p7Str = Utils.base64encode(p7Bytes); header.addStringValue("pkcs7ChainBase64", p7Str); } catch (Exception e) { - //p7Str = "PKCS#7 B64 Encoding error - " + e.toString() + //p7Str = "PKCS#7 B64 Encoding error - " + e.toString() //+ "; Please contact your administrator"; log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERROR_FORMING_PKCS7_1", e.toString())); diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java index ad503272a..61a606cae 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -52,7 +52,7 @@ import com.netscape.cmsutil.util.Utils; /** * Decode the CRL and display it to the requester. - * + * * @version $Revision$, $Date$ */ public class DisplayCRL extends CMSServlet { @@ -79,7 +79,7 @@ public class DisplayCRL extends CMSServlet { /** * Initialize the servlet. This servlet uses the 'displayCRL.template' file to * to render the response to the client. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class DisplayCRL extends CMSServlet { * <li>http.param pageStart which page to start displaying from * <li>http.param pageSize number of entries to show per page * </ul> - * + * * @param cmsReq the Request to service. */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java index 99082d4c5..e65082f4d 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Servlet to report the status, ie, the agent-initiated user * enrollment is enabled or disabled. - * + * * @version $Revision$, $Date$ */ public class DisplayHashUserEnroll extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java index 1594c5323..afd958abf 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -73,7 +73,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Revoke a Certificate - * + * * @version $Revision$, $Date$ */ public class DoRevoke extends CMSServlet { @@ -109,7 +109,7 @@ public class DoRevoke extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "revocationResult.template" to render the result - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -144,18 +144,18 @@ public class DoRevoke extends CMSServlet { /** * Serves HTTP request. The http parameters used by this request are as follows: - * + * * <pre> * serialNumber Serial number of certificate to revoke (in HEX) * revocationReason Revocation reason (Described below) * totalRecordCount [number] * verifiedRecordCount [number] * invalidityDate [number of seconds in Jan 1,1970] - * + * * </pre> - * + * * revocationReason can be one of these values: - * + * * <pre> * 0 = Unspecified (default) * 1 = Key compromised @@ -375,21 +375,21 @@ public class DoRevoke extends CMSServlet { /** * Process cert status change request * <P> - * + * * (Certificate Request - either an "agent" cert status change request, or an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - either an "agent" cert status change request, or an "EE" cert status change * request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -535,7 +535,7 @@ public class DoRevoke extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; @@ -564,7 +564,7 @@ public class DoRevoke extends CMSServlet { boolean addToList = false; for (int j = 0; j < serialNumbers.size(); j++) { - //xxxxx serial number in decimal? + //xxxxx serial number in decimal? if (certs[i].getSerialNumber().toString().equals((String) serialNumbers.elementAt(j)) && eeSubjectDN != null && eeSubjectDN.equals(certs[i].getSubjectDN().toString())) { addToList = true; @@ -707,7 +707,7 @@ public class DoRevoke extends CMSServlet { // the request is complete if ((stat == RequestStatus.COMPLETE) || ((type.equals(IRequest.CLA_CERT4CRL_REQUEST)) && (stat == RequestStatus.SVC_PENDING))) { - // audit log the error + // audit log the error Integer result = revReq.getExtDataInInteger(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { @@ -832,7 +832,7 @@ public class DoRevoke extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -906,7 +906,7 @@ public class DoRevoke extends CMSServlet { header.addIntegerValue("certsUpdated", certsUpdated); header.addIntegerValue("certsToUpdate", certsToUpdate); - // add crl publishing status. + // add crl publishing status. String publError = revReq.getExtDataInString(IRequest.CRL_PUBLISH_ERROR); @@ -1110,11 +1110,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -1140,11 +1140,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -1164,7 +1164,7 @@ public class DoRevoke extends CMSServlet { BigInteger value = BigInteger.ONE.negate(); - //try int + //try int try { value = new BigInteger(serialNumber, 10); } catch (NumberFormatException e) { @@ -1193,11 +1193,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index c4603dd51..83cefa6f6 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -64,7 +64,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Revoke a Certificate - * + * * @version $Revision$, $Date$ */ public class DoRevokeTPS extends CMSServlet { @@ -99,7 +99,7 @@ public class DoRevokeTPS extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "revocationResult.template" to render the result - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -129,18 +129,18 @@ public class DoRevokeTPS extends CMSServlet { /** * Serves HTTP request. The http parameters used by this request are as follows: - * + * * <pre> * serialNumber Serial number of certificate to revoke (in HEX) * revocationReason Revocation reason (Described below) * totalRecordCount [number] * verifiedRecordCount [number] * invalidityDate [number of seconds in Jan 1,1970] - * + * * </pre> - * + * * revocationReason can be one of these values: - * + * * <pre> * 0 = Unspecified (default) * 1 = Key compromised @@ -278,21 +278,21 @@ public class DoRevokeTPS extends CMSServlet { /** * Process cert status change request * <P> - * + * * (Certificate Request - either an "agent" cert status change request, or an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - either an "agent" cert status change request, or an "EE" cert status change * request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -510,7 +510,7 @@ public class DoRevokeTPS extends CMSServlet { // the request is complete if ((stat == RequestStatus.COMPLETE) || ((type.equals(IRequest.CLA_CERT4CRL_REQUEST)) && (stat == RequestStatus.SVC_PENDING))) { - // audit log the error + // audit log the error Integer result = revReq.getExtDataInInteger(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { @@ -629,7 +629,7 @@ public class DoRevokeTPS extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -682,7 +682,7 @@ public class DoRevokeTPS extends CMSServlet { if (mPublisherProcessor != null && mPublisherProcessor.ldapEnabled()) { header.addStringValue("dirEnabled", "yes"); - // add crl publishing status. + // add crl publishing status. String publError = revReq.getExtDataInString(IRequest.CRL_PUBLISH_ERROR); @@ -851,11 +851,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -881,11 +881,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -912,11 +912,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java index c6b6065b4..cd9a0196b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Unrevoke' a certificate. (For certificates that are on-hold only, * take them off-hold) - * + * * @version $Revision$, $Date$ */ public class DoUnrevoke extends CMSServlet { @@ -89,7 +89,7 @@ public class DoUnrevoke extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -115,7 +115,7 @@ public class DoUnrevoke extends CMSServlet { * with a revovcation reason 'on hold' for this operation to succeed. The serial number may be expressed as a hex * number by prefixing '0x' to the serialNumber string * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -214,20 +214,20 @@ public class DoUnrevoke extends CMSServlet { /** * Process X509 cert status change request * <P> - * + * * (Certificate Request - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * (Certificate Request Processed - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (taken off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param serialNumbers the serial number of the certificate @@ -409,7 +409,7 @@ public class DoUnrevoke extends CMSServlet { } } - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -610,11 +610,11 @@ public class DoUnrevoke extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -640,11 +640,11 @@ public class DoUnrevoke extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index 5d096aff3..e56eece2c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -55,7 +55,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Unrevoke' a certificate. (For certificates that are on-hold only, * take them off-hold) - * + * * @version $Revision$, $Date$ */ public class DoUnrevokeTPS extends CMSServlet { @@ -88,7 +88,7 @@ public class DoUnrevokeTPS extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -113,7 +113,7 @@ public class DoUnrevokeTPS extends CMSServlet { * with a revovcation reason 'on hold' for this operation to succeed. The serial number may be expressed as a hex * number by prefixing '0x' to the serialNumber string * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -129,7 +129,7 @@ public class DoUnrevokeTPS extends CMSServlet { try { form = getTemplate(mFormPath, req, locale); } catch (IOException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", e.toString())); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); @@ -217,20 +217,20 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Process X509 cert status change request * <P> - * + * * (Certificate Request - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * (Certificate Request Processed - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (taken off-hold) * </ul> - * + * * @param serialNumbers the serial number of the certificate * @param req HTTP servlet request * @param resp HTTP servlet response @@ -365,7 +365,7 @@ public class DoUnrevokeTPS extends CMSServlet { } } - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -557,11 +557,11 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -587,11 +587,11 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java index 2a143b668..cbb233251 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * For Face-to-face enrollment, enable EE enrollment feature - * + * * @version $Revision$, $Date$ * @see com.netscape.cms.servlet.cert.DisableEnrollResult */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java index a73a8146c..50eaaa94b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -77,7 +77,7 @@ import com.netscape.cmsutil.util.Utils; /** * Submit a Certificate Enrollment request - * + * * @version $Revision$, $Date$ */ public class EnrollServlet extends CMSServlet { @@ -91,7 +91,7 @@ public class EnrollServlet extends CMSServlet { // enrollment templates. public static final String ENROLL_SUCCESS_TEMPLATE = "EnrollSuccess.template"; - // http params + // http params public static final String OLD_CERT_TYPE = "csrCertType"; public static final String CERT_TYPE = "certType"; // same as in ConfigConstant.java @@ -171,7 +171,7 @@ public class EnrollServlet extends CMSServlet { * <ul> * <li>CMSServlet.PROP_ID - ID for signed audit log messages * <li>CMSServlet.PROP_SUCCESS_TEMPLATE - success template file - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -288,7 +288,7 @@ public class EnrollServlet extends CMSServlet { init_testbed_hack(mConfig); } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -304,7 +304,7 @@ public class EnrollServlet extends CMSServlet { * Getter method to see if Proof of Posession checking is enabled. * this value is set in the CMS.cfg filem with the parameter * "enrollment.enforcePop". It defaults to false - * + * * @return true if user is required to Prove that they possess the * private key corresponding to the public key in the certificate * request they are submitting @@ -323,7 +323,7 @@ public class EnrollServlet extends CMSServlet { * <LI>The request is preprocessed, then processed further in one of the cert request processor classes: * KeyGenProcessor, PKCS10Processor, CMCProcessor, CRMFProcessor * </UL> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -693,23 +693,23 @@ public class EnrollServlet extends CMSServlet { /** * Process X509 certificate enrollment request * <P> - * + * * (Certificate Request - either an "admin" cert request for an admin certificate, an "agent" cert request for * "bulk enrollment", or an "EE" standard cert request) * <P> - * + * * (Certificate Request Processed - either an automated "admin" non-profile based CA admin cert acceptance, an * automated "admin" non-profile based CA admin cert rejection, an automated "EE" non-profile based cert acceptance, * or an automated "EE" non-profile based cert rejection) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_NON_PROFILE_CERT_REQUEST used when a non-profile cert request is made * (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param cmsReq a certificate enrollment request * @exception EBaseException an error has occurred */ @@ -806,7 +806,7 @@ public class EnrollServlet extends CMSServlet { * === certAuth based enroll === * "certAuthEnroll" is on. * "certauthEnrollType can be one of the three: - * single - it's for single cert enrollment + * single - it's for single cert enrollment * dual - it's for dual certs enrollment * encryption - getting the encryption cert only via * authentication of the signing cert @@ -938,8 +938,8 @@ public class EnrollServlet extends CMSServlet { if (authToken != null) { authMgr = authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); - // don't store agent token in request. - // agent currently used for bulk issuance. + // don't store agent token in request. + // agent currently used for bulk issuance. // if (!authMgr.equals(AuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { log(ILogger.LL_INFO, "Enrollment request was authenticated by " + @@ -1355,9 +1355,9 @@ public class EnrollServlet extends CMSServlet { // ensure that any low-level exceptions are reported // to the signed audit log and stored as failures try { - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); - // process result. + // process result. // render OLD_CERT_TYPE's response differently, we // do not want any javascript in HTML, and need to @@ -1693,11 +1693,11 @@ public class EnrollServlet extends CMSServlet { out.println("</HTML>"); } - // XXX ALERT !! - // Remove the following and calls to them when we bundle a cartman - // later than alpha1. - // These are here to cover up problem in cartman where the - // key usage extension always ends up being digital signature only + // XXX ALERT !! + // Remove the following and calls to them when we bundle a cartman + // later than alpha1. + // These are here to cover up problem in cartman where the + // key usage extension always ends up being digital signature only // and for rsa-ex ends up having no bits set. private boolean mIsTestBed = false; @@ -1709,11 +1709,11 @@ public class EnrollServlet extends CMSServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param x509cert an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java index 663397f54..bf985c93e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -59,7 +59,7 @@ import com.netscape.cmsutil.crypto.CryptoUtil; /** * Retrieve certificate by serial number. - * + * * @version $Revision$, $Date$ */ public class GetBySerial extends CMSServlet { @@ -85,7 +85,7 @@ public class GetBySerial extends CMSServlet { * Initialize the servlet. This servlet uses the template file * "ImportCert.template" to import the cert to the users browser, * if that is what the user requested - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -101,7 +101,7 @@ public class GetBySerial extends CMSServlet { } mImportTemplateFiller = new ImportCertsTemplateFiller(); - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); @@ -118,7 +118,7 @@ public class GetBySerial extends CMSServlet { * <ul> * <li>http.param serialNumber serial number of certificate in HEX * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -279,7 +279,7 @@ public class GetBySerial extends CMSServlet { cmsReq.setStatus(CMSRequest.SUCCESS); // XXX follow request in cert record to set certtype, which will - // import cert only if it's client. For now assume "client" if + // import cert only if it's client. For now assume "client" if // someone clicked to import this cert. cmsReq.getHttpParams().set("certType", "client"); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java index fe55f335b..da4959268 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java @@ -50,7 +50,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve the Certificates comprising the CA Chain for this CA. - * + * * @version $Revision$, $Date$ */ public class GetCAChain extends CMSServlet { @@ -67,7 +67,7 @@ public class GetCAChain extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -85,7 +85,7 @@ public class GetCAChain extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index 4c8661359..e9e3c809a 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Utils; /** * Retrieve CRL for a Certificate Authority - * + * * @version $Revision$, $Date$ */ public class GetCRL extends CMSServlet { @@ -67,7 +67,7 @@ public class GetCRL extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -81,7 +81,7 @@ public class GetCRL extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information * @see DisplayCRL#process */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java index 71b0004cd..ce60fabc1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -54,7 +54,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * Gets a issued certificate from a request id. - * + * * @version $Revision$, $Date$ */ public class GetCertFromRequest extends CMSServlet { @@ -82,7 +82,7 @@ public class GetCertFromRequest extends CMSServlet { /** * initialize the servlet. This servlet uses the template files * "displayCertFromRequest.template" and "ImportCert.template" - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -134,7 +134,7 @@ public class GetCertFromRequest extends CMSServlet { * <ul> * <li>http.param requestId The request ID to search on * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -206,7 +206,7 @@ public class GetCertFromRequest extends CMSServlet { } } - if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || + if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || (r.getRequestType().equals(IRequest.RENEWAL_REQUEST)))) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_REQUEST_NOT_ENROLLMENT_1", requestId)); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java index d0dfb8f9a..99bdf2486 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Servlet to get the enrollment status, enable or disable. - * + * * @version $Revision$, $Date$ */ public class GetEnableStatus extends CMSServlet { @@ -63,7 +63,7 @@ public class GetEnableStatus extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -83,7 +83,7 @@ public class GetEnableStatus extends CMSServlet { * <ul> * <li>http.param * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java index 6af5c0c39..30f0b0c40 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java @@ -50,7 +50,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Get detailed information about CA CRL processing - * + * * @version $Revision$, $Date$ */ public class GetInfo extends CMSServlet { @@ -74,7 +74,7 @@ public class GetInfo extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -93,7 +93,7 @@ public class GetInfo extends CMSServlet { * <ul> * <li>http.param template filename of template to use to render the result * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java index 5e6207e1a..0d4b52672 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -85,7 +85,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * performs face-to-face enrollment. - * + * * @version $Revision$, $Date$ */ public class HashEnrollServlet extends CMSServlet { @@ -99,7 +99,7 @@ public class HashEnrollServlet extends CMSServlet { // enrollment templates. public static final String ENROLL_SUCCESS_TEMPLATE = "/ra/HashEnrollSuccess.template"; - // http params + // http params public static final String OLD_CERT_TYPE = "csrCertType"; public static final String CERT_TYPE = "certType"; // same as in ConfigConstant.java @@ -130,7 +130,7 @@ public class HashEnrollServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -157,7 +157,7 @@ public class HashEnrollServlet extends CMSServlet { init_testbed_hack(mConfig); } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); } @@ -165,7 +165,7 @@ public class HashEnrollServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -281,7 +281,7 @@ public class HashEnrollServlet extends CMSServlet { * === certAuth based enroll === * "certAuthEnroll" is on. * "certauthEnrollType can be one of the three: - * single - it's for single cert enrollment + * single - it's for single cert enrollment * dual - it's for dual certs enrollment * encryption - getting the encryption cert only via * authentication of the signing cert @@ -349,8 +349,8 @@ public class HashEnrollServlet extends CMSServlet { String certBasedOldSubjectDN = null; BigInteger certBasedOldSerialNum = null; - // check if request was authenticated, if so set authtoken & certInfo. - // also if authenticated, take certInfo from authToken. + // check if request was authenticated, if so set authtoken & certInfo. + // also if authenticated, take certInfo from authToken. X509CertInfo certInfo = null; if (certAuthEnroll == true) { @@ -399,14 +399,14 @@ public class HashEnrollServlet extends CMSServlet { } else { authMgr = authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); - // don't store agent token in request. - // agent currently used for bulk issuance. + // don't store agent token in request. + // agent currently used for bulk issuance. // if (!authMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { log(ILogger.LL_INFO, "Enrollment request was authenticated by " + authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME)); fillCertInfoFromAuthToken(certInfo, authToken); - // save authtoken attrs to request directly (for policy use) + // save authtoken attrs to request directly (for policy use) saveAuthToken(authToken, req); // req.set(IRequest.AUTH_TOKEN, authToken); // } @@ -606,9 +606,9 @@ public class HashEnrollServlet extends CMSServlet { req.setExtData(CHALLENGE_PASSWORD, pwd); } - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); - // process result. + // process result. // render OLD_CERT_TYPE's response differently, we // dont want any javascript in HTML, and need to @@ -628,7 +628,7 @@ public class HashEnrollServlet extends CMSServlet { String agentID = null; if (!authMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { - // request is from eegateway, so fromUser. + // request is from eegateway, so fromUser. initiative = AuditFormat.FROMUSER; } else { agentID = authToken.getInString("userid"); @@ -640,7 +640,7 @@ public class HashEnrollServlet extends CMSServlet { if (status != RequestStatus.COMPLETE) { cmsReq.setIRequestStatus(); // set status acc. to IRequest status. - // audit log the status + // audit log the status try { if (status == RequestStatus.REJECTED) { Vector<String> messages = req.getExtDataInStringVector(IRequest.ERRORS); @@ -680,7 +680,7 @@ public class HashEnrollServlet extends CMSServlet { certInfo.get(X509CertInfo.SUBJECT), "" } ); } - } else { // other imcomplete status + } else { // other imcomplete status mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -802,7 +802,7 @@ public class HashEnrollServlet extends CMSServlet { throws EBaseException { // override subject, validity and extensions from auth token // CA determines algorithm, version and issuer. - // take key from keygen, cmc, pkcs10 or crmf. + // take key from keygen, cmc, pkcs10 or crmf. // subject name. try { @@ -953,14 +953,14 @@ public class HashEnrollServlet extends CMSServlet { new CertificateSubjectName(subject)); } else if (authToken == null || authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT) == null) { - // No subject name - error! + // No subject name - error! log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_MISSING_SUBJECT_NAME_FROM_AUTHTOKEN")); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_MISSING_SUBJECT_NAME_FROM_AUTHTOKEN")); } - // get extensions + // get extensions CertificateExtensions extensions = null; try { @@ -972,8 +972,8 @@ public class HashEnrollServlet extends CMSServlet { extensions = null; } if (certTemplate.hasExtensions()) { - // put each extension from CRMF into CertInfo. - // index by extension name, consistent with + // put each extension from CRMF into CertInfo. + // index by extension name, consistent with // CertificateExtensions.parseExtension() method. if (extensions == null) extensions = new CertificateExtensions(); @@ -1013,7 +1013,7 @@ public class HashEnrollServlet extends CMSServlet { } - // Added a new configuration parameter + // Added a new configuration parameter // eeGateway.Enrollment.authTokenOverride=[true|false] // By default, it is set to true. In most // of the case, administrator would want @@ -1022,7 +1022,7 @@ public class HashEnrollServlet extends CMSServlet { // -- CRMFfillCert if (authToken != null && authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT) != null) { - // if authenticated override subect name, validity and + // if authenticated override subect name, validity and // extensions if any from authtoken. fillCertInfoFromAuthToken(certInfo, authToken); } @@ -1161,11 +1161,11 @@ public class HashEnrollServlet extends CMSServlet { out.println("</HTML>"); } - // XXX ALERT !! - // Remove the following and calls to them when we bundle a cartman - // later than alpha1. - // These are here to cover up problem in cartman where the - // key usage extension always ends up being digital signature only + // XXX ALERT !! + // Remove the following and calls to them when we bundle a cartman + // later than alpha1. + // These are here to cover up problem in cartman where the + // key usage extension always ends up being digital signature only // and for rsa-ex ends up having no bits set. private boolean mIsTestBed = false; @@ -1196,7 +1196,7 @@ public class HashEnrollServlet extends CMSServlet { exts.get(KeyUsageExtension.NAME); if (ext == null) - // should not happen + // should not happen continue; byte[] value = ext.getExtensionValue(); @@ -1207,7 +1207,7 @@ public class HashEnrollServlet extends CMSServlet { newvalue[1] = 0x03; newvalue[2] = 0x07; newvalue[3] = value[3]; - // force encryption certs to have digitial signature + // force encryption certs to have digitial signature // set too so smime can find the cert for encryption. if (value[3] == 0x20) { @@ -1229,10 +1229,10 @@ public class HashEnrollServlet extends CMSServlet { exts.set(KeyUsageExtension.NAME, newext); } } catch (IOException e) { - // should never happen + // should never happen continue; } catch (CertificateException e) { - // should never happen + // should never happen continue; } } diff --git a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java index 2f551d3f5..016d5a124 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java @@ -60,24 +60,24 @@ import com.netscape.cmsutil.util.Utils; /** * Set up HTTP response to import certificate into browsers - * + * * The result must have been populate with the set of certificates * to return. - * + * * <pre> * inputs: certtype. - * outputs: + * outputs: * - cert type from http input (if any) - * - CA chain + * - CA chain * - authority name (RM, CM, DRM) * - scheme:host:port of server. - * array of one or more + * array of one or more * - cert serial number * - cert pretty print * - cert in base 64 encoding. * - cmmf blob to import * </pre> - * + * * @version $Revision$, $Date$ */ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { @@ -118,7 +118,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams params = new CMSTemplateParams(header, fixed); - // set host name and port. + // set host name and port. HttpServletRequest httpReq = cmsReq.getHttpReq(); String host = httpReq.getServerName(); int port = httpReq.getServerPort(); @@ -169,14 +169,14 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { if (replyTo != null) fixed.set("replyTo", replyTo); - // set user + CA cert chain and pkcs7 for MSIE. + // set user + CA cert chain and pkcs7 for MSIE. X509CertImpl[] userChain = new X509CertImpl[cacerts.length + 1]; int m = 1, n = 0; for (; n < cacerts.length; m++, n++) userChain[m] = (X509CertImpl) cacerts[n]; - // certs. + // certs. X509CertImpl[] certs = (X509CertImpl[]) cmsReq.getResult(); // expose CRMF request id @@ -190,7 +190,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { fixed.set(CRMF_REQID, crmfReqId); } - // set CA certs in cmmf, initialize CertRepContent + // set CA certs in cmmf, initialize CertRepContent // note cartman can't trust ca certs yet but it'll import them. // also set cert nickname for cartman. CertRepContent certRepContent = null; @@ -212,7 +212,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { fixed.set(CERT_NICKNAME, certnickname); } - // make pkcs7 for MSIE + // make pkcs7 for MSIE if (CMSServlet.clientIsMSIE(cmsReq.getHttpReq()) && (certType == null || certType.equals("client"))) { userChain[0] = certs[0]; @@ -308,7 +308,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { p7Str = CMS.BtoA(p7Bytes); repeat.addStringValue("pkcs7ChainBase64", p7Str); } catch (Exception ex) { - //p7Str = "PKCS#7 B64 Encoding error - " + ex.toString() + //p7Str = "PKCS#7 B64 Encoding error - " + ex.toString() //+ "; Please contact your administrator"; throw new ECMSGWException( CMS.getUserMessage("CMS_GW_FORMING_PKCS7_ERROR")); diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java index b93a82fb8..4185113f4 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve a paged list of certs matching the specified query - * + * * @version $Revision$, $Date$ */ public class ListCerts extends CMSServlet { @@ -93,7 +93,7 @@ public class ListCerts extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "queryCert.template" to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -400,7 +400,7 @@ public class ListCerts extends CMSServlet { int toCurIndex = 0; if (!serialToVal.equals(MINUS_ONE)) { - // if user specify a range, we need to + // if user specify a range, we need to // calculate the totalRecordCount tolist = (ICertRecordList) mCertDB.findCertRecordsInList( filter, @@ -456,7 +456,7 @@ public class ListCerts extends CMSServlet { } // DS has a problem where last record will be returned - // even though the filter is not matched. + // even though the filter is not matched. /*cfu - is this necessary? it breaks when paging up if (curSerial.compareTo(sentinel) == -1) { com.netscape.certsrv.apps.CMS.debug("curSerial compare sentinel -1 break..."); diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java index ac531caca..7f626a83f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -52,7 +52,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Provide statistical queries of request and certificate records. - * + * * @version $Revision$, $Date$ */ public class Monitor extends CMSServlet { @@ -82,7 +82,7 @@ public class Monitor extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'monitor.template' to render the response. - * + * * @param sc servlet configuration, read from the web.xml file */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java index 0f21e1921..5b9cd7741 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Specify the RevocationReason when revoking a certificate - * + * * @version $Revision$, $Date$ */ public class ReasonToRevoke extends CMSServlet { @@ -75,7 +75,7 @@ public class ReasonToRevoke extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'reasonToRevoke.template' to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -112,7 +112,7 @@ public class ReasonToRevoke extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java index 478df161d..2783656ae 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -53,7 +53,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Allow agent to turn on/off authentication managers - * + * * @version $Revision$, $Date$ */ public class RemoteAuthConfig extends CMSServlet { @@ -85,7 +85,7 @@ public class RemoteAuthConfig extends CMSServlet { /** * Initializes the servlet. - * + * * Presence of "auths.enableRemoteConfiguration=true" in CMS.cfg * enables remote configuration for authentication plugins. * List of remotely set instances can be found in CMS.cfg diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java index 223121577..3b2a8c3e9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * Certificate Renewal - * + * * @version $Revision$, $Date$ */ public class RenewalServlet extends CMSServlet { @@ -70,12 +70,12 @@ public class RenewalServlet extends CMSServlet { // renewal templates. public static final String RENEWAL_SUCCESS_TEMPLATE = "RenewalSuccess.template"; - // http params + // http params public static final String CERT_TYPE = "certType"; public static final String SERIAL_NO = "serialNo"; - // XXX can't do pkcs10 cause it's got no serial no. + // XXX can't do pkcs10 cause it's got no serial no. // (unless put serial no in pki attributes) - // public static final String PKCS10 = "pkcs10"; + // public static final String PKCS10 = "pkcs10"; public static final String IMPORT_CERT = "importCert"; private String mRenewalSuccessTemplate = RENEWAL_SUCCESS_TEMPLATE; @@ -89,7 +89,7 @@ public class RenewalServlet extends CMSServlet { * initialize the servlet. This servlet makes use of the * template file "RenewalSuccess.template" to render the * response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -111,7 +111,7 @@ public class RenewalServlet extends CMSServlet { mRenewalSuccessFiller = filler; } } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -121,7 +121,7 @@ public class RenewalServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -130,12 +130,12 @@ public class RenewalServlet extends CMSServlet { IArgBlock httpParams = cmsReq.getHttpParams(); HttpServletRequest httpReq = cmsReq.getHttpReq(); - // renewal requires either: - // - coming from ee: - // - old cert from ssl client auth + // renewal requires either: + // - coming from ee: + // - old cert from ssl client auth // - old certs from auth manager - // - coming from agent or trusted RA: - // - serial no of cert to be renewed. + // - coming from agent or trusted RA: + // - serial no of cert to be renewed. BigInteger old_serial_no = null; X509CertImpl old_cert = null; @@ -171,7 +171,7 @@ public class RenewalServlet extends CMSServlet { authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); } - // coming from agent + // coming from agent if (mAuthMgr != null && mAuthMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { X509Certificate[] cert = new X509Certificate[1]; @@ -196,7 +196,7 @@ public class RenewalServlet extends CMSServlet { } } // coming from client else { - // from auth manager + // from auth manager X509CertImpl[] cert = new X509CertImpl[1]; old_serial_no = getCertFromAuthMgr(authToken, cert); @@ -215,15 +215,15 @@ public class RenewalServlet extends CMSServlet { req.setExtData(IRequest.OLD_CERTS, new X509CertImpl[] { old_cert } ); - // create new certinfo from old_cert contents. + // create new certinfo from old_cert contents. X509CertInfo old_certInfo = (X509CertInfo) ((X509CertImpl) old_cert).get( X509CertImpl.NAME + "." + X509CertImpl.INFO); new_certInfo = new X509CertInfo(old_certInfo.getEncodedInfo()); } else { - // if no old cert (came from RA agent) create new cert info - // (serializable) to pass through policies. And set the old + // if no old cert (came from RA agent) create new cert info + // (serializable) to pass through policies. And set the old // serial number to pick up. new_certInfo = new CertInfo(); new_certInfo.set(X509CertInfo.SERIAL_NUMBER, @@ -256,7 +256,7 @@ public class RenewalServlet extends CMSServlet { saveAuthToken(authToken, req); cmsReq.setIRequest(req); - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); // for audit log @@ -271,7 +271,7 @@ public class RenewalServlet extends CMSServlet { initiative = AuditFormat.FROMUSER; } - // check resulting status + // check resulting status RequestStatus status = req.getRequestStatus(); if (status != RequestStatus.COMPLETE) { @@ -320,7 +320,7 @@ public class RenewalServlet extends CMSServlet { "" } ); } - } else { // other imcomplete status + } else { // other imcomplete status mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -338,7 +338,7 @@ public class RenewalServlet extends CMSServlet { return; } - // service error + // service error Integer result = req.getExtDataInInteger(IRequest.RESULT); CMS.debug( @@ -413,8 +413,8 @@ public class RenewalServlet extends CMSServlet { ); cmsReq.setStatus(CMSRequest.SUCCESS); - // check if cert should be imported. - // browser must have input type set to nav or cartman since + // check if cert should be imported. + // browser must have input type set to nav or cartman since // there's no other way to tell IArgBlock httpParams = cmsReq.getHttpParams(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java index 22aa29eda..2c1709145 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -59,7 +59,7 @@ import com.netscape.cmsutil.util.Utils; /** * Perform the first step in revoking a certificate - * + * * @version $Revision$, $Date$ */ public class RevocationServlet extends CMSServlet { @@ -71,11 +71,11 @@ public class RevocationServlet extends CMSServlet { // revocation templates. private final static String TPL_FILE = "reasonToRevoke.template"; - // http params + // http params public static final String SERIAL_NO = "serialNo"; - // XXX can't do pkcs10 cause it's got no serial no. + // XXX can't do pkcs10 cause it's got no serial no. // (unless put serial no in pki attributes) - // public static final String PKCS10 = "pkcs10"; + // public static final String PKCS10 = "pkcs10"; public static final String REASON_CODE = "reasonCode"; private String mFormPath = null; @@ -92,7 +92,7 @@ public class RevocationServlet extends CMSServlet { * initialize the servlet. This servlet uses * the template file "reasonToRevoke.template" to render the * result. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -131,7 +131,7 @@ public class RevocationServlet extends CMSServlet { * actually perform the certificate revocation. This is the first * step in the multi-step revocation process. (the next step is * in the ReasonToRevoke servlet. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -140,12 +140,12 @@ public class RevocationServlet extends CMSServlet { HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); - // revocation requires either: - // - coming from ee: - // - old cert from ssl client auth + // revocation requires either: + // - coming from ee: + // - old cert from ssl client auth // - old certs from auth manager - // - coming from agent or trusted RA: - // - serial no of cert to be revoked. + // - coming from agent or trusted RA: + // - serial no of cert to be revoked. BigInteger old_serial_no = null; X509CertImpl old_cert = null; @@ -186,7 +186,7 @@ public class RevocationServlet extends CMSServlet { return; } - // coming from agent + // coming from agent if (mAuthMgr != null && mAuthMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { X509Certificate[] cert = new X509Certificate[1]; @@ -194,7 +194,7 @@ public class RevocationServlet extends CMSServlet { old_cert = (X509CertImpl) cert[0]; } // coming from client else { - // from auth manager + // from auth manager X509CertImpl[] cert = new X509CertImpl[1]; old_serial_no = getCertFromAuthMgr(authToken, cert); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java index cfc562d71..00941776c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; * - cert pretty print * - cert in base 64 encoding. * - cmmf blob to import - * + * * @version $Revision$, $Date$ */ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { @@ -65,7 +65,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams params = new CMSTemplateParams(null, fixed); - // set host name and port. + // set host name and port. HttpServletRequest httpReq = cmsReq.getHttpReq(); String host = httpReq.getServerName(); int port = httpReq.getServerPort(); @@ -84,7 +84,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { RevokedCertImpl[] revoked = (RevokedCertImpl[]) cmsReq.getResult(); - // revoked certs. + // revoked certs. for (int i = 0; i < revoked.length; i++) { IArgBlock repeat = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java index 3602515c9..375265331 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -62,7 +62,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Search for certificates matching complex query filter - * + * * @version $Revision$, $Date$ */ public class SrchCerts extends CMSServlet { @@ -96,7 +96,7 @@ public class SrchCerts extends CMSServlet { /** * initialize the servlet. This servlet uses srchCert.template * to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java index c0298d1e7..6be6d506c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -61,7 +61,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Force the CRL to be updated now. - * + * * @version $Revision$, $Date$ */ public class UpdateCRL extends CMSServlet { @@ -109,7 +109,7 @@ public class UpdateCRL extends CMSServlet { * <li>http.param clearCRLCache true/false - should the CRL cache cleared before the CRL is generated? * <li>http.param crlIssuingPoint the CRL Issuing Point to Update * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java index 707e7ff5f..df0277b54 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java @@ -59,7 +59,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Update the configured LDAP server with specified objects - * + * * @version $Revision$, $Date$ */ public class UpdateDir extends CMSServlet { @@ -128,7 +128,7 @@ public class UpdateDir extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java index 14c537098..30623ce61 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java +++ b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElement; /** * @author alee - * + * */ @XmlRootElement(name = "CertificateData") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 90a48cb4e..421381441 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -126,12 +126,12 @@ import com.netscape.cmsutil.util.Utils; * This servlet deals with PKCS#10-based certificate requests from * CRS, now called SCEP, and defined at: * http://search.ietf.org/internet-drafts/draft-nourse-scep-02.txt - * + * * The router is hardcoded to look for the http://host:80/cgi-bin/pkiclient.exe - * + * * The HTTP parameters are 'operation' and 'message' * operation can be either 'GetCACert' or 'PKIOperation' - * + * * @version $Revision$, $Date$ */ public class CRSEnrollment extends HttpServlet { @@ -319,13 +319,13 @@ public class CRSEnrollment extends HttpServlet { } /** - * + * * Service a CRS Request. It all starts here. This is where the message from the * router is processed - * + * * @param httpReq The HttpServletRequest. * @param httpResp The HttpServletResponse. - * + * */ public void service(HttpServletRequest httpReq, HttpServletResponse httpResp) @@ -500,7 +500,7 @@ public class CRSEnrollment extends HttpServlet { * ANY cert = new ANY(chain[i].getEncoded()); * certs.addElement(cert); * } - * + * * SignedData crsd = new SignedData( * new SET(), // empty set of digestAlgorithmID's * new ContentInfo( @@ -510,14 +510,14 @@ public class CRSEnrollment extends HttpServlet { * null, // no CRL's * new SET() // empty SignerInfos * ); - * + * * ContentInfo wrap = new ContentInfo(ContentInfo.SIGNED_DATA, crsd); - * + * * ByteArrayOutputStream baos = new ByteArrayOutputStream(); * wrap.encode(baos); - * + * * bytes = baos.toByteArray(); - * + * * httpResp.setContentType("application/x-x509-ca-ra-cert"); *****/ @@ -902,17 +902,17 @@ public class CRSEnrollment extends HttpServlet { CMS.debug("Processing PKCSReq"); try { // Check if there is an existing request. If this returns non-null, - // then the request is 'active' (either pending or completed) in + // then the request is 'active' (either pending or completed) in // which case, we compare the hash of the new request to the hash of the - // one in the queue - if they are the same, I return the state of the + // one in the queue - if they are the same, I return the state of the // original request - as if it was 'getCertInitial' message. // If the hashes are different, then the user attempted to enroll - // for a new request with the same txid, which is not allowed - + // for a new request with the same txid, which is not allowed - // so we return 'failure'. IRequest cmsRequest = findRequestByTransactionID(req.getTransactionID(), true); - // If there was no request (with a cert) with this transaction ID, + // If there was no request (with a cert) with this transaction ID, // process it as a new request cert = handlePKCSReq(httpReq, cmsRequest, req, crsResp, cx); @@ -1006,15 +1006,15 @@ public class CRSEnrollment extends HttpServlet { * Called if the router is requesting us to send it its certificate * Examine request queue for a request matching the transaction ID. * Ignore any rejected or cancelled requests. - * + * * If a request is found in the pending state, the response should be * 'pending' - * + * * If a request is found in the completed state, the response should be * to return the certificate - * + * * If no request is found, the response should be to return null - * + * */ public X509CertImpl handleGetCertInitial(CRSPKIMessage req, CRSPKIMessage resp) { @@ -1053,7 +1053,7 @@ public class CRSEnrollment extends HttpServlet { /** * Create an entry for this user in the publishing directory - * + * */ private boolean createEntry(String dn) { @@ -1096,7 +1096,7 @@ public class CRSEnrollment extends HttpServlet { /** * Here we decrypt the PKCS10 message from the client - * + * */ public void unwrapPKCS10(CRSPKIMessage req, CryptoContext cx) @@ -1316,7 +1316,7 @@ public class CRSEnrollment extends HttpServlet { req.put(SUBJECTNAME, subject); if (key == null || subject == null) { - // log + // log //throw new ERegistrationException(RegistrationResources.ERROR_MALFORMED_P10); } @@ -1536,7 +1536,7 @@ public class CRSEnrollment extends HttpServlet { return null; } - ////// post the request + ////// post the request /* needed: @@ -1604,7 +1604,7 @@ public class CRSEnrollment extends HttpServlet { credentials.set("PWD", p10Password); if (authenticator == null) { - // XXX - to help caRouterCert to work, we need to + // XXX - to help caRouterCert to work, we need to // add authentication to caRouterCert authToken = new AuthToken(null); } else { @@ -1867,7 +1867,7 @@ public class CRSEnrollment extends HttpServlet { byte[] ed = crsResp.makeEnvelopedData(0); - // 7. Make Digest of SignedData Content + // 7. Make Digest of SignedData Content MessageDigest md = MessageDigest.getInstance(mHashAlgorithm); msgdigest = md.digest(ed); @@ -1898,7 +1898,7 @@ public class CRSEnrollment extends HttpServlet { // recipientNonce and SenderNonce have already been set crsResp.makeAuthenticatedAttributes(); - // crsResp.makeAuthenticatedAttributes_old(); + // crsResp.makeAuthenticatedAttributes_old(); // now package up the rest of the SignerInfo { diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java index ff55dc9ce..5c7ac856f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java @@ -42,7 +42,7 @@ public class ChallengePassword implements CertAttrSet { /** * Get the password marshalled in this object - * + * * @return the challenge password */ public String toString() { @@ -51,7 +51,7 @@ public class ChallengePassword implements CertAttrSet { /** * Create a ChallengePassword object - * + * * @param stuff (must be of type byte[]) a DER-encoded by array following * The ASN.1 template for ChallenegePassword specified in the SCEP * documentation @@ -103,7 +103,7 @@ public class ChallengePassword implements CertAttrSet { /** * Get an attribute of this object. - * + * * @param name the name of the attribute of this object to get. The only * supported attribute is "password" */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java index 85f3938b8..3cb88f3f8 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java @@ -94,7 +94,7 @@ public class ExtensionsRequested implements CertAttrSet { /** * construct - expects this in the inputstream (from the router): - * + * * 211 30 31: SEQUENCE { * 213 06 10: OBJECT IDENTIFIER '2 16 840 1 113733 1 9 8' * 225 31 17: SET { @@ -107,9 +107,9 @@ public class ExtensionsRequested implements CertAttrSet { * : } * : } * : } - * + * * or this (from IRE client): - * + * * 262 30 51: SEQUENCE { * 264 06 9: OBJECT IDENTIFIER extensionReq (1 2 840 113549 1 9 14) * 275 31 38: SET { diff --git a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java index 88369ace3..f01d75c98 100644 --- a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java +++ b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Authentication Credentials as input to the authMgr * <P> - * + * * @version $Revision$, $Date$ */ public class AuthCredentials implements IAuthCredentials { @@ -36,7 +36,7 @@ public class AuthCredentials implements IAuthCredentials { */ private static final long serialVersionUID = -5995164231849154265L; private Hashtable<String, Object> authCreds = null; - // Inserted by bskim + // Inserted by bskim private IArgBlock argblk = null; // Insert end @@ -47,7 +47,7 @@ public class AuthCredentials implements IAuthCredentials { /** * sets a credential with credential name and the credential - * + * * @param name credential name * @param cred credential * @exception com.netscape.certsrv.base.EBaseException NullPointerException @@ -63,7 +63,7 @@ public class AuthCredentials implements IAuthCredentials { /** * returns the credential to which the specified name is mapped in this * credential set - * + * * @param name credential name * @return the named authentication credential */ @@ -75,7 +75,7 @@ public class AuthCredentials implements IAuthCredentials { * removes the name and its corresponding credential from this * credential set. This method does nothing if the named * credential is not in the credential set. - * + * * @param name credential name */ public void delete(String name) { @@ -86,7 +86,7 @@ public class AuthCredentials implements IAuthCredentials { * returns an enumeration of the credential names in this credential * set. Use the Enumeration methods on the returned object to * fetch the elements sequentially. - * + * * @return an enumeration of the names in this credential set * @see java.util.Enumeration */ diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFile.java b/base/common/src/com/netscape/cms/servlet/common/CMSFile.java index 4d7c4cdd6..7f73ce8d3 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSFile.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSFile.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.logging.ILogger; /** * CMSFile represents a file from the filesystem cached in memory - * + * * @version $Revision$, $Date$ */ public class CMSFile { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java index 808bdda78..a8d753e7c 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * CMSFileLoader - file cache. - * + * * @version $Revision$, $Date$ */ @@ -43,10 +43,10 @@ public class CMSFileLoader { // property to cache templates only public final String PROP_CACHE_TEMPLATES_ONLY = "cacheTemplatesOnly"; - // hash of files to their content. + // hash of files to their content. private Hashtable<String, CMSFile> mLoadedFiles = new Hashtable<String, CMSFile>(); - // max number of files + // max number of files private int mMaxSize = MAX_SIZE; // number of files to clear when max is reached. @@ -84,14 +84,14 @@ public class CMSFileLoader { public byte[] get(File file, String enc) throws EBaseException, IOException { CMSFile cmsFile = getCMSFile(file, enc); - // Change end + // Change end return cmsFile.getContent(); } // Changed by bskim //public CMSFile getCMSFile(File file) throws EBaseException, IOException { public CMSFile getCMSFile(File file, String enc) throws EBaseException, IOException { - // Change end + // Change end String absPath = file.getAbsolutePath(); long modified = file.lastModified(); CMSFile cmsFile = (CMSFile) mLoadedFiles.get(absPath); @@ -100,7 +100,7 @@ public class CMSFileLoader { // new file. if (cmsFile == null || modified != lastModified) { // Changed by bskim - //cmsFile = updateFile(absPath, file); + //cmsFile = updateFile(absPath, file); cmsFile = updateFile(absPath, file, enc); // Change end } @@ -109,7 +109,7 @@ public class CMSFileLoader { } // Changed by bskim - //private CMSFile updateFile(String absPath, File file) + //private CMSFile updateFile(String absPath, File file) private CMSFile updateFile(String absPath, File file, String enc) // Change end throws EBaseException, IOException { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java b/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java index 7ae242ae7..32264c01e 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for cms gateway. * <P> - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java index 20743022a..157d5e3d1 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This class is to hold some general method for servlets. - * + * * @version $Revision$, $Date$ */ public class CMSGateway { @@ -345,7 +345,7 @@ public class CMSGateway { * epoch value passed in. If there is no header, or there is a problem * parsing the value, or if the file has been modified this will return * true, indicating the file has changed. - * + * * @param lastModified The time value in milliseconds past the epoch to * compare the If-Modified-Since header to. */ diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java index 62276df14..4e3d3c0bc 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java @@ -19,7 +19,7 @@ package com.netscape.cms.servlet.common; /** * handy class containing cms templates to load & fill. - * + * * @version $Revision$, $Date$ */ public class CMSLoadTemplate { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java index 256c01010..d7a32d340 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This represents a user request. - * + * * @version $Revision$, $Date$ */ public class CMSRequest { @@ -58,7 +58,7 @@ public class CMSRequest { // http headers & other info. private HttpServletRequest mHttpReq = null; - // http response. + // http response. private HttpServletResponse mHttpResp = null; // http servlet config. @@ -67,7 +67,7 @@ public class CMSRequest { // http servlet context. private ServletContext mServletContext = null; - // permanent request in request queue. + // permanent request in request queue. private IRequest mRequest = null; // whether request processed successfully @@ -90,7 +90,7 @@ public class CMSRequest { public CMSRequest() { } - // set methods use by servlets. + // set methods use by servlets. /** * set the HTTP parameters @@ -132,7 +132,7 @@ public class CMSRequest { mServletConfig = servletConfig; } - /* + /* * set the servlet context. the servletcontext has detail * about the currently running request */ @@ -142,7 +142,7 @@ public class CMSRequest { /** * Set request status. - * + * * @param status request status. Allowed values are * UNAUTHORIZED, SUCCESS, REJECTED, PENDING, ERROR, SVC_PENDING * @throws IllegalArgumentException if status is not one of the above values @@ -235,7 +235,7 @@ public class CMSRequest { return reason; } - // handy routines for IRequest. + // handy routines for IRequest. public void setExtData(String type, String value) { if (mRequest != null) { @@ -251,7 +251,7 @@ public class CMSRequest { } } - // policy errors; set on rejection or possibly deferral. + // policy errors; set on rejection or possibly deferral. public Vector<String> getPolicyMessages() { if (mRequest != null) { return mRequest.getExtDataInStringVector(IRequest.ERRORS); @@ -277,11 +277,11 @@ public class CMSRequest { mStatus = CMSRequest.SUCCESS; return; } - // unexpected resulting request status. + // unexpected resulting request status. if (status == RequestStatus.REJECTED) { mStatus = CMSRequest.REJECTED; return; - } // pending or service pending. + } // pending or service pending. else if (status == RequestStatus.PENDING) { mStatus = CMSRequest.PENDING; return; diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java index 317bddbcd..055a025b2 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.logging.ILogger; * <CMS_TEMPLATE> and replace the tag with * a series of javascript variable definitions * (depending on the servlet) - * + * * @version $Revision$, $Date$ */ public class CMSTemplate extends CMSFile { @@ -76,7 +76,7 @@ public class CMSTemplate extends CMSFile { /** * Constructor - * + * * @param file template file to load * @param charset character set * @throws IOException if the there was an error opening the file @@ -146,7 +146,7 @@ public class CMSTemplate extends CMSFile { /** * Write a javascript representation of 'input' * surrounded by SCRIPT tags to the outputstream - * + * * @param rout the outputstream to write to * @param input the parameters to write */ @@ -176,7 +176,7 @@ public class CMSTemplate extends CMSFile { out.println("var recordSet = new Array;"); out.println("var result = new Object();"); - // hack + // hack out.println("var httpParamsCount = 0;"); out.println("var httpHeadersCount = 0;"); out.println("var authTokenCount = 0;"); @@ -253,7 +253,7 @@ public class CMSTemplate extends CMSFile { /** * Ouput the pre-amble HTML Header including * the pre-output buffer. - * + * * @param out output stream specified * @return success or error */ @@ -275,7 +275,7 @@ public class CMSTemplate extends CMSFile { /** * Output the post HTML tags and post-output * buffer. - * + * * @param out output stream specified * @return success or error */ @@ -294,7 +294,7 @@ public class CMSTemplate extends CMSFile { return mAbsPath; } - // inherit getabspath, getContent, get last access and set last access + // inherit getabspath, getContent, get last access and set last access /*========================================================== * private methods diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java index ce2c26c3c..50c5e824f 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Holds template parameters - * + * * @version $Revision$, $Date$ */ public class CMSTemplateParams { diff --git a/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java b/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java index e8b848f7d..2c24c112a 100644 --- a/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java +++ b/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a CMS gateway exception. * <P> - * + * * @version $Revision$, $Date$ */ public class ECMSGWException extends EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java index 40edb3bda..29e106ae9 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Default error template filler - * + * * @version $Revision$, $Date$ */ public class GenErrorTemplateFiller implements ICMSTemplateFiller { @@ -37,7 +37,7 @@ public class GenErrorTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq the CMS Request. * @param authority the authority * @param locale the locale of template. @@ -60,11 +60,11 @@ public class GenErrorTemplateFiller implements ICMSTemplateFiller { return null; } - // error + // error String ex = cmsReq.getError(); // Changed by beomsuk - /*if (ex == null) + /*if (ex == null) ex = new EBaseException(CMS.getLogMessage("BASE_UNKNOWN_ERROR")); fixed.set(ICMSTemplateFiller.ERROR, ex.toString(locale)); */ diff --git a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java index 1d479fef3..60b79a81e 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java @@ -60,7 +60,7 @@ import com.netscape.certsrv.request.RequestId; /** * default Pending template filler - * + * * @version $Revision$, $Date$ */ public class GenPendingTemplateFiller implements ICMSTemplateFiller { @@ -71,7 +71,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -92,7 +92,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller { if (sts != null) fixed.set(ICMSTemplateFiller.REQUEST_STATUS, sts.toString()); - // request id + // request id IRequest req = cmsReq.getIRequest(); if (req != null) { diff --git a/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java index 9e75cc799..95631ba5e 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.request.IRequest; /** * default Service Pending template filler - * + * * @version $Revision$, $Date$ */ public class GenRejectedTemplateFiller implements ICMSTemplateFiller { @@ -60,7 +60,7 @@ public class GenRejectedTemplateFiller implements ICMSTemplateFiller { return null; } - // request id + // request id IRequest req = cmsReq.getIRequest(); if (req != null) { diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java index f6de38412..bf164977d 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * default Success template filler - * + * * @version $Revision$, $Date$ */ public class GenSuccessTemplateFiller implements ICMSTemplateFiller { @@ -35,7 +35,7 @@ public class GenSuccessTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -54,7 +54,7 @@ public class GenSuccessTemplateFiller implements ICMSTemplateFiller { fixed.set(ICMSTemplateFiller.REQUEST_STATUS, sts.toString()); } - // this authority + // this authority if (authority != null) fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName()); diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java index ec1b97779..275980cf1 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.request.IRequest; /** * default Service Pending template filler - * + * * @version $Revision$, $Date$ */ public class GenSvcPendingTemplateFiller implements ICMSTemplateFiller { @@ -37,7 +37,7 @@ public class GenSvcPendingTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java index cab1b36e6..48a4a54ea 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * default Unauthorized template filler - * + * * @version $Revision$, $Date$ */ public class GenUnauthorizedTemplateFiller implements ICMSTemplateFiller { @@ -35,7 +35,7 @@ public class GenUnauthorizedTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -58,7 +58,7 @@ public class GenUnauthorizedTemplateFiller implements ICMSTemplateFiller { fixed.set(ICMSTemplateFiller.ERROR, new ECMSGWException(CMS.getLogMessage("CMSGW_UNAUTHORIZED"))); - // this authority + // this authority if (authority != null) fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName()); diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java index 8b560d7bc..1d768a88f 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * default unexpected error template filler - * + * * @version $Revision$, $Date$ */ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller { @@ -36,7 +36,7 @@ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -49,8 +49,8 @@ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller { // When an exception occurs the exit is non-local which probably // will leave the requestStatus value set to something other - // than CMSRequest.EXCEPTION, so force the requestStatus to - // EXCEPTION since it must be that if we're here. + // than CMSRequest.EXCEPTION, so force the requestStatus to + // EXCEPTION since it must be that if we're here. Integer sts = CMSRequest.EXCEPTION; if (cmsReq != null) cmsReq.setStatus(sts); diff --git a/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java index 2d046f0ee..27bcf308d 100644 --- a/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java @@ -23,11 +23,11 @@ import com.netscape.certsrv.authority.IAuthority; /** * This interface represents a template filler. - * + * * @version $Revision$, $Date$ */ public interface ICMSTemplateFiller { - // common template variables. + // common template variables. public final static String ERROR = "errorDetails"; public final static String ERROR_DESCR = "errorDescription"; public final static String EXCEPTION = "unexpectedError"; diff --git a/base/common/src/com/netscape/cms/servlet/common/IRawJS.java b/base/common/src/com/netscape/cms/servlet/common/IRawJS.java index 827f24f1d..e5714f727 100644 --- a/base/common/src/com/netscape/cms/servlet/common/IRawJS.java +++ b/base/common/src/com/netscape/cms/servlet/common/IRawJS.java @@ -19,7 +19,7 @@ package com.netscape.cms.servlet.common; /** * This represents raw JS parameters. - * + * * @version $Revision$, $Date$ */ public interface IRawJS { diff --git a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java index 59c4a0fe4..ced916541 100644 --- a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.base.ISubsystem; * subsystems can be loaded into this kernel by specifying * parameters in the configuration store. * <P> - * + * * @version $Revision$, $Date$ */ public class IndexTemplateFiller implements ICMSTemplateFiller { @@ -101,7 +101,7 @@ public class IndexTemplateFiller implements ICMSTemplateFiller { count++; } // information about what is selected is provided - // from the caller. This parameter (selected) is used + // from the caller. This parameter (selected) is used // by header servlet try { header.addStringValue("selected", diff --git a/base/common/src/com/netscape/cms/servlet/common/RawJS.java b/base/common/src/com/netscape/cms/servlet/common/RawJS.java index f936e0757..03a4e7e2b 100644 --- a/base/common/src/com/netscape/cms/servlet/common/RawJS.java +++ b/base/common/src/com/netscape/cms/servlet/common/RawJS.java @@ -19,7 +19,7 @@ package com.netscape.cms.servlet.common; /** * This represents raw JS parameters. - * + * * @version $Revision$, $Date$ */ public class RawJS implements IRawJS { diff --git a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java index 5c16b8195..1d19a0b17 100644 --- a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java +++ b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * Utility class - * + * * @version $Revision$, $Date$ */ public class ServletUtils { diff --git a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java index f9085a5bc..467cc1cf4 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java @@ -60,7 +60,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * Clone servlet - part of the Clone Authority (CLA) * processes Revoked certs from its dependant clone CAs * service request and return status. - * + * * @version $Revision$, $Date$ */ public class CloneServlet extends CMSServlet { @@ -123,7 +123,7 @@ public class CloneServlet extends CMSServlet { IPKIMessage msg = null; IPKIMessage replymsg = null; - // NOTE must read all bufer before redoing handshake for + // NOTE must read all bufer before redoing handshake for // ssl client auth for client auth to work. // get request method @@ -152,8 +152,8 @@ public class CloneServlet extends CMSServlet { // force client auth handshake, validate clone CA (CCA) // and get CCA's Id. - // NOTE must do this after all contents are read for ssl - // redohandshake to work + // NOTE must do this after all contents are read for ssl + // redohandshake to work X509Certificate peerCert; @@ -231,7 +231,7 @@ public class CloneServlet extends CMSServlet { // decode request. CMS.debug("Cloneservlet: before decoding request, encodedreq= " + encodedreq); msg = (IPKIMessage) mReqEncoder.decode(encodedreq); - // process request + // process request CMS.debug("Cloneservlet: decoded request"); replymsg = processRequest(CCA_Id, CCAUserId, msg, token); } catch (IOException e) { @@ -247,7 +247,7 @@ public class CloneServlet extends CMSServlet { return; } - // encode reply + // encode reply String encodedrep = mReqEncoder.encode(replymsg); resp.setStatus(HttpServletResponse.SC_OK); @@ -269,9 +269,9 @@ public class CloneServlet extends CMSServlet { X509Certificate peerCert) throws EBaseException { try { - // XXX using agent authentication now since we're only - // verifying that the cert belongs to a user in the db. - // XXX change this to ACL in the future. + // XXX using agent authentication now since we're only + // verifying that the cert belongs to a user in the db. + // XXX change this to ACL in the future. // build JAVA X509Certificate from peerCert. X509CertImpl cert = new X509CertImpl(peerCert.getEncoded()); @@ -417,10 +417,10 @@ public class CloneServlet extends CMSServlet { // Get the certificate(s) from the request X509CertImpl issuedCerts[] = (X509CertImpl[])thisreq.get(IRequest.ISSUED_CERTS); - // return potentially more than one certificates. + // return potentially more than one certificates. if (issuedCerts != null) { for (int i = 0; i < issuedCerts.length; i++) { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.FORMAT, @@ -436,7 +436,7 @@ public class CloneServlet extends CMSServlet { ); } } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, @@ -458,7 +458,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.RENEWALFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , authMgr , "completed", @@ -468,7 +468,7 @@ public class CloneServlet extends CMSServlet { renewed_cert.getSerialNumber().toString(16)} ); } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, @@ -492,7 +492,7 @@ public class CloneServlet extends CMSServlet { Extension ext = (Extension) enum.nextElement(); if (ext instanceof CRLReasonExtension) { reason = ((CRLReasonExtension)ext).getReason().toInt - (); + (); break; } } @@ -502,7 +502,7 @@ public class CloneServlet extends CMSServlet { Integer result = (Integer)thisreq.get(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { EBaseException ex = (EBaseException)thisreq.get(IRequest.ERROR); - EBaseException[] svcErrors = + EBaseException[] svcErrors = (EBaseException[])thisreq.get(IRequest.SVCERRORS); if (svcErrors != null && svcErrors.length > 0) { for (int i = 0; i < svcErrors.length; i++) { @@ -515,7 +515,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.DOREVOKEFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , "completed with error: " + err.toString() , @@ -536,7 +536,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.DOREVOKEFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , "completed" , oldCerts[j].getSubjectDN() , @@ -547,7 +547,7 @@ public class CloneServlet extends CMSServlet { } } } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java index e8d4f898f..c566753b6 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -76,7 +76,7 @@ import com.netscape.cmsutil.util.Utils; * Connector servlet * process requests from remote authority - * service request or return status. - * + * * @version $Revision$, $Date$ */ public class ConnectorServlet extends CMSServlet { @@ -158,7 +158,7 @@ public class ConnectorServlet extends CMSServlet { IPKIMessage msg = null; IPKIMessage replymsg = null; - // NOTE must read all bufer before redoing handshake for + // NOTE must read all bufer before redoing handshake for // ssl client auth for client auth to work. // get request method @@ -186,8 +186,8 @@ public class ConnectorServlet extends CMSServlet { } // force client auth handshake, validate RA and get RA's Id. - // NOTE must do this after all contents are read for ssl - // redohandshake to work + // NOTE must do this after all contents are read for ssl + // redohandshake to work X509Certificate peerCert; @@ -206,7 +206,7 @@ public class ConnectorServlet extends CMSServlet { return; } - // authenticate RA + // authenticate RA String RA_Id = null; String raUserId = null; @@ -260,7 +260,7 @@ public class ConnectorServlet extends CMSServlet { try { // decode request. msg = (IPKIMessage) mReqEncoder.decode(encodedreq); - // process request + // process request replymsg = processRequest(RA_Id, raUserId, msg, token); } catch (IOException e) { CMS.debug("ConnectorServlet: service " + e.toString()); @@ -283,7 +283,7 @@ public class ConnectorServlet extends CMSServlet { CMS.debug("ConnectorServlet: done processRequest"); - // encode reply + // encode reply try { String encodedrep = mReqEncoder.encode(replymsg); @@ -373,7 +373,7 @@ public class ConnectorServlet extends CMSServlet { CMS.getSubsystem("profile"); IEnrollProfile profile = null; - // profile subsystem may not be available. In case of KRA for + // profile subsystem may not be available. In case of KRA for // example if (ps == null) { CMS.debug("ConnectorServlet: Profile Subsystem not found "); @@ -394,13 +394,13 @@ public class ConnectorServlet extends CMSServlet { /** * Process request * <P> - * + * * (Certificate Request - all "agent" profile cert requests made through a connector) * <P> - * + * * (Certificate Request Processed - all automated "agent" profile based cert acceptance made through a connector) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_PROFILE_CERT_REQUEST used when a profile cert request is made (before * approval process) @@ -409,7 +409,7 @@ public class ConnectorServlet extends CMSServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS used when inter-CIMC_Boundary data transfer is * successful (this is used when data does not need to be captured) * </ul> - * + * * @param source string containing source * @param sourceUserId string containing source user ID * @param msg PKI message @@ -753,7 +753,7 @@ public class ConnectorServlet extends CMSServlet { x509Certs = thisreq.getExtDataInCertArray(IRequest.ISSUED_CERTS); - // return potentially more than one certificates. + // return potentially more than one certificates. if (x509Certs != null) { for (int i = 0; i < x509Certs.length; i++) { mLogger.log(ILogger.EV_AUDIT, @@ -1003,11 +1003,11 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1027,12 +1027,12 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log Profile ID - * + * * This method is inherited by all extended "EnrollProfile"s, * and is called to obtain the "ProfileID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message ProfileID */ protected String auditProfileID() { @@ -1054,11 +1054,11 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param request a Request containing an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java index bb787c7ad..597b50741 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * GenerateKeyPairServlet * handles "server-side key pair generation" requests from the * netkey RA. - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -64,7 +64,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * Constructs GenerateKeyPair servlet. - * + * */ public GenerateKeyPairServlet() { super(); @@ -84,7 +84,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -94,7 +94,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /* * processServerSideKeyGen - * handles netkey DRM serverside keygen. - * netkey operations: + * netkey operations: * 1. generate keypair (archive user priv key) * 2. unwrap des key with transport key, then url decode it * 3. wrap user priv key with des key @@ -219,8 +219,8 @@ public class GenerateKeyPairServlet extends CMSServlet { } } - /* - + /* + * For GenerateKeyPair: * * input: @@ -277,9 +277,9 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * XXX remember tocheck peer SSL cert and get RA id later - * + * * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ diff --git a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java index 337b24259..0f79d6394 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * TokenKeyRecoveryServlet * handles "key recovery service" requests from the * netkey TPS - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -63,7 +63,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Constructs TokenKeyRecovery servlet. - * + * */ public TokenKeyRecoveryServlet() { super(); @@ -83,7 +83,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -92,7 +92,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param s The URL to decode */ protected String URLdecode(String s) { @@ -127,7 +127,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { * wrapped with DRM transport key * cert - the user cert corresponding to the key to be recovered * - * operations: + * operations: * 1. unwrap des key with transport key, then url decode it * 2. retrieve user private key * 3. wrap user priv key with des key @@ -269,7 +269,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { } } - /* + /* * For TokenKeyRecovery * * input: diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index 1f5a3327c..a3d933993 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -578,7 +578,7 @@ public class AdminPanel extends WizardPanelBase { } // this request is from IE. The VBScript has problem of generating // certificate request if the subject name has E and UID components. - // For now, we always hardcoded the subject DN to be cn=NAME in + // For now, we always hardcoded the subject DN to be cn=NAME in // the IE browser. } else if (cert_request_type.equals("pkcs10")) { try { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java index 2e7682e08..e6b5f3c13 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java @@ -67,7 +67,7 @@ public class BaseServlet extends VelocityServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index e956edebe..71703c888 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -490,10 +490,10 @@ public class CertUtil { } if (req != null) { - // update request with cert + // update request with cert req.setExtData(IEnrollProfile.REQUEST_ISSUED_CERT, cert); - // store request in db + // store request in db try { CMS.debug("certUtil: before updateRequest"); if (queue != null) { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java index 52a98d540..9a780cca8 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java @@ -50,7 +50,7 @@ public class CheckIdentity extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -61,7 +61,7 @@ public class CheckIdentity extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java index dbda788f6..41249fa97 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java @@ -63,7 +63,7 @@ public abstract class ConfigBaseServlet extends BaseServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java index 82c45d1cd..ed2e4a22c 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java @@ -977,7 +977,7 @@ public class DatabasePanel extends WizardPanelBase { String remove = HttpInput.getID(request, "removeData"); if (isPanelDone() && (remove == null || remove.equals(""))) { - /* if user submits the same data, they just want to skip + /* if user submits the same data, they just want to skip to the next panel, no database population is required. */ if (hostname1.equals(hostname2) && portStr1.equals(portStr2) && @@ -1055,7 +1055,7 @@ public class DatabasePanel extends WizardPanelBase { (secure.equals("on") ? "true" : "false")); importLDIFS("preop.internaldb.post_ldif", conn); - /* For vlvtask, we need to check if the task has + /* For vlvtask, we need to check if the task has been completed or not. Presence of nsTaskExitCode means task is complete */ String wait_dn = cs.getString("preop.internaldb.wait_dn", ""); @@ -1369,7 +1369,7 @@ public class DatabasePanel extends WizardPanelBase { conn.add(entry); } catch (LDAPException e) { if (e.getLDAPResultCode() == LDAPException.ENTRY_ALREADY_EXISTS) { - /* BZ 470918 -we cant just add the new dn. We need to do a replace instead + /* BZ 470918 -we cant just add the new dn. We need to do a replace instead * until the DS code is fixed */ CMS.debug("DatabasePanel enableReplication: " + replicadn + " has already been used"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java index c6db8a8b7..19edff7ba 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java @@ -117,7 +117,7 @@ public class DisplayCertChainPanel extends WizardPanelBase { Context context) { CMS.debug("DisplayCertChainPanel: display"); - // update session id + // update session id String session_id = request.getParameter("session_id"); if (session_id != null) { CMS.debug("DisplayCertChainPanel setting session id."); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index 6d0e92618..7729ea40e 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -167,7 +167,7 @@ public class DonePanel extends WizardPanelBase { Context context) { CMS.debug("DonePanel: display()"); - // update session id + // update session id String session_id = request.getParameter("session_id"); if (session_id != null) { CMS.debug("NamePanel setting session id."); @@ -326,7 +326,7 @@ public class DonePanel extends WizardPanelBase { } try { - // Add this host (only CA can create new domain) + // Add this host (only CA can create new domain) String cn = ownhost + ":" + ownadminsport; String dn = "cn=" + cn + ",cn=CAList,ou=Security Domain," + basedn; LDAPEntry entry = null; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java index 094aa7166..808cfa523 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java @@ -50,7 +50,7 @@ public class DownloadPKCS12 extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java index 02fbd7643..c956e733a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java @@ -54,7 +54,7 @@ public class GetCertChain extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -67,7 +67,7 @@ public class GetCertChain extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java index 33d82e9b8..a9de5a54e 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java @@ -59,7 +59,7 @@ public class GetConfigEntries extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -73,7 +73,7 @@ public class GetConfigEntries extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java index e6810ff42..e16f99f4f 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -67,7 +67,7 @@ public class GetCookie extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -84,7 +84,7 @@ public class GetCookie extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java index 999f13815..fc13382c9 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java @@ -61,7 +61,7 @@ public class GetDomainXML extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -76,7 +76,7 @@ public class GetDomainXML extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -115,14 +115,14 @@ public class GetDomainXML extends CMSServlet { connFactory.init(ldapConfig); conn = connFactory.getConn(); - // get the security domain name + // get the security domain name String secdomain = (String) conn.read(dn).getAttribute("name").getStringValues().nextElement(); XMLObject xmlObj = new XMLObject(); Node domainInfo = xmlObj.createRoot("DomainInfo"); xmlObj.addItemToContainer(domainInfo, "Name", secdomain); - // this should return CAList, KRAList etc. + // this should return CAList, KRAList etc. LDAPSearchResults res = conn.search(dn, LDAPConnection.SCOPE_ONE, filter, attrs, true, cons); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java index 4dc6f0ff6..21baefcb0 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -50,7 +50,7 @@ public class GetStatus extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -59,7 +59,7 @@ public class GetStatus extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java index 288cfad60..85f274404 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java @@ -53,7 +53,7 @@ public class GetSubsystemCert extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java index f97d3e5e1..28c3b242d 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java @@ -51,7 +51,7 @@ public class GetTokenInfo extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -65,7 +65,7 @@ public class GetTokenInfo extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java index 87a1788d6..847ca3486 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java @@ -61,7 +61,7 @@ public class GetTransportCert extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java index 9044dec04..b42bdb7de 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java @@ -56,7 +56,7 @@ public class HierarchyPanel extends WizardPanelBase { public boolean shouldSkip() { - // we dont need to ask the hierachy if we are + // we dont need to ask the hierachy if we are // setting up a clone try { IConfigStore c = CMS.getConfigStore(); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java index 93c26cdf3..a12bb164f 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java @@ -128,7 +128,7 @@ public class ImportAdminCertPanel extends WizardPanelBase { if (ca == null) { if (type.equals("otherca")) { try { - // this is a non-CA system that has elected to have its certificates + // this is a non-CA system that has elected to have its certificates // signed by a CA outside of the security domain. // in this case, we submitted the cert request for the admin cert to // to security domain host. diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java index 66ca8a8bf..dd648e8c5 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java @@ -60,7 +60,7 @@ public class ImportTransportCert extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java index 1c67654b4..7732a9a3c 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java @@ -39,7 +39,7 @@ public class ModuleServlet extends BaseServlet { * "preop.module=soft" * or * "preop.module=hard" - * + * * <ul> * <li>http.param selection "soft" or "hard" for software token or hardware token * </ul> diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java index 916ab199b..cb37ef76d 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java @@ -165,7 +165,7 @@ public class NamePanel extends WizardPanelBase { CMS.debug("NamePanel: display()"); context.put("title", "Subject Names"); - // update session id + // update session id String session_id = request.getParameter("session_id"); if (session_id != null) { CMS.debug("NamePanel setting session id."); @@ -337,7 +337,7 @@ public class NamePanel extends WizardPanelBase { } // while } - /* + /* * update some parameters for clones */ public void updateCloneConfig(IConfigStore config) @@ -868,7 +868,7 @@ public class NamePanel extends WizardPanelBase { System.err.println("Exception caught: " + e.toString()); } - } // while + } // while if (hasErr == false) { config.putBoolean("preop.NamePanel.done", true); config.commit(false); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java index 0042cdb5a..2f6238304 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -75,7 +75,7 @@ public class RegisterUser extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index 54a5ed3f6..506abdd70 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -194,7 +194,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { if (!tokenname.equals("Internal Key Storage Token")) return; - // Path can be empty. If this case, we just want to + // Path can be empty. If this case, we just want to // get to the next panel. Customer has HSM. String s = HttpInput.getString(request, "path"); // if (s == null || s.equals("")) { @@ -450,7 +450,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { s1.append(","); s1.append("ca.connector.KRA"); } - + s1.append(",internaldb,internaldb.ldapauth,internaldb.ldapconn"); content = diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java index f3a4169e8..a36db6439 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java @@ -352,7 +352,7 @@ public class SecurityDomainPanel extends WizardPanelBase { config.putString("securitydomain.httpsadminport", CMS.getAdminPort()); - // make sure the subsystem certificate is issued by the security + // make sure the subsystem certificate is issued by the security // domain config.putString("preop.cert.subsystem.type", "local"); config.putString("preop.cert.subsystem.profile", "subsystemCert.profile"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java index bd557fa7a..e1217a460 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java @@ -414,7 +414,7 @@ public class SizePanel extends WizardPanelBase { CMS.debug("SizePanel: update() Exception caught: " + e.toString()); } - // generate key pair + // generate key pair Enumeration<Cert> c = mCerts.elements(); while (c.hasMoreElements()) { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java index 2372b3094..4c6338751 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java @@ -51,7 +51,7 @@ public class TokenAuthenticate extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -60,7 +60,7 @@ public class TokenAuthenticate extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java index f3df51bd1..2698da7d9 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java @@ -60,7 +60,7 @@ public class UpdateConnector extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index a2b6ebc72..5dd05b2cd 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -73,7 +73,7 @@ public class UpdateDomainXML extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -196,7 +196,7 @@ public class UpdateDomainXML extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -455,7 +455,7 @@ public class UpdateDomainXML extends CMSServlet { parser.addItemToContainer(parent, "Clone", clone.toUpperCase()); count++; } - //update count + //update count String countS = ""; NodeList nlist = n.getChildNodes(); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java index 894afa5ff..ff3666f2a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java @@ -62,7 +62,7 @@ public class UpdateNumberRange extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -77,7 +77,7 @@ public class UpdateNumberRange extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -158,7 +158,7 @@ public class UpdateNumberRange extends CMSServlet { } // checkRanges for replicaID - we do this each time a replica is created. - // This needs to be done beforehand to ensure that we always have enough + // This needs to be done beforehand to ensure that we always have enough // replica numbers if (type.equals("replicaId")) { CMS.debug("Checking replica number ranges"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java index 2d3e33f9a..30e0b0fce 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java @@ -56,7 +56,7 @@ public class UpdateOCSPConfig extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index 59b01f26a..aa51ec35f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; * shows key information and presents a list of text boxes * so that recovery agents can type in their identifiers * and passwords. - * + * * @version $Revision$, $Date$ */ public class ConfirmRecoverBySerial extends CMSServlet { @@ -105,7 +105,7 @@ public class ConfirmRecoverBySerial extends CMSServlet { public void process(CMSRequest cmsReq) throws EBaseException { // Note that we should try to handle all the exceptions - // instead of passing it up back to the servlet + // instead of passing it up back to the servlet // framework. HttpServletRequest req = cmsReq.getHttpReq(); diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java index 8876d9350..e414dde9a 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Display a specific Key Archival Request * <P> - * + * * @version $Revision$, $Date$ */ public class DisplayBySerial extends CMSServlet { @@ -76,7 +76,7 @@ public class DisplayBySerial extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "displayBySerial.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -101,7 +101,7 @@ public class DisplayBySerial extends CMSServlet { * <ul> * <li>http.param serialNumber serial number of the key archival request * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -141,7 +141,7 @@ public class DisplayBySerial extends CMSServlet { } // Note that we should try to handle all the exceptions - // instead of passing it up back to the servlet + // instead of passing it up back to the servlet // framework. IArgBlock header = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java index 29cc2b3b3..9bc1c1b4f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Display a Specific Key Archival Request, and initiate * key recovery process - * + * * @version $Revision$, $Date$ */ public class DisplayBySerialForRecovery extends CMSServlet { @@ -78,7 +78,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "displayBySerialForRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { * <li>http.param serialNumber request ID of key archival request * <li>http.param publicKeyData * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -143,7 +143,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { } // Note that we should try to handle all the exceptions - // instead of passing it up back to the servlet + // instead of passing it up back to the servlet // framework. IArgBlock header = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java index dd224cc8a..5c0fc73e9 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java @@ -35,7 +35,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve Transport Certificate used to * wrap Private key Archival requests - * + * * @version $Revision$, $Date$ */ public class DisplayTransport extends CMSServlet { @@ -70,7 +70,7 @@ public class DisplayTransport extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index cd440da08..630ef1b14 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * View the Key Recovery Request - * + * * @version $Revision$, $Date$ */ public class ExamineRecovery extends CMSServlet { @@ -107,7 +107,7 @@ public class ExamineRecovery extends CMSServlet { * <ul> * <li>http.param recoveryID recovery request ID * </ul> - * + * * @param cmsReq the object holding the request and response information */ @@ -167,7 +167,7 @@ public class ExamineRecovery extends CMSServlet { /* catch (NumberFormatException e) { error = eBaseException( - + header.addStringValue(OUT_ERROR, MessageFormatter.getLocalizedString( locale[0], diff --git a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java index 55d79b1ab..4989c1245 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Check to see if a Key Recovery Request has been approved - * + * * @version $Revision$, $Date$ */ public class GetApprovalStatus extends CMSServlet { @@ -79,7 +79,7 @@ public class GetApprovalStatus extends CMSServlet { * initialize the servlet. This servlet uses the template files * "getApprovalStatus.template" and "finishRecovery.template" * to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -102,7 +102,7 @@ public class GetApprovalStatus extends CMSServlet { * <ul> * <li>http.param recoveryID request ID to check * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -189,7 +189,7 @@ public class GetApprovalStatus extends CMSServlet { } */ } else if (((IKeyRecoveryAuthority) mService).getError(recoveryID) != null) { - // error in recovery process + // error in recovery process header.addStringValue(OUT_ERROR, ((IKeyRecoveryAuthority) mService).getError(recoveryID)); rComplete = 1; diff --git a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java index 9d67cab8d..dfc7d4d3b 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Get the recovered key in PKCS#12 format * - for asynchronous key recovery only - * + * */ public class GetAsyncPk12 extends CMSServlet { @@ -83,7 +83,7 @@ public class GetAsyncPk12 extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "finishAsyncRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -108,7 +108,7 @@ public class GetAsyncPk12 extends CMSServlet { * <ul> * <li>http.param reqID request id for recovery * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -228,7 +228,7 @@ public class GetAsyncPk12 extends CMSServlet { CMS.getUserMessage(locale[0], "CMS_BASE_INTERNAL_ERROR", e.toString())); } } else if (((IKeyRecoveryAuthority) mService).getError(reqID) != null) { - // error in recovery process + // error in recovery process header.addStringValue(OUT_ERROR, ((IKeyRecoveryAuthority) mService).getError(reqID)); } else { diff --git a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java index 96fe7c85d..fdcbf40bc 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Get the recovered key in PKCS#12 format - * + * * @version $Revision$, $Date$ */ public class GetPk12 extends CMSServlet { @@ -82,7 +82,7 @@ public class GetPk12 extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "finishRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -107,7 +107,7 @@ public class GetPk12 extends CMSServlet { * <ul> * <li>http.param recoveryID ID of request to recover * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java index 7c0c0cb1c..fee739f29 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Approve an asynchronous key recovery request - * + * */ public class GrantAsyncRecovery extends CMSServlet { @@ -80,7 +80,7 @@ public class GrantAsyncRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'grantAsyncRecovery.template' to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -106,9 +106,9 @@ public class GrantAsyncRecovery extends CMSServlet { * <ul> * <li>http.param reqID request ID of the request to approve * <li>http.param agentID User ID of the agent approving the request - * + * * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -183,12 +183,12 @@ public class GrantAsyncRecovery extends CMSServlet { /** * Update agent approval list * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_AGENT_LOGIN used whenever DRM agents login as recovery agents * to approve key recovery requests * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reqID string containing the recovery request ID diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java index 02aacc31c..9c4ccc8be 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -43,7 +43,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Approve a key recovery request - * + * * @version $Revision$, $Date$ */ public class GrantRecovery extends CMSServlet { @@ -84,7 +84,7 @@ public class GrantRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'grantRecovery.template' to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -111,9 +111,9 @@ public class GrantRecovery extends CMSServlet { * <li>http.param recoveryID ID of the request to approve * <li>http.param agentID User ID of the agent approving the request * <li>http.param agentPWD Password of the agent approving the request - * + * * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -189,12 +189,12 @@ public class GrantRecovery extends CMSServlet { * Recovers a key. The p12 will be protected by the password * provided by the administrator. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_AGENT_LOGIN used whenever DRM agents login as recovery agents * to approve key recovery requests * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param recoveryID string containing the recovery ID diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java index ed770ea91..b599cc7f5 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.dbs.keydb.IKeyRecord; /** * Output a 'pretty print' of a Key Archival record - * + * * @version $Revision$, $Date$ */ public class KeyRecordParser { @@ -60,7 +60,7 @@ public class KeyRecordParser { rec.getSerialNumber(), 10); rarg.addStringValue(OUT_KEY_ALGORITHM, rec.getAlgorithm()); - // Possible Enhancement: sun's BASE64Encode is not + // Possible Enhancement: sun's BASE64Encode is not // fast. We may may to have our native implmenetation. IPrettyPrintFormat pp = CMS.getPrettyPrintFormat(":"); diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyResource.java b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java index a47c46d86..13960b23e 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyResource.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java @@ -12,7 +12,7 @@ import com.netscape.cms.servlet.request.model.RecoveryRequestData; @Path("/key") public interface KeyResource { - + /** * Used to retrieve a key * @param data @@ -23,7 +23,7 @@ public interface KeyResource { @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyData retrieveKey(RecoveryRequestData data); - + // retrieval - used to test integration with a browser @POST @Path("retrieve") diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java index 88f2f8a82..0ec84b8f6 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java @@ -37,10 +37,10 @@ import com.netscape.certsrv.dbs.keydb.KeyId; /** * @author alee - * + * */ public class KeyResourceService extends CMSResourceService implements KeyResource{ - + /** * Used to retrieve a key * @param data @@ -64,15 +64,15 @@ public class KeyResourceService extends CMSResourceService implements KeyResourc } return keyData; } - + // retrieval - used to test integration with a browser public KeyData retrieveKey(MultivaluedMap<String, String> form) { RecoveryRequestData data = new RecoveryRequestData(form); return retrieveKey(data); } - + private KeyId validateRequest(RecoveryRequestData data) { - + // confirm request exists RequestId reqId = data.getRequestId(); if (reqId == null) { @@ -100,24 +100,24 @@ public class KeyResourceService extends CMSResourceService implements KeyResourc // request not found throw new WebApplicationException(Response.Status.GONE); } - + //confirm request is of the right type String type = reqInfo.getRequestType(); if (!type.equals(IRequest.SECURITY_DATA_RECOVERY_REQUEST)) { // log error throw new WebApplicationException(Response.Status.BAD_REQUEST); } - - //confirm that agent is originator of request, else throw 401 + + //confirm that agent is originator of request, else throw 401 // TO-DO - + // confirm request is in approved state String status = reqInfo.getRequestStatus(); if (!status.equals(RequestStatus.APPROVED.toString())) { // log error throw new WebApplicationException(Response.Status.UNAUTHORIZED); } - + return reqInfo.getKeyId(); } diff --git a/base/common/src/com/netscape/cms/servlet/key/KeysResource.java b/base/common/src/com/netscape/cms/servlet/key/KeysResource.java index c93ffa4c9..67d29cc52 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeysResource.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeysResource.java @@ -7,17 +7,17 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import com.netscape.cms.servlet.key.model.KeyDataInfos; - + @Path("/keys") public interface KeysResource { public static final int DEFAULT_MAXTIME = 10; public static final int DEFAULT_MAXRESULTS = 100; - + @GET @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) public KeyDataInfos listKeys(@QueryParam("clientID") String clientID, @QueryParam("status") String status, @DefaultValue(""+DEFAULT_MAXRESULTS) @QueryParam("maxResults") int maxResults, @DefaultValue(""+DEFAULT_MAXTIME) @QueryParam("maxTime") int maxTime); - + } diff --git a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java index d525d5a77..080d4871b 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java @@ -16,13 +16,13 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; - + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.base.CMSResourceService; @@ -32,20 +32,20 @@ import com.netscape.cmsutil.ldap.LDAPUtil; /** * @author alee - * + * */ public class KeysResourceService extends CMSResourceService implements KeysResource { /** * Used to generate list of key infos based on the search parameters */ - public KeyDataInfos listKeys(String clientID, String status, int maxResults, int maxTime) { + public KeyDataInfos listKeys(String clientID, String status, int maxResults, int maxTime) { // auth and authz - + // get ldap filter String filter = createSearchFilter(status, clientID); CMS.debug("listKeys: filter is " + filter); - + KeyDAO dao = new KeyDAO(); KeyDataInfos infos; try { @@ -56,30 +56,30 @@ public class KeysResourceService extends CMSResourceService implements KeysResou } return infos; } - + private String createSearchFilter(String status, String clientID) { String filter = ""; int matches = 0; - + if ((status == null) && (clientID == null)) { filter = "(serialno=*)"; return filter; } - + if (status != null) { filter += "(status=" + LDAPUtil.escape(status) + ")"; matches ++; } - + if (clientID != null) { filter += "(clientID=" + LDAPUtil.escape(clientID) + ")"; matches ++; } - + if (matches > 1) { filter = "(&" + filter + ")"; } - + return filter; } diff --git a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java index 28ff30803..bedfa911d 100644 --- a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Cert; /** * A class representing a recoverBySerial servlet. - * + * * @version $Revision$, $Date$ */ public class RecoverBySerial extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java index bff14e9f2..b249b663f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java +++ b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching search criteria - * + * * @version $Revision$, $Date$ */ public class SrchKey extends CMSServlet { @@ -92,7 +92,7 @@ public class SrchKey extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "srchKey.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -144,7 +144,7 @@ public class SrchKey extends CMSServlet { * <li>http.param querySentinel ID of first request to show * <li>http.param timeLimit number of seconds to limit ldap search to * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index 95c777701..c3e6bba53 100644 --- a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -47,8 +47,8 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching given public key material - * - * + * + * * @version $Revision$, $Date$ */ public class SrchKeyForRecovery extends CMSServlet { @@ -93,7 +93,7 @@ public class SrchKeyForRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "srchKeyForRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class SrchKeyForRecovery extends CMSServlet { * <li>http.param querySentinel ID of first request to show * <li>http.param timeLimit number of seconds to limit ldap search to * </ul> - * + * * @param cmsReq the object holding the request and response information */ @@ -295,7 +295,7 @@ public class SrchKeyForRecovery extends CMSServlet { IKeyRecord rec = e.nextElement(); // rec is null when we specify maxResults // DS will return an err=4, which triggers - // a LDAPException.SIZE_LIMIT_ExCEEDED + // a LDAPException.SIZE_LIMIT_ExCEEDED // in DSSearchResults.java if (rec != null) { IArgBlock rarg = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java index f479c6f0d..c34c1752f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java @@ -48,7 +48,7 @@ public class KeyDAO { private IKeyRepository repo; private IKeyRecoveryAuthority kra; private IRequestQueue queue; - + public KeyDAO() { kra = ( IKeyRecoveryAuthority ) CMS.getSubsystem( "kra" ); repo = kra.getKeyRepository(); @@ -57,7 +57,7 @@ public class KeyDAO { /** * Returns list of keys meeting specified search filter. * Currently, vlv searches are not used for keys. - * + * * @param filter * @param maxResults * @param maxTime @@ -65,29 +65,29 @@ public class KeyDAO { * @return * @throws EBaseException */ - public KeyDataInfos listKeys(String filter, int maxResults, int maxTime, UriInfo uriInfo) + public KeyDataInfos listKeys(String filter, int maxResults, int maxTime, UriInfo uriInfo) throws EBaseException { List <KeyDataInfo> list = new ArrayList<KeyDataInfo>(); Enumeration<IKeyRecord> e = null; - - e = repo.searchKeys(filter, maxResults, maxTime); + + e = repo.searchKeys(filter, maxResults, maxTime); if (e == null) { throw new EBaseException("search results are null"); } - + while (e.hasMoreElements()) { IKeyRecord rec = e.nextElement(); if (rec != null) { list.add(createKeyDataInfo(rec, uriInfo)); } } - + KeyDataInfos ret = new KeyDataInfos(); ret.setKeyInfos(list); - + return ret; } - + public KeyData getKey(KeyId keyId, RecoveryRequestData data) throws EBaseException { KeyData keyData; @@ -105,7 +105,7 @@ public class KeyDAO { // get wrapped key IKeyRecord rec = repo.readKeyRecord(keyId.toBigInteger()); if (rec == null) { - return null; + return null; } Hashtable<String, Object> requestParams = kra.getVolatileRequest( @@ -182,10 +182,10 @@ public class KeyDAO { kra.destroyVolatileRequest(request.getRequestId()); queue.markAsServiced(request); - + return keyData; } - + public KeyDataInfo createKeyDataInfo(IKeyRecord rec, UriInfo uriInfo) throws EBaseException { KeyDataInfo ret = new KeyDataInfo(); @@ -198,5 +198,5 @@ public class KeyDAO { return ret; } - + } diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java index 4f303e27d..2ff2b5d0c 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key.model; @@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlElement; public class KeyData { @XmlElement String wrappedPrivateData; - + @XmlElement String nonceData; @@ -56,7 +56,7 @@ public class KeyData { public void setWrappedPrivateData(String wrappedPrivateData) { this.wrappedPrivateData = wrappedPrivateData; } - + /** * @return the nonceData */ diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java index 88b31b4d1..6fd9649fb 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java @@ -16,11 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key.model; - + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -35,13 +35,13 @@ import com.netscape.certsrv.dbs.keydb.KeyId; @XmlRootElement(name="SecurityDataInfo") @XmlAccessorType(XmlAccessType.FIELD) public class KeyDataInfo { - + @XmlElement protected String keyURL; @XmlElement protected String clientID; - + public KeyDataInfo() { // required for JAXB (defaults) } diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java index b01184708..79e5add95 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java @@ -28,10 +28,10 @@ import com.netscape.cms.servlet.base.model.Link; @XmlRootElement(name = "SecurityDataInfos") public class KeyDataInfos { - + protected Collection<KeyDataInfo> keyInfos; protected List<Link> links; - + /** * @return the keyInfos */ @@ -58,7 +58,7 @@ public class KeyDataInfos { public void setLinks(List<Link> links) { this.links = links; } - + @XmlTransient public String getNext() { if (links == null) { diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java index 1ef680853..fef1a2e5c 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java @@ -47,7 +47,7 @@ import com.netscape.cmsutil.util.Cert; /** * Configure the CA to respond to OCSP requests for a CA - * + * * @version $Revision$ $Date$ */ public class AddCAServlet extends CMSServlet { @@ -80,7 +80,7 @@ public class AddCAServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "addCA.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -105,7 +105,7 @@ public class AddCAServlet extends CMSServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_OCSP_ADD_CA_REQUEST_PROCESSED used when an add CA request to the OCSP * Responder is processed * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java index 2dec0e1f5..ff2d76029 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java @@ -56,7 +56,7 @@ import com.netscape.cmsutil.util.Cert; /** * Update the OCSP responder with a new CRL - * + * * @version $Revision$ $Date$ */ public class AddCRLServlet extends CMSServlet { @@ -86,7 +86,7 @@ public class AddCRLServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "addCRL.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class AddCRLServlet extends CMSServlet { /** * Process the HTTP request. * <P> - * + * * <ul> * <li>http.param crl certificate revocation list, base-64, DER encoded wrapped in -----BEGIN CERTIFICATE REVOCATION * LIST-----, -----END CERTIFICATE REVOCATION LIST----- strings @@ -113,7 +113,7 @@ public class AddCRLServlet extends CMSServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_CRL_VALIDATION used when CRL is retrieved and validation process occurs * ("agent" or "EE") * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java index dfe796366..cbe9283d3 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java @@ -49,7 +49,7 @@ import com.netscape.cmsutil.util.Cert; /** * Check the status of a specific certificate - * + * * @version $Revision$ $Date$ */ public class CheckCertServlet extends CMSServlet { @@ -83,7 +83,7 @@ public class CheckCertServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "checkCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class CheckCertServlet extends CMSServlet { * <li>http.param cert certificate to check. Base64, DER encoded, wrapped in -----BEGIN CERTIFICATE-----, -----END * CERTIFICATE----- strings * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java index 3dfc1d5f3..65c16d817 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java @@ -43,7 +43,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve information about the number of OCSP requests the OCSP * has serviced - * + * * @version $Revision$, $Date$ */ public class GetOCSPInfo extends CMSServlet { @@ -61,7 +61,7 @@ public class GetOCSPInfo extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "getOCSPInfo.template" to render the result page. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -79,7 +79,7 @@ public class GetOCSPInfo extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java index a93512ccd..b2365d009 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Show the list of CA's that the OCSP responder can service - * + * * @version $Revision$ $Date$ */ public class ListCAServlet extends CMSServlet { @@ -71,7 +71,7 @@ public class ListCAServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "listCAs.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -87,7 +87,7 @@ public class ListCAServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java index 3ab20141c..1e1b649e6 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java @@ -51,7 +51,7 @@ import com.netscape.cmsutil.util.Utils; /** * Process OCSP messages, According to RFC 2560 * See http://www.ietf.org/rfc/rfc2560.txt - * + * * @version $Revision$ $Date$ */ public class OCSPServlet extends CMSServlet { @@ -74,7 +74,7 @@ public class OCSPServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -94,7 +94,7 @@ public class OCSPServlet extends CMSServlet { * This method is invoked when the OCSP service receives a OCSP * request. Based on RFC 2560, the request should have the OCSP * request in the HTTP body as binary blob. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java index 4262940d0..a5b656cb4 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Configure the CA to no longer respond to OCSP requests for a CA - * + * * @version $Revision: 1274 $ $Date: 2010-09-07 22:14:41 -0700 (Tue, 07 Sep 2010) $ */ public class RemoveCAServlet extends CMSServlet { @@ -70,7 +70,7 @@ public class RemoveCAServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "addCA.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -95,7 +95,7 @@ public class RemoveCAServlet extends CMSServlet { * LOGGING_SIGNED_AUDIT_OCSP_REMOVE_CA_REQUEST_PROCESSED_FAILURE are used when a remove CA request to the OCSP * Responder is processed successfully or not. * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java index 2d2f1430e..4d46e8a75 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Process CRMF requests, according to RFC 2511 * See http://www.ietf.org/rfc/rfc2511.txt - * + * * @version $Revision$, $Date$ */ public class CRMFProcessor extends PKIProcessor { @@ -88,12 +88,12 @@ public class CRMFProcessor extends PKIProcessor { /** * Verify Proof of Possession (POP) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_PROOF_OF_POSSESSION used when proof of possession is checked during * certificate enrollment * </ul> - * + * * @param certReqMsg the certificate request message * @exception EBaseException an error has occurred */ diff --git a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java index 9139f888c..395d30ea9 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java @@ -22,7 +22,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * This represents the request parser. - * + * * @version $Revision$, $Date$ */ public interface IPKIProcessor { diff --git a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java index cfe9754a8..bea447abe 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * KeyGenProcess parses Certificate request matching the * KEYGEN tag format used by Netscape Communicator 4.x - * + * * @version $Revision$, $Date$ */ public class KeyGenProcessor extends PKIProcessor { diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java index dad4b64ab..9ce331412 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; * PKCS10Processor process Certificate Requests in * PKCS10 format, as defined here: * http://www.rsasecurity.com/rsalabs/pkcs/pkcs-10/index.html - * + * * @version $Revision$, $Date$ */ public class PKCS10Processor extends PKIProcessor { diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java index 5b78bb42a..b3859ad2f 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -43,7 +43,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Process Certificate Requests - * + * * @version $Revision$, $Date$ */ public class PKIProcessor implements IPKIProcessor { @@ -295,11 +295,11 @@ public class PKIProcessor implements IPKIProcessor { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -319,12 +319,12 @@ public class PKIProcessor implements IPKIProcessor { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java index 48848695f..7b5343000 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * Toggle the approval state of a profile - * + * * @version $Revision$, $Date$ */ public class ProfileApproveServlet extends ProfileServlet { @@ -71,7 +71,7 @@ public class ProfileApproveServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -82,13 +82,13 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Process the HTTP request. * <P> - * + * * <ul> * <li>http.param profileId the id of the profile to change * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_PROFILE_APPROVAL used when an agent approves/disapproves a cert * profile set by the administrator for automatic approval * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -460,11 +460,11 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Signed Audit Log Profile ID - * + * * This method is called to obtain the "ProfileID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message ProfileID */ @@ -490,11 +490,11 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Signed Audit Log Profile Operation - * + * * This method is called to obtain the "Profile Operation" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return operation string containing either OP_APPROVE, OP_DISAPPROVE, * or SIGNED_AUDIT_EMPTY_VALUE diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java index 2ca5f0a5c..9556da8e3 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * List all enabled profiles. - * + * * @version $Revision$, $Date$ */ public class ProfileListServlet extends ProfileServlet { @@ -60,7 +60,7 @@ public class ProfileListServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -70,7 +70,7 @@ public class ProfileListServlet extends ProfileServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java index e482b67da..996b65d78 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet approves profile-based request. - * + * * @version $Revision$, $Date$ */ public class ProfileProcessServlet extends ProfileServlet { @@ -359,7 +359,7 @@ public class ProfileProcessServlet extends ProfileServlet { if (op.equals("assign")) { String owner = req.getRequestOwner(); - // assigned owner + // assigned owner if (owner != null && owner.length() > 0) { if (!grantPermission(req, authToken)) { CMS.debug("ProfileProcessServlet: Permission not granted to assign request."); @@ -548,15 +548,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Cancel request * <P> - * + * * (Certificate Request Processed - a manual "agent" profile based cert cancellation) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -605,15 +605,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Reject request * <P> - * + * * (Certificate Request Processed - a manual "agent" profile based cert rejection) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -662,15 +662,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Approve request * <P> - * + * * (Certificate Request Processed - a manual "agent" profile based cert acceptance) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -835,11 +835,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -865,11 +865,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Info Value - * + * * This method is called to obtain the "reason" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return reason string containing the signed audit log message reason */ @@ -901,11 +901,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param x509cert an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java index dd0ee7be7..61a04a630 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java @@ -55,7 +55,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * This servlet allows reviewing of profile-based request. - * + * * @version $Revision$, $Date$ */ public class ProfileReviewServlet extends ProfileServlet { @@ -77,7 +77,7 @@ public class ProfileReviewServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -99,7 +99,7 @@ public class ProfileReviewServlet extends ProfileServlet { * <ul> * <li>http.param requestId the ID of the profile to review * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java index 5b07951f8..a4213e3a1 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * Retrieve detailed information of a particular profile. - * + * * @version $Revision$, $Date$ */ public class ProfileSelectServlet extends ProfileServlet { @@ -74,7 +74,7 @@ public class ProfileSelectServlet extends ProfileServlet { * <ul> * <li>http.param profileId the id of the profile to select * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java index 457b8422b..9eac8eebd 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ServletUtils; /** * This servlet is the base class of all profile servlets. - * + * * @version $Revision$, $Date$ */ public class ProfileServlet extends CMSServlet { @@ -168,7 +168,7 @@ public class ProfileServlet extends CMSServlet { * initialize the servlet. Servlets implementing this method * must specify the template to use as a parameter called * "templatePath" in the servletConfig - * + * * @param sc servlet configuration, read from the web.xml file */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index 16451f6dd..93e5b6a4b 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet submits end-user request into the profile framework. - * + * * @version $Revision$, $Date$ */ public class ProfileSubmitCMCServlet extends ProfileServlet { @@ -104,9 +104,9 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { * be set up to always issue certificates against a certain profile * by setting the 'profileId' configuration in the servletConfig * If not, the user must specify the profileID when submitting the request - * + * * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -212,17 +212,17 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Process the HTTP request * <P> - * + * * (Certificate Request Processed - either an automated "EE" profile based cert acceptance, or an automated "EE" * profile based cert rejection) * <P> - * + * * <ul> * <li>http.param profileId ID of profile to use to process request * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -267,7 +267,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { while (paramNames.hasMoreElements()) { String paramName = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -526,7 +526,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { Integer nums = (Integer) (context.get("numOfControls")); CMCOutputTemplate template = new CMCOutputTemplate(); // if there is only one control GetCert, then simple response - // must be returned. + // must be returned. if (nums != null && nums.intValue() == 1) { TaggedAttribute attr1 = (TaggedAttribute) (context.get(OBJECT_IDENTIFIER.id_cmc_getCert)); if (attr1 != null) { @@ -623,7 +623,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { return; } catch (Throwable e) { CMS.debug("ProfileSubmitCMCServlet: populate " + e.toString()); - // throw new IOException("Profile " + profileId + + // throw new IOException("Profile " + profileId + // " cannot populate"); CMCOutputTemplate template = new CMCOutputTemplate(); SEQUENCE seq = new SEQUENCE(); @@ -704,7 +704,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { "CMS_PROFILE_DEFERRED", e.toString()); } catch (ERejectException e) { - // return error to the user + // return error to the user reqs[k].setRequestStatus(RequestStatus.REJECTED); CMS.debug("ProfileSubmitCMCServlet: submit " + e.toString()); errorCode = "3"; @@ -772,7 +772,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { } /////////////////////////////////////////////// - // output output list + // output output list /////////////////////////////////////////////// CMS.debug("ProfileSubmitCMCServlet: done serving"); @@ -812,11 +812,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -842,11 +842,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param request request containing an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index eb3b93eb8..64ab5f82d 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -73,7 +73,7 @@ import com.netscape.cmsutil.xml.XMLObject; /** * This servlet submits end-user request into the profile framework. - * + * * @author Christina Fu (renewal support) * @version $Revision$, $Date$ */ @@ -117,9 +117,9 @@ public class ProfileSubmitServlet extends ProfileServlet { * be set up to always issue certificates against a certain profile * by setting the 'profileId' configuration in the servletConfig * If not, the user must specify the profileID when submitting the request - * + * * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -154,7 +154,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } - /* + /* * fill input info from "request" to context. * This is expected to be used by renewal where the request * is retrieved from request record @@ -356,7 +356,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } } - /* + /* * fill input info from orig request to the renew request. * This is expected to be used by renewal where the request * is retrieved from request record @@ -439,17 +439,17 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Process the HTTP request * <P> - * + * * (Certificate Request Processed - either an automated "EE" profile based cert acceptance, or an automated "EE" * profile based cert rejection) * <P> - * + * * <ul> * <li>http.param profileId ID of profile to use to process request * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -488,7 +488,7 @@ public class ProfileSubmitServlet extends ProfileServlet { while (paramNames.hasMoreElements()) { String paramName = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -548,7 +548,7 @@ public class ProfileSubmitServlet extends ProfileServlet { * Framework. The authentication and authorization are taken from * the renewal profile, while the input (with requests) and grace * period constraint are taken from the original cert's request record. - * + * * Things to note: * * the renew request will contain the original profile instead * of the new @@ -614,7 +614,7 @@ public class ProfileSubmitServlet extends ProfileServlet { String serial = request.getParameter("serial_num"); BigInteger certSerial = null; // if serial number is sent with request, then the authentication - // method is not ssl client auth. In this case, an alternative + // method is not ssl client auth. In this case, an alternative // authentication method is used (default: ldap based) if (serial != null) { CMS.debug("ProfileSubmitServlet: renewal: found serial_num"); @@ -1199,7 +1199,7 @@ public class ProfileSubmitServlet extends ProfileServlet { // no profile set found CMS.debug("ProfileSubmitServlet: no profile policy set found"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), + outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); @@ -1246,10 +1246,10 @@ public class ProfileSubmitServlet extends ProfileServlet { return; } catch (Throwable e) { CMS.debug("ProfileSubmitServlet: populate " + e.toString()); - // throw new IOException("Profile " + profileId + + // throw new IOException("Profile " + profileId + // " cannot populate"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), + outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); @@ -1332,7 +1332,7 @@ public class ProfileSubmitServlet extends ProfileServlet { "CMS_PROFILE_DEFERRED", e.toString()); } catch (ERejectException e) { - // return error to the user + // return error to the user reqs[k].setRequestStatus(RequestStatus.REJECTED); CMS.debug("ProfileSubmitServlet: submit " + e.toString()); errorCode = "3"; @@ -1415,7 +1415,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } /////////////////////////////////////////////// - // output output list + // output output list /////////////////////////////////////////////// if (xmlOutput) { xmlOutput(response, profile, locale, reqs); @@ -1538,11 +1538,11 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -1568,11 +1568,11 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param request request containing an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java index d8fc68a69..b2043238b 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -62,7 +62,7 @@ import com.netscape.cms.servlet.common.RawJS; /** * Output a 'pretty print' of a certificate request - * + * * @version $Revision$, $Date$ */ public class CertReqParser extends ReqParser { @@ -82,7 +82,7 @@ public class CertReqParser extends ReqParser { /** * Constructs a certificate request parser. - * + * * @param details return detailed information (this can be time consuming) */ public CertReqParser(boolean details) { @@ -142,7 +142,7 @@ public class CertReqParser extends ReqParser { // show all http parameters stored in request. if (name.equalsIgnoreCase(IRequest.HTTP_PARAMS)) { Hashtable<String, String> http_params = req.getExtDataInHashtable(name); - // show certType specially + // show certType specially String certType = http_params.get(IRequest.CERT_TYPE); if (certType != null) { @@ -290,12 +290,12 @@ public class CertReqParser extends ReqParser { } if (name.equalsIgnoreCase(IRequest.CERT_INFO)) { - // Get the certificate info from the request + // Get the certificate info from the request X509CertInfo[] certInfo = req.getExtDataInCertInfoArray(IRequest.CERT_INFO); if (certInfo != null && certInfo[0] != null) { - // Get the subject name if any set. + // Get the subject name if any set. CertificateSubjectName subjectName = null; String signatureAlgorithm = null; String signatureAlgorithmName = null; @@ -410,7 +410,7 @@ public class CertReqParser extends ReqParser { } - // Get the public key + // Get the public key CertificateX509Key certKey = null; try { @@ -436,7 +436,7 @@ public class CertReqParser extends ReqParser { pp.toHexString(key.getKey(), 0, 16)); } - // Get the validity period + // Get the validity period CertificateValidity validity = null; try { @@ -444,7 +444,7 @@ public class CertReqParser extends ReqParser { (CertificateValidity) certInfo[0].get(X509CertInfo.VALIDITY); if (validity != null) { - long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - + long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - ((Date) validity.get(CertificateValidity.NOT_BEFORE)).getTime()) / 1000; arg.addLongValue("validityLength", validityLength); } @@ -694,7 +694,7 @@ public class CertReqParser extends ReqParser { // show all http parameters stored in request. if (name.equalsIgnoreCase(IRequest.HTTP_PARAMS)) { Hashtable<String, String> http_params = req.getExtDataInHashtable(name); - // show certType specially + // show certType specially String certType = http_params.get(IRequest.CERT_TYPE); if (certType != null) { @@ -818,7 +818,7 @@ public class CertReqParser extends ReqParser { } if (name.equalsIgnoreCase(IRequest.CERT_INFO)) { - // Get the certificate info from the request + // Get the certificate info from the request RevokedCertImpl revokedCert[] = req.getExtDataInRevokedCertArray(IRequest.CERT_INFO); if (mDetails && revokedCert != null) { diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java index b65c90fca..43b6d8901 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -83,7 +83,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Check the status of a certificate request - * + * * @version $Revision$, $Date$ */ public class CheckRequest extends CMSServlet { @@ -123,7 +123,7 @@ public class CheckRequest extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "requestStatus.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class CheckRequest extends CMSServlet { * the 'queryPending' parameter. * <li>http.param queryPending query formatted as a CMC request * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -329,7 +329,7 @@ public class CheckRequest extends CMSServlet { String type = r.getRequestType(); Integer result = r.getExtDataInInteger(IRequest.RESULT); - /* if (type.equals(IRequest.ENROLLMENT_REQUEST) && (r.get("profile") != null) && status.equals(RequestStatus.COMPLETE)) { + /* if (type.equals(IRequest.ENROLLMENT_REQUEST) && (r.get("profile") != null) && status.equals(RequestStatus.COMPLETE)) { X509CertImpl cert = (X509CertImpl) r.get(IEnrollProfile.REQUEST_ISSUED_CERT); IArgBlock rarg = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java index f90e97b70..7731efcb4 100644 --- a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java @@ -29,7 +29,7 @@ import com.netscape.cms.servlet.common.CMSTemplateParams; * converts Java request object into name value * pairs and vice versa. * <P> - * + * * @version $Revision$, $Date$ */ public interface IReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java index b7ddc16d4..6c863733f 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java @@ -30,7 +30,7 @@ import com.netscape.cms.servlet.key.KeyRecordParser; /** * Output a 'pretty print' of a Key Archival request - * + * * @version $Revision$, $Date$ */ public class KeyReqParser extends ReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java index 82b1efa07..0ea06f983 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java @@ -15,7 +15,7 @@ // (C) 2011 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- - + package com.netscape.cms.servlet.request; import javax.ws.rs.WebApplicationException; @@ -41,16 +41,16 @@ public class KeyRequestsResourceService extends CMSResourceService implements Ke public KeyRequestInfos listRequests(String requestState, String requestType, String clientID, RequestId start, int pageSize, int maxResults, int maxTime) { // auth and authz - + // get ldap filter String filter = createSearchFilter(requestState, requestType, clientID); CMS.debug("listRequests: filter is " + filter); - + // get start marker if (start == null) { start = new RequestId(KeyRequestsResource.DEFAULT_START); } - + KeyRequestDAO reqDAO = new KeyRequestDAO(); KeyRequestInfos requests; try { @@ -66,31 +66,31 @@ public class KeyRequestsResourceService extends CMSResourceService implements Ke private String createSearchFilter(String requestState, String requestType, String clientID) { String filter = ""; int matches = 0; - + if ((requestState == null) && (requestType == null) && (clientID == null)) { filter = "(requeststate=*)"; return filter; } - + if (requestState != null) { filter += "(requeststate=" + LDAPUtil.escape(requestState) + ")"; matches ++; } - + if (requestType != null) { filter += "(requesttype=" + LDAPUtil.escape(requestType) + ")"; matches ++; } - + if (clientID != null) { filter += "(clientID=" + LDAPUtil.escape(clientID) + ")"; matches ++; } - + if (matches > 1) { filter = "(&" + filter + ")"; } - + return filter; } } diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java index 9c173d832..bf8decd69 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java @@ -52,7 +52,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Display Generic Request detail to the user. - * + * * @version $Revision$, $Date$ */ public class ProcessReq extends CMSServlet { @@ -94,7 +94,7 @@ public class ProcessReq extends CMSServlet { * <LI><B>CertReqParser.DETAIL_PARSER</B> - Show certificate detail * <LI><B>KeyReqParser.PARSER</B> - Show key archival detail * </UL> - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -113,7 +113,7 @@ public class ProcessReq extends CMSServlet { mParser = KeyReqParser.PARSER; } - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); @@ -127,7 +127,7 @@ public class ProcessReq extends CMSServlet { * <li>http.param seqNum * <li>http.param doAssign reassign request. Value can be reassignToMe reassignToNobody * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -261,7 +261,7 @@ public class ProcessReq extends CMSServlet { } } - // add authority names to know what privileges can be requested. + // add authority names to know what privileges can be requested. if (CMS.getSubsystem("kra") != null) header.addStringValue("localkra", "yes"); if (CMS.getSubsystem("ca") != null) @@ -272,8 +272,8 @@ public class ProcessReq extends CMSServlet { // DONT NEED TO DO THIS FOR DRM if (mAuthority instanceof ICertAuthority) { // Check/set signing algorithms dynamically. - // In RA mSigningAlgorithms could be null at startup if CA is not - // up and set later when CA comes back up. + // In RA mSigningAlgorithms could be null at startup if CA is not + // up and set later when CA comes back up. // Once it's set assumed that it won't change. String[] allAlgorithms = mSigningAlgorithms; diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java index f6ae634f4..f18fabc6a 100644 --- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Show paged list of requests matching search criteria - * + * * @version $Revision$, $Date$ */ public class QueryReq extends CMSServlet { @@ -118,7 +118,7 @@ public class QueryReq extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "queryReq.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class QueryReq extends CMSServlet { mParser = KeyReqParser.PARSER; } - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); @@ -222,7 +222,7 @@ public class QueryReq extends CMSServlet { * <li>http.param totalCount total number of records in set of pages * <li>http.param direction "up", "down", "begin", or "end" * </ul> - * + * * @param cmsReq the object holding the request and response information */ @@ -254,7 +254,7 @@ public class QueryReq extends CMSServlet { Locale[] locale = new Locale[1]; try { - // if get a EBaseException we just throw it. + // if get a EBaseException we just throw it. form = getTemplate(mFormPath, req, locale); } catch (IOException e) { log(ILogger.LL_FAILURE, @@ -265,9 +265,9 @@ public class QueryReq extends CMSServlet { /** * WARNING: - * + * * PLEASE DO NOT TOUCH THE FILTER HERE. ALL FILTERS ARE INDEXED. - * + * **/ String filter = null; String reqState = req.getParameter("reqState"); @@ -353,7 +353,7 @@ public class QueryReq extends CMSServlet { /** * Perform search based on direction button pressed - * + * * @param filter ldap filter indicating which VLV to search through. This can be * 'all requests', 'pending', etc * @param count the number of requests to show per page @@ -382,7 +382,7 @@ public class QueryReq extends CMSServlet { } /** - * + * * @param locale * @param filter the types of requests to return - this must match the VLV index * @param count maximum number of records to return @@ -411,7 +411,7 @@ public class QueryReq extends CMSServlet { boolean jumptoend = false; if (marker.toString().equals("-1")) { marker = BigInteger.ZERO; // I think this is inconsequential - jumptoend = true; // override to '99' during search + jumptoend = true; // override to '99' during search } RequestId id = new RequestId(marker); @@ -487,7 +487,7 @@ public class QueryReq extends CMSServlet { /** * If the vector contains the marker element at the end, remove it. - * + * * @param v The vector to trim * @param marker the marker to look for. */ @@ -502,7 +502,7 @@ public class QueryReq extends CMSServlet { /** * Sometimes the list comes back from LDAP in reverse order. This function makes * sure the results are in 'forward' order. - * + * * @param list * @return */ @@ -527,7 +527,7 @@ public class QueryReq extends CMSServlet { /** * If the requests are in backwards order, reverse the list - * + * * @param list * @return */ diff --git a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java index 230ddb433..4a6a79072 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java @@ -29,7 +29,7 @@ import com.netscape.cms.servlet.common.CMSTemplateParams; /** * A class representing a request parser. * <P> - * + * * @version $Revision$, $Date$ */ public class ReqParser implements IReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index 08d5805b6..b9fa461fd 100644 --- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Search for certificates matching complex query filter - * + * * @version $Revision$, $Date$ */ public class SearchReqs extends CMSServlet { @@ -90,7 +90,7 @@ public class SearchReqs extends CMSServlet { /** * initialize the servlet. This servlet uses queryReq.template * to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java index 8a25c6684..bcc51bf96 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.request.model; @@ -42,21 +42,21 @@ public class ArchivalRequestData { @XmlElement protected String clientId; - + @XmlElement protected String transWrappedSessionKey; - + @XmlElement protected String dataType; - + @XmlElement protected String wrappedPrivateData; - + public ArchivalRequestData() { // required for JAXB (defaults) } - - public ArchivalRequestData(MultivaluedMap<String, String> form) { + + public ArchivalRequestData(MultivaluedMap<String, String> form) { clientId = form.getFirst(CLIENT_ID); transWrappedSessionKey = form.getFirst(TRANS_WRAPPED_SESSION_KEY); dataType = form.getFirst(DATA_TYPE); @@ -118,6 +118,6 @@ public class ArchivalRequestData { public void setWrappedPrivateData(String wrappedPrivateData) { this.wrappedPrivateData = wrappedPrivateData; } - + } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java index d1f1a27bd..aaea45398 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java @@ -53,20 +53,20 @@ public class KeyRequestDAO { private IKeyRecoveryAuthority kra; private static String REQUEST_ARCHIVE_OPTIONS = IEnrollProfile.REQUEST_ARCHIVE_OPTIONS; - + private String[] vlvFilters = { "(requeststate=*)", "(requesttype=enrollment)", "(requesttype=recovery)", "(requeststate=canceled)", "(&(requeststate=canceled)(requesttype=enrollment))", - "(&(requeststate=canceled)(requesttype=recovery))", - "(requeststate=rejected)", + "(&(requeststate=canceled)(requesttype=recovery))", + "(requeststate=rejected)", "(&(requeststate=rejected)(requesttype=enrollment))", "(&(requeststate=rejected)(requesttype=recovery))", "(requeststate=complete)", "(&(requeststate=complete)(requesttype=enrollment))", "(&(requeststate=complete)(requesttype=recovery))" }; - + public static final String ATTR_SERIALNO = "serialNumber"; public KeyRequestDAO() { @@ -75,12 +75,12 @@ public class KeyRequestDAO { } /** - * Finds list of requests matching the specified search filter. - * - * If the filter corresponds to a VLV search, then that search is executed and the pageSize + * Finds list of requests matching the specified search filter. + * + * If the filter corresponds to a VLV search, then that search is executed and the pageSize * and start parameters are used. Otherwise, the maxResults and maxTime parameters are * used in the regularly indexed search. - * + * * @param filter - ldap search filter * @param start - start position for VLV search * @param pageSize - page size for VLV search @@ -96,16 +96,16 @@ public class KeyRequestDAO { List <Link> links = new ArrayList<Link>(); int totalSize = 0; int current = 0; - + if (isVLVSearch(filter)) { IRequestVirtualList vlvlist = queue.getPagedRequestsByFilter(start, false, filter, pageSize +1 , "requestId"); totalSize = vlvlist.getSize(); current = vlvlist.getCurrentIndex(); - + int numRecords = (totalSize > (current + pageSize)) ? pageSize : totalSize - current; - + for (int i=0; i < numRecords; i++) { IRequest request = vlvlist.getElementAt(i); list.add(createKeyRequestInfo(request, uriInfo)); @@ -127,7 +127,7 @@ public class KeyRequestDAO { } } } - + // builder for vlv links MultivaluedMap<String, String> params = uriInfo.getQueryParameters(); UriBuilder builder = uriInfo.getAbsolutePathBuilder(); @@ -139,7 +139,7 @@ public class KeyRequestDAO { } builder.queryParam("start", "{start}"); builder.queryParam("pageSize", "{pageSize}"); - + // next link if (totalSize > current + pageSize) { int next = current + pageSize + 1; @@ -147,7 +147,7 @@ public class KeyRequestDAO { Link nextLink = new Link("next", nextUri.toString(), "application/xml"); links.add(nextLink); } - + // previous link if (current >0) { int previous = current - pageSize; @@ -155,18 +155,18 @@ public class KeyRequestDAO { Link previousLink = new Link("previous", previousUri.toString(), "application/xml"); links.add(previousLink); } - + KeyRequestInfos ret = new KeyRequestInfos(); ret.setRequests(list); ret.setLinks(links); return ret; } - + /** * Gets info for a specific request * @param id * @return info for specific request - * @throws EBaseException + * @throws EBaseException */ public KeyRequestInfo getRequest(RequestId id, UriInfo uriInfo) throws EBaseException { IRequest request = queue.findRequest(id); @@ -180,7 +180,7 @@ public class KeyRequestDAO { * Submits an archival request and processes it. * @param data * @return info for the request submitted. - * @throws EBaseException + * @throws EBaseException */ public KeyRequestInfo submitRequest(ArchivalRequestData data, UriInfo uriInfo) throws EBaseException { String clientId = data.getClientId(); @@ -209,9 +209,9 @@ public class KeyRequestDAO { * Submits a key recovery request. * @param data * @return info on the recovery request created - * @throws EBaseException + * @throws EBaseException */ - public KeyRequestInfo submitRequest(RecoveryRequestData data, UriInfo uriInfo) throws EBaseException { + public KeyRequestInfo submitRequest(RecoveryRequestData data, UriInfo uriInfo) throws EBaseException { // set data using request.setExtData(field, data) @@ -256,42 +256,42 @@ public class KeyRequestDAO { request.setRequestStatus(RequestStatus.APPROVED); queue.updateRequest(request); } - + public void rejectRequest(RequestId id) throws EBaseException { IRequest request = queue.findRequest(id); request.setRequestStatus(RequestStatus.CANCELED); queue.updateRequest(request); } - + public void cancelRequest(RequestId id) throws EBaseException { IRequest request = queue.findRequest(id); request.setRequestStatus(RequestStatus.REJECTED); queue.updateRequest(request); } - + public KeyRequestInfo createKeyRequestInfo(IRequest request, UriInfo uriInfo) { KeyRequestInfo ret = new KeyRequestInfo(); - + ret.setRequestType(request.getRequestType()); ret.setRequestStatus(request.getRequestStatus().toString()); - + Path keyRequestPath = KeyRequestResource.class.getAnnotation(Path.class); RequestId rid = request.getRequestId(); UriBuilder reqBuilder = uriInfo.getBaseUriBuilder(); reqBuilder.path(keyRequestPath.value() + "/" + rid); ret.setRequestURL(reqBuilder.build().toString()); - + Path keyPath = KeyResource.class.getAnnotation(Path.class); String kid = request.getExtDataInString("keyrecord"); UriBuilder keyBuilder = uriInfo.getBaseUriBuilder(); keyBuilder.path(keyPath.value() + "/" + kid); ret.setKeyURL(keyBuilder.build().toString()); - + return ret; } - + private boolean isVLVSearch(String filter) { for (int i=0; i < vlvFilters.length; i++) { if (vlvFilters[i].equalsIgnoreCase(filter)) { diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java index f07c302dd..fd3be8044 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java @@ -32,20 +32,20 @@ public class KeyRequestInfo { @XmlElement protected String requestType; - + @XmlElement protected String requestStatus; - + @XmlElement protected String requestURL; - + @XmlElement protected String keyURL; - + public KeyRequestInfo(){ // required to be here for JAXB (defaults) } - + /** * @return the requestType */ diff --git a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java index 80ec6d127..335414792 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.request.model; @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.RequestIdAdapter; @XmlRootElement(name="SecurityDataRecoveryRequest") @XmlAccessorType(XmlAccessType.FIELD) public class RecoveryRequestData { - + private static final String KEY_ID = "keyId"; private static final String REQUEST_ID = "requestId"; private static final String TRANS_WRAPPED_SESSION_KEY = "transWrappedSessionKey"; @@ -50,24 +50,24 @@ public class RecoveryRequestData { @XmlElement @XmlJavaTypeAdapter(KeyIdAdapter.class) protected KeyId keyId; - + @XmlElement @XmlJavaTypeAdapter(RequestIdAdapter.class) protected RequestId requestId; - + @XmlElement protected String transWrappedSessionKey; - + @XmlElement protected String sessionWrappedPassphrase; - + @XmlElement protected String nonceData; public RecoveryRequestData() { // required for JAXB (defaults) } - + public RecoveryRequestData(MultivaluedMap<String, String> form) { if (form.containsKey(KEY_ID)) { keyId = new KeyId(form.getFirst(KEY_ID)); diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java index c96a30a85..d4801e794 100644 --- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java +++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java @@ -54,7 +54,7 @@ import com.netscape.symkey.SessionKey; * Service Authority. This servlet is responsible to serve * tks administrative operation such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public class TokenServlet extends CMSServlet { @@ -134,7 +134,7 @@ public class TokenServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -143,7 +143,7 @@ public class TokenServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param s The URL to decode. */ protected String URLdecode(String s) { @@ -455,7 +455,7 @@ public class TokenServlet extends CMSServlet { // (1) generate DES key /* applet does not support DES3 - org.mozilla.jss.crypto.KeyGenerator kg = + org.mozilla.jss.crypto.KeyGenerator kg = internalToken.getKeyGenerator(KeyGenAlgorithm.DES3); desKey = kg.generate();*/ @@ -1148,19 +1148,19 @@ public class TokenServlet extends CMSServlet { audit(auditMessage); } - /* + /* * For EncryptData: * data=value1 * CUID=value2 // missing from RA * versionID=value3 // missing from RA * - * For ComputeSession: + * For ComputeSession: * card_challenge=value1 * host_challenge=value2 - + * For DiversifyKey: * new_master_key_index - * master_key_index + * master_key_index */ private void processComputeRandomData(HttpServletRequest req, @@ -1329,7 +1329,7 @@ public class TokenServlet extends CMSServlet { /** * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ diff --git a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java index aee57858f..6c5211650 100644 --- a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java +++ b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java @@ -222,7 +222,7 @@ public class WizardServlet extends VelocityServlet { public int getPanelNo(HttpServletRequest request) { int p = 0; - // panel number can be identified by either + // panel number can be identified by either // panel no (p parameter) directly, or // panel name (panelname parameter). if (request.getParameter("panelname") != null) { @@ -424,7 +424,7 @@ public class WizardServlet extends VelocityServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed diff --git a/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/base/common/src/com/netscape/cms/shares/OldJoinShares.java index f01e1e1c3..cda8dddfe 100644 --- a/base/common/src/com/netscape/cms/shares/OldJoinShares.java +++ b/base/common/src/com/netscape/cms/shares/OldJoinShares.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.kra.IJoinShares; /** * Use Java's reflection API to leverage CMS's * old Share and JoinShares implementations. - * + * * @deprecated * @version $Revision$ $Date$ */ diff --git a/base/common/src/com/netscape/cms/shares/OldShare.java b/base/common/src/com/netscape/cms/shares/OldShare.java index 4020e759e..2bf27f5ab 100644 --- a/base/common/src/com/netscape/cms/shares/OldShare.java +++ b/base/common/src/com/netscape/cms/shares/OldShare.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.kra.IShare; /** * Use Java's reflection API to leverage CMS's * old Share and JoinShares implementations. - * + * * @deprecated * @version $Revision$ $Date$ */ |