validaties

Author: Shalucik

api/v3/wfs_validation.go

@@ -50,6 +50,18 @@ func ValidateWFS(wfs *WFS, warnings *[]string, allErrs *field.ErrorList) {
 		)
 	}
 
+	crsses := []string{}
+	for i, crs := range service.OtherCrs {
+		if slices.Contains(crsses, crs) {
+			*allErrs = append(*allErrs, field.Duplicate(
+				path.Child("otherCrs").Index(i),
+				crs,
+			))
+		} else {
+			crsses = append(crsses, crs)
+		}
+	}
+
 	ValidateInspire(wfs, allErrs)
 
 	if wfs.Spec.HorizontalPodAutoscalerPatch != nil {

api/v3/wms_types.go

@@ -249,6 +249,7 @@ type Layer struct {
 }
 
 type WMSBoundingBox struct {
+	// +kubebuilder:validation:Pattern:="^(EPSG:(28992|25831|25832|3034|3035|3857|4258|4326)|CRS:84)$"
 	CRS  string                   `json:"crs"`
 	BBox smoothoperatormodel.BBox `json:"bbox"`
 }

api/v3/wms_validation.go

@@ -122,6 +122,18 @@ func validateLayer(layer AnnotatedLayer, path *field.Path, groupStyles []string,
 		validateNotVisibleLayer(layer, path, wms, warnings, allErrs)
 	}
 
+	crsses := []string{}
+	for i, bbox := range layer.BoundingBoxes {
+		if slices.Contains(crsses, bbox.CRS) {
+			*allErrs = append(*allErrs, field.Duplicate(
+				path.Child("boundingBoxes").Index(i).Child("crs"),
+				bbox.CRS,
+			))
+		} else {
+			crsses = append(crsses, bbox.CRS)
+		}
+	}
+
 	styleNames := []string{}
 	for i, style := range layer.Styles {
 		stylePath := path.Child("styles").Index(i)

config/crd/bases/pdok.nl_wms.yaml

@@ -1323,6 +1323,7 @@ spec:
                                   - miny
                                 type: object
                               crs:
+                                pattern: ^(EPSG:(28992|25831|25832|3034|3035|3857|4258|4326)|CRS:84)$
                                 type: string
                             required:
                               - bbox
@@ -1421,6 +1422,7 @@ spec:
                                         - miny
                                       type: object
                                     crs:
+                                      pattern: ^(EPSG:(28992|25831|25832|3034|3035|3857|4258|4326)|CRS:84)$
                                       type: string
                                   required:
                                     - bbox
@@ -1625,6 +1627,7 @@ spec:
                                               - miny
                                             type: object
                                           crs:
+                                            pattern: ^(EPSG:(28992|25831|25832|3034|3035|3857|4258|4326)|CRS:84)$
                                             type: string
                                         required:
                                           - bbox

internal/webhook/v3/wfs_webhook_test.go

@@ -152,6 +152,18 @@ var _ = Describe("WFS Webhook", func() {
 				))))
 		})
 
+		It("Should deny Create when a otherCrs has the same crs multiple times", func() {
+			crs := "EPSG:3035"
+			obj.Spec.Service.OtherCrs = []string{crs, crs}
+
+			warnings, err := validator.ValidateCreate(ctx, obj)
+			Expect(err).To(Equal(getValidationError(obj, field.Duplicate(
+				field.NewPath("spec").Child("service").Child("otherCrs").Index(1),
+				crs,
+			))))
+			Expect(warnings).To(BeEmpty())
+		})
+
 		It("Should deny creation if SpatialID is also used as a featureType datasetMetadataID", func() {
 			Expect(obj.Inspire()).NotTo(BeNil())
 			Expect(obj.Spec.Service.FeatureTypes[0].DatasetMetadataURL).NotTo(BeNil())

internal/webhook/v3/wms_webhook_test.go

@@ -330,6 +330,26 @@ var _ = Describe("WMS Webhook", func() {
 									)))))))))
 		})
 
+		It("Should deny Create when a Layer has multiple boundingBoxes with  the same CRS", func() {
+			bbox := pdoknlv3.WMSBoundingBox{
+				CRS: "EPSG:28992",
+				BBox: smoothoperatormodel.BBox{
+					MinX: "-25000",
+					MinY: "250000",
+					MaxX: "280000",
+					MaxY: "860000",
+				},
+			}
+			obj.Spec.Service.Layer.BoundingBoxes = []pdoknlv3.WMSBoundingBox{bbox, bbox}
+
+			warnings, err := validator.ValidateCreate(ctx, obj)
+			Expect(err).To(Equal(getValidationError(obj, field.Duplicate(
+				field.NewPath("spec").Child("service").Child("layer").Child("boundingBoxes").Index(1).Child("crs"),
+				bbox.CRS,
+			))))
+			Expect(warnings).To(BeEmpty())
+		})
+
 		It("Should deny Create when a Layer uses the same style name multiple times", func() {
 			styleName := "duplicate"
 			style := pdoknlv3.Style{