x

ooni · Feb 12, 2024 · daeeb50 · daeeb50
1 parent 648fdb6
commit daeeb50
Show file tree

Hide file tree

Showing 45 changed files with 893 additions and 907 deletions.
diff --git a/...ata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json b/...ata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json
@@ -38,7 +38,7 @@
   "TCPConnectUnexplainedFailureDuringWebFetch": [],
   "TCPConnectUnexplainedFailureDuringConnectivityCheck": [],
   "TLSHandshakeExpectedFailure": [
-    40002
+    40001
   ],
   "TLSHandshakeUnexpectedFailure": [],
   "TLSHandshakeUnexpectedFailureDuringWebFetch": [],
@@ -49,7 +49,7 @@
   "HTTPRoundTripUnexpectedFailure": [],
   "HTTPRoundTripUnexplainedFailure": [],
   "HTTPFinalResponseSuccessTLSWithoutControl": null,
-  "HTTPFinalResponseSuccessTLSWithControl": 40001,
+  "HTTPFinalResponseSuccessTLSWithControl": 40002,
   "HTTPFinalResponseSuccessTCPWithoutControl": null,
   "HTTPFinalResponseSuccessTCPWithControl": null,
   "HTTPFinalResponseDiffBodyProportionFactor": 1,
@@ -64,7 +64,7 @@
       "TagDepth": 0,
       "Type": 3,
       "Failure": "",
-      "TransactionID": 40001,
+      "TransactionID": 40002,
       "TagFetchBody": true,
       "DNSTransactionID": 20001,
       "DNSDomain": "www.example.com",
@@ -78,7 +78,7 @@
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40001,
+      "EndpointTransactionID": 40002,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "93.184.216.34:443",
@@ -121,7 +121,7 @@
       "TagDepth": 0,
       "Type": 2,
       "Failure": "ssl_unknown_authority",
-      "TransactionID": 40002,
+      "TransactionID": 40001,
       "TagFetchBody": true,
       "DNSTransactionID": 1,
       "DNSDomain": "www.example.com",
@@ -135,7 +135,7 @@
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40002,
+      "EndpointTransactionID": 40001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "104.154.89.105:443",

diff --git a/...onnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json b/...onnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json
@@ -30,7 +30,7 @@
   "TCPConnectUnexplainedFailureDuringWebFetch": [],
   "TCPConnectUnexplainedFailureDuringConnectivityCheck": [],
   "TLSHandshakeExpectedFailure": [
-    40002
+    40001
   ],
   "TLSHandshakeUnexpectedFailure": [],
   "TLSHandshakeUnexpectedFailureDuringWebFetch": [],
@@ -53,7 +53,7 @@
       "TagDepth": 0,
       "Type": 2,
       "Failure": "ssl_unknown_authority",
-      "TransactionID": 40002,
+      "TransactionID": 40001,
       "TagFetchBody": true,
       "DNSTransactionID": 1,
       "DNSDomain": "www.example.com",
@@ -67,7 +67,7 @@
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40002,
+      "EndpointTransactionID": 40001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "104.154.89.105:443",

diff --git a/.../webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json b/.../webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json
@@ -219,7 +219,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 40001
+        "transaction_id": 40002
       }
     ],
     "tcp_connect": [
@@ -235,7 +235,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 40002
+        "transaction_id": 40001
       },
       {
         "ip": "93.184.216.34",
@@ -249,7 +249,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 40001
+        "transaction_id": 40002
       }
     ],
     "tls_handshakes": [
@@ -268,7 +268,7 @@
           "fetch_body=true"
         ],
         "tls_version": "",
-        "transaction_id": 40002
+        "transaction_id": 40001
       },
       {
         "network": "tcp",
@@ -285,7 +285,7 @@
           "fetch_body=true"
         ],
         "tls_version": "TLSv1.3",
-        "transaction_id": 40001
+        "transaction_id": 40002
       }
     ],
     "x_control_request": {
@@ -302,10 +302,10 @@
         ]
       },
       "tcp_connect": [
-        "93.184.216.34:443",
-        "93.184.216.34:80",
         "104.154.89.105:443",
-        "104.154.89.105:80"
+        "104.154.89.105:80",
+        "93.184.216.34:443",
+        "93.184.216.34:80"
       ],
       "x_quic_enabled": false
     },

diff --git a/...webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json b/...webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json
@@ -262,50 +262,45 @@
   "KnownTCPEndpoints": {
     "40001": {
       "TagDepth": 0,
-      "Type": 3,
-      "Failure": "",
+      "Type": 2,
+      "Failure": "ssl_unknown_authority",
       "TransactionID": 40001,
       "TagFetchBody": true,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 1,
       "DNSDomain": "www.example.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
       "DNSEngine": null,
       "DNSResolvedAddrs": [
-        "93.184.216.34"
+        "104.154.89.105"
       ],
       "IPAddressOrigin": "dns",
-      "IPAddress": "93.184.216.34",
-      "IPAddressASN": 15133,
+      "IPAddress": "104.154.89.105",
+      "IPAddressASN": 396982,
       "IPAddressBogon": false,
       "EndpointTransactionID": 40001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
-      "EndpointAddress": "93.184.216.34:443",
+      "EndpointAddress": "104.154.89.105:443",
       "TCPConnectFailure": "",
-      "TLSHandshakeFailure": "",
+      "TLSHandshakeFailure": "ssl_unknown_authority",
       "TLSServerName": "www.example.com",
-      "HTTPRequestURL": "https://www.example.com/",
-      "HTTPFailure": "",
-      "HTTPResponseStatusCode": 200,
-      "HTTPResponseBodyLength": 1533,
-      "HTTPResponseBodyIsTruncated": false,
-      "HTTPResponseHeadersKeys": {
-        "Alt-Svc": true,
-        "Content-Length": true,
-        "Content-Type": true,
-        "Date": true
-      },
+      "HTTPRequestURL": null,
+      "HTTPFailure": null,
+      "HTTPResponseStatusCode": null,
+      "HTTPResponseBodyLength": null,
+      "HTTPResponseBodyIsTruncated": null,
+      "HTTPResponseHeadersKeys": null,
       "HTTPResponseLocation": null,
-      "HTTPResponseTitle": "Default Web Page",
-      "HTTPResponseIsFinal": true,
+      "HTTPResponseTitle": null,
+      "HTTPResponseIsFinal": null,
       "ControlDNSDomain": "www.example.com",
       "ControlDNSLookupFailure": "",
       "ControlDNSResolvedAddrs": [
         "93.184.216.34"
       ],
       "ControlTCPConnectFailure": "",
-      "ControlTLSHandshakeFailure": "",
+      "ControlTLSHandshakeFailure": "ssl_unknown_authority",
       "ControlHTTPFailure": "",
       "ControlHTTPResponseStatusCode": 200,
       "ControlHTTPResponseBodyLength": 1533,
@@ -319,45 +314,50 @@
     },
     "40002": {
       "TagDepth": 0,
-      "Type": 2,
-      "Failure": "ssl_unknown_authority",
+      "Type": 3,
+      "Failure": "",
       "TransactionID": 40002,
       "TagFetchBody": true,
-      "DNSTransactionID": 1,
+      "DNSTransactionID": 20001,
       "DNSDomain": "www.example.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
       "DNSEngine": null,
       "DNSResolvedAddrs": [
-        "104.154.89.105"
+        "93.184.216.34"
       ],
       "IPAddressOrigin": "dns",
-      "IPAddress": "104.154.89.105",
-      "IPAddressASN": 396982,
+      "IPAddress": "93.184.216.34",
+      "IPAddressASN": 15133,
       "IPAddressBogon": false,
       "EndpointTransactionID": 40002,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
-      "EndpointAddress": "104.154.89.105:443",
+      "EndpointAddress": "93.184.216.34:443",
       "TCPConnectFailure": "",
-      "TLSHandshakeFailure": "ssl_unknown_authority",
+      "TLSHandshakeFailure": "",
       "TLSServerName": "www.example.com",
-      "HTTPRequestURL": null,
-      "HTTPFailure": null,
-      "HTTPResponseStatusCode": null,
-      "HTTPResponseBodyLength": null,
-      "HTTPResponseBodyIsTruncated": null,
-      "HTTPResponseHeadersKeys": null,
+      "HTTPRequestURL": "https://www.example.com/",
+      "HTTPFailure": "",
+      "HTTPResponseStatusCode": 200,
+      "HTTPResponseBodyLength": 1533,
+      "HTTPResponseBodyIsTruncated": false,
+      "HTTPResponseHeadersKeys": {
+        "Alt-Svc": true,
+        "Content-Length": true,
+        "Content-Type": true,
+        "Date": true
+      },
       "HTTPResponseLocation": null,
-      "HTTPResponseTitle": null,
-      "HTTPResponseIsFinal": null,
+      "HTTPResponseTitle": "Default Web Page",
+      "HTTPResponseIsFinal": true,
       "ControlDNSDomain": "www.example.com",
       "ControlDNSLookupFailure": "",
       "ControlDNSResolvedAddrs": [
         "93.184.216.34"
       ],
       "ControlTCPConnectFailure": "",
-      "ControlTLSHandshakeFailure": "ssl_unknown_authority",
+      "ControlTLSHandshakeFailure": "",
       "ControlHTTPFailure": "",
       "ControlHTTPResponseStatusCode": 200,
       "ControlHTTPResponseBodyLength": 1533,

diff --git a/...ctivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json b/...ctivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json
@@ -55,11 +55,11 @@
     }
   ],
   "KnownTCPEndpoints": {
-    "40002": {
+    "40001": {
       "TagDepth": 0,
       "Type": 2,
       "Failure": "ssl_unknown_authority",
-      "TransactionID": 40002,
+      "TransactionID": 40001,
       "TagFetchBody": true,
       "DNSTransactionID": 1,
       "DNSDomain": "www.example.com",
@@ -73,7 +73,7 @@
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40002,
+      "EndpointTransactionID": 40001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "104.154.89.105:443",

diff --git a/...ipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json b/...ipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json
@@ -49,7 +49,7 @@
   "HTTPFinalResponseSuccessTLSWithoutControl": null,
   "HTTPFinalResponseSuccessTLSWithControl": null,
   "HTTPFinalResponseSuccessTCPWithoutControl": null,
-  "HTTPFinalResponseSuccessTCPWithControl": 30002,
+  "HTTPFinalResponseSuccessTCPWithControl": 30001,
   "HTTPFinalResponseDiffBodyProportionFactor": 1,
   "HTTPFinalResponseDiffStatusCodeMatch": true,
   "HTTPFinalResponseDiffTitleDifferentLongWords": {},
@@ -61,7 +61,7 @@
       "TagDepth": 0,
       "Type": 3,
       "Failure": "",
-      "TransactionID": 30002,
+      "TransactionID": 30001,
       "TagFetchBody": true,
       "DNSTransactionID": 1,
       "DNSDomain": "www.example.com",
@@ -75,7 +75,7 @@
       "IPAddress": "130.192.182.17",
       "IPAddressASN": 137,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 30002,
+      "EndpointTransactionID": 30001,
       "EndpointProto": "tcp",
       "EndpointPort": "80",
       "EndpointAddress": "130.192.182.17:80",
@@ -119,22 +119,22 @@
       "Failure": "",
       "TransactionID": 40002,
       "TagFetchBody": false,
-      "DNSTransactionID": 1,
+      "DNSTransactionID": 20001,
       "DNSDomain": "www.example.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
       "DNSEngine": null,
       "DNSResolvedAddrs": [
-        "130.192.182.17"
+        "93.184.216.34"
       ],
       "IPAddressOrigin": "dns",
-      "IPAddress": "130.192.182.17",
-      "IPAddressASN": 137,
+      "IPAddress": "93.184.216.34",
+      "IPAddressASN": 15133,
       "IPAddressBogon": false,
       "EndpointTransactionID": 40002,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
-      "EndpointAddress": "130.192.182.17:443",
+      "EndpointAddress": "93.184.216.34:443",
       "TCPConnectFailure": "",
       "TLSHandshakeFailure": "",
       "TLSServerName": "www.example.com",
@@ -171,22 +171,22 @@
       "Failure": "",
       "TransactionID": 40001,
       "TagFetchBody": false,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 1,
       "DNSDomain": "www.example.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
       "DNSEngine": null,
       "DNSResolvedAddrs": [
-        "93.184.216.34"
+        "130.192.182.17"
       ],
       "IPAddressOrigin": "dns",
-      "IPAddress": "93.184.216.34",
-      "IPAddressASN": 15133,
+      "IPAddress": "130.192.182.17",
+      "IPAddressASN": 137,
       "IPAddressBogon": false,
       "EndpointTransactionID": 40001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
-      "EndpointAddress": "93.184.216.34:443",
+      "EndpointAddress": "130.192.182.17:443",
       "TCPConnectFailure": "",
       "TLSHandshakeFailure": "",
       "TLSServerName": "www.example.com",
@@ -221,7 +221,7 @@
       "TagDepth": 0,
       "Type": 1,
       "Failure": "",
-      "TransactionID": 30001,
+      "TransactionID": 30002,
       "TagFetchBody": true,
       "DNSTransactionID": 20001,
       "DNSDomain": "www.example.com",
@@ -235,7 +235,7 @@
       "IPAddress": "93.184.216.34",
       "IPAddressASN": 15133,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 30001,
+      "EndpointTransactionID": 30002,
       "EndpointProto": "tcp",
       "EndpointPort": "80",
       "EndpointAddress": "93.184.216.34:80",