Add eIDAS NodeCountry and NodeCountryType basic support

- Adds schemas and auto-generated .py files for eIDAS NodeCountry and
NodeCountryType support
- Adds node_country as a recognized attribute in the configuration of an
  SP/IdP
- Adds node_country parsing for the construction of the entity
  descriptor as an extension element

Author: ioparaskev

src/saml2/config.py

@@ -97,6 +97,7 @@
     "sp_type",
     "sp_type_in_metadata",
     "requested_attributes",
+    "node_country",
 ]
 
 AA_IDP_ARGS = [
@@ -118,6 +119,7 @@
     "domain",
     "name_qualifier",
     "edu_person_targeted_id",
+    "node_country",
 ]
 
 PDP_ARGS = ["endpoints", "name_form", "name_id_format"]

src/saml2/extension/node_country.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+#
+# Generated Thu Dec 12 18:16:51 2019 by parse_xsd.py version 0.5.
+#
+
+import saml2
+from saml2 import SamlBase
+
+
+NAMESPACE = 'http://eidas.europa.eu/saml-extensions'
+class NodeCountryType_(SamlBase):
+    """The http://eidas.europa.eu/saml-extensions:NodeCountryType element """
+
+    c_tag = 'NodeCountryType'
+    c_namespace = NAMESPACE
+    c_children = SamlBase.c_children.copy()
+    c_attributes = SamlBase.c_attributes.copy()
+    c_child_order = SamlBase.c_child_order[:]
+    c_cardinality = SamlBase.c_cardinality.copy()
+
+def node_country_type__from_string(xml_string):
+    return saml2.create_class_from_xml_string(NodeCountryType_, xml_string)
+
+
+class NodeCountry(NodeCountryType_):
+    """The http://eidas.europa.eu/saml-extensions:NodeCountry element """
+
+    c_tag = 'NodeCountry'
+    c_namespace = NAMESPACE
+    c_children = NodeCountryType_.c_children.copy()
+    c_attributes = NodeCountryType_.c_attributes.copy()
+    c_child_order = NodeCountryType_.c_child_order[:]
+    c_cardinality = NodeCountryType_.c_cardinality.copy()
+
+def node_country_from_string(xml_string):
+    return saml2.create_class_from_xml_string(NodeCountry, xml_string)
+
+
+ELEMENT_FROM_STRING = {
+    NodeCountry.c_tag: node_country_from_string,
+    NodeCountryType_.c_tag: node_country_type__from_string,
+}
+
+ELEMENT_BY_TAG = {
+    'NodeCountry': NodeCountry,
+    'NodeCountryType': NodeCountryType_,
+}
+def factory(tag, **kwargs):
+    return ELEMENT_BY_TAG[tag](**kwargs)

src/saml2/metadata.py

@@ -10,6 +10,7 @@
 from saml2.extension import shibmd
 from saml2.extension import mdattr
 from saml2.extension import sp_type
+from saml2.extension import node_country
 from saml2.saml import NAME_FORMAT_URI
 from saml2.saml import AttributeValue
 from saml2.saml import Attribute
@@ -770,6 +771,13 @@ def entity_descriptor(confd):
         entd.authn_authority_descriptor = do_aq_descriptor(confd, mycert,
                                                            enc_cert)
 
+    conf_node_country = confd.getattr('node_country', confd.context)
+    if conf_node_country:
+        if not entd.extensions:
+            entd.extensions = md.Extensions()
+        item = node_country.NodeCountry(text=conf_node_country)
+        entd.extensions.add_extension_element(item)
+
     return entd
 
 

tools/data/node_country.xsd

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+    xmlns="http://eidas.europa.eu/saml-extensions"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://eidas.europa.eu/saml-extensions"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1">
+    <xsd:element name="NodeCountry" type="NodeCountryType"/>
+        <xsd:simpleType name="NodeCountryType">
+            <xsd:restriction base="xsd:string">
+                <xsd:pattern value="[A-Z][A-Z]"/>
+            </xsd:restriction>
+        </xsd:simpleType>
+</xsd:schema>