git.iko.soy/typeable/oauth2-proxy
on master help sign in
Encrypting user/email from cookie
commit4f7517b2f91cca30a71cb8a8c7f6efa0d83b6008 authorCostel Moraru <costel.moraru@ro.ibm.com> dateTue 9 Apr 2019, 14:55 (8 years ago) parente9d4f6e
2 files changed+33−6
compare with master
unifiedsplit
providers/session_state.go+27 providers/session_state_test.go+6−6
providers/session_state.go+27
@@ -62,6 +62,19 @@ func (s *SessionState) EncodeSessionState(c *cookie.Cipher) (string, error) {
6262 } else {
6363 ss = *s
6464 var err error
65+ // Encrypt also Email and User when cipher is provided
66+ if ss.Email != "" {
67+ ss.Email, err = c.Encrypt(ss.Email)
68+ if err != nil {
69+ return "", err
70+ }
71+ }
72+ if ss.User != "" {
73+ ss.User, err = c.Encrypt(ss.User)
74+ if err != nil {
75+ return "", err
76+ }
77+ }
6578 if ss.AccessToken != "" {
6679 ss.AccessToken, err = c.Encrypt(ss.AccessToken)
6780 if err != nil {
@@ -172,6 +185,20 @@ func DecodeSessionState(v string, c *cookie.Cipher) (*SessionState, error) {
172185 User: ss.User,
173186 }
174187 } else {
188+ // Backward compatibility with using unecrypted Email
189+ if ss.Email != "" {
190+ decryptedEmail, err := c.Decrypt(ss.Email)
191+ if err == nil {
192+ ss.Email = decryptedEmail
193+ }
194+ }
195+ // Backward compatibility with using unecrypted User
196+ if ss.User != "" {
197+ decryptedUser, err := c.Decrypt(ss.User)
198+ if err == nil {
199+ ss.User = decryptedUser
200+ }
201+ }
175202 if ss.AccessToken != "" {
176203 ss.AccessToken, err = c.Decrypt(ss.AccessToken)
177204 if err != nil {
providers/session_state_test.go+6−6
@@ -41,8 +41,8 @@ func TestSessionStateSerialization(t *testing.T) {
4141 ss, err = DecodeSessionState(encoded, c2)
4242 t.Logf("%#v", ss)
4343 assert.Equal(t, nil, err)
44− assert.Equal(t, "user", ss.User)
45− assert.Equal(t, s.Email, ss.Email)
44+ assert.NotEqual(t, "user", ss.User)
45+ assert.NotEqual(t, s.Email, ss.Email)
4646 assert.Equal(t, s.ExpiresOn.Unix(), ss.ExpiresOn.Unix())
4747 assert.NotEqual(t, s.AccessToken, ss.AccessToken)
4848 assert.NotEqual(t, s.IDToken, ss.IDToken)
@@ -77,8 +77,8 @@ func TestSessionStateSerializationWithUser(t *testing.T) {
7777 ss, err = DecodeSessionState(encoded, c2)
7878 t.Logf("%#v", ss)
7979 assert.Equal(t, nil, err)
80− assert.Equal(t, s.User, ss.User)
81− assert.Equal(t, s.Email, ss.Email)
80+ assert.NotEqual(t, s.User, ss.User)
81+ assert.NotEqual(t, s.Email, ss.Email)
8282 assert.Equal(t, s.ExpiresOn.Unix(), ss.ExpiresOn.Unix())
8383 assert.NotEqual(t, s.AccessToken, ss.AccessToken)
8484 assert.NotEqual(t, s.RefreshToken, ss.RefreshToken)
@@ -229,7 +229,7 @@ func TestDecodeSessionState(t *testing.T) {
229229 ExpiresOn: e,
230230 RefreshToken: "refresh4321",
231231 },
232− Encoded: fmt.Sprintf(`{"Email":"user@domain.com","User":"just-user","AccessToken":"I6s+ml+/MldBMgHIiC35BTKTh57skGX24w==","IDToken":"xojNdyyjB1HgYWh6XMtXY/Ph5eCVxa1cNsklJw==","RefreshToken":"qEX0x6RmASxo4dhlBG6YuRs9Syn/e9sHu/+K","ExpiresOn":%s}`, eString),
232+ Encoded: fmt.Sprintf(`{"Email":"FsKKYrTWZWrxSOAqA/fTNAUZS5QWCqOBjuAbBlbVOw==","User":"rT6JP3dxQhxUhkWrrd7yt6c1mDVyQCVVxw==","AccessToken":"I6s+ml+/MldBMgHIiC35BTKTh57skGX24w==","IDToken":"xojNdyyjB1HgYWh6XMtXY/Ph5eCVxa1cNsklJw==","RefreshToken":"qEX0x6RmASxo4dhlBG6YuRs9Syn/e9sHu/+K","ExpiresOn":%s}`, eString),
233233 Cipher: c,
234234 },
235235 {
@@ -237,7 +237,7 @@ func TestDecodeSessionState(t *testing.T) {
237237 Email: "user@domain.com",
238238 User: "just-user",
239239 },
240− Encoded: `{"Email":"user@domain.com","User":"just-user"}`,
240+ Encoded: `{"Email":"EGTllJcOFC16b7LBYzLekaHAC5SMMSPdyUrg8hd25g==","User":"rT6JP3dxQhxUhkWrrd7yt6c1mDVyQCVVxw=="}`,
241241 Cipher: c,
242242 },
243243 {