Skip to content

AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when master_key is not persisted #2348

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

Merged
2 commits merged into from Sep 20, 2018
Merged

AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when master_key is not persisted #2348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f7818
AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError wh…
Sep 19, 2018
45bef83
AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError wh…
Sep 20, 2018
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
44 changes: 27 additions & 17 deletions ambari-server/src/main/python/ambari_server/serverConfiguration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,9 +908,9 @@ def read_passwd_for_alias(alias, masterKey="", options=None):
with open(tempFilePath, 'w+'):
os.chmod(tempFilePath, stat.S_IREAD | stat.S_IWRITE)

if options is not None and options.master_key is not None and options.master_key:
if options is not None and hasattr(options, 'master_key') and options.master_key:
masterKey = options.master_key
if masterKey is None or masterKey == "":
if not masterKey:
masterKey = "None"

serverClassPath = ambari_server.serverClassPath.ServerClassPath(get_ambari_properties(), None)
Expand Down Expand Up @@ -1017,17 +1017,8 @@ def get_web_server_startup_timeout(properties):
def get_original_master_key(properties, options = None):
input = True
masterKey = None
env_master_key = os.environ.get(SECURITY_KEY_ENV_VAR_NAME)
while(input):
try:
if options is not None and options.master_key is not None and options.master_key:
masterKey = options.master_key
if masterKey is None:
masterKey = get_validated_string_input('Enter current Master Key: ',
"", ".*", "", True, False)
except KeyboardInterrupt:
print_warning_msg('Exiting...')
sys.exit(1)

# Find an alias that exists
alias = None
property = properties.get_property(JDBC_PASSWORD_PROPERTY)
Expand All @@ -1045,11 +1036,30 @@ def get_original_master_key(properties, options = None):
alias = SSL_TRUSTSTORE_PASSWORD_ALIAS

# Decrypt alias with master to validate it, if no master return
if alias and masterKey:
password = read_passwd_for_alias(alias, masterKey, options)
if not password:
print_error_msg ("ERROR: Master key does not match.")
continue
password = None
if alias and env_master_key and env_master_key is not "" and env_master_key != "None":
password = read_passwd_for_alias(alias, env_master_key, options)
if not password:
try:
if options is not None and hasattr(options, 'master_key') and options.master_key:
masterKey = options.master_key
if not masterKey:
masterKey = get_validated_string_input('Enter current Master Key: ',
"", ".*", "", True, False)
if options is not None:
options.master_key = masterKey
except KeyboardInterrupt:
print_warning_msg('Exiting...')
sys.exit(1)
if alias and masterKey:
password = read_passwd_for_alias(alias, masterKey, options)
if not password:
masterKey = None
if options is not None:
options.master_key = None
print_error_msg ("ERROR: Master key does not match")

continue

input = False

Expand Down