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

ecessary,

3 files changed, 111 insertions, 0 deletions

diff --git a/swamid-2.0/rems.csc.fi.xml b/swamid-2.0/rems.csc.fi.xml
new file mode 100644
index 00000000..b4743fd1
--- /dev/null
+++ b/swamid-2.0/rems.csc.fi.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rems.csc.fi">
+    <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/eu-adequate-protection</samla:AttributeValue>
+       </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+        <Extensions>
+            <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://rems.csc.fi/Shibboleth.sso/Login" index="1"/>
+            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+                <mdui:DisplayName xml:lang="en">REMS</mdui:DisplayName>
+                <mdui:DisplayName xml:lang="fi">REMS</mdui:DisplayName>
+                <mdui:Description xml:lang="en">Resource Entitlement Management
+                    System</mdui:Description>
+                <mdui:Description xml:lang="fi">Valtuutuuksien Hallinta
+                    Järjestelmä</mdui:Description>
+                <mdui:PrivacyStatementURL xml:lang="en"
+                    >https://rems.csc.fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
+                <mdui:PrivacyStatementURL xml:lang="fi"
+                    >https://rems.csc.fi/web/guest/tietosuojaseloste</mdui:PrivacyStatementURL>
+            </mdui:UIInfo>
+        </Extensions>
+        <KeyDescriptor>
+            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                <ds:X509Data>
+                    <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJAJNkHpbnqskZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+                        BAMTC3JlbXMuY3NjLmZpMB4XDTEyMTAwNDA2NDc1M1oXDTIyMTAwMjA2NDc1M1ow
+                        FjEUMBIGA1UEAxMLcmVtcy5jc2MuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+                        ggEKAoIBAQCti37oqpPuAfgsIAc7VwKA+3L99iuTlFG9jlGTJiurXW/ARwl5y8FX
+                        HWDYmdg5GECe7qHsvKAhgGnJ6x0qmhJZacbvBuhofGZBHliG6ykCX377HA09pDr1
+                        db9WRhRMwz/w46mZU/9n/r3BfXXNpmAsdHiC/nD+0lPoOEHfo9wN0JsqO4SQUbya
+                        0cyMle8YVlPeF+8voug2lNvcDRcx9CRvAMTHuJX9HBTYE0XtAgHZOymZ10KvBDnq
+                        Lw7z0bndgUuSAp5puWH1eKGZt1S6rslLeMVw7xlTlds4HmGc5CRkJyZ0WKkU0VI2
+                        THDKIHlWCkJ+X0i04TFYtiJKxwavAjoRAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Jl
+                        bXMuY3NjLmZpMB0GA1UdDgQWBBSTogtyEd5toTA7qpl65syr7UE9OzANBgkqhkiG
+                        9w0BAQUFAAOCAQEAkHuPNT6e9a3PG8dy/OcUfY+ln2NA1gThNFRc0ZdhsRML1MXk
+                        hTPyv6v04KsyfEH4OjkpyTqcVCvs6jjVZrQmPyzU3nXu1aPyM7lYvGikVM/oFRAV
+                        0H4Cz+Yj8mKCddTdxAAiNyuqjOf+eYlRv3SyNjIYYM6OmqD0mH/mPZ6ado41ALUN
+                        0iqdiwFeKwjOlKALGVW92ihgU8uX3ScC6jCbAdPTu2m+NBO42pKNVYasHI0PBJmB
+                        HCZKDHCPHeGmXn6ab0zU6GbvGrxAKWDwJNw9mgRfxKqvTpVI9hY8QOE4eAjH7UJz
+                        c3E0G+pYuKCVKHVH6HOcuVL23IneYlhKtmz+Kw==</ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+            Location="https://rems.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+        <AttributeConsumingService index="1" isDefault="true">
+            <ServiceName xml:lang="fi">REMS</ServiceName>
+            <ServiceName xml:lang="en">REMS</ServiceName>
+            <ServiceDescription xml:lang="fi">Valtuutuuksien Hallinta
+                Jarjestelma</ServiceDescription>
+            <ServiceDescription xml:lang="en">Resource Entitlement Management
+                System</ServiceDescription>
+            <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <RequestedAttribute FriendlyName="eduPersonAffiliation"
+                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <RequestedAttribute FriendlyName="eduPersonPrincipalName"
+                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <RequestedAttribute FriendlyName="schacHomeOrganization"
+                Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <RequestedAttribute FriendlyName="schacHomeOrganizationType"
+                Name="urn:oid:1.3.6.1.4.1.25178.1.2.10"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+        </AttributeConsumingService>
+    </SPSSODescriptor>
+    <Organization>
+        <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+        <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+        <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+        <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus
+            Oy</OrganizationDisplayName>
+        <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science
+            Ltd.</OrganizationDisplayName>
+        <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus
+            Oy</OrganizationDisplayName>
+        <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+        <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+        <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+        <GivenName>Janne</GivenName>
+        <SurName>Lauros</SurName>
+        <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="support">
+        <GivenName>Janne</GivenName>
+        <SurName>Lauros</SurName>
+        <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
+    </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8baa94d3..13472f0a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -44,4 +44,5 @@
    <xi:include href="swamid-2.0/testshib.msacademicverify.com.xml"/>
    <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/www.mit.ladok.se-gui-sp.xml"/>
+   <xi:include href="swamid-2.0/rems.csc.fi.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 8d76d277..21265d19 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -304,4 +304,5 @@
   <xi:include href="swamid-1.0/wb11_idp-metadata.xml"/>
   <xi:include href="swamid-1.0/bhb-00.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/portalservicesutv.miun.se.xml"/>
+  <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
 </EntitiesDescriptor>