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

2 files changed, 82 insertions, 0 deletions

diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml
new file mode 100644
index 00000000..901344fc
--- /dev/null
+++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml
@@ -0,0 +1,81 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_68e124b223d8dcc0d37318ea4360ac1d631613c9" entityID="https://aktivera.ki.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/sfs-1993-1153</samla:AttributeValue>

+      </samla:Attribute>

+    </mdattr:EntityAttributes>

+

+    <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">

+      <mdui:DisplayName xml:lang="sv">Aktivera universitetskonto Karolinska Institutet</mdui:DisplayName>

+      <mdui:DisplayName xml:lang="en">Activate university account Karolinska Institutet</mdui:DisplayName>

+      <mdui:Description xml:lang="sv">Här kan du aktivera ditt universitetskonto</mdui:Description>

+      <mdui:Description xml:lang="en">Here you can activate your university account</mdui:Description>

+    </mdui:UIInfo>

+  </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://aktivera.ki.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://aktivera.ki.se/Shibboleth.sso/Login" index="1"/>

+    </md:Extensions>

+    <md:KeyDescriptor>

+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

+        <ds:KeyName>aktivera.ki.se</ds:KeyName>

+        <ds:X509Data>

+          <ds:X509SubjectName>CN=aktivera.ki.se</ds:X509SubjectName>

+          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJALyq1Aqsb9IBMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV

+BAMTDmFrdGl2ZXJhLmtpLnNlMB4XDTEzMDMwMTEyNDIzM1oXDTIzMDIyNzEyNDIz

+M1owGTEXMBUGA1UEAxMOYWt0aXZlcmEua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUA

+A4IBDwAwggEKAoIBAQCl1rok6UwvfFyFpN/akmpBOTAy6JJnWpMjIQPOcW/cJDQa

+fAri1mWsarSzgKM/C4MdL2T3IjQyhLvydm++hQvGEIn2OPLrWPr9j9KFCZ6Vysnh

+GTa3j29SReSKjJkMVMD4t9nAJsDkx8NQyimSV7hgxhhvoVIMchJ0WusWqxxpeLyt

+LfNt5UModNQMmrF66Nr+DCCBOYsYOUDhjHz3EYWs2jEx1LfnZomcn365bDEG9Z3t

+qg+kcXTvnHwhO9CAE4oFzn4OWy1ucFyffGair12FkQUhHSLkgcMnhsa9qa+9yViM

+X7zII9pVE6BeebBscN3BeDjYphEuo5Z6UamQ/yhdAgMBAAGjPDA6MBkGA1UdEQQS

+MBCCDmFrdGl2ZXJhLmtpLnNlMB0GA1UdDgQWBBTTRtopMmSDYlR/zxoMdZDFeO+X

++zANBgkqhkiG9w0BAQUFAAOCAQEAmszPge3RJcRexpZwaD70KOr4MMKn7+ke6y+J

+ym/fHpNH3FSHSTCNGzcl+80uXYtXnlcFTZ7gyDmoqhtcrxjwc4elOGlPfOXbUlri

+XsIGra4z/g/5ZeIFHczDVBek1obXVrYDGj6GYtzF6Mkkghy6iJvhTzPQfvJwxgfT

+QHLT0e/V9KmT2E1eHx7QpfBh5Uab714COk5zoP5PWFnwvBfpSb0sTlJcOGP9nz2E

+HxR7p2CxcGozA68nst9lx34XSYT1VTXRED7m+H+nGN8lJNjDcAZsudpBsmOU7Pbs

+t1UEJRh1QFCjTJZ0dWFqE9ZDz8jPeZGuERdOnxv9ooMtwU9t1w==

+</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://aktivera.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/SOAP"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/Redirect"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/POST"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/Artifact"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/POST" index="5"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>

+  </md:SPSSODescriptor>

+

+</md:EntityDescriptor>

diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0a7f9a03..261e5f0c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -60,4 +60,5 @@
    <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml"/>
    <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-sp.xml"/>
    <xi:include href="swamid-2.0/uninett-box-idp.nordu.net.xml"/>
+   <xi:include href="swamid-2.0/aktivera.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>