Resolves SWAMIDOPS-590 Byte SMHI IdP metadata

1 files changed, 85 insertions, 77 deletions

diff --git a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
index 2f117e11..8833e915 100644
--- a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
@@ -20,42 +20,49 @@
         <mdui:Keywords xml:lang="en">SMHI</mdui:Keywords>
         <mdui:Keywords xml:lang="sv">SMHI</mdui:Keywords>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>smhi.se</mdui:DomainHint>
+        <mdui:IPHint>91.192.28.0/22</mdui:IPHint>
+        <mdui:IPHint>2001:67c:274::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.5811180,16.1450240</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-	    MIIFwTCCA6mgAwIBAgIJAI1HHzkfl9YAMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
-	    BAYTAlNFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxDTALBgNVBAoMBFNNSEkxDTAL
-	    BgNVBAsMBFNNSEkxFzAVBgNVBAMMDnNoaWJicy5zbWhpLnNlMRowGAYJKoZIhvcN
-	    AQkBFgtpZGFAc21oaS5zZTAeFw0xNTA5MjUxNTE3MzdaFw0xODA5MjQxNTE3Mzda
-	    MHcxCzAJBgNVBAYTAlNFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxDTALBgNVBAoM
-	    BFNNSEkxDTALBgNVBAsMBFNNSEkxFzAVBgNVBAMMDnNoaWJicy5zbWhpLnNlMRow
-	    GAYJKoZIhvcNAQkBFgtpZGFAc21oaS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-	    ADCCAgoCggIBALolw4x2DyihwpWW6fDMCi9FjPXhJTDslygyg3UE42UrieE3FIUB
-	    qRRUTNggcw4pfmVZln5pE72vmiiBZQa9aov8stbxQupLaNzqtF8lxKsUtrZGZCJo
-	    lbxmwvbeDZj5txZe7dPMcJYFcsj6HBJvCumf/nbV7UkCwLNwirXvoMJ+M7Jt09AI
-	    5GR6WbLbk1U4pocw7qIEsNMpKgGPf05ucCcQp1agr1Pc6AVevT2qRwDzBTUq4Yw2
-	    AtOYEcE5I4+qDdnxd9yIx1fTh2/bparX/EDdM6nNtmw3sD1M6SCaT/Njgzq3sYzS
-	    VRWvwS+O459imG/WfWKmNxptInWtlZ9C3zinOG0RnhYMbmtEKAdki42VTywJ9l4/
-	    IN23eGtNZ8ZyvPF0z7uAlpyxqYMUhHcor8DjbdydW/o8gYF/aVqvo/G/JlNFaFgx
-	    PQPs3dO9IiK1U89bii3u+VHpxPK58pSlXU7RB97txcbSLsu/KNLSJm7/fgdewwOR
-	    MqsEGGW/3BLFN4jRP+O9F4nzPiir1ZMujQ0mna678UOkFb5HGoQxbAu6f0u8ZLvF
-	    5n536Sk14bA/H6Q8ZqUOWqv5/OcrAQgMu96EsMYxFUOegfpQWDeTfkEGblfKU2Hw
-	    SQVPAcdhl5v5rrFzmrOF3CevncgIqTlQKTlnUXOs5UVTQMhZEjpGi9wpAgMBAAGj
-	    UDBOMB0GA1UdDgQWBBQZxCEjV78PPSS34KKsT8kr6JImWTAfBgNVHSMEGDAWgBQZ
-	    xCEjV78PPSS34KKsT8kr6JImWTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-	    A4ICAQCUJ6Oax78++RdL9TM2sJ2ZP3KsKMLwDUfwTRbgkYvy6cDfdj7CYJzpBHAT
-	    GAjI89Xkn+zr9J8cxFPxG4x9c4M5g3YWeXTFHxptkf25QTt7KXVWSIY4a75fIIMB
-	    SfKoXmdA+L7lR9AwdEyeZXGKmykSu6uU/Hk+QTf6JgNOvk7+T97JxtKUT8mXCGZI
-	    IsygP+n8DSPjo1kw3nMPpm/bgzq1sxIFrxU36ZOuCToUTn9I/qRxOFHpX8i9HEix
-	    NvrB5/V5dxDtflS2Vb+ooF0sNLdWX4mWGZB9xYdFm85Ilm3n6G2lFSrh7+rr7Ifb
-	    pFN9F0z+0rD7zTcSnw06NNAH4rqpCGtZ0d1gQ9rcxVCS5/Pt7i2oERNuWxO92XNU
-	    VI3H5p7pG4rXwjehr2O8VImukpgdBnUGL5t2Rl07o3tXCxfuJLad1PHXAtVe6Wva
-	    SZiEcgOP7wmLYix0UG6+8cSjdOExDheGbPo758YygUMLODWQwK6qDb3L0VNYX1Wx
-	    faMIlCMykTYHC0LJrbStdDcH1PRyIO9x5QDY1o9ZFmVnOpsGiPsGtum+KApqdwjC
-	    Yx3IH3fdZRtWsMbwHONe5z6SDqz0B1vUC0UrIao0X6t4g/8Ta0BhEHb6PCulkO7W
-	    FFGn4CG4KX+SKv1I4yDkmiG0myXXyqVvMGo/uPAytrTBH0krrQ==
+		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
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -64,37 +71,38 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-	    MIIFwTCCA6mgAwIBAgIJAOfY870CSGYLMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
-	    BAYTAlNFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxDTALBgNVBAoMBFNNSEkxDTAL
-	    BgNVBAsMBFNNSEkxFzAVBgNVBAMMDnNoaWJicy5zbWhpLnNlMRowGAYJKoZIhvcN
-	    AQkBFgtpZGFAc21oaS5zZTAeFw0xNTA5MjUxNTE5NThaFw0xODA5MjQxNTE5NTha
-	    MHcxCzAJBgNVBAYTAlNFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxDTALBgNVBAoM
-	    BFNNSEkxDTALBgNVBAsMBFNNSEkxFzAVBgNVBAMMDnNoaWJicy5zbWhpLnNlMRow
-	    GAYJKoZIhvcNAQkBFgtpZGFAc21oaS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-	    ADCCAgoCggIBAKMAen4Oe2syOyQtLcpZL11RFCUisj05HQUjATa1G+7U52BJcAsX
-	    EPHo/FLmtEgqAAvLNcM576GnwYuepEdQ8gVuEDTVp9Y8gex26B+OEf/SNAowtW2f
-	    xqcRv9aEYypnHSfrTyFMhjRWDFjp7QhWbihuhaYEFfq29TiDyXP1el774ZW6a4ou
-	    5NKI92kD1ZLStm0Ev42IyAaw3lvc27Dowag0qZN1W7GFZesYavsH/g3mIczp1BqT
-	    DIkUbTK5Xg4lDtWCfFcyzsGjymfxALmCYS3hSX9ScVXuB2gfygl0lZGLHLYjepWK
-	    +jjLgfcX4PU/ruNofGBWtBWR2YFsAGTd3kWhsBybAVnyNxLZT27pPyz+GKcGV6Wx
-	    qp57G5ZjbLn+E2HciY0fYHOZHGCAIDtUesE9GYUPQuWPBZbHb0vX6cfYg7eJy1Ji
-	    +r/fr5SdQfHICSTvN03NQOWIkR/vIX0qfTto8ZRWSmbVj2oIX8tVWmUDrChyVru1
-	    uVTk6Wch8PUl32sN2z2Bmd1JDUPuvMXD5ZHBVYKB0nja4utonUEZfU/btgdjxs8O
-	    9ZjP0xoFBN4PE2MdumfVTOQFAMj/RoDyayK97dnySwZ1lUaPUUITbQtV6H659jh5
-	    p1eFa8/oJbwPsToqoMK83vP+e98JOFxsaU4YWUM7JpQuFRATucTP05n9AgMBAAGj
-	    UDBOMB0GA1UdDgQWBBR0iHJKEv29NAW0RuYQnO9OryKBdzAfBgNVHSMEGDAWgBR0
-	    iHJKEv29NAW0RuYQnO9OryKBdzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-	    A4ICAQBjR/aW5xvLmm+nTHGF+ZU/rp2oi785kkjKbZhBp9tjPWqFXpUwGhAUvOp7
-	    sPp0QMVISsREg4frGzhgMP49vUKVcivZjgE1vyMcsW5+qScvS8RkJsiE1p5rd0ls
-	    p9eWLm6qvJeF0JJ2JCLcpcpR+9jnfPr9era7qmNK89WUlbKQyBYKET8RJwjeFAEi
-	    KM8S74b6M7QA4UC454OSYjQu5Q27V496YIohi+CAX/4Z0ARKr/mHj09pQTag5Cp/
-	    5vpne+2Br3FxEww9EpCrLrssakvHvtb4DfIGy57Y2mzXXIx6dAF+TT4KmQw59PcR
-	    lmz4bbNyVb1jrKApkpjsMyVyHx/i2yy68MxFJpSFhqwD3iy8djCkuOvbe7CixhqW
-	    1f5VUPY9eLGk6T9FdGfDc6Twv3V5dzVJjkeoDt8ab5Owbdv9iWU84BTr4zWKsZp0
-	    3DzMDdWkBSP2VFzX19QFl6rRgxJLFaTmtsMrbBMU85qqlZeotkMayOXMWhwElL8k
-	    1aVCc76GodExgkEZBnBVv9/2LBTNrv8LikV+41fSPh8cHzpzUB4xaJdkP5x9Pw1v
-	    WJa0W6B/SykINg3kvr1JoRhUPcUPjhz+40MR6oP71Iuy0PgqZZfrE3pt5ngQxut3
-	    BS+qJoqgoexO0Zz7jfFKjTI213eIFcUaER/1pTTsmdRugXT/9g==
+		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
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -119,37 +127,37 @@
   <ContactPerson contactType="administrative">
     <Company>SMHI</Company>
     <SurName>Sakib Kicic</SurName>
-    <EmailAddress>sakib.kicic@smhi.se</EmailAddress>
-    <TelephoneNumber>+46134958033</TelephoneNumber>
+    <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
+    <TelephoneNumber>+46114958033</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <Company>SMHI</Company>
-    <SurName>Victor Naslund</SurName>
-    <EmailAddress>victor.naslund@smhi.se</EmailAddress>
-    <TelephoneNumber>+46134958246</TelephoneNumber>
+    <SurName>Peter Magnusson</SurName>
+    <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
+    <TelephoneNumber>+46114958547</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>SMHI</Company>
     <SurName>Sakib Kicic</SurName>
-    <EmailAddress>sakib.kicic@smhi.se</EmailAddress>
-    <TelephoneNumber>+46134958033</TelephoneNumber>
+    <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
+    <TelephoneNumber>+46114958033</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>SMHI</Company>
-    <SurName>Victor Naslund</SurName>
-    <EmailAddress>victor.naslund@smhi.se</EmailAddress>
-    <TelephoneNumber>+46134958246</TelephoneNumber>
+    <SurName>Peter Magnusson</SurName>
+    <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
+    <TelephoneNumber>+46114958547</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>SMHI</Company>
     <SurName>Sakib Kicic</SurName>
-    <EmailAddress>sakib.kicic@smhi.se</EmailAddress>
-    <TelephoneNumber>+46134958033</TelephoneNumber>
+    <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
+    <TelephoneNumber>+46114958033</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>SMHI</Company>
-    <SurName>Victor Naslund</SurName>
-    <EmailAddress>victor.naslund@smhi.se</EmailAddress>
-    <TelephoneNumber>+46134958246</TelephoneNumber>
+    <SurName>Peter Magnusson</SurName>
+    <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
+    <TelephoneNumber>+46114958547</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>