Update pre-commit-config hooks and apply them

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: (^LICENSE.md$|^src/VERSION$|^env/|^src/(bw/misc/root-ca.pem$|deps/src/|common/core/modsecurity/files|ui/static/(js/(editor/|utils/purify/|tsparticles\.bundle\.min\.js)|css/dashboard\.css))|\.(svg|drawio|patch\d?|ascii|tf|tftpl|key)$)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: c4a0b883114b00d8d76b479c820ce7950211c99b # frozen: v4.5.0
+    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0
     hooks:
       - id: requirements-txt-fixer
         name: Fix requirements.txt and requirements.in files
@@ -17,7 +17,7 @@ repos:
       - id: check-case-conflict
 
   - repo: https://github.com/psf/black
-    rev: 552baf822992936134cbd31a38f69c8cfe7c0f05 # frozen: 24.3.0
+    rev: 8fe627072f15ff2e3d380887b92f7868efaf6d05 # frozen: 24.4.0
     hooks:
       - id: black
         name: Black Python Formatter

src/common/core/blacklist/ui/template.html

@@ -14,7 +14,7 @@
             </div>
             <p class="core-card-text mt-4 mb-2">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#blacklisting"  class="hover:brightness-90 cursor-pointer mt-2 underline text-primary">in the documentation</a>.</p>
         </div>
-        <!-- end info --> 
+        <!-- end info -->
 
           {% if pre_render.get("status", False) and pre_render.get("status", False) == "ko" or "error" in pre_render.get("data", {}) or not pre_render.get("data") %} <div class="core-layout-separator"></div>
           <div class="my-2 flex justify-center col-span-12">

src/common/core/misc/ui/template.html

@@ -14,7 +14,7 @@
             </div>
             <p class="core-card-text mt-4 mb-2">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/settings/#miscellaneous"  class="hover:brightness-90 cursor-pointer mt-2 underline text-primary">in the documentation</a>.</p>
         </div>
-        <!-- end info -->   
+        <!-- end info -->
 
           {% if pre_render.get("status", False) and pre_render.get("status", False) == "ko" or "error" in pre_render.get("data", {}) or not pre_render.get("data") %} <div class="core-layout-separator"></div>
           <div class="my-2 flex justify-center col-span-12">

src/linux/scripts/start.sh

@@ -113,8 +113,10 @@ function start() {
     stop_nginx
 
     # Check if we are in slave/master mode
-    export MASTER_MODE="$(grep "^MASTER_MODE=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
-    export SLAVE_MODE="$(grep "^SLAVE_MODE=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
+    MASTER_MODE="$(grep "^MASTER_MODE=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
+    export MASTER_MODE
+    SLAVE_MODE="$(grep "^SLAVE_MODE=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
+    export SLAVE_MODE
 
     if [ "$MASTER_MODE" != "yes" ] ; then
         # Generate temp conf for jobs and start nginx

tests/ui/global_config_page.py

@@ -23,11 +23,9 @@ try:
     select_combobox.send_keys("no plugin matching normally")
 
     # All tabs should be hidden
-    total_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('[data-tab-select-handler]').length"""
-    )
+    total_tabs = DRIVER.execute_script("""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('[data-tab-select-handler]').length""")
     hidden_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
+        """return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
     )
 
     if total_tabs != hidden_tabs:
@@ -42,7 +40,7 @@ try:
     select_combobox.send_keys("blacklist")
 
     hidden_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
+        """return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
     )
 
     if hidden_tabs != total_tabs - 1:
@@ -61,7 +59,7 @@ try:
         exit(1)
 
     hidden_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
+        """return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
     )
 
     if hidden_tabs:

tests/ui/services_page.py

@@ -69,11 +69,9 @@ try:
     select_combobox.send_keys("no plugin matching normally")
 
     # All tabs should be hidden
-    total_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('[data-tab-select-handler]').length"""
-    )
+    total_tabs = DRIVER.execute_script("""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('[data-tab-select-handler]').length""")
     hidden_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
+        """return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
     )
 
     if total_tabs != hidden_tabs:
@@ -88,7 +86,7 @@ try:
     select_combobox.send_keys("blacklist")
 
     hidden_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
+        """return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
     )
 
     if hidden_tabs != total_tabs - 1:
@@ -107,7 +105,7 @@ try:
         exit(1)
 
     hidden_tabs = DRIVER.execute_script(
-        f"""return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
+        """return document?.querySelector('[data-tab-select-dropdown]')?.querySelectorAll('button[data-tab-select-handler][class*="hidden"]').length"""
     )
 
     if hidden_tabs: