diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | swamid-2.0/login.idp.eduid.se-idp.xml (renamed from swamid-2.0/login.idp.eduid.se-idp.xml.xml) | 0 | ||||
-rw-r--r-- | swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml | 1 | ||||
-rw-r--r-- | swamid-2.0/www.antagning.se-aws-sp.xml | 1 | ||||
-rw-r--r-- | swamid-2.0/www.testa.antagning.se-aws-sp.xml | 1 | ||||
-rw-r--r-- | swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml | 1 | ||||
-rw-r--r-- | swamid-2.0/www.testb.antagning.se-aws-sp.xml | 1 | ||||
-rw-r--r-- | swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml | 1 | ||||
-rw-r--r-- | swamid-2.0/www.universityadmissions.se-aws-sp-en.xml | 1 | ||||
-rw-r--r-- | swamid-edugain-idp-1.0.mxml | 2 |
10 files changed, 10 insertions, 1 deletions
@@ -156,6 +156,8 @@ committest: test @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed -n 's;.*<[a-z0-9:]*GeolocationHint>\(.*\)</[a-z0-9:]*GeolocationHint>;\1;p' | grep -q -vE '^$$|^geo:[0-9][0-9][0-9.]*,[0-9][0-9][0-9.]*$$' ; then echo " $$x" ; fi ; done | grep . && exit 1 || true @echo "Check for new SP:s with SimpleSign (breaks ADFS IdP:s with Shib SP 2.5+)" @for x in `find $(SRCDIRS) -name \*.xml`; do if ! grep -qx `basename $$x` sp-with-simplesign && grep -q HTTP-POST-SimpleSign $$x ; then echo " $$x" ; fi ; done | grep . && exit 1 || true + @echo "Check for IdP:s with AL2 without AL1" + @for x in `find $(SRCDIRS) -name \*.xml`; do if grep -q http://www.swamid.se/policy/assurance/al2 $$x && ! grep -q http://www.swamid.se/policy/assurance/al1 $$x ; then echo " $$x" ; fi ; done | grep . && exit 1 || true commit: tidy committest @git diff --color || true diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml index e840385b..e840385b 100644 --- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml +++ b/swamid-2.0/login.idp.eduid.se-idp.xml diff --git a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml index 16cbb132..061a3c66 100644 --- a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml +++ b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml @@ -8,6 +8,7 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> + <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.antagning.se-aws-sp.xml b/swamid-2.0/www.antagning.se-aws-sp.xml index de2d5cdc..4ada4852 100644 --- a/swamid-2.0/www.antagning.se-aws-sp.xml +++ b/swamid-2.0/www.antagning.se-aws-sp.xml @@ -8,6 +8,7 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> + <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.testa.antagning.se-aws-sp.xml b/swamid-2.0/www.testa.antagning.se-aws-sp.xml index af657417..ab08ad17 100644 --- a/swamid-2.0/www.testa.antagning.se-aws-sp.xml +++ b/swamid-2.0/www.testa.antagning.se-aws-sp.xml @@ -8,6 +8,7 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> + <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml index 8f5e9d61..4530c985 100644 --- a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml +++ b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml @@ -8,6 +8,7 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> + <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.testb.antagning.se-aws-sp.xml b/swamid-2.0/www.testb.antagning.se-aws-sp.xml index a96310f9..d648cb35 100644 --- a/swamid-2.0/www.testb.antagning.se-aws-sp.xml +++ b/swamid-2.0/www.testb.antagning.se-aws-sp.xml @@ -8,6 +8,7 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> + <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml index 8f15a786..7c1acd4f 100644 --- a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml +++ b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml @@ -8,6 +8,7 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> + <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml index fbb590fc..2ca8d503 100644 --- a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml +++ b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml @@ -8,6 +8,7 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> + <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index dd45fb19..dfc93cfb 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -42,7 +42,7 @@ <xi:include href="swamid-2.0/weblogin.uu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml.xml"/> + <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/> <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/> |