support scope as a mako filter

Author: leifj

src/satosa/internal_data.py

@@ -135,7 +135,7 @@ def _collate_attribute_values_by_priority_order(self, attribute_names, data):
         return result
 
     def _render_attribute_template(self, template, data):
-        t = Template(template,cache_enabled=True)
+        t = Template(template,cache_enabled=True,imports=["from satosa.util import scope"])
         return t.render(**data).split(self.multivalue_separator)
 
     def _get_nested_attribute_value(self, nested_key, data):

src/satosa/util.py

@@ -168,3 +168,9 @@ def rndstr(size=16, alphabet=""):
     if not alphabet:
         alphabet = string.ascii_letters[0:52] + string.digits
     return type(alphabet)().join(rng.choice(alphabet) for _ in range(size))
+
+def scope(s):
+   if not '@' in s:
+      raise ValueError("Unscoped string")
+   (local_part, _, domain_part) = s.partition('@')
+   return domain_part

tests/satosa/test_internal_data.py

@@ -272,6 +272,29 @@ def test_simple_template_mapping(self):
         assert len(internal_repr["name"]) == 1
         assert internal_repr["name"][0] == "Valfrid Lindeman"
 
+    def test_scoped_template_mapping(self):
+        mapping = {
+            "attributes": {
+                "unscoped_affiliation": {
+                   "p1": ["eduPersonAffiliation"]
+                },
+                "uid": {
+                   "p1": ["eduPersonPrincipalName"],
+                },
+                "affiliation": {
+                   "p1": ["eduPersonScopedAffiliation","${eduPersonAffiliation[0]}@${eduPersonPrincipalName[0] | scope}"]
+                }
+            }
+        }
+
+        converter = DataConverter(mapping)
+        internal_repr = converter.to_internal("p1", {
+             "eduPersonAffiliation": ["student"], 
+             "eduPersonPrincipalName": ["[email protected]"]})
+        assert "affiliation" in internal_repr
+        assert len(internal_repr["affiliation"]) == 1
+        assert internal_repr["affiliation"][0] == "[email protected]"
+
 
     @pytest.mark.parametrize("attribute_value", [
         {"email": "[email protected]"},