cubetiq/code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for @ammarb

Browse Source
This commit is contained in:
Anmol Sethi 2020-10-06 21:05:32 -04:00
parent 6e8248cf0c
commit c3c24fe4d2
No known key found for this signature in database
GPG Key ID: 8CEF1878FF10ADEB
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/node/cli.ts
View File

@ -48,7 +48,7 @@ export interface Args extends VsArgs {
readonly "reuse-window"?: boolean
readonly "new-window"?: boolean
readonly "coder-link"?: OptionalString
readonly "coder-bind"?: string
}
interface Option<T> {
@ -159,10 +159,10 @@ const options: Options<Required<Args>> = {
log: { type: LogLevel },
verbose: { type: "boolean", short: "vvv", description: "Enable verbose logging." },
"coder-link": {
type: OptionalString,
"coder-bind": {
type: "string",
description: `
Securely link code-server via Coder Cloud with the passed name. You'll get a URL like
Securely bind code-server via Coder Cloud with the passed name. You'll get a URL like
https://myname.coder-cloud.com at which you can easily access your code-server instance.
Authorization is done via GitHub. Only the first code-server spawned with the current
configuration will be accessible.`,

2
src/node/coder-cloud.ts
View File

@ -9,7 +9,7 @@ import xdgBasedir from "xdg-basedir"
const coderCloudAgent = path.resolve(__dirname, "../../lib/coder-cloud-agent")
export async function coderCloudLink(serverName: string): Promise<void> {
export async function coderCloudBind(serverName: string): Promise<void> {
const agent = spawn(coderCloudAgent, ["link", serverName], {
stdio: ["inherit", "inherit", "pipe"],
})

22
src/node/entry.ts
View File

@ -12,7 +12,7 @@ import { StaticHttpProvider } from "./app/static"
import { UpdateHttpProvider } from "./app/update"
import { VscodeHttpProvider } from "./app/vscode"
import { Args, bindAddrFromAllSources, optionDescriptions, parse, readConfigFile, setDefaults } from "./cli"
import { coderCloudLink, coderCloudProxy } from "./coder-cloud"
import { coderCloudBind, coderCloudProxy } from "./coder-cloud"
import { AuthType, HttpServer, HttpServerOptions } from "./http"
import { loadPlugins } from "./plugin"
import { generateCertificate, hash, humanPath, open } from "./util"
@ -36,13 +36,15 @@ const version = pkg.version || "development"
const commit = pkg.commit || "development"
const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void> => {
if (args["coder-link"]) {
// If we're being exposed to the cloud, we listen on a random address.
if (args["coder-bind"]) {
// If we're being exposed to the cloud, we listen on a random address and disable auth.
args = {
...args,
host: "localhost",
port: 0,
auth: AuthType.None,
}
logger.info("coder-bind: disabling auth and listening on random localhost port")
}
if (!args.auth) {
@ -132,8 +134,6 @@ const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void>
httpServer.proxyDomains.forEach((domain) => logger.info(` - *.${domain}`))
}
coderCloudProxy(serverAddress!)
if (serverAddress && !options.socket && args.open) {
// The web socket doesn't seem to work if browsing with 0.0.0.0.
const openAddress = serverAddress.replace(/:\/\/0.0.0.0/, "://localhost")
@ -141,16 +141,12 @@ const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void>
logger.info(`Opened ${openAddress}`)
}
if (args["coder-link"]) {
if (!args["coder-link"].value) {
logger.error("You must pass a name to link with coder cloud. See --help")
process.exit(1)
}
logger.info(`linking code-server to the cloud with name ${args["coder-link"].value}`)
if (args["coder-bind"]) {
logger.info(`linking code-server to the cloud with name ${args["coder-bind"]}`)
try {
await coderCloudLink(args["coder-link"].value)
await coderCloudBind(args["coder-bind"])
coderCloudProxy(serverAddress!)
} catch (err) {
logger.error(err.message)
process.exit(1)