master: update deps and set version to 3.12.0-alpha (#548)
* chore: update all workflows to use go1.17.2 See https://github.com/ooni/probe/issues/1815 * chore: update all dependencies See https://github.com/ooni/probe/issues/1815 * chore: run `go generate` See https://github.com/ooni/probe/issues/1815 * chore: update the user-agent Part of https://github.com/ooni/probe/issues/1815 * Set version to 3.12.0-alpha Part of https://github.com/ooni/probe/issues/1815 * fix: update to ooni/probe-assets@v0.5.0 This overcomes https://github.com/ooni/probe/issues/1836 in the CLI and, while there, let us also make maxminddb tests stricter. * fix(QA/Dockerfile): build using go1.17 See https://github.com/ooni/probe-cli/pull/547#issuecomment-947760839 * chore(mk): use go1.17.2 Part of https://github.com/ooni/probe/issues/1815 * fix(codeql): always run for master Otherwise we see a warning that there is no CodeQL information available for the base branch and this is sub-optimal. Part of https://github.com/ooni/probe/issues/1815
This commit is contained in:
@@ -2,18 +2,18 @@ package geolocate
|
||||
|
||||
import "testing"
|
||||
|
||||
const ipAddr = "35.204.49.125"
|
||||
const ipAddr = "8.8.8.8"
|
||||
|
||||
func TestLookupASN(t *testing.T) {
|
||||
asn, org, err := LookupASN(ipAddr)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if asn <= 0 {
|
||||
t.Fatal("unexpected ASN value")
|
||||
if asn != 15169 {
|
||||
t.Fatal("unexpected ASN value", asn)
|
||||
}
|
||||
if len(org) <= 0 {
|
||||
t.Fatal("unexpected org value")
|
||||
if org != "Google LLC" {
|
||||
t.Fatal("unexpected org value", org)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,8 +35,8 @@ func TestLookupCC(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(cc) != 2 {
|
||||
t.Fatal("does not seem a country code")
|
||||
if cc != "US" {
|
||||
t.Fatal("invalid country code", cc)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ package httpheader
|
||||
|
||||
// UserAgent returns the User-Agent header used for measuring.
|
||||
func UserAgent() string {
|
||||
// 11.0% as of May 13, 2021 according to https://techblog.willshouse.com/2012/01/03/most-common-user-agents/
|
||||
const ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36"
|
||||
// 10.0% as of Oct 20, 2021 according to https://techblog.willshouse.com/2012/01/03/most-common-user-agents/
|
||||
const ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36"
|
||||
return ua
|
||||
}
|
||||
|
||||
@@ -12,5 +12,5 @@ func UserAgent() string {
|
||||
// pretent to be a command line HTTP client.
|
||||
func CLIUserAgent() string {
|
||||
// here we always put the latest version of cURL.
|
||||
return "curl/7.76.1"
|
||||
return "curl/7.79.1"
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-29 16:40:31.464953 +0200 CEST m=+0.466236210
|
||||
// 2021-10-20 14:12:54.599493 +0200 CEST m=+0.419755751
|
||||
// https://curl.haxx.se/ca/cacert.pem
|
||||
|
||||
package netxlite
|
||||
@@ -10,7 +10,7 @@ const pemcerts string = `
|
||||
##
|
||||
## Bundle of CA Root Certificates
|
||||
##
|
||||
## Certificate data from Mozilla as of: Mon Jul 5 21:35:54 2021 GMT
|
||||
## Certificate data from Mozilla as of: Thu Sep 30 03:12:05 2021 GMT
|
||||
##
|
||||
## This is a bundle of X.509 certificates of public Certificate Authorities
|
||||
## (CA). These were automatically extracted from Mozilla's root certificates
|
||||
@@ -390,26 +390,6 @@ mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
|
||||
vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
DST Root CA X3
|
||||
==============
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
|
||||
ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
|
||||
DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
|
||||
cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
|
||||
ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
|
||||
rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
|
||||
UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
|
||||
xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
|
||||
utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
|
||||
AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
|
||||
MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
|
||||
dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
|
||||
GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
|
||||
RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
|
||||
fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
SwissSign Gold CA - G2
|
||||
======================
|
||||
-----BEGIN CERTIFICATE-----
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.42792 +0200 CEST m=+0.613746876
|
||||
// Generated: 2021-10-20 14:12:55.50877 +0200 CEST m=+0.664237210
|
||||
|
||||
package netxlite
|
||||
|
||||
@@ -7,7 +7,7 @@ package netxlite
|
||||
|
||||
// This enumeration lists the failures defined at
|
||||
// https://github.com/ooni/spec/blob/master/data-formats/df-007-errors.md.
|
||||
// Please, refer to such a document for more information.
|
||||
// Please, refer to that document for more information.
|
||||
const (
|
||||
FailureAddressFamilyNotSupported = "address_family_not_supported"
|
||||
FailureAddressInUse = "address_in_use"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:31.814543 +0200 CEST m=+0.000360918
|
||||
// Generated: 2021-10-20 14:12:54.844727 +0200 CEST m=+0.000188960
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:31.912358 +0200 CEST m=+0.098177043
|
||||
// Generated: 2021-10-20 14:12:54.927727 +0200 CEST m=+0.083189626
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:31.947263 +0200 CEST m=+0.133082793
|
||||
// Generated: 2021-10-20 14:12:54.974877 +0200 CEST m=+0.130340293
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.010423 +0200 CEST m=+0.196243584
|
||||
// Generated: 2021-10-20 14:12:55.045861 +0200 CEST m=+0.201324876
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.047214 +0200 CEST m=+0.233035084
|
||||
// Generated: 2021-10-20 14:12:55.086625 +0200 CEST m=+0.242089460
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.110555 +0200 CEST m=+0.296377043
|
||||
// Generated: 2021-10-20 14:12:55.158003 +0200 CEST m=+0.313467668
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.146781 +0200 CEST m=+0.332603876
|
||||
// Generated: 2021-10-20 14:12:55.199889 +0200 CEST m=+0.355353960
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.210176 +0200 CEST m=+0.395999709
|
||||
// Generated: 2021-10-20 14:12:55.26791 +0200 CEST m=+0.423375168
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.246508 +0200 CEST m=+0.432331918
|
||||
// Generated: 2021-10-20 14:12:55.309355 +0200 CEST m=+0.464820460
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.309745 +0200 CEST m=+0.495570709
|
||||
// Generated: 2021-10-20 14:12:55.377268 +0200 CEST m=+0.532734710
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.346817 +0200 CEST m=+0.532646709
|
||||
// Generated: 2021-10-20 14:12:55.419258 +0200 CEST m=+0.574724501
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// Generated: 2021-09-29 16:40:32.393519 +0200 CEST m=+0.579345709
|
||||
// Generated: 2021-10-20 14:12:55.470884 +0200 CEST m=+0.626351293
|
||||
|
||||
package netxlite
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:20.164257 +0200 CEST m=+0.000193834
|
||||
// 2021-10-20 14:12:55.762084 +0200 CEST m=+0.000209251
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:20.537692 +0200 CEST m=+0.000164918
|
||||
// 2021-10-20 14:12:56.092704 +0200 CEST m=+0.000214376
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:20.806737 +0200 CEST m=+0.000196043
|
||||
// 2021-10-20 14:12:56.387017 +0200 CEST m=+0.000215293
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:21.094817 +0200 CEST m=+0.000177376
|
||||
// 2021-10-20 14:12:56.679306 +0200 CEST m=+0.000207960
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:21.383065 +0200 CEST m=+0.000204043
|
||||
// 2021-10-20 14:12:56.962776 +0200 CEST m=+0.000233959
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:21.649124 +0200 CEST m=+0.000178126
|
||||
// 2021-10-20 14:12:57.244698 +0200 CEST m=+0.000236459
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:21.914519 +0200 CEST m=+0.000179917
|
||||
// 2021-10-20 14:12:57.571045 +0200 CEST m=+0.000218459
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:22.176937 +0200 CEST m=+0.000169251
|
||||
// 2021-10-20 14:12:57.8828 +0200 CEST m=+0.000181501
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:22.411961 +0200 CEST m=+0.000187918
|
||||
// 2021-10-20 14:12:58.154461 +0200 CEST m=+0.000196126
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:22.674011 +0200 CEST m=+0.000198918
|
||||
// 2021-10-20 14:12:58.438865 +0200 CEST m=+0.000235709
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:22.959095 +0200 CEST m=+0.000193418
|
||||
// 2021-10-20 14:12:58.734227 +0200 CEST m=+0.000193167
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:23.239796 +0200 CEST m=+0.000205959
|
||||
// 2021-10-20 14:12:59.020492 +0200 CEST m=+0.000188293
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:23.599657 +0200 CEST m=+0.000196001
|
||||
// 2021-10-20 14:12:59.343152 +0200 CEST m=+0.000202709
|
||||
|
||||
package ooapi
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-28 12:05:23.978512 +0200 CEST m=+0.000565751
|
||||
// 2021-10-20 14:12:59.725759 +0200 CEST m=+0.000530042
|
||||
|
||||
package ooapi
|
||||
|
||||
@@ -9,7 +9,7 @@ const swagger = `{
|
||||
"swagger": "2.0",
|
||||
"info": {
|
||||
"title": "OONI API specification",
|
||||
"version": "0.20210928.9100523"
|
||||
"version": "0.20211020.10121259"
|
||||
},
|
||||
"host": "api.ooni.io",
|
||||
"basePath": "/",
|
||||
|
||||
@@ -3,5 +3,5 @@ package version
|
||||
|
||||
const (
|
||||
// Version is the software version
|
||||
Version = "3.11.0-alpha"
|
||||
Version = "3.12.0-alpha"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user