Implement change registration

[cascardo/ipsilon.git] / ipsilon / login / authpam.py

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
old mode 100755 (executable)
new mode 100644 (file)
index c7cb9a0..1a34f8f
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -1,24 +1,7 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2013  Simo Sorce <simo@redhat.com>
-#
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ipsilon.login.common import LoginFormBase, LoginManagerBase
-from ipsilon.login.common import FACILITY
+# Copyright (C) 2013 Ipsilon project Contributors, for license see COPYING
+
+from ipsilon.login.common import LoginFormBase, LoginManagerBase, \
+    LoginManagerInstaller

 from ipsilon.util.plugin import PluginObject
 from ipsilon.util import config as pconfig
 import pam
 from ipsilon.util.plugin import PluginObject
 from ipsilon.util import config as pconfig
 import pam


@@ -63,7 +46,7 @@ class Pam(LoginFormBase):
             error_password=not password,
             error_username=not username
         )
             error_password=not password,
             error_username=not username
         )

-        # pylint: disable=star-args
+        self.lm.set_auth_error()

         return self._template('login/form.html', **context)
 
 
         return self._template('login/form.html', **context)
 
 


@@ -118,11 +101,12 @@ for authentication. """
         return self.page
 
 
         return self.page
 
 

-class Installer(object):
+class Installer(LoginManagerInstaller):

 
 

-    def __init__(self):
+    def __init__(self, *pargs):
+        super(Installer, self).__init__()

         self.name = 'pam'
         self.name = 'pam'

-        self.ptype = 'login'
+        self.pargs = pargs

 
     def install_args(self, group):
         group.add_argument('--pam', choices=['yes', 'no'], default='no',
 
     def install_args(self, group):
         group.add_argument('--pam', choices=['yes', 'no'], default='no',


@@ -130,30 +114,21 @@ class Installer(object):
         group.add_argument('--pam-service', action='store', default='remote',
                            help='PAM service name to use for authentication')
 
         group.add_argument('--pam-service', action='store', default='remote',
                            help='PAM service name to use for authentication')
 

-    def configure(self, opts):
+    def configure(self, opts, changes):

         if opts['pam'] != 'yes':
             return
 
         # Add configuration data to database
         if opts['pam'] != 'yes':
             return
 
         # Add configuration data to database

-        po = PluginObject()
+        po = PluginObject(*self.pargs)

         po.name = 'pam'
         po.wipe_data()
         po.name = 'pam'
         po.wipe_data()

-
-        po.wipe_config_values(FACILITY)
+        po.wipe_config_values()

         config = {'service name': opts['pam_service']}
         config = {'service name': opts['pam_service']}

-        po.save_plugin_config(FACILITY, config)
+        po.save_plugin_config(config)

 
         # Update global config to add login plugin
 
         # Update global config to add login plugin

-        po = PluginObject()
-        po.name = 'global'
-        globalconf = po.get_plugin_config(FACILITY)
-        if 'order' in globalconf:
-            order = globalconf['order'].split(',')
-        else:
-            order = []
-        order.append('pam')
-        globalconf['order'] = ','.join(order)
-        po.save_plugin_config(FACILITY, globalconf)
+        po.is_enabled = True
+        po.save_enabled_state()

 
         # for selinux enabled platforms, ignore if it fails just report
         try:
 
         # for selinux enabled platforms, ignore if it fails just report
         try: