From 4e5acd5219278b57bbee0bd89638f119a50e508d Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders.lordal@hig.se>
Date: Wed, 17 Jun 2015 11:03:30 +0200
Subject: Resolves SWAMIDOPS-7717

---
 swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml | 127 ++++++++++++++++++++++
 swamid-testing-idp-1.0.mxml                       |   1 +
 2 files changed, 128 insertions(+)
 create mode 100644 swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml

diff --git a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..026b3120
--- /dev/null
+++ b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
@@ -0,0 +1,127 @@
+<?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#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://demo.weblogin.uu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.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" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">DEMO Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DEMO Uppsala University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">AKKA DEMO Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University's AKKA DEMO Joint Web Login for employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="sv">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAPxLbmeKxztkByoHr1nHOrwqB4XjMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMME2RlbW8ud2VibG9naW4udXUuc2UwHhcNMTUwNjE2MTM0
+NDAzWhcNMzUwNjE2MTM0NDAzWjAeMRwwGgYDVQQDDBNkZW1vLndlYmxvZ2luLnV1
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWwx4TDF3MMObfgM
+CnDI+ghMX4K7wEPbGR5Xyw/BEWMm6xvNgMzX6R7QVU7NWle2Kdsy1XgbQC3hb9/P
+WzWdMag9UKuNCB3KeZcT7+RsQgBS76T5HpcYqDMjoDSDlBn36qeizjTEjQfujFrx
+tt/yeq//1v/FzZHoePoiNe3j9FHtz5QZ+vJVVOMRZlrACfLqxpzYZc8NkQjupOAo
+Xrh02tsAvMokjS1R17don1D8BFxKCve6hclrrTcNWFPjhx3ucuRgmYXHaGLUlNAT
+GeVNBujBJ+N+3/8dPTk7izj04J01O/MUerBTTkc2gzGd0/dfTTg/VLYvWZerbe7a
+h/kkLwIDAQABo20wazAdBgNVHQ4EFgQU0W7hm9BiA/ksTNslvsbrsIWKLPIwSgYD
+VR0RBEMwQYITZGVtby53ZWJsb2dpbi51dS5zZYYqaHR0cHM6Ly9kZW1vLndlYmxv
+Z2luLnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQA4jOuz
+faaTxSHudbNaA0Np0rfvyibyCTN+GCHehuabl5jLYDGvMX5WwV+tyQ+Q2nDLCmjH
+QThOe96fbyN5KoJq4J+5nK5LC4/3HaVhG7XXJofTutbQXazmeuSFYDOhBk5qAXv6
+0B+rfTm0xpdHQoMakPfbYA0v2xh2z5B9Q63gEqt2BMU2IEYbD/+/XzR+t+3mBrfg
+MXx/+iCnRjnS6/wHETmB3/v2cAJsksFLiJ/EyV2UG1URHPMYIBcWnVHJo1yJIMFe
+uyWI170/uSD+sI1wCOKp/8zKrwaPh5xnnx74Nktr+m+pbH8Hq6VPjZmmsP557nm4
+czuyQatrgEL0HlWr
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://demo.weblogin.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://demo.weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAPxLbmeKxztkByoHr1nHOrwqB4XjMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMME2RlbW8ud2VibG9naW4udXUuc2UwHhcNMTUwNjE2MTM0
+NDAzWhcNMzUwNjE2MTM0NDAzWjAeMRwwGgYDVQQDDBNkZW1vLndlYmxvZ2luLnV1
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWwx4TDF3MMObfgM
+CnDI+ghMX4K7wEPbGR5Xyw/BEWMm6xvNgMzX6R7QVU7NWle2Kdsy1XgbQC3hb9/P
+WzWdMag9UKuNCB3KeZcT7+RsQgBS76T5HpcYqDMjoDSDlBn36qeizjTEjQfujFrx
+tt/yeq//1v/FzZHoePoiNe3j9FHtz5QZ+vJVVOMRZlrACfLqxpzYZc8NkQjupOAo
+Xrh02tsAvMokjS1R17don1D8BFxKCve6hclrrTcNWFPjhx3ucuRgmYXHaGLUlNAT
+GeVNBujBJ+N+3/8dPTk7izj04J01O/MUerBTTkc2gzGd0/dfTTg/VLYvWZerbe7a
+h/kkLwIDAQABo20wazAdBgNVHQ4EFgQU0W7hm9BiA/ksTNslvsbrsIWKLPIwSgYD
+VR0RBEMwQYITZGVtby53ZWJsb2dpbi51dS5zZYYqaHR0cHM6Ly9kZW1vLndlYmxv
+Z2luLnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQA4jOuz
+faaTxSHudbNaA0Np0rfvyibyCTN+GCHehuabl5jLYDGvMX5WwV+tyQ+Q2nDLCmjH
+QThOe96fbyN5KoJq4J+5nK5LC4/3HaVhG7XXJofTutbQXazmeuSFYDOhBk5qAXv6
+0B+rfTm0xpdHQoMakPfbYA0v2xh2z5B9Q63gEqt2BMU2IEYbD/+/XzR+t+3mBrfg
+MXx/+iCnRjnS6/wHETmB3/v2cAJsksFLiJ/EyV2UG1URHPMYIBcWnVHJo1yJIMFe
+uyWI170/uSD+sI1wCOKp/8zKrwaPh5xnnx74Nktr+m+pbH8Hq6VPjZmmsP557nm4
+czuyQatrgEL0HlWr
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://demo.weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">DEMO Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">DEMO Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala University</md:Company>
+    <md:SurName>Team Plattform</md:SurName>
+    <md:EmailAddress>uadm-team_plattform@lists.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala University</md:Company>
+    <md:SurName>John Morrison</md:SurName>
+    <md:EmailAddress>john.morrison@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>IT Servicedesk</md:SurName>
+    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 74cc7ba1..a911c1b6 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -43,4 +43,5 @@
   <xi:include href="swamid-2.0/a0251.srv.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idptest.hj.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3