From 1d126e1d0e4922e7c36917d1a5c189dd3ba8a159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Thu, 18 May 2023 18:01:18 -0400 Subject: [PATCH] core - fix cors tests with the preflight request --- tests/core/cors/docker-compose.yml | 1 + tests/core/cors/main.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/core/cors/docker-compose.yml b/tests/core/cors/docker-compose.yml index c7c0643a..5f7ea2e0 100644 --- a/tests/core/cors/docker-compose.yml +++ b/tests/core/cors/docker-compose.yml @@ -17,6 +17,7 @@ services: LOG_LEVEL: "info" GENERATE_SELF_SIGNED_SSL: "no" ALLOWED_METHODS: "GET|POST|HEAD|OPTIONS" + CUSTOM_CONF_SEVER_HTTP_main: "location /options { default_type 'text/plain'; content_by_lua_block { if ngx.var.request_method == \"OPTIONS\" then ngx.say(\"Hello, world!\") end } }" # ? CORS settings USE_CORS: "no" diff --git a/tests/core/cors/main.py b/tests/core/cors/main.py index 671f414f..c9b19604 100644 --- a/tests/core/cors/main.py +++ b/tests/core/cors/main.py @@ -113,19 +113,20 @@ try: sleep(1) print( - f"ℹ️ Sending a preflight request to http{'s' if ssl else ''}://www.example.com ...", + f"ℹ️ Sending a preflight request to http{'s' if ssl else ''}://www.example.com/options ...", flush=True, ) response = options( - f"http{'s' if ssl else ''}://www.example.com", + f"http{'s' if ssl else ''}://www.example.com/options", headers={ "Host": "www.example.com", "Origin": f"http{'s' if ssl else ''}://bwadm.example.com", }, verify=False, ) - response.raise_for_status() + if response.status_code != 404: + response.raise_for_status() if use_cors: if (