diff options
| author | Aarni Koskela <akx@iki.fi> | 2022-10-27 15:14:36 +0300 |
|---|---|---|
| committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2022-11-15 13:06:41 +0200 |
| commit | fc84d5103a0ede07d1f371a4c85f2abaf0f8f3c0 (patch) | |
| tree | 8477fcba4d0ddf1b43b767163d7fd6203fd34046 | |
| parent | 15f131d08a0905662bc578d1d9c7d8fa8d8fda43 (diff) | |
| download | pysaml2-fc84d5103a0ede07d1f371a4c85f2abaf0f8f3c0.tar.gz | |
Run flynt -tc + black + isort
37 files changed, 2152 insertions, 2154 deletions
diff --git a/example/attributemaps/saml_uri.py b/example/attributemaps/saml_uri.py index aa02559f..5f5d9145 100644 --- a/example/attributemaps/saml_uri.py +++ b/example/attributemaps/saml_uri.py @@ -11,189 +11,189 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57." MAP = { "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", "fro": { - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - EDUPERSON_OID + "1": "eduPersonAffiliation", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NETSCAPE_LDAP + "241": "displayName", - UCL_DIR_PILOT + "37": "associatedDomain", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - X500ATTR_OID + "53": "deltaRevocationList", - X500ATTR_OID + "52": "supportedAlgorithms", - X500ATTR_OID + "51": "houseIdentifier", - X500ATTR_OID + "50": "uniqueMember", - X500ATTR_OID + "19": "physicalDeliveryOfficeName", - X500ATTR_OID + "18": "postOfficeBox", - X500ATTR_OID + "17": "postalCode", - X500ATTR_OID + "16": "postalAddress", - X500ATTR_OID + "15": "businessCategory", - X500ATTR_OID + "14": "searchGuide", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - X500ATTR_OID + "12": "title", - X500ATTR_OID + "11": "ou", - X500ATTR_OID + "10": "o", - X500ATTR_OID + "37": "cACertificate", - X500ATTR_OID + "36": "userCertificate", - X500ATTR_OID + "31": "member", - X500ATTR_OID + "30": "supportedApplicationContext", - X500ATTR_OID + "33": "roleOccupant", - X500ATTR_OID + "32": "owner", - NETSCAPE_LDAP + "1": "carLicense", - PKCS_9 + "1": "email", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "2": "departmentNumber", - X500ATTR_OID + "39": "certificateRevocationList", - X500ATTR_OID + "38": "authorityRevocationList", - NETSCAPE_LDAP + "216": "userPKCS12", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - X500ATTR_OID + "9": "street", - X500ATTR_OID + "8": "st", - NETSCAPE_LDAP + "39": "preferredLanguage", - EDUPERSON_OID + "7": "eduPersonEntitlement", - X500ATTR_OID + "2": "knowledgeInformation", - X500ATTR_OID + "7": "l", - X500ATTR_OID + "6": "c", - X500ATTR_OID + "5": "serialNumber", - X500ATTR_OID + "4": "sn", - UCL_DIR_PILOT + "60": "jpegPhoto", - X500ATTR_OID + "65": "pseudonym", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - X500ATTR_OID + "40": "crossCertificatePair", - X500ATTR_OID + "42": "givenName", - X500ATTR_OID + "43": "initials", - X500ATTR_OID + "44": "generationQualifier", - X500ATTR_OID + "45": "x500UniqueIdentifier", - X500ATTR_OID + "46": "dnQualifier", - X500ATTR_OID + "47": "enhancedSearchGuide", - X500ATTR_OID + "48": "protocolInformation", - X500ATTR_OID + "54": "dmdName", - NETSCAPE_LDAP + "4": "employeeType", - X500ATTR_OID + "22": "teletexTerminalIdentifier", - X500ATTR_OID + "23": "facsimileTelephoneNumber", - X500ATTR_OID + "20": "telephoneNumber", - X500ATTR_OID + "21": "telexNumber", - X500ATTR_OID + "26": "registeredAddress", - X500ATTR_OID + "27": "destinationIndicator", - X500ATTR_OID + "24": "x121Address", - X500ATTR_OID + "25": "internationaliSDNNumber", - X500ATTR_OID + "28": "preferredDeliveryMethod", - X500ATTR_OID + "29": "presentationAddress", - EDUPERSON_OID + "3": "eduPersonOrgDN", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", - UMICH + "57": "labeledURI", - UCL_DIR_PILOT + "1": "uid", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NETSCAPE_LDAP}241": "displayName", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{X500ATTR_OID}53": "deltaRevocationList", + f"{X500ATTR_OID}52": "supportedAlgorithms", + f"{X500ATTR_OID}51": "houseIdentifier", + f"{X500ATTR_OID}50": "uniqueMember", + f"{X500ATTR_OID}19": "physicalDeliveryOfficeName", + f"{X500ATTR_OID}18": "postOfficeBox", + f"{X500ATTR_OID}17": "postalCode", + f"{X500ATTR_OID}16": "postalAddress", + f"{X500ATTR_OID}15": "businessCategory", + f"{X500ATTR_OID}14": "searchGuide", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{X500ATTR_OID}12": "title", + f"{X500ATTR_OID}11": "ou", + f"{X500ATTR_OID}10": "o", + f"{X500ATTR_OID}37": "cACertificate", + f"{X500ATTR_OID}36": "userCertificate", + f"{X500ATTR_OID}31": "member", + f"{X500ATTR_OID}30": "supportedApplicationContext", + f"{X500ATTR_OID}33": "roleOccupant", + f"{X500ATTR_OID}32": "owner", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{PKCS_9}1": "email", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{X500ATTR_OID}39": "certificateRevocationList", + f"{X500ATTR_OID}38": "authorityRevocationList", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{X500ATTR_OID}9": "street", + f"{X500ATTR_OID}8": "st", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{X500ATTR_OID}2": "knowledgeInformation", + f"{X500ATTR_OID}7": "l", + f"{X500ATTR_OID}6": "c", + f"{X500ATTR_OID}5": "serialNumber", + f"{X500ATTR_OID}4": "sn", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{X500ATTR_OID}65": "pseudonym", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{X500ATTR_OID}40": "crossCertificatePair", + f"{X500ATTR_OID}42": "givenName", + f"{X500ATTR_OID}43": "initials", + f"{X500ATTR_OID}44": "generationQualifier", + f"{X500ATTR_OID}45": "x500UniqueIdentifier", + f"{X500ATTR_OID}46": "dnQualifier", + f"{X500ATTR_OID}47": "enhancedSearchGuide", + f"{X500ATTR_OID}48": "protocolInformation", + f"{X500ATTR_OID}54": "dmdName", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{X500ATTR_OID}22": "teletexTerminalIdentifier", + f"{X500ATTR_OID}23": "facsimileTelephoneNumber", + f"{X500ATTR_OID}20": "telephoneNumber", + f"{X500ATTR_OID}21": "telexNumber", + f"{X500ATTR_OID}26": "registeredAddress", + f"{X500ATTR_OID}27": "destinationIndicator", + f"{X500ATTR_OID}24": "x121Address", + f"{X500ATTR_OID}25": "internationaliSDNNumber", + f"{X500ATTR_OID}28": "preferredDeliveryMethod", + f"{X500ATTR_OID}29": "presentationAddress", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", + f"{UMICH}57": "labeledURI", + f"{UCL_DIR_PILOT}1": "uid", }, "to": { - "roleOccupant": X500ATTR_OID + "33", - "gn": X500ATTR_OID + "42", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "title": X500ATTR_OID + "12", - "facsimileTelephoneNumber": X500ATTR_OID + "23", - "mail": UCL_DIR_PILOT + "3", - "postOfficeBox": X500ATTR_OID + "18", - "fax": X500ATTR_OID + "23", - "telephoneNumber": X500ATTR_OID + "20", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "rfc822Mailbox": UCL_DIR_PILOT + "3", - "dc": UCL_DIR_PILOT + "25", - "countryName": X500ATTR_OID + "6", - "emailAddress": PKCS_9 + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "organizationName": X500ATTR_OID + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "registeredAddress": X500ATTR_OID + "26", - "physicalDeliveryOfficeName": X500ATTR_OID + "19", - "associatedDomain": UCL_DIR_PILOT + "37", - "l": X500ATTR_OID + "7", - "stateOrProvinceName": X500ATTR_OID + "8", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "pkcs9email": PKCS_9 + "1", - "givenName": X500ATTR_OID + "42", - "givenname": X500ATTR_OID + "42", - "x500UniqueIdentifier": X500ATTR_OID + "45", - "eduPersonNickname": EDUPERSON_OID + "2", - "houseIdentifier": X500ATTR_OID + "51", - "street": X500ATTR_OID + "9", - "supportedAlgorithms": X500ATTR_OID + "52", - "preferredLanguage": NETSCAPE_LDAP + "39", - "postalAddress": X500ATTR_OID + "16", - "email": PKCS_9 + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "c": X500ATTR_OID + "6", - "teletexTerminalIdentifier": X500ATTR_OID + "22", - "o": X500ATTR_OID + "10", - "cACertificate": X500ATTR_OID + "37", - "telexNumber": X500ATTR_OID + "21", - "ou": X500ATTR_OID + "11", - "initials": X500ATTR_OID + "43", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "deltaRevocationList": X500ATTR_OID + "53", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "supportedApplicationContext": X500ATTR_OID + "30", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "generationQualifier": X500ATTR_OID + "44", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "edupersonprincipalname": EDUPERSON_OID + "6", - "localityName": X500ATTR_OID + "7", - "owner": X500ATTR_OID + "32", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "searchGuide": X500ATTR_OID + "14", - "certificateRevocationList": X500ATTR_OID + "39", - "organizationalUnitName": X500ATTR_OID + "11", - "userCertificate": X500ATTR_OID + "36", - "preferredDeliveryMethod": X500ATTR_OID + "28", - "internationaliSDNNumber": X500ATTR_OID + "25", - "uniqueMember": X500ATTR_OID + "50", - "departmentNumber": NETSCAPE_LDAP + "2", - "enhancedSearchGuide": X500ATTR_OID + "47", - "userPKCS12": NETSCAPE_LDAP + "216", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "x121Address": X500ATTR_OID + "24", - "destinationIndicator": X500ATTR_OID + "27", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "surname": X500ATTR_OID + "4", - "jpegPhoto": UCL_DIR_PILOT + "60", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "edupersonscopedaffiliation": EDUPERSON_OID + "9", - "protocolInformation": X500ATTR_OID + "48", - "knowledgeInformation": X500ATTR_OID + "2", - "employeeType": NETSCAPE_LDAP + "4", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "member": X500ATTR_OID + "31", - "streetAddress": X500ATTR_OID + "9", - "dmdName": X500ATTR_OID + "54", - "postalCode": X500ATTR_OID + "17", - "pseudonym": X500ATTR_OID + "65", - "dnQualifier": X500ATTR_OID + "46", - "crossCertificatePair": X500ATTR_OID + "40", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "authorityRevocationList": X500ATTR_OID + "38", - "displayName": NETSCAPE_LDAP + "241", - "businessCategory": X500ATTR_OID + "15", - "serialNumber": X500ATTR_OID + "5", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "st": X500ATTR_OID + "8", - "carLicense": NETSCAPE_LDAP + "1", - "presentationAddress": X500ATTR_OID + "29", - "sn": X500ATTR_OID + "4", - "domainComponent": UCL_DIR_PILOT + "25", - "labeledURI": UMICH + "57", - "uid": UCL_DIR_PILOT + "1", + "roleOccupant": f"{X500ATTR_OID}33", + "gn": f"{X500ATTR_OID}42", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "title": f"{X500ATTR_OID}12", + "facsimileTelephoneNumber": f"{X500ATTR_OID}23", + "mail": f"{UCL_DIR_PILOT}3", + "postOfficeBox": f"{X500ATTR_OID}18", + "fax": f"{X500ATTR_OID}23", + "telephoneNumber": f"{X500ATTR_OID}20", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "rfc822Mailbox": f"{UCL_DIR_PILOT}3", + "dc": f"{UCL_DIR_PILOT}25", + "countryName": f"{X500ATTR_OID}6", + "emailAddress": f"{PKCS_9}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "organizationName": f"{X500ATTR_OID}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "registeredAddress": f"{X500ATTR_OID}26", + "physicalDeliveryOfficeName": f"{X500ATTR_OID}19", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "l": f"{X500ATTR_OID}7", + "stateOrProvinceName": f"{X500ATTR_OID}8", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "pkcs9email": f"{PKCS_9}1", + "givenName": f"{X500ATTR_OID}42", + "givenname": f"{X500ATTR_OID}42", + "x500UniqueIdentifier": f"{X500ATTR_OID}45", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "houseIdentifier": f"{X500ATTR_OID}51", + "street": f"{X500ATTR_OID}9", + "supportedAlgorithms": f"{X500ATTR_OID}52", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "postalAddress": f"{X500ATTR_OID}16", + "email": f"{PKCS_9}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "c": f"{X500ATTR_OID}6", + "teletexTerminalIdentifier": f"{X500ATTR_OID}22", + "o": f"{X500ATTR_OID}10", + "cACertificate": f"{X500ATTR_OID}37", + "telexNumber": f"{X500ATTR_OID}21", + "ou": f"{X500ATTR_OID}11", + "initials": f"{X500ATTR_OID}43", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "deltaRevocationList": f"{X500ATTR_OID}53", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "supportedApplicationContext": f"{X500ATTR_OID}30", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "generationQualifier": f"{X500ATTR_OID}44", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "edupersonprincipalname": f"{EDUPERSON_OID}6", + "localityName": f"{X500ATTR_OID}7", + "owner": f"{X500ATTR_OID}32", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "searchGuide": f"{X500ATTR_OID}14", + "certificateRevocationList": f"{X500ATTR_OID}39", + "organizationalUnitName": f"{X500ATTR_OID}11", + "userCertificate": f"{X500ATTR_OID}36", + "preferredDeliveryMethod": f"{X500ATTR_OID}28", + "internationaliSDNNumber": f"{X500ATTR_OID}25", + "uniqueMember": f"{X500ATTR_OID}50", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "enhancedSearchGuide": f"{X500ATTR_OID}47", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "x121Address": f"{X500ATTR_OID}24", + "destinationIndicator": f"{X500ATTR_OID}27", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "surname": f"{X500ATTR_OID}4", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "edupersonscopedaffiliation": f"{EDUPERSON_OID}9", + "protocolInformation": f"{X500ATTR_OID}48", + "knowledgeInformation": f"{X500ATTR_OID}2", + "employeeType": f"{NETSCAPE_LDAP}4", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "member": f"{X500ATTR_OID}31", + "streetAddress": f"{X500ATTR_OID}9", + "dmdName": f"{X500ATTR_OID}54", + "postalCode": f"{X500ATTR_OID}17", + "pseudonym": f"{X500ATTR_OID}65", + "dnQualifier": f"{X500ATTR_OID}46", + "crossCertificatePair": f"{X500ATTR_OID}40", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "authorityRevocationList": f"{X500ATTR_OID}38", + "displayName": f"{NETSCAPE_LDAP}241", + "businessCategory": f"{X500ATTR_OID}15", + "serialNumber": f"{X500ATTR_OID}5", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "st": f"{X500ATTR_OID}8", + "carLicense": f"{NETSCAPE_LDAP}1", + "presentationAddress": f"{X500ATTR_OID}29", + "sn": f"{X500ATTR_OID}4", + "domainComponent": f"{UCL_DIR_PILOT}25", + "labeledURI": f"{UMICH}57", + "uid": f"{UCL_DIR_PILOT}1", }, } diff --git a/example/attributemaps/shibboleth_uri.py b/example/attributemaps/shibboleth_uri.py index 30b31503..992a2219 100644 --- a/example/attributemaps/shibboleth_uri.py +++ b/example/attributemaps/shibboleth_uri.py @@ -9,182 +9,182 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57." MAP = { "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri", "fro": { - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - EDUPERSON_OID + "1": "eduPersonAffiliation", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NETSCAPE_LDAP + "241": "displayName", - UCL_DIR_PILOT + "37": "associatedDomain", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - X500ATTR + "53": "deltaRevocationList", - X500ATTR + "52": "supportedAlgorithms", - X500ATTR + "51": "houseIdentifier", - X500ATTR + "50": "uniqueMember", - X500ATTR + "19": "physicalDeliveryOfficeName", - X500ATTR + "18": "postOfficeBox", - X500ATTR + "17": "postalCode", - X500ATTR + "16": "postalAddress", - X500ATTR + "15": "businessCategory", - X500ATTR + "14": "searchGuide", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - X500ATTR + "12": "title", - X500ATTR + "11": "ou", - X500ATTR + "10": "o", - X500ATTR + "37": "cACertificate", - X500ATTR + "36": "userCertificate", - X500ATTR + "31": "member", - X500ATTR + "30": "supportedApplicationContext", - X500ATTR + "33": "roleOccupant", - X500ATTR + "32": "owner", - NETSCAPE_LDAP + "1": "carLicense", - PKCS_9 + "1": "email", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "2": "departmentNumber", - X500ATTR + "39": "certificateRevocationList", - X500ATTR + "38": "authorityRevocationList", - NETSCAPE_LDAP + "216": "userPKCS12", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - X500ATTR + "9": "street", - X500ATTR + "8": "st", - NETSCAPE_LDAP + "39": "preferredLanguage", - EDUPERSON_OID + "7": "eduPersonEntitlement", - X500ATTR + "2": "knowledgeInformation", - X500ATTR + "7": "l", - X500ATTR + "6": "c", - X500ATTR + "5": "serialNumber", - X500ATTR + "4": "sn", - UCL_DIR_PILOT + "60": "jpegPhoto", - X500ATTR + "65": "pseudonym", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - X500ATTR + "40": "crossCertificatePair", - X500ATTR + "42": "givenName", - X500ATTR + "43": "initials", - X500ATTR + "44": "generationQualifier", - X500ATTR + "45": "x500UniqueIdentifier", - X500ATTR + "46": "dnQualifier", - X500ATTR + "47": "enhancedSearchGuide", - X500ATTR + "48": "protocolInformation", - X500ATTR + "54": "dmdName", - NETSCAPE_LDAP + "4": "employeeType", - X500ATTR + "22": "teletexTerminalIdentifier", - X500ATTR + "23": "facsimileTelephoneNumber", - X500ATTR + "20": "telephoneNumber", - X500ATTR + "21": "telexNumber", - X500ATTR + "26": "registeredAddress", - X500ATTR + "27": "destinationIndicator", - X500ATTR + "24": "x121Address", - X500ATTR + "25": "internationaliSDNNumber", - X500ATTR + "28": "preferredDeliveryMethod", - X500ATTR + "29": "presentationAddress", - EDUPERSON_OID + "3": "eduPersonOrgDN", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NETSCAPE_LDAP}241": "displayName", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{X500ATTR}53": "deltaRevocationList", + f"{X500ATTR}52": "supportedAlgorithms", + f"{X500ATTR}51": "houseIdentifier", + f"{X500ATTR}50": "uniqueMember", + f"{X500ATTR}19": "physicalDeliveryOfficeName", + f"{X500ATTR}18": "postOfficeBox", + f"{X500ATTR}17": "postalCode", + f"{X500ATTR}16": "postalAddress", + f"{X500ATTR}15": "businessCategory", + f"{X500ATTR}14": "searchGuide", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{X500ATTR}12": "title", + f"{X500ATTR}11": "ou", + f"{X500ATTR}10": "o", + f"{X500ATTR}37": "cACertificate", + f"{X500ATTR}36": "userCertificate", + f"{X500ATTR}31": "member", + f"{X500ATTR}30": "supportedApplicationContext", + f"{X500ATTR}33": "roleOccupant", + f"{X500ATTR}32": "owner", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{PKCS_9}1": "email", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{X500ATTR}39": "certificateRevocationList", + f"{X500ATTR}38": "authorityRevocationList", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{X500ATTR}9": "street", + f"{X500ATTR}8": "st", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{X500ATTR}2": "knowledgeInformation", + f"{X500ATTR}7": "l", + f"{X500ATTR}6": "c", + f"{X500ATTR}5": "serialNumber", + f"{X500ATTR}4": "sn", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{X500ATTR}65": "pseudonym", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{X500ATTR}40": "crossCertificatePair", + f"{X500ATTR}42": "givenName", + f"{X500ATTR}43": "initials", + f"{X500ATTR}44": "generationQualifier", + f"{X500ATTR}45": "x500UniqueIdentifier", + f"{X500ATTR}46": "dnQualifier", + f"{X500ATTR}47": "enhancedSearchGuide", + f"{X500ATTR}48": "protocolInformation", + f"{X500ATTR}54": "dmdName", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{X500ATTR}22": "teletexTerminalIdentifier", + f"{X500ATTR}23": "facsimileTelephoneNumber", + f"{X500ATTR}20": "telephoneNumber", + f"{X500ATTR}21": "telexNumber", + f"{X500ATTR}26": "registeredAddress", + f"{X500ATTR}27": "destinationIndicator", + f"{X500ATTR}24": "x121Address", + f"{X500ATTR}25": "internationaliSDNNumber", + f"{X500ATTR}28": "preferredDeliveryMethod", + f"{X500ATTR}29": "presentationAddress", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", }, "to": { - "roleOccupant": X500ATTR + "33", - "gn": X500ATTR + "42", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "title": X500ATTR + "12", - "facsimileTelephoneNumber": X500ATTR + "23", - "mail": UCL_DIR_PILOT + "3", - "postOfficeBox": X500ATTR + "18", - "fax": X500ATTR + "23", - "telephoneNumber": X500ATTR + "20", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "rfc822Mailbox": UCL_DIR_PILOT + "3", - "dc": UCL_DIR_PILOT + "25", - "countryName": X500ATTR + "6", - "emailAddress": PKCS_9 + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "organizationName": X500ATTR + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "registeredAddress": X500ATTR + "26", - "physicalDeliveryOfficeName": X500ATTR + "19", - "associatedDomain": UCL_DIR_PILOT + "37", - "l": X500ATTR + "7", - "stateOrProvinceName": X500ATTR + "8", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "pkcs9email": PKCS_9 + "1", - "givenName": X500ATTR + "42", - "x500UniqueIdentifier": X500ATTR + "45", - "eduPersonNickname": EDUPERSON_OID + "2", - "houseIdentifier": X500ATTR + "51", - "street": X500ATTR + "9", - "supportedAlgorithms": X500ATTR + "52", - "preferredLanguage": NETSCAPE_LDAP + "39", - "postalAddress": X500ATTR + "16", - "email": PKCS_9 + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "c": X500ATTR + "6", - "teletexTerminalIdentifier": X500ATTR + "22", - "o": X500ATTR + "10", - "cACertificate": X500ATTR + "37", - "telexNumber": X500ATTR + "21", - "ou": X500ATTR + "11", - "initials": X500ATTR + "43", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "deltaRevocationList": X500ATTR + "53", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "supportedApplicationContext": X500ATTR + "30", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "generationQualifier": X500ATTR + "44", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "localityName": X500ATTR + "7", - "owner": X500ATTR + "32", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "searchGuide": X500ATTR + "14", - "certificateRevocationList": X500ATTR + "39", - "organizationalUnitName": X500ATTR + "11", - "userCertificate": X500ATTR + "36", - "preferredDeliveryMethod": X500ATTR + "28", - "internationaliSDNNumber": X500ATTR + "25", - "uniqueMember": X500ATTR + "50", - "departmentNumber": NETSCAPE_LDAP + "2", - "enhancedSearchGuide": X500ATTR + "47", - "userPKCS12": NETSCAPE_LDAP + "216", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "x121Address": X500ATTR + "24", - "destinationIndicator": X500ATTR + "27", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "surname": X500ATTR + "4", - "jpegPhoto": UCL_DIR_PILOT + "60", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "protocolInformation": X500ATTR + "48", - "knowledgeInformation": X500ATTR + "2", - "employeeType": NETSCAPE_LDAP + "4", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "member": X500ATTR + "31", - "streetAddress": X500ATTR + "9", - "dmdName": X500ATTR + "54", - "postalCode": X500ATTR + "17", - "pseudonym": X500ATTR + "65", - "dnQualifier": X500ATTR + "46", - "crossCertificatePair": X500ATTR + "40", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "authorityRevocationList": X500ATTR + "38", - "displayName": NETSCAPE_LDAP + "241", - "businessCategory": X500ATTR + "15", - "serialNumber": X500ATTR + "5", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "st": X500ATTR + "8", - "carLicense": NETSCAPE_LDAP + "1", - "presentationAddress": X500ATTR + "29", - "sn": X500ATTR + "4", - "domainComponent": UCL_DIR_PILOT + "25", + "roleOccupant": f"{X500ATTR}33", + "gn": f"{X500ATTR}42", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "title": f"{X500ATTR}12", + "facsimileTelephoneNumber": f"{X500ATTR}23", + "mail": f"{UCL_DIR_PILOT}3", + "postOfficeBox": f"{X500ATTR}18", + "fax": f"{X500ATTR}23", + "telephoneNumber": f"{X500ATTR}20", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "rfc822Mailbox": f"{UCL_DIR_PILOT}3", + "dc": f"{UCL_DIR_PILOT}25", + "countryName": f"{X500ATTR}6", + "emailAddress": f"{PKCS_9}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "organizationName": f"{X500ATTR}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "registeredAddress": f"{X500ATTR}26", + "physicalDeliveryOfficeName": f"{X500ATTR}19", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "l": f"{X500ATTR}7", + "stateOrProvinceName": f"{X500ATTR}8", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "pkcs9email": f"{PKCS_9}1", + "givenName": f"{X500ATTR}42", + "x500UniqueIdentifier": f"{X500ATTR}45", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "houseIdentifier": f"{X500ATTR}51", + "street": f"{X500ATTR}9", + "supportedAlgorithms": f"{X500ATTR}52", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "postalAddress": f"{X500ATTR}16", + "email": f"{PKCS_9}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "c": f"{X500ATTR}6", + "teletexTerminalIdentifier": f"{X500ATTR}22", + "o": f"{X500ATTR}10", + "cACertificate": f"{X500ATTR}37", + "telexNumber": f"{X500ATTR}21", + "ou": f"{X500ATTR}11", + "initials": f"{X500ATTR}43", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "deltaRevocationList": f"{X500ATTR}53", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "supportedApplicationContext": f"{X500ATTR}30", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "generationQualifier": f"{X500ATTR}44", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "localityName": f"{X500ATTR}7", + "owner": f"{X500ATTR}32", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "searchGuide": f"{X500ATTR}14", + "certificateRevocationList": f"{X500ATTR}39", + "organizationalUnitName": f"{X500ATTR}11", + "userCertificate": f"{X500ATTR}36", + "preferredDeliveryMethod": f"{X500ATTR}28", + "internationaliSDNNumber": f"{X500ATTR}25", + "uniqueMember": f"{X500ATTR}50", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "enhancedSearchGuide": f"{X500ATTR}47", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "x121Address": f"{X500ATTR}24", + "destinationIndicator": f"{X500ATTR}27", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "surname": f"{X500ATTR}4", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "protocolInformation": f"{X500ATTR}48", + "knowledgeInformation": f"{X500ATTR}2", + "employeeType": f"{NETSCAPE_LDAP}4", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "member": f"{X500ATTR}31", + "streetAddress": f"{X500ATTR}9", + "dmdName": f"{X500ATTR}54", + "postalCode": f"{X500ATTR}17", + "pseudonym": f"{X500ATTR}65", + "dnQualifier": f"{X500ATTR}46", + "crossCertificatePair": f"{X500ATTR}40", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "authorityRevocationList": f"{X500ATTR}38", + "displayName": f"{NETSCAPE_LDAP}241", + "businessCategory": f"{X500ATTR}15", + "serialNumber": f"{X500ATTR}5", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "st": f"{X500ATTR}8", + "carLicense": f"{NETSCAPE_LDAP}1", + "presentationAddress": f"{X500ATTR}29", + "sn": f"{X500ATTR}4", + "domainComponent": f"{UCL_DIR_PILOT}25", }, } diff --git a/example/idp2/idp.py b/example/idp2/idp.py index 6bd85a5e..17013646 100755 --- a/example/idp2/idp.py +++ b/example/idp2/idp.py @@ -1078,8 +1078,8 @@ if __name__ == "__main__": _rot = args.mako_root LOOKUP = TemplateLookup( - directories=[_rot + "templates", _rot + "htdocs"], - module_directory=_rot + "modules", + directories=[f"{_rot}templates", f"{_rot}htdocs"], + module_directory=f"{_rot}modules", input_encoding="utf-8", output_encoding="utf-8", ) diff --git a/example/idp2/idp_uwsgi.py b/example/idp2/idp_uwsgi.py index ab14e0ec..af559d51 100755 --- a/example/idp2/idp_uwsgi.py +++ b/example/idp2/idp_uwsgi.py @@ -975,8 +975,8 @@ if __name__ == "__main__": _rot = args.mako_root LOOKUP = TemplateLookup( - directories=[_rot + "templates", _rot + "htdocs"], - module_directory=_rot + "modules", + directories=[f"{_rot}templates", f"{_rot}htdocs"], + module_directory=f"{_rot}modules", input_encoding="utf-8", output_encoding="utf-8", ) @@ -990,8 +990,8 @@ if __name__ == "__main__": else: _rot = args.mako_root LOOKUP = TemplateLookup( - directories=[_rot + "templates", _rot + "htdocs"], - module_directory=_rot + "modules", + directories=[f"{_rot}templates", f"{_rot}htdocs"], + module_directory=f"{_rot}modules", input_encoding="utf-8", output_encoding="utf-8", ) diff --git a/example/idp2_repoze/idp.py b/example/idp2_repoze/idp.py index d42f8262..cc36e9ec 100755 --- a/example/idp2_repoze/idp.py +++ b/example/idp2_repoze/idp.py @@ -962,8 +962,8 @@ if __name__ == "__main__": _rot = args.mako_root LOOKUP = TemplateLookup( - directories=[_rot + "templates", _rot + "htdocs"], - module_directory=_rot + "modules", + directories=[f"{_rot}templates", f"{_rot}htdocs"], + module_directory=f"{_rot}modules", input_encoding="utf-8", output_encoding="utf-8", ) @@ -977,8 +977,8 @@ if __name__ == "__main__": else: _rot = args.mako_root LOOKUP = TemplateLookup( - directories=[_rot + "templates", _rot + "htdocs"], - module_directory=_rot + "modules", + directories=[f"{_rot}templates", f"{_rot}htdocs"], + module_directory=f"{_rot}modules", input_encoding="utf-8", output_encoding="utf-8", ) diff --git a/example/sp-repoze/attributemaps/saml_uri.py b/example/sp-repoze/attributemaps/saml_uri.py index 245d05ed..a6672559 100644 --- a/example/sp-repoze/attributemaps/saml_uri.py +++ b/example/sp-repoze/attributemaps/saml_uri.py @@ -11,189 +11,189 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57." MAP = { "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", "fro": { - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - EDUPERSON_OID + "1": "eduPersonAffiliation", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NETSCAPE_LDAP + "241": "displayName", - UCL_DIR_PILOT + "37": "associatedDomain", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - X500ATTR_OID + "53": "deltaRevocationList", - X500ATTR_OID + "52": "supportedAlgorithms", - X500ATTR_OID + "51": "houseIdentifier", - X500ATTR_OID + "50": "uniqueMember", - X500ATTR_OID + "19": "physicalDeliveryOfficeName", - X500ATTR_OID + "18": "postOfficeBox", - X500ATTR_OID + "17": "postalCode", - X500ATTR_OID + "16": "postalAddress", - X500ATTR_OID + "15": "businessCategory", - X500ATTR_OID + "14": "searchGuide", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - X500ATTR_OID + "12": "title", - X500ATTR_OID + "11": "ou", - X500ATTR_OID + "10": "o", - X500ATTR_OID + "37": "cACertificate", - X500ATTR_OID + "36": "userCertificate", - X500ATTR_OID + "31": "member", - X500ATTR_OID + "30": "supportedApplicationContext", - X500ATTR_OID + "33": "roleOccupant", - X500ATTR_OID + "32": "owner", - NETSCAPE_LDAP + "1": "carLicense", - PKCS_9 + "1": "email", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "2": "departmentNumber", - X500ATTR_OID + "39": "certificateRevocationList", - X500ATTR_OID + "38": "authorityRevocationList", - NETSCAPE_LDAP + "216": "userPKCS12", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - X500ATTR_OID + "9": "street", - X500ATTR_OID + "8": "st", - NETSCAPE_LDAP + "39": "preferredLanguage", - EDUPERSON_OID + "7": "eduPersonEntitlement", - X500ATTR_OID + "2": "knowledgeInformation", - X500ATTR_OID + "7": "l", - X500ATTR_OID + "6": "c", - X500ATTR_OID + "5": "serialNumber", - X500ATTR_OID + "4": "sn", - UCL_DIR_PILOT + "60": "jpegPhoto", - X500ATTR_OID + "65": "pseudonym", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - X500ATTR_OID + "40": "crossCertificatePair", - X500ATTR_OID + "42": "givenName", - X500ATTR_OID + "43": "initials", - X500ATTR_OID + "44": "generationQualifier", - X500ATTR_OID + "45": "x500UniqueIdentifier", - X500ATTR_OID + "46": "dnQualifier", - X500ATTR_OID + "47": "enhancedSearchGuide", - X500ATTR_OID + "48": "protocolInformation", - X500ATTR_OID + "54": "dmdName", - NETSCAPE_LDAP + "4": "employeeType", - X500ATTR_OID + "22": "teletexTerminalIdentifier", - X500ATTR_OID + "23": "facsimileTelephoneNumber", - X500ATTR_OID + "20": "telephoneNumber", - X500ATTR_OID + "21": "telexNumber", - X500ATTR_OID + "26": "registeredAddress", - X500ATTR_OID + "27": "destinationIndicator", - X500ATTR_OID + "24": "x121Address", - X500ATTR_OID + "25": "internationaliSDNNumber", - X500ATTR_OID + "28": "preferredDeliveryMethod", - X500ATTR_OID + "29": "presentationAddress", - EDUPERSON_OID + "3": "eduPersonOrgDN", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", - UMICH + "57": "labeledURI", - UCL_DIR_PILOT + "1": "uid", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NETSCAPE_LDAP}241": "displayName", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{X500ATTR_OID}53": "deltaRevocationList", + f"{X500ATTR_OID}52": "supportedAlgorithms", + f"{X500ATTR_OID}51": "houseIdentifier", + f"{X500ATTR_OID}50": "uniqueMember", + f"{X500ATTR_OID}19": "physicalDeliveryOfficeName", + f"{X500ATTR_OID}18": "postOfficeBox", + f"{X500ATTR_OID}17": "postalCode", + f"{X500ATTR_OID}16": "postalAddress", + f"{X500ATTR_OID}15": "businessCategory", + f"{X500ATTR_OID}14": "searchGuide", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{X500ATTR_OID}12": "title", + f"{X500ATTR_OID}11": "ou", + f"{X500ATTR_OID}10": "o", + f"{X500ATTR_OID}37": "cACertificate", + f"{X500ATTR_OID}36": "userCertificate", + f"{X500ATTR_OID}31": "member", + f"{X500ATTR_OID}30": "supportedApplicationContext", + f"{X500ATTR_OID}33": "roleOccupant", + f"{X500ATTR_OID}32": "owner", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{PKCS_9}1": "email", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{X500ATTR_OID}39": "certificateRevocationList", + f"{X500ATTR_OID}38": "authorityRevocationList", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{X500ATTR_OID}9": "street", + f"{X500ATTR_OID}8": "st", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{X500ATTR_OID}2": "knowledgeInformation", + f"{X500ATTR_OID}7": "l", + f"{X500ATTR_OID}6": "c", + f"{X500ATTR_OID}5": "serialNumber", + f"{X500ATTR_OID}4": "sn", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{X500ATTR_OID}65": "pseudonym", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{X500ATTR_OID}40": "crossCertificatePair", + f"{X500ATTR_OID}42": "givenName", + f"{X500ATTR_OID}43": "initials", + f"{X500ATTR_OID}44": "generationQualifier", + f"{X500ATTR_OID}45": "x500UniqueIdentifier", + f"{X500ATTR_OID}46": "dnQualifier", + f"{X500ATTR_OID}47": "enhancedSearchGuide", + f"{X500ATTR_OID}48": "protocolInformation", + f"{X500ATTR_OID}54": "dmdName", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{X500ATTR_OID}22": "teletexTerminalIdentifier", + f"{X500ATTR_OID}23": "facsimileTelephoneNumber", + f"{X500ATTR_OID}20": "telephoneNumber", + f"{X500ATTR_OID}21": "telexNumber", + f"{X500ATTR_OID}26": "registeredAddress", + f"{X500ATTR_OID}27": "destinationIndicator", + f"{X500ATTR_OID}24": "x121Address", + f"{X500ATTR_OID}25": "internationaliSDNNumber", + f"{X500ATTR_OID}28": "preferredDeliveryMethod", + f"{X500ATTR_OID}29": "presentationAddress", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", + f"{UMICH}57": "labeledURI", + f"{UCL_DIR_PILOT}1": "uid", }, "to": { - "roleOccupant": X500ATTR_OID + "33", - "gn": X500ATTR_OID + "42", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "title": X500ATTR_OID + "12", - "facsimileTelephoneNumber": X500ATTR_OID + "23", - "mail": UCL_DIR_PILOT + "3", - "postOfficeBox": X500ATTR_OID + "18", - "fax": X500ATTR_OID + "23", - "telephoneNumber": X500ATTR_OID + "20", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "rfc822Mailbox": UCL_DIR_PILOT + "3", - "dc": UCL_DIR_PILOT + "25", - "countryName": X500ATTR_OID + "6", - "emailAddress": PKCS_9 + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "organizationName": X500ATTR_OID + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "registeredAddress": X500ATTR_OID + "26", - "physicalDeliveryOfficeName": X500ATTR_OID + "19", - "associatedDomain": UCL_DIR_PILOT + "37", - "l": X500ATTR_OID + "7", - "stateOrProvinceName": X500ATTR_OID + "8", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "pkcs9email": PKCS_9 + "1", - "givenName": X500ATTR_OID + "42", - "givenname": X500ATTR_OID + "42", - "x500UniqueIdentifier": X500ATTR_OID + "45", - "eduPersonNickname": EDUPERSON_OID + "2", - "houseIdentifier": X500ATTR_OID + "51", - "street": X500ATTR_OID + "9", - "supportedAlgorithms": X500ATTR_OID + "52", - "preferredLanguage": NETSCAPE_LDAP + "39", - "postalAddress": X500ATTR_OID + "16", - "email": PKCS_9 + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "c": X500ATTR_OID + "6", - "teletexTerminalIdentifier": X500ATTR_OID + "22", - "o": X500ATTR_OID + "10", - "cACertificate": X500ATTR_OID + "37", - "telexNumber": X500ATTR_OID + "21", - "ou": X500ATTR_OID + "11", - "initials": X500ATTR_OID + "43", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "deltaRevocationList": X500ATTR_OID + "53", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "supportedApplicationContext": X500ATTR_OID + "30", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "generationQualifier": X500ATTR_OID + "44", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "edupersonprincipalname": EDUPERSON_OID + "6", - "localityName": X500ATTR_OID + "7", - "owner": X500ATTR_OID + "32", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "searchGuide": X500ATTR_OID + "14", - "certificateRevocationList": X500ATTR_OID + "39", - "organizationalUnitName": X500ATTR_OID + "11", - "userCertificate": X500ATTR_OID + "36", - "preferredDeliveryMethod": X500ATTR_OID + "28", - "internationaliSDNNumber": X500ATTR_OID + "25", - "uniqueMember": X500ATTR_OID + "50", - "departmentNumber": NETSCAPE_LDAP + "2", - "enhancedSearchGuide": X500ATTR_OID + "47", - "userPKCS12": NETSCAPE_LDAP + "216", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "x121Address": X500ATTR_OID + "24", - "destinationIndicator": X500ATTR_OID + "27", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "surname": X500ATTR_OID + "4", - "jpegPhoto": UCL_DIR_PILOT + "60", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "edupersonscopedaffiliation": EDUPERSON_OID + "9", - "protocolInformation": X500ATTR_OID + "48", - "knowledgeInformation": X500ATTR_OID + "2", - "employeeType": NETSCAPE_LDAP + "4", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "member": X500ATTR_OID + "31", - "streetAddress": X500ATTR_OID + "9", - "dmdName": X500ATTR_OID + "54", - "postalCode": X500ATTR_OID + "17", - "pseudonym": X500ATTR_OID + "65", - "dnQualifier": X500ATTR_OID + "46", - "crossCertificatePair": X500ATTR_OID + "40", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "authorityRevocationList": X500ATTR_OID + "38", - "displayName": NETSCAPE_LDAP + "241", - "businessCategory": X500ATTR_OID + "15", - "serialNumber": X500ATTR_OID + "5", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "st": X500ATTR_OID + "8", - "carLicense": NETSCAPE_LDAP + "1", - "presentationAddress": X500ATTR_OID + "29", - "sn": X500ATTR_OID + "4", - "domainComponent": UCL_DIR_PILOT + "25", - "labeledURI": UMICH + "57", - "uid": UCL_DIR_PILOT + "1", + "roleOccupant": f"{X500ATTR_OID}33", + "gn": f"{X500ATTR_OID}42", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "title": f"{X500ATTR_OID}12", + "facsimileTelephoneNumber": f"{X500ATTR_OID}23", + "mail": f"{UCL_DIR_PILOT}3", + "postOfficeBox": f"{X500ATTR_OID}18", + "fax": f"{X500ATTR_OID}23", + "telephoneNumber": f"{X500ATTR_OID}20", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "rfc822Mailbox": f"{UCL_DIR_PILOT}3", + "dc": f"{UCL_DIR_PILOT}25", + "countryName": f"{X500ATTR_OID}6", + "emailAddress": f"{PKCS_9}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "organizationName": f"{X500ATTR_OID}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "registeredAddress": f"{X500ATTR_OID}26", + "physicalDeliveryOfficeName": f"{X500ATTR_OID}19", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "l": f"{X500ATTR_OID}7", + "stateOrProvinceName": f"{X500ATTR_OID}8", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "pkcs9email": f"{PKCS_9}1", + "givenName": f"{X500ATTR_OID}42", + "givenname": f"{X500ATTR_OID}42", + "x500UniqueIdentifier": f"{X500ATTR_OID}45", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "houseIdentifier": f"{X500ATTR_OID}51", + "street": f"{X500ATTR_OID}9", + "supportedAlgorithms": f"{X500ATTR_OID}52", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "postalAddress": f"{X500ATTR_OID}16", + "email": f"{PKCS_9}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "c": f"{X500ATTR_OID}6", + "teletexTerminalIdentifier": f"{X500ATTR_OID}22", + "o": f"{X500ATTR_OID}10", + "cACertificate": f"{X500ATTR_OID}37", + "telexNumber": f"{X500ATTR_OID}21", + "ou": f"{X500ATTR_OID}11", + "initials": f"{X500ATTR_OID}43", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "deltaRevocationList": f"{X500ATTR_OID}53", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "supportedApplicationContext": f"{X500ATTR_OID}30", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "generationQualifier": f"{X500ATTR_OID}44", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "edupersonprincipalname": f"{EDUPERSON_OID}6", + "localityName": f"{X500ATTR_OID}7", + "owner": f"{X500ATTR_OID}32", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "searchGuide": f"{X500ATTR_OID}14", + "certificateRevocationList": f"{X500ATTR_OID}39", + "organizationalUnitName": f"{X500ATTR_OID}11", + "userCertificate": f"{X500ATTR_OID}36", + "preferredDeliveryMethod": f"{X500ATTR_OID}28", + "internationaliSDNNumber": f"{X500ATTR_OID}25", + "uniqueMember": f"{X500ATTR_OID}50", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "enhancedSearchGuide": f"{X500ATTR_OID}47", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "x121Address": f"{X500ATTR_OID}24", + "destinationIndicator": f"{X500ATTR_OID}27", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "surname": f"{X500ATTR_OID}4", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "edupersonscopedaffiliation": f"{EDUPERSON_OID}9", + "protocolInformation": f"{X500ATTR_OID}48", + "knowledgeInformation": f"{X500ATTR_OID}2", + "employeeType": f"{NETSCAPE_LDAP}4", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "member": f"{X500ATTR_OID}31", + "streetAddress": f"{X500ATTR_OID}9", + "dmdName": f"{X500ATTR_OID}54", + "postalCode": f"{X500ATTR_OID}17", + "pseudonym": f"{X500ATTR_OID}65", + "dnQualifier": f"{X500ATTR_OID}46", + "crossCertificatePair": f"{X500ATTR_OID}40", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "authorityRevocationList": f"{X500ATTR_OID}38", + "displayName": f"{NETSCAPE_LDAP}241", + "businessCategory": f"{X500ATTR_OID}15", + "serialNumber": f"{X500ATTR_OID}5", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "st": f"{X500ATTR_OID}8", + "carLicense": f"{NETSCAPE_LDAP}1", + "presentationAddress": f"{X500ATTR_OID}29", + "sn": f"{X500ATTR_OID}4", + "domainComponent": f"{UCL_DIR_PILOT}25", + "labeledURI": f"{UMICH}57", + "uid": f"{UCL_DIR_PILOT}1", }, } diff --git a/example/sp-repoze/attributemaps/shibboleth_uri.py b/example/sp-repoze/attributemaps/shibboleth_uri.py index 30b31503..992a2219 100644 --- a/example/sp-repoze/attributemaps/shibboleth_uri.py +++ b/example/sp-repoze/attributemaps/shibboleth_uri.py @@ -9,182 +9,182 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57." MAP = { "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri", "fro": { - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - EDUPERSON_OID + "1": "eduPersonAffiliation", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NETSCAPE_LDAP + "241": "displayName", - UCL_DIR_PILOT + "37": "associatedDomain", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - X500ATTR + "53": "deltaRevocationList", - X500ATTR + "52": "supportedAlgorithms", - X500ATTR + "51": "houseIdentifier", - X500ATTR + "50": "uniqueMember", - X500ATTR + "19": "physicalDeliveryOfficeName", - X500ATTR + "18": "postOfficeBox", - X500ATTR + "17": "postalCode", - X500ATTR + "16": "postalAddress", - X500ATTR + "15": "businessCategory", - X500ATTR + "14": "searchGuide", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - X500ATTR + "12": "title", - X500ATTR + "11": "ou", - X500ATTR + "10": "o", - X500ATTR + "37": "cACertificate", - X500ATTR + "36": "userCertificate", - X500ATTR + "31": "member", - X500ATTR + "30": "supportedApplicationContext", - X500ATTR + "33": "roleOccupant", - X500ATTR + "32": "owner", - NETSCAPE_LDAP + "1": "carLicense", - PKCS_9 + "1": "email", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "2": "departmentNumber", - X500ATTR + "39": "certificateRevocationList", - X500ATTR + "38": "authorityRevocationList", - NETSCAPE_LDAP + "216": "userPKCS12", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - X500ATTR + "9": "street", - X500ATTR + "8": "st", - NETSCAPE_LDAP + "39": "preferredLanguage", - EDUPERSON_OID + "7": "eduPersonEntitlement", - X500ATTR + "2": "knowledgeInformation", - X500ATTR + "7": "l", - X500ATTR + "6": "c", - X500ATTR + "5": "serialNumber", - X500ATTR + "4": "sn", - UCL_DIR_PILOT + "60": "jpegPhoto", - X500ATTR + "65": "pseudonym", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - X500ATTR + "40": "crossCertificatePair", - X500ATTR + "42": "givenName", - X500ATTR + "43": "initials", - X500ATTR + "44": "generationQualifier", - X500ATTR + "45": "x500UniqueIdentifier", - X500ATTR + "46": "dnQualifier", - X500ATTR + "47": "enhancedSearchGuide", - X500ATTR + "48": "protocolInformation", - X500ATTR + "54": "dmdName", - NETSCAPE_LDAP + "4": "employeeType", - X500ATTR + "22": "teletexTerminalIdentifier", - X500ATTR + "23": "facsimileTelephoneNumber", - X500ATTR + "20": "telephoneNumber", - X500ATTR + "21": "telexNumber", - X500ATTR + "26": "registeredAddress", - X500ATTR + "27": "destinationIndicator", - X500ATTR + "24": "x121Address", - X500ATTR + "25": "internationaliSDNNumber", - X500ATTR + "28": "preferredDeliveryMethod", - X500ATTR + "29": "presentationAddress", - EDUPERSON_OID + "3": "eduPersonOrgDN", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NETSCAPE_LDAP}241": "displayName", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{X500ATTR}53": "deltaRevocationList", + f"{X500ATTR}52": "supportedAlgorithms", + f"{X500ATTR}51": "houseIdentifier", + f"{X500ATTR}50": "uniqueMember", + f"{X500ATTR}19": "physicalDeliveryOfficeName", + f"{X500ATTR}18": "postOfficeBox", + f"{X500ATTR}17": "postalCode", + f"{X500ATTR}16": "postalAddress", + f"{X500ATTR}15": "businessCategory", + f"{X500ATTR}14": "searchGuide", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{X500ATTR}12": "title", + f"{X500ATTR}11": "ou", + f"{X500ATTR}10": "o", + f"{X500ATTR}37": "cACertificate", + f"{X500ATTR}36": "userCertificate", + f"{X500ATTR}31": "member", + f"{X500ATTR}30": "supportedApplicationContext", + f"{X500ATTR}33": "roleOccupant", + f"{X500ATTR}32": "owner", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{PKCS_9}1": "email", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{X500ATTR}39": "certificateRevocationList", + f"{X500ATTR}38": "authorityRevocationList", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{X500ATTR}9": "street", + f"{X500ATTR}8": "st", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{X500ATTR}2": "knowledgeInformation", + f"{X500ATTR}7": "l", + f"{X500ATTR}6": "c", + f"{X500ATTR}5": "serialNumber", + f"{X500ATTR}4": "sn", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{X500ATTR}65": "pseudonym", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{X500ATTR}40": "crossCertificatePair", + f"{X500ATTR}42": "givenName", + f"{X500ATTR}43": "initials", + f"{X500ATTR}44": "generationQualifier", + f"{X500ATTR}45": "x500UniqueIdentifier", + f"{X500ATTR}46": "dnQualifier", + f"{X500ATTR}47": "enhancedSearchGuide", + f"{X500ATTR}48": "protocolInformation", + f"{X500ATTR}54": "dmdName", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{X500ATTR}22": "teletexTerminalIdentifier", + f"{X500ATTR}23": "facsimileTelephoneNumber", + f"{X500ATTR}20": "telephoneNumber", + f"{X500ATTR}21": "telexNumber", + f"{X500ATTR}26": "registeredAddress", + f"{X500ATTR}27": "destinationIndicator", + f"{X500ATTR}24": "x121Address", + f"{X500ATTR}25": "internationaliSDNNumber", + f"{X500ATTR}28": "preferredDeliveryMethod", + f"{X500ATTR}29": "presentationAddress", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", }, "to": { - "roleOccupant": X500ATTR + "33", - "gn": X500ATTR + "42", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "title": X500ATTR + "12", - "facsimileTelephoneNumber": X500ATTR + "23", - "mail": UCL_DIR_PILOT + "3", - "postOfficeBox": X500ATTR + "18", - "fax": X500ATTR + "23", - "telephoneNumber": X500ATTR + "20", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "rfc822Mailbox": UCL_DIR_PILOT + "3", - "dc": UCL_DIR_PILOT + "25", - "countryName": X500ATTR + "6", - "emailAddress": PKCS_9 + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "organizationName": X500ATTR + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "registeredAddress": X500ATTR + "26", - "physicalDeliveryOfficeName": X500ATTR + "19", - "associatedDomain": UCL_DIR_PILOT + "37", - "l": X500ATTR + "7", - "stateOrProvinceName": X500ATTR + "8", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "pkcs9email": PKCS_9 + "1", - "givenName": X500ATTR + "42", - "x500UniqueIdentifier": X500ATTR + "45", - "eduPersonNickname": EDUPERSON_OID + "2", - "houseIdentifier": X500ATTR + "51", - "street": X500ATTR + "9", - "supportedAlgorithms": X500ATTR + "52", - "preferredLanguage": NETSCAPE_LDAP + "39", - "postalAddress": X500ATTR + "16", - "email": PKCS_9 + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "c": X500ATTR + "6", - "teletexTerminalIdentifier": X500ATTR + "22", - "o": X500ATTR + "10", - "cACertificate": X500ATTR + "37", - "telexNumber": X500ATTR + "21", - "ou": X500ATTR + "11", - "initials": X500ATTR + "43", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "deltaRevocationList": X500ATTR + "53", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "supportedApplicationContext": X500ATTR + "30", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "generationQualifier": X500ATTR + "44", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "localityName": X500ATTR + "7", - "owner": X500ATTR + "32", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "searchGuide": X500ATTR + "14", - "certificateRevocationList": X500ATTR + "39", - "organizationalUnitName": X500ATTR + "11", - "userCertificate": X500ATTR + "36", - "preferredDeliveryMethod": X500ATTR + "28", - "internationaliSDNNumber": X500ATTR + "25", - "uniqueMember": X500ATTR + "50", - "departmentNumber": NETSCAPE_LDAP + "2", - "enhancedSearchGuide": X500ATTR + "47", - "userPKCS12": NETSCAPE_LDAP + "216", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "x121Address": X500ATTR + "24", - "destinationIndicator": X500ATTR + "27", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "surname": X500ATTR + "4", - "jpegPhoto": UCL_DIR_PILOT + "60", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "protocolInformation": X500ATTR + "48", - "knowledgeInformation": X500ATTR + "2", - "employeeType": NETSCAPE_LDAP + "4", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "member": X500ATTR + "31", - "streetAddress": X500ATTR + "9", - "dmdName": X500ATTR + "54", - "postalCode": X500ATTR + "17", - "pseudonym": X500ATTR + "65", - "dnQualifier": X500ATTR + "46", - "crossCertificatePair": X500ATTR + "40", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "authorityRevocationList": X500ATTR + "38", - "displayName": NETSCAPE_LDAP + "241", - "businessCategory": X500ATTR + "15", - "serialNumber": X500ATTR + "5", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "st": X500ATTR + "8", - "carLicense": NETSCAPE_LDAP + "1", - "presentationAddress": X500ATTR + "29", - "sn": X500ATTR + "4", - "domainComponent": UCL_DIR_PILOT + "25", + "roleOccupant": f"{X500ATTR}33", + "gn": f"{X500ATTR}42", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "title": f"{X500ATTR}12", + "facsimileTelephoneNumber": f"{X500ATTR}23", + "mail": f"{UCL_DIR_PILOT}3", + "postOfficeBox": f"{X500ATTR}18", + "fax": f"{X500ATTR}23", + "telephoneNumber": f"{X500ATTR}20", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "rfc822Mailbox": f"{UCL_DIR_PILOT}3", + "dc": f"{UCL_DIR_PILOT}25", + "countryName": f"{X500ATTR}6", + "emailAddress": f"{PKCS_9}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "organizationName": f"{X500ATTR}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "registeredAddress": f"{X500ATTR}26", + "physicalDeliveryOfficeName": f"{X500ATTR}19", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "l": f"{X500ATTR}7", + "stateOrProvinceName": f"{X500ATTR}8", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "pkcs9email": f"{PKCS_9}1", + "givenName": f"{X500ATTR}42", + "x500UniqueIdentifier": f"{X500ATTR}45", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "houseIdentifier": f"{X500ATTR}51", + "street": f"{X500ATTR}9", + "supportedAlgorithms": f"{X500ATTR}52", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "postalAddress": f"{X500ATTR}16", + "email": f"{PKCS_9}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "c": f"{X500ATTR}6", + "teletexTerminalIdentifier": f"{X500ATTR}22", + "o": f"{X500ATTR}10", + "cACertificate": f"{X500ATTR}37", + "telexNumber": f"{X500ATTR}21", + "ou": f"{X500ATTR}11", + "initials": f"{X500ATTR}43", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "deltaRevocationList": f"{X500ATTR}53", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "supportedApplicationContext": f"{X500ATTR}30", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "generationQualifier": f"{X500ATTR}44", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "localityName": f"{X500ATTR}7", + "owner": f"{X500ATTR}32", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "searchGuide": f"{X500ATTR}14", + "certificateRevocationList": f"{X500ATTR}39", + "organizationalUnitName": f"{X500ATTR}11", + "userCertificate": f"{X500ATTR}36", + "preferredDeliveryMethod": f"{X500ATTR}28", + "internationaliSDNNumber": f"{X500ATTR}25", + "uniqueMember": f"{X500ATTR}50", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "enhancedSearchGuide": f"{X500ATTR}47", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "x121Address": f"{X500ATTR}24", + "destinationIndicator": f"{X500ATTR}27", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "surname": f"{X500ATTR}4", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "protocolInformation": f"{X500ATTR}48", + "knowledgeInformation": f"{X500ATTR}2", + "employeeType": f"{NETSCAPE_LDAP}4", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "member": f"{X500ATTR}31", + "streetAddress": f"{X500ATTR}9", + "dmdName": f"{X500ATTR}54", + "postalCode": f"{X500ATTR}17", + "pseudonym": f"{X500ATTR}65", + "dnQualifier": f"{X500ATTR}46", + "crossCertificatePair": f"{X500ATTR}40", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "authorityRevocationList": f"{X500ATTR}38", + "displayName": f"{NETSCAPE_LDAP}241", + "businessCategory": f"{X500ATTR}15", + "serialNumber": f"{X500ATTR}5", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "st": f"{X500ATTR}8", + "carLicense": f"{NETSCAPE_LDAP}1", + "presentationAddress": f"{X500ATTR}29", + "sn": f"{X500ATTR}4", + "domainComponent": f"{UCL_DIR_PILOT}25", }, } diff --git a/example/sp-repoze/sp.py b/example/sp-repoze/sp.py index d0429289..1c837962 100755 --- a/example/sp-repoze/sp.py +++ b/example/sp-repoze/sp.py @@ -209,7 +209,7 @@ def metadata(environ, start_response): if path[-1] != "/": path += "/" metadata = create_metadata_string( - path + "sp_conf.py", None, args.valid, args.cert, args.keyfile, args.id, args.name, args.sign + f"{path}sp_conf.py", None, args.valid, args.cert, args.keyfile, args.id, args.name, args.sign ) start_response("200 OK", [("Content-Type", "text/xml")]) return metadata diff --git a/example/sp-wsgi/sp.py b/example/sp-wsgi/sp.py index 35061236..926ea036 100755 --- a/example/sp-wsgi/sp.py +++ b/example/sp-wsgi/sp.py @@ -797,7 +797,7 @@ def metadata(environ, start_response): if path[-1] != "/": path += "/" metadata = create_metadata_string( - path + "sp_conf.py", + f"{path}sp_conf.py", None, _args.valid, _args.cert, diff --git a/script/utility/run_list_of_tests.py b/script/utility/run_list_of_tests.py index 08abb9ce..2b01781a 100755 --- a/script/utility/run_list_of_tests.py +++ b/script/utility/run_list_of_tests.py @@ -5,6 +5,6 @@ from subprocess import call for line in fileinput.input(): - cmd = "./run_oper.sh " + line.rstrip() - print("executing " + cmd) + cmd = f"./run_oper.sh {line.rstrip()}" + print(f"executing {cmd}") call(cmd, shell=True) diff --git a/src/saml2/__init__.py b/src/saml2/__init__.py index c5142c55..72352caa 100644 --- a/src/saml2/__init__.py +++ b/src/saml2/__init__.py @@ -628,7 +628,7 @@ class SamlBase(ExtensionContainer): uri_map = {} for prefix, uri in prefix_map.items(): uri_map[uri] = prefix - elem.set("xmlns:" + prefix, uri) + elem.set(f"xmlns:{prefix}", uri) # fixup all elements in the tree memo = {} @@ -644,7 +644,7 @@ class SamlBase(ExtensionContainer): return uri, tag = name[1:].split("}") if uri in uri_map: - new_name = uri_map[uri] + ":" + tag + new_name = f"{uri_map[uri]}:{tag}" memo[name] = new_name return new_name diff --git a/src/saml2/attributemaps/adfs_v1x.py b/src/saml2/attributemaps/adfs_v1x.py index 69f99fbd..0e405bfb 100644 --- a/src/saml2/attributemaps/adfs_v1x.py +++ b/src/saml2/attributemaps/adfs_v1x.py @@ -4,15 +4,15 @@ CLAIMS = "http://schemas.xmlsoap.org/claims/" MAP = { "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified", "fro": { - CLAIMS + "commonname": "commonName", - CLAIMS + "emailaddress": "emailAddress", - CLAIMS + "group": "group", - CLAIMS + "upn": "upn", + f"{CLAIMS}commonname": "commonName", + f"{CLAIMS}emailaddress": "emailAddress", + f"{CLAIMS}group": "group", + f"{CLAIMS}upn": "upn", }, "to": { - "commonName": CLAIMS + "commonname", - "emailAddress": CLAIMS + "emailaddress", - "group": CLAIMS + "group", - "upn": CLAIMS + "upn", + "commonName": f"{CLAIMS}commonname", + "emailAddress": f"{CLAIMS}emailaddress", + "group": f"{CLAIMS}group", + "upn": f"{CLAIMS}upn", }, } diff --git a/src/saml2/attributemaps/adfs_v20.py b/src/saml2/attributemaps/adfs_v20.py index ab2e3088..20a00675 100644 --- a/src/saml2/attributemaps/adfs_v20.py +++ b/src/saml2/attributemaps/adfs_v20.py @@ -7,43 +7,43 @@ ORG_WS_CLAIMS = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/" MAP = { "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified", "fro": { - CLAIMS + "commonname": "commonName", - CLAIMS + "group": "group", - COM_WS_CLAIMS + "denyonlysid": "denyOnlySid", - MS_CLAIMS + "authenticationmethod": "authenticationMethod", - MS_CLAIMS + "denyonlyprimarygroupsid": "denyOnlyPrimaryGroupSid", - MS_CLAIMS + "denyonlyprimarysid": "denyOnlyPrimarySid", - MS_CLAIMS + "groupsid": "groupSid", - MS_CLAIMS + "primarygroupsid": "primaryGroupSid", - MS_CLAIMS + "primarysid": "primarySid", - MS_CLAIMS + "role": "role", - MS_CLAIMS + "windowsaccountname": "windowsAccountName", - ORG_WS_CLAIMS + "emailaddress": "emailAddress", - ORG_WS_CLAIMS + "givenname": "givenName", - ORG_WS_CLAIMS + "name": "name", - ORG_WS_CLAIMS + "nameidentifier": "nameId", - ORG_WS_CLAIMS + "privatepersonalidentifier": "privatePersonalId", - ORG_WS_CLAIMS + "surname": "surname", - ORG_WS_CLAIMS + "upn": "upn", + f"{CLAIMS}commonname": "commonName", + f"{CLAIMS}group": "group", + f"{COM_WS_CLAIMS}denyonlysid": "denyOnlySid", + f"{MS_CLAIMS}authenticationmethod": "authenticationMethod", + f"{MS_CLAIMS}denyonlyprimarygroupsid": "denyOnlyPrimaryGroupSid", + f"{MS_CLAIMS}denyonlyprimarysid": "denyOnlyPrimarySid", + f"{MS_CLAIMS}groupsid": "groupSid", + f"{MS_CLAIMS}primarygroupsid": "primaryGroupSid", + f"{MS_CLAIMS}primarysid": "primarySid", + f"{MS_CLAIMS}role": "role", + f"{MS_CLAIMS}windowsaccountname": "windowsAccountName", + f"{ORG_WS_CLAIMS}emailaddress": "emailAddress", + f"{ORG_WS_CLAIMS}givenname": "givenName", + f"{ORG_WS_CLAIMS}name": "name", + f"{ORG_WS_CLAIMS}nameidentifier": "nameId", + f"{ORG_WS_CLAIMS}privatepersonalidentifier": "privatePersonalId", + f"{ORG_WS_CLAIMS}surname": "surname", + f"{ORG_WS_CLAIMS}upn": "upn", }, "to": { - "authenticationMethod": MS_CLAIMS + "authenticationmethod", - "commonName": CLAIMS + "commonname", - "denyOnlyPrimaryGroupSid": MS_CLAIMS + "denyonlyprimarygroupsid", - "denyOnlyPrimarySid": MS_CLAIMS + "denyonlyprimarysid", - "denyOnlySid": COM_WS_CLAIMS + "denyonlysid", - "emailAddress": ORG_WS_CLAIMS + "emailaddress", - "givenName": ORG_WS_CLAIMS + "givenname", - "group": CLAIMS + "group", - "groupSid": MS_CLAIMS + "groupsid", - "name": ORG_WS_CLAIMS + "name", - "nameId": ORG_WS_CLAIMS + "nameidentifier", - "primaryGroupSid": MS_CLAIMS + "primarygroupsid", - "primarySid": MS_CLAIMS + "primarysid", - "privatePersonalId": ORG_WS_CLAIMS + "privatepersonalidentifier", - "role": MS_CLAIMS + "role", - "surname": ORG_WS_CLAIMS + "surname", - "upn": ORG_WS_CLAIMS + "upn", - "windowsAccountName": MS_CLAIMS + "windowsaccountname", + "authenticationMethod": f"{MS_CLAIMS}authenticationmethod", + "commonName": f"{CLAIMS}commonname", + "denyOnlyPrimaryGroupSid": f"{MS_CLAIMS}denyonlyprimarygroupsid", + "denyOnlyPrimarySid": f"{MS_CLAIMS}denyonlyprimarysid", + "denyOnlySid": f"{COM_WS_CLAIMS}denyonlysid", + "emailAddress": f"{ORG_WS_CLAIMS}emailaddress", + "givenName": f"{ORG_WS_CLAIMS}givenname", + "group": f"{CLAIMS}group", + "groupSid": f"{MS_CLAIMS}groupsid", + "name": f"{ORG_WS_CLAIMS}name", + "nameId": f"{ORG_WS_CLAIMS}nameidentifier", + "primaryGroupSid": f"{MS_CLAIMS}primarygroupsid", + "primarySid": f"{MS_CLAIMS}primarysid", + "privatePersonalId": f"{ORG_WS_CLAIMS}privatepersonalidentifier", + "role": f"{MS_CLAIMS}role", + "surname": f"{ORG_WS_CLAIMS}surname", + "upn": f"{ORG_WS_CLAIMS}upn", + "windowsAccountName": f"{MS_CLAIMS}windowsaccountname", }, } diff --git a/src/saml2/attributemaps/basic.py b/src/saml2/attributemaps/basic.py index 9ad8fb54..995dbd43 100644 --- a/src/saml2/attributemaps/basic.py +++ b/src/saml2/attributemaps/basic.py @@ -4,339 +4,339 @@ DEF = "urn:mace:dir:attribute-def:" MAP = { "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic", "fro": { - DEF + "aRecord": "aRecord", - DEF + "aliasedEntryName": "aliasedEntryName", - DEF + "aliasedObjectName": "aliasedObjectName", - DEF + "associatedDomain": "associatedDomain", - DEF + "associatedName": "associatedName", - DEF + "audio": "audio", - DEF + "authorityRevocationList": "authorityRevocationList", - DEF + "buildingName": "buildingName", - DEF + "businessCategory": "businessCategory", - DEF + "c": "c", - DEF + "cACertificate": "cACertificate", - DEF + "cNAMERecord": "cNAMERecord", - DEF + "carLicense": "carLicense", - DEF + "certificateRevocationList": "certificateRevocationList", - DEF + "cn": "cn", - DEF + "co": "co", - DEF + "commonName": "commonName", - DEF + "countryName": "countryName", - DEF + "crossCertificatePair": "crossCertificatePair", - DEF + "dITRedirect": "dITRedirect", - DEF + "dSAQuality": "dSAQuality", - DEF + "dc": "dc", - DEF + "deltaRevocationList": "deltaRevocationList", - DEF + "departmentNumber": "departmentNumber", - DEF + "description": "description", - DEF + "destinationIndicator": "destinationIndicator", - DEF + "displayName": "displayName", - DEF + "distinguishedName": "distinguishedName", - DEF + "dmdName": "dmdName", - DEF + "dnQualifier": "dnQualifier", - DEF + "documentAuthor": "documentAuthor", - DEF + "documentIdentifier": "documentIdentifier", - DEF + "documentLocation": "documentLocation", - DEF + "documentPublisher": "documentPublisher", - DEF + "documentTitle": "documentTitle", - DEF + "documentVersion": "documentVersion", - DEF + "domainComponent": "domainComponent", - DEF + "drink": "drink", - DEF + "eduOrgHomePageURI": "eduOrgHomePageURI", - DEF + "eduOrgIdentityAuthNPolicyURI": "eduOrgIdentityAuthNPolicyURI", - DEF + "eduOrgLegalName": "eduOrgLegalName", - DEF + "eduOrgSuperiorURI": "eduOrgSuperiorURI", - DEF + "eduOrgWhitePagesURI": "eduOrgWhitePagesURI", - DEF + "eduCourseOffering": "eduCourseOffering", - DEF + "eduCourseMember": "eduCourseMember", - DEF + "eduPersonAffiliation": "eduPersonAffiliation", - DEF + "eduPersonEntitlement": "eduPersonEntitlement", - DEF + "eduPersonNickname": "eduPersonNickname", - DEF + "eduPersonOrgDN": "eduPersonOrgDN", - DEF + "eduPersonOrgUnitDN": "eduPersonOrgUnitDN", - DEF + "eduPersonPrimaryAffiliation": "eduPersonPrimaryAffiliation", - DEF + "eduPersonPrimaryOrgUnitDN": "eduPersonPrimaryOrgUnitDN", - DEF + "eduPersonPrincipalName": "eduPersonPrincipalName", - DEF + "eduPersonPrincipalNamePrior": "eduPersonPrincipalNamePrior", - DEF + "eduPersonScopedAffiliation": "eduPersonScopedAffiliation", - DEF + "eduPersonTargetedID": "eduPersonTargetedID", - DEF + "eduPersonAssurance": "eduPersonAssurance", - DEF + "eduPersonUniqueId": "eduPersonUniqueId", - DEF + "eduPersonOrcid": "eduPersonOrcid", - DEF + "email": "email", - DEF + "emailAddress": "emailAddress", - DEF + "employeeNumber": "employeeNumber", - DEF + "employeeType": "employeeType", - DEF + "enhancedSearchGuide": "enhancedSearchGuide", - DEF + "facsimileTelephoneNumber": "facsimileTelephoneNumber", - DEF + "favouriteDrink": "favouriteDrink", - DEF + "fax": "fax", - DEF + "federationFeideSchemaVersion": "federationFeideSchemaVersion", - DEF + "friendlyCountryName": "friendlyCountryName", - DEF + "generationQualifier": "generationQualifier", - DEF + "givenName": "givenName", - DEF + "gn": "gn", - DEF + "homePhone": "homePhone", - DEF + "homePostalAddress": "homePostalAddress", - DEF + "homeTelephoneNumber": "homeTelephoneNumber", - DEF + "host": "host", - DEF + "houseIdentifier": "houseIdentifier", - DEF + "info": "info", - DEF + "initials": "initials", - DEF + "internationaliSDNNumber": "internationaliSDNNumber", - DEF + "isMemberOf": "isMemberOf", - DEF + "janetMailbox": "janetMailbox", - DEF + "jpegPhoto": "jpegPhoto", - DEF + "knowledgeInformation": "knowledgeInformation", - DEF + "l": "l", - DEF + "labeledURI": "labeledURI", - DEF + "localityName": "localityName", - DEF + "mDRecord": "mDRecord", - DEF + "mXRecord": "mXRecord", - DEF + "mail": "mail", - DEF + "mailPreferenceOption": "mailPreferenceOption", - DEF + "manager": "manager", - DEF + "member": "member", - DEF + "mobile": "mobile", - DEF + "mobileTelephoneNumber": "mobileTelephoneNumber", - DEF + "nSRecord": "nSRecord", - DEF + "name": "name", - DEF + "norEduOrgAcronym": "norEduOrgAcronym", - DEF + "norEduOrgNIN": "norEduOrgNIN", - DEF + "norEduOrgSchemaVersion": "norEduOrgSchemaVersion", - DEF + "norEduOrgUniqueIdentifier": "norEduOrgUniqueIdentifier", - DEF + "norEduOrgUniqueNumber": "norEduOrgUniqueNumber", - DEF + "norEduOrgUnitUniqueIdentifier": "norEduOrgUnitUniqueIdentifier", - DEF + "norEduOrgUnitUniqueNumber": "norEduOrgUnitUniqueNumber", - DEF + "norEduPersonBirthDate": "norEduPersonBirthDate", - DEF + "norEduPersonLIN": "norEduPersonLIN", - DEF + "norEduPersonNIN": "norEduPersonNIN", - DEF + "o": "o", - DEF + "objectClass": "objectClass", - DEF + "organizationName": "organizationName", - DEF + "organizationalStatus": "organizationalStatus", - DEF + "organizationalUnitName": "organizationalUnitName", - DEF + "otherMailbox": "otherMailbox", - DEF + "ou": "ou", - DEF + "owner": "owner", - DEF + "pager": "pager", - DEF + "pagerTelephoneNumber": "pagerTelephoneNumber", - DEF + "personalSignature": "personalSignature", - DEF + "personalTitle": "personalTitle", - DEF + "photo": "photo", - DEF + "physicalDeliveryOfficeName": "physicalDeliveryOfficeName", - DEF + "pkcs9email": "pkcs9email", - DEF + "postOfficeBox": "postOfficeBox", - DEF + "postalAddress": "postalAddress", - DEF + "postalCode": "postalCode", - DEF + "preferredDeliveryMethod": "preferredDeliveryMethod", - DEF + "preferredLanguage": "preferredLanguage", - DEF + "presentationAddress": "presentationAddress", - DEF + "protocolInformation": "protocolInformation", - DEF + "pseudonym": "pseudonym", - DEF + "registeredAddress": "registeredAddress", - DEF + "rfc822Mailbox": "rfc822Mailbox", - DEF + "roleOccupant": "roleOccupant", - DEF + "roomNumber": "roomNumber", - DEF + "sOARecord": "sOARecord", - DEF + "searchGuide": "searchGuide", - DEF + "secretary": "secretary", - DEF + "seeAlso": "seeAlso", - DEF + "serialNumber": "serialNumber", - DEF + "singleLevelQuality": "singleLevelQuality", - DEF + "sn": "sn", - DEF + "st": "st", - DEF + "stateOrProvinceName": "stateOrProvinceName", - DEF + "street": "street", - DEF + "streetAddress": "streetAddress", - DEF + "subtreeMaximumQuality": "subtreeMaximumQuality", - DEF + "subtreeMinimumQuality": "subtreeMinimumQuality", - DEF + "supportedAlgorithms": "supportedAlgorithms", - DEF + "supportedApplicationContext": "supportedApplicationContext", - DEF + "surname": "surname", - DEF + "telephoneNumber": "telephoneNumber", - DEF + "teletexTerminalIdentifier": "teletexTerminalIdentifier", - DEF + "telexNumber": "telexNumber", - DEF + "textEncodedORAddress": "textEncodedORAddress", - DEF + "title": "title", - DEF + "uid": "uid", - DEF + "uniqueIdentifier": "uniqueIdentifier", - DEF + "uniqueMember": "uniqueMember", - DEF + "userCertificate": "userCertificate", - DEF + "userClass": "userClass", - DEF + "userPKCS12": "userPKCS12", - DEF + "userPassword": "userPassword", - DEF + "userSMIMECertificate": "userSMIMECertificate", - DEF + "userid": "userid", - DEF + "x121Address": "x121Address", - DEF + "x500UniqueIdentifier": "x500UniqueIdentifier", + f"{DEF}aRecord": "aRecord", + f"{DEF}aliasedEntryName": "aliasedEntryName", + f"{DEF}aliasedObjectName": "aliasedObjectName", + f"{DEF}associatedDomain": "associatedDomain", + f"{DEF}associatedName": "associatedName", + f"{DEF}audio": "audio", + f"{DEF}authorityRevocationList": "authorityRevocationList", + f"{DEF}buildingName": "buildingName", + f"{DEF}businessCategory": "businessCategory", + f"{DEF}c": "c", + f"{DEF}cACertificate": "cACertificate", + f"{DEF}cNAMERecord": "cNAMERecord", + f"{DEF}carLicense": "carLicense", + f"{DEF}certificateRevocationList": "certificateRevocationList", + f"{DEF}cn": "cn", + f"{DEF}co": "co", + f"{DEF}commonName": "commonName", + f"{DEF}countryName": "countryName", + f"{DEF}crossCertificatePair": "crossCertificatePair", + f"{DEF}dITRedirect": "dITRedirect", + f"{DEF}dSAQuality": "dSAQuality", + f"{DEF}dc": "dc", + f"{DEF}deltaRevocationList": "deltaRevocationList", + f"{DEF}departmentNumber": "departmentNumber", + f"{DEF}description": "description", + f"{DEF}destinationIndicator": "destinationIndicator", + f"{DEF}displayName": "displayName", + f"{DEF}distinguishedName": "distinguishedName", + f"{DEF}dmdName": "dmdName", + f"{DEF}dnQualifier": "dnQualifier", + f"{DEF}documentAuthor": "documentAuthor", + f"{DEF}documentIdentifier": "documentIdentifier", + f"{DEF}documentLocation": "documentLocation", + f"{DEF}documentPublisher": "documentPublisher", + f"{DEF}documentTitle": "documentTitle", + f"{DEF}documentVersion": "documentVersion", + f"{DEF}domainComponent": "domainComponent", + f"{DEF}drink": "drink", + f"{DEF}eduOrgHomePageURI": "eduOrgHomePageURI", + f"{DEF}eduOrgIdentityAuthNPolicyURI": "eduOrgIdentityAuthNPolicyURI", + f"{DEF}eduOrgLegalName": "eduOrgLegalName", + f"{DEF}eduOrgSuperiorURI": "eduOrgSuperiorURI", + f"{DEF}eduOrgWhitePagesURI": "eduOrgWhitePagesURI", + f"{DEF}eduCourseOffering": "eduCourseOffering", + f"{DEF}eduCourseMember": "eduCourseMember", + f"{DEF}eduPersonAffiliation": "eduPersonAffiliation", + f"{DEF}eduPersonEntitlement": "eduPersonEntitlement", + f"{DEF}eduPersonNickname": "eduPersonNickname", + f"{DEF}eduPersonOrgDN": "eduPersonOrgDN", + f"{DEF}eduPersonOrgUnitDN": "eduPersonOrgUnitDN", + f"{DEF}eduPersonPrimaryAffiliation": "eduPersonPrimaryAffiliation", + f"{DEF}eduPersonPrimaryOrgUnitDN": "eduPersonPrimaryOrgUnitDN", + f"{DEF}eduPersonPrincipalName": "eduPersonPrincipalName", + f"{DEF}eduPersonPrincipalNamePrior": "eduPersonPrincipalNamePrior", + f"{DEF}eduPersonScopedAffiliation": "eduPersonScopedAffiliation", + f"{DEF}eduPersonTargetedID": "eduPersonTargetedID", + f"{DEF}eduPersonAssurance": "eduPersonAssurance", + f"{DEF}eduPersonUniqueId": "eduPersonUniqueId", + f"{DEF}eduPersonOrcid": "eduPersonOrcid", + f"{DEF}email": "email", + f"{DEF}emailAddress": "emailAddress", + f"{DEF}employeeNumber": "employeeNumber", + f"{DEF}employeeType": "employeeType", + f"{DEF}enhancedSearchGuide": "enhancedSearchGuide", + f"{DEF}facsimileTelephoneNumber": "facsimileTelephoneNumber", + f"{DEF}favouriteDrink": "favouriteDrink", + f"{DEF}fax": "fax", + f"{DEF}federationFeideSchemaVersion": "federationFeideSchemaVersion", + f"{DEF}friendlyCountryName": "friendlyCountryName", + f"{DEF}generationQualifier": "generationQualifier", + f"{DEF}givenName": "givenName", + f"{DEF}gn": "gn", + f"{DEF}homePhone": "homePhone", + f"{DEF}homePostalAddress": "homePostalAddress", + f"{DEF}homeTelephoneNumber": "homeTelephoneNumber", + f"{DEF}host": "host", + f"{DEF}houseIdentifier": "houseIdentifier", + f"{DEF}info": "info", + f"{DEF}initials": "initials", + f"{DEF}internationaliSDNNumber": "internationaliSDNNumber", + f"{DEF}isMemberOf": "isMemberOf", + f"{DEF}janetMailbox": "janetMailbox", + f"{DEF}jpegPhoto": "jpegPhoto", + f"{DEF}knowledgeInformation": "knowledgeInformation", + f"{DEF}l": "l", + f"{DEF}labeledURI": "labeledURI", + f"{DEF}localityName": "localityName", + f"{DEF}mDRecord": "mDRecord", + f"{DEF}mXRecord": "mXRecord", + f"{DEF}mail": "mail", + f"{DEF}mailPreferenceOption": "mailPreferenceOption", + f"{DEF}manager": "manager", + f"{DEF}member": "member", + f"{DEF}mobile": "mobile", + f"{DEF}mobileTelephoneNumber": "mobileTelephoneNumber", + f"{DEF}nSRecord": "nSRecord", + f"{DEF}name": "name", + f"{DEF}norEduOrgAcronym": "norEduOrgAcronym", + f"{DEF}norEduOrgNIN": "norEduOrgNIN", + f"{DEF}norEduOrgSchemaVersion": "norEduOrgSchemaVersion", + f"{DEF}norEduOrgUniqueIdentifier": "norEduOrgUniqueIdentifier", + f"{DEF}norEduOrgUniqueNumber": "norEduOrgUniqueNumber", + f"{DEF}norEduOrgUnitUniqueIdentifier": "norEduOrgUnitUniqueIdentifier", + f"{DEF}norEduOrgUnitUniqueNumber": "norEduOrgUnitUniqueNumber", + f"{DEF}norEduPersonBirthDate": "norEduPersonBirthDate", + f"{DEF}norEduPersonLIN": "norEduPersonLIN", + f"{DEF}norEduPersonNIN": "norEduPersonNIN", + f"{DEF}o": "o", + f"{DEF}objectClass": "objectClass", + f"{DEF}organizationName": "organizationName", + f"{DEF}organizationalStatus": "organizationalStatus", + f"{DEF}organizationalUnitName": "organizationalUnitName", + f"{DEF}otherMailbox": "otherMailbox", + f"{DEF}ou": "ou", + f"{DEF}owner": "owner", + f"{DEF}pager": "pager", + f"{DEF}pagerTelephoneNumber": "pagerTelephoneNumber", + f"{DEF}personalSignature": "personalSignature", + f"{DEF}personalTitle": "personalTitle", + f"{DEF}photo": "photo", + f"{DEF}physicalDeliveryOfficeName": "physicalDeliveryOfficeName", + f"{DEF}pkcs9email": "pkcs9email", + f"{DEF}postOfficeBox": "postOfficeBox", + f"{DEF}postalAddress": "postalAddress", + f"{DEF}postalCode": "postalCode", + f"{DEF}preferredDeliveryMethod": "preferredDeliveryMethod", + f"{DEF}preferredLanguage": "preferredLanguage", + f"{DEF}presentationAddress": "presentationAddress", + f"{DEF}protocolInformation": "protocolInformation", + f"{DEF}pseudonym": "pseudonym", + f"{DEF}registeredAddress": "registeredAddress", + f"{DEF}rfc822Mailbox": "rfc822Mailbox", + f"{DEF}roleOccupant": "roleOccupant", + f"{DEF}roomNumber": "roomNumber", + f"{DEF}sOARecord": "sOARecord", + f"{DEF}searchGuide": "searchGuide", + f"{DEF}secretary": "secretary", + f"{DEF}seeAlso": "seeAlso", + f"{DEF}serialNumber": "serialNumber", + f"{DEF}singleLevelQuality": "singleLevelQuality", + f"{DEF}sn": "sn", + f"{DEF}st": "st", + f"{DEF}stateOrProvinceName": "stateOrProvinceName", + f"{DEF}street": "street", + f"{DEF}streetAddress": "streetAddress", + f"{DEF}subtreeMaximumQuality": "subtreeMaximumQuality", + f"{DEF}subtreeMinimumQuality": "subtreeMinimumQuality", + f"{DEF}supportedAlgorithms": "supportedAlgorithms", + f"{DEF}supportedApplicationContext": "supportedApplicationContext", + f"{DEF}surname": "surname", + f"{DEF}telephoneNumber": "telephoneNumber", + f"{DEF}teletexTerminalIdentifier": "teletexTerminalIdentifier", + f"{DEF}telexNumber": "telexNumber", + f"{DEF}textEncodedORAddress": "textEncodedORAddress", + f"{DEF}title": "title", + f"{DEF}uid": "uid", + f"{DEF}uniqueIdentifier": "uniqueIdentifier", + f"{DEF}uniqueMember": "uniqueMember", + f"{DEF}userCertificate": "userCertificate", + f"{DEF}userClass": "userClass", + f"{DEF}userPKCS12": "userPKCS12", + f"{DEF}userPassword": "userPassword", + f"{DEF}userSMIMECertificate": "userSMIMECertificate", + f"{DEF}userid": "userid", + f"{DEF}x121Address": "x121Address", + f"{DEF}x500UniqueIdentifier": "x500UniqueIdentifier", }, "to": { - "aRecord": DEF + "aRecord", - "aliasedEntryName": DEF + "aliasedEntryName", - "aliasedObjectName": DEF + "aliasedObjectName", - "associatedDomain": DEF + "associatedDomain", - "associatedName": DEF + "associatedName", - "audio": DEF + "audio", - "authorityRevocationList": DEF + "authorityRevocationList", - "buildingName": DEF + "buildingName", - "businessCategory": DEF + "businessCategory", - "c": DEF + "c", - "cACertificate": DEF + "cACertificate", - "cNAMERecord": DEF + "cNAMERecord", - "carLicense": DEF + "carLicense", - "certificateRevocationList": DEF + "certificateRevocationList", - "cn": DEF + "cn", - "co": DEF + "co", - "commonName": DEF + "commonName", - "countryName": DEF + "countryName", - "crossCertificatePair": DEF + "crossCertificatePair", - "dITRedirect": DEF + "dITRedirect", - "dSAQuality": DEF + "dSAQuality", - "dc": DEF + "dc", - "deltaRevocationList": DEF + "deltaRevocationList", - "departmentNumber": DEF + "departmentNumber", - "description": DEF + "description", - "destinationIndicator": DEF + "destinationIndicator", - "displayName": DEF + "displayName", - "distinguishedName": DEF + "distinguishedName", - "dmdName": DEF + "dmdName", - "dnQualifier": DEF + "dnQualifier", - "documentAuthor": DEF + "documentAuthor", - "documentIdentifier": DEF + "documentIdentifier", - "documentLocation": DEF + "documentLocation", - "documentPublisher": DEF + "documentPublisher", - "documentTitle": DEF + "documentTitle", - "documentVersion": DEF + "documentVersion", - "domainComponent": DEF + "domainComponent", - "drink": DEF + "drink", - "eduOrgHomePageURI": DEF + "eduOrgHomePageURI", - "eduOrgIdentityAuthNPolicyURI": DEF + "eduOrgIdentityAuthNPolicyURI", - "eduOrgLegalName": DEF + "eduOrgLegalName", - "eduOrgSuperiorURI": DEF + "eduOrgSuperiorURI", - "eduOrgWhitePagesURI": DEF + "eduOrgWhitePagesURI", - "eduCourseMember": DEF + "eduCourseMember", - "eduCourseOffering": DEF + "eduCourseOffering", - "eduPersonAffiliation": DEF + "eduPersonAffiliation", - "eduPersonEntitlement": DEF + "eduPersonEntitlement", - "eduPersonNickname": DEF + "eduPersonNickname", - "eduPersonOrgDN": DEF + "eduPersonOrgDN", - "eduPersonOrgUnitDN": DEF + "eduPersonOrgUnitDN", - "eduPersonPrimaryAffiliation": DEF + "eduPersonPrimaryAffiliation", - "eduPersonPrimaryOrgUnitDN": DEF + "eduPersonPrimaryOrgUnitDN", - "eduPersonPrincipalName": DEF + "eduPersonPrincipalName", - "eduPersonPrincipalNamePrior": DEF + "eduPersonPrincipalNamePrior", - "eduPersonScopedAffiliation": DEF + "eduPersonScopedAffiliation", - "eduPersonTargetedID": DEF + "eduPersonTargetedID", - "eduPersonAssurance": DEF + "eduPersonAssurance", - "eduPersonUniqueId": DEF + "eduPersonUniqueId", - "eduPersonOrcid": DEF + "eduPersonOrcid", - "email": DEF + "email", - "emailAddress": DEF + "emailAddress", - "employeeNumber": DEF + "employeeNumber", - "employeeType": DEF + "employeeType", - "enhancedSearchGuide": DEF + "enhancedSearchGuide", - "facsimileTelephoneNumber": DEF + "facsimileTelephoneNumber", - "favouriteDrink": DEF + "favouriteDrink", - "fax": DEF + "fax", - "federationFeideSchemaVersion": DEF + "federationFeideSchemaVersion", - "friendlyCountryName": DEF + "friendlyCountryName", - "generationQualifier": DEF + "generationQualifier", - "givenName": DEF + "givenName", - "gn": DEF + "gn", - "homePhone": DEF + "homePhone", - "homePostalAddress": DEF + "homePostalAddress", - "homeTelephoneNumber": DEF + "homeTelephoneNumber", - "host": DEF + "host", - "houseIdentifier": DEF + "houseIdentifier", - "info": DEF + "info", - "initials": DEF + "initials", - "internationaliSDNNumber": DEF + "internationaliSDNNumber", - "isMemberOf": DEF + "isMemberOf", - "janetMailbox": DEF + "janetMailbox", - "jpegPhoto": DEF + "jpegPhoto", - "knowledgeInformation": DEF + "knowledgeInformation", - "l": DEF + "l", - "labeledURI": DEF + "labeledURI", - "localityName": DEF + "localityName", - "mDRecord": DEF + "mDRecord", - "mXRecord": DEF + "mXRecord", - "mail": DEF + "mail", - "mailPreferenceOption": DEF + "mailPreferenceOption", - "manager": DEF + "manager", - "member": DEF + "member", - "mobile": DEF + "mobile", - "mobileTelephoneNumber": DEF + "mobileTelephoneNumber", - "nSRecord": DEF + "nSRecord", - "name": DEF + "name", - "norEduOrgAcronym": DEF + "norEduOrgAcronym", - "norEduOrgNIN": DEF + "norEduOrgNIN", - "norEduOrgSchemaVersion": DEF + "norEduOrgSchemaVersion", - "norEduOrgUniqueIdentifier": DEF + "norEduOrgUniqueIdentifier", - "norEduOrgUniqueNumber": DEF + "norEduOrgUniqueNumber", - "norEduOrgUnitUniqueIdentifier": DEF + "norEduOrgUnitUniqueIdentifier", - "norEduOrgUnitUniqueNumber": DEF + "norEduOrgUnitUniqueNumber", - "norEduPersonBirthDate": DEF + "norEduPersonBirthDate", - "norEduPersonLIN": DEF + "norEduPersonLIN", - "norEduPersonNIN": DEF + "norEduPersonNIN", - "o": DEF + "o", - "objectClass": DEF + "objectClass", - "organizationName": DEF + "organizationName", - "organizationalStatus": DEF + "organizationalStatus", - "organizationalUnitName": DEF + "organizationalUnitName", - "otherMailbox": DEF + "otherMailbox", - "ou": DEF + "ou", - "owner": DEF + "owner", - "pager": DEF + "pager", - "pagerTelephoneNumber": DEF + "pagerTelephoneNumber", - "personalSignature": DEF + "personalSignature", - "personalTitle": DEF + "personalTitle", - "photo": DEF + "photo", - "physicalDeliveryOfficeName": DEF + "physicalDeliveryOfficeName", - "pkcs9email": DEF + "pkcs9email", - "postOfficeBox": DEF + "postOfficeBox", - "postalAddress": DEF + "postalAddress", - "postalCode": DEF + "postalCode", - "preferredDeliveryMethod": DEF + "preferredDeliveryMethod", - "preferredLanguage": DEF + "preferredLanguage", - "presentationAddress": DEF + "presentationAddress", - "protocolInformation": DEF + "protocolInformation", - "pseudonym": DEF + "pseudonym", - "registeredAddress": DEF + "registeredAddress", - "rfc822Mailbox": DEF + "rfc822Mailbox", - "roleOccupant": DEF + "roleOccupant", - "roomNumber": DEF + "roomNumber", - "sOARecord": DEF + "sOARecord", - "searchGuide": DEF + "searchGuide", - "secretary": DEF + "secretary", - "seeAlso": DEF + "seeAlso", - "serialNumber": DEF + "serialNumber", - "singleLevelQuality": DEF + "singleLevelQuality", - "sn": DEF + "sn", - "st": DEF + "st", - "stateOrProvinceName": DEF + "stateOrProvinceName", - "street": DEF + "street", - "streetAddress": DEF + "streetAddress", - "subtreeMaximumQuality": DEF + "subtreeMaximumQuality", - "subtreeMinimumQuality": DEF + "subtreeMinimumQuality", - "supportedAlgorithms": DEF + "supportedAlgorithms", - "supportedApplicationContext": DEF + "supportedApplicationContext", - "surname": DEF + "surname", - "telephoneNumber": DEF + "telephoneNumber", - "teletexTerminalIdentifier": DEF + "teletexTerminalIdentifier", - "telexNumber": DEF + "telexNumber", - "textEncodedORAddress": DEF + "textEncodedORAddress", - "title": DEF + "title", - "uid": DEF + "uid", - "uniqueIdentifier": DEF + "uniqueIdentifier", - "uniqueMember": DEF + "uniqueMember", - "userCertificate": DEF + "userCertificate", - "userClass": DEF + "userClass", - "userPKCS12": DEF + "userPKCS12", - "userPassword": DEF + "userPassword", - "userSMIMECertificate": DEF + "userSMIMECertificate", - "userid": DEF + "userid", - "x121Address": DEF + "x121Address", - "x500UniqueIdentifier": DEF + "x500UniqueIdentifier", + "aRecord": f"{DEF}aRecord", + "aliasedEntryName": f"{DEF}aliasedEntryName", + "aliasedObjectName": f"{DEF}aliasedObjectName", + "associatedDomain": f"{DEF}associatedDomain", + "associatedName": f"{DEF}associatedName", + "audio": f"{DEF}audio", + "authorityRevocationList": f"{DEF}authorityRevocationList", + "buildingName": f"{DEF}buildingName", + "businessCategory": f"{DEF}businessCategory", + "c": f"{DEF}c", + "cACertificate": f"{DEF}cACertificate", + "cNAMERecord": f"{DEF}cNAMERecord", + "carLicense": f"{DEF}carLicense", + "certificateRevocationList": f"{DEF}certificateRevocationList", + "cn": f"{DEF}cn", + "co": f"{DEF}co", + "commonName": f"{DEF}commonName", + "countryName": f"{DEF}countryName", + "crossCertificatePair": f"{DEF}crossCertificatePair", + "dITRedirect": f"{DEF}dITRedirect", + "dSAQuality": f"{DEF}dSAQuality", + "dc": f"{DEF}dc", + "deltaRevocationList": f"{DEF}deltaRevocationList", + "departmentNumber": f"{DEF}departmentNumber", + "description": f"{DEF}description", + "destinationIndicator": f"{DEF}destinationIndicator", + "displayName": f"{DEF}displayName", + "distinguishedName": f"{DEF}distinguishedName", + "dmdName": f"{DEF}dmdName", + "dnQualifier": f"{DEF}dnQualifier", + "documentAuthor": f"{DEF}documentAuthor", + "documentIdentifier": f"{DEF}documentIdentifier", + "documentLocation": f"{DEF}documentLocation", + "documentPublisher": f"{DEF}documentPublisher", + "documentTitle": f"{DEF}documentTitle", + "documentVersion": f"{DEF}documentVersion", + "domainComponent": f"{DEF}domainComponent", + "drink": f"{DEF}drink", + "eduOrgHomePageURI": f"{DEF}eduOrgHomePageURI", + "eduOrgIdentityAuthNPolicyURI": f"{DEF}eduOrgIdentityAuthNPolicyURI", + "eduOrgLegalName": f"{DEF}eduOrgLegalName", + "eduOrgSuperiorURI": f"{DEF}eduOrgSuperiorURI", + "eduOrgWhitePagesURI": f"{DEF}eduOrgWhitePagesURI", + "eduCourseMember": f"{DEF}eduCourseMember", + "eduCourseOffering": f"{DEF}eduCourseOffering", + "eduPersonAffiliation": f"{DEF}eduPersonAffiliation", + "eduPersonEntitlement": f"{DEF}eduPersonEntitlement", + "eduPersonNickname": f"{DEF}eduPersonNickname", + "eduPersonOrgDN": f"{DEF}eduPersonOrgDN", + "eduPersonOrgUnitDN": f"{DEF}eduPersonOrgUnitDN", + "eduPersonPrimaryAffiliation": f"{DEF}eduPersonPrimaryAffiliation", + "eduPersonPrimaryOrgUnitDN": f"{DEF}eduPersonPrimaryOrgUnitDN", + "eduPersonPrincipalName": f"{DEF}eduPersonPrincipalName", + "eduPersonPrincipalNamePrior": f"{DEF}eduPersonPrincipalNamePrior", + "eduPersonScopedAffiliation": f"{DEF}eduPersonScopedAffiliation", + "eduPersonTargetedID": f"{DEF}eduPersonTargetedID", + "eduPersonAssurance": f"{DEF}eduPersonAssurance", + "eduPersonUniqueId": f"{DEF}eduPersonUniqueId", + "eduPersonOrcid": f"{DEF}eduPersonOrcid", + "email": f"{DEF}email", + "emailAddress": f"{DEF}emailAddress", + "employeeNumber": f"{DEF}employeeNumber", + "employeeType": f"{DEF}employeeType", + "enhancedSearchGuide": f"{DEF}enhancedSearchGuide", + "facsimileTelephoneNumber": f"{DEF}facsimileTelephoneNumber", + "favouriteDrink": f"{DEF}favouriteDrink", + "fax": f"{DEF}fax", + "federationFeideSchemaVersion": f"{DEF}federationFeideSchemaVersion", + "friendlyCountryName": f"{DEF}friendlyCountryName", + "generationQualifier": f"{DEF}generationQualifier", + "givenName": f"{DEF}givenName", + "gn": f"{DEF}gn", + "homePhone": f"{DEF}homePhone", + "homePostalAddress": f"{DEF}homePostalAddress", + "homeTelephoneNumber": f"{DEF}homeTelephoneNumber", + "host": f"{DEF}host", + "houseIdentifier": f"{DEF}houseIdentifier", + "info": f"{DEF}info", + "initials": f"{DEF}initials", + "internationaliSDNNumber": f"{DEF}internationaliSDNNumber", + "isMemberOf": f"{DEF}isMemberOf", + "janetMailbox": f"{DEF}janetMailbox", + "jpegPhoto": f"{DEF}jpegPhoto", + "knowledgeInformation": f"{DEF}knowledgeInformation", + "l": f"{DEF}l", + "labeledURI": f"{DEF}labeledURI", + "localityName": f"{DEF}localityName", + "mDRecord": f"{DEF}mDRecord", + "mXRecord": f"{DEF}mXRecord", + "mail": f"{DEF}mail", + "mailPreferenceOption": f"{DEF}mailPreferenceOption", + "manager": f"{DEF}manager", + "member": f"{DEF}member", + "mobile": f"{DEF}mobile", + "mobileTelephoneNumber": f"{DEF}mobileTelephoneNumber", + "nSRecord": f"{DEF}nSRecord", + "name": f"{DEF}name", + "norEduOrgAcronym": f"{DEF}norEduOrgAcronym", + "norEduOrgNIN": f"{DEF}norEduOrgNIN", + "norEduOrgSchemaVersion": f"{DEF}norEduOrgSchemaVersion", + "norEduOrgUniqueIdentifier": f"{DEF}norEduOrgUniqueIdentifier", + "norEduOrgUniqueNumber": f"{DEF}norEduOrgUniqueNumber", + "norEduOrgUnitUniqueIdentifier": f"{DEF}norEduOrgUnitUniqueIdentifier", + "norEduOrgUnitUniqueNumber": f"{DEF}norEduOrgUnitUniqueNumber", + "norEduPersonBirthDate": f"{DEF}norEduPersonBirthDate", + "norEduPersonLIN": f"{DEF}norEduPersonLIN", + "norEduPersonNIN": f"{DEF}norEduPersonNIN", + "o": f"{DEF}o", + "objectClass": f"{DEF}objectClass", + "organizationName": f"{DEF}organizationName", + "organizationalStatus": f"{DEF}organizationalStatus", + "organizationalUnitName": f"{DEF}organizationalUnitName", + "otherMailbox": f"{DEF}otherMailbox", + "ou": f"{DEF}ou", + "owner": f"{DEF}owner", + "pager": f"{DEF}pager", + "pagerTelephoneNumber": f"{DEF}pagerTelephoneNumber", + "personalSignature": f"{DEF}personalSignature", + "personalTitle": f"{DEF}personalTitle", + "photo": f"{DEF}photo", + "physicalDeliveryOfficeName": f"{DEF}physicalDeliveryOfficeName", + "pkcs9email": f"{DEF}pkcs9email", + "postOfficeBox": f"{DEF}postOfficeBox", + "postalAddress": f"{DEF}postalAddress", + "postalCode": f"{DEF}postalCode", + "preferredDeliveryMethod": f"{DEF}preferredDeliveryMethod", + "preferredLanguage": f"{DEF}preferredLanguage", + "presentationAddress": f"{DEF}presentationAddress", + "protocolInformation": f"{DEF}protocolInformation", + "pseudonym": f"{DEF}pseudonym", + "registeredAddress": f"{DEF}registeredAddress", + "rfc822Mailbox": f"{DEF}rfc822Mailbox", + "roleOccupant": f"{DEF}roleOccupant", + "roomNumber": f"{DEF}roomNumber", + "sOARecord": f"{DEF}sOARecord", + "searchGuide": f"{DEF}searchGuide", + "secretary": f"{DEF}secretary", + "seeAlso": f"{DEF}seeAlso", + "serialNumber": f"{DEF}serialNumber", + "singleLevelQuality": f"{DEF}singleLevelQuality", + "sn": f"{DEF}sn", + "st": f"{DEF}st", + "stateOrProvinceName": f"{DEF}stateOrProvinceName", + "street": f"{DEF}street", + "streetAddress": f"{DEF}streetAddress", + "subtreeMaximumQuality": f"{DEF}subtreeMaximumQuality", + "subtreeMinimumQuality": f"{DEF}subtreeMinimumQuality", + "supportedAlgorithms": f"{DEF}supportedAlgorithms", + "supportedApplicationContext": f"{DEF}supportedApplicationContext", + "surname": f"{DEF}surname", + "telephoneNumber": f"{DEF}telephoneNumber", + "teletexTerminalIdentifier": f"{DEF}teletexTerminalIdentifier", + "telexNumber": f"{DEF}telexNumber", + "textEncodedORAddress": f"{DEF}textEncodedORAddress", + "title": f"{DEF}title", + "uid": f"{DEF}uid", + "uniqueIdentifier": f"{DEF}uniqueIdentifier", + "uniqueMember": f"{DEF}uniqueMember", + "userCertificate": f"{DEF}userCertificate", + "userClass": f"{DEF}userClass", + "userPKCS12": f"{DEF}userPKCS12", + "userPassword": f"{DEF}userPassword", + "userSMIMECertificate": f"{DEF}userSMIMECertificate", + "userid": f"{DEF}userid", + "x121Address": f"{DEF}x121Address", + "x500UniqueIdentifier": f"{DEF}x500UniqueIdentifier", }, } diff --git a/src/saml2/attributemaps/saml_uri.py b/src/saml2/attributemaps/saml_uri.py index b574b08e..a7b5c718 100644 --- a/src/saml2/attributemaps/saml_uri.py +++ b/src/saml2/attributemaps/saml_uri.py @@ -52,439 +52,439 @@ DIGG_OID = "urn:oid:1.2.752.201.3." MAP = { "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", "fro": { - DIGG_OID + "1": "orgAffiliation", - DIGG_OID + "2": "transactionIdentifier", - DIGG_OID + "3": "authContextParams", - DIGG_OID + "4": "prid", - DIGG_OID + "5": "pridPersistence", - DIGG_OID + "6": "personalIdentityNumberBinding", - DIGG_OID + "7": "eidasPersonIdentifier", - DIGG_OID + "8": "birthName", - DIGG_OID + "9": "eidasNaturalPersonAddress", - DIGG_OID + "10": "userCertificate", - DIGG_OID + "11": "userSignature", - DIGG_OID + "12": "sad", - DIGG_OID + "13": "authServerSignature", - DIGG_OID + "14": "signMessageDigest", - EIDAS_LEGALPERSON + "LegalPersonIdentifier": "LegalPersonIdentifier", - EIDAS_LEGALPERSON + "LegalPersonAddress": "LegalAddress", - EIDAS_LEGALPERSON + "LegalName": "LegalName", - EIDAS_LEGALPERSON + "VATRegistrationNumber": "VATRegistration", - EIDAS_LEGALPERSON + "TaxReference": "TaxReference", - EIDAS_LEGALPERSON + "BusinessCodes": "BusinessCodes", - EIDAS_LEGALPERSON + "LEI": "LEI", - EIDAS_LEGALPERSON + "EORI": "EORI", - EIDAS_LEGALPERSON + "SEED": "SEED", - EIDAS_LEGALPERSON + "SIC": "SIC", - EIDAS_LEGALPERSON + "D-2012-17-EUIdentifier": "D-2012-17-EUIdentifier", - EIDAS_NATURALPERSON + "PersonIdentifier": "PersonIdentifier", - EIDAS_NATURALPERSON + "CurrentFamilyName": "FamilyName", - EIDAS_NATURALPERSON + "CurrentGivenName": "FirstName", - EIDAS_NATURALPERSON + "DateOfBirth": "DateOfBirth", - EIDAS_NATURALPERSON + "BirthName": "BirthName", - EIDAS_NATURALPERSON + "PlaceOfBirth": "PlaceOfBirth", - EIDAS_NATURALPERSON + "CurrentAddress": "CurrentAddress", - EIDAS_NATURALPERSON + "Gender": "Gender", - EDUCOURSE_OID + "1": "eduCourseOffering", - EDUCOURSE_OID + "2": "eduCourseMember", - EDUMEMBER1_OID + "1": "isMemberOf", - EDUPERSON_OID + "1": "eduPersonAffiliation", - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "3": "eduPersonOrgDN", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - EDUPERSON_OID + "7": "eduPersonEntitlement", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "12": "eduPersonPrincipalNamePrior", - EDUPERSON_OID + "13": "eduPersonUniqueId", - EDUPERSON_OID + "16": "eduPersonOrcid", - INERA_OID + "1": "employeeHsaId", - INERA_OID + "13": "personalIdentityNumber", - LDAPGVAT_OID + "1": "PVP-GID", - LDAPGVAT_OID + "149": "PVP-BPK", - LDAPGVAT_OID + "153": "PVP-OU-OKZ", - LDAPGVAT_OID + "261.10": "PVP-VERSION", - LDAPGVAT_OID + "261.20": "PVP-PRINCIPAL-NAME", - LDAPGVAT_OID + "261.24": "PVP-PARTICIPANT-OKZ", - LDAPGVAT_OID + "261.30": "PVP-ROLES", - LDAPGVAT_OID + "261.40": "PVP-INVOICE-RECPT-ID", - LDAPGVAT_OID + "261.50": "PVP-COST-CENTER-ID", - LDAPGVAT_OID + "261.60": "PVP-CHARGE-CODE", - LDAPGVAT_OID + "3": "PVP-OU-GV-OU-ID", - LDAPGVAT_OID + "33": "PVP-FUNCTION", - LDAPGVAT_OID + "55": "PVP-BIRTHDATE", - LDAPGVAT_OID + "71": "PVP-PARTICIPANT-ID", - LDAPGVAT_UCL_DIR_PILOT + "1": "PVP-USERID", - LDAPGVAT_UCL_DIR_PILOT + "3": "PVP-MAIL", - LDAPGVAT_X500ATTR_OID + "11": "PVP-OU", - LDAPGVAT_X500ATTR_OID + "20": "PVP-TEL", - LDAPGVAT_X500ATTR_OID + "42": "PVP-GIVENNAME", - NETSCAPE_LDAP + "1": "carLicense", - NETSCAPE_LDAP + "2": "departmentNumber", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "4": "employeeType", - NETSCAPE_LDAP + "39": "preferredLanguage", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NETSCAPE_LDAP + "216": "userPKCS12", - NETSCAPE_LDAP + "241": "displayName", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - NOREDUPERSON_OID + "10": "norEduPersonLegalName", - NOREDUPERSON_OID + "11": "norEduOrgSchemaVersion", - NOREDUPERSON_OID + "12": "norEduOrgNIN", - OPENOSI_OID + "17": "osiHomeUrl", - OPENOSI_OID + "19": "osiPreferredTZ", - OPENOSI_OID + "72": "osiICardTimeLastUpdated", - OPENOSI_OID + "104": "osiMiddleName", - OPENOSI_OID + "107": "osiOtherEmail", - OPENOSI_OID + "109": "osiOtherHomePhone", - OPENOSI_OID + "120": "osiWorkURL", - PKCS_9 + "1": "email", - PKIX_OID + "1": "dateOfBirth", - PKIX_OID + "2": "placeOfBirth", - PKIX_OID + "3": "gender", - PKIX_OID + "4": "countryOfCitizenship", - PKIX_OID + "5": "countryOfResidence", - SAML_SUBJECT_ID + "subject-id": "subject-id", - SAML_SUBJECT_ID + "pairwise-id": "pairwise-id", - SCHAC + "1": "schacMotherTongue", - SCHAC + "2": "schacGender", - SCHAC + "3": "schacDateOfBirth", - SCHAC + "4": "schacPlaceOfBirth", - SCHAC + "5": "schacCountryOfCitizenship", - SCHAC + "6": "schacSn1", - SCHAC + "7": "schacSn2", - SCHAC + "8": "schacPersonalTitle", - SCHAC + "9": "schacHomeOrganization", - SCHAC + "10": "schacHomeOrganizationType", - SCHAC + "11": "schacCountryOfResidence", - SCHAC + "12": "schacUserPresenceID", - SCHAC + "13": "schacPersonalPosition", - SCHAC + "14": "schacPersonalUniqueCode", - SCHAC + "15": "schacPersonalUniqueID", - SCHAC + "17": "schacExpiryDate", - SCHAC + "18": "schacUserPrivateAttribute", - SCHAC + "19": "schacUserStatus", - SCHAC + "20": "schacProjectMembership", - SCHAC + "21": "schacProjectSpecificRole", - SIS + "1": "sisLegalGuardianFor", - SIS + "2": "sisSchoolGrade", - UCL_DIR_PILOT + "1": "uid", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - UCL_DIR_PILOT + "37": "associatedDomain", - UCL_DIR_PILOT + "43": "co", - UCL_DIR_PILOT + "60": "jpegPhoto", - UMBRELLA_EAAUser_ID + "1": "EAAHash", - UMBRELLA_EAAUser_ID + "3": "EAAKey", - UMICH + "57": "labeledURI", - X500ATTR_OID + "2": "knowledgeInformation", - X500ATTR_OID + "3": "cn", - X500ATTR_OID + "4": "sn", - X500ATTR_OID + "5": "serialNumber", - X500ATTR_OID + "6": "c", - X500ATTR_OID + "7": "l", - X500ATTR_OID + "8": "st", - X500ATTR_OID + "9": "street", - X500ATTR_OID + "10": "o", - X500ATTR_OID + "11": "ou", - X500ATTR_OID + "12": "title", - X500ATTR_OID + "14": "searchGuide", - X500ATTR_OID + "15": "businessCategory", - X500ATTR_OID + "16": "postalAddress", - X500ATTR_OID + "17": "postalCode", - X500ATTR_OID + "18": "postOfficeBox", - X500ATTR_OID + "19": "physicalDeliveryOfficeName", - X500ATTR_OID + "20": "telephoneNumber", - X500ATTR_OID + "21": "telexNumber", - X500ATTR_OID + "22": "teletexTerminalIdentifier", - X500ATTR_OID + "23": "facsimileTelephoneNumber", - X500ATTR_OID + "24": "x121Address", - X500ATTR_OID + "25": "internationaliSDNNumber", - X500ATTR_OID + "26": "registeredAddress", - X500ATTR_OID + "27": "destinationIndicator", - X500ATTR_OID + "28": "preferredDeliveryMethod", - X500ATTR_OID + "29": "presentationAddress", - X500ATTR_OID + "30": "supportedApplicationContext", - X500ATTR_OID + "31": "member", - X500ATTR_OID + "32": "owner", - X500ATTR_OID + "33": "roleOccupant", - X500ATTR_OID + "36": "userCertificate", - X500ATTR_OID + "37": "cACertificate", - X500ATTR_OID + "38": "authorityRevocationList", - X500ATTR_OID + "39": "certificateRevocationList", - X500ATTR_OID + "40": "crossCertificatePair", - X500ATTR_OID + "42": "givenName", - X500ATTR_OID + "43": "initials", - X500ATTR_OID + "44": "generationQualifier", - X500ATTR_OID + "45": "x500UniqueIdentifier", - X500ATTR_OID + "46": "dnQualifier", - X500ATTR_OID + "47": "enhancedSearchGuide", - X500ATTR_OID + "48": "protocolInformation", - X500ATTR_OID + "50": "uniqueMember", - X500ATTR_OID + "51": "houseIdentifier", - X500ATTR_OID + "52": "supportedAlgorithms", - X500ATTR_OID + "53": "deltaRevocationList", - X500ATTR_OID + "54": "dmdName", - X500ATTR_OID + "65": "pseudonym", - SWISSEDUPERSON_OID + "1": "swissEduPersonUniqueID", - SWISSEDUPERSON_OID + "2": "swissEduPersonDateOfBirth", - SWISSEDUPERSON_OID + "3": "swissEduPersonGender", - SWISSEDUPERSON_OID + "4": "swissEduPersonHomeOrganization", - SWISSEDUPERSON_OID + "5": "swissEduPersonHomeOrganizationType", - SWISSEDUPERSON_OID + "6": "swissEduPersonStudyBranch1", - SWISSEDUPERSON_OID + "7": "swissEduPersonStudyBranch2", - SWISSEDUPERSON_OID + "8": "swissEduPersonStudyBranch3", - SWISSEDUPERSON_OID + "9": "swissEduPersonStudyLevel", - SWISSEDUPERSON_OID + "10": "swissEduPersonStaffCategory", - SWISSEDUPERSON_OID + "11": "swissEduPersonMatriculationNumber", - SWISSEDUPERSON_OID + "12": "swissEduPersonCardUID", - SWISSEDUPERSON_OID + "13": "swissEduID", - SWISSEDUPERSON_OID + "1023": "swissLibraryPersonAffiliation", - SWISSEDUPERSON_OID + "1025": "swissLibraryPersonResidence", - VOPERSON_V2_OID + "1": "voPersonApplicationUID", - VOPERSON_V2_OID + "2": "voPersonAuthorName", - VOPERSON_V2_OID + "3": "voPersonCertificateDN", - VOPERSON_V2_OID + "4": "voPersonCertificateIssuerDN", - VOPERSON_V2_OID + "5": "voPersonExternalID", - VOPERSON_V2_OID + "6": "voPersonID", - VOPERSON_V2_OID + "7": "voPersonPolicyAgreement", - VOPERSON_V2_OID + "8": "voPersonSoRID", - VOPERSON_V2_OID + "9": "voPersonStatus", - VOPERSON_V2_OID + "10": "voPersonAffiliation", - VOPERSON_V2_OID + "11": "voPersonExternalAffiliation", - VOPERSON_V2_OID + "12": "voPersonScopedAffiliation", - VOPERSON_V2_OID + "13": "voPersonApplicationPassword", - VOPERSON_V2_OID + "14": "voPersonVerifiedEmail", - VOPERSON_V2_OID + "15": "voPersonToken", + f"{DIGG_OID}1": "orgAffiliation", + f"{DIGG_OID}2": "transactionIdentifier", + f"{DIGG_OID}3": "authContextParams", + f"{DIGG_OID}4": "prid", + f"{DIGG_OID}5": "pridPersistence", + f"{DIGG_OID}6": "personalIdentityNumberBinding", + f"{DIGG_OID}7": "eidasPersonIdentifier", + f"{DIGG_OID}8": "birthName", + f"{DIGG_OID}9": "eidasNaturalPersonAddress", + f"{DIGG_OID}10": "userCertificate", + f"{DIGG_OID}11": "userSignature", + f"{DIGG_OID}12": "sad", + f"{DIGG_OID}13": "authServerSignature", + f"{DIGG_OID}14": "signMessageDigest", + f"{EIDAS_LEGALPERSON}LegalPersonIdentifier": "LegalPersonIdentifier", + f"{EIDAS_LEGALPERSON}LegalPersonAddress": "LegalAddress", + f"{EIDAS_LEGALPERSON}LegalName": "LegalName", + f"{EIDAS_LEGALPERSON}VATRegistrationNumber": "VATRegistration", + f"{EIDAS_LEGALPERSON}TaxReference": "TaxReference", + f"{EIDAS_LEGALPERSON}BusinessCodes": "BusinessCodes", + f"{EIDAS_LEGALPERSON}LEI": "LEI", + f"{EIDAS_LEGALPERSON}EORI": "EORI", + f"{EIDAS_LEGALPERSON}SEED": "SEED", + f"{EIDAS_LEGALPERSON}SIC": "SIC", + f"{EIDAS_LEGALPERSON}D-2012-17-EUIdentifier": "D-2012-17-EUIdentifier", + f"{EIDAS_NATURALPERSON}PersonIdentifier": "PersonIdentifier", + f"{EIDAS_NATURALPERSON}CurrentFamilyName": "FamilyName", + f"{EIDAS_NATURALPERSON}CurrentGivenName": "FirstName", + f"{EIDAS_NATURALPERSON}DateOfBirth": "DateOfBirth", + f"{EIDAS_NATURALPERSON}BirthName": "BirthName", + f"{EIDAS_NATURALPERSON}PlaceOfBirth": "PlaceOfBirth", + f"{EIDAS_NATURALPERSON}CurrentAddress": "CurrentAddress", + f"{EIDAS_NATURALPERSON}Gender": "Gender", + f"{EDUCOURSE_OID}1": "eduCourseOffering", + f"{EDUCOURSE_OID}2": "eduCourseMember", + f"{EDUMEMBER1_OID}1": "isMemberOf", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}12": "eduPersonPrincipalNamePrior", + f"{EDUPERSON_OID}13": "eduPersonUniqueId", + f"{EDUPERSON_OID}16": "eduPersonOrcid", + f"{INERA_OID}1": "employeeHsaId", + f"{INERA_OID}13": "personalIdentityNumber", + f"{LDAPGVAT_OID}1": "PVP-GID", + f"{LDAPGVAT_OID}149": "PVP-BPK", + f"{LDAPGVAT_OID}153": "PVP-OU-OKZ", + f"{LDAPGVAT_OID}261.10": "PVP-VERSION", + f"{LDAPGVAT_OID}261.20": "PVP-PRINCIPAL-NAME", + f"{LDAPGVAT_OID}261.24": "PVP-PARTICIPANT-OKZ", + f"{LDAPGVAT_OID}261.30": "PVP-ROLES", + f"{LDAPGVAT_OID}261.40": "PVP-INVOICE-RECPT-ID", + f"{LDAPGVAT_OID}261.50": "PVP-COST-CENTER-ID", + f"{LDAPGVAT_OID}261.60": "PVP-CHARGE-CODE", + f"{LDAPGVAT_OID}3": "PVP-OU-GV-OU-ID", + f"{LDAPGVAT_OID}33": "PVP-FUNCTION", + f"{LDAPGVAT_OID}55": "PVP-BIRTHDATE", + f"{LDAPGVAT_OID}71": "PVP-PARTICIPANT-ID", + f"{LDAPGVAT_UCL_DIR_PILOT}1": "PVP-USERID", + f"{LDAPGVAT_UCL_DIR_PILOT}3": "PVP-MAIL", + f"{LDAPGVAT_X500ATTR_OID}11": "PVP-OU", + f"{LDAPGVAT_X500ATTR_OID}20": "PVP-TEL", + f"{LDAPGVAT_X500ATTR_OID}42": "PVP-GIVENNAME", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{NETSCAPE_LDAP}241": "displayName", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{NOREDUPERSON_OID}10": "norEduPersonLegalName", + f"{NOREDUPERSON_OID}11": "norEduOrgSchemaVersion", + f"{NOREDUPERSON_OID}12": "norEduOrgNIN", + f"{OPENOSI_OID}17": "osiHomeUrl", + f"{OPENOSI_OID}19": "osiPreferredTZ", + f"{OPENOSI_OID}72": "osiICardTimeLastUpdated", + f"{OPENOSI_OID}104": "osiMiddleName", + f"{OPENOSI_OID}107": "osiOtherEmail", + f"{OPENOSI_OID}109": "osiOtherHomePhone", + f"{OPENOSI_OID}120": "osiWorkURL", + f"{PKCS_9}1": "email", + f"{PKIX_OID}1": "dateOfBirth", + f"{PKIX_OID}2": "placeOfBirth", + f"{PKIX_OID}3": "gender", + f"{PKIX_OID}4": "countryOfCitizenship", + f"{PKIX_OID}5": "countryOfResidence", + f"{SAML_SUBJECT_ID}subject-id": "subject-id", + f"{SAML_SUBJECT_ID}pairwise-id": "pairwise-id", + f"{SCHAC}1": "schacMotherTongue", + f"{SCHAC}2": "schacGender", + f"{SCHAC}3": "schacDateOfBirth", + f"{SCHAC}4": "schacPlaceOfBirth", + f"{SCHAC}5": "schacCountryOfCitizenship", + f"{SCHAC}6": "schacSn1", + f"{SCHAC}7": "schacSn2", + f"{SCHAC}8": "schacPersonalTitle", + f"{SCHAC}9": "schacHomeOrganization", + f"{SCHAC}10": "schacHomeOrganizationType", + f"{SCHAC}11": "schacCountryOfResidence", + f"{SCHAC}12": "schacUserPresenceID", + f"{SCHAC}13": "schacPersonalPosition", + f"{SCHAC}14": "schacPersonalUniqueCode", + f"{SCHAC}15": "schacPersonalUniqueID", + f"{SCHAC}17": "schacExpiryDate", + f"{SCHAC}18": "schacUserPrivateAttribute", + f"{SCHAC}19": "schacUserStatus", + f"{SCHAC}20": "schacProjectMembership", + f"{SCHAC}21": "schacProjectSpecificRole", + f"{SIS}1": "sisLegalGuardianFor", + f"{SIS}2": "sisSchoolGrade", + f"{UCL_DIR_PILOT}1": "uid", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{UCL_DIR_PILOT}43": "co", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{UMBRELLA_EAAUser_ID}1": "EAAHash", + f"{UMBRELLA_EAAUser_ID}3": "EAAKey", + f"{UMICH}57": "labeledURI", + f"{X500ATTR_OID}2": "knowledgeInformation", + f"{X500ATTR_OID}3": "cn", + f"{X500ATTR_OID}4": "sn", + f"{X500ATTR_OID}5": "serialNumber", + f"{X500ATTR_OID}6": "c", + f"{X500ATTR_OID}7": "l", + f"{X500ATTR_OID}8": "st", + f"{X500ATTR_OID}9": "street", + f"{X500ATTR_OID}10": "o", + f"{X500ATTR_OID}11": "ou", + f"{X500ATTR_OID}12": "title", + f"{X500ATTR_OID}14": "searchGuide", + f"{X500ATTR_OID}15": "businessCategory", + f"{X500ATTR_OID}16": "postalAddress", + f"{X500ATTR_OID}17": "postalCode", + f"{X500ATTR_OID}18": "postOfficeBox", + f"{X500ATTR_OID}19": "physicalDeliveryOfficeName", + f"{X500ATTR_OID}20": "telephoneNumber", + f"{X500ATTR_OID}21": "telexNumber", + f"{X500ATTR_OID}22": "teletexTerminalIdentifier", + f"{X500ATTR_OID}23": "facsimileTelephoneNumber", + f"{X500ATTR_OID}24": "x121Address", + f"{X500ATTR_OID}25": "internationaliSDNNumber", + f"{X500ATTR_OID}26": "registeredAddress", + f"{X500ATTR_OID}27": "destinationIndicator", + f"{X500ATTR_OID}28": "preferredDeliveryMethod", + f"{X500ATTR_OID}29": "presentationAddress", + f"{X500ATTR_OID}30": "supportedApplicationContext", + f"{X500ATTR_OID}31": "member", + f"{X500ATTR_OID}32": "owner", + f"{X500ATTR_OID}33": "roleOccupant", + f"{X500ATTR_OID}36": "userCertificate", + f"{X500ATTR_OID}37": "cACertificate", + f"{X500ATTR_OID}38": "authorityRevocationList", + f"{X500ATTR_OID}39": "certificateRevocationList", + f"{X500ATTR_OID}40": "crossCertificatePair", + f"{X500ATTR_OID}42": "givenName", + f"{X500ATTR_OID}43": "initials", + f"{X500ATTR_OID}44": "generationQualifier", + f"{X500ATTR_OID}45": "x500UniqueIdentifier", + f"{X500ATTR_OID}46": "dnQualifier", + f"{X500ATTR_OID}47": "enhancedSearchGuide", + f"{X500ATTR_OID}48": "protocolInformation", + f"{X500ATTR_OID}50": "uniqueMember", + f"{X500ATTR_OID}51": "houseIdentifier", + f"{X500ATTR_OID}52": "supportedAlgorithms", + f"{X500ATTR_OID}53": "deltaRevocationList", + f"{X500ATTR_OID}54": "dmdName", + f"{X500ATTR_OID}65": "pseudonym", + f"{SWISSEDUPERSON_OID}1": "swissEduPersonUniqueID", + f"{SWISSEDUPERSON_OID}2": "swissEduPersonDateOfBirth", + f"{SWISSEDUPERSON_OID}3": "swissEduPersonGender", + f"{SWISSEDUPERSON_OID}4": "swissEduPersonHomeOrganization", + f"{SWISSEDUPERSON_OID}5": "swissEduPersonHomeOrganizationType", + f"{SWISSEDUPERSON_OID}6": "swissEduPersonStudyBranch1", + f"{SWISSEDUPERSON_OID}7": "swissEduPersonStudyBranch2", + f"{SWISSEDUPERSON_OID}8": "swissEduPersonStudyBranch3", + f"{SWISSEDUPERSON_OID}9": "swissEduPersonStudyLevel", + f"{SWISSEDUPERSON_OID}10": "swissEduPersonStaffCategory", + f"{SWISSEDUPERSON_OID}11": "swissEduPersonMatriculationNumber", + f"{SWISSEDUPERSON_OID}12": "swissEduPersonCardUID", + f"{SWISSEDUPERSON_OID}13": "swissEduID", + f"{SWISSEDUPERSON_OID}1023": "swissLibraryPersonAffiliation", + f"{SWISSEDUPERSON_OID}1025": "swissLibraryPersonResidence", + f"{VOPERSON_V2_OID}1": "voPersonApplicationUID", + f"{VOPERSON_V2_OID}2": "voPersonAuthorName", + f"{VOPERSON_V2_OID}3": "voPersonCertificateDN", + f"{VOPERSON_V2_OID}4": "voPersonCertificateIssuerDN", + f"{VOPERSON_V2_OID}5": "voPersonExternalID", + f"{VOPERSON_V2_OID}6": "voPersonID", + f"{VOPERSON_V2_OID}7": "voPersonPolicyAgreement", + f"{VOPERSON_V2_OID}8": "voPersonSoRID", + f"{VOPERSON_V2_OID}9": "voPersonStatus", + f"{VOPERSON_V2_OID}10": "voPersonAffiliation", + f"{VOPERSON_V2_OID}11": "voPersonExternalAffiliation", + f"{VOPERSON_V2_OID}12": "voPersonScopedAffiliation", + f"{VOPERSON_V2_OID}13": "voPersonApplicationPassword", + f"{VOPERSON_V2_OID}14": "voPersonVerifiedEmail", + f"{VOPERSON_V2_OID}15": "voPersonToken", }, "to": { - "LegalPersonIdentifier": EIDAS_LEGALPERSON + "LegalPersonIdentifier", - "LegalAddress": EIDAS_LEGALPERSON + "LegalPersonAddress", - "LegalName": EIDAS_LEGALPERSON + "LegalName", - "VATRegistration": EIDAS_LEGALPERSON + "VATRegistrationNumber", - "TaxReference": EIDAS_LEGALPERSON + "TaxReference", - "BusinessCodes": EIDAS_LEGALPERSON + "BusinessCodes", - "LEI": EIDAS_LEGALPERSON + "LEI", - "EORI": EIDAS_LEGALPERSON + "EORI", - "SEED": EIDAS_LEGALPERSON + "SEED", - "SIC": EIDAS_LEGALPERSON + "SIC", - "D-2012-17-EUIdentifier": EIDAS_LEGALPERSON + "D-2012-17-EUIdentifier", - "PersonIdentifier": EIDAS_NATURALPERSON + "PersonIdentifier", - "FamilyName": EIDAS_NATURALPERSON + "CurrentFamilyName", - "FirstName": EIDAS_NATURALPERSON + "CurrentGivenName", - "DateOfBirth": EIDAS_NATURALPERSON + "DateOfBirth", - "BirthName": EIDAS_NATURALPERSON + "BirthName", - "PlaceOfBirth": EIDAS_NATURALPERSON + "PlaceOfBirth", - "CurrentAddress": EIDAS_NATURALPERSON + "CurrentAddress", - "Gender": EIDAS_NATURALPERSON + "Gender", - "associatedDomain": UCL_DIR_PILOT + "37", - "authContextParams": DIGG_OID + "3", - "authorityRevocationList": X500ATTR_OID + "38", - "authServerSignature": DIGG_OID + "13", - "birthName": DIGG_OID + "8", - "businessCategory": X500ATTR_OID + "15", - "c": X500ATTR_OID + "6", - "cACertificate": X500ATTR_OID + "37", - "carLicense": NETSCAPE_LDAP + "1", - "certificateRevocationList": X500ATTR_OID + "39", - "cn": X500ATTR_OID + "3", - "co": UCL_DIR_PILOT + "43", - "countryOfCitizenship": PKIX_OID + "4", - "countryOfResidence": PKIX_OID + "5", - "crossCertificatePair": X500ATTR_OID + "40", - "dateOfBirth": PKIX_OID + "1", - "dc": UCL_DIR_PILOT + "25", - "deltaRevocationList": X500ATTR_OID + "53", - "departmentNumber": NETSCAPE_LDAP + "2", - "destinationIndicator": X500ATTR_OID + "27", - "displayName": NETSCAPE_LDAP + "241", - "dmdName": X500ATTR_OID + "54", - "dnQualifier": X500ATTR_OID + "46", - "EAAHash": UMBRELLA_EAAUser_ID + "1", - "EAAKey": UMBRELLA_EAAUser_ID + "3", - "eduCourseMember": EDUCOURSE_OID + "2", - "eduCourseOffering": EDUCOURSE_OID + "1", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "eduPersonNickname": EDUPERSON_OID + "2", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "eduPersonPrincipalNamePrior": EDUPERSON_OID + "12", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "eduPersonUniqueId": EDUPERSON_OID + "13", - "eduPersonOrcid": EDUPERSON_OID + "16", - "eidasNaturalPersonAddress": DIGG_OID + "9", - "eidasPersonIdentifier": DIGG_OID + "7", - "email": PKCS_9 + "1", - "employeeHsaId": INERA_OID + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "employeeType": NETSCAPE_LDAP + "4", - "enhancedSearchGuide": X500ATTR_OID + "47", - "facsimileTelephoneNumber": X500ATTR_OID + "23", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "gender": PKIX_OID + "3", - "generationQualifier": X500ATTR_OID + "44", - "givenName": X500ATTR_OID + "42", - "houseIdentifier": X500ATTR_OID + "51", - "initials": X500ATTR_OID + "43", - "internationaliSDNNumber": X500ATTR_OID + "25", - "isMemberOf": EDUMEMBER1_OID + "1", - "jpegPhoto": UCL_DIR_PILOT + "60", - "knowledgeInformation": X500ATTR_OID + "2", - "l": X500ATTR_OID + "7", - "labeledURI": UMICH + "57", - "mail": UCL_DIR_PILOT + "3", - "member": X500ATTR_OID + "31", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "norEduOrgNIN": NOREDUPERSON_OID + "12", - "norEduOrgSchemaVersion": NOREDUPERSON_OID + "11", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "norEduPersonLegalName": NOREDUPERSON_OID + "10", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "o": X500ATTR_OID + "10", - "osiHomeUrl": OPENOSI_OID + "17", - "osiPreferredTZ": OPENOSI_OID + "19", - "osiICardTimeLastUpdated": OPENOSI_OID + "72", - "osiMiddleName": OPENOSI_OID + "104", - "osiOtherEmail": OPENOSI_OID + "107", - "osiOtherHomePhone": OPENOSI_OID + "109", - "osiWorkURL": OPENOSI_OID + "120", - "ou": X500ATTR_OID + "11", - "orgAffiliation": DIGG_OID + "1", - "owner": X500ATTR_OID + "32", - "pairwise-id": SAML_SUBJECT_ID + "pairwise-id", - "personalIdentityNumber": INERA_OID + "13", - "personalIdentityNumberBinding": DIGG_OID + "6", - "physicalDeliveryOfficeName": X500ATTR_OID + "19", - "placeOfBirth": PKIX_OID + "2", - "postOfficeBox": X500ATTR_OID + "18", - "postalAddress": X500ATTR_OID + "16", - "postalCode": X500ATTR_OID + "17", - "preferredDeliveryMethod": X500ATTR_OID + "28", - "preferredLanguage": NETSCAPE_LDAP + "39", - "presentationAddress": X500ATTR_OID + "29", - "prid": DIGG_OID + "4", - "pridPersistence": DIGG_OID + "5", - "protocolInformation": X500ATTR_OID + "48", - "pseudonym": X500ATTR_OID + "65", - "PVP-USERID": LDAPGVAT_UCL_DIR_PILOT + "1", - "PVP-MAIL": LDAPGVAT_UCL_DIR_PILOT + "3", - "PVP-GID": LDAPGVAT_OID + "1", - "PVP-BPK": LDAPGVAT_OID + "149", - "PVP-OU-OKZ": LDAPGVAT_OID + "153", - "PVP-VERSION": LDAPGVAT_OID + "261.10", - "PVP-PRINCIPAL-NAME": LDAPGVAT_OID + "261.20", - "PVP-PARTICIPANT-OKZ": LDAPGVAT_OID + "261.24", - "PVP-ROLES": LDAPGVAT_OID + "261.30", - "PVP-INVOICE-RECPT-ID": LDAPGVAT_OID + "261.40", - "PVP-COST-CENTER-ID": LDAPGVAT_OID + "261.50", - "PVP-CHARGE-CODE": LDAPGVAT_OID + "261.60", - "PVP-OU-GV-OU-ID": LDAPGVAT_OID + "3", - "PVP-FUNCTION": LDAPGVAT_OID + "33", - "PVP-BIRTHDATE": LDAPGVAT_OID + "55", - "PVP-PARTICIPANT-ID": LDAPGVAT_OID + "71", - "PVP-OU": LDAPGVAT_X500ATTR_OID + "11", - "PVP-TEL": LDAPGVAT_X500ATTR_OID + "20", - "PVP-GIVENNAME": LDAPGVAT_X500ATTR_OID + "42", - "registeredAddress": X500ATTR_OID + "26", - "roleOccupant": X500ATTR_OID + "33", - "sad": DIGG_OID + "12", - "schacCountryOfCitizenship": SCHAC + "5", - "schacCountryOfResidence": SCHAC + "11", - "schacDateOfBirth": SCHAC + "3", - "schacExpiryDate": SCHAC + "17", - "schacGender": SCHAC + "2", - "schacHomeOrganization": SCHAC + "9", - "schacHomeOrganizationType": SCHAC + "10", - "schacMotherTongue": SCHAC + "1", - "schacPersonalPosition": SCHAC + "13", - "schacPersonalTitle": SCHAC + "8", - "schacPersonalUniqueCode": SCHAC + "14", - "schacPersonalUniqueID": SCHAC + "15", - "schacPlaceOfBirth": SCHAC + "4", - "schacProjectMembership": SCHAC + "20", - "schacProjectSpecificRole": SCHAC + "21", - "schacSn1": SCHAC + "6", - "schacSn2": SCHAC + "7", - "schacUserPresenceID": SCHAC + "12", - "schacUserPrivateAttribute": SCHAC + "18", - "schacUserStatus": SCHAC + "19", - "searchGuide": X500ATTR_OID + "14", - "serialNumber": X500ATTR_OID + "5", - "signMessageDigest": DIGG_OID + "14", - "sisLegalGuardianFor": SIS + "1", - "sisSchoolGrade": SIS + "2", - "sn": X500ATTR_OID + "4", - "st": X500ATTR_OID + "8", - "street": X500ATTR_OID + "9", - "subject-id": SAML_SUBJECT_ID + "subject-id", - "supportedAlgorithms": X500ATTR_OID + "52", - "supportedApplicationContext": X500ATTR_OID + "30", - "telephoneNumber": X500ATTR_OID + "20", - "teletexTerminalIdentifier": X500ATTR_OID + "22", - "telexNumber": X500ATTR_OID + "21", - "title": X500ATTR_OID + "12", - "transactionIdentifier": DIGG_OID + "2", - "uid": UCL_DIR_PILOT + "1", - "uniqueMember": X500ATTR_OID + "50", - "userCertificate": X500ATTR_OID + "36", + "LegalPersonIdentifier": f"{EIDAS_LEGALPERSON}LegalPersonIdentifier", + "LegalAddress": f"{EIDAS_LEGALPERSON}LegalPersonAddress", + "LegalName": f"{EIDAS_LEGALPERSON}LegalName", + "VATRegistration": f"{EIDAS_LEGALPERSON}VATRegistrationNumber", + "TaxReference": f"{EIDAS_LEGALPERSON}TaxReference", + "BusinessCodes": f"{EIDAS_LEGALPERSON}BusinessCodes", + "LEI": f"{EIDAS_LEGALPERSON}LEI", + "EORI": f"{EIDAS_LEGALPERSON}EORI", + "SEED": f"{EIDAS_LEGALPERSON}SEED", + "SIC": f"{EIDAS_LEGALPERSON}SIC", + "D-2012-17-EUIdentifier": f"{EIDAS_LEGALPERSON}D-2012-17-EUIdentifier", + "PersonIdentifier": f"{EIDAS_NATURALPERSON}PersonIdentifier", + "FamilyName": f"{EIDAS_NATURALPERSON}CurrentFamilyName", + "FirstName": f"{EIDAS_NATURALPERSON}CurrentGivenName", + "DateOfBirth": f"{EIDAS_NATURALPERSON}DateOfBirth", + "BirthName": f"{EIDAS_NATURALPERSON}BirthName", + "PlaceOfBirth": f"{EIDAS_NATURALPERSON}PlaceOfBirth", + "CurrentAddress": f"{EIDAS_NATURALPERSON}CurrentAddress", + "Gender": f"{EIDAS_NATURALPERSON}Gender", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "authContextParams": f"{DIGG_OID}3", + "authorityRevocationList": f"{X500ATTR_OID}38", + "authServerSignature": f"{DIGG_OID}13", + "birthName": f"{DIGG_OID}8", + "businessCategory": f"{X500ATTR_OID}15", + "c": f"{X500ATTR_OID}6", + "cACertificate": f"{X500ATTR_OID}37", + "carLicense": f"{NETSCAPE_LDAP}1", + "certificateRevocationList": f"{X500ATTR_OID}39", + "cn": f"{X500ATTR_OID}3", + "co": f"{UCL_DIR_PILOT}43", + "countryOfCitizenship": f"{PKIX_OID}4", + "countryOfResidence": f"{PKIX_OID}5", + "crossCertificatePair": f"{X500ATTR_OID}40", + "dateOfBirth": f"{PKIX_OID}1", + "dc": f"{UCL_DIR_PILOT}25", + "deltaRevocationList": f"{X500ATTR_OID}53", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "destinationIndicator": f"{X500ATTR_OID}27", + "displayName": f"{NETSCAPE_LDAP}241", + "dmdName": f"{X500ATTR_OID}54", + "dnQualifier": f"{X500ATTR_OID}46", + "EAAHash": f"{UMBRELLA_EAAUser_ID}1", + "EAAKey": f"{UMBRELLA_EAAUser_ID}3", + "eduCourseMember": f"{EDUCOURSE_OID}2", + "eduCourseOffering": f"{EDUCOURSE_OID}1", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "eduPersonPrincipalNamePrior": f"{EDUPERSON_OID}12", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "eduPersonUniqueId": f"{EDUPERSON_OID}13", + "eduPersonOrcid": f"{EDUPERSON_OID}16", + "eidasNaturalPersonAddress": f"{DIGG_OID}9", + "eidasPersonIdentifier": f"{DIGG_OID}7", + "email": f"{PKCS_9}1", + "employeeHsaId": f"{INERA_OID}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "employeeType": f"{NETSCAPE_LDAP}4", + "enhancedSearchGuide": f"{X500ATTR_OID}47", + "facsimileTelephoneNumber": f"{X500ATTR_OID}23", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "gender": f"{PKIX_OID}3", + "generationQualifier": f"{X500ATTR_OID}44", + "givenName": f"{X500ATTR_OID}42", + "houseIdentifier": f"{X500ATTR_OID}51", + "initials": f"{X500ATTR_OID}43", + "internationaliSDNNumber": f"{X500ATTR_OID}25", + "isMemberOf": f"{EDUMEMBER1_OID}1", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "knowledgeInformation": f"{X500ATTR_OID}2", + "l": f"{X500ATTR_OID}7", + "labeledURI": f"{UMICH}57", + "mail": f"{UCL_DIR_PILOT}3", + "member": f"{X500ATTR_OID}31", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "norEduOrgNIN": f"{NOREDUPERSON_OID}12", + "norEduOrgSchemaVersion": f"{NOREDUPERSON_OID}11", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "norEduPersonLegalName": f"{NOREDUPERSON_OID}10", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "o": f"{X500ATTR_OID}10", + "osiHomeUrl": f"{OPENOSI_OID}17", + "osiPreferredTZ": f"{OPENOSI_OID}19", + "osiICardTimeLastUpdated": f"{OPENOSI_OID}72", + "osiMiddleName": f"{OPENOSI_OID}104", + "osiOtherEmail": f"{OPENOSI_OID}107", + "osiOtherHomePhone": f"{OPENOSI_OID}109", + "osiWorkURL": f"{OPENOSI_OID}120", + "ou": f"{X500ATTR_OID}11", + "orgAffiliation": f"{DIGG_OID}1", + "owner": f"{X500ATTR_OID}32", + "pairwise-id": f"{SAML_SUBJECT_ID}pairwise-id", + "personalIdentityNumber": f"{INERA_OID}13", + "personalIdentityNumberBinding": f"{DIGG_OID}6", + "physicalDeliveryOfficeName": f"{X500ATTR_OID}19", + "placeOfBirth": f"{PKIX_OID}2", + "postOfficeBox": f"{X500ATTR_OID}18", + "postalAddress": f"{X500ATTR_OID}16", + "postalCode": f"{X500ATTR_OID}17", + "preferredDeliveryMethod": f"{X500ATTR_OID}28", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "presentationAddress": f"{X500ATTR_OID}29", + "prid": f"{DIGG_OID}4", + "pridPersistence": f"{DIGG_OID}5", + "protocolInformation": f"{X500ATTR_OID}48", + "pseudonym": f"{X500ATTR_OID}65", + "PVP-USERID": f"{LDAPGVAT_UCL_DIR_PILOT}1", + "PVP-MAIL": f"{LDAPGVAT_UCL_DIR_PILOT}3", + "PVP-GID": f"{LDAPGVAT_OID}1", + "PVP-BPK": f"{LDAPGVAT_OID}149", + "PVP-OU-OKZ": f"{LDAPGVAT_OID}153", + "PVP-VERSION": f"{LDAPGVAT_OID}261.10", + "PVP-PRINCIPAL-NAME": f"{LDAPGVAT_OID}261.20", + "PVP-PARTICIPANT-OKZ": f"{LDAPGVAT_OID}261.24", + "PVP-ROLES": f"{LDAPGVAT_OID}261.30", + "PVP-INVOICE-RECPT-ID": f"{LDAPGVAT_OID}261.40", + "PVP-COST-CENTER-ID": f"{LDAPGVAT_OID}261.50", + "PVP-CHARGE-CODE": f"{LDAPGVAT_OID}261.60", + "PVP-OU-GV-OU-ID": f"{LDAPGVAT_OID}3", + "PVP-FUNCTION": f"{LDAPGVAT_OID}33", + "PVP-BIRTHDATE": f"{LDAPGVAT_OID}55", + "PVP-PARTICIPANT-ID": f"{LDAPGVAT_OID}71", + "PVP-OU": f"{LDAPGVAT_X500ATTR_OID}11", + "PVP-TEL": f"{LDAPGVAT_X500ATTR_OID}20", + "PVP-GIVENNAME": f"{LDAPGVAT_X500ATTR_OID}42", + "registeredAddress": f"{X500ATTR_OID}26", + "roleOccupant": f"{X500ATTR_OID}33", + "sad": f"{DIGG_OID}12", + "schacCountryOfCitizenship": f"{SCHAC}5", + "schacCountryOfResidence": f"{SCHAC}11", + "schacDateOfBirth": f"{SCHAC}3", + "schacExpiryDate": f"{SCHAC}17", + "schacGender": f"{SCHAC}2", + "schacHomeOrganization": f"{SCHAC}9", + "schacHomeOrganizationType": f"{SCHAC}10", + "schacMotherTongue": f"{SCHAC}1", + "schacPersonalPosition": f"{SCHAC}13", + "schacPersonalTitle": f"{SCHAC}8", + "schacPersonalUniqueCode": f"{SCHAC}14", + "schacPersonalUniqueID": f"{SCHAC}15", + "schacPlaceOfBirth": f"{SCHAC}4", + "schacProjectMembership": f"{SCHAC}20", + "schacProjectSpecificRole": f"{SCHAC}21", + "schacSn1": f"{SCHAC}6", + "schacSn2": f"{SCHAC}7", + "schacUserPresenceID": f"{SCHAC}12", + "schacUserPrivateAttribute": f"{SCHAC}18", + "schacUserStatus": f"{SCHAC}19", + "searchGuide": f"{X500ATTR_OID}14", + "serialNumber": f"{X500ATTR_OID}5", + "signMessageDigest": f"{DIGG_OID}14", + "sisLegalGuardianFor": f"{SIS}1", + "sisSchoolGrade": f"{SIS}2", + "sn": f"{X500ATTR_OID}4", + "st": f"{X500ATTR_OID}8", + "street": f"{X500ATTR_OID}9", + "subject-id": f"{SAML_SUBJECT_ID}subject-id", + "supportedAlgorithms": f"{X500ATTR_OID}52", + "supportedApplicationContext": f"{X500ATTR_OID}30", + "telephoneNumber": f"{X500ATTR_OID}20", + "teletexTerminalIdentifier": f"{X500ATTR_OID}22", + "telexNumber": f"{X500ATTR_OID}21", + "title": f"{X500ATTR_OID}12", + "transactionIdentifier": f"{DIGG_OID}2", + "uid": f"{UCL_DIR_PILOT}1", + "uniqueMember": f"{X500ATTR_OID}50", + "userCertificate": f"{X500ATTR_OID}36", # 'userCertificate': DIGG_OID+'10', - "userPKCS12": NETSCAPE_LDAP + "216", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "userSignature": DIGG_OID + "11", - "x121Address": X500ATTR_OID + "24", - "x500UniqueIdentifier": X500ATTR_OID + "45", - "swissEduPersonUniqueID": SWISSEDUPERSON_OID + "1", - "swissEduPersonDateOfBirth": SWISSEDUPERSON_OID + "2", - "swissEduPersonGender": SWISSEDUPERSON_OID + "3", - "swissEduPersonHomeOrganization": SWISSEDUPERSON_OID + "4", - "swissEduPersonHomeOrganizationType": SWISSEDUPERSON_OID + "5", - "swissEduPersonStudyBranch1": SWISSEDUPERSON_OID + "6", - "swissEduPersonStudyBranch2": SWISSEDUPERSON_OID + "7", - "swissEduPersonStudyBranch3": SWISSEDUPERSON_OID + "8", - "swissEduPersonStudyLevel": SWISSEDUPERSON_OID + "9", - "swissEduPersonStaffCategory": SWISSEDUPERSON_OID + "10", - "swissEduPersonMatriculationNumber": SWISSEDUPERSON_OID + "11", - "swissEduPersonCardUID": SWISSEDUPERSON_OID + "12", - "swissEduID": SWISSEDUPERSON_OID + "13", - "swissLibraryPersonAffiliation": SWISSEDUPERSON_OID + "1023", - "swissLibraryPersonResidence": SWISSEDUPERSON_OID + "1025", - "voPersonAffiliation": VOPERSON_V2_OID + "10", - "voPersonApplicationPassword": VOPERSON_V2_OID + "13", - "voPersonApplicationUID": VOPERSON_V2_OID + "1", - "voPersonAuthorName": VOPERSON_V2_OID + "2", - "voPersonCertificateDN": VOPERSON_V2_OID + "3", - "voPersonCertificateIssuerDN": VOPERSON_V2_OID + "4", - "voPersonExternalAffiliation": VOPERSON_V2_OID + "11", - "voPersonExternalID": VOPERSON_V2_OID + "5", - "voPersonID": VOPERSON_V2_OID + "6", - "voPersonPolicyAgreement": VOPERSON_V2_OID + "7", - "voPersonScopedAffiliation": VOPERSON_V2_OID + "12", - "voPersonSoRID": VOPERSON_V2_OID + "8", - "voPersonStatus": VOPERSON_V2_OID + "9", - "voPersonToken": VOPERSON_V2_OID + "15", - "voPersonVerifiedEmail": VOPERSON_V2_OID + "14", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "userSignature": f"{DIGG_OID}11", + "x121Address": f"{X500ATTR_OID}24", + "x500UniqueIdentifier": f"{X500ATTR_OID}45", + "swissEduPersonUniqueID": f"{SWISSEDUPERSON_OID}1", + "swissEduPersonDateOfBirth": f"{SWISSEDUPERSON_OID}2", + "swissEduPersonGender": f"{SWISSEDUPERSON_OID}3", + "swissEduPersonHomeOrganization": f"{SWISSEDUPERSON_OID}4", + "swissEduPersonHomeOrganizationType": f"{SWISSEDUPERSON_OID}5", + "swissEduPersonStudyBranch1": f"{SWISSEDUPERSON_OID}6", + "swissEduPersonStudyBranch2": f"{SWISSEDUPERSON_OID}7", + "swissEduPersonStudyBranch3": f"{SWISSEDUPERSON_OID}8", + "swissEduPersonStudyLevel": f"{SWISSEDUPERSON_OID}9", + "swissEduPersonStaffCategory": f"{SWISSEDUPERSON_OID}10", + "swissEduPersonMatriculationNumber": f"{SWISSEDUPERSON_OID}11", + "swissEduPersonCardUID": f"{SWISSEDUPERSON_OID}12", + "swissEduID": f"{SWISSEDUPERSON_OID}13", + "swissLibraryPersonAffiliation": f"{SWISSEDUPERSON_OID}1023", + "swissLibraryPersonResidence": f"{SWISSEDUPERSON_OID}1025", + "voPersonAffiliation": f"{VOPERSON_V2_OID}10", + "voPersonApplicationPassword": f"{VOPERSON_V2_OID}13", + "voPersonApplicationUID": f"{VOPERSON_V2_OID}1", + "voPersonAuthorName": f"{VOPERSON_V2_OID}2", + "voPersonCertificateDN": f"{VOPERSON_V2_OID}3", + "voPersonCertificateIssuerDN": f"{VOPERSON_V2_OID}4", + "voPersonExternalAffiliation": f"{VOPERSON_V2_OID}11", + "voPersonExternalID": f"{VOPERSON_V2_OID}5", + "voPersonID": f"{VOPERSON_V2_OID}6", + "voPersonPolicyAgreement": f"{VOPERSON_V2_OID}7", + "voPersonScopedAffiliation": f"{VOPERSON_V2_OID}12", + "voPersonSoRID": f"{VOPERSON_V2_OID}8", + "voPersonStatus": f"{VOPERSON_V2_OID}9", + "voPersonToken": f"{VOPERSON_V2_OID}15", + "voPersonVerifiedEmail": f"{VOPERSON_V2_OID}14", }, } diff --git a/src/saml2/attributemaps/shibboleth_uri.py b/src/saml2/attributemaps/shibboleth_uri.py index 6de6b276..7ddef3e0 100644 --- a/src/saml2/attributemaps/shibboleth_uri.py +++ b/src/saml2/attributemaps/shibboleth_uri.py @@ -10,188 +10,188 @@ X500ATTR = "urn:oid:2.5.4." MAP = { "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri", "fro": { - EDUPERSON_OID + "1": "eduPersonAffiliation", - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "3": "eduPersonOrgDN", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - EDUPERSON_OID + "7": "eduPersonEntitlement", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "12": "eduPersonPrincipalNamePrior", - EDUPERSON_OID + "13": "eduPersonUniqueId", - EDUPERSON_OID + "16": "eduPersonOrcid", - NETSCAPE_LDAP + "1": "carLicense", - NETSCAPE_LDAP + "2": "departmentNumber", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "4": "employeeType", - NETSCAPE_LDAP + "39": "preferredLanguage", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NETSCAPE_LDAP + "216": "userPKCS12", - NETSCAPE_LDAP + "241": "displayName", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - PKCS_9 + "1": "email", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - UCL_DIR_PILOT + "37": "associatedDomain", - UCL_DIR_PILOT + "60": "jpegPhoto", - X500ATTR + "2": "knowledgeInformation", - X500ATTR + "4": "sn", - X500ATTR + "5": "serialNumber", - X500ATTR + "6": "c", - X500ATTR + "7": "l", - X500ATTR + "8": "st", - X500ATTR + "9": "street", - X500ATTR + "10": "o", - X500ATTR + "11": "ou", - X500ATTR + "12": "title", - X500ATTR + "14": "searchGuide", - X500ATTR + "15": "businessCategory", - X500ATTR + "16": "postalAddress", - X500ATTR + "17": "postalCode", - X500ATTR + "18": "postOfficeBox", - X500ATTR + "19": "physicalDeliveryOfficeName", - X500ATTR + "20": "telephoneNumber", - X500ATTR + "21": "telexNumber", - X500ATTR + "22": "teletexTerminalIdentifier", - X500ATTR + "23": "facsimileTelephoneNumber", - X500ATTR + "24": "x121Address", - X500ATTR + "25": "internationaliSDNNumber", - X500ATTR + "26": "registeredAddress", - X500ATTR + "27": "destinationIndicator", - X500ATTR + "28": "preferredDeliveryMethod", - X500ATTR + "29": "presentationAddress", - X500ATTR + "30": "supportedApplicationContext", - X500ATTR + "31": "member", - X500ATTR + "32": "owner", - X500ATTR + "33": "roleOccupant", - X500ATTR + "36": "userCertificate", - X500ATTR + "37": "cACertificate", - X500ATTR + "38": "authorityRevocationList", - X500ATTR + "39": "certificateRevocationList", - X500ATTR + "40": "crossCertificatePair", - X500ATTR + "42": "givenName", - X500ATTR + "43": "initials", - X500ATTR + "44": "generationQualifier", - X500ATTR + "45": "x500UniqueIdentifier", - X500ATTR + "46": "dnQualifier", - X500ATTR + "47": "enhancedSearchGuide", - X500ATTR + "48": "protocolInformation", - X500ATTR + "50": "uniqueMember", - X500ATTR + "51": "houseIdentifier", - X500ATTR + "52": "supportedAlgorithms", - X500ATTR + "53": "deltaRevocationList", - X500ATTR + "54": "dmdName", - X500ATTR + "65": "pseudonym", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}12": "eduPersonPrincipalNamePrior", + f"{EDUPERSON_OID}13": "eduPersonUniqueId", + f"{EDUPERSON_OID}16": "eduPersonOrcid", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{NETSCAPE_LDAP}241": "displayName", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{PKCS_9}1": "email", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{X500ATTR}2": "knowledgeInformation", + f"{X500ATTR}4": "sn", + f"{X500ATTR}5": "serialNumber", + f"{X500ATTR}6": "c", + f"{X500ATTR}7": "l", + f"{X500ATTR}8": "st", + f"{X500ATTR}9": "street", + f"{X500ATTR}10": "o", + f"{X500ATTR}11": "ou", + f"{X500ATTR}12": "title", + f"{X500ATTR}14": "searchGuide", + f"{X500ATTR}15": "businessCategory", + f"{X500ATTR}16": "postalAddress", + f"{X500ATTR}17": "postalCode", + f"{X500ATTR}18": "postOfficeBox", + f"{X500ATTR}19": "physicalDeliveryOfficeName", + f"{X500ATTR}20": "telephoneNumber", + f"{X500ATTR}21": "telexNumber", + f"{X500ATTR}22": "teletexTerminalIdentifier", + f"{X500ATTR}23": "facsimileTelephoneNumber", + f"{X500ATTR}24": "x121Address", + f"{X500ATTR}25": "internationaliSDNNumber", + f"{X500ATTR}26": "registeredAddress", + f"{X500ATTR}27": "destinationIndicator", + f"{X500ATTR}28": "preferredDeliveryMethod", + f"{X500ATTR}29": "presentationAddress", + f"{X500ATTR}30": "supportedApplicationContext", + f"{X500ATTR}31": "member", + f"{X500ATTR}32": "owner", + f"{X500ATTR}33": "roleOccupant", + f"{X500ATTR}36": "userCertificate", + f"{X500ATTR}37": "cACertificate", + f"{X500ATTR}38": "authorityRevocationList", + f"{X500ATTR}39": "certificateRevocationList", + f"{X500ATTR}40": "crossCertificatePair", + f"{X500ATTR}42": "givenName", + f"{X500ATTR}43": "initials", + f"{X500ATTR}44": "generationQualifier", + f"{X500ATTR}45": "x500UniqueIdentifier", + f"{X500ATTR}46": "dnQualifier", + f"{X500ATTR}47": "enhancedSearchGuide", + f"{X500ATTR}48": "protocolInformation", + f"{X500ATTR}50": "uniqueMember", + f"{X500ATTR}51": "houseIdentifier", + f"{X500ATTR}52": "supportedAlgorithms", + f"{X500ATTR}53": "deltaRevocationList", + f"{X500ATTR}54": "dmdName", + f"{X500ATTR}65": "pseudonym", }, "to": { - "associatedDomain": UCL_DIR_PILOT + "37", - "authorityRevocationList": X500ATTR + "38", - "businessCategory": X500ATTR + "15", - "c": X500ATTR + "6", - "cACertificate": X500ATTR + "37", - "carLicense": NETSCAPE_LDAP + "1", - "certificateRevocationList": X500ATTR + "39", - "countryName": X500ATTR + "6", - "crossCertificatePair": X500ATTR + "40", - "dc": UCL_DIR_PILOT + "25", - "deltaRevocationList": X500ATTR + "53", - "departmentNumber": NETSCAPE_LDAP + "2", - "destinationIndicator": X500ATTR + "27", - "displayName": NETSCAPE_LDAP + "241", - "dmdName": X500ATTR + "54", - "dnQualifier": X500ATTR + "46", - "domainComponent": UCL_DIR_PILOT + "25", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "eduPersonNickname": EDUPERSON_OID + "2", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "eduPersonPrincipalNamePrior": EDUPERSON_OID + "12", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "eduPersonUniqueId": EDUPERSON_OID + "13", - "eduPersonOrcid": EDUPERSON_OID + "16", - "email": PKCS_9 + "1", - "emailAddress": PKCS_9 + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "employeeType": NETSCAPE_LDAP + "4", - "enhancedSearchGuide": X500ATTR + "47", - "facsimileTelephoneNumber": X500ATTR + "23", - "fax": X500ATTR + "23", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "generationQualifier": X500ATTR + "44", - "givenName": X500ATTR + "42", - "gn": X500ATTR + "42", - "houseIdentifier": X500ATTR + "51", - "initials": X500ATTR + "43", - "internationaliSDNNumber": X500ATTR + "25", - "jpegPhoto": UCL_DIR_PILOT + "60", - "knowledgeInformation": X500ATTR + "2", - "l": X500ATTR + "7", - "localityName": X500ATTR + "7", - "mail": UCL_DIR_PILOT + "3", - "member": X500ATTR + "31", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "o": X500ATTR + "10", - "organizationName": X500ATTR + "10", - "organizationalUnitName": X500ATTR + "11", - "ou": X500ATTR + "11", - "owner": X500ATTR + "32", - "physicalDeliveryOfficeName": X500ATTR + "19", - "pkcs9email": PKCS_9 + "1", - "postOfficeBox": X500ATTR + "18", - "postalAddress": X500ATTR + "16", - "postalCode": X500ATTR + "17", - "preferredDeliveryMethod": X500ATTR + "28", - "preferredLanguage": NETSCAPE_LDAP + "39", - "presentationAddress": X500ATTR + "29", - "protocolInformation": X500ATTR + "48", - "pseudonym": X500ATTR + "65", - "registeredAddress": X500ATTR + "26", - "rfc822Mailbox": UCL_DIR_PILOT + "3", - "roleOccupant": X500ATTR + "33", - "searchGuide": X500ATTR + "14", - "serialNumber": X500ATTR + "5", - "sn": X500ATTR + "4", - "st": X500ATTR + "8", - "stateOrProvinceName": X500ATTR + "8", - "street": X500ATTR + "9", - "streetAddress": X500ATTR + "9", - "supportedAlgorithms": X500ATTR + "52", - "supportedApplicationContext": X500ATTR + "30", - "surname": X500ATTR + "4", - "telephoneNumber": X500ATTR + "20", - "teletexTerminalIdentifier": X500ATTR + "22", - "telexNumber": X500ATTR + "21", - "title": X500ATTR + "12", - "uniqueMember": X500ATTR + "50", - "userCertificate": X500ATTR + "36", - "userPKCS12": NETSCAPE_LDAP + "216", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "x121Address": X500ATTR + "24", - "x500UniqueIdentifier": X500ATTR + "45", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "authorityRevocationList": f"{X500ATTR}38", + "businessCategory": f"{X500ATTR}15", + "c": f"{X500ATTR}6", + "cACertificate": f"{X500ATTR}37", + "carLicense": f"{NETSCAPE_LDAP}1", + "certificateRevocationList": f"{X500ATTR}39", + "countryName": f"{X500ATTR}6", + "crossCertificatePair": f"{X500ATTR}40", + "dc": f"{UCL_DIR_PILOT}25", + "deltaRevocationList": f"{X500ATTR}53", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "destinationIndicator": f"{X500ATTR}27", + "displayName": f"{NETSCAPE_LDAP}241", + "dmdName": f"{X500ATTR}54", + "dnQualifier": f"{X500ATTR}46", + "domainComponent": f"{UCL_DIR_PILOT}25", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "eduPersonPrincipalNamePrior": f"{EDUPERSON_OID}12", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "eduPersonUniqueId": f"{EDUPERSON_OID}13", + "eduPersonOrcid": f"{EDUPERSON_OID}16", + "email": f"{PKCS_9}1", + "emailAddress": f"{PKCS_9}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "employeeType": f"{NETSCAPE_LDAP}4", + "enhancedSearchGuide": f"{X500ATTR}47", + "facsimileTelephoneNumber": f"{X500ATTR}23", + "fax": f"{X500ATTR}23", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "generationQualifier": f"{X500ATTR}44", + "givenName": f"{X500ATTR}42", + "gn": f"{X500ATTR}42", + "houseIdentifier": f"{X500ATTR}51", + "initials": f"{X500ATTR}43", + "internationaliSDNNumber": f"{X500ATTR}25", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "knowledgeInformation": f"{X500ATTR}2", + "l": f"{X500ATTR}7", + "localityName": f"{X500ATTR}7", + "mail": f"{UCL_DIR_PILOT}3", + "member": f"{X500ATTR}31", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "o": f"{X500ATTR}10", + "organizationName": f"{X500ATTR}10", + "organizationalUnitName": f"{X500ATTR}11", + "ou": f"{X500ATTR}11", + "owner": f"{X500ATTR}32", + "physicalDeliveryOfficeName": f"{X500ATTR}19", + "pkcs9email": f"{PKCS_9}1", + "postOfficeBox": f"{X500ATTR}18", + "postalAddress": f"{X500ATTR}16", + "postalCode": f"{X500ATTR}17", + "preferredDeliveryMethod": f"{X500ATTR}28", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "presentationAddress": f"{X500ATTR}29", + "protocolInformation": f"{X500ATTR}48", + "pseudonym": f"{X500ATTR}65", + "registeredAddress": f"{X500ATTR}26", + "rfc822Mailbox": f"{UCL_DIR_PILOT}3", + "roleOccupant": f"{X500ATTR}33", + "searchGuide": f"{X500ATTR}14", + "serialNumber": f"{X500ATTR}5", + "sn": f"{X500ATTR}4", + "st": f"{X500ATTR}8", + "stateOrProvinceName": f"{X500ATTR}8", + "street": f"{X500ATTR}9", + "streetAddress": f"{X500ATTR}9", + "supportedAlgorithms": f"{X500ATTR}52", + "supportedApplicationContext": f"{X500ATTR}30", + "surname": f"{X500ATTR}4", + "telephoneNumber": f"{X500ATTR}20", + "teletexTerminalIdentifier": f"{X500ATTR}22", + "telexNumber": f"{X500ATTR}21", + "title": f"{X500ATTR}12", + "uniqueMember": f"{X500ATTR}50", + "userCertificate": f"{X500ATTR}36", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "x121Address": f"{X500ATTR}24", + "x500UniqueIdentifier": f"{X500ATTR}45", }, } diff --git a/src/saml2/client.py b/src/saml2/client.py index 1a40258d..0e77bad1 100644 --- a/src/saml2/client.py +++ b/src/saml2/client.py @@ -451,7 +451,7 @@ class Saml2Client(Base): else: response = _response_func(response.content) else: - raise HTTPError("%d:%s" % (response.status_code, response.error)) + raise HTTPError(f"{int(response.status_code)}:{response.error}") if response: # not_done.remove(entity_id) diff --git a/src/saml2/httputil.py b/src/saml2/httputil.py index 5ff1282d..7217b147 100644 --- a/src/saml2/httputil.py +++ b/src/saml2/httputil.py @@ -200,21 +200,21 @@ def geturl(environ, query=True, path=True, use_server_name=False): :param use_server_name: If SERVER_NAME/_HOST should be used instead of HTTP_HOST """ - url = [environ["wsgi.url_scheme"] + "://"] + url = [f"{environ['wsgi.url_scheme']}://"] if use_server_name: url.append(environ["SERVER_NAME"]) if environ["wsgi.url_scheme"] == "https": if environ["SERVER_PORT"] != "443": - url.append(":" + environ["SERVER_PORT"]) + url.append(f":{environ['SERVER_PORT']}") else: if environ["SERVER_PORT"] != "80": - url.append(":" + environ["SERVER_PORT"]) + url.append(f":{environ['SERVER_PORT']}") else: url.append(environ["HTTP_HOST"]) if path: url.append(getpath(environ)) if query and environ.get("QUERY_STRING"): - url.append("?" + environ["QUERY_STRING"]) + url.append(f"?{environ['QUERY_STRING']}") return "".join(url) diff --git a/src/saml2/ident.py b/src/saml2/ident.py index 3a05c1d8..c7d37c0d 100644 --- a/src/saml2/ident.py +++ b/src/saml2/ident.py @@ -40,7 +40,7 @@ def code(item): for attr in ATTR: val = getattr(item, attr) if val: - _res.append("%d=%s" % (i, quote(val))) + _res.append(f"{int(i)}={quote(val)}") i += 1 return ",".join(_res) diff --git a/src/saml2/mcache.py b/src/saml2/mcache.py index 9540d0f0..c464cfc2 100644 --- a/src/saml2/mcache.py +++ b/src/saml2/mcache.py @@ -57,7 +57,7 @@ class Cache: res = {} oldees = [] - for (entity_id, item) in self._cache.get_multi(entities, subject_id + "_").items(): + for (entity_id, item) in self._cache.get_multi(entities, f"{subject_id}_").items(): try: info = self.get_info(item) except TooOld: diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py index 639c7a2d..b2bae0a7 100644 --- a/src/saml2/mdstore.py +++ b/src/saml2/mdstore.py @@ -131,7 +131,7 @@ def load_extensions(): from saml2 import extension package = extension - prefix = package.__name__ + "." + prefix = f"{package.__name__}." ext_map = {} for importer, modname, ispkg in pkgutil.iter_modules(package.__path__, prefix): module = __import__(modname, fromlist="dummy") diff --git a/src/saml2/metadata.py b/src/saml2/metadata.py index d7f19453..9ac8d69c 100644 --- a/src/saml2/metadata.py +++ b/src/saml2/metadata.py @@ -393,7 +393,7 @@ def do_endpoints(conf, endpoints): if indexed: if "index" not in args: - args["index"] = "%d" % i + args["index"] = f"{int(i)}" i += 1 else: try: @@ -764,10 +764,10 @@ def entities_descriptor(eds, valid_for, name, ident, sign, secc, sign_alg=None, ident = sid() if not secc.key_file: - raise SAMLError("If you want to do signing you should define " + "a key to sign with") + raise SAMLError(f"If you want to do signing you should define a key to sign with") if not secc.my_cert: - raise SAMLError("If you want to do signing you should define " + "where your public key are") + raise SAMLError(f"If you want to do signing you should define where your public key are") entities.signature = pre_signature_part(ident, secc.my_cert, 1, sign_alg=sign_alg, digest_alg=digest_alg) entities.id = ident diff --git a/src/saml2/response.py b/src/saml2/response.py index 3b564c62..2bc147db 100644 --- a/src/saml2/response.py +++ b/src/saml2/response.py @@ -331,7 +331,7 @@ class StatusResponse: self.response = self.sec.check_signature(instance) except SignatureError: # The response as a whole might be signed or not - self.response = self.sec.check_signature(instance, samlp.NAMESPACE + ":Response") + self.response = self.sec.check_signature(instance, f"{samlp.NAMESPACE}:Response") else: self.not_signed = True self.response = instance diff --git a/src/saml2/s2repoze/plugins/sp.py b/src/saml2/s2repoze/plugins/sp.py index d71541ea..7079d96f 100644 --- a/src/saml2/s2repoze/plugins/sp.py +++ b/src/saml2/s2repoze/plugins/sp.py @@ -59,7 +59,7 @@ def construct_came_from(environ): came_from = environ.get("PATH_INFO") qstr = environ.get("QUERY_STRING", "") if qstr: - came_from += "?" + qstr + came_from += f"?{qstr}" return came_from diff --git a/src/saml2/s_utils.py b/src/saml2/s_utils.py index 1284e3e9..2e8b4406 100644 --- a/src/saml2/s_utils.py +++ b/src/saml2/s_utils.py @@ -194,7 +194,7 @@ def sid(): :return: A random string prefix with 'id-' to make it compliant with the NCName specification """ - return "id-" + rndstr(17) + return f"id-{rndstr(17)}" def parse_attribute_map(filenames): diff --git a/src/saml2/time_util.py b/src/saml2/time_util.py index 37cd2319..c3e5b139 100644 --- a/src/saml2/time_util.py +++ b/src/saml2/time_util.py @@ -237,7 +237,7 @@ def str_to_time(timestr, format=TIME_FORMAT): except Exception as exc: print(f"Exception: {exc} on {timestr}", file=sys.stderr) raise - then = time.strptime(elem.groups()[0] + "Z", TIME_FORMAT) + then = time.strptime(f"{elem.groups()[0]}Z", TIME_FORMAT) return time.gmtime(calendar.timegm(then)) diff --git a/src/saml2/validate.py b/src/saml2/validate.py index ae66504b..51a41b99 100644 --- a/src/saml2/validate.py +++ b/src/saml2/validate.py @@ -112,9 +112,7 @@ def validate_before(not_before, slack): nbefore = calendar.timegm(time_util.str_to_time(not_before)) if nbefore > now + slack: now_str = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime(now)) - raise ToEarly( - "Can't use response yet: (now=%s + slack=%d) " "<= notbefore=%s" % (now_str, slack, not_before) - ) + raise ToEarly(f"Can't use response yet: (now={now_str} + slack={int(slack)}) <= notbefore={not_before}") return True diff --git a/tests/_test_80_p11_backend.py b/tests/_test_80_p11_backend.py index 475eeb83..ea0ef4b4 100644 --- a/tests/_test_80_p11_backend.py +++ b/tests/_test_80_p11_backend.py @@ -202,7 +202,7 @@ class TestPKCS11: logging.debug(out) rv = proc.wait() if rv: - raise RuntimeError("command exited with code != 0: %d" % rv) + raise RuntimeError(f"command exited with code != 0: {int(rv)}") def test_SAML_sign_with_pkcs11(self): """ diff --git a/tests/aa_conf.py b/tests/aa_conf.py index 8f728974..48059119 100644 --- a/tests/aa_conf.py +++ b/tests/aa_conf.py @@ -12,8 +12,8 @@ CONFIG = { "service": { "aa": { "endpoints": { - "attribute_service": [(BASE + "as", BINDING_HTTP_REDIRECT)], - "single_logout_service": [(BASE + "slo", BINDING_SOAP)], + "attribute_service": [(f"{BASE}as", BINDING_HTTP_REDIRECT)], + "single_logout_service": [(f"{BASE}slo", BINDING_SOAP)], }, "release_policy": { "default": { @@ -25,7 +25,7 @@ CONFIG = { "subject_data": full_path("aa.db"), } }, - "entityid": BASE + "aa", + "entityid": f"{BASE}aa", "name": "Rolands AA", "debug": 1, "key_file": full_path("test.key"), diff --git a/tests/attributemaps/saml_uri.py b/tests/attributemaps/saml_uri.py index 2055f016..0520f4dd 100644 --- a/tests/attributemaps/saml_uri.py +++ b/tests/attributemaps/saml_uri.py @@ -12,230 +12,230 @@ SCHAC = "urn:oid:1.3.6.1.4.1.25178.2." MAP = { "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", "fro": { - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - EDUPERSON_OID + "1": "eduPersonAffiliation", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NETSCAPE_LDAP + "241": "displayName", - UCL_DIR_PILOT + "37": "associatedDomain", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - X500ATTR_OID + "53": "deltaRevocationList", - X500ATTR_OID + "52": "supportedAlgorithms", - X500ATTR_OID + "51": "houseIdentifier", - X500ATTR_OID + "50": "uniqueMember", - X500ATTR_OID + "19": "physicalDeliveryOfficeName", - X500ATTR_OID + "18": "postOfficeBox", - X500ATTR_OID + "17": "postalCode", - X500ATTR_OID + "16": "postalAddress", - X500ATTR_OID + "15": "businessCategory", - X500ATTR_OID + "14": "searchGuide", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - X500ATTR_OID + "12": "title", - X500ATTR_OID + "11": "ou", - X500ATTR_OID + "10": "o", - X500ATTR_OID + "37": "cACertificate", - X500ATTR_OID + "36": "userCertificate", - X500ATTR_OID + "31": "member", - X500ATTR_OID + "30": "supportedApplicationContext", - X500ATTR_OID + "33": "roleOccupant", - X500ATTR_OID + "32": "owner", - NETSCAPE_LDAP + "1": "carLicense", - PKCS_9 + "1": "email", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "2": "departmentNumber", - X500ATTR_OID + "39": "certificateRevocationList", - X500ATTR_OID + "38": "authorityRevocationList", - NETSCAPE_LDAP + "216": "userPKCS12", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - X500ATTR_OID + "9": "street", - X500ATTR_OID + "8": "st", - NETSCAPE_LDAP + "39": "preferredLanguage", - EDUPERSON_OID + "7": "eduPersonEntitlement", - X500ATTR_OID + "2": "knowledgeInformation", - X500ATTR_OID + "7": "l", - X500ATTR_OID + "6": "c", - X500ATTR_OID + "5": "serialNumber", - X500ATTR_OID + "4": "sn", - UCL_DIR_PILOT + "60": "jpegPhoto", - X500ATTR_OID + "65": "pseudonym", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - X500ATTR_OID + "40": "crossCertificatePair", - X500ATTR_OID + "42": "givenName", - X500ATTR_OID + "43": "initials", - X500ATTR_OID + "44": "generationQualifier", - X500ATTR_OID + "45": "x500UniqueIdentifier", - X500ATTR_OID + "46": "dnQualifier", - X500ATTR_OID + "47": "enhancedSearchGuide", - X500ATTR_OID + "48": "protocolInformation", - X500ATTR_OID + "54": "dmdName", - NETSCAPE_LDAP + "4": "employeeType", - X500ATTR_OID + "22": "teletexTerminalIdentifier", - X500ATTR_OID + "23": "facsimileTelephoneNumber", - X500ATTR_OID + "20": "telephoneNumber", - X500ATTR_OID + "21": "telexNumber", - X500ATTR_OID + "26": "registeredAddress", - X500ATTR_OID + "27": "destinationIndicator", - X500ATTR_OID + "24": "x121Address", - X500ATTR_OID + "25": "internationaliSDNNumber", - X500ATTR_OID + "28": "preferredDeliveryMethod", - X500ATTR_OID + "29": "presentationAddress", - EDUPERSON_OID + "3": "eduPersonOrgDN", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", - UMICH + "57": "labeledURI", - UCL_DIR_PILOT + "1": "uid", - SCHAC + "1": "schacMotherTongue", - SCHAC + "2": "schacGender", - SCHAC + "3": "schacDateOfBirth", - SCHAC + "4": "schacPlaceOfBirth", - SCHAC + "5": "schacCountryOfCitizenship", - SCHAC + "6": "schacSn1", - SCHAC + "7": "schacSn2", - SCHAC + "8": "schacPersonalTitle", - SCHAC + "9": "schacHomeOrganization", - SCHAC + "10": "schacHomeOrganizationType", - SCHAC + "11": "schacCountryOfResidence", - SCHAC + "12": "schacUserPresenceID", - SCHAC + "13": "schacPersonalPosition", - SCHAC + "14": "schacPersonalUniqueCode", - SCHAC + "15": "schacPersonalUniqueID", - SCHAC + "17": "schacExpiryDate", - SCHAC + "18": "schacUserPrivateAttribute", - SCHAC + "19": "schacUserStatus", - SCHAC + "20": "schacProjectMembership", - SCHAC + "21": "schacProjectSpecificRole", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NETSCAPE_LDAP}241": "displayName", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{X500ATTR_OID}53": "deltaRevocationList", + f"{X500ATTR_OID}52": "supportedAlgorithms", + f"{X500ATTR_OID}51": "houseIdentifier", + f"{X500ATTR_OID}50": "uniqueMember", + f"{X500ATTR_OID}19": "physicalDeliveryOfficeName", + f"{X500ATTR_OID}18": "postOfficeBox", + f"{X500ATTR_OID}17": "postalCode", + f"{X500ATTR_OID}16": "postalAddress", + f"{X500ATTR_OID}15": "businessCategory", + f"{X500ATTR_OID}14": "searchGuide", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{X500ATTR_OID}12": "title", + f"{X500ATTR_OID}11": "ou", + f"{X500ATTR_OID}10": "o", + f"{X500ATTR_OID}37": "cACertificate", + f"{X500ATTR_OID}36": "userCertificate", + f"{X500ATTR_OID}31": "member", + f"{X500ATTR_OID}30": "supportedApplicationContext", + f"{X500ATTR_OID}33": "roleOccupant", + f"{X500ATTR_OID}32": "owner", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{PKCS_9}1": "email", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{X500ATTR_OID}39": "certificateRevocationList", + f"{X500ATTR_OID}38": "authorityRevocationList", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{X500ATTR_OID}9": "street", + f"{X500ATTR_OID}8": "st", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{X500ATTR_OID}2": "knowledgeInformation", + f"{X500ATTR_OID}7": "l", + f"{X500ATTR_OID}6": "c", + f"{X500ATTR_OID}5": "serialNumber", + f"{X500ATTR_OID}4": "sn", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{X500ATTR_OID}65": "pseudonym", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{X500ATTR_OID}40": "crossCertificatePair", + f"{X500ATTR_OID}42": "givenName", + f"{X500ATTR_OID}43": "initials", + f"{X500ATTR_OID}44": "generationQualifier", + f"{X500ATTR_OID}45": "x500UniqueIdentifier", + f"{X500ATTR_OID}46": "dnQualifier", + f"{X500ATTR_OID}47": "enhancedSearchGuide", + f"{X500ATTR_OID}48": "protocolInformation", + f"{X500ATTR_OID}54": "dmdName", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{X500ATTR_OID}22": "teletexTerminalIdentifier", + f"{X500ATTR_OID}23": "facsimileTelephoneNumber", + f"{X500ATTR_OID}20": "telephoneNumber", + f"{X500ATTR_OID}21": "telexNumber", + f"{X500ATTR_OID}26": "registeredAddress", + f"{X500ATTR_OID}27": "destinationIndicator", + f"{X500ATTR_OID}24": "x121Address", + f"{X500ATTR_OID}25": "internationaliSDNNumber", + f"{X500ATTR_OID}28": "preferredDeliveryMethod", + f"{X500ATTR_OID}29": "presentationAddress", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", + f"{UMICH}57": "labeledURI", + f"{UCL_DIR_PILOT}1": "uid", + f"{SCHAC}1": "schacMotherTongue", + f"{SCHAC}2": "schacGender", + f"{SCHAC}3": "schacDateOfBirth", + f"{SCHAC}4": "schacPlaceOfBirth", + f"{SCHAC}5": "schacCountryOfCitizenship", + f"{SCHAC}6": "schacSn1", + f"{SCHAC}7": "schacSn2", + f"{SCHAC}8": "schacPersonalTitle", + f"{SCHAC}9": "schacHomeOrganization", + f"{SCHAC}10": "schacHomeOrganizationType", + f"{SCHAC}11": "schacCountryOfResidence", + f"{SCHAC}12": "schacUserPresenceID", + f"{SCHAC}13": "schacPersonalPosition", + f"{SCHAC}14": "schacPersonalUniqueCode", + f"{SCHAC}15": "schacPersonalUniqueID", + f"{SCHAC}17": "schacExpiryDate", + f"{SCHAC}18": "schacUserPrivateAttribute", + f"{SCHAC}19": "schacUserStatus", + f"{SCHAC}20": "schacProjectMembership", + f"{SCHAC}21": "schacProjectSpecificRole", }, "to": { - "roleOccupant": X500ATTR_OID + "33", - "gn": X500ATTR_OID + "42", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "title": X500ATTR_OID + "12", - "facsimileTelephoneNumber": X500ATTR_OID + "23", - "mail": UCL_DIR_PILOT + "3", - "postOfficeBox": X500ATTR_OID + "18", - "fax": X500ATTR_OID + "23", - "telephoneNumber": X500ATTR_OID + "20", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "rfc822Mailbox": UCL_DIR_PILOT + "3", - "dc": UCL_DIR_PILOT + "25", - "countryName": X500ATTR_OID + "6", - "emailAddress": PKCS_9 + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "organizationName": X500ATTR_OID + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "registeredAddress": X500ATTR_OID + "26", - "physicalDeliveryOfficeName": X500ATTR_OID + "19", - "associatedDomain": UCL_DIR_PILOT + "37", - "l": X500ATTR_OID + "7", - "stateOrProvinceName": X500ATTR_OID + "8", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "pkcs9email": PKCS_9 + "1", - "givenName": X500ATTR_OID + "42", - "givenname": X500ATTR_OID + "42", - "x500UniqueIdentifier": X500ATTR_OID + "45", - "eduPersonNickname": EDUPERSON_OID + "2", - "houseIdentifier": X500ATTR_OID + "51", - "street": X500ATTR_OID + "9", - "supportedAlgorithms": X500ATTR_OID + "52", - "preferredLanguage": NETSCAPE_LDAP + "39", - "postalAddress": X500ATTR_OID + "16", - "email": PKCS_9 + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "c": X500ATTR_OID + "6", - "teletexTerminalIdentifier": X500ATTR_OID + "22", - "o": X500ATTR_OID + "10", - "cACertificate": X500ATTR_OID + "37", - "telexNumber": X500ATTR_OID + "21", - "ou": X500ATTR_OID + "11", - "initials": X500ATTR_OID + "43", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "deltaRevocationList": X500ATTR_OID + "53", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "supportedApplicationContext": X500ATTR_OID + "30", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "generationQualifier": X500ATTR_OID + "44", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "edupersonaffiliation": EDUPERSON_OID + "1", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "edupersonprincipalname": EDUPERSON_OID + "6", - "localityName": X500ATTR_OID + "7", - "owner": X500ATTR_OID + "32", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "searchGuide": X500ATTR_OID + "14", - "certificateRevocationList": X500ATTR_OID + "39", - "organizationalUnitName": X500ATTR_OID + "11", - "userCertificate": X500ATTR_OID + "36", - "preferredDeliveryMethod": X500ATTR_OID + "28", - "internationaliSDNNumber": X500ATTR_OID + "25", - "uniqueMember": X500ATTR_OID + "50", - "departmentNumber": NETSCAPE_LDAP + "2", - "enhancedSearchGuide": X500ATTR_OID + "47", - "userPKCS12": NETSCAPE_LDAP + "216", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "x121Address": X500ATTR_OID + "24", - "destinationIndicator": X500ATTR_OID + "27", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "surname": X500ATTR_OID + "4", - "jpegPhoto": UCL_DIR_PILOT + "60", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "edupersonscopedaffiliation": EDUPERSON_OID + "9", - "protocolInformation": X500ATTR_OID + "48", - "knowledgeInformation": X500ATTR_OID + "2", - "employeeType": NETSCAPE_LDAP + "4", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "member": X500ATTR_OID + "31", - "streetAddress": X500ATTR_OID + "9", - "dmdName": X500ATTR_OID + "54", - "postalCode": X500ATTR_OID + "17", - "pseudonym": X500ATTR_OID + "65", - "dnQualifier": X500ATTR_OID + "46", - "crossCertificatePair": X500ATTR_OID + "40", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "authorityRevocationList": X500ATTR_OID + "38", - "displayName": NETSCAPE_LDAP + "241", - "businessCategory": X500ATTR_OID + "15", - "serialNumber": X500ATTR_OID + "5", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "st": X500ATTR_OID + "8", - "carLicense": NETSCAPE_LDAP + "1", - "presentationAddress": X500ATTR_OID + "29", - "sn": X500ATTR_OID + "4", - "domainComponent": UCL_DIR_PILOT + "25", - "labeledURI": UMICH + "57", - "uid": UCL_DIR_PILOT + "1", - "schacMotherTongue": SCHAC + "1", - "schacGender": SCHAC + "2", - "schacDateOfBirth": SCHAC + "3", - "schacPlaceOfBirth": SCHAC + "4", - "schacCountryOfCitizenship": SCHAC + "5", - "schacSn1": SCHAC + "6", - "schacSn2": SCHAC + "7", - "schacPersonalTitle": SCHAC + "8", - "schacHomeOrganization": SCHAC + "9", - "schacHomeOrganizationType": SCHAC + "10", - "schacCountryOfResidence": SCHAC + "11", - "schacUserPresenceID": SCHAC + "12", - "schacPersonalPosition": SCHAC + "13", - "schacPersonalUniqueCode": SCHAC + "14", - "schacPersonalUniqueID": SCHAC + "15", - "schacExpiryDate": SCHAC + "17", - "schacUserPrivateAttribute": SCHAC + "18", - "schacUserStatus": SCHAC + "19", - "schacProjectMembership": SCHAC + "20", - "schacProjectSpecificRole": SCHAC + "21", + "roleOccupant": f"{X500ATTR_OID}33", + "gn": f"{X500ATTR_OID}42", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "title": f"{X500ATTR_OID}12", + "facsimileTelephoneNumber": f"{X500ATTR_OID}23", + "mail": f"{UCL_DIR_PILOT}3", + "postOfficeBox": f"{X500ATTR_OID}18", + "fax": f"{X500ATTR_OID}23", + "telephoneNumber": f"{X500ATTR_OID}20", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "rfc822Mailbox": f"{UCL_DIR_PILOT}3", + "dc": f"{UCL_DIR_PILOT}25", + "countryName": f"{X500ATTR_OID}6", + "emailAddress": f"{PKCS_9}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "organizationName": f"{X500ATTR_OID}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "registeredAddress": f"{X500ATTR_OID}26", + "physicalDeliveryOfficeName": f"{X500ATTR_OID}19", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "l": f"{X500ATTR_OID}7", + "stateOrProvinceName": f"{X500ATTR_OID}8", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "pkcs9email": f"{PKCS_9}1", + "givenName": f"{X500ATTR_OID}42", + "givenname": f"{X500ATTR_OID}42", + "x500UniqueIdentifier": f"{X500ATTR_OID}45", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "houseIdentifier": f"{X500ATTR_OID}51", + "street": f"{X500ATTR_OID}9", + "supportedAlgorithms": f"{X500ATTR_OID}52", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "postalAddress": f"{X500ATTR_OID}16", + "email": f"{PKCS_9}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "c": f"{X500ATTR_OID}6", + "teletexTerminalIdentifier": f"{X500ATTR_OID}22", + "o": f"{X500ATTR_OID}10", + "cACertificate": f"{X500ATTR_OID}37", + "telexNumber": f"{X500ATTR_OID}21", + "ou": f"{X500ATTR_OID}11", + "initials": f"{X500ATTR_OID}43", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "deltaRevocationList": f"{X500ATTR_OID}53", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "supportedApplicationContext": f"{X500ATTR_OID}30", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "generationQualifier": f"{X500ATTR_OID}44", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "edupersonaffiliation": f"{EDUPERSON_OID}1", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "edupersonprincipalname": f"{EDUPERSON_OID}6", + "localityName": f"{X500ATTR_OID}7", + "owner": f"{X500ATTR_OID}32", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "searchGuide": f"{X500ATTR_OID}14", + "certificateRevocationList": f"{X500ATTR_OID}39", + "organizationalUnitName": f"{X500ATTR_OID}11", + "userCertificate": f"{X500ATTR_OID}36", + "preferredDeliveryMethod": f"{X500ATTR_OID}28", + "internationaliSDNNumber": f"{X500ATTR_OID}25", + "uniqueMember": f"{X500ATTR_OID}50", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "enhancedSearchGuide": f"{X500ATTR_OID}47", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "x121Address": f"{X500ATTR_OID}24", + "destinationIndicator": f"{X500ATTR_OID}27", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "surname": f"{X500ATTR_OID}4", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "edupersonscopedaffiliation": f"{EDUPERSON_OID}9", + "protocolInformation": f"{X500ATTR_OID}48", + "knowledgeInformation": f"{X500ATTR_OID}2", + "employeeType": f"{NETSCAPE_LDAP}4", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "member": f"{X500ATTR_OID}31", + "streetAddress": f"{X500ATTR_OID}9", + "dmdName": f"{X500ATTR_OID}54", + "postalCode": f"{X500ATTR_OID}17", + "pseudonym": f"{X500ATTR_OID}65", + "dnQualifier": f"{X500ATTR_OID}46", + "crossCertificatePair": f"{X500ATTR_OID}40", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "authorityRevocationList": f"{X500ATTR_OID}38", + "displayName": f"{NETSCAPE_LDAP}241", + "businessCategory": f"{X500ATTR_OID}15", + "serialNumber": f"{X500ATTR_OID}5", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "st": f"{X500ATTR_OID}8", + "carLicense": f"{NETSCAPE_LDAP}1", + "presentationAddress": f"{X500ATTR_OID}29", + "sn": f"{X500ATTR_OID}4", + "domainComponent": f"{UCL_DIR_PILOT}25", + "labeledURI": f"{UMICH}57", + "uid": f"{UCL_DIR_PILOT}1", + "schacMotherTongue": f"{SCHAC}1", + "schacGender": f"{SCHAC}2", + "schacDateOfBirth": f"{SCHAC}3", + "schacPlaceOfBirth": f"{SCHAC}4", + "schacCountryOfCitizenship": f"{SCHAC}5", + "schacSn1": f"{SCHAC}6", + "schacSn2": f"{SCHAC}7", + "schacPersonalTitle": f"{SCHAC}8", + "schacHomeOrganization": f"{SCHAC}9", + "schacHomeOrganizationType": f"{SCHAC}10", + "schacCountryOfResidence": f"{SCHAC}11", + "schacUserPresenceID": f"{SCHAC}12", + "schacPersonalPosition": f"{SCHAC}13", + "schacPersonalUniqueCode": f"{SCHAC}14", + "schacPersonalUniqueID": f"{SCHAC}15", + "schacExpiryDate": f"{SCHAC}17", + "schacUserPrivateAttribute": f"{SCHAC}18", + "schacUserStatus": f"{SCHAC}19", + "schacProjectMembership": f"{SCHAC}20", + "schacProjectSpecificRole": f"{SCHAC}21", }, } diff --git a/tests/attributemaps/shibboleth_uri.py b/tests/attributemaps/shibboleth_uri.py index 30b31503..992a2219 100644 --- a/tests/attributemaps/shibboleth_uri.py +++ b/tests/attributemaps/shibboleth_uri.py @@ -9,182 +9,182 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57." MAP = { "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri", "fro": { - EDUPERSON_OID + "2": "eduPersonNickname", - EDUPERSON_OID + "9": "eduPersonScopedAffiliation", - EDUPERSON_OID + "11": "eduPersonAssurance", - EDUPERSON_OID + "10": "eduPersonTargetedID", - EDUPERSON_OID + "4": "eduPersonOrgUnitDN", - NOREDUPERSON_OID + "6": "norEduOrgAcronym", - NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier", - NOREDUPERSON_OID + "4": "norEduPersonLIN", - EDUPERSON_OID + "1": "eduPersonAffiliation", - NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber", - NETSCAPE_LDAP + "40": "userSMIMECertificate", - NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber", - NETSCAPE_LDAP + "241": "displayName", - UCL_DIR_PILOT + "37": "associatedDomain", - EDUPERSON_OID + "6": "eduPersonPrincipalName", - NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier", - NOREDUPERSON_OID + "9": "federationFeideSchemaVersion", - X500ATTR + "53": "deltaRevocationList", - X500ATTR + "52": "supportedAlgorithms", - X500ATTR + "51": "houseIdentifier", - X500ATTR + "50": "uniqueMember", - X500ATTR + "19": "physicalDeliveryOfficeName", - X500ATTR + "18": "postOfficeBox", - X500ATTR + "17": "postalCode", - X500ATTR + "16": "postalAddress", - X500ATTR + "15": "businessCategory", - X500ATTR + "14": "searchGuide", - EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation", - X500ATTR + "12": "title", - X500ATTR + "11": "ou", - X500ATTR + "10": "o", - X500ATTR + "37": "cACertificate", - X500ATTR + "36": "userCertificate", - X500ATTR + "31": "member", - X500ATTR + "30": "supportedApplicationContext", - X500ATTR + "33": "roleOccupant", - X500ATTR + "32": "owner", - NETSCAPE_LDAP + "1": "carLicense", - PKCS_9 + "1": "email", - NETSCAPE_LDAP + "3": "employeeNumber", - NETSCAPE_LDAP + "2": "departmentNumber", - X500ATTR + "39": "certificateRevocationList", - X500ATTR + "38": "authorityRevocationList", - NETSCAPE_LDAP + "216": "userPKCS12", - EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN", - X500ATTR + "9": "street", - X500ATTR + "8": "st", - NETSCAPE_LDAP + "39": "preferredLanguage", - EDUPERSON_OID + "7": "eduPersonEntitlement", - X500ATTR + "2": "knowledgeInformation", - X500ATTR + "7": "l", - X500ATTR + "6": "c", - X500ATTR + "5": "serialNumber", - X500ATTR + "4": "sn", - UCL_DIR_PILOT + "60": "jpegPhoto", - X500ATTR + "65": "pseudonym", - NOREDUPERSON_OID + "5": "norEduPersonNIN", - UCL_DIR_PILOT + "3": "mail", - UCL_DIR_PILOT + "25": "dc", - X500ATTR + "40": "crossCertificatePair", - X500ATTR + "42": "givenName", - X500ATTR + "43": "initials", - X500ATTR + "44": "generationQualifier", - X500ATTR + "45": "x500UniqueIdentifier", - X500ATTR + "46": "dnQualifier", - X500ATTR + "47": "enhancedSearchGuide", - X500ATTR + "48": "protocolInformation", - X500ATTR + "54": "dmdName", - NETSCAPE_LDAP + "4": "employeeType", - X500ATTR + "22": "teletexTerminalIdentifier", - X500ATTR + "23": "facsimileTelephoneNumber", - X500ATTR + "20": "telephoneNumber", - X500ATTR + "21": "telexNumber", - X500ATTR + "26": "registeredAddress", - X500ATTR + "27": "destinationIndicator", - X500ATTR + "24": "x121Address", - X500ATTR + "25": "internationaliSDNNumber", - X500ATTR + "28": "preferredDeliveryMethod", - X500ATTR + "29": "presentationAddress", - EDUPERSON_OID + "3": "eduPersonOrgDN", - NOREDUPERSON_OID + "3": "norEduPersonBirthDate", + f"{EDUPERSON_OID}2": "eduPersonNickname", + f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation", + f"{EDUPERSON_OID}11": "eduPersonAssurance", + f"{EDUPERSON_OID}10": "eduPersonTargetedID", + f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN", + f"{NOREDUPERSON_OID}6": "norEduOrgAcronym", + f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier", + f"{NOREDUPERSON_OID}4": "norEduPersonLIN", + f"{EDUPERSON_OID}1": "eduPersonAffiliation", + f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber", + f"{NETSCAPE_LDAP}40": "userSMIMECertificate", + f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber", + f"{NETSCAPE_LDAP}241": "displayName", + f"{UCL_DIR_PILOT}37": "associatedDomain", + f"{EDUPERSON_OID}6": "eduPersonPrincipalName", + f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier", + f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion", + f"{X500ATTR}53": "deltaRevocationList", + f"{X500ATTR}52": "supportedAlgorithms", + f"{X500ATTR}51": "houseIdentifier", + f"{X500ATTR}50": "uniqueMember", + f"{X500ATTR}19": "physicalDeliveryOfficeName", + f"{X500ATTR}18": "postOfficeBox", + f"{X500ATTR}17": "postalCode", + f"{X500ATTR}16": "postalAddress", + f"{X500ATTR}15": "businessCategory", + f"{X500ATTR}14": "searchGuide", + f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation", + f"{X500ATTR}12": "title", + f"{X500ATTR}11": "ou", + f"{X500ATTR}10": "o", + f"{X500ATTR}37": "cACertificate", + f"{X500ATTR}36": "userCertificate", + f"{X500ATTR}31": "member", + f"{X500ATTR}30": "supportedApplicationContext", + f"{X500ATTR}33": "roleOccupant", + f"{X500ATTR}32": "owner", + f"{NETSCAPE_LDAP}1": "carLicense", + f"{PKCS_9}1": "email", + f"{NETSCAPE_LDAP}3": "employeeNumber", + f"{NETSCAPE_LDAP}2": "departmentNumber", + f"{X500ATTR}39": "certificateRevocationList", + f"{X500ATTR}38": "authorityRevocationList", + f"{NETSCAPE_LDAP}216": "userPKCS12", + f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN", + f"{X500ATTR}9": "street", + f"{X500ATTR}8": "st", + f"{NETSCAPE_LDAP}39": "preferredLanguage", + f"{EDUPERSON_OID}7": "eduPersonEntitlement", + f"{X500ATTR}2": "knowledgeInformation", + f"{X500ATTR}7": "l", + f"{X500ATTR}6": "c", + f"{X500ATTR}5": "serialNumber", + f"{X500ATTR}4": "sn", + f"{UCL_DIR_PILOT}60": "jpegPhoto", + f"{X500ATTR}65": "pseudonym", + f"{NOREDUPERSON_OID}5": "norEduPersonNIN", + f"{UCL_DIR_PILOT}3": "mail", + f"{UCL_DIR_PILOT}25": "dc", + f"{X500ATTR}40": "crossCertificatePair", + f"{X500ATTR}42": "givenName", + f"{X500ATTR}43": "initials", + f"{X500ATTR}44": "generationQualifier", + f"{X500ATTR}45": "x500UniqueIdentifier", + f"{X500ATTR}46": "dnQualifier", + f"{X500ATTR}47": "enhancedSearchGuide", + f"{X500ATTR}48": "protocolInformation", + f"{X500ATTR}54": "dmdName", + f"{NETSCAPE_LDAP}4": "employeeType", + f"{X500ATTR}22": "teletexTerminalIdentifier", + f"{X500ATTR}23": "facsimileTelephoneNumber", + f"{X500ATTR}20": "telephoneNumber", + f"{X500ATTR}21": "telexNumber", + f"{X500ATTR}26": "registeredAddress", + f"{X500ATTR}27": "destinationIndicator", + f"{X500ATTR}24": "x121Address", + f"{X500ATTR}25": "internationaliSDNNumber", + f"{X500ATTR}28": "preferredDeliveryMethod", + f"{X500ATTR}29": "presentationAddress", + f"{EDUPERSON_OID}3": "eduPersonOrgDN", + f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate", }, "to": { - "roleOccupant": X500ATTR + "33", - "gn": X500ATTR + "42", - "norEduPersonNIN": NOREDUPERSON_OID + "5", - "title": X500ATTR + "12", - "facsimileTelephoneNumber": X500ATTR + "23", - "mail": UCL_DIR_PILOT + "3", - "postOfficeBox": X500ATTR + "18", - "fax": X500ATTR + "23", - "telephoneNumber": X500ATTR + "20", - "norEduPersonBirthDate": NOREDUPERSON_OID + "3", - "rfc822Mailbox": UCL_DIR_PILOT + "3", - "dc": UCL_DIR_PILOT + "25", - "countryName": X500ATTR + "6", - "emailAddress": PKCS_9 + "1", - "employeeNumber": NETSCAPE_LDAP + "3", - "organizationName": X500ATTR + "10", - "eduPersonAssurance": EDUPERSON_OID + "11", - "norEduOrgAcronym": NOREDUPERSON_OID + "6", - "registeredAddress": X500ATTR + "26", - "physicalDeliveryOfficeName": X500ATTR + "19", - "associatedDomain": UCL_DIR_PILOT + "37", - "l": X500ATTR + "7", - "stateOrProvinceName": X500ATTR + "8", - "federationFeideSchemaVersion": NOREDUPERSON_OID + "9", - "pkcs9email": PKCS_9 + "1", - "givenName": X500ATTR + "42", - "x500UniqueIdentifier": X500ATTR + "45", - "eduPersonNickname": EDUPERSON_OID + "2", - "houseIdentifier": X500ATTR + "51", - "street": X500ATTR + "9", - "supportedAlgorithms": X500ATTR + "52", - "preferredLanguage": NETSCAPE_LDAP + "39", - "postalAddress": X500ATTR + "16", - "email": PKCS_9 + "1", - "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8", - "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8", - "c": X500ATTR + "6", - "teletexTerminalIdentifier": X500ATTR + "22", - "o": X500ATTR + "10", - "cACertificate": X500ATTR + "37", - "telexNumber": X500ATTR + "21", - "ou": X500ATTR + "11", - "initials": X500ATTR + "43", - "eduPersonOrgUnitDN": EDUPERSON_OID + "4", - "deltaRevocationList": X500ATTR + "53", - "norEduPersonLIN": NOREDUPERSON_OID + "4", - "supportedApplicationContext": X500ATTR + "30", - "eduPersonEntitlement": EDUPERSON_OID + "7", - "generationQualifier": X500ATTR + "44", - "eduPersonAffiliation": EDUPERSON_OID + "1", - "eduPersonPrincipalName": EDUPERSON_OID + "6", - "localityName": X500ATTR + "7", - "owner": X500ATTR + "32", - "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2", - "searchGuide": X500ATTR + "14", - "certificateRevocationList": X500ATTR + "39", - "organizationalUnitName": X500ATTR + "11", - "userCertificate": X500ATTR + "36", - "preferredDeliveryMethod": X500ATTR + "28", - "internationaliSDNNumber": X500ATTR + "25", - "uniqueMember": X500ATTR + "50", - "departmentNumber": NETSCAPE_LDAP + "2", - "enhancedSearchGuide": X500ATTR + "47", - "userPKCS12": NETSCAPE_LDAP + "216", - "eduPersonTargetedID": EDUPERSON_OID + "10", - "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1", - "x121Address": X500ATTR + "24", - "destinationIndicator": X500ATTR + "27", - "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5", - "surname": X500ATTR + "4", - "jpegPhoto": UCL_DIR_PILOT + "60", - "eduPersonScopedAffiliation": EDUPERSON_OID + "9", - "protocolInformation": X500ATTR + "48", - "knowledgeInformation": X500ATTR + "2", - "employeeType": NETSCAPE_LDAP + "4", - "userSMIMECertificate": NETSCAPE_LDAP + "40", - "member": X500ATTR + "31", - "streetAddress": X500ATTR + "9", - "dmdName": X500ATTR + "54", - "postalCode": X500ATTR + "17", - "pseudonym": X500ATTR + "65", - "dnQualifier": X500ATTR + "46", - "crossCertificatePair": X500ATTR + "40", - "eduPersonOrgDN": EDUPERSON_OID + "3", - "authorityRevocationList": X500ATTR + "38", - "displayName": NETSCAPE_LDAP + "241", - "businessCategory": X500ATTR + "15", - "serialNumber": X500ATTR + "5", - "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7", - "st": X500ATTR + "8", - "carLicense": NETSCAPE_LDAP + "1", - "presentationAddress": X500ATTR + "29", - "sn": X500ATTR + "4", - "domainComponent": UCL_DIR_PILOT + "25", + "roleOccupant": f"{X500ATTR}33", + "gn": f"{X500ATTR}42", + "norEduPersonNIN": f"{NOREDUPERSON_OID}5", + "title": f"{X500ATTR}12", + "facsimileTelephoneNumber": f"{X500ATTR}23", + "mail": f"{UCL_DIR_PILOT}3", + "postOfficeBox": f"{X500ATTR}18", + "fax": f"{X500ATTR}23", + "telephoneNumber": f"{X500ATTR}20", + "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3", + "rfc822Mailbox": f"{UCL_DIR_PILOT}3", + "dc": f"{UCL_DIR_PILOT}25", + "countryName": f"{X500ATTR}6", + "emailAddress": f"{PKCS_9}1", + "employeeNumber": f"{NETSCAPE_LDAP}3", + "organizationName": f"{X500ATTR}10", + "eduPersonAssurance": f"{EDUPERSON_OID}11", + "norEduOrgAcronym": f"{NOREDUPERSON_OID}6", + "registeredAddress": f"{X500ATTR}26", + "physicalDeliveryOfficeName": f"{X500ATTR}19", + "associatedDomain": f"{UCL_DIR_PILOT}37", + "l": f"{X500ATTR}7", + "stateOrProvinceName": f"{X500ATTR}8", + "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9", + "pkcs9email": f"{PKCS_9}1", + "givenName": f"{X500ATTR}42", + "x500UniqueIdentifier": f"{X500ATTR}45", + "eduPersonNickname": f"{EDUPERSON_OID}2", + "houseIdentifier": f"{X500ATTR}51", + "street": f"{X500ATTR}9", + "supportedAlgorithms": f"{X500ATTR}52", + "preferredLanguage": f"{NETSCAPE_LDAP}39", + "postalAddress": f"{X500ATTR}16", + "email": f"{PKCS_9}1", + "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8", + "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8", + "c": f"{X500ATTR}6", + "teletexTerminalIdentifier": f"{X500ATTR}22", + "o": f"{X500ATTR}10", + "cACertificate": f"{X500ATTR}37", + "telexNumber": f"{X500ATTR}21", + "ou": f"{X500ATTR}11", + "initials": f"{X500ATTR}43", + "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4", + "deltaRevocationList": f"{X500ATTR}53", + "norEduPersonLIN": f"{NOREDUPERSON_OID}4", + "supportedApplicationContext": f"{X500ATTR}30", + "eduPersonEntitlement": f"{EDUPERSON_OID}7", + "generationQualifier": f"{X500ATTR}44", + "eduPersonAffiliation": f"{EDUPERSON_OID}1", + "eduPersonPrincipalName": f"{EDUPERSON_OID}6", + "localityName": f"{X500ATTR}7", + "owner": f"{X500ATTR}32", + "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2", + "searchGuide": f"{X500ATTR}14", + "certificateRevocationList": f"{X500ATTR}39", + "organizationalUnitName": f"{X500ATTR}11", + "userCertificate": f"{X500ATTR}36", + "preferredDeliveryMethod": f"{X500ATTR}28", + "internationaliSDNNumber": f"{X500ATTR}25", + "uniqueMember": f"{X500ATTR}50", + "departmentNumber": f"{NETSCAPE_LDAP}2", + "enhancedSearchGuide": f"{X500ATTR}47", + "userPKCS12": f"{NETSCAPE_LDAP}216", + "eduPersonTargetedID": f"{EDUPERSON_OID}10", + "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1", + "x121Address": f"{X500ATTR}24", + "destinationIndicator": f"{X500ATTR}27", + "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5", + "surname": f"{X500ATTR}4", + "jpegPhoto": f"{UCL_DIR_PILOT}60", + "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9", + "protocolInformation": f"{X500ATTR}48", + "knowledgeInformation": f"{X500ATTR}2", + "employeeType": f"{NETSCAPE_LDAP}4", + "userSMIMECertificate": f"{NETSCAPE_LDAP}40", + "member": f"{X500ATTR}31", + "streetAddress": f"{X500ATTR}9", + "dmdName": f"{X500ATTR}54", + "postalCode": f"{X500ATTR}17", + "pseudonym": f"{X500ATTR}65", + "dnQualifier": f"{X500ATTR}46", + "crossCertificatePair": f"{X500ATTR}40", + "eduPersonOrgDN": f"{EDUPERSON_OID}3", + "authorityRevocationList": f"{X500ATTR}38", + "displayName": f"{NETSCAPE_LDAP}241", + "businessCategory": f"{X500ATTR}15", + "serialNumber": f"{X500ATTR}5", + "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7", + "st": f"{X500ATTR}8", + "carLicense": f"{NETSCAPE_LDAP}1", + "presentationAddress": f"{X500ATTR}29", + "sn": f"{X500ATTR}4", + "domainComponent": f"{UCL_DIR_PILOT}25", }, } diff --git a/tests/idp_sp_conf.py b/tests/idp_sp_conf.py index e9f4466f..32aecfa2 100644 --- a/tests/idp_sp_conf.py +++ b/tests/idp_sp_conf.py @@ -18,8 +18,8 @@ CONFIG = { "service": { "idp": { "endpoints": { - "single_sign_on_service": [(BASE + "sso", BINDING_HTTP_REDIRECT)], - "single_logout_service": [(BASE + "slo", BINDING_SOAP), (BASE + "slop", BINDING_HTTP_POST)], + "single_sign_on_service": [(f"{BASE}sso", BINDING_HTTP_REDIRECT)], + "single_logout_service": [(f"{BASE}slo", BINDING_SOAP), (f"{BASE}slop", BINDING_HTTP_POST)], }, "policy": { "default": { diff --git a/tests/pathutils.py b/tests/pathutils.py index ce59bc96..1f10b0b9 100644 --- a/tests/pathutils.py +++ b/tests/pathutils.py @@ -10,7 +10,7 @@ def full_path(local_file): def dotname(module): if not BASEDIR.endswith("tests"): - return "tests." + module + return f"tests.{module}" else: return module diff --git a/tests/restrictive_idp_conf.py b/tests/restrictive_idp_conf.py index 67b4ec50..70d78bce 100644 --- a/tests/restrictive_idp_conf.py +++ b/tests/restrictive_idp_conf.py @@ -14,8 +14,8 @@ CONFIG = { "service": { "idp": { "endpoints": { - "single_sign_on_service": [(BASE + "sso", BINDING_HTTP_REDIRECT)], - "attribute_service": [(BASE + "aa", BINDING_SOAP)], + "single_sign_on_service": [(f"{BASE}sso", BINDING_HTTP_REDIRECT)], + "attribute_service": [(f"{BASE}aa", BINDING_SOAP)], }, "policy": { "default": {"lifetime": {"minutes": 15}, "name_form": NAME_FORMAT_URI}, diff --git a/tests/sp_slo_redirect_conf.py b/tests/sp_slo_redirect_conf.py index 4499424b..696bee1d 100644 --- a/tests/sp_slo_redirect_conf.py +++ b/tests/sp_slo_redirect_conf.py @@ -13,7 +13,7 @@ CONFIG = { "sp": { "endpoints": { "assertion_consumer_service": [(HOME, BINDING_HTTP_POST)], - "single_logout_service": [(HOME + "slo", BINDING_HTTP_REDIRECT)], + "single_logout_service": [(f"{HOME}slo", BINDING_HTTP_REDIRECT)], }, "required_attributes": ["surName", "givenName", "mail"], "optional_attributes": ["title"], diff --git a/tests/test_10_time_util.py b/tests/test_10_time_util.py index 12a2c1d4..80e77ac3 100644 --- a/tests/test_10_time_util.py +++ b/tests/test_10_time_util.py @@ -138,7 +138,7 @@ def test_instant(): def test_valid(): assert valid("2000-01-12T00:00:00Z") == False current_year = datetime.datetime.today().year - assert valid("%d-01-12T00:00:00Z" % (current_year + 1)) == True + assert valid(f"{int(current_year + 1)}-01-12T00:00:00Z") == True this_instance = instant() time.sleep(1) assert valid(this_instance) is False # unless on a very fast machine :-) @@ -154,26 +154,26 @@ def test_timeout(): def test_before(): current_year = datetime.datetime.today().year - assert before("%d-01-01T00:00:00Z" % (current_year - 1)) == False - assert before("%d-01-01T00:00:00Z" % (current_year + 1)) == True + assert before(f"{int(current_year - 1)}-01-01T00:00:00Z") == False + assert before(f"{int(current_year + 1)}-01-01T00:00:00Z") == True def test_after(): current_year = datetime.datetime.today().year - assert after("%d-01-01T00:00:00Z" % (current_year + 1)) == False - assert after("%d-01-01T00:00:00Z" % (current_year - 1)) == True + assert after(f"{int(current_year + 1)}-01-01T00:00:00Z") == False + assert after(f"{int(current_year - 1)}-01-01T00:00:00Z") == True def test_not_before(): current_year = datetime.datetime.today().year - assert not_before("%d-01-01T00:00:00Z" % (current_year + 1)) == False - assert not_before("%d-01-01T00:00:00Z" % (current_year - 1)) == True + assert not_before(f"{int(current_year + 1)}-01-01T00:00:00Z") == False + assert not_before(f"{int(current_year - 1)}-01-01T00:00:00Z") == True def test_not_on_or_after(): current_year = datetime.datetime.today().year - assert not_on_or_after("%d-01-01T00:00:00Z" % (current_year + 1)) == True - assert not_on_or_after("%d-01-01T00:00:00Z" % (current_year - 1)) == False + assert not_on_or_after(f"{int(current_year + 1)}-01-01T00:00:00Z") == True + assert not_on_or_after(f"{int(current_year - 1)}-01-01T00:00:00Z") == False if __name__ == "__main__": diff --git a/tests/test_81_certificates.py b/tests/test_81_certificates.py index bc32c575..f02feea6 100644 --- a/tests/test_81_certificates.py +++ b/tests/test_81_certificates.py @@ -36,7 +36,7 @@ class TestGenerateCertificates(unittest.TestCase): cert_info_ca, request=False, write_to_file=True, - cert_dir=os.path.dirname(os.path.abspath(__file__)) + "/pki", + cert_dir=f"{os.path.dirname(os.path.abspath(__file__))}/pki", ) req_cert_str, req_key_str = osw.create_certificate(cert_info, request=True) |