x

ooni · Nov 28, 2023 · 05ca7ee · 05ca7ee
1 parent 8683d63
commit 05ca7ee
Show file tree

Hide file tree

Showing 37 changed files with 62 additions and 545 deletions.
diff --git a/internal/cmd/minipipeline/testdata/analysis.json b/internal/cmd/minipipeline/testdata/analysis.json
@@ -20,4 +20,4 @@
   "TCPTransactionsWithUnexpectedTLSHandshakeFailures": {},
   "TCPTransactionsWithUnexpectedHTTPFailures": {},
   "TCPTransactionsWithUnexplainedUnexpectedFailures": {}
-}
+}
diff --git a/internal/cmd/minipipeline/testdata/observations.json b/internal/cmd/minipipeline/testdata/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -46,7 +45,6 @@
       "DNSEngine": "doh",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -86,7 +84,6 @@
       "DNSEngine": "udp",
       "IPAddress": "130.192.16.171",
       "IPAddressASN": 137,
-      "IPAddressOrg": "Consortium GARR",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -124,7 +121,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": "130.192.16.171",
       "IPAddressASN": 137,
-      "IPAddressOrg": "Consortium GARR",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -162,7 +158,6 @@
       "DNSEngine": "doh",
       "IPAddress": "130.192.16.171",
       "IPAddressASN": 137,
-      "IPAddressOrg": "Consortium GARR",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -202,7 +197,6 @@
       "DNSEngine": null,
       "IPAddress": "130.192.16.171",
       "IPAddressASN": 137,
-      "IPAddressOrg": "Consortium GARR",
       "IPAddressBogon": false,
       "EndpointTransactionID": 4,
       "EndpointProto": "tcp",
@@ -263,4 +257,4 @@
       "ControlHTTPResponseTitle": "Nexa Center for Internet \u0026 Society | Il centro Nexa è un centro di ricerca del Dipartimento di Automatica e Informatica del Politecnico di Torino"
     }
   }
-}
+}
diff --git a/internal/minipipeline/observation.go b/internal/minipipeline/observation.go
@@ -371,7 +371,7 @@ func (c *WebObservationsContainer) IngestHTTPRoundTripEvents(evs ...*model.Archi
 		obs.HTTPFailure = optional.Some(utilsStringPointerToString(ev.Failure))
 
 		// consider the response authoritative only in case of success
-		if ev.Failure != nil {
+		if ev.Failure == nil {
 			obs.HTTPResponseStatusCode = optional.Some(ev.Response.Code)
 			obs.HTTPResponseBodyLength = optional.Some(int64(len(ev.Response.Body)))
 			obs.HTTPResponseBodyIsTruncated = optional.Some(ev.Request.BodyIsTruncated)

diff --git a/...ipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json b/...ipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -48,7 +47,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -86,7 +84,6 @@
       "DNSEngine": "udp",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -126,7 +123,6 @@
       "DNSEngine": null,
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": 3,
       "EndpointProto": "tcp",

diff --git a/...a/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json b/...a/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -46,7 +45,6 @@
       "DNSEngine": "doh",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -86,7 +84,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -124,7 +121,6 @@
       "DNSEngine": "udp",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -162,7 +158,6 @@
       "DNSEngine": "doh",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -202,7 +197,6 @@
       "DNSEngine": null,
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": 4,
       "EndpointProto": "tcp",

diff --git a/...webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json b/...webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -48,7 +47,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -86,7 +84,6 @@
       "DNSEngine": "udp",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -126,7 +123,6 @@
       "DNSEngine": null,
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": 3,
       "EndpointProto": "tcp",
@@ -169,7 +165,6 @@
       "DNSEngine": null,
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": 4,
       "EndpointProto": "tcp",

diff --git a/...nipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json b/...nipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -48,7 +47,6 @@
       "DNSEngine": "udp",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -86,7 +84,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -126,7 +123,6 @@
       "DNSEngine": null,
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
-      "IPAddressOrg": "Google LLC",
       "IPAddressBogon": false,
       "EndpointTransactionID": 3,
       "EndpointProto": "tcp",

diff --git a/...data/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json b/...data/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -48,7 +47,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -86,7 +84,6 @@
       "DNSEngine": "udp",
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -126,7 +123,6 @@
       "DNSEngine": null,
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": 3,
       "EndpointProto": "tcp",

diff --git a/...tdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json b/...tdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -48,7 +47,6 @@
       "DNSEngine": "udp",
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -86,7 +84,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -126,7 +123,6 @@
       "DNSEngine": null,
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": 3,
       "EndpointProto": "tcp",
@@ -169,7 +165,6 @@
       "DNSEngine": null,
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": 4,
       "EndpointProto": "tcp",

diff --git a/...ine/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json b/...ine/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json
@@ -8,7 +8,6 @@
       "DNSEngine": "udp",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -46,45 +45,6 @@
       "DNSEngine": "getaddrinfo",
       "IPAddress": null,
       "IPAddressASN": null,
-      "IPAddressOrg": null,
-      "IPAddressBogon": null,
-      "EndpointTransactionID": null,
-      "EndpointProto": null,
-      "EndpointPort": null,
-      "EndpointAddress": null,
-      "TCPConnectFailure": null,
-      "TLSHandshakeFailure": null,
-      "TLSServerName": null,
-      "HTTPRequestURL": null,
-      "HTTPFailure": null,
-      "HTTPResponseStatusCode": null,
-      "HTTPResponseBodyLength": null,
-      "HTTPResponseBodyIsTruncated": null,
-      "HTTPResponseHeadersKeys": null,
-      "HTTPResponseLocation": null,
-      "HTTPResponseTitle": null,
-      "HTTPResponseIsFinal": null,
-      "ControlDNSDomain": "www.example.com",
-      "ControlDNSLookupFailure": "",
-      "ControlTCPConnectFailure": null,
-      "MatchWithControlIPAddress": null,
-      "MatchWithControlIPAddressASN": null,
-      "ControlTLSHandshakeFailure": null,
-      "ControlHTTPFailure": null,
-      "ControlHTTPResponseStatusCode": null,
-      "ControlHTTPResponseBodyLength": null,
-      "ControlHTTPResponseHeadersKeys": null,
-      "ControlHTTPResponseTitle": null
-    },
-    {
-      "DNSTransactionID": 1,
-      "DNSDomain": "www.example.com",
-      "DNSLookupFailure": "dns_no_answer",
-      "DNSQueryType": "AAAA",
-      "DNSEngine": "udp",
-      "IPAddress": null,
-      "IPAddressASN": null,
-      "IPAddressOrg": null,
       "IPAddressBogon": null,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -124,7 +84,6 @@
       "DNSEngine": "udp",
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": null,
       "EndpointProto": null,
@@ -164,7 +123,6 @@
       "DNSEngine": null,
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
-      "IPAddressOrg": "Edgecast Inc.",
       "IPAddressBogon": false,
       "EndpointTransactionID": 3,
       "EndpointProto": "tcp",