diff options
Diffstat (limited to 'base/server/cms/src/com/netscape')
-rw-r--r-- | base/server/cms/src/com/netscape/cms/ocsp/DefStore.java | 15 | ||||
-rw-r--r-- | base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java | 11 |
2 files changed, 15 insertions, 11 deletions
diff --git a/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java index a009cbb91..a0aefa99a 100644 --- a/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java +++ b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java @@ -326,6 +326,11 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { CMS.debug("DefStore: validating OCSP request"); TBSRequest tbsReq = request.getTBSRequest(); + if (tbsReq.getRequestCount() == 0) { + CMS.debug("DefStore: No request found"); + log(ILogger.LL_FAILURE, CMS.getLogMessage("OCSP_REQUEST_FAILURE", "No Request Found")); + throw new EBaseException("OCSP request is empty"); + } IStatsSubsystem statsSub = (IStatsSubsystem) CMS.getSubsystem("stats"); @@ -358,11 +363,6 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { statsSub.endTiming("lookup"); } - if (singleResponses.size() <= 0) { - CMS.debug("DefStore: No Request Found"); - log(ILogger.LL_FAILURE, CMS.getLogMessage("OCSP_REQUEST_FAILURE", "No Request Found")); - return null; - } if (statsSub != null) { statsSub.startTiming("build_response"); } @@ -423,10 +423,9 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { return response; - } catch (Exception e) { - CMS.debug(e); + } catch (EBaseException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("OCSP_REQUEST_FAILURE", e.toString())); - return null; + throw e; } } diff --git a/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java b/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java index 4cc9269cd..5017b968e 100644 --- a/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java +++ b/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java @@ -275,6 +275,11 @@ public class LDAPStore implements IDefStore, IExtendedPluginInfo { CMS.debug("LDAPStore: validating OCSP request"); TBSRequest tbsReq = request.getTBSRequest(); + if (tbsReq.getRequestCount() == 0) { + CMS.debug("LDAPStore: No request found"); + log(ILogger.LL_FAILURE, CMS.getLogMessage("OCSP_REQUEST_FAILURE", "No Request Found")); + throw new EBaseException("OCSP request is empty"); + } IStatsSubsystem statsSub = (IStatsSubsystem) CMS.getSubsystem("stats"); @@ -364,10 +369,10 @@ public class LDAPStore implements IDefStore, IExtendedPluginInfo { mOCSPAuthority.incTotalTime(endTime - startTime); return response; - } catch (Exception e) { - CMS.debug("LDAPStore: validation " + e.toString()); + + } catch (EBaseException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("OCSP_REQUEST_FAILURE", e.toString())); - return null; + throw e; } } |