In configure we do not need to set_config()

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

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index 378cfb6..10b550e 100755 (executable)
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -17,15 +17,14 @@
 # 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 LoginPageBase, LoginManagerBase
+from ipsilon.login.common import LoginFormBase, LoginManagerBase
 from ipsilon.login.common import FACILITY
 from ipsilon.util.plugin import PluginObject
-import cherrypy
 import pam
 import subprocess
 
 
-class Pam(LoginPageBase):
+class Pam(LoginFormBase):
 
     def _authenticate(self, username, password):
         if self.lm.service_name:
@@ -34,17 +33,12 @@ class Pam(LoginPageBase):
             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 GET(self, *args, **kwargs):
-        context = self.create_tmpl_context()
-        # pylint: disable=star-args
-        return self._template('login/pam.html', **context)
-
     def POST(self, *args, **kwargs):
         username = kwargs.get("login_name")
         password = kwargs.get("login_password")
@@ -54,13 +48,13 @@ class Pam(LoginPageBase):
         if username and password:
             user = self._authenticate(username, password)
             if user:
-                return self.lm.auth_successful(user)
+                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,
@@ -69,29 +63,7 @@ class Pam(LoginPageBase):
             error_username=not username
         )
         # pylint: disable=star-args
-        return self._template('login/pam.html', **context)
-
-    def root(self, *args, **kwargs):
-        op = getattr(self, cherrypy.request.method, self.GET)
-        if callable(op):
-            return op(*args, **kwargs)
-
-    def create_tmpl_context(self, **kwargs):
-        next_url = None
-        if self.lm.next_login is not None:
-            next_url = self.lm.next_login.path
-
-        context = {
-            "title": 'Login',
-            "action": '%s/login/pam' % self.basepath,
-            "service_name": self.lm.service_name,
-            "username_text": self.lm.username_text,
-            "password_text": self.lm.password_text,
-            "description": self.lm.help_text,
-            "next_url": next_url,
-        }
-        context.update(kwargs)
-        return context
+        return self._template('login/form.html', **context)
 
 
 class LoginManager(LoginManagerBase):
@@ -126,6 +98,8 @@ for authentication. """
                 'Password'
             ],
         }
+        self.conf_opt_order = ['service name', 'username text',
+                               'password text', 'help text']
 
     @property
     def service_name(self):
@@ -144,7 +118,7 @@ for authentication. """
         return self.get_config_value('password text')
 
     def get_tree(self, site):
-        self.page = Pam(site, self)
+        self.page = Pam(site, self, 'login/pam')
         return self.page
 
 
@@ -171,8 +145,7 @@ class Installer(object):
 
         po.wipe_config_values(FACILITY)
         config = {'service name': opts['pam_service']}
-        po.set_config(config)
-        po.save_plugin_config(FACILITY)
+        po.save_plugin_config(FACILITY, config)
 
         # Update global config to add login plugin
         po = PluginObject()
@@ -184,8 +157,7 @@ class Installer(object):
             order = []
         order.append('pam')
         globalconf['order'] = ','.join(order)
-        po.set_config(globalconf)
-        po.save_plugin_config(FACILITY)
+        po.save_plugin_config(FACILITY, globalconf)
 
         # for selinux enabled platforms, ignore if it fails just report
         try: