curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-3426: Point to new transfer service URL and eliminate PUT /ok

This commit is contained in:
Michael Borkenstein 2021-04-30 11:38:07 -05:00
parent bf737a0efc
commit 235897ba21
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloudflared/tunnel/login.go
View File

@ -20,7 +20,7 @@ import (
const ( const (
baseLoginURL = "https://dash.cloudflare.com/argotunnel" baseLoginURL = "https://dash.cloudflare.com/argotunnel"
callbackStoreURL = "https://login.argotunnel.com/" callbackStoreURL = "https://login.cloudflareaccess.org/"
) )
func buildLoginSubcommand(hidden bool) *cli.Command { func buildLoginSubcommand(hidden bool) *cli.Command {

26
token/transfer.go
View File

@ -15,7 +15,7 @@ import (
) )
const ( const (
baseStoreURL = "https://login.argotunnel.com/" baseStoreURL = "https://login.cloudflareaccess.org/"
clientTimeout = time.Second * 60 clientTimeout = time.Second * 60
) )
@ -83,11 +83,13 @@ func buildRequestURL(baseURL *url.URL, key, value string, cli, useHostOnly bool)
if useHostOnly { if useHostOnly {
baseURL.Path = "" baseURL.Path = ""
} }
// TODO: pass arg for tunnel login
if !cli { if !cli {
return baseURL.String(), nil return baseURL.String(), nil
} }
q.Set("redirect_url", baseURL.String()) // we add the token as a query param on both the redirect_url and the main url q.Set("redirect_url", baseURL.String()) // we add the token as a query param on both the redirect_url and the main url
q.Set("send_org_token", "true") // indicates that the cli endpoint should return both the org and app token q.Set("send_org_token", "true") // indicates that the cli endpoint should return both the org and app token
q.Set("edge_token_transfer", "true") // use new LoginHelper service built on workers
baseURL.RawQuery = q.Encode() // and this actual baseURL. baseURL.RawQuery = q.Encode() // and this actual baseURL.
baseURL.Path = "cdn-cgi/access/cli" baseURL.Path = "cdn-cgi/access/cli"
return baseURL.String(), nil return baseURL.String(), nil
@ -103,9 +105,6 @@ func transferRequest(requestURL string, log *zerolog.Logger) ([]byte, string, er
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} else if len(buf) > 0 { } else if len(buf) > 0 {
if err := putSuccess(client, requestURL); err != nil {
log.Err(err).Msg("Failed to update resource success")
}
return buf, key, nil return buf, key, nil
} }
} }
@ -136,22 +135,3 @@ func poll(client *http.Client, requestURL string, log *zerolog.Logger) ([]byte,
} }
return buf.Bytes(), resp.Header.Get("service-public-key"), nil return buf.Bytes(), resp.Header.Get("service-public-key"), nil
} }
// putSuccess tells the server we successfully downloaded the resource
func putSuccess(client *http.Client, requestURL string) error {
req, err := http.NewRequest("PUT", requestURL+"/ok", nil)
if err != nil {
return err
}
resp, err := client.Do(req)
if err != nil {
return err
}
resp.Body.Close()
if resp.StatusCode != 200 {
return fmt.Errorf("HTTP Response Status Code: %d", resp.StatusCode)
}
return nil
}