jaaql-middleware-python 4.22.5__tar.gz → 4.22.7__tar.gz

{jaaql-middleware-python-4.22.5/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.22.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.22.5
+Version: 4.22.7
 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

{jaaql-middleware-python-4.22.5 → jaaql-middleware-python-4.22.7}/jaaql/constants.py

@@ -50,7 +50,6 @@ CRON_hour = "hour"
 CRON_dayOfMonth = "dayOfMonth"
 CRON_month = "month"
 CRON_dayOfWeek = "dayOfWeek"
-CRON_year = "year"
 
 REGEX__dmbs_object_name = r'^[0-9a-zA-Z_]{1,32}$'
 
@@ -91,8 +90,6 @@ ENVIRON__jaaql_profiling = "JAAQL_PROFILING"
 ENVIRON__install_path = "INSTALL_PATH"
 ENVIRON__sentinel_url = "SENTINEL_URL"
 ENVIRON__canned_queries = "CANNED_QUERIES"
-ENVIRON__allow_debugging_users = "YOUR_APP_HAS_NO_SECURITY_IF_THIS_IS_TRUE__ALLOW_DEBUGGING_USERS"
-ENVIRON__allow_skip_oauth = "YOUR_APP_HAS_NO_SECURITY_IF_THIS_IS_TRUE__ALLOW_SKIP_AUTH"
 
 EMAIL_PARAM__unlock_key = "JAAQL__UNLOCK_KEY"
 EMAIL_PARAM__unlock_code = "JAAQL__UNLOCK_CODE"
@@ -178,5 +175,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.22.5"
+VERSION = "4.22.7"
 

{jaaql-middleware-python-4.22.5 → jaaql-middleware-python-4.22.7}/jaaql/db/db_utils_no_circ.py

@@ -7,7 +7,7 @@ from jaaql.db.db_utils import execute_supplied_statement, create_interface_for_d
 from jaaql.exceptions.http_status_exception import HttpStatusException
 from jaaql.interpreter.interpret_jaaql import InterpretJAAQL
 from jaaql.constants import KEY__application, KEY__database, KEY__schema, KEY__role, DB__jaaql, \
-    KEY__read_only, KEY__prevent_unused_parameters, KEY__debugging_account_id, ENVIRON__allow_debugging_users
+    KEY__read_only, KEY__prevent_unused_parameters
 from jaaql.db.db_interface import DBInterface
 from jaaql.utilities.utils_no_project_imports import objectify
 from jaaql.mvc.generated_queries import application__select
@@ -56,9 +56,6 @@ def get_required_db(vault, config, jaaql_connection: DBInterface, inputs: dict,
 
         sub_role = inputs.pop(KEY__role) if KEY__role in inputs else None
 
-        if os.environ.get(ENVIRON__allow_debugging_users) == "TRUE" and inputs.get(KEY__debugging_account_id) is not None:
-            account_id = inputs.pop(KEY__debugging_account_id)
-
         required_db = create_interface_for_db(vault, config, account_id, inputs[KEY__database], sub_role)
     else:
         if interface is None:

{jaaql-middleware-python-4.22.5 → jaaql-middleware-python-4.22.7}/jaaql/mvc/base_controller.py

@@ -190,9 +190,7 @@ class BaseJAAQLController:
                 for itm in data[arg.name]:
                     BaseJAAQLController.validate_data_rec(arg.arg_type.responses, itm, fill_missing)
             elif arg.name in data and arg.arg_type == ARG_RESP__allow_all:
-                if not isinstance(data[arg.name], dict):
-                    raise HttpStatusException(ERR__argument_wrong_type % (arg.name, type(data[arg.name]).__name__,
-                                                                          type(dict).__name__), HTTPStatus.BAD_REQUEST)
+                continue
             elif arg.name in data and not isinstance(data[arg.name], arg.arg_type):
                 if data[arg.name] is None and not arg.required:
                     continue
@@ -484,32 +482,23 @@ class BaseJAAQLController:
                         bypass_super = request.headers.get(HEADER__security_bypass)
                         bypass_jaaql = request.headers.get(HEADER__security_bypass_jaaql)
                         bypass_user = request.headers.get(HEADER__security_specify_user)
-                        if bypass_super or bypass_jaaql:
+                        if bypass_super or bypass_jaaql or bypass_user:
                             if ip_addr not in IPS__local:
                                 raise HttpStatusException("Bypass used in none local context: " + ip_addr, HTTPStatus.UNAUTHORIZED)
-                            miss_super_bypass = bypass_super and bypass_super != self.model.local_super_access_key
+                            miss_super_bypass = (bypass_super or bypass_user) and bypass_super != self.model.local_super_access_key
                             miss_jaaql_bypass = bypass_jaaql and bypass_jaaql != self.model.local_jaaql_access_key
                             if miss_super_bypass or miss_jaaql_bypass:
                                 raise HttpStatusException("Invalid bypass key", HTTPStatus.UNAUTHORIZED)
 
                             is_public = False
                             username = USERNAME__super_db if bypass_super else USERNAME__jaaql
+                            if bypass_user:
+                                username = bypass_user
                             account_id, ip_id = self.model.get_bypass_user(username, ip_addr)
 
                             if verification_hook:
                                 verification_hook.put((True, None, None))
 
-                        elif bypass_user:
-                            if not self.model.is_container or os.environ.get(ENVIRON__allow_skip_oauth) == "TRUE":
-                                is_public = False
-                                account_id, ip_id = self.model.get_bypass_user(bypass_user, ip_addr)
-                                username = bypass_user
-
-                                if verification_hook:
-                                    verification_hook.put((True, None, None))
-                            else:
-                                raise HttpStatusException("Cannot bypass user!")
-
                         elif verification_hook:
                             account_id, username, ip_id, is_public, remember_me = self.model.verify_auth_token_threaded(security_key,
                                                                                                                         ip_addr, verification_hook)

{jaaql-middleware-python-4.22.5 → jaaql-middleware-python-4.22.7}/jaaql/mvc/base_model.py

@@ -245,7 +245,7 @@ class BaseJAAQLModel:
             self.vault.insert_obj(VAULT_KEY__super_local_access_key, str(uuid.uuid4()))
 
         self.local_jaaql_access_key = self.vault.get_obj(VAULT_KEY__jaaql_local_access_key)
-        self.local_super_access_key = self.vault.get_obj(VAULT_KEY__super_local_access_key)
+        self.local_super_access_key = os.environ.get("JAAQL__SUPER_BYPASS_KEY", self.vault.get_obj(VAULT_KEY__super_local_access_key))
 
         if self.vault.has_obj(VAULT_KEY__jaaql_lookup_connection):
             if self.is_container:

{jaaql-middleware-python-4.22.5 → jaaql-middleware-python-4.22.7}/jaaql/mvc/model.py

@@ -392,7 +392,7 @@ WHERE
             if not self.vault.get_obj(VAULT_KEY__allow_jaaql_uninstall):
                 raise HttpStatusException("JAAQL not permitted to uninstall itself")
             DBPGInterface.close_all_pools()
-            subprocess.run("crontab -l | grep -v '# jaaql__' | crontab -", check=True, shell=True)
+            subprocess.run("crontab -l 2> /dev/null | grep -v '# jaaql__' | crontab -", check=True, shell=True)
             subprocess.call("./pg_reboot.sh", cwd="/")
         else:
             subprocess.call("docker kill jaaql_pg")
@@ -1160,21 +1160,23 @@ WHERE
             format_field(cron.get(CRON_hour)),
             format_field(cron.get(CRON_dayOfMonth)),
             format_field(cron.get(CRON_month)),
-            format_field(cron.get(CRON_dayOfWeek)),
-            format_field(cron.get(CRON_year))
+            format_field(cron.get(CRON_dayOfWeek))
         ]
         return ' '.join(parts)
 
     def add_cron_job_to_application(self, connection: DBInterface, cron_input: dict):
         self.is_super_admin(connection)
+        application = cron_input.pop(KEY__application)
+        application__select(connection, application)
+        command = cron_input.pop(KEY__command)
+        if '"' in command:
+            raise HttpStatusException("Please do not use double quotes in your cron expression!")
+        cron_string = self.cron_expression_to_string(cron_input)
+        cron_command = '(crontab -l 2> /dev/null; echo "' + cron_string + ' ' + command + '  # jaaql__' + application + '") | crontab -'
         if self.is_container:
-            application = cron_input.pop(KEY__application)
-            application__select(connection, application)
-            command = cron_input.pop(KEY__command)
-            cron_string = self.cron_expression_to_string(cron_input)
-            cron_command = '(crontab - l 2 > /dev/null; echo "' + cron_string + ' ' + command + '  # jaaql__' + application + '") | crontab -'
-            subprocess.run(cron_command, check=True, shell=True)
+            subprocess.run(cron_command, check=True, shell=True, timeout=5)
         else:
+            print(cron_command)
             print("Cron not supported in debugging mode", file=sys.stderr)
 
     def submit(self, inputs: dict, account_id: str, verification_hook: Queue = None, as_objects: bool = False, singleton: bool = False):

{jaaql-middleware-python-4.22.5 → jaaql-middleware-python-4.22.7/jaaql_middleware_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.22.5
+Version: 4.22.7
 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