From 99abd9666d8f8a9c0a30a2ca58dfba504c795aef Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Wed, 20 Apr 2022 15:15:29 -0400 Subject: [PATCH] removed required status for ipv6 and added check on create network --- controllers/network.go | 5 +++++ models/network.go | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/controllers/network.go b/controllers/network.go index af0cbf2a..6ee74539 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -307,6 +307,11 @@ func createNetwork(w http.ResponseWriter, r *http.Request) { return } + if network.AddressRange == "" && network.AddressRange6 == "" { + returnErrorResponse(w, r, formatError(err, "badrequest")) + return + } + network, err = logic.CreateNetwork(network) if err != nil { returnErrorResponse(w, r, formatError(err, "badrequest")) diff --git a/models/network.go b/models/network.go index 49e2efd4..a63ce178 100644 --- a/models/network.go +++ b/models/network.go @@ -7,8 +7,8 @@ import ( // Network Struct - contains info for a given unique network //At some point, need to replace all instances of Name with something else like Identifier type Network struct { - AddressRange string `json:"addressrange" bson:"addressrange" validate:"required,cidr"` - AddressRange6 string `json:"addressrange6" bson:"addressrange6" validate:"regexp=^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$"` + AddressRange string `json:"addressrange" bson:"addressrange" validate:"omitempty,cidr"` + AddressRange6 string `json:"addressrange6" bson:"addressrange6"` NetID string `json:"netid" bson:"netid" validate:"required,min=1,max=12,netid_valid"` NodesLastModified int64 `json:"nodeslastmodified" bson:"nodeslastmodified"` NetworkLastModified int64 `json:"networklastmodified" bson:"networklastmodified"`