Fix "no authentication" message with custom password

Fixes #757.

.travis.yml

@@ -27,7 +27,6 @@ before_deploy:
 - git config --local user.name "$USER_NAME"
 - git config --local user.email "$USER_EMAIL"
 - git tag "$VERSION" "$TRAVIS_COMMIT"
-- if [[ “$TRAVIS_OS_NAME” == “osx” ]]; then yarn task package $VERSION; fi
 deploy:
   provider: releases
   file_glob: true

build/tasks.ts

@@ -21,6 +21,8 @@ const buildServerBinary = register("build:server:binary", async (runner) => {
 	logger.info("Building with environment", field("env", {
 		NODE_ENV: process.env.NODE_ENV,
 		VERSION: process.env.VERSION,
+		OSTYPE: process.env.OSTYPE,
+		TARGET: process.env.TARGET,
 	}));
 
 	await ensureInstalled();

doc/admin/install/aws.md

@@ -11,9 +11,9 @@ If you're just starting out, we recommend [installing code-server locally](../..
 ### Use the AWS wizard
 
 - Click **Launch Instance** from your [EC2 dashboard](https://console.aws.amazon.com/ec2/v2/home).
-- Select the Ubuntu Server 16.04 LTS (HVM), SSD Volume Type (`ami-0f9cf087c1f27d9b1)` at this time of writing)
+- Select the Ubuntu Server 18.04 LTS (HVM), SSD Volume Type
 - Select an appropriate instance size (we recommend t2.medium/large, depending on team size and number of repositories/languages enabled), then **Next: Configure Instance Details**
-- Select **Next: ...** until you get to the **Configure Security Group** page, then add the default **HTTP** rule (port range "80", source "0.0.0.0/0, ::/0")
+- Select **Next: ...** until you get to the **Configure Security Group** page, then add a **Custom TCP Rule** rule with port range set to `8443` and source set to "Anywhere"
   > Rules with source of 0.0.0.0/0 allow all IP addresses to access your instance. We recommend setting [security group rules](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html?icmpid=docs_ec2_console) to allow access from known IP addresses only.
 - Click **Launch**
 - You will be prompted to create a key pair
@@ -56,14 +56,11 @@ If you're just starting out, we recommend [installing code-server locally](../..
   > To ensure the connection between you and your server is encrypted view our guide on [securing your setup](../../security/ssl.md)
 - Finally, run
   ```
-  sudo ./code-server -p 80
+  ./code-server
   ```
-- When you visit the public IP for your AWS instance, you will be greeted   with this page. Code-server is using a self-signed SSL certificate for easy setup. To proceed to the IDE, click **"Advanced"**<img src ="../../assets/chrome_warning.png">
-- Then click **"proceed anyway"**<img src="../../assets/chrome_confirm.png">
+- Open your browser and visit `https://$public_ip:8443/` (where `$public_ip` is your AWS instance's public IP address). You will be greeted with a page similar to the following screenshot. Code-server is using a self-signed SSL certificate for easy setup. In Chrome/Chromium, click **"Advanced"** then click **"proceed anyway"**. In Firefox, click **Advanced**, then **Add Exception**, then finally **Confirm Security Exception**.<img src ="../../assets/chrome_warning.png">
 
   > For instructions on how to keep the server running after you end your SSH session please checkout [how to use systemd](https://www.linode.com/docs/quick-answers/linux/start-service-at-boot/) to start linux based services if they are killed
 
-  > The `-p 80` flag is necessary in order to make the IDE accessible from the public IP of your instance (also available from the description in the instances page.
-
   ---
 > NOTE: If you get stuck or need help, [file an issue](https://github.com/cdr/code-server/issues/new?&title=Improve+self-hosted+quickstart+guide), [tweet (@coderhq)](https://twitter.com/coderhq) or [email](mailto:support@coder.com?subject=Self-hosted%20quickstart%20guide).

doc/admin/install/digitalocean.md

@@ -39,11 +39,10 @@ If you're just starting out, we recommend [installing code-server locally](../..
   > To ensure the connection between you and your server is encrypted view our guide on [securing your setup](../../security/ssl.md)
 - Finally start the code-server
   ```
-  sudo ./code-server -p 80
+  ./code-server
   ```
     > For instructions on how to keep the server running after you end your SSH session please checkout [how to use systemd](https://www.linode.com/docs/quick-answers/linux/start-service-at-boot/) to start linux based services if they are killed
-- When you visit the public IP for your Digital Ocean instance, you will be greeted with this page. Code-server is using a self-signed SSL certificate for easy setup. To proceed to the IDE, click **"Advanced"**<img src ="../../assets/chrome_warning.png">
-- Then click **"proceed anyway"**<img src="../../assets/chrome_confirm.png">
+- Open your browser and visit `https://$public_ip:8443/` (where `$public_ip` is your Digital Ocean instance's public IP address). You will be greeted with a page similar to the following screenshot. Code-server is using a self-signed SSL certificate for easy setup. In Chrome/Chromium, click **"Advanced"** then click **"proceed anyway"**. In Firefox, click **Advanced**, then **Add Exception**, then finally **Confirm Security Exception**.<img src ="../../assets/chrome_warning.png">
 
 ---
 > NOTE: If you get stuck or need help, [file an issue](https://github.com/cdr/code-server/issues/new?&title=Improve+self-hosted+quickstart+guide), [tweet (@coderhq)](https://twitter.com/coderhq) or [email](mailto:support@coder.com?subject=Self-hosted%20quickstart%20guide).

doc/admin/install/google_cloud.md

@@ -12,8 +12,9 @@ If you're just starting out, we recommend [installing code-server locally](../..
 - [Open your Google Cloud console](https://console.cloud.google.com/compute/instances) to create a new VM instance and click **Create Instance**
 - Choose an appropriate machine type (we recommend 2 vCPU and 7.5 GB RAM, more depending on team size and number of repositories/languages enabled)
 - Choose Ubuntu 16.04 LTS as your boot disk
-- Check the boxes for **Allow HTTP traffic** and **Allow HTTPS traffic** in the **Firewall** section
+- Expand the "Management, security, disks, networking, sole tenancy" section, go to the "Networking" tab, then under network tags add "code-server"
 - Create your VM, and **take note** of its public IP address.
+- Visit "VPC network" in the console and go to "Firewall rules". Create a new firewall rule called "http-8443". Under "Target tags" add "code-server", and under "Protocols and ports" tick "Specified protocols and ports" and "tcp". Beside "tcp", add "8443", then create the rule.
 - Copy the link to download the latest Linux binary from our [releases page](https://github.com/cdr/code-server/releases)
 
 ---
@@ -50,22 +51,16 @@ cd code-server-{version}-linux-x64
 chmod +x code-server
 ```
 
-> To ensure the connection between you and your server is encrypted view our guide on [securing your setup](../security/ssl.md)
+> To ensure the connection between you and your server is encrypted view our guide on [securing your setup](../../security/ssl.md)
 
 - Start the code-server
-```
-sudo ./code-server -p 80
-```
+  ```
+  ./code-server
+  ```
+- Open your browser and visit `https://$public_ip:8443/` (where `$public_ip` is your Compute Engine instance's public IP address). You will be greeted with a page similar to the following screenshot. Code-server is using a self-signed SSL certificate for easy setup. In Chrome/Chromium, click **"Advanced"** then click **"proceed anyway"**. In Firefox, click **Advanced**, then **Add Exception**, then finally **Confirm Security Exception**.<img src ="../../assets/chrome_warning.png">
 
 > For instructions on how to keep the server running after you end your SSH session please checkout [how to use systemd](https://www.linode.com/docs/quick-answers/linux/start-service-at-boot/) to start linux based services if they are killed
 
-- Access code-server from the public IP of your Google Cloud instance we noted earlier in your browser.
-> example: 32.32.32.234
-
-- You will be greeted with this page. Code-server is using a self-signed SSL certificate for easy setup. To proceed to the IDE, click **"Advanced"**<img src ="../../assets/chrome_warning.png">
-
-- Then click **"proceed anyway"**<img src="../../assets/chrome_confirm.png">
-
 ---
 
 > NOTE: If you get stuck or need help, [file an issue](https://github.com/cdr/code-server/issues/new?&title=Improve+self-hosted+quickstart+guide), [tweet (@coderhq)](https://twitter.com/coderhq) or [email](mailto:support@coder.com?subject=Self-hosted%20quickstart%20guide).

doc/self-hosted/index.md

@@ -25,8 +25,7 @@ It takes just a few minutes to get your own self-hosted server running. If you'v
 > NOTE: Be careful with your password as sharing it will grant those users access to your server's file system
 
 ### Things To Know
-- When you visit the IP for your code-server, you will be greeted   with this page. Code-server is using a self-signed SSL certificate for easy setup. To proceed to the IDE, click **"Advanced"**<img src ="../assets/chrome_warning.png">
-- Then click **"proceed anyway"**<img src="../assets/chrome_confirm.png">
+- When you visit the IP for your code-server instance, you will be greeted with a page similar to the following screenshot. Code-server is using a self-signed SSL certificate for easy setup. In Chrome/Chromium, click **"Advanced"** then click **"proceed anyway"**. In Firefox, click **Advanced**, then **Add Exception**, then finally **Confirm Security Exception**.<img src ="../../assets/chrome_warning.png">
 
 ## Usage
 <pre class="pre-wrap"><code>code-server<span class="virtual-br"></span> --help</code></pre>
@@ -94,7 +93,7 @@ Options:
       }
    }
   ```
-  
+
   ### Apache Reverse Proxy
   Example of https virtualhost configuration for Apache as a reverse proxy. Please also pass --allow-http on code-server startup to allow the proxy to connect.
   ```
@@ -106,7 +105,7 @@ Options:
     RewriteRule /(.*)           ws://localhost:8443/$1 [P,L]
     RewriteCond %{HTTP:Upgrade} !=websocket [NC]
     RewriteRule /(.*)           http://localhost:8443/$1 [P,L]
-    
+
     ProxyRequests off
 
     RequestHeader set X-Forwarded-Proto https
@@ -118,6 +117,6 @@ Options:
   </VirtualHost>
   ```
   *Important:* For more details about Apache reverse proxy configuration checkout the [documentation](https://httpd.apache.org/docs/current/mod/mod_proxy.html) - especially the [Securing your Server](https://httpd.apache.org/docs/current/mod/mod_proxy.html#access) section
-  
+
   ### Help
   Use `code-server --help` to view the usage for the CLI. This is also shown at the beginning of this section.

packages/ide/src/fill/os.ts

@@ -35,6 +35,10 @@ class OS {
 			default: this._platform = "linux"; break;
 		}
 		process.platform = this._platform;
+		process.env = {};
+		data.env.forEach((v, k) => {
+			process.env[k] = v;
+		});
 	}
 
 	public release(): string {

packages/protocol/package.json

@@ -14,5 +14,8 @@
         "rimraf": "^2.6.3",
         "text-encoding": "^0.7.0",
         "ts-protoc-gen": "^0.8.0"
+    },
+    "scripts": {
+        "gen": "./scripts/generate_proto.sh"
     }
 }

packages/protocol/scripts/generate_proto.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-protoc --plugin="protoc-gen-ts=./node_modules/.bin/protoc-gen-ts" --js_out="import_style=commonjs,binary:./src/proto" --ts_out="./src/proto" ./src/proto/*.proto --proto_path="./src/proto"
+cd "$(dirname "$0")/.."
+
+protoc --plugin="protoc-gen-ts=./node_modules/.bin/protoc-gen-ts" --js_out="import_style=commonjs,binary:./src/proto" --ts_out="./src/proto" ./src/proto/*.proto --proto_path="./src/proto"

packages/protocol/src/browser/client.ts

@@ -280,6 +280,7 @@ export class Client {
 					builtInExtensionsDirectory: init.getBuiltinExtensionsDir(),
 					extraExtensionDirectories: init.getExtraExtensionDirectoriesList(),
 					extraBuiltinExtensionDirectories: init.getExtraBuiltinExtensionDirectoriesList(),
+					env: init.getEnvMap(),
 				};
 				this.initDataEmitter.emit(this._initData);
 				break;

packages/protocol/src/common/connection.ts

@@ -1,3 +1,5 @@
+import * as jspb from "google-protobuf";
+
 export interface SendableConnection {
 	send(data: Buffer | Uint8Array): void;
 }
@@ -27,6 +29,7 @@ export interface InitData {
 	readonly builtInExtensionsDirectory: string;
 	readonly extraExtensionDirectories: string[];
 	readonly extraBuiltinExtensionDirectories: string[];
+	readonly env: jspb.Map<string, string>;
 }
 
 export interface SharedProcessData {

packages/protocol/src/node/server.ts

@@ -103,6 +103,11 @@ export class Server {
 		initMsg.setShell(os.userInfo().shell || global.process.env.SHELL || "");
 		initMsg.setExtraExtensionDirectoriesList(this.options.extraExtensionDirectories || []);
 		initMsg.setExtraBuiltinExtensionDirectoriesList(this.options.extraBuiltinExtensionDirectories || []);
+
+		for (let key in process.env) {
+			initMsg.getEnvMap().set(key,  process.env[key] as string);
+		}
+
 		const srvMsg = new ServerMessage();
 		srvMsg.setInit(initMsg);
 		connection.send(srvMsg.serializeBinary());

packages/protocol/src/proto/client.proto

@@ -44,4 +44,6 @@ message WorkingInit {
 	string extensions_directory = 8;
 	repeated string extra_extension_directories = 9;
 	repeated string extra_builtin_extension_directories = 10;
+
+	map<string, string> env = 11;
 }

packages/protocol/src/proto/client_pb.d.ts

@@ -145,6 +145,8 @@ export class WorkingInit extends jspb.Message {
   setExtraBuiltinExtensionDirectoriesList(value: Array<string>): void;
   addExtraBuiltinExtensionDirectories(value: string, index?: number): string;
 
+  getEnvMap(): jspb.Map<string, string>;
+  clearEnvMap(): void;
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): WorkingInit.AsObject;
   static toObject(includeInstance: boolean, msg: WorkingInit): WorkingInit.AsObject;
@@ -167,6 +169,7 @@ export namespace WorkingInit {
     extensionsDirectory: string,
     extraExtensionDirectoriesList: Array<string>,
     extraBuiltinExtensionDirectoriesList: Array<string>,
+    envMap: Array<[string, string]>,
   }
 
   export enum OperatingSystem {

packages/protocol/src/proto/client_pb.js

@@ -137,7 +137,7 @@ proto.ClientMessage.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.ClientMessage.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     method: (f = msg.getMethod()) && node_pb.Method.toObject(includeInstance, f),
     ping: (f = msg.getPing()) && node_pb.Ping.toObject(includeInstance, f)
   };
@@ -360,7 +360,7 @@ proto.ServerMessage.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.ServerMessage.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     fail: (f = msg.getFail()) && node_pb.Method.Fail.toObject(includeInstance, f),
     success: (f = msg.getSuccess()) && node_pb.Method.Success.toObject(includeInstance, f),
     event: (f = msg.getEvent()) && node_pb.Event.toObject(includeInstance, f),
@@ -794,7 +794,7 @@ proto.WorkingInit.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.WorkingInit.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     homeDirectory: jspb.Message.getFieldWithDefault(msg, 1, ""),
     tmpDirectory: jspb.Message.getFieldWithDefault(msg, 2, ""),
     dataDirectory: jspb.Message.getFieldWithDefault(msg, 3, ""),
@@ -804,7 +804,8 @@ proto.WorkingInit.toObject = function(includeInstance, msg) {
     builtinExtensionsDir: jspb.Message.getFieldWithDefault(msg, 7, ""),
     extensionsDirectory: jspb.Message.getFieldWithDefault(msg, 8, ""),
     extraExtensionDirectoriesList: jspb.Message.getRepeatedField(msg, 9),
-    extraBuiltinExtensionDirectoriesList: jspb.Message.getRepeatedField(msg, 10)
+    extraBuiltinExtensionDirectoriesList: jspb.Message.getRepeatedField(msg, 10),
+    envMap: (f = msg.getEnvMap()) ? f.toObject(includeInstance, undefined) : []
   };
 
   if (includeInstance) {
@@ -881,6 +882,12 @@ proto.WorkingInit.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {string} */ (reader.readString());
       msg.addExtraBuiltinExtensionDirectories(value);
       break;
+    case 11:
+      var value = msg.getEnvMap();
+      reader.readMessage(value, function(message, reader) {
+        jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "");
+         });
+      break;
     default:
       reader.skipField();
       break;
@@ -980,6 +987,10 @@ proto.WorkingInit.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
+  f = message.getEnvMap(true);
+  if (f && f.getLength() > 0) {
+    f.serializeBinary(11, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
+  }
 };
 
 
@@ -1176,4 +1187,25 @@ proto.WorkingInit.prototype.clearExtraBuiltinExtensionDirectoriesList = function
 };
 
 
+/**
+ * map<string, string> env = 11;
+ * @param {boolean=} opt_noLazyCreate Do not create the map if
+ * empty, instead returning `undefined`
+ * @return {!jspb.Map<string,string>}
+ */
+proto.WorkingInit.prototype.getEnvMap = function(opt_noLazyCreate) {
+  return /** @type {!jspb.Map<string,string>} */ (
+      jspb.Message.getMapField(this, 11, opt_noLazyCreate,
+      null));
+};
+
+
+/**
+ * Clears values from the map. The map will be non-null.
+ */
+proto.WorkingInit.prototype.clearEnvMap = function() {
+  this.getEnvMap().clear();
+};
+
+
 goog.object.extend(exports, proto);

packages/protocol/src/proto/node_pb.js

@@ -583,7 +583,7 @@ proto.Argument.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     error: (f = msg.getError()) && proto.Argument.ErrorValue.toObject(includeInstance, f),
     buffer: (f = msg.getBuffer()) && proto.Argument.BufferValue.toObject(includeInstance, f),
     object: (f = msg.getObject()) && proto.Argument.ObjectValue.toObject(includeInstance, f),
@@ -843,7 +843,7 @@ proto.Argument.ErrorValue.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.ErrorValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     message: jspb.Message.getFieldWithDefault(msg, 1, ""),
     stack: jspb.Message.getFieldWithDefault(msg, 2, ""),
     code: jspb.Message.getFieldWithDefault(msg, 3, "")
@@ -1022,7 +1022,7 @@ proto.Argument.BufferValue.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.BufferValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     data: msg.getData_asB64()
   };
 
@@ -1171,7 +1171,7 @@ proto.Argument.ObjectValue.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.ObjectValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     dataMap: (f = msg.getDataMap()) ? f.toObject(includeInstance, proto.Argument.toObject) : []
   };
 
@@ -1308,7 +1308,7 @@ proto.Argument.ArrayValue.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.ArrayValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     dataList: jspb.Message.toObjectList(msg.getDataList(),
     proto.Argument.toObject, includeInstance)
   };
@@ -1455,7 +1455,7 @@ proto.Argument.ProxyValue.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.ProxyValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, 0)
   };
 
@@ -1580,7 +1580,7 @@ proto.Argument.FunctionValue.prototype.toObject = function(opt_includeInstance)
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.FunctionValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, 0)
   };
 
@@ -1705,7 +1705,7 @@ proto.Argument.NullValue.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.NullValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
 
   };
 
@@ -1804,7 +1804,7 @@ proto.Argument.UndefinedValue.prototype.toObject = function(opt_includeInstance)
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.UndefinedValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
 
   };
 
@@ -1903,7 +1903,7 @@ proto.Argument.DateValue.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Argument.DateValue.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     date: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
@@ -2449,7 +2449,7 @@ proto.Method.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Method.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     namedProxy: (f = msg.getNamedProxy()) && proto.Method.Named.toObject(includeInstance, f),
     numberedProxy: (f = msg.getNumberedProxy()) && proto.Method.Numbered.toObject(includeInstance, f)
   };
@@ -2582,7 +2582,7 @@ proto.Method.Named.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Method.Named.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, 0),
     module: jspb.Message.getFieldWithDefault(msg, 2, 0),
     method: jspb.Message.getFieldWithDefault(msg, 3, ""),
@@ -2817,7 +2817,7 @@ proto.Method.Numbered.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Method.Numbered.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, 0),
     proxyId: jspb.Message.getFieldWithDefault(msg, 2, 0),
     method: jspb.Message.getFieldWithDefault(msg, 3, ""),
@@ -3045,7 +3045,7 @@ proto.Method.Fail.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Method.Fail.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, 0),
     response: (f = msg.getResponse()) && proto.Argument.toObject(includeInstance, f)
   };
@@ -3217,7 +3217,7 @@ proto.Method.Success.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Method.Success.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, 0),
     response: (f = msg.getResponse()) && proto.Argument.toObject(includeInstance, f)
   };
@@ -3481,7 +3481,7 @@ proto.Callback.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Callback.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     namedCallback: (f = msg.getNamedCallback()) && proto.Callback.Named.toObject(includeInstance, f),
     numberedCallback: (f = msg.getNumberedCallback()) && proto.Callback.Numbered.toObject(includeInstance, f)
   };
@@ -3614,7 +3614,7 @@ proto.Callback.Named.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Callback.Named.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     module: jspb.Message.getFieldWithDefault(msg, 1, 0),
     callbackId: jspb.Message.getFieldWithDefault(msg, 2, 0),
     argsList: jspb.Message.toObjectList(msg.getArgsList(),
@@ -3822,7 +3822,7 @@ proto.Callback.Numbered.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Callback.Numbered.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     proxyId: jspb.Message.getFieldWithDefault(msg, 1, 0),
     callbackId: jspb.Message.getFieldWithDefault(msg, 2, 0),
     argsList: jspb.Message.toObjectList(msg.getArgsList(),
@@ -4115,7 +4115,7 @@ proto.Event.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Event.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     namedEvent: (f = msg.getNamedEvent()) && proto.Event.Named.toObject(includeInstance, f),
     numberedEvent: (f = msg.getNumberedEvent()) && proto.Event.Numbered.toObject(includeInstance, f)
   };
@@ -4248,7 +4248,7 @@ proto.Event.Named.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Event.Named.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     module: jspb.Message.getFieldWithDefault(msg, 1, 0),
     event: jspb.Message.getFieldWithDefault(msg, 2, ""),
     argsList: jspb.Message.toObjectList(msg.getArgsList(),
@@ -4456,7 +4456,7 @@ proto.Event.Numbered.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Event.Numbered.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     proxyId: jspb.Message.getFieldWithDefault(msg, 1, 0),
     event: jspb.Message.getFieldWithDefault(msg, 2, ""),
     argsList: jspb.Message.toObjectList(msg.getArgsList(),
@@ -4723,7 +4723,7 @@ proto.Ping.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Ping.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
 
   };
 
@@ -4822,7 +4822,7 @@ proto.Pong.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.Pong.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
 
   };
 

packages/protocol/src/proto/vscode_pb.js

@@ -62,7 +62,7 @@ proto.SharedProcessActive.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.SharedProcessActive.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     socketPath: jspb.Message.getFieldWithDefault(msg, 1, ""),
     logPath: jspb.Message.getFieldWithDefault(msg, 2, "")
   };

packages/server/src/cli.ts

@@ -315,10 +315,11 @@ const bold = (text: string | number): string | number => {
 		logger.warn("Documentation on securing your setup: https://github.com/cdr/code-server/blob/master/doc/security/ssl.md");
 	}
 
-	if (!options.noAuth && !usingCustomPassword) {
+	if (!options.noAuth) {
 		logger.info(" ");
-		logger.info(`Password:\u001B[1m ${password}`);
+		logger.info(usingCustomPassword ? "Using custom password." : `Password:\u001B[1m ${password}`);
 	} else {
+		logger.warn(" ");
 		logger.warn("Launched without authentication.");
 	}
 	if (options.disableTelemetry) {

packages/vscode/src/dialog.ts

@@ -315,7 +315,6 @@ class Dialog {
 		}
 		buttonsNode.appendChild(confirmBtn);
 		this.root.appendChild(buttonsNode);
-		this.entryList.layout();
 
 		this.path = options.defaultPath || "/";
 	}
@@ -391,6 +390,8 @@ class Dialog {
 				return true;
 			});
 
+			this.entryList.layout();
+
 			this.entryList.setChildren(null, items.map((i: DialogEntry): ITreeElement<DialogEntry> => ({ element: i })));
 			this.entryList.domFocus();
 			this.entryList.setFocus([null]);

packages/vscode/src/fill/product.ts

@@ -28,12 +28,17 @@ class Product implements IProductConfiguration {
 		return this._dataFolderName;
 	}
 
-	public extensionsGallery = {
-		serviceUrl: global && global.process && global.process.env.SERVICE_URL
-			|| process.env.SERVICE_URL
-			|| "https://v1.extapi.coder.com",
-		// tslint:disable-next-line:no-any
-	} as any;
+	// tslint:disable-next-line:no-any
+	public extensionsGallery: any = {
+		get serviceUrl(): string {
+			return process.env.SERVICE_URL || "https://v1.extapi.coder.com";
+		},
+
+		get itemUrl(): string {
+			return process.env.ITEM_URL || "";
+		},
+
+	};
 
 	public extensionExecutionEnvironments = {
 		"wayou.vscode-todo-highlight": "worker",

scripts/build.sh

@@ -1,32 +1,51 @@
 #!/bin/bash
 set -euxo pipefail
 
-# Variables to be set:
-# $IMAGE
+# Build using a Docker container using the specified image and version.
 function docker_build() {
-	containerID=$(docker create -it -v $(pwd)/.cache:/src/.cache $IMAGE)
-	docker start $containerID
-	docker exec $containerID mkdir -p /src
+	local image="${1}" ; shift
+	local version="${1}" ; shift
 
-	function exec() {
-		docker exec $containerID bash -c "$@"
+	local containerId
+	containerId=$(docker create --network=host --rm -it -v "$(pwd)"/.cache:/src/.cache "${image}")
+	docker start "${containerId}"
+	docker exec "${containerId}" mkdir -p /src
+
+	function docker_exec() {
+		docker exec "${containerId}" bash -c "$@"
 	}
 
-	docker cp ./. $containerID:/src
-	exec "cd /src && yarn"
-	exec "cd /src && npm rebuild"
-	exec "cd /src && NODE_ENV=production VERSION=$VERSION yarn task build:server:binary"
-	exec "cd /src && yarn task package $VERSION"
-	docker cp $containerID:/src/release/. ./release/
+	docker cp ./. "${containerId}":/src
+	docker_exec "cd /src && yarn"
+	docker_exec "cd /src && npm rebuild"
+	docker_exec "cd /src && NODE_ENV=production VERSION=${version} yarn task build:server:binary"
+	docker_exec "cd /src && yarn task package ${version}"
+	docker cp "${containerId}":/src/release/. ./release/
+
+	docker stop "${containerId}"
 }
 
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	NODE_ENV=production yarn task build:server:binary
-else
-	if [[ "$TARGET" == "alpine" ]]; then
-		IMAGE="codercom/nbin-alpine"
-	else
-		IMAGE="codercom/nbin-centos"
+function main() {
+	local version=${VERSION:-}
+	local ostype=${OSTYPE:-}
+
+	if [[ -z "${version}" ]] ; then
+		>&2 echo "Must set VERSION environment variable"
+		exit 1
 	fi
-	docker_build
-fi
+
+	if [[ "${ostype}" == "darwin"* ]]; then
+		NODE_ENV=production VERSION="${version}" yarn task build:server:binary
+		yarn task package "${version}"
+	else
+		local image
+		if [[ "$TARGET" == "alpine" ]]; then
+			image="codercom/nbin-alpine"
+		else
+			image="codercom/nbin-centos"
+		fi
+		docker_build "${image}" "${version}"
+	fi
+}
+
+main "$@"

scripts/webpack.general.config.js

@@ -90,8 +90,6 @@ module.exports = (options = {}) => ({
 		}),
 		new webpack.DefinePlugin({
 			"process.env.NODE_ENV": `"${environment}"`,
-			"process.env.LOG_LEVEL": `"${process.env.LOG_LEVEL || ""}"`,
-			"process.env.SERVICE_URL": `"${process.env.SERVICE_URL || ""}"`,
 			"process.env.VERSION": `"${process.env.VERSION || ""}"`,
 		}),
 	],