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

5 files changed, 97 insertions, 2 deletions

diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 893d79a5..08fa666b 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -92,7 +92,7 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
   </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.liu.se/adfs/services/trust">
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-prod-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
     <Extensions>
       <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
       <mdui:UIInfo>
diff --git a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
index ad15806c..09e586ea 100644
--- a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
@@ -45,7 +45,7 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.test.ad.liu.se/adfs/ls/" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/" index="2"/>
   </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.test.ad.liu.se/adfs/services/trust">
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-test-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
     <Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Linköpings universitet Test (ADFS)</mdui:DisplayName>
diff --git a/swamid-2.0/hrm.flexhosting.se-hrm-.xml b/swamid-2.0/hrm.flexhosting.se-hrm-.xml
new file mode 100644
index 00000000..28d5ea18
--- /dev/null
+++ b/swamid-2.0/hrm.flexhosting.se-hrm-.xml
@@ -0,0 +1,65 @@
+<?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://hrm.flexhosting.se/HRM/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets Flex HRM</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University Flex HRM</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets Flex HRM</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University Flex HRM</mdui:Description>
+        <mdui:Logo height="50" width="50">https://www.flexapplications.se/wp-content/themes/flex-theme/assets/img/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://hrm.flexhosting.se/HRM/Public/CookiePolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://hrm.flexhosting.se/HRM/Public/CookiePolicy/EN</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>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</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hrm.flexhosting.se/HRM/Saml2/Logout"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="true" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="false" index="1"/>
+  </SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">Flex Applications Sverige AB</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Flex Applications</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">https://www.flexapplications.se/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Flex Applications</Company>
+    <EmailAddress>mailto:tekniskkonsulting@flexapplications.se</EmailAddress>
+    <TelephoneNumber>+4619103915</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Flex Applications</Company>
+    <SurName>HRM Time Support</SurName>
+    <EmailAddress>mailto:time.support@flexapplications.se</EmailAddress>
+    <TelephoneNumber>+4619103915</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Flex Applications</Company>
+    <SurName>HRM Travel Support</SurName>
+    <EmailAddress>mailto:travel.support@flexapplications.se</EmailAddress>
+    <TelephoneNumber>+4619103915</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Flex Applications</Company>
+    <SurName>HRM Employee Support</SurName>
+    <EmailAddress>mailto:employee.support@flexapplications.se</EmailAddress>
+    <TelephoneNumber>+4619103915</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Flex Applications</Company>
+    <SurName>HRM Payroll Support</SurName>
+    <EmailAddress>mailto:payroll.support@flexapplications.se</EmailAddress>
+    <TelephoneNumber>+4619103915</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.antagning.se-aws-sp.xml b/swamid-2.0/www.antagning.se-aws-sp.xml
index b0c85a5f..2d8ccda5 100644
--- a/swamid-2.0/www.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.antagning.se-aws-sp.xml
@@ -28,6 +28,7 @@
         <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
+    <!-- OLD CERTS -->
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>https://www.antagning.se/aws-sp</ds:KeyName>
@@ -55,6 +56,34 @@ wo1Z+XF5sAEJ3w30UnCsgh0Muvwlyb3cnRvYFA==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <!-- NEW CERTS -->
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>https://www.antagning.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.antagning.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.antagning.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAPDMvuK5TooeMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHd3dy5hbnRhZ25pbmcuc2UwHhcNMjEwNDI3MTAxMjA3WhcNMzEwNDI1MTAx
+MjA3WjAbMRkwFwYDVQQDExB3d3cuYW50YWduaW5nLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5TGxpp4kYVrZ0jqRb3Uwy8kdybIRTTo5kk+mhKzD
+rpJTC5PWNQuI6jk+oLgh8s1u5xmxD4Ql66HMJwT/SMCmhqWwy4tdANm/zwzhYil5
+7jtllH2OS6o8lWQit9bU5B0Y0U0g/BLmYsUkba/re6wgkOHObrAU6Tj75xlKrGTE
+C/Sm6dse/X3IKpX+8/iyde1ndLuJ6jaH6FqyGaK53cfm5DvlSY5xvhRefOGALuGv
+53YPYFsbIm0EdZy8ATP4c++cMwtcukyAhvr/sNlDkksL0tiD035OsEHDePL2dN4q
+79FYNghu/Vgt3r6HoBCOkjLHuzKxUcniHJTLUSyo7AExBQIDAQABo18wXTA8BgNV
+HREENTAzghB3d3cuYW50YWduaW5nLnNlhh9odHRwczovL3d3dy5hbnRhZ25pbmcu
+c2UvYXdzLXNwMB0GA1UdDgQWBBSDinUL26hl8nSyYdZCKAGfJS0abjANBgkqhkiG
+9w0BAQUFAAOCAQEATDkhLxp0qJejn3QjxJe6Xobv9qe43eZKyYyMFZy5u1z5OBrW
+mNaK95pU/OBWBjlSP52/lQKir9sZPN/TpVwaciK25PGIJa6F4iynPytWnFgPOF9v
+IPraeVn/mBNteqIM3DzSVuJGUf1/NSZewxtmjcUmgU6HONKbAjTMJksSto64R1GO
+4uZ3ohsQc4aXT0i6ekYy3nm687+75guzQM32VC7ZjrCNAr7NbYQ9zVjKSuXLdN9F
+zIKUZWGL+r14i/ucbM+Wm9t3X9/oCTquT7YCHiyhekYrKVZYAVZ199bC5nBQ1IEF
+fQKUbXzTmROuC1Xt1AcRkBcSp4h7TwgglUmiAQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.se/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.se/Shibboleth.sso/SLO/Redirect"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a8f8387a..89f95241 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -689,4 +689,5 @@
   <xi:include href="swamid-2.0/login.fd.su.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/pilot.drive.sunet.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/datalab.humlab.umu.se.xml"/>
+  <xi:include href="swamid-2.0/hrm.flexhosting.se-hrm-.xml"/>
 </md:EntitiesDescriptor>