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

Compress TXT metrics.status.sslip.io: 508 → 431

Browse Source 
The TXT response to the query `metrics.status.sslip.io` was doomed to
exceed the UDP 512-byte limit, which would have forced the client to
re-attempt via TCP, and our server doesn't yet bind to TCP.

This commit fixes that by squeezing the packet. We haven't dropped any
information, but we made it more succinct.

Per [Infoblox](https://www.infoblox.com/dns-security-resource-center/dns-security-faq/is-dns-tcp-or-udp-port-53/):

> when the message size exceeds 512 bytes, it will trigger the ‘TC’ bit
(Truncation) in DNS to be set, informing the client that the message
length has exceeded the allowed size. In these situations, the client
needs to re-transmit over TCP
This commit is contained in:
Brian Cunnie
2022-07-14 08:57:54 -07:00
parent 0be2cabb08
commit 61f56fea14
2 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/sslip.io-dns-server/integration_metrics_test.go
View File

@@ -146,9 +146,6 @@ var _ = Describe("IntegrationMetrics", func() {
expectedMetrics.AnsweredTXTDelKvQueries++ expectedMetrics.AnsweredTXTDelKvQueries++
expectedMetrics = bumpExpectedToAccountForMetricsQuery(expectedMetrics) expectedMetrics = bumpExpectedToAccountForMetricsQuery(expectedMetrics)
actualMetrics = digAndGetMetrics("@localhost delete.key.k-v.io txt +short -p " + strconv.Itoa(port)) actualMetrics = digAndGetMetrics("@localhost delete.key.k-v.io txt +short -p " + strconv.Itoa(port))
fmt.Println()
fmt.Println(expectedMetrics)
fmt.Println(actualMetrics)
Expect(expectedMetrics.MostlyEquals(actualMetrics)).To(BeTrue()) Expect(expectedMetrics.MostlyEquals(actualMetrics)).To(BeTrue())
// PTR version.sslip.io updates .Queries, .AnsweredQueries, .AnsweredPTRQueriesIPv4 // PTR version.sslip.io updates .Queries, .AnsweredQueries, .AnsweredPTRQueriesIPv4
@@ -206,28 +203,24 @@ func getMetrics() (m xip.Metrics) {
var uptime int var uptime int
var junk string var junk string
_, err = fmt.Sscanf(string(stdout), _, err = fmt.Sscanf(string(stdout),
"\"Uptime (seconds): %d\"\n"+ "\"Uptime: %d\"\n"+
"\"Key-value store: %s\n"+ // %s "swallows" the double-quote at the end "\"KV Store: %s\n"+ // %s "swallows" the double-quote at the end
"\"Blocklist: %s %s %s\n"+ "\"Blocklist: %s %s %s\n"+
"\"Queries: %d\"\n"+ "\"Queries: %d (%s\n"+ // %s "swallows" the `/s"` at the end
"\"Queries/second: %s\n"+ "\"Answered Queries: %d (%s\n"+ // %s "swallows" the `/s"` at the end
"\"AnsQueries: %d\"\n"+ "\"A: %d\"\n"+
"\"AnsQueries/second: %s\n"+ "\"AAAA: %d\"\n"+
"\"AnsA: %d\"\n"+ "\"TXT Source: %d\"\n"+
"\"AnsAAAA: %d\"\n"+ "\"TXT Version: %d\"\n"+
"\"Source IP TXT: %d\"\n"+ "\"TXT KV GET/PUT/DEL: %d/%d/%d\"\n"+
"\"Version TXT: %d\"\n"+
"\"Key-Value TXT GET/PUT/DEL: %d/%d/%d\"\n"+
"\"PTR IPv4/IPv6: %d/%d\"\n"+ "\"PTR IPv4/IPv6: %d/%d\"\n"+
"\"DNS-01 challenge: %d\"\n"+ "\"NS DNS-01: %d\"\n"+
"\"Blocked: %d\"\n", "\"Blocked: %d\"\n",
&uptime, &uptime,
&junk, &junk,
&junk, &junk, &junk, &junk, &junk, &junk,
&m.Queries, &m.Queries, &junk,
&junk, &m.AnsweredQueries, &junk,
&m.AnsweredQueries,
&junk,
&m.AnsweredAQueries, &m.AnsweredAQueries,
&m.AnsweredAAAAQueries, &m.AnsweredAAAAQueries,
&m.AnsweredTXTSrcIPQueries, &m.AnsweredTXTSrcIPQueries,

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

@@ -910,27 +910,25 @@ func metricsSslipIo(x *Xip, _ net.IP) (txtResources []dnsmessage.TXTResource, er
<-x.DnsAmplificationAttackDelay <-x.DnsAmplificationAttackDelay
var metrics []string var metrics []string
uptime := time.Since(x.Metrics.Start) uptime := time.Since(x.Metrics.Start)
metrics = append(metrics, fmt.Sprintf("Uptime (seconds): %.0f", uptime.Seconds())) metrics = append(metrics, fmt.Sprintf("Uptime: %.0f", uptime.Seconds()))
keyValueStore := "etcd" keyValueStore := "etcd"
if x.isEtcdNil() { if x.isEtcdNil() {
keyValueStore = "builtin" keyValueStore = "builtin"
} }
metrics = append(metrics, "Key-value store: "+keyValueStore) metrics = append(metrics, "KV Store: "+keyValueStore)
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.BlocklistCDIRs)))
metrics = append(metrics, fmt.Sprintf("Queries: %d", x.Metrics.Queries)) metrics = append(metrics, fmt.Sprintf("Queries: %d (%.1f/s)", x.Metrics.Queries, float64(x.Metrics.Queries)/uptime.Seconds()))
metrics = append(metrics, fmt.Sprintf("Queries/second: %.1f", float64(x.Metrics.Queries)/uptime.Seconds())) metrics = append(metrics, fmt.Sprintf("Answered Queries: %d (%.1f/s)", x.Metrics.AnsweredQueries, float64(x.Metrics.AnsweredQueries)/uptime.Seconds()))
metrics = append(metrics, fmt.Sprintf("AnsQueries: %d", x.Metrics.AnsweredQueries)) metrics = append(metrics, fmt.Sprintf("A: %d", x.Metrics.AnsweredAQueries))
metrics = append(metrics, fmt.Sprintf("AnsQueries/second: %.1f", float64(x.Metrics.AnsweredQueries)/uptime.Seconds())) metrics = append(metrics, fmt.Sprintf("AAAA: %d", x.Metrics.AnsweredAAAAQueries))
metrics = append(metrics, fmt.Sprintf("AnsA: %d", x.Metrics.AnsweredAQueries)) metrics = append(metrics, fmt.Sprintf("TXT Source: %d", x.Metrics.AnsweredTXTSrcIPQueries))
metrics = append(metrics, fmt.Sprintf("AnsAAAA: %d", x.Metrics.AnsweredAAAAQueries)) metrics = append(metrics, fmt.Sprintf("TXT Version: %d", x.Metrics.AnsweredTXTVersionQueries))
metrics = append(metrics, fmt.Sprintf("Source IP TXT: %d", x.Metrics.AnsweredTXTSrcIPQueries)) metrics = append(metrics, fmt.Sprintf("TXT KV GET/PUT/DEL: %d/%d/%d", x.Metrics.AnsweredTXTGetKvQueries, x.Metrics.AnsweredTXTPutKvQueries, x.Metrics.AnsweredTXTDelKvQueries))
metrics = append(metrics, fmt.Sprintf("Version TXT: %d", x.Metrics.AnsweredTXTVersionQueries))
metrics = append(metrics, fmt.Sprintf("Key-Value TXT GET/PUT/DEL: %d/%d/%d", x.Metrics.AnsweredTXTGetKvQueries, x.Metrics.AnsweredTXTPutKvQueries, x.Metrics.AnsweredTXTDelKvQueries))
metrics = append(metrics, fmt.Sprintf("PTR IPv4/IPv6: %d/%d", x.Metrics.AnsweredPTRQueriesIPv4, x.Metrics.AnsweredPTRQueriesIPv6)) metrics = append(metrics, fmt.Sprintf("PTR IPv4/IPv6: %d/%d", x.Metrics.AnsweredPTRQueriesIPv4, x.Metrics.AnsweredPTRQueriesIPv6))
metrics = append(metrics, fmt.Sprintf("DNS-01 challenge: %d", x.Metrics.AnsweredNSDNS01ChallengeQueries)) metrics = append(metrics, fmt.Sprintf("NS DNS-01: %d", x.Metrics.AnsweredNSDNS01ChallengeQueries))
metrics = append(metrics, fmt.Sprintf("Blocked: %d", x.Metrics.AnsweredBlockedQueries)) metrics = append(metrics, fmt.Sprintf("Blocked: %d", x.Metrics.AnsweredBlockedQueries))
for _, metric := range metrics { for _, metric := range metrics {
txtResources = append(txtResources, dnsmessage.TXTResource{TXT: []string{metric}}) txtResources = append(txtResources, dnsmessage.TXTResource{TXT: []string{metric}})