summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Hedberg <roland@catalogix.se>2017-10-11 15:54:43 +0200
committerGitHub <noreply@github.com>2017-10-11 15:54:43 +0200
commite3063f06341231f48adf7dd05c084268c66473dc (patch)
tree732822bd0dbdf974a37c4e71ebcb6d916c7d5844
parent1979ae7ab081107898f0817dc91baea7e21a7281 (diff)
parent3b2eb0b70d18952dba68772d57107896a8e6c2d2 (diff)
downloadpysaml2-e3063f06341231f48adf7dd05c084268c66473dc.tar.gz
Merge pull request #387 from SUNET/ft-swamid-attribute-release-policy-mergebranch
SWAMID attribute release policy updates
-rw-r--r--src/saml2/entity_category/swamid.py19
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