Resolves SWAMID-3146

2 files changed, 73 insertions, 0 deletions

diff --git a/swamid-2.0/sts.vinnova.se-adfs-services-trust.xml b/swamid-2.0/sts.vinnova.se-adfs-services-trust.xml
new file mode 100644
index 00000000..cb135b70
--- /dev/null
+++ b/swamid-2.0/sts.vinnova.se-adfs-services-trust.xml
@@ -0,0 +1,72 @@
+<?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="http://sts.vinnova.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Vinnova</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vinnova</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Swedish Governmental Agency for Innovations Systems</mdui:Description>
+        <mdui:Description xml:lang="en">Swedish Governmental Agency for Innovations Systems</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.vinnova.se/om-oss/regler-som-styr-var-verksamhet/personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.vinnova.se/om-oss/regler-som-styr-var-verksamhet/personuppgifter/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC3jCCAcagAwIBAgIQXVP41p7xD59BxcZuDam4tDANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBzdHMudmlubm92YS5zZTAeFw0yMDA1MDEwOTIyMjhaFw0yNTA0MzAwOTIyMjhaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIHN0cy52aW5ub3ZhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmwU02FGyI5KYokv1qxeePYzq7BGb783il0eZQ+tkxcuc9GfXRZZELigLSWzJAt8d+ONzVqqv/28ogKyBrmyixq5hBC6wmB/oifElinMCpQ0DDbmkFQzzvILCF3xNbTbK84MEVVu/IrnkG56ncJCCMibC0XsLzeP+KErPGpFBr9iB8b4LnY6+xnb/aSiSVjSUtB+QpKf7LuyxIz8SrniMEdaP2uzqsgWw85xxWRL5AH6uitFPSEmOW9qbKfOR4KmXiSbAvoPhJqKFohAMNNte02JZcEVEUHr0S2gTaHz4UuRVl73qCZ48o9g9cqvlHz+TLYJzXpgcjqWuhcnYXe4ihQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAOfXkmgGb49TCIcfojmYVa4u8oauKt1ZoREpKai4QBuqM5/iyyfAdNnCLNRRKlZQjJm6hEhTLl9btuHYA1Uyi43SB9D9qOZBoaBDEo/CRX21Toiwjcw11ZwAwewUIIZKdEcFbXXy0lyHv4zdTAyMvXN7j2EptTSpGiiwts+qWNsRj47bIUBW6Nb3jj/nC6ElAfMbmczykVkZmuLnNwABlYmbjsNSjAyXfspJv4tPanoEUjqsTsKbLtBVyY3N2Nrw+vZYiD/9LtJBn/pBF6v4vMQ/hK1bIiF3FlU0/s/kvO+ODGXksnLj7rP/wGszfloEkgwzYOHOdjOmx0MoshiGud</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC2DCCAcCgAwIBAgIQJxv/rFkFU4lN9EP0v6MUtjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBzdHMudmlubm92YS5zZTAeFw0yMDA1MDEwOTIyMDNaFw0yNTA0MzAwOTIyMDNaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIHN0cy52aW5ub3ZhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA13kcsCVdTndWKdE7dcmhspIRsv4airY2W/eL+h8pcmf6lps99ilYHeYVrww8ZRruzAd8JzFTo9QOW4/3GrC1Ur+ZUg0hyS8UTkL9mmwifUpcuc+JAX8yxQsDrAd5A140kHbu9wddPcYVN/sljeOBOQnaH6QoCB3MQo/Y2BBPecDUsitGxzuH3CWdknZAoj8kbMNon4H4jNw0muoMdFBPJv2Y/nup42j613QfcJmSbiBJotQgPX+4ofvNh2PUNwmC8p7qUr2H20hlchTf13HmSeHzFTpnr9mP3918VRz3UC6vX4FYtn8n5RhedSWV/qKE+y8c4j5dkWBAPE6gGjLwgwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCdBpwMMfrlmiN/JXdW8eBNAryk3alKMS9+mZP2TqMbpCfgzQOP8+YzIqIWH95rlSyw31i+zupbkL+3iHaKB5/LWLQBVsWaY83AxXqh52DH+llW2VNXtpIIBpSpoIK4B3r+CiXJY3G6AuYwj7gaztjinHbvYQmQx8lL+r8/oggWZTHdnJM3uJyf/za/1EgHPMwJMbPm1RMopb5plAwcWC4TTAngkQdffGnewkJxHb986vTeiNpnB0MHfWVIXXHxGORnUwQGiJd3eOSyhB0Dd7s54fWPcligyLjs4FOMLvFNh85ngLD3On3dOiESnI+wsAYNm8oGftbH8K6w3JDpiVn6</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.vinnova.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.vinnova.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.vinnova.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.vinnova.se/adfs/ls/"/>
+  </IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vinnova</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Vinnova</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vinnova</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.vinnova.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Vinnova</md:Company>
+    <md:GivenName>Fornamn</md:GivenName>
+    <md:SurName>Efternamn</md:SurName>
+    <md:EmailAddress>mailto:admin@vinnova.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Vinnova</md:Company>
+    <md:GivenName>Fornamn</md:GivenName>
+    <md:SurName>Efternamn</md:SurName>
+    <md:EmailAddress>mailto:admin@vinnova.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Vinnova</md:Company>
+    <md:GivenName>Fornamn</md:GivenName>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@vinnova.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 473 32 99</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index dd4baba1..274484d1 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -51,4 +51,5 @@
   <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sts.vinnova.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>