jaaql-middleware-python 4.7.3__tar.gz → 4.8.2__tar.gz

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/PKG-INFO

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

@@ -128,5 +128,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.7.3"
+VERSION = "4.8.2"
 

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/jaaql/db/db_interface.py

@@ -2,9 +2,9 @@ import traceback
 from abc import ABC, abstractmethod
 from datetime import datetime
 import logging
-from jaaql.utilities.utils_no_project_imports import time_delta_ms
 from jaaql.exceptions.http_status_exception import *
 from typing import Optional
+from jaaql.utilities.utils_no_project_imports import objectify
 import queue
 
 ERR__unknown_echo = "Unknown echo type '%s'. Please use either %s"
@@ -159,13 +159,10 @@ class DBInterface(ABC):
             ret[RET__echo] = query
 
         if as_objects:
-            return self.objectify(ret)
+            return objectify(ret)
         else:
             return ret
 
-    def objectify(self, data):
-        return [dict(zip(data['columns'], row)) for row in data['rows']]
-
     def execute_script_file(self, conn, file_loc: str = None, as_content: str = None, as_individual=False, commit=True):
         ret = None
         err = None

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/jaaql/db/db_utils.py

@@ -1,9 +1,10 @@
 from jaaql.exceptions.http_status_exception import HttpStatusException
 from jaaql.interpreter.interpret_jaaql import InterpretJAAQL
-from jaaql.constants import ENCODING__utf
+from jaaql.constants import ENCODING__utf, VAULT_KEY__super_db_credentials
 from typing import Union
 import jaaql.utilities.crypt_utils as crypt_utils
 from jaaql.db.db_pg_interface import DBPGInterface
+from jaaql.db.db_interface import DBInterface
 
 ERR__encryption_key_required = "Encryption key required. Check internal function calls"
 ERR__duplicated_encrypt_parameter = "Duplicated value in encrypt_parameters list"
@@ -12,7 +13,7 @@ ERR__missing_encrypt_parameter = "Encrypted parameter is not found '%s'"
 ERR__duplicated_encryption_salt = "Duplicated value in encryption_salts list"
 ERR__expected_single_row = "Expected single row response but received '%d' rows"
 ERR__unsupported_interface = "Unsupported interface '%s'. We only support %s"
-
+ERR__schema_invalid = "Schema invalid!"
 
 KEY_CONFIG__db = "DATABASE"
 KEY_CONFIG__interface = "interface"
@@ -163,3 +164,9 @@ def execute_supplied_statements(db_interface, queries: Union[str, list],
         data = [db_interface.objectify(obj) for obj in data]
 
     return data
+
+
+def create_interface_for_db(vault, config, user_id: str, database: str, sub_role: str = None):
+    jaaql_uri = vault.get_obj(VAULT_KEY__super_db_credentials)
+    address, port, _, username, password = DBInterface.fracture_uri(jaaql_uri)
+    return create_interface(config, address, port, database, username, password=password, role=user_id, sub_role=sub_role)

jaaql-middleware-python-4.8.2/jaaql/db/db_utils_no_circ.py

@@ -0,0 +1,52 @@
+from jaaql.mvc.exception_queries import QUERY__fetch_application_schemas, KG__application_schema__application, KG__application__is_live, \
+    KG__application_schema__name, KEY__is_default
+from queue import Queue
+from jaaql.db.db_utils import execute_supplied_statement, create_interface_for_db, ERR__schema_invalid
+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
+from jaaql.db.db_interface import DBInterface
+
+
+def submit(vault, config, db_crypt_key, jaaql_connection: DBInterface, inputs: dict, account_id: str, verification_hook: Queue = None,
+           cached_canned_query_service = None):
+    if not isinstance(inputs, dict):
+        raise HttpStatusException("Expected object or string input")
+
+    if KEY__application in inputs:
+        schemas = execute_supplied_statement(jaaql_connection, QUERY__fetch_application_schemas, {
+            KG__application_schema__application: inputs[KEY__application]
+        }, as_objects=True)
+        if len(schemas) == 0:
+            raise HttpStatusException("Application has no schemas!")
+        if not schemas[0][KG__application__is_live]:
+            raise HttpStatusException("Application is currently being deployed. Please wait a few minutes until deployment is complete")
+        schemas = {itm[KG__application_schema__name]: itm for itm in schemas}
+
+        found_db = None
+        if KEY__schema in inputs:
+            found_db = schemas[inputs[KEY__schema]][KEY__database]
+            inputs.pop(KEY__schema)
+        else:
+            if len(schemas) == 1:
+                found_db = schemas[list(schemas.keys())[0]][KEY__database]
+            else:
+                found_dbs = [val[KEY__database] for _, val in schemas.items() if val[KEY__is_default]]
+                if len(found_dbs) == 1:
+                    found_db = found_dbs[0]
+
+        if not found_db:
+            raise HttpStatusException(ERR__schema_invalid)
+
+        inputs[KEY__database] = found_db
+
+    if KEY__database not in inputs:
+        inputs[KEY__database] = DB__jaaql
+
+    sub_role = inputs.pop(KEY__role) if KEY__role in inputs else None
+    required_db = create_interface_for_db(vault, config, account_id, inputs[KEY__database], sub_role)
+
+    return InterpretJAAQL(required_db).transform(inputs, skip_commit=inputs.get(KEY__read_only), wait_hook=verification_hook,
+                                                 encryption_key=db_crypt_key,
+                                                 canned_query_service=cached_canned_query_service)

jaaql-middleware-python-4.8.2/jaaql/email/email_manager.py

@@ -0,0 +1,147 @@
+import re
+
+from typing import Callable
+from jaaql.email.email_manager_service import Email
+import requests
+from jaaql.exceptions.http_status_exception import HttpStatusException
+from jaaql.constants import *
+from urllib.parse import quote
+from jaaql.utilities.utils_no_project_imports import load_artifact
+from typing import Optional
+from jaaql.mvc.handmade_queries import *
+from jaaql.db.db_utils_no_circ import submit
+from jaaql.interpreter.interpret_jaaql import KEY_query, KEY_parameters, KEY_assert, ASSERT_one
+
+REGEX__object_name = r'^[0-9a-zA-Z_]{1,63}$'
+
+ERR__invalid_object_name = "Object name '%s' is invalid. Must match regex: " + REGEX__object_name
+
+REGEX__email_parameter = r'({{)([a-zA-Z0-9_\-]+)(}})'
+REGEX__email_uri_encoded_parameter = r'(\[\[)([a-zA-Z0-9_\-]+)(\]\])'
+REPLACE__str = "{{%s}}"
+REPLACE__uri_encoded_str = "[[%s]]"
+ERR__missing_parameter = "Missing parameter from template '%s'"
+ERR__unexpected_parameter_in_template = "Unexpected parameter in template '%s'"
+
+EMAIL_HTML__start = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\r\n<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\">\r\n<body>\r\n"
+EMAIL_HTML__end = "\r\n</body>\r\n</html>"
+
+SUBJECT_MARKER = "Subject: "
+
+ERR__unexpected_parameters = "Email parameters were not expected"
+ERR__expected_parameters = "Email parameters were expected"
+
+
+class EmailManager:
+
+    def __init__(self, is_container: bool):
+        self.is_container = is_container
+
+    def _send_email(self, email: Email):
+        requests.post("http://127.0.0.1:" + str(PORT__ems) + ENDPOINT__send_email, json=email.repr_json())
+
+    @staticmethod
+    def uri_encode_replace(val):
+        return quote(str(val))
+
+    def send_email(self, vault, config, db_crypt_key, jaaql_connection, application: str, template: str, application_artifacts_source: str,
+                   application_base_url: str, account_id: str, parameters: dict = None, parameter_id: str = None, none_sanitized_parameters: dict = None):
+        if none_sanitized_parameters is None:
+            none_sanitized_parameters = {}
+
+        account = account__select(jaaql_connection, db_crypt_key, account_id)
+        template = email_template__select(jaaql_connection, application, template)
+
+        if parameters is not None and len(parameters) == 0:
+            parameters = None
+
+        if template[KG__email_template__validation_schema] is None and parameters is not None:
+            raise HttpStatusException(ERR__unexpected_parameters)
+        if template[KG__email_template__validation_schema] is not None and parameters is None:
+            raise HttpStatusException(ERR__expected_parameters)
+
+        if parameters is not None:
+            ins_query = "INSERT INTO %s (%s) VALUES (%s) RETURNING id"
+
+            if parameter_id is not None:
+                parameters[KEY__id] = parameter_id
+
+            for col, _ in parameters.items():
+                if not re.match(REGEX__object_name, col):
+                    raise HttpStatusException(ERR__invalid_object_name % col)
+
+            cols = ", ".join(['"' + key + '"' for key in parameters.keys()])
+            vals = ", ".join([':' + key for key in parameters.keys()])
+
+            ins_query = ins_query % (template[KG__email_template__data_validation_table], cols, vals)
+            submit(vault, config, db_crypt_key, jaaql_connection, {
+                KEY__application: application,
+                KEY__schema: template[KG__email_template__validation_schema],
+                KEY_query: ins_query,
+                KEY_parameters: parameters,
+                KEY_assert: ASSERT_one
+            }, account_id)
+            parameter_id = execute_supplied_statement_singleton(jaaql_connection, ins_query, parameters, as_objects=True)[KEY__id]
+
+            sel_table = \
+                template[KG__email_template__data_validation_table] if template[KG__email_template__data_validation_view] is None \
+                else template[KG__email_template__data_validation_view]
+
+            sel_query = "SELECT * FROM %s WHERE id = :id" % sel_table
+            submit(vault, config, db_crypt_key, jaaql_connection, {
+                KEY__application: application,
+                KEY__schema: template[KG__email_template__validation_schema],
+                KEY_query: sel_query,
+                KEY_parameters: parameters,
+                KEY_assert: ASSERT_one
+            }, account_id)
+            parameters = execute_supplied_statement_singleton(jaaql_connection, sel_query, {KEY__id: parameter_id}, as_objects=True)
+        else:
+            parameters = {}
+
+        none_sanitized_parameters[EMAIL_PARAM__app_url] = application_base_url
+        none_sanitized_parameters[EMAIL_PARAM__email_address] = account[KG__account__username]
+        parameters = {**parameters, **none_sanitized_parameters}
+
+        self.construct_and_send_email(application_artifacts_source, template[KG__email_template__dispatcher], template,
+                                      account[KG__account__username], parameters)
+
+    def construct_and_send_email(self, application_artifacts_source: Optional[str], dispatcher: str, template: dict, to_email: str,
+                                 parameters: Optional[dict], attachments=None, attachment_access_token: str = None):
+        loaded_template = load_artifact(self.is_container, application_artifacts_source, template[KG__email_template__content_url])
+
+        loaded_template = self.perform_replacements(loaded_template, REPLACE__str, str, REGEX__email_parameter, parameters)
+        loaded_template = self.perform_replacements(loaded_template, REPLACE__uri_encoded_str, EmailManager.uri_encode_replace,
+                                                    REGEX__email_uri_encoded_parameter, parameters)
+
+        first_line = loaded_template.split("\n")[0].strip()
+        if SUBJECT_MARKER not in first_line:
+            raise HttpStatusException("Email template does not have a subject on the first line denoted by 'Subject: '")
+        subject = first_line.split(SUBJECT_MARKER)[1].strip()
+        body = "\n".join(loaded_template.split("\n")[1:]).strip()
+
+        if template[KG__email_template__content_url].lower().endswith(".htmlbody"):
+            body = EMAIL_HTML__start + body + EMAIL_HTML__end
+
+        if attachments is not None:
+            attachment_list = attachments
+            if not isinstance(attachment_list, list):
+                attachment_list = [attachment_list]
+            for attachment in attachment_list:
+                attachment.format_attachment_url(application_artifacts_source, self.is_container)
+
+        self._send_email(Email(template[KEY__application], template[KG__email_template__name], dispatcher, to_email, subject, body,
+                               attachments=attachments, attachment_access_token=attachment_access_token))
+
+    def perform_replacements(self, html_template: str, replace_str: str, replace_func: Callable, replace_regex: str, args: dict = None):
+        if args is None:
+            args = {}
+
+        for key, val in args.items():
+            html_template = html_template.replace(replace_str % key.upper(), replace_func(val))
+
+        matched = re.findall(replace_regex, html_template)
+        if len(matched) != 0:
+            raise HttpStatusException(ERR__missing_parameter % matched[0][1])
+
+        return html_template

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/jaaql/mvc/base_controller.py

@@ -17,7 +17,7 @@ from jaaql.constants import *
 from jaaql.mvc.model import JAAQLModel
 from jaaql.mvc.response import JAAQLResponse
 from typing import Union
-from jaaql.utilities.utils import create_interface_for_db
+from jaaql.db.db_utils import create_interface_for_db
 from monitor.main import HEADER__security, HEADER__security_bypass_jaaql, HEADER__security_bypass
 
 from jaaql.openapi.swagger_documentation import SwaggerDocumentation, SwaggerMethod, TYPE__response, \

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/jaaql/mvc/model.py

@@ -1,4 +1,3 @@
-import re
 import uuid
 
 from jaaql.db.db_pg_interface import DBPGInterface
@@ -8,9 +7,10 @@ from jaaql.exceptions.http_status_exception import HttpStatusException, HTTPStat
 from os.path import join
 from jaaql.constants import *
 from jaaql.mvc.response import JAAQLResponse
-from jaaql.interpreter.interpret_jaaql import InterpretJAAQL, ASSERT_one, KEY_assert, KEY_query, KEY_parameters
-from jaaql.utilities.utils import get_jaaql_root, get_base_url, create_interface_for_db
+from jaaql.utilities.utils import get_jaaql_root, get_base_url
+from jaaql.utilities.utils_no_project_imports import objectify
 from jaaql.db.db_utils import create_interface, jaaql__encrypt
+from jaaql.db.db_utils_no_circ import submit
 from jaaql.utilities import crypt_utils
 import threading
 from datetime import datetime, timedelta
@@ -25,24 +25,18 @@ import random
 
 from jaaql.migrations.migrations import run_migrations
 
-REGEX__object_name = r'^[0-9a-zA-Z_]{1,63}$'
-
-ERR__invalid_object_name = "Object name '%s' is invalid. Must match regex: " + REGEX__object_name
 ERR__refresh_expired = "Token too old to be used for refresh. Please authenticate again"
 ERR__incorrect_install_key = "Incorrect install key!"
 ERR__invalid_level = "Invalid level!"
 ERR__incorrect_credentials = "Incorrect credentials!"
 ERR__email_template_not_installed = "Either email template does not exist"
 ERR__lacking_permissions = "Only an administrator can perform this action!"
-ERR__schema_invalid = "Schema invalid!"
 ERR__cant_send_attachments = "Cannot send attachments to other people"
 ERR__keep_alive_failed = "Keep alive failed"
 ERR__template_not_signup = "Sign up template does not have the correct type"
 ERR__template_not_already = "Already signed up template does not have the correct type"
 ERR__template_not_reset = "Reset template does not have the correct type"
 ERR__template_not_unregistered = "Unregistered template does not have the correct type"
-ERR__unexpected_parameters = "Email parameters were not expected"
-ERR__expected_parameters = "Email parameters were expected"
 ERR__unexpected_validation_column = "Unexpected column in the input parameters '%s'"
 ERR__data_validation_table_no_primary = "Data validation table has no primary key"
 ERR__cant_find_sign_up = "Cannot locate sign up with key. The key is either incorrect, has expired or has not been activated with the emailed code"
@@ -469,68 +463,6 @@ WHERE
     def attach_dispatcher_credentials(self, connection: DBInterface, inputs: dict):
         email_dispatcher__update(connection, self.get_db_crypt_key(), **inputs)
 
-    def send_email(self, application: str, template: str, application_artifacts_source: str, application_base_url: str, account_id: str,
-                   parameters: dict = None, parameter_id: str = None, none_sanitized_parameters: dict = None):
-        if none_sanitized_parameters is None:
-            none_sanitized_parameters = {}
-
-        account = account__select(self.jaaql_lookup_connection, self.get_db_crypt_key(), account_id)
-        template = email_template__select(self.jaaql_lookup_connection, application, template)
-
-        if parameters is not None and len(parameters) == 0:
-            parameters = None
-
-        if template[KG__email_template__validation_schema] is None and parameters is not None:
-            raise HttpStatusException(ERR__unexpected_parameters)
-        if template[KG__email_template__validation_schema] is not None and parameters is None:
-            raise HttpStatusException(ERR__expected_parameters)
-
-        if parameters is not None:
-            ins_query = "INSERT INTO %s (%s) VALUES (%s) RETURNING id"
-
-            if parameter_id is not None:
-                parameters[KEY__id] = parameter_id
-
-            for col, _ in parameters.items():
-                if not re.match(REGEX__object_name, col):
-                    raise HttpStatusException(ERR__invalid_object_name % col)
-
-            cols = ", ".join(['"' + key + '"' for key in parameters.keys()])
-            vals = ", ".join([':' + key for key in parameters.keys()])
-
-            ins_query = ins_query % (template[KG__email_template__data_validation_table], cols, vals)
-            self.submit({
-                KEY__application: application,
-                KEY__schema: template[KG__email_template__validation_schema],
-                KEY_query: ins_query,
-                KEY_parameters: parameters,
-                KEY_assert: ASSERT_one
-            }, account_id)
-            parameter_id = execute_supplied_statement_singleton(self.jaaql_lookup_connection, ins_query, parameters, as_objects=True)[KEY__id]
-
-            sel_table = \
-                template[KG__email_template__data_validation_table] if template[KG__email_template__data_validation_view] is None \
-                else template[KG__email_template__data_validation_view]
-
-            sel_query = "SELECT * FROM %s WHERE id = :id" % sel_table
-            self.submit({
-                KEY__application: application,
-                KEY__schema: template[KG__email_template__validation_schema],
-                KEY_query: sel_query,
-                KEY_parameters: parameters,
-                KEY_assert: ASSERT_one
-            }, account_id)
-            parameters = execute_supplied_statement_singleton(self.jaaql_lookup_connection, sel_query, {KEY__id: parameter_id}, as_objects=True)
-        else:
-            parameters = {}
-
-        none_sanitized_parameters[EMAIL_PARAM__app_url] = application_base_url
-        none_sanitized_parameters[EMAIL_PARAM__email_address] = account[KG__account__username]
-        parameters = {**parameters, **none_sanitized_parameters}
-
-        self.email_manager.construct_and_send_email(application_artifacts_source, template[KG__email_template__dispatcher], template,
-                                                    account[KG__account__username], parameters)
-
     def gen_security_event_unlock_code(self, codeset: str, length: int):
         return "".join([codeset[random.randint(0, len(codeset) - 1)] for _ in range(length)])
 
@@ -654,9 +586,11 @@ WHERE
         reg_env_ins = security_event__insert(self.jaaql_lookup_connection, inputs[KG__security_event__application], template, account_id,
                                              unlock_code)
 
-        self.send_email(inputs[KG__security_event__application], template, app[KG__application__artifacts_source],
-                        app[KG__application__base_url], account_id, inputs[KEY__parameters],
-                        parameter_id=reg_env_ins[KG__security_event__event_lock], none_sanitized_parameters={
+        self.email_manager.send_email(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, self.get_db_crypt_key(),
+                                      inputs[KG__security_event__application], template,
+                                      app[KG__application__artifacts_source],
+                                      app[KG__application__base_url], account_id, inputs[KEY__parameters],
+                                      parameter_id=reg_env_ins[KG__security_event__event_lock], none_sanitized_parameters={
                 EMAIL_PARAM__unlock_key: reg_env_ins[KG__security_event__unlock_key],
                 EMAIL_PARAM__unlock_code: unlock_code
             })
@@ -722,9 +656,10 @@ WHERE
         reg_env_ins = security_event__insert(self.jaaql_lookup_connection, inputs[KG__security_event__application], template, account_id,
                                              unlock_code)
 
-        self.send_email(inputs[KG__security_event__application], template, app[KG__application__artifacts_source],
-                        app[KG__application__base_url], account_id, inputs[KEY__parameters],
-                        parameter_id=reg_env_ins[KG__security_event__event_lock], none_sanitized_parameters={
+        self.email_manager.send_email(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, self.get_db_crypt_key(),
+                                      inputs[KG__security_event__application], template,
+                                      app[KG__application__artifacts_source], app[KG__application__base_url], account_id, inputs[KEY__parameters],
+                                      parameter_id=reg_env_ins[KG__security_event__event_lock], none_sanitized_parameters={
                 EMAIL_PARAM__unlock_key: reg_env_ins[KG__security_event__unlock_key],
                 EMAIL_PARAM__unlock_code: unlock_code
             })
@@ -733,43 +668,11 @@ WHERE
             KG__security_event__event_lock: reg_env_ins[KG__security_event__event_lock]
         }
 
-    def submit(self, inputs: dict, account_id: str, verification_hook: Queue = None):
-        if not isinstance(inputs, dict):
-            raise HttpStatusException("Expected object or string input")
-
-        if KEY__application in inputs:
-            schemas = execute_supplied_statement(self.jaaql_lookup_connection, QUERY__fetch_application_schemas, {
-                KG__application_schema__application: inputs[KEY__application]
-            }, as_objects=True)
-            if len(schemas) == 0:
-                raise HttpStatusException("Application has no schemas!")
-            if not schemas[0][KG__application__is_live]:
-                raise HttpStatusException("Application is currently being deployed. Please wait a few minutes until deployment is complete")
-            schemas = {itm[KG__application_schema__name]: itm for itm in schemas}
-
-            found_db = None
-            if KEY__schema in inputs:
-                found_db = schemas[inputs[KEY__schema]][KEY__database]
-                inputs.pop(KEY__schema)
-            else:
-                if len(schemas) == 1:
-                    found_db = schemas[list(schemas.keys())[0]][KEY__database]
-                else:
-                    found_dbs = [val[KEY__database] for _, val in schemas.items() if val[KEY__is_default]]
-                    if len(found_dbs) == 1:
-                        found_db = found_dbs[0]
-
-            if not found_db:
-                raise HttpStatusException(ERR__schema_invalid)
-
-            inputs[KEY__database] = found_db
-
-        if KEY__database not in inputs:
-            inputs[KEY__database] = DB__jaaql
+    def submit(self, inputs: dict, account_id: str, verification_hook: Queue = None, as_objects: bool = False, singleton: bool = False):
+        ret = submit(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, inputs, account_id, verification_hook,
+                     self.cached_canned_query_service)
 
-        sub_role = inputs.pop(KEY__role) if KEY__role in inputs else None
-        required_db = create_interface_for_db(self.vault, self.config, account_id, inputs[KEY__database], sub_role)
+        if as_objects:
+            ret = objectify(ret, singleton=singleton)
 
-        return InterpretJAAQL(required_db).transform(inputs, skip_commit=inputs.get(KEY__read_only), wait_hook=verification_hook,
-                                                     encryption_key=self.get_db_crypt_key(),
-                                                     canned_query_service=self.cached_canned_query_service)
+        return ret

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/jaaql/utilities/utils.py

@@ -3,12 +3,13 @@ from os.path import join, exists, dirname
 from datetime import datetime
 import os
 import glob
-from jaaql.constants import DIR__config, FILE__config, CONFIG_KEY__server, CONFIG_KEY_SERVER__port, ENVIRON__install_path, PORT__ems, PORT__mms,\
-    VAULT_KEY__super_db_credentials
+from jaaql.constants import DIR__config, FILE__config, CONFIG_KEY__server, CONFIG_KEY_SERVER__port, ENVIRON__install_path, PORT__ems, PORT__mms, \
+    VAULT_KEY__db_crypt_key
 from jaaql.config_constants import *
 from jaaql.db.db_interface import DBInterface
 from jaaql.db.db_utils import create_interface
 from jaaql.constants import VAULT_KEY__jaaql_lookup_connection
+from jaaql.utilities.crypt_utils import ENCODING__ascii
 import configparser
 import time
 import urllib.parse
@@ -150,7 +151,5 @@ def get_db_connection_as_jaaql(config, vault, db: str):
     return create_interface(config, address, port, db, username, password)
 
 
-def create_interface_for_db(vault, config, user_id: str, database: str, sub_role: str = None):
-    jaaql_uri = vault.get_obj(VAULT_KEY__super_db_credentials)
-    address, port, _, username, password = DBInterface.fracture_uri(jaaql_uri)
-    return create_interface(config, address, port, database, username, password=password, role=user_id, sub_role=sub_role)
+def get_db_crypt_key(vault):
+    return vault.get_obj(VAULT_KEY__db_crypt_key).encode(ENCODING__ascii)

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/jaaql/utilities/utils_no_project_imports.py

@@ -10,6 +10,13 @@ import re
 ALLOWABLE_FILE_PATH = r'^[a-z0-9_\-\/]+(\.[a-zA-Z0-9]+)?$'
 
 
+def objectify(data, singleton: bool = False):
+    if singleton:
+        return dict(zip(data['columns'], data['rows'][0]))
+    else:
+        return [dict(zip(data['columns'], row)) for row in data['rows']]
+
+
 def time_delta_ms(start_time: datetime, end_time: datetime) -> int:
     return int(round((end_time - start_time).total_seconds() * 1000))
 

{jaaql-middleware-python-4.7.3 → jaaql-middleware-python-4.8.2}/jaaql_middleware_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.7.3
+Version: 4.8.2
 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.7.3 → jaaql-middleware-python-4.8.2}/jaaql_middleware_python.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ jaaql/db/__init__.py
 jaaql/db/db_interface.py
 jaaql/db/db_pg_interface.py
 jaaql/db/db_utils.py
+jaaql/db/db_utils_no_circ.py
 jaaql/documentation/__init__.py
 jaaql/documentation/documentation_internal.py
 jaaql/documentation/documentation_public.py

jaaql-middleware-python-4.7.3/jaaql/email/email_manager.py

@@ -1,76 +0,0 @@
-import re
-
-from typing import Callable
-from jaaql.email.email_manager_service import Email
-import requests
-from jaaql.exceptions.http_status_exception import HttpStatusException
-from jaaql.constants import *
-from urllib.parse import quote
-from jaaql.utilities.utils_no_project_imports import load_artifact
-from typing import Optional
-from jaaql.mvc.handmade_queries import *
-
-REGEX__email_parameter = r'({{)([a-zA-Z0-9_\-]+)(}})'
-REGEX__email_uri_encoded_parameter = r'(\[\[)([a-zA-Z0-9_\-]+)(\]\])'
-REPLACE__str = "{{%s}}"
-REPLACE__uri_encoded_str = "[[%s]]"
-ERR__missing_parameter = "Missing parameter from template '%s'"
-ERR__unexpected_parameter_in_template = "Unexpected parameter in template '%s'"
-
-EMAIL_HTML__start = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\r\n<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\">\r\n<body>\r\n"
-EMAIL_HTML__end = "\r\n</body>\r\n</html>"
-
-SUBJECT_MARKER = "Subject: "
-
-
-class EmailManager:
-
-    def __init__(self, is_container: bool):
-        self.is_container = is_container
-
-    def send_email(self, email: Email):
-        requests.post("http://127.0.0.1:" + str(PORT__ems) + ENDPOINT__send_email, json=email.repr_json())
-
-    @staticmethod
-    def uri_encode_replace(val):
-        return quote(str(val))
-
-    def construct_and_send_email(self, application_artifacts_source: Optional[str], dispatcher: str, template: dict, to_email: str,
-                                 parameters: Optional[dict], attachments=None, attachment_access_token: str = None):
-        loaded_template = load_artifact(self.is_container, application_artifacts_source, template[KG__email_template__content_url])
-
-        loaded_template = self.perform_replacements(loaded_template, REPLACE__str, str, REGEX__email_parameter, parameters)
-        loaded_template = self.perform_replacements(loaded_template, REPLACE__uri_encoded_str, EmailManager.uri_encode_replace,
-                                                    REGEX__email_uri_encoded_parameter, parameters)
-
-        first_line = loaded_template.split("\n")[0].strip()
-        if SUBJECT_MARKER not in first_line:
-            raise HttpStatusException("Email template does not have a subject on the first line denoted by 'Subject: '")
-        subject = first_line.split(SUBJECT_MARKER)[1].strip()
-        body = "\n".join(loaded_template.split("\n")[1:]).strip()
-
-        if template[KG__email_template__content_url].lower().endswith(".htmlbody"):
-            body = EMAIL_HTML__start + body + EMAIL_HTML__end
-
-        if attachments is not None:
-            attachment_list = attachments
-            if not isinstance(attachment_list, list):
-                attachment_list = [attachment_list]
-            for attachment in attachment_list:
-                attachment.format_attachment_url(application_artifacts_source, self.is_container)
-
-        self.send_email(Email(template[KEY__application], template[KG__email_template__name], dispatcher, to_email, subject, body,
-                              attachments=attachments, attachment_access_token=attachment_access_token))
-
-    def perform_replacements(self, html_template: str, replace_str: str, replace_func: Callable, replace_regex: str, args: dict = None):
-        if args is None:
-            args = {}
-
-        for key, val in args.items():
-            html_template = html_template.replace(replace_str % key.upper(), replace_func(val))
-
-        matched = re.findall(replace_regex, html_template)
-        if len(matched) != 0:
-            raise HttpStatusException(ERR__missing_parameter % matched[0][1])
-
-        return html_template