zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-17 22:31:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

rm debug logs

Browse Source
This commit is contained in:
abhishek9686
2024-08-26 17:39:00 +05:30
parent c9e593038e
commit 6faeec2437
5 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/middleware.go
View File

@@ -6,7 +6,6 @@ import (
"strings" "strings"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
) )
@@ -105,7 +104,6 @@ func userMiddleWare(handler http.Handler) http.Handler {
} }
r.Header.Set("RSRC_TYPE", r.Header.Get("TARGET_RSRC")) r.Header.Set("RSRC_TYPE", r.Header.Get("TARGET_RSRC"))
logger.Log(0, "URL ------> ", route)
handler.ServeHTTP(w, r) handler.ServeHTTP(w, r)
}) })
} }

8
pro/auth/google.go
View File

@@ -69,22 +69,17 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
handleOauthNotConfigured(w) handleOauthNotConfigured(w)
return return
} }
logger.Log(0, "CALLBACK ----> 1")
logger.Log(0, "CALLBACK ----> 2")
var inviteExists bool var inviteExists bool
// check if invite exists for User // check if invite exists for User
in, err := logic.GetUserInvite(content.Email) in, err := logic.GetUserInvite(content.Email)
if err == nil { if err == nil {
inviteExists = true inviteExists = true
} }
logger.Log(0, fmt.Sprintf("CALLBACK ----> 3 %v", inviteExists))
// check if user approval is already pending // check if user approval is already pending
if !inviteExists && logic.IsPendingUser(content.Email) { if !inviteExists && logic.IsPendingUser(content.Email) {
handleOauthUserSignUpApprovalPending(w) handleOauthUserSignUpApprovalPending(w)
return return
} }
logger.Log(0, "CALLBACK ----> 4")
_, err = logic.GetUser(content.Email) _, err = logic.GetUser(content.Email)
if err != nil { if err != nil {
if database.IsEmptyRecord(err) { // user must not exist, so try to make one if database.IsEmptyRecord(err) { // user must not exist, so try to make one
@@ -95,7 +90,6 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
return return
} }
logger.Log(0, "CALLBACK ----> 4.0")
if err = logic.CreateUser(&user); err != nil { if err = logic.CreateUser(&user); err != nil {
handleSomethingWentWrong(w) handleSomethingWentWrong(w)
@@ -124,7 +118,6 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
logger.Log(0, "CALLBACK ----> 6")
user, err := logic.GetUser(content.Email) user, err := logic.GetUser(content.Email)
if err != nil { if err != nil {
logger.Log(0, "error fetching user: ", err.Error()) logger.Log(0, "error fetching user: ", err.Error())
@@ -186,7 +179,6 @@ func getGoogleUserInfo(state string, code string) (*OAuthUser, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("failed reading response body: %s", err.Error()) return nil, fmt.Errorf("failed reading response body: %s", err.Error())
} }
logger.Log(0, fmt.Sprintf("---------------> USERINFO: %v, token: %s", string(contents), token.AccessToken))
var userInfo = &OAuthUser{} var userInfo = &OAuthUser{}
if err = json.Unmarshal(contents, userInfo); err != nil { if err = json.Unmarshal(contents, userInfo); err != nil {
return nil, fmt.Errorf("failed parsing email from response data: %s", err.Error()) return nil, fmt.Errorf("failed parsing email from response data: %s", err.Error())

9
pro/controllers/users.go
View File

@@ -808,21 +808,18 @@ func removeUserFromRemoteAccessGW(w http.ResponseWriter, r *http.Request) {
func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) { func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
// set header. // set header.
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
logger.Log(0, "------------> 1. getUserRemoteAccessGwsV1")
var params = mux.Vars(r) var params = mux.Vars(r)
username := params["username"] username := params["username"]
if username == "" { if username == "" {
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("required params username"), "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("required params username"), "badrequest"))
return return
} }
logger.Log(0, "------------> 2. getUserRemoteAccessGwsV1")
user, err := logic.GetUser(username) user, err := logic.GetUser(username)
if err != nil { if err != nil {
logger.Log(0, username, "failed to fetch user: ", err.Error()) logger.Log(0, username, "failed to fetch user: ", err.Error())
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to fetch user %s, error: %v", username, err), "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to fetch user %s, error: %v", username, err), "badrequest"))
return return
} }
logger.Log(0, "------------> 3. getUserRemoteAccessGwsV1")
remoteAccessClientID := r.URL.Query().Get("remote_access_clientid") remoteAccessClientID := r.URL.Query().Get("remote_access_clientid")
var req models.UserRemoteGwsReq var req models.UserRemoteGwsReq
if remoteAccessClientID == "" { if remoteAccessClientID == "" {
@@ -833,7 +830,6 @@ func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
logger.Log(0, "------------> 4. getUserRemoteAccessGwsV1")
reqFromMobile := r.URL.Query().Get("from_mobile") == "true" reqFromMobile := r.URL.Query().Get("from_mobile") == "true"
if req.RemoteAccessClientID == "" && remoteAccessClientID == "" { if req.RemoteAccessClientID == "" && remoteAccessClientID == "" {
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("remote access client id cannot be empty"), "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("remote access client id cannot be empty"), "badrequest"))
@@ -843,13 +839,11 @@ func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
req.RemoteAccessClientID = remoteAccessClientID req.RemoteAccessClientID = remoteAccessClientID
} }
userGws := make(map[string][]models.UserRemoteGws) userGws := make(map[string][]models.UserRemoteGws)
logger.Log(0, "------------> 5. getUserRemoteAccessGwsV1")
allextClients, err := logic.GetAllExtClients() allextClients, err := logic.GetAllExtClients()
if err != nil { if err != nil {
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
return return
} }
logger.Log(0, "------------> 6. getUserRemoteAccessGwsV1")
userGwNodes := proLogic.GetUserRAGNodes(*user) userGwNodes := proLogic.GetUserRAGNodes(*user)
logger.Log(0, fmt.Sprintf("1. User Gw Nodes: %+v", userGwNodes)) logger.Log(0, fmt.Sprintf("1. User Gw Nodes: %+v", userGwNodes))
for _, extClient := range allextClients { for _, extClient := range allextClients {
@@ -890,7 +884,6 @@ func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
logger.Log(0, fmt.Sprintf("2. User Gw Nodes: %+v", userGwNodes)) logger.Log(0, fmt.Sprintf("2. User Gw Nodes: %+v", userGwNodes))
// add remaining gw nodes to resp // add remaining gw nodes to resp
for gwID := range userGwNodes { for gwID := range userGwNodes {
logger.Log(0, "RAG ---> 1")
node, err := logic.GetNodeByID(gwID) node, err := logic.GetNodeByID(gwID)
if err != nil { if err != nil {
continue continue
@@ -901,7 +894,6 @@ func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
if node.PendingDelete { if node.PendingDelete {
continue continue
} }
logger.Log(0, "RAG ---> 2")
host, err := logic.GetHost(node.HostID.String()) host, err := logic.GetHost(node.HostID.String())
if err != nil { if err != nil {
continue continue
@@ -910,7 +902,6 @@ func getUserRemoteAccessGwsV1(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
slog.Error("failed to get node network", "error", err) slog.Error("failed to get node network", "error", err)
} }
logger.Log(0, "RAG ---> 3")
gws := userGws[node.Network] gws := userGws[node.Network]
gws = append(gws, models.UserRemoteGws{ gws = append(gws, models.UserRemoteGws{

7
pro/logic/security.go
View File

@@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
) )
@@ -16,7 +15,6 @@ func NetworkPermissionsCheck(username string, r *http.Request) error {
if err != nil { if err != nil {
return err return err
} }
logger.Log(0, "NET MIDDL----> 1")
userRole, err := logic.GetRole(user.PlatformRoleID) userRole, err := logic.GetRole(user.PlatformRoleID)
if err != nil { if err != nil {
return errors.New("access denied") return errors.New("access denied")
@@ -24,7 +22,6 @@ func NetworkPermissionsCheck(username string, r *http.Request) error {
if userRole.FullAccess { if userRole.FullAccess {
return nil return nil
} }
logger.Log(0, "NET MIDDL----> 2")
// get info from header to determine the target rsrc // get info from header to determine the target rsrc
targetRsrc := r.Header.Get("TARGET_RSRC") targetRsrc := r.Header.Get("TARGET_RSRC")
targetRsrcID := r.Header.Get("TARGET_RSRC_ID") targetRsrcID := r.Header.Get("TARGET_RSRC_ID")
@@ -81,7 +78,6 @@ func checkNetworkAccessPermissions(netRoleID models.UserRoleID, username, reqSco
if err != nil { if err != nil {
return err return err
} }
logger.Log(0, "NET MIDDL----> 3", string(netRoleID))
if networkPermissionScope.FullAccess { if networkPermissionScope.FullAccess {
return nil return nil
} }
@@ -92,7 +88,6 @@ func checkNetworkAccessPermissions(netRoleID models.UserRoleID, username, reqSco
if !ok { if !ok {
return errors.New("access denied") return errors.New("access denied")
} }
logger.Log(0, "NET MIDDL----> 4", string(netRoleID))
if allRsrcsTypePermissionScope, ok := rsrcPermissionScope[models.RsrcID(fmt.Sprintf("all_%s", targetRsrc))]; ok { if allRsrcsTypePermissionScope, ok := rsrcPermissionScope[models.RsrcID(fmt.Sprintf("all_%s", targetRsrc))]; ok {
// handle extclient apis here // handle extclient apis here
if models.RsrcType(targetRsrc) == models.ExtClientsRsrc && allRsrcsTypePermissionScope.SelfOnly && targetRsrcID != "" { if models.RsrcType(targetRsrc) == models.ExtClientsRsrc && allRsrcsTypePermissionScope.SelfOnly && targetRsrcID != "" {
@@ -118,7 +113,6 @@ func checkNetworkAccessPermissions(netRoleID models.UserRoleID, username, reqSco
} }
} }
} }
logger.Log(0, "NET MIDDL----> 5", string(netRoleID))
if targetRsrcID == "" { if targetRsrcID == "" {
return errors.New("target rsrc id is empty") return errors.New("target rsrc id is empty")
} }
@@ -128,7 +122,6 @@ func checkNetworkAccessPermissions(netRoleID models.UserRoleID, username, reqSco
return nil return nil
} }
} }
logger.Log(0, "NET MIDDL----> 6", string(netRoleID))
return errors.New("access denied") return errors.New("access denied")
} }

2
pro/logic/user_mgmt.go
View File

@@ -533,7 +533,7 @@ func HasNetworkRsrcScope(permissionTemplate models.UserRolePermissionTemplate, n
func GetUserRAGNodes(user models.User) (gws map[string]models.Node) { func GetUserRAGNodes(user models.User) (gws map[string]models.Node) {
gws = make(map[string]models.Node) gws = make(map[string]models.Node)
userGwAccessScope := GetUserNetworkRolesWithRemoteVPNAccess(user) userGwAccessScope := GetUserNetworkRolesWithRemoteVPNAccess(user)
logger.Log(0, fmt.Sprintf("User Gw Access Scope: %+v", userGwAccessScope)) logger.Log(3, fmt.Sprintf("User Gw Access Scope: %+v", userGwAccessScope))
_, allNetAccess := userGwAccessScope["*"] _, allNetAccess := userGwAccessScope["*"]
nodes, err := logic.GetAllNodes() nodes, err := logic.GetAllNodes()
if err != nil { if err != nil {