IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

base64 encode encrypted oauth token fields

Browse Source
This commit is contained in:
Sean Lafferty 2019-02-02 09:03:04 -05:00
parent 4a7cf82f5f
commit fa22311a95
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/services/sqlstore/user_auth.go
View File

@ -1,6 +1,7 @@
package sqlstore package sqlstore
import ( import (
"encoding/base64"
"time" "time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
@ -127,25 +128,38 @@ func GetAuthInfo(query *m.GetAuthInfoQuery) error {
} }
if userAuth.OAuthAccessToken != "" { if userAuth.OAuthAccessToken != "" {
accessToken, err := util.Decrypt([]byte(userAuth.OAuthAccessToken), setting.SecretKey) decodedAccessToken, err := base64.StdEncoding.DecodeString(userAuth.OAuthAccessToken)
if err != nil { if err != nil {
return err return err
} }
userAuth.OAuthAccessToken = string(accessToken) decryptedAccessToken, err := util.Decrypt(decodedAccessToken, setting.SecretKey)
if err != nil {
return err
}
userAuth.OAuthAccessToken = string(decryptedAccessToken)
} }
if userAuth.OAuthRefreshToken != "" { if userAuth.OAuthRefreshToken != "" {
refreshToken, err := util.Decrypt([]byte(userAuth.OAuthRefreshToken), setting.SecretKey) decodedRefreshToken, err := base64.StdEncoding.DecodeString(userAuth.OAuthRefreshToken)
if err != nil { if err != nil {
return err return err
} }
userAuth.OAuthRefreshToken = string(refreshToken) decryptedRefreshToken, err := util.Decrypt(decodedRefreshToken, setting.SecretKey)
if err != nil {
return err
}
userAuth.OAuthRefreshToken = string(decryptedRefreshToken)
} }
if userAuth.OAuthTokenType != "" { if userAuth.OAuthTokenType != "" {
tokenType, err := util.Decrypt([]byte(userAuth.OAuthTokenType), setting.SecretKey) decodedTokenType, err := base64.StdEncoding.DecodeString(userAuth.OAuthTokenType)
if err != nil { if err != nil {
return err return err
} }
userAuth.OAuthTokenType = string(tokenType) decryptedTokenType, err := util.Decrypt(decodedTokenType, setting.SecretKey)
if err != nil {
return err
}
userAuth.OAuthTokenType = string(decryptedTokenType)
} }
query.Result = userAuth query.Result = userAuth
@ -175,9 +189,9 @@ func SetAuthInfo(cmd *m.SetAuthInfoCommand) error {
return err return err
} }
authUser.OAuthAccessToken = string(secretAccessToken) authUser.OAuthAccessToken = base64.StdEncoding.EncodeToString(secretAccessToken)
authUser.OAuthRefreshToken = string(secretRefreshToken) authUser.OAuthRefreshToken = base64.StdEncoding.EncodeToString(secretRefreshToken)
authUser.OAuthTokenType = string(secretTokenType) authUser.OAuthTokenType = base64.StdEncoding.EncodeToString(secretTokenType)
authUser.OAuthExpiry = cmd.OAuthToken.Expiry authUser.OAuthExpiry = cmd.OAuthToken.Expiry
} }
@ -208,9 +222,9 @@ func UpdateAuthInfo(cmd *m.UpdateAuthInfoCommand) error {
if err != nil { if err != nil {
return err return err
} }
authUser.OAuthAccessToken = string(secretAccessToken) authUser.OAuthAccessToken = base64.StdEncoding.EncodeToString(secretAccessToken)
authUser.OAuthRefreshToken = string(secretRefreshToken) authUser.OAuthRefreshToken = base64.StdEncoding.EncodeToString(secretRefreshToken)
authUser.OAuthTokenType = string(secretTokenType) authUser.OAuthTokenType = base64.StdEncoding.EncodeToString(secretTokenType)
authUser.OAuthExpiry = cmd.OAuthToken.Expiry authUser.OAuthExpiry = cmd.OAuthToken.Expiry
} }