diff options
| author | Roland Hedberg <roland@catalogix.se> | 2017-10-11 21:44:34 +0200 |
|---|---|---|
| committer | Roland Hedberg <roland@catalogix.se> | 2017-10-11 21:44:34 +0200 |
| commit | 847e970c5af6a09de61307be3a3d0305eee131f7 (patch) | |
| tree | cb86cd970feb101b563c0637dc4f7feab8a5d094 | |
| parent | 72a516a7651ee3c9f4a3f54e1e17eae10194926c (diff) | |
| parent | e3063f06341231f48adf7dd05c084268c66473dc (diff) | |
| download | pysaml2-847e970c5af6a09de61307be3a3d0305eee131f7.tar.gz | |
Merge branch 'master' of github.com:rohe/pysaml2v4.5.0
| -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 |