niklas/cool-dns
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

bugfixes #1

Merged
niklas merged 5 commits from develop into master 2021-03-21 13:25:41 +00:00
Conversation 0 Commits 5 Files Changed 2 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4394d6078d - Show all commits

6
internal/blacklist.go
View File

@ -86,12 +86,10 @@ func parseRawBlacklist(blacklist configBlacklist, raw string) []string {
// parseHostFormat parse the string in the format of a hostfile // parseHostFormat parse the string in the format of a hostfile
func parseHostFormat(raw string) []string { func parseHostFormat(raw string) []string {
finalList := make([]string, 0) finalList := make([]string, 0)
reg := regexp.MustCompile(`(?mi)^\s*(#*)\s*(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+([a-zA-Z0-9\.\- ]+)$`) reg := regexp.MustCompile(`(?m)^\s*(0\.0\.0\.0) ([a-zA-Z0-9-.]*)`)
matches := reg.FindAllStringSubmatch(raw, -1) matches := reg.FindAllStringSubmatch(raw, -1)
for _, match := range matches { for _, match := range matches {
if match[1] != "#" { finalList = append(finalList, dns.Fqdn(match[2]))
finalList = append(finalList, dns.Fqdn(match[3]))
}
} }
return finalList return finalList