extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-25 17:43:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert codacy

Browse Source
This commit is contained in:
Pascal Fischer 2023-03-30 18:54:55 +02:00
parent e08af7fcdf
commit f273fe9f51
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
management/server/http/middleware/auth_middleware.go
View File

@ -34,10 +34,8 @@ type AuthMiddleware struct {
audience string audience string
} }
type key string
const ( const (
userProperty key = "user" userProperty = "user"
) )
// NewAuthMiddleware instance constructor // NewAuthMiddleware instance constructor
@ -131,10 +129,10 @@ func (m *AuthMiddleware) CheckPATFromRequest(w http.ResponseWriter, r *http.Requ
} }
claimMaps := jwt.MapClaims{} claimMaps := jwt.MapClaims{}
claimMaps[string(jwtclaims.UserIDClaim)] = user.Id claimMaps[jwtclaims.UserIDClaim] = user.Id
claimMaps[m.audience+string(jwtclaims.AccountIDSuffix)] = account.Id claimMaps[m.audience+jwtclaims.AccountIDSuffix] = account.Id
claimMaps[m.audience+string(jwtclaims.DomainIDSuffix)] = account.Domain claimMaps[m.audience+jwtclaims.DomainIDSuffix] = account.Domain
claimMaps[m.audience+string(jwtclaims.DomainCategorySuffix)] = account.DomainCategory claimMaps[m.audience+jwtclaims.DomainCategorySuffix] = account.DomainCategory
jwtToken := jwt.NewWithClaims(jwt.SigningMethodHS256, claimMaps) jwtToken := jwt.NewWithClaims(jwt.SigningMethodHS256, claimMaps)
newRequest := r.WithContext(context.WithValue(r.Context(), jwtclaims.TokenUserProperty, jwtToken)) newRequest := r.WithContext(context.WithValue(r.Context(), jwtclaims.TokenUserProperty, jwtToken))
// Update the current request with the new context information. // Update the current request with the new context information.

18
management/server/jwtclaims/extractor.go
View File

@ -6,19 +6,17 @@ import (
"github.com/golang-jwt/jwt" "github.com/golang-jwt/jwt"
) )
type key string
const ( const (
// TokenUserProperty key for the user property in the request context // TokenUserProperty key for the user property in the request context
TokenUserProperty key = "user" TokenUserProperty = "user"
// AccountIDSuffix suffix for the account id claim // AccountIDSuffix suffix for the account id claim
AccountIDSuffix key = "wt_account_id" AccountIDSuffix = "wt_account_id"
// DomainIDSuffix suffix for the domain id claim // DomainIDSuffix suffix for the domain id claim
DomainIDSuffix key = "wt_account_domain" DomainIDSuffix = "wt_account_domain"
// DomainCategorySuffix suffix for the domain category claim // DomainCategorySuffix suffix for the domain category claim
DomainCategorySuffix key = "wt_account_domain_category" DomainCategorySuffix = "wt_account_domain_category"
// UserIDClaim claim for the user id // UserIDClaim claim for the user id
UserIDClaim key = "sub" UserIDClaim = "sub"
) )
// Extract function type // Extract function type
@ -81,15 +79,15 @@ func (c *ClaimsExtractor) FromToken(token *jwt.Token) AuthorizationClaims {
return jwtClaims return jwtClaims
} }
jwtClaims.UserId = userID jwtClaims.UserId = userID
accountIDClaim, ok := claims[c.authAudience+string(AccountIDSuffix)] accountIDClaim, ok := claims[c.authAudience+AccountIDSuffix]
if ok { if ok {
jwtClaims.AccountId = accountIDClaim.(string) jwtClaims.AccountId = accountIDClaim.(string)
} }
domainClaim, ok := claims[c.authAudience+string(DomainIDSuffix)] domainClaim, ok := claims[c.authAudience+DomainIDSuffix]
if ok { if ok {
jwtClaims.Domain = domainClaim.(string) jwtClaims.Domain = domainClaim.(string)
} }
domainCategoryClaim, ok := claims[c.authAudience+string(DomainCategorySuffix)] domainCategoryClaim, ok := claims[c.authAudience+DomainCategorySuffix]
if ok { if ok {
jwtClaims.DomainCategory = domainCategoryClaim.(string) jwtClaims.DomainCategory = domainCategoryClaim.(string)
} }