Fix, update tests

Author: FedericoCeratto

api/ooniapi/incidents.py

@@ -192,7 +192,11 @@ def prepare_incident_dict(d: dict):
 def mismatched_email_addr(req: dict) -> bool:
     account_id = get_account_id_or_raise()
     hashed = hash_email_address(req["email_address"])
-    return account_id == hashed
+    if account_id == hashed:
+        return False
+
+    log.info(f"Email mismatch {hashed} {account_id}")
+    return True
 
 
 def user_cannot_update(incident_id: str) -> bool:

api/tests/integ/test_incidents.py

@@ -201,6 +201,7 @@ def test_crud_user_create(cleanup, client, adminsession, usersession):
         ],
         "published": False,
         "reported_by": "ooni",
+        "email_address": "[email protected]",
         "start_time": "2020-01-01T00:00:00Z",
         "tags": ["integ-test"],
         "title": title,
@@ -219,6 +220,7 @@ def test_crud_user_create_cannot_publish(cleanup, client, adminsession, usersess
         start_time=datetime(2020, 1, 1),
         end_time=None,
         reported_by="ooni",
+        email_address="[email protected]",
         title=title,
         text="foo bar\nbaz\n",
         event_type="incident",
@@ -243,6 +245,7 @@ def test_crud_user_create_invalid_asns(cleanup, client, adminsession, usersessio
         start_time=datetime(2020, 1, 1),
         end_time=None,
         reported_by="ooni",
+        email_address="[email protected]",
         title=title,
         text="foo bar\nbaz\n",
         event_type="incident",
@@ -267,6 +270,7 @@ def test_crud_user_create_invalid_dates(cleanup, client, adminsession, usersessi
         start_time=datetime(2020, 1, 1),
         end_time=datetime(2019, 1, 1),
         reported_by="ooni",
+        email_address="[email protected]",
         title=title,
         text="foo bar\nbaz\n",
         event_type="incident",
@@ -285,12 +289,39 @@ def test_crud_user_create_invalid_dates(cleanup, client, adminsession, usersessi
     assert r.status_code == 400, r.json
 
 
+def test_crud_user_create_mismatched_email(cleanup, client, adminsession, usersession):
+    title = "integ-test-6"
+    new = dict(
+        start_time=datetime(2020, 1, 1),
+        end_time=None,
+        reported_by="ooni",
+        email_address="[email protected]",
+        title=title,
+        short_description="integ test",
+        text="foo bar\nbaz\n",
+        event_type="incident",
+        published=False,
+        CCs=["UK", "FR"],
+        test_names=["web_connectivity"],
+        ASNs=[1, 2],
+        domains=[],
+        tags=["integ-test"],
+        links=[
+            "https://explorer.ooni.org/chart/mat?test_name=web_connectivity&axis_x=measurement_start_day&since=2023-04-16&until=2023-05-16&time_grain=day"
+        ],
+    )
+    d = dict(**new)
+    r = usersession.post("/api/v1/incidents/create", json=d)
+    assert r.status_code == 400, r.json
+
+
 def test_crud_invalid_fields(client, adminsession, usersession):
     # Create
     new = dict(
         start_time=datetime(2020, 1, 1),
         end_time=None,
         reported_by="ooni",
+        email_address="[email protected]",
         title="",  # empty
         short_description="integ test",
         text="foo bar\nbaz\n",
@@ -316,6 +347,7 @@ def test_crud_extra_field(client, adminsession, usersession):
         start_time=datetime(2020, 1, 1),
         end_time=None,
         reported_by="ooni",
+        email_address="[email protected]",
         title="",
         short_description="integ test",
         text="foo bar\nbaz\n",