Catch error when openssl isn't installed

code-asher · code-asher · commit b52fbb4cb97e · 2020-03-16T15:14:54.000-05:00
diff --git a/lib/vscode b/lib/vscode
@@ -1 +1 @@
-Subproject commit ae08d5460b5a45169385ff3fd44208f431992451
+Subproject commit 78a4c91400152c0f27ba4d363eb56d2835f9903a
diff --git a/src/node/entry.ts b/src/node/entry.ts
@@ -45,11 +45,16 @@ const main = async (args: Args): Promise<void> => {
   } else if (args.cert && !args["cert-key"]) {
     throw new Error("--cert-key is missing")
   }
+
   if (!args["disable-ssh"]) {
     if (!options.sshHostKey && typeof options.sshHostKey !== "undefined") {
       throw new Error("--ssh-host-key cannot be blank")
     } else if (!options.sshHostKey) {
-      options.sshHostKey = await generateSshHostKey()
+      try {
+        options.sshHostKey = await generateSshHostKey()
+      } catch (error) {
+        logger.error("Unable to start SSH server", field("error", error.message))
+      }
     }
   }
 
@@ -66,7 +71,7 @@ const main = async (args: Args): Promise<void> => {
   logger.info(`code-server ${require("../../package.json").version}`)
 
   let sshPort = ""
-  if (!args["disable-ssh"]) {
+  if (!args["disable-ssh"] && options.sshHostKey) {
     const sshProvider = httpServer.registerHttpProvider("/ssh", SshProvider, options.sshHostKey as string)
     sshPort = await sshProvider.listen()
   }

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,16 @@ const main = async (args: Args): Promise<void> => {`
`45`	`45`	`} else if (args.cert && !args["cert-key"]) {`
`46`	`46`	`throw new Error("--cert-key is missing")`
`47`	`47`	`}`
	`48`	`+`
`48`	`49`	`if (!args["disable-ssh"]) {`
`49`	`50`	`if (!options.sshHostKey && typeof options.sshHostKey !== "undefined") {`
`50`	`51`	`throw new Error("--ssh-host-key cannot be blank")`
`51`	`52`	`} else if (!options.sshHostKey) {`
`52`		`- options.sshHostKey = await generateSshHostKey()`
	`53`	`+ try {`
	`54`	`+ options.sshHostKey = await generateSshHostKey()`
	`55`	`+ } catch (error) {`
	`56`	`+ logger.error("Unable to start SSH server", field("error", error.message))`
	`57`	`+ }`
`53`	`58`	`}`
`54`	`59`	`}`
`55`	`60`
`@@ -66,7 +71,7 @@ const main = async (args: Args): Promise<void> => {`
`66`	`71`	logger.info(`code-server ${require("../../package.json").version}`)
`67`	`72`
`68`	`73`	`let sshPort = ""`
`69`		`- if (!args["disable-ssh"]) {`
	`74`	`+ if (!args["disable-ssh"] && options.sshHostKey) {`
`70`	`75`	`const sshProvider = httpServer.registerHttpProvider("/ssh", SshProvider, options.sshHostKey as string)`
`71`	`76`	`sshPort = await sshProvider.listen()`
`72`	`77`	`}`