Use localhost instead of 0.0.0.0 for all local socket servers

package.json

@@ -627,6 +627,16 @@
 								"type": "string",
 								"description": "Absolute path to a file containing environment variable definitions.",
 								"default": ""
+							},
+							"port": {
+								"type": "number",
+								"description": "Debug port (default is 0, resulting in the use of a dynamic port).",
+								"default": 0
+							},
+							"host": {
+								"type": "string",
+								"description": "IP Address of the of the local debug server (default is localhost or use 127.0.0.1).",
+								"default": "localhost"
 							}
 						}
 					},
@@ -1321,6 +1331,12 @@
 					"description": "Port number used for debugging of unittests.",
 					"scope": "resource"
 				},
+				"python.unitTest.debugHost": {
+					"type": "number",
+					"default": "localhost",
+					"description": "IP Address of the of the local unit test server (default is localhost or use 127.0.0.1).",
+					"scope": "resource"
+				},
 				"python.unitTest.cwd": {
 					"type": "string",
 					"default": null,
@@ -1567,6 +1583,7 @@
 		"tslint-microsoft-contrib": "^5.0.1",
 		"typescript": "^2.6.2",
 		"typescript-formatter": "^6.0.0",
-		"vscode": "^1.1.5"
+		"vscode": "^1.1.5",
+		"vscode-debugadapter-testsupport": "^1.25.0"
 	}
 }

src/client/common/configSettings.ts

@@ -36,6 +36,7 @@ export interface ISortImportSettings {
 export interface IUnitTestSettings {
     promptToConfigure: boolean;
     debugPort: number;
+    debugHost?: string;
     nosetestsEnabled: boolean;
     nosetestPath: string;
     nosetestArgs: string[];

src/client/common/net/socket/socketServer.ts

@@ -1,38 +1,34 @@
-"use strict";
-
-import * as net from "net";
 import { EventEmitter } from 'events';
+import * as net from 'net';
 import { createDeferred } from '../../helpers';
 
 export class SocketServer extends EventEmitter {
-    private socketServer: net.Server = null;
+    private socketServer: net.Server | undefined;
     constructor() {
         super();
     }
 
     public Stop() {
-        if (this.socketServer === null) { return; }
+        if (!this.socketServer) { return; }
         try {
             this.socketServer.close();
-        }
-        catch (ex) { }
-        this.socketServer = null;
+            // tslint:disable-next-line:no-empty
+        } catch (ex) { }
+        this.socketServer = undefined;
     }
 
-    public Start(): Promise<number> {
+    public Start(options: { port?: number, host?: string } = {}): Promise<number> {
         const def = createDeferred<number>();
         this.socketServer = net.createServer(this.connectionListener.bind(this));
 
-        this.socketServer.listen(0, function (this: SocketServer) {
-            def.resolve(this.socketServer.address().port);
-        }.bind(this));
+        const port = typeof options.port === 'number' ? options.port! : 0;
+        const host = typeof options.host === 'string' ? options.host! : 'localhost';
+        this.socketServer!.listen({ port, host }, () => {
+            def.resolve(this.socketServer!.address().port);
+        });
 
-        this.socketServer.on("error", ex => {
+        this.socketServer!.on('error', ex => {
             console.error('Error in Socket Server', ex);
-            if (def.completed) {
-                // Ooops
-                debugger;
-            }
             const msg = `Failed to start the socket server. (Error: ${ex.message})`;
 
             def.reject(msg);
@@ -41,14 +37,14 @@ export class SocketServer extends EventEmitter {
     }
 
     private connectionListener(client: net.Socket) {
-        client.on("close", function () {
+        client.on('close', () => {
             this.emit('close', client);
-        }.bind(this));
-        client.on("data", function (data: Buffer) {
+        });
+        client.on('data', (data: Buffer) => {
             this.emit('data', client, data);
-        }.bind(this));
+        });
 
-        client.on("timeout", d => {
+        client.on('timeout', d => {
             // let msg = "Debugger client timedout, " + d;
         });
     }

src/client/debugger/Common/Contracts.ts

@@ -1,8 +1,10 @@
-"use strict";
-import * as net from "net";
+// tslint:disable:interface-name member-access no-single-line-block-comment no-any no-stateless-class member-ordering prefer-method-signature
+
+'use strict';
 import { ChildProcess } from 'child_process';
-import { DebugProtocol } from "vscode-debugprotocol";
-import { OutputEvent } from "vscode-debugadapter";
+import * as net from 'net';
+import { OutputEvent } from 'vscode-debugadapter';
+import { DebugProtocol } from 'vscode-debugprotocol';
 
 export class TelemetryEvent extends OutputEvent {
     body: {
@@ -14,25 +16,25 @@ export class TelemetryEvent extends OutputEvent {
         data?: any;
     };
     constructor(output: string, data?: any) {
-        super(output, "telemetry");
+        super(output, 'telemetry');
         if (data) {
             this.body.data = data;
         }
     }
 }
-export const DjangoApp = "DJANGO";
+export const DjangoApp = 'DJANGO';
 export enum DebugFlags {
     None = 0,
     IgnoreCommandBursts = 1
 }
 
 export class DebugOptions {
-    public static get WaitOnAbnormalExit(): string { return "WaitOnAbnormalExit"; }
-    public static get WaitOnNormalExit(): string { return "WaitOnNormalExit"; }
-    public static get RedirectOutput(): string { return "RedirectOutput"; }
-    public static get DjangoDebugging(): string { return "DjangoDebugging"; }
-    public static get DebugStdLib(): string { return "DebugStdLib"; }
-    public static get BreakOnSystemExitZero(): string { return "BreakOnSystemExitZero"; }
+    public static get WaitOnAbnormalExit(): string { return 'WaitOnAbnormalExit'; }
+    public static get WaitOnNormalExit(): string { return 'WaitOnNormalExit'; }
+    public static get RedirectOutput(): string { return 'RedirectOutput'; }
+    public static get DjangoDebugging(): string { return 'DjangoDebugging'; }
+    public static get DebugStdLib(): string { return 'DebugStdLib'; }
+    public static get BreakOnSystemExitZero(): string { return 'BreakOnSystemExitZero'; }
 }
 
 export interface ExceptionHandling {
@@ -55,7 +57,9 @@ export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArgum
     env?: Object;
     envFile: string;
     exceptionHandling?: ExceptionHandling;
-    console?: "none" | "integratedTerminal" | "externalTerminal";
+    console?: 'none' | 'integratedTerminal' | 'externalTerminal';
+    port?: number;
+    host?: string;
 }
 
 export interface AttachRequestArguments extends DebugProtocol.AttachRequestArguments {
@@ -76,7 +80,8 @@ export enum FrameKind {
     None,
     Python,
     Django
-};
+}
+
 export enum enum_EXCEPTION_STATE {
     BREAK_MODE_NEVER = 0,
     BREAK_MODE_ALWAYS = 1,
@@ -99,7 +104,7 @@ export enum PythonEvaluationResultFlags {
     MethodCall = 2,
     SideEffects = 4,
     Raw = 8,
-    HasRawRepr = 16,
+    HasRawRepr = 16
 }
 
 export interface IPythonProcess extends NodeJS.EventEmitter {
@@ -138,14 +143,12 @@ export interface IPythonEvaluationResult {
     Frame: IPythonStackFrame;
 }
 
-
 export interface IPythonModule {
     ModuleId: number;
     Name: string;
     Filename: string;
 }
 
-
 export interface IPythonThread {
     IsWorkerThread: boolean;
     Process: IPythonProcess;

src/client/debugger/DebugClients/LocalDebugClient.ts

@@ -46,7 +46,7 @@ export class LocalDebugClient extends DebugClient {
 
     public CreateDebugServer(pythonProcess: IPythonProcess): BaseDebugServer {
         this.pythonProcess = pythonProcess;
-        this.debugServer = new LocalDebugServer(this.debugSession, this.pythonProcess);
+        this.debugServer = new LocalDebugServer(this.debugSession, this.pythonProcess, this.args);
         return this.debugServer;
     }
 

src/client/debugger/DebugServers/DebugServerFactory.ts

@@ -1,9 +1,8 @@
-import {BaseDebugServer} from "./BaseDebugServer";
-import {LocalDebugServer} from "./LocalDebugServer";
-import {RemoteDebugServer} from "./RemoteDebugServer";
-import {DebugSession, OutputEvent} from "vscode-debugadapter";
-import {IPythonProcess, IDebugServer} from "../Common/Contracts";
+import { DebugSession } from 'vscode-debugadapter';
+import { IPythonProcess, LaunchRequestArguments } from '../Common/Contracts';
+import { BaseDebugServer } from './BaseDebugServer';
+import { LocalDebugServer } from './LocalDebugServer';
 
-export function CreateDebugServer(debugSession: DebugSession, pythonProcess: IPythonProcess): BaseDebugServer {
-    return new LocalDebugServer(debugSession, pythonProcess);
+export function CreateDebugServer(debugSession: DebugSession, pythonProcess: IPythonProcess, args: LaunchRequestArguments): BaseDebugServer {
+    return new LocalDebugServer(debugSession, pythonProcess, args);
 }

src/client/debugger/DebugServers/LocalDebugServer.ts

@@ -3,23 +3,23 @@
 import * as net from 'net';
 import { EOL } from 'os';
 import { DebugSession, OutputEvent } from 'vscode-debugadapter';
-import { IDebugServer, IPythonProcess } from '../Common/Contracts';
+import { IDebugServer, IPythonProcess, LaunchRequestArguments } from '../Common/Contracts';
 import { BaseDebugServer } from './BaseDebugServer';
 
 export class LocalDebugServer extends BaseDebugServer {
-    private debugSocketServer: net.Server = null;
+    private debugSocketServer: net.Server | undefined;
 
-    constructor(debugSession: DebugSession, pythonProcess: IPythonProcess) {
+    constructor(debugSession: DebugSession, pythonProcess: IPythonProcess, private args: LaunchRequestArguments) {
         super(debugSession, pythonProcess);
     }
 
     public Stop() {
-        if (this.debugSocketServer === null) { return; }
+        if (!this.debugSocketServer) { return; }
         try {
             this.debugSocketServer.close();
             // tslint:disable-next-line:no-empty
         } catch { }
-        this.debugSocketServer = null;
+        this.debugSocketServer = undefined;
     }
 
     public async Start(): Promise<IDebugServer> {
@@ -61,7 +61,7 @@ export class LocalDebugServer extends BaseDebugServer {
                     reject(msg);
                 });
             });
-            this.debugSocketServer.on('error', ex => {
+            this.debugSocketServer!.on('error', ex => {
                 const exMessage = JSON.stringify(ex);
                 let msg = '';
                 // tslint:disable-next-line:no-any
@@ -77,8 +77,10 @@ export class LocalDebugServer extends BaseDebugServer {
                 reject(msg);
             });
 
-            this.debugSocketServer.listen(0, () => {
-                const server = this.debugSocketServer.address();
+            const port = typeof this.args.port === 'number' ? this.args.port! : 0;
+            const host = typeof this.args.host === 'string' && this.args.host.trim().length > 0 ? this.args.host!.trim() : 'localhost';
+            this.debugSocketServer!.listen({ port, host }, () => {
+                const server = this.debugSocketServer!.address();
                 resolve({ port: server.port });
             });
         });