fix: fix rule id check (#2709)

Signed-off-by: yisaer <[email protected]>
lf-edge · Mar 14, 2024 · 2b1fee4 · 2b1fee4
1 parent 7800443
commit 2b1fee4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/internal/processor/rule.go b/internal/processor/rule.go
@@ -190,10 +190,13 @@ func (p *RuleProcessor) GetRuleByJson(id, ruleJson string) (*api.Rule, error) {
 }
 
 var invalidRuleChars = []string{
-	"/",
+	"/", "#", "%",
 }
 
 func validateRuleID(id string) error {
+	if id != strings.TrimSpace(id) {
+		return fmt.Errorf("ruleID: %v should be trimed", id)
+	}
 	for _, invalidChar := range invalidRuleChars {
 		if strings.Contains(id, invalidChar) {
 			return fmt.Errorf("ruleID:%s contains invalidChar:%v", id, invalidChar)

diff --git a/internal/processor/rule_test.go b/internal/processor/rule_test.go
@@ -266,6 +266,22 @@ func TestValidateRuleID(t *testing.T) {
 			"1/2",
 			fmt.Errorf("ruleID:%s contains invalidChar:%v", "1/2", "/"),
 		},
+		{
+			"1#2",
+			fmt.Errorf("ruleID:%s contains invalidChar:%v", "1#2", "#"),
+		},
+		{
+			"1%2",
+			fmt.Errorf("ruleID:%s contains invalidChar:%v", "1%2", "%"),
+		},
+		{
+			id:  "\t123",
+			err: fmt.Errorf("ruleID: %v should be trimed", "\t123"),
+		},
+		{
+			id:  "123\t",
+			err: fmt.Errorf("ruleID: %v should be trimed", "123\t"),
+		},
 	}
 	for _, tc := range testcases {
 		require.Equal(t, tc.err, validateRuleID(tc.id))