git.iko.soy/typeable/oauth2-proxy
on master help sign in
Adding the IDToken to the session for the Azure Provider.
commitc8a89eca0800ca64da09ab09f758d78b98bc974f authorleyshon <leyshon@gmail.com> dateThu 29 Aug 2019, 14:32 (7 years ago) parent6683e35
2 files changed+82−1
providers/azure.go+65 providers/azure_test.go+17−1
providers/azure.go+65
@@ -5,6 +5,10 @@ import (
55 "fmt"
66 "net/http"
77 "net/url"
8+ "encoding/json"
9+ "io/ioutil"
10+ "bytes"
11+ "time"
812
913 "github.com/bitly/go-simplejson"
1014 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
@@ -65,6 +69,67 @@ func (p *AzureProvider) Configure(tenant string) {
6569 }
6670}
6771
72+func (p *AzureProvider) Redeem(redirectURL, code string) (s *sessions.SessionState, err error) {
73+ if code == "" {
74+ err = errors.New("missing code")
75+ return
76+ }
77+
78+ params := url.Values{}
79+ params.Add("redirect_uri", redirectURL)
80+ params.Add("client_id", p.ClientID)
81+ params.Add("client_secret", p.ClientSecret)
82+ params.Add("code", code)
83+ params.Add("grant_type", "authorization_code")
84+ if p.ProtectedResource != nil && p.ProtectedResource.String() != "" {
85+ params.Add("resource", p.ProtectedResource.String())
86+ }
87+
88+ var req *http.Request
89+ req, err = http.NewRequest("POST", p.RedeemURL.String(), bytes.NewBufferString(params.Encode()))
90+ if err != nil {
91+ return
92+ }
93+ req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
94+
95+ var resp *http.Response
96+ resp, err = http.DefaultClient.Do(req)
97+ if err != nil {
98+ return nil, err
99+ }
100+ var body []byte
101+ body, err = ioutil.ReadAll(resp.Body)
102+ resp.Body.Close()
103+ if err != nil {
104+ return
105+ }
106+
107+ if resp.StatusCode != 200 {
108+ err = fmt.Errorf("got %d from %q %s", resp.StatusCode, p.RedeemURL.String(), body)
109+ return
110+ }
111+
112+ var jsonResponse struct {
113+ AccessToken string `json:"access_token"`
114+ RefreshToken string `json:"refresh_token"`
115+ ExpiresOn int64 `json:"expires_on,string"`
116+ IDToken string `json:"id_token"`
117+ }
118+ err = json.Unmarshal(body, &jsonResponse)
119+ if err != nil {
120+ return
121+ }
122+
123+ s = &sessions.SessionState{
124+ AccessToken: jsonResponse.AccessToken,
125+ IDToken: jsonResponse.IDToken,
126+ CreatedAt: time.Now(),
127+ ExpiresOn: time.Unix(jsonResponse.ExpiresOn, 0),
128+ RefreshToken: jsonResponse.RefreshToken,
129+ }
130+ return
131+}
132+
68133func getAzureHeader(accessToken string) http.Header {
69134 header := make(http.Header)
70135 header.Set("Authorization", fmt.Sprintf("Bearer %s", accessToken))
providers/azure_test.go+17−1
@@ -20,6 +20,7 @@ func testAzureProvider(hostname string) *AzureProvider {
2020 ValidateURL: &url.URL{},
2121 ProtectedResource: &url.URL{},
2222 Scope: ""})
23+
2324 if hostname != "" {
2425 updateURL(p.Data().LoginURL, hostname)
2526 updateURL(p.Data().RedeemURL, hostname)
@@ -111,8 +112,11 @@ func testAzureBackend(payload string) *httptest.Server {
111112
112113 return httptest.NewServer(http.HandlerFunc(
113114 func(w http.ResponseWriter, r *http.Request) {
114− if r.URL.Path != path || r.URL.RawQuery != query {
115+ if (r.URL.Path != path || r.URL.RawQuery != query) && r.Method != "POST" {
115116 w.WriteHeader(404)
117+ } else if r.Method == "POST" && r.Body != nil {
118+ w.WriteHeader(200)
119+ w.Write([]byte(payload))
116120 } else if r.Header.Get("Authorization") != "Bearer imaginary_access_token" {
117121 w.WriteHeader(403)
118122 } else {
@@ -199,3 +203,15 @@ func TestAzureProviderGetEmailAddressIncorrectOtherMails(t *testing.T) {
199203 assert.Equal(t, "type assertion to string failed", err.Error())
200204 assert.Equal(t, "", email)
201205}
206+
207+func TestAzureProviderRedeemReturnsIdToken(t *testing.T) {
208+ b := testAzureBackend(`{ "id_token": "testtoken1234" }`)
209+ defer b.Close()
210+
211+ bURL, _ := url.Parse(b.URL)
212+ p := testAzureProvider(bURL.Host)
213+ p.Data().RedeemURL.Path = "/common/oauth2/token"
214+ s, err := p.Redeem("https://localhost", "1234")
215+ assert.Equal(t, nil, err)
216+ assert.Equal(t, "testtoken1234", s.IDToken)
217+}