From 78bf5ddc2b2078e8d94d21ffb73677223c4d11f3 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Fri, 8 Nov 2024 17:29:12 +0000 Subject: [PATCH] stash --- internal/dns/settings.go | 5 +++-- internal/dns/setup.go | 2 +- internal/provider/expressvpn/updater/hardcoded.go | 9 --------- internal/updater/resolver/parallel.go | 4 +++- maintenance.md | 4 +++- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/internal/dns/settings.go b/internal/dns/settings.go index bfad5e12..ae1e3f9d 100644 --- a/internal/dns/settings.go +++ b/internal/dns/settings.go @@ -22,14 +22,15 @@ func (l *Loop) SetSettings(ctx context.Context, settings settings.DNS) ( return l.state.SetSettings(ctx, settings) } -func buildDoTSettings(settings settings.DNS, +func buildServerSettings(settings settings.DNS, filter *mapfilter.Filter, logger Logger) ( serverSettings server.Settings, err error, ) { serverSettings.Logger = logger + providersData := provider.NewProviders() var dotSettings dot.Settings - providersData := provider.NewProviders() + dotSettings.Warner = logger dotSettings.UpstreamResolvers = make([]provider.Provider, len(settings.DoT.Providers)) for i := range settings.DoT.Providers { var err error diff --git a/internal/dns/setup.go b/internal/dns/setup.go index 4eb97d95..aab34252 100644 --- a/internal/dns/setup.go +++ b/internal/dns/setup.go @@ -20,7 +20,7 @@ func (l *Loop) setupServer(ctx context.Context) (runError <-chan error, err erro settings := l.GetSettings() - dotSettings, err := buildDoTSettings(settings, l.filter, l.logger) + dotSettings, err := buildServerSettings(settings, l.filter, l.logger) if err != nil { return nil, fmt.Errorf("building DoT settings: %w", err) } diff --git a/internal/provider/expressvpn/updater/hardcoded.go b/internal/provider/expressvpn/updater/hardcoded.go index f3b8cdab..93ef072b 100644 --- a/internal/provider/expressvpn/updater/hardcoded.go +++ b/internal/provider/expressvpn/updater/hardcoded.go @@ -32,7 +32,6 @@ func hardcodedServers() (servers []models.Server) { {Country: "Canada", City: "Montreal", Hostname: "canada-montreal-ca-version-2.expressnetw.com"}, {Country: "Canada", City: "Toronto", Hostname: "canada-toronto-2-ca-version-2.expressnetw.com"}, {Country: "Canada", City: "Toronto", Hostname: "canada-toronto-ca-version-2.expressnetw.com"}, - {Country: "Canada", City: "Vancouver", Hostname: "canada-vancouver-ca-version-2.expressnetw.com"}, {Country: "Chile", Hostname: "chile-ca-version-2.expressnetw.com"}, {Country: "Colombia", Hostname: "colombia-ca-version-2.expressnetw.com"}, {Country: "Costa Rica", City: "Costa Rica", Hostname: "costarica-ca-version-2.expressnetw.com"}, @@ -49,17 +48,13 @@ func hardcodedServers() (servers []models.Server) { {Country: "France", City: "Strasbourg", Hostname: "france-strasbourg-ca-version-2.expressnetw.com"}, {Country: "Georgia", Hostname: "georgia-ca-version-2.expressnetw.com"}, {Country: "Germany", City: "Frankfurt", Hostname: "germany-frankfurt-1-ca-version-2.expressnetw.com"}, - {Country: "Germany", City: "Frankfurt", Hostname: "germany-frankfurt-2-ca-version-2.expressnetw.com"}, {Country: "Germany", City: "Frankfurt", Hostname: "germany-darmstadt-ca-version-2.expressnetw.com"}, {Country: "Germany", City: "Nuremberg", Hostname: "germany-nuremberg-ca-version-2.expressnetw.com"}, {Country: "Greece", Hostname: "greece-ca-version-2.expressnetw.com"}, {Country: "Guatemala", Hostname: "guatemala-ca-version-2.expressnetw.com"}, {Country: "Hong Kong", City: "Hong Kong", Hostname: "hongkong-2-ca-version-2.expressnetw.com"}, - {Country: "Hong Kong", City: "Hong Kong", Hostname: "hongkong4-ca-version-2.expressnetw.com"}, {Country: "Hungary", Hostname: "hungary-ca-version-2.expressnetw.com"}, {Country: "Iceland", Hostname: "iceland-ca-version-2.expressnetw.com"}, - {Country: "India", City: "Chennai", Hostname: "india-chennai-ca-version-2.expressnetw.com"}, - {Country: "India", City: "Mumbai", Hostname: "india-mumbai-1-ca-version-2.expressnetw.com"}, {Country: "Indonesia", Hostname: "indonesia-ca-version-2.expressnetw.com"}, {Country: "Ireland", Hostname: "ireland-ca-version-2.expressnetw.com"}, {Country: "Isle Of Man", City: "Isle Of Man", Hostname: "isleofman-ca-version-2.expressnetw.com"}, @@ -72,7 +67,6 @@ func hardcodedServers() (servers []models.Server) { {Country: "Jersey", Hostname: "jersey-ca-version-2.expressnetw.com"}, {Country: "Kazakhstan", Hostname: "kazakhstan-ca-version-2.expressnetw.com"}, {Country: "Kenya", Hostname: "kenya-ca-version-2.expressnetw.com"}, - {Country: "Kyrgyzstan", Hostname: "kyrgyzstan-ca-version-2.expressnetw.com"}, {Country: "Laos", Hostname: "laos-ca-version-2.expressnetw.com"}, {Country: "Latvia", Hostname: "latvia-ca-version-2.expressnetw.com"}, {Country: "Liechtenstein", Hostname: "liechtenstein-ca-version-2.expressnetw.com"}, @@ -88,7 +82,6 @@ func hardcodedServers() (servers []models.Server) { {Country: "Montenegro", Hostname: "montenegro-ca-version-2.expressnetw.com"}, {Country: "Myanmar", Hostname: "myanmar-ca-version-2.expressnetw.com"}, {Country: "Nepal", Hostname: "nepal-ca-version-2.expressnetw.com"}, - {Country: "Netherlands", City: "Amsterdam", Hostname: "netherlands-amsterdam-2-ca-version-2.expressnetw.com"}, {Country: "Netherlands", City: "Amsterdam", Hostname: "netherlands-amsterdam-ca-version-2.expressnetw.com"}, {Country: "Netherlands", City: "Rotterdam", Hostname: "netherlands-rotterdam-ca-version-2.expressnetw.com"}, {Country: "Netherlands", City: "The Hague", Hostname: "netherlands-thehague-ca-version-2.expressnetw.com"}, @@ -129,7 +122,6 @@ func hardcodedServers() (servers []models.Server) { {Country: "USA", City: "Dallas", Hostname: "usa-dallas-2-ca-version-2.expressnetw.com"}, {Country: "USA", City: "Dallas", Hostname: "usa-dallas-ca-version-2.expressnetw.com"}, {Country: "USA", City: "Denver", Hostname: "usa-denver-ca-version-2.expressnetw.com"}, - {Country: "USA", City: "Los Angeles", Hostname: "usa-losangeles-1-ca-version-2.expressnetw.com"}, {Country: "USA", City: "Los Angeles", Hostname: "usa-losangeles-2-ca-version-2.expressnetw.com"}, {Country: "USA", City: "Los Angeles", Hostname: "usa-losangeles-3-ca-version-2.expressnetw.com"}, {Country: "USA", City: "Los Angeles", Hostname: "usa-losangeles5-ca-version-2.expressnetw.com"}, @@ -138,7 +130,6 @@ func hardcodedServers() (servers []models.Server) { {Country: "USA", City: "New Jersey", Hostname: "usa-newjersey-1-ca-version-2.expressnetw.com"}, {Country: "USA", City: "New Jersey", Hostname: "usa-newjersey2-ca-version-2.expressnetw.com"}, {Country: "USA", City: "New Jersey", Hostname: "usa-newjersey-3-ca-version-2.expressnetw.com"}, - {Country: "USA", City: "New York", Hostname: "us-new-york-2-ca-version-2.expressnetw.com"}, {Country: "USA", City: "New York", Hostname: "usa-newyork-ca-version-2.expressnetw.com"}, {Country: "USA", City: "Salt Lake City", Hostname: "usa-saltlakecity-ca-version-2.expressnetw.com"}, {Country: "USA", City: "San Francisco", Hostname: "usa-sanfrancisco-ca-version-2.expressnetw.com"}, diff --git a/internal/updater/resolver/parallel.go b/internal/updater/resolver/parallel.go index 3d22e1a1..38d2bbb3 100644 --- a/internal/updater/resolver/parallel.go +++ b/internal/updater/resolver/parallel.go @@ -5,10 +5,12 @@ import ( "errors" "fmt" "net/netip" + "time" ) type Parallel struct { - repeatResolver *Repeat + lastRequestTime time.Time + repeatResolver *Repeat } func NewParallelResolver(resolverAddress string) *Parallel { diff --git a/maintenance.md b/maintenance.md index 6282b738..e0f55ce0 100644 --- a/maintenance.md +++ b/maintenance.md @@ -1,6 +1,8 @@ # Maintenance -- Rename `UNBLOCK` to `DNS_HOSTNAMES_UNBLOCKED` + + +- Rename `UNBLOCK` to `DNS_ALLOWED_HOSTNAMES` - Change `Run` methods to `Start`+`Stop`, returning channels rather than injecting them - Go 1.18 - gofumpt