Merge branch 'master' of md-master.swamid.se:swamid-metadata

3 files changed, 85 insertions, 2 deletions

diff --git a/swamid-2.0/rals.saco-s.lu.se-shibboleth.xml b/swamid-2.0/rals.saco-s.lu.se-shibboleth.xml
new file mode 100644
index 00000000..dc70adc4
--- /dev/null
+++ b/swamid-2.0/rals.saco-s.lu.se-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rals.saco-s.lu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <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://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rals.saco-s.lu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rals.saco-s.lu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Portal, Saco-S, Lunds universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Web Portal, Saco-S, Lund university</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Lönestatistik-Saco, Lunds Universitet- Utvecklat på LTH</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rals.saco-s.lu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rals.saco-s.lu.se,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQKtvwlDqMAGr/6pzFeEWzsDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDYxMzAwMDAwMFoXDTE2MDYxMjIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFyYWxzLnNhY28t
+cy5sdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgf3mrkuV5Z
+mJ7RyuEBn4LCZjr7EidUEkmdBE+VPI1xGJXFJ+dNFFgnrmRaIHCl0GA20aHQJ9hK
+bJQ/ka4hTYVvlTgLfFENGRguuLDC7J11AswWRQGnBi+uubhvZndmo1JoEKTWYngU
+LnDXgtbh/9n5wocwm0NXpcHw/Lrwp3++zk5NqaCgct/lUCuRPdmDXxzFNs5Ev2KT
+z4fCJZcTnjAmAFIKmjs0+BZTi+OF5ekBuzk1ETKU1wd3Cqm/dM5gpAxoPJxpfCVW
+/Ch61K493bzcjfskEPTDmIi+mNvlmI9l+4+Nbg1w27u26CvtE45uZFmbu3Fh2mfi
+w2sWEcyRAcECAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBS3pd+zc4nfxblM4VFLMNRv8LmdEzAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRcmFscy5zYWNvLXMubHUuc2Uw
+DQYJKoZIhvcNAQEFBQADggEBAIGTCHKdTzGg2C0Wz74KbY4KsKzOo4AcuIpUoICf
+kLkVj/p+aHLOIJTuIpCEg+Ac09mEQzsBahkfiGpck66n2iBbtErHJJ1MYK+AJbLf
+dLzrqwLppETlzCY6caY/7cA28QU7QPlkwX383VZW5qegjv95eSGAx3BZxc82IRQv
+hufF8GD+9fEl7QXQF7JXUNiEBr16MzIURhVxTS0S938D6ftfqmIjH5QWQfIx78J2
+2oGDpGtMYiB9IPI/nANCxrYZQ3w6ikm5vWihKcm4nKnGrHS1S819dc+nL8/wKCZq
+jYuWfTT6DawZdls/B5k5Q2vWWezlrlhmckT73F9JoVVUkYs=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rals.saco-s.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rals.saco-s.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
index 7c9cc757..40a46380 100644
--- a/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
+++ b/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
@@ -26,9 +26,9 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv"> PING PONG vid Sophiahemmets högskola </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv"> PING PONG vid Sophiahemmet högskola </mdui:DisplayName>
         <mdui:DisplayName xml:lang="en"> PING PONG at Sophiahemmet University </mdui:DisplayName>
-        <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Sophiahemmets högskola. </mdui:Description>
+        <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Sophiahemmet högskola. </mdui:Description>
         <mdui:Description xml:lang="en"> The learning platform PING PONG at Sophiahemmet University. </mdui:Description>
         <mdui:Logo height="168" width="50">https://shh.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://shh.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b771976a..09ae3769 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -346,4 +346,5 @@
   <xi:include href="swamid-2.0/sesam.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.oru.se.xml"/>
+  <xi:include href="swamid-2.0/rals.saco-s.lu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>