diff --git a/example/idp2/idp.xml b/example/idp2/idp.xml index f8c77438b..07ba648e5 100644 --- a/example/idp2/idp.xml +++ b/example/idp2/idp.xml @@ -1,4 +1,4 @@ -MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV +MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l @@ -14,7 +14,7 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= -urn:oasis:names:tc:SAML:2.0:nameid-format:transienturn:oasis:names:tc:SAML:2.0:nameid-format:persistentMIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV +urn:oasis:names:tc:SAML:2.0:nameid-format:transienturn:oasis:names:tc:SAML:2.0:nameid-format:persistentMIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l @@ -30,7 +30,7 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= -MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV +MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l @@ -46,4 +46,4 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= -urn:oasis:names:tc:SAML:2.0:nameid-format:transienturn:oasis:names:tc:SAML:2.0:nameid-format:persistentRolands IdentiteterRolands Identiteterhttp://www.example.comRolandHedbergtechnical@example.comSupportsupport@example.com +urn:oasis:names:tc:SAML:2.0:nameid-format:transienturn:oasis:names:tc:SAML:2.0:nameid-format:persistentRolands IdentiteterRolands Identiteterhttp://www.example.comRolandHedbergtechnical@example.comSupportsupport@example.com diff --git a/src/saml2/__init__.py b/src/saml2/__init__.py index 6588a741b..d04c85e9f 100644 --- a/src/saml2/__init__.py +++ b/src/saml2/__init__.py @@ -44,7 +44,31 @@ NAMESPACE = 'urn:oasis:names:tc:SAML:2.0:assertion' # TEMPLATE = '{urn:oasis:names:tc:SAML:2.0:assertion}%s' -# XSI_NAMESPACE = 'http://www.w3.org/2001/XMLSchema-instance' +SAMLP_NAMESPACE = 'urn:oasis:names:tc:SAML:2.0:protocol' +XSI_NAMESPACE = 'http://www.w3.org/2001/XMLSchema-instance' +XS_NAMESPACE = 'http://www.w3.org/2001/XMLSchema' +DS_NAMESPACE = 'http://www.w3.org/2000/09/xmldsig#' +MD_NAMESPACE = "urn:oasis:names:tc:SAML:2.0:metadata" +MDATTR_NAMESPACE = 'urn:oasis:names:tc:SAML:metadata:attribute' +MDUI_NAMESPACE = "urn:oasis:names:tc:SAML:metadata:ui" +XENC_NAMESPACE = 'http://www.w3.org/2001/04/xmlenc#' +ALG_NAMESPACE = 'urn:oasis:names:tc:SAML:metadata:algsupport' +IDPDISC_NAMESPACE = 'urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol' +ECP_NAMESPACE = 'urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp' +OASIS_DEFAULT_NS_PREFIXES = { + 'saml': NAMESPACE, + 'samlp': SAMLP_NAMESPACE, + 'ds': DS_NAMESPACE, + 'xsi': XSI_NAMESPACE, + 'xs': XS_NAMESPACE, + 'xenc': XENC_NAMESPACE, + 'mdui': MDUI_NAMESPACE, + 'md': MD_NAMESPACE, + 'mdattr': MDATTR_NAMESPACE, + 'alg': ALG_NAMESPACE, + 'idpdisc': IDPDISC_NAMESPACE, + 'ecp': ECP_NAMESPACE, +} NAMEID_FORMAT_EMAILADDRESS = ( "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress") @@ -556,7 +580,8 @@ def _to_element_tree(self): self._add_members_to_element_tree(new_tree) return new_tree - def register_prefix(self, nspair): + @staticmethod + def register_prefix(nspair): """ Register with ElementTree a set of namespaces @@ -1048,3 +1073,6 @@ def is_required_attribute(cls, attr): :return: True if required """ return cls.c_attributes[attr][REQUIRED] + + +SamlBase.register_prefix(OASIS_DEFAULT_NS_PREFIXES) diff --git a/tests/attribute_statement_data.py b/tests/attribute_statement_data.py index dae085f10..127d397ef 100644 --- a/tests/attribute_statement_data.py +++ b/tests/attribute_statement_data.py @@ -4,74 +4,74 @@ """Testdata for attribute converters """ STATEMENT1 = """ - - - rohe0002@umu.se - - - a139b2116ad1dd7b91c129a32a242fcc5fd9e821 - - - Hedberg, Roland - - - rohe0002 - - - rohe0002 - - - Roland Hedberg - - - member - employee - staff - - - Umeå universitet - - - 901 87 - - - employee@umu.se - staff@umu.se - member@umu.se - - - Västra flygeln, plan 4 - - - IT-arkitekt - övrig/annan befattning - - - Ladokenheten - IT-enheten - - - Roland - - - Hedberg - -""" + + + rohe0002@umu.se + + + a139b2116ad1dd7b91c129a32a242fcc5fd9e821 + + + Hedberg, Roland + + + rohe0002 + + + rohe0002 + + + Roland Hedberg + + + member + employee + staff + + + Umeå universitet + + + 901 87 + + + employee@umu.se + staff@umu.se + member@umu.se + + + Västra flygeln, plan 4 + + + IT-arkitekt + övrig/annan befattning + + + Ladokenheten + IT-enheten + + + Roland + + + Hedberg + +""" STATEMENT2 = """ @@ -129,34 +129,34 @@ """ STATEMENT3 = """ - - - 1234567890 - - - staff - - + + 1234567890 + + + staff + + - Hedberg - - - roland - - - Roland - -""" + Hedberg + + + roland + + + Roland + +""" STATEMENT4 = """ - - - bob - - - bobsnameagain - -""" + + + bob + + + bobsnameagain + +""" STATEMENT_MIXED = """ diff --git a/tests/ecp_soap.xml b/tests/ecp_soap.xml index dbe07d30f..743e6eac5 100644 --- a/tests/ecp_soap.xml +++ b/tests/ecp_soap.xml @@ -1,28 +1,28 @@ + xmlns:ecp="urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp" + xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" + xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"> - - - + - - https://sp.example.org/entity - - + https://sp.example.org/entity + + ABCDEFGHI01234567 - + - + diff --git a/tests/enc_tmpl.xml b/tests/enc_tmpl.xml index 711496729..76a155dd7 100644 --- a/tests/enc_tmpl.xml +++ b/tests/enc_tmpl.xml @@ -1,22 +1,22 @@ - - - - - + + - - my-rsa-key - - - - - - - - - - + + my-rsa-key + + + + + + + + + + diff --git a/tests/encrypted_attribute_statement.xml b/tests/encrypted_attribute_statement.xml index 45c490411..9d88519f3 100644 --- a/tests/encrypted_attribute_statement.xml +++ b/tests/encrypted_attribute_statement.xml @@ -1,18 +1,18 @@ - - - + + - - - + - - - + + + xj+8vbBX7wMflO5/Oiw19sXUNtAjIXU5F/EAojJWQq3HRNzI/8MAy03SUHwsYdxu nj4Q1Wp8PpaQnOdtGlkyHMXOJxoZr8x2e5LJt4Tqbyr9V2S5QTYinkyr+3AAVET3 qNfDNvngHBIP3PsNLmZrts08UW5By8WmZwj/ZUAvR5+VfqbrXbyV8Cl3CI1QKzq0 @@ -21,49 +21,49 @@ 8yBq4U19bqk+NS0Vs6Y2oG62P6uRBfzan3dbL8yrpwJNtrQt3cJRTl/8c7RKRR1g TR4ecJaHw9aHexMqghCFi7Xpw1H/mQO1b4QUebgbRMQPNufmkr+NZrAj+8IJYzrO QD0030NDdChObGMwUYs1/EsQPSa5nJs+ - - - - - + + + + - - - - - + + + + + H57XM3+yhY5nHiTYmfTLmH9FBL9jTRcUQTx0fwSIQaYbsHVne9gvsu47unVwXASl GjUzqbRuH2p7iGJsL1RH2wHYqU/P3pzJdt5EFpTso9JVwnTfxDlHBABDDGIk3jN+ 0WzqlrHsouUm5MAUC3x45F0TNZLWrS243Hnz7/MQTa8= - - - - - - - - - - + + + + + + + + + - - - + + - - - - - + + + + + hDtrZP8T7LHr0dtbhI5KnRDZiDpnKFJ2RT1yqP42G0MAuvE/pdPPR3bpRD6AGvfd LL6i3YffzrB2eQ2Pu4yfEyzh9NyK8RRIW3eQxPlIeiDdSg8LjDt0Z5R3Y/OQnupK 2cpd+ZdddbRD0I5Itsa0/B3SsoPBva5/HB1iVmXAEHg= - - - - - - + + + + + + XNyrhgaUs00vg9WA5idgv6yPOa5CwHrCb4IHM7tlK+aW7MWaZBjcifDFJDBNQ1At h8092JEknRAXeI8hrWCb3/uHPAK51Q07euszJkWi51UbVZblEYlc/US/Ibq3DGt/ 1wuXrpoSFx2kNVg8mTahVrOXQrKXJThb/NhRs3616WzVvePV0hveABv8cTT1rSjW @@ -72,32 +72,32 @@ MQZwu77a2JdT7Z0+QKZW8k8TD0dNtId4BPndLPSsHb++2b3mL6XryhGfW7oTQmkC iKF4gB9b7p+tKNrMBSaB1ZGBUQwopTStdGft3wdIRAGlOSvjeJG74s5YQyinO8nt gUsjgUuYzyxdJ2yxG4WG67RWvLAxhHwmiAQgS62b/JgmzO+GMUdaEw== - - - - - - - + + + + + + - - - + + - - - - - + + + + + mqeDbs+m1iV/iJAibjg2JkaTk5qgcoevTFmQvKi4r/poK1Ch6RuNhcY6B+avyrC7 of4A0wQY8/gWoH8Ka3IjvrMMHEfSHqhAJPu5At10Bf0ImJFpjhcZMdC5J4i0m8oU sV3zmMzZFs9gMuyNHWKPBFNzTZSWweiTEGMB7poxLqw= - - - - - - + + + + + + or5RZixvPJKh3/dk4xm5xfbTLYlgEaSs88lLtx+7eWUuTKUD7APCi3QtBJmMzPak L4MXdGkIjonw9S5xtG3ElUmLU3kix/FmPWnHotuCWonFIqoqQBaSCeOf04ZzZqlB RFBBjDXC/tiImGZ0IENk8ztyrWpW/iru8hl75VSE/lpWB+j7+q4qIJgs5vOlQ+mE @@ -106,32 +106,32 @@ jvJR/WMVMaWjFDXR8NnBCyGhSHU1/OsTdKNPw01XNx7wTGCD79dijY8Jz6qoBZEf C3zrySPPFi+8UZfxRdjOyb2adTxtxF4R2TRTUObuEuB7WV5jNY17qMj7Am0wHtiP R/e5d9kiwEiUBhbDcFfXAg== - - - - - - - + + + + + + - - - + + - - - - - + + + + + kpkeBJDeQ7Eo1h5vOo5tmIAwhJm01wuOTWRzwBw1tIne2REC0DwxpQf6+ZOXCQAe uo3bv9wY0RbLBptKa4AULFvqB5gWAxyGZ8pdG4l7FwlE+cSVTAz6CEY2ptNuGF9o 8Ytioe0h2MrUxK0BGMcRFtEdlo3fJPL/biKwh8Ah6W0= - - - - - - + + + + + + XQmRA71fcF0Inuzn7nEZGFu0XHnMV50VUfzbfxonOskcf63wRJQdBCSffUQPj7P6 07rGbJYEBUhF1K2RtvL06aeuxWNGRt0oTWV0eyW0PLCihWpNnBmxXFR420lQn0jc Jh8KEdsEdsgemveBOTP2mTchywqeEnAm6SUK44SVB85jOsbmomjGTPh2XZ0YgWgp @@ -140,8 +140,8 @@ kfiWZV2U1GLocF9IJmPLrIgDznOCN8NQiHbcTgGHDVxUup4revQq8Ryu536qQ4Cn 5RGpENRQ7qvikA9P22pwaJu7dlX+ygnO1XmhX+QpysOT7GkUoA6veEc0QvVGdjWI MvIFnYwtIJkrBFxLgQY5O2RD2Mb9wFpMQGZdBuwKVxI= - - - - - + + + + + diff --git a/tests/entity_cat_re.xml b/tests/entity_cat_re.xml index c8ce2cfe2..71308e796 100644 --- a/tests/entity_cat_re.xml +++ b/tests/entity_cat_re.xml @@ -1,33 +1,33 @@ - - - - - + + + + http://www.swamid.se/category/research-and-education - - - - - + + + + - - + - - - - - + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -44,14 +44,14 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - - - - + + + + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -68,17 +68,17 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - - - + + diff --git a/tests/entity_cat_re_nren.xml b/tests/entity_cat_re_nren.xml index ea45a8b4a..d5cc178ad 100644 --- a/tests/entity_cat_re_nren.xml +++ b/tests/entity_cat_re_nren.xml @@ -1,36 +1,36 @@ - - - - - + + + + http://www.swamid.se/category/research-and-education - - + + http://www.swamid.se/category/nren-service - - - - - + + + + - - + - - - - - + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -47,14 +47,14 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - - - - + + + + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -71,17 +71,17 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - - - + + diff --git a/tests/entity_cat_rs.xml b/tests/entity_cat_rs.xml index 5f3e00f8b..37d5110b7 100644 --- a/tests/entity_cat_rs.xml +++ b/tests/entity_cat_rs.xml @@ -1,33 +1,33 @@ - - - - - + + + + http://refeds.org/category/research-and-scholarship - - - - - + + + + - - + - - - - - + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -44,14 +44,14 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - - - - + + + + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -68,17 +68,17 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - - - + + diff --git a/tests/entity_cat_sfs_hei.xml b/tests/entity_cat_sfs_hei.xml index 6b05f1c2f..7b86aa474 100644 --- a/tests/entity_cat_sfs_hei.xml +++ b/tests/entity_cat_sfs_hei.xml @@ -1,34 +1,34 @@ - - - - - + + + + http://www.swamid.se/category/sfs-1993-1153 - - + + http://www.swamid.se/category/hei-service - - - - - + + + + - - + - - - - - + + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -44,14 +44,14 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - - - - + + + + + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -67,54 +67,54 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - - - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + + - - - - - AB Exempel - AB Exempel - - http://www.example.org - - - - Roland - Hedberg - tech@eample.com - tech@example.org - +46 70 100 0000 - - + + + AB Exempel + AB Exempel + + http://www.example.org + + + + Roland + Hedberg + tech@eample.com + tech@example.org + +46 70 100 0000 + + diff --git a/tests/entity_esi_and_coco_sp.xml b/tests/entity_esi_and_coco_sp.xml index a076535b6..eb88d492c 100644 --- a/tests/entity_esi_and_coco_sp.xml +++ b/tests/entity_esi_and_coco_sp.xml @@ -1,18 +1,18 @@ - - + + https://myacademicid.org/entity-categories/esi http://www.geant.net/uri/dataprotection-code-of-conduct/v1 - - - - - - MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC + + + + + + MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC U0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYD VQQKDAVFRFVJRDEaMBgGA1UECwwRZWR1aWQuZXhhbXBsZS5jb20xGjAYBgNVBAMM EWVkdWlkLmV4YW1wbGUuY29tMSAwHgYJKoZIhvcNAQkBFhFlZHVpZEBleGFtcGxl @@ -32,14 +32,14 @@ ST6WPF+2vDJv7dGPuglzyQLvA2fd6BLnyGV6kLUc2XNOyCmD/tWuMvKvW62j4Y3B XZvRFZZdHNgay4Wgvs8D6wyozWpkWpawXkQ3LqbXO6GChYC4VLru+uJuMKvvKCd/ I125dzkP2nf9zkGV0cil3oIVSBPBtSRTF/M+oZhkHTwoM6hhonRvdOLuvobKfZ2Q wHyaxzYldWmVC5omkgZeAdCGpJ316GQF8Zwg/yDOUzm4cvGeIESf1Q6ZxBwI6zGE - - - - - - - - MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC + + + + + + + + MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC U0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYD VQQKDAVFRFVJRDEaMBgGA1UECwwRZWR1aWQuZXhhbXBsZS5jb20xGjAYBgNVBAMM EWVkdWlkLmV4YW1wbGUuY29tMSAwHgYJKoZIhvcNAQkBFhFlZHVpZEBleGFtcGxl @@ -59,38 +59,38 @@ ST6WPF+2vDJv7dGPuglzyQLvA2fd6BLnyGV6kLUc2XNOyCmD/tWuMvKvW62j4Y3B XZvRFZZdHNgay4Wgvs8D6wyozWpkWpawXkQ3LqbXO6GChYC4VLru+uJuMKvvKCd/ I125dzkP2nf9zkGV0cil3oIVSBPBtSRTF/M+oZhkHTwoM6hhonRvdOLuvobKfZ2Q wHyaxzYldWmVC5omkgZeAdCGpJ316GQF8Zwg/yDOUzm4cvGeIESf1Q6ZxBwI6zGE - - - - - - + + + + + + - - esi-coco-SP - ESI and COCO SP - - - - - - Example CO - Example CO - Example - Example - http://www.example.edu - http://www.example.com - - - Example CO - Sysadmin - - sysadmin@example.com - - - Example CO - Admin - CEO - admin@example.com - - + + esi-coco-SP + ESI and COCO SP + + + + + + Example CO + Example CO + Example + Example + http://www.example.edu + http://www.example.com + + + Example CO + Sysadmin + + sysadmin@example.com + + + Example CO + Admin + CEO + admin@example.com + + diff --git a/tests/entity_no_friendly_name_sp.xml b/tests/entity_no_friendly_name_sp.xml index 584494c24..beb0df795 100644 --- a/tests/entity_no_friendly_name_sp.xml +++ b/tests/entity_no_friendly_name_sp.xml @@ -1,16 +1,16 @@ - - + + http://www.geant.net/uri/dataprotection-code-of-conduct/v1 - - - - - - MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC + + + + + + MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC U0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYD VQQKDAVFRFVJRDEaMBgGA1UECwwRZWR1aWQuZXhhbXBsZS5jb20xGjAYBgNVBAMM EWVkdWlkLmV4YW1wbGUuY29tMSAwHgYJKoZIhvcNAQkBFhFlZHVpZEBleGFtcGxl @@ -30,14 +30,14 @@ ST6WPF+2vDJv7dGPuglzyQLvA2fd6BLnyGV6kLUc2XNOyCmD/tWuMvKvW62j4Y3B XZvRFZZdHNgay4Wgvs8D6wyozWpkWpawXkQ3LqbXO6GChYC4VLru+uJuMKvvKCd/ I125dzkP2nf9zkGV0cil3oIVSBPBtSRTF/M+oZhkHTwoM6hhonRvdOLuvobKfZ2Q wHyaxzYldWmVC5omkgZeAdCGpJ316GQF8Zwg/yDOUzm4cvGeIESf1Q6ZxBwI6zGE - - - - - - - - MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC + + + + + + + + MIIDvDCCAqQCCQDXVjecpE8ibTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC U0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYD VQQKDAVFRFVJRDEaMBgGA1UECwwRZWR1aWQuZXhhbXBsZS5jb20xGjAYBgNVBAMM EWVkdWlkLmV4YW1wbGUuY29tMSAwHgYJKoZIhvcNAQkBFhFlZHVpZEBleGFtcGxl @@ -57,37 +57,37 @@ ST6WPF+2vDJv7dGPuglzyQLvA2fd6BLnyGV6kLUc2XNOyCmD/tWuMvKvW62j4Y3B XZvRFZZdHNgay4Wgvs8D6wyozWpkWpawXkQ3LqbXO6GChYC4VLru+uJuMKvvKCd/ I125dzkP2nf9zkGV0cil3oIVSBPBtSRTF/M+oZhkHTwoM6hhonRvdOLuvobKfZ2Q wHyaxzYldWmVC5omkgZeAdCGpJ316GQF8Zwg/yDOUzm4cvGeIESf1Q6ZxBwI6zGE - - - - - - + + + + + + - - no-friendlyName-SP - No friendlyName SP - - - - - Example CO - Example CO - Example - Example - http://www.example.edu - http://www.example.com - - - Example CO - Sysadmin - - sysadmin@example.com - - - Example CO - Admin - CEO - admin@example.com - - + + no-friendlyName-SP + No friendlyName SP + + + + + Example CO + Example CO + Example + Example + http://www.example.edu + http://www.example.com + + + Example CO + Sysadmin + + sysadmin@example.com + + + Example CO + Admin + CEO + admin@example.com + + diff --git a/tests/idp.xml b/tests/idp.xml index a79bbf6f5..a1de8e70e 100644 --- a/tests/idp.xml +++ b/tests/idp.xml @@ -1,5 +1,5 @@ -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -14,7 +14,7 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -29,4 +29,4 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com +Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com diff --git a/tests/idp_2.xml b/tests/idp_2.xml index 9c8dfccae..e0d63f68d 100644 --- a/tests/idp_2.xml +++ b/tests/idp_2.xml @@ -1,12 +1,12 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -22,40 +22,40 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/roland - - - - John - Smith - john.smith@example.com - - - - + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/roland + + + + John + Smith + john.smith@example.com + + + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -71,28 +71,28 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/roland - - - - John - Smith - john.smith@example.com - - - + + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/roland + + + + John + Smith + john.smith@example.com + + + diff --git a/tests/idp_aa.xml b/tests/idp_aa.xml index e258aa681..f7ea089df 100644 --- a/tests/idp_aa.xml +++ b/tests/idp_aa.xml @@ -1,12 +1,12 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -22,40 +22,40 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/roland - - - - John - Smith - john.smith@example.com - - - - + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/roland + + + + John + Smith + john.smith@example.com + + + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -71,28 +71,28 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/roland - - - - John - Smith - john.smith@example.com - - - + + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/roland + + + + John + Smith + john.smith@example.com + + + diff --git a/tests/idp_all.xml b/tests/idp_all.xml index 4aab003ee..e366827ab 100644 --- a/tests/idp_all.xml +++ b/tests/idp_all.xml @@ -1,5 +1,5 @@ -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -14,7 +14,7 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -29,7 +29,7 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -44,4 +44,4 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com +Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com diff --git a/tests/idp_example.xml b/tests/idp_example.xml index dd7bc86f8..fa9f98493 100644 --- a/tests/idp_example.xml +++ b/tests/idp_example.xml @@ -1,15 +1,15 @@ - - - - - - + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -26,14 +26,14 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - - - - + + + + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -50,60 +50,60 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - - - - - - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + + - - - - - - - + - - - - + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -120,14 +120,14 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - - - - + + + + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -144,20 +144,20 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - - + - - - - + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -174,14 +174,14 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - - - - + + + + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -198,33 +198,33 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - - - Rolands Identiteter - - Rolands Identiteter - - http://www.example.com - - - - Roland - Hedberg - technical@example.com - - - Support - support@example.com - - + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + + + + Rolands Identiteter + + Rolands Identiteter + + http://www.example.com + + + + Roland + Hedberg + technical@example.com + + + Support + support@example.com + + diff --git a/tests/idp_slo_redirect.xml b/tests/idp_slo_redirect.xml index cbf723faf..78c77f754 100644 --- a/tests/idp_slo_redirect.xml +++ b/tests/idp_slo_redirect.xml @@ -1,5 +1,5 @@ -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -14,4 +14,4 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com +Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com diff --git a/tests/idp_soap.xml b/tests/idp_soap.xml index 0902dc5e9..e80f4fea4 100644 --- a/tests/idp_soap.xml +++ b/tests/idp_soap.xml @@ -1,5 +1,5 @@ -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -14,4 +14,4 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com +Exempel ABExempel ABExample Co.http://www.example.com/rolandJohnSmithjohn.smith@example.com diff --git a/tests/idp_uiinfo.xml b/tests/idp_uiinfo.xml index 7d531fd11..740ca8dbc 100644 --- a/tests/idp_uiinfo.xml +++ b/tests/idp_uiinfo.xml @@ -1,19 +1,19 @@ - - - - descriptor-example.org - descriptor-example[^0-9]*\.org - - - - idpssodescriptor-example.org - foo barhttp://example.com/logo.jpghttp://example.com/saml2/info.htmlExample Co.Exempel bolaghttp://example.com/saml2/privacyStatement.html - - - MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJg2cms7MqjniT8Fi/XkNHZNPbNVQyMUMXE9tXOdqwYCA1cc8vQdzkihscQMXy3iPw2cMggBu6gjMTOSOxECkuvX5ZCclKr8pXAJM5cY6gVOaVO2PdTZcvDBKGbiaNefiEw5hnoZomqZGp8wHNLAUkwtH9vjqqvxyS/vclc6k2ewIDAQABo4GnMIGkMB0GA1UdDgQWBBRePsKHKYJsiojE78ZWXccK9K4aJTB1BgNVHSMEbjBsgBRePsKHKYJsiojE78ZWXccK9K4aJaFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJrzqSSwmDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + descriptor-example.org + descriptor-example[^0-9]*\.org + + + + idpssodescriptor-example.org + foo barhttp://example.com/logo.jpghttp://example.com/saml2/info.htmlExample Co.Exempel bolaghttp://example.com/saml2/privacyStatement.html + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJg2cms7MqjniT8Fi/XkNHZNPbNVQyMUMXE9tXOdqwYCA1cc8vQdzkihscQMXy3iPw2cMggBu6gjMTOSOxECkuvX5ZCclKr8pXAJM5cY6gVOaVO2PdTZcvDBKGbiaNefiEw5hnoZomqZGp8wHNLAUkwtH9vjqqvxyS/vclc6k2ewIDAQABo4GnMIGkMB0GA1UdDgQWBBRePsKHKYJsiojE78ZWXccK9K4aJTB1BgNVHSMEbjBsgBRePsKHKYJsiojE78ZWXccK9K4aJaFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJrzqSSwmDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6mrPzGzk3ECbupFnqyREH3+ZPSdk= + + + + + diff --git a/tests/md_data.py b/tests/md_data.py index 1a18ce6d3..08d644664 100644 --- a/tests/md_data.py +++ b/tests/md_data.py @@ -108,9 +108,9 @@ """ TEST_ORGANIZATION_DISPLAY_NAME = """ - + Catalogix - + """ TEST_ORGANIZATION_URL = """ diff --git a/tests/metadata.xml b/tests/metadata.xml index 90fb3d2de..edbd84124 100644 --- a/tests/metadata.xml +++ b/tests/metadata.xml @@ -1,14 +1,14 @@ - - - + + - - - - + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -25,34 +25,34 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - - - http://www.example.com/ - - Example Co - Example Co - - - - Roland - Hedberg - roland.hedberg@example.com - - - - + + http://www.example.com/ + + Example Co + Example Co + + + + Roland + Hedberg + roland.hedberg@example.com + + + + - - - - + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz @@ -69,25 +69,25 @@ BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - + + + + - - - http://www.example.com/ - - Example Co - Example Co - - - - Roland - Hedberg - roland.hedberg@example.com - - - + + + http://www.example.com/ + + Example Co + Example Co + + + + Roland + Hedberg + roland.hedberg@example.com + + + diff --git a/tests/metadata/idp.xml b/tests/metadata/idp.xml index f6ef697b0..cb56d2a52 100644 --- a/tests/metadata/idp.xml +++ b/tests/metadata/idp.xml @@ -1,12 +1,12 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -22,34 +22,34 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/roland - - - - John - Smith - john.smith@example.com - - - + + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/roland + + + + John + Smith + john.smith@example.com + + + diff --git a/tests/metadata/idp_2.xml b/tests/metadata/idp_2.xml index 9c8dfccae..e0d63f68d 100644 --- a/tests/metadata/idp_2.xml +++ b/tests/metadata/idp_2.xml @@ -1,12 +1,12 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -22,40 +22,40 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/roland - - - - John - Smith - john.smith@example.com - - - - + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/roland + + + + John + Smith + john.smith@example.com + + + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -71,28 +71,28 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/roland - - - - John - Smith - john.smith@example.com - - - + + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/roland + + + + John + Smith + john.smith@example.com + + + diff --git a/tests/metadata/idp_uiinfo.xml b/tests/metadata/idp_uiinfo.xml index fa37d7035..4f83ec62e 100644 --- a/tests/metadata/idp_uiinfo.xml +++ b/tests/metadata/idp_uiinfo.xml @@ -1,5 +1,5 @@ -example.orgfoo barhttp://example.com/logo.jpghttp://example.com/saml2/info.htmlExample Co.Exempel bolaghttp://example.com/saml2/privacyStatement.htmlMIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +example.orgfoo barhttp://example.com/logo.jpghttp://example.com/saml2/info.htmlExample Co.Exempel bolaghttp://example.com/saml2/privacyStatement.htmlMIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -14,4 +14,4 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - + diff --git a/tests/metadata_cert.xml b/tests/metadata_cert.xml index f467cd94e..3139673e0 100644 --- a/tests/metadata_cert.xml +++ b/tests/metadata_cert.xml @@ -1,53 +1,53 @@ - - - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJg2cms7MqjniT8Fi/XkNHZNPbNVQyMUMXE9tXOdqwYCA1cc8vQdzkihscQMXy3iPw2cMggBu6gjMTOSOxECkuvX5ZCclKr8pXAJM5cY6gVOaVO2PdTZcvDBKGbiaNefiEw5hnoZomqZGp8wHNLAUkwtH9vjqqvxyS/vclc6k2ewIDAQABo4GnMIGkMB0GA1UdDgQWBBRePsKHKYJsiojE78ZWXccK9K4aJTB1BgNVHSMEbjBsgBRePsKHKYJsiojE78ZWXccK9K4aJaFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJrzqSSwmDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - - - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + + - - - AB Exempel - AB Exempel - - http://www.example.org - - - - Roland - Hedberg - tech@eample.com - tech@example.org - +46 70 100 0000 - - + + + AB Exempel + AB Exempel + + http://www.example.org + + + + Roland + Hedberg + tech@eample.com + tech@example.org + +46 70 100 0000 + + diff --git a/tests/metadata_sp_1.xml b/tests/metadata_sp_1.xml index 24e189a7f..4fb93343d 100644 --- a/tests/metadata_sp_1.xml +++ b/tests/metadata_sp_1.xml @@ -1,14 +1,14 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -24,14 +24,14 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - - - - + + + + + + + + MIICHzCCAYgCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNV BAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwF Wnp6enoxDTALBgNVBAMMBHRlc3QwHhcNMTUwNjAyMDc0MzAxWhcNMjUwNTMwMDc0 @@ -44,14 +44,14 @@ CZrAObpaC4nbyPPW/vccFKmEkYtlygEPgky7D9AGsVSaTc/YxPZcanY+vKoRIsiR 6ZitIUU5b+NnHcdj6289tUQ0iHj5jgVyv8wYHvPntTnqH2S7he0talLER8ITYToh 2wz3u7waz/GypMeA/suhoEfxew== - - - - - - - - + + + + + + + + MIICHzCCAYgCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNV BAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwF Wnp6enoxDTALBgNVBAMMBHRlc3QwHhcNMTUwNjAyMDc0MjI2WhcNMjUwNTMwMDc0 @@ -64,51 +64,51 @@ M5a+Hth53m5hbAFuguSvERPCuJ/CfP1+g7CIZN/GnsIsg9QW77NvdOyxjXxzoJJm okl1qz/qy3FY3mJ0gIUxDyPD9DL3c9/03MDv5YmWsoP+HNqK8QtNJ/JDEOhBr/Eo /MokRo4gtMNeLF/soveWNoNiUg== - - - - - + + + + - - + + urn:mace:example.com:saml:roland:sp - - My own SP - - + My own SP + + - - - - - - - AB Exempel - - AB Exempel - - http://www.example.org - - - - Roland - Hedberg - tech@eample.com - tech@example.org - +46 70 100 0000 - - - + + + + AB Exempel + + AB Exempel + + http://www.example.org + + + + Roland + Hedberg + tech@eample.com + tech@example.org + +46 70 100 0000 + + + diff --git a/tests/metadata_sp_1_no_encryption.xml b/tests/metadata_sp_1_no_encryption.xml index 6812b55d2..ef47fbffd 100644 --- a/tests/metadata_sp_1_no_encryption.xml +++ b/tests/metadata_sp_1_no_encryption.xml @@ -1,14 +1,14 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -24,51 +24,51 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - - + + urn:mace:example.com:saml:roland:sp - - My own SP - - + My own SP + + - - - - - - - AB Exempel - - AB Exempel - - http://www.example.org - - - - Roland - Hedberg - tech@eample.com - tech@example.org - +46 70 100 0000 - - - + + + + AB Exempel + + AB Exempel + + http://www.example.org + + + + Roland + Hedberg + tech@eample.com + tech@example.org + +46 70 100 0000 + + + diff --git a/tests/metadata_sp_2.xml b/tests/metadata_sp_2.xml index 0e8e71035..3bee5b4de 100644 --- a/tests/metadata_sp_2.xml +++ b/tests/metadata_sp_2.xml @@ -1,14 +1,14 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -24,14 +24,14 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - - - - + + + + + + + + MIICHzCCAYgCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNV BAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwF Wnp6enoxDTALBgNVBAMMBHRlc3QwHhcNMTUwNjAyMDc0MzAxWhcNMjUwNTMwMDc0 @@ -44,14 +44,14 @@ CZrAObpaC4nbyPPW/vccFKmEkYtlygEPgky7D9AGsVSaTc/YxPZcanY+vKoRIsiR 6ZitIUU5b+NnHcdj6289tUQ0iHj5jgVyv8wYHvPntTnqH2S7he0talLER8ITYToh 2wz3u7waz/GypMeA/suhoEfxew== - - - - - - - - + + + + + + + + MIICHzCCAYgCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNV BAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwF Wnp6enoxDTALBgNVBAMMBHRlc3QwHhcNMTUwNjAyMDc0MjI2WhcNMjUwNTMwMDc0 @@ -64,51 +64,51 @@ M5a+Hth53m5hbAFuguSvERPCuJ/CfP1+g7CIZN/GnsIsg9QW77NvdOyxjXxzoJJm okl1qz/qy3FY3mJ0gIUxDyPD9DL3c9/03MDv5YmWsoP+HNqK8QtNJ/JDEOhBr/Eo /MokRo4gtMNeLF/soveWNoNiUg== - - - - - + + + + - - + + urn:mace:example.com:saml:roland:sp - - My own SP - - + My own SP + + - - - - - - - AB Exempel - - AB Exempel - - http://www.example.org - - - - Roland - Hedberg - tech@eample.com - tech@example.org - +46 70 100 0000 - - - + + + + AB Exempel + + AB Exempel + + http://www.example.org + + + + Roland + Hedberg + tech@eample.com + tech@example.org + +46 70 100 0000 + + + diff --git a/tests/metasp.xml b/tests/metasp.xml index b1756d59a..a8d0baea3 100644 --- a/tests/metasp.xml +++ b/tests/metasp.xml @@ -1,11 +1,11 @@ - - - - - - - MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV + + + + + + + MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l @@ -21,18 +21,18 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= - - - - - - - Rolands SP - - - - - - - - + + + + + + + Rolands SP + + + + + + + + diff --git a/tests/okta_assertion b/tests/okta_assertion index 35da48907..d52483c4c 100644 --- a/tests/okta_assertion +++ b/tests/okta_assertion @@ -1,2 +1,2 @@ -http://www.okta.com/IssueruserNameaudienceurn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransportJohn Doe \ No newline at end of file +http://www.okta.com/IssueruserNameaudienceurn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransportJohn Doe \ No newline at end of file diff --git a/tests/pdp_meta.xml b/tests/pdp_meta.xml index 5bad0db5f..cc3891f55 100644 --- a/tests/pdp_meta.xml +++ b/tests/pdp_meta.xml @@ -1,13 +1,13 @@ - - - + + - - - - + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -23,30 +23,30 @@ h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - + + + + - urn:oasis:names:tc:SAML:2.0:attrname-format:uri - - - - Exempel AB - - Exempel AB - - Example Co. - - http://www.example.com/ - - - - John - Smith - john.smith@example.com - - - + urn:oasis:names:tc:SAML:2.0:attrname-format:uri + + + + Exempel AB + + Exempel AB + + Example Co. + + http://www.example.com/ + + + + John + Smith + john.smith@example.com + + + diff --git a/tests/pre_enc.xml b/tests/pre_enc.xml index cb50b091b..14e2f90fb 100644 --- a/tests/pre_enc.xml +++ b/tests/pre_enc.xml @@ -1,74 +1,74 @@ - - + urn:mace:example.com:saml:roland:idp - - - - - - + + + + + - urn:mace:example.com:saml:roland:idp - - - + + c2645854117fc0a480e1b6ba2fafcb7799f7431ede0621e37a3b079dee753e57 - - + - - - - + + - - urn:mace:example.com:saml:roland:sp - - - - - + urn:mace:example.com:saml:roland:sp + + + + + - Jeter - - - Jeter + + + - shortstop - - - shortstop + + + - staff - - member - - - staff + + member + + + - foo@gmail.com - - - foo@gmail.com + + + - Derek - - - - - - + Derek + + + + + + diff --git a/tests/saml_false_signed.xml b/tests/saml_false_signed.xml index f8c4a7413..5d6aa42e6 100644 --- a/tests/saml_false_signed.xml +++ b/tests/saml_false_signed.xml @@ -1,30 +1,30 @@ - - urn:mace:example.com:saml:roland:idp - - - - - urn:mace:example.com:saml:roland:idp - - - - - - - - - - - Ij7uELbswQDq4HN6MDTFlF39Z84= - - - UUs1oTjqM8hgDVIrSVRPQfT/KLXar0EfXEQ2OiR+BlYzAh/3q2DQtqWHhlkP9ehs + + urn:mace:example.com:saml:roland:idp + + + + + urn:mace:example.com:saml:roland:idp + + + + + + + + + + + Ij7uELbswQDq4HN6MDTFlF39Z84= + + + UUs1oTjqM8hgDVIrSVRPQfT/KLXar0EfXEQ2OiR+BlYzAh/3q2DQtqWHhlkP9ehs cncSdBB3t1mZhD2v5B5qNwnsNSuHVwEEPe3tSJ+yICVN7REXPXlm0sOsU2zSooEy -OmuMZY0K6ERY4fNVnGEAoUZeieehC6/ljmfk14xCAlE= - - - +OmuMZY0K6ERY4fNVnGEAoUZeieehC6/ljmfk14xCAlE= + + + AAAAAAAAAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -40,42 +40,42 @@ OmuMZY0K6ERY4fNVnGEAoUZeieehC6/ljmfk14xCAlE= h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - - + + + + + + _cddc88563d433f556d4cc70c3162deabddea3b5019 - - - - - - - - urn:mace:example.com:saml:roland:sp - - - - - urn:oasis:names:tc:SAML:2.0:ac:classes:Password - - - - - + + + + + + + + urn:mace:example.com:saml:roland:sp + + + + + urn:oasis:names:tc:SAML:2.0:ac:classes:Password + + + + + student - - - - + + + + member - - + + student - - - - - + + + + + diff --git a/tests/saml_hok.xml b/tests/saml_hok.xml index 6aad625a6..34f219fe3 100644 --- a/tests/saml_hok.xml +++ b/tests/saml_hok.xml @@ -1,45 +1,45 @@ - - https://idp:8443 - - - - - https://idp:8443 - - 57a0a35eefdb29ca8b4ab78d5a118117 - - - - - MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHcj80WU/XBsd9FlyQmfjPUdfmedhCFDd6TEQmZNNqP/UG+VkGa+BXjRIHMfic/WxPTbGhCjv68ci0UDNomUXagFexLGNpkwa7+CRVtoc/1xgq+ySE6M4nhcCutScoxNvWNn5eSQ66i3U0sTv91MgsXxqEdTaiZg0BIufEc3dueQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAGUV5B+USHvaRa8kgCNJSuNpo6ARlv0ekrk8bbdNRBiEUdCMyoGJFfuM9K0zybX6Vr25wai3nvaog294Vx/jWjX2g5SDbjItH6VGy6C9GCGf1A07VxFRCfJn5tA9HuJjPKiE+g/BmrV5N4CealzFxPHWYkNOzoRU8qI7OqUai1kL - - - - - - - - - MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjW0kJM+4baWKtvO24ZsGXNvNKKkwTMz7OW5Z6BRqhSOq2WA0c5NCpMk6rD8Z2OTFEolPojEjf8dVyd/Ds/hrjFKQv8wQgbdXLN51YTIsgd6h+hBJO+vzhl0PT4aT7M0JKo5ALtS6qk4tsworW2BnwyvsGSAinwfeWt4t/b1J3kwIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAFtj7WArQQBugmh/KQjjlfTQ5A052QeXfgTyO9vv1S6MRIi7qgiaEv49cGXnJv/TWbySkMKObPMUApjg6z8PqcxuShew5FCTkNvwhABFPiyu0fUj3e2FEPHfsBu76jz4ugtmhUqjqhzwFY9ctnWRkkl6J0AjM3LnHOSgjNIclDZG - - - - - - - - urn:oasis:names:tc:SAML:2.0:ac:classes:Password - - - - - testuser - - - - + https://idp:8443 + + + + + https://idp:8443 + + 57a0a35eefdb29ca8b4ab78d5a118117 + + + + + MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHcj80WU/XBsd9FlyQmfjPUdfmedhCFDd6TEQmZNNqP/UG+VkGa+BXjRIHMfic/WxPTbGhCjv68ci0UDNomUXagFexLGNpkwa7+CRVtoc/1xgq+ySE6M4nhcCutScoxNvWNn5eSQ66i3U0sTv91MgsXxqEdTaiZg0BIufEc3dueQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAGUV5B+USHvaRa8kgCNJSuNpo6ARlv0ekrk8bbdNRBiEUdCMyoGJFfuM9K0zybX6Vr25wai3nvaog294Vx/jWjX2g5SDbjItH6VGy6C9GCGf1A07VxFRCfJn5tA9HuJjPKiE+g/BmrV5N4CealzFxPHWYkNOzoRU8qI7OqUai1kL + + + + + + + + + MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjW0kJM+4baWKtvO24ZsGXNvNKKkwTMz7OW5Z6BRqhSOq2WA0c5NCpMk6rD8Z2OTFEolPojEjf8dVyd/Ds/hrjFKQv8wQgbdXLN51YTIsgd6h+hBJO+vzhl0PT4aT7M0JKo5ALtS6qk4tsworW2BnwyvsGSAinwfeWt4t/b1J3kwIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAFtj7WArQQBugmh/KQjjlfTQ5A052QeXfgTyO9vv1S6MRIi7qgiaEv49cGXnJv/TWbySkMKObPMUApjg6z8PqcxuShew5FCTkNvwhABFPiyu0fUj3e2FEPHfsBu76jz4ugtmhUqjqhzwFY9ctnWRkkl6J0AjM3LnHOSgjNIclDZG + + + + + + + + urn:oasis:names:tc:SAML:2.0:ac:classes:Password + + + + + testuser + + + + diff --git a/tests/saml_hok_invalid.xml b/tests/saml_hok_invalid.xml index 53c9edb96..864a90422 100644 --- a/tests/saml_hok_invalid.xml +++ b/tests/saml_hok_invalid.xml @@ -1,30 +1,30 @@ - - https://idp:8443 - - - - - https://idp:8443 - - 57a0a35eefdb29ca8b4ab78d5a118117 - - - - - - - urn:oasis:names:tc:SAML:2.0:ac:classes:Password - - - - - testuser - - - - + https://idp:8443 + + + + + https://idp:8443 + + 57a0a35eefdb29ca8b4ab78d5a118117 + + + + + + + urn:oasis:names:tc:SAML:2.0:ac:classes:Password + + + + + testuser + + + + diff --git a/tests/saml_signed.xml b/tests/saml_signed.xml index ca824c2f5..93a0bad72 100644 --- a/tests/saml_signed.xml +++ b/tests/saml_signed.xml @@ -1,30 +1,30 @@ - - http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php - - - - - http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php - - - - - - - - - - - Ij7uELbswQDq4HN6MDTFlF39Z84= - - - UUs1oTjqM8hgDVIrSVRPQfT/KLXar0EfXEQ2OiR+BlYzAh/3q2DQtqWHhlkP9ehs + + http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php + + + + + http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php + + + + + + + + + + + Ij7uELbswQDq4HN6MDTFlF39Z84= + + + UUs1oTjqM8hgDVIrSVRPQfT/KLXar0EfXEQ2OiR+BlYzAh/3q2DQtqWHhlkP9ehs cncSdBB3t1mZhD2v5B5qNwnsNSuHVwEEPe3tSJ+yICVN7REXPXlm0sOsU2zSooEy -OmuMZY0K6ERY4fNVnGEAoUZeieehC6/ljmfk14xCAlE= - - - +OmuMZY0K6ERY4fNVnGEAoUZeieehC6/ljmfk14xCAlE= + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -40,42 +40,42 @@ OmuMZY0K6ERY4fNVnGEAoUZeieehC6/ljmfk14xCAlE= h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - - + + + + + + _cddc88563d433f556d4cc70c3162deabddea3b5019 - - - - - - - - xenosmilus.umdc.umu.se - - - - - urn:oasis:names:tc:SAML:2.0:ac:classes:Password - - - - - + + + + + + + + xenosmilus.umdc.umu.se + + + + + urn:oasis:names:tc:SAML:2.0:ac:classes:Password + + + + + student - - - - + + + + member - - + + student - - - - - + + + + + diff --git a/tests/saml_unsigned.xml b/tests/saml_unsigned.xml index c0213bfad..ea2756b59 100644 --- a/tests/saml_unsigned.xml +++ b/tests/saml_unsigned.xml @@ -1,43 +1,43 @@ - - http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php - - - - - http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php - - + + http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php + + + + + http://xenosmilus.umdc.umu.se/simplesaml/saml2/idp/metadata.php + + _cddc88563d433f556d4cc70c3162deabddea3b5019 - - - - - - - - xenosmilus.umdc.umu.se - - - - - urn:oasis:names:tc:SAML:2.0:ac:classes:Password - - - - - + + + + + + + + xenosmilus.umdc.umu.se + + + + + urn:oasis:names:tc:SAML:2.0:ac:classes:Password + + + + + student - - - - + + + + member - - + + student - - - - - + + + + + diff --git a/tests/servera.xml b/tests/servera.xml index fe80d9d70..637fdb048 100644 --- a/tests/servera.xml +++ b/tests/servera.xml @@ -1,28 +1,28 @@ - - - - - http://www.swamid.se/category/sfs-1993-1153 - http://www.swamid.se/category/hei-service - - - - - - - - - - - + + + + http://www.swamid.se/category/sfs-1993-1153 + http://www.swamid.se/category/hei-service + + + + + + + + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -38,14 +38,14 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - - - - + + + + + + + + MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF @@ -61,33 +61,33 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= - - - - - - - - - - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - - - - - - AB Exempel - AB Exempel - http://www.example.org - - - Roland - Hedberg - tech@eample.com - tech@example.org - +46 70 100 0000 - - + + + + + + + + + + + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + + + + + + + AB Exempel + AB Exempel + http://www.example.org + + + Roland + Hedberg + tech@eample.com + tech@example.org + +46 70 100 0000 + + diff --git a/tests/sp.xml b/tests/sp.xml index fb3142e3b..bb2cc77a5 100644 --- a/tests/sp.xml +++ b/tests/sp.xml @@ -1,5 +1,5 @@ -MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV +MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l @@ -15,7 +15,7 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= -MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV +MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l @@ -31,4 +31,4 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI= -AB ExempelAB Exempelhttp://www.example.orgRolandHedbergtech@eample.comtech@example.org+46 70 100 0000 +AB ExempelAB Exempelhttp://www.example.orgRolandHedbergtech@eample.comtech@example.org+46 70 100 0000 diff --git a/tests/sp_0.metadata b/tests/sp_0.metadata index 6fb6146e3..26663b839 100644 --- a/tests/sp_0.metadata +++ b/tests/sp_0.metadata @@ -1,5 +1,5 @@ -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -14,4 +14,4 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -Rolands SPRoland own test SP +Rolands SPRoland own test SP diff --git a/tests/sp_slo_redirect.xml b/tests/sp_slo_redirect.xml index b0c484ec9..ff3ee2aa7 100644 --- a/tests/sp_slo_redirect.xml +++ b/tests/sp_slo_redirect.xml @@ -1,5 +1,5 @@ -MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 @@ -14,4 +14,4 @@ mDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6 h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5 U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6 mrPzGzk3ECbupFnqyREH3+ZPSdk= -urn:mace:example.com:saml:roland:spMy own SPAB ExempelAB Exempelhttp://www.example.orgRolandHedbergtech@eample.comtech@example.org+46 70 100 0000 +urn:mace:example.com:saml:roland:spMy own SPAB ExempelAB Exempelhttp://www.example.orgRolandHedbergtech@eample.comtech@example.org+46 70 100 0000 diff --git a/tests/test_01_xmlenc.py b/tests/test_01_xmlenc.py index b6e6be0d9..76d7727ee 100644 --- a/tests/test_01_xmlenc.py +++ b/tests/test_01_xmlenc.py @@ -3,11 +3,11 @@ from saml2 import xmldsig data1 = """ - - - A23B45C56 - -""" + + + A23B45C56 + +""" def test_1(): @@ -20,17 +20,17 @@ def test_1(): assert cd.cipher_value.text == "A23B45C56" data2 = """ - - - - John Smith - - - DEADBEEF - -""" + xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"> + + + John Smith + + + DEADBEEF + +""" # data2 = """ @@ -59,19 +59,19 @@ def test_2(): assert cd.cipher_value.text == "DEADBEEF" data3 = """ - - - - + + + - Sally Doe - - - DEADBEEF - -""" + Sally Doe + + + DEADBEEF + +""" def test_3(): ed = xenc.encrypted_data_from_string(data3) @@ -93,21 +93,21 @@ def test_3(): assert cd.cipher_value.text == "DEADBEEF" data4 = """ - - - - John Smith - - - xyzabc - - - - - Sally Doe -""" + xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"> + + + John Smith + + + xyzabc + + + + + Sally Doe +""" # data4 = """ diff --git a/tests/test_02_saml.py b/tests/test_02_saml.py index fe5bbb707..10f1bdfda 100644 --- a/tests/test_02_saml.py +++ b/tests/test_02_saml.py @@ -225,12 +225,13 @@ def test_make_vals_multi_dict(self): def test_to_string_nspair(self): foo = saml2.make_vals("lions", AttributeValue, part=True) txt = foo.to_string().decode('utf-8') - nsstr = foo.to_string({"saml": saml.NAMESPACE}).decode('utf-8') + nsstr = foo.to_string({"saml2": saml.NAMESPACE}).decode('utf-8') assert nsstr != txt print(txt) print(nsstr) - assert "saml:AttributeValue" in nsstr - assert "saml:AttributeValue" not in txt + assert "saml2:AttributeValue" in nsstr + assert "saml2:AttributeValue" not in txt + assert "saml:AttributeValue" in txt def test_set_text_empty(self): av = AttributeValue() diff --git a/tests/test_12_s_utils.py b/tests/test_12_s_utils.py index cd1be8e90..ea89a6e51 100644 --- a/tests/test_12_s_utils.py +++ b/tests/test_12_s_utils.py @@ -20,25 +20,25 @@ XML_HEADER = '\n' SUCCESS_STATUS_NO_HEADER = ( - '') + 'Value="urn:oasis:names:tc:SAML:2.0:status:Success" />') SUCCESS_STATUS = '%s%s' % (XML_HEADER, SUCCESS_STATUS_NO_HEADER) ERROR_STATUS_NO_HEADER = ( - 'Error resolving ' - 'principal') + '/>Error resolving ' + 'principal') ERROR_STATUS_NO_HEADER_EMPTY = ( - '') + '/>') ERROR_STATUS = '%s%s' % (XML_HEADER, ERROR_STATUS_NO_HEADER) ERROR_STATUS_EMPTY = '%s%s' % (XML_HEADER, ERROR_STATUS_NO_HEADER_EMPTY) diff --git a/tests/test_19_attribute_converter.py b/tests/test_19_attribute_converter.py index fdb9cd96a..9eed13bca 100644 --- a/tests/test_19_attribute_converter.py +++ b/tests/test_19_attribute_converter.py @@ -139,14 +139,14 @@ def test_to_local_name(self): def test_to_local_name_from_unspecified(self): _xml = """ - - + - foo@bar.com - - + foo@bar.com + + """ attr = attribute_statement_from_string(_xml) @@ -265,15 +265,15 @@ def test_noop_attribute_conversion(): class BuilderAVA(): def __init__(self, name, friendly_name, name_format): template = """ - - + uu.se - - + + """ self.ava = template.format( diff --git a/tests/test_42_enc.py b/tests/test_42_enc.py index 548259022..41229ebaa 100644 --- a/tests/test_42_enc.py +++ b/tests/test_42_enc.py @@ -12,7 +12,7 @@ __author__ = 'roland' -TMPL_NO_HEADER = """{key_info}""" +TMPL_NO_HEADER = """{key_info}""" TMPL = f"\n{TMPL_NO_HEADER}" IDENTITY = {"eduPersonAffiliation": ["staff", "member"], @@ -66,7 +66,7 @@ def test_pre_enc_with_named_key(): expected = TMPL_NO_HEADER.format( ed_id=tmpl.id, ek_id=tmpl.key_info.encrypted_key.id, - key_info='my-rsa-key' + key_info='my-rsa-key' ) assert str(tmpl) == expected @@ -134,5 +134,6 @@ def test_enc2(): assert enc_resp + if __name__ == "__main__": test_enc1() diff --git a/tests/test_51_client.py b/tests/test_51_client.py index a323de793..698f34d00 100644 --- a/tests/test_51_client.py +++ b/tests/test_51_client.py @@ -139,24 +139,24 @@ def _leq(l1, l2): REQ1 = {"1.2.14": """ -urn:mace:example.com:saml:roland:spurn:mace:example.com:saml:roland:spE8042FB4-4D5B-48C3-8E14-8EDD852790DD""", +.0:nameid-format:persistent">E8042FB4-4D5B-48C3-8E14-8EDD852790DD""", "1.2.16": """ -urn:mace:example -.com:saml:roland:spE8042FB4-4D5B-48C3-8E14-8EDD852790DD"""} +.0:nameid-format:persistent">E8042FB4-4D5B-48C3-8E14-8EDD852790DD"""} nid = NameID(name_qualifier="foo", format=NAMEID_FORMAT_TRANSIENT, text="123456") @@ -1735,7 +1735,7 @@ def test_do_logout_post(self): _dic = unpack_form(info["data"]) res = self.server.parse_logout_request(_dic["SAMLRequest"], BINDING_HTTP_POST) - assert b'_foo' in res.xmlstr + assert b'_foo' in res.xmlstr def test_do_logout_redirect_no_cache(self): conf = config.SPConfig() @@ -1789,7 +1789,7 @@ def test_do_logout_session_expired(self): _dic = unpack_form(info["data"]) res = self.server.parse_logout_request(_dic["SAMLRequest"], BINDING_HTTP_POST) - assert b'_foo' in res.xmlstr + assert b'_foo' in res.xmlstr def test_signature_wants(self): @@ -3340,7 +3340,7 @@ def test_do_logout_post(self): _dic = unpack_form(info["data"]) res = self.server.parse_logout_request(_dic["SAMLRequest"], BINDING_HTTP_POST) - assert b'_foo' in res.xmlstr + assert b'_foo' in res.xmlstr def test_do_logout_session_expired(self): # information about the user from an IdP @@ -3370,7 +3370,7 @@ def test_do_logout_session_expired(self): _dic = unpack_form(info["data"]) res = self.server.parse_logout_request(_dic["SAMLRequest"], BINDING_HTTP_POST) - assert b'_foo' in res.xmlstr + assert b'_foo' in res.xmlstr # Below can only be done with dummy Server IDP = "urn:mace:example.com:saml:roland:idp" diff --git a/tests/test_88_nsprefix.py b/tests/test_88_nsprefix.py index 4f652a54f..ea496dee6 100644 --- a/tests/test_88_nsprefix.py +++ b/tests/test_88_nsprefix.py @@ -13,7 +13,7 @@ def test_nsprefix(): txt = "%s" % status_message - assert "ns0:StatusMessage" in txt + assert "samlp:StatusMessage" in txt status_message.register_prefix({"saml2": saml.NAMESPACE, "saml2p": samlp.NAMESPACE}) @@ -41,5 +41,6 @@ def test_nsprefix2(): assert "saml2p:AuthnRequest" in txt assert "saml2:Issuer" in txt + if __name__ == "__main__": - test_nsprefix2() \ No newline at end of file + test_nsprefix2() diff --git a/tests/vo_metadata.xml b/tests/vo_metadata.xml index fafc4c04d..391f44735 100644 --- a/tests/vo_metadata.xml +++ b/tests/vo_metadata.xml @@ -1,18 +1,18 @@ - - + - - + urn:mace:example.com:saml:aa - - + + urn:mace:example.com:saml:idp - - - - + + + +