Pass the incoming client_ip into the ExtORPort.

server/server.go

@@ -139,10 +139,18 @@ func webSocketHandler(ws *websocket.WebSocket) {
 		handlerChan <- -1
 	}()
 
-	// Pass an empty string for the client address. The remote address on
+	// Check if client addr is a valid IP
-	// the incoming connection reflects that of the browser proxy, not of
+	addr := ws.Request().URL.Query().Get("client_ip")
-	// the client. See https://bugs.torproject.org/18628.
+	clientIP := net.ParseIP(addr)
-	or, err := pt.DialOr(&ptInfo, "", ptMethodName)
+
+	if clientIP == nil {
+		// Set client addr to empty
+		addr = ""
+	}
+
+	// Pass the address of client as the remote address of incoming connection
+	or, err := pt.DialOr(&ptInfo, addr, ptMethodName)
+
 	if err != nil {
 		log.Printf("failed to connect to ORPort: %s", err)
 		return