@small-tech/auto-encrypt 4.1.3 → 4.2.0

package/index.js

@@ -14,7 +14,6 @@
 import os from 'os'
 import util from 'util'
 import https from 'https'
-import ocsp from 'ocsp'
 import monkeyPatchTls from './lib/staging/monkeyPatchTls.js'
 import LetsEncryptServer from './lib/LetsEncryptServer.js'
 import Configuration from './lib/Configuration.js'
@@ -77,9 +76,6 @@ export default class AutoEncrypt {
    */
   static get https () { return AutoEncrypt }
 
-
-  static ocspCache = null
-
   /**
    * Automatically manages Let’s Encrypt certificate provisioning and renewal for Node.js
    * https servers using the HTTP-01 challenge on first hit of an HTTPS route via use of
@@ -174,7 +170,7 @@ export default class AutoEncrypt {
       }
     }
 
-    const server = this.addOcspStapling(https.createServer(options, listener))
+    const server = https.createServer(options, listener)
 
     //
     // Monkey-patch the server.
@@ -212,25 +208,11 @@ export default class AutoEncrypt {
   }
 
 
-  /**
-   * The OCSP module does not have a means of clearing its cache check timers
-   * so we do it here. (Otherwise, the test suite would hang.)
-   */
-  static clearOcspCacheTimers () {
-    if (this.ocspCache !== null) {
-      const cacheIds = Object.keys(this.ocspCache.cache)
-      cacheIds.forEach(cacheId => {
-        clearInterval(this.ocspCache.cache[cacheId].timer)
-      })
-    }
-  }
-
   /**
    * Shut Auto Encrypt down. Do this before app exit. Performs necessary clean-up and removes
    * any references that might cause the app to not exit.
    */
   static shutdown () {
-    this.clearOcspCacheTimers()
     this.certificate.stopCheckingForRenewal()
   }
 
@@ -238,64 +220,6 @@ export default class AutoEncrypt {
   // Private.
   //
 
-  /**
-   * Adds Online Certificate Status Protocol (OCSP) stapling (also known as TLS Certificate Status Request extension)
-   * support to the passed server instance.
-   *
-   * @private
-   * @param {https.Server} server HTTPS server instance without OCSP Stapling support.
-   * @returns {https.Server} HTTPS server instance with OCSP Stapling support.
-   */
-  static addOcspStapling(server) {
-    // OCSP stapling
-    //
-    // Many browsers will fetch OCSP from Let’s Encrypt when they load your site. This is a performance and privacy
-    // problem. Ideally, connections to your site should not wait for a secondary connection to Let’s Encrypt. Also,
-    // OCSP requests tell Let’s Encrypt which sites people are visiting. We have a good privacy policy and do not record
-    // individually identifying details from OCSP requests, we’d rather not even receive the data in the first place.
-    // Additionally, we anticipate our bandwidth costs for serving OCSP every time a browser visits a Let’s Encrypt site
-    // for the first time will be a big part of our infrastructure expense.
-    //
-    // By turning on OCSP Stapling, you can improve the performance of your website, provide better privacy protections
-    // … and help Let’s Encrypt efficiently serve as many people as possible.
-    //
-    // (Source: https://letsencrypt.org/docs/integration-guide/implement-ocsp-stapling)
-
-    this.ocspCache = new ocsp.Cache()
-    const cache = this.ocspCache
-
-    server.on('OCSPRequest', (certificate, issuer, callback) => {
-
-      if (certificate == null) {
-        return callback(new Error('Cannot OCSP staple: certificate not yet provisioned.'))
-      }
-
-      ocsp.getOCSPURI(certificate, function(error, uri) {
-        if (error) return callback(error)
-        if (uri === null) return callback()
-
-        const request = ocsp.request.generate(certificate, issuer)
-
-        cache.probe(request.id, (error, cached) => {
-          if (error) return callback(error)
-
-          if (cached !== false) {
-            return callback(null, cached.response)
-          }
-
-          const options = {
-            url: uri,
-            ocsp: request.data
-          }
-
-          cache.request(request.id, options, callback);
-        })
-      })
-    })
-
-    return server
-  }
-
   // Custom object description for console output (for debugging).
   static [util.inspect.custom] () {
     return `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@small-tech/auto-encrypt",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "description": "Automatically provisions and renews Let’s Encrypt TLS certificates on Node.js https servers (including Kitten, Polka, Express.js, etc.)",
   "engines": {
     "node": ">=18.20.0"
@@ -68,8 +68,7 @@
     "encodeurl": "^1.0.2",
     "jose": "^1.28.2",
     "moment": "^2.29.4",
-    "node-forge": "^1.3.1",
-    "ocsp": "^1.2.0"
+    "node-forge": "^1.3.1"
   },
   "devDependencies": {
     "@small-tech/esm-tape-runner": "^1.0.3",