mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-19 00:11:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #590 from scrapinghub/bugfix-accesstoken

Browse source 
access_token query param is in JWT format
This commit is contained in:
Brad Rydzewski 2014-10-17 10:33:06 -07:00
commit 5574f07749
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/session/session.go
View file

@ -52,7 +52,11 @@ func GenerateToken(c context.Context, r *http.Request, user *model.User) (string
// auth token. // auth token.
func getUserToken(c context.Context, r *http.Request) *model.User { func getUserToken(c context.Context, r *http.Request) *model.User {
var token = r.FormValue("access_token") var token = r.FormValue("access_token")
var user, _ = datastore.GetUserToken(c, token) var user = getUserJwtToken(c, token)
// TODO: is it needed to fallback to user_token query?
if user == nil {
user, _ = datastore.GetUserToken(c, token)
}
return user return user
} }
@ -61,7 +65,13 @@ func getUserToken(c context.Context, r *http.Request) *model.User {
func getUserBearer(c context.Context, r *http.Request) *model.User { func getUserBearer(c context.Context, r *http.Request) *model.User {
var tokenstr = r.Header.Get("Authorization") var tokenstr = r.Header.Get("Authorization")
fmt.Sscanf(tokenstr, "Bearer %s", &tokenstr) fmt.Sscanf(tokenstr, "Bearer %s", &tokenstr)
var user = getUserJwtToken(c, tokenstr)
return user
}
// getUserAccessToken gets the currently authenticated user for the given
// auth token in jwt format.
func getUserJwtToken(c context.Context, tokenstr string) *model.User {
var token, err = jwt.Parse(tokenstr, func(t *jwt.Token) (interface{}, error) { var token, err = jwt.Parse(tokenstr, func(t *jwt.Token) (interface{}, error) {
return []byte(*secret), nil return []byte(*secret), nil
}) })