PR#100: Add Fedora SSH and GPG key mapping and make sure OpenID AX works with multiple values - ipsilon

Patrick Uiterwijk • 7 years ago

d39f763

Patrick Uiterwijk • 7 years ago

7bb91fe

Patrick Uiterwijk • 7 years ago

a8795a1

ipsilon/login/authfas.py

file modified

+6 -1

		`@@ -1,4 +1,4 @@`
		`- # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING`
		`+ # Copyright (C) 2014,2016 Ipsilon project Contributors, for license see COPYING`

		`from ipsilon.login.common import LoginFormBase, LoginManagerBase, \`
		`LoginManagerInstaller`
		`@@ -35,6 +35,8 @@`
		`['human_name', 'fullname'],`
		`['email', 'email'],`
		`['timezone', 'timezone'],`
		`+ ['ssh_key', 'ssh_key'],`
		`+ ['gpg_keyid', 'gpg_keyid'],`
		`]`


		`@@ -84,6 +86,9 @@`
		`def make_userdata(self, fas_data):`
		`userdata, fas_extra = self.mapper.map_attributes(fas_data)`

		`+ # We need to split ssh keys by newline, since we can't send newlines`
		`+ userdata['ssh_key'] = userdata['ssh_key'].split('\n')`
		`+`
		`# compute and store groups and cla groups`
		`userdata['_groups'] = []`
		`userdata['_extras'] = {'fas': fas_extra, 'cla': []}`

file modified

+18 -2

		`@@ -2,6 +2,7 @@`

		`from __future__ import absolute_import`

		`+ from ipsilon.providers.common import AuthenticationError`
		`from ipsilon.providers.openid.extensions.common import OpenidExtensionBase`
		`from openid.extensions import ax`

		`@@ -38,12 +39,27 @@`
		`return None`
		`resp = ax.FetchResponse(req)`
		`for name in req.requested_attributes:`
		`+ attr = req.requested_attributes[name]`
		`try:`
		`self.debug(name)`
		`+ value = None`
		`if name in AP_MAP:`
		`- resp.addValue(name, userdata[AP_MAP[name]])`
		`+ value = userdata[AP_MAP[name]]`
		`else:`
		`- resp.addValue(name, userdata[name])`
		`+ value = userdata[name]`
		`+`
		`+ if '\n' in value:`
		`+ raise AuthenticationError('Newline in attribute %s' % name)`
		`+`
		`+ added_vals = 0`
		`+ if not isinstance(value, list):`
		`+ value = [value]`
		`+ for val in value:`
		`+ val = val.strip()`
		`+ if attr.wantsUnlimitedValues() or added_vals < attr.count:`
		`+ if val != '':`
		`+ added_vals += 1`
		`+ resp.addValue(name, val)`
		`except Exception: # pylint: disable=broad-except`
		`pass`
		`return resp`