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

2 files changed, 7 insertions, 109 deletions

diff --git a/swamid-2.0/idp.hv.se-idp-shibboleth.xml b/swamid-2.0/idp.hv.se-idp-shibboleth.xml
index df931c86..ed54accf 100644
--- a/swamid-2.0/idp.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hv.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="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:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.hv.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
diff --git a/swamid-2.0/idp3.hv.se-idp-shibboleth.xml b/swamid-2.0/idp3.hv.se-idp-shibboleth.xml
deleted file mode 100644
index 6f085338..00000000
--- a/swamid-2.0/idp3.hv.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="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://idp3.hv.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University West (Test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan Väst (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hv.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKTQIrf9LxcGt46niDqiM7jwkFfgMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDQuc2VydmVyLmh2LnNlMB4XDTEyMTEzMDEz
-MDU1MFoXDTMyMTEzMDEzMDU1MFowHzEdMBsGA1UEAxMUbHNhbWwwNC5zZXJ2ZXIu
-aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCclapvzUvFzlGy
-HHpmhLlLt2ZSwhKVkyuphRkz7MeF8jFrvN4QQ7/dQHt3c+HdEwycJ6DUgvstHthx
-gYek3Lp8fvoMjPN4RZXOg7VEZn6So8y+aRYTjx0vrLG4IlUZyGZlyw0M9SCl4zt0
-sOBNZZqK/K0qgPG5mYwnDKYM0HTUwVQqzqcIYS53wq0iRffeA+fRa0GQpBH4tNOb
-WjVkHw0HCaxHPI7rg5cnzBQVLr4MiLELYDcwdCyFxFP6qvYTeGVnGyIMN5ZkHFH5
-14bhD4k+3zjc0unztuAeBqrKuyRu0fqTA7naezG0sNw5TooxxMVQNchGf0ZpQiEE
-WJqb3pCLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDQuc2VydmVyLmh2LnNl
-hitodHRwczovL2xzYW1sMDQuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRfZ73QSc/wylbnusEXXLOfPQvbgTANBgkqhkiG9w0BAQUFAAOCAQEA
-ErxZEN44gh21kexTLFIHHaPJ97rawkYE/lXGRxtzmyOamyTMt7C5gcFy9Vx4vHHR
-l/mtKWWwOjGwJDWSAiMIXmKehGMncLqXPeiPpaPx9Gmeh7T1o5ZqNTK608xvlxDV
-4TMbzNQKo9+B9zJFKso4Cusn+XefHkokKrYRuaX5ZQ5Lk2cvob46pl75aXA03w9D
-qIQd0+msnu09J5Ul9LG666tzcNXSJjJRKOWlSomwGi/oLgKkENGkPD+s8UZ/qoQv
-h45FsOw64riDT7QFrR9PvAvJhhpD7Q7NX+dZUQNnj0oyFZij3k6A36D5eENhf5HN
-skz1W+/eg2IbITbz88uIXA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.hv.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.hv.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.hv.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKTQIrf9LxcGt46niDqiM7jwkFfgMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDQuc2VydmVyLmh2LnNlMB4XDTEyMTEzMDEz
-MDU1MFoXDTMyMTEzMDEzMDU1MFowHzEdMBsGA1UEAxMUbHNhbWwwNC5zZXJ2ZXIu
-aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCclapvzUvFzlGy
-HHpmhLlLt2ZSwhKVkyuphRkz7MeF8jFrvN4QQ7/dQHt3c+HdEwycJ6DUgvstHthx
-gYek3Lp8fvoMjPN4RZXOg7VEZn6So8y+aRYTjx0vrLG4IlUZyGZlyw0M9SCl4zt0
-sOBNZZqK/K0qgPG5mYwnDKYM0HTUwVQqzqcIYS53wq0iRffeA+fRa0GQpBH4tNOb
-WjVkHw0HCaxHPI7rg5cnzBQVLr4MiLELYDcwdCyFxFP6qvYTeGVnGyIMN5ZkHFH5
-14bhD4k+3zjc0unztuAeBqrKuyRu0fqTA7naezG0sNw5TooxxMVQNchGf0ZpQiEE
-WJqb3pCLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDQuc2VydmVyLmh2LnNl
-hitodHRwczovL2xzYW1sMDQuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRfZ73QSc/wylbnusEXXLOfPQvbgTANBgkqhkiG9w0BAQUFAAOCAQEA
-ErxZEN44gh21kexTLFIHHaPJ97rawkYE/lXGRxtzmyOamyTMt7C5gcFy9Vx4vHHR
-l/mtKWWwOjGwJDWSAiMIXmKehGMncLqXPeiPpaPx9Gmeh7T1o5ZqNTK608xvlxDV
-4TMbzNQKo9+B9zJFKso4Cusn+XefHkokKrYRuaX5ZQ5Lk2cvob46pl75aXA03w9D
-qIQd0+msnu09J5Ul9LG666tzcNXSJjJRKOWlSomwGi/oLgKkENGkPD+s8UZ/qoQv
-h45FsOw64riDT7QFrR9PvAvJhhpD7Q7NX+dZUQNnj0oyFZij3k6A36D5eENhf5HN
-skz1W+/eg2IbITbz88uIXA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="sv">HV</OrganizationName>
-    <OrganizationName xml:lang="en">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Väst (Test)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University West (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Högskolan Väst</Company>
-    <GivenName>Magnus</GivenName>
-    <SurName>Andersson</SurName>
-    <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Högskolan Väst</Company>
-    <GivenName>Christian</GivenName>
-    <SurName>Jiresjö</SurName>
-    <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>