Browse Source

fixed return and logs

0xdcarns 3 years ago
parent
commit
6184d0b965
3 changed files with 6 additions and 1 deletions
  1. 4 0
      controllers/common.go
  2. 1 1
      controllers/loggerHttpController.go
  3. 1 0
      controllers/security.go

+ 4 - 0
controllers/common.go

@@ -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

+ 1 - 1
controllers/loggerHttpController.go

@@ -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 - 0
controllers/security.go

@@ -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)