Fix #135, #136. Metadata XML (RequestedAttribute)

Author: pitbulk

src/onelogin/saml2/metadata.py

@@ -87,14 +87,14 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
             requested_attribute_data = []
             for req_attribs in sp['attributeConsumingService']['requestedAttributes']:
                 req_attr_nameformat_str = req_attr_friendlyname_str = req_attr_isrequired_str = ''
-                req_attr_aux_str = ' \>'
+                req_attr_aux_str = ' />'
 
                 if 'nameFormat' in req_attribs.keys() and req_attribs['nameFormat']:
                     req_attr_nameformat_str = " NameFormat=\"%s\"" % req_attribs['nameFormat']
                 if 'friendlyName' in req_attribs.keys() and req_attribs['friendlyName']:
                     req_attr_nameformat_str = " FriendlyName=\"%s\"" % req_attribs['friendlyName']
                 if 'isRequired' in req_attribs.keys() and req_attribs['isRequired']:
-                    req_attr_isrequired_str = " isRequired=\"%s\"" % req_attribs['isRequired']
+                    req_attr_isrequired_str = " isRequired=\"%s\"" % 'true' if req_attribs['isRequired'] else 'false'
                 if 'attributeValue' in req_attribs.keys() and req_attribs['attributeValue']:
                     req_attr_aux_str = """ >
             <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion>%(attributeValue)</saml:AttributeValue>

tests/src/OneLogin/saml2_tests/metadata_test.py

@@ -158,11 +158,11 @@ def testBuilderAttributeConsumingService(self):
         self.assertIn("""        <md:AttributeConsumingService index="1">
             <md:ServiceName xml:lang="en">Test Service</md:ServiceName>
             <md:ServiceDescription xml:lang="en">Test Service</md:ServiceDescription>
-            <md:RequestedAttribute Name="urn:oid:2.5.4.42" FriendlyName="givenName" \>
-            <md:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn" \>
-            <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" FriendlyName="displayName" \>
-            <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" FriendlyName="mail" \>
-            <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" FriendlyName="uid" \>
+            <md:RequestedAttribute Name="urn:oid:2.5.4.42" FriendlyName="givenName" />
+            <md:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn" />
+            <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" FriendlyName="displayName" />
+            <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" FriendlyName="mail" />
+            <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" FriendlyName="uid" />
         </md:AttributeConsumingService>""", metadata)
 
     def testSignMetadata(self):