X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fauthpam.py;h=10b550eaeefe4cf264c5ed92ec598857299a488d;hp=d5ab42896922ff178eac7399354d3a966f754cdb;hb=62b4656571be6e8671ada295047eac385d330f66;hpb=630b85e06018fb3d9f8c34685a406b3770d58b54

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index d5ab428..10b550e 100755
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -17,12 +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
-import cherrypy
+from ipsilon.login.common import LoginFormBase, LoginManagerBase
+from ipsilon.login.common import FACILITY
+from ipsilon.util.plugin import PluginObject
 import pam
+import subprocess
 
 
-class Pam(LoginPageBase):
+class Pam(LoginFormBase):
 
     def _authenticate(self, username, password):
         if self.lm.service_name:
@@ -31,43 +33,37 @@ 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):
-        return self._template('login/pam.html', title='Login',
-                              action='%s/login/pam' % self.basepath,
-                              service_name=self.lm.service_name,
-                              help_text=self.lm.help_text,
-                              username_text=self.lm.username_text,
-                              password_text=self.lm.password_text)
-
     def POST(self, *args, **kwargs):
-        username = None
-        password = None
+        username = kwargs.get("login_name")
+        password = kwargs.get("login_password")
         user = None
-        for key, value in kwargs.iteritems():
-            if key == 'login_name':
-                username = value
-            elif key == 'login_password':
-                password = value
-        if username is not None and password is not None:
-            user = self._authenticate(username, password)
-        else:
-            cherrypy.log.error("Error: Username or password is missing")
+        error = None
 
-        if user:
-            return self.lm.auth_successful(user)
+        if username and password:
+            user = self._authenticate(username, password)
+            if user:
+                return self.lm.auth_successful(self.trans, user, 'password')
+            else:
+                error = "Authentication failed"
+                self.error(error)
         else:
-            return self.lm.auth_failed()
+            error = "Username or password is missing"
+            self.error("Error: " + error)
 
-    def root(self, *args, **kwargs):
-        op = getattr(self, cherrypy.request.method, self.GET)
-        if callable(op):
-            return op(*args, **kwargs)
+        context = self.create_tmpl_context(
+            username=username,
+            error=error,
+            error_password=not password,
+            error_username=not username
+        )
+        # pylint: disable=star-args
+        return self._template('login/form.html', **context)
 
 
 class LoginManager(LoginManagerBase):
@@ -102,6 +98,8 @@ for authentication. """
                 'Password'
             ],
         }
+        self.conf_opt_order = ['service name', 'username text',
+                               'password text', 'help text']
 
     @property
     def service_name(self):
@@ -120,5 +118,51 @@ 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
+
+
+class Installer(object):
+
+    def __init__(self):
+        self.name = 'pam'
+        self.ptype = 'login'
+
+    def install_args(self, group):
+        group.add_argument('--pam', choices=['yes', 'no'], default='no',
+                           help='Configure PAM authentication')
+        group.add_argument('--pam-service', action='store', default='remote',
+                           help='PAM service name to use for authentication')
+
+    def configure(self, opts):
+        if opts['pam'] != 'yes':
+            return
+
+        # Add configuration data to database
+        po = PluginObject()
+        po.name = 'pam'
+        po.wipe_data()
+
+        po.wipe_config_values(FACILITY)
+        config = {'service name': opts['pam_service']}
+        po.save_plugin_config(FACILITY, 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.save_plugin_config(FACILITY, globalconf)
+
+        # for selinux enabled platforms, ignore if it fails just report
+        try:
+            subprocess.call(['/usr/sbin/setsebool', '-P',
+                             'httpd_mod_auth_pam=on',
+                             'httpd_tmp_exec=on'])
+        except Exception:  # pylint: disable=broad-except
+            pass