From 7b7eae617a2ac1b297e04a8d6c97597c48571e65 Mon Sep 17 00:00:00 2001 From: Varun Narravula Date: Wed, 31 Dec 2025 15:07:06 -0800 Subject: [PATCH] chore: format files using gofmt Former-commit-id: 5cfa0dfb9781d57bd369fa3f4631f9721f64a5a9 --- dns/dns_proxy.go | 10 +++--- dns/dns_records.go | 2 +- dns/dns_records_test.go | 68 ++++++++++++++++++++--------------------- dns/platform/darwin.go | 2 +- olm/olm.go | 2 +- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dns/dns_proxy.go b/dns/dns_proxy.go index 6d56379..6c9891a 100644 --- a/dns/dns_proxy.go +++ b/dns/dns_proxy.go @@ -34,18 +34,18 @@ type DNSProxy struct { ep *channel.Endpoint proxyIP netip.Addr upstreamDNS []string - tunnelDNS bool // Whether to tunnel DNS queries over WireGuard or to spit them out locally + tunnelDNS bool // Whether to tunnel DNS queries over WireGuard or to spit them out locally mtu int tunDevice tun.Device // Direct reference to underlying TUN device for responses middleDevice *device.MiddleDevice // Reference to MiddleDevice for packet filtering recordStore *DNSRecordStore // Local DNS records // Tunnel DNS fields - for sending queries over WireGuard - tunnelIP netip.Addr // WireGuard interface IP (source for tunneled queries) - tunnelStack *stack.Stack // Separate netstack for outbound tunnel queries - tunnelEp *channel.Endpoint + tunnelIP netip.Addr // WireGuard interface IP (source for tunneled queries) + tunnelStack *stack.Stack // Separate netstack for outbound tunnel queries + tunnelEp *channel.Endpoint tunnelActivePorts map[uint16]bool - tunnelPortsLock sync.Mutex + tunnelPortsLock sync.Mutex ctx context.Context cancel context.CancelFunc diff --git a/dns/dns_records.go b/dns/dns_records.go index ed57b77..5308b0e 100644 --- a/dns/dns_records.go +++ b/dns/dns_records.go @@ -322,4 +322,4 @@ func matchWildcardInternal(pattern, domain string, pi, di int) bool { } return matchWildcardInternal(pattern, domain, pi+1, di+1) -} \ No newline at end of file +} diff --git a/dns/dns_records_test.go b/dns/dns_records_test.go index 0bb18a1..f922afb 100644 --- a/dns/dns_records_test.go +++ b/dns/dns_records_test.go @@ -37,7 +37,7 @@ func TestWildcardMatching(t *testing.T) { domain: "autoco.internal.", expected: false, }, - + // Question mark wildcard tests { name: "host-0?.autoco.internal matches host-01.autoco.internal", @@ -63,7 +63,7 @@ func TestWildcardMatching(t *testing.T) { domain: "host-012.autoco.internal.", expected: false, }, - + // Combined wildcard tests { name: "*.host-0?.autoco.internal matches sub.host-01.autoco.internal", @@ -83,7 +83,7 @@ func TestWildcardMatching(t *testing.T) { domain: "host-01.autoco.internal.", expected: false, }, - + // Multiple asterisks { name: "*.*. autoco.internal matches any.thing.autoco.internal", @@ -97,7 +97,7 @@ func TestWildcardMatching(t *testing.T) { domain: "single.autoco.internal.", expected: false, }, - + // Asterisk in middle { name: "host-*.autoco.internal matches host-anything.autoco.internal", @@ -111,7 +111,7 @@ func TestWildcardMatching(t *testing.T) { domain: "host-.autoco.internal.", expected: true, }, - + // Multiple question marks { name: "host-??.autoco.internal matches host-01.autoco.internal", @@ -125,7 +125,7 @@ func TestWildcardMatching(t *testing.T) { domain: "host-1.autoco.internal.", expected: false, }, - + // Exact match (no wildcards) { name: "exact.autoco.internal matches exact.autoco.internal", @@ -139,7 +139,7 @@ func TestWildcardMatching(t *testing.T) { domain: "other.autoco.internal.", expected: false, }, - + // Edge cases { name: "* matches anything", @@ -154,7 +154,7 @@ func TestWildcardMatching(t *testing.T) { expected: true, }, } - + for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { result := matchWildcard(tt.pattern, tt.domain) @@ -167,21 +167,21 @@ func TestWildcardMatching(t *testing.T) { func TestDNSRecordStoreWildcard(t *testing.T) { store := NewDNSRecordStore() - + // Add wildcard records wildcardIP := net.ParseIP("10.0.0.1") err := store.AddRecord("*.autoco.internal", wildcardIP) if err != nil { t.Fatalf("Failed to add wildcard record: %v", err) } - + // Add exact record exactIP := net.ParseIP("10.0.0.2") err = store.AddRecord("exact.autoco.internal", exactIP) if err != nil { t.Fatalf("Failed to add exact record: %v", err) } - + // Test exact match takes precedence ips := store.GetRecords("exact.autoco.internal.", RecordTypeA) if len(ips) != 1 { @@ -190,7 +190,7 @@ func TestDNSRecordStoreWildcard(t *testing.T) { if !ips[0].Equal(exactIP) { t.Errorf("Expected exact IP %v, got %v", exactIP, ips[0]) } - + // Test wildcard match ips = store.GetRecords("host.autoco.internal.", RecordTypeA) if len(ips) != 1 { @@ -199,7 +199,7 @@ func TestDNSRecordStoreWildcard(t *testing.T) { if !ips[0].Equal(wildcardIP) { t.Errorf("Expected wildcard IP %v, got %v", wildcardIP, ips[0]) } - + // Test non-match (base domain) ips = store.GetRecords("autoco.internal.", RecordTypeA) if len(ips) != 0 { @@ -209,14 +209,14 @@ func TestDNSRecordStoreWildcard(t *testing.T) { func TestDNSRecordStoreComplexWildcard(t *testing.T) { store := NewDNSRecordStore() - + // Add complex wildcard pattern ip1 := net.ParseIP("10.0.0.1") err := store.AddRecord("*.host-0?.autoco.internal", ip1) if err != nil { t.Fatalf("Failed to add wildcard record: %v", err) } - + // Test matching domain ips := store.GetRecords("sub.host-01.autoco.internal.", RecordTypeA) if len(ips) != 1 { @@ -225,13 +225,13 @@ func TestDNSRecordStoreComplexWildcard(t *testing.T) { if len(ips) > 0 && !ips[0].Equal(ip1) { t.Errorf("Expected IP %v, got %v", ip1, ips[0]) } - + // Test non-matching domain (missing prefix) ips = store.GetRecords("host-01.autoco.internal.", RecordTypeA) if len(ips) != 0 { t.Errorf("Expected 0 IPs for domain without prefix, got %d", len(ips)) } - + // Test non-matching domain (wrong ? position) ips = store.GetRecords("sub.host-012.autoco.internal.", RecordTypeA) if len(ips) != 0 { @@ -241,23 +241,23 @@ func TestDNSRecordStoreComplexWildcard(t *testing.T) { func TestDNSRecordStoreRemoveWildcard(t *testing.T) { store := NewDNSRecordStore() - + // Add wildcard record ip := net.ParseIP("10.0.0.1") err := store.AddRecord("*.autoco.internal", ip) if err != nil { t.Fatalf("Failed to add wildcard record: %v", err) } - + // Verify it exists ips := store.GetRecords("host.autoco.internal.", RecordTypeA) if len(ips) != 1 { t.Errorf("Expected 1 IP before removal, got %d", len(ips)) } - + // Remove wildcard record store.RemoveRecord("*.autoco.internal", nil) - + // Verify it's gone ips = store.GetRecords("host.autoco.internal.", RecordTypeA) if len(ips) != 0 { @@ -267,40 +267,40 @@ func TestDNSRecordStoreRemoveWildcard(t *testing.T) { func TestDNSRecordStoreMultipleWildcards(t *testing.T) { store := NewDNSRecordStore() - + // Add multiple wildcard patterns that don't overlap ip1 := net.ParseIP("10.0.0.1") ip2 := net.ParseIP("10.0.0.2") ip3 := net.ParseIP("10.0.0.3") - + err := store.AddRecord("*.prod.autoco.internal", ip1) if err != nil { t.Fatalf("Failed to add first wildcard: %v", err) } - + err = store.AddRecord("*.dev.autoco.internal", ip2) if err != nil { t.Fatalf("Failed to add second wildcard: %v", err) } - + // Add a broader wildcard that matches both err = store.AddRecord("*.autoco.internal", ip3) if err != nil { t.Fatalf("Failed to add third wildcard: %v", err) } - + // Test domain matching only the prod pattern and the broad pattern ips := store.GetRecords("host.prod.autoco.internal.", RecordTypeA) if len(ips) != 2 { t.Errorf("Expected 2 IPs (prod + broad), got %d", len(ips)) } - + // Test domain matching only the dev pattern and the broad pattern ips = store.GetRecords("service.dev.autoco.internal.", RecordTypeA) if len(ips) != 2 { t.Errorf("Expected 2 IPs (dev + broad), got %d", len(ips)) } - + // Test domain matching only the broad pattern ips = store.GetRecords("host.test.autoco.internal.", RecordTypeA) if len(ips) != 1 { @@ -310,14 +310,14 @@ func TestDNSRecordStoreMultipleWildcards(t *testing.T) { func TestDNSRecordStoreIPv6Wildcard(t *testing.T) { store := NewDNSRecordStore() - + // Add IPv6 wildcard record ip := net.ParseIP("2001:db8::1") err := store.AddRecord("*.autoco.internal", ip) if err != nil { t.Fatalf("Failed to add IPv6 wildcard record: %v", err) } - + // Test wildcard match for IPv6 ips := store.GetRecords("host.autoco.internal.", RecordTypeAAAA) if len(ips) != 1 { @@ -330,21 +330,21 @@ func TestDNSRecordStoreIPv6Wildcard(t *testing.T) { func TestHasRecordWildcard(t *testing.T) { store := NewDNSRecordStore() - + // Add wildcard record ip := net.ParseIP("10.0.0.1") err := store.AddRecord("*.autoco.internal", ip) if err != nil { t.Fatalf("Failed to add wildcard record: %v", err) } - + // Test HasRecord with wildcard match if !store.HasRecord("host.autoco.internal.", RecordTypeA) { t.Error("Expected HasRecord to return true for wildcard match") } - + // Test HasRecord with non-match if store.HasRecord("autoco.internal.", RecordTypeA) { t.Error("Expected HasRecord to return false for base domain") } -} \ No newline at end of file +} diff --git a/dns/platform/darwin.go b/dns/platform/darwin.go index 61cc81b..8054c57 100644 --- a/dns/platform/darwin.go +++ b/dns/platform/darwin.go @@ -416,4 +416,4 @@ func (d *DarwinDNSConfigurator) clearState() error { logger.Debug("Cleared DNS state file") return nil -} \ No newline at end of file +} diff --git a/olm/olm.go b/olm/olm.go index f84ee4f..02257b8 100644 --- a/olm/olm.go +++ b/olm/olm.go @@ -811,7 +811,7 @@ func StartTunnel(config TunnelConfig) { Endpoint: handshakeData.ExitNode.Endpoint, RelayPort: relayPort, PublicKey: handshakeData.ExitNode.PublicKey, - SiteIds: []int{siteId}, + SiteIds: []int{siteId}, } added := holePunchManager.AddExitNode(exitNode)