Skip to content

Allow configuring the proxy for GitHub auth client #1166

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

Merged
pipecd-bot merged 2 commits into from
Nov 30, 2020
Merged

Allow configuring the proxy for GitHub auth client #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6c80ce
Allow configure the proxy for GitHub auth client
nghialv Nov 27, 2020
333055c
Reformat
nghialv Nov 27, 2020
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
1 change: 1 addition & 0 deletions pkg/model/project.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ message ProjectSSOConfig {
string client_secret = 2 [(validate.rules).string.min_len = 1];
string base_url = 3;
string upload_url = 4;
string proxy_url = 5;
}

message Google {
Expand Down
14 changes: 14 additions & 0 deletions pkg/oauth/github/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package github
import (
"context"
"fmt"
"net/http"
"net/url"

"github.com/google/go-github/v29/github"
Expand Down Expand Up @@ -54,9 +55,22 @@ func NewOAuthClient(ctx context.Context,
ClientSecret: sso.ClientSecret,
Endpoint: oauth2github.Endpoint,
}

if sso.ProxyUrl != "" {
proxyURL, err := url.Parse(sso.ProxyUrl)
if err != nil {
return nil, err
}

t := http.DefaultTransport.(*http.Transport).Clone()
t.Proxy = http.ProxyURL(proxyURL)
ctx = context.WithValue(ctx, oauth2.HTTPClient, &http.Client{Transport: t})
}

if enterprise {
return newGHEOAuthClient(ctx, sso, code, c, cfg)
}

token, err := cfg.Exchange(ctx, code)
if err != nil {
return nil, err
Expand Down