Update to Mockttp v4 for SOCKS, non-HTTP, delays & URL transforms

Lots and lots of exciting changes here - internally there's also some
notable CA & cert generation changes that might cause downstream effects
to watch out for. Mostly nothing immediately impactful though
(hopefully) and this is primarily a question of enabling shiny new
features that'll be powered by the UI shortly.

Author: pimterry

package-lock.json

@@ -83,8 +83,8 @@
     "lookpath": "^1.2.1",
     "mime-types": "^2.1.27",
     "mobx": "^6.3.5",
-    "mockrtc": "^0.4.0",
-    "mockttp": "^3.17.1",
+    "mockrtc": "^0.5.0",
+    "mockttp": "^4.0.0",
     "node-fetch": "^2.6.1",
     "node-forge": "^1.3.0",
     "node-gsettings-wrapper": "^0.5.0",

package.json

@@ -51,7 +51,8 @@ export class ApiModel {
         // Wait for each async part in parallel:
         const [
             systemProxy,
-            dnsServers
+            dnsServers,
+            spkiFingerprint
         ] = await Promise.all([
             withFallback(
                 () => getSystemProxy(),
@@ -61,7 +62,9 @@ export class ApiModel {
 
             proxyPort
                 ? await this.getDnsServers(proxyPort)
-                : []
+                : [],
+
+            generateSPKIFingerprint(this.config.https.certContent)
         ])
 
         return {
@@ -74,7 +77,7 @@ export class ApiModel {
             // We could calculate this client side, but it  requires node-forge or some
             // other heavyweight crypto lib, and we already have that here, so it's
             // convenient to do it up front.
-            certificateFingerprint: generateSPKIFingerprint(this.config.https.certContent),
+            certificateFingerprint: spkiFingerprint,
 
             networkInterfaces: this.getNetworkInterfaces(),
             systemProxy,

src/api/api-model.ts

@@ -34,8 +34,6 @@ import {
 import { clearWebExtensionConfig, updateWebExtensionConfig } from './webextension';
 import { HttpClient } from './client/http-client';
 
-const APP_NAME = "HTTP Toolkit";
-
 async function generateHTTPSConfig(configPath: string) {
     const keyPath = path.join(configPath, 'ca.key');
     const certPath = path.join(configPath, 'ca.pem');
@@ -50,8 +48,10 @@ async function generateHTTPSConfig(configPath: string) {
         // Cert doesn't exist, or is too close/past expiry. Generate a new one:
 
         const newCertPair = await generateCACertificate({
-            commonName: APP_NAME + ' CA',
-            organizationName: APP_NAME + ' CA'
+            subject: {
+                commonName: 'HTTP Toolkit CA',
+                organizationName: 'HTTP Toolkit CA'
+            }
         });
 
         return Promise.all([

src/index.ts

@@ -106,7 +106,7 @@ export class AndroidAdbInterceptor implements Interceptor {
             ),
             port: proxyPort,
             localTunnelPort: proxyPort,
-            certFingerprint: generateSPKIFingerprint(this.config.https.certContent)
+            certFingerprint: await generateSPKIFingerprint(this.config.https.certContent)
         };
         const intentData = urlSafeBase64(JSON.stringify(setupParams));
 
@@ -189,7 +189,7 @@ export class AndroidAdbInterceptor implements Interceptor {
                 console.log("Cert already installed, nothing to do");
             }
 
-            const spkiFingerprint = generateSPKIFingerprint(certContent);
+            const spkiFingerprint = await generateSPKIFingerprint(certContent);
 
             // Chrome requires system certificates to use certificate transparency, which we can't do. To work
             // around this, we need to explicitly trust our certificate in Chrome:

src/interceptors/android/android-adb-interceptor.ts

@@ -29,7 +29,7 @@ const getChromiumLaunchOptions = async (
     webExtensionEnabled: boolean
 ): Promise<LaunchOptions & { options: Required<LaunchOptions>['options'] }> => {
     const certificatePem = await readFile(config.https.certPath, 'utf8');
-    const spkiFingerprint = generateSPKIFingerprint(certificatePem);
+    const spkiFingerprint = await generateSPKIFingerprint(certificatePem);
 
     return {
         profile: profilePath,

src/interceptors/chromium-based-interceptors.ts

@@ -148,7 +148,7 @@ export class ElectronInterceptor implements Interceptor {
                 JSON.stringify(path.join(OVERRIDES_DIR, 'js', 'prepend-electron.js'))
             })({
                 newlineEncodedCertData: "${(await this.certData).replace(/\r\n|\r|\n/g, '\\n')}",
-                spkiFingerprint: "${generateSPKIFingerprint(await this.certData)}"
+                spkiFingerprint: "${await generateSPKIFingerprint(await this.certData)}"
             })`,
             callFrameId
         });

src/interceptors/electron.ts

@@ -108,7 +108,7 @@ export class ExistingTerminalInterceptor implements Interceptor {
         // A success endpoint, so we can mark this as active (which provides some helpful UX on the frontend)
         await server.forPost('/success').thenCallback(() => {
             serverState.isActive = true;
-            return { status: 200 };
+            return { statusCode: 200 };
         });
 
         this.servers[proxyPort] = serverState;