DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Fixing codebase after JWT lib switch

Browse Source
This commit is contained in:
Denis Arh
2022-01-11 15:35:05 +01:00
parent 72999ca692
commit 3ffa0ef8be
16 changed files with 253 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/websocket/session.go
+1 -1
View File
@@ -296,7 +296,7 @@ func (s *session) authenticate(p *payloadAuth) error {
return err
}
if scope, has := token.Get("scope"); !has || !auth.CheckScope(scope, "api") {
if !auth.CheckJwtScope(token, "api") {
return fmt.Errorf("client does not allow use of websockets (missing 'api' scope)")
}
pkg/websocket/session_test.go
+19 -9
View File
@@ -15,9 +15,17 @@ func TestSession_procRawMessage(t *testing.T) {
var (
req = require.New(t)
s = session{server: Server(nil, options.WebsocketOpt{})}
jwtHandler, err = auth.JWT("secret", time.Minute)
jwtHandler, err = auth.TokenManager("secret", time.Minute)
userID uint64 = 123
token []byte
mockResponse = func(token []byte) (out []byte) {
out = []byte(`{"@type": "credentials", "@value": {"accessToken": "`)
out = append(out, token...)
out = append(out, []byte(`"}}`)...)
return
}
)
if testing.Verbose() {
@@ -27,17 +35,17 @@ func TestSession_procRawMessage(t *testing.T) {
}
req.NoError(err)
s.server.accessToken = jwtHandler
jwt := jwtHandler.Encode(auth.Authenticated(userID, 456, 789))
token, err = jwtHandler.Encode(auth.Authenticated(userID, 456, 789), 0, "api")
req.NoError(err)
req.EqualError(s.procRawMessage([]byte("{}")), "unauthenticated session")
req.Nil(s.identity)
req.EqualError(s.procRawMessage([]byte(`{"@type": "credentials", "@value": {"accessToken": ""}}`)), "unauthorized: token contains an invalid number of segments")
req.EqualError(s.procRawMessage(mockResponse(nil)), "unauthorized: failed to parse token: EOF")
req.Nil(s.identity)
req.NoError(s.procRawMessage([]byte(`{"@type": "credentials", "@value": {"accessToken": "` + jwt + `"}}`)))
req.NoError(s.procRawMessage(mockResponse(token)))
req.NotNil(s.identity)
req.Equal(userID, s.identity.Identity())
@@ -45,15 +53,17 @@ func TestSession_procRawMessage(t *testing.T) {
req.Equal(userID, s.identity.Identity())
// Repeat with the same user
jwt = jwtHandler.Encode(auth.Authenticated(userID, 456, 789))
token, err = jwtHandler.Encode(auth.Authenticated(userID, 456, 789), 0, "api")
req.NoError(err)
req.NoError(s.procRawMessage([]byte(`{"@type": "credentials", "@value": {"accessToken": "` + jwt + `"}}`)))
req.NoError(s.procRawMessage(mockResponse(token)))
req.NotNil(s.identity)
req.Equal(userID, s.identity.Identity())
// Try to authenticate on an existing authenticated session as a different user
jwt = jwtHandler.Encode(auth.Authenticated(userID+1, 456, 789))
token, err = jwtHandler.Encode(auth.Authenticated(userID+1, 456, 789), 0, "api")
req.NoError(err)
req.EqualError(s.procRawMessage([]byte(`{"@type": "credentials", "@value": {"accessToken": "`+jwt+`"}}`)), "unauthorized: identity does not match")
req.EqualError(s.procRawMessage(mockResponse(token)), "unauthorized: identity does not match")
}