fix generated RouterOS script, clean up template (#100)

* update readme with latest MikroTik script

* fix generated RouterOS script, clean up template

* Update docker readme

* enhancement: remove scenario splitting as not needed

* enhancement: gofmt myself

* enhancement: Remove whitelist removal in for loop

---------

Co-authored-by: Laurence Jones <[email protected]>

Author: j3n57h0m45

docker/README.md

@@ -141,21 +141,14 @@ Generates a MikroTik Script that the device can execute to populate the specifie
 
 Example output:
 ```bash
-:global CrowdSecBlockIP do={
-  :local list "foo"
-  :local address $1
-  :local comment $2
-  :local timeout $3
-  onerror e in={ 
-    /ip firewall address-list add list=$list address=$address comment=$comment timeout="$timeout"
-  } do={
-    /ip firewall address-list remove [ find list=$list address="$address" ]
-    /ip firewall address-list add list=$list address=$address comment=$comment timeout="$timeout"
-  }
+/ip/firewall/address-list/remove [ find where list="foo" ];
+:global CrowdSecAddIP;
+:set CrowdSecAddIP do={
+    :do { /ip/firewall/address-list/add list=foo address=$1 comment="$2" timeout=$3; } on-error={ }
 }
-$CrowdSecBlockIP 1.2.3.4 "crowdsecurity/ssh-bf" 152h40m24s
-$CrowdSecBlockIP 4.3.2.1 "crowdsecurity/postfix-spam" 166h40m25s
-$CrowdSecBlockIP 2001:470:1:c84::17 "crowdsecurity/ssh-bf" 165h13m42s
+$CrowdSecAddIP 1.2.3.4 "ssh-bf" 152h40m24s
+$CrowdSecAddIP 4.3.2.1 "postfix-spam" 166h40m25s
+$CrowdSecAddIP 2001:470:1:c84::17 "ssh-bf" 165h13m42s
 ```
 
 #### Example: MikroTik import script

pkg/formatters/mikrotik/mikrotik.go

@@ -42,7 +42,7 @@ func Format(w http.ResponseWriter, r *http.Request) {
 	data := CustomMikrotikData{
 		ListName:               listName,
 		Decisions:              decisions,
-		NameOfMikrotikFunction: "CrowdSecBlockIP",
+		NameOfMikrotikFunction: "CrowdSecAddIP",
 		IPv6Only:               ipv6only,
 		IPv4Only:               ipv4only,
 	}

pkg/formatters/mikrotik/mikrotik.tmpl

@@ -1,46 +1,31 @@
-{{if not $.IPv6Only -}}
-:global {{$.NameOfMikrotikFunction}} do={
-  :local list "{{$.ListName}}"
-  :local address $1
-  :local comment $2
-  :local timeout $3
-  onerror e in={ 
-    /ip firewall address-list add list=$list address=$address comment=$comment timeout="$timeout"
-  } do={
-    /ip firewall address-list remove [ find list=$list address="$address" ]
-    /ip firewall address-list add list=$list address=$address comment=$comment timeout="$timeout"
-  }
+{{ if not $.IPv6Only }}
+/ip/firewall/address-list/remove [ find where list="{{$.ListName}}" ];
+:global {{$.NameOfMikrotikFunction}};
+:set {{$.NameOfMikrotikFunction}} do={
+    :do { /ip/firewall/address-list/add list={{$.ListName}} address=$1 comment="$2" timeout=$3; } on-error={ }
 }
-{{- if not $.IPv4Only}}
-{{end}}{{end}}
-{{- if not $.IPv4Only -}}
-:global {{$.NameOfMikrotikFunction}}v6 do={
-  :local list "{{$.ListName}}"
-  :local address $1
-  :local comment $2
-  :local timeout $3
-  onerror e in={ 
-    /ipv6 firewall address-list add list=$list address=$address comment=$comment timeout="$timeout"
-  } do={
-    /ipv6 firewall address-list remove [ find list=$list address="$address" ]
-    /ipv6 firewall address-list add list=$list address=$address comment=$comment timeout="$timeout"
-  }
+{{ end -}}
+{{ if not $.IPv4Only }}
+/ipv6/firewall/address-list/remove [ find where list="{{$.ListName}}" ];
+:global {{$.NameOfMikrotikFunction}}v6;
+:set {{$.NameOfMikrotikFunction}}v6 do={
+    :do { /ipv6/firewall/address-list/add list={{$.ListName}} address=$1 comment="$2" timeout=$3; } on-error={ }
 }
-{{- end -}}
+{{ end -}}
 
-{{- range .Decisions}}
-{{ $ipv6Check := contains .Value ":"}}
+{{- range .Decisions -}}
+{{ $ipv6Check := contains .Value ":" }}
 {{- if not $ipv6Check -}}
-${{$.NameOfMikrotikFunction}} {{.Value}} "{{.Scenario}}" {{.Duration}}
+${{$.NameOfMikrotikFunction}} "{{.Value}}" "{{.Scenario}}" "{{.Duration}}"
 {{- else -}}
-${{$.NameOfMikrotikFunction}}v6 {{.Value}} "{{.Scenario}}" {{.Duration}}
-{{- end }}
+${{$.NameOfMikrotikFunction}}v6 "{{.Value}}" "{{.Scenario}}" "{{.Duration}}"
 {{- end }}
+{{ end -}}
 
-{{- if not $.IPv6Only }}
-:set {{$.NameOfMikrotikFunction}}
-{{- end}}
-{{- if not $.IPv4Only }}
-:set {{$.NameOfMikrotikFunction}}v6
-{{- end}}
+{{ if not $.IPv6Only }}
+:set {{$.NameOfMikrotikFunction}};
+{{- end -}}
+{{ if not $.IPv4Only }}
+:set {{$.NameOfMikrotikFunction}}v6;
+{{- end -}}