Feat: support extended text format with prefix & suffix in line as input

IP and CIDR with prefix and suffix in one line now can be processed by using `text` format as input, specified by args `removePrefixesInLine` and `removeSuffixesInLine`.
Loyalsoldier · Aug 5, 2024 · b5b2429 · b5b2429
1 parent ee3687e
commit b5b2429
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 4 deletions.
diff --git a/config-example.json b/config-example.json
@@ -104,6 +104,19 @@
         "onlyIPType": "ipv4"
       }
     },
+    {
+      "type": "text",
+      "action": "add",
+      "args": {
+        "inputDir": "./data",
+        "onlyIPType": "ipv4",
+        "removePrefixesInLine": [
+          "iptables -A INPUT -s",
+          "iptables -A INPUT -d"
+        ],
+        "removeSuffixesInLine": ["-j ACCEPT", "-j DROP"]
+      }
+    },
     {
       "type": "text",
       "action": "add",
@@ -113,6 +126,26 @@
         "onlyIPType": "ipv6"
       }
     },
+    {
+      "type": "text",
+      "action": "add",
+      "args": {
+        "name": "mylist",
+        "uri": "./an/example/dir/mycidr.txt",
+        "onlyIPType": "ipv6",
+        "removePrefixesInLine": ["allow from", "deny from"]
+      }
+    },
+    {
+      "type": "text",
+      "action": "add",
+      "args": {
+        "name": "mylist",
+        "uri": "./an/example/dir/mycidr.txt",
+        "onlyIPType": "ipv6",
+        "removeSuffixesInLine": [";", ","]
+      }
+    },
     {
       "type": "text",
       "action": "add",

diff --git a/plugin/plaintext/common_in.go b/plugin/plaintext/common_in.go
@@ -17,6 +17,9 @@ type textIn struct {
 	URI         string
 	InputDir    string
 	OnlyIPType  lib.IPType
+
+	RemovePrefixesInLine []string
+	RemoveSuffixesInLine []string
 }
 
 func (t *textIn) scanFile(reader io.Reader, entry *lib.Entry) error {
@@ -40,17 +43,28 @@ func (t *textIn) scanFile(reader io.Reader, entry *lib.Entry) error {
 func (t *textIn) scanFileForTextIn(reader io.Reader, entry *lib.Entry) error {
 	scanner := bufio.NewScanner(reader)
 	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		if line == "" {
-			continue
-		}
+		line := scanner.Text()
+
 		line, _, _ = strings.Cut(line, "#")
 		line, _, _ = strings.Cut(line, "//")
 		line, _, _ = strings.Cut(line, "/*")
 		line = strings.TrimSpace(line)
 		if line == "" {
 			continue
 		}
+
+		line = strings.ToLower(line)
+		for _, prefix := range t.RemovePrefixesInLine {
+			line = strings.TrimSpace(strings.TrimPrefix(line, strings.ToLower(strings.TrimSpace(prefix))))
+		}
+		for _, suffix := range t.RemoveSuffixesInLine {
+			line = strings.TrimSpace(strings.TrimSuffix(line, strings.ToLower(strings.TrimSpace(suffix))))
+		}
+		line = strings.TrimSpace(line)
+		if line == "" {
+			continue
+		}
+
 		if err := entry.AddPrefix(line); err != nil {
 			return err
 		}

diff --git a/plugin/plaintext/text_in.go b/plugin/plaintext/text_in.go
@@ -32,6 +32,9 @@ func newTextIn(iType string, action lib.Action, data json.RawMessage) (lib.Input
 		URI        string     `json:"uri"`
 		InputDir   string     `json:"inputDir"`
 		OnlyIPType lib.IPType `json:"onlyIPType"`
+
+		RemovePrefixesInLine []string `json:"removePrefixesInLine"`
+		RemoveSuffixesInLine []string `json:"removeSuffixesInLine"`
 	}
 
 	if strings.TrimSpace(iType) == "" {
@@ -60,6 +63,9 @@ func newTextIn(iType string, action lib.Action, data json.RawMessage) (lib.Input
 		URI:         tmp.URI,
 		InputDir:    tmp.InputDir,
 		OnlyIPType:  tmp.OnlyIPType,
+
+		RemovePrefixesInLine: tmp.RemovePrefixesInLine,
+		RemoveSuffixesInLine: tmp.RemoveSuffixesInLine,
 	}, nil
 }