Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable VS Code Desktop for stable VS Code Web #5599

Merged
merged 3 commits into from
Sep 10, 2021
Merged

Enable VS Code Desktop for stable VS Code Web #5599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac4f2f2
[code] allow desktop in stable
akosyakov Sep 8, 2021
77593cc
[server] align stable with latest code version to enable desktop support
akosyakov Sep 8, 2021
9c4bd51
[local-app] fix failed/cancelled auth
akosyakov Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ components:
imageName: "ide/theia"
codeImage:
imageName: "ide/code"
stableVersion: "commit-59f277ba0a7795afe2cc4ca4509c718cd4013f29"
stableVersion: "commit-2f069ca3b646ab8099c05f7efd181004c08e95cb"
supervisor:
imageName: "supervisor"
dockerUp:
Expand Down
2 changes: 1 addition & 1 deletion components/ide/code/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh |
&& npm install -g yarn node-gyp
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH

ENV GP_CODE_COMMIT b667bcb6376c418cc5782072b134a49290b83495
ENV GP_CODE_COMMIT 26bf7356a65baf730233257f41d77ebbf7e977f3
RUN mkdir gp-code \
&& cd gp-code \
&& git init \
Expand Down
18 changes: 14 additions & 4 deletions components/local-app/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,21 @@ func main() {
},
},
&cli.BoolFlag{
Name: "verbose",
Name: "verbose",
Usage: "Enable verbose logging",
EnvVars: []string{
"GITPOD_LCA_VERBOSE",
},
Value: false,
},
&cli.DurationFlag{
Name: "auth-timeout",
Usage: "Auth timeout in seconds",
EnvVars: []string{
"GITPOD_LCA_AUTH_TIMEOUT",
},
Value: 30,
},
},
Commands: []*cli.Command{
{
Expand All @@ -107,7 +116,8 @@ func main() {
if c.Bool("mock-keyring") {
keyring.MockInit()
}
return run(c.String("gitpod-host"), c.String("ssh_config"), c.Int("api-port"), c.Bool("allow-cors-from-port"), c.Bool("auto-tunnel"), c.String("auth-redirect-url"), c.Bool("verbose"))
return run(c.String("gitpod-host"), c.String("ssh_config"), c.Int("api-port"), c.Bool("allow-cors-from-port"),
c.Bool("auto-tunnel"), c.String("auth-redirect-url"), c.Bool("verbose"), c.Duration("auth-timeout"))
},
Flags: []cli.Flag{
&cli.PathFlag{
Expand All @@ -131,7 +141,7 @@ func DefaultCommand(name string) cli.ActionFunc {
}
}

func run(origin, sshConfig string, apiPort int, allowCORSFromPort bool, autoTunnel bool, authRedirectUrl string, verbose bool) error {
func run(origin, sshConfig string, apiPort int, allowCORSFromPort bool, autoTunnel bool, authRedirectUrl string, verbose bool, authTimeout time.Duration) error {
if verbose {
logrus.SetLevel(logrus.DebugLevel)
}
Expand All @@ -155,7 +165,7 @@ func run(origin, sshConfig string, apiPort int, allowCORSFromPort bool, autoTunn

var b *bastion.Bastion

client, err := connectToServer(auth.LoginOpts{GitpodURL: origin, RedirectURL: authRedirectUrl}, func() {
client, err := connectToServer(auth.LoginOpts{GitpodURL: origin, RedirectURL: authRedirectUrl, AuthTimeout: authTimeout}, func() {
if b != nil {
b.FullUpdate()
}
Expand Down
5 changes: 5 additions & 0 deletions components/local-app/pkg/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"net/http"
"net/url"
"strings"
"time"

jwt "github.com/dgrijalva/jwt-go"
gitpod "github.com/gitpod-io/gitpod/gitpod-protocol"
Expand Down Expand Up @@ -95,6 +96,7 @@ func DeleteToken(host string) error {
type LoginOpts struct {
GitpodURL string
RedirectURL string
AuthTimeout time.Duration
}

const html = `
Expand Down Expand Up @@ -201,6 +203,7 @@ func Login(ctx context.Context, opts LoginOpts) (token string, err error) {
return "", xerrors.Errorf("cannot open browser to URL %s: %s\n", authorizationURL, err)
}

authTimeout := time.NewTimer(opts.AuthTimeout * time.Second)
var query url.Values
var code, approved string
select {
Expand All @@ -211,6 +214,8 @@ func Login(ctx context.Context, opts LoginOpts) (token string, err error) {
case query = <-queryChan:
code = query.Get("code")
approved = query.Get("approved")
case <-authTimeout.C:
return "", xerrors.Errorf("auth timeout after %d seconds", uint32(opts.AuthTimeout))
}

if approved == "no" {
Expand Down
2 changes: 1 addition & 1 deletion components/server/src/oauth-server/oauth-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class OAuthController {

// Let the local app know they rejected the approval
const rt = req.query.redirect_uri;
if (!rt || !rt.startsWith("http://localhost:")) {
if (!rt || !rt.startsWith("http://127.0.0.1:")) {
log.error(`/oauth/authorize: invalid returnTo URL: "${rt}"`)
res.sendStatus(400);
return false;
Expand Down