diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/policy')
8 files changed, 785 insertions, 891 deletions
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 d58cfe132..e55bc24d6 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java @@ -17,31 +17,29 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import com.netscape.certsrv.policy.EPolicyException; import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; - /** - * This class represents an expression of the form - * <var1 op val1 AND var2 op va2>. - * + * This class represents an expression of the form <var1 op val1 AND var2 op + * va2>. + * * Expressions are used as predicates for policy selection. - * + * * @author kanda * @version $Revision$, $Date$ */ public class AndExpression implements IExpression { private IExpression mExp1; private IExpression mExp2; + public AndExpression(IExpression exp1, IExpression exp2) { mExp1 = exp1; mExp2 = exp2; } - public boolean evaluate(IRequest req) - throws EPolicyException { + public boolean evaluate(IRequest req) throws EPolicyException { // If an expression is missing we assume applicability. if (mExp1 == null && mExp2 == null) return true; @@ -49,7 +47,8 @@ public class AndExpression implements IExpression { return mExp1.evaluate(req) && mExp2.evaluate(req); else if (mExp1 == null) return mExp2.evaluate(req); - else // (if mExp2 == null) + else + // (if mExp2 == null) return mExp1.evaluate(req); } 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 8f16548db..4f518bc8b 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Enumeration; @@ -50,23 +49,21 @@ import com.netscape.certsrv.policy.IGeneralNamesConfig; import com.netscape.certsrv.policy.ISubjAltNameConfig; import com.netscape.cmscore.util.Debug; - -/** - * Class that can be used to form general names from configuration file. - * Used by policies and extension commands. +/** + * Class that can be used to form general names from configuration file. Used by + * policies and extension commands. */ public class GeneralNameUtil implements IGeneralNameUtil { private static final String DOT = "."; /** - * GeneralName can be used in the context of Constraints. Examples - * are NameConstraints, CertificateScopeOfUse extensions. In such - * cases, IPAddress may contain netmask component. + * GeneralName can be used in the context of Constraints. Examples are + * NameConstraints, CertificateScopeOfUse extensions. In such cases, + * IPAddress may contain netmask component. */ - static public GeneralName - form_GeneralNameAsConstraints(String generalNameChoice, String value) - throws EBaseException { + static public GeneralName form_GeneralNameAsConstraints( + String generalNameChoice, String value) throws EBaseException { try { if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_IPADDRESS)) { StringTokenizer st = new StringTokenizer(value, ","); @@ -81,21 +78,22 @@ public class GeneralNameUtil implements IGeneralNameUtil { return form_GeneralName(generalNameChoice, value); } } catch (InvalidIPAddressException e) { - throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_IP_ADDR", value)); + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INVALID_IP_ADDR", value)); } } /** - * Form a General Name from a General Name choice and value. - * The General Name choice must be one of the General Name Choice Strings - * defined in this class. - * @param generalNameChoice General Name choice. Must be one of the General - * Name choices defined in this class. + * Form a General Name from a General Name choice and value. The General + * Name choice must be one of the General Name Choice Strings defined in + * this class. + * + * @param generalNameChoice General Name choice. Must be one of the General + * Name choices defined in this class. * @param value String value of the general name to form. */ - static public GeneralName - form_GeneralName(String generalNameChoice, String value) - throws EBaseException { + static public GeneralName form_GeneralName(String generalNameChoice, + String value) throws EBaseException { GeneralNameInterface generalNameI = null; DerValue derVal = null; GeneralName generalName = null; @@ -106,67 +104,73 @@ public class GeneralNameUtil implements IGeneralNameUtil { derVal = new DerValue(new ByteArrayInputStream(val)); Debug.trace("otherName formed"); - } else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_RFC822NAME)) { + } else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_RFC822NAME)) { generalNameI = new RFC822Name(value); Debug.trace("rfc822Name formed "); - } else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_DNSNAME)) { + } else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_DNSNAME)) { generalNameI = new DNSName(value); Debug.trace("dnsName formed"); - } /** not supported -- no sun class - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_X400ADDRESS)) { - } - **/ else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_DIRECTORYNAME)) { + }/** + * not supported -- no sun class else if + * (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_X400ADDRESS)) + * { } + **/ + else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_DIRECTORYNAME)) { generalNameI = new X500Name(value); Debug.trace("X500Name formed"); - } else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_EDIPARTYNAME)) { + } else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_EDIPARTYNAME)) { generalNameI = new EDIPartyName(value); Debug.trace("ediPartyName formed"); } else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_URL)) { generalNameI = new URIName(value); Debug.trace("url formed"); - } else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_IPADDRESS)) { + } else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_IPADDRESS)) { generalNameI = new IPAddressName(value); Debug.trace("ipaddress formed"); - } else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_REGISTEREDID)) { + } else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_REGISTEREDID)) { ObjectIdentifier oid; try { oid = new ObjectIdentifier(value); } catch (Exception e) { - throw new EBaseException( - CMS.getUserMessage("CMS_BASE_INVALID_VALUE_FOR_TYPE", - generalNameChoice, - "value must be a valid OID in the form n.n.n.n")); + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INVALID_VALUE_FOR_TYPE", + generalNameChoice, + "value must be a valid OID in the form n.n.n.n")); } generalNameI = new OIDName(oid); Debug.trace("oidname formed"); } else { - throw new EBaseException( - CMS.getUserMessage("CMS_BASE_INVALID_ATTR_VALUE", - new String[] { + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INVALID_ATTR_VALUE", new String[] { PROP_GENNAME_CHOICE, - "value must be one of: " + - GENNAME_CHOICE_OTHERNAME + ", " + - GENNAME_CHOICE_RFC822NAME + ", " + - GENNAME_CHOICE_DNSNAME + ", " + - - /* GENNAME_CHOICE_X400ADDRESS +", "+ */ - GENNAME_CHOICE_DIRECTORYNAME + ", " + - GENNAME_CHOICE_EDIPARTYNAME + ", " + - GENNAME_CHOICE_URL + ", " + - GENNAME_CHOICE_IPADDRESS + ", or " + - GENNAME_CHOICE_REGISTEREDID + "." - } - )); + "value must be one of: " + + GENNAME_CHOICE_OTHERNAME + ", " + + GENNAME_CHOICE_RFC822NAME + ", " + + GENNAME_CHOICE_DNSNAME + ", " + + + /* GENNAME_CHOICE_X400ADDRESS +", "+ */ + GENNAME_CHOICE_DIRECTORYNAME + ", " + + GENNAME_CHOICE_EDIPARTYNAME + ", " + + GENNAME_CHOICE_URL + ", " + + GENNAME_CHOICE_IPADDRESS + ", or " + + GENNAME_CHOICE_REGISTEREDID + "." })); } } catch (IOException e) { Debug.printStackTrace(e); - throw new EBaseException( - CMS.getUserMessage("CMS_BASE_INVALID_VALUE_FOR_TYPE", - generalNameChoice, e.toString())); + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INVALID_VALUE_FOR_TYPE", generalNameChoice, + e.toString())); } catch (InvalidIPAddressException e) { Debug.printStackTrace(e); - throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_IP_ADDR", value)); + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INVALID_IP_ADDR", value)); } catch (RuntimeException e) { Debug.printStackTrace(e); throw e; @@ -181,68 +185,70 @@ public class GeneralNameUtil implements IGeneralNameUtil { return generalName; } catch (IOException e) { Debug.printStackTrace(e); - throw new EBaseException( - CMS.getUserMessage("CMS_BASE_INTERNAL_ERROR", "Could not form GeneralName. Error: " + e)); + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INTERNAL_ERROR", + "Could not form GeneralName. Error: " + e)); } } /** - * Checks if given string is a valid General Name choice and returns - * the actual string that can be passed into form_GeneralName(). + * Checks if given string is a valid General Name choice and returns the + * actual string that can be passed into form_GeneralName(). + * * @param generalNameChoice a General Name choice string. - * @return one of General Name choices defined in this class that can be - * passed into form_GeneralName(). + * @return one of General Name choices defined in this class that can be + * passed into form_GeneralName(). */ - static public String check_GeneralNameChoice(String generalNameChoice) - throws EBaseException { + static public String check_GeneralNameChoice(String generalNameChoice) + throws EBaseException { String theGeneralNameChoice = null; - if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_OTHERNAME)) + if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_OTHERNAME)) theGeneralNameChoice = GENNAME_CHOICE_OTHERNAME; - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_RFC822NAME)) + else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_RFC822NAME)) theGeneralNameChoice = GENNAME_CHOICE_RFC822NAME; - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_DNSNAME)) + else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_DNSNAME)) theGeneralNameChoice = GENNAME_CHOICE_DNSNAME; - /* X400Address not supported. - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_X400ADDRESS)) - theGeneralNameChoice = GENNAME_CHOICE_X400ADDRESS; - */ - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_DIRECTORYNAME)) + /* + * X400Address not supported. else if + * (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_X400ADDRESS)) + * theGeneralNameChoice = GENNAME_CHOICE_X400ADDRESS; + */ + else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_DIRECTORYNAME)) theGeneralNameChoice = GENNAME_CHOICE_DIRECTORYNAME; - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_EDIPARTYNAME)) + else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_EDIPARTYNAME)) theGeneralNameChoice = GENNAME_CHOICE_EDIPARTYNAME; - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_URL)) + else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_URL)) theGeneralNameChoice = GENNAME_CHOICE_URL; - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_IPADDRESS)) + else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_IPADDRESS)) theGeneralNameChoice = GENNAME_CHOICE_IPADDRESS; - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_REGISTEREDID)) + else if (generalNameChoice + .equalsIgnoreCase(GENNAME_CHOICE_REGISTEREDID)) theGeneralNameChoice = GENNAME_CHOICE_REGISTEREDID; else { - throw new EBaseException( - CMS.getUserMessage("CMS_BASE_INVALID_ATTR_VALUE", - new String[] { + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INVALID_ATTR_VALUE", new String[] { PROP_GENNAME_CHOICE + "=" + generalNameChoice, - "value must be one of: " + - GENNAME_CHOICE_OTHERNAME + ", " + - GENNAME_CHOICE_RFC822NAME + ", " + - GENNAME_CHOICE_DNSNAME + ", " + - - /* GENNAME_CHOICE_X400ADDRESS +", "+ */ - GENNAME_CHOICE_DIRECTORYNAME + ", " + - GENNAME_CHOICE_EDIPARTYNAME + ", " + - GENNAME_CHOICE_URL + ", " + - GENNAME_CHOICE_IPADDRESS + ", " + - GENNAME_CHOICE_REGISTEREDID + "." - } - )); + "value must be one of: " + GENNAME_CHOICE_OTHERNAME + + ", " + GENNAME_CHOICE_RFC822NAME + ", " + + GENNAME_CHOICE_DNSNAME + ", " + + + /* GENNAME_CHOICE_X400ADDRESS +", "+ */ + GENNAME_CHOICE_DIRECTORYNAME + ", " + + GENNAME_CHOICE_EDIPARTYNAME + ", " + + GENNAME_CHOICE_URL + ", " + + GENNAME_CHOICE_IPADDRESS + ", " + + GENNAME_CHOICE_REGISTEREDID + "." })); } return theGeneralNameChoice; } static public class GeneralNamesConfig implements IGeneralNamesConfig { public String mName = null; // substore name of config if any. - public GeneralNameConfig[] mGenNameConfigs = null; + public GeneralNameConfig[] mGenNameConfigs = null; public IConfigStore mConfig = null; public boolean mIsValueConfigured = true; public boolean mIsPolicyEnabled = true; @@ -251,39 +257,33 @@ public class GeneralNameUtil implements IGeneralNameUtil { private String mNameDotGeneralName = mName + DOT + PROP_GENERALNAME; - public GeneralNamesConfig( - String name, - IConfigStore config, - boolean isValueConfigured, - boolean isPolicyEnabled) - throws EBaseException { + public GeneralNamesConfig(String name, IConfigStore config, + boolean isValueConfigured, boolean isPolicyEnabled) + throws EBaseException { mIsValueConfigured = isValueConfigured; mIsPolicyEnabled = isPolicyEnabled; mName = name; - if (mName != null) + if (mName != null) mNameDotGeneralName = mName + DOT + PROP_GENERALNAME; - else + else mNameDotGeneralName = PROP_GENERALNAME; mConfig = config; int numGNs = mConfig.getInteger(PROP_NUM_GENERALNAMES); if (numGNs < 0) { - throw new EBaseException( - CMS.getUserMessage("CMS_BASE_INVALID_ATTR_VALUE", - new String[] { - PROP_NUM_GENERALNAMES + "=" + numGNs, - "value must be greater than or equal to 0."} - )); + throw new EBaseException(CMS.getUserMessage( + "CMS_BASE_INVALID_ATTR_VALUE", new String[] { + PROP_NUM_GENERALNAMES + "=" + numGNs, + "value must be greater than or equal to 0." })); } mGenNameConfigs = new GeneralNameConfig[numGNs]; for (int i = 0; i < numGNs; i++) { String storeName = mNameDotGeneralName + i; - mGenNameConfigs[i] = - newGeneralNameConfig( - storeName, mConfig.getSubStore(storeName), - mIsValueConfigured, mIsPolicyEnabled); + mGenNameConfigs[i] = newGeneralNameConfig(storeName, + mConfig.getSubStore(storeName), mIsValueConfigured, + mIsPolicyEnabled); } if (mIsValueConfigured && mIsPolicyEnabled) { @@ -298,12 +298,11 @@ public class GeneralNameUtil implements IGeneralNameUtil { return mGeneralNames; } - protected GeneralNameConfig newGeneralNameConfig( - String name, IConfigStore config, - boolean isValueConfigured, boolean isPolicyEnabled) - throws EBaseException { - return new GeneralNameConfig( - name, config, isValueConfigured, isPolicyEnabled); + protected GeneralNameConfig newGeneralNameConfig(String name, + IConfigStore config, boolean isValueConfigured, + boolean isPolicyEnabled) throws EBaseException { + return new GeneralNameConfig(name, config, isValueConfigured, + isPolicyEnabled); } public GeneralNameConfig[] getGenNameConfig() { @@ -334,20 +333,20 @@ public class GeneralNameUtil implements IGeneralNameUtil { return mDefNumGenNames; } - /** - * adds params to default + /** + * adds params to default */ - public static void getDefaultParams( - String name, boolean isValueConfigured, Vector params) { + public static void getDefaultParams(String name, + boolean isValueConfigured, Vector params) { String nameDot = ""; - if (name != null) + if (name != null) nameDot = name + DOT; - params.addElement( - nameDot + PROP_NUM_GENERALNAMES + '=' + DEF_NUM_GENERALNAMES); + params.addElement(nameDot + PROP_NUM_GENERALNAMES + '=' + + DEF_NUM_GENERALNAMES); for (int i = 0; i < DEF_NUM_GENERALNAMES; i++) { - GeneralNameConfig.getDefaultParams( - nameDot + PROP_GENERALNAME + i, isValueConfigured, params); + GeneralNameConfig.getDefaultParams(nameDot + PROP_GENERALNAME + + i, isValueConfigured, params); } } @@ -355,8 +354,8 @@ public class GeneralNameUtil implements IGeneralNameUtil { * Get instance params. */ public void getInstanceParams(Vector params) { - params.addElement( - PROP_NUM_GENERALNAMES + '=' + mGenNameConfigs.length); + params.addElement(PROP_NUM_GENERALNAMES + '=' + + mGenNameConfigs.length); for (int i = 0; i < mGenNameConfigs.length; i++) { mGenNameConfigs[i].getInstanceParams(params); } @@ -365,42 +364,37 @@ public class GeneralNameUtil implements IGeneralNameUtil { /** * Get extended plugin info. */ - public static void getExtendedPluginInfo( - String name, boolean isValueConfigured, Vector info) { + public static void getExtendedPluginInfo(String name, + boolean isValueConfigured, Vector info) { String nameDot = ""; if (name != null && name.length() > 0) nameDot = name + "."; info.addElement(PROP_NUM_GENERALNAMES + ";" + NUM_GENERALNAMES_INFO); for (int i = 0; i < DEF_NUM_GENERALNAMES; i++) { - GeneralNameConfig.getExtendedPluginInfo( - nameDot + PROP_GENERALNAME + i, isValueConfigured, info); + GeneralNameConfig.getExtendedPluginInfo(nameDot + + PROP_GENERALNAME + i, isValueConfigured, info); } } } - - static public class GeneralNamesAsConstraintsConfig extends GeneralNamesConfig implements IGeneralNamesAsConstraintsConfig { - public GeneralNamesAsConstraintsConfig( - String name, - IConfigStore config, - boolean isValueConfigured, - boolean isPolicyEnabled) - throws EBaseException { + static public class GeneralNamesAsConstraintsConfig extends + GeneralNamesConfig implements IGeneralNamesAsConstraintsConfig { + public GeneralNamesAsConstraintsConfig(String name, + IConfigStore config, boolean isValueConfigured, + boolean isPolicyEnabled) throws EBaseException { super(name, config, isValueConfigured, isPolicyEnabled); } - protected GeneralNameConfig newGeneralNameConfig( - String name, IConfigStore config, - boolean isValueConfigured, boolean isPolicyEnabled) - throws EBaseException { - return new GeneralNameAsConstraintsConfig(name, config, + protected GeneralNameConfig newGeneralNameConfig(String name, + IConfigStore config, boolean isValueConfigured, + boolean isPolicyEnabled) throws EBaseException { + return new GeneralNameAsConstraintsConfig(name, config, isValueConfigured, isPolicyEnabled); } } - /** * convenience class for policies use. */ @@ -417,12 +411,9 @@ public class GeneralNameUtil implements IGeneralNameUtil { public String mNameDotChoice = null; public String mNameDotValue = null; - public GeneralNameConfig( - String name, - IConfigStore config, - boolean isValueConfigured, - boolean isPolicyEnabled) - throws EBaseException { + public GeneralNameConfig(String name, IConfigStore config, + boolean isValueConfigured, boolean isPolicyEnabled) + throws EBaseException { mIsValueConfigured = isValueConfigured; mIsPolicyEnabled = isPolicyEnabled; mName = name; @@ -461,7 +452,7 @@ public class GeneralNameUtil implements IGeneralNameUtil { mGeneralName = formGeneralName(mGenNameChoice, mValue); } else { mValue = mConfig.getString(PROP_GENNAME_VALUE, ""); - if (mValue != null && mValue.length() > 0) + if (mValue != null && mValue.length() > 0) mGeneralName = formGeneralName(mGenNameChoice, mValue); } } @@ -470,23 +461,21 @@ public class GeneralNameUtil implements IGeneralNameUtil { /** * Form a general name from the value string. */ - public GeneralName formGeneralName(String value) - throws EBaseException { + public GeneralName formGeneralName(String value) throws EBaseException { return formGeneralName(mGenNameChoice, value); } - public GeneralName formGeneralName(String choice, String value) - throws EBaseException { + public GeneralName formGeneralName(String choice, String value) + throws EBaseException { return form_GeneralName(choice, value); } - /** - * @return a vector of General names from a value that can be - * either a Vector of strings, string array or just a string. - * Returned Vector can be null if value is not of expected type. + /** + * @return a vector of General names from a value that can be either a + * Vector of strings, string array or just a string. Returned + * Vector can be null if value is not of expected type. */ - public Vector formGeneralNames(Object value) - throws EBaseException { + public Vector formGeneralNames(Object value) throws EBaseException { Vector gns = new Vector(); GeneralName gn = null; @@ -512,8 +501,10 @@ public class GeneralNameUtil implements IGeneralNameUtil { for (Enumeration n = vals.elements(); n.hasMoreElements();) { Object val = n.nextElement(); - if (val != null && (val instanceof String) && - ((String) (val = ((String) val).trim())).length() > 0) { + if (val != null + && (val instanceof String) + && ((String) (val = ((String) val).trim())) + .length() > 0) { gn = formGeneralName(mGenNameChoice, (String) val); gns.addElement(gn); } @@ -539,10 +530,7 @@ public class GeneralNameUtil implements IGeneralNameUtil { } /* - public GeneralNameInterface getGeneralName() { - return mGeneralName; - } - + * public GeneralNameInterface getGeneralName() { return mGeneralName; } */ public boolean isValueConfigured() { return mIsValueConfigured; @@ -552,8 +540,8 @@ public class GeneralNameUtil implements IGeneralNameUtil { * Get default params */ - public static void getDefaultParams( - String name, boolean isValueConfigured, Vector params) { + public static void getDefaultParams(String name, + boolean isValueConfigured, Vector params) { String nameDot = ""; if (name != null) @@ -565,46 +553,43 @@ public class GeneralNameUtil implements IGeneralNameUtil { } /** - * Get instance params + * Get instance params */ public void getInstanceParams(Vector params) { String value = (mValue == null) ? "" : mValue; String choice = (mGenNameChoice == null) ? "" : mGenNameChoice; params.addElement(mNameDotChoice + "=" + choice); - if (mIsValueConfigured) + if (mIsValueConfigured) params.addElement(mNameDotValue + "=" + value); } /** * Get extended plugin info */ - public static void getExtendedPluginInfo( - String name, boolean isValueConfigured, Vector info) { + public static void getExtendedPluginInfo(String name, + boolean isValueConfigured, Vector info) { String nameDot = ""; - if (name != null && name.length() > 0) + if (name != null && name.length() > 0) nameDot = name + "."; - info.addElement( - nameDot + PROP_GENNAME_CHOICE + ";" + GENNAME_CHOICE_INFO); - if (isValueConfigured) - info.addElement( - nameDot + PROP_GENNAME_VALUE + ";" + GENNAME_VALUE_INFO); + info.addElement(nameDot + PROP_GENNAME_CHOICE + ";" + + GENNAME_CHOICE_INFO); + if (isValueConfigured) + info.addElement(nameDot + PROP_GENNAME_VALUE + ";" + + GENNAME_VALUE_INFO); } } - /** * convenience class for policies use. */ - static public class GeneralNameAsConstraintsConfig extends GeneralNameConfig implements IGeneralNameAsConstraintsConfig { - - public GeneralNameAsConstraintsConfig( - String name, - IConfigStore config, - boolean isValueConfigured, - boolean isPolicyEnabled) - throws EBaseException { + static public class GeneralNameAsConstraintsConfig extends + GeneralNameConfig implements IGeneralNameAsConstraintsConfig { + + public GeneralNameAsConstraintsConfig(String name, IConfigStore config, + boolean isValueConfigured, boolean isPolicyEnabled) + throws EBaseException { super(name, config, isValueConfigured, isPolicyEnabled); } @@ -615,18 +600,17 @@ public class GeneralNameUtil implements IGeneralNameUtil { /** * Form a general name from the value string. */ - public GeneralName formGeneralName(String choice, String value) - throws EBaseException { + public GeneralName formGeneralName(String choice, String value) + throws EBaseException { return form_GeneralNameAsConstraints(choice, value); } } - - public static class SubjAltNameGN extends GeneralNameUtil.GeneralNameConfig implements ISubjAltNameConfig { - static final String REQUEST_ATTR_INFO = - "string;Request attribute name. " + - "The value of the request attribute will be used to form a " + - "General Name in the Subject Alternative Name extension."; + public static class SubjAltNameGN extends GeneralNameUtil.GeneralNameConfig + implements ISubjAltNameConfig { + static final String REQUEST_ATTR_INFO = "string;Request attribute name. " + + "The value of the request attribute will be used to form a " + + "General Name in the Subject Alternative Name extension."; static final String PROP_REQUEST_ATTR = "requestAttr"; @@ -634,9 +618,8 @@ public class GeneralNameUtil implements IGeneralNameUtil { String mPfx = null; String mAttr = null; - public SubjAltNameGN( - String name, IConfigStore config, boolean isPolicyEnabled) - throws EBaseException { + public SubjAltNameGN(String name, IConfigStore config, + boolean isPolicyEnabled) throws EBaseException { super(name, config, false, isPolicyEnabled); mRequestAttr = mConfig.getString(PROP_REQUEST_ATTR, null); @@ -645,8 +628,9 @@ public class GeneralNameUtil implements IGeneralNameUtil { mRequestAttr = ""; } if (isPolicyEnabled && mRequestAttr.length() == 0) { - throw new EPropertyNotFound(CMS.getUserMessage("CMS_BASE_GET_PROPERTY_FAILED", - mConfig.getName() + "." + PROP_REQUEST_ATTR)); + throw new EPropertyNotFound(CMS.getUserMessage( + "CMS_BASE_GET_PROPERTY_FAILED", mConfig.getName() + "." + + PROP_REQUEST_ATTR)); } int x = mRequestAttr.indexOf('.'); @@ -677,7 +661,8 @@ public class GeneralNameUtil implements IGeneralNameUtil { if (name != null && name.length() > 0) nameDot = name + "."; params.addElement(nameDot + PROP_REQUEST_ATTR + "="); - GeneralNameUtil.GeneralNameConfig.getDefaultParams(name, false, params); + GeneralNameUtil.GeneralNameConfig.getDefaultParams(name, false, + params); } public static void getExtendedPluginInfo(String name, Vector params) { @@ -685,8 +670,10 @@ public class GeneralNameUtil implements IGeneralNameUtil { if (name != null && name.length() > 0) nameDot = name + "."; - params.addElement(nameDot + PROP_REQUEST_ATTR + ";" + REQUEST_ATTR_INFO); - GeneralNameUtil.GeneralNameConfig.getExtendedPluginInfo(name, false, params); + params.addElement(nameDot + PROP_REQUEST_ATTR + ";" + + REQUEST_ATTR_INFO); + GeneralNameUtil.GeneralNameConfig.getExtendedPluginInfo(name, + false, params); } } } 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 95d668283..151fef180 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; @@ -48,20 +47,17 @@ import com.netscape.cmscore.request.ARequestQueue; import com.netscape.cmscore.util.AssertionException; import com.netscape.cmscore.util.Debug; - /** - * This is a Generic policy processor. The three main functions of - * this class are: - * 1. To initialize policies by reading policy configuration from the - * config file, and maintain 5 sets of policies - viz Enrollment, - * Renewal, Revocation and KeyRecovery and KeyArchival. - * 2. To apply the configured policies on the given request. - * 3. To enable policy listing/configuration via MCC console. - * - * Since the policy processor also implements the IPolicy interface - * the processor itself presents itself as one big policy to the - * request processor. - * + * This is a Generic policy processor. The three main functions of this class + * are: 1. To initialize policies by reading policy configuration from the + * config file, and maintain 5 sets of policies - viz Enrollment, Renewal, + * Revocation and KeyRecovery and KeyArchival. 2. To apply the configured + * policies on the given request. 3. To enable policy listing/configuration via + * MCC console. + * + * Since the policy processor also implements the IPolicy interface the + * processor itself presents itself as one big policy to the request processor. + * * @author kanda * @version $Revision$, $Date$ */ @@ -71,12 +67,10 @@ public class GenericPolicyProcessor implements IPolicyProcessor { protected IAuthority mAuthority = null; // Default System Policies - public final static String[] DEF_POLICIES = - {"com.netscape.cms.policy.constraints.ManualAuthentication"}; + public final static String[] DEF_POLICIES = { "com.netscape.cms.policy.constraints.ManualAuthentication" }; // Policies that can't be deleted nor disabled. - public final static Hashtable DEF_UNDELETABLE_POLICIES = - new Hashtable(); + public final static Hashtable DEF_UNDELETABLE_POLICIES = new Hashtable(); private String mId = "Policy"; private Vector mPolicyOrder = new Vector(); @@ -125,9 +119,9 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } /** - * Returns the configuration store. + * Returns the configuration store. * <P> - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -137,24 +131,24 @@ public class GenericPolicyProcessor implements IPolicyProcessor { /** * Initializes the PolicyProcessor * <P> - * + * * @param owner owner of this subsystem * @param config configuration of this subsystem * @exception EBaseException failed to initialize this Subsystem. */ public synchronized void init(ISubsystem owner, IConfigStore config) - throws EBaseException { + throws EBaseException { // Debug.trace("GenericPolicyProcessor::init"); CMS.debug("GenericPolicyProcessor::init begins"); mAuthority = (IAuthority) owner; mConfig = config; - mGlobalStore = - SubsystemRegistry.getInstance().get("MAIN").getConfigStore(); + mGlobalStore = SubsystemRegistry.getInstance().get("MAIN") + .getConfigStore(); try { IConfigStore configStore = CMS.getConfigStore(); - String PKI_Subsystem = configStore.getString( "subsystem.0.id", - null ); + String PKI_Subsystem = configStore + .getString("subsystem.0.id", null); // CMS 6.1 began utilizing the "Certificate Profiles" framework // instead of the legacy "Certificate Policies" framework. @@ -164,34 +158,31 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // that this legacy "Certificate Policies" framework would be // deprecated and disabled by default (see Bugzilla Bug #472597). // - // NOTE: The "Certificate Policies" framework ONLY applied to - // to CA, KRA, and legacy RA (pre-CMS 7.0) subsystems. + // NOTE: The "Certificate Policies" framework ONLY applied to + // to CA, KRA, and legacy RA (pre-CMS 7.0) subsystems. // - if( PKI_Subsystem.trim().equalsIgnoreCase( "ca" ) || - PKI_Subsystem.trim().equalsIgnoreCase( "kra" ) ) { - String policyStatus = PKI_Subsystem.trim().toLowerCase() - + "." + "Policy" - + "." + IPolicyProcessor.PROP_ENABLE; - - if( configStore.getBoolean( policyStatus, true ) == true ) { - // NOTE: If "<subsystem>.Policy.enable=<boolean>" is - // missing, then the referenced instance existed - // prior to this name=value pair existing in its - // 'CS.cfg' file, and thus we err on the - // side that the user may still need to - // use the policy framework. - CMS.debug( "GenericPolicyProcessor::init Certificate " - + "Policy Framework (deprecated) " - + "is ENABLED" ); + if (PKI_Subsystem.trim().equalsIgnoreCase("ca") + || PKI_Subsystem.trim().equalsIgnoreCase("kra")) { + String policyStatus = PKI_Subsystem.trim().toLowerCase() + "." + + "Policy" + "." + IPolicyProcessor.PROP_ENABLE; + + if (configStore.getBoolean(policyStatus, true) == true) { + // NOTE: If "<subsystem>.Policy.enable=<boolean>" is + // missing, then the referenced instance existed + // prior to this name=value pair existing in its + // 'CS.cfg' file, and thus we err on the + // side that the user may still need to + // use the policy framework. + CMS.debug("GenericPolicyProcessor::init Certificate " + + "Policy Framework (deprecated) " + "is ENABLED"); } else { - // CS 8.1 Default: <subsystem>.Policy.enable=false - CMS.debug( "GenericPolicyProcessor::init Certificate " - + "Policy Framework (deprecated) " - + "is DISABLED" ); + // CS 8.1 Default: <subsystem>.Policy.enable=false + CMS.debug("GenericPolicyProcessor::init Certificate " + + "Policy Framework (deprecated) " + "is DISABLED"); return; } } - } catch( EBaseException e ) { + } catch (EBaseException e) { throw e; } @@ -215,39 +206,38 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // The implementation id should be unique if (mImplTable.containsKey(id)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_DUPLICATE_IMPL_ID", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_DUPLICATE_IMPL_ID", id)); String clPath = c.getString(id + "." + PROP_CLASS); // We should n't let the CatchAll policies to be configurable. if (isSystemDefaultPolicy(clPath)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_SYSTEM_POLICY_CONFIG_ERROR", clPath)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_SYSTEM_POLICY_CONFIG_ERROR", clPath)); - // Verify if the class is a valid implementation of - // IPolicyRule + // Verify if the class is a valid implementation of + // IPolicyRule try { Object o = Class.forName(clPath).newInstance(); - if (!(o instanceof IEnrollmentPolicy) && - !(o instanceof IRenewalPolicy) && - !(o instanceof IRevocationPolicy) && - !(o instanceof IKeyRecoveryPolicy) && - !(o instanceof IKeyArchivalPolicy)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_IMPL", clPath)); + if (!(o instanceof IEnrollmentPolicy) + && !(o instanceof IRenewalPolicy) + && !(o instanceof IRevocationPolicy) + && !(o instanceof IKeyRecoveryPolicy) + && !(o instanceof IKeyArchivalPolicy)) + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_POLICY_IMPL", clPath)); } catch (EBaseException e) { throw e; } catch (Exception e) { Debug.printStackTrace(e); - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_NO_POLICY_IMPL", - id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_NO_POLICY_IMPL", id)); } // Register the implementation. - RegisteredPolicy regPolicy = - new RegisteredPolicy(id, clPath); + RegisteredPolicy regPolicy = new RegisteredPolicy(id, clPath); mImplTable.put(id, regPolicy); } @@ -275,13 +265,13 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // The instance id should be unique if (mInstanceTable.containsKey(instanceName)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_DUPLICATE_INST_ID", instanceName)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_DUPLICATE_INST_ID", instanceName)); c = ruleStore.getSubStore(instanceName); if (c == null || c.size() == 0) - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_NO_POLICY_CONFIG", - instanceName)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_NO_POLICY_CONFIG", instanceName)); IPolicyRule rule = null; String implName; boolean enabled; @@ -290,40 +280,41 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // If the policy rule is not enabled, skip it. String enabledStr = c.getString(PROP_ENABLE, null); - if (enabledStr == null || enabledStr.trim().length() == 0 || - enabledStr.trim().equalsIgnoreCase("true")) + if (enabledStr == null || enabledStr.trim().length() == 0 + || enabledStr.trim().equalsIgnoreCase("true")) enabled = true; else enabled = false; implName = c.getString(PROP_IMPL_NAME, null); if (implName == null) { - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_NO_POLICY_CONFIG", - instanceName)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_NO_POLICY_CONFIG", instanceName)); } // Make an instance of the specified policy. - RegisteredPolicy regPolicy = - (RegisteredPolicy) mImplTable.get(implName); + RegisteredPolicy regPolicy = (RegisteredPolicy) mImplTable + .get(implName); if (regPolicy == null) { - String[] params = {implName, instanceName}; + String[] params = { implName, instanceName }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_IMPL_NOT_FOUND", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_IMPL_NOT_FOUND", params)); } - + String classpath = regPolicy.getClassPath(); try { - rule = (IPolicyRule) - Class.forName(classpath).newInstance(); + rule = (IPolicyRule) Class.forName(classpath).newInstance(); if (rule instanceof IPolicyRule) ((IPolicyRule) rule).setInstanceName(instanceName); rule.init(this, c); } catch (Throwable e) { - mAuthority.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_POLICY_INIT_FAILED", instanceName, e.toString())); - // disable rule initialized if there is + mAuthority.log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CMSCORE_POLICY_INIT_FAILED", instanceName, + e.toString())); + // disable rule initialized if there is // configuration error enabled = false; c.putString(PROP_ENABLE, "false"); @@ -332,9 +323,10 @@ public class GenericPolicyProcessor implements IPolicyProcessor { if (rule == null) continue; - // Read the predicate expression if any associated - // with the rule - String exp = c.getString(GenericPolicyProcessor.PROP_PREDICATE, null); + // Read the predicate expression if any associated + // with the rule + String exp = c.getString(GenericPolicyProcessor.PROP_PREDICATE, + null); if (exp != null) exp = exp.trim(); @@ -344,14 +336,14 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } // Add the rule to the instance table - mInstanceTable.put(instanceName, - new PolicyInstance(instanceName, implName, rule, enabled)); + mInstanceTable.put(instanceName, new PolicyInstance(instanceName, + implName, rule, enabled)); if (!enabled) continue; - // Add the rule to the policy set according to category if a - // rule is enabled. + // Add the rule to the policy set according to category if a + // rule is enabled. addRule(instanceName, rule); } @@ -372,8 +364,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { /** * Apply policies on the given request. - * - * @param IRequest The given request + * + * @param IRequest The given request * @return The policy result object. */ public PolicyResult apply(IRequest req) { @@ -383,18 +375,19 @@ public class GenericPolicyProcessor implements IPolicyProcessor { CMS.debug("GenericPolicyProcessor: apply begins"); if (op == null) { CMS.debug("GenericPolicyProcessor: apply op null"); - // throw new AssertionException("Missing operation type in request. Can't happen!"); - // Return ACCEPTED for now. Looks like even get CA chain - // is being passed in here with request type set elsewhere - // on the request. + // throw new + // AssertionException("Missing operation type in request. Can't happen!"); + // Return ACCEPTED for now. Looks like even get CA chain + // is being passed in here with request type set elsewhere + // on the request. return PolicyResult.ACCEPTED; } if (isProfileRequest(req)) { - Debug.trace("GenericPolicyProcessor: Profile-base Request " + - req.getRequestId().toString()); + Debug.trace("GenericPolicyProcessor: Profile-base Request " + + req.getRequestId().toString()); return PolicyResult.ACCEPTED; } - CMS.debug("GenericPolicyProcessor: apply not ProfileRequest. op="+op); + CMS.debug("GenericPolicyProcessor: apply not ProfileRequest. op=" + op); if (op.equalsIgnoreCase(IRequest.ENROLLMENT_REQUEST)) rules = mEnrollmentRules; @@ -409,7 +402,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { else { // It aint' a CMP request. We don't care. return PolicyResult.ACCEPTED; - // throw new AssertionException("Invalid request type. Can't Happen!"); + // throw new + // AssertionException("Invalid request type. Can't Happen!"); } // ((PolicySet)rules).printPolicies(); @@ -421,11 +415,11 @@ public class GenericPolicyProcessor implements IPolicyProcessor { return PolicyResult.ACCEPTED; /** - setError(req, PolicyResources.NO_RULES_CONFIGURED, op); - return PolicyResult.REJECTED; + * setError(req, PolicyResources.NO_RULES_CONFIGURED, op); return + * PolicyResult.REJECTED; **/ } - CMS.debug("GenericPolicyProcessor: apply: rules.count="+ rules.count()); + CMS.debug("GenericPolicyProcessor: apply: rules.count=" + rules.count()); // request must be up to date or can't process it. PolicyResult res = PolicyResult.ACCEPTED; @@ -478,12 +472,12 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { while (enum1.hasMoreElements()) { - RegisteredPolicy regPolicy = - (RegisteredPolicy) enum1.nextElement(); + RegisteredPolicy regPolicy = (RegisteredPolicy) enum1 + .nextElement(); // Make an Instance of it - IPolicyRule ruleImpl = (IPolicyRule) - Class.forName(regPolicy.getClassPath()).newInstance(); + IPolicyRule ruleImpl = (IPolicyRule) Class.forName( + regPolicy.getClassPath()).newInstance(); impls.addElement(ruleImpl); } @@ -501,8 +495,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { while (enum1.hasMoreElements()) { - RegisteredPolicy regPolicy = - (RegisteredPolicy) enum1.nextElement(); + RegisteredPolicy regPolicy = (RegisteredPolicy) enum1 + .nextElement(); impls.addElement(regPolicy.getId()); @@ -515,16 +509,15 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } public IPolicyRule getPolicyImpl(String id) { - RegisteredPolicy regImpl = (RegisteredPolicy) - mImplTable.get(id); + RegisteredPolicy regImpl = (RegisteredPolicy) mImplTable.get(id); if (regImpl == null) return null; IPolicyRule impl = null; try { - impl = - (IPolicyRule) Class.forName(regImpl.getClassPath()).newInstance(); + impl = (IPolicyRule) Class.forName(regImpl.getClassPath()) + .newInstance(); } catch (Exception e) { Debug.printStackTrace(e); } @@ -545,17 +538,15 @@ public class GenericPolicyProcessor implements IPolicyProcessor { return v; } - public void deletePolicyImpl(String id) - throws EBaseException { + public void deletePolicyImpl(String id) throws EBaseException { // First check if the id is valid; - RegisteredPolicy regPolicy = - (RegisteredPolicy) mImplTable.get(id); + RegisteredPolicy regPolicy = (RegisteredPolicy) mImplTable.get(id); if (regPolicy == null) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_NO_POLICY_IMPL", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_NO_POLICY_IMPL", id)); - // If any instance exists for this impl, can't delete it. + // If any instance exists for this impl, can't delete it. boolean instanceExist = false; Enumeration e = mInstanceTable.elements(); @@ -568,15 +559,14 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } } if (instanceExist) // we found an instance - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_ACTIVE_POLICY_RULES_EXIST", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_ACTIVE_POLICY_RULES_EXIST", id)); - // Else delete the implementation + // Else delete the implementation mImplTable.remove(id); - IConfigStore policyStore = - mGlobalStore.getSubStore(getPolicySubstoreId()); - IConfigStore implStore = - policyStore.getSubStore(PROP_IMPL); + IConfigStore policyStore = mGlobalStore + .getSubStore(getPolicySubstoreId()); + IConfigStore implStore = policyStore.getSubStore(PROP_IMPL); implStore.removeSubStore(id); @@ -585,60 +575,58 @@ public class GenericPolicyProcessor implements IPolicyProcessor { mGlobalStore.commit(true); } catch (Exception ex) { Debug.printStackTrace(ex); - String[] params = {"implementation", id}; + String[] params = { "implementation", id }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_DELETING_POLICY_ERROR", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_DELETING_POLICY_ERROR", params)); } } public void addPolicyImpl(String id, String classPath) - throws EBaseException { + throws EBaseException { // See if the id is unique if (mImplTable.containsKey(id)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_DUPLICATE_IMPL_ID", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_DUPLICATE_IMPL_ID", id)); - // See if the classPath is ok + // See if the classPath is ok Object impl = null; try { impl = Class.forName(classPath).newInstance(); - }catch (Exception e) { - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_NO_POLICY_IMPL", - id)); + } catch (Exception e) { + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_NO_POLICY_IMPL", id)); } // Does the class implement one of the four interfaces? - if (!(impl instanceof IEnrollmentPolicy) && - !(impl instanceof IRenewalPolicy) && - !(impl instanceof IRevocationPolicy) && - !(impl instanceof IKeyRecoveryPolicy) && - !(impl instanceof IKeyArchivalPolicy)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_IMPL", classPath)); - - // Add the implementation to the registry - RegisteredPolicy regPolicy = - new RegisteredPolicy(id, classPath); + if (!(impl instanceof IEnrollmentPolicy) + && !(impl instanceof IRenewalPolicy) + && !(impl instanceof IRevocationPolicy) + && !(impl instanceof IKeyRecoveryPolicy) + && !(impl instanceof IKeyArchivalPolicy)) + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_POLICY_IMPL", classPath)); + + // Add the implementation to the registry + RegisteredPolicy regPolicy = new RegisteredPolicy(id, classPath); mImplTable.put(id, regPolicy); // Store the impl in the configuration. - IConfigStore policyStore = - mGlobalStore.getSubStore(getPolicySubstoreId()); - IConfigStore implStore = - policyStore.getSubStore(PROP_IMPL); + IConfigStore policyStore = mGlobalStore + .getSubStore(getPolicySubstoreId()); + IConfigStore implStore = policyStore.getSubStore(PROP_IMPL); IConfigStore newStore = implStore.makeSubStore(id); newStore.put(PROP_CLASS, classPath); try { mGlobalStore.commit(true); } catch (Exception e) { - String[] params = {"implementation", id}; + String[] params = { "implementation", id }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_ADDING_POLICY_ERROR", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_ADDING_POLICY_ERROR", params)); } } @@ -649,8 +637,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { while (enum1.hasMoreElements()) { - PolicyInstance instance = - (PolicyInstance) mInstanceTable.get((String) enum1.nextElement()); + PolicyInstance instance = (PolicyInstance) mInstanceTable + .get((String) enum1.nextElement()); rules.addElement(instance.getRule()); @@ -670,8 +658,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { while (enum1.hasMoreElements()) { String ruleName = (String) enum1.nextElement(); - PolicyInstance instance = - (PolicyInstance) mInstanceTable.get(ruleName); + PolicyInstance instance = (PolicyInstance) mInstanceTable + .get(ruleName); rules.addElement(instance.getRuleInfo()); } @@ -683,15 +671,13 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } public IPolicyRule getPolicyInstance(String id) { - PolicyInstance policyInstance = (PolicyInstance) - mInstanceTable.get(id); + PolicyInstance policyInstance = (PolicyInstance) mInstanceTable.get(id); return (policyInstance == null) ? null : policyInstance.getRule(); } public Vector getPolicyInstanceConfig(String id) { - PolicyInstance policyInstance = (PolicyInstance) - mInstanceTable.get(id); + PolicyInstance policyInstance = (PolicyInstance) mInstanceTable.get(id); if (policyInstance == null) return null; @@ -709,25 +695,22 @@ public class GenericPolicyProcessor implements IPolicyProcessor { return v; } - public void deletePolicyInstance(String id) - throws EBaseException { + public void deletePolicyInstance(String id) throws EBaseException { // If the rule is a persistent rule, we can't delete it. if (mUndeletablePolicies.containsKey(id)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_CANT_DELETE_PERSISTENT_POLICY", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_CANT_DELETE_PERSISTENT_POLICY", id)); - // First check if the instance is present. - PolicyInstance instance = - (PolicyInstance) mInstanceTable.get(id); + // First check if the instance is present. + PolicyInstance instance = (PolicyInstance) mInstanceTable.get(id); if (instance == null) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_INSTANCE", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_POLICY_INSTANCE", id)); - IConfigStore policyStore = - mGlobalStore.getSubStore(getPolicySubstoreId()); - IConfigStore instanceStore = - policyStore.getSubStore(PROP_RULE); + IConfigStore policyStore = mGlobalStore + .getSubStore(getPolicySubstoreId()); + IConfigStore instanceStore = policyStore.getSubStore(PROP_RULE); instanceStore.removeSubStore(id); @@ -747,10 +730,10 @@ public class GenericPolicyProcessor implements IPolicyProcessor { mPolicyOrder.insertElementAt(id, index); Debug.printStackTrace(e); - String[] params = {"instance", id}; + String[] params = { "instance", id }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_DELETING_POLICY_ERROR", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_DELETING_POLICY_ERROR", params)); } IPolicyRule rule = instance.getRule(); @@ -766,31 +749,30 @@ public class GenericPolicyProcessor implements IPolicyProcessor { if (rule instanceof IKeyArchivalPolicy) mKeyArchivalRules.removeRule(id); - // Delete the instance + // Delete the instance mInstanceTable.remove(id); } public void addPolicyInstance(String id, Hashtable ht) - throws EBaseException { + throws EBaseException { // The instance id should be unique if (getPolicyInstance(id) != null) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_DUPLICATE_INST_ID", id)); - // There should be an implmentation for this rule. + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_DUPLICATE_INST_ID", id)); + // There should be an implmentation for this rule. String implName = (String) ht.get(IPolicyRule.PROP_IMPLNAME); // See if there is an implementation with this name. IPolicyRule rule = getPolicyImpl(implName); if (rule == null) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_NO_POLICY_IMPL", implName)); - - // Prepare config file entries. - IConfigStore policyStore = - mGlobalStore.getSubStore(getPolicySubstoreId()); - IConfigStore instanceStore = - policyStore.getSubStore(PROP_RULE); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_NO_POLICY_IMPL", implName)); + + // Prepare config file entries. + IConfigStore policyStore = mGlobalStore + .getSubStore(getPolicySubstoreId()); + IConfigStore instanceStore = policyStore.getSubStore(PROP_RULE); IConfigStore newStore = instanceStore.makeSubStore(id); for (Enumeration keys = ht.keys(); keys.hasMoreElements();) { @@ -801,8 +783,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } // Set the order string. - policyStore.put(PROP_ORDER, - getRuleOrderString(mPolicyOrder, id)); + policyStore.put(PROP_ORDER, getRuleOrderString(mPolicyOrder, id)); // Try to initialize this rule. rule.init(this, newStore); @@ -811,11 +792,11 @@ public class GenericPolicyProcessor implements IPolicyProcessor { String enabledStr = (String) ht.get(IPolicyRule.PROP_ENABLE); boolean active = false; - if (enabledStr == null || enabledStr.trim().length() == 0 || - enabledStr.equalsIgnoreCase("true")) + if (enabledStr == null || enabledStr.trim().length() == 0 + || enabledStr.equalsIgnoreCase("true")) active = true; - // Set the predicate if any present on the rule. + // Set the predicate if any present on the rule. String predicate = ((String) ht.get(IPolicyRule.PROP_PREDICATE)).trim(); IExpression exp = null; @@ -827,15 +808,15 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { mGlobalStore.commit(true); } catch (Exception e) { - String[] params = {"instance", id}; + String[] params = { "instance", id }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_ADDING_POLICY_ERROR", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_ADDING_POLICY_ERROR", params)); } // Add the rule to the instance table. - PolicyInstance policyInst = new PolicyInstance(id, implName, - rule, active); + PolicyInstance policyInst = new PolicyInstance(id, implName, rule, + active); mInstanceTable.put(id, policyInst); @@ -850,84 +831,79 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } public void modifyPolicyInstance(String id, Hashtable ht) - throws EBaseException { + throws EBaseException { // The instance id should be there already - PolicyInstance policyInstance = (PolicyInstance) - mInstanceTable.get(id); + PolicyInstance policyInstance = (PolicyInstance) mInstanceTable.get(id); if (policyInstance == null) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_INSTANCE", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_POLICY_INSTANCE", id)); IPolicyRule rule = policyInstance.getRule(); // The impl id shouldn't change String implId = (String) ht.get(IPolicyRule.PROP_IMPLNAME); if (!implId.equals(policyInstance.getImplId())) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_IMPLCHANGE_ERROR", id)); - - // Make a new rule instance + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_IMPLCHANGE_ERROR", id)); + + // Make a new rule instance IPolicyRule newRule = getPolicyImpl(implId); if (newRule == null) // Can't happen, but just in case.. - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_IMPL", implId)); - - // Try to init this rule. - IConfigStore policyStore = - mGlobalStore.getSubStore(getPolicySubstoreId()); - IConfigStore instanceStore = - policyStore.getSubStore(PROP_RULE); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_POLICY_IMPL", implId)); + + // Try to init this rule. + IConfigStore policyStore = mGlobalStore + .getSubStore(getPolicySubstoreId()); + IConfigStore instanceStore = policyStore.getSubStore(PROP_RULE); IConfigStore oldStore = instanceStore.getSubStore(id); IConfigStore newStore = new PropConfigStore(id); - + // See if the rule is disabled. String enabledStr = (String) ht.get(IPolicyRule.PROP_ENABLE); boolean active = false; - if (enabledStr == null || enabledStr.trim().length() == 0 || - enabledStr.equalsIgnoreCase("true")) + if (enabledStr == null || enabledStr.trim().length() == 0 + || enabledStr.equalsIgnoreCase("true")) active = true; - // Set the predicate expression. + // Set the predicate expression. String predicate = ((String) ht.get(IPolicyRule.PROP_PREDICATE)).trim(); IExpression exp = null; if (predicate.trim().length() > 0) exp = PolicyPredicateParser.parse(predicate.trim()); - // See if this a persistent rule. + // See if this a persistent rule. if (mUndeletablePolicies.containsKey(id)) { // A persistent rule can't be disabled. if (!active) { - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_INACTIVE", id)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_INACTIVE", id)); } - IExpression defPred = (IExpression) - mUndeletablePolicies.get(id); + IExpression defPred = (IExpression) mUndeletablePolicies.get(id); if (defPred == SimpleExpression.NULL_EXPRESSION) defPred = null; if (exp == null && defPred != null) { - String[] params = {id, defPred.toString(), - "null" }; + String[] params = { id, defPred.toString(), "null" }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); } else if (exp != null && defPred == null) { - String[] params = {id, "null", exp.toString()}; + String[] params = { id, "null", exp.toString() }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); } else if (exp != null && defPred != null) { if (!defPred.toString().equals(exp.toString())) { - String[] params = {id, defPred.toString(), - exp.toString() }; + String[] params = { id, defPred.toString(), exp.toString() }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); } } } @@ -935,9 +911,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // Predicate for the persistent rule can't be changed. ht.put(IPolicyRule.PROP_ENABLE, String.valueOf(active)); - // put old config store parameters first. - for (Enumeration oldkeys = oldStore.keys(); - oldkeys.hasMoreElements();) { + // put old config store parameters first. + for (Enumeration oldkeys = oldStore.keys(); oldkeys.hasMoreElements();) { String k = (String) oldkeys.nextElement(); String v = (String) oldStore.getString(k); @@ -945,15 +920,15 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } // put modified params. - for (Enumeration newkeys = ht.keys(); - newkeys.hasMoreElements();) { + for (Enumeration newkeys = ht.keys(); newkeys.hasMoreElements();) { String k = (String) newkeys.nextElement(); String v = (String) ht.get(k); Debug.trace("newstore key " + k + "=" + v); if (v != null) { - if (!k.equals(Constants.OP_TYPE) && !k.equals(Constants.OP_SCOPE) && - !k.equals(Constants.RS_ID) && !k.equals("RULENAME")) { + if (!k.equals(Constants.OP_TYPE) + && !k.equals(Constants.OP_SCOPE) + && !k.equals(Constants.RS_ID) && !k.equals("RULENAME")) { Debug.trace("newstore.put(" + k + "=" + v + ")"); newStore.put(k, v); } @@ -963,19 +938,15 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // include impl default params in case we missed any. /* - for (Enumeration keys = ht.keys(); keys.hasMoreElements();) - { - String key = (String)keys.nextElement(); - String val = (String)ht.get(key); - newStore.put(key, val); - } + * for (Enumeration keys = ht.keys(); keys.hasMoreElements();) { String + * key = (String)keys.nextElement(); String val = (String)ht.get(key); + * newStore.put(key, val); } */ - // Try to initialize this rule. newRule.init(this, newStore); - - // If we are successfully initialized, replace the rule + + // If we are successfully initialized, replace the rule // instance policyInstance.setRule(newRule); policyInstance.setActive(active); @@ -984,24 +955,23 @@ public class GenericPolicyProcessor implements IPolicyProcessor { if (exp != null) newRule.setPredicate(exp); - // Store the changes in the file. + // Store the changes in the file. try { for (Enumeration e = newStore.keys(); e.hasMoreElements();) { String key = (String) e.nextElement(); if (key != null) { - Debug.trace( - "oldstore.put(" + key + "," + - (String) newStore.getString(key) + ")"); + Debug.trace("oldstore.put(" + key + "," + + (String) newStore.getString(key) + ")"); oldStore.put(key, (String) newStore.getString(key)); } } mGlobalStore.commit(true); } catch (Exception e) { - String[] params = {"instance", id}; + String[] params = { "instance", id }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_ADDING_POLICY_ERROR", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_ADDING_POLICY_ERROR", params)); } // If rule is disabled, we need to remove it from the @@ -1032,9 +1002,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } } - public synchronized void changePolicyInstanceOrdering( - String policyOrderStr) - throws EBaseException { + public synchronized void changePolicyInstanceOrdering(String policyOrderStr) + throws EBaseException { Vector policyOrder = new Vector(); StringTokenizer tokens = new StringTokenizer(policyOrderStr, ","); @@ -1044,8 +1013,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // Check if we have that instance configured. if (!mInstanceTable.containsKey(instanceId)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_INSTANCE", instanceId)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_POLICY_INSTANCE", instanceId)); policyOrder.addElement(instanceId); } @@ -1065,12 +1034,12 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // add system default rules first. try { for (int i = 0; i < mSystemDefaults.length; i++) { - String defRuleName = mSystemDefaults[i].substring( - mSystemDefaults[i].lastIndexOf('.') + 1); - IPolicyRule defRule = (IPolicyRule) - Class.forName(mSystemDefaults[i]).newInstance(); - IConfigStore ruleConfig = - mConfig.getSubStore(PROP_DEF_POLICIES + "." + defRuleName); + String defRuleName = mSystemDefaults[i] + .substring(mSystemDefaults[i].lastIndexOf('.') + 1); + IPolicyRule defRule = (IPolicyRule) Class.forName( + mSystemDefaults[i]).newInstance(); + IConfigStore ruleConfig = mConfig.getSubStore(PROP_DEF_POLICIES + + "." + defRuleName); defRule.init(this, ruleConfig); if (defRule instanceof IEnrollmentPolicy) @@ -1087,25 +1056,28 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } } catch (Throwable e) { Debug.printStackTrace(e); - EBaseException ex = new EBaseException(CMS.getUserMessage("CMS_BASE_INTERNAL_ERROR", - "Cannot create default policy rule. Error: " + e.getMessage())); + EBaseException ex = new EBaseException(CMS.getUserMessage( + "CMS_BASE_INTERNAL_ERROR", + "Cannot create default policy rule. Error: " + + e.getMessage())); - mAuthority.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_POLICY_DEF_CREATE", e.toString())); + mAuthority.log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CMSCORE_POLICY_DEF_CREATE", e.toString())); throw ex; } // add rules specified in the new order. - for (Enumeration enum1 = policyOrder.elements(); - enum1.hasMoreElements();) { + for (Enumeration enum1 = policyOrder.elements(); enum1 + .hasMoreElements();) { String instanceName = (String) enum1.nextElement(); - PolicyInstance pInstance = (PolicyInstance) - mInstanceTable.get(instanceName); - + PolicyInstance pInstance = (PolicyInstance) mInstanceTable + .get(instanceName); + if (!pInstance.isActive()) continue; - // Add the rule to the policy set according to category if a - // rule is enabled. + // Add the rule to the policy set according to category if a + // rule is enabled. IPolicyRule rule = pInstance.getRule(); if (rule instanceof IEnrollmentPolicy) @@ -1129,8 +1101,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { mPolicyOrder = policyOrder; // Now change the ordering in the config file. - IConfigStore policyStore = - mGlobalStore.getSubStore(getPolicySubstoreId()); + IConfigStore policyStore = mGlobalStore + .getSubStore(getPolicySubstoreId()); policyStore.put(PROP_ORDER, policyOrderStr); @@ -1139,8 +1111,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { mGlobalStore.commit(true); } catch (Exception ex) { Debug.printStackTrace(ex); - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_ORDER_ERROR", policyOrderStr)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_ORDER_ERROR", policyOrderStr)); } } @@ -1178,38 +1150,37 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } /** - * Initializes the default system policies. Currently there is only - * one policy - ManualAuthentication. More may be added later on. - * - * The default policies may be disabled - for example to over-ride - * agent approval for testing the system by setting the following - * property in the config file: + * Initializes the default system policies. Currently there is only one + * policy - ManualAuthentication. More may be added later on. * - * <subsystemId>.Policy.systemPolicies.enable=false + * The default policies may be disabled - for example to over-ride agent + * approval for testing the system by setting the following property in the + * config file: * - * By default the value for this property is true. - * - * Users can over-ride the default system policies by listing their - * 'custom' system policies under the following property: + * <subsystemId>.Policy.systemPolicies.enable=false * - * <subsystemId>.Policy.systemPolicies=<system policy1 class path>, - * <system policy2 class path> - * - * There can only be one instance of the system policy in the system - * and will apply to all requests, and hence predicates are not used - * for a system policy. Due to the same reason, these properties are - * not configurable using the Console. + * By default the value for this property is true. + * + * Users can over-ride the default system policies by listing their 'custom' + * system policies under the following property: + * + * <subsystemId>.Policy.systemPolicies=<system policy1 class path>, <system + * policy2 class path> + * + * There can only be one instance of the system policy in the system and + * will apply to all requests, and hence predicates are not used for a + * system policy. Due to the same reason, these properties are not + * configurable using the Console. * * A System policy may read config properties from a subtree under * <subsystemId>.Policy.systemPolicies.<ClassName>. An example is * ra.Policy.systemPolicies.ManualAuthentication.param1=value */ - private void initSystemPolicies(IConfigStore mConfig) - throws EBaseException { + private void initSystemPolicies(IConfigStore mConfig) throws EBaseException { // If system policies are disabled, return. No Deferral of // requests may be done. - String enable = mConfig.getString(PROP_DEF_POLICIES + "." + - PROP_ENABLE, "true").trim(); + String enable = mConfig.getString( + PROP_DEF_POLICIES + "." + PROP_ENABLE, "true").trim(); if (enable.equalsIgnoreCase("false")) { mSystemDefaults = DEF_POLICIES; @@ -1217,17 +1188,16 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } // Load default policies that are always present. - String configuredDefaults = mConfig.getString(PROP_DEF_POLICIES, - null); + String configuredDefaults = mConfig.getString(PROP_DEF_POLICIES, null); - if (configuredDefaults == null || - configuredDefaults.trim().length() == 0) + if (configuredDefaults == null + || configuredDefaults.trim().length() == 0) mSystemDefaults = DEF_POLICIES; else { Vector rules = new Vector(); - StringTokenizer tokenizer = new - StringTokenizer(configuredDefaults.trim(), ","); - + StringTokenizer tokenizer = new StringTokenizer( + configuredDefaults.trim(), ","); + while (tokenizer.hasMoreTokens()) { String rule = tokenizer.nextToken().trim(); @@ -1236,11 +1206,11 @@ public class GenericPolicyProcessor implements IPolicyProcessor { if (rules.size() > 0) { mSystemDefaults = new String[rules.size()]; rules.copyInto(mSystemDefaults); - } else + } else mSystemDefaults = DEF_POLICIES; } - - // Now Initialize the rules. These defaults have only one + + // Now Initialize the rules. These defaults have only one // instance and the rule name is the name of the class itself. // Any configuration parameters required could be read from // <subsystemId>.Policy.default.RuleName. @@ -1253,134 +1223,131 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { Object o = Class.forName(mSystemDefaults[i]).newInstance(); - if (!(o instanceof IEnrollmentPolicy) && - !(o instanceof IRenewalPolicy) && - !(o instanceof IRevocationPolicy) && - !(o instanceof IKeyRecoveryPolicy) && - !(o instanceof IKeyArchivalPolicy)) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_IMPL", - mSystemDefaults[i])); - + if (!(o instanceof IEnrollmentPolicy) + && !(o instanceof IRenewalPolicy) + && !(o instanceof IRevocationPolicy) + && !(o instanceof IKeyRecoveryPolicy) + && !(o instanceof IKeyArchivalPolicy)) + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_POLICY_IMPL", + mSystemDefaults[i])); + IPolicyRule rule = (IPolicyRule) o; - + // Initialize the rule. - ruleName = mSystemDefaults[i].substring( - mSystemDefaults[i].lastIndexOf('.') + 1); - IConfigStore ruleConfig = mConfig.getSubStore( - PROP_DEF_POLICIES + "." + ruleName); + ruleName = mSystemDefaults[i].substring(mSystemDefaults[i] + .lastIndexOf('.') + 1); + IConfigStore ruleConfig = mConfig.getSubStore(PROP_DEF_POLICIES + + "." + ruleName); rule.init(this, ruleConfig); - + // Add the rule to the appropriate PolicySet. addRule(ruleName, rule); } catch (EBaseException e) { throw e; } catch (Exception e) { Debug.printStackTrace(e); - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_NO_POLICY_IMPL", - ruleName)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_NO_POLICY_IMPL", ruleName)); } } } /** - * Read list of undeletable policies if any configured in the - * system. - * - * These are required to protect the system from being misconfigured - * to the point that the requests wouldn't serialize or certain - * fields in the certificate(s) being checked will go unchecked - * ..etc. - * - * For now the following policies are undeletable: - * - * DirAuthRule: This is a default DirectoryAuthentication policy - * for user certificates that interprets directory - * credentials. The presence of this policy is needed - * if the OOTB DirectoryAuthentication-based automatic - * certificate issuance is supported. - * - * DefaultUserNameRule: This policy verifies/sets subjectDn for user - * certificates. - * - * DefaultServerNameRule: This policy verifies/sets subjectDn for - * server certificates. - * - * DefaultValidityRule: Verifies/sets validty for all certificates. - * - * DefaultRenewalValidityRule: Verifies/sets validity for certs being - * renewed. - * - * The 'undeletables' cannot be deleted from the config file, nor - * can the be disabled. If any predicates are associated with them - * the predicates can't be changed either. But, other config parameters - * such as maxValidity, renewalInterval ..etc can be changed to suit - * local policy requirements. - * - * During start up the policy processor will verify if the undeletables - * are present, and that they are enabled and that their predicates are - * not changed. - * - * The rules mentioned above are currently hard coded. If these need to - * read from the config file, the 'undeletables' can be configured as - * as follows: - * - * <subsystemId>.Policy.undeletablePolicies=<comma separated rule names> - * Example: - * ra.Policy.undeletablePolicies=DirAuthRule, DefaultUserNameRule, DefaultServerNameRule, DefaultValidityRule, DefaultRenewalValidityRule - * - * The predicates if any associated with them may be configured as - * follows: - * <subsystemId>.Policy.undeletablePolicies.DirAuthRule.predicate= certType == client. - * - * where subsystemId is ra or ca. - * + * Read list of undeletable policies if any configured in the system. + * + * These are required to protect the system from being misconfigured to the + * point that the requests wouldn't serialize or certain fields in the + * certificate(s) being checked will go unchecked ..etc. + * + * For now the following policies are undeletable: + * + * DirAuthRule: This is a default DirectoryAuthentication policy for user + * certificates that interprets directory credentials. The presence of this + * policy is needed if the OOTB DirectoryAuthentication-based automatic + * certificate issuance is supported. + * + * DefaultUserNameRule: This policy verifies/sets subjectDn for user + * certificates. + * + * DefaultServerNameRule: This policy verifies/sets subjectDn for server + * certificates. + * + * DefaultValidityRule: Verifies/sets validty for all certificates. + * + * DefaultRenewalValidityRule: Verifies/sets validity for certs being + * renewed. + * + * The 'undeletables' cannot be deleted from the config file, nor can the be + * disabled. If any predicates are associated with them the predicates can't + * be changed either. But, other config parameters such as maxValidity, + * renewalInterval ..etc can be changed to suit local policy requirements. + * + * During start up the policy processor will verify if the undeletables are + * present, and that they are enabled and that their predicates are not + * changed. + * + * The rules mentioned above are currently hard coded. If these need to read + * from the config file, the 'undeletables' can be configured as as follows: + * + * <subsystemId>.Policy.undeletablePolicies=<comma separated rule names> + * Example: ra.Policy.undeletablePolicies=DirAuthRule, DefaultUserNameRule, + * DefaultServerNameRule, DefaultValidityRule, DefaultRenewalValidityRule + * + * The predicates if any associated with them may be configured as follows: + * <subsystemId>.Policy.undeletablePolicies.DirAuthRule.predicate= certType + * == client. + * + * where subsystemId is ra or ca. + * * If the undeletables are configured in the file,the configured entries - * take precedence over the hardcoded ones in this file. If you are - * configuring them in the file, please remember to configure the - * predicates if applicable. - * - * During policy configuration from MCC, the policy processor will not - * let you delete an 'undeletable', nor will it let you disable it. - * You will not be able to change the predicate either. Other parameters - * can be configured as needed. - * - * If a particular rule needs to be removed from the 'undeletables', - * either remove it from the hard coded list above, or configure the - * rules required rules only via the config file. The former needs - * recompilation of the source. The later is flexible to be able to - * make any rule an 'undeletable' or nor an 'undeletable'. - * - * Example: We want to use only manual forms for enrollment. - * We do n't need to burn in DirAuthRule. We need to configure all - * other rules except the DirAuthRule as follows: - * - * ra.Policy.undeletablePolicies = DefaultUserNameRule, DefaultServerNameRule, DefaultValidityRule, DefaultRenewalValidityRule - * + * take precedence over the hardcoded ones in this file. If you are + * configuring them in the file, please remember to configure the predicates + * if applicable. + * + * During policy configuration from MCC, the policy processor will not let + * you delete an 'undeletable', nor will it let you disable it. You will not + * be able to change the predicate either. Other parameters can be + * configured as needed. + * + * If a particular rule needs to be removed from the 'undeletables', either + * remove it from the hard coded list above, or configure the rules required + * rules only via the config file. The former needs recompilation of the + * source. The later is flexible to be able to make any rule an + * 'undeletable' or nor an 'undeletable'. + * + * Example: We want to use only manual forms for enrollment. We do n't need + * to burn in DirAuthRule. We need to configure all other rules except the + * DirAuthRule as follows: + * + * ra.Policy.undeletablePolicies = DefaultUserNameRule, + * DefaultServerNameRule, DefaultValidityRule, DefaultRenewalValidityRule + * * The following predicates are necessary: - * - * ra.Policy.undeletablePolicies.DefaultUserNameRule.predicate = certType == client - * ra.Policy.undeletablePolicies.DefaultServerNameRule.predicate = certType == server - * - * The other two rules do not have any predicates. + * + * ra.Policy.undeletablePolicies.DefaultUserNameRule.predicate = certType == + * client ra.Policy.undeletablePolicies.DefaultServerNameRule.predicate = + * certType == server + * + * The other two rules do not have any predicates. */ private void initUndeletablePolicies(IConfigStore mConfig) - throws EBaseException { + throws EBaseException { // Read undeletable policies if any configured. - String configuredUndeletables = - mConfig.getString(PROP_UNDELETABLE_POLICIES, null); + String configuredUndeletables = mConfig.getString( + PROP_UNDELETABLE_POLICIES, null); - if (configuredUndeletables == null || - configuredUndeletables.trim().length() == 0) { + if (configuredUndeletables == null + || configuredUndeletables.trim().length() == 0) { mUndeletablePolicies = DEF_UNDELETABLE_POLICIES; return; } Vector rules = new Vector(); - StringTokenizer tokenizer = new - StringTokenizer(configuredUndeletables.trim(), ","); - + StringTokenizer tokenizer = new StringTokenizer( + configuredUndeletables.trim(), ","); + while (tokenizer.hasMoreTokens()) { String rule = tokenizer.nextToken().trim(); @@ -1392,18 +1359,18 @@ public class GenericPolicyProcessor implements IPolicyProcessor { return; } - // For each rule read from the config file, see if any + // For each rule read from the config file, see if any // predicate is set. mUndeletablePolicies = new Hashtable(); for (Enumeration e = rules.elements(); e.hasMoreElements();) { String urn = (String) e.nextElement(); - + // See if there is predicate in the file - String pred = mConfig.getString(PROP_UNDELETABLE_POLICIES + - "." + urn + "." + PROP_PREDICATE, null); - + String pred = mConfig.getString(PROP_UNDELETABLE_POLICIES + "." + + urn + "." + PROP_PREDICATE, null); + IExpression exp = SimpleExpression.NULL_EXPRESSION; - + if (pred != null) exp = PolicyPredicateParser.parse(pred); mUndeletablePolicies.put(urn, exp); @@ -1437,30 +1404,27 @@ public class GenericPolicyProcessor implements IPolicyProcessor { return ret; } - private void verifyDefaultPolicyConfig() - throws EPolicyException { + private void verifyDefaultPolicyConfig() throws EPolicyException { // For each policy in undeletable list make sure that // the policy is present, is not disabled and its predicate // is not tampered with. - for (Enumeration e = mUndeletablePolicies.keys(); - e.hasMoreElements();) { + for (Enumeration e = mUndeletablePolicies.keys(); e.hasMoreElements();) { String urn = (String) e.nextElement(); // See if the rule is in the instance table. PolicyInstance inst = (PolicyInstance) mInstanceTable.get(urn); if (inst == null) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_MISSING_PERSISTENT_RULE", urn)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_MISSING_PERSISTENT_RULE", urn)); - // See if the instance is disabled. + // See if the instance is disabled. if (!inst.isActive()) - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_INACTIVE", urn)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_INACTIVE", urn)); - // See if the predicated is misconfigured. - IExpression defPred = (IExpression) - mUndeletablePolicies.get(urn); + // See if the predicated is misconfigured. + IExpression defPred = (IExpression) mUndeletablePolicies.get(urn); // We used SimpleExpression.NULL_EXPRESSION to indicate a null. if (defPred == SimpleExpression.NULL_EXPRESSION) @@ -1468,61 +1432,59 @@ public class GenericPolicyProcessor implements IPolicyProcessor { IExpression confPred = inst.getRule().getPredicate(); if (defPred == null && confPred != null) { - String[] params = {urn, "null", confPred.toString()}; + String[] params = { urn, "null", confPred.toString() }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); } else if (defPred != null && confPred == null) { - String[] params = {urn, defPred.toString(), "null"}; + String[] params = { urn, defPred.toString(), "null" }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); } else if (defPred != null && confPred != null) { if (!defPred.toString().equals(confPred.toString())) { - String[] params = {urn, defPred.toString(), - confPred.toString()}; + String[] params = { urn, defPred.toString(), + confPred.toString() }; - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_PERSISTENT_RULE_MISCONFIG", params)); } } } } } - /** * Class to keep track of various configurable implementations. */ class RegisteredPolicy { String mId; String mClPath; - public RegisteredPolicy (String id, String clPath) { + + public RegisteredPolicy(String id, String clPath) { if (id == null || clPath == null) - throw new - AssertionException("Policy id or classpath can't be null"); + throw new AssertionException("Policy id or classpath can't be null"); mId = id; mClPath = clPath; } - + public String getClassPath() { return mClPath; } - + public String getId() { return mId; } } - class PolicyInstance { String mInstanceId; String mImplId; IPolicyRule mRule; boolean mIsEnabled; - public PolicyInstance(String instanceId, String implId, - IPolicyRule rule, boolean isEnabled) { + public PolicyInstance(String instanceId, String implId, IPolicyRule rule, + boolean isEnabled) { mInstanceId = instanceId; mImplId = implId; mRule = rule; @@ -1558,9 +1520,8 @@ class PolicyInstance { public void setActive(boolean stat) { mIsEnabled = stat; } - + public void setRule(IPolicyRule newRule) { mRule = newRule; } -} - +} 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 fde12d04f..e9a7371d9 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java @@ -17,14 +17,13 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import com.netscape.certsrv.policy.IPolicyRule; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; - public class JavaScriptRequestProxy { IRequest req; + public JavaScriptRequestProxy(IRequest r) { req = r; } @@ -42,4 +41,3 @@ public class JavaScriptRequestProxy { } } - 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 f1bb6457a..a7777c46c 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java @@ -17,38 +17,37 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import com.netscape.certsrv.policy.EPolicyException; import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; - /** - * This class represents an Or expression of the form - * (var1 op val1 OR var2 op val2). - * + * This class represents an Or expression of the form (var1 op val1 OR var2 op + * val2). + * * Expressions are used as predicates for policy selection. - * + * * @author kanda * @version $Revision$, $Date$ */ public class OrExpression implements IExpression { private IExpression mExp1; private IExpression mExp2; + public OrExpression(IExpression exp1, IExpression exp2) { mExp1 = exp1; mExp2 = exp2; } - public boolean evaluate(IRequest req) - throws EPolicyException { + public boolean evaluate(IRequest req) throws EPolicyException { if (mExp1 == null && mExp2 == null) return true; else if (mExp1 != null && mExp2 != null) return mExp1.evaluate(req) || mExp2.evaluate(req); else if (mExp1 != null && mExp2 == null) return mExp1.evaluate(req); - else // (mExp1 == null && mExp2 != null) + else + // (mExp1 == null && mExp2 != null) return mExp2.evaluate(req); } @@ -59,7 +58,8 @@ public class OrExpression implements IExpression { return mExp1.toString() + " OR " + mExp2.toString(); else if (mExp1 != null && mExp2 == null) return mExp1.toString(); - else // (mExp1 == null && mExp2 != null) + else + // (mExp1 == null && mExp2 != null) return mExp2.toString(); } } 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 0f00e8151..8f3568e90 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; @@ -29,19 +28,16 @@ import com.netscape.certsrv.policy.EPolicyException; import com.netscape.certsrv.policy.IExpression; import com.netscape.cmscore.util.Debug; - /** * Default implementation of predicate parser. - * + * * Limitations: - * - * 1. Currently parentheses are not suported. - * 2. Only ==, != <, >, <= and >= operators are supported. - * 3. The only boolean operators supported are AND and OR. AND takes precedence - * over OR. Example: a AND b OR e OR c AND d - * is treated as (a AND b) OR e OR (c AND d) - * 4. If this is n't adequate, roll your own. - * + * + * 1. Currently parentheses are not suported. 2. Only ==, != <, >, <= and >= + * operators are supported. 3. The only boolean operators supported are AND and + * OR. AND takes precedence over OR. Example: a AND b OR e OR c AND d is treated + * as (a AND b) OR e OR (c AND d) 4. If this is n't adequate, roll your own. + * * @author kanda * @version $Revision$, $Date$ */ @@ -57,22 +53,22 @@ public class PolicyPredicateParser { /** * Parse the predicate expression and return a vector of expressions. - * - * @param predicateExp The predicate expression as read from the config file. - * @return expVector The vector of expressions. + * + * @param predicateExp The predicate expression as read from the config + * file. + * @return expVector The vector of expressions. */ public static IExpression parse(String predicateExpression) - throws EPolicyException { - if (predicateExpression == null || - predicateExpression.length() == 0) + throws EPolicyException { + if (predicateExpression == null || predicateExpression.length() == 0) return null; PredicateTokenizer pt = new PredicateTokenizer(predicateExpression); if (pt == null || !pt.hasMoreTokens()) return null; - // The first token cannot be an operator. We are not dealing with - // reverse-polish notation. + // The first token cannot be an operator. We are not dealing with + // reverse-polish notation. String token = pt.nextToken(); boolean opANDSeen; boolean opORSeen; @@ -80,7 +76,8 @@ public class PolicyPredicateParser { if (getOP(token) != EXPRESSION) { if (Debug.ON) Debug.trace("Malformed expression: " + predicateExpression); - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_BAD_POLICY_EXPRESSION", predicateExpression)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_BAD_POLICY_EXPRESSION", predicateExpression)); } IExpression current = parseExpression(token); boolean malformed = false; @@ -91,8 +88,8 @@ public class PolicyPredicateParser { token = pt.nextToken(); int curType = getOP(token); - if ((prevType != EXPRESSION && curType != EXPRESSION) || - (prevType == EXPRESSION && curType == EXPRESSION)) { + if ((prevType != EXPRESSION && curType != EXPRESSION) + || (prevType == EXPRESSION && curType == EXPRESSION)) { malformed = true; break; } @@ -103,7 +100,8 @@ public class PolicyPredicateParser { continue; } - // If the previous type was an OR token, add the current expression to + // If the previous type was an OR token, add the current expression + // to // the expression set; if (prevType == OP_OR) { expSet.addElement(current); @@ -121,9 +119,8 @@ public class PolicyPredicateParser { if (malformed) { if (Debug.ON) Debug.trace("Malformed expression: " + predicateExpression); - throw new EPolicyException( - CMS.getUserMessage("CMS_POLICY_BAD_POLICY_EXPRESSION", - predicateExpression)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_BAD_POLICY_EXPRESSION", predicateExpression)); } // Form an ORExpression @@ -134,12 +131,11 @@ public class PolicyPredicateParser { if (size == 0) return null; - OrExpression orExp = new - OrExpression((IExpression) expSet.elementAt(0), null); + OrExpression orExp = new OrExpression( + (IExpression) expSet.elementAt(0), null); for (int i = 1; i < size; i++) - orExp = new OrExpression(orExp, - (IExpression) expSet.elementAt(i)); + orExp = new OrExpression(orExp, (IExpression) expSet.elementAt(i)); return orExp; } @@ -153,7 +149,7 @@ public class PolicyPredicateParser { } private static IExpression parseExpression(String input) - throws EPolicyException { + throws EPolicyException { // If the expression has multiple parts separated by commas // we need to construct an AND expression. Else we will return a // simple expression. @@ -165,17 +161,16 @@ public class PolicyPredicateParser { Vector expVector = new Vector(); while (commaIndex > 0) { - SimpleExpression exp = (SimpleExpression) - SimpleExpression.parse(input.substring(currentIndex, - commaIndex)); + SimpleExpression exp = (SimpleExpression) SimpleExpression + .parse(input.substring(currentIndex, commaIndex)); expVector.addElement(exp); currentIndex = commaIndex + 1; commaIndex = input.indexOf(COMMA, currentIndex); } if (currentIndex < (input.length() - 1)) { - SimpleExpression exp = (SimpleExpression) - SimpleExpression.parse(input.substring(currentIndex)); + SimpleExpression exp = (SimpleExpression) SimpleExpression + .parse(input.substring(currentIndex)); expVector.addElement(exp); } @@ -186,7 +181,8 @@ public class PolicyPredicateParser { AndExpression andExp = new AndExpression(exp1, exp2); for (int i = 2; i < size; i++) { - andExp = new AndExpression(andExp, (SimpleExpression) expVector.elementAt(i)); + andExp = new AndExpression(andExp, + (SimpleExpression) expVector.elementAt(i)); } return andExp; } @@ -194,79 +190,40 @@ public class PolicyPredicateParser { public static void main(String[] args) { /********* - IRequest req = new IRequest(); - try - { - req.set("ou", "people"); - req.set("cn", "John Doe"); - req.set("uid", "jdoes"); - req.set("o", "airius.com"); - req.set("certtype", "client"); - req.set("request", "issuance"); - req.set("id", new Integer(10)); - req.set("dualcerts", new Boolean(true)); - - Vector v = new Vector(); - v.addElement("one"); - v.addElement("two"); - v.addElement("three"); - req.set("count", v); - } - catch (Exception e){e.printStackTrace();} - String[] array = { "ou == people AND certtype == client", - "ou == servergroup AND certtype == server", - "uid == jdoes, ou==people, o==airius.com OR ou == people AND certType == client OR certType == server AND cn == needles.mcom.com", - }; - for (int i = 0; i < array.length; i++) - { - System.out.println(); - System.out.println("String: " + array[i]); - IExpression exp = null; - try - { - exp = parse(array[i]); - if (exp != null) - { - System.out.println("Parsed Expression: " + exp); - boolean result = exp.evaluate(req); - System.out.println("Result: " + result); - } - } - catch (Exception e) {e.printStackTrace(); } - } - - - try - { - BufferedReader rdr = new BufferedReader( - new FileReader(args[0])); - String line; - while((line=rdr.readLine()) != null) - { - System.out.println(); - System.out.println("Line Read: " + line); - IExpression exp = null; - try - { - exp = parse(line); - if (exp != null) - { - System.out.println(exp); - boolean result = exp.evaluate(req); - System.out.println("Result: " + result); - } - - }catch (Exception e){e.printStackTrace();} - } - } - catch (Exception e){e.printStackTrace(); } - + * IRequest req = new IRequest(); try { req.set("ou", "people"); + * req.set("cn", "John Doe"); req.set("uid", "jdoes"); req.set("o", + * "airius.com"); req.set("certtype", "client"); req.set("request", + * "issuance"); req.set("id", new Integer(10)); req.set("dualcerts", new + * Boolean(true)); + * + * Vector v = new Vector(); v.addElement("one"); v.addElement("two"); + * v.addElement("three"); req.set("count", v); } catch (Exception + * e){e.printStackTrace();} String[] array = { + * "ou == people AND certtype == client", + * "ou == servergroup AND certtype == server", + * "uid == jdoes, ou==people, o==airius.com OR ou == people AND certType == client OR certType == server AND cn == needles.mcom.com" + * , }; for (int i = 0; i < array.length; i++) { System.out.println(); + * System.out.println("String: " + array[i]); IExpression exp = null; + * try { exp = parse(array[i]); if (exp != null) { + * System.out.println("Parsed Expression: " + exp); boolean result = + * exp.evaluate(req); System.out.println("Result: " + result); } } catch + * (Exception e) {e.printStackTrace(); } } + * + * + * try { BufferedReader rdr = new BufferedReader( new + * FileReader(args[0])); String line; while((line=rdr.readLine()) != + * null) { System.out.println(); System.out.println("Line Read: " + + * line); IExpression exp = null; try { exp = parse(line); if (exp != + * null) { System.out.println(exp); boolean result = exp.evaluate(req); + * System.out.println("Result: " + result); } + * + * }catch (Exception e){e.printStackTrace();} } } catch (Exception + * e){e.printStackTrace(); } *******/ } } - class PredicateTokenizer { String input; int currentIndex; @@ -348,30 +305,27 @@ class PredicateTokenizer { } } - class AttributeSet implements IAttrSet { /** * */ private static final long serialVersionUID = -3985810281989018413L; Hashtable ht = new Hashtable(); + public AttributeSet() { } - public void delete(String name) - throws EBaseException { + public void delete(String name) throws EBaseException { Object ob = ht.get(name); ht.remove(ob); } - public Object get(String name) - throws EBaseException { + public Object get(String name) throws EBaseException { return ht.get(name); } - public void set(String name, Object ob) - throws EBaseException { + public void set(String name, Object ob) throws EBaseException { ht.put(name, ob); } 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 17a19e9d4..3239df64d 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import java.util.Enumeration; import java.util.Vector; @@ -30,11 +29,10 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cmscore.util.Debug; - /** - * Implements a policy set per IPolicySet interface. This class - * uses a vector of ordered policies to enforce priority. - * + * Implements a policy set per IPolicySet interface. This class uses a vector of + * ordered policies to enforce priority. + * * @author kanda * @version $Revision$, $Date$ */ @@ -51,7 +49,7 @@ public class PolicySet implements IPolicySet { /** * Returns the name of the rule set. * <P> - * + * * @return The name of the rule set. */ public String getName() { @@ -61,6 +59,7 @@ public class PolicySet implements IPolicySet { /** * Returns the no of rules in a set. * <P> + * * @return the no of rules. */ public int count() { @@ -70,9 +69,9 @@ public class PolicySet implements IPolicySet { /** * Add a policy rule. * <P> - * - * @param ruleName The name of the rule to be added. - * @param rule The rule to be added. + * + * @param ruleName The name of the rule to be added. + * @param rule The rule to be added. */ public void addRule(String ruleName, IPolicyRule rule) { if (mRuleNames.indexOf(ruleName) >= 0) @@ -88,9 +87,9 @@ public class PolicySet implements IPolicySet { /** * Remplaces a policy rule identified by the given name. - * - * @param name The name of the rule to be replaced. - * @param rule The rule to be replaced. + * + * @param name The name of the rule to be replaced. + * @param rule The rule to be replaced. */ public void replaceRule(String ruleName, IPolicyRule rule) { int index = mRuleNames.indexOf(ruleName); @@ -99,22 +98,22 @@ public class PolicySet implements IPolicySet { addRule(ruleName, rule); return; } - + mRuleNames.setElementAt(ruleName, index); mRules.setElementAt(rule, index); } /** * Removes a policy rule identified by the given name. - * - * @param name The name of the rule to be removed. + * + * @param name The name of the rule to be removed. */ public void removeRule(String ruleName) { int index = mRuleNames.indexOf(ruleName); if (index < 0) return; // XXX - throw an exception. - + mRuleNames.removeElementAt(index); mRules.removeElementAt(index); } @@ -122,8 +121,8 @@ public class PolicySet implements IPolicySet { /** * Returns the rule identified by a given name. * <P> - * - * @param name The name of the rule to be return. + * + * @param name The name of the rule to be return. * @return The rule identified by the given name or null if none exists. */ public IPolicyRule getRule(String ruleName) { @@ -137,7 +136,7 @@ public class PolicySet implements IPolicySet { /** * Returns an enumeration of rules. * <P> - * + * * @return An enumeration of rules. */ public Enumeration getRules() { @@ -145,10 +144,10 @@ public class PolicySet implements IPolicySet { } /** - * Apply policies on a given request from a rule set. - * The rules may modify the request. - * - * @param req The request to apply policies on. + * Apply policies on a given request from a rule set. The rules may modify + * the request. + * + * @param req The request to apply policies on. * @return the PolicyResult. */ public PolicyResult apply(IRequest req) { @@ -158,11 +157,11 @@ public class PolicySet implements IPolicySet { if ((cnt = mRules.size()) == 0) return PolicyResult.ACCEPTED; - // All policies are applied before returning the result. Hence - // if atleast one of the policies returns a REJECTED, we need to - // return that status. If none of the policies REJECTED - // the request, but atleast one of them DEFERRED the request, we - // need to return DEFERRED. + // All policies are applied before returning the result. Hence + // if atleast one of the policies returns a REJECTED, we need to + // return that status. If none of the policies REJECTED + // the request, but atleast one of them DEFERRED the request, we + // need to return DEFERRED. boolean rejected = false; boolean deferred = false; int size = mRules.size(); @@ -174,15 +173,17 @@ public class PolicySet implements IPolicySet { try { if (Debug.ON) - Debug.trace("evaluating predicate for rule " + rule.getName()); - CMS.debug("PolicySet: apply()- evaluating predicate for rule " + rule.getName()); + Debug.trace("evaluating predicate for rule " + + rule.getName()); + CMS.debug("PolicySet: apply()- evaluating predicate for rule " + + rule.getName()); if (exp != null && !exp.evaluate(req)) continue; } catch (Exception e) { e.printStackTrace(); } - if (!typeMatched(rule, req)) + if (!typeMatched(rule, req)) continue; try { @@ -200,16 +201,18 @@ public class PolicySet implements IPolicySet { // we pass that info down the chain. For now use S_OTHER // as the system id for the log entry. mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, - ILogger.LL_FAILURE, - CMS.getLogMessage("CMSCORE_POLICY_REJECT_RESULT", req.getRequestId().toString(), name)); + ILogger.LL_FAILURE, CMS.getLogMessage( + "CMSCORE_POLICY_REJECT_RESULT", req + .getRequestId().toString(), name)); rejected = true; } else if (result == PolicyResult.DEFERRED) { // It is hard to find out the owner at the moment unless // we pass that info down the chain. For now use S_OTHER // as the system id for the log entry. mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, - ILogger.LL_WARN, - CMS.getLogMessage("CMSCORE_POLICY_DEFER_RESULT", req.getRequestId().toString(), name)); + ILogger.LL_WARN, CMS.getLogMessage( + "CMSCORE_POLICY_DEFER_RESULT", req + .getRequestId().toString(), name)); deferred = true; } else if (result == PolicyResult.ACCEPTED) { // It is hard to find out the owner at the moment unless @@ -221,9 +224,10 @@ public class PolicySet implements IPolicySet { // we pass that info down the chain. For now use S_OTHER // as the system id for the log entry. mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, - ILogger.LL_INFO, - "policy: Request " + req.getRequestId() + " - Result of applying rule: " + name + - " is: " + getPolicyResult(result)); + ILogger.LL_INFO, + "policy: Request " + req.getRequestId() + + " - Result of applying rule: " + name + + " is: " + getPolicyResult(result)); } } catch (Throwable ex) { // Customer can install his own policies. @@ -231,14 +235,16 @@ public class PolicySet implements IPolicySet { // catch those problems and report // them to the log mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, - ILogger.LL_FAILURE, - CMS.getLogMessage("CMSCORE_POLICY_ERROR_RESULT", req.getRequestId().toString(), name, ex.toString())); - // treat as rejected to prevent request from going into + ILogger.LL_FAILURE, CMS.getLogMessage( + "CMSCORE_POLICY_ERROR_RESULT", req + .getRequestId().toString(), name, ex + .toString())); + // treat as rejected to prevent request from going into // a weird state. request queue doesn't handle this case. rejected = true; - ((IPolicyRule) rule).setError( - req, - CMS.getUserMessage("CMS_POLICY_UNEXPECTED_POLICY_ERROR", rule.getName(), ex.toString()), null); + ((IPolicyRule) rule).setError(req, CMS.getUserMessage( + "CMS_POLICY_UNEXPECTED_POLICY_ERROR", rule.getName(), + ex.toString()), null); } } @@ -247,10 +253,9 @@ public class PolicySet implements IPolicySet { } else if (deferred) { return PolicyResult.DEFERRED; } else { - mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, - ILogger.LL_INFO, - "Request " + req.getRequestId() + - " Policy result: successful"); + mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_INFO, + "Request " + req.getRequestId() + + " Policy result: successful"); return PolicyResult.ACCEPTED; } } @@ -266,8 +271,8 @@ public class PolicySet implements IPolicySet { String ruleName = (String) mRuleNames.elementAt(index); System.out.println("Rule Name: " + ruleName); - System.out.println("Implementation: " + - mRules.elementAt(index).getClass().getName()); + System.out.println("Implementation: " + + mRules.elementAt(index).getClass().getName()); } } @@ -295,4 +300,3 @@ public class PolicySet implements IPolicySet { return false; } } - 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 5e6458be2..e94f4dc52 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.policy; - import java.util.Enumeration; import java.util.Vector; @@ -28,13 +27,12 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.cmscore.util.AssertionException; import com.netscape.cmscore.util.Debug; - /** - * This class represents an expression of the form var = val, - * var != val, var < val, var > val, var <= val, var >= val. - * + * This class represents an expression of the form var = val, var != val, var < + * val, var > val, var <= val, var >= val. + * * Expressions are used as predicates for policy selection. - * + * * @author kanda * @version $Revision$, $Date$ */ @@ -47,11 +45,11 @@ public class SimpleExpression implements IExpression { private boolean hasWildCard; public static final char WILDCARD_CHAR = '*'; - // This is just for indicating a null expression. - public static SimpleExpression NULL_EXPRESSION = new SimpleExpression("null", OP_EQUAL, "null"); + // This is just for indicating a null expression. + public static SimpleExpression NULL_EXPRESSION = new SimpleExpression( + "null", OP_EQUAL, "null"); - public static IExpression parse(String input) - throws EPolicyException { + public static IExpression parse(String input) throws EPolicyException { // Get the index of operator // Debug.trace("SimpleExpression::input: " + input); String var = null; @@ -72,7 +70,8 @@ public class SimpleExpression implements IExpression { if (comps == null) comps = parseForLT(input); if (comps == null) - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_BAD_POLICY_EXPRESSION", input)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_BAD_POLICY_EXPRESSION", input)); String pfx = null; String rawVar = comps.getAttr(); int dotIdx = rawVar.indexOf('.'); @@ -117,20 +116,18 @@ public class SimpleExpression implements IExpression { hasWildCard = false; } - public boolean evaluate(IRequest req) - throws EPolicyException { + public boolean evaluate(IRequest req) throws EPolicyException { // mPfx and mVar are looked up case-indendently String givenVal = req.getExtDataInString(mPfx, mVar); if (Debug.ON) - Debug.trace("mPfx: " + mPfx + " mVar: " + mVar + - ",Given Value: " + givenVal + ", Value to compare with: " + mVal); + Debug.trace("mPfx: " + mPfx + " mVar: " + mVar + ",Given Value: " + + givenVal + ", Value to compare with: " + mVal); return matchValue(givenVal); } - private boolean matchVector(Vector value) - throws EPolicyException { + private boolean matchVector(Vector value) throws EPolicyException { boolean result = false; Enumeration e = (Enumeration) value.elements(); @@ -142,8 +139,7 @@ public class SimpleExpression implements IExpression { return result; } - private boolean matchStringArray(String[] value) - throws EPolicyException { + private boolean matchStringArray(String[] value) throws EPolicyException { boolean result = false; for (int i = 0; i < value.length; i++) { @@ -154,33 +150,32 @@ public class SimpleExpression implements IExpression { return result; } - private boolean matchValue(Object value) - throws EPolicyException { + private boolean matchValue(Object value) throws EPolicyException { boolean result; // There is nothing to compare with! if (value == null) return false; - // XXX - Kanda: We need a better way of handling this!. + // XXX - Kanda: We need a better way of handling this!. if (value instanceof String) result = matchStringValue((String) value); else if (value instanceof Integer) result = matchIntegerValue((Integer) value); else if (value instanceof Boolean) result = matchBooleanValue((Boolean) value); - else if (value instanceof Vector) + else if (value instanceof Vector) result = matchVector((Vector) value); - else if (value instanceof String[]) + else if (value instanceof String[]) result = matchStringArray((String[]) value); else - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_INVALID_ATTR_VALUE", - value.getClass().getName())); + throw new EPolicyException( + CMS.getUserMessage("CMS_POLICY_INVALID_ATTR_VALUE", value + .getClass().getName())); return result; } - private boolean matchStringValue(String givenVal) - throws EPolicyException { + private boolean matchStringValue(String givenVal) throws EPolicyException { boolean result; switch (mOp) { @@ -220,8 +215,7 @@ public class SimpleExpression implements IExpression { return result; } - private boolean matchIntegerValue(Integer intVal) - throws EPolicyException { + private boolean matchIntegerValue(Integer intVal) throws EPolicyException { boolean result; int storedVal; int givenVal = intVal.intValue(); @@ -229,7 +223,8 @@ public class SimpleExpression implements IExpression { try { storedVal = new Integer(mVal).intValue(); } catch (Exception e) { - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_INVALID_ATTR_VALUE", mVal)); + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_ATTR_VALUE", mVal)); } switch (mOp) { @@ -263,15 +258,13 @@ public class SimpleExpression implements IExpression { return result; } - private boolean matchBooleanValue(Boolean givenVal) - throws EPolicyException { + private boolean matchBooleanValue(Boolean givenVal) throws EPolicyException { boolean result; Boolean storedVal; - if (!(mVal.equalsIgnoreCase("true") || - mVal.equalsIgnoreCase("false"))) - throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_INVALID_ATTR_VALUE", - mVal)); + if (!(mVal.equalsIgnoreCase("true") || mVal.equalsIgnoreCase("false"))) + throw new EPolicyException(CMS.getUserMessage( + "CMS_POLICY_INVALID_ATTR_VALUE", mVal)); storedVal = new Boolean(mVal); switch (mOp) { case OP_EQUAL: @@ -320,9 +313,9 @@ public class SimpleExpression implements IExpression { op = IExpression.LE_STR; break; } - if (mPfx != null && mPfx.length() > 0) + if (mPfx != null && mPfx.length() > 0) return mPfx + "." + mVar + " " + op + " " + mVal; - else + else return mVar + " " + op + " " + mVal; } @@ -411,7 +404,6 @@ public class SimpleExpression implements IExpression { } } - class ExpressionComps { String attr; int op; @@ -435,4 +427,3 @@ class ExpressionComps { return val; } } - |