5352487 · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Get rid of dependencies on bitly/oauth2_proxy/api

commit53524875d1e62f11485c7cbc6d07967fc0830d8f authorKarel Pokorny <Karel.Pokorny@konicaminolta.cz> dateSun 28 Jul 2019, 16:46 (7 years ago) parent800a369

2 files changed+16−16

compare with master

unifiedsplit

providers/keycloak.go+8−8 providers/keycloak_test.go+8−8

providers/keycloak.go+8−8

@@ -1,12 +1,12 @@

11package providers

33import (

4− "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

5− "log"

64 "net/http"

75 "net/url"

9− "github.com/bitly/oauth2_proxy/api"

7+ "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

8+ "github.com/pusher/oauth2_proxy/pkg/logger"

9+ "github.com/pusher/oauth2_proxy/pkg/requests"

1010)

1111

1212type KeycloakProvider struct {

@@ -52,19 +52,19 @@ func (p *KeycloakProvider) GetEmailAddress(s *sessions.SessionState) (string, er

5252 req, err := http.NewRequest("GET", p.ValidateURL.String(), nil)

5353 req.Header.Set("Authorization", "Bearer "+s.AccessToken)

5454 if err != nil {

55− log.Printf("failed building request %s", err)

55+ logger.Printf("failed building request %s", err)

5656 return "", err

5757 }

58− json, err := api.Request(req)

58+ json, err := requests.Request(req)

5959 if err != nil {

60− log.Printf("failed making request %s", err)

60+ logger.Printf("failed making request %s", err)

6161 return "", err

6262 }

6363

6464 if p.Group != "" {

6565 var groups, err = json.Get("groups").Array()

6666 if err != nil {

67− log.Printf("groups not found %s", err)

67+ logger.Printf("groups not found %s", err)

6868 return "", err

6969 }

7070

@@ -77,7 +77,7 @@ func (p *KeycloakProvider) GetEmailAddress(s *sessions.SessionState) (string, er

7777 }

7878

7979 if found != true {

80− log.Printf("group not found, access denied")

80+ logger.Printf("group not found, access denied")

8181 return "", nil

8282 }

8383 }

providers/keycloak_test.go+8−8

@@ -94,8 +94,8 @@ func TestKeycloakProviderGetEmailAddress(t *testing.T) {

9494 b := testKeycloakBackend("{\"email\": \"michael.bland@gsa.gov\"}")

9595 defer b.Close()

9696

97− b_url, _ := url.Parse(b.URL)

98− p := testKeycloakProvider(b_url.Host, "")

97+ bUrl, _ := url.Parse(b.URL)

98+ p := testKeycloakProvider(bUrl.Host, "")

9999

100100 session := &sessions.SessionState{AccessToken: "imaginary_access_token"}

101101 email, err := p.GetEmailAddress(session)

@@ -107,8 +107,8 @@ func TestKeycloakProviderGetEmailAddressAndGroup(t *testing.T) {

107107 b := testKeycloakBackend("{\"email\": \"michael.bland@gsa.gov\", \"groups\": [\"test-grp1\", \"test-grp2\"]}")

108108 defer b.Close()

109109

110− b_url, _ := url.Parse(b.URL)

111− p := testKeycloakProvider(b_url.Host, "test-grp1")

110+ bUrl, _ := url.Parse(b.URL)

111+ p := testKeycloakProvider(bUrl.Host, "test-grp1")

112112

113113 session := &sessions.SessionState{AccessToken: "imaginary_access_token"}

114114 email, err := p.GetEmailAddress(session)

@@ -122,8 +122,8 @@ func TestKeycloakProviderGetEmailAddressFailedRequest(t *testing.T) {

122122 b := testKeycloakBackend("unused payload")

123123 defer b.Close()

124124

125− b_url, _ := url.Parse(b.URL)

126− p := testKeycloakProvider(b_url.Host, "")

125+ bUrl, _ := url.Parse(b.URL)

126+ p := testKeycloakProvider(bUrl.Host, "")

127127

128128 // We'll trigger a request failure by using an unexpected access

129129 // token. Alternatively, we could allow the parsing of the payload as

@@ -138,8 +138,8 @@ func TestKeycloakProviderGetEmailAddressEmailNotPresentInPayload(t *testing.T) {

138138 b := testKeycloakBackend("{\"foo\": \"bar\"}")

139139 defer b.Close()

140140

141− b_url, _ := url.Parse(b.URL)

142− p := testKeycloakProvider(b_url.Host, "")

141+ bUrl, _ := url.Parse(b.URL)

142+ p := testKeycloakProvider(bUrl.Host, "")

143143

144144 session := &sessions.SessionState{AccessToken: "imaginary_access_token"}

145145 email, err := p.GetEmailAddress(session)