jaaql-middleware-python 4.24.2__tar.gz → 4.24.4__tar.gz

{jaaql-middleware-python-4.24.2/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.24.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.24.2
+Version: 4.24.4
 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.24.2 → jaaql-middleware-python-4.24.4}/jaaql/constants.py

@@ -52,7 +52,7 @@ CRON_dayOfMonth = "dayOfMonth"
 CRON_month = "month"
 CRON_dayOfWeek = "dayOfWeek"
 
-REGEX__dmbs_object_name = r'^[0-9a-zA-Z_]{1,32}$'
+REGEX__dmbs_object_name = r'^[0-9a-zA-Z_]{1,63}$'
 
 SEPARATOR__comma_space = ", "
 SEPARATOR__comma = ","
@@ -180,5 +180,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.24.2"
+VERSION = "4.24.4"
 

{jaaql-middleware-python-4.24.2 → jaaql-middleware-python-4.24.4}/jaaql/documentation/documentation_public.py

@@ -291,7 +291,6 @@ DOCUMENTATION__invite = SwaggerDocumentation(
             body=[
                 set_nullable(ARG_RES__username, "Potentially if the user is not known"),
                 ARG_RES__parameters,
-                ARG_RES__query,
                 ARG_RES__event_application,
                 SwaggerArgumentResponse(
                     name=KEY__sign_up_template,

{jaaql-middleware-python-4.24.2 → jaaql-middleware-python-4.24.4}/jaaql/mvc/model.py

@@ -361,6 +361,7 @@ WHERE
                     return
 
             new_data = open(config_path, "r").read()
+            new_data = new_data.replace("{{JAAQL_INSTALL_LOCATION}}", os.environ.get("INSTALL_PATH"))
 
             # Read the file content
             with open(file_path, 'r') as file:
@@ -1059,7 +1060,7 @@ WHERE
             where_clause = " WHERE " + where_clause
             permissions_view = sign_up_template[KG__email_template__permissions_view]
             if re.match(REGEX__dmbs_object_name, permissions_view) is None:
-                raise HttpStatusException("Unsafe data relation specified for sign up")
+                raise HttpStatusException("Unsafe permissions relation specified for sign up: Found '" + str(permissions_view) + "' na did not match regex " + REGEX__dmbs_object_name)
             permissions_query = f'SELECT * FROM "{permissions_view}"{where_clause}'  # Ignore pycharm pep issue
             submit_data[KEY_query] = permissions_query
             submit_data[KEY_parameters] = ret
@@ -1077,27 +1078,34 @@ WHERE
 
             base_relation = sign_up_template[KG__email_template__base_relation]
             if re.match(REGEX__dmbs_object_name, base_relation) is None:
-                raise HttpStatusException("Unsafe data relation specified for sign up")
+                raise HttpStatusException("Unsafe base relation specified for sign up: Found '" + str(base_relation) + "' na did not match regex " + REGEX__dmbs_object_name)
 
-            if inputs.get(KEY__username) is None:
-                get_user_data = {
-                    KEY__application: inputs[KG__security_event__application],
-                    KEY__schema: sign_up_template[KG__email_template__validation_schema],
-                    KEY_parameters: ret,
-                    KEY_query: f'SELECT {dbms_user_column_name} FROM {base_relation}{where_clause}'  # Ignore pycharm PEP issue
-                }
+            found_username = None
+            get_user_data = {
+                KEY__application: inputs[KG__security_event__application],
+                KEY__schema: sign_up_template[KG__email_template__validation_schema],
+                KEY_parameters: ret,
+                KEY_query: f'SELECT {dbms_user_column_name} FROM {base_relation}{where_clause}'  # Ignore pycharm PEP issue
+            }
 
-                try:
-                    dbms_user = submit(self.vault, self.config, self.get_db_crypt_key(),
-                                       self.jaaql_lookup_connection, get_user_data,
-                                       ROLE__jaaql, None,
-                                       self.cached_canned_query_service, as_objects=True,
-                                       singleton=True)[dbms_user_column_name]
+            try:
+                dbms_user = submit(self.vault, self.config, self.get_db_crypt_key(),
+                                   self.jaaql_lookup_connection, get_user_data,
+                                   ROLE__jaaql, None,
+                                   self.cached_canned_query_service, as_objects=True,
+                                   singleton=True)[dbms_user_column_name]
+
+                account = account__select(self.jaaql_lookup_connection, self.get_db_crypt_key(), dbms_user)
+                found_username = account[KG__account__username]
+            except HttpSingletonStatusException:
+                if inputs[KEY__username] is None:
+                    raise HttpSingletonStatusException("User with specified parameters could not be found! It's likely you should supply a username!")
 
-                    account = account__select(self.jaaql_lookup_connection, self.get_db_crypt_key(), dbms_user)
-                    inputs[KEY__username] = account[KG__account__username]
-                except HttpSingletonStatusException:
-                    raise HttpSingletonStatusException("User with specified parameters could not be found!")
+            if found_username and inputs[KEY__username] is not None:
+                raise HttpStatusException("Did not expect username! User has already been created and associated in the base relation")
+
+            if inputs[KEY__username] is None:
+                inputs[KEY__username] = found_username
 
             # We now create the user if the user doesn't exist
             account_existed = False
@@ -1118,22 +1126,6 @@ WHERE
                 if account == jaaql_singleton[KG__jaaql__the_anonymous_user]:
                     raise HttpStatusException("Cannot re-invite the anonymous user")
 
-            data_view = sign_up_template[KG__email_template__data_view]
-            data_query = f'SELECT * FROM "{data_view}"{where_clause}'  # Ignore pycharm pep issue
-            submit_data[KEY_query] = data_query
-            try:
-                sign_up_data = submit(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, submit_data, new_account_id,
-                                      None, self.cached_canned_query_service, as_objects=False, singleton=True)
-                sign_up_data = objectify(sign_up_data, singleton=True)
-                if dbms_user_column_name in sign_up_data:
-                    del sign_up_data[dbms_user_column_name]  # Remove it. Not harmful that it's there as jaaql knows this already
-            except HttpSingletonStatusException:
-                raise HttpSingletonStatusException("No or multiple rows returned from " + data_view + " with " + where_clause)
-
-            for key, val in sign_up_data:
-                perms_check[key] = val
-            sign_up_data = perms_check
-
             # We abort if there have been too many requests. Everything is rolled back
             count = count_for_security_event(self.jaaql_lookup_connection, self.get_db_crypt_key(), self.get_vault_repeatable_salt(),
                                              EMAIL_TYPE__signup, EMAIL_TYPE__already_signed_up, new_account_id)
@@ -1158,6 +1150,24 @@ WHERE
                                                inputs[KG__security_event__application], template[KG__email_template__name], unlock_code,
                                                new_account_id)
 
+            data_view = sign_up_template[KG__email_template__data_view]
+            if re.match(REGEX__dmbs_object_name, data_view) is None:
+                raise HttpStatusException("Unsafe data view specified for sign up: Found '" + str(data_view) + "' na did not match regex " + REGEX__dmbs_object_name)
+            data_query = f'SELECT * FROM "{data_view}"'
+            submit_data[KEY_query] = data_query
+            try:
+                submit_data[KEY__parameters] = {}  # Might at some point have some data parameters but for now none
+                sign_up_data = submit(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, submit_data, new_account_id,
+                                      None, self.cached_canned_query_service, as_objects=False, singleton=True)
+                sign_up_data = objectify(sign_up_data, singleton=True)
+                if dbms_user_column_name in sign_up_data:
+                    del sign_up_data[dbms_user_column_name]  # Remove it. Not harmful that it's there as jaaql knows this already
+            except HttpSingletonStatusException:
+                raise HttpSingletonStatusException("No or multiple rows returned from " + data_view)
+            for key, val in sign_up_data.items():
+                perms_check[key] = val
+            sign_up_data = perms_check
+
             sign_up_data[EMAIL_PARAM__app_url] = app[KG__application__base_url]
             sign_up_data[EMAIL_PARAM__app_name] = app[KG__application__name]
             sign_up_data[EMAIL_PARAM__email_address] = inputs[KEY__username]

{jaaql-middleware-python-4.24.2 → jaaql-middleware-python-4.24.4/jaaql_middleware_python.egg-info}/PKG-INFO

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