diff options
author | Endi S. Dewata <edewata@redhat.com> | 2017-06-20 08:18:20 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2017-06-20 20:05:11 +0200 |
commit | 4aa28a72c7deea46f8c7bc407153fd50030bb311 (patch) | |
tree | e52d5009668ea03895723b3aeb806a9f9b69ff51 /base/server/cms/src/com/netscape/cms/ocsp/DefStore.java | |
parent | 53d695a365b8a104b507970381a6a88df8624cd9 (diff) | |
download | pki-4aa28a72c7deea46f8c7bc407153fd50030bb311.tar.gz pki-4aa28a72c7deea46f8c7bc407153fd50030bb311.tar.xz pki-4aa28a72c7deea46f8c7bc407153fd50030bb311.zip |
Fixed OCSP service error handling.
Some OCSP-related classes have been modified to detect errors and
handle exceptions properly.
https://pagure.io/dogtagpki/issue/2652
Change-Id: Ifd054c47d04ff106120df2d7f3705366c7de9da9
Diffstat (limited to 'base/server/cms/src/com/netscape/cms/ocsp/DefStore.java')
-rw-r--r-- | base/server/cms/src/com/netscape/cms/ocsp/DefStore.java | 15 |
1 files changed, 7 insertions, 8 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; } } |