Compare commits
6 Commits
943ba1e819
...
main
Author | SHA1 | Date | |
---|---|---|---|
0e428a79cc
|
|||
b1202e9a7d
|
|||
ee395ba8a2
|
|||
79002e80bc
|
|||
7286a21464
|
|||
fdd6b2288e
|
@@ -1,19 +1,8 @@
|
|||||||
.rules-changes: &rules-changes
|
|
||||||
rules:
|
|
||||||
- changes:
|
|
||||||
- Jenkinsfile
|
|
||||||
- .gitlab-ci.yml
|
|
||||||
- README.md
|
|
||||||
- docs/*
|
|
||||||
when: never
|
|
||||||
- when: on_success
|
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
"Build Release":
|
"Build Release":
|
||||||
stage: build
|
stage: build
|
||||||
<<: *rules-changes
|
|
||||||
image:
|
image:
|
||||||
name: registry.c.test-chamber-13.lan/dockerhub/library/golang:alpine
|
name: registry.c.test-chamber-13.lan/dockerhub/library/golang:alpine
|
||||||
allow_failure: false
|
allow_failure: false
|
||||||
@@ -43,19 +32,17 @@ stages:
|
|||||||
|
|
||||||
"Create Release":
|
"Create Release":
|
||||||
stage: build
|
stage: build
|
||||||
|
|
||||||
image:
|
image:
|
||||||
name: registry.gitlab.com/gitlab-org/release-cli:latest
|
name: registry.gitlab.com/gitlab-org/release-cli:latest
|
||||||
<<: *rules-changes
|
|
||||||
needs:
|
needs:
|
||||||
- job: "Build Release"
|
- job: "Build Release"
|
||||||
artifacts: true
|
artifacts: true
|
||||||
script:
|
script:
|
||||||
- printf '%s\n' "Creating Release"
|
- printf '%s\n' "Creating Release"
|
||||||
release:
|
release:
|
||||||
name: Version $CI_COMMIT_TAG
|
name: Version $CI_COMMIT_SHORT_SHA
|
||||||
tag_name: $CI_COMMIT_TAG
|
tag_name: $CI_COMMIT_SHORT_SHA
|
||||||
description: Release created using the release-cli. Release $CI_COMMIT_TAG
|
description: Release created using the release-cli. Release $CI_COMMIT_SHORT_SHA
|
||||||
assets:
|
assets:
|
||||||
links:
|
links:
|
||||||
- name: bind-response-policy-zone-creator-linux-arm
|
- name: bind-response-policy-zone-creator-linux-arm
|
||||||
|
@@ -57,8 +57,8 @@ sources:
|
|||||||
- "https://raw.githubusercontent.com/dibdot/DoH-IP-blocklists/master/doh-domains.txt"
|
- "https://raw.githubusercontent.com/dibdot/DoH-IP-blocklists/master/doh-domains.txt"
|
||||||
- "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt"
|
- "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt"
|
||||||
- "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt"
|
- "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt"
|
||||||
- "https://big.oisd.nl/"
|
|
||||||
adBlockURLs:
|
adBlockURLs:
|
||||||
|
- "https://big.oisd.nl"
|
||||||
- "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt"
|
- "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt"
|
||||||
- "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt"
|
- "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt"
|
||||||
- "https://github.com/KnightmareVIIVIIXC/AIO-Firebog-Blocklists/raw/main/lists/firebogadmal.txt"
|
- "https://github.com/KnightmareVIIVIIXC/AIO-Firebog-Blocklists/raw/main/lists/firebogadmal.txt"
|
||||||
@@ -77,18 +77,22 @@ allowList:
|
|||||||
- (^|\.)apiservices\.krxd\.net$
|
- (^|\.)apiservices\.krxd\.net$
|
||||||
- (^|\.)app-measurement\.com$
|
- (^|\.)app-measurement\.com$
|
||||||
- (^|\.)assets\.adobedtm\.com$
|
- (^|\.)assets\.adobedtm\.com$
|
||||||
|
- (^|\.)bato\.to$
|
||||||
- (^|\.)brandify\.com$
|
- (^|\.)brandify\.com$
|
||||||
- (^|\.)clients.\.google\.com$
|
- (^|\.)clients.\.google\.com$
|
||||||
- (^|\.)cpng\.lol$
|
- (^|\.)cpng\.lol$
|
||||||
- (^|\.)doubleclick\.net$
|
- (^|\.)doubleclick\.net$
|
||||||
- (^|\.)duckduckgo\.com$
|
- (^|\.)duckduckgo\.com$
|
||||||
|
- (^|\.)events\.data\.microsoft\.com$
|
||||||
- (^|\.)ghostery\.net$
|
- (^|\.)ghostery\.net$
|
||||||
- (^|\.)googleadservices\.com$
|
- (^|\.)googleadservices\.com$
|
||||||
- (^|\.)kochava\.com$
|
- (^|\.)kochava\.com$
|
||||||
|
- (^|\.)launchdarkly\.com$
|
||||||
- (^|\.)logfiles-va\.zoom\.us$
|
- (^|\.)logfiles-va\.zoom\.us$
|
||||||
- (^|\.)logfiles\.zoom\.us$
|
- (^|\.)logfiles\.zoom\.us$
|
||||||
- (^|\.)login\.live\.com$
|
- (^|\.)login\.live\.com$
|
||||||
- (^|\.)magiskmanager\.com$
|
- (^|\.)magiskmanager\.com$
|
||||||
|
- (^|\.)mimojp\.store$
|
||||||
- (^|\.)msn\.com$
|
- (^|\.)msn\.com$
|
||||||
- (^|\.)nest\.com$
|
- (^|\.)nest\.com$
|
||||||
- (^|\.)nexusrules\.officeapps\.live\.com$
|
- (^|\.)nexusrules\.officeapps\.live\.com$
|
||||||
@@ -100,8 +104,6 @@ allowList:
|
|||||||
- (^|\.)unagi-na\.amazon\.com$
|
- (^|\.)unagi-na\.amazon\.com$
|
||||||
- (^|\.)unagi\.amazon\.com$
|
- (^|\.)unagi\.amazon\.com$
|
||||||
- (^|\.)vercel-dns\.com$
|
- (^|\.)vercel-dns\.com$
|
||||||
- (^|\.)launchdarkly\.com$
|
|
||||||
- (^|\.)mimojp\.store$
|
|
||||||
- ^\w+-\d{4}\.\w+-msedge\.net$
|
- ^\w+-\d{4}\.\w+-msedge\.net$
|
||||||
- ^ctldl\.windowsupdate\.com$
|
- ^ctldl\.windowsupdate\.com$
|
||||||
- ^settings-win\.data\.microsoft\.com$
|
- ^settings-win\.data\.microsoft\.com$
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
@@ -29,15 +28,12 @@ func cleanBadDomains(domains []string) []string {
|
|||||||
// remove duplicates
|
// remove duplicates
|
||||||
domains = removeDuplicateStr(domains)
|
domains = removeDuplicateStr(domains)
|
||||||
|
|
||||||
fmt.Printf("Processing: \n")
|
|
||||||
|
|
||||||
for _, domain := range domains {
|
for _, domain := range domains {
|
||||||
// removing trailing dots
|
// removing trailing dots
|
||||||
domain = regexp.MustCompile(`\.$`).ReplaceAllString(domain, "")
|
domain = regexp.MustCompile(`\.$`).ReplaceAllString(domain, "")
|
||||||
|
|
||||||
// skip domains that are too long
|
// skip domains that are too long
|
||||||
if len([]rune(domain)) > 230 {
|
if len([]rune(domain)) > 230 {
|
||||||
fmt.Printf("-")
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,7 +46,7 @@ func cleanBadDomains(domains []string) []string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if skip {
|
if skip {
|
||||||
fmt.Printf(".")
|
log.Trace("Skipping Domain", "domain", domain)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user