From 5b543cdab320de7918b9078735cfafff744ede23 Mon Sep 17 00:00:00 2001 From: Devrim Date: Wed, 5 Apr 2023 12:08:01 +0300 Subject: [PATCH] fix(jans-linux-setup): re-orginize creating smtp configuration (#4457) --- jans-linux-setup/jans_setup/jans_setup.py | 4 +--- .../jans_setup/setup_app/installers/jans.py | 20 +++++++++---------- .../setup_app/installers/jans_auth.py | 5 ++--- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/jans-linux-setup/jans_setup/jans_setup.py b/jans-linux-setup/jans_setup/jans_setup.py index 9868c973c3c..4538e25d88c 100755 --- a/jans-linux-setup/jans_setup/jans_setup.py +++ b/jans-linux-setup/jans_setup/jans_setup.py @@ -354,15 +354,13 @@ def do_installation(): if not Config.installed_instance: jansInstaller.configureSystem() jansInstaller.make_salt() - jansAuthInstaller.make_salt() if not base.snap: jreInstaller.start_installation() jettyInstaller.start_installation() jythonInstaller.start_installation() - jansInstaller.generate_configuration() - + jansInstaller.generate_smtp_config() jansInstaller.copy_scripts() jansInstaller.encode_passwords() diff --git a/jans-linux-setup/jans_setup/setup_app/installers/jans.py b/jans-linux-setup/jans_setup/setup_app/installers/jans.py index ba6166e5c6d..464513c768d 100644 --- a/jans-linux-setup/jans_setup/setup_app/installers/jans.py +++ b/jans-linux-setup/jans_setup/setup_app/installers/jans.py @@ -130,15 +130,6 @@ def initialize(self): self.logIt("Key generator path was determined as {}".format(Config.non_setup_properties['key_export_path'])) self.extract_scripts() - - self.make_salt() - - if not Config.get('smtp_jks_pass'): - Config.smtp_jks_pass = self.getPW() - try: - Config.smtp_jks_pass_enc = self.obscure(Config.smtp_jks_pass) - except Exception as e: - self.logIt("JansInstaller. __init__ failed. Reason: %s" % str(e), errorLog=True) def configureSystem(self): self.logIt("Configuring system", 'jans') @@ -577,9 +568,18 @@ def enable_scripts(self, inums, enable=True): def extract_scripts(self): base.extract_from_zip(base.current_app.jans_zip, 'docs/script-catalog', Config.script_catalog_dir) - def generate_configuration(self): + + def generate_smtp_config(self): self.logIt("Generating smtp keys", pbar=self.service_name) + if not Config.get('smtp_jks_pass'): + Config.smtp_jks_pass = self.getPW() + try: + Config.smtp_jks_pass_enc = self.obscure(Config.smtp_jks_pass) + except Exception as e: + self.logIt("JansInstaller. __init__ failed. Reason: %s" % str(e), errorLog=True) + + cmd_cert_gen = [Config.cmd_keytool, '-genkeypair', '-alias', Config.smtp_alias, '-keyalg', 'ec', diff --git a/jans-linux-setup/jans_setup/setup_app/installers/jans_auth.py b/jans-linux-setup/jans_setup/setup_app/installers/jans_auth.py index 48b9b4594c3..978d3936e2d 100644 --- a/jans-linux-setup/jans_setup/setup_app/installers/jans_auth.py +++ b/jans-linux-setup/jans_setup/setup_app/installers/jans_auth.py @@ -54,7 +54,7 @@ def __init__(self): def install(self): self.logIt("Copying auth.war into jetty webapps folder...") - + self.make_pairwise_calculation_salt() self.installJettyService(self.jetty_app_configuration[self.service_name], True) self.copyFile(self.source_files[0][0], self.jetty_service_webapps) self.external_libs() @@ -79,7 +79,6 @@ def generate_configuration(self): if Config.get('use_external_key'): self.import_openbanking_key() - def get_config_api_scopes(self): scopes_def = base.current_app.ConfigApiInstaller.get_scope_defs() scope_list = [] @@ -153,7 +152,7 @@ def genRandomString(self, N): + string.ascii_uppercase + string.digits) for _ in range(N)) - def make_salt(self, enforce=False): + def make_pairwise_calculation_salt(self, enforce=False): if not Config.get('pairwiseCalculationKey') or enforce: Config.pairwiseCalculationKey = self.genRandomString(random.randint(20,30)) if not Config.get('pairwiseCalculationSalt') or enforce: