Skip to content

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

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 17, 2018
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d1eb46
AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError wh…
Sep 14, 2018
8daaf66
AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError whe…
Sep 17, 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
9 changes: 7 additions & 2 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,7 +908,7 @@ 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 is not None and options.master_key:
masterKey = options.master_key
if masterKey is None or masterKey == "":
masterKey = "None"
Expand Down Expand Up @@ -1019,11 +1019,13 @@ def get_original_master_key(properties, options = None):
masterKey = None
while(input):
try:
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 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)
if options is not None:
options.master_key = masterKey
except KeyboardInterrupt:
print_warning_msg('Exiting...')
sys.exit(1)
Expand All @@ -1048,6 +1050,9 @@ def get_original_master_key(properties, options = None):
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

Expand Down