2 files changed, 77 insertions, 3 deletions
diff --git a/swamid-2.0/idpaas.swamid.se-idp.xml b/swamid-2.0/idpaas.swamid.se-idp.xml
index 7ba49c0f..a543a343 100644
--- a/swamid-2.0/idpaas.swamid.se-idp.xml
+++ b/swamid-2.0/idpaas.swamid.se-idp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpaas.swamid.se/Saml2IDP/idp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpaas.swamid.se/Saml2IDP/sp/SUNET">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
@@ -58,8 +58,8 @@ Pn4CLMAvvHqQ
       </ns1:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpaas.swamid.se/Saml2IDP/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas.swamid.se/Saml2IDP/sso/post"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpaas.swamid.se/Saml2SP/SUNET/sso/redirect"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas.swamid.se/Saml2SP/SUNET/sso/post"/>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SUNET Test IdP</md:OrganizationName>
diff --git a/swamid-2.0/idpaas.swamid.se-sp.xml b/swamid-2.0/idpaas.swamid.se-sp.xml
new file mode 100644
index 00000000..e15c587d
--- /dev/null
+++ b/swamid-2.0/idpaas.swamid.se-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata          sstc-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" entityID="https://idpaas.swamid.se/Saml2SP/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Sunets Test COmanage IDP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sunet's Test COmanage IDP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">COmanage Test IDP hos Sunet</mdui:Description>
+        <mdui:Description xml:lang="en">COmanage Test IDP at Sunet</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFFTCCAv2gAwIBAgIUMwC6Sv2X/IxC4PLzSK1zRUfQLsEwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMB4XDTE5MTAxNDEwNTYzNFoX
+DTI5MTAxMTEwNTYzNFowGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0WdTJhh5Lv34YqkWXjmav1xdeHye
+/2YdXc0gYNTIb4HyoWoejQoVuxoidpAVwEN0694j63IcLyAwEy6pOQn+BIEE2cAq
+QllWOLlNta+HRMvkjNohqaQk5IS/S3VPKMfvVv66oIcdzD5V/10HB9NxS+cpOqSF
+PPl89rrtP1Ef8QGK8yUwH2a3XKjNyzod4Xsp65fOP9uD4JveB/0CMD/7hlkkr2kJ
+c6Dehv4FMzspAt1otzuza6lwks68sKrooG6CUN4cULLTjAOv4T9nGA9jobaCr9JM
+7/+GOLtDOyG+ES7m+GbuWyuTE7f08Hel/kAc7rmHi+ZiGJdKPYHIvueOEHkah7Ch
+IWWQC6vZiJQoFxE2QCf6OdbrL3s2HZO2tAgqWHs8U+jjXcTd8arh4aBpvlfblJ11
+JLXsTV3P5ooMTFJ7iujYpGpuETxJZu5+FqJgaXrXSh5M3esGu9bLOBqLUi6G28nl
+dkgwO8VSCgQjx6wtt90/hlJOsSrHzpJy1D3mQETtCQfKQST1aoo2+9N5P0iIb+zl
+MHGKqxAxbQVyBt63hf2jTNAqb835AcycBof79lveKBHBt5gJCN3XIccGHJ/8/br1
+VkhuBlvxGaWEbTDPe+lWtN+5Lltbz9bzJLpRepSkCYoH/srZ19iD8tISJPtIhQqH
+Fmn9XgfMv8v7/XUCAwEAAaNTMFEwHQYDVR0OBBYEFK91jyAlLIP2Z0MSKCEcOnik
+ApT5MB8GA1UdIwQYMBaAFK91jyAlLIP2Z0MSKCEcOnikApT5MA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAG9r3QWTR0BslCWKKoq86RDO2fl8X+p/
+/nFQVPv78r97cS8Ihx+SvZ7yMDdgGEeI0Jhvijx6gtcFak4CVRJZP4Jpd9EL4sRT
+a6p6XEQcGqb8ZUL4zcU44YQgEm1op129oYPTSOFgthC+skMTOBcgVKYjmYNPMqHH
+NPtyvacYhnBKNPA2cPdNkITvjfZjDjGr0ZnDpwYhY2yQpOtakUXJ99W4Pptvbz2K
+dD+B1ndAYNOhub0yVzWQXPuQJtICBGpt3nUGMd3VOg0iQVfZqQNxhZ+putGWnjXq
+H9ZwZwx4ba9kgIYzphtIslLA48JKpvJ5VAVBBzr2czegQD4Wt+CmN/CHEw8IPDTB
+k0F69V/UZWjdKjCEwfWz0kXQiBsXWjOLAexpkPkezvbYaK4Bml36Yd/YObTqY/hO
+KG7YW8lWoKEQNQTI/OfPGbbkQtgaiQUFLI6WPiKPRAGFKxHdHJMT1p5r6fccNWJi
+WpVC8i+rNnoAoXbJdRkzlF8LpQUgl4to9K4/GLXi0AoypF9A6ABNcqLmxNShxkBw
+3Re+aaHugoOtHht9I7tfL3Y7qLh2/T3AQY1JiS0wx7M06IlWClacC1WEAZGBE6ff
+6wdFb/nCricrlu02DPq6qiET3vkHLTQravQx/uaGUhUwhDaTz1o5MmzHwvgryHtd
+Pn4CLMAvvHqQ
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas.swamid.se/Saml2SP/acs/post" index="1"/>
+  </SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">SUNET</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>Technical</GivenName>
+    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>Support</GivenName>
+    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>