From 40d3643b8d91886bf210aa27f711731c81a11e49 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Fri, 23 Mar 2012 16:19:59 -0400 Subject: Added policy deprecations Many of the policy deprecation warnings come from classes that probably ought to be deprecated as part of the deprecated policy framework as well. Making these as deprecated removes the deprecation warnings - and we can really see where we make sure of deprecated policy code elsewhere. Also removed some URLEncoder, Decoder deprecations --- .../common/src/com/netscape/certsrv/ca/ICertificateAuthority.java | 2 +- .../src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java | 2 +- .../src/com/netscape/certsrv/ra/IRegistrationAuthority.java | 2 +- .../src/com/netscape/cms/publish/publishers/OCSPPublisher.java | 6 +++--- .../common/src/com/netscape/cms/servlet/admin/AdminServlet.java | 4 ++-- .../src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java | 1 + .../common/src/com/netscape/cms/servlet/csadmin/DonePanel.java | 2 +- .../common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java | 8 +++++++- .../common/src/com/netscape/cmscore/policy/AndExpression.java | 1 + .../common/src/com/netscape/cmscore/policy/GeneralNameUtil.java | 1 + .../src/com/netscape/cmscore/policy/GenericPolicyProcessor.java | 4 ++++ .../src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java | 5 +++++ pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java | 1 + .../src/com/netscape/cmscore/policy/PolicyPredicateParser.java | 1 + pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java | 1 + .../common/src/com/netscape/cmscore/policy/SimpleExpression.java | 1 + 16 files changed, 32 insertions(+), 10 deletions(-) (limited to 'pki/base/common/src') diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java index a49653c12..25bc9cabe 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java @@ -125,7 +125,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the policy processor of this certificate authority. - * + * @deprecated * @return CA's policy processor */ public IPolicyProcessor getPolicyProcessor(); diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java index 0171115ee..a7cc40507 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java @@ -206,7 +206,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns policy processor of the key recovery * authority. - * + * @deprecated * @return policy processor */ public IPolicyProcessor getPolicyProcessor(); diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java index 193a6d9bd..8302e2d23 100644 --- a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java @@ -69,7 +69,7 @@ public interface IRegistrationAuthority extends ISubsystem { /** * Retrieves the policy processor of this registration authority. - * + * @deprecated * @return RA's policy processor */ public IPolicyProcessor getPolicyProcessor(); diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java index 80abd5f77..600bbd110 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java @@ -237,9 +237,9 @@ public class OCSPPublisher implements ILdapPublisher, IExtendedPluginInfo { StringBuffer query = new StringBuffer(); query.append("crl="); - query.append(URLEncoder.encode("-----BEGIN CERTIFICATE REVOCATION LIST-----\n")); - query.append(URLEncoder.encode(CMS.BtoA(crl.getEncoded()))); - query.append(URLEncoder.encode("\n-----END CERTIFICATE REVOCATION LIST-----")); + query.append(URLEncoder.encode("-----BEGIN CERTIFICATE REVOCATION LIST-----\n", "UTF-8")); + query.append(URLEncoder.encode(CMS.BtoA(crl.getEncoded()), "UTF-8")); + query.append(URLEncoder.encode("\n-----END CERTIFICATE REVOCATION LIST-----", "UTF-8")); query.append("&noui=true"); Socket socket = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index dbcba085d..ce4c966ad 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -798,9 +798,9 @@ public class AdminServlet extends HttpServlet { for (Iterator i = names.iterator(); i.hasNext(); ) { String name = i.next(); String value = java.net.URLEncoder.encode( - params.get(name)); + params.get(name), "UTF-8"); - buf.append(java.net.URLEncoder.encode(name) + + buf.append(java.net.URLEncoder.encode(name, "UTF-8") + "=" + value); if (i.hasNext()) buf.append("&"); diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index f656cbd44..0bcb962ea 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -50,6 +50,7 @@ import com.netscape.certsrv.ra.IRegistrationAuthority; * for registering an instance of this with the remote * administration subsystem. * + * @deprecated * @version $Revision$, $Date$ */ public class PolicyAdminServlet extends AdminServlet { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index 663435cba..6d0e92618 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -849,7 +849,7 @@ public class DonePanel extends WizardPanelBase { + "&ca.connector.KRA.port=" + ownagentsport + "&ca.connector.KRA.transportCert=" - + URLEncoder.encode(transportCert) + + URLEncoder.encode(transportCert, "UTF-8") + "&sessionID=" + session_id; diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java index 3d5e93a56..3ab20141c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.ServletConfig; @@ -124,7 +125,12 @@ public class OCSPServlet extends CMSServlet { CMS.debug("RequestURI=" + httpReq.getRequestURI()); String pathInfo = httpReq.getPathInfo(); if (pathInfo != null && pathInfo.indexOf('%') != -1) { - pathInfo = URLDecoder.decode(pathInfo); + try { + pathInfo = URLDecoder.decode(pathInfo, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + throw new EBaseException("OCSPServlet: Unsupported encoding" + e); + } } CMS.debug("PathInfo=" + pathInfo); diff --git a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java index 7e704dfbf..459660f1e 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java @@ -27,6 +27,7 @@ import com.netscape.certsrv.request.IRequest; * * Expressions are used as predicates for policy selection. * + * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java index 6afaea997..7c7162d0c 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -53,6 +53,7 @@ import com.netscape.cmsutil.util.Utils; /** * Class that can be used to form general names from configuration file. * Used by policies and extension commands. + * @deprecated */ public class GeneralNameUtil implements IGeneralNameUtil { diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java index c9cc25997..05f8e111a 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -60,6 +60,7 @@ import com.netscape.cmscore.util.Debug; * the processor itself presents itself as one big policy to the * request processor. * + * @deprecated * @author kanda * @version $Revision$, $Date$ */ @@ -1494,6 +1495,9 @@ class RegisteredPolicy { } } +/** + * @deprecated + */ class PolicyInstance { String mInstanceId; String mImplId; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java index e9a7371d9..1fbcf2738 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java @@ -21,6 +21,11 @@ import com.netscape.certsrv.policy.IPolicyRule; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; +/** + * + * @deprecated + * + */ public class JavaScriptRequestProxy { IRequest req; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java index ec461fb9a..3b220c100 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java @@ -27,6 +27,7 @@ import com.netscape.certsrv.request.IRequest; * * Expressions are used as predicates for policy selection. * + * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index 6c73bcb96..568a38e6d 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -36,6 +36,7 @@ import com.netscape.cmscore.util.Debug; * is treated as (a AND b) OR e OR (c AND d) * 4. If this is n't adequate, roll your own. * + * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java index bd38138ff..9e7ecdc64 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -33,6 +33,7 @@ import com.netscape.cmscore.util.Debug; * Implements a policy set per IPolicySet interface. This class * uses a vector of ordered policies to enforce priority. * + * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java index c84441468..892fd6451 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -33,6 +33,7 @@ import com.netscape.cmscore.util.Debug; * * Expressions are used as predicates for policy selection. * + * @deprecated * @author kanda * @version $Revision$, $Date$ */ -- cgit