ihs.se removed from GIH IdP

SWAMIDOPS-7127

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

Conflicts:
	swamid-sp-2.0.mxml

10 files changed, 291 insertions, 5 deletions

diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 2d3640cb..58b9df4c 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -50,6 +50,7 @@
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="false"/>
       <md:RequestedAttribute 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" FriendlyName="eduPersonAffiliation" isRequired="false"/>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="false"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..dc82895c
--- /dev/null
+++ b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <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/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Logga in i Karlstads universitet intranät - Inslaget</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Login to Karlstad University intranet - Inslaget</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Karlstads universitets nya intranät baserad på Drupal Commons</mdui:Description>
+        <mdui:Description xml:lang="en">This is the new intranet at Karlstad University based upon Drupal Commons</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIJAP1roPw615wjMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRswGQYDVQQDDBJjYWx5cHNvLnNhdS5rYXUuc2UwHhcNMTQwMTA4MTAwMTExWhcNMjQwMTA4MTAwMTExWjBdMQswCQYDVQQGEwJTRTERMA8GA1UEBwwIS2FybHN0YWQxHjAcBgNVBAoMFUthcmxzdGFkcyB1bml2ZXJzaXRldDEbMBkGA1UEAwwSY2FseXBzby5zYXUua2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnUT0R4WtcHh/5yHR0hfPF86BHudlJ8tfFloK9pcE6VwpTSgo++zz1BB9jIU0Nq+V9AwrO0z3azx9inPY07sLEkTwhxYgO7w4N5E9AkZY4+KpmVaRFI5iQBbfFSwa0scI0jlozJpvj4u14Okmzjz63c8qErULiT8/V+gE+HfGwbzwROd4I5HagaqLoDzFU972bzx863dq5K3C6pxmxdg2go2ndoARo5kkv3VvSStAyNc/Mz9hSmXmue3QXFcR8Yp6V9W1fLJ7W3/S3DdyO3lCo556L94NBwE/3PqHfMga6wErrTJoxzVfFzc1xsMJAybzCxg0Rq5ohXZQu9kLaYurHQIDAQABo1AwTjAdBgNVHQ4EFgQU900dUcsCm+hCDW6HpM81y9LsyG4wHwYDVR0jBBgwFoAU900dUcsCm+hCDW6HpM81y9LsyG4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWRzFKJML0ZfT9zNlUh9blGCOkHI4TchwBdIkWiRfCC7U83wIkIdrrwIMA++b6i4Qs4J9zsS13hFZoeUNfjJyhc08ixJELU30ud9bp1Jfq/gLgLnJRxDn64QT8USxRNIvr2fZ2e83yeqT6Hu0utcRPYV6mIa03JWiOYW8I1Y/BH9onfeqYzAADdX8QB5pWj429QRtSJ1Ab0Qg+fLo7L7Cfur0rr0Tfi6YcOqt91ht5BFWM+hVHJ2Vd+8wycioW2xYCe8jLfXkRuXCtTD/Q2refKAoNPYYfRWzSR0+dYVUjUQp5OyVtxtRXOkCOwJpKWL8I1JKEJHpqRKX0ohkygmi/w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIJAP1roPw615wjMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRswGQYDVQQDDBJjYWx5cHNvLnNhdS5rYXUuc2UwHhcNMTQwMTA4MTAwMTExWhcNMjQwMTA4MTAwMTExWjBdMQswCQYDVQQGEwJTRTERMA8GA1UEBwwIS2FybHN0YWQxHjAcBgNVBAoMFUthcmxzdGFkcyB1bml2ZXJzaXRldDEbMBkGA1UEAwwSY2FseXBzby5zYXUua2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnUT0R4WtcHh/5yHR0hfPF86BHudlJ8tfFloK9pcE6VwpTSgo++zz1BB9jIU0Nq+V9AwrO0z3azx9inPY07sLEkTwhxYgO7w4N5E9AkZY4+KpmVaRFI5iQBbfFSwa0scI0jlozJpvj4u14Okmzjz63c8qErULiT8/V+gE+HfGwbzwROd4I5HagaqLoDzFU972bzx863dq5K3C6pxmxdg2go2ndoARo5kkv3VvSStAyNc/Mz9hSmXmue3QXFcR8Yp6V9W1fLJ7W3/S3DdyO3lCo556L94NBwE/3PqHfMga6wErrTJoxzVfFzc1xsMJAybzCxg0Rq5ohXZQu9kLaYurHQIDAQABo1AwTjAdBgNVHQ4EFgQU900dUcsCm+hCDW6HpM81y9LsyG4wHwYDVR0jBBgwFoAU900dUcsCm+hCDW6HpM81y9LsyG4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWRzFKJML0ZfT9zNlUh9blGCOkHI4TchwBdIkWiRfCC7U83wIkIdrrwIMA++b6i4Qs4J9zsS13hFZoeUNfjJyhc08ixJELU30ud9bp1Jfq/gLgLnJRxDn64QT8USxRNIvr2fZ2e83yeqT6Hu0utcRPYV6mIa03JWiOYW8I1Y/BH9onfeqYzAADdX8QB5pWj429QRtSJ1Ab0Qg+fLo7L7Cfur0rr0Tfi6YcOqt91ht5BFWM+hVHJ2Vd+8wycioW2xYCe8jLfXkRuXCtTD/Q2refKAoNPYYfRWzSR0+dYVUjUQp5OyVtxtRXOkCOwJpKWL8I1JKEJHpqRKX0ohkygmi/w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT-avdelningen</md:GivenName>
+    <md:EmailAddress>webbteknik@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/dev.idp.eduid.se-idp.xml b/swamid-2.0/dev.idp.eduid.se-idp.xml
new file mode 100644
index 00000000..f3e927c8
--- /dev/null
+++ b/swamid-2.0/dev.idp.eduid.se-idp.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://dev.idp.eduid.se/idp.xml">
+  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:Scope regexp="false">eduid.se</ns1:Scope>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
+RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
+MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
+ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
+MIIBOgKCATEA1f/fv5GSVkRNkPj1xVshkDlVaVTSeofLjJeFK820uVMaZagUsn8T
+mML2YdH8CyLEAZgeU8V/oF2P1SFieG1Ex3lBflLGWw/7pQqe08tjfTkeJthntJJR
+W2gCa4I0v1bsJS02U7pVizDv4/3zIo1EpAHrmu7NOs9ybCHA0RnrdQk6aHppe6nz
+571Cz3F6zlp9sc4X3Dbf1sVtXHSArUjOh3bgjQnvOAAirJqSYzZgav54WwLzcsas
+JMEwLnRSiyRxXm0dnuqhsM7xlJM/G7X35zhBQFwxUKJ33b1xu9PPFfoqIH/NjoPU
+gj15jTxvXQam0DvkHMFQvn87bfrtdW187ENZ2lPBYw/yFfF2Mffh0xYKlemJ7LEs
+Y1FMJStI+7vKEq9DHGedUfufhFEZNtJW0wIDAQABo0AwPjAMBgNVHRMBAf8EAjAA
+MA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFPM+gGbOGyvozZ3L44342h8VTKCN
+MA0GCSqGSIb3DQEBCwUAA4IBMQBlBpfl/507hO/upCjKsmtKL7SMufq/kGXb1VB8
+gFiBHgH96woVz/AwHRAVfdrKsQxriXFnOAlgnSAgUtfOmrO8t2mDJ3nxVLW/eKfz
+ZfrQCTLxcZpQnzmYlNCyFepjbpb0E9I2wkUeY4DvdzzMlQFwxjSDWa2NPc5UiXAe
+EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
+g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
+xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
+hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
+RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
+MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
+ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
+MIIBOgKCATEA1f/fv5GSVkRNkPj1xVshkDlVaVTSeofLjJeFK820uVMaZagUsn8T
+mML2YdH8CyLEAZgeU8V/oF2P1SFieG1Ex3lBflLGWw/7pQqe08tjfTkeJthntJJR
+W2gCa4I0v1bsJS02U7pVizDv4/3zIo1EpAHrmu7NOs9ybCHA0RnrdQk6aHppe6nz
+571Cz3F6zlp9sc4X3Dbf1sVtXHSArUjOh3bgjQnvOAAirJqSYzZgav54WwLzcsas
+JMEwLnRSiyRxXm0dnuqhsM7xlJM/G7X35zhBQFwxUKJ33b1xu9PPFfoqIH/NjoPU
+gj15jTxvXQam0DvkHMFQvn87bfrtdW187ENZ2lPBYw/yFfF2Mffh0xYKlemJ7LEs
+Y1FMJStI+7vKEq9DHGedUfufhFEZNtJW0wIDAQABo0AwPjAMBgNVHRMBAf8EAjAA
+MA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFPM+gGbOGyvozZ3L44342h8VTKCN
+MA0GCSqGSIb3DQEBCwUAA4IBMQBlBpfl/507hO/upCjKsmtKL7SMufq/kGXb1VB8
+gFiBHgH96woVz/AwHRAVfdrKsQxriXFnOAlgnSAgUtfOmrO8t2mDJ3nxVLW/eKfz
+ZfrQCTLxcZpQnzmYlNCyFepjbpb0E9I2wkUeY4DvdzzMlQFwxjSDWa2NPc5UiXAe
+EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
+g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
+xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
+hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.idp.eduid.se/slo/soap"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.idp.eduid.se/slo/post"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.idp.eduid.se/slo/redirect"/>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.idp.eduid.se/sso/redirect"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.idp.eduid.se/sso/post"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.idp.eduid.se/sso/art"/>
+  </ns0:IDPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">eduID TEST</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="en">eduID TEST</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>eduID</ns0:GivenName>
+    <ns0:SurName>developers</ns0:SurName>
+    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="support">
+    <ns0:GivenName>Support</ns0:GivenName>
+    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 94ceecf1..94aa440b 100644
--- a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -8,7 +8,7 @@
         <mdui:Description xml:lang="sv">Identity Provider för Gymnastik- och Idrottshögskolan vid Stockholms Stadion</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
       </mdui:UIInfo>
-      <shibmd:Scope regexp="false">ihs.se</shibmd:Scope>
+      <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
diff --git a/swamid-2.0/grouper-test.its.uu.se-shibboleth.xml b/swamid-2.0/grouper-test.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..f92fb470
--- /dev/null
+++ b/swamid-2.0/grouper-test.its.uu.se-shibboleth.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper-test.its.uu.se/shibboleth">
+  <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://grouper-test.its.uu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">UU TEST GROUPER</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">UU TEST GROUPER</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna Grouper för test</mdui:Description>
+        <mdui:Description xml:lang="en">The internal test Grouper for the IT Department at Uppsala University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lagopus.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lagopus.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAJwLNDNAvdwVMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWxhZ29wdXMuaXRzLnV1LnNlMB4XDTEyMDIyMjExMTgwNFoXDTIyMDIxOTEx
+MTgwNFowHDEaMBgGA1UEAxMRbGFnb3B1cy5pdHMudXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIc2xP8hCNliluyW/3kFHw8/EYMmGu4FvKFbCh
+33+QDDdZWQIDyZUo/GIw/DdRdkDaRaQ2JgF1zofooPlkYrqd5cBaoxc+oEet1MB+
+J70hvt+83IuzVdp4VNxAiGy9L5aAfnXdsYV2AHZisoHKyeAX2XNlUC4VA9dKBWJC
+O2dUjDCxZ52R6E8P0CCZ5zKUA6i/nVJzpjklaQDT67Fyb0p14Aqzw4092ykUXbys
+KOFZ11QmuzTN0r3+jTsUHICakgsSyUNTnwQKNfE8TAHj+WPFhfzTKMcSWEpYI7Rj
+FfkNFSMem7oV26V7RuE3KoXTtrCXlFBzt3014mQWEb5+ve7hAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEWxhZ29wdXMuaXRzLnV1LnNlMB0GA1UdDgQWBBSzeuO1UGd9noyM
+fwfJ93JJacVEaTANBgkqhkiG9w0BAQUFAAOCAQEAWhy3C+EjI2SqeftECTKBZb1D
+C6DInq/e0nB9Y9cvKHxzZdX9TKDcfozjBw91B+1GhEMZIuIPS8fPMpwLc3OOX0lf
+KS/zEjUbl47rWlpYMApXopQGR718vuOeqFh25s6goFD4axlS4Be1YHr66JCTuKs6
+6XqCqzPvKgI6DWqu6Qi0aLBuZUuZGfotLRBLPQtjzWiDsBzRLNa89majbg7drwgj
+oQFShIE1qtNWMZ7gYnXyPXDuE8ru8W2i/NrytzLHJN/NzEOBid4VzRHG+XAO4+bK
+Jkes+PA+V+YNBFaZc6S+0YsiqsedpDewqW0HB/SzVIgIiiBRCu/4lfR9eqWbVA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://grouper-test.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/grouper-utv.its.uu.se-shibboleth.xml b/swamid-2.0/grouper-utv.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..f146ab14
--- /dev/null
+++ b/swamid-2.0/grouper-utv.its.uu.se-shibboleth.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper-utv.its.uu.se/shibboleth">
+  <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://grouper-utv.its.uu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">UU UTV GROUPER</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">UU DEV GROUPER</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna Grouper för utvecklning</mdui:Description>
+        <mdui:Description xml:lang="en">The internal development Grouper for the IT Department at Uppsala University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>laeta.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=laeta.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPhqmNfCXoJdMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2xhZXRhLml0cy51dS5zZTAeFw0xMjAyMTQxMDI3MjFaFw0yMjAyMTExMDI3
+MjFaMBoxGDAWBgNVBAMTD2xhZXRhLml0cy51dS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAL4zBv8DXuK32BxPmgj1ecXRfZe35OwJprelf4tZ25IF
+gUw5wy6YJG1dwA0rRyZTvRDgGcSjCpUtO2AAqRASM3BzvnzMJdg8aIi70c33KvvL
+486fKpfc3oUfnZ4s1WBOFiqeYAmzz85YL6F830yRw7UdN9/ysJPCVC2qilAKM7RI
+iOwcrZIb8prxvoVDRFsV2wGjRP/YIyVO41ObfdWkg+tB7X7DRz127S5Mqga/YlJk
+O0NLXv4DqSqAkv9tYpTJKE0UG6oh5B9dtbtEfLYMLGamDv7y82jvmjW4qaY+Gu2G
+2yYqkon3ILleH4mk3Vath9qRRqEQVRE61xtoH0ZpADUCAwEAAaM9MDswGgYDVR0R
+BBMwEYIPbGFldGEuaXRzLnV1LnNlMB0GA1UdDgQWBBSyozmFibzGVWSCCyw/Ek5+
+PFmlgTANBgkqhkiG9w0BAQUFAAOCAQEAJ9RJgL04YiZhJFVrPHzv4QPWtHN4BRoN
+MUQeXlzQ9iz9ksl/0eN0XKJuzo5HbG0067w1OUzpZUEM8GVtBCTpOlqAJJA6lb60
+r+3KbUEejZyPZeHh9xFh1tlPkZLmn7bj/ucfTdBACRbXYniWAOn98wV1wd4eGLVG
+/VyoVi5bUhq5tCOhp5eO/xWM0gBCeRt760hZWDQ5/sgd4nkrS1Se7zWejG7Ph+Cx
+OH5QMcOlj81+M7N3qUU//X8ypY42+QHc0gUQEB8BJAzatIdjIjipoT4fhk82E84q
+p9ItgP+bXhVORPr8DiYsTGUr5vfs7Q4e7etZRBJC30LQiGaerGc80Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/grouper.its.uu.se-shibboleth.xml b/swamid-2.0/grouper.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..e13c7e94
--- /dev/null
+++ b/swamid-2.0/grouper.its.uu.se-shibboleth.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.its.uu.se/shibboleth">
+  <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://grouper.its.uu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">UU GROUPER</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">UU GROUPER</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna Grouper</mdui:Description>
+        <mdui:Description xml:lang="en">The internal Grouper for the IT Department at Uppsala University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lory.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lory.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAL1RGIih2dp/MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmxvcnkuaXRzLnV1LnNlMB4XDTEyMDIyMjE1MDgzOVoXDTIyMDIxOTE1MDgz
+OVowGTEXMBUGA1UEAxMObG9yeS5pdHMudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDfaJDQjzXaGpYLPN8oiu76Ck6yPiKT2mzXNLDC6gl6qcKd
+B8q7eBu7QW4/WqYD69XdhUkIiPiG1eNu1uXEuF/lBDmOGQ9O9sQoMOaNYWQofwtF
+6yKUgnm4T42rNHYZ5mGFt7RfH+380s+d2M7HMh+OApCbRuu5FMVyITKmtroTkYof
++86LJDq7GzktkGaRHn+5mXDg201c5LsCfDG27V+eIAxjeN0a4BlAzNDwynmX7Tmq
+VacNvFdreBIAXjU4CNQ+fPccUd8Dyst0Bb2mPMCUqlyxn0cILDc+Q9Iv4KO7czoG
+XdkANIfqS7YWgaxtnBFVtu25vps/h8hihwE/RcobAgMBAAGjPDA6MBkGA1UdEQQS
+MBCCDmxvcnkuaXRzLnV1LnNlMB0GA1UdDgQWBBR7usKPvDlmkEuaKS1bVoLokZAx
+8zANBgkqhkiG9w0BAQUFAAOCAQEAJeHoL4LRFh2W5WUrLH6o2BjezwajXIZxNtHH
+OBIbdU6zGebAFVMd8ILlZJCWceOYb8aT2NpZsNBt6Of+bXRgT95vk8P3rgfghAAm
+m4RVMmI0E3Sg7upppdp0UvUdff/01QP4jMEif9zqO1CB8HwDe7qPd2zIlSg4hVXA
+VTYITlhc2HTLdhLLeqq2kkO8uoh7Deb2+om56Wq2UG8JFLDiwQuTiil9bmDs7635
+J97muJOIk72pZ7M+z7aRmbGqaZmX7lVcn2ipqR01Wt86IncZ8N4+KHvL1bd8Ot+e
+0C2Qlb5+9FE8h6CiVCxRMBaxUsVFR6knlay131nUecMwLC3G7w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://grouper.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
index a6fb57b3..47af38e8 100644
--- a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?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" entityID="https://www.mit-ik.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 935c8edb..d1f19523 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -267,4 +267,8 @@
   <xi:include href="swamid-2.0/mp.uu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/grouper-test.its.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/grouper-utv.its.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/grouper.its.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index e978cd1f..965f5849 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -40,4 +40,5 @@
   <xi:include href="swamid-2.0/idp3.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.umu.se-test.xml"/>
   <xi:include href="swamid-2.0/pilot.idp.eduid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/dev.idp.eduid.se-idp.xml"/>
 </EntitiesDescriptor>