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

2 files changed, 127 insertions, 0 deletions

diff --git a/swamid-2.0/account-idac.ki.se-shibboleth.xml b/swamid-2.0/account-idac.ki.se-shibboleth.xml
new file mode 100644
index 00000000..48951a67
--- /dev/null
+++ b/swamid-2.0/account-idac.ki.se-shibboleth.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account-idac.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#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://account.ki.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">KI Account</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KI Account</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Kontohantering/aktivering för anställda, studenter, m.fl. som har konto på KI</mdui:Description>
+        <mdui:Description xml:lang="en">Account management/activation for employees, students and others with accounts at KI</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kiaccount02</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kiaccount02</ds:X509SubjectName>
+          <ds:X509Certificate>MIID6DCCAlCgAwIBAgIJALYKDgHvZN4tMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2tpYWNjb3VudDAyMB4XDTE5MDQxNTE1NDk1NloXDTI5MDQxMjE1NDk1Nlow
+FjEUMBIGA1UEAxMLa2lhY2NvdW50MDIwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAw
+ggGKAoIBgQDEg/6Sr7NFtFsBVIRaH3Ro9B9wZ4jG2Cr4VVM362CnawbR5PjSzSTb
+MnMLzirNEvDhwpmlxh8EP42Zd/JIJMeHabfXCyOlzEfgHIFECdteGYff1lvIsG5w
+RhMSv5DJmXLOEnEza3C3CJWAAGrvLfRac2cbp/nXd7kQ80UEqzFxRG68sd+IiMPz
+wW2O/ITO6uNFDI29Olbzn/Deg4lJkBd4yuv386XxE04pZPJuwLwn1Dt5+0BUpWM9
+i31EQd7SVg7j6wOEU6zIY483R3M5wZZThnQsTSH9muD6yTUCQv2dcj/H5u8/eKde
+GQEOhU8usJYlh8SvyUNmz4QlU8pOXOM0UWebf3W57Pa7jzwtrV500Vmfp6AQO6eH
+TG0oVYh4Bkifdc5u+8O5JDiQIB+ViW3jXstz9Fh2SXs8avvdPXmyv5e22h9k4L1s
+0l0RWYFNVKnVRjoLjCHiqKMHKnqNKHYThn7HxUkom6QT/Vnx32ZHQWnBvCmPkPdy
+3trEaWbNvAcCAwEAAaM5MDcwFgYDVR0RBA8wDYILa2lhY2NvdW50MDIwHQYDVR0O
+BBYEFEQ2MjcUGbXSUeSRTtd31t5fd3vEMA0GCSqGSIb3DQEBCwUAA4IBgQAT5q2e
+Degs8V/K/7HoQicZjoPB39VGVhng9MjwRuznKzGEUnEDyOHPO5Gz+G9Xt04qLvc8
+J/wftqGmGdjiLbLIy7X4HZDxxwJMYiLqgTndTNjvGj6AsmQm+pRbbDVj0Rdd5w8N
+5TBhbMQP2iwfFcqHo8yFu4nbIDxO5JLgkFXpSbTVErsDspsqQdu1LsSR/wLs4R4w
+rP0GpxGvsFepY90fBdDGdk86DKBnRxkFP2s5pxCbt+URbjPSezjF//Zc5w0bbZ9U
+2vviw6D+KQbVtnfNVwoGz0qcXM6ypxGsuLnqz/E3u1XoFLSdK5IzS0nLb43iDm1A
+McGZ1tGIchPQA+KJk8+VJw5hYTNGlkIq5JpatSYG1+1cwxYnkcOMJpSjNqkt8dE1
+6vtXYxdzVOxgHXzAjgSXO0OlklfJxmfVQEdkDpYsWX5HtQ28rOyJf7wHQ748BG30
+OGefgfJt2JHjnQ4lSm+Q8kJRSIl3s4vAY2HvStfozsvyL/2+jcD5e45B0z4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kiaccount02</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kiaccount02</ds:X509SubjectName>
+          <ds:X509Certificate>MIID6DCCAlCgAwIBAgIJAI6eisFXz5z5MA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2tpYWNjb3VudDAyMB4XDTE5MDQxNTE1NDk1NloXDTI5MDQxMjE1NDk1Nlow
+FjEUMBIGA1UEAxMLa2lhY2NvdW50MDIwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAw
+ggGKAoIBgQDUqR3uizdi5tmboKhpbGF00Kjkbz2aSiUkKYN2Bq93JtY7OJOfmhuF
+ksmIZMoixKZlOUnJ6SsNs8ip7GFTICqjRwk9oxnfc+QjYgkqkNkYom4LW2BekEW7
+Uw5Orv15ZFHIdWjB56ml1JzbKTDV8nIqkJop00kOkv9DgmvUYxwQGVq/qfEGj6OU
+KMu0b1xNaawT4Bn1zIBXSnPKfNwKch34HkPp+bl5/GjDmVJ3WUBrW3zVEelmp65w
+VAaDuWAJnI98SFU/jd+kKHWGQyKEF4TilrqJQJ2CgBp5qSiqcILM5xaxXvj58xyG
+dhL0wGoqwCpZBXH+e26NE6tvoypXhOQSNr4CnJUrV3MT7duNUXiC8WcumrihRH9s
+VjiiPpZexjGTR4edsN6rIe6Qkg9L2ttqaCZuNKdHOq91euTXsv08YOnU/BTacNuf
+XCs/3yIEbIyunZDpSbXfd8G8oq9xeJ7xbguQ3zsYZ1VxbH968UpC/f9e+zn64Db/
+tQgumM65FXECAwEAAaM5MDcwFgYDVR0RBA8wDYILa2lhY2NvdW50MDIwHQYDVR0O
+BBYEFG0Qnp238IsFYSmmOYH5w7nUpBk+MA0GCSqGSIb3DQEBCwUAA4IBgQBSXUAv
+AFUdBqyo5b11HFlG7Lc1GlBEvBzzqJoabM1qJOIbtA6hDXxmPyOo6XVAspNBufhy
++DeuIVbBNlqUq23cjmKeNN7Vsiv4sPeLlqCA8YXFi8yNXGkatWg6DUmcN3Q+lhs0
+QDcnSMnYGtcEFbUOHSCm21NAOlIFAZrQFnRA9ox1/SxdyGNsoGKbvsy3drCcf1NG
+P/CxvkqKYb49Jx4orTWUaB2EjcYiGt73NKV3FQUqgQKLbfouzIeBaca+xf7aGLVg
+aQlCtc3bzGtqUm4uEQMaRz8VCkUtdGk1KevLk2gGVIN5RHrPpMPst5vDXoKsk26o
+kSL+CA/rbpXwRm3nHNg1rnjc3bw7VZn6mPa66U0FisLPsrkcuYS+AZAdA0fO02bL
+9FqeL0yDDJIfJ/pXM//wVuThe/hof6Xt9Ay8eBgD3SIwmiaKr6l03xtpiHuz6FXG
+4HBEyf/zMpyyD/X8MxZwc+oCOVZ1pdsdEnk+kXeZ4oiYLVUWDkj10wh3D3Y=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <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://account.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Johansson</md:SurName>
+    <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT-support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46852482222</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index d71a10d6..b216dab7 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -630,4 +630,5 @@
   <xi:include href="swamid-2.0/anvandare.antagning.se-anvandare-sp.xml"/>
   <xi:include href="swamid-2.0/proxytest.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/account-idac.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>