Skip to content

The stunnel EFS port can be configurable #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rkurucz9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

The stunnel EFS port can be configurable #288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 28 additions & 3 deletions src/mount_efs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
STUNNEL_EFS_CONFIG = {
"client": "yes",
"accept": "127.0.0.1:%s",
"connect": "%s:2049",
"connect": "%s:%s",
"sslVersion": "TLSv1.2",
"renegotiation": "no",
"TIMEOUTbusy": "20",
Expand Down Expand Up @@ -621,6 +621,30 @@ def get_boolean_config_item_value(
return default_value
return config.getboolean(config_section, config_item)

def get_int_config_item_value(
config, config_section, config_item, default_value, emit_warning_message=True
):
warning_message = None
if not config.has_section(config_section):
warning_message = (
"Warning: config file does not have section %s." % config_section
)
elif not config.has_option(config_section, config_item):
warning_message = (
"Warning: config file does not have %s item in section %s."
% (config_item, config_section)
)

if warning_message:
if emit_warning_message:
sys.stdout.write(
"%s. You should be able to find a new config file in the same folder as current config file %s. "
"Consider update the new config file to latest config file. Use the default value [%s = %s]."
% (warning_message, CONFIG_FILE, config_item, default_value)
)
return default_value
return config.getint(config_section, config_item)


def fetch_ec2_metadata_token_disabled(config):
return get_boolean_config_item_value(
Expand Down Expand Up @@ -1514,10 +1538,11 @@ def write_stunnel_config_file(
efs_config = dict(STUNNEL_EFS_CONFIG)
efs_config["accept"] = efs_config["accept"] % tls_port

stunnel_efs_port = get_int_config_item_value(config, CONFIG_SECTION, "stunnel_efs_port", 2049)
if fallback_ip_address:
efs_config["connect"] = efs_config["connect"] % fallback_ip_address
efs_config["connect"] = efs_config["connect"] % (fallback_ip_address, stunnel_efs_port)
else:
efs_config["connect"] = efs_config["connect"] % dns_name
efs_config["connect"] = efs_config["connect"] % (dns_name, stunnel_efs_port)

# Verify level is only valid for tls mounts
if (verify_level is not None) and tls_enabled(options):
Expand Down