From 1b62d0d961e3f79dfdac706132d5cc9c81214771 Mon Sep 17 00:00:00 2001
From: Chris Anderson <chris.anderson@am.jll.com>
Date: Fri, 24 Jul 2020 14:01:00 -0600
Subject: Set the default attribute NameFormat to NAME_FORMAT_UNSPECIFIED as
 per section 2.7.3.1 of the spec

---
 src/saml2/saml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/saml2/saml.py b/src/saml2/saml.py
index e551bcb6..933b0a08 100644
--- a/src/saml2/saml.py
+++ b/src/saml2/saml.py
@@ -1079,7 +1079,7 @@ class AttributeType_(SamlBase):
     def __init__(self,
                  attribute_value=None,
                  name=None,
-                 name_format=NAME_FORMAT_URI,
+                 name_format=NAME_FORMAT_UNSPECIFIED,
                  friendly_name=None,
                  text=None,
                  extension_elements=None,
-- 
cgit v1.2.1


From f5fd7f6a8be799cd97411b70378bc500809ef97c Mon Sep 17 00:00:00 2001
From: Chris Anderson <chris.anderson@am.jll.com>
Date: Tue, 11 Aug 2020 06:45:28 -0600
Subject: Ensure IdP configurations still default to NAME_FORMAT_URI

---
 src/saml2/saml.py                              |  6 +++++-
 tests/remote_data/InCommon-metadata-export.xml |  2 +-
 tests/remote_data/metadata.aaitest.xml         |  2 +-
 tests/test_20_assertion.py                     | 18 +++++++++++++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/saml2/saml.py b/src/saml2/saml.py
index 933b0a08..555539fc 100644
--- a/src/saml2/saml.py
+++ b/src/saml2/saml.py
@@ -1079,7 +1079,7 @@ class AttributeType_(SamlBase):
     def __init__(self,
                  attribute_value=None,
                  name=None,
-                 name_format=NAME_FORMAT_UNSPECIFIED,
+                 name_format=NAME_FORMAT_URI,
                  friendly_name=None,
                  text=None,
                  extension_elements=None,
@@ -1093,6 +1093,10 @@ class AttributeType_(SamlBase):
         self.name_format = name_format
         self.friendly_name = friendly_name
 
+    def harvest_element_tree(self, tree):
+        tree.attrib.setdefault('NameFormat', NAME_FORMAT_UNSPECIFIED)
+        SamlBase.harvest_element_tree(self, tree)
+
 
 def attribute_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(AttributeType_, xml_string)
diff --git a/tests/remote_data/InCommon-metadata-export.xml b/tests/remote_data/InCommon-metadata-export.xml
index d67e6afa..5ac71b11 100644
--- a/tests/remote_data/InCommon-metadata-export.xml
+++ b/tests/remote_data/InCommon-metadata-export.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="_20191126T193752" validUntil="9999-01-01T00:00:00Z">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="_20191126T193752" validUntil="3001-01-01T00:00:00Z">
 <md:Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
 <mdrpi:PublicationInfo creationInstant="2019-11-26T19:37:52Z" publisher="https://incommon.org"/>
 </md:Extensions>
diff --git a/tests/remote_data/metadata.aaitest.xml b/tests/remote_data/metadata.aaitest.xml
index 2c5b8824..6f1ec013 100644
--- a/tests/remote_data/metadata.aaitest.xml
+++ b/tests/remote_data/metadata.aaitest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="AAITest-20191127170144" Name="urn:mace:switch.ch:aaitest" validUntil="9999-01-01T00:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="AAITest-20191127170144" Name="urn:mace:switch.ch:aaitest" validUntil="3001-01-01T00:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
 <!--
 		This metadata file is generated for the AAI Test federation,
 		which is for development and testing purposes only!
diff --git a/tests/test_20_assertion.py b/tests/test_20_assertion.py
index bb4dbb73..f617e516 100644
--- a/tests/test_20_assertion.py
+++ b/tests/test_20_assertion.py
@@ -2,11 +2,12 @@
 from saml2.argtree import add_path
 from saml2.authn_context import pword
 from saml2.mdie import to_dict
-from saml2 import md, assertion
+from saml2 import md, assertion, create_class_from_xml_string
 from saml2.saml import Attribute
 from saml2.saml import Issuer
 from saml2.saml import NAMEID_FORMAT_ENTITY
 from saml2.saml import NAME_FORMAT_URI
+from saml2.saml import NAME_FORMAT_UNSPECIFIED
 from saml2.saml import AttributeValue
 from saml2.saml import NameID
 from saml2.saml import NAMEID_FORMAT_TRANSIENT
@@ -942,6 +943,21 @@ def test_assertion_with_authn_instant():
     assert msg.authn_statement[0].authn_instant == "2009-02-13T23:31:30Z"
 
 
+def test_attribute_producer_should_default_to_uri():
+    attr = Attribute()
+    assert attr.name_format == NAME_FORMAT_URI
+
+
+def test_attribute_consumer_should_default_to_unspecified():
+    attr_str = """
+      <saml:Attribute Name="uid" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <saml:AttributeValue xsi:type="xs:string">test</saml:AttributeValue>
+      </saml:Attribute>
+    """
+    attr = create_class_from_xml_string(Attribute, attr_str)
+    assert attr.name_format == NAME_FORMAT_UNSPECIFIED
+
+
 if __name__ == "__main__":
     test_assertion_2()
 
-- 
cgit v1.2.1


From b7a77f79441c61adfbce5aa111aefa3f52a34365 Mon Sep 17 00:00:00 2001
From: Ivan Kanakarakis <ivan.kanak@gmail.com>
Date: Tue, 29 Sep 2020 15:48:17 +0300
Subject: Add explanatory comment for harvest_element_tree usage

---
 src/saml2/saml.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/saml2/saml.py b/src/saml2/saml.py
index 555539fc..0351aef6 100644
--- a/src/saml2/saml.py
+++ b/src/saml2/saml.py
@@ -1093,6 +1093,7 @@ class AttributeType_(SamlBase):
         self.name_format = name_format
         self.friendly_name = friendly_name
 
+    # when consuming such elements, default to NAME_FORMAT_UNSPECIFIED as NameFormat
     def harvest_element_tree(self, tree):
         tree.attrib.setdefault('NameFormat', NAME_FORMAT_UNSPECIFIED)
         SamlBase.harvest_element_tree(self, tree)
-- 
cgit v1.2.1