Merge pull request #18

ext-request-validation

Author: RobyFerro

CHANGELOG.md

@@ -3,10 +3,16 @@
 All notable changes to the "Go-Web Framework" will be documented in this file.
 
 ## [Unreleased]
+
+
+## [v0.7.1-beta] - 2021-09-02
 ### Fixed
 - Issue #17
 - Issue #16
 
+### Added
+- Support for request validation in routers
+- 
 ## [v0.7.0-beta] - 2021-08-27
 ### Changed
 - Changed .yml routing system in favour of the router module. Now every route/group have to be registered directly in go structure.

kernel/router.go

@@ -17,6 +17,7 @@ type Route struct {
 	Action      string
 	Method      string
 	Description string
+	Validation  interface{}
 	Middleware  []Middleware
 }
 
@@ -62,16 +63,31 @@ func HandleSingleRoute(routes []Route, router *mux.Router) {
 	for _, route := range routes {
 		hasMiddleware := len(route.Middleware) > 0
 		directive := strings.Split(route.Action, "@")
+		validation := route.Validation
 		if hasMiddleware {
 			subRouter := mux.NewRouter()
 			subRouter.HandleFunc(route.Path, func(writer http.ResponseWriter, request *http.Request) {
+				if err := validateRequest(validation, request); err != nil {
+					writer.WriteHeader(http.StatusUnprocessableEntity)
+					_, _ = writer.Write([]byte(err.Error()))
+
+					return
+				}
+
 				executeControllerDirective(directive, writer, request)
 			}).Methods(route.Method)
 
 			subRouter.Use(parseMiddleware(route.Middleware)...)
 			router.Handle(route.Path, subRouter).Methods(route.Method)
 		} else {
 			router.HandleFunc(route.Path, func(writer http.ResponseWriter, request *http.Request) {
+				if err := validateRequest(validation, request); err != nil {
+					writer.WriteHeader(http.StatusUnprocessableEntity)
+					_, _ = writer.Write([]byte(err.Error()))
+
+					return
+				}
+
 				executeControllerDirective(directive, writer, request)
 			}).Methods(route.Method)
 		}
@@ -85,17 +101,32 @@ func HandleGroups(groups []Group, router *mux.Router) {
 
 		for _, route := range group.Routes {
 			directive := strings.Split(route.Action, "@")
+			validation := route.Validation
 			if len(route.Middleware) > 0 {
 				nestedRouter := mux.NewRouter()
 				fullPath := fmt.Sprintf("%s%s", group.Prefix, route.Path)
 				nestedRouter.HandleFunc(fullPath, func(writer http.ResponseWriter, request *http.Request) {
+					if err := validateRequest(validation, request); err != nil {
+						writer.WriteHeader(http.StatusUnprocessableEntity)
+						_, _ = writer.Write([]byte(err.Error()))
+
+						return
+					}
+
 					executeControllerDirective(directive, writer, request)
 				}).Methods(route.Method)
 
 				nestedRouter.Use(parseMiddleware(route.Middleware)...)
 				subRouter.Handle(route.Path, nestedRouter).Methods(route.Method)
 			} else {
 				subRouter.HandleFunc(route.Path, func(writer http.ResponseWriter, request *http.Request) {
+					if err := validateRequest(validation, request); err != nil {
+						writer.WriteHeader(http.StatusUnprocessableEntity)
+						_, _ = writer.Write([]byte(err.Error()))
+
+						return
+					}
+
 					executeControllerDirective(directive, writer, request)
 				}).Methods(route.Method)
 			}
@@ -132,12 +163,26 @@ func GetControllerInterface(directive []string, w http.ResponseWriter, r *http.R
 // Example: MainController@main
 // 	executes the main method from MainController
 // It build the CUSTOM SERVICE CONTAINER and invoke the selected directive inside them.
-func executeControllerDirective(directive []string, w http.ResponseWriter, r *http.Request) {
+func executeControllerDirective(d []string, w http.ResponseWriter, r *http.Request) {
 	container := BuildCustomContainer()
-	cc := GetControllerInterface(directive, w, r)
-	method := reflect.ValueOf(cc).MethodByName(directive[1])
+	cc := GetControllerInterface(d, w, r)
+	method := reflect.ValueOf(cc).MethodByName(d[1])
 
 	if err := dig.GroupInvoke(method.Interface(), container, SingletonIOC); err != nil {
 		log.Fatal(err)
 	}
 }
+
+func validateRequest(data interface{}, r *http.Request) error {
+	if data != nil {
+		if err := tool.DecodeJsonRequest(r, &data); err != nil {
+			return err
+		}
+
+		if err := tool.ValidateRequest(data); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

tool/json.go

@@ -1,16 +1,30 @@
 package tool
 
 import (
+	"bytes"
 	"encoding/json"
+	"errors"
+	"io"
+	"io/ioutil"
 	"net/http"
 )
 
 // DecodeJsonRequest in a selected struct
 func DecodeJsonRequest(r *http.Request, interfaceRef interface{}) error {
-	decoder := json.NewDecoder(r.Body)
-	if err := decoder.Decode(interfaceRef); err != nil {
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
 		return err
 	}
 
+	if err := json.Unmarshal(data, interfaceRef); err != nil {
+		if err == io.EOF {
+			return errors.New("missing request body")
+		}
+
+		return err
+	}
+
+	r.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+
 	return nil
 }

tool/validation.go

@@ -1,25 +1,14 @@
 package tool
 
 import (
-	"encoding/json"
 	"gopkg.in/asaskevich/govalidator.v4"
-	"log"
-	"net/http"
 )
 
 // ValidateRequest incoming request
-func ValidateRequest(data interface{}, response http.ResponseWriter) bool {
+func ValidateRequest(data interface{}) error {
 	if valid, err := govalidator.ValidateStruct(data); valid == false {
-		message, e := json.Marshal(err)
-
-		if e != nil {
-			log.Fatal(err)
-		}
-
-		response.WriteHeader(422)
-		_, _ = response.Write(message)
-		return false
+		return err
 	}
 
-	return true
+	return nil
 }