Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions flex-linux-setup/flex_linux_setup/flex_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,9 @@ def __init__(self):
self.adimin_ui_bin_url = 'https://jenkins.gluu.org/npm/admin_ui/main/built/admin-ui-main-built.tar.gz'
self.policy_store_path = os.path.join(self.templates_dir, 'policy-store.json')
self.schema_file = os.path.join(self.flex_setup_dir, 'flex_schema.json')
self.java_security_fn = os.path.join(self.templates_dir, 'java.security')
self.config_api_base_dir = os.path.join(config_api_installer.jetty_base, config_api_installer.service_name)
self.java_security_dir = os.path.join(self.config_api_base_dir, 'etc/jetty/security')

if not argsp.download_exit:
self.dbUtils.bind(force=True)
Expand Down Expand Up @@ -615,6 +618,9 @@ def install_gluu_admin_ui(self):
)
config_api_installer.run([base.paths.cmd_chmod, '+x', os.path.join(Config.jansOptBinFolder, 'admin-ui')])

self.tls13_settings()


def install_config_api_plugin(self):

old_plugin = os.path.join(config_api_installer.libDir, 'admin-ui-plugin.jar')
Expand Down Expand Up @@ -656,6 +662,41 @@ def install_config_api_plugin(self):

self.rewrite_cli_ini()


def tls13_settings(self):

if not os.path.exists(self.java_security_fn):
return

os.makedirs(self.java_security_dir, exist_ok=True)
config_api_installer.copyFile(self.java_security_fn, self.java_security_dir)

config_api_server_ini_fn = os.path.join(self.config_api_base_dir, 'start.d/server.ini')
if not os.path.exists(config_api_server_ini_fn):
return

java_security_prefix = '-Djava.security.properties'
java_security_prop_line = f'{java_security_prefix}=./' + Path(self.java_security_dir).relative_to(self.config_api_base_dir).joinpath(os.path.basename(self.java_security_fn)).as_posix()
config_api_server_ini_content = config_api_installer.readFile(config_api_server_ini_fn)
config_api_server_ini_content_list = config_api_server_ini_content.splitlines()
write_fn = False

for i, line in enumerate(config_api_server_ini_content_list[:]):
ls = line.strip()
if ls == java_security_prop_line:
break
lsl = ls.split('=')
if len(lsl) > 1 and lsl[0].strip() == java_security_prefix:
config_api_server_ini_content_list[i] = java_security_prop_line
write_fn = True
break
else:
config_api_server_ini_content_list.append(java_security_prop_line)
write_fn = True

if write_fn:
config_api_installer.writeFile(config_api_server_ini_fn, '\n'.join(config_api_server_ini_content_list))

def install_casa(self):
Config.install_casa = True
jans_casa_installer.calculate_selected_aplications_memory()
Expand Down
4 changes: 4 additions & 0 deletions flex-linux-setup/flex_linux_setup/templates/java.security
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1, DTLSv1.0, RC4, DES, \
MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
ECDH, TLS_RSA_*, TLS_ECDH_*, *_CBC_*, ffdhe2048, rsa_pkcs1_sha1 usage HandshakeSignature, \
ecdsa_sha1 usage HandshakeSignature, dsa_sha1 usage HandshakeSignature
Loading