zishuo/nip
1
0
Fork 0
mirror of https://github.com/cunnie/sslip.io.git synced 2025-10-06 16:18:00 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Classless Inter-Domain Routing: "CIDR" not "CDIR"

Browse Source 
This is a cosmetic change, but one that's important to me.

I also updated the comment to reflect the purpose of `BlockListCIDRs`.
This commit is contained in:
Brian Cunnie
2023-11-29 12:41:31 -08:00
parent bcbf75a25b
commit f0b5ed0e63
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sslip.io-dns-server/xip/xip.go
View File

@@ -28,7 +28,7 @@ type Xip struct {
DnsAmplificationAttackDelay chan struct{} // for throttling metrics.status.sslip.io DnsAmplificationAttackDelay chan struct{} // for throttling metrics.status.sslip.io
Metrics Metrics // DNS server metrics Metrics Metrics // DNS server metrics
BlocklistStrings []string // list of blacklisted strings that shouldn't appear in public hostnames BlocklistStrings []string // list of blacklisted strings that shouldn't appear in public hostnames
BlocklistCDIRs []net.IPNet // list of blacklisted strings that shouldn't appear in public hostnames BlocklistCIDRs []net.IPNet // list of blacklisted CIDRs; no A/AAAA records should resolve to IPs in these CIDRs
BlocklistUpdated time.Time // The most recent time the Blocklist was updated BlocklistUpdated time.Time // The most recent time the Blocklist was updated
NameServers []dnsmessage.NSResource // The list of authoritative name servers (NS) NameServers []dnsmessage.NSResource // The list of authoritative name servers (NS)
} }
@@ -892,7 +892,7 @@ func TXTMetrics(x *Xip, _ net.IP) (txtResources []dnsmessage.TXTResource, err er
metrics = append(metrics, fmt.Sprintf("Blocklist: %s %d,%d", metrics = append(metrics, fmt.Sprintf("Blocklist: %s %d,%d",
x.BlocklistUpdated.Format("2006-01-02 15:04:05-07"), x.BlocklistUpdated.Format("2006-01-02 15:04:05-07"),
len(x.BlocklistStrings), len(x.BlocklistStrings),
len(x.BlocklistCDIRs))) len(x.BlocklistCIDRs)))
metrics = append(metrics, fmt.Sprintf("Queries: %d (%.1f/s)", x.Metrics.Queries, float64(x.Metrics.Queries)/uptime.Seconds())) metrics = append(metrics, fmt.Sprintf("Queries: %d (%.1f/s)", x.Metrics.Queries, float64(x.Metrics.Queries)/uptime.Seconds()))
metrics = append(metrics, fmt.Sprintf("TCP/UDP: %d/%d", x.Metrics.TCPQueries, x.Metrics.UDPQueries)) metrics = append(metrics, fmt.Sprintf("TCP/UDP: %d/%d", x.Metrics.TCPQueries, x.Metrics.UDPQueries))
metrics = append(metrics, fmt.Sprintf("Answered Queries: %d (%.1f/s)", x.Metrics.AnsweredQueries, float64(x.Metrics.AnsweredQueries)/uptime.Seconds())) metrics = append(metrics, fmt.Sprintf("Answered Queries: %d (%.1f/s)", x.Metrics.AnsweredQueries, float64(x.Metrics.AnsweredQueries)/uptime.Seconds()))
@@ -970,9 +970,9 @@ func (x *Xip) downloadBlockList(blocklistURL string) string {
return fmt.Sprintf(`failed to parse blocklist "%s": %s`, blocklistURL, err.Error()) return fmt.Sprintf(`failed to parse blocklist "%s": %s`, blocklistURL, err.Error())
} }
x.BlocklistStrings = blocklistStrings x.BlocklistStrings = blocklistStrings
x.BlocklistCDIRs = blocklistCIDRs x.BlocklistCIDRs = blocklistCIDRs
x.BlocklistUpdated = time.Now() x.BlocklistUpdated = time.Now()
return fmt.Sprintf("Successfully downloaded blocklist from %s: %v, %v", blocklistURL, x.BlocklistStrings, x.BlocklistCDIRs) return fmt.Sprintf("Successfully downloaded blocklist from %s: %v, %v", blocklistURL, x.BlocklistStrings, x.BlocklistCIDRs)
} }
// ReadBlocklist "sanitizes" the block list, removing comments, invalid characters // ReadBlocklist "sanitizes" the block list, removing comments, invalid characters
@@ -1027,8 +1027,8 @@ func (x *Xip) blocklist(hostname string) bool {
return true return true
} }
} }
for _, blockCDIR := range x.BlocklistCDIRs { for _, blockCIDR := range x.BlocklistCIDRs {
if blockCDIR.Contains(ip) { if blockCIDR.Contains(ip) {
return true return true
} }
} }