X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fauthfas.py;h=4ae0dc43ab31bca0598819223d01f3d32fe43be9;hp=c2d8fff90974ec0a2b96ac2cf9fbcae0e9a4d396;hb=0b40c36998ed29c7e98a8cf5f42a798e0bec0870;hpb=62b4656571be6e8671ada295047eac385d330f66 diff --git a/ipsilon/login/authfas.py b/ipsilon/login/authfas.py old mode 100755 new mode 100644 index c2d8fff..4ae0dc4 --- a/ipsilon/login/authfas.py +++ b/ipsilon/login/authfas.py @@ -1,12 +1,11 @@ -#!/usr/bin/python -# # Copyright (C) 2014 Ipsilon contributors, see COPYING file for license -from ipsilon.info.common import InfoMapping -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 +from ipsilon.util.policy import Policy +from ipsilon.util import config as pconfig import cherrypy from fedora.client.fasproxy import FasProxyClient @@ -29,22 +28,21 @@ try: except ImportError: CLA_GROUPS = dict() -fas_mapping = { - 'username': 'nickname', - 'telephone': 'phone', - 'country_code': 'country', - 'human_name': 'fullname', - 'email': 'email', - 'timezone': 'timezone', -} +fas_mapping = [ + ['username', 'nickname'], + ['telephone', 'phone'], + ['country_code', 'country'], + ['human_name', 'fullname'], + ['email', 'email'], + ['timezone', 'timezone'], +] class FAS(LoginFormBase): def __init__(self, site, mgr, page): super(FAS, self).__init__(site, mgr, page) - self.mapper = InfoMapping() - self.mapper.set_mapping(fas_mapping) + self.mapper = Policy(fas_mapping) def POST(self, *args, **kwargs): username = kwargs.get("login_name") @@ -77,25 +75,27 @@ class FAS(LoginFormBase): error_password=not password, error_username=not username ) + self.lm.set_auth_error() # pylint: disable=star-args return self._template(self.formtemplate, **context) def make_userdata(self, fas_data): - userdata, fas_extra = self.mapper.map_attrs(fas_data) + userdata, fas_extra = self.mapper.map_attributes(fas_data) # compute and store groups and cla groups - userdata['groups'] = [] - userdata['extras'] = {'fas': fas_extra, 'cla': []} + userdata['_groups'] = [] + userdata['_extras'] = {'fas': fas_extra, 'cla': []} for group in fas_data.get('approved_memberships', {}): if 'name' not in group: continue if group.get('group_type') == 'cla': if group['name'] in CLA_GROUPS: - userdata['extras']['cla'].append(CLA_GROUPS[group['name']]) + group_name = CLA_GROUPS[group['name']] else: - userdata['extras']['cla'].append(group['name']) + group_name = group['name'] + userdata['_extras']['cla'].append(group_name) else: - userdata['groups'].append(group['name']) + userdata['_groups'].append(group['name']) return userdata @@ -112,41 +112,33 @@ class LoginManager(LoginManagerBase): self.description = """ Form based login Manager that uses the Fedora Authentication Server """ - self._options = { - 'help text': [ - """ The text shown to guide the user at login time. """, - 'string', - 'Login wth your FAS credentials' - ], - 'username text': [ - """ The text shown to ask for the username in the form. """, - 'string', - 'FAS Username' - ], - 'password text': [ - """ The text shown to ask for the password in the form. """, - 'string', - 'Password' - ], - 'FAS url': [ - """ The FAS Url. """, - 'string', - 'https://admin.fedoraproject.org/accounts/' - ], - 'FAS Proxy client user Agent': [ - """ The User Agent presented to the FAS Server. """, - 'string', - 'Ipsilon v1.0' - ], - 'FAS Insecure Auth': [ - """ If 'YES' skips FAS server cert verification. """, - 'string', - '' - ], - } - self.conf_opt_order = ['FAS url', 'FAS Proxy client user Agent', - 'FAS Insecure Auth', 'username text', - 'password text', 'help text'] + self.new_config( + self.name, + pconfig.String( + 'FAS url', + 'The FAS Url.', + 'https://admin.fedoraproject.org/accounts/'), + pconfig.String( + 'FAS Proxy client user Agent', + 'The User Agent presented to the FAS Server.', + 'Ipsilon v1.0'), + pconfig.Condition( + 'FAS Insecure Auth', + 'If checked skips FAS server cert verification.', + False), + pconfig.String( + 'username text', + 'Text used to ask for the username at login time.', + 'FAS 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.', + 'Login with your FAS credentials') + ) @property def help_text(self): @@ -180,11 +172,12 @@ Form based login Manager that uses the Fedora Authentication Server return self.page -class Installer(object): +class Installer(LoginManagerInstaller): - def __init__(self): + def __init__(self, *pargs): + super(Installer, self).__init__() self.name = 'fas' - self.ptype = 'login' + self.pargs = pargs def install_args(self, group): group.add_argument('--fas', choices=['yes', 'no'], default='no', @@ -195,20 +188,11 @@ class Installer(object): return # Add configuration data to database - po = PluginObject() + po = PluginObject(*self.pargs) po.name = 'fas' po.wipe_data() - - po.wipe_config_values(FACILITY) + po.wipe_config_values() # 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('fas') - globalconf['order'] = ','.join(order) - po.save_plugin_config(FACILITY, globalconf) + po.is_enabled = True + po.save_enabled_state()