Resolves SWAMID-3049

2 files changed, 138 insertions, 0 deletions

diff --git a/swamid-2.0/lis.ladok.se-shibboleth.xml b/swamid-2.0/lis.ladok.se-shibboleth.xml
new file mode 100644
index 00000000..ff805bc3
--- /dev/null
+++ b/swamid-2.0/lis.ladok.se-shibboleth.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://lis.ladok.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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"/>
+    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://lis.ladok.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://lis.ladok.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Administrationsverktyg Ladok-Lis integration</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Administrative tool for Ladok-Lis integration</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Logverktyg för hanterade händelser</mdui:Description>
+        <mdui:Description xml:lang="en">Log viewer for handled events</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>signing.lis.ladok.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=signing.lis.ladok.sunet.se,OU=ITS,O=Umea University,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE3zCCA8egAwIBAgIJAPhWjc2h+5AIMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMRgw
+FgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lUUzEjMCEGA1UEAxMa
+c2lnbmluZy5saXMubGFkb2suc3VuZXQuc2UxIzAhBgkqhkiG9w0BCQEWFHRvbW15
+LmxhcnNzb25AdW11LnNlMB4XDTE4MDgxNzA2MDIxN1oXDTIxMDYzMDA2MDIxN1ow
+gaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcT
+BFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMSMw
+IQYDVQQDExpzaWduaW5nLmxpcy5sYWRvay5zdW5ldC5zZTEjMCEGCSqGSIb3DQEJ
+ARYUdG9tbXkubGFyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDuHA2qy8BWs8DjtiIwYQ8DwnAe5fUOAgyLvU2mH31Qh0Gt6EoWtJKC
+2qG9r2os4GpQJyhDGbGrphjExgakq/Wi0XfksieCSYL8+JKjiIVaAa6+vTM+baxe
+NCVjqQzQBx35yeuFi9M/CDOPqO8pVw0ump+PyHiaO5cBR6tRGYYeiNn2e25upW4P
+PWCuOchpzAyL6eeqcZTHx+1VRDH8T/a7Tw4IlfH3aMn71d2RN5PgGytQN5Cp3NcA
+SG6myNRq7gl74Xv0i6G/jPSMYCcRZ1B4mm0q9uLNHa5b8IwwhjvYNLHMhON0r59I
+DdNaeT+V64D0GiDWMI6gw77H3pBUXbdVAgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
+rx3w3PCs+RMz9XjC7YCraE5/tmcwgdoGA1UdIwSB0jCBz4AUrx3w3PCs+RMz9XjC
+7YCraE5/tmehgaukgagwgaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJi
+b3R0ZW4xDTALBgNVBAcTBFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEM
+MAoGA1UECxMDSVRTMSMwIQYDVQQDExpzaWduaW5nLmxpcy5sYWRvay5zdW5ldC5z
+ZTEjMCEGCSqGSIb3DQEJARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQD4Vo3NofuQ
+CDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA/6Swk1L6IDnMJidEi
+KfRyEmpbaFI3PbAFIfwqx87LAttB/Zc8GYo2RmnlTcbu/Tiu0xh7FEMUwHakjuj8
+OzTOfibIS20Ht4tmvQJ15yoTD010i239A7+LCTTzfH0VZJom3/P6wyauHXKoQnHf
+2mE1L3iyZWVDF01Mx+fng3I1mqwLpOlbvZzq4B+2VciNhYRFIxIiczTcb2AHPWrq
+/Yd4ucMTfeN+vGnC4+lavM5FTSiF+yzNQTjU4jJ0v+D5VnPIF2coDEdkiHebKEeF
+rzFSMNotRzVyn94d1SLTwnc5q9KXsonV02WPtRFHhjrgRsnHed0+TriFY5YZhAey
+Nlzw
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>encrypt.lis.ladok.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=encrypt.lis.ladok.sunet.se,OU=ITS,O=Umea University,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE3zCCA8egAwIBAgIJAKj7bUIT1VLPMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMRgw
+FgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lUUzEjMCEGA1UEAxMa
+ZW5jcnlwdC5saXMubGFkb2suc3VuZXQuc2UxIzAhBgkqhkiG9w0BCQEWFHRvbW15
+LmxhcnNzb25AdW11LnNlMB4XDTE4MDgxNzA2MDExMFoXDTIxMDYzMDA2MDExMFow
+gaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcT
+BFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMSMw
+IQYDVQQDExplbmNyeXB0Lmxpcy5sYWRvay5zdW5ldC5zZTEjMCEGCSqGSIb3DQEJ
+ARYUdG9tbXkubGFyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC1ohE9UGaS2US7z1aHuQhY9lyye7Csl+Kb9NDi9LYa8ZFXQIijb4W8
+GRKqOlRofXyhaWGoDk0O88X0j/9+NrnS1w/3fS6lUhIZrVn3gOmNC6Uta5ClT1XY
+AQ7rVq7GO5k30/DjlQQ4LEgiSQPRDEiwkf/2TyYSrxwaYHSBEjcgZwTMNTXVb1cq
+TmVvdE6DOerozXosxFXo9G1vUF9pIeXYi6kWDv6H7jkDSpQi+nPDoRQN7dPIaTf8
+rPF1BepkYlQkZDZrGjuTFoGM8lGq6b04Gc2M7+Q4u3MRTjsC4xhAk181ujvfUDbg
+/lFEBgzFy+KtTrBh5PIAoKzfeLSsgpkZAgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
+XXh1Fs25t8gxtnE28rqqBB+GVY0wgdoGA1UdIwSB0jCBz4AUXXh1Fs25t8gxtnE2
+8rqqBB+GVY2hgaukgagwgaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJi
+b3R0ZW4xDTALBgNVBAcTBFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEM
+MAoGA1UECxMDSVRTMSMwIQYDVQQDExplbmNyeXB0Lmxpcy5sYWRvay5zdW5ldC5z
+ZTEjMCEGCSqGSIb3DQEJARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQCo+21CE9VS
+zzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAGivkj3tBfQO9C2Uvt
+OOtoJkCOGE8vBE9bfKgPxfgBv42w3OSOo8YzYCOf7HiAV4yse7mQfbfGjRqtbGhn
+rWFITCFUMCRzr9G4Vmgf7ckKOxxxdYnawZkQBdMRQ5SwbSpTOHXWJGPGBgIkCh9s
+plJbJk1w0sxrriuGHiRbIeEOJSQXjG0bKJLjEHkZnDIBPMBEbCvfYj3VFwYeQW2S
+DAELXN1yRdl0IHUQOse58XuCksLiW2Ih7GVhEqCDTo/bxTlxV7vCIEmZBkvncHzh
++w2MDjfBGwGosbfO7UcjkA4OVlb3sBdXRXC1DolS3H+CplXR1HiP4kcbcisDw7P7
+i23B
+</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://lis.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lis.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lis.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lis.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lis.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lis.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olov</md:GivenName>
+    <md:SurName>Höglund</md:SurName>
+    <md:EmailAddress>mailto:olov.hoglund@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index c01e37ad..783166d1 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -627,4 +627,5 @@
   <xi:include href="swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/id.easyvote.se-saml2-lucat.xml"/>
   <xi:include href="swamid-2.0/jitsi.fhv.lu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/lis.ladok.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>