summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@sunet.se>2022-12-16 15:20:36 +0100
committerIvan Kanakarakis <ivan.kanak@gmail.com>2022-12-23 14:37:32 +0200
commit27a39d20a28f6c3e3e1a91e482e934dc7c0aa6d6 (patch)
treeaadb4818f43c8818f561837167f7c34164dd8423
parent964e885054d9f0ac8e228267e194d183f93c34e0 (diff)
downloadpysaml2-27a39d20a28f6c3e3e1a91e482e934dc7c0aa6d6.tar.gz
Disable REFEDS Access entity categories for Swamid
Turns out the implementation of no aggregation ECs was not quite what was needed to comply with the policy for these.
-rw-r--r--src/saml2/entity_category/swamid.py8
-rw-r--r--tests/test_37_entity_categories.py5
2 files changed, 10 insertions, 3 deletions
diff --git a/src/saml2/entity_category/swamid.py b/src/saml2/entity_category/swamid.py
index dde72d78..79bb4ed6 100644
--- a/src/saml2/entity_category/swamid.py
+++ b/src/saml2/entity_category/swamid.py
@@ -113,10 +113,12 @@ RELEASE = {
ESI: MYACADEMICID_ESI,
(ESI, COCOv1): MYACADEMICID_ESI + GEANT_COCO,
(ESI, COCOv2): MYACADEMICID_ESI + REFEDS_COCO,
+ # XXX: disabled temporarily until we can figure out how to handle them
+ # these need to be able to be combined with other categories just not with each other
# no aggregation categories
- PERSONALIZED: REFEDS_PERSONALIZED_ACCESS,
- PSEUDONYMOUS: REFEDS_PSEUDONYMOUS_ACCESS,
- ANONYMOUS: REFEDS_ANONYMOUS_ACCESS,
+ # PERSONALIZED: REFEDS_PERSONALIZED_ACCESS,
+ # PSEUDONYMOUS: REFEDS_PSEUDONYMOUS_ACCESS,
+ # ANONYMOUS: REFEDS_ANONYMOUS_ACCESS,
}
ONLY_REQUIRED = {
diff --git a/tests/test_37_entity_categories.py b/tests/test_37_entity_categories.py
index 063cfc95..894b03cf 100644
--- a/tests/test_37_entity_categories.py
+++ b/tests/test_37_entity_categories.py
@@ -1,5 +1,7 @@
from contextlib import closing
+import pytest
+
from pathutils import full_path
from saml2 import config
@@ -291,6 +293,7 @@ def test_filter_ava_esi_coco():
)
+@pytest.mark.skip("Temporarily disabled")
def test_filter_ava_refeds_anonymous_access():
entity_id = "https://anonymous.example.edu/saml2/metadata/"
mds = MetadataStore(ATTRCONV, sec_config, disable_ssl_certificate_validation=True)
@@ -319,6 +322,7 @@ def test_filter_ava_refeds_anonymous_access():
assert _eq(ava["schacHomeOrganization"], ["example.com"])
+@pytest.mark.skip("Temporarily disabled")
def test_filter_ava_refeds_pseudonymous_access():
entity_id = "https://pseudonymous.example.edu/saml2/metadata/"
mds = MetadataStore(ATTRCONV, sec_config, disable_ssl_certificate_validation=True)
@@ -351,6 +355,7 @@ def test_filter_ava_refeds_pseudonymous_access():
assert _eq(ava["schacHomeOrganization"], ["example.com"])
+@pytest.mark.skip("Temporarily disabled")
def test_filter_ava_refeds_personalized_access():
entity_id = "https://personalized.example.edu/saml2/metadata/"
mds = MetadataStore(ATTRCONV, sec_config, disable_ssl_certificate_validation=True)