Limit argument count on router cases

Author: rowanseymour

flows/definition/flow_test.go

@@ -100,7 +100,7 @@ func TestBrokenFlows(t *testing.T) {
 		},
 		{
 			"invalid_case_category.json",
-			"invalid node[uuid=a58be63b-907d-4a1a-856b-0bb5579d7507]: invalid router: case category 37d8813f-1402-4ad2-9cc2-e9054a96525b is not a valid category",
+			"invalid node[uuid=a58be63b-907d-4a1a-856b-0bb5579d7507]: invalid router: invalid case[uuid=5d6abc80-39e7-4620-9988-a2447bffe526]: category 37d8813f-1402-4ad2-9cc2-e9054a96525b is not a valid category",
 		},
 		{
 			"invalid_exit_dest.json",
@@ -120,11 +120,11 @@ func TestBrokenFlows(t *testing.T) {
 		},
 		{
 			"too_many_categories.json",
-			"invalid node[uuid=a58be63b-907d-4a1a-856b-0bb5579d7507]: invalid router: router can't have more than 100 categories (has 101)",
+			"invalid node[uuid=a58be63b-907d-4a1a-856b-0bb5579d7507]: invalid router: can't have more than 100 categories (has 101)",
 		},
 		{
 			"too_many_cases.json",
-			"invalid node[uuid=a58be63b-907d-4a1a-856b-0bb5579d7507]: invalid router: switch router can't have more than 100 cases (has 101)",
+			"invalid node[uuid=a58be63b-907d-4a1a-856b-0bb5579d7507]: invalid router: can't have more than 100 cases (has 101)",
 		},
 	}
 

flows/interfaces.go

@@ -21,6 +21,8 @@ const (
 	MaxActionsPerNode      = 100  // max number of actions in a node
 	MaxExitsPerNode        = 100  // max number of exits in a node
 	MaxCategoriesPerRouter = 100  // max number of categories a router can have
+	MaxCasesPerRouter      = 100  // max number of categories a switch router can have
+	MaxArgumentsPerCase    = 100  // max number of test arguments a switch router case can have
 )
 
 // NodeUUID is a UUID of a flow node

flows/routers/base.go

@@ -92,7 +92,7 @@ func (r *baseRouter) EnumerateLocalizables(include func(uuids.UUID, string, []st
 
 func (r *baseRouter) validate(flow flows.Flow, exits []flows.Exit) error {
 	if len(r.categories) > flows.MaxCategoriesPerRouter {
-		return fmt.Errorf("router can't have more than %d categories (has %d)", flows.MaxCategoriesPerRouter, len(r.categories))
+		return fmt.Errorf("can't have more than %d categories (has %d)", flows.MaxCategoriesPerRouter, len(r.categories))
 	}
 
 	// check wait timeout category is valid

flows/routers/switch.go

@@ -41,6 +41,22 @@ func NewCase(uuid uuids.UUID, type_ string, arguments []string, categoryUUID flo
 	}
 }
 
+func (c *Case) validate(r *SwitchRouter) error {
+	if !r.isValidCategory(c.CategoryUUID) {
+		return fmt.Errorf("category %s is not a valid category", c.CategoryUUID)
+	}
+
+	if _, exists := cases.XTESTS[c.Type]; !exists {
+		return fmt.Errorf("%s is not a registered test function", c.Type)
+	}
+
+	if len(c.Arguments) > flows.MaxArgumentsPerCase {
+		return fmt.Errorf("can't have more than %d arguments (has %d)", flows.MaxArgumentsPerCase, len(c.Arguments))
+	}
+
+	return nil
+}
+
 // LocalizationUUID gets the UUID which identifies this object for localization
 func (c *Case) LocalizationUUID() uuids.UUID { return uuids.UUID(c.UUID) }
 
@@ -94,8 +110,8 @@ func (r *SwitchRouter) Cases() []*Case { return r.cases }
 
 // Validate validates the arguments for this router
 func (r *SwitchRouter) Validate(flow flows.Flow, exits []flows.Exit) error {
-	if len(r.cases) > flows.MaxCategoriesPerRouter {
-		return fmt.Errorf("switch router can't have more than %d cases (has %d)", flows.MaxCategoriesPerRouter, len(r.cases))
+	if len(r.cases) > flows.MaxCasesPerRouter {
+		return fmt.Errorf("can't have more than %d cases (has %d)", flows.MaxCasesPerRouter, len(r.cases))
 	}
 
 	// check the default category is valid
@@ -104,14 +120,8 @@ func (r *SwitchRouter) Validate(flow flows.Flow, exits []flows.Exit) error {
 	}
 
 	for _, c := range r.cases {
-		// check each case points to a valid category
-		if !r.isValidCategory(c.CategoryUUID) {
-			return fmt.Errorf("case category %s is not a valid category", c.CategoryUUID)
-		}
-
-		// and each case test is valid
-		if _, exists := cases.XTESTS[c.Type]; !exists {
-			return fmt.Errorf("case test %s is not a registered test function", c.Type)
+		if err := c.validate(r); err != nil {
+			return fmt.Errorf("invalid case[uuid=%s]: %s", c.UUID, err)
 		}
 	}
 

flows/routers/testdata/switch.json

@@ -87,7 +87,7 @@
                 }
             ]
         },
-        "read_error": "case category 33c829d5-9092-484e-9683-c03614b6a446 is not a valid category"
+        "read_error": "invalid case[uuid=98503572-25bf-40ce-ad72-8836b6549a38]: category 33c829d5-9092-484e-9683-c03614b6a446 is not a valid category"
     },
     {
         "description": "Read fails for invalid case test",
@@ -132,7 +132,7 @@
                 }
             ]
         },
-        "read_error": "case test has_any_icecream is not a registered test function"
+        "read_error": "invalid case[uuid=98503572-25bf-40ce-ad72-8836b6549a38]: has_any_icecream is not a registered test function"
     },
     {
         "description": "Result created with matching test result",