jaaql-middleware-python 4.21.36__tar.gz → 4.21.38__tar.gz

{jaaql-middleware-python-4.21.36/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.21.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.21.36
+Version: 4.21.38
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv
@@ -8,12 +8,12 @@ Author-email: aaron.tasker@sqmi.nl
 License: Mozilla Public License Version 2.0 with Commons Clause
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: jaaql-monitor~=1.2.109
+Requires-Dist: jaaql-monitor~=1.2.119
 Requires-Dist: psycopg[binary]~=3.1.18
-Requires-Dist: Pillow~=10.1.0
-Requires-Dist: cryptography~=41.0.5
-Requires-Dist: flask~=3.0.0
-Requires-Dist: coverage~=7.3.2
+Requires-Dist: Pillow~=10.2.0
+Requires-Dist: cryptography~=42.0.5
+Requires-Dist: flask~=3.0.2
+Requires-Dist: coverage~=7.4.3
 Requires-Dist: psycopg-pool~=3.2.1
 Requires-Dist: pyjwt~=2.8.0
 Requires-Dist: pyyaml~=6.0.1
@@ -22,13 +22,13 @@ Requires-Dist: argon2-cffi~=23.1.0
 Requires-Dist: pyotp~=2.9.0
 Requires-Dist: qrcode~=7.4.2
 Requires-Dist: gunicorn~=21.2.0
-Requires-Dist: gevent~=23.9.1
+Requires-Dist: gevent~=24.2.1
 Requires-Dist: requests~=2.31.0
 Requires-Dist: pyzbar~=0.1.9
 Requires-Dist: parsys-requests-unixsocket~=0.3.1
-Requires-Dist: selenium~=4.15.1
-Requires-Dist: twine~=4.0.2
-Requires-Dist: urllib3~=2.0.7
+Requires-Dist: selenium~=4.18.1
+Requires-Dist: twine~=5.0.0
+Requires-Dist: urllib3~=2.2.1
 
 # JAAQL-middleware-python
 Please navigate to docker/docker.md to see setup instructions  

{jaaql-middleware-python-4.21.36 → jaaql-middleware-python-4.21.38}/jaaql/constants.py

@@ -164,5 +164,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.21.36"
+VERSION = "4.21.38"
 

{jaaql-middleware-python-4.21.36 → jaaql-middleware-python-4.21.38}/jaaql/documentation/documentation_internal.py

@@ -207,11 +207,11 @@ DOCUMENTATION__prepare = SwaggerDocumentation(
     )
 )
 
-DOCUMENTATION__set_page_headers = SwaggerDocumentation(
-    tags="Headers",
+DOCUMENTATION__set_web_config = SwaggerDocumentation(
+    tags="Web Config",
     methods=SwaggerMethod(
-        name="Sets page headers",
-        description="Updates the nginx configuration to include some different headers",
+        name="Sets web config",
+        description="Updates the nginx configuration, including security headers",
         method=REST__POST
     )
 )

{jaaql-middleware-python-4.21.36 → jaaql-middleware-python-4.21.38}/jaaql/mvc/controller.py

@@ -110,6 +110,6 @@ class JAAQLController(BaseJAAQLController):
             else:
                 return self.model.finish_security_event(http_inputs)
 
-        @self.publish_route('/internal/set-page-headers', DOCUMENTATION__set_page_headers)
-        def set_page_headers(connection: DBInterface):
-            self.model.set_page_headers(connection)
+        @self.publish_route('/internal/set-web-config', DOCUMENTATION__set_web_config)
+        def set_web_config(connection: DBInterface):
+            self.model.set_web_config(connection)

{jaaql-middleware-python-4.21.36 → jaaql-middleware-python-4.21.38}/jaaql/mvc/model.py

@@ -328,20 +328,24 @@ WHERE
         return requests.post("http://127.0.0.1:" + str(PORT__shared_var_service) + ENDPOINT__get_shared_var,
                              json={ARG__variable: SHARED_VAR__frozen}).json()[ARG__value]
 
-    def set_page_headers(self, connection: DBInterface):
+    def set_web_config(self, connection: DBInterface):
         self.is_super_admin(connection)
 
         if self.is_container:
             # Define the path to your file
             file_path = '/etc/nginx/sites-available/jaaql'
-
-            config_path = "nginx.config"
+            override = os.environ.get("SET_WEB_CONFIG_OVERRIDE", "")
+            if len(override) != 0:
+                override += "."
+            config_path = f"nginx.${override}config"
             if not os.path.exists(config_path):
                 config_path = "www/" + config_path
                 if not os.path.exists(config_path):
                     print("Could not find config file")
                     return
 
+            new_data = open(config_path, "r").read()
+
             # Read the file content
             with open(file_path, 'r') as file:
                 lines = file.readlines()
@@ -351,16 +355,16 @@ WHERE
             updated_lines = []
 
             for line in lines:
-                if line.strip().startswith('add_header "Content-Security-Policy"'):
+                if line.strip().startswith('charset'):
                     in_section = True
                     updated_lines.append(line)
                     continue  # Skip to the next iteration
-                elif line.strip().startswith('root /') and in_section:
+                elif line.startswith('}') and in_section:
                     # Append new data before the end marker when in a section
                     updated_lines.append(new_data)
                     in_section = False
 
-                if not in_section or line.strip().startswith('root /'):
+                if not in_section or line.startswith('}'):
                     updated_lines.append(line)
 
             # Write the updated content back to the file

{jaaql-middleware-python-4.21.36 → jaaql-middleware-python-4.21.38/jaaql_middleware_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.21.36
+Version: 4.21.38
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv
@@ -8,12 +8,12 @@ Author-email: aaron.tasker@sqmi.nl
 License: Mozilla Public License Version 2.0 with Commons Clause
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: jaaql-monitor~=1.2.109
+Requires-Dist: jaaql-monitor~=1.2.119
 Requires-Dist: psycopg[binary]~=3.1.18
-Requires-Dist: Pillow~=10.1.0
-Requires-Dist: cryptography~=41.0.5
-Requires-Dist: flask~=3.0.0
-Requires-Dist: coverage~=7.3.2
+Requires-Dist: Pillow~=10.2.0
+Requires-Dist: cryptography~=42.0.5
+Requires-Dist: flask~=3.0.2
+Requires-Dist: coverage~=7.4.3
 Requires-Dist: psycopg-pool~=3.2.1
 Requires-Dist: pyjwt~=2.8.0
 Requires-Dist: pyyaml~=6.0.1
@@ -22,13 +22,13 @@ Requires-Dist: argon2-cffi~=23.1.0
 Requires-Dist: pyotp~=2.9.0
 Requires-Dist: qrcode~=7.4.2
 Requires-Dist: gunicorn~=21.2.0
-Requires-Dist: gevent~=23.9.1
+Requires-Dist: gevent~=24.2.1
 Requires-Dist: requests~=2.31.0
 Requires-Dist: pyzbar~=0.1.9
 Requires-Dist: parsys-requests-unixsocket~=0.3.1
-Requires-Dist: selenium~=4.15.1
-Requires-Dist: twine~=4.0.2
-Requires-Dist: urllib3~=2.0.7
+Requires-Dist: selenium~=4.18.1
+Requires-Dist: twine~=5.0.0
+Requires-Dist: urllib3~=2.2.1
 
 # JAAQL-middleware-python
 Please navigate to docker/docker.md to see setup instructions  

{jaaql-middleware-python-4.21.36 → jaaql-middleware-python-4.21.38}/jaaql_middleware_python.egg-info/requires.txt

@@ -1,9 +1,9 @@
-jaaql-monitor~=1.2.109
+jaaql-monitor~=1.2.119
 psycopg[binary]~=3.1.18
-Pillow~=10.1.0
-cryptography~=41.0.5
-flask~=3.0.0
-coverage~=7.3.2
+Pillow~=10.2.0
+cryptography~=42.0.5
+flask~=3.0.2
+coverage~=7.4.3
 psycopg-pool~=3.2.1
 pyjwt~=2.8.0
 pyyaml~=6.0.1
@@ -12,10 +12,10 @@ argon2-cffi~=23.1.0
 pyotp~=2.9.0
 qrcode~=7.4.2
 gunicorn~=21.2.0
-gevent~=23.9.1
+gevent~=24.2.1
 requests~=2.31.0
 pyzbar~=0.1.9
 parsys-requests-unixsocket~=0.3.1
-selenium~=4.15.1
-twine~=4.0.2
-urllib3~=2.0.7
+selenium~=4.18.1
+twine~=5.0.0
+urllib3~=2.2.1