zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-05 13:46:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: revert jwt token from auth

Browse Source
This commit is contained in:
Andrey Melnikov
2020-10-14 11:53:05 -07:00
parent 38f1aafaec
commit 20c4950b69
6 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/auth/auth.go
View File

@@ -8,7 +8,6 @@ import (
"fmt"
"github.com/onepanelio/core/api"
"github.com/onepanelio/core/pkg/util"
"github.com/onepanelio/core/pkg/util/tokens"
v12 "k8s.io/apimachinery/pkg/apis/meta/v1"
"net/http"
"strings"
@@ -72,17 +71,11 @@ func getClient(ctx context.Context, kubeConfig *v1.Config, db *v1.DB, sysConfig
return nil, status.Error(codes.Unauthenticated, `Missing or invalid "authorization" header.`)
}
tokenContent, err := tokens.ParseJWTToken(*bearerToken, sysConfig.HMACKey())
if err != nil {
return nil, err
if sysConfig["token"] != *bearerToken {
sysConfig["token"] = *bearerToken
}
if sysConfig["jwtToken"] != *bearerToken {
sysConfig["jwtToken"] = *bearerToken
sysConfig["jwtUsername"] = tokenContent.Username
}
kubeConfig.BearerToken = tokenContent.Token
kubeConfig.BearerToken = *bearerToken
client, err := v1.NewClient(kubeConfig, db, sysConfig)
if err != nil {
@@ -187,17 +180,7 @@ func UnaryInterceptor(kubeConfig *v1.Config, db *v1.DB, sysConfig v1.SystemConfi
return nil, err
}
hmac := sysConfig.HMACKey()
if len(hmac) == 0 {
return nil, errors.New("HMAC key not found in secrets - this value is required")
}
jwtToken, err := tokens.CreateJWTToken(tokenRequest.Username, rawToken, hmac)
if err != nil {
return nil, err
}
md.Set("onepanel-auth-token", jwtToken)
md.Set("onepanel-auth-token", rawToken)
ctx, err = getClient(ctx, kubeConfig, db, sysConfig)
if err != nil {