Still resolving SWAMIDOPS-8448

3 files changed, 5 insertions, 83 deletions

diff --git a/swamid-2.0/test.account.hj.se-adfs-services-trust.xml b/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
index 281515cd..ab41bcd8 100644
--- a/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
+++ b/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://test.account.hj.se/adfs/services/trust">
   <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>
     <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/hei-service</samla:AttributeValue>
diff --git a/swamid-2.0/test.account.hj.se.xml b/swamid-2.0/test.account.hj.se.xml
deleted file mode 100644
index 8ddc4d7c..00000000
--- a/swamid-2.0/test.account.hj.se.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.account.hj.se">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <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://test.account.hj.se/Shibboleth.sso/DS/Login"/>
-      <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://test.account.hj.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Jönköping University - Test för kontohantering</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jönköping University - Account management test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Denna applikation används som test för kontohantering.</mdui:Description>
-        <mdui:Description xml:lang="en">This service is used for account management test.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://ju.se/it-helpdesk/faq---manualer/mitt-anvandarkonto.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://ju.se/en/it-helpdesk/ju-faq---manuals/my-user-account.html</mdui:InformationURL>
-        <mdui:Logo height="21" width="187">https://test.account.hj.se/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>hj.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hj.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID1jCCAj6gAwIBAgIJAOpUvp4Vv6qZMA0GCSqGSIb3DQEBCwUAMBAxDjAMBgNV
-BAMTBWhqLnNlMB4XDTE2MTEyMjEzMTUyMloXDTI2MTEyMDEzMTUyMlowEDEOMAwG
-A1UEAxMFaGouc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDNG7ha
-1uml/wG6sYQ+ELdEneUBw/BSkcInbpgnpc5QIM/EPDM5aJmiyR9Ue69epZStQTkt
-Z7WcDN3L9SEphxc4Jt87V8hTl1ixKktrH3PnG6YF55QomeqeuDRmaiZVGYZSiU/8
-QfY+aML5ufdeJVg7Q4Eiyi3s4Z7PCsM6CVLier8NnZZLpdlUBDidtqreaLSyibI7
-6eEzOtpSoao9SXe/g6hFXbLmJlEm0lPxIe0yrPIR9X1q4bBzgGPg/rSsOeBGl1MI
-G+eW+V/QAtVBEuhCE6/ZAwS/gXeiD8RP1MuVv5aJY5Duu1BmlWbadiqvCLyS7fcO
-Op7Z1CkxEvrcfWqGFURRjJd5i4YJBk0o1Jgn1xIP6ah0QVXkN+JiRE8PPFF/jQA5
-s8jC/lz5zJADNiSADXjzI4OxqXWYURQysiVHlq4n/MGlTUHVjGkrtTwLurIuCetB
-qJvp4zCZ3NxyN8IsHI7DGf4iOtDggu6NEyAincYMfc3tRcruMB+Koy5m47cCAwEA
-AaMzMDEwEAYDVR0RBAkwB4IFaGouc2UwHQYDVR0OBBYEFIAUVokTruXKgjGhSktb
-nJD8y0X6MA0GCSqGSIb3DQEBCwUAA4IBgQCoJCfO9qft1ZN1EUHR5d44rbwQH/xE
-I26OFcawMS/YZo9zQfRerehK/qUcDpYAWE0yNsBaAvd3XDlsu/9ia3owIinvpMMf
-lmkncIjcECCeCXdyRkELTraS+hI7IB46pcBrYW8WhOfHtSyt3FUZ/3Qnw+Ev4/3Z
-pQLeBOeaKNHqnVUCRmStNPVBcWYg5166wrtnb72gFpsITY5AJEE7pdyEtXgX1mKT
-Y6bmpt23SQKXFM74jOFxqEtTAdDfcSKfOiGhdd2cqVYRe4/NIEqbB1hRGVP9ahq/
-OMhUbtYoEbbjw6fh3NJqTgLxxZD7WLECCsxtAh0d13AjuXsSYnKGOqGmnAaDOSXh
-rjDSwt9Z2R3iU5fWh4DxWZ9uDpl5ocignptw6HwPTZNNC5yl+gOROOLxmeMZqnIS
-o/S+5LRIt+rWTDRGv4b4iTUVLLk4t17JDGTvjJVIGXnOrZCdZHRRKzUAWxrrCSOs
-UhQiSal1UsuGJ0x8+VVy/+6qrkoIsKhNB+k=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://test.account.hj.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.account.hj.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.account.hj.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.account.hj.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.account.hj.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.account.hj.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.account.hj.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 78c76f03..79af73e5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -620,7 +620,6 @@
   <xi:include href="swamid-2.0/demo.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/student.verifiering2.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/test.account.hj.se.xml"/>
   <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>