X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fauthpam.py;h=ba8ecdd9b7e15768cb72be1c5d2297be27ddf2ec;hp=58e07cf74ffe904b09defda59ab5a131ed867920;hb=0b40c36998ed29c7e98a8cf5f42a798e0bec0870;hpb=25b8eaf83e681a9322cffe61aad5254bcbe0c917

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
old mode 100755
new mode 100644
index 58e07cf..ba8ecdd
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # Copyright (C) 2013  Simo Sorce <simo@redhat.com>
 #
 # see file 'COPYING' for use and warranty information
@@ -17,10 +15,10 @@
 # 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
+from ipsilon.login.common import LoginFormBase, LoginManagerBase, \
+    LoginManagerInstaller
 from ipsilon.util.plugin import PluginObject
-import cherrypy
+from ipsilon.util import config as pconfig
 import pam
 import subprocess
 
@@ -34,10 +32,10 @@ class Pam(LoginFormBase):
             ok = pam.authenticate(username, password)
 
         if ok:
-            cherrypy.log("User %s successfully authenticated." % username)
+            self.log("User %s successfully authenticated." % username)
             return username
 
-        cherrypy.log("User %s failed authentication." % username)
+        self.log("User %s failed authentication." % username)
         return None
 
     def POST(self, *args, **kwargs):
@@ -49,13 +47,13 @@ class Pam(LoginFormBase):
         if username and password:
             user = self._authenticate(username, password)
             if user:
-                return self.lm.auth_successful(user, 'password')
+                return self.lm.auth_successful(self.trans, user, 'password')
             else:
                 error = "Authentication failed"
-                cherrypy.log.error(error)
+                self.error(error)
         else:
             error = "Username or password is missing"
-            cherrypy.log.error("Error: " + error)
+            self.error("Error: " + error)
 
         context = self.create_tmpl_context(
             username=username,
@@ -63,6 +61,7 @@ class Pam(LoginFormBase):
             error_password=not password,
             error_username=not username
         )
+        self.lm.set_auth_error()
         # pylint: disable=star-args
         return self._template('login/form.html', **context)
 
@@ -77,28 +76,25 @@ class LoginManager(LoginManagerBase):
         self.description = """
 Form based login Manager that uses the system's PAM infrastructure
 for authentication. """
-        self._options = {
-            'service name': [
-                """ The name of the PAM service used to authenticate. """,
-                'string',
-                'remote'
-            ],
-            'help text': [
-                """ The text shown to guide the user at login time. """,
-                'string',
-                'Insert your Username and Password and then submit.'
-            ],
-            'username text': [
-                """ The text shown to ask for the username in the form. """,
-                'string',
-                'Username'
-            ],
-            'password text': [
-                """ The text shown to ask for the password in the form. """,
-                'string',
-                'Password'
-            ],
-        }
+        self.new_config(
+            self.name,
+            pconfig.String(
+                'service name',
+                'The name of the PAM service used to authenticate.',
+                'remote'),
+            pconfig.String(
+                'username text',
+                'Text used to ask for the username at login time.',
+                'Username'),
+            pconfig.String(
+                'password text',
+                'Text used to ask for the password at login time.',
+                'Password'),
+            pconfig.String(
+                'help text',
+                'Text used to guide the user at login time.',
+                'Provide your Username and Password')
+        )
 
     @property
     def service_name(self):
@@ -121,11 +117,12 @@ for authentication. """
         return self.page
 
 
-class Installer(object):
+class Installer(LoginManagerInstaller):
 
-    def __init__(self):
+    def __init__(self, *pargs):
+        super(Installer, self).__init__()
         self.name = 'pam'
-        self.ptype = 'login'
+        self.pargs = pargs
 
     def install_args(self, group):
         group.add_argument('--pam', choices=['yes', 'no'], default='no',
@@ -138,27 +135,16 @@ class Installer(object):
             return
 
         # Add configuration data to database
-        po = PluginObject()
+        po = PluginObject(*self.pargs)
         po.name = 'pam'
         po.wipe_data()
-
-        po.wipe_config_values(FACILITY)
+        po.wipe_config_values()
         config = {'service name': opts['pam_service']}
-        po.set_config(config)
-        po.save_plugin_config(FACILITY)
+        po.save_plugin_config(config)
 
         # 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.set_config(globalconf)
-        po.save_plugin_config(FACILITY)
+        po.is_enabled = True
+        po.save_enabled_state()
 
         # for selinux enabled platforms, ignore if it fails just report
         try: