nhyatt/bind-response-policy-zone-creator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

another attempt at speeding this thing up.

Browse Source
This commit is contained in:
Hyatt 2022-03-21 18:40:21 -05:00
parent 1fe492f3cb
commit 13b9f1c048
Signed by: nhyatt
GPG Key ID: C50D0BBB5BC40BEA
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/bind/cleanup.go
View File

@ -38,24 +38,28 @@ func cleanBadDomains(domains []string) []string {
// remove allow-listed matches // remove allow-listed matches
total = len(domains) total = len(domains)
for i, allowedItem := range config.Config.AllowLists { // filter out bad regex
log.Printf("[DEBUG] Processing %d of %d\n", i+1, len(config.Config.AllowLists)) goodAllowedItemList := []string{}
for _, allowedItem := range config.Config.AllowLists {
list = []string{} _, err := regexp.Compile(allowedItem)
for _, v := range domains {
r, err := regexp.Compile(allowedItem)
if err != nil { if err != nil {
log.Printf("[ERROR] Allow list item (%s) is not valid regex: %v\n", allowedItem, err) log.Printf("[ERROR] Allow list item (%s) is not valid regex: %v\n", allowedItem, err)
break break
} }
if r.MatchString(v) { goodAllowedItemList = append(goodAllowedItemList, allowedItem)
}
list = []string{}
for _, v := range domains {
for _, allowedItem := range goodAllowedItemList {
if regexp.MustCompile(allowedItem).MatchString(v) {
log.Printf("[DEBUG] Removing allowed matching item: %s\n", v) log.Printf("[DEBUG] Removing allowed matching item: %s\n", v)
} else { } else {
list = append(list, v) list = append(list, v)
} }
} }
domains = list
} }
domains = list
log.Printf("[INFO] Allowed hosts removed: %d\n", total-len(domains)) log.Printf("[INFO] Allowed hosts removed: %d\n", total-len(domains))
log.Printf("[INFO] Total domains in list at end: %d.\n", len(domains)) log.Printf("[INFO] Total domains in list at end: %d.\n", len(domains))

38
config/config.yaml
View File

@ -38,25 +38,25 @@ allowList:
- ^ip6-allnodes$ - ^ip6-allnodes$
- ^ip6-allrouters$ - ^ip6-allrouters$
- ^ip6-allhosts$ - ^ip6-allhosts$
- (^|\.)thepiratebay\.org - (^|\.)thepiratebay\.org$
- (^|\.)sendgrid\.net - (^|\.)sendgrid\.net$
- (^|\.)googleadservices\.com - (^|\.)googleadservices\.com$
- (^|\.)doubleclick\.net - (^|\.)doubleclick\.net$
- (^|\.)sailthru\.com - (^|\.)sailthru\.com$
- (^|\.)magiskmanager\.com - (^|\.)magiskmanager\.com$
- (^|\.)apiservices\.krxd\.net - (^|\.)apiservices\.krxd\.net$
- (^|\.)logfiles\.zoom\.us - (^|\.)logfiles\.zoom\.us$
- (^|\.)logfiles-va\.zoom\.us - (^|\.)logfiles-va\.zoom\.us$
- (^|\.)nest\.com - (^|\.)nest\.com$
- (^|\.)clients.\.google\.com - (^|\.)clients.\.google\.com$
- (^|\.)login\.live\.com - (^|\.)login\.live\.com$
- (^|\.)unagi\.amazon\.com - (^|\.)unagi\.amazon\.com$
- (^|\.)unagi-na\.amazon\.com - (^|\.)unagi-na\.amazon\.com$
- (^|\.)duckduckgo\.com - (^|\.)duckduckgo\.com$
- (^|\.)msn\.com - (^|\.)msn\.com$
- (^|\.)nexusrules\.officeapps\.live\.com - (^|\.)nexusrules\.officeapps\.live\.com$
- (^|\.)playfabapi\.com - (^|\.)playfabapi\.com$
- (^|\.)vercel-dns\.com - (^|\.)vercel-dns\.com$
denyList: denyList:
- jindlecleanings.xyz - jindlecleanings.xyz
- "*.jindlecleanings.xyz" - "*.jindlecleanings.xyz"