Merge branch 'dev' of github.com:bunkerity/bunkerweb into dev

src/common/core/clientcache/plugin.json

@@ -38,7 +38,7 @@
       "help": "Value of the Cache-Control HTTP header.",
       "id": "client-cache-control",
       "label": "Cache-Control header",
-      "regex": "^.*$",
+      "regex": "^(?!(, ?| ))((, )?(((max-age|s-maxage|stale-while-revalidate|stale-if-error)=\\d+(?!.*\\6))|((?!.*public)private|(?!.*private)public)|(must|proxy)-revalidate|must-understand|immutable|no-(cache|store|transform))(?!.*\\5))+$",
       "type": "text"
     }
   }

tests/core/bwcli/main.py

@@ -55,7 +55,7 @@ try:
             f'❌ Redis ban list not found in the output of "bans", exiting ...\noutput: {result.output.decode()}'
         )
         exit(1)
-    elif b"1 hour" not in result.output or b"59 minutes" not in result.output:
+    elif b"1 hour" not in result.output and b"59 minutes" not in result.output:
         print(
             f"❌ Ban duration isn't 1 hour, exiting ...\noutput: {result.output.decode()}"
         )