From 30b6fe4364e2165bb723f7af73663c4f773bedb8 Mon Sep 17 00:00:00 2001 From: Ryan Hurey Date: Tue, 9 Jul 2019 14:43:28 -0700 Subject: [PATCH 1/2] Add ability to specify httpOptions when checking certificate. If specified, the options will be used as part of the http request to the certificate authority. --- lib/ocsp/check.js | 12 +++++++++++- lib/ocsp/utils.js | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/ocsp/check.js b/lib/ocsp/check.js index 5b3e4a8..e7b1f66 100644 --- a/lib/ocsp/check.js +++ b/lib/ocsp/check.js @@ -1,6 +1,8 @@ 'use strict'; var ocsp = require('../ocsp'); +var util = require('util'); +var url = require('url'); var rfc2560 = require('asn1.js-rfc2560'); @@ -31,7 +33,15 @@ module.exports = function check(options, cb) { if (err) return done(err); - ocsp.utils.getResponse(uri, req.data, function(err, raw) { + var httpOptions; + + if (options.httpOptions !== undefined) { + httpOptions = util._extend(options.httpOptions, url.parse(uri)); + } else { + httpOptions = uri; + } + + ocsp.utils.getResponse(httpOptions, req.data, function(err, raw) { if (err) return done(err); diff --git a/lib/ocsp/utils.js b/lib/ocsp/utils.js index ad9af75..f280f00 100644 --- a/lib/ocsp/utils.js +++ b/lib/ocsp/utils.js @@ -11,7 +11,9 @@ exports['id-ad-caIssuers'] = [ 1, 3, 6, 1, 5, 5, 7, 48, 2 ]; exports['id-kp-OCSPSigning'] = [ 1, 3, 6, 1, 5, 5, 7, 3, 9 ]; exports.getResponse = function getResponse(uri, req, cb) { - uri = url.parse(uri); + if (typeof uri !== 'object') { + uri = url.parse(uri); + } var options = util._extend({ method: 'POST', From 293f98d0387721b24a426c0786209cf5a39d23f5 Mon Sep 17 00:00:00 2001 From: Ryan Hurey Date: Tue, 9 Jul 2019 16:22:07 -0700 Subject: [PATCH 2/2] Fix bad indenting --- lib/ocsp/check.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ocsp/check.js b/lib/ocsp/check.js index e7b1f66..607c8fe 100644 --- a/lib/ocsp/check.js +++ b/lib/ocsp/check.js @@ -33,13 +33,13 @@ module.exports = function check(options, cb) { if (err) return done(err); - var httpOptions; + var httpOptions; - if (options.httpOptions !== undefined) { - httpOptions = util._extend(options.httpOptions, url.parse(uri)); - } else { - httpOptions = uri; - } + if (options.httpOptions !== undefined) { + httpOptions = util._extend(options.httpOptions, url.parse(uri)); + } else { + httpOptions = uri; + } ocsp.utils.getResponse(httpOptions, req.data, function(err, raw) { if (err)