Merge pull request #110 from ooni/fix/analysis-confirmed

Fix/analysis confirmed

oonipipeline/src/oonipipeline/analysis/web_analysis.py

@@ -116,9 +116,9 @@ def format_query_analysis_web_fuzzy_logic(
         length(dns_answers) = 0 AND dns_failure IS NULL,
         tuple(0.0, 0.0, 0.0),
 
-        -- We matches a country blockpage, our possibility of blocking is 1.
+        -- We matched a country blockpage, our possibility of blocking is 1.
         dns_blocking_country_consistent,
-        tuple(1.0, 1.0, 0.0),
+        tuple(1.0, 0.0, 0.0),
 
         -- We got a TLS consistent inside of DNS, this is a very strong signal that
         -- the answer is good.
@@ -197,6 +197,10 @@ def format_query_analysis_web_fuzzy_logic(
         -- We didn't get a good DNS answer, so we can't do much to analyze this result set since we
         -- can't trust what we saw in DNS, so we just return early and ignore this from the perspective of
         -- a TCP analysis
+
+        -- TODO(art): since this being applied after the first check for success, we
+        -- run the risk of marking as OK TCP instances where we were able to connect to the blockpage.
+        -- It it correct to do so?
         dns_blocked > 0 AND dns_ok <= (dns_blocked + dns_down),
         tuple(0, 0, 0),
 

oonipipeline/src/oonipipeline/cli/commands.py

@@ -165,6 +165,7 @@ def run(
         elif workflow_name == "analysis":
             make_analysis_in_a_day(
                 MakeAnalysisParams(
+                    clickhouse_url=config.clickhouse_url,
                     probe_cc=probe_cc,
                     test_name=test_name,
                     day=start_day,