diff --git a/README.md b/README.md index d522713..e1125d7 100644 --- a/README.md +++ b/README.md @@ -20,16 +20,25 @@ Works with mobile versions too. * Jitter * IP Address, ISP, distance from server (optional) * Telemetry (optional) -* Results sharing (optional) +* Results sharing via PNG image and JSON API (optional) * Multiple Points of Test (optional) * Compatible with PHP frontend predefined endpoints (with `.php` suffixes) -* Supports [Proxy Protocol](https://www.haproxy.org/download/2.3/doc/proxy-protocol.txt) (without TLV support yet) +* Supports [Proxy Protocol](https://www.haproxy.org/download/2.3/doc/proxy-protocol.txt) +* Modern and classic UI designs with switchable interface +* ID obfuscation for test result privacy (optional) + +### IP Detection +* Client IP detection with proxy header chain support (X-Forwarded-For, X-Real-IP, Client-IP, CF-Connecting-IPv6) +* ISP and location detection via ipinfo.io API with offline GeoIP database fallback (MaxMind .mmdb) +* Private/special IP detection (including ULA IPv6 and CGNAT) +* Distance calculation with human-friendly rounding ![Screencast](https://speedtest.zzz.cat/speedtest.webp) ## Server requirements -* Any [Go supported platforms](https://github.com/golang/go/wiki/MinimumRequirements) -* BoltDB, PostgreSQL or MySQL database to store test results (optional) +* Any [Go supported platforms](https://github.com/golang/go/wiki/MinimumRequirements) (Go 1.21+) +* SQLite, BoltDB, PostgreSQL, MySQL or MSSQL database to store test results (optional) +* No external dependencies — single binary deployment * A fast! Internet connection ## Installation @@ -47,17 +56,7 @@ Works with mobile versions too. You can use an Ansible role for installing speedtest-go easily. You can find the role on the [Ansible galaxy](https://galaxy.ansible.com/flymia/ansible_speedtest_go). There is a [separate repository](https://github.com/flymia/ansible-speedtest_go) for documentation about the Ansible role. ### Compile from source -You need Go 1.16+ to compile the binary. If you have an older version of Go and don't want to install the tarball -manually, you can install newer version of Go into your `GOPATH`: - -0. Install Go 1.17 - - ``` - $ go get golang.org/dl/go1.17.1 - # Assuming your GOPATH is default (~/go), Go 1.17.1 will be installed in ~/go/bin - $ ~/go/bin/go1.17.1 version - go version go1.17.1 linux/amd64 - ``` +You need Go 1.21+ to compile the binary. 1. Clone this repository: @@ -76,19 +75,21 @@ manually, you can install newer version of Go into your `GOPATH`: 3. Copy the `assets` directory, `settings.toml` file along with the compiled `speedtest` binary into a single directory 4. If you have telemetry enabled, - - For PostgreSQL/MySQL, create database and import the corresponding `.sql` file under `database/{postgresql,mysql}` + - For PostgreSQL/MySQL/MSSQL, create database and import the corresponding `.sql` file under `database/{postgresql,mysql,mssql}` ``` # assume you have already created a database named `speedtest` under current user $ psql speedtest < database/postgresql/telemetry_postgresql.sql ``` - - For embedded BoltDB, make sure to define the `database_file` path in `settings.toml`: + - For embedded databases (BoltDB, SQLite), make sure to define the `database_file` path in `settings.toml`: ``` database_file="speedtest.db" ``` + - SQLite supports WAL mode for better concurrent performance and works out of the box with no additional dependencies. + 5. Put `assets` folder under the same directory as your compiled binary. - Make sure the font files and JavaScripts are in the `assets` directory - You can have multiple HTML pages under `assets` directory. They can be access directly under the server root @@ -119,7 +120,7 @@ manually, you can install newer version of Go into your `GOPATH`: # redact IP addresses redact_ip_addresses=false - # database type for statistics data, currently supports: none, memory, bolt, mysql, postgresql + # database type for statistics data, currently supports: none, memory, bolt, sqlite, mysql, postgresql, mssql # if none is specified, no telemetry/stats will be recorded, and no result PNG will be generated database_type="postgresql" database_hostname="localhost" @@ -127,9 +128,16 @@ manually, you can install newer version of Go into your `GOPATH`: database_username="postgres" database_password="" - # if you use `bolt` as database, set database_file to database file location + # database port (optional, defaults to driver default; only used by mssql) + database_port="" + + # if you use `bolt` or `sqlite` as database, set database_file to database file location database_file="speedtest.db" + # GeoIP offline database (.mmdb format) for ISP detection fallback (optional) + # Leave empty to disable. + # geoip_database_file="country_asn.mmdb" + # TLS and HTTP/2 settings. TLS is required for HTTP/2 enable_tls=false enable_http2=false @@ -141,11 +149,11 @@ manually, you can install newer version of Go into your `GOPATH`: ## Differences between Go and PHP implementation and caveats -- Since there is no CGo-free SQLite implementation available, I've opted to use [BoltDB](https://github.com/etcd-io/bbolt) - instead, as an embedded database alternative to SQLite -- Test IDs are generated ULID, there is no option to change them to plain ID -- You can use the same HTML template from the PHP implementation -- Server location can be defined in settings +- Test IDs are generated as ULID (Universally Unique Lexicographically Sortable Identifier), unlike the PHP version's auto-increment integer IDs +- ID obfuscation is available as an optional feature — when enabled, ULIDs are obfuscated with a per-instance salt +- The Go version ships with two built-in UI designs (classic gauges and modern CSS), switchable via `?design=new` URL parameter +- The modern design (`index-modern.html`) supports multi-server configuration via `server-list.json` placed alongside the binary +- Server location can be defined in settings or auto-detected at startup - There might be a slight delay on program start if your Internet connection is slow. That's because the program will attempt to fetch your current network's ISP info for distance calculation between your network and the speed test client's. This action will only be taken once, and cached for later use. diff --git a/config/config.go b/config/config.go index f092431..bb46b6f 100644 --- a/config/config.go +++ b/config/config.go @@ -14,8 +14,9 @@ type Config struct { ServerLng float64 `mapstructure:"server_lng"` IPInfoAPIKey string `mapstructure:"ipinfo_api_key"` - StatsPassword string `mapstructure:"statistics_password"` - RedactIP bool `mapstructure:"redact_ip_addresses"` + StatsPassword string `mapstructure:"statistics_password"` + RedactIP bool `mapstructure:"redact_ip_addresses"` + EnableIDObfuscation bool `mapstructure:"enable_id_obfuscation"` AssetsPath string `mapstructure:"assets_path"` @@ -26,6 +27,9 @@ type Config struct { DatabasePassword string `mapstructure:"database_password"` DatabaseFile string `mapstructure:"database_file"` + DatabasePort string `mapstructure:"database_port"` + + GeoIPDatabaseFile string `mapstructure:"geoip_database_file"` EnableHTTP2 bool `mapstructure:"enable_http2"` EnableTLS bool `mapstructure:"enable_tls"` diff --git a/database/database.go b/database/database.go index 315b947..cb347bd 100644 --- a/database/database.go +++ b/database/database.go @@ -4,10 +4,12 @@ import ( "github.com/librespeed/speedtest-go/config" "github.com/librespeed/speedtest-go/database/bolt" "github.com/librespeed/speedtest-go/database/memory" + "github.com/librespeed/speedtest-go/database/mssql" "github.com/librespeed/speedtest-go/database/mysql" "github.com/librespeed/speedtest-go/database/none" "github.com/librespeed/speedtest-go/database/postgresql" "github.com/librespeed/speedtest-go/database/schema" + "github.com/librespeed/speedtest-go/database/sqlite" log "github.com/sirupsen/logrus" ) @@ -30,6 +32,10 @@ func SetDBInfo(conf *config.Config) { DB = mysql.Open(conf.DatabaseHostname, conf.DatabaseUsername, conf.DatabasePassword, conf.DatabaseName) case "bolt": DB = bolt.Open(conf.DatabaseFile) + case "sqlite": + DB = sqlite.Open(conf.DatabaseFile) + case "mssql": + DB = mssql.Open(conf.DatabaseHostname, conf.DatabaseUsername, conf.DatabasePassword, conf.DatabaseName, conf.DatabasePort) case "memory": DB = memory.Open("") case "none": diff --git a/database/mssql/mssql.go b/database/mssql/mssql.go new file mode 100644 index 0000000..526b016 --- /dev/null +++ b/database/mssql/mssql.go @@ -0,0 +1,81 @@ +package mssql + +import ( + "database/sql" + "fmt" + "net/url" + + "github.com/librespeed/speedtest-go/database/schema" + + _ "github.com/denisenkom/go-mssqldb" + log "github.com/sirupsen/logrus" +) + +type MSSQL struct { + db *sql.DB +} + +func Open(hostname, username, password, database, port string) *MSSQL { + if port == "" { + port = "1433" + } + + query := url.Values{} + query.Add("database", database) + + connStr := fmt.Sprintf("sqlserver://%s:%s@%s:%s?%s", + url.QueryEscape(username), + url.QueryEscape(password), + hostname, + port, + query.Encode(), + ) + + conn, err := sql.Open("sqlserver", connStr) + if err != nil { + log.Fatalf("Cannot open MSSQL database: %s", err) + } + + return &MSSQL{db: conn} +} + +func (p *MSSQL) Insert(data *schema.TelemetryData) error { + stmt := `INSERT INTO speedtest_users (ip, ispinfo, extra, ua, lang, dl, ul, ping, jitter, log, uuid) + VALUES (@p1, @p2, @p3, @p4, @p5, @p6, @p7, @p8, @p9, @p10, @p11);` + _, err := p.db.Exec(stmt, + data.IPAddress, data.ISPInfo, data.Extra, data.UserAgent, data.Language, + data.Download, data.Upload, data.Ping, data.Jitter, data.Log, data.UUID) + return err +} + +func (p *MSSQL) FetchByUUID(uuid string) (*schema.TelemetryData, error) { + var record schema.TelemetryData + row := p.db.QueryRow(`SELECT * FROM speedtest_users WHERE uuid = @p1`, uuid) + if row != nil { + var id int64 + if err := row.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { + return nil, fmt.Errorf("mssql fetch by uuid: %w", err) + } + } + return &record, nil +} + +func (p *MSSQL) FetchLast100() ([]schema.TelemetryData, error) { + var records []schema.TelemetryData + rows, err := p.db.Query(`SELECT TOP 100 * FROM speedtest_users ORDER BY timestamp DESC;`) + if err != nil { + return nil, fmt.Errorf("mssql fetch last 100: %w", err) + } + if rows != nil { + defer rows.Close() + for rows.Next() { + var record schema.TelemetryData + var id int64 + if err := rows.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { + return nil, fmt.Errorf("mssql scan row: %w", err) + } + records = append(records, record) + } + } + return records, nil +} diff --git a/database/mssql/telemetry_mssql.sql b/database/mssql/telemetry_mssql.sql new file mode 100644 index 0000000..dd4f455 --- /dev/null +++ b/database/mssql/telemetry_mssql.sql @@ -0,0 +1,27 @@ +-- +-- MSSQL database schema for speedtest telemetry +-- + +CREATE TABLE [dbo].[speedtest_users]( + [id] [bigint] IDENTITY(120,1) NOT NULL, + [timestamp] [datetime] NOT NULL, + [ip] [nvarchar](max) NOT NULL, + [ispinfo] [nvarchar](max) NULL, + [extra] [nvarchar](max) NULL, + [ua] [nvarchar](max) NOT NULL, + [lang] [nvarchar](max) NOT NULL, + [dl] [nvarchar](max) NULL, + [ul] [nvarchar](max) NULL, + [ping] [nvarchar](max) NULL, + [jitter] [nvarchar](max) NULL, + [log] [nvarchar](max) NULL, + [uuid] [nvarchar](max) NULL, + CONSTRAINT [PK_speedtest_users] PRIMARY KEY CLUSTERED +( + [id] ASC +) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +ALTER TABLE [dbo].[speedtest_users] ADD CONSTRAINT [DF_speedtest_users_timestamp] DEFAULT (getdate()) FOR [timestamp] +GO diff --git a/database/sqlite/sqlite.go b/database/sqlite/sqlite.go new file mode 100644 index 0000000..15e5136 --- /dev/null +++ b/database/sqlite/sqlite.go @@ -0,0 +1,95 @@ +package sqlite + +import ( + "database/sql" + "fmt" + + "github.com/librespeed/speedtest-go/database/schema" + + _ "modernc.org/sqlite" + log "github.com/sirupsen/logrus" +) + +type SQLite struct { + db *sql.DB +} + +func Open(databaseFile string) *SQLite { + conn, err := sql.Open("sqlite", databaseFile) + if err != nil { + log.Fatalf("Cannot open SQLite database: %s", err) + } + + // Enable WAL mode for better concurrent performance + if _, err := conn.Exec("PRAGMA journal_mode=WAL"); err != nil { + log.Warnf("Failed to set SQLite journal mode to WAL: %s", err) + } + + // Create table if not exists (matching the PHP SQLite auto-creation behavior) + stmt := `CREATE TABLE IF NOT EXISTS speedtest_users ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + ip TEXT NOT NULL, + ispinfo TEXT, + extra TEXT, + ua TEXT NOT NULL, + lang TEXT NOT NULL, + dl TEXT, + ul TEXT, + ping TEXT, + jitter TEXT, + log TEXT, + uuid TEXT + );` + if _, err := conn.Exec(stmt); err != nil { + log.Fatalf("Failed to create speedtest_users table: %s", err) + } + + return &SQLite{db: conn} +} + +func (p *SQLite) Insert(data *schema.TelemetryData) error { + var existingID int + // Check for duplicate UUID first + err := p.db.QueryRow(`SELECT id FROM speedtest_users WHERE uuid = ?`, data.UUID).Scan(&existingID) + if err == nil { + // Record with this UUID already exists - skip insert + return nil + } + + stmt := `INSERT INTO speedtest_users (ip, ispinfo, extra, ua, lang, dl, ul, ping, jitter, log, uuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);` + _, err = p.db.Exec(stmt, data.IPAddress, data.ISPInfo, data.Extra, data.UserAgent, data.Language, data.Download, data.Upload, data.Ping, data.Jitter, data.Log, data.UUID) + return err +} + +func (p *SQLite) FetchByUUID(uuid string) (*schema.TelemetryData, error) { + var record schema.TelemetryData + row := p.db.QueryRow(`SELECT * FROM speedtest_users WHERE uuid = ?`, uuid) + if row != nil { + var id int + if err := row.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { + return nil, fmt.Errorf("sqlite fetch by uuid: %w", err) + } + } + return &record, nil +} + +func (p *SQLite) FetchLast100() ([]schema.TelemetryData, error) { + var records []schema.TelemetryData + rows, err := p.db.Query(`SELECT * FROM speedtest_users ORDER BY timestamp DESC LIMIT 100;`) + if err != nil { + return nil, fmt.Errorf("sqlite fetch last 100: %w", err) + } + if rows != nil { + defer rows.Close() + for rows.Next() { + var record schema.TelemetryData + var id int + if err := rows.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { + return nil, fmt.Errorf("sqlite scan row: %w", err) + } + records = append(records, record) + } + } + return records, nil +} diff --git a/database/sqlite/telemetry_sqlite.sql b/database/sqlite/telemetry_sqlite.sql new file mode 100644 index 0000000..212c300 --- /dev/null +++ b/database/sqlite/telemetry_sqlite.sql @@ -0,0 +1,21 @@ +-- +-- SQLite database schema for speedtest telemetry +-- Auto-created by the sqlite backend if it doesn't exist. +-- This file is provided for reference / manual setup. +-- + +CREATE TABLE IF NOT EXISTS `speedtest_users` ( + `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + `timestamp` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `ip` TEXT NOT NULL, + `ispinfo` TEXT, + `extra` TEXT, + `ua` TEXT NOT NULL, + `lang` TEXT NOT NULL, + `dl` TEXT, + `ul` TEXT, + `ping` TEXT, + `jitter` TEXT, + `log` TEXT, + `uuid` TEXT +); diff --git a/go.mod b/go.mod index 90195fe..e4f2a67 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,11 @@ module github.com/librespeed/speedtest-go -go 1.16 +go 1.25.0 require ( github.com/breml/rootcerts v0.2.1 github.com/coreos/go-systemd/v22 v22.4.0 + github.com/denisenkom/go-mssqldb v0.12.3 github.com/go-chi/chi/v5 v5.0.7 github.com/go-chi/cors v1.2.0 github.com/go-chi/render v1.0.1 @@ -14,12 +15,42 @@ require ( github.com/gorilla/sessions v1.2.1 github.com/lib/pq v1.10.4 github.com/oklog/ulid/v2 v2.0.2 + github.com/oschwald/maxminddb-golang v1.13.1 github.com/pires/go-proxyproto v0.6.1 github.com/sirupsen/logrus v1.8.1 - github.com/spf13/afero v1.8.0 // indirect github.com/spf13/viper v1.10.1 github.com/umahmood/haversine v0.0.0-20151105152445-808ab04add26 go.etcd.io/bbolt v1.3.6 golang.org/x/image v0.0.0-20211028202545-6944b10bf410 - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + modernc.org/sqlite v1.50.0 +) + +require ( + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect + github.com/golang-sql/sqlexp v0.1.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/kr/pretty v0.2.0 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/ncruces/go-strftime v1.0.0 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/spf13/afero v1.8.0 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect + golang.org/x/sys v0.42.0 // indirect + golang.org/x/text v0.3.7 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + modernc.org/libc v1.72.0 // indirect + modernc.org/mathutil v1.7.1 // indirect + modernc.org/memory v1.11.0 // indirect ) diff --git a/go.sum b/go.sum index 1dbc9fb..da55bbb 100644 --- a/go.sum +++ b/go.sum @@ -17,17 +17,6 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -36,7 +25,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -48,71 +36,39 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/breml/rootcerts v0.2.1 h1:GZMVDXOs945764NFck0vtHSjktKYubOFM0kjf5HAuwc= github.com/breml/rootcerts v0.2.1/go.mod h1:24FDtzYMpqIeYC7QzaE8VPRQaFZU5TIUDlyk8qwjD88= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.4.0 h1:y9YHcjnjynCd/DVbg5j9L/33jQM3MxJlbj/zWskzfGU= github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw= +github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo= +github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE= @@ -122,23 +78,19 @@ github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= +github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -146,8 +98,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -162,10 +112,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -176,15 +122,10 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -195,66 +136,32 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -263,78 +170,35 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= +github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= +github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc= github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE= +github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pires/go-proxyproto v0.6.1 h1:EBupykFmo22SDjv4fQVQd2J9NOoLPmyZA/15ldOGkPw= github.com/pires/go-proxyproto v0.6.1/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60= github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= @@ -346,51 +210,38 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/umahmood/haversine v0.0.0-20151105152445-808ab04add26 h1:UFHFmFfixpmfRBcxuu+LA9l8MdURWVdVNUHxO5n1d2w= github.com/umahmood/haversine v0.0.0-20151105152445-808ab04add26/go.mod h1:IGhd0qMDsUa9acVjsbsT7bu3ktadtGOHI79+idTew/M= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -416,7 +267,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -427,11 +277,10 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= +golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -439,11 +288,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -460,16 +307,11 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -479,14 +321,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -497,32 +331,23 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -541,32 +366,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -574,7 +381,6 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -594,7 +400,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -619,7 +424,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -628,14 +432,10 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= +golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -659,19 +459,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -702,7 +489,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -715,33 +501,7 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -755,21 +515,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -780,10 +528,6 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= @@ -791,17 +535,14 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -809,6 +550,34 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +modernc.org/cc/v4 v4.27.3 h1:uNCgn37E5U09mTv1XgskEVUJ8ADKpmFMPxzGJ0TSo+U= +modernc.org/cc/v4 v4.27.3/go.mod h1:3YjcbCqhoTTHPycJDRl2WZKKFj0nwcOIPBfEZK0Hdk8= +modernc.org/ccgo/v4 v4.32.4 h1:L5OB8rpEX4ZsXEQwGozRfJyJSFHbbNVOoQ59DU9/KuU= +modernc.org/ccgo/v4 v4.32.4/go.mod h1:lY7f+fiTDHfcv6YlRgSkxYfhs+UvOEEzj49jAn2TOx0= +modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= +modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= +modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= +modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= +modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo= +modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= +modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= +modernc.org/libc v1.72.0 h1:IEu559v9a0XWjw0DPoVKtXpO2qt5NVLAnFaBbjq+n8c= +modernc.org/libc v1.72.0/go.mod h1:tTU8DL8A+XLVkEY3x5E/tO7s2Q/q42EtnNWda/L5QhQ= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= +modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= +modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= +modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= +modernc.org/sqlite v1.50.0 h1:eMowQSWLK0MeiQTdmz3lqoF5dqclujdlIKeJA11+7oM= +modernc.org/sqlite v1.50.0/go.mod h1:m0w8xhwYUVY3H6pSDwc3gkJ/irZT/0YEXwBlhaxQEew= +modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= +modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= +modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= +modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/results/idobfuscation.go b/results/idobfuscation.go new file mode 100644 index 0000000..da3d545 --- /dev/null +++ b/results/idobfuscation.go @@ -0,0 +1,119 @@ +package results + +import ( + "crypto/rand" + "encoding/base64" + "encoding/binary" + "fmt" + "os" + "path/filepath" + "sync" + + "github.com/oklog/ulid/v2" + log "github.com/sirupsen/logrus" +) + +// ID obfuscation provides an optional privacy layer for test result URLs. +// When enabled, the telemetry endpoint returns an obfuscated ULID that must +// be deobfuscated before looking up the result. +// +// This is NOT cryptographically secure — it prevents casual ID guessing, +// matching the behavior of the PHP version's idObfuscation.php. + +var ( + obfuscationSalt uint32 + obfuscationSaltOnce sync.Once + obfuscationSaltErr error +) + +const obfuscationSaltFile = "idObfuscation_salt.bin" + +func getOrCreateObfuscationSalt() (uint32, error) { + obfuscationSaltOnce.Do(func() { + data, err := os.ReadFile(obfuscationSaltFile) + if err == nil && len(data) == 4 { + obfuscationSalt = binary.LittleEndian.Uint32(data) + return + } + + saltBytes := make([]byte, 4) + if _, err := rand.Read(saltBytes); err != nil { + obfuscationSaltErr = fmt.Errorf("failed to generate obfuscation salt: %w", err) + return + } + obfuscationSalt = binary.LittleEndian.Uint32(saltBytes) + + dir := filepath.Dir(obfuscationSaltFile) + if dir != "." { + if err := os.MkdirAll(dir, 0755); err != nil { + log.Warnf("Could not create directory for obfuscation salt file: %s", err) + } + } + if err := os.WriteFile(obfuscationSaltFile, saltBytes, 0644); err != nil { + log.Warnf("Could not save obfuscation salt file: %s", err) + } + }) + + return obfuscationSalt, obfuscationSaltErr +} + +// obfuscateBytes applies reversible transform on ULID bytes: +// XOR the first 4 bytes with the salt (simple but effective for casual privacy) +func obfuscateBytes(data []byte) []byte { + salt, err := getOrCreateObfuscationSalt() + if err != nil || len(data) < 4 { + return data + } + result := make([]byte, len(data)) + copy(result, data) + val := binary.LittleEndian.Uint32(result[:4]) + val ^= salt + binary.LittleEndian.PutUint32(result[:4], val) + return result +} + +// deobfuscateBytes reverses obfuscateBytes (XOR is self-inverse) +var deobfuscateBytes = obfuscateBytes + +// ObfuscateULID transforms a ULID string to its obfuscated (base64) form +func ObfuscateULID(id string) string { + parsed, err := ulid.Parse(id) + if err != nil { + return id + } + obfuscated := obfuscateBytes(parsed[:]) + return base64.RawURLEncoding.EncodeToString(obfuscated) +} + +// DeobfuscateULID reverses ULID obfuscation +func DeobfuscateULID(obfuscated string) (string, error) { + data, err := base64.RawURLEncoding.DecodeString(obfuscated) + if err != nil { + return "", fmt.Errorf("invalid obfuscated ID encoding: %w", err) + } + if len(data) != 16 { + return "", fmt.Errorf("invalid obfuscated ID length: %d", len(data)) + } + deobfuscated := deobfuscateBytes(data) + var id ulid.ULID + copy(id[:], deobfuscated) + return id.String(), nil +} + +// ResolveID takes an ID string and returns the database ULID. +// It tries the raw input first, then attempts deobfuscation. +func ResolveID(id string) string { + // First try: use as-is (plain ULID) + if _, err := ulid.Parse(id); err == nil { + return id + } + + // Second try: deobfuscate + if deobfuscated, err := DeobfuscateULID(id); err == nil { + return deobfuscated + } + + return id +} + + diff --git a/results/json.go b/results/json.go new file mode 100644 index 0000000..bd05662 --- /dev/null +++ b/results/json.go @@ -0,0 +1,102 @@ +package results + +import ( + "encoding/json" + "net/http" + "strconv" + "strings" + + "github.com/go-chi/render" + "github.com/librespeed/speedtest-go/config" + "github.com/librespeed/speedtest-go/database" + log "github.com/sirupsen/logrus" +) + +// formatValue formats a numeric string for display, matching PHP behavior: +// - values < 10: 2 decimal places +// - values < 100: 1 decimal place +// - values >= 100: 0 decimal places +func formatValue(d string) string { + val, err := strconv.ParseFloat(d, 64) + if err != nil { + return d + } + if val < 10 { + return strconv.FormatFloat(val, 'f', 2, 64) + } + if val < 100 { + return strconv.FormatFloat(val, 'f', 1, 64) + } + return strconv.FormatFloat(val, 'f', 0, 64) +} + +// extractISPName extracts the ISP name from the processedString format: +// "IP - ISP, Country (distance)" → "ISP" +func extractISPName(processedString string) string { + dash := strings.Index(processedString, "-") + if dash == -1 { + return "" + } + isp := strings.TrimSpace(processedString[dash+1:]) + par := strings.LastIndex(isp, "(") + if par != -1 { + isp = strings.TrimSpace(isp[:par]) + } + return isp +} + +// JSONResponse is the structure returned by the JSON results endpoint +type JSONResponse struct { + Timestamp string `json:"timestamp"` + Download string `json:"download"` + Upload string `json:"upload"` + Ping string `json:"ping"` + Jitter string `json:"jitter"` + ISPInfo string `json:"ispinfo"` +} + +// JSONResult handles GET /results/json?id=X and returns test results as JSON +func JSONResult(w http.ResponseWriter, r *http.Request) { + conf := config.LoadedConfig() + + if conf.DatabaseType == "none" { + render.PlainText(w, r, "Telemetry is disabled") + return + } + + rawID := r.FormValue("id") + if rawID == "" { + w.WriteHeader(http.StatusBadRequest) + render.JSON(w, r, map[string]string{"error": "missing id parameter"}) + return + } + + uuid := ResolveID(rawID) + record, err := database.DB.FetchByUUID(uuid) + if err != nil { + log.Errorf("Error querying database for JSON result: %s", err) + w.WriteHeader(http.StatusNotFound) + render.JSON(w, r, map[string]string{"error": "result not found"}) + return + } + + // Format values for display (matching PHP json.php behavior) + resp := JSONResponse{ + Timestamp: record.Timestamp.Format("2006-01-02 15:04:05"), + Download: formatValue(record.Download), + Upload: formatValue(record.Upload), + Ping: formatValue(record.Ping), + Jitter: formatValue(record.Jitter), + } + + // Extract ISP name from ISP info JSON + var result Result + if err := json.Unmarshal([]byte(record.ISPInfo), &result); err == nil { + resp.ISPInfo = extractISPName(result.ProcessedString) + } + + w.Header().Set("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, s-maxage=0") + w.Header().Add("Cache-Control", "post-check=0, pre-check=0") + w.Header().Set("Pragma", "no-cache") + render.JSON(w, r, resp) +} diff --git a/results/telemetry.go b/results/telemetry.go index 7103a85..566db23 100644 --- a/results/telemetry.go +++ b/results/telemetry.go @@ -201,7 +201,12 @@ func Record(w http.ResponseWriter, r *http.Request) { return } - if _, err := w.Write([]byte("id " + uuid.String())); err != nil { + responseID := uuid.String() + if config.LoadedConfig().EnableIDObfuscation { + responseID = ObfuscateULID(uuid.String()) + } + + if _, err := w.Write([]byte("id " + responseID)); err != nil { log.Errorf("Error writing ID to telemetry request: %s", err) w.WriteHeader(http.StatusInternalServerError) } @@ -214,7 +219,8 @@ func DrawPNG(w http.ResponseWriter, r *http.Request) { return } - uuid := r.FormValue("id") + rawID := r.FormValue("id") + uuid := ResolveID(rawID) record, err := database.DB.FetchByUUID(uuid) if err != nil { log.Errorf("Error querying database: %s", err) diff --git a/settings.toml b/settings.toml index 0f0de1f..4ef8a47 100644 --- a/settings.toml +++ b/settings.toml @@ -20,17 +20,25 @@ statistics_password="PASSWORD" # redact IP addresses redact_ip_addresses=false -# database type for statistics data, currently supports: none, memory, bolt, mysql, postgresql +# database type for statistics data, currently supports: none, memory, bolt, mysql, postgresql, sqlite, mssql # if none is specified, no telemetry/stats will be recorded, and no result PNG will be generated database_type="memory" database_hostname="" database_name="" database_username="" database_password="" +# database port (optional, defaults to driver default) +database_port="" # if you use `bolt` as database, set database_file to database file location +# if you use `sqlite` as database, set database_file to database file location database_file="speedtest.db" +# GeoIP offline database (.mmdb format) for ISP and country detection when ipinfo.io API is not available +# This is used as a fallback, matching the PHP backend behavior. +# Leave empty to disable. +# geoip_database_file="country_asn.mmdb" + # TLS and HTTP/2 settings. TLS is required for HTTP/2 enable_tls=false enable_http2=false diff --git a/web/assets/design-switch.js b/web/assets/design-switch.js new file mode 100644 index 0000000..4469baa --- /dev/null +++ b/web/assets/design-switch.js @@ -0,0 +1,45 @@ +/** + * Feature switch for enabling the new LibreSpeed design + * + * This script checks for: + * 1. URL parameter: ?design=new or ?design=old + * 2. Default behavior: Shows the classic design + * + * Note: This script is only loaded on the root index.html + */ +(function () { + 'use strict'; + + // Don't run this script if we're already on a specific design page + const currentPath = window.location.pathname; + if (currentPath.includes('index-classic.html') || currentPath.includes('index-modern.html')) { + return; + } + + // Check URL parameters first + const urlParams = new URLSearchParams(window.location.search); + const designParam = urlParams.get('design'); + + if (designParam === 'new') { + redirectToNewDesign(); + return; + } + + if (designParam === 'old' || designParam === 'classic') { + redirectToOldDesign(); + return; + } + + // Default to classic design + redirectToOldDesign(); + + function redirectToNewDesign() { + const currentParams = window.location.search; + window.location.href = 'index-modern.html' + currentParams; + } + + function redirectToOldDesign() { + const currentParams = window.location.search; + window.location.href = 'index-classic.html' + currentParams; + } +})(); diff --git a/web/assets/favicon.ico b/web/assets/favicon.ico new file mode 100755 index 0000000..e50e89a Binary files /dev/null and b/web/assets/favicon.ico differ diff --git a/web/assets/fonts/Inter-latin-ext.woff2 b/web/assets/fonts/Inter-latin-ext.woff2 new file mode 100644 index 0000000..887153b Binary files /dev/null and b/web/assets/fonts/Inter-latin-ext.woff2 differ diff --git a/web/assets/fonts/Inter-latin.woff2 b/web/assets/fonts/Inter-latin.woff2 new file mode 100644 index 0000000..798d6d9 Binary files /dev/null and b/web/assets/fonts/Inter-latin.woff2 differ diff --git a/web/assets/images/background.jpeg b/web/assets/images/background.jpeg new file mode 100644 index 0000000..e0f8916 Binary files /dev/null and b/web/assets/images/background.jpeg differ diff --git a/web/assets/images/chevron.svg b/web/assets/images/chevron.svg new file mode 100644 index 0000000..d520abd --- /dev/null +++ b/web/assets/images/chevron.svg @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/web/assets/images/close-button.svg b/web/assets/images/close-button.svg new file mode 100644 index 0000000..befe4e6 --- /dev/null +++ b/web/assets/images/close-button.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/web/assets/images/favicon.svg b/web/assets/images/favicon.svg new file mode 100644 index 0000000..a38e24d --- /dev/null +++ b/web/assets/images/favicon.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/assets/images/logo.svg b/web/assets/images/logo.svg new file mode 100644 index 0000000..709aa1c --- /dev/null +++ b/web/assets/images/logo.svg @@ -0,0 +1,66 @@ + \ No newline at end of file diff --git a/web/assets/index-classic.html b/web/assets/index-classic.html new file mode 100755 index 0000000..823ef9f --- /dev/null +++ b/web/assets/index-classic.html @@ -0,0 +1,365 @@ + + + + + + + + + +LibreSpeed Example + + +

LibreSpeed Example

+
+

+ Privacy +
+
+
+
Ping
+
+
ms
+
+
+
Jitter
+
+
ms
+
+
+
+
+
Download
+ +
+
Mbps
+
+
+
Upload
+ +
+
Mbps
+
+
+
+ +
+ +
+ Source code +
+ + + + diff --git a/web/assets/index-modern.html b/web/assets/index-modern.html new file mode 100644 index 0000000..c855f78 --- /dev/null +++ b/web/assets/index-modern.html @@ -0,0 +1,152 @@ + + + + + + + + + + + + + LibreSpeed - Free and Open Source Speedtest + + + +
+ LibreSpeed +
+
+

Free and Open Source Speedtest.

+

No Flash, No Java, No Websockets, No Bullsh*t

+ +
+
+
+ select... +
+

current server

+

searching nearest server...

+
+ + +
+ + + + +
+ + +
+
+
+

00 Mbps

+

Download

+
+ +
+
+
+

00 Mbps

+

Upload

+
+ + +
+ + +
+ + + +
+ Close +
+ Test results in graphical form + + + + +
+ Close +
+
+

Privacy Policy

+

+ This HTML5 speed test server is configured with telemetry enabled. +

+ +

What data we collect

+

+ At the end of the test, the following data is collected and stored: +

+ + + +

How we use the data

+

Data collected through this service is used to:

+ + + +

No personal information is disclosed to third parties.

+ +

Your consent

+

+ By starting the test, you consent to the terms of this privacy policy. +

+ +

Data removal

+

+ If you want to have your information deleted, you need to provide + either the ID of the test or your IP address. This is the only way to + identify your data, without this information we won't be able to + comply with your request. +

+

+ Contact this email address for all deletion requests: + TO BE FILLED BY DEVELOPER. +

+
+ + + + + diff --git a/web/assets/index.html b/web/assets/index.html old mode 100755 new mode 100644 index 823ef9f..c7b3620 --- a/web/assets/index.html +++ b/web/assets/index.html @@ -1,365 +1,16 @@ + - - - - - - -LibreSpeed Example + + + + + LibreSpeed + -

LibreSpeed Example

-
-

- Privacy -
-
-
-
Ping
-
-
ms
-
-
-
Jitter
-
-
ms
-
-
-
-
-
Download
- -
-
Mbps
-
-
-
Upload
- -
-
Mbps
-
-
-
- -
- -
- Source code -
- - +

Loading...

+ diff --git a/web/assets/javascript/index.js b/web/assets/javascript/index.js new file mode 100644 index 0000000..ba4eb0e --- /dev/null +++ b/web/assets/javascript/index.js @@ -0,0 +1,447 @@ +/** + * Design by fromScratch Studio - 2022, 2023 (fromscratch.io) + * Implementation in HTML/CSS/JS by Timendus - 2024 (https://github.com/Timendus) + * + * See https://github.com/librespeed/speedtest/issues/585 + */ + +// States the UI can be in +const INITIALIZING = 0; +const READY = 1; +const RUNNING = 2; +const FINISHED = 3; + +// Keep some global state here +const testState = { + state: INITIALIZING, + speedtest: null, + servers: [], + selectedServerDirty: false, + testData: null, + testDataDirty: false, + telemetryEnabled: false, +}; + +// Bootstrap the application when the DOM is ready +window.addEventListener("DOMContentLoaded", async () => { + createSpeedtest(); + hookUpButtons(); + startRenderingLoop(); + applySettingsJSON(); + applyServerListJSON(); +}); + +/** + * Create a new Speedtest and hook it into the global state + */ +function createSpeedtest() { + testState.speedtest = new Speedtest(); + testState.speedtest.onupdate = (data) => { + testState.testData = data; + testState.testDataDirty = true; + }; + testState.speedtest.onend = (aborted) => + (testState.state = aborted ? READY : FINISHED); +} + +/** + * Make all the buttons respond to the right clicks + */ +function hookUpButtons() { + document + .querySelector("#start-button") + .addEventListener("click", startButtonClickHandler); + document + .querySelector("#choose-privacy") + .addEventListener("click", () => + document.querySelector("#privacy").showModal() + ); + document + .querySelector("#share-results") + .addEventListener("click", () => + document.querySelector("#share").showModal() + ); + document + .querySelector("#copy-link") + .addEventListener("click", copyLinkButtonClickHandler); + document + .querySelectorAll(".close-dialog, #close-privacy") + .forEach((element) => { + element.addEventListener("click", () => + document.querySelectorAll("dialog").forEach((modal) => modal.close()) + ); + }); +} + +/** + * Event listener for clicks on the main start button + */ +function startButtonClickHandler() { + switch (testState.state) { + case READY: + case FINISHED: + testState.speedtest.start(); + testState.state = RUNNING; + return; + case RUNNING: + testState.speedtest.abort(); + // testState.state is updated by `onend` handler of speedtest + return; + default: + return; + } +} + +/** + * Event listener for clicks on the "Copy link" button in the modal + */ +async function copyLinkButtonClickHandler() { + const link = document.querySelector("img#results").src; + await navigator.clipboard.writeText(link); + const button = document.querySelector("#copy-link"); + button.classList.add("active"); + button.textContent = "Copied!"; + setTimeout(() => { + button.classList.remove("active"); + button.textContent = "Copy link"; + }, 3000); +} + +/** + * Load settings from settings.json on the server and apply them + */ +async function applySettingsJSON() { + try { + const response = await fetch("settings.json"); + const settings = await response.json(); + if (!settings || typeof settings !== "object") { + return console.error("Settings are empty or malformed"); + } + for (let setting in settings) { + testState.speedtest.setParameter(setting, settings[setting]); + if ( + setting == "telemetry_level" && + settings[setting] && + settings[setting] != "off" && + settings[setting] != "disabled" && + settings[setting] != "false" + ) { + testState.telemetryEnabled = true; + document.querySelector("#privacy-warning").classList.remove("hidden"); + } + } + } catch (error) { + console.error("Failed to fetch settings:", error); + } +} + +/** + * Load server list from the configured source and populate the dropdown + */ +async function applyServerListJSON() { + try { + const serverSource = + typeof globalThis.SPEEDTEST_SERVERS !== "undefined" + ? globalThis.SPEEDTEST_SERVERS + : "server-list.json"; + const servers = Array.isArray(serverSource) + ? serverSource + : await fetch(serverSource).then((response) => response.json()); + if (!servers || !Array.isArray(servers) || servers.length === 0) { + return console.error("Server list is empty or malformed"); + } + + testState.servers = servers; + + // If there's only one server, just show it. No reachability checks needed. + if (servers.length === 1) { + populateDropdown(servers); + return; + } + + // For multiple servers: first run the built-in selection (which pings servers + // and annotates them with pingT). Only then populate the dropdown so that + // dead servers don't appear. + testState.speedtest.addTestPoints(servers); + testState.speedtest.selectServer((bestServer) => { + const aliveServers = testState.servers.filter((s) => { + // Keep servers that responded to ping (pingT !== -1). + if (s.pingT !== -1) return true; + // Also keep protocol-relative servers ("//...") as a defensive fallback. + // LibreSpeed normalizes them to the page protocol before pinging, so they + // are normally treated like any other server and get a real pingT value. + return typeof s.server === "string" && s.server.startsWith("//"); + }); + + // Prefer to show only reachable servers, but if none are reachable, + // fall back to the full list so users can still pick a server manually. + if (aliveServers.length > 0) { + testState.servers = aliveServers; + } + populateDropdown(testState.servers); + + + if (bestServer) { + selectServer(bestServer); + } else { + alert( + "Can't reach any of the speedtest servers! But you're on this page. Something weird is going on with your network." + ); + } + }); + } catch (error) { + console.error("Failed to load server list:", error); + } +} + +/** + * Add all the servers to the server selection dropdown and make it actually + * work. + * @param {Array} servers - an array of server objects + */ +function populateDropdown(servers) { + const serverSelector = document.querySelector("div.server-selector"); + const serverList = serverSelector.querySelector("ul.servers"); + + // Reset previous state (populateDropdown can be called multiple times) + serverSelector.classList.remove("single-server"); + serverSelector.classList.remove("active"); + serverList.classList.remove("active"); + serverList.innerHTML = ""; + + // If we have only a single server, just show it + if (servers.length === 1) { + serverSelector.classList.add("single-server"); + selectServer(servers[0]); + return; + } + serverSelector.classList.add("active"); + + // Make the dropdown open and close (hook only once) + if (serverSelector.dataset.hooked !== "1") { + serverSelector.dataset.hooked = "1"; + + serverSelector.addEventListener("click", () => { + serverList.classList.toggle("active"); + }); + document.addEventListener("click", (e) => { + if (e.target.closest("div.server-selector") !== serverSelector) + serverList.classList.remove("active"); + }); + } + + // Populate the list to choose from + servers.forEach((server) => { + const item = document.createElement("li"); + const link = document.createElement("a"); + link.href = "#"; + link.innerHTML = `${server.name}${ + server.sponsorName ? ` (${server.sponsorName})` : "" + }`; + link.addEventListener("click", () => selectServer(server)); + item.appendChild(link); + serverList.appendChild(item); + }); +} + +/** + * Set the given server as the selected server for the speedtest + * @param {Object} server - a server object + */ +function selectServer(server) { + testState.speedtest.setSelectedServer(server); + testState.selectedServerDirty = true; + testState.state = READY; +} + +/** + * Start the requestAnimationFrame UI rendering loop + */ +function startRenderingLoop() { + // Do these queries once to speed up the rendering itself + const serverSelector = document.querySelector("div.server-selector"); + const selectedServer = serverSelector.querySelector("#selected-server"); + const sponsor = serverSelector.querySelector("#sponsor"); + const startButton = document.querySelector("#start-button"); + const privacyWarning = document.querySelector("#privacy-warning"); + + const gauges = document.querySelectorAll("#download-gauge, #upload-gauge"); + const downloadProgress = document.querySelector("#download-gauge .progress"); + const uploadProgress = document.querySelector("#upload-gauge .progress"); + const downloadGauge = document.querySelector("#download-gauge .speed"); + const uploadGauge = document.querySelector("#upload-gauge .speed"); + const downloadText = document.querySelector("#download-gauge span"); + const uploadText = document.querySelector("#upload-gauge span"); + + const pingAndJitter = document.querySelectorAll(".ping, .jitter"); + const ping = document.querySelector("#ping"); + const jitter = document.querySelector("#jitter"); + const shareResults = document.querySelector("#share-results"); + const copyLink = document.querySelector("#copy-link"); + const resultsImage = document.querySelector("#results"); + + const buttonTexts = { + [INITIALIZING]: "Loading...", + [READY]: "Let's start", + [RUNNING]: "Abort", + [FINISHED]: "Restart", + }; + + // Show copy link button only if navigator.clipboard is available + copyLink.classList.toggle("hidden", !navigator.clipboard); + + function renderUI() { + // Make the main button reflect the current state + startButton.textContent = buttonTexts[testState.state]; + startButton.classList.toggle("disabled", testState.state === INITIALIZING); + startButton.classList.toggle("active", testState.state === RUNNING); + + // Disable the server selector while test is running + serverSelector.classList.toggle("disabled", testState.state === RUNNING); + + // Show selected server + if (testState.selectedServerDirty) { + const server = testState.speedtest.getSelectedServer(); + selectedServer.textContent = server.name; + if (server.sponsorName) { + if (server.sponsorURL) { + sponsor.innerHTML = `Sponsor: ${server.sponsorName}`; + } else { + sponsor.textContent = `Sponsor: ${server.sponsorName}`; + } + } else { + sponsor.innerHTML = " "; + } + testState.selectedServerDirty = false; + } + + // Activate the gauges when test running or finished + gauges.forEach((e) => + e.classList.toggle( + "enabled", + testState.state === RUNNING || testState.state === FINISHED + ) + ); + + // Show ping and jitter if data is available + pingAndJitter.forEach((e) => + e.classList.toggle( + "hidden", + !( + testState.testData && + testState.testData.pingStatus && + testState.testData.jitterStatus + ) + ) + ); + + // Show share button after test if server supports it + shareResults.classList.toggle( + "hidden", + !( + testState.state === FINISHED && + testState.telemetryEnabled && + testState.testData.testId + ) + ); + + if (testState.testDataDirty) { + // Set gauge rotations + downloadProgress.style = `--progress-rotation: ${ + testState.testData.dlProgress * 180 + }deg`; + uploadProgress.style = `--progress-rotation: ${ + testState.testData.ulProgress * 180 + }deg`; + downloadGauge.style = `--speed-rotation: ${mbpsToRotation( + testState.testData.dlStatus, + testState.testData.testState === 1 + )}deg`; + uploadGauge.style = `--speed-rotation: ${mbpsToRotation( + testState.testData.ulStatus, + testState.testData.testState === 3 + )}deg`; + + // Set numeric values + downloadText.textContent = numberToText(testState.testData.dlStatus); + uploadText.textContent = numberToText(testState.testData.ulStatus); + ping.textContent = numberToText(testState.testData.pingStatus); + jitter.textContent = numberToText(testState.testData.jitterStatus); + + // Set user's IP and provider + if (testState.testData.clientIp) { + // Clear previous content + privacyWarning.innerHTML = ''; + + const connectedThrough = document.createElement('span'); + connectedThrough.textContent = 'You are connected through:'; + + const ipAddress = document.createTextNode(testState.testData.clientIp); + + privacyWarning.appendChild(connectedThrough); + privacyWarning.appendChild(document.createElement('br')); + privacyWarning.appendChild(ipAddress); + + privacyWarning.classList.remove("hidden"); + } + + // Set image for sharing results + if (testState.testData.testId) { + resultsImage.src = + window.location.href.substring( + 0, + window.location.href.lastIndexOf("/") + ) + + "/results/?id=" + + testState.testData.testId; + } + + testState.testDataDirty = false; + } + + requestAnimationFrame(renderUI); + } + + renderUI(); +} + +/** + * Convert a speed in Mbits per second to a rotation for the gauge + * @param {string} speed Speed in Mbits + * @param {boolean} oscillate If the gauge should wiggle a bit + * @returns {number} Rotation for the gauge in degrees + */ +function mbpsToRotation(speed, oscillate) { + speed = Number(speed); + if (speed <= 0) return 0; + + const minSpeed = 0; + const maxSpeed = 10000; // 10 Gbps maxes out the gauge + const minRotation = 0; + const maxRotation = 180; + + // Can't do log10 of values less than one, +1 all to keep it fair + const logMinSpeed = Math.log10(minSpeed + 1); + const logMaxSpeed = Math.log10(maxSpeed + 1); + const logSpeed = Math.log10(speed + 1); + + const power = (logSpeed - logMinSpeed) / (logMaxSpeed - logMinSpeed); + const oscillation = oscillate ? 1 + 0.01 * Math.sin(Date.now() / 100) : 1; + const rotation = power * oscillation * maxRotation; + + // Make sure we stay within bounds at all times + return Math.max(Math.min(rotation, maxRotation), minRotation); +} + +/** + * Convert a number to a user friendly version + * @param {string} value Speed, ping or jitter + * @returns {string} A text version with proper decimals + */ +function numberToText(value) { + if (!value) return "00"; + value = Number(value); + if (value < 10) return value.toFixed(2); + if (value < 100) return value.toFixed(1); + return value.toFixed(0); +} diff --git a/web/assets/speedtest.js b/web/assets/speedtest.js index 61d0e77..a938db1 100755 --- a/web/assets/speedtest.js +++ b/web/assets/speedtest.js @@ -6,15 +6,15 @@ */ /* - This is the main interface between your webpage and the speedtest. - It hides the speedtest web worker to the page, and provides many convenient functions to control the test. - + This is the main interface between your webpage and the speed test. + It hides the speed test web worker to the page, and provides many convenient functions to control the test. + The best way to learn how to use this is to look at the basic example, but here's some documentation. - + To initialize the test, create a new Speedtest object: - var s=new Speedtest(); + let s=new Speedtest(); Now you can think of this as a finite state machine. These are the states (use getState() to see them): - - 0: here you can change the speedtest settings (such as test duration) with the setParameter("parameter",value) method. From here you can either start the test using start() (goes to state 3) or you can add multiple test points using addTestPoint(server) or addTestPoints(serverList) (goes to state 1). Additionally, this is the perfect moment to set up callbacks for the onupdate(data) and onend(aborted) events. + - 0: here you can change the speed test settings (such as test duration) with the setParameter("parameter",value) method. From here you can either start the test using start() (goes to state 3) or you can add multiple test points using addTestPoint(server) or addTestPoints(serverList) (goes to state 1). Additionally, this is the perfect moment to set up callbacks for the onupdate(data) and onend(aborted) events. - 1: here you can add test points. You only need to do this if you want to use multiple test points. A server is defined as an object like this: { @@ -27,16 +27,16 @@ } While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2. - 2: test point selected, ready to start the test. Use start() to begin, this will move to state 3 - - 3: test running. Here, your onupdate event calback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your onupdate function, with the following items: - - dlStatus: download speed in mbps - - ulStatus: upload speed in mbps + - 3: test running. Here, your onupdate event callback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your onupdate function, with the following items: + - dlStatus: download speed in Mbit/s + - ulStatus: upload speed in Mbit/s - pingStatus: ping in ms - jitterStatus: jitter in ms - dlProgress: progress of the download test as a float 0-1 - ulProgress: progress of the upload test as a float 0-1 - pingProgress: progress of the ping/jitter test as a float 0-1 - testState: state of the test (-1=not started, 0=starting, 1=download test, 2=ping+jitter test, 3=upload test, 4=finished, 5=aborted) - - clientIp: IP address of the client performing the test (and optionally ISP and distance) + - clientIp: IP address of the client performing the test (and optionally ISP and distance) At the end of the test, the onend function will be called, with a boolean specifying whether the test was aborted or if it ended normally. The test can be aborted at any time with abort(). At the end of the test, it will move to state 4 @@ -46,10 +46,10 @@ function Speedtest() { this._serverList = []; //when using multiple points of test, this is a list of test points this._selectedServer = null; //when using multiple points of test, this is the selected server - this._settings = {}; //settings for the speedtest worker + this._settings = {}; //settings for the speed test worker this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done console.log( - "LibreSpeed by Federico Dossena v5.2.4 - https://github.com/librespeed/speedtest" + "LibreSpeed by Federico Dossena v6.1.0 - https://github.com/librespeed/speedtest" ); } @@ -66,7 +66,7 @@ Speedtest.prototype = { * - parameter: string with the name of the parameter that you want to set * - value: new value for the parameter * - * Invalid values or nonexistant parameters will be ignored by the speedtest worker. + * Invalid values or nonexistant parameters will be ignored by the speed test worker. */ setParameter: function(parameter, value) { if (this._state == 3) @@ -125,7 +125,7 @@ Speedtest.prototype = { * Same as addTestPoint, but you can pass an array of servers */ addTestPoints: function(list) { - for (var i = 0; i < list.length; i++) this.addTestPoint(list[i]); + for (let i = 0; i < list.length; i++) this.addTestPoint(list[i]); }, /** * Load a JSON server list from URL (multiple points of test) @@ -144,11 +144,11 @@ Speedtest.prototype = { if (this._state == 0) this._state = 1; if (this._state != 1) throw "You can't add a server after server selection"; this._settings.mpot = true; - var xhr = new XMLHttpRequest(); + let xhr = new XMLHttpRequest(); xhr.onload = function(){ try{ - var servers=JSON.parse(xhr.responseText); - for(var i=0;i 0 && d < instspd) instspd = d; } catch (e) {} @@ -234,14 +234,14 @@ Speedtest.prototype = { }.bind(this); //this function repeatedly pings a server to get a good estimate of the ping. When it's done, it calls the done function without parameters. At the end of the execution, the server will have a new parameter called pingT, which is either the best ping we got from the server or -1 if something went wrong. - var PINGS = 3, //up to 3 pings are performed, unless the server is down... + const PINGS = 3, //up to 3 pings are performed, unless the server is down... SLOW_THRESHOLD = 500; //...or one of the pings is above this threshold - var checkServer = function(server, done) { - var i = 0; + const checkServer = function(server, done) { + let i = 0; server.pingT = -1; if (server.server.indexOf(location.protocol) == -1) done(); else { - var nextPing = function() { + const nextPing = function() { if (i++ == PINGS) { done(); return; @@ -261,10 +261,10 @@ Speedtest.prototype = { } }.bind(this); //check servers in list, one by one - var i = 0; - var done = function() { - var bestServer = null; - for (var i = 0; i < serverList.length; i++) { + let i = 0; + const done = function() { + let bestServer = null; + for (let i = 0; i < serverList.length; i++) { if ( serverList[i].pingT != -1 && (bestServer == null || serverList[i].pingT < bestServer.pingT) @@ -273,7 +273,7 @@ Speedtest.prototype = { } selected(bestServer); }.bind(this); - var nextServer = function() { + const nextServer = function() { if (i == serverList.length) { done(); return; @@ -284,17 +284,17 @@ Speedtest.prototype = { }.bind(this); //parallel server selection - var CONCURRENCY = 6; - var serverLists = []; - for (var i = 0; i < CONCURRENCY; i++) { + const CONCURRENCY = 6; + let serverLists = []; + for (let i = 0; i < CONCURRENCY; i++) { serverLists[i] = []; } - for (var i = 0; i < this._serverList.length; i++) { + for (let i = 0; i < this._serverList.length; i++) { serverLists[i % CONCURRENCY].push(this._serverList[i]); } - var completed = 0; - var bestServer = null; - for (var i = 0; i < CONCURRENCY; i++) { + let completed = 0; + let bestServer = null; + for (let i = 0; i < CONCURRENCY; i++) { select( serverLists[i], function(server) { @@ -323,14 +323,14 @@ Speedtest.prototype = { this.worker.onmessage = function(e) { if (e.data === this._prevData) return; else this._prevData = e.data; - var data = JSON.parse(e.data); + const data = JSON.parse(e.data); try { if (this.onupdate) this.onupdate(data); } catch (e) { console.error("Speedtest onupdate event threw exception: " + e); } if (data.testState >= 4) { - clearInterval(this.updater); + clearInterval(this.updater); this._state = 4; try { if (this.onend) this.onend(data.testState == 5); diff --git a/web/assets/speedtest_worker.js b/web/assets/speedtest_worker.js index 2899e70..8626b7a 100755 --- a/web/assets/speedtest_worker.js +++ b/web/assets/speedtest_worker.js @@ -6,18 +6,18 @@ */ // data reported to main thread -var testState = -1; // -1=not started, 0=starting, 1=download test, 2=ping+jitter test, 3=upload test, 4=finished, 5=abort -var dlStatus = ""; // download speed in megabit/s with 2 decimal digits -var ulStatus = ""; // upload speed in megabit/s with 2 decimal digits -var pingStatus = ""; // ping in milliseconds with 2 decimal digits -var jitterStatus = ""; // jitter in milliseconds with 2 decimal digits -var clientIp = ""; // client's IP address as reported by getIP.php -var dlProgress = 0; //progress of download test 0-1 -var ulProgress = 0; //progress of upload test 0-1 -var pingProgress = 0; //progress of ping+jitter test 0-1 -var testId = null; //test ID (sent back by telemetry if used, null otherwise) +let testState = -1; // -1=not started, 0=starting, 1=download test, 2=ping+jitter test, 3=upload test, 4=finished, 5=abort +let dlStatus = ""; // download speed in megabit/s with 2 decimal digits +let ulStatus = ""; // upload speed in megabit/s with 2 decimal digits +let pingStatus = ""; // ping in milliseconds with 2 decimal digits +let jitterStatus = ""; // jitter in milliseconds with 2 decimal digits +let clientIp = ""; // client's IP address as reported by getIP.php +let dlProgress = 0; //progress of download test 0-1 +let ulProgress = 0; //progress of upload test 0-1 +let pingProgress = 0; //progress of ping+jitter test 0-1 +let testId = null; //test ID (sent back by telemetry if used, null otherwise) -var log = ""; //telemetry log +let log = ""; //telemetry log function tlog(s) { if (settings.telemetry_level >= 2) { log += Date.now() + ": " + s + "\n"; @@ -36,7 +36,7 @@ function twarn(s) { } // test settings. can be overridden by sending specific values with the start command -var settings = { +let settings = { mpot: false, //set to true when in MPOT mode test_order: "IP_D_U", //order in which tests will be performed as a string. D=Download, U=Upload, P=Ping+Jitter, I=IP, _=1 second delay time_ul_max: 15, // max duration of upload test in seconds @@ -60,17 +60,17 @@ var settings = { garbagePhp_chunkSize: 100, // size of chunks sent by garbage.php (can be different if enable_quirks is active) enable_quirks: true, // enable quirks for specific browsers. currently it overrides settings to optimize for specific browsers, unless they are already being overridden with the start command ping_allowPerformanceApi: true, // if enabled, the ping test will attempt to calculate the ping more precisely using the Performance API. Currently works perfectly in Chrome, badly in Edge, and not at all in Firefox. If Performance API is not supported or the result is obviously wrong, a fallback is provided. - overheadCompensationFactor: 1.06, //can be changed to compensatie for transport overhead. (see doc.md for some other values) + overheadCompensationFactor: 1.06, //can be changed to compensate for transport overhead. (see doc.md for some other values) useMebibits: false, //if set to true, speed will be reported in mebibits/s instead of megabits/s telemetry_level: 0, // 0=disabled, 1=basic (results only), 2=full (results and timing) 3=debug (results+log) url_telemetry: "results/telemetry.php", // path to the script that adds telemetry data to the database telemetry_extra: "", //extra data that can be passed to the telemetry through the settings - forceIE11Workaround: false //when set to true, it will foce the IE11 upload test on all browsers. Debug only + forceIE11Workaround: false //when set to true, it will force the IE11 upload test on all browsers. Debug only }; -var xhr = null; // array of currently active xhr requests -var interval = null; // timer used in tests -var test_pointer = 0; //pointer to the next test to run inside settings.test_order +let xhr = null; // array of currently active xhr requests +let interval = null; // timer used in tests +let test_pointer = 0; //pointer to the next test to run inside settings.test_order /* this function is used on URLs passed in the settings to determine whether we need a ? or an & as a separator @@ -88,7 +88,7 @@ function url_sep(url) { example: start {"time_ul_max":"10", "time_dl_max":"10", "count_ping":"50"} */ this.addEventListener("message", function(e) { - var params = e.data.split(" "); + const params = e.data.split(" "); if (params[0] === "status") { // return status postMessage( @@ -111,19 +111,19 @@ this.addEventListener("message", function(e) { testState = 0; try { // parse settings, if present - var s = {}; + let s = {}; try { - var ss = e.data.substring(5); + const ss = e.data.substring(5); if (ss) s = JSON.parse(ss); } catch (e) { twarn("Error parsing custom settings JSON. Please check your syntax"); } //copy custom settings - for (var key in s) { + for (let key in s) { if (typeof settings[key] !== "undefined") settings[key] = s[key]; else twarn("Unknown setting ignored: " + key); } - var ua = navigator.userAgent; + const ua = navigator.userAgent; // quirks for specific browsers. apply only if not overridden. more may be added in future releases if (settings.enable_quirks || (typeof s.enable_quirks !== "undefined" && s.enable_quirks)) { if (/Firefox.(\d+\.\d+)/i.test(ua)) { @@ -172,11 +172,11 @@ this.addEventListener("message", function(e) { // run the tests tverb(JSON.stringify(settings)); test_pointer = 0; - var iRun = false, + let iRun = false, dRun = false, uRun = false, pRun = false; - var runNextTest = function() { + const runNextTest = function() { if (testState == 5) return; if (test_pointer >= settings.test_order.length) { //test is finished @@ -267,7 +267,7 @@ this.addEventListener("message", function(e) { function clearRequests() { tverb("stopping pending XHRs"); if (xhr) { - for (var i = 0; i < xhr.length; i++) { + for (let i = 0; i < xhr.length; i++) { try { xhr[i].onprogress = null; xhr[i].onload = null; @@ -289,18 +289,18 @@ function clearRequests() { } } // gets client's IP using url_getIp, then calls the done function -var ipCalled = false; // used to prevent multiple accidental calls to getIp -var ispInfo = ""; //used for telemetry +let ipCalled = false; // used to prevent multiple accidental calls to getIp +let ispInfo = ""; //used for telemetry function getIp(done) { tverb("getIp"); if (ipCalled) return; else ipCalled = true; // getIp already called? - var startT = new Date().getTime(); + let startT = new Date().getTime(); xhr = new XMLHttpRequest(); xhr.onload = function() { tlog("IP: " + xhr.responseText + ", took " + (new Date().getTime() - startT) + "ms"); try { - var data = JSON.parse(xhr.responseText); + const data = JSON.parse(xhr.responseText); clientIp = data.processedString; ispInfo = data.rawIspInfo; } catch (e) { @@ -317,25 +317,25 @@ function getIp(done) { xhr.send(); } // download test, calls done function when it's over -var dlCalled = false; // used to prevent multiple accidental calls to dlTest +let dlCalled = false; // used to prevent multiple accidental calls to dlTest function dlTest(done) { tverb("dlTest"); if (dlCalled) return; else dlCalled = true; // dlTest already called? - var totLoaded = 0.0, // total number of loaded bytes + let totLoaded = 0.0, // total number of loaded bytes startT = new Date().getTime(), // timestamp when test was started bonusT = 0, //how many milliseconds the test has been shortened by (higher on faster connections) graceTimeDone = false, //set to true after the grace time is past failed = false; // set to true if a stream fails xhr = []; // function to create a download stream. streams are slightly delayed so that they will not end at the same time - var testStream = function(i, delay) { + const testStream = function(i, delay) { setTimeout( function() { if (testState !== 1) return; // delayed stream ended up starting after the end of the download test tverb("dl test stream started " + i + " " + delay); - var prevLoaded = 0; // number of bytes loaded last time onprogress was called - var x = new XMLHttpRequest(); + let prevLoaded = 0; // number of bytes loaded last time onprogress was called + let x = new XMLHttpRequest(); xhr[i] = x; xhr[i].onprogress = function(event) { tverb("dl stream progress event " + i + " " + event.loaded); @@ -345,7 +345,7 @@ function dlTest(done) { } catch (e) {} } // just in case this XHR is still running after the download test // progress event, add number of new loaded bytes to totLoaded - var loadDiff = event.loaded <= 0 ? 0 : event.loaded - prevLoaded; + const loadDiff = event.loaded <= 0 ? 0 : event.loaded - prevLoaded; if (isNaN(loadDiff) || !isFinite(loadDiff) || loadDiff < 0) return; // just in case totLoaded += loadDiff; prevLoaded = event.loaded; @@ -380,14 +380,14 @@ function dlTest(done) { ); }.bind(this); // open streams - for (var i = 0; i < settings.xhr_dlMultistream; i++) { + for (let i = 0; i < settings.xhr_dlMultistream; i++) { testStream(i, settings.xhr_multistreamDelay * i); } // every 200ms, update dlStatus interval = setInterval( function() { tverb("DL: " + dlStatus + (graceTimeDone ? "" : " (in grace time)")); - var t = new Date().getTime() - startT; + const t = new Date().getTime() - startT; if (graceTimeDone) dlProgress = (t + bonusT) / (settings.time_dl_max * 1000); if (t < 200) return; if (!graceTimeDone) { @@ -401,10 +401,10 @@ function dlTest(done) { graceTimeDone = true; } } else { - var speed = totLoaded / (t / 1000.0); + const speed = totLoaded / (t / 1000.0); if (settings.time_auto) { //decide how much to shorten the test. Every 200ms, the test is shortened by the bonusT calculated here - var bonus = (5.0 * speed) / 100000; + const bonus = (5.0 * speed) / 100000; bonusT += bonus > 400 ? 400 : bonus; } //update status @@ -423,47 +423,47 @@ function dlTest(done) { 200 ); } -// upload test, calls done function whent it's over -var ulCalled = false; // used to prevent multiple accidental calls to ulTest +// upload test, calls done function when it's over +let ulCalled = false; // used to prevent multiple accidental calls to ulTest function ulTest(done) { tverb("ulTest"); if (ulCalled) return; else ulCalled = true; // ulTest already called? // garbage data for upload test - var r = new ArrayBuffer(1048576); - var maxInt = Math.pow(2, 32) - 1; + let r = new ArrayBuffer(1048576); + const maxInt = Math.pow(2, 32) - 1; try { r = new Uint32Array(r); - for (var i = 0; i < r.length; i++) r[i] = Math.random() * maxInt; + for (let i = 0; i < r.length; i++) r[i] = Math.random() * maxInt; } catch (e) {} - var req = []; - var reqsmall = []; - for (var i = 0; i < settings.xhr_ul_blob_megabytes; i++) req.push(r); + let req = []; + let reqsmall = []; + for (let i = 0; i < settings.xhr_ul_blob_megabytes; i++) req.push(r); req = new Blob(req); r = new ArrayBuffer(262144); try { r = new Uint32Array(r); - for (var i = 0; i < r.length; i++) r[i] = Math.random() * maxInt; + for (let i = 0; i < r.length; i++) r[i] = Math.random() * maxInt; } catch (e) {} reqsmall.push(r); reqsmall = new Blob(reqsmall); - var testFunction = function() { - var totLoaded = 0.0, // total number of transmitted bytes + const testFunction = function() { + let totLoaded = 0.0, // total number of transmitted bytes startT = new Date().getTime(), // timestamp when test was started bonusT = 0, //how many milliseconds the test has been shortened by (higher on faster connections) graceTimeDone = false, //set to true after the grace time is past failed = false; // set to true if a stream fails xhr = []; // function to create an upload stream. streams are slightly delayed so that they will not end at the same time - var testStream = function(i, delay) { + const testStream = function(i, delay) { setTimeout( function() { if (testState !== 3) return; // delayed stream ended up starting after the end of the upload test tverb("ul test stream started " + i + " " + delay); - var prevLoaded = 0; // number of bytes transmitted last time onprogress was called - var x = new XMLHttpRequest(); + let prevLoaded = 0; // number of bytes transmitted last time onprogress was called + let x = new XMLHttpRequest(); xhr[i] = x; - var ie11workaround; + let ie11workaround; if (settings.forceIE11Workaround) ie11workaround = true; else { try { @@ -474,7 +474,7 @@ function ulTest(done) { } } if (ie11workaround) { - // IE11 workarond: xhr.upload does not work properly, therefore we send a bunch of small 256k requests and use the onload event as progress. This is not precise, especially on fast connections + // IE11 workaround: xhr.upload does not work properly, therefore we send a bunch of small 256k requests and use the onload event as progress. This is not precise, especially on fast connections xhr[i].onload = xhr[i].onerror = function() { tverb("ul stream progress event (ie11wa)"); totLoaded += reqsmall.size; @@ -496,7 +496,7 @@ function ulTest(done) { } catch (e) {} } // just in case this XHR is still running after the upload test // progress event, add number of new loaded bytes to totLoaded - var loadDiff = event.loaded <= 0 ? 0 : event.loaded - prevLoaded; + const loadDiff = event.loaded <= 0 ? 0 : event.loaded - prevLoaded; if (isNaN(loadDiff) || !isFinite(loadDiff) || loadDiff < 0) return; // just in case totLoaded += loadDiff; prevLoaded = event.loaded; @@ -528,14 +528,14 @@ function ulTest(done) { ); }.bind(this); // open streams - for (var i = 0; i < settings.xhr_ulMultistream; i++) { + for (let i = 0; i < settings.xhr_ulMultistream; i++) { testStream(i, settings.xhr_multistreamDelay * i); } // every 200ms, update ulStatus interval = setInterval( function() { tverb("UL: " + ulStatus + (graceTimeDone ? "" : " (in grace time)")); - var t = new Date().getTime() - startT; + const t = new Date().getTime() - startT; if (graceTimeDone) ulProgress = (t + bonusT) / (settings.time_ul_max * 1000); if (t < 200) return; if (!graceTimeDone) { @@ -549,10 +549,10 @@ function ulTest(done) { graceTimeDone = true; } } else { - var speed = totLoaded / (t / 1000.0); + const speed = totLoaded / (t / 1000.0); if (settings.time_auto) { //decide how much to shorten the test. Every 200ms, the test is shortened by the bonusT calculated here - var bonus = (5.0 * speed) / 100000; + const bonus = (5.0 * speed) / 100000; bonusT += bonus > 400 ? 400 : bonus; } //update status @@ -584,20 +584,20 @@ function ulTest(done) { } else testFunction(); } // ping+jitter test, function done is called when it's over -var ptCalled = false; // used to prevent multiple accidental calls to pingTest +let ptCalled = false; // used to prevent multiple accidental calls to pingTest function pingTest(done) { tverb("pingTest"); if (ptCalled) return; else ptCalled = true; // pingTest already called? - var startT = new Date().getTime(); //when the test was started - var prevT = null; // last time a pong was received - var ping = 0.0; // current ping value - var jitter = 0.0; // current jitter value - var i = 0; // counter of pongs received - var prevInstspd = 0; // last ping time, used for jitter calculation + const startT = new Date().getTime(); //when the test was started + let prevT = null; // last time a pong was received + let ping = 0.0; // current ping value + let jitter = 0.0; // current jitter value + let i = 0; // counter of pongs received + let prevInstspd = 0; // last ping time, used for jitter calculation xhr = []; // ping function - var doPing = function() { + const doPing = function() { tverb("ping"); pingProgress = i / settings.count_ping; prevT = new Date().getTime(); @@ -608,13 +608,13 @@ function pingTest(done) { if (i === 0) { prevT = new Date().getTime(); // first pong } else { - var instspd = new Date().getTime() - prevT; + let instspd = new Date().getTime() - prevT; if (settings.ping_allowPerformanceApi) { try { //try to get accurate performance timing using performance api - var p = performance.getEntries(); + let p = performance.getEntries(); p = p[p.length - 1]; - var d = p.responseStart - p.requestStart; + let d = p.responseStart - p.requestStart; if (d <= 0) d = p.duration; if (d > 0 && d < instspd) instspd = d; } catch (e) { @@ -625,7 +625,7 @@ function pingTest(done) { //noticed that some browsers randomly have 0ms ping if (instspd < 1) instspd = prevInstspd; if (instspd < 1) instspd = 1; - var instjitter = Math.abs(instspd - prevInstspd); + const instjitter = Math.abs(instspd - prevInstspd); if (i === 1) ping = instspd; /* first ping, can't tell jitter yet*/ else { if (instspd < ping) ping = instspd; // update ping, if the instant ping is lower @@ -684,10 +684,10 @@ function sendTelemetry(done) { xhr = new XMLHttpRequest(); xhr.onload = function() { try { - var parts = xhr.responseText.split(" "); + const parts = xhr.responseText.split(" "); if (parts[0] == "id") { try { - var id = parts[1]; + let id = parts[1]; done(id); } catch (e) { done(null); @@ -702,12 +702,12 @@ function sendTelemetry(done) { done(null); }; xhr.open("POST", settings.url_telemetry + url_sep(settings.url_telemetry) + (settings.mpot ? "cors=true&" : "") + "r=" + Math.random(), true); - var telemetryIspInfo = { + const telemetryIspInfo = { processedString: clientIp, rawIspInfo: typeof ispInfo === "object" ? ispInfo : "" }; try { - var fd = new FormData(); + const fd = new FormData(); fd.append("ispinfo", JSON.stringify(telemetryIspInfo)); fd.append("dl", dlStatus); fd.append("ul", ulStatus); @@ -717,7 +717,7 @@ function sendTelemetry(done) { fd.append("extra", settings.telemetry_extra); xhr.send(fd); } catch (ex) { - var postData = "extra=" + encodeURIComponent(settings.telemetry_extra) + "&ispinfo=" + encodeURIComponent(JSON.stringify(telemetryIspInfo)) + "&dl=" + encodeURIComponent(dlStatus) + "&ul=" + encodeURIComponent(ulStatus) + "&ping=" + encodeURIComponent(pingStatus) + "&jitter=" + encodeURIComponent(jitterStatus) + "&log=" + encodeURIComponent(settings.telemetry_level > 1 ? log : ""); + const postData = "extra=" + encodeURIComponent(settings.telemetry_extra) + "&ispinfo=" + encodeURIComponent(JSON.stringify(telemetryIspInfo)) + "&dl=" + encodeURIComponent(dlStatus) + "&ul=" + encodeURIComponent(ulStatus) + "&ping=" + encodeURIComponent(pingStatus) + "&jitter=" + encodeURIComponent(jitterStatus) + "&log=" + encodeURIComponent(settings.telemetry_level > 1 ? log : ""); xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); xhr.send(postData); } diff --git a/web/assets/styling/button.css b/web/assets/styling/button.css new file mode 100644 index 0000000..7a25829 --- /dev/null +++ b/web/assets/styling/button.css @@ -0,0 +1,83 @@ +/* The main "start the test" button and the share button */ + +button { + height: 6.8rem; + min-width: 26.4rem; + padding: 0 5rem; + margin: 2.5rem; + border-radius: 3.4rem; + border: 0; + + font-family: "Inter", sans-serif; + font-size: 2rem; + font-weight: 700; + letter-spacing: -0.1rem; + color: var(--button-text-color); + text-transform: uppercase; + cursor: pointer; + box-shadow: 0 0.4rem 1.6rem 0 var(--button-shadow-color); + + will-change: transform; + backface-visibility: hidden; + transform: scale(1) translate3d(0, 0, 0) perspective(1px); + + background: var(--button-gradient-1-color-1); + transition: background-position 0.2s, transform 0.2s; + background-position: 0% 0%; + background: linear-gradient( + 92.97deg, + var(--button-gradient-1-color-1) 0%, + var(--button-gradient-1-color-1) 33%, + var(--button-gradient-1-color-2) 40%, + var(--button-gradient-1-color-3) 66.71%, + var(--button-gradient-1-color-3) 100% + ); + background-size: 300% 100%; + + &.disabled { + cursor: default; + transform: scale(1) translate3d(0, 0, 0) perspective(1px); + background: var(--button-disabled-background-color); + } + &.small { + height: 4.7rem; + min-width: 20.2rem; + text-transform: lowercase; + } + &.inverted { + border: 1px solid var(--button-gradient-1-color-1); + color: transparent; + background-clip: text; + } + &.hidden { + opacity: 0; + pointer-events: none; + } + &:hover { + background-position: 60% 0%; + transform: scale(1.03) translate3d(0, 0, 0) perspective(1px); + } + &.active, + &:active { + background-position: 100% 0%; + animation: pulse 0.7s; + } +} + +@keyframes pulse { + 0% { + transform: scale(1.03) translate3d(0, 0, 0) perspective(1px); + } + 20% { + transform: scale(1.2) translate3d(0, 0, 0) perspective(1px); + } + 40% { + transform: scale(1) translate3d(0, 0, 0) perspective(1px); + } + 60% { + transform: scale(1.1) translate3d(0, 0, 0) perspective(1px); + } + 100% { + transform: scale(1) translate3d(0, 0, 0) perspective(1px); + } +} diff --git a/web/assets/styling/colors.css b/web/assets/styling/colors.css new file mode 100644 index 0000000..6a948d4 --- /dev/null +++ b/web/assets/styling/colors.css @@ -0,0 +1,36 @@ +:root { + --theme-green: #5cf9fd; + --theme-pink: #d63bc6; + + --background-backup-color: #0e0720; + --background-overlay-color: rgb(41 26 70 / 71%); + + --primary-text-color: #ffffff; + --tagline-text-color: var(--theme-green); + --secondary-text-color: #898591; + --primary-text-disabled-color: #888888; + --secondary-text-disabled-color: #2e7d7f; + + --button-text-color: #3e2f50; + --button-gradient-1-color-1: #f5f5f5; + --button-gradient-1-color-2: var(--theme-green); + --button-gradient-1-color-3: var(--theme-pink); + --button-shadow-color: #5cf9fd47; + --button-disabled-background-color: #a2a2a2; + + --server-selector-border-color: #625b6b; + --server-selector-hover-border-color: var(--theme-green); + --server-selector-background-color: #251b32; + --server-selector-hover-background-color: var(--server-selector-border-color); + + --gauge-background-color: #3e2f50; + --gauge-progress-color: #726c7a; + --gauge-pointer-green: #e2fbfc; + --gauge-pointer-pink: #d091ca; + + --ping-and-jitter-primary-text-color: #f5f5f5; + --ping-and-jitter-secondary-text-color: #7b7b7b; + + --popup-background-color: #251b32; + --popup-shadow-color: #000000; +} diff --git a/web/assets/styling/dialog.css b/web/assets/styling/dialog.css new file mode 100644 index 0000000..cfbfe03 --- /dev/null +++ b/web/assets/styling/dialog.css @@ -0,0 +1,132 @@ +/* Styling for the popups */ + +dialog { + flex-direction: column; + align-items: center; + justify-content: center; + width: 70vw; + height: 70vh; + margin: auto; + margin-top: 23rem; + + background: var(--popup-background-color); + border: none; + border-radius: 0.8rem; + + @media screen and (max-width: 800px) { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + max-width: 100vw; /* We need these overrides of browser defaults*/ + max-height: 100vh; + width: auto; + height: auto; + margin: 0; + } + + animation: fade-out 0.3s ease-out; + &[open] { + display: flex; + animation: fade-in 0.3s ease-out; + } + + & > .close-dialog { + display: flex; + align-items: center; + justify-content: center; + width: 4rem; + height: 4rem; + position: absolute; + top: 3rem; + right: 3rem; + + cursor: pointer; + } + + & > section { + max-width: 800px; + overflow-y: auto; + margin: 4rem 2rem 2rem 4rem; + padding: 0 2rem 0 0; + + & h1, + & h2 { + margin: 3rem 0 2rem 0; + font-size: 3.6rem; + font-weight: 400; + letter-spacing: -0.2rem; + color: var(--primary-text-color); + } + & h2 { + margin: 2rem 0 1rem 0; + font-size: 2.5rem; + } + + & p, + & li { + margin: 1rem 0 1rem 0; + font-size: 1.6rem; + line-height: 2.5rem; + font-weight: 400; + letter-spacing: -0.1rem; + color: var(--secondary-text-color); + } + + & ul { + list-style-position: inside; + margin: 1rem; + + & li { + margin: 0.1rem 0; + } + } + + & a { + font-size: 1.6rem; + font-weight: 700; + letter-spacing: -0.1rem; + color: var(--secondary-text-color); + text-underline-offset: 0.3rem; + transition: text-underline-offset 0.2s; + + &:hover { + color: var(--theme-green); + text-underline-offset: 0.5rem; + } + } + } +} + +@keyframes fade-in { + 0% { + opacity: 0; + transform: scale(0.6); + display: none; + } + 0.1% { + display: flex; + } + 100% { + opacity: 1; + transform: scale(1); + display: flex; + } +} + +@keyframes fade-out { + 0% { + opacity: 1; + transform: scale(1); + display: flex; + } + 99.9% { + display: flex; + } + 100% { + opacity: 0; + transform: scale(0.6); + display: none; + } +} diff --git a/web/assets/styling/fonts.css b/web/assets/styling/fonts.css new file mode 100644 index 0000000..abd7203 --- /dev/null +++ b/web/assets/styling/fonts.css @@ -0,0 +1,22 @@ +/* latin-ext */ +@font-face { + font-family: "Inter"; + font-style: normal; + font-weight: 100 900; + font-display: swap; + src: url(../fonts/Inter-latin-ext.woff2) format("woff2"); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, + U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +/* latin */ +@font-face { + font-family: "Inter"; + font-style: normal; + font-weight: 100 900; + font-display: swap; + src: url(../fonts/Inter-latin.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, + U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, + U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/web/assets/styling/index.css b/web/assets/styling/index.css new file mode 100644 index 0000000..d8abd9c --- /dev/null +++ b/web/assets/styling/index.css @@ -0,0 +1,85 @@ +/** + * Design by fromScratch Studio - 2022, 2023 (fromscratch.io) + * Implementation in HTML/CSS/JS by Timendus - 2024 (https://github.com/Timendus) + * + * See https://github.com/librespeed/speedtest/issues/585 + */ + +@import url("colors.css"); +@import url("fonts.css"); +@import url("main.css"); +@import url("server-selector.css"); +@import url("button.css"); +@import url("results.css"); +@import url("dialog.css"); + +/* Setting up the basic structure */ + +* { + box-sizing: border-box; + padding: 0; + margin: 0; +} + +html, +body { + min-height: 100vh; + width: 100vw; +} + +html { + background-color: var(--background-backup-color); + background-image: url("../images/background.jpeg"); + background-repeat: no-repeat; + background-position: center; + background-size: cover; + font-size: 10px; + + @media screen and (max-width: 800px) { + font-size: 8px; + } +} + +body { + font-family: "Inter", sans-serif; + background-color: var(--background-overlay-color); + color: var(--primary-text-color); + display: flex; + flex-direction: column; +} + +/* Position the logo */ + +header { + padding: 4rem 7rem; + + @media screen and (max-width: 800px) { + padding: 7rem 2rem; + text-align: center; + } +} + +/* Position the source code link */ + +footer { + margin: auto auto 0 auto; + padding: 5rem; + + & > p.source a { + font-size: 1.6rem; + font-weight: 700; + letter-spacing: -0.1rem; + color: var(--theme-green); + text-underline-offset: 0.3rem; + transition: text-underline-offset 0.2s; + + &:hover { + color: var(--theme-pink); + text-underline-offset: 0.5rem; + } + } + + @media screen and (max-width: 800px) { + padding: 4rem; + } +} diff --git a/web/assets/styling/main.css b/web/assets/styling/main.css new file mode 100644 index 0000000..530ed4d --- /dev/null +++ b/web/assets/styling/main.css @@ -0,0 +1,58 @@ +/* Texts on the front page */ + +main { + text-align: center; + padding: 0 2rem; + flex: 1; + + & > h1 { + margin: 0.2rem; + font-size: 3.6rem; + font-weight: 400; + letter-spacing: -0.2rem; + color: var(--primary-text-color); + } + + & p { + margin-top: 8rem; + font-size: 1.6rem; + line-height: 2.5rem; + font-weight: 400; + letter-spacing: -0.1rem; + color: var(--secondary-text-color); + + &#privacy-warning { + min-height: 5.3rem; + + & > span { + font-weight: 700; + color: var(--theme-green); + } + &.hidden { + opacity: 0; + pointer-events: none; + } + } + } + + & > p.tagline { + margin-top: 0; + margin-bottom: 6rem; + font-size: 2rem; + color: var(--tagline-text-color); + } + + & a { + font-size: 1.6rem; + font-weight: 700; + letter-spacing: -0.1rem; + color: var(--secondary-text-color); + text-underline-offset: 0.3rem; + transition: text-underline-offset 0.2s; + + &:hover { + color: var(--theme-green); + text-underline-offset: 0.5rem; + } + } +} diff --git a/web/assets/styling/results.css b/web/assets/styling/results.css new file mode 100644 index 0000000..55a281e --- /dev/null +++ b/web/assets/styling/results.css @@ -0,0 +1,260 @@ +/* Variables */ + +:root { + --gauge-width: 32rem; + --gauge-height: 22rem; + --progress-width: 0.6rem; + --speed-width: 3rem; +} + +/* Layout for the gauges */ + +.gauge-layout { + display: flex; + flex-direction: row; + align-items: start; + justify-content: center; + gap: 5rem; + margin: 5rem auto 3rem auto; + + @media screen and (max-width: 1100px) { + display: grid; + grid-template-areas: + "download upload" + "ping jitter"; + justify-items: center; + justify-content: center; + + --gauge-width: min(40vw, 32rem); + --gauge-height: min(28vw, 22rem); + --progress-width: min(1.2vw, 0.6rem); + --speed-width: min(4vw, 3rem); + } + @media screen and (max-width: 500px) { + gap: 5rem 2rem; + } +} + +/* The download/upload speed gauges */ + +/** + * One thing I should really document here is the weird `transform: scale(1);` + * and `position: fixed` in this code. This is a nasty little trick to allow the + * gauge pointer to break out of the `overflow: hidden` of the .speed element. + * We need the `overflow: hidden` to hide the arc that's rotating into view when + * the value goes up. But we do want to see the full pointer, even when it's at + * zero. This degrades fairly gracefully into showing half of the pointer when + * browsers don't understand this. + * + * Trick taken from this article: + * https://medium.com/@thomas.ryu/css-overriding-the-parents-overflow-hidden-90c75a0e7296 + */ + +div.gauge { + position: relative; + transform: scale(1); + width: var(--gauge-width); + height: var(--gauge-height); + + &.download { + grid-area: download; + } + &.upload { + grid-area: upload; + } + + & > .progress, + & > .speed { + position: absolute; + top: 0; + left: 0; + width: var(--gauge-width); + height: calc(var(--gauge-width) / 2); + overflow: hidden; + + &:after, + &:before { + content: ""; + position: absolute; + box-sizing: border-box; + } + } + + & > .progress { + &:before, + &:after { + top: 0; + left: 0; + width: var(--gauge-width); + height: calc(var(--gauge-width) / 2); + + border-radius: 50% 50% 0 0 / 100% 100% 0 0; + border: var(--progress-width) solid var(--gauge-background-color); + border-bottom: 0; + + transform-origin: bottom center; + transform: rotate(var(--progress-rotation)); + transition: transform 0.2s linear; + } + &:after { + top: calc(var(--gauge-width) / 2); + + border-radius: 0 0 50% 50% / 0 0 100% 100%; + border: var(--progress-width) solid var(--gauge-background-color); + border-top: 0; + + transform-origin: top center; + } + } + + & > .speed { + &:before, + &:after { + transform: rotate(var(--speed-rotation)); + transition: transform 0.2s ease; + transition-timing-function: cubic-bezier(0.56, 0.04, 0.59, 0.91); + } + &:before { + position: fixed; + top: calc(var(--gauge-width) / 2 - var(--speed-width) / 3); + left: var(--progress-width); + width: 0; + height: 0; + + border-top: calc(var(--speed-width) / 3) solid transparent; + border-bottom: calc(var(--speed-width) / 3) solid transparent; + border-right: calc(var(--speed-width) * 0.97) solid + var(--gauge-background-color); + z-index: 1; + + transform-origin: calc(var(--gauge-width) / 2 - var(--progress-width)) + calc(var(--speed-width) / 3); + } + &:after { + top: calc(var(--gauge-width) / 2); + left: calc(var(--progress-width) - 0.1rem); + width: calc(var(--gauge-width) - var(--progress-width) * 2 + 0.2rem); + height: calc(var(--gauge-width) / 2 - var(--progress-width) + 0.1rem); + + border-radius: 0 0 50% 50% / 0 0 100% 100%; + border: var(--speed-width) solid var(--gauge-background-color); + border-top: 0; + + transform-origin: top center; + } + } + + &.enabled { + &.download { + & > .progress:after { + border-color: var(--theme-pink); + } + & > .speed { + &:before { + border-right-color: var(--gauge-pointer-pink); + } + &:after { + border-color: var(--theme-pink); + } + } + } + &.upload { + & > .progress:after { + border-color: var(--theme-green); + } + & > .speed { + &:before { + border-right-color: var(--gauge-pointer-green); + } + &:after { + border-color: var(--theme-green); + } + } + } + & > h1 > span { + color: var(--primary-text-color); + } + } + + & > h1, + & > h2 { + display: block; + position: absolute; + width: 100%; + font-family: "Inter", sans-serif; + font-size: 2.1rem; + letter-spacing: -0.1rem; + color: var(--secondary-text-color); + } + & > h1 { + bottom: calc(var(--gauge-height) - var(--gauge-width) / 2); + font-weight: 300; + + & > span { + font-size: 5.5rem; + font-weight: 200; + display: block; + color: var(--secondary-text-color); + letter-spacing: -0.3rem; + } + } + & > h2 { + bottom: 0; + font-weight: 700; + text-transform: uppercase; + } + + @media screen and (max-width: 500px) { + & > h1 { + font-size: 3vw; + + & > span { + font-size: 8vw; + } + } + + & > h2 { + font-size: 3vw; + } + } +} + +/* Styling for Ping and Jitter */ + +.ping, +.jitter { + grid-area: jitter; + display: flex; + align-items: end; + height: calc(var(--gauge-width) / 2); + width: 13rem; + + font-size: 2.1rem; + letter-spacing: -0.1rem; + font-weight: 300; + color: var(--ping-and-jitter-secondary-text-color); + + & > .label { + font-weight: 700; + } + & > .value { + color: var(--ping-and-jitter-primary-text-color); + } + + &.hidden { + display: none; + } + + @media screen and (max-width: 1100px) { + width: 100%; + height: auto; + justify-content: center !important; + } + @media screen and (max-width: 500px) { + font-size: 1.8rem; + } +} +.ping { + grid-area: ping; + justify-content: end; +} diff --git a/web/assets/styling/server-selector.css b/web/assets/styling/server-selector.css new file mode 100644 index 0000000..e614d63 --- /dev/null +++ b/web/assets/styling/server-selector.css @@ -0,0 +1,171 @@ +/* The server selector fake dropdown */ + +.server-selector { + position: relative; + width: 50rem; + margin: 0rem auto; + display: none; + + &.active { + display: block; + } + + @media screen and (max-width: 500px) { + width: 100%; + } + + & > .chosen { + position: relative; + height: 8.8rem; + + border: 1px solid var(--server-selector-border-color); + border-radius: 0.8rem; + background-color: var(--server-selector-background-color); + cursor: pointer; + transition: border-color 0.2s; + + &:hover { + border-color: var(--server-selector-hover-border-color); + } + + & > div.chevron { + content: ""; + position: absolute; + display: block; + width: 32px; + height: 32px; + right: 1.8rem; + top: 1rem; + } + + & > p { + margin: 0; + position: absolute; + left: 2.4rem; + top: 1.5rem; + font-size: 1.6rem; + font-weight: 400; + letter-spacing: -0.1rem; + color: var(--theme-green); + } + + & > h2 { + position: absolute; + left: 2.4rem; + right: 2.4rem; + bottom: 1rem; + + font-size: 2.4rem; + font-weight: 700; + letter-spacing: -0.2rem; + color: var(--primary-text-color); + text-align: left; + text-transform: uppercase; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + + & span { + font-weight: 400; + } + } + } + + /* Special case for when we have only one server */ + &.single-server { + & > .chosen { + cursor: default; + &:hover { + border-color: var(--server-selector-border-color); + } + & > div.chevron { + display: none; + } + } + } + + /* Overrides for when the test is running and the selector is disabled */ + &.disabled { + pointer-events: none; + + & > .chosen { + cursor: default; + &:hover { + border-color: var(--server-selector-border-color); + } + & > p { + color: var(--secondary-text-disabled-color); + } + & > h2 { + color: var(--primary-text-disabled-color); + } + } + } + + /* Styling for the list of servers that pops out */ + & > ul.servers { + position: absolute; + width: 50rem; + max-height: 70vh; + overflow-y: auto; + z-index: 1; + + border: 1px solid var(--server-selector-border-color); + border-radius: 0.8rem; + background-color: var(--server-selector-background-color); + list-style: none; + + transform: scaleY(0); + transform-origin: top; + transition: transform 0.1s; + + &.active { + transform: scaleY(1); + } + + @media screen and (max-width: 800px) { + width: 100%; + } + + & > li { + &:first-child a { + padding-top: 1.5rem; + } + &:last-child a { + padding-bottom: 1.5rem; + } + + & a { + display: block; + padding: 0.7rem 2.4rem; + + font-size: 2.4rem; + font-weight: 700; + letter-spacing: -0.2rem; + color: var(--sprint-text-color); + text-transform: uppercase; + text-decoration: none; + text-align: left; + cursor: pointer; + + transition: background-color 0.2s; + + & span { + font-weight: 400; + } + &:hover { + background-color: var(--server-selector-hover-background-color); + } + } + } + } + + /* Styling for the sponsor text under the dropdown */ + & > p.sponsor { + margin: 1rem 0 5rem 0; + + & a { + font-weight: 400; + } + } +} diff --git a/web/getip_util.go b/web/getip_util.go new file mode 100644 index 0000000..f988623 --- /dev/null +++ b/web/getip_util.go @@ -0,0 +1,120 @@ +package web + +import ( + "net" + "net/http" + "regexp" + "strings" +) + +// normalizeCandidateIP validates and normalizes an IP address candidate +// from a request header. It trims whitespace, takes the first comma-separated +// token (for XFF-like headers that may contain a chain), and validates. +func normalizeCandidateIP(raw string, ipv6 bool) string { + ip := strings.TrimSpace(raw) + // For XFF-like values, take the first address before a comma + if idx := strings.Index(ip, ","); idx != -1 { + ip = strings.TrimSpace(ip[:idx]) + } + if ip == "" { + return "" + } + if ipv6 { + parsed := net.ParseIP(ip) + if parsed != nil && parsed.To16() != nil && parsed.To4() == nil { + return strings.TrimPrefix(ip, "::ffff:") + } + return "" + } + parsed := net.ParseIP(ip) + if parsed != nil { + return strings.TrimPrefix(ip, "::ffff:") + } + return "" +} + +// getClientIP extracts the real client IP from the request using the following +// priority chain, mirroring the PHP getIP_util.php behavior: +// +// 1. CF-Connecting-IPv6 (Cloudflare, must be a valid IPv6) +// 2. Client-IP +// 3. X-Real-IP +// 4. X-Forwarded-For (first address in the chain) +// 5. RemoteAddr (fallback) +func getClientIP(r *http.Request) string { + // 1. Cloudflare IPv6 header — must be a valid IPv6 address + if cf := r.Header.Get("CF-Connecting-IPv6"); cf != "" { + if ip := normalizeCandidateIP(cf, true); ip != "" { + return strings.TrimPrefix(ip, "::ffff:") + } + } + + // 2–4. Other forwarding / proxy headers — accept any valid IP + for _, header := range []string{"Client-IP", "X-Real-IP", "X-Forwarded-For"} { + if v := r.Header.Get(header); v != "" { + if ip := normalizeCandidateIP(v, false); ip != "" { + return strings.TrimPrefix(ip, "::ffff:") + } + } + } + + // 5. Fallback: RemoteAddr set by the server + ip, _, err := net.SplitHostPort(r.RemoteAddr) + if err != nil { + // RemoteAddr may not have a port in some environments + ip = r.RemoteAddr + } + if parsed := net.ParseIP(ip); parsed != nil { + return strings.TrimPrefix(ip, "::ffff:") + } + + return "" +} + +// classifyPrivateIP returns a human-readable description if the IP is a +// private or special-purpose address, or an empty string otherwise. +// Mirrors the PHP getLocalOrPrivateIpInfo() function. +func classifyPrivateIP(ip string) string { + // Strip IPv4-mapped IPv6 prefix if present + ip = strings.TrimPrefix(ip, "::ffff:") + + switch { + case ip == "::1": + return "localhost IPv6 access" + case strings.HasPrefix(ip, "fe80:"): + return "link-local IPv6 access" + // ULA IPv6 (fc00::/7): fc00:: - fdff:ffff:... + case isULAIPv6(ip): + return "ULA IPv6 access" + case strings.HasPrefix(ip, "127."): + return "localhost IPv4 access" + case strings.HasPrefix(ip, "10."): + return "private IPv4 access" + case mustCompile(`^172\.(1[6-9]|2\d|3[01])\.`).MatchString(ip): + return "private IPv4 access" + case strings.HasPrefix(ip, "192.168"): + return "private IPv4 access" + case strings.HasPrefix(ip, "169.254"): + return "link-local IPv4 access" + case mustCompile(`^100\.([6-9][0-9]|1[0-2][0-7])\.`).MatchString(ip): + return "CGNAT IPv4 access" + } + return "" +} + +// isULAIPv6 checks if an IP is a Unique Local IPv6 Unicast Address (fc00::/7). +func isULAIPv6(ipStr string) bool { + ip := net.ParseIP(ipStr) + if ip == nil || ip.To16() == nil { + return false + } + // fc00::/7 means the first 7 bits are 1111110 + // So the first byte & 0xFE must equal 0xFC + return ip[0]&0xFE == 0xFC +} + +// mustCompile is a helper that compiles a regex and panics on error +// (safe to use for static patterns). +func mustCompile(pattern string) *regexp.Regexp { + return regexp.MustCompile(pattern) +} diff --git a/web/helpers.go b/web/helpers.go index d39a98e..9d187bb 100644 --- a/web/helpers.go +++ b/web/helpers.go @@ -5,10 +5,13 @@ import ( "encoding/json" "fmt" "io/ioutil" + "net" "net/http" + "os" "strconv" "strings" + "github.com/oschwald/maxminddb-golang" log "github.com/sirupsen/logrus" "github.com/umahmood/haversine" @@ -140,16 +143,147 @@ func calculateDistance(clientLocation string, unit string) string { } dist, km := haversine.Distance(clientCoord, serverCoord) - unitString := " mi" switch unit { case "km": dist = km - unitString = " km" + rounded := roundToNearest10(dist) + if dist < 20 { + return "<20 km" + } + return fmt.Sprintf("%.0f km", rounded) case "NM": dist = km * 0.539957 - unitString = " NM" + return fmt.Sprintf("%.2f NM", dist) + default: // miles + distMi := dist + rounded := roundToNearest10(distMi) + if distMi < 15 { + return "<15 mi" + } + return fmt.Sprintf("%.0f mi", rounded) + } +} + +// roundToNearest10 rounds a float64 to the nearest 10, matching PHP round($d, -1) +func roundToNearest10(val float64) float64 { + return float64(int64(val/10+0.5)) * 10 +} + +// GeoIP database holder (lazily opened on first use) +var ( + geoIPReader *maxminddb.Reader + geoIPOpened bool +) + +// getGeoIPData looks up the given IP in the configured GeoIP .mmdb database +// and returns ISP and country information if available. +// It returns nil if GeoIP is not configured or the lookup fails. +func getGeoIPData(ipStr string) *struct { + ASName string + CountryName string +} { + conf := config.LoadedConfig() + if conf.GeoIPDatabaseFile == "" { + return nil } - return fmt.Sprintf("%.2f%s", dist, unitString) + if !geoIPOpened { + geoIPOpened = true + if _, err := os.Stat(conf.GeoIPDatabaseFile); os.IsNotExist(err) { + log.Warnf("GeoIP database file not found: %s", conf.GeoIPDatabaseFile) + return nil + } + reader, err := maxminddb.Open(conf.GeoIPDatabaseFile) + if err != nil { + log.Warnf("Failed to open GeoIP database: %s", err) + return nil + } + geoIPReader = reader + } + + if geoIPReader == nil { + return nil + } + + ip := net.ParseIP(ipStr) + if ip == nil { + return nil + } + + // Try ipinfo.io offline database format first + var ipinfoResult map[string]interface{} + if err := geoIPReader.Lookup(ip, &ipinfoResult); err != nil { + log.Warnf("GeoIP lookup failed: %s", err) + return nil + } + + if len(ipinfoResult) == 0 { + return nil + } + + result := &struct { + ASName string + CountryName string + }{} + + // ipinfo.io offline format uses "as_name" and "country_name" + if v, ok := ipinfoResult["as_name"].(string); ok { + result.ASName = v + } + if v, ok := ipinfoResult["country_name"].(string); ok { + result.CountryName = v + } + + // If ipinfo format fields are empty, try standard MaxMind GeoIP2 format + if result.ASName == "" { + // Try autonomous_system > organization + if as, ok := ipinfoResult["autonomous_system"].(map[string]interface{}); ok { + if v, ok := as["organization"].(string); ok { + result.ASName = v + } + } + } + if result.CountryName == "" { + if country, ok := ipinfoResult["country"].(map[string]interface{}); ok { + if v, ok := country["names"].(map[string]interface{}); ok { + if n, ok := v["en"].(string); ok { + result.CountryName = n + } + } + } + // Fallback: direct "country" string field (as used by some GeoIP DBs) + if result.CountryName == "" { + if v, ok := ipinfoResult["country"].(string); ok { + result.CountryName = v + } + } + } + + if result.ASName == "" && result.CountryName == "" { + return nil + } + + return result +} + +// getISPInfoByPriority tries to fetch ISP info using the ipinfo.io API first, +// then falls back to the configured offline GeoIP database, mirroring PHP behavior. +func getISPInfoByPriority(addr string) results.IPInfoResponse { + // First try: ipinfo.io API + info := getIPInfo(addr) + if info.Organization != "" || info.Country != "" { + return info + } + + // Second try: offline GeoIP database + geo := getGeoIPData(addr) + if geo != nil { + info.Organization = geo.ASName + info.Country = geo.CountryName + return info + } + + // Fallback: empty result (will show IP only) + return info } diff --git a/web/web.go b/web/web.go index 785d7bb..9fcc21f 100644 --- a/web/web.go +++ b/web/web.go @@ -11,7 +11,6 @@ import ( "os" "regexp" "strconv" - "strings" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" @@ -79,6 +78,8 @@ func ListenAndServe(conf *config.Config) error { r.Post(conf.BaseURL+"/backend/results/telemetry", results.Record) r.HandleFunc(conf.BaseURL+"/stats", results.Stats) r.HandleFunc(conf.BaseURL+"/backend/stats", results.Stats) + r.Get(conf.BaseURL+"/results/json", results.JSONResult) + r.Get(conf.BaseURL+"/backend/results/json", results.JSONResult) // PHP frontend default values compatibility r.HandleFunc(conf.BaseURL+"/empty.php", empty) @@ -91,6 +92,8 @@ func ListenAndServe(conf *config.Config) error { r.Post(conf.BaseURL+"/backend/results/telemetry.php", results.Record) r.HandleFunc(conf.BaseURL+"/stats.php", results.Stats) r.HandleFunc(conf.BaseURL+"/backend/stats.php", results.Stats) + r.Get(conf.BaseURL+"/results/json.php", results.JSONResult) + r.Get(conf.BaseURL+"/backend/results/json.php", results.JSONResult) go listenProxyProtocol(conf, r) @@ -132,6 +135,16 @@ func pages(fs http.FileSystem, BaseURL string) http.HandlerFunc { return fn } +// sendPHPCORSHeaders sets CORS headers matching the PHP backend's ?cors parameter behavior. +// This is for API compatibility with the PHP version; the global CORS middleware already handles CORS. +func sendPHPCORSHeaders(w http.ResponseWriter, r *http.Request) { + if r.FormValue("cors") == "true" { + w.Header().Set("Access-Control-Allow-Origin", "*") + w.Header().Set("Access-Control-Allow-Methods", "GET, POST") + w.Header().Set("Access-Control-Allow-Headers", "Content-Encoding, Content-Type") + } +} + func empty(w http.ResponseWriter, r *http.Request) { _, err := io.Copy(ioutil.Discard, r.Body) if err != nil { @@ -140,11 +153,13 @@ func empty(w http.ResponseWriter, r *http.Request) { } _ = r.Body.Close() + sendPHPCORSHeaders(w, r) w.Header().Set("Connection", "keep-alive") w.WriteHeader(http.StatusOK) } func garbage(w http.ResponseWriter, r *http.Request) { + sendPHPCORSHeaders(w, r) w.Header().Set("Content-Description", "File Transfer") w.Header().Set("Content-Type", "application/octet-stream") w.Header().Set("Content-Disposition", "attachment; filename=random.dat") @@ -180,37 +195,17 @@ func garbage(w http.ResponseWriter, r *http.Request) { func getIP(w http.ResponseWriter, r *http.Request) { var ret results.Result - clientIP := r.RemoteAddr - clientIP = strings.ReplaceAll(clientIP, "::ffff:", "") + clientIP := getClientIP(r) - ip, _, err := net.SplitHostPort(r.RemoteAddr) - if err == nil { - clientIP = ip - } + // Add anti-cache headers matching PHP behavior + w.Header().Set("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, s-maxage=0") + w.Header().Add("Cache-Control", "post-check=0, pre-check=0") + w.Header().Set("Pragma", "no-cache") - isSpecialIP := true - switch { - case clientIP == "::1": - ret.ProcessedString = clientIP + " - localhost IPv6 access" - case strings.HasPrefix(clientIP, "fe80:"): - ret.ProcessedString = clientIP + " - link-local IPv6 access" - case strings.HasPrefix(clientIP, "127."): - ret.ProcessedString = clientIP + " - localhost IPv4 access" - case strings.HasPrefix(clientIP, "10."): - ret.ProcessedString = clientIP + " - private IPv4 access" - case regexp.MustCompile(`^172\.(1[6-9]|2\d|3[01])\.`).MatchString(clientIP): - ret.ProcessedString = clientIP + " - private IPv4 access" - case strings.HasPrefix(clientIP, "192.168"): - ret.ProcessedString = clientIP + " - private IPv4 access" - case strings.HasPrefix(clientIP, "169.254"): - ret.ProcessedString = clientIP + " - link-local IPv4 access" - case regexp.MustCompile(`^100\.([6-9][0-9]|1[0-2][0-7])\.`).MatchString(clientIP): - ret.ProcessedString = clientIP + " - CGNAT IPv4 access" - default: - isSpecialIP = false - } + sendPHPCORSHeaders(w, r) - if isSpecialIP { + if desc := classifyPrivateIP(clientIP); desc != "" { + ret.ProcessedString = clientIP + " - " + desc b, _ := json.Marshal(&ret) if _, err := w.Write(b); err != nil { log.Errorf("Error writing to client: %s", err) @@ -224,7 +219,7 @@ func getIP(w http.ResponseWriter, r *http.Request) { ret.ProcessedString = clientIP if getISPInfo { - ispInfo := getIPInfo(clientIP) + ispInfo := getISPInfoByPriority(clientIP) ret.RawISPInfo = ispInfo removeRegexp := regexp.MustCompile(`AS\d+\s`)