From 771b8fd095f3bcb922f761d297c62f1a56a997d5 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 16 Feb 2015 14:04:49 -0500 Subject: Prefix userdata hives with _ to avoid conflicts The main userdata dict contains common attributes, but we add a sepcial groups list and unmapped extras, as well as indicators like auth_type. All these additional attributes are now prefixed by a _ character so that conflicts with legitimate attributes are improbable. Signed-off-by: Simo Sorce Reviewed-by: Patrick Uiterwijk --- ipsilon/login/authfas.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'ipsilon/login/authfas.py') diff --git a/ipsilon/login/authfas.py b/ipsilon/login/authfas.py index 33d1ac5..3697c1a 100644 --- a/ipsilon/login/authfas.py +++ b/ipsilon/login/authfas.py @@ -82,18 +82,19 @@ class FAS(LoginFormBase): userdata, fas_extra = self.mapper.map_attrs(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 -- cgit