diff options
Diffstat (limited to 'base/common/src')
13 files changed, 64 insertions, 68 deletions
diff --git a/base/common/src/UserMessages.properties b/base/common/src/UserMessages.properties index 1c78c98ce..694c31d65 100644 --- a/base/common/src/UserMessages.properties +++ b/base/common/src/UserMessages.properties @@ -50,7 +50,7 @@ CMS_INVALID_OPERATION=Invalid operation # ProcessCertReq servlet # ProcessReq servelt ####################################################### -CMS_BASE_CERT_NOT_FOUND=Certificate not found +CMS_BASE_CERT_NOT_FOUND=Certificate not found or invalid CMS_BASE_ENCODE_CERT_FAILED=Failed to encode certificate CMS_BASE_NOT_TOKEN_CERT=The certificate being deleted is not a token certificate CMS_BASE_CERT_ERROR=Certificate Error: {0} @@ -459,6 +459,7 @@ CMS_DBS_SETBACK_MAXSERIAL=The serial number is already in use.\nYou can only set CMS_DBS_LDIF_FAILED=Failed to create ldif file: {0} CMS_DBS_COPY_LDIF_FAILED=Failed to copy ldif file: {0} CMS_DBS_RECORD_NOT_FOUND=Record not found +CMS_DBS_MISSING_OBJECT_CLASS=Missing Object Class ####################################################### # Jobs # diff --git a/base/common/src/com/netscape/certsrv/util/StatsEvent.java b/base/common/src/com/netscape/certsrv/util/StatsEvent.java index 3ee6e0d30..c431a3908 100644 --- a/base/common/src/com/netscape/certsrv/util/StatsEvent.java +++ b/base/common/src/com/netscape/certsrv/util/StatsEvent.java @@ -18,6 +18,8 @@ package com.netscape.certsrv.util; import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; import java.util.Vector; /** @@ -34,7 +36,7 @@ public class StatsEvent { private long mTimeTaken = 0; private long mTimeTakenSqSum = 0; private long mNoOfOperations = 0; - private Vector<StatsEvent> mSubEvents = new Vector<StatsEvent>(); + private Map<String,StatsEvent> mSubEvents = new HashMap<String,StatsEvent>(); private StatsEvent mParent = null; public StatsEvent(StatsEvent parent) { @@ -53,7 +55,7 @@ public class StatsEvent { } public void addSubEvent(StatsEvent st) { - mSubEvents.addElement(st); + mSubEvents.put(st.getName(), st); } /** @@ -61,10 +63,8 @@ public class StatsEvent { */ public Enumeration<String> getSubEventNames() { Vector<String> names = new Vector<String>(); - Enumeration<StatsEvent> e = mSubEvents.elements(); - while (e.hasMoreElements()) { - StatsEvent st = e.nextElement(); - names.addElement(st.getName()); + for (String s : mSubEvents.keySet()) { + names.add(s); } return names.elements(); } @@ -73,14 +73,7 @@ public class StatsEvent { * Retrieves a sub transaction. */ public StatsEvent getSubEvent(String name) { - Enumeration<StatsEvent> e = mSubEvents.elements(); - while (e.hasMoreElements()) { - StatsEvent st = e.nextElement(); - if (st.getName().equals(name)) { - return st; - } - } - return null; + return mSubEvents.get(name); } public void resetCounters() { @@ -89,11 +82,10 @@ public class StatsEvent { mNoOfOperations = 0; mTimeTaken = 0; mTimeTakenSqSum = 0; - Enumeration<String> e = getSubEventNames(); - while (e.hasMoreElements()) { - String n = e.nextElement(); - StatsEvent c = getSubEvent(n); - c.resetCounters(); + for (StatsEvent c : mSubEvents.values()) { + if (c != null) { + c.resetCounters(); + } } } diff --git a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 4ad6db528..2c092f91c 100644 --- a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -421,8 +421,8 @@ public class AuthzSubsystem implements IAuthzSubsystem { //String infoMsg = // "Shutting down authz manager instance " + mgr.getName(); //log(ILogger.LL_INFO, infoMsg); - - mgr.shutdown(); + if (mgr != null) + mgr.shutdown(); } mAuthzMgrPlugins.clear(); mAuthzMgrInsts.clear(); diff --git a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 1aa53d9e4..dd7918bd5 100644 --- a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -454,10 +454,16 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { } protected LDAPConnection getConn() throws ELdapException { - if (mLdapConnFactory != null) - return mLdapConnFactory.getConn(); + if (mLdapConnFactory != null) { + LDAPConnection conn = mLdapConnFactory.getConn(); + if (conn == null) { + throw new ELdapException("No Ldap Connection Available"); + } else { + return conn; + } + } - return null; + throw new ELdapException("Ldap Connection Factory is null"); } protected void returnConn(LDAPConnection conn) throws ELdapException { diff --git a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java index ddf23378a..4b35662fa 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java @@ -73,11 +73,10 @@ public class HttpPKIMessage implements IHttpPKIMessage { + r.getRequestId().toString() + " requestStatus=" + reqStatus + " instance=" + r); String attrs[] = RequestTransfer.getTransferAttributes(r); - int len = attrs.length; String[] names = attrs; Object value = null; - for (int i = 0; i < len; i++) { + for (int i = 0; i < attrs.length; i++) { String key = names[i]; if (r.isSimpleExtDataValue(key)) { value = r.getExtDataInString(key); diff --git a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java index baf076422..b3479aea0 100644 --- a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java +++ b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java @@ -91,12 +91,7 @@ public class RequestTransfer { v.addElement(k); } CMS.debug("RequestTransfer: attribute size=" + v.size()); - if (v.size() == 0) - return null; - String attrs[] = new String[v.size()]; - - v.copyInto(attrs); - return attrs; + return v.toArray(new String[v.size()]); } else { return transferAttributes; } diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java index 63b00b6bf..2b6a63a62 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java @@ -457,25 +457,20 @@ public class DBRegistry implements IDBRegistry, ISubsystem { * Creates object from attribute set. */ public IDBObj createObject(LDAPAttributeSet attrs) - throws EBaseException { + throws EDBException { // map object class attribute to object LDAPAttribute attr = attrs.getAttribute("objectclass"); + if (attr == null) { + throw new EDBException(CMS.getLogMessage("CMS_DBS_MISSING_OBJECT_CLASS")); + } //CMS.debug("createObject: attrs " + attrs.toString()); attrs.remove("objectclass"); // sort the object class values - @SuppressWarnings("unchecked") - Enumeration<String> vals = attr.getStringValues(); - Vector<String> v = new Vector<String>(); - - while (vals.hasMoreElements()) { - v.addElement(vals.nextElement()); - } - String s[] = new String[v.size()]; - v.copyInto(s); + String[] s = attr.getStringValueArray(); String sorted = sortAndConcate(s).toLowerCase(); NameAndObject no = mOCldapNames.get(sorted); diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index b0505c16b..71f889895 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -274,7 +274,7 @@ class PredicateTokenizer { return (currentIndex != -1); } - public String nextToken() { + public String nextToken() throws ELdapException { if (nextToken != null) { String toReturn = nextToken; @@ -322,8 +322,9 @@ class PredicateTokenizer { } } else { // Cannot happen; Assert here. - toReturn = null; - System.out.println("We shouldn't be here!"); + if (Debug.ON) + Debug.trace("Malformed expression: Null Token"); + throw new ELdapException(CMS.getUserMessage("CMS_LDAP_BAD_LDAP_EXPRESSION")); } if (toReturn == null) return null; diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 62e4b8bef..ab99b4f06 100644 --- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -493,7 +493,7 @@ public class PublisherProcessor implements //this is the only rule we support now LdapRule rule = (LdapRule) (mRuleInsts.get(name)); - if (rule.enabled() && rule.getType().equals(publishingType)) { + if (rule.enabled() && publishingType.equals(rule.getType())) { // check if the predicate match ILdapExpression exp = rule.getPredicate(); @@ -509,6 +509,7 @@ public class PublisherProcessor implements if (Debug.ON) Debug.trace("added rule " + name + " for " + publishingType); } + } return rules.elements(); } @@ -519,24 +520,13 @@ public class PublisherProcessor implements } Vector<ILdapRule> rules = new Vector<ILdapRule>(); - Enumeration<String> e = mRuleInsts.keys(); + Enumeration<ILdapRule> e = mRuleInsts.elements(); while (e.hasMoreElements()) { - String name = e.nextElement(); - - if (name == null) { - if (Debug.ON) - Debug.trace("rule name is " + "null"); - return null; - } else { - if (Debug.ON) - Debug.trace("rule name is " + name); - } - //this is the only rule we support now - LdapRule rule = (LdapRule) (mRuleInsts.get(name)); + LdapRule rule = (LdapRule) e.nextElement(); - if (rule.enabled() && rule.getType().equals(publishingType)) { + if (rule.enabled() && publishingType.equals(rule.getType())) { // check if the predicate match ILdapExpression exp = rule.getPredicate(); @@ -549,9 +539,10 @@ public class PublisherProcessor implements rules.addElement(rule); if (Debug.ON) - Debug.trace("added rule " + name + " for " + publishingType + + Debug.trace("added rule " + rule.getInstanceName() + " for " + publishingType + " request: " + req.getRequestId()); } + } return rules.elements(); } diff --git a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java index 9607cf892..82b515846 100644 --- a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -204,6 +204,10 @@ public class LogSubsystem implements ILogSubsystem { try { return cs.getString("pluginName", ""); } catch (EBaseException e) { + e.printStackTrace(); + return ""; + } catch (NullPointerException e) { + e.printStackTrace(); return ""; } } diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index f6c01b041..579d9ff5b 100644 --- a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -75,6 +75,7 @@ public class PolicyPredicateParser { Debug.trace("Malformed expression: " + predicateExpression); throw new EPolicyException(CMS.getUserMessage("CMS_POLICY_BAD_POLICY_EXPRESSION", predicateExpression)); } + IExpression current = parseExpression(token); boolean malformed = false; Vector<IExpression> expSet = new Vector<IExpression>(); @@ -276,7 +277,7 @@ class PredicateTokenizer { return (currentIndex != -1); } - public String nextToken() { + public String nextToken() throws EPolicyException { if (nextToken != null) { String toReturn = nextToken; @@ -324,8 +325,9 @@ class PredicateTokenizer { } } else { // Cannot happen; Assert here. - toReturn = null; - System.out.println("We shouldn't be here!"); + if (Debug.ON) + Debug.trace("Malformed Predicate Expression : No Tokens"); + throw new EPolicyException("Malformed Predicate Expression : No Tokens"); } if (toReturn == null) return null; diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index 914803223..040abc3c2 100644 --- a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -189,6 +189,9 @@ public abstract class CertificateInfo { String hashtype = (String) mProperties.get(ConfigConstants.PR_HASH_TYPE); algm = KeyCertUtil.getSigningAlgorithm(getKeyAlgorithm(), hashtype); + if (algm == null) { + throw new NoSuchAlgorithmException(); + } mProperties.put(Constants.PR_SIGNATURE_ALGORITHM, algm); } diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index 192f2f483..95e213541 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -1680,9 +1680,16 @@ public final class UGSubsystem implements IUGSubsystem { } protected LDAPConnection getConn() throws ELdapException { - if (mLdapConnFactory == null) - return null; - return mLdapConnFactory.getConn(); + if (mLdapConnFactory != null) { + LDAPConnection conn = mLdapConnFactory.getConn(); + if (conn == null) { + throw new ELdapException("No Ldap Connection Available"); + } else { + return conn; + } + } + + throw new ELdapException("Ldap Connection Factory is Unavailable"); } protected void returnConn(LDAPConnection conn) { |