zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-16 13:51:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

use host id in jwt claims

Browse Source
This commit is contained in:
Anish Mukherjee
2023-01-20 18:42:18 +05:30
parent 5a5613dd6d
commit 175e371da9
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/node.go
View File

@@ -53,7 +53,6 @@ func nodeHandlers(r *mux.Router) {
func authenticate(response http.ResponseWriter, request *http.Request) { func authenticate(response http.ResponseWriter, request *http.Request) {
var authRequest models.AuthParams var authRequest models.AuthParams
var result models.Node
var errorResponse = models.ErrorResponse{ var errorResponse = models.ErrorResponse{
Code: http.StatusInternalServerError, Message: "W1R3: It's not you it's me.", Code: http.StatusInternalServerError, Message: "W1R3: It's not you it's me.",
} }
@@ -82,20 +81,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
logic.ReturnErrorResponse(response, request, errorResponse) logic.ReturnErrorResponse(response, request, errorResponse)
return return
} }
var err error host, err := logic.GetHost(authRequest.ID)
result, err = logic.GetNodeByID(authRequest.ID)
if err != nil {
result, err = logic.GetDeletedNodeByID(authRequest.ID)
if err != nil {
errorResponse.Code = http.StatusBadRequest
errorResponse.Message = err.Error()
logger.Log(0, request.Header.Get("user"),
fmt.Sprintf("failed to get node info [%s]: %v", authRequest.ID, err))
logic.ReturnErrorResponse(response, request, errorResponse)
return
}
}
host, err := logic.GetHost(result.HostID.String())
if err != nil { if err != nil {
errorResponse.Code = http.StatusBadRequest errorResponse.Code = http.StatusBadRequest
errorResponse.Message = err.Error() errorResponse.Message = err.Error()
@@ -114,7 +100,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
return return
} }
tokenString, err := logic.CreateJWT(authRequest.ID, authRequest.MacAddress, result.Network) tokenString, err := logic.CreateJWT(authRequest.ID, authRequest.MacAddress, mux.Vars(request)["network"])
if tokenString == "" { if tokenString == "" {
errorResponse.Code = http.StatusBadRequest errorResponse.Code = http.StatusBadRequest
errorResponse.Message = "Could not create Token" errorResponse.Message = "Could not create Token"

2
logic/jwts.go
View File

@@ -130,7 +130,7 @@ func VerifyUserToken(tokenString string) (username string, networks []string, is
} }
// VerifyToken - [nodes] Only // VerifyToken - [nodes] Only
func VerifyToken(tokenString string) (nodeID string, mac string, network string, err error) { func VerifyToken(tokenString string) (hostID string, mac string, network string, err error) {
claims := &models.Claims{} claims := &models.Claims{}
// this may be a stupid way of serving up a master key // this may be a stupid way of serving up a master key