Resolves SWAMIDOPS-354

3 files changed, 67 insertions, 4 deletions

diff --git a/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml b/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
index 1b47ed94..96bbc3f9 100644
--- a/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
+++ b/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
@@ -1,9 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_3c5a8ac47c9940dd6c0e247d1f6e72fcae406495" entityID="https://grr.cert.sunet.se:8443/shibboleth">
-
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grr.cert.sunet.se:8443/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"/>
@@ -28,7 +28,6 @@ and do *NOT* provide it in real time to your partners.
       </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://grr.cert.sunet.se:8443/Shibboleth.sso/Login"/>
@@ -85,5 +84,4 @@ U2CMeWihvrXOFYyKBmlMNt78NqegrleUURtdyMWCMuiU6sMdPbT0g3vrgnOV9w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://grr.cert.sunet.se:8443/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kau-se.zoom.us.xml b/swamid-2.0/kau-se.zoom.us.xml
new file mode 100644
index 00000000..9d2102c6
--- /dev/null
+++ b/swamid-2.0/kau-se.zoom.us.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="kau-se.zoom.us">
+  <md:Extensions>
+    <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" 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">KAU Zoom</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KAU Zoom</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Karlstads universitets e-mötesverktyg</mdui:Description>
+        <mdui:Description xml:lang="en">This is Karlstad University's E-Meeting service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFzCCA/+gAwIBAgIHBFgs/vQRuzANBgkqhkiG9w0BAQsFADCBtDELMAkGA1UEBhMCVVMxEDAO
+BgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29t
+LCBJbmMuMS0wKwYDVQQLEyRodHRwOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8xMzAx
+BgNVBAMTKkdvIERhZGR5IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjAeFw0xNDA0
+MTEwMDQ4MDVaFw0xODA4MDMyMzM2NDJaMDcxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlk
+YXRlZDESMBAGA1UEAwwJKi56b29tLnVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+okFee4Mpg9uh8LOOYygGRyhxXwsfvnh7FvtJT67CRryvMEHftbeD4b9xa7CSxrU5XfP6ICLxFplv
++4sntZy4o3h6ryBrV9BvMAkG1DavujorcSEbk+O0Rk9GpQFGOXvTZQN71mzv66ITuQn83t9+1vx9
+JTqapWmi/LtC1nTvkqNCjdfbTkIqoLjcUN+awRT+4WnDYp2h8oAMUGePwRMqebFQl7uTF3Ok0xyh
+akmB0QU7EgM3jw7drHTW3A0MX3Ei9u23dhrmBGUDTs9oO6Zpu7LMkmCyFW5XCKokKeqbtXQulOCT
+gRrd8i3paIwFBqISFiygYOKmVolL1zaUCm+LfQIDAQABo4IBqDCCAaQwDwYDVR0TAQH/BAUwAwEB
+ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMDYGA1UdHwQv
+MC0wK6ApoCeGJWh0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RpZzJzMS00MC5jcmwwUwYDVR0gBEww
+SjBIBgtghkgBhv1tAQcXATA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFk
+ZHkuY29tL3JlcG9zaXRvcnkvMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29j
+c3AuZ29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHku
+Y29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeOzDSDMKIz1/tss/C0LIDO
+MB0GA1UdEQQWMBSCCSouem9vbS51c4IHem9vbS51czAdBgNVHQ4EFgQU7Iq18k6UpRo2UcsGL/qS
+UFoZ64kwDQYJKoZIhvcNAQELBQADggEBAKBUJLQlb6o9kCVuFhGNj/7och4wo7K207guo9PuhDls
+ipAo4NHubWMrmTRwSELUtQpP1T21uymzPKC2riko1+tOwNJjJ6hB7UMa8hwgC3dCq+TeTsMxNBgP
+xLYUwl+W8g0iss0TTolx4DHrF4iSH2HcunwxDXtqkCtlIRiLhkU/q2DXPwyatLD9f4nypEowXARJ
+F9AI1u80XBk4qks6VFI+F101ov7c11YqtKvzICNJSF/uTaoKU16ZMeV7Awt0stHY1ILdI40ht+YZ
+kMpIITAqh9XwkMMbjOapCeNu6wfL/ywLEOskEvvxnEgP00VVk8S32kBKmNQGLPufut3obbI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kau-se.zoom.us/saml/SingleLogout" ResponseLocation="https://kau-se.zoom.us/saml/SingleLogout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kau-se.zoom.us/saml/SingleLogout" ResponseLocation="https://kau-se.zoom.us/saml/SingleLogout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kau-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kau-se.zoom.us/saml/SSO" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Karlstad University</md:Company>
+    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8d66979f..b4ec37cd 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -662,4 +662,5 @@
   <xi:include href="swamid-2.0/client200-190.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/diskus.ub.uu.se-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml"/>
+  <xi:include href="swamid-2.0/kau-se.zoom.us.xml"/>
 </md:EntitiesDescriptor>