Update 1 for SWAMIDOPS-8283

3 files changed, 51 insertions, 9 deletions

diff --git a/swamid-2.0/idp.hj.se-idp-shibboleth.xml b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
index ce6b589a..16df7112 100644
--- a/swamid-2.0/idp.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
@@ -1,18 +1,36 @@
 <?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.
-
-     This metadata is not dynamic - it will not change as your configuration changes.
--->
 <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.hj.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 Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml: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">hj.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">A Name for the IdP at idp.hj.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enter a description of your IdP at idp.hj.se</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
+        <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://hj.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://hj.se/en.html</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="35" width="310">https://idp.hj.se/idp/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="35" width="310">https://idp.hj.se/idp/images/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://hj.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://hj.se/en/it-helpdesk/ju-faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>hj.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -185,4 +203,28 @@ I91KnWp+FpSd3F3W0MlM1+MiKQ==
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hj.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">HJ</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Jönköping University</Company>
+    <SurName>Joakim Danielsson</SurName>
+    <EmailAddress>mailto:Joakim.Danielsson@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101116</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Jönköping University</Company>
+    <SurName>Stefan Kindh</SurName>
+    <EmailAddress>mailto:Stefan.Kindh@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101170</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Jönköping University</Company>
+    <SurName>IT-Helpdesk</SurName>
+    <EmailAddress>mailto:helpdesk@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101112</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 197cc391..5d6bc682 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -49,4 +49,5 @@
   <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.hj.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 080098b4..6b1eb6de 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -50,7 +50,6 @@
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.hj.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/gihidp02.ihs.se-idp-shibboleth.xml"/>