add endpoint /api/v1/test-list/psiphon-config

ansible/roles/ooni-backend/templates/nginx-api.conf

@@ -84,7 +84,7 @@ server {
   }
 
   # Selectively route test-list/urls to the API
-  location ~^/api/v1/test-list/(urls|tor-targets) {
+  location ~^/api/v1/test-list/urls {
       proxy_pass http://127.0.0.1:8000;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
@@ -106,6 +106,18 @@ server {
       add_header X-Content-Type-Options nosniff always;
   }
 
+   # reverse proxy test-list/urls, test-list/psiphon-config, test-list/tor-targets endpoints
+   location ~^/api/v1/test-list/(tor-targets|psiphon-config) {
+      proxy_http_version 1.1;
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Real-IP $external_remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_read_timeout 900;
+
+      proxy_pass https://ooniprobe.prod.ooni.io:443;
+   }
+
   # Orchestrate
   # Should match:
   # - /api/v1/test-list

tf/environments/dev/main.tf

@@ -597,6 +597,7 @@ module "ooniapi_ooniprobe" {
     COLLECTOR_ID          = 3 # use a different one in prod
     CONFIG_BUCKET         = aws_s3_bucket.ooni_private_config_bucket.bucket
     TOR_TARGETS           = "tor_targets.json"
+    PSIPHON_CONFIG        = "psiphon_config.json"
     ANONC_MANIFEST_BUCKET = aws_s3_bucket.anoncred_manifests.bucket
     ANONC_MANIFEST_FILE   = "manifest.json"
   }

tf/environments/prod/main.tf

@@ -821,6 +821,7 @@ module "ooniapi_ooniprobe" {
     COLLECTOR_ID          = 4 # be sure this is different from dev
     CONFIG_BUCKET         = aws_s3_bucket.ooni_private_config_bucket.bucket
     TOR_TARGETS           = "tor_targets.json"
+    PSIPHON_CONFIG        = "psiphon_config.json"
     ANONC_MANIFEST_BUCKET = aws_s3_bucket.anoncred_manifests.bucket
     ANONC_MANIFEST_FILE   = "manifest.json"
   }

tf/modules/ooniapi_frontend/main.tf

@@ -413,7 +413,8 @@ resource "aws_lb_listener_rule" "ooniapi_ooniprobe_rule_4" {
         "/bouncer/net-tests*",
         "/api/v1/geolookup*",
         "/api/v1/collectors*",
-        "/api/v1/test-list/tor-targets"
+        "/api/v1/test-list/tor-targets",
+        "/api/v1/test-list/psiphon-config"
       ]
     }
   }