X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fauthtest.py;h=0b05e0a6eeef8fd80a74d464edfc01cb7d114cf4;hp=7b6606619f566e55b5566c0c2950c016b0d4f47c;hb=cfe24fa3dc15d87f3ace944a2d62a0f4c5ee496c;hpb=32bb6d8b38b9147143074710ba2dcb7f45cd4157 diff --git a/ipsilon/login/authtest.py b/ipsilon/login/authtest.py old mode 100755 new mode 100644 index 7b66066..0b05e0a --- a/ipsilon/login/authtest.py +++ b/ipsilon/login/authtest.py @@ -1,34 +1,14 @@ -#!/usr/bin/python -# -# Copyright (C) 2014 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) 2014 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 cherrypy +import logging -class TestAuth(LoginPageBase): - - def GET(self, *args, **kwargs): - context = self.create_tmpl_context() - # pylint: disable=star-args - return self._template('login/form.html', **context) +class TestAuth(LoginFormBase): def POST(self, *args, **kwargs): username = kwargs.get("login_name") @@ -38,13 +18,21 @@ class TestAuth(LoginPageBase): if username and password: if password == 'ipsilon': cherrypy.log("User %s successfully authenticated." % username) - return self.lm.auth_successful(username) + testdata = { + 'givenname': 'Test User', + 'surname': username, + 'fullname': 'Test User %s' % username, + 'email': '%s@example.com' % username, + '_groups': [username] + } + return self.lm.auth_successful(self.trans, + username, 'password', testdata) else: cherrypy.log("User %s failed authentication." % username) error = "Authentication failed" else: error = "Username or password is missing" - cherrypy.log.error("Error: " + error) + cherrypy.log.error("Error: " + error, severity=logging.ERROR) context = self.create_tmpl_context( username=username, @@ -52,57 +40,38 @@ class TestAuth(LoginPageBase): error_password=not password, error_username=not username ) - # pylint: disable=star-args + self.lm.set_auth_error() return self._template('login/form.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": 'TEST Login', - "action": '%s/login/testauth' % self.basepath, - "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 - class LoginManager(LoginManagerBase): def __init__(self, *args, **kwargs): super(LoginManager, self).__init__(*args, **kwargs) self.name = 'testauth' + self.service_name = 'testauth' self.path = 'testauth' self.page = None self.description = """ Form based TEST login Manager, DO NOT EVER ACTIVATE IN PRODUCTION """ - self._options = { - '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( + '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.', + 'DISABLE IN PRODUCTION, USE ONLY FOR TEST ' + + 'Use any username they are all valid, "admin" gives ' + + 'administrative powers. ' + + 'Use the fixed password "ipsilon" for any user') + ) @property def help_text(self): @@ -117,15 +86,16 @@ Form based TEST login Manager, DO NOT EVER ACTIVATE IN PRODUCTION """ return self.get_config_value('password text') def get_tree(self, site): - self.page = TestAuth(site, self) + self.page = TestAuth(site, self, 'login/testauth') return self.page -class Installer(object): +class Installer(LoginManagerInstaller): - def __init__(self): + def __init__(self, *pargs): + super(Installer, self).__init__() self.name = 'testauth' - self.ptype = 'login' + self.pargs = pargs def install_args(self, group): group.add_argument('--testauth', choices=['yes', 'no'], default='no', @@ -135,20 +105,12 @@ class Installer(object): if opts['testauth'] != 'yes': return + logging.debug(self.pargs) # Add configuration data to database - po = PluginObject() + po = PluginObject(*self.pargs) po.name = 'testauth' po.wipe_data() # 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('testauth') - globalconf['order'] = ','.join(order) - po.set_config(globalconf) - po.save_plugin_config(FACILITY) + po.is_enabled = True + po.save_enabled_state()