summaryrefslogtreecommitdiff
path: root/swamid-2.0
diff options
context:
space:
mode:
authorPaul Scott <paul.scott@kau.se>2015-11-04 07:13:57 +0100
committerPaul Scott <paul.scott@kau.se>2015-11-04 07:13:57 +0100
commit8c6b1674293cf8261ef2fb435aaf179e24c5d528 (patch)
tree6db38af13a41e0d6190c96f38969c5b98db7e063 /swamid-2.0
parent70cea30cee0275af3ae70eed81232975351f1802 (diff)
Resolves SWAMIDOPS-7871 and SWAMIDOPS-7872
Diffstat (limited to 'swamid-2.0')
-rw-r--r--swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml81
-rw-r--r--swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml71
2 files changed, 40 insertions, 112 deletions
diff --git a/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
index 596c395a..77514bc3 100644
--- a/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
+++ b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
@@ -5,7 +5,6 @@
<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>
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -23,26 +22,26 @@
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
- MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
- BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
- ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
- DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
- BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
- MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
- kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
- XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
- Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
- fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
- kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
- A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
- t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
- uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
- Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
- sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
- yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
- Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
- 58AtMMXk7/2okGexE3sN
+ MIIDmzCCAoOgAwIBAgIJALMD2UXE6X0+MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMjIyOFoXDTI2MDgyMTExMjIyOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA6
+ SRQk0fw4o2f5u0vy3YAu1Zmr1bFCOlG1b4wnWXd6J1j1duHDIE7aWgTdT6bMCU7X
+ AAByaVmYOgzps+38kw27j1EE9CpIvQed6RWD5kDUU5rdpYNfKRvA1+sy62h3qMK4
+ e0Yfo1t7WRG1pz7FWz324PR3mAmXDbhrs47zan0m+Ds7VpI+n4SMKNHzqnMrKDe3
+ HVifjPaoea6SwMrPfuVQPxlwJh1XmtYybkqozmo6RB8Mkt/feN+YUXt9G2Rd5xfr
+ N86EdmlYTjlxDf9XzhXt2xyKO5YsNIv6sgPnGTxZC6/rzx8NYUbfXfFh4HUDEtbY
+ TA50ga7htHv63FhyREun
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -51,26 +50,26 @@
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
- MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
- BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
- ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
- DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
- BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
- MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
- kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
- XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
- Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
- fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
- kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
- A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
- t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
- uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
- Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
- sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
- yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
- Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
- 58AtMMXk7/2okGexE3sN
+ MIIDmzCCAoOgAwIBAgIJALMD2UXE6X0+MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMjIyOFoXDTI2MDgyMTExMjIyOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA6
+ SRQk0fw4o2f5u0vy3YAu1Zmr1bFCOlG1b4wnWXd6J1j1duHDIE7aWgTdT6bMCU7X
+ AAByaVmYOgzps+38kw27j1EE9CpIvQed6RWD5kDUU5rdpYNfKRvA1+sy62h3qMK4
+ e0Yfo1t7WRG1pz7FWz324PR3mAmXDbhrs47zan0m+Ds7VpI+n4SMKNHzqnMrKDe3
+ HVifjPaoea6SwMrPfuVQPxlwJh1XmtYybkqozmo6RB8Mkt/feN+YUXt9G2Rd5xfr
+ N86EdmlYTjlxDf9XzhXt2xyKO5YsNIv6sgPnGTxZC6/rzx8NYUbfXfFh4HUDEtbY
+ TA50ga7htHv63FhyREun
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml
deleted file mode 100644
index 431387f5..00000000
--- a/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://portal.cloud.ipnett.se/shibboleth">
- <md:Extensions>
- <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/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAPKb4F2SRWHbMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMMFnBvcnRhbC5jbG91ZC5pcG5ldHQuc2UwHhcNMTUwMjEwMjA1OTU0WhcNMjYw
- MTIzMjA1OTU0WjAhMR8wHQYDVQQDDBZwb3J0YWwuY2xvdWQuaXBuZXR0LnNlMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzx+JkLQWyBizwwRD9RULQ2hk
- fKgukxwLM46rEtblLfIn6VFHSIT2Ff7Ssx4SEcp/FyOYb88fnyvTQphNCov7OhOh
- 9MfarL6GVkQvrkVgUXwoehPL4BEkwRFlY+GxP/u7GY4RZJHxQSG3jFllzFP3HCaG
- e1wuC4THzuJd4iaUopS9ZQF6s3dv8N/KhJxSs9AvjXl1Qa6zhGa/XoqNVXSvg5zX
- gGWNga9GUgM+aPiNQgmFNY4mR7hiUtwRghgizz/Y7xp+eCuSMXvgfevcS7+a9joH
- ZEa0RY4op92UuMwQnG3o6LSv3OYEVq5k3cGBbYpbMokMFOv0cQI13Pp9Ji6ZHwID
- AQABo1AwTjAdBgNVHQ4EFgQUbji6yOG+NcYePMoP0Yb6Un1l/WcwHwYDVR0jBBgw
- FoAUbji6yOG+NcYePMoP0Yb6Un1l/WcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
- AQUFAAOCAQEAjJMEkgrmXf2ZX2X6BuWabf3vVRhHn8NAOgWXdhyLUXHVeNTpwm4c
- Sfdm1dK6hNGXyGqhLPU3WP1nv93GdnM/ilb/9hcvzueBgGl6Lw7Jyy2vI2U8xm9H
- NoP4PzncPtyWY8G7Gc7OOIHoglHB4wEJwdyJQ5+P5psp6gO0ITq/qq5o337s0n+F
- CVIxRUNuvFC7IMaky2vJTezPBey4FDUwsEGcoeJpiqXmopfRdfxq0R0Ge0aajTEJ
- LTTy+ozNxeKkACigXyZrvk5+f1zlCFg+hKR7BNk2s0VSYm175E2PKzM2TcOuXEy+
- VAYvoweICMB1H3PYBRrj0QM/iwGY4CCfSQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAPKb4F2SRWHbMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMMFnBvcnRhbC5jbG91ZC5pcG5ldHQuc2UwHhcNMTUwMjEwMjA1OTU0WhcNMjYw
- MTIzMjA1OTU0WjAhMR8wHQYDVQQDDBZwb3J0YWwuY2xvdWQuaXBuZXR0LnNlMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzx+JkLQWyBizwwRD9RULQ2hk
- fKgukxwLM46rEtblLfIn6VFHSIT2Ff7Ssx4SEcp/FyOYb88fnyvTQphNCov7OhOh
- 9MfarL6GVkQvrkVgUXwoehPL4BEkwRFlY+GxP/u7GY4RZJHxQSG3jFllzFP3HCaG
- e1wuC4THzuJd4iaUopS9ZQF6s3dv8N/KhJxSs9AvjXl1Qa6zhGa/XoqNVXSvg5zX
- gGWNga9GUgM+aPiNQgmFNY4mR7hiUtwRghgizz/Y7xp+eCuSMXvgfevcS7+a9joH
- ZEa0RY4op92UuMwQnG3o6LSv3OYEVq5k3cGBbYpbMokMFOv0cQI13Pp9Ji6ZHwID
- AQABo1AwTjAdBgNVHQ4EFgQUbji6yOG+NcYePMoP0Yb6Un1l/WcwHwYDVR0jBBgw
- FoAUbji6yOG+NcYePMoP0Yb6Un1l/WcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
- AQUFAAOCAQEAjJMEkgrmXf2ZX2X6BuWabf3vVRhHn8NAOgWXdhyLUXHVeNTpwm4c
- Sfdm1dK6hNGXyGqhLPU3WP1nv93GdnM/ilb/9hcvzueBgGl6Lw7Jyy2vI2U8xm9H
- NoP4PzncPtyWY8G7Gc7OOIHoglHB4wEJwdyJQ5+P5psp6gO0ITq/qq5o337s0n+F
- CVIxRUNuvFC7IMaky2vJTezPBey4FDUwsEGcoeJpiqXmopfRdfxq0R0Ge0aajTEJ
- LTTy+ozNxeKkACigXyZrvk5+f1zlCFg+hKR7BNk2s0VSYm175E2PKzM2TcOuXEy+
- VAYvoweICMB1H3PYBRrj0QM/iwGY4CCfSQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.cloud.ipnett.se/Shibboleth.sso/Logout"/>
- <md:AssertionConsumerService Location="https://portal.cloud.ipnett.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">IPnett Cloud Services Portal</md:ServiceName>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>