gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 15:44:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'NET-1227' of https://github.com/gravitl/netmaker into NET-1227-pro

Browse source
This commit is contained in:
abhishek9686 2024-07-31 11:26:31 +05:30
commit 203d80ba33
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
controllers/middleware.go
View file

@ -2,6 +2,7 @@ package controller
import (
"net/http"
"net/url"
"strings"
"github.com/gorilla/mux"
@ -76,7 +77,13 @@ func userMiddleWare(handler http.Handler) http.Handler {
if userID, ok := params["username"]; ok {
r.Header.Set("TARGET_RSRC_ID", userID)
} else {
username, _ := url.QueryUnescape(r.URL.Query().Get("username"))
if username != "" {
r.Header.Set("TARGET_RSRC_ID", username)
}
}
if r.Header.Get("NET_ID") == "" && (r.Header.Get("TARGET_RSRC_ID") == "" ||
r.Header.Get("TARGET_RSRC") == models.EnrollmentKeysRsrc.String() ||
r.Header.Get("TARGET_RSRC") == models.UserRsrc.String()) {

4
logic/security.go
View file

@ -2,6 +2,7 @@ package logic
import (
"net/http"
"net/url"
"strings"
"github.com/gorilla/mux"
@ -98,6 +99,9 @@ func ContinueIfUserMatch(next http.Handler) http.HandlerFunc {
}
var params = mux.Vars(r)
var requestedUser = params["username"]
if requestedUser == "" {
requestedUser, _ = url.QueryUnescape(r.URL.Query().Get("username"))
}
if requestedUser != r.Header.Get("user") {
logger.Log(0, "next 2", r.URL.String(), errorResponse.Message)
ReturnErrorResponse(w, r, errorResponse)

2
models/user_mgmt.go
View file

@ -143,7 +143,7 @@ type User struct {
type ReturnUserWithRolesAndGroups struct {
ReturnUser
PlatformRole UserRolePermissionTemplate
PlatformRole UserRolePermissionTemplate `json:"platform_role"`
}
// ReturnUser - return user struct