fix(mitm): disable upstream proxy for dns lookup

Author: blakebyrnes

mitm-socket/go/dialer.go

@@ -21,7 +21,7 @@ func Dial(addr string, connectArgs ConnectArgs, sessionArgs SessionArgs) (net.Co
 			return nil, err
 		}
 
-		if proxyUrl.Scheme == "socks5" {
+		if proxyUrl.Scheme == "socks5" || proxyUrl.Scheme == "socks5h" {
 			return DialAddrViaSock5Proxy(dialer, addr, proxyUrl)
 		}
 

mitm/lib/Dns.ts

@@ -17,7 +17,10 @@ export class Dns {
   }
 
   public async lookupIp(host: string, retries = 3): Promise<string> {
-    if (!this.dnsSettings.dnsOverTlsConnection || host === 'localhost' || net.isIP(host)) return host;
+    // disable dns lookups when using a proxy
+    if (this.requestSession.upstreamProxyUrl) return host;
+    if (!this.dnsSettings.dnsOverTlsConnection || host === 'localhost' || net.isIP(host))
+      return host;
 
     try {
       // get cached (or in process resolver)

mitm/lib/DnsOverTlsSocket.ts

@@ -4,7 +4,7 @@ import IResolvablePromise from '@secret-agent/interfaces/IResolvablePromise';
 import { createPromise } from '@secret-agent/commons/utils';
 import MitmSocket from '@secret-agent/mitm-socket/index';
 import { CanceledPromiseError } from '@secret-agent/commons/interfaces/IPendingWaitEvent';
-import IDnsSettings from "@secret-agent/interfaces/IDnsSettings";
+import IDnsSettings from '@secret-agent/interfaces/IDnsSettings';
 import { addTypedEventListener, removeEventListeners } from '@secret-agent/commons/eventUtils';
 import { IBoundLog } from '@secret-agent/interfaces/ILog';
 import Log from '@secret-agent/commons/Logger';
@@ -70,12 +70,7 @@ export default class DnsOverTlsSocket {
       keepAlive: true,
       debug: true,
     });
-    if (this.dnsSettings.useUpstreamProxy) {
-      const upstreamProxy = this.requestSession.upstreamProxyUrl;
-      if (upstreamProxy) {
-        this.mitmSocket.setProxyUrl(upstreamProxy);
-      }
-    }
+
     await this.mitmSocket.connect(this.requestSession.requestAgent.socketSession, 10e3);
 
     this.mitmSocket.socket.on('data', this.onData.bind(this));

puppet-chrome/lib/Browser.ts

@@ -150,13 +150,19 @@ export class Browser extends TypedEventEmitter<IBrowserEvents> implements IPuppe
 
   private async onTargetCreated(event: Protocol.Target.TargetCreatedEvent) {
     const { targetInfo } = event;
-    if (targetInfo.type === 'page' && !targetInfo.attached) {
-      const context = this.browserContextsById.get(targetInfo.browserContextId);
-      await context?.attachToTarget(targetInfo.targetId);
-    }
-    if (targetInfo.type === 'shared_worker') {
-      const context = this.browserContextsById.get(targetInfo.browserContextId);
-      await context?.attachToWorker(targetInfo);
+    try {
+      if (targetInfo.type === 'page' && !targetInfo.attached) {
+        const context = this.browserContextsById.get(targetInfo.browserContextId);
+        await context?.attachToTarget(targetInfo.targetId);
+      }
+      if (targetInfo.type === 'shared_worker') {
+        const context = this.browserContextsById.get(targetInfo.browserContextId);
+        await context?.attachToWorker(targetInfo);
+      }
+    } catch (error) {
+      // target went away too quickly
+      if (String(error).includes('No target with given id found')) return;
+      throw error;
     }
   }