add collectors to ooniapi

ooniapi/common/src/common/config.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Dict
 from pydantic_settings import BaseSettings
 
 
@@ -41,3 +41,21 @@ class Settings(BaseSettings):
     failed_reports_bucket: str = (
         ""  # for uploading reports that couldn't be sent to fastpath
     )
+
+    # ooniprobe client configuration
+    collectors: List[Dict[str, str]] = [
+        {"address": "httpo://guegdifjy7bjpequ.onion", "type": "onion"},
+        {"address": "https://ams-pg.ooni.org:443", "type": "https"},
+        {
+            "address": "https://dkyhjv0wpi2dk.cloudfront.net",
+            "front": "dkyhjv0wpi2dk.cloudfront.net",
+            "type": "cloudfront",
+        },
+        {"address": "httpo://guegdifjy7bjpequ.onion", "type": "onion"},
+        {"address": "https://ams-pg.ooni.org:443", "type": "https"},
+        {
+            "address": "https://dkyhjv0wpi2dk.cloudfront.net",
+            "front": "dkyhjv0wpi2dk.cloudfront.net",
+            "type": "cloudfront",
+        },
+    ]

ooniapi/services/ooniprobe/src/ooniprobe/routers/v1/probe_services.py

@@ -17,7 +17,6 @@
     lookup_probe_network,
 )
 from ...dependencies import CCReaderDep, ASNReaderDep, ClickhouseDep, SettingsDep
-from ...common.dependencies import get_settings
 from ...common.routers import BaseModel
 from ...common.auth import create_jwt, decode_jwt, jwt
 from ...common.config import Settings
@@ -81,7 +80,7 @@ class ProbeLoginResponse(BaseModel):
 def probe_login_post(
     probe_login: ProbeLogin,
     response: Response,
-    settings: Settings = Depends(get_settings),
+    settings: SettingsDep,
 ) -> ProbeLoginResponse:
 
     if probe_login.username is None or probe_login.password is None:
@@ -151,7 +150,7 @@ class ProbeRegisterResponse(BaseModel):
 def probe_register_post(
     probe_register: ProbeRegister,
     response: Response,
-    settings: Settings = Depends(get_settings),
+    settings: SettingsDep,
 ) -> ProbeRegisterResponse:
     """Probe Services: Register
 
@@ -590,3 +589,21 @@ def random_web_test_helpers(th_list: List[str]) -> List[Dict]:
     for th_addr in th_list:
         out.append({"address": th_addr, "type": "https"})
     return out
+
+
+class CollectorEntry(BaseModel):
+    # not actually used but necessary to be compliant with the old API schema
+    address: str = Field(description="Address of collector")
+    front: Optional[str] = Field(default=None, description="Fronted domain")
+    type: Optional[str] = Field(default=None, description="Type of collector")
+
+@router.get("/collectors", tags=["ooniprobe"])
+def list_collectors(
+    settings: SettingsDep,
+    ) -> List[CollectorEntry]:
+    config_collectors = settings.collectors
+    collectors_response = []
+    for entry in config_collectors:
+        collector = CollectorEntry(**entry)
+        collectors_response.append(collector)
+    return collectors_response

ooniapi/services/ooniprobe/tests/integ/test_list_collectors.py

@@ -0,0 +1,5 @@
+def test_list_collectors(client):
+    c = client.get("/api/v1/collectors").json()
+    assert len(c) == 6
+    for entry in c:
+        assert "address" in entry