Merge branch 'internetstandards:main' into main

Author: apio-sys

Changelog.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 1.10 (in progress)
+## 1.10
 
 _Compared to the latest 1.9 release._
 
@@ -44,6 +44,7 @@ docker network rm internetnl-prod_public-internet
 - The API version was updated to version 2.5.0.
 - The fields `caa_enabled`, `caa_errors`, `caa_recommendations`, `caa_records`, and `caa_found_on_domain` have been added
   ([OpenAPI diff](https://github.com/internetstandards/Internet.nl/commit/cdc642c97f3ef00b4ef8ec7ff6ea4c5403c80978#diff-ccabca18cd3cc1ba3dd325e532acccf5d37c7be317a2966209b6e55b968d4890)).
+- The API report URL was [updated to use HTTPS](https://github.com/internetstandards/Internet.nl/issues/1704).
 
 ## 1.9.3
 

checks/tasks/shared.py

@@ -336,7 +336,7 @@ def aggregate_subreports(subreports, report):
                 # This is a small hack to allow running CAA along with all other tests in web,
                 # i.e. once per webserver IP, while it only applies once per target domain.
                 # Therefore, the tech table is flattened to only include one result, and no server column.
-                if subreport[test_item]["name"] in ["web_caa", "mail_caa"]:
+                if subreport[test_item]["name"] == "web_caa":
                     report[test_item]["tech_data"] = [[row] for row in subtechdata]
                     continue
                 elif subreport[test_item]["tech_type"] == "table_multi_col" and isinstance(subtechdata, list):

docker/webserver/nginx_templates/app.conf.template

@@ -177,6 +177,7 @@ server {
         proxy_cache_key $scheme$host$uri$is_args$args$http_accept_language;
 
         proxy_set_header REMOTE-USER $remote_user;
+
         include /etc/nginx/conf.d/basic_auth.include;
         # set proxy_pass argument for 'app' container as variable, this way nginx doesn't fail when 'app' is unresolvable at startup
         set $app http://app:8080;
@@ -285,6 +286,7 @@ server {
 
         # pass host for Django's allowed_hosts
         proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
 
         # set proxy_pass argument for 'app' container as variable, this way nginx doesn't fail when 'app' is unresolvable at startup
         set $app http://app:8080;

integration_tests/batch/test_batch.py

@@ -120,6 +120,10 @@ def test_batch_request(unique_id, register_test_user, test_domain):
     assert results_response_data["domains"][test_domain]["status"] == "ok"
     assert results_response_data["domains"][test_domain]["scoring"]["percentage"] == TEST_DOMAIN_EXPECTED_SCORE
 
+    assert results_response_data["domains"][test_domain]["report"]["url"].startswith(
+        "https"
+    ), "Report URL should take procotol from request (https)"
+
     # test results page should be publicly accessible
     report_url = results_response_data["domains"][test_domain]["report"]["url"]
     response = requests.get(report_url, verify=False)