diff options
| author | Fredrik Thulin <fredrik@thulin.net> | 2017-02-02 14:08:09 +0100 |
|---|---|---|
| committer | Fredrik Thulin <fredrik@thulin.net> | 2017-02-10 09:17:49 +0100 |
| commit | 3b2eb0b70d18952dba68772d57107896a8e6c2d2 (patch) | |
| tree | b70cd9c0bc6fa29d530f6733c6a024d437445bfd | |
| parent | 08815f932240eb31c8f421f737683a3edd7ec938 (diff) | |
| download | pysaml2-3b2eb0b70d18952dba68772d57107896a8e6c2d2.tar.gz | |
Update with changes from Hans Nordlöf
| -rw-r--r-- | src/saml2/entity_category/swamid.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/saml2/entity_category/swamid.py b/src/saml2/entity_category/swamid.py index 5dd717ec..b611c5aa 100644 --- a/src/saml2/entity_category/swamid.py +++ b/src/saml2/entity_category/swamid.py @@ -1,14 +1,24 @@ __author__ = 'rolandh' - -NAME = ["givenName", "displayName", "sn"] +NAME = ["givenName", "displayName", "sn", "cn"] STATIC_ORG_INFO = ["c", "o", "co", "norEduOrgAcronym", "schacHomeOrganization", 'schacHomeOrganizationType'] -OTHER = ["eduPersonPrincipalName", "eduPersonScopedAffiliation", "mail"] +OTHER = ["eduPersonPrincipalName", "eduPersonScopedAffiliation", "mail", + "eduPersonAssurance"] + +R_AND_S = ['eduPersonTargetedID', + 'eduPersonPrincipalName', + 'mail', + 'displayName', + 'givenName', + 'sn', + 'eduPersonScopedAffiliation' + ] # These give you access to information RESEARCH_AND_EDUCATION = "http://www.swamid.se/category/research-and-education" SFS_1993_1153 = "http://www.swamid.se/category/sfs-1993-1153" +RESEARCH_AND_SCHOLARSHIP = "http://refeds.org/category/research-and-scholarship" # presently these don't by themself EU = "http://www.swamid.se/category/eu-adequate-protection" @@ -17,8 +27,9 @@ HEI = "http://www.swamid.se/category/hei-service" RELEASE = { "": ["eduPersonTargetedID"], - SFS_1993_1153: ["norEduPersonNIN"], + SFS_1993_1153: ["norEduPersonNIN", "eduPersonAssurance"], (RESEARCH_AND_EDUCATION, EU): NAME + STATIC_ORG_INFO + OTHER, (RESEARCH_AND_EDUCATION, NREN): NAME + STATIC_ORG_INFO + OTHER, (RESEARCH_AND_EDUCATION, HEI): NAME + STATIC_ORG_INFO + OTHER, + RESEARCH_AND_SCHOLARSHIP: R_AND_S, }
\ No newline at end of file |