server: port range is end inclusive, improve validation

Author: aeschli

src/server-main.js

@@ -147,9 +147,9 @@ async function start() {
 }
 
 /**
- * If `--pick - port` and `--port` is specified, connect to that port.
+ * If `--pick-port` and `--port` is specified, connect to that port.
  *
- * If not and a port range is specified through `--pick - port`
+ * If not and a port range is specified through `--pick-port`
  * then find a free port in that range. Throw error if no
  * free port available in range.
  *
@@ -176,14 +176,15 @@ async function parsePort(host, strPort, strPickPort) {
 			if (port !== undefined) {
 				return port;
 			}
-			console.warn(`--port: Could not find free port in range: ${range.start} - ${range.end}.`);
+			console.warn(`--port: Could not find free port in range: ${range.start} - ${range.end} (inclusive).`);
 			process.exit(1);
 
 		} else {
-			console.warn(`--port "${strPort}" is not a valid number or range.`);
+			console.warn(`--port "${strPort}" is not a valid number or range. Ranges must be in the form 'from-to' with 'from' an integer larger than 0 and not larger than 'end'.`);
 			process.exit(1);
 		}
 	}
+	// pick-port is deprected and will be removed soon
 	if (strPickPort) {
 		const range = parseRange(strPickPort);
 		if (range) {
@@ -194,11 +195,11 @@ async function parsePort(host, strPort, strPickPort) {
 				if (port !== undefined) {
 					return port;
 				}
-				console.log(`--pick - port: Could not find free port in range: ${range.start} - ${range.end}.`);
+				console.log(`--pick-port: Could not find free port in range: ${range.start} - ${range.end}.`);
 				process.exit(1);
 			}
 		} else {
-			console.log(`--pick - port "${strPickPort}" is not properly formatted.`);
+			console.log(`--pick-port "${strPickPort}" is not a valid range. Ranges must be in the form 'from-to' with 'from' an integer larger than 0 and not larger than 'end'.`);
 			process.exit(1);
 		}
 	}
@@ -212,7 +213,10 @@ async function parsePort(host, strPort, strPickPort) {
 function parseRange(strRange) {
 	const match = strRange.match(/^(\d+)-(\d+)$/);
 	if (match) {
-		return { start: parseInt(match[1], 10), end: parseInt(match[2], 10) };
+		const start = parseInt(match[1], 10), end = parseInt(match[2], 10);
+		if (start > 0 && start <= end && end <= 65535) {
+			return { start, end };
+		}
 	}
 	return undefined;
 }
@@ -239,7 +243,7 @@ async function findFreePort(host, start, end) {
 			});
 		});
 	};
-	for (let port = start; port < end; port++) {
+	for (let port = start; port <= end; port++) {
 		if (await testPort(port)) {
 			return port;
 		}

src/vs/server/node/serverEnvironmentService.ts

@@ -15,8 +15,8 @@ export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
 	/* ----- server setup ----- */
 
 	'host': { type: 'string', cat: 'o', args: 'ip-address', description: nls.localize('host', "The host name or IP address the server should listen to. If not set, defaults to 'localhost'.") },
-	'port': { type: 'string', cat: 'o', args: 'port | port range', description: nls.localize('port', "The port the server should listen to. If 0 is passed a random free port is picked. If a range in the format num-num is passed, a free port from the range is selected.") },
-	'pick-port': { type: 'string', deprecationMessage: "Use the range notation in 'port' instead." },
+	'port': { type: 'string', cat: 'o', args: 'port | port range', description: nls.localize('port', "The port the server should listen to. If 0 is passed a random free port is picked. If a range in the format num-num is passed, a free port from the range (end inclusive) is selected.") },
+	'pick-port': { type: 'string', deprecationMessage: 'Use the range notation in \'port\' instead.' },
 	'socket-path': { type: 'string', cat: 'o', args: 'path', description: nls.localize('socket-path', "The path to a socket file for the server to listen to.") },
 	'connection-token': { type: 'string', cat: 'o', args: 'token', deprecates: ['connectionToken'], description: nls.localize('connection-token', "A secret that must be included with all requests.") },
 	'connection-token-file': { type: 'string', cat: 'o', args: 'path', deprecates: ['connection-secret', 'connectionTokenFile'], description: nls.localize('connection-token-file', "Path to a file that contains the connection token.") },