summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2015-05-08 18:30:02 +0200
committerRob Crittenden <rcritten@redhat.com>2015-05-08 16:35:20 -0400
commitd6f7323943c0e7afc26f700d05831d294119a1d1 (patch)
tree5da2fd55f3a71ca953ad28dbeeb38ed075a86ee7
parent485baf6ee7a315d1af1086fe5b5da8cff6c4ba37 (diff)
downloadipsilon.git-d6f7323943c0e7afc26f700d05831d294119a1d1.tar.gz
ipsilon.git-d6f7323943c0e7afc26f700d05831d294119a1d1.tar.xz
ipsilon.git-d6f7323943c0e7afc26f700d05831d294119a1d1.zip
Add uninstallation support to infosssd
This should make it revert any changes it made during installation. https://fedorahosted.org/ipsilon/ticket/67 Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com> Reviewed-by: Rob Crittenden <rcritten@redhat.com>
-rw-r--r--ipsilon/info/infosssd.py72
-rwxr-xr-xipsilon/install/ipsilon-server-install8
2 files changed, 75 insertions, 5 deletions
diff --git a/ipsilon/info/infosssd.py b/ipsilon/info/infosssd.py
index 54d0ba2..cb097ad 100644
--- a/ipsilon/info/infosssd.py
+++ b/ipsilon/info/infosssd.py
@@ -158,13 +158,21 @@ class Installer(InfoProviderInstaller):
else:
domains = opts['info_sssd_domain']
+ changes['domains'] = {}
for domain in domains:
+ changes['domains'][domain] = {}
try:
sssd_domain = sssdconfig.get_domain(domain)
except SSSDConfig.NoDomainError:
logging.info('No SSSD domain %s', domain)
continue
else:
+ try:
+ changes['domains'][domain] = {
+ 'ldap_user_extra_attrs':
+ sssd_domain.get_option('ldap_user_extra_attrs')}
+ except SSSDConfig.NoOptionError:
+ pass
sssd_domain.set_option(
'ldap_user_extra_attrs', ', '.join(SSSD_ATTRS)
)
@@ -176,14 +184,26 @@ class Installer(InfoProviderInstaller):
logging.info('No SSSD domains configured')
return False
+ changes['ifp'] = {}
try:
sssdconfig.new_service('ifp')
+ changes['ifp']['new'] = True
except SSSDConfig.ServiceAlreadyExists:
- pass
+ changes['ifp']['new'] = False
sssdconfig.activate_service('ifp')
ifp = sssdconfig.get_service('ifp')
+ if not changes['ifp']['new']:
+ try:
+ changes['ifp']['allowed_uids'] = ifp.get_option('allowed_uids')
+ except SSSDConfig.NoOptionError:
+ pass
+ try:
+ changes['ifp']['user_attributes'] = ifp.get_option(
+ 'user_attributes')
+ except SSSDConfig.NoOptionError:
+ pass
ifp.set_option('allowed_uids', 'apache, root')
ifp.set_option('user_attributes', '+' + ', +'.join(SSSD_ATTRS))
@@ -216,3 +236,53 @@ class Installer(InfoProviderInstaller):
# Update global config to add info plugin
po.is_enabled = True
po.save_enabled_state()
+
+ def unconfigure(self, opts, changes):
+ try:
+ sssdconfig = SSSDConfig.SSSDConfig()
+ sssdconfig.import_config()
+ except Exception as e: # pylint: disable=broad-except
+ # Unable to read existing SSSD config so it is probably not
+ # configured.
+ logging.info('Loading SSSD config failed: %s', e)
+ return False
+
+ for domain in changes['domains']:
+ try:
+ sssd_domain = sssdconfig.get_domain(domain.encode('utf-8'))
+ except SSSDConfig.NoDomainError:
+ logging.info('No SSSD domain %s', domain)
+ continue
+ else:
+ if 'ldap_user_extra_attrs' in changes['domains'][domain]:
+ sssd_domain.set_option('ldap_user_extra_attrs',
+ changes['domains'][domain][
+ 'ldap_user_extra_attrs'].encode(
+ 'utf-8'))
+ else:
+ sssd_domain.remove_option('ldap_user_extra_attrs')
+ sssdconfig.save_domain(sssd_domain)
+
+ if changes['ifp']['new']:
+ # We created the service newly, let's remove
+ sssdconfig.delete_service('ifp')
+ else:
+ ifp = sssdconfig.get_service('ifp')
+ if 'allowed_uids' in changes['ifp']:
+ ifp.set_option('allowed_uids',
+ changes['ifp']['allowed_uids'].encode('utf-8'))
+ if 'user_attributes' in changes['ifp']:
+ ifp.set_option('user_attributes',
+ changes['ifp']['user_attributes'].encode(
+ 'utf-8'))
+ sssdconfig.save_service(ifp)
+
+ sssdconfig.write(SSSD_CONF)
+
+ try:
+ subprocess.call(['/sbin/service', 'sssd', 'restart'])
+ except Exception: # pylint: disable=broad-except
+ pass
+
+ # Give SSSD a chance to restart
+ time.sleep(5)
diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install
index 0677f0e..85f2ba3 100755
--- a/ipsilon/install/ipsilon-server-install
+++ b/ipsilon/install/ipsilon-server-install
@@ -252,28 +252,28 @@ def uninstall(plugins, args):
logger.info('Removing environment helpers')
for plugin_name in plugins['Environment Helpers']:
plugin = plugins['Environment Helpers'][plugin_name]
- plugin_changes = changes['env_helper'][plugin_name]
+ plugin_changes = changes['env_helper'].get(plugin_name, {})
if plugin.unconfigure(args, plugin_changes) == False:
logger.info('Removal of environment helper %s failed' % plugin_name)
logger.info('Removing login managers')
for plugin_name in plugins['Login Managers']:
plugin = plugins['Login Managers'][plugin_name]
- plugin_changes = changes['login_manager'][plugin_name]
+ plugin_changes = changes['login_manager'].get(plugin_name, {})
if plugin.unconfigure(args, plugin_changes) == False:
logger.info('Removal of login manager %s failed' % plugin_name)
logger.info('Removing Info providers')
for plugin_name in plugins['Info Provider']:
plugin = plugins['Info Provider'][plugin_name]
- plugin_changes = changes['info_provider'][plugin_name]
+ plugin_changes = changes['info_provider'].get(plugin_name, {})
if plugin.unconfigure(args, plugin_changes) == False:
logger.info('Removal of info provider %s failed' % plugin_name)
logger.info('Removing Authentication Providers')
for plugin_name in plugins['Auth Providers']:
plugin = plugins['Auth Providers'][plugin_name]
- plugin_changes = changes['auth_provider'][plugin_name]
+ plugin_changes = changes['auth_provider'].get(plugin_name, {})
if plugin.unconfigure(args, plugin_changes) == False:
logger.info('Removal of auth provider %s failed' % plugin_name)