Update new HiS IdP, still in test

1 files changed, 46 insertions, 146 deletions

diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index 80df2dfa..40b2583b 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
@@ -9,11 +9,27 @@
     <Extensions>
       <shibmd:Scope regexp="false">his.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Högskolan i Skövde (test v4)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde (test v4)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enter a description of your IdP at idp.his.se</mdui:Description>
-        <mdui:Logo height="80" width="80">https://idp.his.se/Path/To/Logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Högskolan i Skövde (new)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde (ny)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.his.se/en/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="196" width="206">https://idp.his.se/idp/images/ny_his_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="196" width="206">https://idp.his.se/idp/images/ny_his_logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">skövde his</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">skövde his</mdui:Keywords>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>his.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.176.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.184.0/23</mdui:IPHint>
+        <mdui:IPHint>193.11.96.0/22</mdui:IPHint>
+        <mdui:IPHint>212.25.128.0/23</mdui:IPHint>
+        <mdui:IPHint>212.25.134.0/23</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.39,13.85</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:58.39412,13.85542</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <!-- First signing certificate is BackChannel, the Second is FrontChannel-->
     <KeyDescriptor use="signing">
@@ -124,151 +140,35 @@ zGqLyGPg/8g=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <!--<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
--->
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.his.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/SLO"/>
--->
     <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" req-attr:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" req-attr:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" req-attr:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO"/>
-    <!--<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
--->
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
   </IDPSSODescriptor>
-  <!--    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">his.se</shibmd:Scope>
-        </Extensions>
-
-        -->
-  <!-- First signing certificate is BackChannel, the Second is FrontChannel-->
-  <!--
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-MIIFFDCCAvygAwIBAgIVALwi1H+BLbsBo4cZ5U3MIvXjmpklMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5oaXMuc2UwHhcNMjExMTExMTMzOTE3WhcNNDEx
-MTExMTMzOTE3WjAVMRMwEQYDVQQDDAppZHAuaGlzLnNlMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAgGMmGX4n0p30xWDCBSuJ/hT0zsszJ3zr/RR1ffA3
-AULhzg9//KLDU+qXmWhRfoS1rcHihOUv8iOusrcJs9cDyiQSrubXq1CkVdXeuUdg
-Ka6q4SJXb7xpicqHSOaWBP1wudQ5R7V9ZbpQp9ND31uHPYuknafhTj6Zm2CHBd12
-NlkLvDHnIGZXCvNttIyF9j2qFlqei66ZPFbEiM8h7UIgurvN0fpYGiENQK2rt4Hj
-8/Xyq+GWkpQ1PgFQEAqWJxT2INu2hc+XJdX8Jpw05UKwvdCnCOWxQUFRemo750dN
-s1dBgweLB/EBnUaIprO/ebmN8i3JlWkeNrxvCGzbxRxYTdd1s67W4vGopWAWCWfm
-46mi/H/h7WJMYtdLQayYVy0+L9lboczrC/lzPmJjG5QlXCQ6fk4ReLw0j/OMRZlP
-GO4A5ocoBPSrbEPmZPSPPQ27xGbo19QrGrWoemX74Rr2nPlqc0hQe20DL3jnJcW7
-w/8UA4ytVmMOXeJiZTn1L3O1DTMrNZYRBlcSIWEYt4Vt0B5KgNsB6hxKnKZHn45O
-GfE+FUldUzcmcvcdDbkrVTsugr3Dqp17mgZOBqi55gLWWVF9fBdmlKHI9TPwBBUN
-K4uqagObbHhPCLnSXpY/sp4EWtXfbg6BDwFTz8Ix4cZimspLKRSAOacx0MvPuDwe
-Z30CAwEAAaNbMFkwHQYDVR0OBBYEFEqoUQBrShfNETUyANZdXnT+tbeWMDgGA1Ud
-EQQxMC+CCmlkcC5oaXMuc2WGIWh0dHBzOi8vaWRwLmhpcy5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAgEAfC488j5EY/CIOT/Ct03iPKic0vySXcWQ
-4g9obiUKn+qDLvLwIxqi7gcZ7fh5ZXazoqpq9q/ZAf1NDb/qPYEOQiVLpgwqbF/e
-spGUONcRLQ1y0Ebp1bkRTYg2Xq6ioPFKEUiCWse14tQE6OOMOSQzG+6W8ruLZJAK
-7c9WPUfObUtJD+ApjYbQ1Qx62eIayLP2MnxPRANb2X0CbnwtPmPyppetvrhx9F7p
-C2rN9sk/HkTDVu3C2iapLUWBaEkaxUbL0dQFtUO/ybzisMvhPCwXayugFjwhHyjp
-qWZNPrdPBYA0EgX8j8lt+sdEsCCEj0SV7/p8r7ICCs3lP1V09GMdpF0ELPuchtvZ
-7z6E9+2mrMQ3WnOHoyc2PdsJaqpgeiuP6V+3dAZ1e3oC/Ap73zzMkgv3JmaY6cNR
-Vw3cCIzdAGrvf03gxxCYwTS6pNlMqraSa6MRRBFqYT8GKTz3+eZx08DrqcMYTb6t
-r0gFZmO2q6KwqC7XYqi7nznbhg/EqJY+8WjbGx0M0qBPOAy68NbM6EE9J6BmyySC
-n3PflyA1fNnxPsvo/0HcC+J8rO29QAvfOugZM69zHXAGM8X1XFAOAnX/f9Iv7BQs
-DpIK4YRNEspb2FURNjXQAF9FNL6V5vlyn+v0Xzqg/ZbOg5gpN+inDJOpzw2qBfyk
-zd/8UxmFiKo=
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-            </ds:KeyInfo>
-
-        </KeyDescriptor>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-MIIFEzCCAvugAwIBAgIUEFwJoMHCpORaZBP7wDLi8em/px4wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmhpcy5zZTAeFw0yMTExMTExMzM3MjZaFw00MTEx
-MTExMzM3MjZaMBUxEzARBgNVBAMMCmlkcC5oaXMuc2UwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCVW6+7BNJBQGoUo1rtNzYzin1NgVWwDpNk/2Y8Czd/
-WNpCRKlS78cBGmXSlnn695k6Zhqpo44nc/yBf1dnHGEwM5e4z81YanCezeXN6Nya
-JRMzxuODUXdblDLdm8hri9mhQPDu1TGOpSjqlk94p3G6gdLXeI6plmSyvqMBuCAo
-tPFOpPqCdXjD1rw4flMmuL4LEP0WhBYVTISPeO2NwIQGu7gLJb1bXagbLdRB8MmE
-yrkzE7VC3CHIBUqcfSMYyHeVSERlwPp59oaeJLEz++hYnF1pf1YSxG445unRqyP4
-6TOR1Ie0VfBRAJNLIX4+Gv4MAHvmmFY4sjrIHPBInZFb3PLlT3hBDN1buP74H9mI
-o/sSciW9CcoHsLhfMuxy+EgUDJR19OkEfzMkG7RRfZTziSEVA53+Ae2+Z0LtQ/NC
-BmusEX1VnzedXMIgBDKkwv+yyM8vf+xwg7XhygLBp2+CMII/sM178V9x2IEcY/kz
-XfkLzcQWcToxNrEgUG6/JcGkTXODWvJmDjDK7kbSeRfcrGdGVRYFiMWm/HLapVw0
-i3Hc56FKT7BB/e1IPgo7Rl5KX1jnzrJfhUxTwAVZbPye2jBEPJGy3O3EwC3xdpy3
-Hulg5FjFakZCipN3aF+i2ilHTxISVct9RnUbA6dYaAy0Zm9axSJA7QfEyqJuxuFz
-bQIDAQABo1swWTAdBgNVHQ4EFgQUrY8UnWcOBb7aFQqHwYSTl0/PQycwOAYDVR0R
-BDEwL4IKaWRwLmhpcy5zZYYhaHR0cHM6Ly9pZHAuaGlzLnNlL2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4ICAQCFUgQ/keEczGrc3n6OZ3M6jermCb9ecTS7
-Pi56ZAefEwmm8dnGia4bbO8oXwHgeS4ruszN9y1Y/ZV4er30xOpvpW3elWWP1u2h
-7pJUnJQ9+00Qlbcht9xCd+IOkaut37CjV5krs6lK0Hl3R+d7yxkjJ4pBs0wrfuIw
-Sq8fRvKu065+tT7EldMIbDrieaOtK43ct+s8Yj3l/djoFk4ivo6/7KZvWHngHS6+
-uxeZuuFQKqikMdMSIHPeYuzKu0kHx8SO/VZCC8bBhlLG48NF+ImZTThPmyoZB2pi
-5KwJBhh7XVinetQDT/AOJulxIXZMyfQN0h9O/wF7lYryo18zDhQt8jv5a9MlGiwe
-PlwcKxgKPFXavkaGfpV8+3wBfgtYFapntw5xShUiVavDj5LgPvFUe9LaH87jZoXL
-H3TgJjQms+MQlNyEIzCW5g/MzycZNjQKktuI3YO3umZs+2vGtyEgUiNR4u0f68n4
-YdUB2sinuovdDYxDsW40GBnYfE4V6o1Km6wxnGxxU+24I5D8hRhjIa2FyRkb9MP/
-nFpgPMnhwDRTVqGkUurWFrzE+Ipntp4wrW6FGsdmkM8YYsQOJfL6Q2pLFWE+PreB
-6qR2T89xJHCKDO/Oscfb0F2nd5ccTamiObmBWDfmXz1bNs2lTyQ698ErdOb3igR2
-LhX8iNAQPA==
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-            </ds:KeyInfo>
-
-        </KeyDescriptor>
-        <KeyDescriptor use="encryption">
-            <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-MIIFFDCCAvygAwIBAgIVAIFPHUELPJcBCsdWHjuKSOWZ7+wJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5oaXMuc2UwHhcNMjExMTExMTMzNzI4WhcNNDEx
-MTExMTMzNzI4WjAVMRMwEQYDVQQDDAppZHAuaGlzLnNlMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAk8IyCtuc/v1M/5dpwMJxIvCbsp5LSGV1Yms4DjPv
-1VbC7auGQkxvR+XOFqvrref+8IJQH9x7nqKkUurN57BpZ1zbD6KwUB+0+t0iEK97
-cft540Hsn2jtLgmQcOu3ecb9xUErVBuCKGOi66078TQweZxU1TuDwYGhROhsLuh8
-UT+TE59F5g4vNpDVLyWUZxWGtuf08lI32lWekReTg0upsehR27eMIHMJKFgc2zWs
-GkYBJU/WnhN+Zeh/g27zKe07NujZma5zuqpUZNIeYwz5bFuJN5ZCR3yLRzPsNRNI
-fr00CjLFYgO3uIcFs9+Kpr89nEyLfdqrW3ReLQirXreZBKeb7IHA3eL/inSxrTjs
-ehOFOPCQotsYGFkocu5ivEF0vuDLrHlFfQ9xzIAvBidnQyTX6o1Y2faSBS+WJ5Au
-G000QRFFv+kRoWJ55s0KgohpFC1R07/fTovpDZyW9FX91MjDtLUW80D3qYDYnPJd
-kbSE009umdfqRCXzb0R65ucaYSIP6reffr3zNxU84wTB9xFLcRAPBleSixmug0nv
-LwY+Ze1nP1x6zRjsPmlxNyIg4228gZ0lvvjJAthxREt+rM8auisRXh4GsEvfmWcD
-xFXOD9v5fcVsQVjeCk0CIY7R/vvmpOkuGn7+gcy1416lu4YKwJXxC3MvBQpRSikl
-4oECAwEAAaNbMFkwHQYDVR0OBBYEFDo0xAj0o0BBHsQeuz+I7FBfd7iYMDgGA1Ud
-EQQxMC+CCmlkcC5oaXMuc2WGIWh0dHBzOi8vaWRwLmhpcy5zZS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAgEAd0KB2J1O6LtU9gPGBBduo8E/7EkvSUG/
-bcltY9/TwMCAHi7Cd4NEMIw2O2pvIGQBTaFIn+EatTh3lBPSP2xykYZzujvtBo4P
-IkEgSdgOQcVWy0L49SxlI6h99FEi8rMAv7JLOs1gnEej27inCx6k5IladbSWXkc+
-vjK+xv4UApqBWZ4BfjZh0CSOHPJnZahT9Go2zOk6e2kUXryyp+chY8bE02fR/Rcq
-z5cb18rXZOSaZREEyx6TKIK0pur7pTvUXJvyoNOsLowz4RPf5WjnCtrwfMIbiFPP
-Pu5zV4ZeXcNowkgYeLAS2zT71hSEy7iapGsTNzRiInoRrgYagjnavLpVr9imXyjM
-FNEx1HWD+rvgcU8hEdbzcaEpgccboR5MDPEp152XZqTusrfxakXTXgBSRmmvgT9v
-QuVGYYJdQOfS+8LKXDx4UwRWz+4o79MHUKhPMe7VI+KhqUrPTC++PWgzHGWp4vOn
-8uWjEtlAUuFwDL4X//Yt0Ni9ZnFs+dgVyk9FjVwL9pF8Tuzs2jAoyIqy2HYcKRR4
-J+z7HtTLsXY3si2pKZSsIqTI5Gx1NlrTyG68xfefhawYSmE5VRKzre2tnYN8TKzY
-ubscnnES8lXMq+LVSEFTvTjEF/+8J4FWzssPpYyjdO/w63/SHAXE+zsPmK01l2+w
-zGqLyGPg/8g=
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-            </ds:KeyInfo>
-
-        </KeyDescriptor>
-
-        -->
-  <!--<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>-->
-  <!--
-        -->
-  <!--<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">HIS</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Skövde</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.his.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Skövde</Company>
+    <SurName>HiS Netadmin</SurName>
+    <EmailAddress>mailto:netadmin@his.se</EmailAddress>
+    <TelephoneNumber>+46 500 448800</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>University of Skövde</Company>
+    <SurName>HiS Netadmin</SurName>
+    <EmailAddress>mailto:netadmin@his.se</EmailAddress>
+    <TelephoneNumber>+46 500 448800</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Skövde</Company>
+    <SurName>IT Helpdesk Högskolan i Skövde</SurName>
+    <EmailAddress>mailto:helpdesk@his.se</EmailAddress>
+    <TelephoneNumber>+46 500 448800</TelephoneNumber>
+  </ContactPerson>
 </md:EntityDescriptor>