From bcb80648317524e7aad78347bc8f20bc11c62230 Mon Sep 17 00:00:00 2001 From: Jehiah Czebotar Date: Mon, 20 Jun 2016 08:12:07 -0400 Subject: [PATCH] github: fix github enterprise support --- README.md | 9 ++++----- providers/github.go | 32 +++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 135f573..b21bf6c 100644 --- a/README.md +++ b/README.md @@ -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-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: - - -login-url="/login/oauth/authorize" - -redeem-url="/login/oauth/access_token" - -validate-url="/user/emails" +If you are using GitHub enterprise, make sure you set the following to the appropriate url: + -login-url="http(s):///login/oauth/authorize" + -redeem-url="http(s):///login/oauth/access_token" + -validate-url="http(s):///api/v3" ### GitLab Auth Provider diff --git a/providers/github.go b/providers/github.go index bae1f8c..9101c6c 100644 --- a/providers/github.go +++ b/providers/github.go @@ -7,6 +7,7 @@ import ( "log" "net/http" "net/url" + "path" "strings" ) @@ -32,11 +33,12 @@ func NewGitHubProvider(p *ProviderData) *GitHubProvider { Path: "/login/oauth/access_token", } } + // ValidationURL is the API Base URL if p.ValidateURL == nil || p.ValidateURL.String() == "" { p.ValidateURL = &url.URL{ Scheme: "https", Host: "api.github.com", - Path: "/user/emails", + Path: "/", } } if p.Scope == "" { @@ -64,8 +66,13 @@ func (p *GitHubProvider) hasOrg(accessToken string) (bool, error) { "limit": {"100"}, } - endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + "/user/orgs?" + params.Encode() - req, _ := http.NewRequest("GET", endpoint, nil) + endpoint := &url.URL{ + 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") resp, err := http.DefaultClient.Do(req) if err != nil { @@ -114,8 +121,13 @@ func (p *GitHubProvider) hasOrgAndTeam(accessToken string) (bool, error) { "limit": {"100"}, } - endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + "/user/teams?" + params.Encode() - req, _ := http.NewRequest("GET", endpoint, nil) + endpoint := &url.URL{ + 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") resp, err := http.DefaultClient.Do(req) if err != nil { @@ -187,8 +199,14 @@ func (p *GitHubProvider) GetEmailAddress(s *SessionState) (string, error) { params := url.Values{ "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 { return "", err }