mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-07 06:59:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix SecureManagedInstallsPreferences implementation so it does not write to root's ByHost preferences. Fixes #617.

Browse Source
This commit is contained in:
Greg Neagle
2016-07-15 11:41:04 -07:00
parent aa20f9f792
commit 93b0d079e7
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/client/munkilib/munkicommon.py
View File

@@ -60,6 +60,7 @@ from Foundation import CFPreferencesCopyKeyList
from Foundation import CFPreferencesSetValue
from Foundation import kCFPreferencesAnyUser
from Foundation import kCFPreferencesCurrentUser
from Foundation import kCFPreferencesAnyHost
from Foundation import kCFPreferencesCurrentHost
from SystemConfiguration import SCDynamicStoreCopyConsoleUser
@@ -1116,7 +1117,8 @@ def isApplication(pathname):
class Preferences(object):
"""Class which directly reads/writes Apple CF preferences."""
def __init__(self, bundle_id, user=kCFPreferencesAnyUser):
def __init__(self, bundle_id,
user=kCFPreferencesAnyUser, host=kCFPreferencesCurrentHost):
"""Init.
Args:
@@ -1126,10 +1128,10 @@ class Preferences(object):
bundle_id = bundle_id[:-6]
self.bundle_id = bundle_id
self.user = user
self.host = host
def __iter__(self):
keys = CFPreferencesCopyKeyList(
self.bundle_id, self.user, kCFPreferencesCurrentHost)
keys = CFPreferencesCopyKeyList(self.bundle_id, self.user, self.host)
if keys is not None:
for i in keys:
yield i
@@ -1143,8 +1145,7 @@ class Preferences(object):
def __setitem__(self, pref_name, pref_value):
CFPreferencesSetValue(
pref_name, pref_value, self.bundle_id, self.user,
kCFPreferencesCurrentHost)
pref_name, pref_value, self.bundle_id, self.user, self.host)
CFPreferencesAppSynchronize(self.bundle_id)
def __delitem__(self, pref_name):
@@ -1164,13 +1165,17 @@ class Preferences(object):
class ManagedInstallsPreferences(Preferences):
"""Preferences which read from /L/P/ManagedInstalls."""
def __init__(self):
Preferences.__init__(self, 'ManagedInstalls', kCFPreferencesAnyUser)
Preferences.__init__(self, 'ManagedInstalls',
user=kCFPreferencesAnyUser,
host=kCFPreferencesCurrentHost)
class SecureManagedInstallsPreferences(Preferences):
"""Preferences which read from /private/var/root/L/P/ManagedInstalls."""
def __init__(self):
Preferences.__init__(self, 'ManagedInstalls', kCFPreferencesCurrentUser)
Preferences.__init__(self, 'ManagedInstalls',
user=kCFPreferencesCurrentUser,
host=kCFPreferencesAnyHost)
def reload_prefs():