Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3389 from influxdata/fix/generic_oauth_github 

Fix Generic OAuth bug for GitHub Enterprise where the principal was incorrectly being checked for email being Primary and Verified
pull/3396/head
Jared Scheib 2018-05-07 13:32:05 -07:00 committed by GitHub
parent ae037fdb7c 2b78e08760
commit eebb8ff6cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -28,6 +28,7 @@
1. [#3353](https://github.com/influxdata/chronograf/pull/3353): Display y-axis label on initial graph load
1. [#3352](https://github.com/influxdata/chronograf/pull/3352): Fix not being able to change the source in the CEO display
1. [#3357](https://github.com/influxdata/chronograf/pull/3357): Fix only the selected template variable value getting loaded
1. [#3389](https://github.com/influxdata/chronograf/pull/3389): Fix Generic OAuth bug for GitHub Enterprise where the principal was incorrectly being checked for email being Primary and Verified
## v1.4.4.1 [2018-04-16]

24
oauth2/generic.go
View File

@ -165,28 +165,6 @@ type UserEmail struct {
Verified *bool `json:"verified,omitempty"`
}
// GetPrimary returns if the email is the primary email.
// If primary is not present, all emails are considered the primary.
func (u *UserEmail) GetPrimary() bool {
if u == nil {
return false
} else if u.Primary == nil {
return true
}
return *u.Primary
}
// GetVerified returns if the email has been verified.
// If verified is not present, all emails are considered verified.
func (u *UserEmail) GetVerified() bool {
if u == nil {
return false
} else if u.Verified == nil {
return true
}
return *u.Verified
}
// getPrimaryEmail gets the private email account for the authenticated user.
func (g *Generic) getPrimaryEmail(client *http.Client) (string, error) {
emailsEndpoint := g.APIURL + "/emails"
@ -211,7 +189,7 @@ func (g *Generic) getPrimaryEmail(client *http.Client) (string, error) {
func (g *Generic) primaryEmail(emails []*UserEmail) (string, error) {
for _, m := range emails {
if m != nil && m.GetPrimary() && m.GetVerified() && m.Email != nil {
if m != nil && m.Primary != nil && m.Verified != nil && m.Email != nil {
return *m.Email, nil
}
}

4
oauth2/generic_test.go
View File

@ -155,9 +155,7 @@ func TestGenericPrincipalIDDomain(t *testing.T) {
Primary bool `json:"primary"`
Verified bool `json:"verified"`
}{
{"mcfly@example.com", false, true},
{"martymcspelledwrong@example.com", false, false},
{"martymcfly@pinheads.rok", true, true},
{"martymcfly@pinheads.rok", true, false},
}
mockAPI := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/" {