@tryghost/domain-validator 4.1.0 → 5.0.0

package/lib/pro.js

@@ -16,18 +16,19 @@ const responseObject = {
     raw: null,
 };
 
+// The origin echoes X-Forwarded-Proto back as x-ghost-forwarded-proto, using "-" when
+// it received no X-Forwarded-Proto header at all, so "-" is the same as the header being absent
+_private.hasForwardedProto = (headers) =>
+    _.has(headers, 'x-ghost-forwarded-proto') && headers['x-ghost-forwarded-proto'] !== '-';
+
 // Attempt to detect if the results look like a proxy
-_private.detectProxy = (headers, proto) => {
+_private.detectProxy = (headers) => {
     if (
         // If x-forwarded-host was originally set, this is a proxy. "- [Invalid]" means original value was empty
         (_.has(headers, 'x-ghost-forwarded-host') &&
             headers['x-ghost-forwarded-host'] !== '- [Invalid]') ||
         // If x-amz-cf-id is set, then this is cloudfront and therefore is a proxy
-        _.has(headers, 'x-amz-cf-id') ||
-        // If we are making an https request and get http back, this must be a proxy
-        (proto === 'https' &&
-            _.has(headers, 'x-ghost-forwarded-proto') &&
-            headers['x-ghost-forwarded-proto'] !== proto)
+        _.has(headers, 'x-amz-cf-id')
     ) {
         return true;
     }
@@ -55,11 +56,10 @@ _private.validateProxy = (headers, subdomain, customdomain, subdirectory, prodom
         });
     }
 
-    // Proto must be https
-    if (
-        !_.has(headers, 'x-ghost-forwarded-proto') ||
-        headers['x-ghost-forwarded-proto'] !== 'https'
-    ) {
+    // Proto must be https when the header is present. An absent header ("-") is not
+    // evidence of a bad proxy: Fastly sets X-Forwarded-Proto itself and can lose it
+    // on the hop between its own nodes, so only fail on a positive wrong value
+    if (_private.hasForwardedProto(headers) && headers['x-ghost-forwarded-proto'] !== 'https') {
         proxyResult.isValid = false;
         proxyResult.errors.push({
             'x-forwarded-proto': {
@@ -137,7 +137,7 @@ _private.buildResponse = (result, proto, subdomain, customdomain, subdirectory,
     response.isGhostPro =
         response.isGhostPro && (!response.hasRedirect || response.isGhostProRedirect);
 
-    response.isProxy = _private.detectProxy(headers, proto);
+    response.isProxy = _private.detectProxy(headers);
 
     // Generate a proxy report
     const proxyResult = _private.validateProxy(

package/lib/request.js

@@ -1,4 +1,5 @@
-const got = require('got');
+// got 12+ is ESM-only; Node 22.12+ can require() it and exposes the export as `.default`
+const got = require('got').default;
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const debug = require('@tryghost/debug')('dv:request');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/domain-validator",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "license": "MIT",
   "author": "Ghost Foundation",
   "repository": {
@@ -21,20 +21,20 @@
     "access": "public"
   },
   "dependencies": {
-    "@tryghost/debug": "2.3.8",
-    "@tryghost/errors": "3.3.8",
-    "@tryghost/pretty-cli": "3.3.8",
-    "got": "11.8.6",
+    "@tryghost/debug": "2.3.19",
+    "@tryghost/errors": "3.4.5",
+    "@tryghost/pretty-cli": "3.4.1",
+    "got": "16.2.0",
     "lodash": "4.18.1",
     "semver": "7.8.5",
-    "@tryghost/dns": "^0.8.10"
+    "@tryghost/dns": "^0.9.0"
   },
   "devDependencies": {
     "should": "13.2.3",
     "sinon": "22.1.0"
   },
   "engines": {
-    "node": ">=20.20.0"
+    "node": ">=22.12.0"
   },
   "scripts": {
     "dv": "node bin/dv.js",