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

Merge pull request #361 from jehiah/gofmt_361

Browse Source 
travis: run gofmt and go vet
This commit is contained in:
Jehiah Czebotar 2017-03-29 09:53:19 -04:00 committed by GitHub
commit bb9b607440
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oauthproxy.go
View File

@ -199,7 +199,7 @@ func NewOAuthProxy(opts *Options, validator func(string) bool) *OAuthProxy {
skipAuthRegex: opts.SkipAuthRegex, skipAuthRegex: opts.SkipAuthRegex,
compiledRegex: opts.CompiledRegex, compiledRegex: opts.CompiledRegex,
PassBasicAuth: opts.PassBasicAuth, PassBasicAuth: opts.PassBasicAuth,
PassUserHeaders: opts.PassUserHeaders, PassUserHeaders: opts.PassUserHeaders,
BasicAuthPassword: opts.BasicAuthPassword, BasicAuthPassword: opts.BasicAuthPassword,
PassAccessToken: opts.PassAccessToken, PassAccessToken: opts.PassAccessToken,
SkipProviderButton: opts.SkipProviderButton, SkipProviderButton: opts.SkipProviderButton,

2
options.go
View File

@ -54,7 +54,7 @@ type Options struct {
PassAccessToken bool `flag:"pass-access-token" cfg:"pass_access_token"` PassAccessToken bool `flag:"pass-access-token" cfg:"pass_access_token"`
PassHostHeader bool `flag:"pass-host-header" cfg:"pass_host_header"` PassHostHeader bool `flag:"pass-host-header" cfg:"pass_host_header"`
SkipProviderButton bool `flag:"skip-provider-button" cfg:"skip_provider_button"` SkipProviderButton bool `flag:"skip-provider-button" cfg:"skip_provider_button"`
PassUserHeaders bool `flag:"pass-user-headers" cfg:"pass_user_headers"` PassUserHeaders bool `flag:"pass-user-headers" cfg:"pass_user_headers"`
// These options allow for other providers besides Google, with // These options allow for other providers besides Google, with
// potential overrides. // potential overrides.

22
providers/azure.go
View File

@ -3,11 +3,11 @@ package providers
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/bitly/go-simplejson"
"github.com/bitly/oauth2_proxy/api" "github.com/bitly/oauth2_proxy/api"
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
"github.com/bitly/go-simplejson"
) )
type AzureProvider struct { type AzureProvider struct {
@ -67,26 +67,26 @@ func getAzureHeader(access_token string) http.Header {
} }
func getEmailFromJSON(json *simplejson.Json) (string, error) { func getEmailFromJSON(json *simplejson.Json) (string, error) {
var email string var email string
var err error var err error
email, err = json.Get("mail").String() email, err = json.Get("mail").String()
if err != nil || email == "" { if err != nil || email == "" {
otherMails, otherMailsErr := json.Get("otherMails").Array() otherMails, otherMailsErr := json.Get("otherMails").Array()
if len(otherMails) > 0{ if len(otherMails) > 0 {
email = otherMails[0].(string) email = otherMails[0].(string)
} }
err = otherMailsErr err = otherMailsErr
} }
return email, err return email, err
} }
func (p *AzureProvider) GetEmailAddress(s *SessionState) (string, error) { func (p *AzureProvider) GetEmailAddress(s *SessionState) (string, error) {
var email string var email string
var err error var err error
if s.AccessToken == "" { if s.AccessToken == "" {
return "", errors.New("missing access token") return "", errors.New("missing access token")
} }
@ -109,16 +109,16 @@ func (p *AzureProvider) GetEmailAddress(s *SessionState) (string, error) {
} }
email, err = json.Get("userPrincipalName").String() email, err = json.Get("userPrincipalName").String()
if err != nil { if err != nil {
log.Printf("failed making request %s", err) log.Printf("failed making request %s", err)
return "", err return "", err
} }
if email == "" { if email == "" {
log.Printf("failed to get email address") log.Printf("failed to get email address")
return "", err return "", err
} }
return email, err return email, err
} }

2
providers/azure_test.go
View File

@ -197,4 +197,4 @@ func TestAzureProviderGetEmailAddressIncorrectOtherMails(t *testing.T) {
email, err := p.GetEmailAddress(session) email, err := p.GetEmailAddress(session)
assert.Equal(t, "type assertion to string failed", err.Error()) assert.Equal(t, "type assertion to string failed", err.Error())
assert.Equal(t, "", email) assert.Equal(t, "", email)
} }

6
test.sh
View File

@ -1,5 +1,11 @@
#!/bin/bash #!/bin/bash
set -e set -e
echo "gofmt"
diff -u <(echo -n) <(gofmt -d $(find . -type f -name '*.go' -not -path "./.godeps/*"))
echo "go vet"
go vet ./...
echo "go test"
go test -timeout 60s ./... go test -timeout 60s ./...
echo "go test -race"
GOMAXPROCS=4 go test -timeout 60s -race ./... GOMAXPROCS=4 go test -timeout 60s -race ./...