@tryghost/domain-validator 1.3.0 → 1.5.0

package/lib/pro.js

@@ -106,6 +106,12 @@ _private.buildResponse = (result, proto, subdomain, customdomain, subdirectory,
     if (result.length > 1) {
         response.hasRedirect = true;
         response.redirect = result.slice(0, -1);
+
+        const validRedirectDomains = [customdomain];
+        if (subdomain && prodomain) {
+            validRedirectDomains.push(`${subdomain}.${prodomain}`);
+        }
+        response.isGhostProRedirect = response.redirect.every(redirect => validRedirectDomains.includes(new URL(redirect.headers.location).hostname));
     }
 
     // If we find the x-ghost-cache-status header, we're seeing Ghost(Pro)
@@ -116,6 +122,9 @@ _private.buildResponse = (result, proto, subdomain, customdomain, subdirectory,
         }
     }
 
+    // Ensure that we only set isGhostPro to true if the redirect only uses valid domains
+    response.isGhostPro = response.isGhostPro && (!response.hasRedirect || response.isGhostProRedirect);
+
     response.isProxy = _private.detectProxy(headers, proto);
 
     // Generate a proxy report

package/lib/request.js

@@ -4,7 +4,31 @@ const Promise = require('bluebird');
 const errors = require('@tryghost/errors');
 const debug = require('@tryghost/debug')('dv:request');
 
+// Use 3rd party DNS resolver
+const http = require('http');
+const https = require('https');
+const {Resolver} = require('dns').promises;
+const resolver = new Resolver();
+resolver.setServers(['1.1.1.1', '1.0.0.1']);
+
+const staticLookup = () => async (hostname, _options, callback) => {
+    try {
+        const ips = await resolver.resolve(hostname);
+
+        if (ips.length === 0) {
+            return callback(new Error(`Unable to resolve ${hostname}`));
+        }
+
+        callback(null, ips[0], 4);
+    } catch (err) {
+        return callback(err);
+    }
+};
+
 module.exports.domain = (url) => {
+    const httpModule = new URL(url).protocol === 'https:' ? https : http;
+    const httpAgent = new httpModule.Agent({lookup: staticLookup()});
+
     const options = {
         // We want to capture details of different hops
         followRedirect: false,
@@ -14,7 +38,8 @@ module.exports.domain = (url) => {
         retries: 1,
         headers: {
             'X-Ghost-Proxy': true
-        }
+        },
+        agent: httpAgent
     };
 
     const responses = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/domain-validator",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "repository": {
     "type": "git",
     "url": "ssh://git@github.com/TryGhost/Pro",
@@ -38,5 +38,5 @@
     "got": "8.3.2",
     "lodash": "4.17.21"
   },
-  "gitHead": "06061de9669e92d852dde89d038dfed50dc3e806"
+  "gitHead": "7a23ec04b7a660ee582defdf8bcabcc7268a2cd5"
 }