From 53adc18af9905aed0c1d5a2f4760fd604c20c8f3 Mon Sep 17 00:00:00 2001 From: Björn Mattsson Date: Fri, 15 Jun 2018 16:02:26 +0200 Subject: Updated idp.dev.eduid + removed 2 old unused idp:s --- Makefile | 2 +- swamid-2.0/idp-fre-1.eduid.se-idp.xml | 75 ------------------------------ swamid-2.0/idp.dev.eduid.se-idp.xml.xml | 14 ++++++ swamid-2.0/pilot.idp.eduid.se-idp.xml | 82 --------------------------------- swamid-testing-idp-1.0.mxml | 3 -- 5 files changed, 15 insertions(+), 161 deletions(-) delete mode 100644 swamid-2.0/idp-fre-1.eduid.se-idp.xml delete mode 100644 swamid-2.0/pilot.idp.eduid.se-idp.xml diff --git a/Makefile b/Makefile index d8655da6..8803b210 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ testEntCat: @echo "Checking for wrong AttributeValue in EntityAttributes/Attribute http://www.swamid.se/assurance-requirement" @for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l "http://www.swamid.se/assurance-requirement"` ; do if cat $$x | sed 's;\(/dev/null | grep "AttributeValue" | egrep -v ">http://www.swamid.se/policy/assurance/al1<|>http://www.swamid.se/policy/assurance/al2<" ; then echo " $$x" | sed 's/.*/&/' ; fi ; done | grep . && exit 1 || true @echo "Checking for wrong AttributeValue in EntityAttributes/Attribute urn:oasis:names:tc:SAML:attribute:assurance-certification" - @for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l "urn:oasis:names:tc:SAML:attribute:assurance-certification"` ; do if cat $$x | sed 's;\(/dev/null | grep "AttributeValue" | egrep -v ">https://refeds.org/sirtfi<|>http://www.swamid.se/policy/assurance/al1<|>http://www.swamid.se/policy/assurance/al2<" ; then echo " $$x" | sed 's/.*/&/' ; fi ; done | grep . && exit 1 || true + @for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l "urn:oasis:names:tc:SAML:attribute:assurance-certification"` ; do if cat $$x | sed 's;\(/dev/null | grep "AttributeValue" | egrep -v ">https://refeds.org/sirtfi<|>http://www.swamid.se/policy/assurance/al1<|>http://www.swamid.se/policy/assurance/al2<|>http://www.swamid.se/policy/authentication/swamid-al2-mfa<|>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi<" ; then echo " $$x" | sed 's/.*/&/' ; fi ; done | grep . && exit 1 || true testSimpleSign: @echo "Check for new SP:s with SimpleSign (breaks ADFS IdP:s with Shib SP 2.5+)" diff --git a/swamid-2.0/idp-fre-1.eduid.se-idp.xml b/swamid-2.0/idp-fre-1.eduid.se-idp.xml deleted file mode 100644 index c0d390a5..00000000 --- a/swamid-2.0/idp-fre-1.eduid.se-idp.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - eduid.se - - - - - MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp -ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0 -WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr -Ov5RyA+j4c5qtxgX30eT1mSS+xxd1UYy78jIR42QnvmwZRAw3XGzCT4u+41u+4KP -ZuzsNmueFruQ/FUj5YvYJdo9LKDXnhqj7GrOYwVKRx3TtV+76IXbY+OQF5mNXNdn -qFepNt6ukBGqdWjEi6fslbjVwCkRwN9gFm/f0xshITr79MEsmEbm97n8+TxNWx9o -Vx2cIGHVKur+iBR0ntY71jXCGb/0drVlogMluXUssMV9fZSP0W1HnlI2vNQrVA6p -0hzRsi+kGGAXn0/u1rhfJ7G6/Tz43OqhVqH5BeKs+0v/AgMBAAEwDQYJKoZIhvcN -AQEFBQADggEBANfLG7xG2d2bc8ib/XCMly48KEPYqNXIeDIHPR8MpEZrdCph4TUz -Y96pEbhM3Onn7iZTAqk7QUfVzj3qH35H8FG6XJuUlpeo11c94dsS6+euamdf+9qZ -ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx -N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/ -6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu -97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw= - - - - - - - - MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp -ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0 -WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr -Ov5RyA+j4c5qtxgX30eT1mSS+xxd1UYy78jIR42QnvmwZRAw3XGzCT4u+41u+4KP -ZuzsNmueFruQ/FUj5YvYJdo9LKDXnhqj7GrOYwVKRx3TtV+76IXbY+OQF5mNXNdn -qFepNt6ukBGqdWjEi6fslbjVwCkRwN9gFm/f0xshITr79MEsmEbm97n8+TxNWx9o -Vx2cIGHVKur+iBR0ntY71jXCGb/0drVlogMluXUssMV9fZSP0W1HnlI2vNQrVA6p -0hzRsi+kGGAXn0/u1rhfJ7G6/Tz43OqhVqH5BeKs+0v/AgMBAAEwDQYJKoZIhvcN -AQEFBQADggEBANfLG7xG2d2bc8ib/XCMly48KEPYqNXIeDIHPR8MpEZrdCph4TUz -Y96pEbhM3Onn7iZTAqk7QUfVzj3qH35H8FG6XJuUlpeo11c94dsS6+euamdf+9qZ -ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx -N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/ -6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu -97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw= - - - - - - - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - - - - - - eduID TEST - eduID TEST - http://www.eduid.se/ - - - eduID - developers - eduid-dev@SEGATE.SUNET.SE - - - Support - support@eduid.se - - diff --git a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml index 063a87a3..15ff70e3 100644 --- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml +++ b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml @@ -1,5 +1,19 @@ + + + + http://www.swamid.se/policy/assurance/al1 + http://www.swamid.se/policy/assurance/al2 + http://www.swamid.se/policy/authentication/swamid-al2-mfa + http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi + + + http://refeds.org/category/research-and-scholarship + http://www.geant.net/uri/dataprotection-code-of-conduct/v1 + + + eduid.se diff --git a/swamid-2.0/pilot.idp.eduid.se-idp.xml b/swamid-2.0/pilot.idp.eduid.se-idp.xml deleted file mode 100644 index ff1e5deb..00000000 --- a/swamid-2.0/pilot.idp.eduid.se-idp.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - pilot.eduid.se - - - - - MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy -MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0 -MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG -SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR -GPXGZg978+sJsesZamPR7wnxqYnXng+lCrKO3xEtrLE1JxzrEGY4xUMtnVOJmwgZ -G8+TVmppZsmIu/sQd0+uF+fFAc9BgYx+xL/KEpJLDM/BaoQnt5AIz1L8iG3L6hur -D8/79EN4Bp8tNG1WcX5Y8TjNk+4V9kd/GGZKaABH79aq2gD5W3F/j/A66b/qByq2 -LrbCZi1C9ED8X3oFeKXAQd/r82koj8ErKAaPfQXa6oxBn+hFwJ53bC4ixW84gOlI -oAZovK7uAE9xBoJOoW86rGRfFhJy7Jl41JqsjbOXGwKG0Ze4i00yJskiNWDiZh5n -ZgxnTY9vu1JMEIoVEhdaoeuXThUidFcHUKoGgfq8iQHIh9ehqhFpAgMBAAGjQDA+ -MAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUOJHQvHUg -3gPXPmJFWbX+GzVCxWEwDQYJKoZIhvcNAQELBQADggExAIqLh7pcjkYAr3n3msYf -PRasAPR+5OIdi7DSDNpPaPQnlSTGz0XwesxUvwhTuir7SDuqOzhoTW07jM8p8GQI -1cxdaHxnaxF+O5iNkU5Pgx0XhyktXfGeB4uhB33bULN0SfpgaEyyXbOGTRz06Th4 -3AW90cP+5odC/z+yHhcOHq4VcdOg3jZZtTBghQ08u3i7cJLIG5Auc0PZb37hgLRy -lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg -1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y -p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif -7js= - - - - - - - - MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy -MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0 -MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG -SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR -GPXGZg978+sJsesZamPR7wnxqYnXng+lCrKO3xEtrLE1JxzrEGY4xUMtnVOJmwgZ -G8+TVmppZsmIu/sQd0+uF+fFAc9BgYx+xL/KEpJLDM/BaoQnt5AIz1L8iG3L6hur -D8/79EN4Bp8tNG1WcX5Y8TjNk+4V9kd/GGZKaABH79aq2gD5W3F/j/A66b/qByq2 -LrbCZi1C9ED8X3oFeKXAQd/r82koj8ErKAaPfQXa6oxBn+hFwJ53bC4ixW84gOlI -oAZovK7uAE9xBoJOoW86rGRfFhJy7Jl41JqsjbOXGwKG0Ze4i00yJskiNWDiZh5n -ZgxnTY9vu1JMEIoVEhdaoeuXThUidFcHUKoGgfq8iQHIh9ehqhFpAgMBAAGjQDA+ -MAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUOJHQvHUg -3gPXPmJFWbX+GzVCxWEwDQYJKoZIhvcNAQELBQADggExAIqLh7pcjkYAr3n3msYf -PRasAPR+5OIdi7DSDNpPaPQnlSTGz0XwesxUvwhTuir7SDuqOzhoTW07jM8p8GQI -1cxdaHxnaxF+O5iNkU5Pgx0XhyktXfGeB4uhB33bULN0SfpgaEyyXbOGTRz06Th4 -3AW90cP+5odC/z+yHhcOHq4VcdOg3jZZtTBghQ08u3i7cJLIG5Auc0PZb37hgLRy -lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg -1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y -p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif -7js= - - - - - - - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - - - - - eduID PILOT - eduID PILOT - http://www.eduid.se/ - - - eduID - developers - eduid-dev@SEGATE.SUNET.SE - - - Support - support@eduid.se - - diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml index 7c9c14a1..cf85033f 100644 --- a/swamid-testing-idp-1.0.mxml +++ b/swamid-testing-idp-1.0.mxml @@ -18,15 +18,12 @@ - - - -- cgit v1.2.3