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

fixed return and logs

Browse Source
This commit is contained in:
0xdcarns
2021-12-07 11:15:01 -05:00
parent 95528f510a
commit 6184d0b965
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/common.go
View File

@@ -15,6 +15,7 @@ import (
* If being deleted by server, create a record in the DELETED_NODES_TABLE for the client to find * If being deleted by server, create a record in the DELETED_NODES_TABLE for the client to find
* If being deleted by the client, delete completely * If being deleted by the client, delete completely
*/ */
// DeleteNode - deletes a node
func DeleteNode(key string, exterminate bool) error { func DeleteNode(key string, exterminate bool) error {
var err error var err error
if !exterminate { if !exterminate {
@@ -46,6 +47,7 @@ func DeleteNode(key string, exterminate bool) error {
return err return err
} }
// DeleteIntClient - deletes an int client
func DeleteIntClient(clientid string) (bool, error) { func DeleteIntClient(clientid string) (bool, error) {
err := database.DeleteRecord(database.INT_CLIENTS_TABLE_NAME, clientid) err := database.DeleteRecord(database.INT_CLIENTS_TABLE_NAME, clientid)
@@ -56,6 +58,7 @@ func DeleteIntClient(clientid string) (bool, error) {
return true, nil return true, nil
} }
// GetNode - gets a node
func GetNode(macaddress string, network string) (models.Node, error) { func GetNode(macaddress string, network string) (models.Node, error) {
var node models.Node var node models.Node
@@ -80,6 +83,7 @@ func GetNode(macaddress string, network string) (models.Node, error) {
return node, err return node, err
} }
// GetIntClient - gets int client
func GetIntClient(clientid string) (models.IntClient, error) { func GetIntClient(clientid string) (models.IntClient, error) {
var client models.IntClient var client models.IntClient

2
controllers/loggerHttpController.go
View File

@@ -10,7 +10,7 @@ import (
) )
func loggerHandlers(r *mux.Router) { func loggerHandlers(r *mux.Router) {
r.HandleFunc("/api/logs", securityCheckDNS(true, true, http.HandlerFunc(getLogs))).Methods("GET") r.HandleFunc("/api/logs", securityCheck(true, http.HandlerFunc(getLogs))).Methods("GET")
} }
func getLogs(w http.ResponseWriter, r *http.Request) { func getLogs(w http.ResponseWriter, r *http.Request) {

1
controllers/security.go
View File

@@ -28,6 +28,7 @@ func securityCheck(reqAdmin bool, next http.Handler) http.HandlerFunc {
networks, _ := json.Marshal([]string{ALL_NETWORK_ACCESS}) networks, _ := json.Marshal([]string{ALL_NETWORK_ACCESS})
r.Header.Set("networks", string(networks)) r.Header.Set("networks", string(networks))
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
return
} }
err, networks, username := SecurityCheck(reqAdmin, params["networkname"], bearerToken) err, networks, username := SecurityCheck(reqAdmin, params["networkname"], bearerToken)