mapper: validate set length constraints in SetField()

Signed-off-by: Dan Williams <[email protected]>
ovn-org · May 11, 2023 · 3c71180 · 3c71180
1 parent 98cc6c7
commit 3c71180
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 5 deletions.
diff --git a/mapper/info.go b/mapper/info.go
@@ -66,7 +66,25 @@ func (i *Info) SetField(column string, value interface{}) error {
 		return fmt.Errorf("column %s: native value %v (%s) is not assignable to field %s (%s)",
 			column, value, reflect.TypeOf(value), fieldName, fieldValue.Type())
 	}
-	fieldValue.Set(reflect.ValueOf(value))
+
+	colSchema := i.Metadata.TableSchema.Column(column)
+	if colSchema == nil {
+		return fmt.Errorf("SetField: column %s schema not found", column)
+	}
+
+	// Validate set length requirements
+	newVal := reflect.ValueOf(value)
+	if colSchema.Type == ovsdb.TypeSet || colSchema.Type == ovsdb.TypeEnum {
+		maxVal := colSchema.TypeObj.Max()
+		minVal := colSchema.TypeObj.Min()
+		if maxVal > 1 && newVal.Len() > maxVal {
+			return fmt.Errorf("SetField: column %s overflow: %d new elements but max is %d", column, newVal.Len(), maxVal)
+		} else if minVal > 0 && newVal.Len() < minVal {
+			return fmt.Errorf("SetField: column %s underflow: %d new elements but min is %d", column, newVal.Len(), minVal)
+		}
+	}
+
+	fieldValue.Set(newVal)
 	return nil
 }
 

diff --git a/mapper/info_test.go b/mapper/info_test.go
@@ -24,6 +24,13 @@ var sampleTable = []byte(`{
             "min": 0
           }
         },
+        "aLimitedSet": {
+          "type": {
+            "key": "string",
+            "max": 3,
+            "min": 0
+          }
+        },
         "aMap": {
           "type": {
             "key": "string",
@@ -75,10 +82,11 @@ func TestNewMapperInfo(t *testing.T) {
 
 func TestMapperInfoSet(t *testing.T) {
 	type obj struct {
-		Ostring string            `ovsdb:"aString"`
-		Oint    int               `ovsdb:"aInteger"`
-		Oset    []string          `ovsdb:"aSet"`
-		Omap    map[string]string `ovsdb:"aMap"`
+		Ostring     string            `ovsdb:"aString"`
+		Oint        int               `ovsdb:"aInteger"`
+		Oset        []string          `ovsdb:"aSet"`
+		OLimitedSet []string          `ovsdb:"aLimitedSet"`
+		Omap        map[string]string `ovsdb:"aMap"`
 	}
 
 	type test struct {
@@ -106,6 +114,22 @@ func TestMapperInfoSet(t *testing.T) {
 			column: "aSet",
 			err:    false,
 		},
+		{
+			name:   "limited set under max",
+			table:  sampleTable,
+			obj:    &obj{},
+			field:  []string{"foo", "bar"},
+			column: "aLimitedSet",
+			err:    false,
+		},
+		{
+			name:   "limited set over max",
+			table:  sampleTable,
+			obj:    &obj{},
+			field:  []string{"foo", "bar", "baz", "qux"},
+			column: "aLimitedSet",
+			err:    true,
+		},
 		{
 			name:   "map",
 			table:  sampleTable,