From 4f1c508a7c95a11f4ac16cca98134eea0f62c008 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Wed, 17 Jan 2018 17:04:15 +0100
Subject: [PATCH] refact: refactored api.rest utility functions into separate
 file.

---
 modules/api_rest_controller.go | 39 -----------------------------
 modules/api_rest_utils.go      | 45 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 modules/api_rest_utils.go

diff --git a/modules/api_rest_controller.go b/modules/api_rest_controller.go
index bdb49859..9259b869 100644
--- a/modules/api_rest_controller.go
+++ b/modules/api_rest_controller.go
@@ -1,52 +1,13 @@
 package modules
 
 import (
-	"encoding/json"
-	"io"
 	"strconv"
 
 	"github.com/evilsocket/bettercap-ng/session"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
 )
 
-type CommandRequest struct {
-	Command string `json:"cmd"`
-}
-
-type APIResponse struct {
-	Success bool   `json:"success"`
-	Message string `json:"msg"`
-}
-
-func SafeBind(c *gin.Context, obj interface{}) error {
-	decoder := json.NewDecoder(io.LimitReader(c.Request.Body, 100*1024))
-	if binding.EnableDecoderUseNumber {
-		decoder.UseNumber()
-	}
-	if err := decoder.Decode(obj); err != nil {
-		return err
-	}
-
-	if binding.Validator == nil {
-		return nil
-	}
-	return binding.Validator.ValidateStruct(obj)
-}
-
-func BadRequest(c *gin.Context, optMsg ...string) {
-	msg := "Bad Request"
-	if len(optMsg) > 0 {
-		msg = optMsg[0]
-	}
-	c.JSON(400, APIResponse{
-		Success: false,
-		Message: msg,
-	})
-	c.Abort()
-}
-
 func ShowRestSession(c *gin.Context) {
 	c.JSON(200, session.I)
 }
diff --git a/modules/api_rest_utils.go b/modules/api_rest_utils.go
new file mode 100644
index 00000000..c87ee08e
--- /dev/null
+++ b/modules/api_rest_utils.go
@@ -0,0 +1,45 @@
+package modules
+
+import (
+	"encoding/json"
+	"io"
+
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+)
+
+type CommandRequest struct {
+	Command string `json:"cmd"`
+}
+
+type APIResponse struct {
+	Success bool   `json:"success"`
+	Message string `json:"msg"`
+}
+
+func SafeBind(c *gin.Context, obj interface{}) error {
+	decoder := json.NewDecoder(io.LimitReader(c.Request.Body, 100*1024))
+	if binding.EnableDecoderUseNumber {
+		decoder.UseNumber()
+	}
+	if err := decoder.Decode(obj); err != nil {
+		return err
+	}
+
+	if binding.Validator == nil {
+		return nil
+	}
+	return binding.Validator.ValidateStruct(obj)
+}
+
+func BadRequest(c *gin.Context, optMsg ...string) {
+	msg := "Bad Request"
+	if len(optMsg) > 0 {
+		msg = optMsg[0]
+	}
+	c.JSON(400, APIResponse{
+		Success: false,
+		Message: msg,
+	})
+	c.Abort()
+}