go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2024-11-28 09:08:44 +02:00
Code Issues Releases Activity

Merge pull request #214 from raphink/github_multiple_teams

Browse Source 
github provider: allow multiple teams
This commit is contained in:
Jehiah Czebotar 2016-02-17 17:24:50 -05:00
commit 293d674e14
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -95,7 +95,7 @@ The Azure AD auth provider uses `openid` as it default scope. It uses `https://g
The GitHub auth provider supports two additional parameters to restrict authentication to Organization or Team level access. Restricting by org and team is normally accompanied with `--email-domain=*` The GitHub auth provider supports two additional parameters to restrict authentication to Organization or Team level access. Restricting by org and team is normally accompanied with `--email-domain=*`
-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 this team -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:

10
providers/github.go
View File

@ -3,6 +3,7 @@ package providers
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
@ -141,9 +142,12 @@ func (p *GitHubProvider) hasOrgAndTeam(accessToken string) (bool, error) {
presentOrgs[team.Org.Login] = true presentOrgs[team.Org.Login] = true
if p.Org == team.Org.Login { if p.Org == team.Org.Login {
hasOrg = true hasOrg = true
if p.Team == team.Slug { ts := strings.Split(p.Team, ",")
log.Printf("Found Github Organization:%q Team:%q (Name:%q)", team.Org.Login, team.Slug, team.Name) for _, t := range ts {
return true, nil if t == team.Slug {
log.Printf("Found Github Organization:%q Team:%q (Name:%q)", team.Org.Login, team.Slug, team.Name)
return true, nil
}
} }
presentTeams = append(presentTeams, team.Slug) presentTeams = append(presentTeams, team.Slug)
} }