X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fauthpam.py;h=1a34f8ff5ba0eb4f8353f62178d9c09dda23c487;hp=db409f714f2854885c2490cf4756f1080e3ad950;hb=485baf6ee7a315d1af1086fe5b5da8cff6c4ba37;hpb=411a829b99d81939a6f194abe940eb0f3f88673e diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py old mode 100755 new mode 100644 index db409f7..1a34f8f --- a/ipsilon/login/authpam.py +++ b/ipsilon/login/authpam.py @@ -1,30 +1,14 @@ -#!/usr/bin/python -# -# Copyright (C) 2013 Simo Sorce -# -# 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 . - -from ipsilon.login.common import LoginPageBase, 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 -import cherrypy +from ipsilon.util import config as pconfig import pam +import subprocess -class Pam(LoginPageBase): +class Pam(LoginFormBase): def _authenticate(self, username, password): if self.lm.service_name: @@ -33,17 +17,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") @@ -53,13 +32,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, @@ -67,30 +46,8 @@ class Pam(LoginPageBase): error_password=not password, 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 + self.lm.set_auth_error() + return self._template('login/form.html', **context) class LoginManager(LoginManagerBase): @@ -103,28 +60,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): @@ -143,15 +97,16 @@ 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): +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', @@ -159,29 +114,26 @@ class Installer(object): 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 - 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: + subprocess.call(['/usr/sbin/setsebool', '-P', + 'httpd_mod_auth_pam=on', + 'httpd_tmp_exec=on']) + except Exception: # pylint: disable=broad-except + pass