meutel/oauth2_proxy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

github: fix github enterprise support

Browse Source
This commit is contained in:
Jehiah Czebotar 2016-06-20 08:12:07 -04:00
parent 2fa0a35c7f
commit bcb8064831
No known key found for this signature in database
GPG Key ID: 43CA3BC55BBC543F
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -97,12 +97,11 @@ The GitHub auth provider supports two additional parameters to restrict authenti
-github-org="": restrict logins to members of this organisation -github-org="": restrict logins to members of this organisation
-github-team="": restrict logins to members of any of these teams, separated by a comma -github-team="": restrict logins to members of any of these teams, separated by a comma
If you are using github enterprise, make sure you set the following to the appropriate url: If you are using GitHub enterprise, make sure you set the following to the appropriate url:
-login-url="<enterprise github url>/login/oauth/authorize"
-redeem-url="<enterprise github url>/login/oauth/access_token"
-validate-url="<enterprise github api url>/user/emails"
-login-url="http(s)://<enterprise github host>/login/oauth/authorize"
-redeem-url="http(s)://<enterprise github host>/login/oauth/access_token"
-validate-url="http(s)://<enterprise github host>/api/v3"
### GitLab Auth Provider ### GitLab Auth Provider

32
providers/github.go
View File

@ -7,6 +7,7 @@ import (
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
"path"
"strings" "strings"
) )
@ -32,11 +33,12 @@ func NewGitHubProvider(p *ProviderData) *GitHubProvider {
Path: "/login/oauth/access_token", Path: "/login/oauth/access_token",
} }
} }
// ValidationURL is the API Base URL
if p.ValidateURL == nil || p.ValidateURL.String() == "" { if p.ValidateURL == nil || p.ValidateURL.String() == "" {
p.ValidateURL = &url.URL{ p.ValidateURL = &url.URL{
Scheme: "https", Scheme: "https",
Host: "api.github.com", Host: "api.github.com",
Path: "/user/emails", Path: "/",
} }
} }
if p.Scope == "" { if p.Scope == "" {
@ -64,8 +66,13 @@ func (p *GitHubProvider) hasOrg(accessToken string) (bool, error) {
"limit": {"100"}, "limit": {"100"},
} }
endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + "/user/orgs?" + params.Encode() endpoint := &url.URL{
req, _ := http.NewRequest("GET", endpoint, nil) Scheme: p.ValidateURL.Scheme,
Host: p.ValidateURL.Host,
Path: path.Join(p.ValidateURL.Path, "/user/orgs"),
RawQuery: params.Encode(),
}
req, _ := http.NewRequest("GET", endpoint.String(), nil)
req.Header.Set("Accept", "application/vnd.github.v3+json") req.Header.Set("Accept", "application/vnd.github.v3+json")
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
@ -114,8 +121,13 @@ func (p *GitHubProvider) hasOrgAndTeam(accessToken string) (bool, error) {
"limit": {"100"}, "limit": {"100"},
} }
endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + "/user/teams?" + params.Encode() endpoint := &url.URL{
req, _ := http.NewRequest("GET", endpoint, nil) Scheme: p.ValidateURL.Scheme,
Host: p.ValidateURL.Host,
Path: path.Join(p.ValidateURL.Path, "/user/teams"),
RawQuery: params.Encode(),
}
req, _ := http.NewRequest("GET", endpoint.String(), nil)
req.Header.Set("Accept", "application/vnd.github.v3+json") req.Header.Set("Accept", "application/vnd.github.v3+json")
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
@ -187,8 +199,14 @@ func (p *GitHubProvider) GetEmailAddress(s *SessionState) (string, error) {
params := url.Values{ params := url.Values{
"access_token": {s.AccessToken}, "access_token": {s.AccessToken},
} }
endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + p.ValidateURL.Path + "?" + params.Encode()
resp, err := http.DefaultClient.Get(endpoint) endpoint := &url.URL{
Scheme: p.ValidateURL.Scheme,
Host: p.ValidateURL.Host,
Path: path.Join(p.ValidateURL.Path, "/user/emails"),
RawQuery: params.Encode(),
}
resp, err := http.DefaultClient.Get(endpoint.String())
if err != nil { if err != nil {
return "", err return "", err
} }