mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2025-12-30 11:09:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add more logging to authrestartd; update comments in MSCPasswordAlertController.py

Browse Source
This commit is contained in:
Greg Neagle
2018-06-05 16:06:51 -07:00
parent 24c0e41054
commit 5182909bec
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/apps/Managed Software Center/Managed Software Center/MSCPasswordAlertController.py
View File

@@ -87,7 +87,7 @@ class MSCPasswordAlertController(NSObject):
username = NSUserName()
password = self.passwordField.stringValue()
if passwdutil.verifyPassword(username, password):
# store password and end modal alert
# store username and password and end modal alert
authrestart.store_password(password, username=username)
code = NSAlertFirstButtonReturn
NSApplication.sharedApplication().stopModalWithCode_(code)

11
code/client/authrestartd
View File

@@ -87,6 +87,8 @@ class FDEUtil(object):
# restart
self.log.info('Restart request from uid %s', self.uid)
if self.uid == 0:
self.log.info('Stored username for authrestart: %s',
self.server.stored_username)
authrestart.do_authorized_or_normal_restart(
password=self.server.stored_password,
username=self.server.stored_username)
@@ -98,17 +100,18 @@ class FDEUtil(object):
if self.request['task'] == 'store_password':
# store a password for later fdesetup authrestart
self.log.info('Store password request')
password = self.request.get('password')
if not password:
self.log.info('No password in request')
raise FDEUtilError('No password provided')
username = self.request.get('username')
self.log.info('Request username: %s', username)
# don't store the password if the user isn't enabled for FileVault
if (username and
not authrestart.can_attempt_auth_restart_for(username)):
self.log.info('User %s can\'t do auth restart', username)
raise FDEUtilError(
'User %s can\'t do FileVault authrestart' % username)
password = self.request.get('password')
if not password:
self.log.info('No password in request')
raise FDEUtilError('No password provided')
self.store_password(password, username=username)
self.log.info('Password stored.')
return 'DONE'