From 4381e053731e63e140bb17795ba0cdd4badbc280 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Mon, 12 Apr 2021 16:00:06 +0000 Subject: [PATCH 01/11] [server] Support local app login --- .werft/values.dev.yaml | 1 + chart/templates/server-deployment.yaml | 4 ++ components/server/src/env.ts | 2 + components/server/src/user/user-controller.ts | 51 ++++++++++++++++++- 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/.werft/values.dev.yaml b/.werft/values.dev.yaml index 00183e5010537d..4a34e45ba7ec01 100644 --- a/.werft/values.dev.yaml +++ b/.werft/values.dev.yaml @@ -34,6 +34,7 @@ components: replicas: 1 makeNewUsersAdmin: true # for development theiaPluginsBucketName: gitpod-core-dev-plugins + enableLocalApp: true registryFacade: daemonSet: true diff --git a/chart/templates/server-deployment.yaml b/chart/templates/server-deployment.yaml index c88b8e4ae011b6..c8116a0dfd80ed 100644 --- a/chart/templates/server-deployment.yaml +++ b/chart/templates/server-deployment.yaml @@ -163,6 +163,10 @@ spec: - name: MAKE_NEW_USERS_ADMIN value: {{ $comp.makeNewUsersAdmin | quote }} {{- end }} + {{- if $comp.enableLocalApp }} + - name: ENABLE_LOCAL_APP + value: "true" + {{- end }} {{- if $comp.portAccessForUsersOnly }} - name: PORT_ACCESS_FOR_USERS_ONLY value: "true" diff --git a/components/server/src/env.ts b/components/server/src/env.ts index 5a810e05c6ab11..6f8f5f7d6be483 100644 --- a/components/server/src/env.ts +++ b/components/server/src/env.ts @@ -85,6 +85,8 @@ export class Env extends AbstractComponentEnv { readonly devBranch = process.env.DEV_BRANCH || ''; + readonly enableLocalApp = process.env.ENABLE_LOCAL_APP === "true"; + readonly authProviderConfigs = this.parseAuthProviderParamss(); protected parseAuthProviderParamss(): AuthProviderParams[] { diff --git a/components/server/src/user/user-controller.ts b/components/server/src/user/user-controller.ts index 37fe42b824ecd7..66a700d12729f1 100644 --- a/components/server/src/user/user-controller.ts +++ b/components/server/src/user/user-controller.ts @@ -4,6 +4,7 @@ * See License-AGPL.txt in the project root for license information. */ +import * as crypto from 'crypto'; import { inject, injectable } from "inversify"; import { UserDB } from '@gitpod/gitpod-db/lib/user-db'; import * as express from 'express'; @@ -20,7 +21,7 @@ import { parseWorkspaceIdFromHostname } from "@gitpod/gitpod-protocol/lib/util/p import { SessionHandlerProvider } from "../session-handler"; import { URL } from 'url'; import { saveSession, getRequestingClientInfo, destroySession } from "../express-util"; -import { User } from "@gitpod/gitpod-protocol"; +import { GitpodToken, GitpodTokenType, User } from "@gitpod/gitpod-protocol"; import { HostContextProvider } from "../auth/host-context-provider"; import { AuthFlow } from "../auth/auth-provider"; import { LoginCompletionHandler } from "../auth/login-completion-handler"; @@ -28,6 +29,9 @@ import { TosCookie } from "./tos-cookie"; import { TosFlow } from "../terms/tos-flow"; import { increaseLoginCounter } from '../../src/prometheus-metrics'; import * as uuidv4 from 'uuid/v4'; +import { DBUser } from "@gitpod/gitpod-db"; +import { ScopedResourceGuard } from "../auth/resource-access"; +import { OneTimeSecretServer } from '../one-time-secret-server'; @injectable() export class UserController { @@ -43,6 +47,7 @@ export class UserController { @inject(HostContextProvider) protected readonly hostContextProvider: HostContextProvider; @inject(SessionHandlerProvider) protected readonly sessionHandlerProvider: SessionHandlerProvider; @inject(LoginCompletionHandler) protected readonly loginCompletionHandler: LoginCompletionHandler; + @inject(OneTimeSecretServer) protected readonly otsServer: OneTimeSecretServer; get apiRouter(): express.Router { const router = express.Router(); @@ -218,6 +223,50 @@ export class UserController { }); res.sendStatus(200); }); + if (this.env.enableLocalApp) { + router.get("/auth/local-app", async (req: express.Request, res: express.Response, next: express.NextFunction) => { + if (!req.isAuthenticated() || !User.is(req.user)) { + res.sendStatus(401); + return; + } + + const user = req.user as User; + if (user.blocked) { + res.sendStatus(403); + return; + } + + const rt = req.query.returnTo; + if (!rt || !rt.startsWith("localhost:")) { + log.error(`auth/local-app: invalid returnTo URL: "${rt}"`) + res.sendStatus(400); + return; + } + + const token = crypto.randomBytes(30).toString('hex'); + const tokenHash = crypto.createHash('sha256').update(token, 'utf8').digest("hex"); + const dbToken: GitpodToken & { user: DBUser } = { + tokenHash, + name: `local-app`, + type: GitpodTokenType.MACHINE_AUTH_TOKEN, + user: req.user as DBUser, + scopes: [ + "function:getWorkspaces", + "function:listenForWorkspaceInstanceUpdates", + "resource:"+ScopedResourceGuard.marshalResourceScope({kind: "workspace", subjectID: "*", operations: ["get"]}), + "resource:"+ScopedResourceGuard.marshalResourceScope({kind: "workspaceInstance", subjectID: "*", operations: ["get"]}), + ], + created: new Date().toISOString(), + }; + await this.userDb.storeGitpodToken(dbToken); + + const otsExpirationTime = new Date(); + otsExpirationTime.setMinutes(otsExpirationTime.getMinutes() + 2); + const ots = await this.otsServer.serve({}, token, otsExpirationTime); + + res.redirect(`http://${rt}/?ots=${encodeURI(ots.token)}`); + }); + } router.get("/auth/workspace", async (req: express.Request, res: express.Response, next: express.NextFunction) => { if (!req.isAuthenticated() || !User.is(req.user)) { res.sendStatus(401); From 278b02114c0575720cdd0f215408179d72ec2674 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Mon, 12 Apr 2021 16:00:23 +0000 Subject: [PATCH 02/11] [local-app] Start local app --- components/local-app/BUILD.yaml | 11 ++ components/local-app/cmd/debug/main.go | 100 +++++++++++++++ components/local-app/go.mod | 15 +++ components/local-app/go.sum | 81 ++++++++++++ components/local-app/pkg/auth/auth.go | 132 ++++++++++++++++++++ components/local-app/pkg/bastion/bastion.go | 79 ++++++++++++ 6 files changed, 418 insertions(+) create mode 100644 components/local-app/BUILD.yaml create mode 100644 components/local-app/cmd/debug/main.go create mode 100644 components/local-app/go.mod create mode 100644 components/local-app/go.sum create mode 100644 components/local-app/pkg/auth/auth.go create mode 100644 components/local-app/pkg/bastion/bastion.go diff --git a/components/local-app/BUILD.yaml b/components/local-app/BUILD.yaml new file mode 100644 index 00000000000000..4fb992967d255f --- /dev/null +++ b/components/local-app/BUILD.yaml @@ -0,0 +1,11 @@ +packages: + - name: app + type: go + srcs: + - go.mod + - go.sum + - "**/*.go" + deps: + - components/gitpod-protocol/go:lib + config: + packaging: app diff --git a/components/local-app/cmd/debug/main.go b/components/local-app/cmd/debug/main.go new file mode 100644 index 00000000000000..adbd723ee7e398 --- /dev/null +++ b/components/local-app/cmd/debug/main.go @@ -0,0 +1,100 @@ +// Copyright (c) 2021 Gitpod GmbH. All rights reserved. +// Licensed under the GNU Affero General Public License (AGPL). +// See License-AGPL.txt in the project root for license information. + +package main + +import ( + "context" + "errors" + "fmt" + "log" + "os" + "strings" + + gitpod "github.com/gitpod-io/gitpod/gitpod-protocol" + "github.com/gitpod-io/local-app/pkg/auth" + "github.com/gitpod-io/local-app/pkg/bastion" + "github.com/sirupsen/logrus" + "github.com/urfave/cli/v2" + "github.com/zalando/go-keyring" +) + +func main() { + keyring.MockInit() + app := cli.App{ + Name: "local-app-debug", + Commands: []*cli.Command{ + { + Name: "login", + Action: func(c *cli.Context) error { + _, err := auth.Login(context.Background(), auth.LoginOpts{ + GitpodURL: c.String("gitpod-host"), + }) + if err != nil { + return err + } + fmt.Println("login successful") + return nil + }, + Flags: []cli.Flag{ + &cli.StringFlag{ + EnvVars: []string{ + "GITPOD_HOST", + }, + Name: "gitpod-host", + }, + }, + }, + { + Name: "run", + Action: func(c *cli.Context) error { + return run(c.String("gitpod-host")) + }, + Flags: []cli.Flag{ + &cli.StringFlag{ + EnvVars: []string{ + "GITPOD_HOST", + }, + Name: "gitpod-host", + }, + }, + }, + }, + } + err := app.Run(os.Args) + if err != nil { + log.Fatal(err) + } +} + +func run(host string) error { + tkn, err := auth.GetToken() + if errors.Is(err, keyring.ErrNotFound) { + tkn, err = auth.Login(context.Background(), auth.LoginOpts{GitpodURL: host}) + } + if err != nil { + return err + } + + wshost := host + wshost = strings.ReplaceAll(wshost, "https://", "wss://") + wshost = strings.ReplaceAll(wshost, "http://", "ws://") + wshost += "/api/v1" + client, err := gitpod.ConnectToServer(wshost, gitpod.ConnectToServerOpts{ + Context: context.Background(), + Token: tkn, + Log: logrus.NewEntry(logrus.New()), + }) + if err != nil { + return err + } + b := bastion.New(client, &logCallbacks{}) + return b.Run() +} + +type logCallbacks struct{} + +func (*logCallbacks) InstanceUpdate(w *bastion.Workspace) { + logrus.WithField("workspace", w).Info("instance update") +} diff --git a/components/local-app/go.mod b/components/local-app/go.mod new file mode 100644 index 00000000000000..4e191a54655673 --- /dev/null +++ b/components/local-app/go.mod @@ -0,0 +1,15 @@ +module github.com/gitpod-io/local-app + +go 1.16 + +require ( + github.com/gitpod-io/gitpod/gitpod-protocol v0.0.0-00010101000000-000000000000 + github.com/jpillora/chisel v1.7.6 // indirect + github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect + github.com/sirupsen/logrus v1.7.0 + github.com/urfave/cli/v2 v2.3.0 + github.com/zalando/go-keyring v0.1.1 + golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect +) + +replace github.com/gitpod-io/gitpod/gitpod-protocol => ../gitpod-protocol/go // leeway diff --git a/components/local-app/go.sum b/components/local-app/go.sum new file mode 100644 index 00000000000000..1da5b96edcc6d7 --- /dev/null +++ b/components/local-app/go.sum @@ -0,0 +1,81 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM= +github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2/go.mod h1:jnzFpU88PccN/tPPhCpnNU8mZphvKxYM9lLNkd8e+os= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/danieljoos/wincred v1.1.0 h1:3RNcEpBg4IhIChZdFRSdlQt1QjCp1sMAPIrOnm7Yf8g= +github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/jpillora/ansi v1.0.2 h1:+Ei5HCAH0xsrQRCT2PDr4mq9r4Gm4tg+arNdXRkB22s= +github.com/jpillora/ansi v1.0.2/go.mod h1:D2tT+6uzJvN1nBVQILYWkIdq7zG+b5gcFN5WI/VyjMY= +github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/jpillora/chisel v1.7.6 h1:ipVmcsJcz90+0u0rkn07wKwcXNiw1W/3E2w3rxIPpWM= +github.com/jpillora/chisel v1.7.6/go.mod h1:BC2zg11mTIoyGPUjc2EkTgfz3uUUV93+K9tNYCCU/fw= +github.com/jpillora/requestlog v1.0.0 h1:bg++eJ74T7DYL3DlIpiwknrtfdUA9oP/M4fL+PpqnyA= +github.com/jpillora/requestlog v1.0.0/go.mod h1:HTWQb7QfDc2jtHnWe2XEIEeJB7gJPnVdpNn52HXPvy8= +github.com/jpillora/sizestr v1.0.0 h1:4tr0FLxs1Mtq3TnsLDV+GYUWG7Q26a6s+tV5Zfw2ygw= +github.com/jpillora/sizestr v1.0.0/go.mod h1:bUhLv4ctkknatr6gR42qPxirmd5+ds1u7mzD+MZ33f0= +github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI= +github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37 h1:marA1XQDC7N870zmSFIoHZpIUduK80USeY0Rkuflgp4= +github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= +github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= +github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/zalando/go-keyring v0.1.1 h1:w2V9lcx/Uj4l+dzAf1m9s+DJ1O8ROkEHnynonHjTcYE= +github.com/zalando/go-keyring v0.1.1/go.mod h1:OIC+OZ28XbmwFxU/Rp9V7eKzZjamBJwRzC8UFJH9+L8= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 h1:F5Gozwx4I1xtr/sr/8CFbb57iKi3297KFs0QDbGN60A= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/components/local-app/pkg/auth/auth.go b/components/local-app/pkg/auth/auth.go new file mode 100644 index 00000000000000..7a5145e68577a5 --- /dev/null +++ b/components/local-app/pkg/auth/auth.go @@ -0,0 +1,132 @@ +// Copyright (c) 2021 Gitpod GmbH. All rights reserved. +// Licensed under the GNU Affero General Public License (AGPL). +// See License-AGPL.txt in the project root for license information. + +package auth + +import ( + "context" + "fmt" + "io" + "net" + "net/http" + "net/url" + "os" + "os/exec" + "runtime" + + "github.com/zalando/go-keyring" +) + +const ( + keyringService = "gitpod-io" + keyringUser = "token" +) + +// GetToken returns the persisted Gitpod token +func GetToken() (token string, err error) { + return keyring.Get(keyringService, keyringUser) +} + +// LoginOpts configure the login process +type LoginOpts struct { + GitpodURL string +} + +// Login walks through the login flow for obtaining a Gitpod token +func Login(ctx context.Context, opts LoginOpts) (token string, err error) { + rl, err := net.Listen("tcp", "localhost:0") + if err != nil { + return "", err + } + defer rl.Close() + + var ( + ec = make(chan error, 1) + tc = make(chan string, 1) + ) + + returnHandler := func(rw http.ResponseWriter, req *http.Request) { + tc <- req.URL.Query().Get("ots") + } + + returnServer := &http.Server{ + Addr: "localhost:0", + Handler: http.HandlerFunc(returnHandler), + } + go func() { + err := returnServer.Serve(rl) + if err != nil { + ec <- err + } + }() + defer returnServer.Shutdown(ctx) + + baseURL := opts.GitpodURL + if baseURL == "" { + baseURL = "https://gitpod.io" + } + reqURL, err := url.Parse(baseURL) + if err != nil { + return "", err + } + reqURL.Path = "/api/auth/local-app" + q := reqURL.Query() + q.Set("returnTo", fmt.Sprintf("localhost:%d", rl.Addr().(*net.TCPAddr).Port)) + reqURL.RawQuery = q.Encode() + err = openBrowser(reqURL.String()) + if err != nil { + fmt.Printf("Cannot open browswer. Please visit %s\n", reqURL.String()) + err = nil + } + + var ots string + select { + case <-ctx.Done(): + return "", ctx.Err() + case err = <-ec: + return "", err + case ots = <-tc: + } + + otsReq, err := http.NewRequest("GET", ots, nil) + if err != nil { + return "", err + } + otsReq = otsReq.WithContext(ctx) + otsResp, err := http.DefaultClient.Do(otsReq) + if err != nil { + return "", err + } + body := otsResp.Body + defer body.Close() + tkn, err := io.ReadAll(body) + if err != nil { + return "", err + } + token = string(tkn) + + err = keyring.Set(keyringService, keyringUser, token) + if err != nil { + return "", err + } + + return token, nil +} + +func openBrowser(url string) error { + if cmd := os.Getenv("BROWSER"); cmd != "" { + return exec.Command(cmd, url).Start() + } + + switch runtime.GOOS { + case "linux": + return exec.Command("xdg-open", url).Start() + case "windows": + return exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start() + case "darwin": + return exec.Command("open", url).Start() + default: + return fmt.Errorf("unsupported platform") + } +} diff --git a/components/local-app/pkg/bastion/bastion.go b/components/local-app/pkg/bastion/bastion.go new file mode 100644 index 00000000000000..346539688f2ec9 --- /dev/null +++ b/components/local-app/pkg/bastion/bastion.go @@ -0,0 +1,79 @@ +// Copyright (c) 2021 Gitpod GmbH. All rights reserved. +// Licensed under the GNU Affero General Public License (AGPL). +// See License-AGPL.txt in the project root for license information. + +package bastion + +import ( + "context" + + gitpod "github.com/gitpod-io/gitpod/gitpod-protocol" + "github.com/sirupsen/logrus" +) + +type Workspace struct { + Name string + Phase string +} + +type Callbacks interface { + InstanceUpdate(*Workspace) +} + +func New(client gitpod.APIInterface, cb Callbacks) *Bastion { + ctx, cancel := context.WithCancel(context.Background()) + return &Bastion{ + Client: client, + Callbacks: cb, + workspaces: make(map[string]*Workspace), + ctx: ctx, + stop: cancel, + } +} + +type Bastion struct { + Client gitpod.APIInterface + Callbacks Callbacks + + workspaces map[string]*Workspace + + ctx context.Context + stop context.CancelFunc +} + +func (b *Bastion) Run() error { + updates, err := b.Client.InstanceUpdates(b.ctx, "") + if err != nil { + return err + } + + wss, err := b.Client.GetWorkspaces(b.ctx, &gitpod.GetWorkspacesOptions{Limit: float64(100)}) + if err != nil { + logrus.WithError(err).Warn("cannot get workspaces") + } else { + for _, ws := range wss { + if ws.LatestInstance == nil || ws.LatestInstance.Status.Phase != "running" { + continue + } + w := &Workspace{ + Name: ws.Workspace.ID, + Phase: "running", + } + b.workspaces[ws.LatestInstance.ID] = w + b.Callbacks.InstanceUpdate(w) + } + } + + for u := range updates { + w, ok := b.workspaces[u.WorkspaceID] + if !ok { + w = &Workspace{} + b.workspaces[u.WorkspaceID] = w + } + + w.Name = u.WorkspaceID + w.Phase = u.Status.Phase + b.Callbacks.InstanceUpdate(w) + } + return nil +} From fa4fca2f640a3434b0fe2dbae27c86d29af183dc Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Tue, 13 Apr 2021 12:50:24 +0000 Subject: [PATCH 03/11] [gitpod-protocol] Support listening to all instance updates --- components/gitpod-protocol/go/gitpod-service.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/gitpod-protocol/go/gitpod-service.go b/components/gitpod-protocol/go/gitpod-service.go index 639feedfcd29a4..8d327b5d7505d1 100644 --- a/components/gitpod-protocol/go/gitpod-service.go +++ b/components/gitpod-protocol/go/gitpod-service.go @@ -333,6 +333,12 @@ func (gp *APIoverJSONRPC) handler(ctx context.Context, conn *jsonrpc2.Conn, req default: } } + for chn := range gp.subs[""] { + select { + case chn <- &instance: + default: + } + } return } From ec9658ee1325da49d551e1b273bf317a667f651e Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Tue, 13 Apr 2021 13:25:57 +0000 Subject: [PATCH 04/11] [supervisor] Add chisel server --- components/supervisor/go.mod | 5 ++++- components/supervisor/go.sum | 15 +++++++++++++++ .../supervisor/pkg/supervisor/supervisor.go | 15 +++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/components/supervisor/go.mod b/components/supervisor/go.mod index bc8ae4d27dec18..32feba28fd69f7 100644 --- a/components/supervisor/go.mod +++ b/components/supervisor/go.mod @@ -7,6 +7,8 @@ replace github.com/docker/distribution v2.7.1+incompatible => github.com/docker/ replace github.com/docker/docker v1.13.1 => github.com/docker/engine v0.0.0-20190822205725-ed20165a37b4 // leeway ignore +replace github.com/jpillora/chisel => github.com/csweichel/chisel v1.7.6-0.20210413131541-40f425137158 // leeway ignore + require ( github.com/Netflix/go-env v0.0.0-20200908232752-3e802f601e28 github.com/creack/pty v1.1.11 @@ -22,7 +24,8 @@ require ( github.com/google/uuid v1.1.4 github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 github.com/grpc-ecosystem/grpc-gateway/v2 v2.2.0 - github.com/mailru/easygo v0.0.0-20190618140210-3c14a0dc985f // indirect + github.com/jpillora/chisel v1.7.6 + github.com/mailru/easygo v0.0.0-20190618140210-3c14a0dc985f github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/prometheus/procfs v0.6.0 github.com/sirupsen/logrus v1.7.0 diff --git a/components/supervisor/go.sum b/components/supervisor/go.sum index f12fe8f5b2df20..7e25e082797023 100644 --- a/components/supervisor/go.sum +++ b/components/supervisor/go.sum @@ -80,11 +80,15 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= +github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM= +github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2/go.mod h1:jnzFpU88PccN/tPPhCpnNU8mZphvKxYM9lLNkd8e+os= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= @@ -191,6 +195,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/csweichel/chisel v1.7.6-0.20210413131541-40f425137158 h1:TO0PBAq9dFt1/uyRCD1ZyuGMUokeAkRPvLLCj3zj24g= +github.com/csweichel/chisel v1.7.6-0.20210413131541-40f425137158/go.mod h1:BC2zg11mTIoyGPUjc2EkTgfz3uUUV93+K9tNYCCU/fw= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= @@ -398,6 +404,13 @@ github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6t github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/ansi v1.0.2 h1:+Ei5HCAH0xsrQRCT2PDr4mq9r4Gm4tg+arNdXRkB22s= +github.com/jpillora/ansi v1.0.2/go.mod h1:D2tT+6uzJvN1nBVQILYWkIdq7zG+b5gcFN5WI/VyjMY= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/jpillora/requestlog v1.0.0 h1:bg++eJ74T7DYL3DlIpiwknrtfdUA9oP/M4fL+PpqnyA= +github.com/jpillora/requestlog v1.0.0/go.mod h1:HTWQb7QfDc2jtHnWe2XEIEeJB7gJPnVdpNn52HXPvy8= +github.com/jpillora/sizestr v1.0.0 h1:4tr0FLxs1Mtq3TnsLDV+GYUWG7Q26a6s+tV5Zfw2ygw= +github.com/jpillora/sizestr v1.0.0/go.mod h1:bUhLv4ctkknatr6gR42qPxirmd5+ds1u7mzD+MZ33f0= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= @@ -634,6 +647,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= github.com/uber-go/atomic v1.4.0 h1:yOuPqEq4ovnhEjpHmfFwsqBXDYbQeT6Nb0bwD6XnD5o= github.com/uber-go/atomic v1.4.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber/jaeger-client-go v2.16.1-0.20190821210114-30e625686abe+incompatible h1:JHBDV9mu1P4nS/bZ+tjjnsVYN5qDLwKlZCwUuYPzG48= diff --git a/components/supervisor/pkg/supervisor/supervisor.go b/components/supervisor/pkg/supervisor/supervisor.go index c1ee53b52de68d..213b3869b0087b 100644 --- a/components/supervisor/pkg/supervisor/supervisor.go +++ b/components/supervisor/pkg/supervisor/supervisor.go @@ -40,6 +40,7 @@ import ( daemon "github.com/gitpod-io/gitpod/ws-daemon/api" grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + chisel "github.com/jpillora/chisel/server" ) var ( @@ -615,6 +616,20 @@ func startAPIEndpoint(ctx context.Context, cfg *Config, wg *sync.WaitGroup, serv } go grpcServer.Serve(grpcMux) + // Register chisel before the generic HTTP1 catch-all which would otherwise catch chisel, too + chiselMux := m.Match(cmux.HTTP1HeaderFieldPrefix("Sec-WebSocket-Protocol", "chisel-")) + chs, err := chisel.NewServer(&chisel.Config{ + Listener: chiselMux, + Reverse: true, + }) + if err != nil { + log.WithError(err).Fatal("cannot start chisel server") + } + err = chs.Start("", strconv.Itoa(cfg.APIEndpointPort)) + if err != nil { + log.WithError(err).Fatal("cannot start chisel server") + } + httpMux := m.Match(cmux.HTTP1Fast()) routes := http.NewServeMux() routes.Handle("/_supervisor/v1/", http.StripPrefix("/_supervisor", restMux)) From 7ecfb5a64b9f038cbc0a3663b3f9916bf67f5d83 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Tue, 13 Apr 2021 14:15:57 +0000 Subject: [PATCH 05/11] [ws-proxy] Support `x-gitpod-owner-token` for authentication --- components/ws-manager/pkg/manager/create.go | 2 +- components/ws-proxy/pkg/proxy/auth.go | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/components/ws-manager/pkg/manager/create.go b/components/ws-manager/pkg/manager/create.go index 5ca610b043e6a4..01af6ce37417bd 100644 --- a/components/ws-manager/pkg/manager/create.go +++ b/components/ws-manager/pkg/manager/create.go @@ -746,7 +746,7 @@ func getServicePrefix(req *api.StartWorkspaceRequest) string { // // The tokens we produce here (e.g. owner token or CLI API token) are likely placed in cookies or transmitted via HTTP. // To make the lifes of downstream users easier we'll try and play nice here w.r.t. to the characters used. -var validCookieChars = []byte("!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}") +var validCookieChars = []byte("!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{}|") func getRandomString(length int) (string, error) { b := make([]byte, length) diff --git a/components/ws-proxy/pkg/proxy/auth.go b/components/ws-proxy/pkg/proxy/auth.go index c1c8701bfb3fe3..1a6149497bce37 100644 --- a/components/ws-proxy/pkg/proxy/auth.go +++ b/components/ws-proxy/pkg/proxy/auth.go @@ -78,20 +78,25 @@ func WorkspaceAuthHandler(domain string, info WorkspaceInfoProvider) mux.Middlew // port seems to be private - subject it to the same access policy as the workspace itself } - cn := fmt.Sprintf("%s%s_owner_", cookiePrefix, ws.InstanceID) - c, err := req.Cookie(cn) - if err != nil { - log.WithField("cookieName", cn).Warn("no owner cookie present") - resp.WriteHeader(http.StatusUnauthorized) - return - } + tkn := req.Header.Get("x-gitpod-owner-token") + if tkn == "" { + cn := fmt.Sprintf("%s%s_owner_", cookiePrefix, ws.InstanceID) + c, err := req.Cookie(cn) + if err != nil { + log.WithField("cookieName", cn).Warn("no owner cookie present") + resp.WriteHeader(http.StatusUnauthorized) + return + } - tkn, err := url.QueryUnescape(c.Value) + tkn = c.Value + } + tkn, err := url.QueryUnescape(tkn) if err != nil { log.WithError(err).Warn("cannot decode owner token") resp.WriteHeader(http.StatusBadRequest) return } + if tkn != ws.Auth.OwnerToken { log.Warn("owner token mismatch") resp.WriteHeader(http.StatusForbidden) From 2060b98a9b5b221111b65433211658f2c5f11bee Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Wed, 14 Apr 2021 09:40:08 +0000 Subject: [PATCH 06/11] [workspacekit] Relax IWS socket wait time --- components/workspacekit/cmd/rings.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/workspacekit/cmd/rings.go b/components/workspacekit/cmd/rings.go index 3bef4912d95fff..254c00b356aa68 100644 --- a/components/workspacekit/cmd/rings.go +++ b/components/workspacekit/cmd/rings.go @@ -61,7 +61,7 @@ var ring0Cmd = &cobra.Command{ sleepForDebugging() }() - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) defer cancel() client, conn, err := connectToInWorkspaceDaemonService(ctx) From e396249121a5beda54d32198609578ccecb5b961 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Wed, 14 Apr 2021 10:15:05 +0000 Subject: [PATCH 07/11] [ws-manager] Reduce owner token char set to make using the token easier in cookies and HTTP header --- components/ws-manager/pkg/manager/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ws-manager/pkg/manager/create.go b/components/ws-manager/pkg/manager/create.go index 01af6ce37417bd..b0d5f4fab0a18c 100644 --- a/components/ws-manager/pkg/manager/create.go +++ b/components/ws-manager/pkg/manager/create.go @@ -746,7 +746,7 @@ func getServicePrefix(req *api.StartWorkspaceRequest) string { // // The tokens we produce here (e.g. owner token or CLI API token) are likely placed in cookies or transmitted via HTTP. // To make the lifes of downstream users easier we'll try and play nice here w.r.t. to the characters used. -var validCookieChars = []byte("!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{}|") +var validCookieChars = []byte("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-.") func getRandomString(length int) (string, error) { b := make([]byte, length) From 592c841802842ba6042db63a206d550876c242a9 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Sun, 7 Mar 2021 15:22:43 +0000 Subject: [PATCH 08/11] [workspacekit] Ignore chown /dev/pts --- components/workspacekit/pkg/seccomp/notify.go | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/components/workspacekit/pkg/seccomp/notify.go b/components/workspacekit/pkg/seccomp/notify.go index 3ead0d4af8ed35..576c48149e0009 100644 --- a/components/workspacekit/pkg/seccomp/notify.go +++ b/components/workspacekit/pkg/seccomp/notify.go @@ -30,6 +30,7 @@ type SyscallHandler interface { Mount(req *libseccomp.ScmpNotifReq) (val uint64, errno int32, flags uint32) Umount(req *libseccomp.ScmpNotifReq) (val uint64, errno int32, flags uint32) Bind(req *libseccomp.ScmpNotifReq) (val uint64, errno int32, flags uint32) + Chown(req *libseccomp.ScmpNotifReq) (val uint64, errno int32, flags uint32) } func mapHandler(h SyscallHandler) map[string]syscallHandler { @@ -38,6 +39,7 @@ func mapHandler(h SyscallHandler) map[string]syscallHandler { "umount": h.Umount, "umount2": h.Umount, "bind": h.Bind, + "chown": h.Chown, } } @@ -384,6 +386,33 @@ func (h *InWorkspaceHandler) Bind(req *libseccomp.ScmpNotifReq) (val uint64, err return } +func (h *InWorkspaceHandler) Chown(req *libseccomp.ScmpNotifReq) (val uint64, errno int32, flags uint32) { + log := log.WithFields(map[string]interface{}{ + "syscall": "bind", + "pid": req.Pid, + "id": req.ID, + }) + + memFile, err := readarg.OpenMem(req.Pid) + if err != nil { + log.WithError(err).Error("cannot open mem") + return + } + defer memFile.Close() + + pth, err := readarg.ReadString(memFile, int64(req.Data.Args[0])) + if err != nil { + log.WithError(err).Error("cannot open mem") + return + } + + if strings.HasPrefix(pth, "/dev/pts") { + return 0, 0, 0 + } + + return 0, 0, libseccomp.NotifRespFlagContinue +} + var nativeEndian binary.ByteOrder func init() { From 02b89648bf1cd8c8157582f52dae91ef028db15b Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Thu, 15 Apr 2021 05:48:58 +0000 Subject: [PATCH 09/11] [supervisor] Add SSH support --- components/supervisor/BUILD.yaml | 11 +++ components/supervisor/leeway.Dockerfile | 13 ++-- .../supervisor/pkg/supervisor/config.go | 6 ++ .../supervisor/pkg/supervisor/supervisor.go | 69 ++++++++++++++++++- components/supervisor/supervisor-config.json | 3 +- 5 files changed, 96 insertions(+), 6 deletions(-) diff --git a/components/supervisor/BUILD.yaml b/components/supervisor/BUILD.yaml index 5d38f40f1537f2..da14cb878616f2 100644 --- a/components/supervisor/BUILD.yaml +++ b/components/supervisor/BUILD.yaml @@ -21,6 +21,7 @@ packages: - "supervisor-config.json" deps: - :app + - :dropbear - components/supervisor/frontend:app - components/workspacekit:app - components/workspacekit:fuse-overlayfs @@ -30,3 +31,13 @@ packages: dockerfile: leeway.Dockerfile image: - ${imageRepoBase}/supervisor:${version} + - name: dropbear + type: generic + config: + commands: + - ["curl", "-OL", "https://matt.ucc.asn.au/dropbear/dropbear-2020.81.tar.bz2"] + - ["tar", "xjf", "dropbear-2020.81.tar.bz2"] + - ["sh", "-c", "cd dropbear-2020.81; ./configure --enable-static && make"] + - ["mv", "dropbear-2020.81/dropbear", "dropbear"] + - ["mv", "dropbear-2020.81/dropbearkey", "dropbearkey"] + - ["rm", "-rf", "dropbear-2020.81*"] \ No newline at end of file diff --git a/components/supervisor/leeway.Dockerfile b/components/supervisor/leeway.Dockerfile index cecb477456b29c..769c7f9dd1c2e9 100644 --- a/components/supervisor/leeway.Dockerfile +++ b/components/supervisor/leeway.Dockerfile @@ -10,9 +10,14 @@ FROM scratch COPY components-supervisor-frontend--app/node_modules/@gitpod/supervisor-frontend/dist/ /.supervisor/frontend/ WORKDIR "/.supervisor" -COPY components-supervisor--app/supervisor /.supervisor/supervisor -COPY supervisor-config.json /.supervisor/supervisor-config.json -COPY components-workspacekit--app/workspacekit /.supervisor/workspacekit -COPY components-workspacekit--fuse-overlayfs/fuse-overlayfs /.supervisor/fuse-overlayfs +COPY components-supervisor--app/supervisor \ + supervisor-config.json \ + components-workspacekit--app/workspacekit \ + components-workspacekit--fuse-overlayfs/fuse-overlayfs \ + ./ +WORKDIR "/.supervisor/dropbear" +COPY components-supervisor--dropbear/dropbear \ + components-supervisor--dropbear/dropbearkey \ + ./ ENTRYPOINT ["/.supervisor/supervisor"] \ No newline at end of file diff --git a/components/supervisor/pkg/supervisor/config.go b/components/supervisor/pkg/supervisor/config.go index 1410c05d4637e9..57b6743b551a5e 100644 --- a/components/supervisor/pkg/supervisor/config.go +++ b/components/supervisor/pkg/supervisor/config.go @@ -72,6 +72,9 @@ type StaticConfig struct { // APIEndpointPort is the port where to serve the API endpoint on APIEndpointPort int `json:"apiEndpointPort"` + + // SSHPort is the port we run the SSH server on + SSHPort int `json:"sshPort"` } // Validate validates this configuration @@ -85,6 +88,9 @@ func (c StaticConfig) Validate() error { if !(0 < c.APIEndpointPort && c.APIEndpointPort <= math.MaxUint16) { return fmt.Errorf("apiEndpointPort must be between 0 and %d", math.MaxUint16) } + if !(0 < c.SSHPort && c.SSHPort <= math.MaxUint16) { + return fmt.Errorf("sshPort must be between 0 and %d", math.MaxUint16) + } return nil } diff --git a/components/supervisor/pkg/supervisor/supervisor.go b/components/supervisor/pkg/supervisor/supervisor.go index 213b3869b0087b..54da94345fdc86 100644 --- a/components/supervisor/pkg/supervisor/supervisor.go +++ b/components/supervisor/pkg/supervisor/supervisor.go @@ -8,11 +8,13 @@ import ( "context" "encoding/json" "fmt" + "io/ioutil" "net" "net/http" "os" "os/exec" "os/signal" + "path/filepath" "runtime" "strconv" "strings" @@ -145,6 +147,7 @@ func Run(options ...RunOption) { ports.NewConfigService(cfg.WorkspaceID, gitpodConfigService, gitpodService), uint32(cfg.IDEPort), uint32(cfg.APIEndpointPort), + uint32(cfg.SSHPort), ) termMux = terminal.NewMux() termMuxSrv = terminal.NewMuxTerminalService(termMux) @@ -190,9 +193,13 @@ func Run(options ...RunOption) { go startAndWatchIDE(ctx, cfg, &ideWG, ideReady) var wg sync.WaitGroup - wg.Add(4) + wg.Add(1) go startContentInit(ctx, cfg, &wg, cstate) + wg.Add(1) go startAPIEndpoint(ctx, cfg, &wg, apiServices, apiEndpointOpts...) + wg.Add(1) + go startSSHServer(ctx, cfg, &wg) + wg.Add(1) go taskManager.Run(ctx, &wg) go socketActivationForDocker(ctx, &wg, termMux) @@ -646,6 +653,66 @@ func startAPIEndpoint(ctx context.Context, cfg *Config, wg *sync.WaitGroup, serv l.Close() } +func startSSHServer(ctx context.Context, cfg *Config, wg *sync.WaitGroup) { + defer wg.Done() + + bin, err := os.Executable() + if err != nil { + log.WithError(err).Error("cannot find executable path") + return + } + dropbear := filepath.Join(filepath.Dir(bin), "dropbear", "dropbear") + if _, err := os.Stat(dropbear); err != nil { + log.WithError(err).WithField("path", dropbear).Error("cannot locate dropebar binary") + return + } + dropbearkey := filepath.Join(filepath.Dir(bin), "dropbear", "dropbearkey") + if _, err := os.Stat(dropbearkey); err != nil { + log.WithError(err).WithField("path", dropbearkey).Error("cannot locate dropebarkey") + return + } + + hostkeyFN, err := ioutil.TempFile("", "hostkey") + if err != nil { + log.WithError(err).Error("cannot create hostkey file") + return + } + hostkeyFN.Close() + os.Remove(hostkeyFN.Name()) + + out, err := exec.Command(dropbearkey, "-t", "rsa", "-f", hostkeyFN.Name()).CombinedOutput() + if err != nil { + log.WithError(err).WithField("out", string(out)).Error("cannot create hostkey file") + return + } + + cmd := exec.Command(dropbear, "-F", "-E", "-w", "-s", "-p", fmt.Sprintf(":%d", cfg.SSHPort), "-r", hostkeyFN.Name()) + cmd.Env = buildIDEEnv(cfg) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + err = cmd.Start() + if err != nil { + log.WithError(err).Error("cannot start SSH server") + return + } + + done := make(chan error, 1) + go func() { + done <- cmd.Wait() + }() + select { + case <-ctx.Done(): + if cmd.Process != nil { + cmd.Process.Kill() + } + return + case err = <-done: + if err != nil { + log.WithError(err).Error("SSH server stopped") + } + } +} + func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst ContentState) { defer wg.Done() defer log.Info("supervisor: workspace content available") diff --git a/components/supervisor/supervisor-config.json b/components/supervisor/supervisor-config.json index a0bbf3aa9323e4..5f2084c9bed7bf 100644 --- a/components/supervisor/supervisor-config.json +++ b/components/supervisor/supervisor-config.json @@ -1,5 +1,6 @@ { "ideConfigLocation": "/ide/supervisor-ide-config.json", "frontendLocation": "/.supervisor/frontend/", - "apiEndpointPort": 22999 + "apiEndpointPort": 22999, + "sshPort": 23001 } \ No newline at end of file From e07cf00a9bf41541b884a1292814fd342e9f9d38 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Thu, 15 Apr 2021 13:50:13 +0000 Subject: [PATCH 10/11] [local-app] auto-establish SSH connection --- components/local-app/BUILD.yaml | 1 + components/local-app/cmd/debug/main.go | 36 +- components/local-app/go.mod | 7 +- components/local-app/go.sum | 356 ++++++++++++++++++ components/local-app/pkg/auth/auth.go | 12 +- components/local-app/pkg/bastion/bastion.go | 244 +++++++++++- .../supervisor/pkg/supervisor/supervisor.go | 5 +- 7 files changed, 633 insertions(+), 28 deletions(-) diff --git a/components/local-app/BUILD.yaml b/components/local-app/BUILD.yaml index 4fb992967d255f..a5cb617824c812 100644 --- a/components/local-app/BUILD.yaml +++ b/components/local-app/BUILD.yaml @@ -6,6 +6,7 @@ packages: - go.sum - "**/*.go" deps: + - components/supervisor-api/go:lib - components/gitpod-protocol/go:lib config: packaging: app diff --git a/components/local-app/cmd/debug/main.go b/components/local-app/cmd/debug/main.go index adbd723ee7e398..1e932898f52b51 100644 --- a/components/local-app/cmd/debug/main.go +++ b/components/local-app/cmd/debug/main.go @@ -21,13 +21,13 @@ import ( ) func main() { - keyring.MockInit() app := cli.App{ Name: "local-app-debug", Commands: []*cli.Command{ { Name: "login", Action: func(c *cli.Context) error { + keyring.MockInit() _, err := auth.Login(context.Background(), auth.LoginOpts{ GitpodURL: c.String("gitpod-host"), }) @@ -49,7 +49,10 @@ func main() { { Name: "run", Action: func(c *cli.Context) error { - return run(c.String("gitpod-host")) + if c.Bool("mock-keyring") { + keyring.MockInit() + } + return run(c.String("gitpod-host"), c.String("token"), c.String("ssh_config")) }, Flags: []cli.Flag{ &cli.StringFlag{ @@ -58,6 +61,18 @@ func main() { }, Name: "gitpod-host", }, + &cli.StringFlag{ + Name: "token", + EnvVars: []string{ + "GITPOD_TOKEN", + }, + }, + &cli.PathFlag{ + Name: "ssh_config", + }, + &cli.BoolFlag{ + Name: "mock-keyring", + }, }, }, }, @@ -68,8 +83,12 @@ func main() { } } -func run(host string) error { - tkn, err := auth.GetToken() +func run(host, token, sshConfig string) error { + if token != "" { + auth.SetToken(host, token) + } + + tkn, err := auth.GetToken(host) if errors.Is(err, keyring.ErrNotFound) { tkn, err = auth.Login(context.Background(), auth.LoginOpts{GitpodURL: host}) } @@ -77,6 +96,13 @@ func run(host string) error { return err } + cb := bastion.CompositeCallbacks{ + &logCallbacks{}, + } + if sshConfig != "" { + cb = append(cb, &bastion.SSHConfigWritingCallback{Path: sshConfig}) + } + wshost := host wshost = strings.ReplaceAll(wshost, "https://", "wss://") wshost = strings.ReplaceAll(wshost, "http://", "ws://") @@ -89,7 +115,7 @@ func run(host string) error { if err != nil { return err } - b := bastion.New(client, &logCallbacks{}) + b := bastion.New(client, cb) return b.Run() } diff --git a/components/local-app/go.mod b/components/local-app/go.mod index 4e191a54655673..5a3b903861d7ce 100644 --- a/components/local-app/go.mod +++ b/components/local-app/go.mod @@ -4,12 +4,17 @@ go 1.16 require ( github.com/gitpod-io/gitpod/gitpod-protocol v0.0.0-00010101000000-000000000000 - github.com/jpillora/chisel v1.7.6 // indirect + github.com/gitpod-io/gitpod/supervisor/api v0.0.0-00010101000000-000000000000 + github.com/jpillora/chisel v1.7.6 + github.com/kevinburke/ssh_config v1.1.0 // indirect github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect github.com/sirupsen/logrus v1.7.0 github.com/urfave/cli/v2 v2.3.0 github.com/zalando/go-keyring v0.1.1 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect + google.golang.org/grpc v1.36.0 ) replace github.com/gitpod-io/gitpod/gitpod-protocol => ../gitpod-protocol/go // leeway + +replace github.com/gitpod-io/gitpod/supervisor/api => ../supervisor-api/go // leeway diff --git a/components/local-app/go.sum b/components/local-app/go.sum index 1da5b96edcc6d7..ece38fe4b45ba0 100644 --- a/components/local-app/go.sum +++ b/components/local-app/go.sum @@ -1,24 +1,128 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM= github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2/go.mod h1:jnzFpU88PccN/tPPhCpnNU8mZphvKxYM9lLNkd8e+os= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/danieljoos/wincred v1.1.0 h1:3RNcEpBg4IhIChZdFRSdlQt1QjCp1sMAPIrOnm7Yf8g= github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.2.0 h1:HlJcTiqGHvaWDG7/s85d68Kw7G7FqMz+9LlcyVauOAw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.2.0/go.mod h1:gRq9gZWcIFvz68EgWqy2qQpRbmtn5j2qLZ4zHjqiLpg= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jpillora/ansi v1.0.2 h1:+Ei5HCAH0xsrQRCT2PDr4mq9r4Gm4tg+arNdXRkB22s= github.com/jpillora/ansi v1.0.2/go.mod h1:D2tT+6uzJvN1nBVQILYWkIdq7zG+b5gcFN5WI/VyjMY= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= @@ -29,9 +133,20 @@ github.com/jpillora/requestlog v1.0.0 h1:bg++eJ74T7DYL3DlIpiwknrtfdUA9oP/M4fL+Pp github.com/jpillora/requestlog v1.0.0/go.mod h1:HTWQb7QfDc2jtHnWe2XEIEeJB7gJPnVdpNn52HXPvy8= github.com/jpillora/sizestr v1.0.0 h1:4tr0FLxs1Mtq3TnsLDV+GYUWG7Q26a6s+tV5Zfw2ygw= github.com/jpillora/sizestr v1.0.0/go.mod h1:bUhLv4ctkknatr6gR42qPxirmd5+ds1u7mzD+MZ33f0= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kevinburke/ssh_config v1.1.0 h1:pH/t1WS9NzT8go394IqZeJTMHVm6Cr6ZJ6AQ+mdNo/o= +github.com/kevinburke/ssh_config v1.1.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= @@ -42,40 +157,281 @@ github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37 h1:marA1XQDC7 github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc= github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zalando/go-keyring v0.1.1 h1:w2V9lcx/Uj4l+dzAf1m9s+DJ1O8ROkEHnynonHjTcYE= github.com/zalando/go-keyring v0.1.1/go.mod h1:OIC+OZ28XbmwFxU/Rp9V7eKzZjamBJwRzC8UFJH9+L8= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20210201163806-010130855d6c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 h1:F5Gozwx4I1xtr/sr/8CFbb57iKi3297KFs0QDbGN60A= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea h1:N98SvVh7Hdle2lgUVFuIkf0B3u29CUakMUQa7Hwz8Wc= +google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.0.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/components/local-app/pkg/auth/auth.go b/components/local-app/pkg/auth/auth.go index 7a5145e68577a5..6f58fb6c6841c8 100644 --- a/components/local-app/pkg/auth/auth.go +++ b/components/local-app/pkg/auth/auth.go @@ -20,12 +20,16 @@ import ( const ( keyringService = "gitpod-io" - keyringUser = "token" ) +// SetToken returns the persisted Gitpod token +func SetToken(host, token string) error { + return keyring.Set(keyringService, host, token) +} + // GetToken returns the persisted Gitpod token -func GetToken() (token string, err error) { - return keyring.Get(keyringService, keyringUser) +func GetToken(host string) (token string, err error) { + return keyring.Get(keyringService, host) } // LoginOpts configure the login process @@ -106,7 +110,7 @@ func Login(ctx context.Context, opts LoginOpts) (token string, err error) { } token = string(tkn) - err = keyring.Set(keyringService, keyringUser, token) + err = keyring.Set(keyringService, baseURL, token) if err != nil { return "", err } diff --git a/components/local-app/pkg/bastion/bastion.go b/components/local-app/pkg/bastion/bastion.go index 346539688f2ec9..a39c6c0c075d99 100644 --- a/components/local-app/pkg/bastion/bastion.go +++ b/components/local-app/pkg/bastion/bastion.go @@ -6,20 +6,88 @@ package bastion import ( "context" + "fmt" + "io/ioutil" + "net" + "net/http" + "os" + "path/filepath" + "strconv" + "strings" + "time" gitpod "github.com/gitpod-io/gitpod/gitpod-protocol" + supervisor "github.com/gitpod-io/gitpod/supervisor/api" + "github.com/kevinburke/ssh_config" + "google.golang.org/grpc" + + chisel "github.com/jpillora/chisel/client" "github.com/sirupsen/logrus" ) type Workspace struct { - Name string - Phase string + WorkspaceID string + Phase string + OwnerToken string + URL string + + LocalSupervisorPort int + LocalSSHPort int + + ctx context.Context + cancel context.CancelFunc } type Callbacks interface { InstanceUpdate(*Workspace) } +type CompositeCallbacks []Callbacks + +func (cb CompositeCallbacks) InstanceUpdate(w *Workspace) { + for _, c := range cb { + c.InstanceUpdate(w) + } +} + +type SSHConfigWritingCallback struct { + Path string + + workspaces map[string]*Workspace +} + +func (s *SSHConfigWritingCallback) InstanceUpdate(w *Workspace) { + if s.workspaces == nil { + s.workspaces = make(map[string]*Workspace) + } + if w.LocalSSHPort == 0 || w.Phase == "stopping" { + delete(s.workspaces, w.WorkspaceID) + } else { + s.workspaces[w.WorkspaceID] = w + } + + var cfg ssh_config.Config + for _, ws := range s.workspaces { + // TODO(cw): don't ignore error + p, _ := ssh_config.NewPattern(ws.WorkspaceID) + + cfg.Hosts = append(cfg.Hosts, &ssh_config.Host{ + Patterns: []*ssh_config.Pattern{p}, + Nodes: []ssh_config.Node{ + &ssh_config.KV{Key: "HostName", Value: "127.0.0.1"}, + &ssh_config.KV{Key: "User", Value: "gitpod"}, + &ssh_config.KV{Key: "Port", Value: strconv.Itoa(ws.LocalSSHPort)}, + }, + }) + } + + err := ioutil.WriteFile(s.Path, []byte(cfg.String()), 0644) + if err != nil { + logrus.WithError(err).WithField("path", s.Path).Error("cannot write ssh config file") + return + } +} + func New(client gitpod.APIInterface, cb Callbacks) *Bastion { ctx, cancel := context.WithCancel(context.Background()) return &Bastion{ @@ -47,33 +115,177 @@ func (b *Bastion) Run() error { return err } + uchan := make(chan *gitpod.WorkspaceInstance, 10) + go b.acceptUpdates(uchan) + b.fullUpdate(uchan) + + for u := range updates { + uchan <- u + } + return nil +} + +func (b *Bastion) fullUpdate(uchan chan<- *gitpod.WorkspaceInstance) { wss, err := b.Client.GetWorkspaces(b.ctx, &gitpod.GetWorkspacesOptions{Limit: float64(100)}) if err != nil { logrus.WithError(err).Warn("cannot get workspaces") } else { for _, ws := range wss { - if ws.LatestInstance == nil || ws.LatestInstance.Status.Phase != "running" { + if ws.LatestInstance == nil { continue } - w := &Workspace{ - Name: ws.Workspace.ID, - Phase: "running", - } - b.workspaces[ws.LatestInstance.ID] = w - b.Callbacks.InstanceUpdate(w) + uchan <- ws.LatestInstance } } +} +func (b *Bastion) acceptUpdates(updates chan *gitpod.WorkspaceInstance) { for u := range updates { - w, ok := b.workspaces[u.WorkspaceID] - if !ok { - w = &Workspace{} - b.workspaces[u.WorkspaceID] = w + ws, ok := b.workspaces[u.ID] + if !ok && u.Status.Phase != "stopping" { + ctx, cancel := context.WithCancel(b.ctx) + ws = &Workspace{ + WorkspaceID: u.WorkspaceID, + + ctx: ctx, + cancel: cancel, + } + } + ws.Phase = u.Status.Phase + ws.URL = u.IdeURL + ws.OwnerToken = u.Status.OwnerToken + if ws.OwnerToken == "" && ws.Phase == "running" { + // updates don't carry the owner token + go b.fullUpdate(updates) + } + + switch ws.Phase { + case "running": + if ws.LocalSupervisorPort == 0 && ws.OwnerToken != "" { + var err error + ws.LocalSupervisorPort, err = b.establishChiselTunnel(ws, "supervisor", 22999) + if err != nil { + logrus.WithError(err).Error("cannot establish supervisor tunnel") + } + + logrus.WithField("workspace", ws.WorkspaceID).WithField("supervisor port", ws.LocalSupervisorPort).Info("established supervisor channel") + } + + if ws.LocalSSHPort == 0 && ws.LocalSupervisorPort != 0 { + var err error + ws.LocalSSHPort, err = b.establishSSHTunnel(ws) + if err != nil { + logrus.WithError(err).Error("cannot establish SSH tunnel") + } + } + + case "stopping": + ws.cancel() + delete(b.workspaces, ws.WorkspaceID) + b.Callbacks.InstanceUpdate(ws) + return } - w.Name = u.WorkspaceID - w.Phase = u.Status.Phase - b.Callbacks.InstanceUpdate(w) + b.workspaces[u.ID] = ws + b.Callbacks.InstanceUpdate(ws) } +} + +func (b *Bastion) establishChiselTunnel(ws *Workspace, logprefix string, remotePort int) (localPort int, err error) { + if ws.URL == "" { + return 0, fmt.Errorf("IDE URL is empty") + } + if ws.OwnerToken == "" { + return 0, fmt.Errorf("owner token is empty") + } + + l, err := net.Listen("tcp", "localhost:0") + if err != nil { + return 0, err + } + localPort = l.(*net.TCPListener).Addr().(*net.TCPAddr).Port + l.Close() + + h := make(http.Header) + h.Set("x-gitpod-owner-token", ws.OwnerToken) + cl, err := chisel.NewClient(&chisel.Config{ + KeepAlive: 10 * time.Second, + Headers: h, + Server: ws.URL + "/_supervisor", + Remotes: []string{fmt.Sprintf("%d:%d", localPort, remotePort)}, + }) + cl.Logger = cl.Logger.Fork(logprefix) + if err != nil { + return 0, err + } + err = cl.Start(ws.ctx) + if err != nil { + return 0, err + } + go func() { + for ws.ctx.Err() == nil { + cl.Wait() + time.Sleep(100 * time.Millisecond) + logrus.Debugf("reconnecting %s", logprefix) + cl.Start(ws.ctx) + } + }() + return +} + +func (b *Bastion) establishSSHTunnel(ws *Workspace) (localPort int, err error) { + key, err := readPublicSSHKey() + if err != nil { + // TODO(cw): surface to the user and ask them to run ssh-keygen + logrus.WithError(err).Warn("no id_rsa.pub file found - will not be able to login via SSH") + } + err = installSSHAuthorizedKey(ws, key) + if err != nil { + // TODO(cw): surface to the user and ask them install the key manually + logrus.WithError(err).Warn("cannot install authorized key") + } + + return b.establishChiselTunnel(ws, "ssh", 23001) +} + +func readPublicSSHKey() (key string, err error) { + home, err := os.UserHomeDir() + if err != nil { + return "", err + } + res, err := ioutil.ReadFile(filepath.Join(home, ".ssh", "id_rsa.pub")) + if err != nil { + return "", err + } + return strings.TrimSpace(string(res)), nil +} + +func installSSHAuthorizedKey(ws *Workspace, key string) error { + conn, err := grpc.Dial(fmt.Sprintf("localhost:%d", ws.LocalSupervisorPort), grpc.WithInsecure()) + if err != nil { + return err + } + + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + term := supervisor.NewTerminalServiceClient(conn) + tres, err := term.Open(ctx, &supervisor.OpenTerminalRequest{Workdir: "/", Shell: "/bin/sh"}) + if err != nil { + return err + } + defer term.Shutdown(ctx, &supervisor.ShutdownTerminalRequest{Alias: tres.Terminal.Alias}) + + _, err = term.Write(ctx, &supervisor.WriteTerminalRequest{ + Alias: tres.Terminal.Alias, + Stdin: []byte(fmt.Sprintf("mkdir -p ~/.ssh; echo %s >> ~/.ssh/authorized_keys\n", key)), + }) + if err != nil { + return err + } + + // give the command some time to execute + // TODO(cw): synchronize this properly + time.Sleep(500 * time.Millisecond) + return nil } diff --git a/components/supervisor/pkg/supervisor/supervisor.go b/components/supervisor/pkg/supervisor/supervisor.go index 54da94345fdc86..cde562f385b10b 100644 --- a/components/supervisor/pkg/supervisor/supervisor.go +++ b/components/supervisor/pkg/supervisor/supervisor.go @@ -626,8 +626,9 @@ func startAPIEndpoint(ctx context.Context, cfg *Config, wg *sync.WaitGroup, serv // Register chisel before the generic HTTP1 catch-all which would otherwise catch chisel, too chiselMux := m.Match(cmux.HTTP1HeaderFieldPrefix("Sec-WebSocket-Protocol", "chisel-")) chs, err := chisel.NewServer(&chisel.Config{ - Listener: chiselMux, - Reverse: true, + Listener: chiselMux, + Reverse: true, + KeepAlive: 10 * time.Second, }) if err != nil { log.WithError(err).Fatal("cannot start chisel server") From a064c7713d25f524fbf07cbe3afb842286a8008b Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Thu, 15 Apr 2021 16:39:02 +0000 Subject: [PATCH 11/11] [local-app] Make part of the regular build --- components/BUILD.yaml | 3 +- components/local-app/BUILD.yaml | 49 ++++++++++++++ components/local-app/README.md | 19 ++++++ components/local-app/leeway.Dockerfile | 12 ++++ components/local-app/{cmd/debug => }/main.go | 67 +++++++------------- 5 files changed, 106 insertions(+), 44 deletions(-) create mode 100644 components/local-app/README.md create mode 100644 components/local-app/leeway.Dockerfile rename components/local-app/{cmd/debug => }/main.go (64%) diff --git a/components/BUILD.yaml b/components/BUILD.yaml index 71af4eb3225f24..a454a37d9307ac 100644 --- a/components/BUILD.yaml +++ b/components/BUILD.yaml @@ -19,15 +19,16 @@ packages: - components/ide/code:docker - components/ide/theia:docker - components/image-builder:docker + - components/local-app:docker - components/proxy:docker - components/registry-facade:docker - components/server:docker - components/service-waiter:docker - components/supervisor-api/typescript-grpc:publish - components/supervisor:docker + - components/ws-daemon:docker - components/ws-daemon/seccomp-profile-installer:docker - components/ws-daemon/shiftfs-module-loader:docker - - components/ws-daemon:docker - components/ws-manager-bridge:docker - components/ws-manager:docker - components/ws-proxy:docker diff --git a/components/local-app/BUILD.yaml b/components/local-app/BUILD.yaml index a5cb617824c812..03b4bc7bd4c605 100644 --- a/components/local-app/BUILD.yaml +++ b/components/local-app/BUILD.yaml @@ -1,5 +1,27 @@ packages: - name: app + type: generic + config: + commands: [["echo"]] + deps: + - :app-linux + - :app-darwin + - :app-windows + - name: app-linux + type: go + srcs: + - go.mod + - go.sum + - "**/*.go" + deps: + - components/supervisor-api/go:lib + - components/gitpod-protocol/go:lib + env: + - CGO_ENABLED=0 + - GOOS=linux + config: + packaging: app + - name: app-darwin type: go srcs: - go.mod @@ -8,5 +30,32 @@ packages: deps: - components/supervisor-api/go:lib - components/gitpod-protocol/go:lib + env: + - CGO_ENABLED=0 + - GOOS=darwin config: packaging: app + - name: app-windows + type: go + srcs: + - go.mod + - go.sum + - "**/*.go" + deps: + - components/supervisor-api/go:lib + - components/gitpod-protocol/go:lib + env: + - CGO_ENABLED=0 + - GOOS=windows + config: + packaging: app + - name: docker + type: docker + deps: + - :app + argdeps: + - imageRepoBase + config: + dockerfile: leeway.Dockerfile + image: + - ${imageRepoBase}/local-app:${version} \ No newline at end of file diff --git a/components/local-app/README.md b/components/local-app/README.md new file mode 100644 index 00000000000000..5ad942f40be8d4 --- /dev/null +++ b/components/local-app/README.md @@ -0,0 +1,19 @@ +# local-app + +**Beware**: this is very much work in progress and will likely break things. + +## How to install +``` +docker run --rm -it -v /tmp/dest:/out eu.gcr.io/gitpod-core-dev/build/local-app: +``` + +## How to run +``` +./local-app +``` + +## How to run in Gitpod against a dev-staging environment +``` +cd components/local-app +BROWSER= GITPOD_HOST= go run main.go --mock-keyring run +``` diff --git a/components/local-app/leeway.Dockerfile b/components/local-app/leeway.Dockerfile new file mode 100644 index 00000000000000..a54265ace7a2b0 --- /dev/null +++ b/components/local-app/leeway.Dockerfile @@ -0,0 +1,12 @@ +# Copyright (c) 2021 Gitpod GmbH. All rights reserved. +# Licensed under the GNU Affero General Public License (AGPL). +# See License-AGPL.txt in the project root for license information. + +FROM alpine:3.13 + +WORKDIR /app +COPY components-local-app--app/components-local-app--app-linux/local-app local-app-linux +COPY components-local-app--app/components-local-app--app-darwin/local-app local-app-darwin +COPY components-local-app--app/components-local-app--app-windows/local-app.exe local-app-windows.exe + +CMD ["/bin/sh", "-c", "cp /app/* /out"] diff --git a/components/local-app/cmd/debug/main.go b/components/local-app/main.go similarity index 64% rename from components/local-app/cmd/debug/main.go rename to components/local-app/main.go index 1e932898f52b51..84e2fb4cbfe0d4 100644 --- a/components/local-app/cmd/debug/main.go +++ b/components/local-app/main.go @@ -7,7 +7,6 @@ package main import ( "context" "errors" - "fmt" "log" "os" "strings" @@ -22,56 +21,36 @@ import ( func main() { app := cli.App{ - Name: "local-app-debug", - Commands: []*cli.Command{ - { - Name: "login", - Action: func(c *cli.Context) error { - keyring.MockInit() - _, err := auth.Login(context.Background(), auth.LoginOpts{ - GitpodURL: c.String("gitpod-host"), - }) - if err != nil { - return err - } - fmt.Println("login successful") - return nil - }, - Flags: []cli.Flag{ - &cli.StringFlag{ - EnvVars: []string{ - "GITPOD_HOST", - }, - Name: "gitpod-host", - }, + Name: "gitpod", + Action: DefaultCommand("run"), + EnableBashCompletion: true, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "gitpod-host", + Usage: "URL of the Gitpod installation to connect to", + EnvVars: []string{ + "GITPOD_HOST", }, }, + &cli.BoolFlag{ + Name: "mock-keyring", + Usage: "Don't use system native keyring, but store Gitpod token in memory", + }, + }, + Commands: []*cli.Command{ { Name: "run", Action: func(c *cli.Context) error { if c.Bool("mock-keyring") { keyring.MockInit() } - return run(c.String("gitpod-host"), c.String("token"), c.String("ssh_config")) + return run(c.String("gitpod-host"), c.String("ssh_config")) }, Flags: []cli.Flag{ - &cli.StringFlag{ - EnvVars: []string{ - "GITPOD_HOST", - }, - Name: "gitpod-host", - }, - &cli.StringFlag{ - Name: "token", - EnvVars: []string{ - "GITPOD_TOKEN", - }, - }, &cli.PathFlag{ - Name: "ssh_config", - }, - &cli.BoolFlag{ - Name: "mock-keyring", + Name: "ssh_config", + Usage: "produce and update an OpenSSH compatible ssh_config file", + Value: "/tmp/gitpod_ssh_config", }, }, }, @@ -83,11 +62,13 @@ func main() { } } -func run(host, token, sshConfig string) error { - if token != "" { - auth.SetToken(host, token) +func DefaultCommand(name string) cli.ActionFunc { + return func(ctx *cli.Context) error { + return ctx.App.Command(name).Run(ctx) } +} +func run(host, sshConfig string) error { tkn, err := auth.GetToken(host) if errors.Is(err, keyring.ErrNotFound) { tkn, err = auth.Login(context.Background(), auth.LoginOpts{GitpodURL: host})