ci/cd - fix core/cors tests

CHANGELOG.md

@@ -7,12 +7,17 @@
 - Store configuration in a database backend
 - Improved web UI and make it working with all integrations
 - Improved internal LUA code
+- Improved internal cache of BW
 - Add Redis support when using clustered integrations
 - Add RHEL integration
 - Add Vagrant integration
 - Init support of generic TCP/UDP (stream)
 - Init support of IPv6
-- Improved CI/CD
+- Improved CI/CD : UI tests, core tests and release automation
+- Reduce Docker images size
+- Fix and improved core plugins : antibot, cors, dnsbl, ...
+- Use PCRE regex instead of LUA patterns
+- Connectivity tests at startup/reload with logging
 
 ## v1.4.8 - 2023/04/05
 

tests/core/cors/main.py

@@ -39,7 +39,7 @@ try:
     firefox_options.add_argument("--headless")
 
     use_cors = getenv("USE_CORS", "no")
-    cors_allow_origin = getenv("CORS_ALLOW_ORIGIN", "*").replace("%.", ".")
+    cors_allow_origin = getenv("CORS_ALLOW_ORIGIN", "*").replace("\\", "").replace("^", "").replace("$", "")
     cors_expose_headers = getenv("CORS_EXPOSE_HEADERS", "Content-Length,Content-Range")
     cors_max_age = getenv("CORS_MAX_AGE", "86400")
     cors_allow_credentials = getenv("CORS_ALLOW_CREDENTIALS", "no") == "yes"

tests/core/cors/test.sh

@@ -20,7 +20,7 @@ cleanup_stack () {
     exit_code=$?
     if [[ $end -eq 1 || $exit_code = 1 ]] || [[ $end -eq 0 && $exit_code = 0 ]] && [ $manual = 0 ] ; then
         find . -type f -name 'docker-compose.*' -exec sed -i 's@USE_CORS: "yes"@USE_CORS: "no"@' {} \;
-        find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_ALLOW_ORIGIN: "https://www%.example%.com"@CORS_ALLOW_ORIGIN: "\*"@' {} \;
+        find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_ALLOW_ORIGIN: "^https://www\\\\.example\\\\.com$$"@CORS_ALLOW_ORIGIN: "\*"@' {} \;
         find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_EXPOSE_HEADERS: "X-Test"@CORS_EXPOSE_HEADERS: "Content-Length,Content-Range"@' {} \;
         find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_MAX_AGE: "3600"@CORS_MAX_AGE: "86400"@' {} \;
         find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_ALLOW_CREDENTIALS: "yes"@CORS_ALLOW_CREDENTIALS: "no"@' {} \;
@@ -55,10 +55,10 @@ do
         find . -type f -name 'docker-compose.*' -exec sed -i 's@USE_CORS: "no"@USE_CORS: "yes"@' {} \;
     elif [ "$test" = "allow_origin" ] ; then
         echo "🛰️ Running tests with cors allow origin set to https://www.example.com ..."
-        find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_ALLOW_ORIGIN: "\*"@CORS_ALLOW_ORIGIN: "https://www%.example%.com"@' {} \;
+        find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_ALLOW_ORIGIN: "\*"@CORS_ALLOW_ORIGIN: "^https://www\\\\.example\\\\.com$$"@' {} \;
     elif [ "$test" = "expose_headers" ] ; then
         echo "🛰️ Running tests with cors expose headers set to X-Test ..."
-        find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_ALLOW_ORIGIN: "https://www%.example%.com"@CORS_ALLOW_ORIGIN: "\*"@' {} \;
+        find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_ALLOW_ORIGIN: "^https://www\\\\.example\\\\.com$$"@CORS_ALLOW_ORIGIN: "\*"@' {} \;
         find . -type f -name 'docker-compose.*' -exec sed -i 's@CORS_EXPOSE_HEADERS: "Content-Length,Content-Range"@CORS_EXPOSE_HEADERS: "X-Test"@' {} \;
     elif [ "$test" = "max_age" ] ; then
         echo "🛰️ Running tests with cors max age set to 3600 ..."