Skip to content

Commit 17b03f3

Browse files
committed
Do not fix the configured requested_attributes
This is always done on use, ie, on client_base.py::create_authn_request Signed-off-by: Ivan Kanakarakis <[email protected]>
1 parent 70d4257 commit 17b03f3

File tree

1 file changed

+0
-44
lines changed

1 file changed

+0
-44
lines changed

src/saml2/config.py

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -509,50 +509,6 @@ def ecp_endpoint(self, ipaddress):
509509

510510
return None
511511

512-
def load(self, cnf, metadata_construction=False):
513-
super().load(cnf, metadata_construction=False)
514-
self.fix_requested_attributes()
515-
return self
516-
517-
def fix_requested_attributes(self):
518-
"""Add friendly_name or name if missing to the requested attributes"""
519-
requested_attrs = self.getattr('requested_attributes', 'sp')
520-
521-
if not requested_attrs:
522-
return
523-
524-
for attr in requested_attrs:
525-
friendly_name = attr.get('friendly_name')
526-
name = attr.get('name')
527-
name_format = attr.get('name_format')
528-
529-
if not name and not friendly_name:
530-
raise ValueError(
531-
"Missing required attribute: '{}' or '{}'".format(
532-
'name', 'friendly_name'))
533-
534-
if not name:
535-
for converter in self.attribute_converters:
536-
try:
537-
attr['name'] = converter._to[friendly_name.lower()]
538-
except KeyError:
539-
continue
540-
else:
541-
if not name_format:
542-
attr['name_format'] = converter.name_format
543-
break
544-
545-
if not friendly_name:
546-
for converter in self.attribute_converters:
547-
try:
548-
attr['friendly_name'] = converter._fro[name.lower()]
549-
except KeyError:
550-
continue
551-
else:
552-
if not name_format:
553-
attr['name_format'] = converter.name_format
554-
break
555-
556512

557513
class IdPConfig(Config):
558514
def_context = "idp"

0 commit comments

Comments
 (0)