specify ip address / proper error validation in backend / refactor

core/client.go

@@ -22,6 +22,17 @@ import (
 
 // CreateClient client with all necessary data
 func CreateClient(client *model.Client) (*model.Client, error) {
+	// check if client is valid
+	errs := client.IsValid()
+	if len(errs) != 0 {
+		for _, err := range errs {
+			log.WithFields(log.Fields{
+				"err": err,
+			}).Error("client validation error")
+		}
+		return nil, errors.New("failed to validate client")
+	}
+
 	u := uuid.NewV4()
 	client.Id = u.String()
 
@@ -32,32 +43,14 @@ func CreateClient(client *model.Client) (*model.Client, error) {
 	client.PrivateKey = key.String()
 	client.PublicKey = key.PublicKey().String()
 
-	// find available IP address from selected networks
-	clients, err := ReadClients()
+	reserverIps, err := GetAllReservedIps()
 	if err != nil {
 		return nil, err
 	}
 
-	reserverIps := make([]string, 0)
-	for _, client := range clients {
-		ips := strings.Split(client.Address, ",")
-		for i := range ips {
-			if util.IsIPv6(ips[i]) {
-				ips[i] = strings.ReplaceAll(strings.TrimSpace(ips[i]), "/128", "")
-			} else {
-				ips[i] = strings.ReplaceAll(strings.TrimSpace(ips[i]), "/32", "")
-			}
-		}
-		reserverIps = append(reserverIps, ips...)
-	}
-
-	networks := strings.Split(client.Address, ",")
-	for i := range networks {
-		networks[i] = strings.TrimSpace(networks[i])
-	}
 	ips := make([]string, 0)
-	for _, network := range networks {
-		ip, err := util.GetAvailableIp(network, reserverIps)
+	for _, network := range strings.Split(client.Address, ",") {
+		ip, err := util.GetAvailableIp(strings.TrimSpace(network), reserverIps)
 		if err != nil {
 			return nil, err
 		}
@@ -109,6 +102,18 @@ func UpdateClient(Id string, client *model.Client) (*model.Client, error) {
 	if current.Id != client.Id {
 		return nil, errors.New("records Id mismatch")
 	}
+
+	// check if client is valid
+	errs := client.IsValid()
+	if len(errs) != 0 {
+		for _, err := range errs {
+			log.WithFields(log.Fields{
+				"err": err,
+			}).Error("client validation error")
+		}
+		return nil, errors.New("failed to validate client")
+	}
+
 	// keep keys
 	client.PrivateKey = current.PrivateKey
 	client.PublicKey = current.PublicKey
@@ -159,7 +164,7 @@ func ReadClients() ([]*model.Client, error) {
 				log.WithFields(log.Fields{
 					"err":  err,
 					"path": f.Name(),
-				}).Error("failed to storage.Destorage.Serialize client")
+				}).Error("failed to deserialize client")
 			} else {
 				clients = append(clients, c.(*model.Client))
 			}

core/server.go

@@ -1,6 +1,8 @@
 package core
 
 import (
+	"errors"
+	log "github.com/sirupsen/logrus"
 	"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/model"
 	"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/storage"
 	"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/template"
@@ -8,6 +10,7 @@ import (
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 )
 
@@ -62,6 +65,18 @@ func UpdateServer(server *model.Server) (*model.Server, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// check if server is valid
+	errs := server.IsValid()
+	if len(errs) != 0 {
+		for _, err := range errs {
+			log.WithFields(log.Fields{
+				"err": err,
+			}).Error("server validation error")
+		}
+		return nil, errors.New("failed to validate server")
+	}
+
 	server.PrivateKey = current.(*model.Server).PrivateKey
 	server.PublicKey = current.(*model.Server).PublicKey
 	server.PresharedKey = current.(*model.Server).PresharedKey
@@ -100,3 +115,46 @@ func UpdateServerConfigWg() error {
 
 	return nil
 }
+
+// GetAllReservedIps the list of all reserved IPs, client and server
+func GetAllReservedIps() ([]string, error) {
+	clients, err := ReadClients()
+	if err != nil {
+		return nil, err
+	}
+
+	server, err := ReadServer()
+	if err != nil {
+		return nil, err
+	}
+
+	reserverIps := make([]string, 0)
+
+	for _, client := range clients {
+		for _, cidr := range strings.Split(client.Address, ",") {
+			ip, err := util.GetIpFromCidr(strings.TrimSpace(cidr))
+			if err != nil {
+				log.WithFields(log.Fields{
+					"err":  err,
+					"cidr": err,
+				}).Error("failed to ip from cidr")
+			} else {
+				reserverIps = append(reserverIps, ip)
+			}
+		}
+	}
+
+	for _, cidr := range strings.Split(server.Address, ",") {
+		ip, err := util.GetIpFromCidr(strings.TrimSpace(cidr))
+		if err != nil {
+			log.WithFields(log.Fields{
+				"err":  err,
+				"cidr": err,
+			}).Error("failed to ip from cidr")
+		} else {
+			reserverIps = append(reserverIps, ip)
+		}
+	}
+
+	return reserverIps, nil
+}