improved default rules, better regex compile warnings

Author: cjimti

cfg.yml

@@ -1,17 +1,21 @@
 postBan:
-  [
-    'heyyou',
-    '3cscript',
-    '2fscript',
-    '<script',
-    '\(+.select',
-    '\+\(',
-    '\+\s+\(',
-  ]
+  - \w*((\%27)|(\'))((\%6F)|o|(\%4F))((\%72)|r|(\%52))
+  - ((\%3D)|(=))[^\n]*((\%27)|(\')|(\-\-)|(\%3B)|(;))
+  - ((\%27)|(\'))union
+  - exec(\s|\+)+(s|x)p\w+
+  - ((\%3C)|<)((\%2F)|\/)*[a-z0-9\%]+((\%3E)|>)
+  - 3cscript
+  - 2fscript
+  - <script
+  - \(.+select
+  - \+\(
+  - \+\s+\(
 urlBan:
-  [
-    'fun',
-  ]
+  - \w*((\%27)|(\'))((\%6F)|o|(\%4F))((\%72)|r|(\%52))
+  - ((\%3D)|(=))[^\n]*((\%27)|(\')|(\-\-)|(\%3B)|(;))
+  - ((\%27)|(\'))union
+  - exec(\s|\+)+(s|x)p\w+
+  - ((\%3C)|<)((\%2F)|\/)*[a-z0-9\%]+((\%3E)|>)
 postFilter:
   -
     name: taco

rweng/rweng.go

@@ -9,9 +9,11 @@ import (
 	"strings"
 	"text/template"
 
+	"os"
+
 	"github.com/Masterminds/sprig"
-	"github.com/go-yaml/yaml"
 	"go.uber.org/zap"
+	"gopkg.in/yaml.v2"
 )
 
 type FilterCfg struct {
@@ -115,21 +117,34 @@ func NewEngFromYml(filename string, logger *zap.Logger) (*Eng, error) {
 	postBan := make([]*regexp.Regexp, 0)
 
 	for _, r := range engCfg.PostBan {
-		rxp := regexp.MustCompile(strings.ToLower(r))
+		rxp, err := regexp.Compile(strings.ToLower(r))
+		if err != nil {
+			logger.Error("Error in regex compile: " + err.Error())
+			os.Exit(1)
+		}
 		postBan = append(postBan, rxp)
 	}
 
 	urlBan := make([]*regexp.Regexp, 0)
 
 	for _, r := range engCfg.UrlBan {
-		rxp := regexp.MustCompile(strings.ToLower(r))
+		rxp, err := regexp.Compile(strings.ToLower(r))
+		if err != nil {
+			logger.Error("Error in regex compile: " + err.Error())
+			os.Exit(1)
+		}
 		urlBan = append(urlBan, rxp)
 	}
 
 	filter := make(map[*regexp.Regexp]FilterTemplate, 0)
 
 	for _, filterCfg := range engCfg.Filter {
-		rxp := regexp.MustCompile(strings.ToLower(filterCfg.Match))
+		rxp, err := regexp.Compile(strings.ToLower(filterCfg.Match))
+		if err != nil {
+			logger.Error("Error in regex compile: " + err.Error())
+			os.Exit(1)
+		}
+
 		tmpl, err := template.New(filterCfg.Name).Funcs(sprig.TxtFuncMap()).Parse(filterCfg.Template)
 		if err != nil {
 			logger.Error("Template parsing error: " + err.Error())

server.go

@@ -1,17 +1,14 @@
 package main
 
 import (
+	"flag"
+	"fmt"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
 	"os"
-
 	"time"
 
-	"fmt"
-
-	"flag"
-
 	"github.com/txn2/n2proxy/rweng"
 	"go.uber.org/zap"
 )