[java-identity-provider] branch master updated: IDP-1167 dos2unix as apporpriate
Rod Widdowson
rdw at steadingsoftware.com
Sun May 21 09:36:49 EDT 2017
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=fc04c7fd8a089fdd627ae7768965ac75624ed3e4
The following commit(s) were added to refs/heads/master by this push:
new fc04c7f IDP-1167 dos2unix as apporpriate
fc04c7f is described below
commit fc04c7fd8a089fdd627ae7768965ac75624ed3e4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun May 21 13:53:22 2017 +0100
IDP-1167 dos2unix as apporpriate
https://issues.shibboleth.net/jira/browse/IDP-1167
Undo the damage caused by inappropriate windows set ups since forever.
1) grep for <cr> in the tree
2) exclude binary files (*.png, *.jks, *.pk*, *.der, *.pem and so forth)
3) run dos2unix on the rest
---
.../shibboleth/idp/filter/impl/complex/epa-uid.xml | 20 +-
.../idp/filter/impl/complex/epa-uidwithjsmith.xml | 22 +-
.../idp/filter/impl/complex/uid-epawithjsmith.xml | 22 +-
.../idp/filter/impl/saml/mdrpi-metadata.xml | 838 +-
.../net/shibboleth/idp/filter/impl/saml/orphan.xml | 78 +-
.../filter/impl/saml/shibboleth.net-metadata.xml | 806 +-
.../idp/attribute/filter/attribute/epa-uid.xml | 34 +-
.../filter/attribute/epa-uidwithjsmith.xml | 36 +-
.../filter/attribute/uid-epawithjsmith.xml | 36 +-
.../idp/attribute/filter/matcher/afp/and.xml | 20 +-
.../attribute/filter/matcher/afp/andSingleton.xml | 16 +-
.../idp/attribute/filter/matcher/afp/any.xml | 6 +-
.../filter/matcher/afp/attributeRegex.xml | 12 +-
.../filter/matcher/afp/attributeRequester.xml | 6 +-
.../filter/matcher/afp/attributeScope.xml | 6 +-
.../filter/matcher/afp/attributeScopeRegex.xml | 12 +-
.../filter/matcher/afp/attributeValueId.xml | 12 +-
.../filter/matcher/afp/attributeValueNoId.xml | 6 +-
.../idp/attribute/filter/matcher/afp/implicit.xml | 2 +-
.../filter/matcher/afp/mappedInMetadata.xml | 32 +-
.../idp/attribute/filter/matcher/afp/not.xml | 14 +-
.../idp/attribute/filter/matcher/afp/or.xml | 16 +-
.../attribute/filter/matcher/afp/orSingleton.xml | 14 +-
.../filter/matcher/afp/requestedInMetadata.xml | 20 +-
.../attribute/filter/matcher/afp/scripted-v8.xml | 26 +-
.../idp/attribute/filter/matcher/afp/scripted.xml | 24 +-
.../idp/attribute/filter/matcher/and.xml | 22 +-
.../idp/attribute/filter/matcher/any.xml | 12 +-
.../attribute/filter/matcher/attributeRegex.xml | 14 +-
.../filter/matcher/attributeRequester.xml | 12 +-
.../attribute/filter/matcher/attributeScope.xml | 14 +-
.../filter/matcher/attributeScopeRegex.xml | 14 +-
.../attribute/filter/matcher/attributeValueId.xml | 14 +-
.../filter/matcher/attributeValueNoId.xml | 14 +-
.../idp/attribute/filter/matcher/customBean.xml | 38 +-
.../idp/attribute/filter/matcher/implicit.xml | 10 +-
.../idp/attribute/filter/matcher/not.xml | 20 +-
.../shibboleth/idp/attribute/filter/matcher/or.xml | 22 +-
.../filter/matcher/requestedInMetadata.xml | 38 +-
.../idp/attribute/filter/matcher/scripted.xml | 30 +-
.../idp/attribute/filter/policyrule/afp/and.xml | 18 +-
.../filter/policyrule/afp/andSingleton.xml | 14 +-
.../idp/attribute/filter/policyrule/afp/any.xml | 8 +-
.../filter/policyrule/afp/attributeIssuer.xml | 10 +-
.../policyrule/afp/attributeRegexRequester.xml | 8 +-
.../filter/policyrule/afp/attributeRequester.xml | 8 +-
.../filter/policyrule/afp/attributeValueId.xml | 10 +-
.../filter/policyrule/afp/attributeValueNoId.xml | 8 +-
.../filter/policyrule/afp/authenticationMethod.xml | 10 +-
.../policyrule/afp/authenticationMethodRegex.xml | 8 +-
.../idp/attribute/filter/policyrule/afp/not.xml | 16 +-
.../filter/policyrule/afp/numberAttrValues.xml | 14 +-
.../idp/attribute/filter/policyrule/afp/or.xml | 18 +-
.../filter/policyrule/afp/orSingleton.xml | 12 +-
.../attribute/filter/policyrule/afp/predicate1.xml | 10 +-
.../attribute/filter/policyrule/afp/predicate2.xml | 10 +-
.../filter/policyrule/afp/predicateRp.xml | 10 +-
.../filter/policyrule/afp/principalName.xml | 10 +-
.../filter/policyrule/afp/principalNameRegex.xml | 8 +-
.../policyrule/afp/registrationAuthorityOne.xml | 18 +-
.../policyrule/afp/registrationAuthorityTwo.xml | 18 +-
.../filter/policyrule/afp/requesterEA2.xml | 14 +-
.../filter/policyrule/afp/requesterEARegex2.xml | 12 +-
.../filter/policyrule/afp/requesterEG2.xml | 10 +-
.../filter/policyrule/afp/requesterNameId2.xml | 12 +-
.../filter/policyrule/afp/scripted-v8.xml | 14 +-
.../attribute/filter/policyrule/afp/scripted.xml | 12 +-
.../attribute/filter/policyrule/andSingleton.xml | 20 +-
.../idp/attribute/filter/policyrule/file.v8.script | 2 +-
.../attribute/filter/policyrule/orSingleton.xml | 16 +-
.../idp/attribute/filter/spring/native/deny1.xml | 122 +-
.../idp/attribute/filter/spring/native/deny2.xml | 136 +-
.../idp/attribute/filter/spring/native/policy2.xml | 122 +-
.../idp/attribute/filter/spring/native/policy3.xml | 70 +-
.../idp/attribute/filter/spring/native/policy4.xml | 130 +-
.../idp/attribute/filter/spring/native/policy5.xml | 144 +-
.../attribute/filter/spring/native/policyAll.xml | 30 +-
.../idp/attribute/filter/spring/policy4.xml | 58 +-
.../resolver/impl/ad/addAfterGetValues.script | 4 +-
.../attribute/resolver/impl/ad/attributes.script | 10 +-
.../attribute/resolver/impl/ad/attributes2.script | 14 +-
.../idp/attribute/resolver/impl/ad/context.script | 14 +-
.../idp/attribute/resolver/impl/ad/custom.script | 2 +-
.../resolver/impl/ad/example1.attribute.xml | 10 +-
.../idp/attribute/resolver/impl/ad/example1.script | 36 +-
.../resolver/impl/ad/example2.attribute.xml | 12 +-
.../idp/attribute/resolver/impl/ad/example2.script | 60 +-
.../resolver/impl/ad/example3.attribute.2.xml | 18 +-
.../resolver/impl/ad/example3.attribute.xml | 12 +-
.../idp/attribute/resolver/impl/ad/example3.script | 14 +-
.../resolver/impl/ad/example4.attribute.2.xml | 16 +-
.../resolver/impl/ad/example4.attribute.3.xml | 10 +-
.../resolver/impl/ad/example4.attribute.xml | 10 +-
.../idp/attribute/resolver/impl/ad/example4.script | 16 +-
.../idp/attribute/resolver/impl/ad/fail1.script | 2 +-
.../idp/attribute/resolver/impl/ad/fail2.script | 4 +-
.../idp/attribute/resolver/impl/ad/fail3.script | 2 +-
.../idp/attribute/resolver/impl/ad/fail4.script | 4 +-
.../idp/attribute/resolver/impl/ad/fail5.script | 4 +-
.../idp/attribute/resolver/impl/ad/fail6.script | 6 +-
.../attribute/resolver/impl/ad/jdk8/context.script | 8 +-
.../resolver/impl/ad/jdk8/example1.script | 40 +-
.../resolver/impl/ad/jdk8/example2.script | 62 +-
.../resolver/impl/ad/jdk8/example3.script | 16 +-
.../resolver/impl/ad/jdk8/example4.script | 18 +-
.../attribute/resolver/impl/ad/jdk8/fail6.script | 2 +-
.../attribute/resolver/impl/ad/jdk8/logging.script | 10 +-
.../resolver/impl/ad/jdk8/nullValue.script | 10 +-
.../attribute/resolver/impl/ad/jdk8/simple2.script | 6 +-
.../resolver/impl/ad/jdk8/simpleWithPredef.script | 12 +-
.../idp/attribute/resolver/impl/ad/logging.script | 14 +-
.../attribute/resolver/impl/ad/nullValue.script | 2 +-
.../resolver/impl/ad/requestContext.script | 10 +-
.../impl/ad/requestContextUnimplemented.script | 178 +-
.../idp/attribute/resolver/impl/ad/simple.script | 2 +-
.../idp/attribute/resolver/impl/ad/simple2.script | 4 +-
.../resolver/impl/ad/simpleWithPredef.script | 16 +-
.../idp/attribute/resolver/impl/ad/subjects.script | 16 +-
.../idp/attribute/resolver/impl/ad/work.script | 10 +-
.../idp/attribute/resolver/impl/dc/DeleteStore.sql | 2 +-
.../attribute/resolver/impl/dc/StoredIdStore.sql | 22 +-
.../resolver/impl/dc/entityAttributes.xml | 20 +-
.../impl/dc/ldap/ldapDataConnectorTest.ldif | 136 +-
.../impl/dc/ldap/ldapDataConnectorTestEmpty.ldif | 72 +-
.../attribute/resolver/impl/dc/rdbms/RdbmsData.sql | 134 +-
.../resolver/impl/dc/rdbms/RdbmsStore.sql | 24 +-
.../idp/attribute/resolver/impl/dc/v8/custom.js | 2 +-
.../resolver/impl/dc/v8/scriptedConnector.js | 96 +-
.../idp/attribute/resolver/filter/resolver.xml | 96 +-
.../idp/attribute/resolver/filter/service.xml | 80 +-
.../attribute/resolver/filter/withAttributes.xml | 52 +-
.../resolver/spring/PropertyPlaceholder.xml | 20 +-
.../idp/attribute/resolver/spring/RdbmsData.sql | 20 +-
.../idp/attribute/resolver/spring/RdbmsStore.sql | 16 +-
.../attribute/resolver/spring/ad/cryptoNoTime.xml | 24 +-
.../resolver/spring/ad/cryptoWithTime.xml | 34 +-
.../resolver/spring/ad/idInParentDependency.xml | 20 +-
.../attribute/resolver/spring/ad/mapped/mapped.xml | 40 +-
.../resolver/spring/ad/mapped/mappedNoDefault.xml | 30 +-
.../resolver/spring/ad/mapped/mappedNoValueMap.xml | 22 +-
.../resolver/spring/ad/mapped/sourceValue.xml | 36 +-
.../spring/ad/mapped/sourceValueAttributes1.xml | 36 +-
.../spring/ad/mapped/sourceValueAttributes2.xml | 36 +-
.../resolver/spring/ad/mapped/valueMap.xml | 36 +-
.../spring/ad/mapped/valueMapNoSourceValue.xml | 24 +-
.../resolver/spring/ad/mapped/valueMapNoValues.xml | 20 +-
.../resolver/spring/ad/noIdInParentDependency.xml | 20 +-
.../resolver/spring/ad/orphanDependency.xml | 14 +-
.../attribute/resolver/spring/ad/prescopedWith.xml | 30 +-
.../resolver/spring/ad/prescopedWithout.xml | 28 +-
.../spring/ad/principalAuthenticationMethod.xml | 26 +-
.../attribute/resolver/spring/ad/principalName.xml | 26 +-
.../attribute/resolver/spring/ad/regexDefault.xml | 30 +-
.../resolver/spring/ad/regexInsensitive.xml | 34 +-
.../idp/attribute/resolver/spring/ad/regexNone.xml | 32 +-
.../resolver/spring/ad/regexSensitive.xml | 32 +-
.../resolver/spring/ad/saml1NameIdAttributes.xml | 32 +-
.../resolver/spring/ad/saml1NameIdDefault.xml | 28 +-
.../resolver/spring/ad/scriptedAttributeInline.xml | 26 +-
.../spring/ad/simpleAttributeBadValues.xml | 26 +-
.../spring/ad/simpleAttributePopulated.xml | 54 +-
.../spring/ad/simpleAttributePopulated2.xml | 38 +-
.../spring/ad/simpleAttributeUnpopulated.xml | 28 +-
.../attribute-resolver-selective-navigate.xml | 98 +-
.../spring/attribute-resolver-selective.xml | 84 +-
.../resolver/spring/attribute-resolver-svn.xml | 122 +-
.../resolver/spring/attribute-resolver2.xml | 24 +-
.../idp/attribute/resolver/spring/customBean.xml | 50 +-
.../idp/attribute/resolver/spring/dc/IdP338.xml | 32 +-
.../idp/attribute/resolver/spring/dc/computed.xml | 32 +-
.../resolver/spring/dc/computedProperty.xml | 32 +-
.../resolver/spring/dc/ldap/ldap-v2.properties | 62 +-
.../resolver/spring/dc/ldap/ldap-v3.properties | 62 +-
.../resolver/spring/dc/rdbms/RdbmsData.sql | 40 +-
.../resolver/spring/dc/rdbms/RdbmsStore.sql | 16 +-
.../resolver/spring/dc/staticAttributes.xml | 42 +-
.../resolver/spring/dc/staticAttributesNative.xml | 58 +-
.../idp/attribute/resolver/spring/enc/idp-571.xml | 98 +-
.../attribute/resolver/spring/enc/predicates.xml | 18 +-
.../attribute/resolver/spring/enc/saml1Base64.xml | 28 +-
.../resolver/spring/enc/saml1Base64Default.xml | 26 +-
.../resolver/spring/enc/saml1Base64NoName.xml | 24 +-
.../attribute/resolver/spring/enc/saml1Scoped.xml | 32 +-
.../resolver/spring/enc/saml1ScopedDefault.xml | 26 +-
.../resolver/spring/enc/saml1ScopedNoName.xml | 24 +-
.../attribute/resolver/spring/enc/saml1String.xml | 28 +-
.../resolver/spring/enc/saml1StringDefault.xml | 26 +-
.../spring/enc/saml1StringNameIdentifier.xml | 26 +-
.../enc/saml1StringNameIdentifierDefault.xml | 20 +-
.../resolver/spring/enc/saml1StringNoName.xml | 24 +-
.../resolver/spring/enc/saml1XmlObject.xml | 28 +-
.../resolver/spring/enc/saml1XmlObjectDefault.xml | 26 +-
.../resolver/spring/enc/saml1XmlObjectNoName.xml | 24 +-
.../attribute/resolver/spring/enc/saml2Base64.xml | 28 +-
.../resolver/spring/enc/saml2Base64Default.xml | 26 +-
.../resolver/spring/enc/saml2Base64NoName.xml | 24 +-
.../attribute/resolver/spring/enc/saml2Scoped.xml | 34 +-
.../resolver/spring/enc/saml2ScopedDefault.xml | 26 +-
.../resolver/spring/enc/saml2ScopedNoName.xml | 24 +-
.../attribute/resolver/spring/enc/saml2String.xml | 26 +-
.../resolver/spring/enc/saml2StringConditional.xml | 26 +-
.../resolver/spring/enc/saml2StringDefault.xml | 24 +-
.../resolver/spring/enc/saml2StringNameID.xml | 28 +-
.../spring/enc/saml2StringNameIDDefault.xml | 20 +-
.../resolver/spring/enc/saml2StringNoName.xml | 22 +-
.../resolver/spring/enc/saml2XmlObject.xml | 26 +-
.../resolver/spring/enc/saml2XmlObjectDefault.xml | 24 +-
.../resolver/spring/enc/saml2XmlObjectNoName.xml | 22 +-
.../attribute/resolver/spring/externalBeans.xml | 78 +-
.../resolver/spring/inputAttributeDefinition1.xml | 10 +-
.../resolver/spring/inputDataConnector1.xml | 12 +-
.../resolver/spring/inputDataConnector2.xml | 12 +-
.../resolver/spring/inputDataConnector3.xml | 14 +-
.../resolver/spring/inputDataConnector4.xml | 10 +-
.../attribute/resolver/spring/mappedTemplate.xml | 116 +-
.../resolver/spring/mappedTemplateService.xml | 96 +-
.../resolver/spring/mapperTest-attributes.xml | 142 +-
.../idp/attribute/resolver/spring/mapperTest.xml | 80 +-
.../resolver/spring/multiFileResolver1.xml | 62 +-
.../resolver/spring/multiFileResolver2.xml | 42 +-
.../attribute/resolver/spring/multiFileService.xml | 78 +-
.../attribute/resolver/spring/pc/DeleteStore.sql | 2 +-
.../attribute/resolver/spring/pc/StoredIdStore.sql | 22 +-
.../idp/attribute/resolver/spring/pc/crypto.xml | 12 +-
.../attribute/resolver/spring/pc/dataconnector.xml | 10 +-
.../idp/attribute/resolver/spring/pc/direct.xml | 12 +-
.../idp/attribute/resolver/spring/pc/directRPs.xml | 18 +-
.../resolver/spring/pc/stored-beanConnector.xml | 82 +-
.../attribute/resolver/spring/pc/stored-direct.xml | 68 +-
.../idp/attribute/resolver/spring/pc/stored.xml | 70 +-
.../idp/attribute/resolver/spring/pc/transient.xml | 12 +-
.../resolver/spring/pc/transientNoStore.xml | 12 +-
.../resolver/spring/predicates-navigate.xml | 62 +-
.../idp/attribute/resolver/spring/predicates.xml | 54 +-
.../idp/attribute/resolver/spring/sealer.xml | 34 +-
.../idp/attribute/resolver/spring/service2.xml | 78 +-
.../resolver/spring/simpleDependencies.xml | 20 +-
.../attribute/resolver/spring/storageService.xml | 42 +-
.../idp/flows/resolveAndFilter/beans.xml | 132 +-
.../resolveAndFilter/resolveAndFilter-flow.xml | 84 +-
.../test/resources/conf/relying-party-legacy.xml | 162 +-
.../resources/mapping/configs/attribute-filter.xml | 92 +-
.../mapping/configs/attribute-resolver.xml | 100 +-
.../test/resources/mapping/configs/override.xml | 40 +-
.../src/main/wix/ShibbolethIdP-warndir-dlg.wxs | 110 +-
.../net/shibboleth/idp/installer/file.properties | 8 +-
.../shibboleth/idp/profile/logic/inlineBean.xml | 52 +-
.../shibboleth/idp/profile/logic/resourceBean.xml | 26 +-
.../net/shibboleth/idp/profile/logic/script.js | 10 +-
.../idp/profile/spring/relyingparty/beans.xml | 318 +-
.../profile/spring/relyingparty/file.properties | 18 +-
.../spring/relyingparty/metadata/HTTPEntities.xml | 22 +-
.../relyingparty/metadata/HTTPEntitiesClient.xml | 24 +-
.../spring/relyingparty/metadata/HTTPEntity.xml | 18 +-
.../spring/relyingparty/metadata/HTTPProxy.xml | 20 +-
.../profile/spring/relyingparty/metadata/beans.xml | 182 +-
.../profile/spring/relyingparty/metadata/chain.xml | 76 +-
.../spring/relyingparty/metadata/chain2.xml | 40 +-
.../relyingparty/metadata/empty-chain-svc.xml | 56 +-
.../spring/relyingparty/metadata/empty-chain.xml | 16 +-
.../spring/relyingparty/metadata/entities.xml | 54 +-
.../spring/relyingparty/metadata/entity.xml | 24 +-
.../metadata/fileBackedHTTPEntities.xml | 22 +-
.../relyingparty/metadata/fileBackedHTTPEntity.xml | 28 +-
.../spring/relyingparty/metadata/fileEntities.xml | 20 +-
.../spring/relyingparty/metadata/fileEntity.xml | 18 +-
.../metadata/filter/metadata.switchaai_signed.xml | 8640 ++++++++++----------
.../relyingparty/metadata/filter/nameIDFormat.xml | 88 +-
.../spring/relyingparty/metadata/filter/other.xml | 62 +-
.../metadata/filter/requiredValidUntil.xml | 48 +-
.../filter/requiredValidUntilParamNonDuration.xml | 48 +-
.../metadata/filter/switch-metadata-file.xml | 22 +-
.../metadata/filter/switch-metadata-inline.xml | 38 +-
.../filter/switch-metadata-trustengine-inline.xml | 40 +-
.../metadata/filter/switch-metadata.xml | 22 +-
.../spring/relyingparty/metadata/filter/switch.xml | 48 +-
.../spring/relyingparty/metadata/httpClient.xml | 36 +-
.../spring/relyingparty/metadata/inLineChain.xml | 80 +-
.../relyingparty/metadata/inLineEntities.xml | 50 +-
.../relyingparty/metadata/inLineEntities2.xml | 56 +-
.../spring/relyingparty/metadata/inLineEntity.xml | 34 +-
.../metadata/resourceClasspathEntities.xml | 26 +-
.../metadata/resourceClasspathEntity.xml | 26 +-
.../metadata/resourceFileBackedHTTPEntities.xml | 36 +-
.../metadata/resourceFileBackedHTTPEntity.xml | 34 +-
.../relyingparty/metadata/resourceFileEntities.xml | 26 +-
.../relyingparty/metadata/resourceFileEntity.xml | 24 +-
.../relyingparty/metadata/resourceHTTPEntities.xml | 32 +-
.../relyingparty/metadata/resourceHTTPEntity.xml | 30 +-
.../spring/relyingparty/metadata/serviceBeans.xml | 68 +-
.../spring/relyingparty/metadata/svnEntity.xml | 30 +-
.../spring/relyingparty/metadata/svnParams.xml | 38 +-
.../spring/relyingparty/propertyPlaceholder.xml | 32 +-
.../profile/spring/relyingparty/reload/beans.xml | 58 +-
.../profile/spring/relyingparty/reload/entity.xml | 24 +-
.../spring/relyingparty/reload/metadata.xml | 18 +-
.../spring/relyingparty/relying-party-group.xml | 478 +-
.../spring/relyingparty/relying-party-group2.xml | 30 +-
.../profile/spring/relyingparty/relying-party.xml | 28 +-
.../idp/profile/spring/relyingparty/saml/ecp.xml | 18 +-
.../relyingparty/saml/ecpLocalityAddress.xml | 24 +-
.../relyingparty/saml/ecpLocalityDNSName.xml | 24 +-
.../profile/spring/relyingparty/saml/ecpValues.xml | 28 +-
.../profile/spring/relyingparty/saml/logout.xml | 18 +-
.../spring/relyingparty/saml/logoutValues.xml | 30 +-
.../spring/relyingparty/saml/saml1artifact.xml | 18 +-
.../relyingparty/saml/saml1artifactValues.xml | 76 +-
.../relyingparty/saml/saml1attributeQuery.xml | 18 +-
.../saml/saml1attributeQueryValues.xml | 30 +-
.../profile/spring/relyingparty/saml/saml2SSO.xml | 18 +-
.../spring/relyingparty/saml/saml2SSOValues.xml | 70 +-
.../spring/relyingparty/saml/saml2artifact.xml | 24 +-
.../relyingparty/saml/saml2artifactValues.xml | 40 +-
.../relyingparty/saml/saml2attributeQuery.xml | 18 +-
.../saml/saml2attributeQueryValues.xml | 42 +-
.../spring/relyingparty/saml/shibbolethSSO.xml | 18 +-
.../relyingparty/saml/shibbolethSSOValues.xml | 30 +-
.../idp/profile/spring/relyingparty/saml/ssos.xml | 18 +-
.../spring/relyingparty/saml/ssosValues.xml | 24 +-
.../credential/fileCertElementsKeyName.xml | 20 +-
.../security/credential/fileCertOnly.xml | 16 +-
.../security/credential/fileKeyCertCrl.xml | 22 +-
.../security/credential/fileTwoCert.xml | 16 +-
.../security/credential/inlineCertOnly.xml | 60 +-
.../security/credential/inlineKeyCertCrl.xml | 256 +-
.../security/credential/inlinePublicOnly.xml | 34 +-
.../security/credential/inlinePublicPrivate.xml | 96 +-
.../security/credential/inlineWrongCert.xml | 174 +-
.../relyingparty/security/trustengine/chain.xml | 72 +-
.../trustengine/filesystemValidationInfo.xml | 10 +-
.../trustengine/filesystemValidationInfoValues.xml | 20 +-
.../security/trustengine/inlineValidationInfo.xml | 10 +-
.../trustengine/inlineValidationInfoValues.xml | 154 +-
.../security/trustengine/staticExplicit.xml | 60 +-
.../security/trustengine/staticExplicitNative.xml | 62 +-
.../security/trustengine/staticPKIX.xml | 16 +-
.../security/trustengine/staticPKIXValues.xml | 32 +-
.../trustengine/staticPKIXValuesCertPathOpts.xml | 38 +-
.../security/trustengine/validationOptions.xml | 8 +-
.../trustengine/validationOptionsValues.xml | 12 +-
.../spring/relyingparty/test-metadata-in.xml | 330 +-
.../spring/relyingparty/test-metadata-out.xml | 436 +-
.../impl/attribute/mapping/attributesMapper.xml | 214 +-
.../attribute/mapping/requestedAttributeValues.xml | 100 +-
.../saml/impl/attribute/resolver/StoredIdStore.sql | 18 +-
.../idp/saml/impl/nameid/DeleteStore.sql | 2 +-
.../schema/shibboleth-attribute-encoder.xsd | 444 +-
.../main/resources/schema/shibboleth-security.xsd | 1606 ++--
.../net/shibboleth/idp/ui/example-metadata.xml | 144 +-
.../net/shibboleth/idp/ui/example-metadata2.xml | 10 +-
.../net/shibboleth/idp/ui/example-metadata3.xml | 10 +-
idp-war/src/main/webapp/css/logout.css | 24 +-
idp-war/src/main/webapp/css/main.css | 330 +-
353 files changed, 13244 insertions(+), 13244 deletions(-)
diff --git a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uid.xml b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uid.xml
index 324ae95..0fcddb6 100644
--- a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uid.xml
+++ b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uid.xml
@@ -1,10 +1,10 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
- </saml:Attribute>
-</mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
+ </saml:Attribute>
+</mdattr:EntityAttributes>
diff --git a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uidwithjsmith.xml b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uidwithjsmith.xml
index fa705cb..01f18ce 100644
--- a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uidwithjsmith.xml
+++ b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uidwithjsmith.xml
@@ -1,11 +1,11 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
- </saml:Attribute>
-</mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
+ </saml:Attribute>
+</mdattr:EntityAttributes>
diff --git a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/uid-epawithjsmith.xml b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/uid-epawithjsmith.xml
index e035c71..4f37a1b 100644
--- a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/uid-epawithjsmith.xml
+++ b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/uid-epawithjsmith.xml
@@ -1,11 +1,11 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
- </saml:Attribute>
-</mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
+ </saml:Attribute>
+</mdattr:EntityAttributes>
diff --git a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/mdrpi-metadata.xml b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/mdrpi-metadata.xml
index 130e232..fc9d0f0 100644
--- a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/mdrpi-metadata.xml
+++ b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/mdrpi-metadata.xml
@@ -1,419 +1,419 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<EntitiesDescriptor
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:elab="http://eduserv.org.uk/labels"
- xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
- xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
- xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
- xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-<EntityDescriptor entityID="https://swamid.user.uu.se/idp/shibboleth">
-
-<Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
-</Extensions>
-<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
- <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
- <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints>
- <mdui:DomainHint>uu.se</mdui:DomainHint>
- <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
- <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
- <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
- <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
- <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
- <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
- <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
- <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
- <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
- <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
-M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
-BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
-u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
-W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
-Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
-gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
-L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
-kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
-qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
-HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
-Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
-lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
-L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-</IDPSSODescriptor>
-<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
-M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
-BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
-u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
-W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
-Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
-gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
-L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
-kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
-qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
-HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
-Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
-lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
-L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-</AttributeAuthorityDescriptor>
-
-
-<Organization>
- <OrganizationName xml:lang="en">UU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
-</Organization><ContactPerson contactType="technical">
- <Company>Uppsala universitet</Company>
- <SurName>AKKA SAML2</SurName>
- <EmailAddress>mailto:akka-datordrift at its.uu.se</EmailAddress>
-</ContactPerson></EntityDescriptor>
-
-
-<EntityDescriptor entityID="https://wiki.ligo.org/shibboleth-sp">
-<Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
-
-</Extensions>
-<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.ligo.org/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">LIGO Wiki</mdui:DisplayName>
- <mdui:Description xml:lang="en">Primary LIGO Scientific Collaboration wiki</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://wiki.ligo.org/Main/SPInformationURL</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
- <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
-<!-- Serial No. 1, expires on Mon Feb 3 20:02:10 2020 GMT -->
- <ds:X509Certificate>
-MIIEVjCCAz6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMDAyMDMyMDAyMTBaFw0yMDAy
-MDMyMDAyMTBaMGkxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFjAU
-BgNVBAMTDXdpa2kubGlnby5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCsizfsa9/YZeLqX0vLLrPxFG0M1cRzSOGOpfxwo3iYPbsw08uFuYjufCaT
-fDQr9T+ZimAlpBP4+yETnYa9R/A65Zmv7ydyge8SfKIdMRY2U23PSBQKMRTp/EdC
-+LFAVZQWlKNmfb9ajrFo776dWU1ZU9NHFkX3dMTeH+BI+kRIMZnlPp7urSutuLMj
-DhoT41XufOUeJUwFm+7g1lf+cbCSPmgRGEa46gHBI+572mOCck7GN0+Zj0H74o5i
-esZrMDf08E6qsH6KnahuMuZH22L25KHULq4P9ByNFGDScvgj34HlLo91J4SzHTjS
-wx/JNBwg4V1bV4o9SGvCrRLBrSr/AgMBAAGjgekwgeYwDAYDVR0TAQH/BAIwADAO
-BgNVHQ8BAf8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
-A1UdIAQSMBAwDgYMKwYBBAGB+kYCAQIBMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6
-Ly9jYS5saWdvLm9yZy81NDE0MDRjMy81NDE0MDRjMy5jcmwwHwYDVR0jBBgwFoAU
-Um7de6pvhVwIItOXn61/I1YeatEwMAYDVR0RBCkwJ4INd2lraS5saWdvLm9yZ4EW
-c2NvdHQua29yYW5kYUBMSUdPLk9SRzANBgkqhkiG9w0BAQUFAAOCAQEAnrDCVAKE
-sv/StHC2c6VwYtrW14rgn/gmOYTWvfioYmteCuS5bqADuCN1qdNxi5nHsgXhX7UE
-aaLeOKBqhNbqu+YiS/va0Kk3Azq7BS+KC0iBhHMM+ZZ86jl93ItV/xsuBc5v/AWx
-jqqsEN8CN35bvZaNwm0mBARfhVll2b2T3r80mdmVbekcJKEry4H0ogGgYWNkcBt3
-rlVaEUap5FC3UzyTmKCkL65y0emhsR+6CEnmyTq5qOlMeyrgKlIJ8YXf/xj6oUaD
-6Zqf7DNzVW6gez9VkUlhivSgXaAfAZ9aJJn/aOsK3BUjJTmUCvps1F6THRr4tc0+
-fMO5DI9dhv07eg==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">LIGO Wiki</ServiceName>
- <ServiceDescription xml:lang="en">Primary LIGO Scientific Collaboration wiki</ServiceDescription>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <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"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </AttributeConsumingService>
-</SPSSODescriptor>
-<Organization>
- <OrganizationName xml:lang="en">LIGO Scientific Collaboration</OrganizationName>
- <OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</OrganizationURL>
-</Organization>
-
-
-
-</EntityDescriptor>
-
-<EntityDescriptor entityID="https://sp-test.swamid.se/shibboleth">
-<Extensions><mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/"><mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy></mdrpi:RegistrationInfo>
-
-</Extensions>
-<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">
- <Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS" index="1"/>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/test-ds.nordu.net" index="4"/>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
- <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
- <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo>
-
- <ds:X509Data>
-
- <ds:X509Certificate>
-MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
-NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
-o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
-WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
-+MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
-vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
-QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
-YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
-yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
-7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
-yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
-WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
-0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo>
-
- <ds:X509Data>
-
- <ds:X509Certificate>
-MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
-NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
-o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
-WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
-+MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
-vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
-QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
-YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
-yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
-7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
-yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
-WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
-0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-</SPSSODescriptor>
-<Organization>
- <OrganizationName xml:lang="en">SWAMID</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.swamid.se</OrganizationURL>
-</Organization><ContactPerson contactType="technical"><EmailAddress>mailto:operations at swamid.se</EmailAddress></ContactPerson></EntityDescriptor>
-
-<EntityDescriptor ID="uk001502" entityID="https://issues.shibboleth.net/shibboleth">
- <!--
- This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet Limited.
- -->
- <Extensions>
-<!-- REMOVED FOR TESTING <mdrpi:RegistrationInfo registrationAuthority="http://ukfederation.org.uk"/> -->
- <ukfedlabel:UKFederationMember/>
-
-
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS"/>
- <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS" index="1"/>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="2"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
- <mdui:Description xml:lang="en">
- The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
- Unauthenticated users may view submitted issues. Authenticated users may submit new
- issues and comment on existing ones.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDRjCCAi6gAwIBAgIJAPpEsjMpUtq9MA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
- kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
- VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTEwMTA3MTg0MTQ4WhcNMTQw
- MTA2MTg0MTQ4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
- GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
- +hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
- f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
- ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
- y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
- 3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
- AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
- AQEFBQADggEBAEzcImXrjUNZF/8AbpcDOqlBO/neTxE0Lcnv4HevHmjqVaemxXK5
- E2pAIJexcyCnp4EV7EK+5hpkr5J26iESHr3w4u/BvUvgSLNjlrIFw58mpBM9f+Qe
- q5bQWff+dmkhrxdhaIVraH70bsuxVKwycmUS0L11nOTxAQbh85wJbIwqH4fKAzQm
- jPp4VbLesRmUyDV+fY4YrZXHYosfuZLEexJgmgcRgZFug6NbWTclKnxKPhquYjem
- oHlA8E0OvkQswalMPLfSzhgftYNHohjdQ2oMBUC4uMk9T+r7ZeKkeCiXIzUzEh8M
- uQfWf/K4Fj4CqCzMOU3mmvy7ricwz/4Kzas=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
-
-
-
-
-
-
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Shibboleth.net Issue Tracking</ServiceName>
- <ServiceDescription xml:lang="en">
- The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
- Unauthenticated users may view submitted issues. Authenticated users may submit new
- issues and comment on existing ones.
- </ServiceDescription>
- <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"/>
- <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <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"/>
- <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth Federated Issue Tracking</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>mailto:contact at shibboleth.net</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Scott</GivenName>
- <SurName>Cantor</SurName>
- <EmailAddress>mailto:cantor.2 at osu.edu</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ian</GivenName>
- <SurName>Young</SurName>
- <EmailAddress>mailto:ukfed at iay.org.uk</EmailAddress>
- </ContactPerson>
-
-
-</EntityDescriptor>
-
-</EntitiesDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<EntitiesDescriptor
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:elab="http://eduserv.org.uk/labels"
+ xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+ xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+ xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+ xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+ xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<EntityDescriptor entityID="https://swamid.user.uu.se/idp/shibboleth">
+
+<Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+</Extensions>
+<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
+ <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>uu.se</mdui:DomainHint>
+ <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+ <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+ <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+ <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+ <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+ <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
+M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
+BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
+u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
+W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
+Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
+gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
+L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
+kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
+qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
+HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
+Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
+lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
+L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
+2DlT+A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+</IDPSSODescriptor>
+<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
+M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
+BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
+u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
+W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
+Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
+gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
+L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
+kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
+qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
+HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
+Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
+lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
+L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
+2DlT+A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+</AttributeAuthorityDescriptor>
+
+
+<Organization>
+ <OrganizationName xml:lang="en">UU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+</Organization><ContactPerson contactType="technical">
+ <Company>Uppsala universitet</Company>
+ <SurName>AKKA SAML2</SurName>
+ <EmailAddress>mailto:akka-datordrift at its.uu.se</EmailAddress>
+</ContactPerson></EntityDescriptor>
+
+
+<EntityDescriptor entityID="https://wiki.ligo.org/shibboleth-sp">
+<Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
+
+</Extensions>
+<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.ligo.org/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">LIGO Wiki</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Primary LIGO Scientific Collaboration wiki</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://wiki.ligo.org/Main/SPInformationURL</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
+ <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+<!-- Serial No. 1, expires on Mon Feb 3 20:02:10 2020 GMT -->
+ <ds:X509Certificate>
+MIIEVjCCAz6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMDAyMDMyMDAyMTBaFw0yMDAy
+MDMyMDAyMTBaMGkxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFjAU
+BgNVBAMTDXdpa2kubGlnby5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCsizfsa9/YZeLqX0vLLrPxFG0M1cRzSOGOpfxwo3iYPbsw08uFuYjufCaT
+fDQr9T+ZimAlpBP4+yETnYa9R/A65Zmv7ydyge8SfKIdMRY2U23PSBQKMRTp/EdC
++LFAVZQWlKNmfb9ajrFo776dWU1ZU9NHFkX3dMTeH+BI+kRIMZnlPp7urSutuLMj
+DhoT41XufOUeJUwFm+7g1lf+cbCSPmgRGEa46gHBI+572mOCck7GN0+Zj0H74o5i
+esZrMDf08E6qsH6KnahuMuZH22L25KHULq4P9ByNFGDScvgj34HlLo91J4SzHTjS
+wx/JNBwg4V1bV4o9SGvCrRLBrSr/AgMBAAGjgekwgeYwDAYDVR0TAQH/BAIwADAO
+BgNVHQ8BAf8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
+A1UdIAQSMBAwDgYMKwYBBAGB+kYCAQIBMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6
+Ly9jYS5saWdvLm9yZy81NDE0MDRjMy81NDE0MDRjMy5jcmwwHwYDVR0jBBgwFoAU
+Um7de6pvhVwIItOXn61/I1YeatEwMAYDVR0RBCkwJ4INd2lraS5saWdvLm9yZ4EW
+c2NvdHQua29yYW5kYUBMSUdPLk9SRzANBgkqhkiG9w0BAQUFAAOCAQEAnrDCVAKE
+sv/StHC2c6VwYtrW14rgn/gmOYTWvfioYmteCuS5bqADuCN1qdNxi5nHsgXhX7UE
+aaLeOKBqhNbqu+YiS/va0Kk3Azq7BS+KC0iBhHMM+ZZ86jl93ItV/xsuBc5v/AWx
+jqqsEN8CN35bvZaNwm0mBARfhVll2b2T3r80mdmVbekcJKEry4H0ogGgYWNkcBt3
+rlVaEUap5FC3UzyTmKCkL65y0emhsR+6CEnmyTq5qOlMeyrgKlIJ8YXf/xj6oUaD
+6Zqf7DNzVW6gez9VkUlhivSgXaAfAZ9aJJn/aOsK3BUjJTmUCvps1F6THRr4tc0+
+fMO5DI9dhv07eg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">LIGO Wiki</ServiceName>
+ <ServiceDescription xml:lang="en">Primary LIGO Scientific Collaboration wiki</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <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"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </AttributeConsumingService>
+</SPSSODescriptor>
+<Organization>
+ <OrganizationName xml:lang="en">LIGO Scientific Collaboration</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</OrganizationURL>
+</Organization>
+
+
+
+</EntityDescriptor>
+
+<EntityDescriptor entityID="https://sp-test.swamid.se/shibboleth">
+<Extensions><mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/"><mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy></mdrpi:RegistrationInfo>
+
+</Extensions>
+<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">
+ <Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS" index="1"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/test-ds.nordu.net" index="4"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
+ <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+
+ <ds:X509Data>
+
+ <ds:X509Certificate>
+MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
+NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
+o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
+WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
++MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
+vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
+QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
+YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
+yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
+7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
+yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
+WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
+0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+
+ <ds:X509Data>
+
+ <ds:X509Certificate>
+MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
+NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
+o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
+WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
++MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
+vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
+QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
+YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
+yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
+7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
+yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
+WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
+0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+</SPSSODescriptor>
+<Organization>
+ <OrganizationName xml:lang="en">SWAMID</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.swamid.se</OrganizationURL>
+</Organization><ContactPerson contactType="technical"><EmailAddress>mailto:operations at swamid.se</EmailAddress></ContactPerson></EntityDescriptor>
+
+<EntityDescriptor ID="uk001502" entityID="https://issues.shibboleth.net/shibboleth">
+ <!--
+ This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet Limited.
+ -->
+ <Extensions>
+<!-- REMOVED FOR TESTING <mdrpi:RegistrationInfo registrationAuthority="http://ukfederation.org.uk"/> -->
+ <ukfedlabel:UKFederationMember/>
+
+
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS"/>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS" index="1"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="2"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
+ <mdui:Description xml:lang="en">
+ The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
+ Unauthenticated users may view submitted issues. Authenticated users may submit new
+ issues and comment on existing ones.
+ </mdui:Description>
+ <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDRjCCAi6gAwIBAgIJAPpEsjMpUtq9MA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
+ kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
+ VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTEwMTA3MTg0MTQ4WhcNMTQw
+ MTA2MTg0MTQ4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
+ GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
+ +hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
+ f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
+ ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
+ y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
+ 3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
+ AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
+ AQEFBQADggEBAEzcImXrjUNZF/8AbpcDOqlBO/neTxE0Lcnv4HevHmjqVaemxXK5
+ E2pAIJexcyCnp4EV7EK+5hpkr5J26iESHr3w4u/BvUvgSLNjlrIFw58mpBM9f+Qe
+ q5bQWff+dmkhrxdhaIVraH70bsuxVKwycmUS0L11nOTxAQbh85wJbIwqH4fKAzQm
+ jPp4VbLesRmUyDV+fY4YrZXHYosfuZLEexJgmgcRgZFug6NbWTclKnxKPhquYjem
+ oHlA8E0OvkQswalMPLfSzhgftYNHohjdQ2oMBUC4uMk9T+r7ZeKkeCiXIzUzEh8M
+ uQfWf/K4Fj4CqCzMOU3mmvy7ricwz/4Kzas=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+
+
+
+
+
+
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">Shibboleth.net Issue Tracking</ServiceName>
+ <ServiceDescription xml:lang="en">
+ The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
+ Unauthenticated users may view submitted issues. Authenticated users may submit new
+ issues and comment on existing ones.
+ </ServiceDescription>
+ <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"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <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"/>
+ <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Shibboleth Federated Issue Tracking</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth.Net Technical Support</GivenName>
+ <EmailAddress>mailto:contact at shibboleth.net</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Scott</GivenName>
+ <SurName>Cantor</SurName>
+ <EmailAddress>mailto:cantor.2 at osu.edu</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ian</GivenName>
+ <SurName>Young</SurName>
+ <EmailAddress>mailto:ukfed at iay.org.uk</EmailAddress>
+ </ContactPerson>
+
+
+</EntityDescriptor>
+
+</EntitiesDescriptor>
diff --git a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/orphan.xml b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/orphan.xml
index b02cf68..acd92e4 100644
--- a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/orphan.xml
+++ b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/orphan.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor entityID="https://idp.shibboleth.net/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
- xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- name="http://shibboleth.net">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
- </NameIDFormat>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.shibboleth.net/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.shibboleth.net/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">Shibboleth.net
- </OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth.net
- </OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net
- </OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>contact at shibboleth.net</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor entityID="https://idp.shibboleth.net/idp/shibboleth"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
+ xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ name="http://shibboleth.net">
+
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+ </NameIDFormat>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+ Location="https://idp.shibboleth.net/idp/profile/SAML2/POST/SSO" />
+
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://idp.shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO" />
+
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.shibboleth.net/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+
+ <Organization>
+ <OrganizationName xml:lang="en">Shibboleth.net
+ </OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Shibboleth.net
+ </OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.shibboleth.net
+ </OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth.Net Technical Support</GivenName>
+ <EmailAddress>contact at shibboleth.net</EmailAddress>
+ </ContactPerson>
+
+</EntityDescriptor>
diff --git a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibboleth.net-metadata.xml b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibboleth.net-metadata.xml
index 958f20a..fd7fadc 100644
--- a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibboleth.net-metadata.xml
+++ b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibboleth.net-metadata.xml
@@ -1,403 +1,403 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="http://shibboleth.net">
-
- <EntityDescriptor entityID="https://idp.shibboleth.net/idp/shibboleth">
-
- <Extensions>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-
- <mdattr:EntityAttributes>
- <saml:Attribute Name="urn:example.org:policies">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">urn:example.org:policy:ABCD</saml:AttributeValue>
- <saml:AttributeValue>urn:example.org:policy:1234</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="urn:example.org:policies">
- <saml:AttributeValue>urn:example.org:policy:5678</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="urn:example.org:entitlements" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:boolean">32</saml:AttributeValue>
- <saml:AttributeValue>urn:example.org:entitlements:ABCD</saml:AttributeValue>
- <saml:AttributeValue>urn:example.org:entitlements:1234</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">shibboleth.net</shibmd:Scope>
-
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
- <mdui:Description xml:lang="en">An identity provider hosted and used by the developers of Shibboleth.</mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
- BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
- MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
- dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA
- M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq
- 5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5
- /0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599
- pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/
- LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3
- y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw
- czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
- 3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj
- 3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH
- egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5
- +A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7
- iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce
- Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx
- BXD36HfGBXk= </ds:X509Certificate>
- </ds:X509Data>
-
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
- </KeyDescriptor>
-
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.net/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">Shibboleth.net</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth.net</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>contact at shibboleth.net</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <EntityDescriptor entityID="https://issues.shibboleth.net/shibboleth">
-
- <Extensions>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <mdattr:EntityAttributes><saml:Assertion/>
- </mdattr:EntityAttributes>
- </Extensions>
-
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <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://issues.shibboleth.net/jira/Shibboleth.sso/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://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="1"/>
-
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
- <mdui:Description xml:lang="en">
- The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
- Unauthenticated users may view submitted issues. Authenticated users may submit new
- issues and comment on existing ones.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
-
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:KeyName>issues.shibboleth.net</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=issues.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
- <ds:X509Certificate>
-MIIDRjCCAi6gAwIBAgIJAPpEsjMpUtq9MA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
-kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
-VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTEwMTA3MTg0MTQ4WhcNMTQw
-MTA2MTg0MTQ4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
-GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
-+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
-f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
-ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
-y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
-3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
-AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
-AQEFBQADggEBAEzcImXrjUNZF/8AbpcDOqlBO/neTxE0Lcnv4HevHmjqVaemxXK5
-E2pAIJexcyCnp4EV7EK+5hpkr5J26iESHr3w4u/BvUvgSLNjlrIFw58mpBM9f+Qe
-q5bQWff+dmkhrxdhaIVraH70bsuxVKwycmUS0L11nOTxAQbh85wJbIwqH4fKAzQm
-jPp4VbLesRmUyDV+fY4YrZXHYosfuZLEexJgmgcRgZFug6NbWTclKnxKPhquYjem
-oHlA8E0OvkQswalMPLfSzhgftYNHohjdQ2oMBUC4uMk9T+r7ZeKkeCiXIzUzEh8M
-uQfWf/K4Fj4CqCzMOU3mmvy7ricwz/4Kzas=
- </ds:X509Certificate>
- </ds:X509Data>
-
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
- </KeyDescriptor>
-
- <NameIDFormat>https://example.org/foo</NameIDFormat>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
-
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-
-
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Shibboleth Federated Issue Tracking</ServiceName>
- <ServiceDescription xml:lang="en"> An issue (bugs, feature requests, tasks) tracking
- service with automatic registration for users who can supply a supported identifier,
- such as eduPersonPrincipalName or swissEduPersonUniqueID. </ServiceDescription>
- <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"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <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"/>
- </AttributeConsumingService>
-
- </SPSSODescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>contact at shibboleth.net</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <EntityDescriptor entityID="https://wiki.shibboleth.net/shibboleth">
-
- <Extensions>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-
- <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <mdattr:EntityAttributes>
- <saml:Attribute Name="urn:example.org:entitlements" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </mdattr:EntityAttributes>
- <mdattr:EntityAttributes><saml:Assertion/>
- </mdattr:EntityAttributes>
- </Extensions>
-
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <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://wiki.shibboleth.net/confluence/Shibboleth.sso/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://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="1"/>
-
-
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
- <mdui:Description xml:lang="en">
- The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing
- documentation. Authenticated users may create new documentation pages and edit existing ones.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:KeyName>wiki.shibboleth.net</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=wiki.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
- <ds:X509Certificate>
-MIIDQjCCAiqgAwIBAgIJAKMO1kGnu43yMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
-kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
-VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTExMDEwNzE4NDIzN1oXDTE0MDEw
-NjE4NDIzN1owTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
-CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
-r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
-iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
-SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
-KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
-m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
-ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
-AAOCAQEAEv6zwotAweOLEfibTXm5d6odE2o/+rHdeEW+IEAspAvmCK7nAPFkuV47
-WMn7JmOd7BWnoXmqFwefJFf3mZtadHnCXReSd8ehGA8/KerSxz9yClMaoanRTEb3
-chT+n5Oh2+WgjzR/v5RbChihoOES+Z2mcvbDm9wn3uSBdxbAoG0/YZihaY9LeoNW
-/CVXv0HYfDw5csol6zwz6dgUDXpfXSXLLKnrjVwARM6lVh00i5i2nfmrWnI41bRh
-NtrvvBkq2tvnd6wm1DJNDzZQB/nRpCadwp4a64Qa0XJiGCoxFUvkd1+RSHqbBsEF
-6w3nDMcYq/BKnF30KZ0Q274eVyQolg==
- </ds:X509Certificate>
- </ds:X509Data>
-
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
-
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-
-
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Shibboleth Federated Wiki</ServiceName>
- <ServiceDescription xml:lang="en"> A shared Wiki service with automatic registration
- for users who can supply a supported identifier, such as eduPersonPrincipalName
- or swissEduPersonUniqueID. </ServiceDescription>
- <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"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <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"/>
- </AttributeConsumingService>
-
- </SPSSODescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>contact at shibboleth.net</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
- <EntityDescriptor entityID="https://none.shibboleth.net/shibboleth">
-
- <Extensions>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-
- <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- </Extensions>
-
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <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://wiki.shibboleth.net/confluence/Shibboleth.sso/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://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="1"/>
-
-
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
- <mdui:Description xml:lang="en">
- The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing
- documentation. Authenticated users may create new documentation pages and edit existing ones.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:KeyName>wiki.shibboleth.net</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=wiki.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
- <ds:X509Certificate>
-MIIDQjCCAiqgAwIBAgIJAKMO1kGnu43yMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
-kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
-VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTExMDEwNzE4NDIzN1oXDTE0MDEw
-NjE4NDIzN1owTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
-CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
-r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
-iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
-SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
-KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
-m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
-ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
-AAOCAQEAEv6zwotAweOLEfibTXm5d6odE2o/+rHdeEW+IEAspAvmCK7nAPFkuV47
-WMn7JmOd7BWnoXmqFwefJFf3mZtadHnCXReSd8ehGA8/KerSxz9yClMaoanRTEb3
-chT+n5Oh2+WgjzR/v5RbChihoOES+Z2mcvbDm9wn3uSBdxbAoG0/YZihaY9LeoNW
-/CVXv0HYfDw5csol6zwz6dgUDXpfXSXLLKnrjVwARM6lVh00i5i2nfmrWnI41bRh
-NtrvvBkq2tvnd6wm1DJNDzZQB/nRpCadwp4a64Qa0XJiGCoxFUvkd1+RSHqbBsEF
-6w3nDMcYq/BKnF30KZ0Q274eVyQolg==
- </ds:X509Certificate>
- </ds:X509Data>
-
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
-
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-
-
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Shibboleth Federated Wiki</ServiceName>
- <ServiceDescription xml:lang="en"> A shared Wiki service with automatic registration
- for users who can supply a supported identifier, such as eduPersonPrincipalName
- or swissEduPersonUniqueID. </ServiceDescription>
- <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"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <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"/>
- </AttributeConsumingService>
-
- </SPSSODescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>contact at shibboleth.net</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-</EntitiesDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="http://shibboleth.net">
+
+ <EntityDescriptor entityID="https://idp.shibboleth.net/idp/shibboleth">
+
+ <Extensions>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+
+ <mdattr:EntityAttributes>
+ <saml:Attribute Name="urn:example.org:policies">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">urn:example.org:policy:ABCD</saml:AttributeValue>
+ <saml:AttributeValue>urn:example.org:policy:1234</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="urn:example.org:policies">
+ <saml:AttributeValue>urn:example.org:policy:5678</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="urn:example.org:entitlements" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:boolean">32</saml:AttributeValue>
+ <saml:AttributeValue>urn:example.org:entitlements:ABCD</saml:AttributeValue>
+ <saml:AttributeValue>urn:example.org:entitlements:1234</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">shibboleth.net</shibmd:Scope>
+
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
+ <mdui:Description xml:lang="en">An identity provider hosted and used by the developers of Shibboleth.</mdui:Description>
+ <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
+ BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
+ MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
+ dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA
+ M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq
+ 5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5
+ /0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599
+ pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/
+ LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3
+ y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw
+ czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+ 3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj
+ 3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH
+ egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5
+ +A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7
+ iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce
+ Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx
+ BXD36HfGBXk= </ds:X509Certificate>
+ </ds:X509Data>
+
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+ </KeyDescriptor>
+
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.net/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+
+ <Organization>
+ <OrganizationName xml:lang="en">Shibboleth.net</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Shibboleth.net</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.shibboleth.net</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth.Net Technical Support</GivenName>
+ <EmailAddress>contact at shibboleth.net</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <EntityDescriptor entityID="https://issues.shibboleth.net/shibboleth">
+
+ <Extensions>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <mdattr:EntityAttributes><saml:Assertion/>
+ </mdattr:EntityAttributes>
+ </Extensions>
+
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <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://issues.shibboleth.net/jira/Shibboleth.sso/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://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="1"/>
+
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
+ <mdui:Description xml:lang="en">
+ The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
+ Unauthenticated users may view submitted issues. Authenticated users may submit new
+ issues and comment on existing ones.
+ </mdui:Description>
+ <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:KeyName>issues.shibboleth.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=issues.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
+ <ds:X509Certificate>
+MIIDRjCCAi6gAwIBAgIJAPpEsjMpUtq9MA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
+kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
+VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTEwMTA3MTg0MTQ4WhcNMTQw
+MTA2MTg0MTQ4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
+GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
++hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
+f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
+ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
+y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
+3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
+AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
+AQEFBQADggEBAEzcImXrjUNZF/8AbpcDOqlBO/neTxE0Lcnv4HevHmjqVaemxXK5
+E2pAIJexcyCnp4EV7EK+5hpkr5J26iESHr3w4u/BvUvgSLNjlrIFw58mpBM9f+Qe
+q5bQWff+dmkhrxdhaIVraH70bsuxVKwycmUS0L11nOTxAQbh85wJbIwqH4fKAzQm
+jPp4VbLesRmUyDV+fY4YrZXHYosfuZLEexJgmgcRgZFug6NbWTclKnxKPhquYjem
+oHlA8E0OvkQswalMPLfSzhgftYNHohjdQ2oMBUC4uMk9T+r7ZeKkeCiXIzUzEh8M
+uQfWf/K4Fj4CqCzMOU3mmvy7ricwz/4Kzas=
+ </ds:X509Certificate>
+ </ds:X509Data>
+
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+ </KeyDescriptor>
+
+ <NameIDFormat>https://example.org/foo</NameIDFormat>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
+
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+
+
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">Shibboleth Federated Issue Tracking</ServiceName>
+ <ServiceDescription xml:lang="en"> An issue (bugs, feature requests, tasks) tracking
+ service with automatic registration for users who can supply a supported identifier,
+ such as eduPersonPrincipalName or swissEduPersonUniqueID. </ServiceDescription>
+ <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"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <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"/>
+ </AttributeConsumingService>
+
+ </SPSSODescriptor>
+
+ <Organization>
+ <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth.Net Technical Support</GivenName>
+ <EmailAddress>contact at shibboleth.net</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <EntityDescriptor entityID="https://wiki.shibboleth.net/shibboleth">
+
+ <Extensions>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <mdattr:EntityAttributes>
+ <saml:Attribute Name="urn:example.org:entitlements" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </mdattr:EntityAttributes>
+ <mdattr:EntityAttributes><saml:Assertion/>
+ </mdattr:EntityAttributes>
+ </Extensions>
+
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <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://wiki.shibboleth.net/confluence/Shibboleth.sso/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://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="1"/>
+
+
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
+ <mdui:Description xml:lang="en">
+ The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing
+ documentation. Authenticated users may create new documentation pages and edit existing ones.
+ </mdui:Description>
+ <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:KeyName>wiki.shibboleth.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=wiki.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
+ <ds:X509Certificate>
+MIIDQjCCAiqgAwIBAgIJAKMO1kGnu43yMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
+kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
+VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTExMDEwNzE4NDIzN1oXDTE0MDEw
+NjE4NDIzN1owTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
+CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
+r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
+iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
+SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
+KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
+m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
+ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
+AAOCAQEAEv6zwotAweOLEfibTXm5d6odE2o/+rHdeEW+IEAspAvmCK7nAPFkuV47
+WMn7JmOd7BWnoXmqFwefJFf3mZtadHnCXReSd8ehGA8/KerSxz9yClMaoanRTEb3
+chT+n5Oh2+WgjzR/v5RbChihoOES+Z2mcvbDm9wn3uSBdxbAoG0/YZihaY9LeoNW
+/CVXv0HYfDw5csol6zwz6dgUDXpfXSXLLKnrjVwARM6lVh00i5i2nfmrWnI41bRh
+NtrvvBkq2tvnd6wm1DJNDzZQB/nRpCadwp4a64Qa0XJiGCoxFUvkd1+RSHqbBsEF
+6w3nDMcYq/BKnF30KZ0Q274eVyQolg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
+
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+
+
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">Shibboleth Federated Wiki</ServiceName>
+ <ServiceDescription xml:lang="en"> A shared Wiki service with automatic registration
+ for users who can supply a supported identifier, such as eduPersonPrincipalName
+ or swissEduPersonUniqueID. </ServiceDescription>
+ <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"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <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"/>
+ </AttributeConsumingService>
+
+ </SPSSODescriptor>
+
+ <Organization>
+ <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth.Net Technical Support</GivenName>
+ <EmailAddress>contact at shibboleth.net</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+ <EntityDescriptor entityID="https://none.shibboleth.net/shibboleth">
+
+ <Extensions>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ </Extensions>
+
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <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://wiki.shibboleth.net/confluence/Shibboleth.sso/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://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="1"/>
+
+
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
+ <mdui:Description xml:lang="en">
+ The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing
+ documentation. Authenticated users may create new documentation pages and edit existing ones.
+ </mdui:Description>
+ <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:KeyName>wiki.shibboleth.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=wiki.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
+ <ds:X509Certificate>
+MIIDQjCCAiqgAwIBAgIJAKMO1kGnu43yMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
+kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
+VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTExMDEwNzE4NDIzN1oXDTE0MDEw
+NjE4NDIzN1owTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
+CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
+r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
+iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
+SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
+KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
+m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
+ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
+AAOCAQEAEv6zwotAweOLEfibTXm5d6odE2o/+rHdeEW+IEAspAvmCK7nAPFkuV47
+WMn7JmOd7BWnoXmqFwefJFf3mZtadHnCXReSd8ehGA8/KerSxz9yClMaoanRTEb3
+chT+n5Oh2+WgjzR/v5RbChihoOES+Z2mcvbDm9wn3uSBdxbAoG0/YZihaY9LeoNW
+/CVXv0HYfDw5csol6zwz6dgUDXpfXSXLLKnrjVwARM6lVh00i5i2nfmrWnI41bRh
+NtrvvBkq2tvnd6wm1DJNDzZQB/nRpCadwp4a64Qa0XJiGCoxFUvkd1+RSHqbBsEF
+6w3nDMcYq/BKnF30KZ0Q274eVyQolg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
+
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+
+
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">Shibboleth Federated Wiki</ServiceName>
+ <ServiceDescription xml:lang="en"> A shared Wiki service with automatic registration
+ for users who can supply a supported identifier, such as eduPersonPrincipalName
+ or swissEduPersonUniqueID. </ServiceDescription>
+ <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"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <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"/>
+ </AttributeConsumingService>
+
+ </SPSSODescriptor>
+
+ <Organization>
+ <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth.Net Technical Support</GivenName>
+ <EmailAddress>contact at shibboleth.net</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+</EntitiesDescriptor>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uid.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uid.xml
index 0a216ad..d5054b8 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uid.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uid.xml
@@ -1,17 +1,17 @@
-<mdattr:EntityAttributes
- xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
-
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
- </saml:Attribute>
-</mdattr:EntityAttributes>
+<mdattr:EntityAttributes
+ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+ xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
+ </saml:Attribute>
+</mdattr:EntityAttributes>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uidwithjsmith.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uidwithjsmith.xml
index cac2fef..86e726a 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uidwithjsmith.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uidwithjsmith.xml
@@ -1,18 +1,18 @@
-<mdattr:EntityAttributes
- xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
-
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
- </saml:Attribute>
-</mdattr:EntityAttributes>
+<mdattr:EntityAttributes
+ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+ xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
+ </saml:Attribute>
+</mdattr:EntityAttributes>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/uid-epawithjsmith.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/uid-epawithjsmith.xml
index 7696f5a..4944b2d 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/uid-epawithjsmith.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/uid-epawithjsmith.xml
@@ -1,18 +1,18 @@
-<mdattr:EntityAttributes
- xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
-
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
- </saml:Attribute>
-</mdattr:EntityAttributes>
+<mdattr:EntityAttributes
+ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+ xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">jsmith</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">daffyDuck</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
+ </saml:Attribute>
+</mdattr:EntityAttributes>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/and.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/and.xml
index 018fe3e..f9e44f3 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/and.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/and.xml
@@ -1,11 +1,11 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="AND">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- <Rule xsi:type="ANY" />
- </PermitValueRule>
+<AttributeRule attributeID="email"
+ xmlns="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="AND">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ <Rule xsi:type="ANY" />
+ </PermitValueRule>
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/andSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/andSingleton.xml
index c7703ee..d12dbd7 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/andSingleton.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/andSingleton.xml
@@ -1,8 +1,8 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="AND">
- <Rule xsi:type="ANY" />
- </PermitValueRule>
-</AttributeRule>
+<AttributeRule attributeID="email"
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="AND">
+ <Rule xsi:type="ANY" />
+ </PermitValueRule>
+</AttributeRule>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/any.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/any.xml
index 971ec95..0d12dbf 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/any.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/any.xml
@@ -1,4 +1,4 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="ANY" />
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="ANY" />
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRegex.xml
index cae9619..280bded 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRegex.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRegex.xml
@@ -1,7 +1,7 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="ValueRegex"
- regex="^jsmit.*$" />
+<AttributeRule attributeID="email"
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="ValueRegex"
+ regex="^jsmit.*$" />
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRequester.xml
index a8a00ea..f0c628e 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRequester.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRequester.xml
@@ -1,4 +1,4 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="Requester" value="https://service.example.edu/shibboleth-sp" />
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="Requester" value="https://service.example.edu/shibboleth-sp" />
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScope.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScope.xml
index 634848e..87becb3 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScope.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScope.xml
@@ -1,4 +1,4 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="Scope" value="jSmItH" ignoreCase="false" />
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="Scope" value="jSmItH" ignoreCase="false" />
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScopeRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScopeRegex.xml
index 30b2dd0..7a3c1fc 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScopeRegex.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScopeRegex.xml
@@ -1,7 +1,7 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="ScopeRegex"
- regex="^example^..*$" />
+<AttributeRule attributeID="email"
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="ScopeRegex"
+ regex="^example^..*$" />
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueId.xml
index 6947ccb..f3c20bd 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueId.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueId.xml
@@ -1,7 +1,7 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="Value"
- value="jsmith" attributeID="uid" ignoreCase="true" />
+<AttributeRule attributeID="email"
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="Value"
+ value="jsmith" attributeID="uid" ignoreCase="true" />
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueNoId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueNoId.xml
index bb261a9..38addb3 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueNoId.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueNoId.xml
@@ -1,4 +1,4 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="Value" value="jsmith" ignoreCase="true" />
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="Value" value="jsmith" ignoreCase="true" />
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/implicit.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/implicit.xml
index 9f4d7eb..4336119 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/implicit.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/implicit.xml
@@ -1,2 +1,2 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd" permitAny=" true " />
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/mappedInMetadata.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/mappedInMetadata.xml
index dc182da..60c6ce0 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/mappedInMetadata.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/mappedInMetadata.xml
@@ -1,17 +1,17 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="MappedAttributeInMetadata"
- id="PRR"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"/>
-
- <AttributeRule attributeID="email">
-
- <PermitValueRule xsi:type="MappedAttributeInMetadata"
- id="PermitRule"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"
- />
- </AttributeRule>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="MappedAttributeInMetadata"
+ id="PRR"
+ onlyIfRequired="true"
+ matchIfMetadataSilent="true"/>
+
+ <AttributeRule attributeID="email">
+
+ <PermitValueRule xsi:type="MappedAttributeInMetadata"
+ id="PermitRule"
+ onlyIfRequired="true"
+ matchIfMetadataSilent="true"
+ />
+ </AttributeRule>
</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/not.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/not.xml
index 6b060ee..5193be2 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/not.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/not.xml
@@ -1,8 +1,8 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="NOT">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- </PermitValueRule>
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="NOT">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ </PermitValueRule>
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/or.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/or.xml
index 3d020dc..280f323 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/or.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/or.xml
@@ -1,9 +1,9 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="OR">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- <Rule xsi:type="ANY" />
- </PermitValueRule>
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="OR">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ <Rule xsi:type="ANY" />
+ </PermitValueRule>
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/orSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/orSingleton.xml
index 75b4096..e14c28e 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/orSingleton.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/orSingleton.xml
@@ -1,8 +1,8 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="OR">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- </PermitValueRule>
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="OR">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ </PermitValueRule>
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/requestedInMetadata.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/requestedInMetadata.xml
index df48c34..7a88039 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/requestedInMetadata.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/requestedInMetadata.xml
@@ -1,11 +1,11 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="AttributeInMetadata" id="PRR" onlyIfRequired="true"
- matchIfMetadataSilent="true" />
-
- <AttributeRule attributeID="email">
-
- <PermitValueRule xsi:type="AttributeInMetadata" id="PermitRule" onlyIfRequired="true"
- matchIfMetadataSilent="true" />
- </AttributeRule>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="AttributeInMetadata" id="PRR" onlyIfRequired="true"
+ matchIfMetadataSilent="true" />
+
+ <AttributeRule attributeID="email">
+
+ <PermitValueRule xsi:type="AttributeInMetadata" id="PermitRule" onlyIfRequired="true"
+ matchIfMetadataSilent="true" />
+ </AttributeRule>
</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted-v8.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted-v8.xml
index 8d7aa91..fec9083 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted-v8.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted-v8.xml
@@ -1,14 +1,14 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="Script">
- <Script>
- <![CDATA[
- hs = Java.type("java.util.HashSet");
- x = new hs();
- x.add(attribute.getValues().iterator().next());
- x;
- ]]>
- </Script>
- </PermitValueRule>
+<AttributeRule attributeID="email"
+ xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="Script">
+ <Script>
+ <![CDATA[
+ hs = Java.type("java.util.HashSet");
+ x = new hs();
+ x.add(attribute.getValues().iterator().next());
+ x;
+ ]]>
+ </Script>
+ </PermitValueRule>
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted.xml
index c204df9..b58514a 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted.xml
@@ -1,13 +1,13 @@
-<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="Script">
- <Script>
- <![CDATA[
- importPackage(Packages.java.util);
- x = new HashSet();
- x.add(attribute.getValues().iterator().next());
- x;
- ]]>
- </Script>
- </PermitValueRule>
+<AttributeRule attributeID="email" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="Script">
+ <Script>
+ <![CDATA[
+ importPackage(Packages.java.util);
+ x = new HashSet();
+ x.add(attribute.getValues().iterator().next());
+ x;
+ ]]>
+ </Script>
+ </PermitValueRule>
</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml
index 2b13d0b..fc35404 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml
@@ -1,12 +1,12 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AND">
- <basic:Rule xsi:type="basic:NOT">
- <basic:Rule xsi:type="basic:ANY" />
- </basic:Rule>
- <basic:Rule xsi:type="basic:ANY" />
- </afp:PermitValueRule>
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:AND">
+ <basic:Rule xsi:type="basic:NOT">
+ <basic:Rule xsi:type="basic:ANY" />
+ </basic:Rule>
+ <basic:Rule xsi:type="basic:ANY" />
+ </afp:PermitValueRule>
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/any.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/any.xml
index 9ab6945..cb6dd63 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/any.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/any.xml
@@ -1,7 +1,7 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:ANY" />
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:ANY" />
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegex.xml
index 1e3a901..d6c052d 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegex.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegex.xml
@@ -1,8 +1,8 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AttributeValueRegex"
- regex="^jsmit.*$" />
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:AttributeValueRegex"
+ regex="^jsmit.*$" />
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRequester.xml
index c50f6f5..5d56813 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRequester.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRequester.xml
@@ -1,7 +1,7 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AttributeRequesterString" value="https://service.example.edu/shibboleth-sp" />
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:AttributeRequesterString" value="https://service.example.edu/shibboleth-sp" />
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScope.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScope.xml
index 9f71c42..5ff2f56 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScope.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScope.xml
@@ -1,8 +1,8 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AttributeScopeString"
- value="jSmItH" ignoreCase="false" />
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:AttributeScopeString"
+ value="jSmItH" ignoreCase="false" />
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeRegex.xml
index e5f3e45..f3f3e2a 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeRegex.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeRegex.xml
@@ -1,8 +1,8 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AttributeScopeRegex"
- regex="^example^..*$" />
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:AttributeScopeRegex"
+ regex="^example^..*$" />
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml
index ad3564c..b0374e5 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml
@@ -1,8 +1,8 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AttributeValueString"
- value="jsmith" attributeID="uid" ignoreCase="true" />
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:AttributeValueString"
+ value="jsmith" attributeID="uid" ignoreCase="true" />
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueNoId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueNoId.xml
index f4e309f..9b3c212 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueNoId.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueNoId.xml
@@ -1,8 +1,8 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AttributeValueString"
- value="jsmith" ignoreCase="true" />
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:AttributeValueString"
+ value="jsmith" ignoreCase="true" />
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/customBean.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/customBean.xml
index a3b6e0b..9ca7924 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/customBean.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/customBean.xml
@@ -1,20 +1,20 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
- <util:map id="shibboleth.CustomScriptObject">
- <entry key="foo" value="bar"/>
- </util:map>
- <util:map id="other.CustomScriptObject">
- <entry key="bar" value="foo"/>
- </util:map>
-</beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+ <util:map id="shibboleth.CustomScriptObject">
+ <entry key="foo" value="bar"/>
+ </util:map>
+ <util:map id="other.CustomScriptObject">
+ <entry key="bar" value="foo"/>
+ </util:map>
+</beans>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/implicit.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/implicit.xml
index 5f9e88f..e6b996f 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/implicit.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/implicit.xml
@@ -1,6 +1,6 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd"
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd"
permitAny="true"/>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml
index 83b8544..33957d5 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml
@@ -1,11 +1,11 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:NOT">
- <basic:Rule xsi:type="basic:NOT">
- <basic:Rule xsi:type="basic:ANY" />
- </basic:Rule>
- </afp:PermitValueRule>
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:NOT">
+ <basic:Rule xsi:type="basic:NOT">
+ <basic:Rule xsi:type="basic:ANY" />
+ </basic:Rule>
+ </afp:PermitValueRule>
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml
index 151f4bf..7de7cc9 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml
@@ -1,12 +1,12 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:OR">
- <basic:Rule xsi:type="basic:NOT">
- <basic:Rule xsi:type="basic:ANY" />
- </basic:Rule>
- <basic:Rule xsi:type="basic:ANY" />
- </afp:PermitValueRule>
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:OR">
+ <basic:Rule xsi:type="basic:NOT">
+ <basic:Rule xsi:type="basic:ANY" />
+ </basic:Rule>
+ <basic:Rule xsi:type="basic:ANY" />
+ </afp:PermitValueRule>
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml
index 4e2aed8..5b27cb9 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml
@@ -1,20 +1,20 @@
-<afp:AttributeFilterPolicy id="MostBasicExample"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
- <afp:PolicyRequirementRule xsi:type="saml:AttributeInMetadata"
- id="PRR"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"/>
-
- <afp:AttributeRule attributeID="email">
-
- <afp:PermitValueRule xsi:type="saml:AttributeInMetadata"
- id="PermitRule"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"
- />
- </afp:AttributeRule>
+<afp:AttributeFilterPolicy id="MostBasicExample"
+ xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
+ urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
+ <afp:PolicyRequirementRule xsi:type="saml:AttributeInMetadata"
+ id="PRR"
+ onlyIfRequired="true"
+ matchIfMetadataSilent="true"/>
+
+ <afp:AttributeRule attributeID="email">
+
+ <afp:PermitValueRule xsi:type="saml:AttributeInMetadata"
+ id="PermitRule"
+ onlyIfRequired="true"
+ matchIfMetadataSilent="true"
+ />
+ </afp:AttributeRule>
</afp:AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
index 1284630..4f5a4bb 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
@@ -1,16 +1,16 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:Script">
- <basic:Script>
- <![CDATA[
- importPackage(Packages.java.util);
- x = new HashSet();
- x.add(attribute.getValues().iterator().next());
- x;
- ]]>
- </basic:Script>
- </afp:PermitValueRule>
+<afp:AttributeRule attributeID="email"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PermitValueRule xsi:type="basic:Script">
+ <basic:Script>
+ <![CDATA[
+ importPackage(Packages.java.util);
+ x = new HashSet();
+ x.add(attribute.getValues().iterator().next());
+ x;
+ ]]>
+ </basic:Script>
+ </afp:PermitValueRule>
</afp:AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/and.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/and.xml
index 6a86d36..0e58d53 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/and.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/and.xml
@@ -1,9 +1,9 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="AND">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- <Rule xsi:type="ANY" />
- </PolicyRequirementRule>
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="AND">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ <Rule xsi:type="ANY" />
+ </PolicyRequirementRule>
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/andSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/andSingleton.xml
index f722ed6..0beb6fd 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/andSingleton.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/andSingleton.xml
@@ -1,8 +1,8 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="AND">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- </PolicyRequirementRule>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="AND">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ </PolicyRequirementRule>
</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/any.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/any.xml
index 35c9454..385b770 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/any.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/any.xml
@@ -1,4 +1,4 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="ANY" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="ANY" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeIssuer.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeIssuer.xml
index f3a93f5..1cc31da 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeIssuer.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeIssuer.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="AttributeIssuerString" value="urn:example:org:idp:foo"
- ignoreCase="true" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="AttributeIssuerString" value="urn:example:org:idp:foo"
+ ignoreCase="true" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRegexRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRegexRequester.xml
index d3ca2c7..ac8d799 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRegexRequester.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRegexRequester.xml
@@ -1,4 +1,4 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="RequesterRegex" regex="^urn:example:.*$" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="RequesterRegex" regex="^urn:example:.*$" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRequester.xml
index 51a6a33..4531c4d 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRequester.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRequester.xml
@@ -1,4 +1,4 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd" >
- <PolicyRequirementRule xsi:type="Requester" value="https://service.example.edu/shibboleth-sp" ignoreCase="false" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd" >
+ <PolicyRequirementRule xsi:type="Requester" value="https://service.example.edu/shibboleth-sp" ignoreCase="false" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueId.xml
index 15faf0b..b7a782a 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueId.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueId.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="Value" value="jsmith" attributeID="uid"
- ignoreCase="true" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="Value" value="jsmith" attributeID="uid"
+ ignoreCase="true" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueNoId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueNoId.xml
index c199a66..c52b7e1 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueNoId.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueNoId.xml
@@ -1,4 +1,4 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="Value" value="jsmith" ignoreCase="true" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="Value" value="jsmith" ignoreCase="true" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethod.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethod.xml
index 694546a..4938a5b 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethod.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethod.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="AuthenticationMethod"
- value="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="AuthenticationMethod"
+ value="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethodRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethodRegex.xml
index ee326f9..37784f4 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethodRegex.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/authenticationMethodRegex.xml
@@ -1,4 +1,4 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="AuthenticationMethodRegex" regex="^urn:oasis:names:tc:SAML:2\.0:ac:classes:[^:]*$" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="AuthenticationMethodRegex" regex="^urn:oasis:names:tc:SAML:2\.0:ac:classes:[^:]*$" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/not.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/not.xml
index a155a58..9ce6dcb 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/not.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/not.xml
@@ -1,8 +1,8 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="NOT">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- </PolicyRequirementRule>
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="NOT">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ </PolicyRequirementRule>
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/numberAttrValues.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/numberAttrValues.xml
index 70d400f..951f401 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/numberAttrValues.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/numberAttrValues.xml
@@ -1,7 +1,7 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <PolicyRequirementRule xsi:type="NumberOfAttributeValues" attributeID="uid" minimum="1"
- maximum="3" />
-
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <PolicyRequirementRule xsi:type="NumberOfAttributeValues" attributeID="uid" minimum="1"
+ maximum="3" />
+
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/or.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/or.xml
index a13783f..edc02a6 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/or.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/or.xml
@@ -1,9 +1,9 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="OR">
- <Rule xsi:type="NOT">
- <Rule xsi:type="ANY" />
- </Rule>
- <Rule xsi:type="ANY" />
- </PolicyRequirementRule>
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="OR">
+ <Rule xsi:type="NOT">
+ <Rule xsi:type="ANY" />
+ </Rule>
+ <Rule xsi:type="ANY" />
+ </PolicyRequirementRule>
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/orSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/orSingleton.xml
index ecc79b3..02fa1b5 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/orSingleton.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/orSingleton.xml
@@ -1,6 +1,6 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="OR">
- <Rule xsi:type="ANY" />
- </PolicyRequirementRule>
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="OR">
+ <Rule xsi:type="ANY" />
+ </PolicyRequirementRule>
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate1.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate1.xml
index 40de63f..04095c8 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate1.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate1.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="Predicate" rulePredicateRef="pred" />
-
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="Predicate" rulePredicateRef="pred" />
+
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate2.xml
index 7a39bdf..1d221b8 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate2.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="Predicate" rulePredicateRef="pred" contextStrategyRef="ctxStrategy" />
-
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="Predicate" rulePredicateRef="pred" contextStrategyRef="ctxStrategy" />
+
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicateRp.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicateRp.xml
index f99431c..c28e196 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicateRp.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicateRp.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="Predicate" rulePredicateRef="rpPred" />
-
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="Predicate" rulePredicateRef="rpPred" />
+
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalName.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalName.xml
index 49112ae..85b76e9 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalName.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalName.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="PrincipalName" value="jsmith" />
-
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="PrincipalName" value="jsmith" />
+
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalNameRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalNameRegex.xml
index 49f153c..d2d8359 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalNameRegex.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalNameRegex.xml
@@ -1,4 +1,4 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="PrincipalNameRegex" regex="^jsmit.*$" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="PrincipalNameRegex" regex="^jsmit.*$" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityOne.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityOne.xml
index 6044ab1..1085f19 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityOne.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityOne.xml
@@ -1,9 +1,9 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
-
- <PolicyRequirementRule
- xsi:type="RegistrationAuthority" id="SilentTRUE"
- matchIfMetadataSilent="true"
- registrars="https://example.org/SilentTrue/One https://example.org/SilentTrue/Two" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+
+ <PolicyRequirementRule
+ xsi:type="RegistrationAuthority" id="SilentTRUE"
+ matchIfMetadataSilent="true"
+ registrars="https://example.org/SilentTrue/One https://example.org/SilentTrue/Two" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityTwo.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityTwo.xml
index eb93ea0..90de7c2 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityTwo.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityTwo.xml
@@ -1,9 +1,9 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
-
- <PolicyRequirementRule
- xsi:type="RegistrationAuthority" id="SilentTRUE"
- matchIfMetadataSilent="true"
- registrars="https://example.org/SilentFalse/One https://example.org/SilentFalse/Two https://example.org/SilentFalse/Three" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+
+ <PolicyRequirementRule
+ xsi:type="RegistrationAuthority" id="SilentTRUE"
+ matchIfMetadataSilent="true"
+ registrars="https://example.org/SilentFalse/One https://example.org/SilentFalse/Two https://example.org/SilentFalse/Three" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEA2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEA2.xml
index a8dee50..031d96b 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEA2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEA2.xml
@@ -1,7 +1,7 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="EntityAttributeExactMatch"
- attributeName="urn:example.org:policy"
- attributeValue="urn:example.org:policy:ABCD1234" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="EntityAttributeExactMatch"
+ attributeName="urn:example.org:policy"
+ attributeValue="urn:example.org:policy:ABCD1234" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEARegex2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEARegex2.xml
index aa5a63e..d69ab59 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEARegex2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEARegex2.xml
@@ -1,6 +1,6 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule
- xsi:type="EntityAttributeRegexMatch"
- attributeName="urn:example.org:policy" attributeValueRegex="^urn:example\.org:policy:[^:]*$" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule
+ xsi:type="EntityAttributeRegexMatch"
+ attributeName="urn:example.org:policy" attributeValueRegex="^urn:example\.org:policy:[^:]*$" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEG2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEG2.xml
index 78dacc0..f23729c 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEG2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEG2.xml
@@ -1,5 +1,5 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="InEntityGroup" groupID="urn:example.org" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="InEntityGroup" groupID="urn:example.org" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterNameId2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterNameId2.xml
index 642a5ee..6c64d8f 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterNameId2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterNameId2.xml
@@ -1,6 +1,6 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule
- xsi:type="NameIDFormatExactMatch" nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" />
-</AttributeFilterPolicy>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule
+ xsi:type="NameIDFormatExactMatch" nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted-v8.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted-v8.xml
index 837aad6..3084c5f 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted-v8.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted-v8.xml
@@ -1,8 +1,8 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <PolicyRequirementRule xsi:type="Script" language="JavaScript" customObjectRef="other.CustomScriptObject">
- <ScriptFile>src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script</ScriptFile>
- </PolicyRequirementRule>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <PolicyRequirementRule xsi:type="Script" language="JavaScript" customObjectRef="other.CustomScriptObject">
+ <ScriptFile>src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script</ScriptFile>
+ </PolicyRequirementRule>
</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted.xml
index a673350..f41f4cc 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted.xml
@@ -1,7 +1,7 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="Script" language="JavaScript" customObjectRef="other.CustomScriptObject">
- <ScriptFile>src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script</ScriptFile>
- </PolicyRequirementRule>
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="Script" language="JavaScript" customObjectRef="other.CustomScriptObject">
+ <ScriptFile>src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script</ScriptFile>
+ </PolicyRequirementRule>
</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml
index eb98b8b..fff542a 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml
@@ -1,11 +1,11 @@
-<afp:AttributeFilterPolicy id="MostBasicExample"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PolicyRequirementRule xsi:type="basic:AND">
- <basic:Rule xsi:type="basic:NOT">
- <basic:Rule xsi:type="basic:ANY" />
- </basic:Rule>
- </afp:PolicyRequirementRule>
+<afp:AttributeFilterPolicy id="MostBasicExample"
+ xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PolicyRequirementRule xsi:type="basic:AND">
+ <basic:Rule xsi:type="basic:NOT">
+ <basic:Rule xsi:type="basic:ANY" />
+ </basic:Rule>
+ </afp:PolicyRequirementRule>
</afp:AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script
index 421bc66..9370154 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script
@@ -1,2 +1,2 @@
-bool = Java.type("java.lang.Boolean");
+bool = Java.type("java.lang.Boolean");
new bool(false);
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml
index e879a30..76d7c53 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml
@@ -1,9 +1,9 @@
-<afp:AttributeFilterPolicy id="MostBasicExample"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PolicyRequirementRule xsi:type="basic:OR">
- <basic:Rule xsi:type="basic:ANY" />
- </afp:PolicyRequirementRule>
+<afp:AttributeFilterPolicy id="MostBasicExample"
+ xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <afp:PolicyRequirementRule xsi:type="basic:OR">
+ <basic:Rule xsi:type="basic:ANY" />
+ </afp:PolicyRequirementRule>
</afp:AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml
index aad7b8b..83f91f4 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
- <afp:AttributeRule attributeID="affiliation">
- <afp:DenyValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="staff" />
- <Rule xsi:type="AttributeValueString" value="student" />
- </afp:DenyValueRule>
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy> -->
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="true" p:attributeId="affiliation">
- <property name="matcher">
- <bean parent="shibboleth.OrMatcher" >
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </constructor-arg>
- </bean>
-
- <!--
- <afp:AttributeFilterPolicy id="InCommonRelease2">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy> -->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease2" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation" p:matcher-ref="shibboleth.ANYMatcher"/>
- </constructor-arg>
- </bean>
-
-<!-- </afp:AttributeFilterPolicyGroup> -->
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+<!--
+ <afp:AttributeFilterPolicy id="InCommonRelease">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY" />
+ <afp:AttributeRule attributeID="affiliation">
+ <afp:DenyValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xsi:type="OR">
+ <Rule xsi:type="AttributeValueString" value="staff" />
+ <Rule xsi:type="AttributeValueString" value="student" />
+ </afp:DenyValueRule>
+ </afp:AttributeRule>
+ </afp:AttributeFilterPolicy> -->
+
+ <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
+ <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
+
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule">
+ <constructor-arg name="attributeRules">
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="true" p:attributeId="affiliation">
+ <property name="matcher">
+ <bean parent="shibboleth.OrMatcher" >
+ <property name="subsidiaries">
+ <list>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <!--
+ <afp:AttributeFilterPolicy id="InCommonRelease2">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY" />
+ <afp:AttributeRule attributeID="affiliation">
+ <afp:PermitValueRule xsi:type="basic:ANY" />
+ </afp:AttributeRule>
+ </afp:AttributeFilterPolicy> -->
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease2" c:requirementRule-ref="shibboleth.ANYPolicyRule">
+ <constructor-arg name="attributeRules">
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation" p:matcher-ref="shibboleth.ANYMatcher"/>
+ </constructor-arg>
+ </bean>
+
+<!-- </afp:AttributeFilterPolicyGroup> -->
</beans>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml
index 8b3eb97..75e280b 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
-<!--
- <afp:DenyValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:type="OR" id="deny">
- <Rule xsi:type="AttributeValueString" value="staff" />
- <Rule xsi:type="AttributeValueString" value="student" />
- </afp:DenyValueRule>
--->
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
- <bean parent="shibboleth.OrMatcher" id="staffStudentMatcher">
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
- </list>
- </property>
- </bean>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="true" p:attributeId="affiliation" id="denyStaffStudent" p:matcher-ref="staffStudentMatcher"/>
-
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
-
- <afp:AttributeRule attributeID="affiliation">
- <afp:DenyValueRuleReference ref="deny" />
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
- -->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule"
- c:attributeRules="#{ {@denyStaffStudent}}"/>
-
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease2">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
-
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
--->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease2" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation" p:matcher-ref="shibboleth.ANYMatcher"/>
- </constructor-arg>
- </bean>
-<!--
-</afp:AttributeFilterPolicyGroup>
- -->
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+<!--
+ <afp:DenyValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xsi:type="OR" id="deny">
+ <Rule xsi:type="AttributeValueString" value="staff" />
+ <Rule xsi:type="AttributeValueString" value="student" />
+ </afp:DenyValueRule>
+-->
+ <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
+ <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
+
+ <bean parent="shibboleth.OrMatcher" id="staffStudentMatcher">
+ <property name="subsidiaries">
+ <list>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="true" p:attributeId="affiliation" id="denyStaffStudent" p:matcher-ref="staffStudentMatcher"/>
+
+<!--
+ <afp:AttributeFilterPolicy id="InCommonRelease">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY" />
+
+ <afp:AttributeRule attributeID="affiliation">
+ <afp:DenyValueRuleReference ref="deny" />
+ </afp:AttributeRule>
+
+ </afp:AttributeFilterPolicy>
+ -->
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule"
+ c:attributeRules="#{ {@denyStaffStudent}}"/>
+
+<!--
+ <afp:AttributeFilterPolicy id="InCommonRelease2">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY" />
+
+ <afp:AttributeRule attributeID="affiliation">
+ <afp:PermitValueRule xsi:type="basic:ANY" />
+ </afp:AttributeRule>
+
+ </afp:AttributeFilterPolicy>
+-->
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease2" c:requirementRule-ref="shibboleth.ANYPolicyRule">
+ <constructor-arg name="attributeRules">
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation" p:matcher-ref="shibboleth.ANYMatcher"/>
+ </constructor-arg>
+ </bean>
+<!--
+</afp:AttributeFilterPolicyGroup>
+ -->
</beans>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml
index 8762df0..b0f177e 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-<!--
- <afp:AttributeFilterPolicy >
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
-
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="faculty"/>
- <Rule xsi:type="AttributeValueString" value="student"/>
- <Rule xsi:type="AttributeValueString" value="staff"/>
- <Rule xsi:type="AttributeValueString" value="alum"/>
- <Rule xsi:type="AttributeValueString" value="member"/>
- <Rule xsi:type="AttributeValueString" value="affiliate"/>
- <Rule xsi:type="AttributeValueString" value="employee"/>
- </afp:PermitValueRule>
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
- -->
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="AffiliationRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation">
- <property name="matcher">
- <bean parent="shibboleth.OrMatcher">
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee"/>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </constructor-arg>
- </bean>
-
-<!-- </afp:AttributeFilterPolicyGroup>
--->
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+<!--
+ <afp:AttributeFilterPolicy >
+ <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
+
+ <afp:AttributeRule attributeID="affiliation">
+ <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" xsi:type="OR">
+ <Rule xsi:type="AttributeValueString" value="faculty"/>
+ <Rule xsi:type="AttributeValueString" value="student"/>
+ <Rule xsi:type="AttributeValueString" value="staff"/>
+ <Rule xsi:type="AttributeValueString" value="alum"/>
+ <Rule xsi:type="AttributeValueString" value="member"/>
+ <Rule xsi:type="AttributeValueString" value="affiliate"/>
+ <Rule xsi:type="AttributeValueString" value="employee"/>
+ </afp:PermitValueRule>
+ </afp:AttributeRule>
+
+ </afp:AttributeFilterPolicy>
+ -->
+ <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
+ <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
+
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="AffiliationRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule">
+ <constructor-arg name="attributeRules">
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation">
+ <property name="matcher">
+ <bean parent="shibboleth.OrMatcher">
+ <property name="subsidiaries">
+ <list>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee"/>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+<!-- </afp:AttributeFilterPolicyGroup>
+-->
+</beans>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml
index e74c6a3..0725133 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
-
-<!--
- <afp:AttributeFilterPolicy id="MostBasicExample">
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
-
- <afp:AttributeRule attributeID="email">
- <afp:PermitValueRule xsi:type="basic:ANY"/>
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy>
--->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="MostBasicExample" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="email" p:matcher-ref="shibboleth.ANYMatcher"/>
- </constructor-arg>
- </bean>
-<!--
-</afp:AttributeFilterPolicyGroup>
- -->
- </beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
+
+<!--
+ <afp:AttributeFilterPolicy id="MostBasicExample">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
+
+ <afp:AttributeRule attributeID="email">
+ <afp:PermitValueRule xsi:type="basic:ANY"/>
+ </afp:AttributeRule>
+ </afp:AttributeFilterPolicy>
+-->
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="MostBasicExample" c:requirementRule-ref="shibboleth.ANYPolicyRule">
+ <constructor-arg name="attributeRules">
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="email" p:matcher-ref="shibboleth.ANYMatcher"/>
+ </constructor-arg>
+ </bean>
+<!--
+</afp:AttributeFilterPolicyGroup>
+ -->
+ </beans>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml
index 9a04c57..3002908 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
-
- <bean parent="shibboleth.OrMatcher" id="wobbleMatcher">
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty" id="fac"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student" id="stud"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff" id="stadd"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum" id="alum"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member" id="member"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate" id="affilient"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee" id = "emp"/>
- </list>
- </property>
- </bean>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" id="wobble" p:attributeId="affiliation" p:matcher-ref="wobbleMatcher"/>
-<!--
- <afp:AttributeRule attributeID="affiliation" id="wobble">
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- id="Wibble" xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
- <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
- <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
- <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
- <Rule xsi:type="AttributeValueString" value="member" id="member"/>
- <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
- <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
- </afp:PermitValueRule>
- </afp:AttributeRule>
- -->
-
- <!-- Release affiliation to anyone in the InCommon group -->
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" id="pq"/>
-
- <afp:AttributeRuleReference ref="wobble"/>
-
- </afp:AttributeFilterPolicy>
- -->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule"
- c:attributeRules="#{ {@wobble}}"/>
- <!--
- </afp:AttributeFilterPolicyGroup>
- -->
- </beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
+ <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
+
+
+ <bean parent="shibboleth.OrMatcher" id="wobbleMatcher">
+ <property name="subsidiaries">
+ <list>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty" id="fac"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student" id="stud"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff" id="stadd"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum" id="alum"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member" id="member"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate" id="affilient"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee" id = "emp"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" id="wobble" p:attributeId="affiliation" p:matcher-ref="wobbleMatcher"/>
+<!--
+ <afp:AttributeRule attributeID="affiliation" id="wobble">
+ <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
+ id="Wibble" xsi:type="OR">
+ <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
+ <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
+ <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
+ <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
+ <Rule xsi:type="AttributeValueString" value="member" id="member"/>
+ <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
+ <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
+ </afp:PermitValueRule>
+ </afp:AttributeRule>
+ -->
+
+ <!-- Release affiliation to anyone in the InCommon group -->
+<!--
+ <afp:AttributeFilterPolicy id="InCommonRelease">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY" id="pq"/>
+
+ <afp:AttributeRuleReference ref="wobble"/>
+
+ </afp:AttributeFilterPolicy>
+ -->
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule"
+ c:attributeRules="#{ {@wobble}}"/>
+ <!--
+ </afp:AttributeFilterPolicyGroup>
+ -->
+ </beans>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml
index 60a4c20..96315c0 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
-<!--
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- id="wibbleMatcher" xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
- <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
- <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
- <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
- <Rule xsi:type="AttributeValueString" value="member" id="member"/>
- <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
- <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
- </afp:PermitValueRule>
-
--->
-
- <bean parent="shibboleth.OrMatcher" id="wibbleMatcher">
- <property name="subsidiaries">
- <list >
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty" id="fac"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student" id="stud"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff" id="stadd"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum" id="alum"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member" id="member"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate" id="affilient"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee" id = "emp"/>
- </list>
- </property>
- </bean>
-<!--
- <afp:AttributeRule attributeID="affiliation" id="wibble">
- <afp:PermitValueRuleReference ref="wibbleMatcher"/>
- </afp:AttributeRule>
--->
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" id="wibble" p:attributeId="affiliation" p:matcher-ref="wibbleMatcher"/>
-
-<!-- <afp:AttributeFilterPolicy id="InCommonRelease">
- Turn on rule if an attribute call firstName has value "john"
- <afp:PolicyRequirementRule xsi:type="basic:AttributeValueString" value="john" attributeID="firstName"/>
-
- <afp:AttributeRuleReference ref="wobble"/>
-
- </afp:AttributeFilterPolicy>
--->
- <bean id="FirstNameJohnPolicy" class="net.shibboleth.idp.attribute.filter.PolicyFromMatcherId" c:attribute="firstName">
- <constructor-arg name="matcher">
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="john"/>
- </constructor-arg>
- </bean>
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="FirstNameJohnPolicy" c:attributeRules="#{ {@wibble}}"/>
-<!--
-</afp:AttributeFilterPolicyGroup>
--->
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
+ <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
+ <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
+
+<!--
+ <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
+ id="wibbleMatcher" xsi:type="OR">
+ <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
+ <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
+ <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
+ <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
+ <Rule xsi:type="AttributeValueString" value="member" id="member"/>
+ <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
+ <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
+ </afp:PermitValueRule>
+
+-->
+
+ <bean parent="shibboleth.OrMatcher" id="wibbleMatcher">
+ <property name="subsidiaries">
+ <list >
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty" id="fac"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student" id="stud"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff" id="stadd"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum" id="alum"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member" id="member"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate" id="affilient"/>
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee" id = "emp"/>
+ </list>
+ </property>
+ </bean>
+<!--
+ <afp:AttributeRule attributeID="affiliation" id="wibble">
+ <afp:PermitValueRuleReference ref="wibbleMatcher"/>
+ </afp:AttributeRule>
+-->
+
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" id="wibble" p:attributeId="affiliation" p:matcher-ref="wibbleMatcher"/>
+
+<!-- <afp:AttributeFilterPolicy id="InCommonRelease">
+ Turn on rule if an attribute call firstName has value "john"
+ <afp:PolicyRequirementRule xsi:type="basic:AttributeValueString" value="john" attributeID="firstName"/>
+
+ <afp:AttributeRuleReference ref="wobble"/>
+
+ </afp:AttributeFilterPolicy>
+-->
+ <bean id="FirstNameJohnPolicy" class="net.shibboleth.idp.attribute.filter.PolicyFromMatcherId" c:attribute="firstName">
+ <constructor-arg name="matcher">
+ <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="john"/>
+ </constructor-arg>
+ </bean>
+ <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="FirstNameJohnPolicy" c:attributeRules="#{ {@wibble}}"/>
+<!--
+</afp:AttributeFilterPolicyGroup>
+-->
+</beans>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policyAll.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policyAll.xml
index 78f2552..6fc5443 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policyAll.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policyAll.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample3"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
-
- <afp:AttributeFilterPolicy id="MostBasicExample">
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
-
- <afp:AttributeRule attributeID="email" permitAny="true"/>
- </afp:AttributeFilterPolicy>
-
-</afp:AttributeFilterPolicyGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+<afp:AttributeFilterPolicyGroup id="PolicyExample3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp"
+ xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+
+ <afp:AttributeFilterPolicy id="MostBasicExample">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
+
+ <afp:AttributeRule attributeID="email" permitAny="true"/>
+ </afp:AttributeFilterPolicy>
+
+</afp:AttributeFilterPolicyGroup>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
index 156c988..bab1bcd 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample4"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
-
- <afp:AttributeRule attributeID="affiliation" id="wobble">
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- id="Wibble" xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
- <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
- <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
- <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
- <Rule xsi:type="AttributeValueString" value="member" id="member"/>
- <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
- <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
- </afp:PermitValueRule>
- </afp:AttributeRule>
-
- <!-- Release affiliation to anyone in the InCommon group -->
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" id="pq"/>
-
- <afp:AttributeRuleReference ref="wobble"/>
-
- </afp:AttributeFilterPolicy>
-
-</afp:AttributeFilterPolicyGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+<afp:AttributeFilterPolicyGroup id="PolicyExample4"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+
+ <afp:AttributeRule attributeID="affiliation" id="wobble">
+ <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
+ id="Wibble" xsi:type="OR">
+ <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
+ <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
+ <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
+ <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
+ <Rule xsi:type="AttributeValueString" value="member" id="member"/>
+ <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
+ <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
+ </afp:PermitValueRule>
+ </afp:AttributeRule>
+
+ <!-- Release affiliation to anyone in the InCommon group -->
+ <afp:AttributeFilterPolicy id="InCommonRelease">
+ <afp:PolicyRequirementRule xsi:type="basic:ANY" id="pq"/>
+
+ <afp:AttributeRuleReference ref="wobble"/>
+
+ </afp:AttributeFilterPolicy>
+
+</afp:AttributeFilterPolicyGroup>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/addAfterGetValues.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/addAfterGetValues.script
index 2916212..2ca04f4 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/addAfterGetValues.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/addAfterGetValues.script
@@ -1,2 +1,2 @@
-Scripted.getValues();
-Scripted.addValue("newValue");
+Scripted.getValues();
+Scripted.addValue("newValue");
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes.script
index 0dfd78c..b4f151b 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes.script
@@ -1,6 +1,6 @@
-values = at1.getNativeAttribute().getValues().iterator();
- val = values.next();
- Scripted.addValue(val.getValue());
- val = values.next();
- Scripted.addValue(val);
+values = at1.getNativeAttribute().getValues().iterator();
+ val = values.next();
+ Scripted.addValue(val.getValue());
+ val = values.next();
+ Scripted.addValue(val);
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script
index 3b58d0a..c865d33 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script
@@ -1,8 +1,8 @@
-values = at1.getValues().iterator();
-val = values.next();
-Scripted.addValue(val);
- if (values.hasNext()) {
- val = values.next();
- Scripted.addValue(val);
- }
+values = at1.getValues().iterator();
+val = values.next();
+Scripted.addValue(val);
+ if (values.hasNext()) {
+ val = values.next();
+ Scripted.addValue(val);
+ }
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
index f5a6a7d..bbd4962 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
@@ -1,7 +1,7 @@
-importPackage(Packages.net.shibboleth.idp.attribute.resolver.impl.ad);
-
-child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-
-Scripted.addValue(child.getClass().getSimpleName());
-Scripted.addValue(profileContext.getClass().getSimpleName());
-
+importPackage(Packages.net.shibboleth.idp.attribute.resolver.impl.ad);
+
+child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
+
+Scripted.addValue(child.getClass().getSimpleName());
+Scripted.addValue(profileContext.getClass().getSimpleName());
+
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/custom.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/custom.script
index db6d001..658289e 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/custom.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/custom.script
@@ -1 +1 @@
-Scripted.addValue(custom);
+Scripted.addValue(custom);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.attribute.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.attribute.xml
index 05a9aa5..2919941 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.attribute.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.attribute.xml
@@ -1,5 +1,5 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="uidNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">12345678</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="uidNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">12345678</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
index f9e929e..f7a01ae 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
@@ -1,19 +1,19 @@
-// Import Shibboleth attribute provider
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Import Apache commons codecs
-importPackage(Packages.org.apache.commons.codec.digest);
-
-// Get the unique value
-uniqueValue = uidNumber.getValues().get(0) + "some#salt#value#12345679";
-
-// Create md5 value
-localpart = DigestUtils.md5Hex(uniqueValue);
-
-// Get attribute to add DO NOT DO THIS FOR NASHORN/JDK8
-if (null == swissEduPersonUniqueID ) {
- swissEduPersonUniqueID = new BasicAttribute("swissEduPersonUniqueID");
-}
-
-// Prepend unique and pseudo-random localpart to domain name
+// Import Shibboleth attribute provider
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+// Import Apache commons codecs
+importPackage(Packages.org.apache.commons.codec.digest);
+
+// Get the unique value
+uniqueValue = uidNumber.getValues().get(0) + "some#salt#value#12345679";
+
+// Create md5 value
+localpart = DigestUtils.md5Hex(uniqueValue);
+
+// Get attribute to add DO NOT DO THIS FOR NASHORN/JDK8
+if (null == swissEduPersonUniqueID ) {
+ swissEduPersonUniqueID = new BasicAttribute("swissEduPersonUniqueID");
+}
+
+// Prepend unique and pseudo-random localpart to domain name
swissEduPersonUniqueID.getValues().add(localpart + "@switch.ch");
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.attribute.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.attribute.xml
index 7e784d7..fd7c91e 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.attribute.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.attribute.xml
@@ -1,6 +1,6 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="memberOf" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">fsdfdsfdsOU=Studentsfsdfdfsd</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">xOU=Stafffff</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="memberOf" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">fsdfdsfdsOU=Studentsfsdfdfsd</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">xOU=Stafffff</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
index 50b2468..b355b9d 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
@@ -1,31 +1,31 @@
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Create attribute to be returned from definition DO NOT DO FOR NASHORHN/JDK8
-if (null == eduPersonAffiliation) {
- eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
-}
-
-// Add at least one value
-eduPersonAffiliation.getValues().add("affiliate");
-
-// If the user has group membership
-if (typeof memberOf != "undefined" && memberOf != null ){
- // The go through each group membership and add the appropriate affiliation
- // The IdP will remove duplicate values so we don't need to worry about that here
- for ( i = 0; memberOf != null && i < memberOf.getValues().size(); i++ ){
- value = memberOf.getValues().get(i);
-
- if (value.indexOf("OU=Students") > 0){
- eduPersonAffiliation.getValues().add("student");
- }
-
- if (value.indexOf("OU=Teachers") > 0){
- eduPersonAffiliation.getValues().add("faculty");
- eduPersonAffiliation.getValues().add("staff");
- }
-
- if (value.indexOf("OU=Staff") > 0){
- eduPersonAffiliation.getValues().add("staff");
- }
- }
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+// Create attribute to be returned from definition DO NOT DO FOR NASHORHN/JDK8
+if (null == eduPersonAffiliation) {
+ eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
+}
+
+// Add at least one value
+eduPersonAffiliation.getValues().add("affiliate");
+
+// If the user has group membership
+if (typeof memberOf != "undefined" && memberOf != null ){
+ // The go through each group membership and add the appropriate affiliation
+ // The IdP will remove duplicate values so we don't need to worry about that here
+ for ( i = 0; memberOf != null && i < memberOf.getValues().size(); i++ ){
+ value = memberOf.getValues().get(i);
+
+ if (value.indexOf("OU=Students") > 0){
+ eduPersonAffiliation.getValues().add("student");
+ }
+
+ if (value.indexOf("OU=Teachers") > 0){
+ eduPersonAffiliation.getValues().add("faculty");
+ eduPersonAffiliation.getValues().add("staff");
+ }
+
+ if (value.indexOf("OU=Staff") > 0){
+ eduPersonAffiliation.getValues().add("staff");
+ }
+ }
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.2.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.2.xml
index df49613..3f0dea7 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.2.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.2.xml
@@ -1,9 +1,9 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="memberOf" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">CN=Green,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">walkin</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="memberOf" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">CN=Green,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">walkin</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.xml
index bc486a5..63b788e 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.xml
@@ -1,6 +1,6 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="memberOf" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">CN=Green,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="memberOf" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">CN=Green,OU=Groups and Resources,DC=EXAMPLE,DC=ORG</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
index 55ee7ac..52ae3b1 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
@@ -1,8 +1,8 @@
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-if (eduPersonAffiliation == null) {
- eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
-}
-is_Staff = memberOf != null && memberOf.getValues().contains("CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG");
-
-if (is_Staff) { eduPersonAffiliation.getValues().add("staff"); };
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+if (eduPersonAffiliation == null) {
+ eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
+}
+is_Staff = memberOf != null && memberOf.getValues().contains("CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG");
+
+if (is_Staff) { eduPersonAffiliation.getValues().add("staff"); };
if (is_Staff) { eduPersonAffiliation.getValues().add("member"); };
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.2.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.2.xml
index beebb1f..edd0771 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.2.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.2.xml
@@ -1,8 +1,8 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">LittleGreenMen</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">staff</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">LittleGreenMen</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">staff</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.3.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.3.xml
index 7dc902c..74ac50f 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.3.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.3.xml
@@ -1,5 +1,5 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">walkin</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">walkin</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.xml
index 4a179dc..8c9e8b0 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.xml
@@ -1,5 +1,5 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">student</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">student</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
index 8d9ea42..6fd043b 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
@@ -1,9 +1,9 @@
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Create attribute to be returned from definition
-if (eduPersonEntitlement == null) eduPersonEntitlement = new BasicAttribute("eduPersonEntitlement");
-
-if (eduPersonAffiliation.getValues().contains("staff") ||
- eduPersonAffiliation.getValues().contains("student")) {
- eduPersonEntitlement.getValues().add("urn:mace:dir:entitlement:common-lib-terms");
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+// Create attribute to be returned from definition
+if (eduPersonEntitlement == null) eduPersonEntitlement = new BasicAttribute("eduPersonEntitlement");
+
+if (eduPersonAffiliation.getValues().contains("staff") ||
+ eduPersonAffiliation.getValues().contains("student")) {
+ eduPersonEntitlement.getValues().add("urn:mace:dir:entitlement:common-lib-terms");
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail1.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail1.script
index 3ea7658..4508618 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail1.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail1.script
@@ -1 +1 @@
-Scripted.nonexistant();
+Scripted.nonexistant();
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail2.script
index 7003086..9582542 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail2.script
@@ -1,2 +1,2 @@
-Scripted = "4567";
-Scripted.getValues().add("sgsg");
+Scripted = "4567";
+Scripted.getValues().add("sgsg");
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail3.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail3.script
index e0153df..74b978e 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail3.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail3.script
@@ -1 +1 @@
-Scripted = null;
+Scripted = null;
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail4.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail4.script
index 1617aa5..7fe8b14 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail4.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail4.script
@@ -1,2 +1,2 @@
-Scripted.getValues();
-Scripted.getNativeAttribute();
+Scripted.getValues();
+Scripted.getNativeAttribute();
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail5.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail5.script
index 3938f6d..0a695e3 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail5.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail5.script
@@ -1,2 +1,2 @@
-Scripted.getNativeAttribute();
-Scripted.getValues();
+Scripted.getNativeAttribute();
+Scripted.getValues();
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script
index 5543284..fe942c2 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script
@@ -1,3 +1,3 @@
-importPackage(Packages.java.lang);
-
-Scripted.addValue(new Integer(21));
+importPackage(Packages.java.lang);
+
+Scripted.addValue(new Integer(21));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script
index fe588c4..04d440e 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script
@@ -1,4 +1,4 @@
-child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-
-Scripted.addValue(child.getClass().getSimpleName());
-Scripted.addValue(profileContext.getClass().getSimpleName());
+child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
+
+Scripted.addValue(child.getClass().getSimpleName());
+Scripted.addValue(profileContext.getClass().getSimpleName());
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script
index 7b4dc12..b06abe6 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script
@@ -1,21 +1,21 @@
-load('nashorn:mozilla_compat.js')
-
-// Import Shibboleth attribute provider
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Import Apache commons codecs
-importPackage(Packages.org.apache.commons.codec.digest);
-
-// Get the unique value
-uniqueValue = uidNumber.getValues().get(0) + "some#salt#value#12345679";
-
-// Create md5 value
-localpart = DigestUtils.md5Hex(uniqueValue);
-
-// Get attribute to add DO NOT DO THIS FOR NASHORN.
-if (null == swissEduPersonUniqueID ) {
- swissEduPersonUniqueID = new BasicAttribute("swissEduPersonUniqueID");
-}
-
-// Prepend unique and pseudo-random localpart to domain name
+load('nashorn:mozilla_compat.js')
+
+// Import Shibboleth attribute provider
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+// Import Apache commons codecs
+importPackage(Packages.org.apache.commons.codec.digest);
+
+// Get the unique value
+uniqueValue = uidNumber.getValues().get(0) + "some#salt#value#12345679";
+
+// Create md5 value
+localpart = DigestUtils.md5Hex(uniqueValue);
+
+// Get attribute to add DO NOT DO THIS FOR NASHORN.
+if (null == swissEduPersonUniqueID ) {
+ swissEduPersonUniqueID = new BasicAttribute("swissEduPersonUniqueID");
+}
+
+// Prepend unique and pseudo-random localpart to domain name
swissEduPersonUniqueID.getValues().add(localpart + "@switch.ch");
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script
index 2eec224..3ede1ba 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script
@@ -1,32 +1,32 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Create attribute to be returned from definition DO NOT DO FOR NASHORHN
-if (null == eduPersonAffiliation) {
- eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
-}
-
-// Add at least one value
-eduPersonAffiliation.getValues().add("affiliate");
-
-// If the user has group membership
-if (typeof memberOf != "undefined" && memberOf != null ){
- // The go through each group membership and add the appropriate affiliation
- // The IdP will remove duplicate values so we don't need to worry about that here
- for ( i = 0; memberOf != null && i < memberOf.getValues().size(); i++ ){
- value = memberOf.getValues().get(i);
-
- if (value.indexOf("OU=Students") > 0){
- eduPersonAffiliation.getValues().add("student");
- }
-
- if (value.indexOf("OU=Teachers") > 0){
- eduPersonAffiliation.getValues().add("faculty");
- eduPersonAffiliation.getValues().add("staff");
- }
-
- if (value.indexOf("OU=Staff") > 0){
- eduPersonAffiliation.getValues().add("staff");
- }
- }
+load('nashorn:mozilla_compat.js')
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+// Create attribute to be returned from definition DO NOT DO FOR NASHORHN
+if (null == eduPersonAffiliation) {
+ eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
+}
+
+// Add at least one value
+eduPersonAffiliation.getValues().add("affiliate");
+
+// If the user has group membership
+if (typeof memberOf != "undefined" && memberOf != null ){
+ // The go through each group membership and add the appropriate affiliation
+ // The IdP will remove duplicate values so we don't need to worry about that here
+ for ( i = 0; memberOf != null && i < memberOf.getValues().size(); i++ ){
+ value = memberOf.getValues().get(i);
+
+ if (value.indexOf("OU=Students") > 0){
+ eduPersonAffiliation.getValues().add("student");
+ }
+
+ if (value.indexOf("OU=Teachers") > 0){
+ eduPersonAffiliation.getValues().add("faculty");
+ eduPersonAffiliation.getValues().add("staff");
+ }
+
+ if (value.indexOf("OU=Staff") > 0){
+ eduPersonAffiliation.getValues().add("staff");
+ }
+ }
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script
index 8194986..55731ba 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script
@@ -1,9 +1,9 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-if (eduPersonAffiliation == null) {
- eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
-}
-is_Staff = memberOf != null && memberOf.getValues().contains("CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG");
-
-if (is_Staff) { eduPersonAffiliation.getValues().add("staff"); };
+load('nashorn:mozilla_compat.js')
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+if (eduPersonAffiliation == null) {
+ eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
+}
+is_Staff = memberOf != null && memberOf.getValues().contains("CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG");
+
+if (is_Staff) { eduPersonAffiliation.getValues().add("staff"); };
if (is_Staff) { eduPersonAffiliation.getValues().add("member"); };
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script
index bde632a..f84ee69 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script
@@ -1,10 +1,10 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Create attribute to be returned from definition
-if (eduPersonEntitlement == null) eduPersonEntitlement = new BasicAttribute("eduPersonEntitlement");
-
-if (eduPersonAffiliation.getValues().contains("staff") ||
- eduPersonAffiliation.getValues().contains("student")) {
- eduPersonEntitlement.getValues().add("urn:mace:dir:entitlement:common-lib-terms");
+load('nashorn:mozilla_compat.js')
+importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+// Create attribute to be returned from definition
+if (eduPersonEntitlement == null) eduPersonEntitlement = new BasicAttribute("eduPersonEntitlement");
+
+if (eduPersonAffiliation.getValues().contains("staff") ||
+ eduPersonAffiliation.getValues().contains("student")) {
+ eduPersonEntitlement.getValues().add("urn:mace:dir:entitlement:common-lib-terms");
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/fail6.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/fail6.script
index 42e8be2..a084fa8 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/fail6.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/fail6.script
@@ -1 +1 @@
-Scripted.addValue(new (Java.type("java.lang.Integer"))(21));
+Scripted.addValue(new (Java.type("java.lang.Integer"))(21));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/logging.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/logging.script
index 4c5942f..01b3a41 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/logging.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/logging.script
@@ -1,6 +1,6 @@
-logger = Java.type("org.slf4j.LoggerFactory").getLogger("net.shibboleth.idp.attribute");
-
-Scripted.addValue("foo");
-Scripted.addValue("bar");
-
+logger = Java.type("org.slf4j.LoggerFactory").getLogger("net.shibboleth.idp.attribute");
+
+Scripted.addValue("foo");
+Scripted.addValue("bar");
+
logger.info("Values of scriptTest were: {} ", Scripted.getValues());
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/nullValue.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/nullValue.script
index 029046a..198f2d3 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/nullValue.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/nullValue.script
@@ -1,5 +1,5 @@
-nativeAttribute = Scripted.getNativeAttribute();
-tmp = new (Java.type("java.util.HashSet"));
-val = Java.type("net.shibboleth.idp.attribute.StringAttributeValue").valueOf(null);
-tmp.add(val);
-nativeAttribute.setValues(tmp);
+nativeAttribute = Scripted.getNativeAttribute();
+tmp = new (Java.type("java.util.HashSet"));
+val = Java.type("net.shibboleth.idp.attribute.StringAttributeValue").valueOf(null);
+tmp.add(val);
+nativeAttribute.setValues(tmp);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simple2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simple2.script
index 74ecf45..ae4f180 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simple2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simple2.script
@@ -1,3 +1,3 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.net.shibboleth.idp.attribute);
-Scripted.addValue(new StringAttributeValue("simple"));
+load('nashorn:mozilla_compat.js')
+importPackage(Packages.net.shibboleth.idp.attribute);
+Scripted.addValue(new StringAttributeValue("simple"));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simpleWithPredef.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simpleWithPredef.script
index bcc0f05..fc254df 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simpleWithPredef.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simpleWithPredef.script
@@ -1,6 +1,6 @@
-nativeAttribute = Scripted.getNativeAttribute();
-tmp = new (Java.type("java.util.HashSet"));
-tmp.addAll(nativeAttribute.getValues());
-val = new (Java.type("net.shibboleth.idp.attribute.StringAttributeValue"))("simple");
-tmp.add(val);
-nativeAttribute.setValues(tmp);
+nativeAttribute = Scripted.getNativeAttribute();
+tmp = new (Java.type("java.util.HashSet"));
+tmp.addAll(nativeAttribute.getValues());
+val = new (Java.type("net.shibboleth.idp.attribute.StringAttributeValue"))("simple");
+tmp.add(val);
+nativeAttribute.setValues(tmp);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script
index e8d0a6c..c71f69d 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script
@@ -1,8 +1,8 @@
-importPackage(Packages.org.slf4j);
-
-logger = LoggerFactory.getLogger("net.shibboleth.idp.attribute");
-
-Scripted.addValue("foo");
-Scripted.addValue("bar");
-
+importPackage(Packages.org.slf4j);
+
+logger = LoggerFactory.getLogger("net.shibboleth.idp.attribute");
+
+Scripted.addValue("foo");
+Scripted.addValue("bar");
+
logger.error("Values of scriptTest were: {} ", Scripted.getValues());
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
index 8e2373e..c3f3fa6 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
@@ -1 +1 @@
-Scripted.addValue(null);
+Scripted.addValue(null);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContext.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContext.script
index b129a5a..45a59ae 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContext.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContext.script
@@ -1,5 +1,5 @@
-if (scripted.getId() == "scripted") {
- scripted.addValue(requestContext.getPrincipalName());
- scripted.addValue(requestContext.getLocalEntityId());
- scripted.addValue(requestContext.getPeerEntityId());
-}
+if (scripted.getId() == "scripted") {
+ scripted.addValue(requestContext.getPrincipalName());
+ scripted.addValue(requestContext.getLocalEntityId());
+ scripted.addValue(requestContext.getPeerEntityId());
+}
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
index 328e72d..0f8768d 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
@@ -1,89 +1,89 @@
-
-requestContext.getInboundSAMLMessage();
-requestContext.getInboundSAMLMessageId();
-requestContext.getInboundSAMLMessageIssueInstant();
-requestContext.getInboundSAMLProtocol();
-requestContext.getLocalEntityMetadata();
-requestContext.getLocalEntityRole();
-requestContext.getLocalEntityRoleMetadata();
-requestContext.getMetadataResolver();
-requestContext.getOuboundSAMLMessageSigningCredential();
-requestContext.getOutboundMessageArtifactType();
-requestContext.getOutboundSAMLMessage();
-requestContext.getOutboundSAMLMessageId();
-requestContext.getOutboundSAMLMessageIssueInstant();
-requestContext.getOutboundSAMLProtocol();
-requestContext.getPeerEntityEndpoint();
-requestContext.getPeerEntityMetadata();
-requestContext.getPeerEntityRole();
-requestContext.getPeerEntityRoleMetadata();
-requestContext.getRelayState();
-requestContext.getSubjectNameIdentifier();
-requestContext.getCommunicationProfileId();
-requestContext.getInboundMessage();
-requestContext.getInboundMessageIssuer();
-requestContext.getInboundMessageTransport();
-requestContext.getOutboundMessage();
-requestContext.getOutboundMessageIssuer();
-requestContext.getOutboundMessageTransport();
-requestContext.getSecurityPolicyResolver();
-requestContext.getPreSecurityInboundHandlerChainResolver();
-requestContext.getPostSecurityInboundHandlerChainResolver();
-requestContext.getOutboundHandlerChainResolver();
-requestContext.getProfileConfiguration();
-requestContext.getRelyingPartyConfiguration();
-requestContext.getUserSession();
-requestContext.getReleasedAttributes();
-requestContext.getRequestedAttributesIds();
-requestContext.getAttributes();
-requestContext.getPrincipalAuthenticationMethod();
-
-requestContext.isInboundSAMLMessageAuthenticated();
-requestContext.isIssuerAuthenticated();
-
-requestContext.setInboundSAMLMessage(null);
-requestContext.setInboundSAMLMessageAuthenticated(true);
-requestContext.setInboundSAMLMessageId("foo");
-requestContext.setInboundSAMLMessageIssueInstant(null);
-requestContext.setInboundSAMLProtocol("foo");
-requestContext.setLocalEntityId("foo");
-requestContext.setLocalEntityMetadata(null);
-requestContext.setLocalEntityRole(null);
-requestContext.setLocalEntityRoleMetadata(null);
-requestContext.setMetadataResolver("foo");
-requestContext.setOutboundMessageArtifactType(null);
-requestContext.setOutboundSAMLMessage(null);
-requestContext.setOutboundSAMLMessageId("foo");
-requestContext.setOutboundSAMLMessageIssueInstant(null);
-requestContext.setOutboundSAMLMessageSigningCredential(null);
-requestContext.setOutboundSAMLProtocol("foo");
-requestContext.setPeerEntityEndpoint(null);
-requestContext.setPeerEntityId(null);
-requestContext.setPeerEntityMetadata(null);
-requestContext.setPeerEntityRole(null);
-requestContext.setPeerEntityRoleMetadata(null);
-requestContext.setRelayState("foo");
-requestContext.setSubjectNameIdentifier(null);
-requestContext.setCommunicationProfileId("foo");
-requestContext.setInboundMessage(null);
-requestContext.setInboundMessageIssuer("foo");
-requestContext.setInboundMessageTransport("foo");
-requestContext.setOutboundMessage(null);
-requestContext.setOutboundMessageIssuer("foo");
-requestContext.setOutboundMessageTransport("foo");
-requestContext.setSecurityPolicyResolver("foo");
-requestContext.setPreSecurityInboundHandlerChainResolver("foo");
-requestContext.setPostSecurityInboundHandlerChainResolver("foo");
-requestContext.setOutboundHandlerChainResolver(null);
-requestContext.setProfileConfiguration("foo");
-requestContext.setRelyingPartyConfiguration("foo");
-requestContext.setAttributes(null);
-requestContext.setUserSession("foo");
-requestContext.setReleasedAttributes(null);
-requestContext.setRequestedAttributes(null);
-requestContext.setPrincipalAuthenticationMethod("foo");
-requestContext.setPrincipalName("foo");
-
-scripted.addValue("AllDone");
-
-
+
+requestContext.getInboundSAMLMessage();
+requestContext.getInboundSAMLMessageId();
+requestContext.getInboundSAMLMessageIssueInstant();
+requestContext.getInboundSAMLProtocol();
+requestContext.getLocalEntityMetadata();
+requestContext.getLocalEntityRole();
+requestContext.getLocalEntityRoleMetadata();
+requestContext.getMetadataResolver();
+requestContext.getOuboundSAMLMessageSigningCredential();
+requestContext.getOutboundMessageArtifactType();
+requestContext.getOutboundSAMLMessage();
+requestContext.getOutboundSAMLMessageId();
+requestContext.getOutboundSAMLMessageIssueInstant();
+requestContext.getOutboundSAMLProtocol();
+requestContext.getPeerEntityEndpoint();
+requestContext.getPeerEntityMetadata();
+requestContext.getPeerEntityRole();
+requestContext.getPeerEntityRoleMetadata();
+requestContext.getRelayState();
+requestContext.getSubjectNameIdentifier();
+requestContext.getCommunicationProfileId();
+requestContext.getInboundMessage();
+requestContext.getInboundMessageIssuer();
+requestContext.getInboundMessageTransport();
+requestContext.getOutboundMessage();
+requestContext.getOutboundMessageIssuer();
+requestContext.getOutboundMessageTransport();
+requestContext.getSecurityPolicyResolver();
+requestContext.getPreSecurityInboundHandlerChainResolver();
+requestContext.getPostSecurityInboundHandlerChainResolver();
+requestContext.getOutboundHandlerChainResolver();
+requestContext.getProfileConfiguration();
+requestContext.getRelyingPartyConfiguration();
+requestContext.getUserSession();
+requestContext.getReleasedAttributes();
+requestContext.getRequestedAttributesIds();
+requestContext.getAttributes();
+requestContext.getPrincipalAuthenticationMethod();
+
+requestContext.isInboundSAMLMessageAuthenticated();
+requestContext.isIssuerAuthenticated();
+
+requestContext.setInboundSAMLMessage(null);
+requestContext.setInboundSAMLMessageAuthenticated(true);
+requestContext.setInboundSAMLMessageId("foo");
+requestContext.setInboundSAMLMessageIssueInstant(null);
+requestContext.setInboundSAMLProtocol("foo");
+requestContext.setLocalEntityId("foo");
+requestContext.setLocalEntityMetadata(null);
+requestContext.setLocalEntityRole(null);
+requestContext.setLocalEntityRoleMetadata(null);
+requestContext.setMetadataResolver("foo");
+requestContext.setOutboundMessageArtifactType(null);
+requestContext.setOutboundSAMLMessage(null);
+requestContext.setOutboundSAMLMessageId("foo");
+requestContext.setOutboundSAMLMessageIssueInstant(null);
+requestContext.setOutboundSAMLMessageSigningCredential(null);
+requestContext.setOutboundSAMLProtocol("foo");
+requestContext.setPeerEntityEndpoint(null);
+requestContext.setPeerEntityId(null);
+requestContext.setPeerEntityMetadata(null);
+requestContext.setPeerEntityRole(null);
+requestContext.setPeerEntityRoleMetadata(null);
+requestContext.setRelayState("foo");
+requestContext.setSubjectNameIdentifier(null);
+requestContext.setCommunicationProfileId("foo");
+requestContext.setInboundMessage(null);
+requestContext.setInboundMessageIssuer("foo");
+requestContext.setInboundMessageTransport("foo");
+requestContext.setOutboundMessage(null);
+requestContext.setOutboundMessageIssuer("foo");
+requestContext.setOutboundMessageTransport("foo");
+requestContext.setSecurityPolicyResolver("foo");
+requestContext.setPreSecurityInboundHandlerChainResolver("foo");
+requestContext.setPostSecurityInboundHandlerChainResolver("foo");
+requestContext.setOutboundHandlerChainResolver(null);
+requestContext.setProfileConfiguration("foo");
+requestContext.setRelyingPartyConfiguration("foo");
+requestContext.setAttributes(null);
+requestContext.setUserSession("foo");
+requestContext.setReleasedAttributes(null);
+requestContext.setRequestedAttributes(null);
+requestContext.setPrincipalAuthenticationMethod("foo");
+requestContext.setPrincipalName("foo");
+
+scripted.addValue("AllDone");
+
+
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple.script
index 1fd4965..841cacc 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple.script
@@ -1 +1 @@
-Scripted.addValue("simple");
+Scripted.addValue("simple");
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script
index 0aec96c..c606150 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script
@@ -1,2 +1,2 @@
-importPackage(Packages.net.shibboleth.idp.attribute);
-Scripted.addValue(new StringAttributeValue("simple"));
+importPackage(Packages.net.shibboleth.idp.attribute);
+Scripted.addValue(new StringAttributeValue("simple"));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
index be6d9fa..a732a76 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
@@ -1,8 +1,8 @@
-importPackage(Packages.net.shibboleth.idp.attribute);
-importPackage(Packages.java.util);
-nativeAttribute = Scripted.getNativeAttribute();
-tmp = new HashSet();
-tmp.addAll(nativeAttribute.getValues());
-val = new StringAttributeValue("simple");
-tmp.add(val);
-nativeAttribute.setValues(tmp);
+importPackage(Packages.net.shibboleth.idp.attribute);
+importPackage(Packages.java.util);
+nativeAttribute = Scripted.getNativeAttribute();
+tmp = new HashSet();
+tmp.addAll(nativeAttribute.getValues());
+val = new StringAttributeValue("simple");
+tmp.add(val);
+nativeAttribute.setValues(tmp);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/subjects.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/subjects.script
index df02352..c8350e2 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/subjects.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/subjects.script
@@ -1,8 +1,8 @@
-x = subjects[0].getPrincipals().iterator();
-while(x.hasNext()){
- Scripted.addValue(x.next().getName());
- }
-x = subjects[1].getPrincipals().iterator();
-while (x.hasNext()){
- Scripted.addValue(x.next().getName());
- }
+x = subjects[0].getPrincipals().iterator();
+while(x.hasNext()){
+ Scripted.addValue(x.next().getName());
+ }
+x = subjects[1].getPrincipals().iterator();
+while (x.hasNext()){
+ Scripted.addValue(x.next().getName());
+ }
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/work.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/work.script
index 82fc1c1..96084fa 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/work.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/work.script
@@ -1,6 +1,6 @@
-values = at1.getNativeAttribute().getValues().iterator();
- val = values.next();
- Scripted.addValue(val);
- Scripted.addValue(workContext.getResolvedIdPAttributeDefinitions().toString());
- Scripted.addValue(workContext.getResolvedDataConnectors().toString());
+values = at1.getNativeAttribute().getValues().iterator();
+ val = values.next();
+ Scripted.addValue(val);
+ Scripted.addValue(workContext.getResolvedIdPAttributeDefinitions().toString());
+ Scripted.addValue(workContext.getResolvedDataConnectors().toString());
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/DeleteStore.sql b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/DeleteStore.sql
index 25c4a8c..9ffe8bd 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/DeleteStore.sql
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/DeleteStore.sql
@@ -1 +1 @@
-DROP TABLE shibpid;
+DROP TABLE shibpid;
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql
index fb2738c..9cc4018 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql
@@ -1,11 +1,11 @@
-CREATE TABLE shibpid (
- localEntity VARCHAR(255) NOT NULL,
- peerEntity VARCHAR(255) NOT NULL,
- persistentId VARCHAR(50) NOT NULL,
- principalName VARCHAR(50) NOT NULL,
- localId VARCHAR(50) NOT NULL,
- peerProvidedId VARCHAR(50) NULL,
- creationDate TIMESTAMP NOT NULL,
- deactivationDate TIMESTAMP NULL,
- PRIMARY KEY (localEntity, peerEntity, persistentId)
- );
+CREATE TABLE shibpid (
+ localEntity VARCHAR(255) NOT NULL,
+ peerEntity VARCHAR(255) NOT NULL,
+ persistentId VARCHAR(50) NOT NULL,
+ principalName VARCHAR(50) NOT NULL,
+ localId VARCHAR(50) NOT NULL,
+ peerProvidedId VARCHAR(50) NULL,
+ creationDate TIMESTAMP NOT NULL,
+ deactivationDate TIMESTAMP NULL,
+ PRIMARY KEY (localEntity, peerEntity, persistentId)
+ );
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/entityAttributes.xml b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/entityAttributes.xml
index 97b4659..c85590a 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/entityAttributes.xml
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/entityAttributes.xml
@@ -1,10 +1,10 @@
-<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <saml:Attribute Name="MultiName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
- <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute Name="SamlName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xsi:type="saml:SubjectLocality"><saml:SubjectLocality Address="10.0.0.1"/></saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
+<mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <saml:Attribute Name="MultiName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="xs:string">pink</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">turquoise</saml:AttributeValue>
+ <saml:AttributeValue xsi:type="xs:string">blue at yellow</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="SamlName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xsi:type="saml:SubjectLocality"><saml:SubjectLocality Address="10.0.0.1"/></saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif
index f172280..73683a9 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif
@@ -1,68 +1,68 @@
-dn: dc=shibboleth,dc=net
-dc: shibboleth
-objectClass: dcObject
-objectClass: organization
-o: Shibboleth, Inc.
-
-dn: ou=people,dc=shibboleth,dc=net
-ou: people
-description: All people in organization
-objectclass: organizationalunit
-
-dn: cn=Peter Principal,ou=people,dc=shibboleth,dc=net
-objectclass: inetOrgPerson
-cn: Peter Principal
-cn: Peter J Principal
-cn: pete principal
-sn: Principal
-uid: PETER_THE_PRINCIPAL
-userpassword: changeit
-homephone: 555-111-2222
-mail: peter.principal at shibboleth.net
-mail: peterprincipal at shibboleth.net
-description: test principal
-
-dn: cn=Paul Principal,ou=people,dc=shibboleth,dc=net
-objectclass: inetOrgPerson
-cn: Paul Principal
-sn: Principal
-uid: PAUL_THE_PRINCIPAL
-userpassword: changeit
-homephone: 555-111-3333
-mail: paul.principal at shibboleth.net
-mail: paulprincipal at shibboleth.net
-description: test principal
-
-dn: cn=Philip Principal,ou=people,dc=shibboleth,dc=net
-objectclass: inetOrgPerson
-cn: Philip Principal
-sn: Principal
-uid: PHILIP_THE_PRINCIPAL
-userpassword: changeit
-homephone: 555-111-3333
-mail:
-mail: ""
-# two spaces
-mail:: ICA=
-# philip.principal at shibboleth.net with leading and trailing space
-mail:: IHBoaWxpcC5wcmluY2lwYWxAc2hpYmJvbGV0aC5uZXQg
-
-dn: cn=Collision 1,ou=people,dc=shibboleth,dc=net
-objectclass: inetOrgPerson
-cn: Collision Principal
-sn: Principal
-uid: dn11
-userpassword: changeit
-homephone: 555-222-1234
-mail: dn11 at shibboleth.net
-description: test principal
-
-dn: cn=Collision 2,ou=people,dc=shibboleth,dc=net
-objectclass: inetOrgPerson
-cn: Collision Principal
-sn: Principal
-uid: dlo1
-userpassword: changeit
-homephone: 555-222-5678
-mail: dlo1 at shibboleth.net
-description: test principal
+dn: dc=shibboleth,dc=net
+dc: shibboleth
+objectClass: dcObject
+objectClass: organization
+o: Shibboleth, Inc.
+
+dn: ou=people,dc=shibboleth,dc=net
+ou: people
+description: All people in organization
+objectclass: organizationalunit
+
+dn: cn=Peter Principal,ou=people,dc=shibboleth,dc=net
+objectclass: inetOrgPerson
+cn: Peter Principal
+cn: Peter J Principal
+cn: pete principal
+sn: Principal
+uid: PETER_THE_PRINCIPAL
+userpassword: changeit
+homephone: 555-111-2222
+mail: peter.principal at shibboleth.net
+mail: peterprincipal at shibboleth.net
+description: test principal
+
+dn: cn=Paul Principal,ou=people,dc=shibboleth,dc=net
+objectclass: inetOrgPerson
+cn: Paul Principal
+sn: Principal
+uid: PAUL_THE_PRINCIPAL
+userpassword: changeit
+homephone: 555-111-3333
+mail: paul.principal at shibboleth.net
+mail: paulprincipal at shibboleth.net
+description: test principal
+
+dn: cn=Philip Principal,ou=people,dc=shibboleth,dc=net
+objectclass: inetOrgPerson
+cn: Philip Principal
+sn: Principal
+uid: PHILIP_THE_PRINCIPAL
+userpassword: changeit
+homephone: 555-111-3333
+mail:
+mail: ""
+# two spaces
+mail:: ICA=
+# philip.principal at shibboleth.net with leading and trailing space
+mail:: IHBoaWxpcC5wcmluY2lwYWxAc2hpYmJvbGV0aC5uZXQg
+
+dn: cn=Collision 1,ou=people,dc=shibboleth,dc=net
+objectclass: inetOrgPerson
+cn: Collision Principal
+sn: Principal
+uid: dn11
+userpassword: changeit
+homephone: 555-222-1234
+mail: dn11 at shibboleth.net
+description: test principal
+
+dn: cn=Collision 2,ou=people,dc=shibboleth,dc=net
+objectclass: inetOrgPerson
+cn: Collision Principal
+sn: Principal
+uid: dlo1
+userpassword: changeit
+homephone: 555-222-5678
+mail: dlo1 at shibboleth.net
+description: test principal
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTestEmpty.ldif b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTestEmpty.ldif
index ea13ae1..eda63fa 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTestEmpty.ldif
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTestEmpty.ldif
@@ -1,36 +1,36 @@
-dn: dc=shibboleth,dc=net
-dc: shibboleth
-objectClass: dcObject
-objectClass: organization
-o: Shibboleth, Inc.
-
-dn: ou=people,dc=shibboleth,dc=net
-ou: people
-description: All people in organization
-objectclass: organizationalunit
-
-dn: cn=Peter Principal,ou=people,dc=shibboleth,dc=net
-objectclass: inetOrgPerson
-cn: Peter Principal
-cn: Peter J Principal
-cn: pete principal
-mail:
-sn: Principal
-uid: PETER_THE_PRINCIPAL
-userpassword: changeit
-homephone: 555-111-2222
-mail: peter.principal at shibboleth.net
-mail: ""
-mail: peterprincipal at shibboleth.net
-description: test principal
-
-dn: cn=Paul Principal,ou=people,dc=shibboleth,dc=net
-objectclass: inetOrgPerson
-cn: Paul Principal
-sn: Principal
-uid: PAUL_THE_PRINCIPAL
-userpassword: changeit
-homephone: 555-111-3333
-mail: paul.principal at shibboleth.net
-mail: paulprincipal at shibboleth.net
-description: test principal
+dn: dc=shibboleth,dc=net
+dc: shibboleth
+objectClass: dcObject
+objectClass: organization
+o: Shibboleth, Inc.
+
+dn: ou=people,dc=shibboleth,dc=net
+ou: people
+description: All people in organization
+objectclass: organizationalunit
+
+dn: cn=Peter Principal,ou=people,dc=shibboleth,dc=net
+objectclass: inetOrgPerson
+cn: Peter Principal
+cn: Peter J Principal
+cn: pete principal
+mail:
+sn: Principal
+uid: PETER_THE_PRINCIPAL
+userpassword: changeit
+homephone: 555-111-2222
+mail: peter.principal at shibboleth.net
+mail: ""
+mail: peterprincipal at shibboleth.net
+description: test principal
+
+dn: cn=Paul Principal,ou=people,dc=shibboleth,dc=net
+objectclass: inetOrgPerson
+cn: Paul Principal
+sn: Principal
+uid: PAUL_THE_PRINCIPAL
+userpassword: changeit
+homephone: 555-111-3333
+mail: paul.principal at shibboleth.net
+mail: paulprincipal at shibboleth.net
+description: test principal
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsData.sql b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsData.sql
index 468c910..580baaa 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsData.sql
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsData.sql
@@ -1,68 +1,68 @@
-INSERT INTO people
- (userid, name, password, homephone, mail, description)
- values (
- 'PETER_THE_PRINCIPAL',
- 'Peter Principal',
- 'changeit',
- '555-111-2222',
- 'peter.principal at shibboleth.net',
- 'test principal');
-
-INSERT INTO people
- (userid, name, password, homephone, mail, description)
- values (
- 'PAUL_THE_PRINCIPAL',
- 'Paul Principal',
- 'changeit',
- '555-111-3333',
- 'paul.principal at shibboleth.net',
- 'test principal');
-
-INSERT INTO people
- (userid, name, password, homephone, description)
- values (
- 'PHILIP_THE_PRINCIPAL',
- 'Philip Principal',
- 'changeit',
- '555-111-4444',
- 'test principal');
-
-INSERT INTO people
- (userid, name, password, homephone, mail, description)
- values (
- 'PHILIP_THE_PRINCIPAL',
- 'Philip Principal',
- 'changeit',
- '555-111-4444',
- '',
- 'test principal');
-
-INSERT INTO people
- (userid, name, password, homephone, mail, description)
- values (
- 'PHILIP_THE_PRINCIPAL',
- 'Philip Principal',
- 'changeit',
- '555-111-4444',
- ' ',
- 'test principal');
-
-INSERT INTO people
- (userid, name, password, homephone, mail, description)
- values (
- 'PHILIP_THE_PRINCIPAL',
- 'Philip Principal',
- 'changeit',
- '555-111-4444',
- ' phil.principal at shibboleth.net ',
- 'test principal');
-
-INSERT INTO groups (userid, name)
- values (
- 'PETER_THE_PRINCIPAL',
- 'group1');
-
-INSERT INTO groups (userid, name)
- values (
- 'PETER_THE_PRINCIPAL',
+INSERT INTO people
+ (userid, name, password, homephone, mail, description)
+ values (
+ 'PETER_THE_PRINCIPAL',
+ 'Peter Principal',
+ 'changeit',
+ '555-111-2222',
+ 'peter.principal at shibboleth.net',
+ 'test principal');
+
+INSERT INTO people
+ (userid, name, password, homephone, mail, description)
+ values (
+ 'PAUL_THE_PRINCIPAL',
+ 'Paul Principal',
+ 'changeit',
+ '555-111-3333',
+ 'paul.principal at shibboleth.net',
+ 'test principal');
+
+INSERT INTO people
+ (userid, name, password, homephone, description)
+ values (
+ 'PHILIP_THE_PRINCIPAL',
+ 'Philip Principal',
+ 'changeit',
+ '555-111-4444',
+ 'test principal');
+
+INSERT INTO people
+ (userid, name, password, homephone, mail, description)
+ values (
+ 'PHILIP_THE_PRINCIPAL',
+ 'Philip Principal',
+ 'changeit',
+ '555-111-4444',
+ '',
+ 'test principal');
+
+INSERT INTO people
+ (userid, name, password, homephone, mail, description)
+ values (
+ 'PHILIP_THE_PRINCIPAL',
+ 'Philip Principal',
+ 'changeit',
+ '555-111-4444',
+ ' ',
+ 'test principal');
+
+INSERT INTO people
+ (userid, name, password, homephone, mail, description)
+ values (
+ 'PHILIP_THE_PRINCIPAL',
+ 'Philip Principal',
+ 'changeit',
+ '555-111-4444',
+ ' phil.principal at shibboleth.net ',
+ 'test principal');
+
+INSERT INTO groups (userid, name)
+ values (
+ 'PETER_THE_PRINCIPAL',
+ 'group1');
+
+INSERT INTO groups (userid, name)
+ values (
+ 'PETER_THE_PRINCIPAL',
'group2');
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsStore.sql b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsStore.sql
index 6de1c01..98eabad 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsStore.sql
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsStore.sql
@@ -1,13 +1,13 @@
-CREATE TABLE people (
- userid VARCHAR(50) NOT NULL,
- name VARCHAR(50) NOT NULL,
- password VARCHAR(50) NOT NULL,
- homephone VARCHAR(15) NOT NULL,
- mail VARCHAR(100),
- description VARCHAR(250)
- );
-
-CREATE TABLE groups (
- userid VARCHAR(50) NOT NULL,
- name VARCHAR(50) NOT NULL
+CREATE TABLE people (
+ userid VARCHAR(50) NOT NULL,
+ name VARCHAR(50) NOT NULL,
+ password VARCHAR(50) NOT NULL,
+ homephone VARCHAR(15) NOT NULL,
+ mail VARCHAR(100),
+ description VARCHAR(250)
+ );
+
+CREATE TABLE groups (
+ userid VARCHAR(50) NOT NULL,
+ name VARCHAR(50) NOT NULL
);
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/custom.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/custom.js
index 74f6744..6b7c241 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/custom.js
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/custom.js
@@ -1 +1 @@
-connectorResults.add(custom);
+connectorResults.add(custom);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js
index c29d4dd..12e5891 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js
@@ -1,48 +1,48 @@
-IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
-StringAttributeValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
-HashSet = Java.type("java.util.HashSet");
-Integer = Java.type("java.lang.Integer");
-
-attr = new IdPAttribute("ScriptedOne");
-set = new HashSet(2);
-set.add(new StringAttributeValue("Value 1"));
-set.add(new StringAttributeValue("Value 2"));
-attr.setValues(set);
-connectorResults.add(attr);
-
-child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-
-
-
-attr = new IdPAttribute("TwoScripted");
-set = new HashSet(4);
-set.add(new StringAttributeValue("1Value"));
-set.add(new StringAttributeValue("2Value"));
-set.add(new Integer(4));
-set.add(new StringAttributeValue("3Value"));
-attr.setValues(set);
-connectorResults.add(attr);
-
-attr = new IdPAttribute("Subjects");
-set = new HashSet(4);
-x = subjects[0].getPrincipals().iterator();
-while(x.hasNext()){
- set.add(new StringAttributeValue(x.next().getName()));
- }
-x = subjects[1].getPrincipals().iterator();
-while (x.hasNext()){
- set.add(new StringAttributeValue(x.next().getName()));
- }
-attr.setValues(set);
-connectorResults.add(attr);
-
-connectorResults.add(new Integer(4));
-
-child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-attr = new IdPAttribute("ThreeScripted");
-set = new HashSet(1);
-set.add(new StringAttributeValue(child.getClass().getSimpleName()));
-attr.setValues(set);
-connectorResults.add(attr);
-
-
+IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
+StringAttributeValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
+HashSet = Java.type("java.util.HashSet");
+Integer = Java.type("java.lang.Integer");
+
+attr = new IdPAttribute("ScriptedOne");
+set = new HashSet(2);
+set.add(new StringAttributeValue("Value 1"));
+set.add(new StringAttributeValue("Value 2"));
+attr.setValues(set);
+connectorResults.add(attr);
+
+child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
+
+
+
+attr = new IdPAttribute("TwoScripted");
+set = new HashSet(4);
+set.add(new StringAttributeValue("1Value"));
+set.add(new StringAttributeValue("2Value"));
+set.add(new Integer(4));
+set.add(new StringAttributeValue("3Value"));
+attr.setValues(set);
+connectorResults.add(attr);
+
+attr = new IdPAttribute("Subjects");
+set = new HashSet(4);
+x = subjects[0].getPrincipals().iterator();
+while(x.hasNext()){
+ set.add(new StringAttributeValue(x.next().getName()));
+ }
+x = subjects[1].getPrincipals().iterator();
+while (x.hasNext()){
+ set.add(new StringAttributeValue(x.next().getName()));
+ }
+attr.setValues(set);
+connectorResults.add(attr);
+
+connectorResults.add(new Integer(4));
+
+child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
+attr = new IdPAttribute("ThreeScripted");
+set = new HashSet(1);
+set.add(new StringAttributeValue(child.getClass().getSimpleName()));
+attr.setValues(set);
+connectorResults.add(attr);
+
+
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
index f282b3a..45c1b4a 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
@@ -1,48 +1,48 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
- id="TestID"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="eduPersonAffiliation">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition id="dn1" xsi:type="ad:Simple" sourceAttributeID="dn1">
- <resolver:Dependency ref="staticAttributes"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
- name="urn:mace:dir:attribute-def:displayName" nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
- friendlyName="dn1" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
- name="http://macedir.org/entity-category" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- friendlyName="c1" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition id="dn2" xsi:type="ad:Simple" sourceAttributeID="dn2">
- <resolver:Dependency ref="staticAttributes"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
- name="urn:oid:2.16.840.1.113730.3.1.241" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- friendlyName="dn2" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition id="eppn" xsi:type="ad:Simple" sourceAttributeID="eppn" >
- <resolver:Dependency ref="staticAttributes"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
- name="urn:mace:dir:attribute-def:eduPersonPrincipalName" nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
- friendlyName="dn2" />
- </resolver:AttributeDefinition>
-
-</resolver:AttributeResolver>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+ id="TestID"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <resolver:DataConnector id="staticAttributes"
+ xsi:type="dc:Static">
+ <dc:Attribute id="eduPersonAffiliation">
+ <dc:Value>member</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="eduPersonEntitlement">
+ <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
+ <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+ <resolver:AttributeDefinition id="dn1" xsi:type="ad:Simple" sourceAttributeID="dn1">
+ <resolver:Dependency ref="staticAttributes"/>
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+ name="urn:mace:dir:attribute-def:displayName" nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+ friendlyName="dn1" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+ name="http://macedir.org/entity-category" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+ friendlyName="c1" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition id="dn2" xsi:type="ad:Simple" sourceAttributeID="dn2">
+ <resolver:Dependency ref="staticAttributes"/>
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+ name="urn:oid:2.16.840.1.113730.3.1.241" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+ friendlyName="dn2" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition id="eppn" xsi:type="ad:Simple" sourceAttributeID="eppn" >
+ <resolver:Dependency ref="staticAttributes"/>
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+ name="urn:mace:dir:attribute-def:eduPersonPrincipalName" nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+ friendlyName="dn2" />
+ </resolver:AttributeDefinition>
+
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
index 847eb17..19a13de 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
- <bean id="shibboleth.VelocityEngine"
- class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <props>
- <prop key="resource.loader">classpath, string</prop>
- <prop key="classpath.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- <prop key="string.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.StringResourceLoader
- </prop>
- </props>
- </property>
- </bean>
- <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- depends-on="shibboleth.VelocityEngine" p:failFast="true"
- p:reloadCheckDelay="0">
-
- <constructor-arg name="claz"
- value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
- <constructor-arg name="strategy">
- <bean
- class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
- p:id="ShibbolethAttributeResolver" />
- </constructor-arg>
- <property name="serviceConfigurations">
- <util:list>
- <value>/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
- </value>
- </util:list>
- </property>
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize" default-destroy-method="destroy">
+ <bean id="shibboleth.VelocityEngine"
+ class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <props>
+ <prop key="resource.loader">classpath, string</prop>
+ <prop key="classpath.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ <prop key="string.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.StringResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+ <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ depends-on="shibboleth.VelocityEngine" p:failFast="true"
+ p:reloadCheckDelay="0">
+
+ <constructor-arg name="claz"
+ value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
+ <constructor-arg name="strategy">
+ <bean
+ class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
+ p:id="ShibbolethAttributeResolver" />
+ </constructor-arg>
+ <property name="serviceConfigurations">
+ <util:list>
+ <value>/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
+ </value>
+ </util:list>
+ </property>
+ </bean>
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/withAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/withAttributes.xml
index c0d638c..b94e165 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/withAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/withAttributes.xml
@@ -1,26 +1,26 @@
-<EntityDescriptor entityID="https://example.org/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
- <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
- <saml:Attribute Name="http://macedir.org/entity-category"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship
- </saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <AssertionConsumerService Location="https://foo" index="1" Binding="urn:foo" />
- <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- index="1">
- <ServiceName xml:lang="en">Foo</ServiceName>
- <RequestedAttribute FriendlyName="displayName"
- Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" />
- <RequestedAttribute FriendlyName="displayName" isRequired="true"
- Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
- <RequestedAttribute FriendlyName="eduPersonPrincipalName"
- Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" />
- </AttributeConsumingService>
- </SPSSODescriptor>
-</EntityDescriptor>
+<EntityDescriptor entityID="https://example.org/shibboleth"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+ <saml:Attribute Name="http://macedir.org/entity-category"
+ NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship
+ </saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <AssertionConsumerService Location="https://foo" index="1" Binding="urn:foo" />
+ <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+ index="1">
+ <ServiceName xml:lang="en">Foo</ServiceName>
+ <RequestedAttribute FriendlyName="displayName"
+ Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" />
+ <RequestedAttribute FriendlyName="displayName" isRequired="true"
+ Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName"
+ Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" />
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+</EntityDescriptor>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/PropertyPlaceholder.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/PropertyPlaceholder.xml
index 35580e4..ab99433 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/PropertyPlaceholder.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/PropertyPlaceholder.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
- <context:property-placeholder
- location="classpath:net/shibboleth/idp/attribute/resolver/spring/SVN.properties" />
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+ <context:property-placeholder
+ location="classpath:net/shibboleth/idp/attribute/resolver/spring/SVN.properties" />
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsData.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsData.sql
index 6093861..93a3242 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsData.sql
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsData.sql
@@ -1,10 +1,10 @@
-INSERT INTO student
- (userid, pager, mobile, street, title, departmentNumber)
- values (
- 'PETER_THE_PRINCIPAL',
- '555-123-4567',
- '444-123-4567',
- 'TheStreet',
- 'Monsieur',
- '#4321');
-
+INSERT INTO student
+ (userid, pager, mobile, street, title, departmentNumber)
+ values (
+ 'PETER_THE_PRINCIPAL',
+ '555-123-4567',
+ '444-123-4567',
+ 'TheStreet',
+ 'Monsieur',
+ '#4321');
+
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsStore.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsStore.sql
index 3c1a6ae..a148b1e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsStore.sql
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsStore.sql
@@ -1,8 +1,8 @@
-CREATE TABLE student (
- userid VARCHAR(50) NOT NULL,
- pager VARCHAR(50) NOT NULL,
- mobile VARCHAR(50) NOT NULL,
- street VARCHAR(15) NOT NULL,
- title VARCHAR(100) NOT NULL,
- departmentNumber VARCHAR(250));
-
+CREATE TABLE student (
+ userid VARCHAR(50) NOT NULL,
+ pager VARCHAR(50) NOT NULL,
+ mobile VARCHAR(50) NOT NULL,
+ street VARCHAR(15) NOT NULL,
+ title VARCHAR(100) NOT NULL,
+ departmentNumber VARCHAR(250));
+
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoNoTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoNoTime.xml
index fdadffd..15d754d 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoNoTime.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoNoTime.xml
@@ -1,13 +1,13 @@
- <resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- id="cryptoTransientId"
- xsi:type="ad:CryptoTransientId"
- dataSealerRef="shibboleth.TransientIDDataSealer"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ <resolver:AttributeDefinition
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ id="cryptoTransientId"
+ xsi:type="ad:CryptoTransientId"
+ dataSealerRef="shibboleth.TransientIDDataSealer"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
index 9f44204..1916d90 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-
- id="cryptoTransientId"
- xsi:type="ad:CryptoTransientId"
- dataSealerRef="shibboleth.TransientIDDataSealer"
- lifetime="PT3M"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:AttributeDefinition
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+
+ id="cryptoTransientId"
+ xsi:type="ad:CryptoTransientId"
+ dataSealerRef="shibboleth.TransientIDDataSealer"
+ lifetime="PT3M"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
index da78890..1d23a68 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
@@ -1,11 +1,11 @@
-
-<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- ref="TheHasRef" />
+
+<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ ref="TheHasRef" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
index d1336c2..bea0dc7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
@@ -1,20 +1,20 @@
-<resolver:AttributeDefintion xsi:type="ad:Mapped"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
- <ad:DefaultValue passThru="true">foobar</ad:DefaultValue>
- <ad:ValueMap>
- <ad:ReturnValue>return</ad:ReturnValue>
- <ad:SourceValue>source</ad:SourceValue>
- </ad:ValueMap>
- <ad:ValueMap>
- <ad:ReturnValue>return1</ad:ReturnValue>
- <ad:SourceValue>source2</ad:SourceValue>
- </ad:ValueMap>
-</resolver:AttributeDefintion>
+<resolver:AttributeDefintion xsi:type="ad:Mapped"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <ad:DefaultValue passThru="true">foobar</ad:DefaultValue>
+ <ad:ValueMap>
+ <ad:ReturnValue>return</ad:ReturnValue>
+ <ad:SourceValue>source</ad:SourceValue>
+ </ad:ValueMap>
+ <ad:ValueMap>
+ <ad:ReturnValue>return1</ad:ReturnValue>
+ <ad:SourceValue>source2</ad:SourceValue>
+ </ad:ValueMap>
+</resolver:AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoDefault.xml
index 482dd26..f9d559e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoDefault.xml
@@ -1,15 +1,15 @@
-<resolver:AttributeDefintion xsi:type="ad:Mapped"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
- <ad:ValueMap>
- <ad:ReturnValue>return</ad:ReturnValue>
- <ad:SourceValue>source</ad:SourceValue>
- </ad:ValueMap>
-</resolver:AttributeDefintion>
+<resolver:AttributeDefintion xsi:type="ad:Mapped"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <ad:ValueMap>
+ <ad:ReturnValue>return</ad:ReturnValue>
+ <ad:SourceValue>source</ad:SourceValue>
+ </ad:ValueMap>
+</resolver:AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoValueMap.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoValueMap.xml
index 799ce18..c754172 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoValueMap.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoValueMap.xml
@@ -1,11 +1,11 @@
-<resolver:AttributeDefintion xsi:type="ad:Mapped"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</resolver:AttributeDefintion>
+<resolver:AttributeDefintion xsi:type="ad:Mapped"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+</resolver:AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
index 276c0c1..b440433 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
@@ -1,18 +1,18 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
- id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- xsi:type="ad:Mapped">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- ref="TheOrphan" />
- <ad:ValueMap>
- <ad:ReturnValue>return</ad:ReturnValue>
- <ad:SourceValue/>
- </ad:ValueMap>
-</ad:AttributeDefinition>
+
+<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
+ id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ xsi:type="ad:Mapped">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ ref="TheOrphan" />
+ <ad:ValueMap>
+ <ad:ReturnValue>return</ad:ReturnValue>
+ <ad:SourceValue/>
+ </ad:ValueMap>
+</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes1.xml
index 4f4281b..40f9ab9 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes1.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes1.xml
@@ -1,18 +1,18 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
- id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- xsi:type="ad:Mapped">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- ref="TheOrphan" />
- <ad:ValueMap>
- <ad:ReturnValue>return</ad:ReturnValue>
- <ad:SourceValue ignoreCase="true" partialMatch="true">sourceValueAttributes1</ad:SourceValue>
- </ad:ValueMap>
-</ad:AttributeDefinition>
+
+<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
+ id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ xsi:type="ad:Mapped">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ ref="TheOrphan" />
+ <ad:ValueMap>
+ <ad:ReturnValue>return</ad:ReturnValue>
+ <ad:SourceValue ignoreCase="true" partialMatch="true">sourceValueAttributes1</ad:SourceValue>
+ </ad:ValueMap>
+</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes2.xml
index c59bf40..03dd2df 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes2.xml
@@ -1,18 +1,18 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
- id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- xsi:type="ad:Mapped">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- ref="TheOrphan" />
- <ad:ValueMap>
- <ad:ReturnValue>return</ad:ReturnValue>
- <ad:SourceValue ignoreCase="false" partialMatch="false">sourceValueAttributes2</ad:SourceValue>
- </ad:ValueMap>
-</ad:AttributeDefinition>
+
+<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
+ id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ xsi:type="ad:Mapped">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ ref="TheOrphan" />
+ <ad:ValueMap>
+ <ad:ReturnValue>return</ad:ReturnValue>
+ <ad:SourceValue ignoreCase="false" partialMatch="false">sourceValueAttributes2</ad:SourceValue>
+ </ad:ValueMap>
+</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
index e924095..b173060 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
@@ -1,18 +1,18 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
- id="container"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- xsi:type="ad:Mapped">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
- <ad:ValueMap>
- <ad:ReturnValue>return</ad:ReturnValue>
- <ad:SourceValue>source</ad:SourceValue>
- </ad:ValueMap>
-</ad:AttributeDefinition>
+
+<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
+ id="container"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ xsi:type="ad:Mapped">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <ad:ValueMap>
+ <ad:ReturnValue>return</ad:ReturnValue>
+ <ad:SourceValue>source</ad:SourceValue>
+ </ad:ValueMap>
+</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoSourceValue.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoSourceValue.xml
index 0ace31d..fc00c77 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoSourceValue.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoSourceValue.xml
@@ -1,12 +1,12 @@
-
-<ad:ValueMap xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <ad:ReturnValue>return</ad:ReturnValue>
-</ad:ValueMap>
+
+<ad:ValueMap xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <ad:ReturnValue>return</ad:ReturnValue>
+</ad:ValueMap>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoValues.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoValues.xml
index 3f306da..a0ca9ce 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoValues.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoValues.xml
@@ -1,10 +1,10 @@
-
-<ad:ValueMap xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+
+<ad:ValueMap xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
index 8e47cd2..a42a224 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
@@ -1,11 +1,11 @@
-<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- ref="TheHasNotRef" />
+<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ ref="TheHasNotRef" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
index fef0bde..59b1ed7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
@@ -1,8 +1,8 @@
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWith.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWith.xml
index b361ca2..09673d0 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWith.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWith.xml
@@ -1,15 +1,15 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:Prescoped" id="prescopedWith" scopeDelimiter="#"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:Prescoped" id="prescopedWith" scopeDelimiter="#"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWithout.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWithout.xml
index 8d964a9..e9565f3 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWithout.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWithout.xml
@@ -1,15 +1,15 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:Prescoped" id="prescopedWith"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:Prescoped" id="prescopedWith"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
index 1c9dd0b..caa1307 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
@@ -1,13 +1,13 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:PrincipalAuthenticationMethod" id="PrincipalAuthenticationMethod"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:PrincipalAuthenticationMethod" id="PrincipalAuthenticationMethod"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
index b8939c4..11e27dd 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
@@ -1,13 +1,13 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:PrincipalName" id="PrincipalName"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:PrincipalName" id="PrincipalName"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
index a4dbe73..e5ec768 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
@@ -1,16 +1,16 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:RegexSplit" id="regexSplitDefault"
- regex="at1-(.+)or"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:RegexSplit" id="regexSplitDefault"
+ regex="at1-(.+)or"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexInsensitive.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexInsensitive.xml
index 574e854..a06bab3 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexInsensitive.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexInsensitive.xml
@@ -1,17 +1,17 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:RegexSplit" id="regexSplitInsensitive"
- regex="at1-(.+)or"
- caseSensitive="0"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:RegexSplit" id="regexSplitInsensitive"
+ regex="at1-(.+)or"
+ caseSensitive="0"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexNone.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexNone.xml
index 55754e6..901d39c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexNone.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexNone.xml
@@ -1,17 +1,17 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:RegexSplit" id="regexNone"
- regex=" "
- caseSensitive="1"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:RegexSplit" id="regexNone"
+ regex=" "
+ caseSensitive="1"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexSensitive.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexSensitive.xml
index 35b046c..4129736 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexSensitive.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexSensitive.xml
@@ -1,17 +1,17 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:RegexSplit" id="regexSplitSensitive"
- regex="at1-(.+)or"
- caseSensitive="1"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:RegexSplit" id="regexSplitSensitive"
+ regex="at1-(.+)or"
+ caseSensitive="1"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
index 595ddcc..1dd637a 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
@@ -1,16 +1,16 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:SAML1NameIdentifier" id="SAML1NameIdentifierAttributes"
- nameIdFormat = "format"
- nameIdQualifier = "qualifier"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:SAML1NameIdentifier" id="SAML1NameIdentifierAttributes"
+ nameIdFormat = "format"
+ nameIdQualifier = "qualifier"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdDefault.xml
index 032164c..eb71128 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdDefault.xml
@@ -1,14 +1,14 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:SAML1NameIdentifier" id="SAML1NameIdentifier"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:SAML1NameIdentifier" id="SAML1NameIdentifier"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
index 7ff55d3..63f1e19 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
@@ -1,14 +1,14 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:Script" id="scriptedInline"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:Script" id="scriptedInline"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
<ad:Script>foo="bar";</ad:Script></AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeBadValues.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeBadValues.xml
index d6902c0..078aea5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeBadValues.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeBadValues.xml
@@ -1,14 +1,14 @@
- <resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- dependencyOnly="FALSE" id="bad"
- xsi:type="ad:Simple"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <resolver:AttributeDefinition
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ dependencyOnly="FALSE" id="bad"
+ xsi:type="ad:Simple"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
</resolver:AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
index bfd3650..e37a60e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
@@ -1,28 +1,28 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:Simple" id="simplePopulated" sourceAttributeID="flibble"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <Dependency ref="dep2"/>
- <Dependency ref="dep1"/>
- <Dependency ref="dep3"/>
-
- <DisplayName xml:lang="en">NameInEnglish</DisplayName>
- <DisplayName xml:lang="fr">NameEnFrancais</DisplayName>
-
- <DisplayDescription xml:lang="en">DescInEnglish</DisplayDescription>
- <DisplayDescription xml:lang="ca">DescInCanadian</DisplayDescription>
-
- <DisplayDescription xml:lang="fr">DescEnFrancais</DisplayDescription>
-
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="ad:Simple" id="simplePopulated" sourceAttributeID="flibble"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <Dependency ref="dep2"/>
+ <Dependency ref="dep1"/>
+ <Dependency ref="dep3"/>
+
+ <DisplayName xml:lang="en">NameInEnglish</DisplayName>
+ <DisplayName xml:lang="fr">NameEnFrancais</DisplayName>
+
+ <DisplayDescription xml:lang="en">DescInEnglish</DisplayDescription>
+ <DisplayDescription xml:lang="ca">DescInCanadian</DisplayDescription>
+
+ <DisplayDescription xml:lang="fr">DescEnFrancais</DisplayDescription>
+
+ <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml
index df7149c..d00942f 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml
@@ -1,20 +1,20 @@
- <AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- dependencyOnly="false"
- xsi:type="ad:Simple" id="simplePopulated2"
-
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <Dependency ref="dep3"/>
- <DisplayName xml:lang="en">NameInAmerican</DisplayName>
- <AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
+ <AttributeDefinition
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ dependencyOnly="false"
+ xsi:type="ad:Simple" id="simplePopulated2"
+
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <Dependency ref="dep3"/>
+ <DisplayName xml:lang="en">NameInAmerican</DisplayName>
+ <AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
+ <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeUnpopulated.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeUnpopulated.xml
index b480c46..bc8b781 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeUnpopulated.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeUnpopulated.xml
@@ -1,15 +1,15 @@
- <resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-
- xsi:type="ad:Simple" id="simpleUnpopulated"
-
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <resolver:AttributeDefinition
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+
+ xsi:type="ad:Simple" id="simpleUnpopulated"
+
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
</resolver:AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
index b7c11b9..7e32b52 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. While the configuration
- presented in this example file is functional, it isn't very interesting.
- However, there are lots of example attributes, encoders, and a couple example
- data connectors. Not all attribute definitions, data connectors, or principal
- connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
- for a complete list of components and their options. -->
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
- <resolver:AttributeDefinition xsi:type="Simple"
- xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPA1"
- sourceAttributeID="staticEpA" activationConditionRef="peter"
- profileContextStrategyRef="findProfileCtx">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="Simple"
- xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPE"
- sourceAttributeID="eduPersonEntitlement" activationConditionRef="principal"
- profileContextStrategyRef="findProfileCtx">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
-
-</resolver:AttributeResolver>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is an EXAMPLE configuration file. While the configuration
+ presented in this example file is functional, it isn't very interesting.
+ However, there are lots of example attributes, encoders, and a couple example
+ data connectors. Not all attribute definitions, data connectors, or principal
+ connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
+ for a complete list of components and their options. -->
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+ <resolver:AttributeDefinition xsi:type="Simple"
+ xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPA1"
+ sourceAttributeID="staticEpA" activationConditionRef="peter"
+ profileContextStrategyRef="findProfileCtx">
+ <resolver:Dependency ref="staticAttributes" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="Simple"
+ xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPE"
+ sourceAttributeID="eduPersonEntitlement" activationConditionRef="principal"
+ profileContextStrategyRef="findProfileCtx">
+ <resolver:Dependency ref="staticAttributes" />
+ </resolver:AttributeDefinition>
+
+ <resolver:DataConnector id="staticAttributes"
+ xsi:type="dc:Static">
+ <dc:Attribute id="staticEpA">
+ <dc:Value>member</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="eduPersonEntitlement">
+ <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
+ <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
index 4d53776..3caeaf1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. While the configuration
- presented in this example file is functional, it isn't very interesting.
- However, there are lots of example attributes, encoders, and a couple example
- data connectors. Not all attribute definitions, data connectors, or principal
- connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
- for a complete list of components and their options. -->
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
- <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPA1" sourceAttributeID="staticEpA" activationConditionRef="peter">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPE" sourceAttributeID="eduPersonEntitlement" activationConditionRef="principal">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
-
- <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
-
-</resolver:AttributeResolver>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is an EXAMPLE configuration file. While the configuration
+ presented in this example file is functional, it isn't very interesting.
+ However, there are lots of example attributes, encoders, and a couple example
+ data connectors. Not all attribute definitions, data connectors, or principal
+ connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
+ for a complete list of components and their options. -->
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+ <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPA1" sourceAttributeID="staticEpA" activationConditionRef="peter">
+ <resolver:Dependency ref="staticAttributes" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPE" sourceAttributeID="eduPersonEntitlement" activationConditionRef="principal">
+ <resolver:Dependency ref="staticAttributes" />
+ </resolver:AttributeDefinition>
+
+ <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
+ <dc:Attribute id="staticEpA">
+ <dc:Value>member</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="eduPersonEntitlement">
+ <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
+ <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-svn.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-svn.xml
index c9f9e59..d2f6c8e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-svn.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-svn.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
- <context:property-placeholder
- location="classpath:net/shibboleth/idp/attribute/resolver/spring/SVN.properties" />
-
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
-
- <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- <dc:Value>student</dc:Value>
- <dc:Value>${svn.test.property.epe}</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="staticEpE">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- <dc:Attribute id=" ${svn.test.property.id} ">
- <dc:Value>${svn.test.property.uid}</dc:Value>
- </dc:Attribute>
-
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation" sourceAttributeID="staticEpA">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="uid" sourceAttributeID="staticUid">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:uid" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonEntitlement" sourceAttributeID="staticEpE">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonEntitlement" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" friendlyName="eduPersonEntitlement" />
- </resolver:AttributeDefinition>
-
-
-</resolver:AttributeResolver>
-
+<?xml version="1.0" encoding="UTF-8"?>
+ <beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+ <context:property-placeholder
+ location="classpath:net/shibboleth/idp/attribute/resolver/spring/SVN.properties" />
+
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+
+ <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
+ <dc:Attribute id="staticEpA">
+ <dc:Value>member</dc:Value>
+ <dc:Value>student</dc:Value>
+ <dc:Value>${svn.test.property.epe}</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="staticEpE">
+ <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
+ <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id=" ${svn.test.property.id} ">
+ <dc:Value>${svn.test.property.uid}</dc:Value>
+ </dc:Attribute>
+
+ </resolver:DataConnector>
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation" sourceAttributeID="staticEpA">
+ <resolver:Dependency ref="staticAttributes" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" id="uid" sourceAttributeID="staticUid">
+ <resolver:Dependency ref="staticAttributes" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:uid" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonEntitlement" sourceAttributeID="staticEpE">
+ <resolver:Dependency ref="staticAttributes" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonEntitlement" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" friendlyName="eduPersonEntitlement" />
+ </resolver:AttributeDefinition>
+
+
+</resolver:AttributeResolver>
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
index fb4b15f..d938fce 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- id = "TestID"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security"
+ id = "TestID"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
index 87ca23b..ef730da 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
@@ -1,26 +1,26 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
- <util:map id="shibboleth.CustomScriptObject">
- <entry key="foo" value="bar"/>
- </util:map>
- <util:map id="other.CustomScriptObject">
- <entry key="bar" value="foo"/>
- </util:map>
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
-</beans>
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+ <util:map id="shibboleth.CustomScriptObject">
+ <entry key="foo" value="bar"/>
+ </util:map>
+ <util:map id="other.CustomScriptObject">
+ <entry key="bar" value="foo"/>
+ </util:map>
+
+ <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
+ class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
+ p:placeholderPrefix="%{" p:placeholderSuffix="}" />
+
+</beans>
+
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/IdP338.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/IdP338.xml
index f37c564..139383c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/IdP338.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/IdP338.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <bean id="cacheBuilder"
- class="com.google.common.cache.CacheBuilder"
- factory-method="from">
- <constructor-arg value="expireAfterAccess=10s,maximumSize=25"/>
- </bean>
- <bean id="cache"
- class="com.google.common.cache.Cache"
- factory-bean="cacheBuilder"
- factory-method="build"/>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean id="cacheBuilder"
+ class="com.google.common.cache.CacheBuilder"
+ factory-method="from">
+ <constructor-arg value="expireAfterAccess=10s,maximumSize=25"/>
+ </bean>
+ <bean id="cache"
+ class="com.google.common.cache.Cache"
+ factory-bean="cacheBuilder"
+ factory-method="build"/>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml
index c1c095e..73c334f 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:DataConnector id="computed"
- xsi:type="dc:ComputedId" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
-
- sourceAttributeID="theSourceRemainsTheSame"
- generatedAttributeID="jenny"
- salt="abcdefghijklmnopqrst "
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:DataConnector id="computed"
+ xsi:type="dc:ComputedId" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+
+ sourceAttributeID="theSourceRemainsTheSame"
+ generatedAttributeID="jenny"
+ salt="abcdefghijklmnopqrst "
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computedProperty.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computedProperty.xml
index a6600ae..98e2a12 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computedProperty.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computedProperty.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:DataConnector id="computed"
- xsi:type="dc:ComputedId" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
-
- sourceAttributeID="theSourceRemainsTheSame"
- generatedAttributeID="jenny"
- salt="%{the.ComputedIDDataConnector.salt}"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:DataConnector id="computed"
+ xsi:type="dc:ComputedId" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+
+ sourceAttributeID="theSourceRemainsTheSame"
+ generatedAttributeID="jenny"
+ salt="%{the.ComputedIDDataConnector.salt}"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
index e2a5add..77b8fef 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
@@ -1,31 +1,31 @@
-connectionConfig.ldapURL=ldap://localhost:10389
-connectionConfig.useStartTLS=true
-connectionConfig.connectTimeout=PT2S
-connectionConfig.responseTimeout=PT4S
-connectionConfig.bindDn=cn=Directory Manager
-connectionConfig.bindCredential=password
-
-noResultIsError=true
-multipleResultsIsError=true
-noRetryDelay=PT5M
-
-search.baseDn=ou=people,dc=shibboleth,dc=net
-search.filter=(uid=${recipientContext.principal})
-search.returnAttributes=uid,homephone,mail
-search.timeLimit=PT7S
-
-jndi.property1=value1
-jndi.property2=value2
-
-connectionPool.blockWaitTime=PT5S
-connectionPool.expirationTime=PT10M
-connectionPool.minPoolSize=5
-connectionPool.maxPoolSize=10
-connectionPool.validatePeriodically=true
-connectionPool.validatePeriod=PT15M
-connectionPool.validator.baseDn=dc=shibboleth,dc=net
-connectionPool.validator.filter=(ou=people)
-connectionPool.failFastInitialize=false
-
-cache.TTL=PT10S
-cache.maxSize=25
+connectionConfig.ldapURL=ldap://localhost:10389
+connectionConfig.useStartTLS=true
+connectionConfig.connectTimeout=PT2S
+connectionConfig.responseTimeout=PT4S
+connectionConfig.bindDn=cn=Directory Manager
+connectionConfig.bindCredential=password
+
+noResultIsError=true
+multipleResultsIsError=true
+noRetryDelay=PT5M
+
+search.baseDn=ou=people,dc=shibboleth,dc=net
+search.filter=(uid=${recipientContext.principal})
+search.returnAttributes=uid,homephone,mail
+search.timeLimit=PT7S
+
+jndi.property1=value1
+jndi.property2=value2
+
+connectionPool.blockWaitTime=PT5S
+connectionPool.expirationTime=PT10M
+connectionPool.minPoolSize=5
+connectionPool.maxPoolSize=10
+connectionPool.validatePeriodically=true
+connectionPool.validatePeriod=PT15M
+connectionPool.validator.baseDn=dc=shibboleth,dc=net
+connectionPool.validator.filter=(ou=people)
+connectionPool.failFastInitialize=false
+
+cache.TTL=PT10S
+cache.maxSize=25
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
index c4ec3fe..e064a2f 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
@@ -1,31 +1,31 @@
-connectionConfig.ldapURL=ldap://localhost:10389
-connectionConfig.useStartTLS=true
-connectionConfig.connectTimeout=2000
-connectionConfig.responseTimeout=4000
-connectionConfig.bindDn=cn=Directory Manager
-connectionConfig.bindCredential=password
-
-noResultIsError=true
-multipleResultsIsError=true
-noRetryDelay=PT5M
-
-search.baseDn=ou=people,dc=shibboleth,dc=net
-search.filter=(uid=${recipientContext.principal})
-search.returnAttributes=uid,homephone,mail
-search.timeLimit=7000
-
-jndi.property1=value1
-jndi.property2=value2
-
-connectionPool.blockWaitTime=5000
-connectionPool.minPoolSize=5
-connectionPool.maxPoolSize=10
-connectionPool.validatePeriodically=true
-connectionPool.validatePeriod=900
-connectionPool.validator.baseDn=dc=shibboleth,dc=net
-connectionPool.validator.filter=(ou=people)
-connectionPool.pruneStrategy.prunePeriod=300
-connectionPool.pruneStrategy.idleTime=600
-connectionPool.failFastInitialize=false
-
-cache.cacheBuilderSpec=expireAfterAccess=10s,maximumSize=25
+connectionConfig.ldapURL=ldap://localhost:10389
+connectionConfig.useStartTLS=true
+connectionConfig.connectTimeout=2000
+connectionConfig.responseTimeout=4000
+connectionConfig.bindDn=cn=Directory Manager
+connectionConfig.bindCredential=password
+
+noResultIsError=true
+multipleResultsIsError=true
+noRetryDelay=PT5M
+
+search.baseDn=ou=people,dc=shibboleth,dc=net
+search.filter=(uid=${recipientContext.principal})
+search.returnAttributes=uid,homephone,mail
+search.timeLimit=7000
+
+jndi.property1=value1
+jndi.property2=value2
+
+connectionPool.blockWaitTime=5000
+connectionPool.minPoolSize=5
+connectionPool.maxPoolSize=10
+connectionPool.validatePeriodically=true
+connectionPool.validatePeriod=900
+connectionPool.validator.baseDn=dc=shibboleth,dc=net
+connectionPool.validator.filter=(ou=people)
+connectionPool.pruneStrategy.prunePeriod=300
+connectionPool.pruneStrategy.idleTime=600
+connectionPool.failFastInitialize=false
+
+cache.cacheBuilderSpec=expireAfterAccess=10s,maximumSize=25
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsData.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsData.sql
index c247559..48f3dd3 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsData.sql
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsData.sql
@@ -1,20 +1,20 @@
-INSERT INTO people
- (userid, name, password, homephone, mail, description)
- values (
- 'PETER_THE_PRINCIPAL',
- 'Peter Principal',
- 'changeit',
- '555-111-2222',
- 'peter.principal at shibboleth.net',
- 'test principal');
-
-INSERT INTO people
- (userid, name, password, homephone, mail, description)
- values (
- 'PAUL_THE_PRINCIPAL',
- 'Paul Principal',
- 'changeit',
- '555-111-3333',
- 'paul.principal at shibboleth.net',
- 'test principal');
-
+INSERT INTO people
+ (userid, name, password, homephone, mail, description)
+ values (
+ 'PETER_THE_PRINCIPAL',
+ 'Peter Principal',
+ 'changeit',
+ '555-111-2222',
+ 'peter.principal at shibboleth.net',
+ 'test principal');
+
+INSERT INTO people
+ (userid, name, password, homephone, mail, description)
+ values (
+ 'PAUL_THE_PRINCIPAL',
+ 'Paul Principal',
+ 'changeit',
+ '555-111-3333',
+ 'paul.principal at shibboleth.net',
+ 'test principal');
+
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql
index 945b8e1..18e7666 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql
@@ -1,8 +1,8 @@
-CREATE TABLE people (
- userid VARCHAR(50) NOT NULL,
- name VARCHAR(50) NOT NULL,
- password VARCHAR(50) NOT NULL,
- homephone VARCHAR(15) NOT NULL,
- mail VARCHAR(100) NOT NULL,
- description VARCHAR(250));
-
+CREATE TABLE people (
+ userid VARCHAR(50) NOT NULL,
+ name VARCHAR(50) NOT NULL,
+ password VARCHAR(50) NOT NULL,
+ homephone VARCHAR(15) NOT NULL,
+ mail VARCHAR(100) NOT NULL,
+ description VARCHAR(250));
+
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml
index 1f0a9e7..42af696 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
-
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
-</resolver:DataConnector>
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:DataConnector id="staticAttributes"
+ xsi:type="dc:Static" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <dc:Attribute id="staticEpA">
+ <dc:Value>member</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="eduPersonEntitlement">
+ <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
+ <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
+ </dc:Attribute>
+</resolver:DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributesNative.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributesNative.xml
index 88d9b15..6b09568 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributesNative.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributesNative.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
-
- <bean class="net.shibboleth.idp.attribute.resolver.dc.impl.StaticDataConnector" id="staticAttributes">
- <property name="values">
- <list>
- <bean class="net.shibboleth.idp.attribute.IdPAttribute" c:attributeId="staticEpA">
- <property name="values">
- <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="member" />
- </property>
- </bean>
- <bean class="net.shibboleth.idp.attribute.IdPAttribute" c:attributeId="eduPersonEntitlement">
- <property name="values">
- <list>
- <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="urn:example.org:entitlement:entitlement1" />
- <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="urn:mace:dir:entitlement:common-lib-terms" />
- </list>
- </property>
-
- </bean>
- </list>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <bean class="net.shibboleth.idp.attribute.resolver.dc.impl.StaticDataConnector" id="staticAttributes">
+ <property name="values">
+ <list>
+ <bean class="net.shibboleth.idp.attribute.IdPAttribute" c:attributeId="staticEpA">
+ <property name="values">
+ <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="member" />
+ </property>
+ </bean>
+ <bean class="net.shibboleth.idp.attribute.IdPAttribute" c:attributeId="eduPersonEntitlement">
+ <property name="values">
+ <list>
+ <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="urn:example.org:entitlement:entitlement1" />
+ <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="urn:mace:dir:entitlement:common-lib-terms" />
+ </list>
+ </property>
+
+ </bean>
+ </list>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/idp-571.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/idp-571.xml
index 7385adf..40d3929 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/idp-571.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/idp-571.xml
@@ -1,49 +1,49 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:AttributeDefinition id="skillsoftdept" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
- xsi:type="Script"
- sourceAttributeID="uid">
-
- <resolver:Dependency ref="static" />
-
- <resolver:AttributeEncoder xsi:type="SAML2String" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
- name="skillsoftdept"
- friendlyName="dept name for skillsoft"
- nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" />
-
- <Script><![CDATA[
-
- importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
- // Create attribute to be returned from definition
- skillsoftdept = new BasicAttribute("skillsoftdept");
-
-
- ]]></Script>
-
- </resolver:AttributeDefinition>
- <resolver:DataConnector id="static"
- xsi:type="dc:Static" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-</resolver:AttributeResolver>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <resolver:AttributeDefinition id="skillsoftdept" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
+ xsi:type="Script"
+ sourceAttributeID="uid">
+
+ <resolver:Dependency ref="static" />
+
+ <resolver:AttributeEncoder xsi:type="SAML2String" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
+ name="skillsoftdept"
+ friendlyName="dept name for skillsoft"
+ nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" />
+
+ <Script><![CDATA[
+
+ importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+ // Create attribute to be returned from definition
+ skillsoftdept = new BasicAttribute("skillsoftdept");
+
+
+ ]]></Script>
+
+ </resolver:AttributeDefinition>
+ <resolver:DataConnector id="static"
+ xsi:type="dc:Static" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+ xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <dc:Attribute id="staticEpA">
+ <dc:Value>member</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml
index eed481c..8b4b613 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <bean id="predicate" class="com.google.common.base.Predicates" factory-method="alwaysFalse"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean id="predicate" class="com.google.common.base.Predicates" factory-method="alwaysFalse"/>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64.xml
index 96a6436..ba52cb5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64.xml
@@ -1,15 +1,15 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_BASE64_ATTRIBUTE_NAME"
- namespace="SAML1_BASE64_ATTRIBUTE_NAME_SPACE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1Base64"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="SAML1_BASE64_ATTRIBUTE_NAME"
+ namespace="SAML1_BASE64_ATTRIBUTE_NAME_SPACE"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64Default.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64Default.xml
index cabff2d..0ba1c4f 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64Default.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64Default.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Base64_ATTRIBUTE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1Base64"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="Base64_ATTRIBUTE"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64NoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64NoName.xml
index 0974791..f6e89fb 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64NoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64NoName.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1Base64"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Scoped.xml
index b272bdc..319dc4c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Scoped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Scoped.xml
@@ -1,17 +1,17 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_SCOPED_ATTRIBUTE_NAME"
- namespace="SAML1_SCOPED_ATTRIBUTE_NAME_FORMAT"
- scopeType="attribute"
- scopeAttribute="saml1ScopeAttrib"
- scopeDelimiter="#@#"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1ScopedString"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="SAML1_SCOPED_ATTRIBUTE_NAME"
+ namespace="SAML1_SCOPED_ATTRIBUTE_NAME_FORMAT"
+ scopeType="attribute"
+ scopeAttribute="saml1ScopeAttrib"
+ scopeDelimiter="#@#"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedDefault.xml
index 0be0075..f7dac02 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedDefault.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="saml1_scoped_name"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1ScopedString"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="saml1_scoped_name"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedNoName.xml
index 5a639f2..1bbee7c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedNoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedNoName.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1ScopedString"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1String.xml
index 76869f9..bad8382 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1String.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1String.xml
@@ -1,15 +1,15 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_STRING_ATTRIBUTE_NAME"
- namespace="SAML1_STRING_ATTRIBUTE_NAME_SPACE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="SAML1_STRING_ATTRIBUTE_NAME"
+ namespace="SAML1_STRING_ATTRIBUTE_NAME_SPACE"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringDefault.xml
index 0e54aeb..413895a 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringDefault.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="ATTRIBUTE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="ATTRIBUTE"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifier.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifier.xml
index 3be5eb6..6927cab 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifier.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifier.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1StringNameIdentifier"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- nameFormat="NAMEIDENTIFIER_FORMAT"
- nameQualifier="NAMEIDENTIFIER_QUALIFIER"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1StringNameIdentifier"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ nameFormat="NAMEIDENTIFIER_FORMAT"
+ nameQualifier="NAMEIDENTIFIER_QUALIFIER"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierDefault.xml
index 9cad9ac..06b2132 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierDefault.xml
@@ -1,11 +1,11 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1StringNameIdentifier"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1StringNameIdentifier"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNoName.xml
index b561c48..725fc1a 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNoName.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObject.xml
index 889883c..0e0fe39 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObject.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObject.xml
@@ -1,15 +1,15 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_XMLObject_ATTRIBUTE_NAME"
- namespace="SAML1_XMLObject_ATTRIBUTE_NAME_SPACE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1XMLObject"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="SAML1_XMLObject_ATTRIBUTE_NAME"
+ namespace="SAML1_XMLObject_ATTRIBUTE_NAME_SPACE"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectDefault.xml
index 89cd97d..9d422db 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectDefault.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="XMLObject_ATTRIBUTE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1XMLObject"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="XMLObject_ATTRIBUTE"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectNoName.xml
index 5c71139..20f41ee 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectNoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectNoName.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML1XMLObject"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64.xml
index 9808159..1b0e569 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64.xml
@@ -1,15 +1,15 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2Base64_ATTRIBUTE_NAME"
- nameFormat="Saml2Base64_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2Base64_ATTRIBUTE_FRIENDLY_NAME"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2Base64"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="Saml2Base64_ATTRIBUTE_NAME"
+ nameFormat="Saml2Base64_ATTRIBUTE_NAME_FORMAT"
+ friendlyName="Saml2Base64_ATTRIBUTE_FRIENDLY_NAME"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64Default.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64Default.xml
index fc69f37..b7eec04 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64Default.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64Default.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Base64Name"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2Base64"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="Base64Name"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64NoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64NoName.xml
index 1e7f0b3..e877c37 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64NoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64NoName.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2Base64"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Scoped.xml
index 0b00814..4d92f71 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Scoped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Scoped.xml
@@ -1,18 +1,18 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="ATTRIBUTE_NAME"
- nameFormat="ATTRIBUTE_NAME_FORMAT"
- friendlyName="ATTRIBUTE_FRIENDLY_NAME"
- scopeType="attribute"
- scopeAttribute="scopeAttrib"
- scopeDelimiter="###"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2ScopedString"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="ATTRIBUTE_NAME"
+ nameFormat="ATTRIBUTE_NAME_FORMAT"
+ friendlyName="ATTRIBUTE_FRIENDLY_NAME"
+ scopeType="attribute"
+ scopeAttribute="scopeAttrib"
+ scopeDelimiter="###"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedDefault.xml
index 5bf9b61..4a37973 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedDefault.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="name"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2ScopedString"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="name"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedNoName.xml
index 4d0f400..d2a50c0 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedNoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedNoName.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2ScopedString"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2String.xml
index 8a7e62f..1ee7122 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2String.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2String.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2String_ATTRIBUTE_NAME"
- nameFormat="Saml2String_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2String_ATTRIBUTE_FRIENDLY_NAME"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="Saml2String_ATTRIBUTE_NAME"
+ nameFormat="Saml2String_ATTRIBUTE_NAME_FORMAT"
+ friendlyName="Saml2String_ATTRIBUTE_FRIENDLY_NAME"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml
index acbcb77..94b1166 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2StringConditional"
- activationConditionRef="predicate"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="Saml2StringConditional"
+ activationConditionRef="predicate"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringDefault.xml
index 6d75b16..f892f9e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringDefault.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2StringName"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="Saml2StringName"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameID.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameID.xml
index 1d3fcd7..f7a9732 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameID.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameID.xml
@@ -1,15 +1,15 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2StringNameID"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- nameFormat="S2_NAMEID_FORMAT"
- nameQualifier="S2_NAMEID_QUALIFIER"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2StringNameID"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ nameFormat="S2_NAMEID_FORMAT"
+ nameQualifier="S2_NAMEID_QUALIFIER"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameIDDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameIDDefault.xml
index 58f4b64..7b4d647 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameIDDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameIDDefault.xml
@@ -1,11 +1,11 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2StringNameID"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2StringNameID"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNoName.xml
index bf348c3..2d6b505 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNoName.xml
@@ -1,12 +1,12 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObject.xml
index 5a5628d..d3e7501 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObject.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObject.xml
@@ -1,14 +1,14 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2XmlObject_ATTRIBUTE_NAME"
- nameFormat="Saml2XmlObject_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2XMLObject"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="Saml2XmlObject_ATTRIBUTE_NAME"
+ nameFormat="Saml2XmlObject_ATTRIBUTE_NAME_FORMAT"
+ friendlyName="Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectDefault.xml
index f4c3c90..38e4491 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectDefault.xml
@@ -1,13 +1,13 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="XmlObjectName"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2XMLObject"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ name="XmlObjectName"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectNoName.xml
index 4b4afec..5996a62 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectNoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectNoName.xml
@@ -1,12 +1,12 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
+<resolver:AttributeEncoder
+ xsi:type="enc:SAML2XMLObject"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
index 7e1bac0..f3bfc8c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <props>
- <prop key="resource.loader">classpath, string</prop>
- <prop key="classpath.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- <prop key="string.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.StringResourceLoader
- </prop>
- </props>
- </property>
- </bean>
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
- <bean id="cacheBuilderExternal" class="com.google.common.cache.CacheBuilder" factory-method="from">
- <constructor-arg value="expireAfterAccess=10s,maximumSize=25" />
- </bean>
-
- <util:list id="emptyList"/>
-
- <util:list id="rdbmsResource">
- <bean class="org.springframework.core.io.ClassPathResource"
- c:path="net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml"/>
- </util:list>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <props>
+ <prop key="resource.loader">classpath, string</prop>
+ <prop key="classpath.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ <prop key="string.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.StringResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
+ class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
+ p:placeholderPrefix="%{" p:placeholderSuffix="}" />
+
+ <bean id="cacheBuilderExternal" class="com.google.common.cache.CacheBuilder" factory-method="from">
+ <constructor-arg value="expireAfterAccess=10s,maximumSize=25" />
+ </bean>
+
+ <util:list id="emptyList"/>
+
+ <util:list id="rdbmsResource">
+ <bean class="org.springframework.core.io.ClassPathResource"
+ c:path="net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml"/>
+ </util:list>
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputAttributeDefinition1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputAttributeDefinition1.xml
index 5a38df8..8b5088b 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputAttributeDefinition1.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputAttributeDefinition1.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InputAttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
- ref="AD1"
-/>
+<?xml version="1.0" encoding="UTF-8"?>
+<InputAttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ ref="AD1"
+/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector1.xml
index 21d1cbf..ca647aa 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector1.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector1.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
- ref="DC1"
- attributeNames="#{ {'1', '2', '3'} }"
-/>
+<?xml version="1.0" encoding="UTF-8"?>
+<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ ref="DC1"
+ attributeNames="#{ {'1', '2', '3'} }"
+/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector2.xml
index 189c2c1..ff23bc5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector2.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
- ref="DC2"
- allAttributes="true"
-/>
+<?xml version="1.0" encoding="UTF-8"?>
+<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ ref="DC2"
+ allAttributes="true"
+/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector3.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector3.xml
index 7c7ff57..165a93d 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector3.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector3.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
- ref="DC3"
- allAttributes="true"
- attributeNames="OneIsOneAndAllAlone"
-/>
+<?xml version="1.0" encoding="UTF-8"?>
+<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ ref="DC3"
+ allAttributes="true"
+ attributeNames="OneIsOneAndAllAlone"
+/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector4.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector4.xml
index 73a34e0..a04fd4c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector4.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector4.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
- ref="DC3"
-/>
+<?xml version="1.0" encoding="UTF-8"?>
+<InputDataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ ref="DC3"
+/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml
index e4e6719..447b50d 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
- <resolver:AttributeDefinition xsi:type="Mapped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
- id="mapped1" sourceAttributeID="attr1" dependencyOnly="true">
- <resolver:Dependency ref="static" />
- <DefaultValue>undefined</DefaultValue>
- <ValueMap>
- <ReturnValue>$1</ReturnValue>
- <SourceValue>(.+)</SourceValue>
- </ValueMap>
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="Mapped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
- id="mapped2" sourceAttributeID="attr2" dependencyOnly="true">
- <resolver:Dependency ref="static" />
- <DefaultValue>undefined</DefaultValue>
- <ValueMap>
- <ReturnValue>$1</ReturnValue>
- <SourceValue>(.+)</SourceValue>
- </ValueMap>
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="Template" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
- id="testing">
- <resolver:Dependency ref="mapped1" />
- <resolver:Dependency ref="mapped2" />
- <Template>
- <![CDATA[${mapped1}:${mapped2}]]>
- </Template>
- <SourceAttribute>mapped1</SourceAttribute>
- <SourceAttribute>mapped2</SourceAttribute>
- </resolver:AttributeDefinition>
-
- <resolver:DataConnector id="static" xsi:type="dc:Static">
- <dc:Attribute id="attr1">
- <dc:Value>a1v1</dc:Value>
- <dc:Value>a1v2</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="attr2">
- <dc:Value>A2V1</dc:Value>
- <dc:Value>A2V2</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
-</resolver:AttributeResolver>
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+ <resolver:AttributeDefinition xsi:type="Mapped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
+ id="mapped1" sourceAttributeID="attr1" dependencyOnly="true">
+ <resolver:Dependency ref="static" />
+ <DefaultValue>undefined</DefaultValue>
+ <ValueMap>
+ <ReturnValue>$1</ReturnValue>
+ <SourceValue>(.+)</SourceValue>
+ </ValueMap>
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="Mapped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
+ id="mapped2" sourceAttributeID="attr2" dependencyOnly="true">
+ <resolver:Dependency ref="static" />
+ <DefaultValue>undefined</DefaultValue>
+ <ValueMap>
+ <ReturnValue>$1</ReturnValue>
+ <SourceValue>(.+)</SourceValue>
+ </ValueMap>
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="Template" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
+ id="testing">
+ <resolver:Dependency ref="mapped1" />
+ <resolver:Dependency ref="mapped2" />
+ <Template>
+ <![CDATA[${mapped1}:${mapped2}]]>
+ </Template>
+ <SourceAttribute>mapped1</SourceAttribute>
+ <SourceAttribute>mapped2</SourceAttribute>
+ </resolver:AttributeDefinition>
+
+ <resolver:DataConnector id="static" xsi:type="dc:Static">
+ <dc:Attribute id="attr1">
+ <dc:Value>a1v1</dc:Value>
+ <dc:Value>a1v2</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="attr2">
+ <dc:Value>A2V1</dc:Value>
+ <dc:Value>A2V2</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml
index 2ac8726..0b0a7eb 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy"
- >
-
- <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
- <bean id="shibboleth.IdentifiableBeanPostProcessor"
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
-
- <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <props>
- <prop key="resource.loader">classpath, string</prop>
- <prop key="classpath.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- <prop key="string.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.StringResourceLoader
- </prop>
- </props>
- </property>
- </bean>
- <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- depends-on="shibboleth.VelocityEngine"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:failFast="false" p:reloadCheckDelay="0">
-
- <constructor-arg name="claz"
- value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
- <constructor-arg name="strategy">
- <bean
- class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
- p:id="Shibboleth.Resolver" />
- </constructor-arg>
- <property name="serviceConfigurations">
- <util:list>
- <value>net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml</value>
- <value>net/shibboleth/idp/attribute/resolver/spring/storageService.xml</value>
- <value>net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml</value>
- </util:list>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize"
+ default-destroy-method="destroy"
+ >
+
+ <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
+ <bean id="shibboleth.IdentifiableBeanPostProcessor"
+ class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+
+ <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <props>
+ <prop key="resource.loader">classpath, string</prop>
+ <prop key="classpath.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ <prop key="string.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.StringResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+ <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ depends-on="shibboleth.VelocityEngine"
+ p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
+ p:failFast="false" p:reloadCheckDelay="0">
+
+ <constructor-arg name="claz"
+ value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
+ <constructor-arg name="strategy">
+ <bean
+ class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
+ p:id="Shibboleth.Resolver" />
+ </constructor-arg>
+ <property name="serviceConfigurations">
+ <util:list>
+ <value>net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml</value>
+ <value>net/shibboleth/idp/attribute/resolver/spring/storageService.xml</value>
+ <value>net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml</value>
+ </util:list>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
index 00f4917..f42cb8c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. While the configuration
- presented in this example file is functional, it isn't very interesting.
- However, there are lots of example attributes, encoders, and a couple example
- data connectors. Not all attribute definitions, data connectors, or principal
- connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
- for a complete list of components and their options. -->
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
- <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
- <dc:Attribute id="assurance">
- <dc:Value>tin</dc:Value>
- <dc:Value>pewter</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="oAssurance">
- <dc:Value>bakelite</dc:Value>
- <dc:Value>dross</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="assurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="fotherSAMLName" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" sourceAttributeID="oAssurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherFormatPersonAssurance" sourceAttributeID="ofAssurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" nameFormat="http://example.org/Format" friendlyName="fOeduPersonAssurance" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org"
- sourceAttributeID="assurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="feduPersonScopedAffiliation"
- scopeDelimiter='#'/>
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTID"
- nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="eduPersonEntitlement">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="feduPersonTargetedID" />
- </resolver:AttributeDefinition>
-</resolver:AttributeResolver>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is an EXAMPLE configuration file. While the configuration
+ presented in this example file is functional, it isn't very interesting.
+ However, there are lots of example attributes, encoders, and a couple example
+ data connectors. Not all attribute definitions, data connectors, or principal
+ connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
+ for a complete list of components and their options. -->
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+ <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
+ <dc:Attribute id="assurance">
+ <dc:Value>tin</dc:Value>
+ <dc:Value>pewter</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="oAssurance">
+ <dc:Value>bakelite</dc:Value>
+ <dc:Value>dross</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="eduPersonEntitlement">
+ <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
+ <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="assurance">
+ <resolver:Dependency ref="staticAttributes" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="fotherSAMLName" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" sourceAttributeID="oAssurance">
+ <resolver:Dependency ref="staticAttributes" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherFormatPersonAssurance" sourceAttributeID="ofAssurance">
+ <resolver:Dependency ref="staticAttributes" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" nameFormat="http://example.org/Format" friendlyName="fOeduPersonAssurance" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org"
+ sourceAttributeID="assurance">
+ <resolver:Dependency ref="staticAttributes" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="feduPersonScopedAffiliation"
+ scopeDelimiter='#'/>
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTID"
+ nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="eduPersonEntitlement">
+ <resolver:Dependency ref="staticAttributes" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="feduPersonTargetedID" />
+ </resolver:AttributeDefinition>
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
index 3cc429f..2c026f5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
- <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <props>
- <prop key="resource.loader">classpath, string</prop>
- <prop key="classpath.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- <prop key="string.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.StringResourceLoader
- </prop>
- </props>
- </property>
- </bean>
- <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- depends-on="shibboleth.VelocityEngine" p:failFast="false"
- p:reloadCheckDelay="0">
-
- <constructor-arg name="claz"
- value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
- <constructor-arg name="strategy">
- <bean
- class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
- p:id="TestID" />
- </constructor-arg>
- <property name="serviceConfigurations">
- <util:list>
- <value>net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml</value>
- </util:list>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+ <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <props>
+ <prop key="resource.loader">classpath, string</prop>
+ <prop key="classpath.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ <prop key="string.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.StringResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+ <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ depends-on="shibboleth.VelocityEngine" p:failFast="false"
+ p:reloadCheckDelay="0">
+
+ <constructor-arg name="claz"
+ value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
+ <constructor-arg name="strategy">
+ <bean
+ class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
+ p:id="TestID" />
+ </constructor-arg>
+ <property name="serviceConfigurations">
+ <util:list>
+ <value>net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml</value>
+ </util:list>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
index 8f32c98..2cf82cc 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
- <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation" sourceAttributeID="staticEpA">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
-
- <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
-</resolver:AttributeResolver>
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+ <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation" sourceAttributeID="staticEpA">
+ <resolver:Dependency ref="staticAttributes" />
+ </resolver:AttributeDefinition>
+
+ <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
+ <dc:Attribute id="staticEpA">
+ <dc:Value>member</dc:Value>
+ </dc:Attribute>
+ <dc:Attribute id="eduPersonEntitlement">
+ <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
+ <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
index 9be6df3..b615902 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
- <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation2" sourceAttributeID="eduPersonAffiliation">
- <resolver:Dependency ref="eduPersonAffiliation" />
- </resolver:AttributeDefinition>
-
-</resolver:AttributeResolver>
+<?xml version="1.0" encoding="UTF-8"?>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+ <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation2" sourceAttributeID="eduPersonAffiliation">
+ <resolver:Dependency ref="eduPersonAffiliation" />
+ </resolver:AttributeDefinition>
+
+</resolver:AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml
index 3e7529e..90de6b6 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
- default-init-method="initialize" default-destroy-method="destroy"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
- <bean id="shibboleth.VelocityEngine"
- class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <props>
- <prop key="resource.loader">classpath, string</prop>
- <prop key="classpath.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- <prop key="string.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.StringResourceLoader
- </prop>
- </props>
- </property>
- </bean>
- <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- depends-on="shibboleth.VelocityEngine" p:failFast="false"
- p:reloadCheckDelay="0">
-
- <constructor-arg name="claz"
- value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
- <constructor-arg name="strategy">
- <bean
- class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
- p:id="MultiFileResolver" />
- </constructor-arg>
- <property name="serviceConfigurations">
- <util:list>
- <value>net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml</value>
- <value>net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml</value>
- </util:list>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
+ default-init-method="initialize" default-destroy-method="destroy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ <bean id="shibboleth.VelocityEngine"
+ class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <props>
+ <prop key="resource.loader">classpath, string</prop>
+ <prop key="classpath.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ <prop key="string.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.StringResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+ <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ depends-on="shibboleth.VelocityEngine" p:failFast="false"
+ p:reloadCheckDelay="0">
+
+ <constructor-arg name="claz"
+ value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
+ <constructor-arg name="strategy">
+ <bean
+ class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
+ p:id="MultiFileResolver" />
+ </constructor-arg>
+ <property name="serviceConfigurations">
+ <util:list>
+ <value>net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml</value>
+ <value>net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml</value>
+ </util:list>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql
index 25c4a8c..9ffe8bd 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql
@@ -1 +1 @@
-DROP TABLE shibpid;
+DROP TABLE shibpid;
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql
index fb2738c..9cc4018 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql
@@ -1,11 +1,11 @@
-CREATE TABLE shibpid (
- localEntity VARCHAR(255) NOT NULL,
- peerEntity VARCHAR(255) NOT NULL,
- persistentId VARCHAR(50) NOT NULL,
- principalName VARCHAR(50) NOT NULL,
- localId VARCHAR(50) NOT NULL,
- peerProvidedId VARCHAR(50) NULL,
- creationDate TIMESTAMP NOT NULL,
- deactivationDate TIMESTAMP NULL,
- PRIMARY KEY (localEntity, peerEntity, persistentId)
- );
+CREATE TABLE shibpid (
+ localEntity VARCHAR(255) NOT NULL,
+ peerEntity VARCHAR(255) NOT NULL,
+ persistentId VARCHAR(50) NOT NULL,
+ principalName VARCHAR(50) NOT NULL,
+ localId VARCHAR(50) NOT NULL,
+ peerProvidedId VARCHAR(50) NULL,
+ creationDate TIMESTAMP NOT NULL,
+ deactivationDate TIMESTAMP NULL,
+ PRIMARY KEY (localEntity, peerEntity, persistentId)
+ );
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml
index 0d3c4c5..72d1aa5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml
@@ -1,6 +1,6 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:CryptoTransient" id="CryptoTransient" nameIDFormat="https://example.org/sealer" dataSealerRef="shibboleth.TransientIDDataSealer"/>
+<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
+
+ xsi:type="pc:CryptoTransient" id="CryptoTransient" nameIDFormat="https://example.org/sealer" dataSealerRef="shibboleth.TransientIDDataSealer"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml
index 3aa1f6d..16373d1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml
@@ -1,6 +1,6 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
- <bean class="org.hsqldb.jdbc.JDBCDataSource" p:url="jdbc:hsqldb:mem:storedId" p:user="SA" p:password="" />
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+ <bean class="org.hsqldb.jdbc.JDBCDataSource" p:url="jdbc:hsqldb:mem:storedId" p:user="SA" p:password="" />
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml
index eecd3bd..f374714 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml
@@ -1,6 +1,6 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Direct" id="shibDirect" nameIDFormat="https://example.org/direct" />
+<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
+
+ xsi:type="pc:Direct" id="shibDirect" nameIDFormat="https://example.org/direct" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/directRPs.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/directRPs.xml
index 3ad4bbb..af5a36c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/directRPs.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/directRPs.xml
@@ -1,9 +1,9 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Direct" id="shibDirect" nameIDFormat="http://example.org/schema">
- <resolver:RelyingParty>SP1</resolver:RelyingParty>
- <resolver:RelyingParty>SP2</resolver:RelyingParty>
-</resolver:PrincipalConnector>
+<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
+
+ xsi:type="pc:Direct" id="shibDirect" nameIDFormat="http://example.org/schema">
+ <resolver:RelyingParty>SP1</resolver:RelyingParty>
+ <resolver:RelyingParty>SP2</resolver:RelyingParty>
+</resolver:PrincipalConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-beanConnector.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-beanConnector.xml
index 2ce3b5d..18325c3 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-beanConnector.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-beanConnector.xml
@@ -1,41 +1,41 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
- <bean class="org.hsqldb.jdbc.JDBCDataSource" p:url="jdbc:hsqldb:mem:storedId" p:user="SA" p:password="" id="Connector" />
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:PrincipalConnector
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
- id="pc" nameIDFormat="https://example.org/stored"
- storedIdDataConnectorRef="dc" />
-
- <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
- generatedAttributeID="output" salt="123456789abcdefgh"
- sourceAttributeID="foobar" >
- <resolver:Dependency ref="staticAttributes" />
- <dc:BeanManagedConnection>Connector</dc:BeanManagedConnection>
- </resolver:DataConnector>
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="foobar">
- <dc:Value>barfoo</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition id="result"
- xsi:type="ad:Simple" sourceAttributeID="output">
- <resolver:Dependency ref="dc" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="https://example.org/stored" />
- </resolver:AttributeDefinition>
-</resolver:AttributeResolver>
-</beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+ <bean class="org.hsqldb.jdbc.JDBCDataSource" p:url="jdbc:hsqldb:mem:storedId" p:user="SA" p:password="" id="Connector" />
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <resolver:PrincipalConnector
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
+ id="pc" nameIDFormat="https://example.org/stored"
+ storedIdDataConnectorRef="dc" />
+
+ <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
+ generatedAttributeID="output" salt="123456789abcdefgh"
+ sourceAttributeID="foobar" >
+ <resolver:Dependency ref="staticAttributes" />
+ <dc:BeanManagedConnection>Connector</dc:BeanManagedConnection>
+ </resolver:DataConnector>
+
+ <resolver:DataConnector id="staticAttributes"
+ xsi:type="dc:Static">
+ <dc:Attribute id="foobar">
+ <dc:Value>barfoo</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+ <resolver:AttributeDefinition id="result"
+ xsi:type="ad:Simple" sourceAttributeID="output">
+ <resolver:Dependency ref="dc" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="https://example.org/stored" />
+ </resolver:AttributeDefinition>
+</resolver:AttributeResolver>
+</beans>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml
index 4886985..a464b7d 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml
@@ -1,35 +1,35 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:PrincipalConnector
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
- id="pc" nameIDFormat="https://example.org/stored"
- storedIdDataConnectorRef="dc" />
-
- <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
- generatedAttributeID="output" salt="123456789abcdefgh"
- sourceAttributeID="foobar" springResources="/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:DataConnector>
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="foobar">
- <dc:Value>barfoo</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition id="result"
- xsi:type="ad:Simple" sourceAttributeID="output">
- <resolver:Dependency ref="dc" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="https://example.org/stored" />
- </resolver:AttributeDefinition>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <resolver:PrincipalConnector
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
+ id="pc" nameIDFormat="https://example.org/stored"
+ storedIdDataConnectorRef="dc" />
+
+ <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
+ generatedAttributeID="output" salt="123456789abcdefgh"
+ sourceAttributeID="foobar" springResources="/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml">
+ <resolver:Dependency ref="staticAttributes" />
+ </resolver:DataConnector>
+
+ <resolver:DataConnector id="staticAttributes"
+ xsi:type="dc:Static">
+ <dc:Attribute id="foobar">
+ <dc:Value>barfoo</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+ <resolver:AttributeDefinition id="result"
+ xsi:type="ad:Simple" sourceAttributeID="output">
+ <resolver:Dependency ref="dc" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="https://example.org/stored" />
+ </resolver:AttributeDefinition>
</resolver:AttributeResolver>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored.xml
index b6a0031..d19e301 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored.xml
@@ -1,36 +1,36 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:PrincipalConnector
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
- id="pc" nameIDFormat="https://example.org/stored"
- storedIdDataConnectorRef="dc" />
-
- <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
- generatedAttributeID="output" salt="123456789abcdefgh"
- sourceAttributeID="foobar">
- <resolver:Dependency ref="staticAttributes" />
- <dc:ApplicationManagedConnection
- jdbcURL="jdbc:hsqldb:mem:storedId" jdbcDriver="org.hsqldb.jdbc.JDBCDriver" jdbcUserName="SA" jdbcPassword="" />
- </resolver:DataConnector>
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="foobar">
- <dc:Value>barfoo</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition id="result"
- xsi:type="ad:Simple" sourceAttributeID="output">
- <resolver:Dependency ref="dc" />
- </resolver:AttributeDefinition>
+<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
+ xmlns:sec="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+ urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+ urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+ urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+
+ <resolver:PrincipalConnector
+ xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
+ id="pc" nameIDFormat="https://example.org/stored"
+ storedIdDataConnectorRef="dc" />
+
+ <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
+ generatedAttributeID="output" salt="123456789abcdefgh"
+ sourceAttributeID="foobar">
+ <resolver:Dependency ref="staticAttributes" />
+ <dc:ApplicationManagedConnection
+ jdbcURL="jdbc:hsqldb:mem:storedId" jdbcDriver="org.hsqldb.jdbc.JDBCDriver" jdbcUserName="SA" jdbcPassword="" />
+ </resolver:DataConnector>
+
+ <resolver:DataConnector id="staticAttributes"
+ xsi:type="dc:Static">
+ <dc:Attribute id="foobar">
+ <dc:Value>barfoo</dc:Value>
+ </dc:Attribute>
+ </resolver:DataConnector>
+
+ <resolver:AttributeDefinition id="result"
+ xsi:type="ad:Simple" sourceAttributeID="output">
+ <resolver:Dependency ref="dc" />
+ </resolver:AttributeDefinition>
</resolver:AttributeResolver>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transient.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transient.xml
index 641a646..9312efd 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transient.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transient.xml
@@ -1,6 +1,6 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Transient" id="Transient" nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" storageServiceRef="testStore"/>
+<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
+
+ xsi:type="pc:Transient" id="Transient" nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" storageServiceRef="testStore"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transientNoStore.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transientNoStore.xml
index 0b37b1f..207547d 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transientNoStore.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transientNoStore.xml
@@ -1,6 +1,6 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Transient" id="TransientNoStore" nameIDFormat="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" />
+<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+ urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
+
+ xsi:type="pc:Transient" id="TransientNoStore" nameIDFormat="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml
index 2ae53e2..71a39de 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <bean id="findProfileCtx"
- class="org.opensaml.messaging.context.navigate.ChildContextLookup"
- c:type="org.opensaml.profile.context.ProfileRequestContext" />
-
- <bean id="findAttributeCtx"
- class="org.opensaml.messaging.context.navigate.ParentContextLookup" />
-
- <bean id="principalFn"
- class="net.shibboleth.idp.attribute.resolver.context.navigate.AttributePrincipalLookupFunction"
- p:attributeResolutionContextLookupStrategy-ref="findAttributeCtx" />
-
- <bean id="issuerFn"
- class="net.shibboleth.idp.attribute.resolver.context.navigate.AttributeIssuerIdLookupFunction"
- p:attributeResolutionContextLookupStrategy-ref="findAttributeCtx" />
-
- <bean id="peter"
- class="net.shibboleth.idp.attribute.resolver.spring.AttributeResolverTest.TestPredicate"
- c:profileFinder-ref="principalFn" c:compare="PETER" />
-
- <bean id="principal"
- class="net.shibboleth.idp.attribute.resolver.spring.AttributeResolverTest.TestPredicate"
- c:profileFinder-ref="issuerFn" c:compare="ISSUER" />
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean id="findProfileCtx"
+ class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+ c:type="org.opensaml.profile.context.ProfileRequestContext" />
+
+ <bean id="findAttributeCtx"
+ class="org.opensaml.messaging.context.navigate.ParentContextLookup" />
+
+ <bean id="principalFn"
+ class="net.shibboleth.idp.attribute.resolver.context.navigate.AttributePrincipalLookupFunction"
+ p:attributeResolutionContextLookupStrategy-ref="findAttributeCtx" />
+
+ <bean id="issuerFn"
+ class="net.shibboleth.idp.attribute.resolver.context.navigate.AttributeIssuerIdLookupFunction"
+ p:attributeResolutionContextLookupStrategy-ref="findAttributeCtx" />
+
+ <bean id="peter"
+ class="net.shibboleth.idp.attribute.resolver.spring.AttributeResolverTest.TestPredicate"
+ c:profileFinder-ref="principalFn" c:compare="PETER" />
+
+ <bean id="principal"
+ class="net.shibboleth.idp.attribute.resolver.spring.AttributeResolverTest.TestPredicate"
+ c:profileFinder-ref="issuerFn" c:compare="ISSUER" />
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates.xml
index 4d759ca..75bdc11 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <util:list id="principals">
- <value>PETER</value>
- </util:list>
-
- <bean id="peter"
- class="net.shibboleth.idp.attribute.resolver.logic.AttributePrincipalPredicate"
- c:candidates-ref="principals" />
-
- <util:list id="issuers">
- <value>ISSUER</value>
- </util:list>
-
- <bean id="principal"
- class="net.shibboleth.idp.attribute.resolver.logic.AttributeIssuerIdPredicate"
- c:candidates-ref="issuers" />
-
- <util:list id="recipients">
- <value>https://example.org/sp</value>
- </util:list>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <util:list id="principals">
+ <value>PETER</value>
+ </util:list>
+
+ <bean id="peter"
+ class="net.shibboleth.idp.attribute.resolver.logic.AttributePrincipalPredicate"
+ c:candidates-ref="principals" />
+
+ <util:list id="issuers">
+ <value>ISSUER</value>
+ </util:list>
+
+ <bean id="principal"
+ class="net.shibboleth.idp.attribute.resolver.logic.AttributeIssuerIdPredicate"
+ c:candidates-ref="issuers" />
+
+ <util:list id="recipients">
+ <value>https://example.org/sp</value>
+ </util:list>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml
index fec1b23..27d5f90 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <bean id="shibboleth.TransientIDDataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer">
- <property name="keyStrategy">
- <bean class="net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategy"
- p:keystoreResource="/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks"
- p:keyVersionResource="/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.kver"
- p:keystorePassword="kpassword"
- p:keyPassword="password"
- p:updateInterval="PT0S" />
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean id="shibboleth.TransientIDDataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer">
+ <property name="keyStrategy">
+ <bean class="net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategy"
+ p:keystoreResource="/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks"
+ p:keyVersionResource="/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.kver"
+ p:keystorePassword="kpassword"
+ p:keyPassword="password"
+ p:updateInterval="PT0S" />
+ </property>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service2.xml
index 3c42828..aabc730 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service2.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
- default-init-method="initialize" default-destroy-method="destroy"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
- <bean id="shibboleth.VelocityEngine"
- class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <props>
- <prop key="resource.loader">classpath, string</prop>
- <prop key="classpath.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- <prop key="string.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.StringResourceLoader
- </prop>
- </props>
- </property>
- </bean>
- <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- depends-on="shibboleth.VelocityEngine" p:failFast="false"
- p:reloadCheckDelay="0">
-
- <constructor-arg name="claz"
- value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
- <constructor-arg name="strategy">
- <bean
- class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
- p:id="TestID" />
- </constructor-arg>
- <property name="serviceConfigurations">
- <util:list>
- <value>net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
- </value>
- </util:list>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
+ default-init-method="initialize" default-destroy-method="destroy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ <bean id="shibboleth.VelocityEngine"
+ class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <props>
+ <prop key="resource.loader">classpath, string</prop>
+ <prop key="classpath.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ <prop key="string.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.StringResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+ <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ depends-on="shibboleth.VelocityEngine" p:failFast="false"
+ p:reloadCheckDelay="0">
+
+ <constructor-arg name="claz"
+ value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
+ <constructor-arg name="strategy">
+ <bean
+ class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
+ p:id="TestID" />
+ </constructor-arg>
+ <property name="serviceConfigurations">
+ <util:list>
+ <value>net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
+ </value>
+ </util:list>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml
index 739db62..7f968e1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml
@@ -1,11 +1,11 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="Simple" id="simplePopulated" sourceAttributeID="flibble"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
- <InputDataConnector ref="dep2" allAttributes="true"/>
- <Dependency ref="dep1"/>
- <InputAttributeDefinition ref="dep3"/>
-
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:type="Simple" id="simplePopulated" sourceAttributeID="flibble"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+
+ <InputDataConnector ref="dep2" allAttributes="true"/>
+ <Dependency ref="dep1"/>
+ <InputAttributeDefinition ref="dep3"/>
+
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
index 0b3c723..61829e4 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <!-- This bean MUST be called "conversionService" to work properly. -->
- <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
- <property name="converters">
- <list>
- <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter"/>
- <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter"/>
- </list>
- </property>
- </bean>
- <bean id="shibboleth.StorageService" p:id="test" class="org.opensaml.storage.impl.MemoryStorageService"
- p:cleanupInterval="PT10M" />
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <!-- This bean MUST be called "conversionService" to work properly. -->
+ <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
+ <property name="converters">
+ <list>
+ <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter"/>
+ <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter"/>
+ </list>
+ </property>
+ </bean>
+ <bean id="shibboleth.StorageService" p:id="test" class="org.opensaml.storage.impl.MemoryStorageService"
+ p:cleanupInterval="PT10M" />
</beans>
\ No newline at end of file
diff --git a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml b/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
index 96f097a..209bf0b 100644
--- a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
+++ b/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
-
- <!-- Beans from the standard flows -->
-
- <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
-
- <bean id="InitializeProfileRequestContext"
- class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
- scope="prototype" p:profileId="test_flow" />
-
- <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes"
- scope="prototype" c:resolverService-ref="shibboleth.AttributeResolverService" />
-
- <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes"
- scope="prototype" c:filterService-ref="shibboleth.AttributeFilterService" />
-
- <bean id="SAMLMetadataLookup"
- class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
- scope="prototype" c:executionDirection="INBOUND">
- <constructor-arg name="messageHandler">
- <bean
- class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler"
- scope="prototype">
- <property name="roleDescriptorResolver">
- <bean
- class="org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver"
- c:mdResolver-ref="shibboleth.MetadataResolver" />
- </property>
- </bean>
- </constructor-arg>
- </bean>
-
- <bean id="SAMLPopulateACS"
- class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
- scope="prototype" c:executionDirection="INBOUND">
- <constructor-arg name="messageHandler">
- <bean
- class="org.opensaml.saml.common.binding.impl.SAMLAddAttributeConsumingServiceHandler"
- scope="prototype" />
- </constructor-arg>
- </bean>
-
- <!-- Common test flow bean -->
- <bean id="PopulateResolution" class="net.shibboleth.idp.test.flows.SetupForResolver"
- scope="prototype" />
-
-
- <!-- Specific test flow beans -->
- <bean id="SetupSAMLMessage" class="net.shibboleth.idp.test.flows.mapper.SpoofSAMLMessage"
- scope="prototype" />
-
-
- <bean id="TestAfterFilter" class="net.shibboleth.idp.test.flows.mapper.TestAfterFilter"
- scope="prototype" />
-
-
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <!-- Beans from the standard flows -->
+
+ <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+
+ <bean id="InitializeProfileRequestContext"
+ class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
+ scope="prototype" p:profileId="test_flow" />
+
+ <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes"
+ scope="prototype" c:resolverService-ref="shibboleth.AttributeResolverService" />
+
+ <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes"
+ scope="prototype" c:filterService-ref="shibboleth.AttributeFilterService" />
+
+ <bean id="SAMLMetadataLookup"
+ class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
+ scope="prototype" c:executionDirection="INBOUND">
+ <constructor-arg name="messageHandler">
+ <bean
+ class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler"
+ scope="prototype">
+ <property name="roleDescriptorResolver">
+ <bean
+ class="org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver"
+ c:mdResolver-ref="shibboleth.MetadataResolver" />
+ </property>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="SAMLPopulateACS"
+ class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
+ scope="prototype" c:executionDirection="INBOUND">
+ <constructor-arg name="messageHandler">
+ <bean
+ class="org.opensaml.saml.common.binding.impl.SAMLAddAttributeConsumingServiceHandler"
+ scope="prototype" />
+ </constructor-arg>
+ </bean>
+
+ <!-- Common test flow bean -->
+ <bean id="PopulateResolution" class="net.shibboleth.idp.test.flows.SetupForResolver"
+ scope="prototype" />
+
+
+ <!-- Specific test flow beans -->
+ <bean id="SetupSAMLMessage" class="net.shibboleth.idp.test.flows.mapper.SpoofSAMLMessage"
+ scope="prototype" />
+
+
+ <bean id="TestAfterFilter" class="net.shibboleth.idp.test.flows.mapper.TestAfterFilter"
+ scope="prototype" />
+
+
+
+</beans>
diff --git a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml b/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml
index e97dc75..369cc17 100644
--- a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml
+++ b/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml
@@ -1,43 +1,43 @@
-<flow xmlns="http://www.springframework.org/schema/webflow"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
-
- <on-start>
- <evaluate expression="InitializeProfileRequestContext" />
- </on-start>
-
- <action-state id="StartTest">
- <evaluate expression="SetupSAMLMessage" />
- <evaluate expression="SAMLMetadataLookup" />
- <evaluate expression="SAMLPopulateACS" />
- <evaluate expression="PopulateResolution" />
- <evaluate expression="ResolveAttributes" />
- <evaluate expression="FilterAttributes" />
- <evaluate expression="'proceed'" />
-
- <transition on="proceed" to="AfterTest" />
- </action-state>
-
- <action-state id="AfterTest">
- <evaluate expression="TestAfterFilter" />
- <evaluate expression="'proceed'" />
-
- <transition on="proceed" to="end" />
- </action-state>
-
- <end-state id="end">
- <!-- TODO: Probably remove later. For tests, map the profile request context
- as an output attribute -->
- <output name="ProfileRequestContext" value="opensamlProfileRequestContext" />
- </end-state>
-
- <end-state id="error" />
-
- <global-transitions>
- <transition on="#{!'proceed'.equals(currentEvent.id)}" to="error" />
- </global-transitions>
-
- <bean-import resource="beans.xml" />
-
-</flow>
+<flow xmlns="http://www.springframework.org/schema/webflow"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
+
+ <on-start>
+ <evaluate expression="InitializeProfileRequestContext" />
+ </on-start>
+
+ <action-state id="StartTest">
+ <evaluate expression="SetupSAMLMessage" />
+ <evaluate expression="SAMLMetadataLookup" />
+ <evaluate expression="SAMLPopulateACS" />
+ <evaluate expression="PopulateResolution" />
+ <evaluate expression="ResolveAttributes" />
+ <evaluate expression="FilterAttributes" />
+ <evaluate expression="'proceed'" />
+
+ <transition on="proceed" to="AfterTest" />
+ </action-state>
+
+ <action-state id="AfterTest">
+ <evaluate expression="TestAfterFilter" />
+ <evaluate expression="'proceed'" />
+
+ <transition on="proceed" to="end" />
+ </action-state>
+
+ <end-state id="end">
+ <!-- TODO: Probably remove later. For tests, map the profile request context
+ as an output attribute -->
+ <output name="ProfileRequestContext" value="opensamlProfileRequestContext" />
+ </end-state>
+
+ <end-state id="error" />
+
+ <global-transitions>
+ <transition on="#{!'proceed'.equals(currentEvent.id)}" to="error" />
+ </global-transitions>
+
+ <bean-import resource="beans.xml" />
+
+</flow>
\ No newline at end of file
diff --git a/idp-conf/src/test/resources/conf/relying-party-legacy.xml b/idp-conf/src/test/resources/conf/relying-party-legacy.xml
index f497042..9cd5f01 100644
--- a/idp-conf/src/test/resources/conf/relying-party-legacy.xml
+++ b/idp-conf/src/test/resources/conf/relying-party-legacy.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This file is an EXAMPLE configuration file.
-
- This file specifies relying party dependent configurations for the IdP, for example, whether SAML assertions to a
- particular relying party should be signed. It also includes metadata provider and credential definitions used
- when answering requests to a relying party.
--->
-<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml"
- xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
- urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
-
- <!-- ========================================== -->
- <!-- Relying Party Configurations -->
- <!-- ========================================== -->
- <rp:AnonymousRelyingParty provider="%{idp.entityID}" defaultSigningCredentialRef="IdPCredential"/>
-
- <rp:DefaultRelyingParty provider="%{idp.entityID}" defaultSigningCredentialRef="IdPCredential">
- <!--
- Each attribute in these profiles configuration is set to its default value,
- that is, the values that would be in effect if those attributes were not present.
- We list them here so that people are aware of them (since they seem reluctant to
- read the documentation).
- -->
- <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile" includeAttributeStatement="false"
- assertionLifetime="PT5M" signResponses="always" signAssertions="never"
- includeConditionsNotBefore="true"/>
-
- <rp:ProfileConfiguration xsi:type="saml:SAML1AttributeQueryProfile" assertionLifetime="PT5M"
- signResponses="conditional" signAssertions="never"
- includeConditionsNotBefore="true"/>
-
- <rp:ProfileConfiguration xsi:type="saml:SAML1ArtifactResolutionProfile" signResponses="conditional"
- signAssertions="never"/>
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2SSOProfile" includeAttributeStatement="true"
- assertionLifetime="PT5M" assertionProxyCount="0"
- signResponses="always" signAssertions="never"
- encryptAssertions="conditional" encryptNameIds="never"
- includeConditionsNotBefore="true"/>
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile" includeAttributeStatement="true"
- assertionLifetime="PT5M" assertionProxyCount="0"
- signResponses="always" signAssertions="never"
- encryptAssertions="conditional" encryptNameIds="never"
- includeConditionsNotBefore="true"/>
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2AttributeQueryProfile"
- assertionLifetime="PT5M" assertionProxyCount="0"
- signResponses="conditional" signAssertions="never"
- encryptAssertions="conditional" encryptNameIds="never"
- includeConditionsNotBefore="true"/>
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2ArtifactResolutionProfile"
- signResponses="conditional" signAssertions="never"
- encryptAssertions="conditional" encryptNameIds="never"/>
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2LogoutRequestProfile"
- signResponses="conditional"/>
-
- </rp:DefaultRelyingParty>
-
- <!-- ========================================== -->
- <!-- Security Configurations -->
- <!-- ========================================== -->
-
- <!-- TODO -->
-
- <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
- <security:PrivateKey>%{idp.signing.key}</security:PrivateKey>
- <security:Certificate>%{idp.signing.cert}</security:Certificate>
- </security:Credential>
-
-</rp:RelyingPartyGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This file is an EXAMPLE configuration file.
+
+ This file specifies relying party dependent configurations for the IdP, for example, whether SAML assertions to a
+ particular relying party should be signed. It also includes metadata provider and credential definitions used
+ when answering requests to a relying party.
+-->
+<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml"
+ xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
+ urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
+
+ <!-- ========================================== -->
+ <!-- Relying Party Configurations -->
+ <!-- ========================================== -->
+ <rp:AnonymousRelyingParty provider="%{idp.entityID}" defaultSigningCredentialRef="IdPCredential"/>
+
+ <rp:DefaultRelyingParty provider="%{idp.entityID}" defaultSigningCredentialRef="IdPCredential">
+ <!--
+ Each attribute in these profiles configuration is set to its default value,
+ that is, the values that would be in effect if those attributes were not present.
+ We list them here so that people are aware of them (since they seem reluctant to
+ read the documentation).
+ -->
+ <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile" includeAttributeStatement="false"
+ assertionLifetime="PT5M" signResponses="always" signAssertions="never"
+ includeConditionsNotBefore="true"/>
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML1AttributeQueryProfile" assertionLifetime="PT5M"
+ signResponses="conditional" signAssertions="never"
+ includeConditionsNotBefore="true"/>
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML1ArtifactResolutionProfile" signResponses="conditional"
+ signAssertions="never"/>
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2SSOProfile" includeAttributeStatement="true"
+ assertionLifetime="PT5M" assertionProxyCount="0"
+ signResponses="always" signAssertions="never"
+ encryptAssertions="conditional" encryptNameIds="never"
+ includeConditionsNotBefore="true"/>
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile" includeAttributeStatement="true"
+ assertionLifetime="PT5M" assertionProxyCount="0"
+ signResponses="always" signAssertions="never"
+ encryptAssertions="conditional" encryptNameIds="never"
+ includeConditionsNotBefore="true"/>
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2AttributeQueryProfile"
+ assertionLifetime="PT5M" assertionProxyCount="0"
+ signResponses="conditional" signAssertions="never"
+ encryptAssertions="conditional" encryptNameIds="never"
+ includeConditionsNotBefore="true"/>
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2ArtifactResolutionProfile"
+ signResponses="conditional" signAssertions="never"
+ encryptAssertions="conditional" encryptNameIds="never"/>
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2LogoutRequestProfile"
+ signResponses="conditional"/>
+
+ </rp:DefaultRelyingParty>
+
+ <!-- ========================================== -->
+ <!-- Security Configurations -->
+ <!-- ========================================== -->
+
+ <!-- TODO -->
+
+ <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
+ <security:PrivateKey>%{idp.signing.key}</security:PrivateKey>
+ <security:Certificate>%{idp.signing.cert}</security:Certificate>
+ </security:Credential>
+
+</rp:RelyingPartyGroup>
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml b/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
index 9e656f8..9bb5b14 100644
--- a/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
+++ b/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Part one of a two part Attribute Filter Policy. -->
-<afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
-
- <!-- Release OK if RA map -->
- <afp:AttributeFilterPolicy id="RAOKFILTER">
- <afp:PolicyRequirementRule id="prrRA1"
- xsi:type="basic:ANY" />
-
- <afp:AttributeRule attributeID="IdPRA1" id="ra1release">
- <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
-
-
- <!-- Release OK if RA map, but it doesn't -->
- <afp:AttributeFilterPolicy id="RANOTFILTER">
- <afp:PolicyRequirementRule id="prrRA2"
- xsi:type="basic:ANY" />
-
- <afp:AttributeRule attributeID="IdPEA1" id="ra2release">
- <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
-
-
- <!-- Release is EA map -->
- <afp:AttributeFilterPolicy id="EAOKFILTER">
- <afp:PolicyRequirementRule id="prrEA1" xsi:type="saml:EntityAttributeExactMatch"
- attributeName="http://macedir.org/entity-category"
- attributeValue="http://refeds.org/category/research-and-scholarship" />
-
- <afp:AttributeRule attributeID="IdPOK">
- <afp:PermitValueRule xsi:type="basic:ANY"/>
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
-
-</afp:AttributeFilterPolicyGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Part one of a two part Attribute Filter Policy. -->
+<afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
+ xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+ xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
+ urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
+
+ <!-- Release OK if RA map -->
+ <afp:AttributeFilterPolicy id="RAOKFILTER">
+ <afp:PolicyRequirementRule id="prrRA1"
+ xsi:type="basic:ANY" />
+
+ <afp:AttributeRule attributeID="IdPRA1" id="ra1release">
+ <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
+ </afp:AttributeRule>
+
+ </afp:AttributeFilterPolicy>
+
+
+ <!-- Release OK if RA map, but it doesn't -->
+ <afp:AttributeFilterPolicy id="RANOTFILTER">
+ <afp:PolicyRequirementRule id="prrRA2"
+ xsi:type="basic:ANY" />
+
+ <afp:AttributeRule attributeID="IdPEA1" id="ra2release">
+ <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
+ </afp:AttributeRule>
+
+ </afp:AttributeFilterPolicy>
+
+
+ <!-- Release is EA map -->
+ <afp:AttributeFilterPolicy id="EAOKFILTER">
+ <afp:PolicyRequirementRule id="prrEA1" xsi:type="saml:EntityAttributeExactMatch"
+ attributeName="http://macedir.org/entity-category"
+ attributeValue="http://refeds.org/category/research-and-scholarship" />
+
+ <afp:AttributeRule attributeID="IdPOK">
+ <afp:PermitValueRule xsi:type="basic:ANY"/>
+ </afp:AttributeRule>
+
+ </afp:AttributeFilterPolicy>
+
+</afp:AttributeFilterPolicyGroup>
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml b/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml
index 414907f..ec1cdf5 100644
--- a/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml
+++ b/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Part 1 of a two part attribute resolver.
--->
-<AttributeResolver
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
- <!-- ========================================== -->
- <!-- Attribute Definitions -->
- <!-- ========================================== -->
-
- <AttributeDefinition id="eduPersonAffiliation" xsi:type="Simple" >
- <InputDataConnector ref="staticAttributes" attributeNames="staticEpA" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAffiliation" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" friendlyName="eduPersonAffiliation" />
- </AttributeDefinition>
-
-
- <DataConnector id="staticAttributes" xsi:type="Static">
- <Attribute id="ra_1">
- <Value>RA1</Value>
- </Attribute>
- <Attribute id="OK">
- <Value>OK</Value>
- </Attribute>
-
- </DataConnector>
-
- <AttributeDefinition xsi:type="Simple" id="IdPRA1" >
- <InputDataConnector ref="staticAttributes" attributeNames="ra_1"/>
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.241" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" friendlyName="raOne" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="IdPOK" >
- <InputDataConnector ref="staticAttributes" attributeNames="OK"/>
- <AttributeEncoder xsi:type="SAML2String"
- name="http://example.org/result"
- nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" friendlyName="OKOUT" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="IdPNotOK" >
- <InputDataConnector ref="staticAttributes" attributeNames="NOTOK"/>
- <AttributeEncoder xsi:type="SAML2String"
- name="http://example.org/result"
- nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" friendlyName="OKOUT" />
- </AttributeDefinition>
-
-</AttributeResolver>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Part 1 of a two part attribute resolver.
+-->
+<AttributeResolver
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+
+ <!-- ========================================== -->
+ <!-- Attribute Definitions -->
+ <!-- ========================================== -->
+
+ <AttributeDefinition id="eduPersonAffiliation" xsi:type="Simple" >
+ <InputDataConnector ref="staticAttributes" attributeNames="staticEpA" />
+ <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAffiliation" />
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" friendlyName="eduPersonAffiliation" />
+ </AttributeDefinition>
+
+
+ <DataConnector id="staticAttributes" xsi:type="Static">
+ <Attribute id="ra_1">
+ <Value>RA1</Value>
+ </Attribute>
+ <Attribute id="OK">
+ <Value>OK</Value>
+ </Attribute>
+
+ </DataConnector>
+
+ <AttributeDefinition xsi:type="Simple" id="IdPRA1" >
+ <InputDataConnector ref="staticAttributes" attributeNames="ra_1"/>
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.241" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" friendlyName="raOne" />
+ </AttributeDefinition>
+
+ <AttributeDefinition xsi:type="Simple" id="IdPOK" >
+ <InputDataConnector ref="staticAttributes" attributeNames="OK"/>
+ <AttributeEncoder xsi:type="SAML2String"
+ name="http://example.org/result"
+ nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" friendlyName="OKOUT" />
+ </AttributeDefinition>
+
+ <AttributeDefinition xsi:type="Simple" id="IdPNotOK" >
+ <InputDataConnector ref="staticAttributes" attributeNames="NOTOK"/>
+ <AttributeEncoder xsi:type="SAML2String"
+ name="http://example.org/result"
+ nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" friendlyName="OKOUT" />
+ </AttributeDefinition>
+
+</AttributeResolver>
diff --git a/idp-conf/src/test/resources/mapping/configs/override.xml b/idp-conf/src/test/resources/mapping/configs/override.xml
index 45be82f..aa47df8 100644
--- a/idp-conf/src/test/resources/mapping/configs/override.xml
+++ b/idp-conf/src/test/resources/mapping/configs/override.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
-
- <util:list id="shibboleth.AttributeResolverResources">
- <value>classpath:/mapping/configs/attribute-resolver.xml</value>
- <value>classpath:/mapping/configs/attribute-resolver2.xml</value>
- </util:list>
-
- <util:list id="shibboleth.AttributeFilterResources">
- <value>classpath:/mapping/configs/attribute-filter.xml</value>
- <value>classpath:/mapping/configs/attribute-filter2.xml</value>
- </util:list>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <util:list id="shibboleth.AttributeResolverResources">
+ <value>classpath:/mapping/configs/attribute-resolver.xml</value>
+ <value>classpath:/mapping/configs/attribute-resolver2.xml</value>
+ </util:list>
+
+ <util:list id="shibboleth.AttributeFilterResources">
+ <value>classpath:/mapping/configs/attribute-filter.xml</value>
+ <value>classpath:/mapping/configs/attribute-filter2.xml</value>
+ </util:list>
+
</beans>
\ No newline at end of file
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs
index b542b51..eece8b0 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-warndir-dlg.wxs
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- The dialog to display if we sense a non default installation directory -->
- <Fragment>
-
- <UI>
- <Dialog Id="WarnDirDlgShib" Width="370" Height="270" Title="[ProductName] Update">
- <!-- Stuff at the top: picture, some text, a line -->
- <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
- <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Update Shibboleth" Transparent="yes" />
- <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Update to [ProductName]" Transparent="yes" />
- <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
-
- <!-- Where we are installing -->
- <Control Id="Warn" Type="Bitmap" X="25" Y="51" Height="32" Width="32" Text="WixUI_Ico_Exclam" />
- <Control Id="Warn2" Type="Text" X="73" Y="51" Height="12" Width="270" Text="Installation not to standard location ([DefaultInstallDir])" />
- <Control Id="Warn3" Type="Text" X="73" Y="67" Height="12" Width="270" Text="Set the property 'idp.home' in your container to be [INSTALLDIR]" />
-
- <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="ConfigADDlg">CONFIGURE_AD</Publish>
- <Publish Event="NewDialog" Value="InstallDirDlgShib">NOT CONFIGURE_AD</Publish>
- </Control>
-
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="AddLocal" Value="InstallJetty">INSTALL_JETTY</Publish>
- <Publish Event="Remove" Value="InstallJetty">Not INSTALL_JETTY</Publish>
- <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- </Control>
-
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- </Dialog>
- </UI>
- </Fragment>
-</Wix>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+ Development, Inc. (UCAID) under one or more contributor license
+ agreements. See the NOTICE file distributed with this work for
+ additional information regarding copyright ownership. The UCAID
+ licenses this file to You under the Apache License, Version 2.0
+ (the 'License'); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- The dialog to display if we sense a non default installation directory -->
+ <Fragment>
+
+ <UI>
+ <Dialog Id="WarnDirDlgShib" Width="370" Height="270" Title="[ProductName] Update">
+ <!-- Stuff at the top: picture, some text, a line -->
+ <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
+ <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Update Shibboleth" Transparent="yes" />
+ <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Update to [ProductName]" Transparent="yes" />
+ <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
+
+ <!-- Where we are installing -->
+ <Control Id="Warn" Type="Bitmap" X="25" Y="51" Height="32" Width="32" Text="WixUI_Ico_Exclam" />
+ <Control Id="Warn2" Type="Text" X="73" Y="51" Height="12" Width="270" Text="Installation not to standard location ([DefaultInstallDir])" />
+ <Control Id="Warn3" Type="Text" X="73" Y="67" Height="12" Width="270" Text="Set the property 'idp.home' in your container to be [INSTALLDIR]" />
+
+ <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="ConfigADDlg">CONFIGURE_AD</Publish>
+ <Publish Event="NewDialog" Value="InstallDirDlgShib">NOT CONFIGURE_AD</Publish>
+ </Control>
+
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
+ <Publish Event="AddLocal" Value="InstallJetty">INSTALL_JETTY</Publish>
+ <Publish Event="Remove" Value="InstallJetty">Not INSTALL_JETTY</Publish>
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ </Control>
+
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ </Dialog>
+ </UI>
+ </Fragment>
+</Wix>
diff --git a/idp-installer/src/test/resources/net/shibboleth/idp/installer/file.properties b/idp-installer/src/test/resources/net/shibboleth/idp/installer/file.properties
index f271eaa..4892da1 100644
--- a/idp-installer/src/test/resources/net/shibboleth/idp/installer/file.properties
+++ b/idp-installer/src/test/resources/net/shibboleth/idp/installer/file.properties
@@ -1,5 +1,5 @@
-#Start with a Comment
-# yy = elephant
-p=123
-q=elephants
+#Start with a Comment
+# yy = elephant
+p=123
+q=elephants
#End with a Comment
\ No newline at end of file
diff --git a/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/inlineBean.xml b/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/inlineBean.xml
index 3fad36d..0619caf 100644
--- a/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/inlineBean.xml
+++ b/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/inlineBean.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="testBean" class="net.shibboleth.idp.profile.logic.ScriptedPredicate"
- factory-method="inlineScript">
- <constructor-arg>
- <value>
-<![CDATA[
- value = true;
- if (null == profileContext.getSubcontext("net.shibboleth.idp.profile.context.RelyingPartyContext")) {
- value = false;
- }
- value;
-]]>
- </value>
- </constructor-arg>
-
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <bean id="testBean" class="net.shibboleth.idp.profile.logic.ScriptedPredicate"
+ factory-method="inlineScript">
+ <constructor-arg>
+ <value>
+<![CDATA[
+ value = true;
+ if (null == profileContext.getSubcontext("net.shibboleth.idp.profile.context.RelyingPartyContext")) {
+ value = false;
+ }
+ value;
+]]>
+ </value>
+ </constructor-arg>
+
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/resourceBean.xml b/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/resourceBean.xml
index 63754f6..6c0658a 100644
--- a/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/resourceBean.xml
+++ b/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/resourceBean.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="testBean" class="net.shibboleth.idp.profile.logic.ScriptedPredicate"
- factory-method="resourceScript" c:resource="classpath:/net/shibboleth/idp/profile/logic/script.js"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <bean id="testBean" class="net.shibboleth.idp.profile.logic.ScriptedPredicate"
+ factory-method="resourceScript" c:resource="classpath:/net/shibboleth/idp/profile/logic/script.js"/>
</beans>
\ No newline at end of file
diff --git a/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/script.js b/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/script.js
index 6e0ca58..867b453 100644
--- a/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/script.js
+++ b/idp-profile-api/src/test/resources/net/shibboleth/idp/profile/logic/script.js
@@ -1,5 +1,5 @@
-value = true;
-if (null == profileContext.getSubcontext("net.shibboleth.idp.profile.context.RelyingPartyContext")) {
- value = false;
-}
-value;
+value = true;
+if (null == profileContext.getSubcontext("net.shibboleth.idp.profile.context.RelyingPartyContext")) {
+ value = false;
+}
+value;
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
index 80217a6..413ae8d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
-
- <context:property-placeholder
- location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties" />
-
- <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name
- (if not already set). -->
- <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
-
- <!-- The profile defaults. Firstly the artifact and InbouldFlowId parameters -->
-
- <!-- SAML2 -->
- <alias alias="shibboleth.SAML2.Artifact.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML2.Artifact.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml-soap" />
-
- <alias alias="shibboleth.SAML2.Logout.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML2.Logout.ArtifactServiceIndex" class="java.lang.String"
- c:_0="3214" />
- <bean id="shibboleth.SAML2.Logout.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml2-slo" />
-
- <alias alias="shibboleth.SAML2.AttributeQuery.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML2.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
- c:_0="2143" />
- <bean id="shibboleth.SAML2.AttributeQuery.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml-soap" />
-
- <alias alias="shibboleth.SAML2.BrowserSSO.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML2.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
- c:_0="1111" />
- <bean id="shibboleth.SAML2.BrowserSSO.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml2-sso" />
-
- <alias alias="shibboleth.SAML2.ECP.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML2.ECP.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml2-ecp" />
-
- <!-- SAML2 - Liberty -->
- <alias alias="shibboleth.SAML2.SSOS.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML2.SSOS.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml2-ssos" />
-
- <!-- SAML1 -->
- <alias alias="shibboleth.SAML1.Artifact.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML1.Artifact.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml-soap" />
-
- <alias alias="shibboleth.SAML1.AttributeQuery.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML1.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
- c:_0="432100" />
- <bean id="shibboleth.SAML1.AttributeQuery.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/saml-soap" />
-
- <alias alias="shibboleth.SAML1.BrowserSSO.ServletRequest" name="shibboleth.HttpServletRequest" />
- <bean id="shibboleth.SAML1.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
- c:_0="1111" />
- <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"
- c:_0="security-policy/shibboleth-sso" />
-
- <bean id="shibboleth.ParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- p:maxPoolSize="100" p:coalescing="true" p:ignoreComments="true"
- p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
-
- <bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- p:maxPoolSize="1000" p:coalescing="true" p:ignoreComments="true"
- p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
- <bean id="shibboleth.SchemaBuilder" class="org.opensaml.saml.common.xml.SAMLSchemaBuilder"
- c:ver="SAML_11" />
-
- <!-- for SSOS -->
- <bean id="jimmy" factory-method="alwaysTrue" class="com.google.common.base.Predicates"/>
-
- <bean id="shibboleth.HttpServletRequest"
- class="org.springframework.mock.web.MockHttpServletRequest" />
- <bean id="dummyPredicate" class="net.shibboleth.idp.profile.spring.logic.DummyPredicate"/>
-
- <!-- Trust Engines -->
-
- <!-- These are hacked to use static resolvers to avoid a dependency on metadata, just so the tests load. -->
-
- <bean id="shibboleth.KeyInfoCredentialResolver" class="org.opensaml.xmlsec.config.impl.DefaultSecurityConfigurationBootstrap"
- factory-method="buildBasicInlineKeyInfoCredentialResolver" />
-
- <bean id="shibboleth.StaticCredentialResolver" class="org.opensaml.xmlsec.keyinfo.impl.StaticKeyInfoCredentialResolver">
- <constructor-arg>
- <bean class="org.opensaml.security.x509.BasicX509Credential">
- <constructor-arg name="entityCertificate">
- <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
- p:resource="classpath:net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem" />
- </constructor-arg>
- </bean>
- </constructor-arg>
- </bean>
-
- <bean id="shibboleth.StaticPKIXValidationInformationResolver"
- class="org.opensaml.security.x509.impl.StaticPKIXValidationInformationResolver"
- c:info="#{null}" c:names="#{null}" />
-
- <bean id="shibboleth.SignatureTrustEngine"
- class="org.opensaml.xmlsec.signature.support.impl.ChainingSignatureTrustEngine">
- <constructor-arg>
- <list>
- <bean class="org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine"
- c:resolver-ref="shibboleth.StaticCredentialResolver"
- c:keyInfoResolver-ref="shibboleth.KeyInfoCredentialResolver" />
- <bean class="org.opensaml.xmlsec.signature.support.impl.PKIXSignatureTrustEngine"
- c:resolver-ref="shibboleth.StaticPKIXValidationInformationResolver"
- c:keyInfoResolver-ref="shibboleth.KeyInfoCredentialResolver" />
- </list>
- </constructor-arg>
- </bean>
-
- <bean id="shibboleth.X509TrustEngine" class="org.opensaml.security.trust.impl.ChainingTrustEngine">
- <constructor-arg>
- <list>
- <bean class="org.opensaml.security.trust.impl.ExplicitX509CertificateTrustEngine"
- c:resolver-ref="shibboleth.StaticCredentialResolver" />
- <bean class="org.opensaml.security.x509.impl.PKIXX509CredentialTrustEngine"
- c:resolver-ref="shibboleth.StaticPKIXValidationInformationResolver" />
- </list>
- </constructor-arg>
- </bean>
-
- <bean id="shibboleth.MetadataSignatureValidationStaticCriteria"
- class="net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl.SignatureValidationCriteriaSetFactoryBean"
- p:includeOpenSAMLGlobalConfig="true">
- <property name="signatureValidationConfigurations">
- <util:list>
- <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
- <property name="whitelistedAlgorithms">
- <list>
- </list>
- </property>
- <property name="blacklistedAlgorithms">
- <list>
- <value>foo</value>
- <value>bar</value>
- <value>baz</value>
- </list>
- </property>
- </bean>
- </util:list>
- </property>
- </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+
+ <context:property-placeholder
+ location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties" />
+
+ <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name
+ (if not already set). -->
+ <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+
+ <!-- The profile defaults. Firstly the artifact and InbouldFlowId parameters -->
+
+ <!-- SAML2 -->
+ <alias alias="shibboleth.SAML2.Artifact.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML2.Artifact.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml-soap" />
+
+ <alias alias="shibboleth.SAML2.Logout.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML2.Logout.ArtifactServiceIndex" class="java.lang.String"
+ c:_0="3214" />
+ <bean id="shibboleth.SAML2.Logout.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml2-slo" />
+
+ <alias alias="shibboleth.SAML2.AttributeQuery.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML2.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
+ c:_0="2143" />
+ <bean id="shibboleth.SAML2.AttributeQuery.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml-soap" />
+
+ <alias alias="shibboleth.SAML2.BrowserSSO.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML2.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
+ c:_0="1111" />
+ <bean id="shibboleth.SAML2.BrowserSSO.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml2-sso" />
+
+ <alias alias="shibboleth.SAML2.ECP.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML2.ECP.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml2-ecp" />
+
+ <!-- SAML2 - Liberty -->
+ <alias alias="shibboleth.SAML2.SSOS.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML2.SSOS.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml2-ssos" />
+
+ <!-- SAML1 -->
+ <alias alias="shibboleth.SAML1.Artifact.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML1.Artifact.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml-soap" />
+
+ <alias alias="shibboleth.SAML1.AttributeQuery.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML1.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
+ c:_0="432100" />
+ <bean id="shibboleth.SAML1.AttributeQuery.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/saml-soap" />
+
+ <alias alias="shibboleth.SAML1.BrowserSSO.ServletRequest" name="shibboleth.HttpServletRequest" />
+ <bean id="shibboleth.SAML1.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
+ c:_0="1111" />
+ <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"
+ c:_0="security-policy/shibboleth-sso" />
+
+ <bean id="shibboleth.ParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="100" p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
+
+ <bean id="myParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="1000" p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
+ <bean id="shibboleth.SchemaBuilder" class="org.opensaml.saml.common.xml.SAMLSchemaBuilder"
+ c:ver="SAML_11" />
+
+ <!-- for SSOS -->
+ <bean id="jimmy" factory-method="alwaysTrue" class="com.google.common.base.Predicates"/>
+
+ <bean id="shibboleth.HttpServletRequest"
+ class="org.springframework.mock.web.MockHttpServletRequest" />
+ <bean id="dummyPredicate" class="net.shibboleth.idp.profile.spring.logic.DummyPredicate"/>
+
+ <!-- Trust Engines -->
+
+ <!-- These are hacked to use static resolvers to avoid a dependency on metadata, just so the tests load. -->
+
+ <bean id="shibboleth.KeyInfoCredentialResolver" class="org.opensaml.xmlsec.config.impl.DefaultSecurityConfigurationBootstrap"
+ factory-method="buildBasicInlineKeyInfoCredentialResolver" />
+
+ <bean id="shibboleth.StaticCredentialResolver" class="org.opensaml.xmlsec.keyinfo.impl.StaticKeyInfoCredentialResolver">
+ <constructor-arg>
+ <bean class="org.opensaml.security.x509.BasicX509Credential">
+ <constructor-arg name="entityCertificate">
+ <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+ p:resource="classpath:net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem" />
+ </constructor-arg>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="shibboleth.StaticPKIXValidationInformationResolver"
+ class="org.opensaml.security.x509.impl.StaticPKIXValidationInformationResolver"
+ c:info="#{null}" c:names="#{null}" />
+
+ <bean id="shibboleth.SignatureTrustEngine"
+ class="org.opensaml.xmlsec.signature.support.impl.ChainingSignatureTrustEngine">
+ <constructor-arg>
+ <list>
+ <bean class="org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine"
+ c:resolver-ref="shibboleth.StaticCredentialResolver"
+ c:keyInfoResolver-ref="shibboleth.KeyInfoCredentialResolver" />
+ <bean class="org.opensaml.xmlsec.signature.support.impl.PKIXSignatureTrustEngine"
+ c:resolver-ref="shibboleth.StaticPKIXValidationInformationResolver"
+ c:keyInfoResolver-ref="shibboleth.KeyInfoCredentialResolver" />
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <bean id="shibboleth.X509TrustEngine" class="org.opensaml.security.trust.impl.ChainingTrustEngine">
+ <constructor-arg>
+ <list>
+ <bean class="org.opensaml.security.trust.impl.ExplicitX509CertificateTrustEngine"
+ c:resolver-ref="shibboleth.StaticCredentialResolver" />
+ <bean class="org.opensaml.security.x509.impl.PKIXX509CredentialTrustEngine"
+ c:resolver-ref="shibboleth.StaticPKIXValidationInformationResolver" />
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <bean id="shibboleth.MetadataSignatureValidationStaticCriteria"
+ class="net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl.SignatureValidationCriteriaSetFactoryBean"
+ p:includeOpenSAMLGlobalConfig="true">
+ <property name="signatureValidationConfigurations">
+ <util:list>
+ <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
+ <property name="whitelistedAlgorithms">
+ <list>
+ </list>
+ </property>
+ <property name="blacklistedAlgorithms">
+ <list>
+ <value>foo</value>
+ <value>bar</value>
+ <value>baz</value>
+ </list>
+ </property>
+ </bean>
+ </util:list>
+ </property>
+ </bean>
+
+</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/file.properties b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/file.properties
index b15d1a7..45dcdb4 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/file.properties
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/file.properties
@@ -1,10 +1,10 @@
-prop.never=never
-prop.artifactType=1234
-prop.false=false
-prop.String1=NibbleAHappyWarthog
-prop.tenMins=PT10M
-
-DIR=
-IDP_ENTITY_ID=https\://idp.example.org
-
+prop.never=never
+prop.artifactType=1234
+prop.false=false
+prop.String1=NibbleAHappyWarthog
+prop.tenMins=PT10M
+
+DIR=
+IDP_ENTITY_ID=https\://idp.example.org
+
allowDelegation=true
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml
index bdadf9d..003c599 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" requestTimeout="PT40M" basicAuthPassword="pass" basicAuthUser="user" disregardTLSCertificate="true"
- id="HTTPEntities" xsi:type="metadata:HTTPMetadataProvider"
- metadataURL="%{metadataURL}">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ parserPoolRef="myParserPool" requestTimeout="PT40M" basicAuthPassword="pass" basicAuthUser="user" disregardTLSCertificate="true"
+ id="HTTPEntities" xsi:type="metadata:HTTPMetadataProvider"
+ metadataURL="%{metadataURL}">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml
index ca211cd..b61e710 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" requestTimeout="PT40M" basicAuthPassword="pass" basicAuthUser="user" disregardTLSCertificate="true"
- id="HTTPEntities" xsi:type="metadata:HTTPMetadataProvider"
- httpClientRef="apacheClient"
- metadataURL="%{metadataURL}">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ parserPoolRef="myParserPool" requestTimeout="PT40M" basicAuthPassword="pass" basicAuthUser="user" disregardTLSCertificate="true"
+ id="HTTPEntities" xsi:type="metadata:HTTPMetadataProvider"
+ httpClientRef="apacheClient"
+ metadataURL="%{metadataURL}">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity.xml
index 6bcd8b2..f7e0fcd 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="HTTPEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}" expirationWarningThreshold="PT12H">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="HTTPEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}" expirationWarningThreshold="PT12H">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPProxy.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPProxy.xml
index b39ae78..7fe6552 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPProxy.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPProxy.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- proxyHost="localhost" proxyUser="user" proxyPassword="pass" proxyPort="123"
- id="HTTPProxy" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ proxyHost="localhost" proxyUser="user" proxyPassword="pass" proxyPort="123"
+ id="HTTPProxy" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
index a1d5ecf..a128f98 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
-
- <bean id="shibboleth.ParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- p:maxPoolSize="100"
- p:coalescing="true" p:ignoreComments="true"
- p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
-
- <bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- p:maxPoolSize="1000"
- p:coalescing="true" p:ignoreComments="true"
- p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
- <bean id="shibboleth.SchemaBuilder" class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11"/>
-
- <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="overrideLogging" value="false"/>
- <property name="velocityProperties">
- <props>
- <prop key="input.encoding">UTF-8</prop>
- <prop key="output.encoding">UTF-8</prop>
- <prop key="resource.loader">classpath, string</prop>
- <prop key="classpath.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- <prop key="string.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.StringResourceLoader
- </prop>
- </props>
- </property>
- </bean>
-
- <bean id="digester.SHA1HexLower" class="net.shibboleth.utilities.java.support.codec.StringDigester"
- c:_0="SHA-1"
- c:_1="HEX_LOWER"/>
-
- <bean id="shibboleth.MetadataSignatureValidationStaticCriteria"
- class="net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl.SignatureValidationCriteriaSetFactoryBean"
- p:includeOpenSAMLGlobalConfig="true">
- <property name="signatureValidationConfigurations">
- <util:list>
- <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
- <property name="whitelistedAlgorithms">
- <list>
- </list>
- </property>
- <property name="blacklistedAlgorithms">
- <list>
- <value>foo</value>
- <value>bar</value>
- <value>baz</value>
- </list>
- </property>
- </bean>
- </util:list>
- </property>
- </bean>
-
- <bean id="predicate.AlwaysFalse" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
-
- <bean id="metadata.persistentCacheManager" class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
-
- <bean id="metadata.HttpClientSecurityParameters" class="org.opensaml.security.httpclient.HttpClientSecurityParameters" />
-
- <bean id="metadata.CredentialsProvider" class="org.apache.http.impl.client.SystemDefaultCredentialsProvider" />
-
- <util:set id="metadata.Indexes">
- <bean class="org.opensaml.saml.metadata.resolver.index.impl.RoleMetadataIndex" />
- <bean class="org.opensaml.saml.metadata.resolver.index.impl.EndpointMetadataIndex" />
- <bean class="org.opensaml.saml.metadata.resolver.index.impl.SAMLArtifactMetadataIndex" />
- </util:set>
-
- <bean id="metadata.LocalDynamicSourceManager" class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
-
- <bean id="metadata.LocalDynamicSourceKeyGenerator" class="org.opensaml.saml.metadata.resolver.impl.IdentityEntityIDGenerator" />
-
- <bean id="metadata.CriterionPredicateRegistry" class="org.opensaml.saml.metadata.criteria.entity.impl.EntityDescriptorCriterionPredicateRegistry" />
-
- <bean id="metadata.classpathRef" class="org.springframework.core.io.ClassPathResource" c:_0="/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+
+ <bean id="shibboleth.ParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="100"
+ p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
+
+ <bean id="myParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="1000"
+ p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
+ <bean id="shibboleth.SchemaBuilder" class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11"/>
+
+ <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="overrideLogging" value="false"/>
+ <property name="velocityProperties">
+ <props>
+ <prop key="input.encoding">UTF-8</prop>
+ <prop key="output.encoding">UTF-8</prop>
+ <prop key="resource.loader">classpath, string</prop>
+ <prop key="classpath.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ <prop key="string.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.StringResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="digester.SHA1HexLower" class="net.shibboleth.utilities.java.support.codec.StringDigester"
+ c:_0="SHA-1"
+ c:_1="HEX_LOWER"/>
+
+ <bean id="shibboleth.MetadataSignatureValidationStaticCriteria"
+ class="net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl.SignatureValidationCriteriaSetFactoryBean"
+ p:includeOpenSAMLGlobalConfig="true">
+ <property name="signatureValidationConfigurations">
+ <util:list>
+ <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
+ <property name="whitelistedAlgorithms">
+ <list>
+ </list>
+ </property>
+ <property name="blacklistedAlgorithms">
+ <list>
+ <value>foo</value>
+ <value>bar</value>
+ <value>baz</value>
+ </list>
+ </property>
+ </bean>
+ </util:list>
+ </property>
+ </bean>
+
+ <bean id="predicate.AlwaysFalse" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
+
+ <bean id="metadata.persistentCacheManager" class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
+
+ <bean id="metadata.HttpClientSecurityParameters" class="org.opensaml.security.httpclient.HttpClientSecurityParameters" />
+
+ <bean id="metadata.CredentialsProvider" class="org.apache.http.impl.client.SystemDefaultCredentialsProvider" />
+
+ <util:set id="metadata.Indexes">
+ <bean class="org.opensaml.saml.metadata.resolver.index.impl.RoleMetadataIndex" />
+ <bean class="org.opensaml.saml.metadata.resolver.index.impl.EndpointMetadataIndex" />
+ <bean class="org.opensaml.saml.metadata.resolver.index.impl.SAMLArtifactMetadataIndex" />
+ </util:set>
+
+ <bean id="metadata.LocalDynamicSourceManager" class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
+
+ <bean id="metadata.LocalDynamicSourceKeyGenerator" class="org.opensaml.saml.metadata.resolver.impl.IdentityEntityIDGenerator" />
+
+ <bean id="metadata.CriterionPredicateRegistry" class="org.opensaml.saml.metadata.criteria.entity.impl.EntityDescriptorCriterionPredicateRegistry" />
+
+ <bean id="metadata.classpathRef" class="org.springframework.core.io.ClassPathResource" c:_0="/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml"/>
+
</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain.xml
index a792ea4..37c3e76 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="chain" xsi:type="metadata:ChainingMetadataProvider">
-
- <metadata:MetadataProvider id="entity"
- xsi:type="metadata:InlineMetadataProvider">
- <EntityDescriptor entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
- </metadata:MetadataProvider>
-
- <metadata:MetadataProvider id="entities"
- xsi:type="metadata:InlineMetadataProvider">
- <EntitiesDescriptor>
-
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
-
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
- </EntitiesDescriptor>
-
- </metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="chain" xsi:type="metadata:ChainingMetadataProvider">
+
+ <metadata:MetadataProvider id="entity"
+ xsi:type="metadata:InlineMetadataProvider">
+ <EntityDescriptor entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+ </metadata:MetadataProvider>
+
+ <metadata:MetadataProvider id="entities"
+ xsi:type="metadata:InlineMetadataProvider">
+ <EntitiesDescriptor>
+
+ <EntityDescriptor ID="uk001502"
+ entityID="https://sp.example.org/sp/shibboleth">
+
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+ </EntitiesDescriptor>
+
+ </metadata:MetadataProvider>
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain2.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain2.xml
index 3ab01c9..0ea3044 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain2.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain2.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- failFastInitialization="false" requireValidMetadata="false"
- id="chain2" xsi:type="metadata:ChainingMetadataProvider">
-
- <metadata:MetadataProvider id="entity"
- xsi:type="metadata:InlineMetadataProvider">
- <EntityDescriptor entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
- </metadata:MetadataProvider>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ failFastInitialization="false" requireValidMetadata="false"
+ id="chain2" xsi:type="metadata:ChainingMetadataProvider">
+
+ <metadata:MetadataProvider id="entity"
+ xsi:type="metadata:InlineMetadataProvider">
+ <EntityDescriptor entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+ </metadata:MetadataProvider>
+
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain-svc.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain-svc.xml
index 342988d..8fa5866 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain-svc.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain-svc.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- p:maxPoolSize="1000"
- p:coalescing="true" p:ignoreComments="true"
- p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
-
- <bean id="shibboleth.MetadataResolverService"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- p:serviceConfigurations="classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain.xml"
- p:failFast="true" p:reloadCheckDelay="0">
- <constructor-arg name="claz"
- value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
- <constructor-arg name="strategy">
- <bean id="strat" p:id="strat" class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy" />
- </constructor-arg>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <bean id="myParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="1000"
+ p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
+
+ <bean id="shibboleth.MetadataResolverService"
+ class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ p:serviceConfigurations="classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain.xml"
+ p:failFast="true" p:reloadCheckDelay="0">
+ <constructor-arg name="claz"
+ value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
+ <constructor-arg name="strategy">
+ <bean id="strat" p:id="strat" class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy" />
+ </constructor-arg>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain.xml
index 58767fa..b6a6f37 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="chain" xsi:type="metadata:ChainingMetadataProvider">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="chain" xsi:type="metadata:ChainingMetadataProvider">
+
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml
index 8218b28..8b939d4 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
-
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
-
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-
- <EntityDescriptor ID="uk001480"
- entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
+
+ <EntityDescriptor ID="uk001502"
+ entityID="https://sp.example.org/sp/shibboleth">
+
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+
+ <EntityDescriptor ID="uk001480"
+ entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
</EntitiesDescriptor>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml
index 8291d56..0606b1d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- ID="uk001480"
- entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+ ID="uk001480"
+ entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
</EntityDescriptor>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntities.xml
index 5252388..302aac9 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntities.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="fileBackedHTTPEntities" xsi:type="metadata:FileBackedHTTPMetadataProvider"
- backingFile="%{DIR}/spoolFileEntities.xml"
- metadataURL="%{metadataURL}">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="fileBackedHTTPEntities" xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolFileEntities.xml"
+ metadataURL="%{metadataURL}">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml
index c048730..6f26921 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="fileBackedHTTPEntity" xsi:type="metadata:FileBackedHTTPMetadataProvider"
- backingFile="%{DIR}/spoolFileEntity.xml"
- initializeFromBackupFile="false"
- backupFileInitNextRefreshDelay="PT10S"
- expirationWarningThreshold="PT12H"
- metadataURL="%{metadataURL}">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="fileBackedHTTPEntity" xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolFileEntity.xml"
+ initializeFromBackupFile="false"
+ backupFileInitNextRefreshDelay="PT10S"
+ expirationWarningThreshold="PT12H"
+ metadataURL="%{metadataURL}">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntities.xml
index a9a98c7..2cb87c3 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntities.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M" expirationWarningThreshold="PT12H"
- id="fileEntities" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/entities.xml">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M" expirationWarningThreshold="PT12H"
+ id="fileEntities" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/entities.xml">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntity.xml
index dfaf8b5..a2633c3 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntity.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="fileEntity" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/entity.xml">
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="fileEntity" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/entity.xml">
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/metadata.switchaai_signed.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/metadata.switchaai_signed.xml
index 96790f6..d1e750a 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/metadata.switchaai_signed.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/metadata.switchaai_signed.xml
@@ -1,4320 +1,4320 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:switch.ch:SWITCHaai" validUntil="2010-01-01T00:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:SignedInfo>
-<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-<ds:Reference URI="">
-<ds:Transforms>
-<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-</ds:Transforms>
-<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-<ds:DigestValue>acLvEhewhbKMo2cSQS9qbZQAqWE=</ds:DigestValue>
-</ds:Reference>
-</ds:SignedInfo>
-<ds:SignatureValue>
-O2+crZMGjIVWjJ/k2PTDDkOv9FGGMEM+N0AOc+KrPLxNFmOOMGWlaAXH1/oeOEOmMpOfine0907E
-p9r+E9L9tL+OfYeJyS2y/NtFuZu/LTke4Z+HAf9DBwcRau4K1idjBrnhzm/hEYPqYBK2obzpH8xj
-+A1g3FEkgtq4YtzALe0=
-</ds:SignatureValue>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIICrzCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwgZ8xCzAJBgNVBAYTAkNIMUAwPgYDVQQKEzdTV0lU
-Q0ggLSBUZWxlaW5mb3JtYXRpa2RpZW5zdGUgZnVlciBMZWhyZSB1bmQgRm9yc2NodW5nMQwwCgYD
-VQQLEwNBQUkxIjAgBgNVBAMTGVNXSVRDSGFhaSBNZXRhZGF0YSBTaWduZXIxHDAaBgkqhkiG9w0B
-CQEWDWFhaUBzd2l0Y2guY2gwHhcNMDUwODAzMTEyMjUxWhcNMTUwODAxMTEyMjUxWjCBnzELMAkG
-A1UEBhMCQ0gxQDA+BgNVBAoTN1NXSVRDSCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVyIExl
-aHJlIHVuZCBGb3JzY2h1bmcxDDAKBgNVBAsTA0FBSTEiMCAGA1UEAxMZU1dJVENIYWFpIE1ldGFk
-YXRhIFNpZ25lcjEcMBoGCSqGSIb3DQEJARYNYWFpQHN3aXRjaC5jaDCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAsmyBYNZ8mKYutdyQShzuOgnVxDP1UBZE+57S2ORZg1qi4JExOJEPnviHuh6H
-EajljhAMGHxr656paDpfXkmGq/Ybk3xmXy2FTnFGpjFpZUV6dY/oJ82rve27C/NVcwZw2nYRl5C5
-aCCgx/QlWsBTw+9972141+wBDH7dXlJ+UGkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQCcLuNwTINk
-fhBlVCIuTixR1R6mYu/+4KUJWtHlRCOUZhSLFept8HxEvfwnuX9xm+Q6Ju/sOgmI1INuSstUGWwV
-y0AbpCphUDDmIh9A85ye8DrVaBHQrj5b/JEjCvkY0zhLJzgDzZ6btT40TuCnk2GpdAClu5SyCTiy
-56+zDYqPqg==
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo></ds:Signature>
-
- <!--
- SWITCHaai Federation metadata for Shibboleth 1.3
- Generated by AAI Resource Registry
- Date: 11. 04. 2006 17:58:04
-
-
- -->
-
-
- <!--
- Valid CA certificates for this federation
- -->
- <Extensions>
- <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
- <!-- SwissSign CA and chain -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <!-- SwissSign Root CA -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDtTCCAp2gAwIBAgIIBhDCeat3PfIwDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UE
-BhMCQ0gxEjAQBgNVBAoTCVN3aXNzU2lnbjEyMDAGA1UEAxMpU3dpc3NTaWduIENB
-IChSU0EgSUsgTWF5IDYgMTk5OSAxODowMDo1OCkxHzAdBgkqhkiG9w0BCQEWEGNh
-QFN3aXNzU2lnbi5jb20wHhcNMDAxMTI2MjMyNzQxWhcNMzExMTI2MjMyNzQxWjB2
-MQswCQYDVQQGEwJDSDESMBAGA1UEChMJU3dpc3NTaWduMTIwMAYDVQQDEylTd2lz
-c1NpZ24gQ0EgKFJTQSBJSyBNYXkgNiAxOTk5IDE4OjAwOjU4KTEfMB0GCSqGSIb3
-DQEJARYQY2FAU3dpc3NTaWduLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKw5fjnmNneLQlUCQG8jQLwwfbrOZoUwNX8cbNqhxK03/xUloFVgAt+S
-Te2RxNXaCAXLBPn5ZST35TLV57aLmbHCtifv3YZqaaQGvjedltIBMJihJhZ+h3LY
-SKsUb+xEJ3x5ZUf8jP+Q1g57y1s8SnBFWN/ni5NkF1Y1y31VwOi9wiOf/VISL+uu
-SC4i1CP1Kbz3BDs6Hht1GpRYCbJ/K0bc9oJSpWpT5PGONsGIawqMbJuyoDghsXQ1
-pbn2e8K64BSscGZVZTNooSGgNiHmACNJBYXiWVWrwXPF4l6SddmC3Rj0aKXjgECc
-FkHLDQcsM5JsK2ZLryTDUsQFbxVP2ikCAwEAAaNHMEUwCwYDVR0PBAQDAgEGMAwG
-A1UdEwQFMAMBAf8wHQYDVR0OBBYEFJbXcc05KtT8iLGKq1N4ae+PR34WMAkGA1Ud
-IwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKMy6W8HvZdS1fBpEUzl6Lvw50bgE1Xc
-HU1JypSBG9mhdcXZo5AlPB4sCvx9Dmfwhyrdsshc0TP2V3Vh6eQqnEF5qB4lVziT
-Bko9mW6Ot+pPnwsy4SHpx3rw6jCYnOqfUcZjWqqqRrq/3P1waz+Mn4cLMVEg3Xaz
-qYov/khvSqS0JniwjRlo2H6f/1oVUKZvP+dUhpQepfZrOqMAWZW4otp6FolyQyeU
-NN6UCRNiUKl5vTijbKwUUwfER/1Vci3M1/O1QCfttQ4vRN4Buc0xqYtGL3cd5WiO
-vWzyhlTzAI6VUdNkQhhHJSAyTpj6dmXDRzrryoFGa2PjgESxz7XBaSI=
- </ds:X509Certificate>
- </ds:X509Data>
- <!-- SwissSign Bronze CA -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDvzCCAqegAwIBAgIIFss9aNe390IwDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UE
-BhMCQ0gxEjAQBgNVBAoTCVN3aXNzU2lnbjEyMDAGA1UEAxMpU3dpc3NTaWduIENB
-IChSU0EgSUsgTWF5IDYgMTk5OSAxODowMDo1OCkxHzAdBgkqhkiG9w0BCQEWEGNh
-QFN3aXNzU2lnbi5jb20wHhcNMDQwMTI4MTUwODM1WhcNMzExMTI2MjMyNzQxWjBk
-MRwwGgYDVQQDExNTd2lzc1NpZ24gQnJvbnplIENBMSMwIQYJKoZIhvcNAQkBFhRi
-cm9uemVAc3dpc3NzaWduLmNvbTESMBAGA1UEChMJU3dpc3NTaWduMQswCQYDVQQG
-EwJDSDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANr1A8bTAN+TVMmH
-7VoZPO9zW3T7E4cQpr2hOfgc4wD1XJcs8zbSSCddIDkzt8uRSwleBxXl9K1ssBCX
-5A8eA3SvSkAIhPQcXSZ9qiBKhecX0L6sCA69RYIEIohsR/LoLXbyx3SNBa8XTrre
-Fc2AvsivtSermSmVEIwgXdDbwhe46TzQs4bMWE6Lk4TucZqCqPcHzD5sldYDKUQs
-jyFHmiAKDGW/h0KIxUabdcAgFNsF/bfX0Eyy0ZpdnIo2Y+rGBb46ajsQy/ZajTOC
-szehUViyPgVeWBrbHLhJBASnW0bHYHeJAGOAJoeqCL9g26YvtXfykQqEE4yEIV8k
-Hs2iRJUCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-HQYDVR0OBBYEFOLejorj/3FBx1M8k9qNbrHSQUhKMB8GA1UdIwQYMBaAFJbXcc05
-KtT8iLGKq1N4ae+PR34WMA0GCSqGSIb3DQEBBQUAA4IBAQBKKRAOlf8eABdmB9vJ
-tBQNcGEcvRxfZkEdeGWiHkIDTUbkzNHT3HR9YGmqSmtK949l+7Kc5v+ksq6Pu87v
-yrIzYQOLuJodfzcNhInEaESS+fbKtpcRMTrvFhfwn+LntyNUSQr+5yRVY2Zwh8IN
-JH505q6ROvQLf1/obdXVMrsOXohNod62ZCKFxWOH3L7w0P8xbsGqx9iFmmKBu8xO
-p7N2tCw4OOfRWTil9UgYToC2LMmAwETK9j5xXvlXBSyyI/PxT45gUPzAdJnqI++k
-VU5MRJ6HQ2YkC62BJ55kwYr9VSMH+VmVVbhP85hRGFCdOSBRdgErK9Ur6gYMRCPM
-d+dR
- </ds:X509Certificate>
- </ds:X509Data>
- <!-- SwissSign Silver CA -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDrjCCApagAwIBAgIJAOzGWItKFXXyMA0GCSqGSIb3DQEBBQUAMGQxHDAaBgNV
-BAMTE1N3aXNzU2lnbiBCcm9uemUgQ0ExIzAhBgkqhkiG9w0BCQEWFGJyb256ZUBz
-d2lzc3NpZ24uY29tMRIwEAYDVQQKEwlTd2lzc1NpZ24xCzAJBgNVBAYTAkNIMB4X
-DTA0MDEyODE5MjAyMFoXDTMxMTEyNjIzMjc0MVowZDEcMBoGA1UEAxMTU3dpc3NT
-aWduIFNpbHZlciBDQTEjMCEGCSqGSIb3DQEJARYUc2lsdmVyQHN3aXNzc2lnbi5j
-b20xEjAQBgNVBAoTCVN3aXNzU2lnbjELMAkGA1UEBhMCQ0gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDw+uCB7JzDd8bHQwEnybM/lfZ0jo3LMzecTPps
-O2Zvi/kM+rasENmxIVCi51R0RFG1i94Ck/P54i6dAeJBBe7VH/eZ3DukXj/3QoAJ
-PO/MQ9YWL8C07kBBwJ85inW8RTpwCKBodZhHfUFyo9vXm6Kz+ymwY7SJuWLAV1mx
-AqHeH169N8YTsHMp4KGWh+qyXr97vhbIcX8mHT88FR1eiZB5IL98IbYZKCr3owKu
-M0hPj8pXOnL8JKtJPI94iVGOITUFMAnmHrOSH+Ci+W1y0NzLUcdLWdL87MpPC246
-ZXBx4/ysKC2b1s6ulLlBIHY+DlPCbl19I5SGFUo2Pzvf71TZAgMBAAGjYzBhMA4G
-A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTNoawjv9A7
-IIpUgc3720Em40pwWjAfBgNVHSMEGDAWgBTi3o6K4/9xQcdTPJPajW6x0kFISjAN
-BgkqhkiG9w0BAQUFAAOCAQEAGMVal6W3zEbEIm00CeSJSoP/KVDLKLAt3k06TL00
-FeNA01ktIx3Tl7gm+vDLfnEXeGrSZb9+9iLkYNXs+xa7XGi1X0X4IkaCv4+E0rLt
-/eeYD060Eu3u+5g2t9eZ6w0gIsCUbbTSn3vl5Ml79FDYdBTw7ijSAiXcX13vl+Wt
-sg9jfzG0+jMNGj+9bsVo8hRA5esoNa8RHWI8Tkx/WWGoYCdigl99F2P+jJa52YsN
-XE13p8QA5Ndxgjl60mmA9I+Ajy5xYlG6byBuu6RW96eUgJdD0LGJpgJ5gdwyGxwB
-iZAZz3D1RUuDp+Zo7NIBeJgD9j8EIr7xi+D+hLG6YMYlhA==
- </ds:X509Certificate>
- </ds:X509Data>
- <!-- SWITCH CA -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIID0jCCArqgAwIBAgIJAMnfZkUiiBS2MA0GCSqGSIb3DQEBBQUAMGQxHDAaBgNV
-BAMTE1N3aXNzU2lnbiBTaWx2ZXIgQ0ExIzAhBgkqhkiG9w0BCQEWFHNpbHZlckBz
-d2lzc3NpZ24uY29tMRIwEAYDVQQKEwlTd2lzc1NpZ24xCzAJBgNVBAYTAkNIMB4X
-DTA0MDIwNjExNDAzOVoXDTMxMTEyNjIzMjc0MVowgYcxEjAQBgNVBAMTCVNXSVRD
-SCBDQTEiMCAGCSqGSIb3DQEJARYTc3dpdGNoLmNhQHN3aXRjaC5jaDFAMD4GA1UE
-ChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5k
-IEZvcnNjaHVuZzELMAkGA1UEBhMCQ0gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDyOe1v3Cs8/lqTUQW3kShBIWEg76i4deENNgc4aSk29MJGLc5Nd7YF
-ukAUtutWDkR5wlR7W0sz9z2NdtsGa7Rxw1C2dC0djWwX7xbh/2e4T5zE5ZOMX/wU
-Bbd5aWTZID3cF61sJRqXVDd4HMgtuGL9CzjrJqahk+WBeojUe6AzIkkxOL6rXX/A
-dy1kHbBNqE+Fm90jKpHf7Kk5V8eNkswpXQVB8NaCtsgOdtYbrLLAJjgxQjh9/0DW
-+tSMBdXm8MvcxALo6GYzFVephWgJqdXhVCmsN3YBII3zk6Ps5r0CnL1G2q0NuVJe
-pIHI9G43f31q9ki+aGY2xo5+d/dSx50jAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQlyQf1FCzQKQXvlfVCQ9XqkI1z
-czAfBgNVHSMEGDAWgBTNoawjv9A7IIpUgc3720Em40pwWjANBgkqhkiG9w0BAQUF
-AAOCAQEAEZALrclenN+L92lBagP3xi6E8Qma1k4XwI4iBr7wNOU07a2kx0nX6N7s
-zY+0dbte/XS6OflCmuJUZEPvyuJktWeOeIOrofNGDmByMatOHCwpccnAurTWcGYH
-LSRW2aMwBiR7idAmUaxq2BQwhhVLD48me1HpNk5Phg+kq2SAreC7ZIJ1JrCoPczD
-vL49ixKiriWEeBYSVGCXuK90MTX+QIOxr5BPMbnjDJNin33VuEyfeZKhZOsgAC7J
-o9jb9MUKKN9/E3ds63E/fbrWoGk+Sc4TP7o5FIbvRE3xcgY5C3S3vqGd8U/mEr8z
-c78euM2bQm5yvlG0D6MgYG22I1WNDw==
- </ds:X509Certificate>
- </ds:X509Data>
- <!-- SWITCH Server CA -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEBDCCAuygAwIBAgIJAJSUwIrQ9v+wMA0GCSqGSIb3DQEBBQUAMIGHMRIwEAYD
-VQQDEwlTV0lUQ0ggQ0ExIjAgBgkqhkiG9w0BCQEWE3N3aXRjaC5jYUBzd2l0Y2gu
-Y2gxQDA+BgNVBAoTN1N3aXRjaCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVy
-IExlaHJlIHVuZCBGb3JzY2h1bmcxCzAJBgNVBAYTAkNIMB4XDTA1MDIxMTA1MDAy
-OVoXDTA3MDMxNTA1MDAyOVowgZUxGTAXBgNVBAMTEFNXSVRDSCBTZXJ2ZXIgQ0Ex
-KTAnBgkqhkiG9w0BCQEWGnN3aXRjaC5zZXJ2ZXIuY2FAc3dpdGNoLmNoMUAwPgYD
-VQQKEzdTV0lUQ0ggLSBUZWxlaW5mb3JtYXRpa2RpZW5zdGUgZnVlciBMZWhyZSB1
-bmQgRm9yc2NodW5nMQswCQYDVQQGEwJDSDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPQ7EUOpqAtlnbyZo9f3QSk4KQuPNA52i6IXrp1mQJImuWvWZoqT
-gFr89Ac7qYdWX+J2LrZHGuMdwod5+SIW0T5n0kX736RJlSbShjRbSX4bFUFB06Bj
-A0dv+ALozP7wYwLi9niS+MeuiOModFKx132KN9JefAR2jmE5aiXOwo5JDaEOd8XJ
-wg6HVQR4vcPmY0Z3ADHsq3z0v3ym4rbqm+7cbuGOcycsaLt9qZedMnKQiBPsgcby
-X6riWXaBSB3XeLTgSYa2ccqkfn9wq+jCsHfA2JVjr9XSpUPA+T0tcdZU63s8qzUN
-bidAeGgeaYjIUO1M/5rpMS7GMT0HAUFDXjcCAwEAAaNjMGEwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMMl3+UOxsxt2SSy23wQpNtb
-peegMB8GA1UdIwQYMBaAFCXJB/UULNApBe+V9UJD1eqQjXNzMA0GCSqGSIb3DQEB
-BQUAA4IBAQCDHEjFPRuwSGa220vS3yz/Jq/K8MT6OP2FwcQ7qEivusem6kYFVrXc
-+O6V2syPQnIm6QGar7Xl8YhEDY50evQzp4HqZYpWldeyPZLxPncGaM8nqU3L89Yz
-EulgV7XQy9jiZTgXLfjh4s2LEJwQzI+YCgwMg5kOXu5ZPKE+WgePkmDecqwBey5d
-XBF4482eVAqDvPp+oVeJUpGNMFzRW+88GuHCJPgw7Q1/La7FS5t3ybWxNT2wanRV
-+cpZMxvMPogLiVU9hNCUNZWlGkfz2Zj05EdUch+D0prAylbGB2wypoVYob9SjCzQ
-Q/dOEOtpKgOJ12NFpFHgQDlAfEfnpvDZ
- </ds:X509Certificate>
- </ds:X509Data>
- <!-- new SWITCH Server CA -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEAzCCAuugAwIBAgIIEBfTTuh1CD8wDQYJKoZIhvcNAQEFBQAwgYcxEjAQBgNV
-BAMTCVNXSVRDSCBDQTEiMCAGCSqGSIb3DQEJARYTc3dpdGNoLmNhQHN3aXRjaC5j
-aDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIg
-TGVocmUgdW5kIEZvcnNjaHVuZzELMAkGA1UEBhMCQ0gwHhcNMDYwMjA5MTI0MTAw
-WhcNMDgwMzEzMTI0MTAwWjCBlTELMAkGA1UEBhMCQ0gxQDA+BgNVBAoTN1NXSVRD
-SCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVyIExlaHJlIHVuZCBGb3JzY2h1
-bmcxGTAXBgNVBAMTEFNXSVRDSCBTZXJ2ZXIgQ0ExKTAnBgkqhkiG9w0BCQEWGnN3
-aXRjaC5zZXJ2ZXIuY2FAc3dpdGNoLmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA4KzBOgjiIeBcR+//lu6yiQxkVLnay+wZoQ5e9A+/kpMFH1V1CqY5
-8xr+A+TK68jiqjgAtJzj5vBcSLcPOzx0sJYvXhfg+1TnpsaP4RRscYMTkLOzRSVJ
-stScTLJIycumpcLmRX1w5cDaSvOKSqKidXEhi0CrIa2HtBrAId1UsIF4qfzlHIp1
-CuO9Jz1MALtwpN8KlF3GMi0MkT2cR8BZjpHpM80zUSd2Q8nAgzcvsdqMIpjb6tIj
-holUK/+7eCwcWWJWEWhdnc6yDTF1K75W6icuBbuswLT5A7I5sCiuKAF0Ils821po
-2xwCeZjxR1lzCPuWwx25OxgEk6VmYwPxYwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUTw0Q79mXN/2x+QHaM1WOLc3V
-ylkwHwYDVR0jBBgwFoAUJckH9RQs0CkF75X1QkPV6pCNc3MwDQYJKoZIhvcNAQEF
-BQADggEBADjbAn4/MOKGyVwGnzPi1P2qezN23ebuGmIZeXhwKlLLKsKz70/XGzgI
-M6R/po/t2DfThIQ2vfSaeA7RpELkdOfrPInGz+Y0zmx309ffifKdUx0hbyybltUK
-zRqFmIhAVXKIMcui7nVbNpnXX4ymH/t/Lk/+xl8J4OXCbUN+0O+kHrqzhv2UwK9U
-abJ0CzpvtJIowUC8qFrb5y0Rq4NgdBpQkcL7oUxqfgMSGxV9KiiWIFX9M+txqug5
-MS7E0CX7ZvDqJcbRURjUDCcI2UcBh0E8LPIYsmB+gisEBcvMkjzRFqdMbe833Nzm
-Df4e4+tSHXKNzAesYsHleWikHBGCpAM=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <!-- TC Trustcenter Class 2 CA -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDXDCCAsWgAwIBAgICA+owDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF
-MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU
-QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI
-MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAyIENBMSkwJwYJKoZIhvcN
-AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla
-Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy
-ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y
-IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1
-c3RDZW50ZXIgQ2xhc3MgMiBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA
-dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANo46O0y
-AClxgwENv4wB3NrGrTmkqYov1YtcaF9QxmL1Zr3KkSLsqh1R1z2zUbKDTl3LSbDw
-TFXlay3HhQswHJJOgtTKAu33b77c4OMUuAVT8pr0VotanoWT0bSCVq5Nu6hLVxa8
-/vhYnvgpjbB7zXjJT6yLZwzxnPv8V5tXXE8NAgMBAAGjazBpMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3
-LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G
-CSqGSIb3DQEBBAUAA4GBAIRS+yjf/x91AbwBvgRWl2p0QiQxg/lGsQaKic+WLDO/
-jLVfenKhhQbOhvgFjuj5Jcrag4wGrOs2bYWRNAQ29ELw+HkuCkhcq8xRT3h2oNms
-Gb0q0WkEKJHKNhAngFdb0lz1wlurZIFjdFH0l7/NEij3TWZ/p/AcASZ4smZHcFFk
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <!-- TC Trustcenter Class 3 CA -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDXDCCAsWgAwIBAgICA+swDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF
-MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU
-QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI
-MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAzIENBMSkwJwYJKoZIhvcN
-AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla
-Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy
-ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y
-IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1
-c3RDZW50ZXIgQ2xhc3MgMyBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA
-dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALa0wTUF
-Lg2N7KBAahwOJ6ZQkmtQGwfeLud2zODa/ISoXoxjaitN2U4CdhHBC/KNecoAtvGw
-Dtf7pBc9r6tpepYnv68zoZoqWarEtTcI8hKlMbZD9TKWcSgoq40oht+77uMMfTDW
-w1Krj10nnGvAo+cFa1dJRLNu6mTP0o56UHd3AgMBAAGjazBpMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3
-LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G
-CSqGSIb3DQEBBAUAA4GBABY9xs3Bu4VxhUafPiCPUSiZ7C1FIWMjWwS7TJC4iJIE
-Tb19AaM/9uzO8d7+feXhPrvGq14L3T2WxMup1Pkm5gZOngylerpuw3yCGdHHsbHD
-2w2Om0B8NwvxXej9H5CIpQ5ON2QhqE6NtJ/x3kit1VYYUimLRzQSCdS7kjXvD9s0
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <!-- Thawte Server CA -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
-MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
-MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
-dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
-cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
-DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
-yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
-L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
-EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
-7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
-QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
-qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <!-- Thawte Premium Server CA -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
-dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
-MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
-A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
-b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
-cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
-VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
-ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
-uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
-hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
-pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <!-- Verisign Class 3 CA -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <!-- Versign Class 3 Public Primary CA -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
- </ds:X509Certificate>
- </ds:X509Data>
- <!-- VeriSign International Server CA - Class 3 -->
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDgzCCAuygAwIBAgIQJUuKhThCzONY+MXdriJupDANBgkqhkiG9w0BAQUFADBf
-MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT
-LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNOTcwNDE3MDAwMDAwWhcNMTExMDI0MjM1OTU5WjCBujEfMB0GA1UEChMWVmVy
-aVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UECxMOVmVyaVNpZ24sIEluYy4xMzAx
-BgNVBAsTKlZlcmlTaWduIEludGVybmF0aW9uYWwgU2VydmVyIENBIC0gQ2xhc3Mg
-MzFJMEcGA1UECxNAd3d3LnZlcmlzaWduLmNvbS9DUFMgSW5jb3JwLmJ5IFJlZi4g
-TElBQklMSVRZIExURC4oYyk5NyBWZXJpU2lnbjCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA2IKA6NYZAn0fhRg5JaJlK+G/1AXTvOY2O6rwTGxbtueqPHNFVbLx
-veqXQu2aNAoV1Klc9UAl3dkHwTKydWzEyruj/lYncUOqY/UwPpMo5frxCTvzt01O
-OfdcSVq4wR3Tsor+cDCVQsv+K1GLWjw6+SJPkLICp1OcTzTnqwSye28CAwEAAaOB
-4zCB4DAPBgNVHRMECDAGAQH/AgEAMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL0NQUzA0BgNV
-HSUELTArBggrBgEFBQcDAQYIKwYBBQUHAwIGCWCGSAGG+EIEAQYKYIZIAYb4RQEI
-ATALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgEGMDEGA1UdHwQqMCgwJqAk
-oCKGIGh0dHA6Ly9jcmwudmVyaXNpZ24uY29tL3BjYTMuY3JsMA0GCSqGSIb3DQEB
-BQUAA4GBAAgB7ORolANC8XPxI6I63unx2sZUxCM+hurPajozq+qcBBQHNgYL+Yhv
-1RPuKSvD5HKNRO3RrCAJLeH24RkFOLA9D59/+J4C3IYChmFOJl9en5IeDCSk9dBw
-E88mw0M9SR2egi5SX7w+xmYpAY5Okiy8RnUDgqxz6dl+C2fvVFIa
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <!-- EPFL CA -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDbjCCAtegAwIBAgIBADANBgkqhkiG9w0BAQQFADCBhzELMAkGA1UEBhMCQ0gx
-DTALBgNVBAgTBFZhdWQxETAPBgNVBAcTCExhdXNhbm5lMQ0wCwYDVQQKEwRFUEZM
-MSUwIwYDVQQDExxFUEZMIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYJKoZI
-hvcNAQkBFhFjZXJ0LWF1dGhAZXBmbC5jaDAeFw0wMjAxMjMxMzU0NDJaFw0xMjAx
-MjExMzU0NDJaMIGHMQswCQYDVQQGEwJDSDENMAsGA1UECBMEVmF1ZDERMA8GA1UE
-BxMITGF1c2FubmUxDTALBgNVBAoTBEVQRkwxJTAjBgNVBAMTHEVQRkwgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkxIDAeBgkqhkiG9w0BCQEWEWNlcnQtYXV0aEBlcGZs
-LmNoMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl6ERqcEOFgnM/DJSuM8AP
-TwvKJB47u+S9wAbfkhESINc1G0orvRJxIztnHlhp245qzvhgMFukdnn/ZhGivNYb
-tu/N1fGInXIMxWb+1gVKtzpQH/QGX3Dva0Gkr/9iT7JL+nsqNV9Rz6byLMSoBMjM
-lyXC7W7LxjZqdQ1FSimG8QIDAQABo4HnMIHkMB0GA1UdDgQWBBQ7iVSOMlRaUJZC
-4vg8nLKpVeJq2jCBtAYDVR0jBIGsMIGpgBQ7iVSOMlRaUJZC4vg8nLKpVeJq2qGB
-jaSBijCBhzELMAkGA1UEBhMCQ0gxDTALBgNVBAgTBFZhdWQxETAPBgNVBAcTCExh
-dXNhbm5lMQ0wCwYDVQQKEwRFUEZMMSUwIwYDVQQDExxFUEZMIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFjZXJ0LWF1dGhAZXBmbC5jaIIB
-ADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAA+iL5occl7nlrcLDoLA
-5LoeE8i201WkkbUQJddz6UhPtbn5XB4b5p6zo+R93TevgKW01ILPanCkROf49PrR
-iGseMuGV55p4WHvyKGVl5Q4je6vL4lZlixqEgACPQepUI9Qdi4fogSCaZQyC7fIO
-Dul1iSdow7sghBcWrsZu8gVt
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </shibmd:KeyAuthority>
- </Extensions>
-
-
-
- <!--
- Identity Provider Definitions
- -->
-
- <!-- Université de Lausanne -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unil.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai1.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai1.unil.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai1.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai1.unil.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Lausanne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Lausanne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- EPFL Home Org -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:epfl.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibb-idp.epfl.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.epfl.ch/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.epfl.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibb-idp.epfl.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.epfl.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">EPFL Home Org</OrganizationName>
- <OrganizationDisplayName xml:lang="en">EPFL Home Org</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>AAI EPFL Team</SurName>
- <EmailAddress>aai at epfl.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <SurName>AAI EPFL Team</SurName>
- <EmailAddress>aai at epfl.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- ETHZ - ETH Zurich -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:ethz.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-login.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.ethz.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-login.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ethz.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">ETHZ - ETH Zurich</OrganizationName>
- <OrganizationDisplayName xml:lang="en">ETHZ - ETH Zurich</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="administrative">
- <SurName>Roland Dietlicher</SurName>
- <EmailAddress>rdietlicher at ethz.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Vladislav Nespor</SurName>
- <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Vladislav Nespor</SurName>
- <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Universität Zürich -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unizh.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizh.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unizh.ch:8443/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unizh.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizh.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unizh.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Universität Zürich</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Universität Zürich</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://idp.unizh.ch/aaierror</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>Luzian Scherrer</SurName>
- <EmailAddress>aaiadm at id.unizh.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <SurName>Luzian Scherrer</SurName>
- <EmailAddress>aaiadm at id.unizh.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Luzian Scherrer</SurName>
- <EmailAddress>aaiadm at id.unizh.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Université de Genève -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unige.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>auth.unige.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.unige.ch:8443/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.unige.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>auth.unige.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.unige.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Genève</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Genève</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://aai.unige.ch/error-origin.html</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>Dominique Petitpierre</SurName>
- <EmailAddress>Dominique.Petitpierre at adm.unige.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Dominique Petitpierre</SurName>
- <EmailAddress>Dominique.Petitpierre at adm.unige.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <SurName>Help Desk for the University of Geneva</SurName>
- <EmailAddress>helpdesk at adm.unige.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Universität Luzern -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unilu.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilu.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-login.unilu.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.unilu.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilu.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-login.unilu.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.unilu.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Universität Luzern</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Universität Luzern</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>Marco Antonini</SurName>
- <EmailAddress>marco.antonini at unilu.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <SurName>Marco Antonini</SurName>
- <EmailAddress>marco.antonini at unilu.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Marco Antonini</SurName>
- <EmailAddress>marco.antonini at unilu.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Virtual Home Organization @SWITCHaai -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:vho-switchaai.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vho-switchaai.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai.vho-switchaai.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.vho-switchaai.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vho-switchaai.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>kerinci.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kerinci.switch.ch/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Virtual Home Organization @SWITCHaai</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Virtual Home Organization @SWITCHaai</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.switch.ch/aai/help/</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="support">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="billing">
- <SurName>Martin Sutter</SurName>
- <EmailAddress>sutter at switch.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Ueli Kienholz</SurName>
- <EmailAddress>kienholz at switch.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Valery Tschopp</SurName>
- <EmailAddress>tschopp at switch.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- SWITCH - The Swiss Education & Research Network -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:switch.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-logon.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-aa.switch.ch/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.switch.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-aa.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-aa.switch.ch/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">SWITCH - The Swiss Education & Research Network</OrganizationName>
- <OrganizationDisplayName xml:lang="en">SWITCH - The Swiss Education & Research Network</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.switch.ch/aai/help/</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="billing">
- <SurName>Martin Sutter</SurName>
- <EmailAddress>sutter at switch.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Ueli Kienholz</SurName>
- <EmailAddress>kienholz at switch.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Universität Bern -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unibe.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-homeorg.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-homeorg.unibe.ch:8443/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-homeorg.unibe.ch:443/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-homeorg.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-homeorg.unibe.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Universität Bern</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Universität Bern</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="support">
- <SurName>Informatikdienste - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Peter M. Geiser</SurName>
- <EmailAddress>peter.geiser at id.unibe.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Zürcher Hochschule Winterthur -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:zhwin.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zhwin.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-logon.zhwin.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.zhwin.ch/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.zhwin.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zhwin.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-logon.zhwin.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.zhwin.ch/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Zürcher Hochschule Winterthur</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Zürcher Hochschule Winterthur</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>Christoph Kägi</SurName>
- <EmailAddress>kgc at zhwin.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <SurName>Christoph Kägi</SurName>
- <EmailAddress>kgc at zhwin.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Peter Eggimann</SurName>
- <EmailAddress>egp at zhwin.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Université de Neuchâtel -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unine.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unine.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-login.unine.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.unine.ch:8443/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.unine.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unine.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-login.unine.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.unine.ch:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Neuchâtel</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Neuchâtel</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="administrative">
- <SurName>Claude Wacker</SurName>
- <EmailAddress>claude.wacker at unine.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <SurName>Hotline SITEL</SurName>
- <EmailAddress>hotline.sitel at unine.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Mathias Rufer</SurName>
- <EmailAddress>mathias.rufer at unine.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Université de Fribourg - Universität Freiburg -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unifr.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>switchaai.unifr.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://switchaai.unifr.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai.unifr.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Fribourg - Universität Freiburg</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Fribourg - Universität Freiburg</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="support">
- <SurName>Helpdesk Uni Fribourg</SurName>
- <EmailAddress>helpdesk at unifr.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Pierrot Héritier</SurName>
- <EmailAddress>aai-support at unifr.ch</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <SurName>Pierrot Héritier</SurName>
- <EmailAddress>aai-support at unifr.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
- <!-- Universität Basel -->
-
- <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unibas.ch">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-idp.unibas.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibas.ch/shibboleth-idp/Artifact" index="1"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-idp.unibas.ch/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
-
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-idp.unibas.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibas.ch/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Universität Basel</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Universität Basel</OrganizationDisplayName>
- <OrganizationURL xml:lang="en"/>
- </Organization>
-
- <ContactPerson contactType="technical">
- <SurName>Arsène Gschwind</SurName>
- <EmailAddress>arsene.gschwind at unibas.ch</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
-
-
-
- <!-- Service Provider Definitions -->
-
-
- <!-- ETH, ID, TIM Test Machine -->
-
- <EntityDescriptor entityID="https://tim-test.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tim-test.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-test.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, VHO 1.3 Tools -->
-
- <EntityDescriptor entityID="https://tools.vho-switchaai.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tools.vho-switchaai.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.vho-switchaai.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.vho-switchaai.ch/password/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>SWITCHaai</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>SWITCHaai</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Valery Tschopp</SurName>
- <EmailAddress>tschopp at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, Attributes Viewer 1.3 -->
-
- <EntityDescriptor entityID="https://kelut.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>kelut.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kelut.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>SWITCHaai</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>SWITCHaai</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Valery Tschopp</SurName>
- <EmailAddress>tschopp at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- AAI Portal to WebCT Vista -->
-
- <EntityDescriptor entityID="https://login.virtualcampus.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>login.virtualcampus.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.virtualcampus.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>Pauline McNamara</SurName>
- <EmailAddress>pauline.mcnamara at unifr.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Pauline McNamara</SurName>
- <EmailAddress>pauline.mcnamara at unifr.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Philippe Froidevaux</SurName>
- <EmailAddress>philippe.froidevaux at unifr.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab12" -->
-
- <EntityDescriptor entityID="https://gridlab12.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab12.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab12.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIZH, OLAT-LIVE -->
-
- <EntityDescriptor entityID="https://www.olat.unizh.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.olat.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.olat.unizh.ch/olat/shib/samlaa" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>olat developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>olat developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>olat developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIGE, DINF, NTIC, test and debug -->
-
- <EntityDescriptor entityID="https://rodn.unige.ch/shibboleth/target">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>rodn.unige.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rodn.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rodn.unige.ch:4443/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "woodstock" -->
-
- <EntityDescriptor entityID="https://woodstock.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>woodstock.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodstock.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "cubert" -->
-
- <EntityDescriptor entityID="https://cubert.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>cubert.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cubert.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "aladin" -->
-
- <EntityDescriptor entityID="https://aladin.cnds.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aladin.cnds.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aladin.cnds.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab01" -->
-
- <EntityDescriptor entityID="https://gridlab01.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab01.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab01.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab02" -->
-
- <EntityDescriptor entityID="https://gridlab02.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab01.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab02.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab03" -->
-
- <EntityDescriptor entityID="https://gridlab03.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab03.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab03.unibe.ch/shibboleth-sp/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab04" -->
-
- <EntityDescriptor entityID="https://gridlab04.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab04.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab04.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab05" -->
-
- <EntityDescriptor entityID="https://gridlab05.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab05.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab05.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab06" -->
-
- <EntityDescriptor entityID="https://gridlab06.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab06.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab06.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab07" -->
-
- <EntityDescriptor entityID="https://gridlab07.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab07.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab07.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab08" -->
-
- <EntityDescriptor entityID="https://gridlab08.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab08.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab08.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab09" -->
-
- <EntityDescriptor entityID="https://gridlab09.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab09.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab09.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab 10" -->
-
- <EntityDescriptor entityID="https://gridlab10.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab10.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab10.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab 11" -->
-
- <EntityDescriptor entityID="https://gridlab11.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab11.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab11.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>info at vitels.ch</SurName>
- <EmailAddress>info at vitels.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, eConf Portal -->
-
- <EntityDescriptor entityID="https://panarea.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>econf.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://panarea.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://econf.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, ID, Sympa Maillisten -->
-
- <EntityDescriptor entityID="https://sympa.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sympa.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sympa.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>sympa-owner at sympa.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>sympa-request at sympa.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIGE, Dokeos test -->
-
- <EntityDescriptor entityID="https://dokeostest.unige.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>dokeostest.unige.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dokeostest.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ganeshatest.unige.ch/in/Shibboleth.sso/showmyinfo/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIZH, OLAT Test Server 1 -->
-
- <EntityDescriptor entityID="https://olattest.unizh.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>olattest.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olattest.unizh.ch/olat/shib/samlaa" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>OLAT Developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>OLAT Developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>OLAT Developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIZH, OLAT Nightly -->
-
- <EntityDescriptor entityID="https://nightly.olat.unizh.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>nightly.olat.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nightly.olat.unizh.ch/nightly/shib/samlaa" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>OLAT Developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>OLAT Developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>OLAT Developers</SurName>
- <EmailAddress>developers at olat.unizh.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, Test SP 1.3 (rita3) -->
-
- <EntityDescriptor entityID="https://rita3.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>rita.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rita3.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://rita3.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, ID, Compicampus Subscriptions -->
-
- <EntityDescriptor entityID="https://tim-1.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tim-1.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-1.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Wanda Lehrer</SurName>
- <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Wanda Lehrer</SurName>
- <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Dévelopement applications adimistratives -->
-
- <EntityDescriptor entityID="https://bilbo.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>bilbo.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bilbo.unil.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://phpdev.unil.ch/Shibboleth.shire" index="2"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://siainterd.unil.ch/Shibboleth.shire" index="3"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://siaintrad.unil.ch/Shibboleth.shire" index="4"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>HENCHOZ Daniel</SurName>
- <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>HENCHOZ Daniel</SurName>
- <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>ROY Alexandre</SurName>
- <EmailAddress>alexandre.roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, ID, Linkchecker for Zope/Silva WCMS sites -->
-
- <EntityDescriptor entityID="https://tim-4.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tim-4.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-4.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, ID, Poor Man's Spammer -->
-
- <EntityDescriptor entityID="https://tim-2.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tim-2.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-2.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>Doris Tomaschewski</SurName>
- <EmailAddress>poormansspam at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UniZH WWW -->
-
- <EntityDescriptor entityID="https://www.unizh.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unizh.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Luzian Scherrer</SurName>
- <EmailAddress>luzian.scherrer at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Roberto Mazzoni</SurName>
- <EmailAddress>roberto.mazzoni at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Webmaster</SurName>
- <EmailAddress>webmaster at unizh.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Internet administratif php furio -->
-
- <EntityDescriptor entityID="https://furio.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>furio.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://furio.unil.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://furio.unil.ch/Shibboleth.shire" index="2"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://zendp.unil.ch/Shibboleth.shire" index="3"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applicationspub.unil.ch/Shibboleth.shire" index="4"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zendp.unil.ch/Shibboleth.shire" index="5"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>HENCHOZ Daniel</SurName>
- <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>HENCHOZ Daniel</SurName>
- <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>ROY Alexandre</SurName>
- <EmailAddress>alexandre.roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, AAIportal HEAD -->
-
- <EntityDescriptor entityID="https://test.aaiportal.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>test.aaiportal.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.aaiportal.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="administrative">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Valéry Tschopp</SurName>
- <EmailAddress>tschopp at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Valéry Tschopp</SurName>
- <EmailAddress>tschopp at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIGE - Dokeos -->
-
- <EntityDescriptor entityID="https://dokeos.unige.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>dokeos.unige.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dokeos.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, ID, Compicampus -->
-
- <EntityDescriptor entityID="https://tim-1.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tim-1.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-1.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Wanda Lehrer</SurName>
- <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Wanda Lehrer</SurName>
- <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, ID, VIP Software Distribution -->
-
- <EntityDescriptor entityID="https://tim-3.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tim-3.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-3.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UniBE, Institut für Erziehungswissenschaft (IfE), ILIAS Plattform -->
-
- <EntityDescriptor entityID="https://ilias.edu.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>ilias.edu.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilias.edu.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Marcel Raimann</SurName>
- <EmailAddress>marcel.raimann at edu.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Marcel Raimann</SurName>
- <EmailAddress>marcel.raimann at edu.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Marcel Raimann</SurName>
- <EmailAddress>marcel.raimann at edu.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Martin Studer</SurName>
- <EmailAddress>martin.studer at sis.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, CustomX -->
-
- <EntityDescriptor entityID="https://parnass.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>parnass.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://parnass.switch.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Ses</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Ses</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Ses</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, CustomX-Test -->
-
- <EntityDescriptor entityID="https://titlis.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>titlis.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://titlis.switch.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Ses</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Ses</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Ses</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- DOIT, Dermatology eLearning -->
-
- <EntityDescriptor entityID="https://aai.cyberderm.net/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai.cyberderm.net</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/resources/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Patrick Husi</SurName>
- <EmailAddress>patrick.husi at arpage.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Vahid Djamei</SurName>
- <EmailAddress>vahid.djamei at usz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Vahid Djamei</SurName>
- <EmailAddress>vahid.djamei at usz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ZHWIN, elearning Moodle Platform -->
-
- <EntityDescriptor entityID="https://elearning.zhwin.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>elearning.zhwin.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://elearning.zhwin.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elearning.zhwin.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Daniel Frei</SurName>
- <EmailAddress>frn at zhwin.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Martin Voegeli</SurName>
- <EmailAddress>vom at zhwin.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Martin Voegeli</SurName>
- <EmailAddress>vom at zhwin.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Projekt-Portal (SQUEAK) -->
-
- <EntityDescriptor entityID="https://squeak.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>squeak.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://squeak.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Patick Chénais</SurName>
- <EmailAddress>patrick.chenais at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Patick Chénais</SurName>
- <EmailAddress>patrick.chenais at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Patick Chénais</SurName>
- <EmailAddress>patrick.chenais at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, NET, ILIAS Testserver -->
-
- <EntityDescriptor entityID="https://ilias-test.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>ilias-test.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilias-test.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, NET, ViewCVS -->
-
- <EntityDescriptor entityID="https://bonifaz.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>bonifaz.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bonifaz.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, eConf Test Portal -->
-
- <EntityDescriptor entityID="http://call-deb5.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>econf.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://call-deb5.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Swiss Bio Grid Certificate Authority -->
-
- <EntityDescriptor entityID="https://sbgca.unizh.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sbgca.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbgca.unizh.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>SBG CA Administrator</SurName>
- <EmailAddress>sbgca at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>SBG CA Administrator</SurName>
- <EmailAddress>sbgca at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>SBG CA Administrator</SurName>
- <EmailAddress>sbgca at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH Network Statistics -->
-
- <EntityDescriptor entityID="https://ezmp1.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>ezmp1.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezmp1.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://ezmp1.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIGE - ShowMyInfo, Attributes Viewer -->
-
- <EntityDescriptor entityID="https://showmyinfo.unige.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>dokeos.unige.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://showmyinfo.unige.ch:4443/in/Shibboleth.sso/showmyinfo/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, ID, AAI-Portal -->
-
- <EntityDescriptor entityID="https://aai-portal.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-login.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-portal.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Vladislav Nespor</SurName>
- <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Vladislav Nespor</SurName>
- <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH AAI Wiki: waaikiki -->
-
- <EntityDescriptor entityID="https://aai-wiki.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tools.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-wiki.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Ueli Kienholz</SurName>
- <EmailAddress>kienholz at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH Tools -->
-
- <EntityDescriptor entityID="https://tools.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tools.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Ueli Kienholz</SurName>
- <EmailAddress>kienholz at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- NFSEN-Tool -->
-
- <EntityDescriptor entityID="https://id-nfsen.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>id-nfsen.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id-nfsen.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Informatikdienste - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Informatikdienste - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Informatikdienste - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, NET, ILIAS Server -->
-
- <EntityDescriptor entityID="https://ilias.net.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>ilias.net.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilias.net.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, Play Streaming Service -->
-
- <EntityDescriptor entityID="https://play.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>play.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- e-Learning Module for VITELS (Firewall Configuration) -->
-
- <EntityDescriptor entityID="https://diufpc200.unifr.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>diufpc200.unifr.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://diufpc200.unifr.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Aurelius Robert BAIER</SurName>
- <EmailAddress>aurelius.baier at unifr.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Aurelius Robert BAIER</SurName>
- <EmailAddress>aurelius.baier at unifr.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Aurelius Robert BAIER</SurName>
- <EmailAddress>aurelius.baier at unifr.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, AAI Resource Registry -->
-
- <EntityDescriptor entityID="https://aai-rr.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tools.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-rr.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>AAI Team</SurName>
- <EmailAddress>aai at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Lukas Haemmerle</SurName>
- <EmailAddress>haemmerle at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Thomas Lenggenhager</SurName>
- <EmailAddress>lenggenhager at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH Network Statistics -->
-
- <EntityDescriptor entityID="https://flow.net.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>flow.net.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://flow.net.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://flow.net.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ADLearn validation server -->
-
- <EntityDescriptor entityID="https://valid.alzheimerlearn.net/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>valid.bio-med.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://valid.alzheimerlearn.net/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="administrative">
- <SurName>Pascal Py</SurName>
- <EmailAddress>pascal.py at bli.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Yan Corneille</SurName>
- <EmailAddress>yan.corneille at bli.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Yan Corneille</SurName>
- <EmailAddress>yan.corneille at bli.unizh.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ScienceDirect -->
-
- <EntityDescriptor entityID="https://sdauth.sciencedirect.com/">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sciencedirect.partner-switchaai.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth-cert3.sciencedirect.com/SHIRE" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="administrative">
- <SurName>Chris Shillum</SurName>
- <EmailAddress>c.shillum at elsevier.com</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Tony Gast</SurName>
- <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Tony Gast</SurName>
- <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCHvconf -->
-
- <EntityDescriptor entityID="https://vconf.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>vconf.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vconf.switch.ch/aai/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="administrative">
- <SurName>Fabio Vena</SurName>
- <EmailAddress>vena at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Olivier Jeger</SurName>
- <EmailAddress>jeger at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Paola Wieting</SurName>
- <EmailAddress>wieting at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH, SMAP / SWITCH Mitarbeiterportal -->
-
- <EntityDescriptor entityID="https://smap.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>smap.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://smap.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Andreas Hebeisen</SurName>
- <EmailAddress>hebeisen at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Andreas Hebeisen</SurName>
- <EmailAddress>hebeisen at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Andreas Hebeisen</SurName>
- <EmailAddress>hebeisen at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab13" -->
-
- <EntityDescriptor entityID="https://gridlab13.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab13.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab13.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab14" -->
-
- <EntityDescriptor entityID="https://gridlab14.unibe.ch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab14.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab14.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab15" -->
-
- <EntityDescriptor entityID="https://gridlab15.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab15.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab15.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab16" -->
-
- <EntityDescriptor entityID="https://gridlab16.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab16.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab16.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab17" -->
-
- <EntityDescriptor entityID="https://gridlab17.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab17.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab17.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab18" -->
-
- <EntityDescriptor entityID="https://gridlab18.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab18.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab18.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab19" -->
-
- <EntityDescriptor entityID="https://gridlab19.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab19.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab19.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- VITELS, EuQoS, OS Laboratory Host "gridlab20" -->
-
- <EntityDescriptor entityID="https://gridlab20.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>gridlab20.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab20.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>vitels at iam.unibe.ch</SurName>
- <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- AAIproxy ETHZ -->
-
- <EntityDescriptor entityID="https://aaiproxy-consortium.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aaiproxy-consortium.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aaiproxy-consortium.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Wolfgang Lierz</SurName>
- <EmailAddress>wolfgang.lierz at library.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Wolfgang Lierz</SurName>
- <EmailAddress>wolfgang.lierz at library.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Wolfgang Lierz</SurName>
- <EmailAddress>wolfgang.lierz at library.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SWITCH Network Web Server -->
-
- <EntityDescriptor entityID="https://www.net.switch.ch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.net.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.net.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>NOC</SurName>
- <EmailAddress>noc at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SIP User Management -->
-
- <EntityDescriptor entityID="https://sip.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sip.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sip.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>Bernhard Höneisen</SurName>
- <EmailAddress>hoeneisen at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Bernhard Höneisen</SurName>
- <EmailAddress>hoeneisen at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Lukas Haemmerle</SurName>
- <EmailAddress>haemmerle at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Test SP rita4 -->
-
- <EntityDescriptor entityID="https://rita4.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>rita4.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rita4.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://rita4.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Alexandre Roy</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Service WWW statique -->
-
- <EntityDescriptor entityID="https://rhea.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>rhea.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rhea.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://rhea.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www2.unil.ch/Shibboleth.sso/SAML/POST" index="3"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www3.unil.ch/Shibboleth.sso/SAML/POST" index="4"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://wwwbscw.unil.ch/Shibboleth.sso/SAML/POST" index="5"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://wwwpeople.unil.ch/Shibboleth.sso/SAML/POST" index="6"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rhea.unil.ch:8001/Shibboleth.sso/SAML/POST" index="7"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.unil.ch/Shibboleth.sso/SAML/POST" index="8"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.unil.ch/Shibboleth.sso/SAML/POST" index="9"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwbscw.unil.ch/Shibboleth.sso/SAML/POST" index="10"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwpeople.unil.ch/Shibboleth.sso/SAML/POST" index="11"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Isabelle Moullet</SurName>
- <EmailAddress>isabelle.moullet at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Isabelle Moullet</SurName>
- <EmailAddress>isabelle.moullet at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Isabelle Moullet</SurName>
- <EmailAddress>isabelle.moullet at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- HEC hecho test -->
-
- <EntityDescriptor entityID="https://hecho.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>hecho.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hecho.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://hecho.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Antoine Christen</SurName>
- <EmailAddress>antoine.christen at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Antoine Christen</SurName>
- <EmailAddress>antoine.christen at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Antoine Christen</SurName>
- <EmailAddress>antoine.christen at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- EuQoS Laboratory Host -->
-
- <EntityDescriptor entityID="https://wp2.tele.pw.edu.pl/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>wp2.tele.pw.edu.pl</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wp2.tele.pw.edu.pl/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Andrzej Beben</SurName>
- <EmailAddress>abeben at tele.pw.edu.pl</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Andrzej Beben</SurName>
- <EmailAddress>abeben at tele.pw.edu.pl</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Andrzej Beben</SurName>
- <EmailAddress>abeben at tele.pw.edu.pl</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- AAI-Portal UniBE -->
-
- <EntityDescriptor entityID="https://aai-portal.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-portal.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-portal.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>Informatikdienste - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Informatikdienste - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Peter M. Geiser</SurName>
- <EmailAddress>peter.geiser at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- IDSECWEB / secure webserver -->
-
- <EntityDescriptor entityID="https://idsecweb.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idsecweb.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idsecweb.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Computer Service Department - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Computer Service Department - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Computer Service Department - Security</SurName>
- <EmailAddress>security at unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, NET, Test Application Form BSCW Pro -->
-
- <EntityDescriptor entityID="https://bonifaz.ethz.ch/bscwproform/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>bonifaz.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bonifaz.ethz.ch/bscwproform/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- SIP User Management (test) -->
-
- <EntityDescriptor entityID="https://wil.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>wil.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wil.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>Bernhard Höneisen</SurName>
- <EmailAddress>hoeneisen at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Bernhard Höneisen</SurName>
- <EmailAddress>hoeneisen at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Lukas Haemmerle</SurName>
- <EmailAddress>haemmerle at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- BigBrother maintance page -->
-
- <EntityDescriptor entityID="https://shasta.switch.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shasta.switch.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bb.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Maria von Kaenel</SurName>
- <EmailAddress>maria.von.kaenel at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>SES</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>SES</SurName>
- <EmailAddress>ses at switch.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, NET, DokuWiki -->
-
- <EntityDescriptor entityID="https://bonifaz.ethz.ch/dokuwiki/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>bonifaz.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bonifaz.ethz.ch/dokuwiki/Shibboleth.shire" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- EVA - Einfache virtuelle Ablage(Demo Version) -->
-
- <EntityDescriptor entityID="https://eva-demo.unibas.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>eva-demo.unibas.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eva-demo.unibas.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIZH, OLAT on idlnxgs -->
-
- <EntityDescriptor entityID="https://idlnxgs.unizh.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idlnxgs.unizh.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idlnxgs.unizh.ch:8443/olat/shib/samlaa" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Guido Schnider
-</SurName>
- <EmailAddress>guido at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Guido Schnider</SurName>
- <EmailAddress>guido at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Guido Schnider</SurName>
- <EmailAddress>guido at id.unizh.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Production applications adimistratives -->
-
- <EntityDescriptor entityID="https://falco.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>falco.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://falco.unil.ch/Shibboleth.shire" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.unil.ch/Shibboleth.shire" index="2"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applicationsinter.unil.ch/Shibboleth.shire" index="3"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applicationsz.unil.ch/Shibboleth.shire" index="4"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>HENCHOZ Daniel</SurName>
- <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>HENCHOZ Daniel</SurName>
- <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>ROY Alexandre</SurName>
- <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Claude's SP -->
-
- <EntityDescriptor entityID="https://slpc1.epfl.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>slpc1.epfl.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slpc1.epfl.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Claude Lecommandeur</SurName>
- <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Claude Lecommandeur</SurName>
- <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Claude Lecommandeur</SurName>
- <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Tequila -->
-
- <EntityDescriptor entityID="https://tequila.epfl.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>guests.epfl.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tequila.epfl.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Claude Lecommandeur</SurName>
- <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Claude Lecommandeur</SurName>
- <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Claude Lecommandeur</SurName>
- <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- EPFL ess-aai -->
-
- <EntityDescriptor entityID="https://ess-aai.epfl.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>ess-aai.epfl.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ess-aai.epfl.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Richard Timsit</SurName>
- <EmailAddress>Richard.Timsit at epfl.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Richard Timsit</SurName>
- <EmailAddress>Richard.Timsit at epfl.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Richard Timsit</SurName>
- <EmailAddress>Richard.Timsit at epfl.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Test AAI Portal to WebCT Vista -->
-
- <EntityDescriptor entityID="https://diuflx75.unifr.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>login.virtualcampus.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://diuflx75.unifr.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="administrative">
- <SurName>Pauline McNamara</SurName>
- <EmailAddress>pauline.mcnamara at unifr.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>Philippe Froidevaux</SurName>
- <EmailAddress>philippe.froidevaux at unifr.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Philippe Froidevaux</SurName>
- <EmailAddress>philippe.froidevaux at unifr.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- services web HEC Lausanne -->
-
- <EntityDescriptor entityID="https://www.hec.unil.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.hec.unil.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hec.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www.hec.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Antoine Christen</SurName>
- <EmailAddress>antoine.christen at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Antoine Christen</SurName>
- <EmailAddress>antoine.christen at unil.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Antoine Christen</SurName>
- <EmailAddress>antoine.christen at unil.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- EVA - Einfache virtuelle Ablage (Uni Basel) -->
-
- <EntityDescriptor entityID="https://eva.unibas.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>eva.unibas.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eva.unibas.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- EVA - Einfache virtuelle Ablage (ELBA-ETHZ) -->
-
- <EntityDescriptor entityID="https://eva-elba.unibas.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>eva-elba.unibas.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eva-elba.unibas.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="support">
- <SurName>ELBA (ETHZ)</SurName>
- <EmailAddress>elba at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="technical">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>URZ-LTN</SurName>
- <EmailAddress>nikt at unibas.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- UNIGE, Dokeos dev -->
-
- <EntityDescriptor entityID="https://dokeosdev.unige.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>dokeosdev.unige.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dokeosdev.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Nicolas Rod</SurName>
- <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- AAI-Logon UniBE (WebCT6) -->
-
- <EntityDescriptor entityID="https://aai-logon.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-logon.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-logon.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Christoph Glanzmann</SurName>
- <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Christoph Glanzmann</SurName>
- <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Christoph Glanzmann</SurName>
- <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- elearning2 -->
-
- <EntityDescriptor entityID="https://elearning2.zhwin.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>elearning2.zhwin.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elearning2.zhwin.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Christoph Kaegi</SurName>
- <EmailAddress>kgc at zhwin.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Martin Voegeli</SurName>
- <EmailAddress>vom at zhwin.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Martin Voegeli</SurName>
- <EmailAddress>vom at zhwin.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Entwicklungs-System tim-5 -->
-
- <EntityDescriptor entityID="https://tim-5.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>tim-5.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-5.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Thedi Gerber</SurName>
- <EmailAddress>gerber at id.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- Document Folder -->
-
- <EntityDescriptor entityID="https://naxos.unibe.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>naxos.unibe.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naxos.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Christoph Glanzmann</SurName>
- <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Christoph Glanzmann</SurName>
- <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Christoph Glanzmann</SurName>
- <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- University of Pisa, EuQoS, Traffic Engineering Laboratory -->
-
- <EntityDescriptor entityID="https://euqos-wp6.iet.unipi.it/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>euqos-wp6.iet.unipi.it</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://euqos-wp6.iet.unipi.it/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Enzo Mingozzi</SurName>
- <EmailAddress>e.mingozzi at iet.unipi.it</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Enzo Mingozzi</SurName>
- <EmailAddress>e.mingozzi at iet.unipi.it</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Luca Luigetti</SurName>
- <EmailAddress>luigetti at cng1.iet.unipi.it</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
- <!-- ETHZ, NET, Moodle Server -->
-
- <EntityDescriptor entityID="https://moodle.net.ethz.ch/shibboleth">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>moodle.net.ethz.ch</ds:KeyName>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.net.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-
- </SPSSODescriptor>
-
- <ContactPerson contactType="technical">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="support">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- <ContactPerson contactType="administrative">
- <SurName>Beat Müller</SurName>
- <EmailAddress>mueller at net.ethz.ch</EmailAddress>
- </ContactPerson>
-
- </EntityDescriptor>
-
-</EntitiesDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:switch.ch:SWITCHaai" validUntil="2010-01-01T00:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:SignedInfo>
+<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
+<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+<ds:Reference URI="">
+<ds:Transforms>
+<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
+</ds:Transforms>
+<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<ds:DigestValue>acLvEhewhbKMo2cSQS9qbZQAqWE=</ds:DigestValue>
+</ds:Reference>
+</ds:SignedInfo>
+<ds:SignatureValue>
+O2+crZMGjIVWjJ/k2PTDDkOv9FGGMEM+N0AOc+KrPLxNFmOOMGWlaAXH1/oeOEOmMpOfine0907E
+p9r+E9L9tL+OfYeJyS2y/NtFuZu/LTke4Z+HAf9DBwcRau4K1idjBrnhzm/hEYPqYBK2obzpH8xj
++A1g3FEkgtq4YtzALe0=
+</ds:SignatureValue>
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>
+MIICrzCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwgZ8xCzAJBgNVBAYTAkNIMUAwPgYDVQQKEzdTV0lU
+Q0ggLSBUZWxlaW5mb3JtYXRpa2RpZW5zdGUgZnVlciBMZWhyZSB1bmQgRm9yc2NodW5nMQwwCgYD
+VQQLEwNBQUkxIjAgBgNVBAMTGVNXSVRDSGFhaSBNZXRhZGF0YSBTaWduZXIxHDAaBgkqhkiG9w0B
+CQEWDWFhaUBzd2l0Y2guY2gwHhcNMDUwODAzMTEyMjUxWhcNMTUwODAxMTEyMjUxWjCBnzELMAkG
+A1UEBhMCQ0gxQDA+BgNVBAoTN1NXSVRDSCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVyIExl
+aHJlIHVuZCBGb3JzY2h1bmcxDDAKBgNVBAsTA0FBSTEiMCAGA1UEAxMZU1dJVENIYWFpIE1ldGFk
+YXRhIFNpZ25lcjEcMBoGCSqGSIb3DQEJARYNYWFpQHN3aXRjaC5jaDCBnzANBgkqhkiG9w0BAQEF
+AAOBjQAwgYkCgYEAsmyBYNZ8mKYutdyQShzuOgnVxDP1UBZE+57S2ORZg1qi4JExOJEPnviHuh6H
+EajljhAMGHxr656paDpfXkmGq/Ybk3xmXy2FTnFGpjFpZUV6dY/oJ82rve27C/NVcwZw2nYRl5C5
+aCCgx/QlWsBTw+9972141+wBDH7dXlJ+UGkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQCcLuNwTINk
+fhBlVCIuTixR1R6mYu/+4KUJWtHlRCOUZhSLFept8HxEvfwnuX9xm+Q6Ju/sOgmI1INuSstUGWwV
+y0AbpCphUDDmIh9A85ye8DrVaBHQrj5b/JEjCvkY0zhLJzgDzZ6btT40TuCnk2GpdAClu5SyCTiy
+56+zDYqPqg==
+</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo></ds:Signature>
+
+ <!--
+ SWITCHaai Federation metadata for Shibboleth 1.3
+ Generated by AAI Resource Registry
+ Date: 11. 04. 2006 17:58:04
+
+
+ -->
+
+
+ <!--
+ Valid CA certificates for this federation
+ -->
+ <Extensions>
+ <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
+ <!-- SwissSign CA and chain -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- SwissSign Root CA -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDtTCCAp2gAwIBAgIIBhDCeat3PfIwDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UE
+BhMCQ0gxEjAQBgNVBAoTCVN3aXNzU2lnbjEyMDAGA1UEAxMpU3dpc3NTaWduIENB
+IChSU0EgSUsgTWF5IDYgMTk5OSAxODowMDo1OCkxHzAdBgkqhkiG9w0BCQEWEGNh
+QFN3aXNzU2lnbi5jb20wHhcNMDAxMTI2MjMyNzQxWhcNMzExMTI2MjMyNzQxWjB2
+MQswCQYDVQQGEwJDSDESMBAGA1UEChMJU3dpc3NTaWduMTIwMAYDVQQDEylTd2lz
+c1NpZ24gQ0EgKFJTQSBJSyBNYXkgNiAxOTk5IDE4OjAwOjU4KTEfMB0GCSqGSIb3
+DQEJARYQY2FAU3dpc3NTaWduLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKw5fjnmNneLQlUCQG8jQLwwfbrOZoUwNX8cbNqhxK03/xUloFVgAt+S
+Te2RxNXaCAXLBPn5ZST35TLV57aLmbHCtifv3YZqaaQGvjedltIBMJihJhZ+h3LY
+SKsUb+xEJ3x5ZUf8jP+Q1g57y1s8SnBFWN/ni5NkF1Y1y31VwOi9wiOf/VISL+uu
+SC4i1CP1Kbz3BDs6Hht1GpRYCbJ/K0bc9oJSpWpT5PGONsGIawqMbJuyoDghsXQ1
+pbn2e8K64BSscGZVZTNooSGgNiHmACNJBYXiWVWrwXPF4l6SddmC3Rj0aKXjgECc
+FkHLDQcsM5JsK2ZLryTDUsQFbxVP2ikCAwEAAaNHMEUwCwYDVR0PBAQDAgEGMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFJbXcc05KtT8iLGKq1N4ae+PR34WMAkGA1Ud
+IwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKMy6W8HvZdS1fBpEUzl6Lvw50bgE1Xc
+HU1JypSBG9mhdcXZo5AlPB4sCvx9Dmfwhyrdsshc0TP2V3Vh6eQqnEF5qB4lVziT
+Bko9mW6Ot+pPnwsy4SHpx3rw6jCYnOqfUcZjWqqqRrq/3P1waz+Mn4cLMVEg3Xaz
+qYov/khvSqS0JniwjRlo2H6f/1oVUKZvP+dUhpQepfZrOqMAWZW4otp6FolyQyeU
+NN6UCRNiUKl5vTijbKwUUwfER/1Vci3M1/O1QCfttQ4vRN4Buc0xqYtGL3cd5WiO
+vWzyhlTzAI6VUdNkQhhHJSAyTpj6dmXDRzrryoFGa2PjgESxz7XBaSI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ <!-- SwissSign Bronze CA -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDvzCCAqegAwIBAgIIFss9aNe390IwDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UE
+BhMCQ0gxEjAQBgNVBAoTCVN3aXNzU2lnbjEyMDAGA1UEAxMpU3dpc3NTaWduIENB
+IChSU0EgSUsgTWF5IDYgMTk5OSAxODowMDo1OCkxHzAdBgkqhkiG9w0BCQEWEGNh
+QFN3aXNzU2lnbi5jb20wHhcNMDQwMTI4MTUwODM1WhcNMzExMTI2MjMyNzQxWjBk
+MRwwGgYDVQQDExNTd2lzc1NpZ24gQnJvbnplIENBMSMwIQYJKoZIhvcNAQkBFhRi
+cm9uemVAc3dpc3NzaWduLmNvbTESMBAGA1UEChMJU3dpc3NTaWduMQswCQYDVQQG
+EwJDSDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANr1A8bTAN+TVMmH
+7VoZPO9zW3T7E4cQpr2hOfgc4wD1XJcs8zbSSCddIDkzt8uRSwleBxXl9K1ssBCX
+5A8eA3SvSkAIhPQcXSZ9qiBKhecX0L6sCA69RYIEIohsR/LoLXbyx3SNBa8XTrre
+Fc2AvsivtSermSmVEIwgXdDbwhe46TzQs4bMWE6Lk4TucZqCqPcHzD5sldYDKUQs
+jyFHmiAKDGW/h0KIxUabdcAgFNsF/bfX0Eyy0ZpdnIo2Y+rGBb46ajsQy/ZajTOC
+szehUViyPgVeWBrbHLhJBASnW0bHYHeJAGOAJoeqCL9g26YvtXfykQqEE4yEIV8k
+Hs2iRJUCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+HQYDVR0OBBYEFOLejorj/3FBx1M8k9qNbrHSQUhKMB8GA1UdIwQYMBaAFJbXcc05
+KtT8iLGKq1N4ae+PR34WMA0GCSqGSIb3DQEBBQUAA4IBAQBKKRAOlf8eABdmB9vJ
+tBQNcGEcvRxfZkEdeGWiHkIDTUbkzNHT3HR9YGmqSmtK949l+7Kc5v+ksq6Pu87v
+yrIzYQOLuJodfzcNhInEaESS+fbKtpcRMTrvFhfwn+LntyNUSQr+5yRVY2Zwh8IN
+JH505q6ROvQLf1/obdXVMrsOXohNod62ZCKFxWOH3L7w0P8xbsGqx9iFmmKBu8xO
+p7N2tCw4OOfRWTil9UgYToC2LMmAwETK9j5xXvlXBSyyI/PxT45gUPzAdJnqI++k
+VU5MRJ6HQ2YkC62BJ55kwYr9VSMH+VmVVbhP85hRGFCdOSBRdgErK9Ur6gYMRCPM
+d+dR
+ </ds:X509Certificate>
+ </ds:X509Data>
+ <!-- SwissSign Silver CA -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDrjCCApagAwIBAgIJAOzGWItKFXXyMA0GCSqGSIb3DQEBBQUAMGQxHDAaBgNV
+BAMTE1N3aXNzU2lnbiBCcm9uemUgQ0ExIzAhBgkqhkiG9w0BCQEWFGJyb256ZUBz
+d2lzc3NpZ24uY29tMRIwEAYDVQQKEwlTd2lzc1NpZ24xCzAJBgNVBAYTAkNIMB4X
+DTA0MDEyODE5MjAyMFoXDTMxMTEyNjIzMjc0MVowZDEcMBoGA1UEAxMTU3dpc3NT
+aWduIFNpbHZlciBDQTEjMCEGCSqGSIb3DQEJARYUc2lsdmVyQHN3aXNzc2lnbi5j
+b20xEjAQBgNVBAoTCVN3aXNzU2lnbjELMAkGA1UEBhMCQ0gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDw+uCB7JzDd8bHQwEnybM/lfZ0jo3LMzecTPps
+O2Zvi/kM+rasENmxIVCi51R0RFG1i94Ck/P54i6dAeJBBe7VH/eZ3DukXj/3QoAJ
+PO/MQ9YWL8C07kBBwJ85inW8RTpwCKBodZhHfUFyo9vXm6Kz+ymwY7SJuWLAV1mx
+AqHeH169N8YTsHMp4KGWh+qyXr97vhbIcX8mHT88FR1eiZB5IL98IbYZKCr3owKu
+M0hPj8pXOnL8JKtJPI94iVGOITUFMAnmHrOSH+Ci+W1y0NzLUcdLWdL87MpPC246
+ZXBx4/ysKC2b1s6ulLlBIHY+DlPCbl19I5SGFUo2Pzvf71TZAgMBAAGjYzBhMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTNoawjv9A7
+IIpUgc3720Em40pwWjAfBgNVHSMEGDAWgBTi3o6K4/9xQcdTPJPajW6x0kFISjAN
+BgkqhkiG9w0BAQUFAAOCAQEAGMVal6W3zEbEIm00CeSJSoP/KVDLKLAt3k06TL00
+FeNA01ktIx3Tl7gm+vDLfnEXeGrSZb9+9iLkYNXs+xa7XGi1X0X4IkaCv4+E0rLt
+/eeYD060Eu3u+5g2t9eZ6w0gIsCUbbTSn3vl5Ml79FDYdBTw7ijSAiXcX13vl+Wt
+sg9jfzG0+jMNGj+9bsVo8hRA5esoNa8RHWI8Tkx/WWGoYCdigl99F2P+jJa52YsN
+XE13p8QA5Ndxgjl60mmA9I+Ajy5xYlG6byBuu6RW96eUgJdD0LGJpgJ5gdwyGxwB
+iZAZz3D1RUuDp+Zo7NIBeJgD9j8EIr7xi+D+hLG6YMYlhA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ <!-- SWITCH CA -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIID0jCCArqgAwIBAgIJAMnfZkUiiBS2MA0GCSqGSIb3DQEBBQUAMGQxHDAaBgNV
+BAMTE1N3aXNzU2lnbiBTaWx2ZXIgQ0ExIzAhBgkqhkiG9w0BCQEWFHNpbHZlckBz
+d2lzc3NpZ24uY29tMRIwEAYDVQQKEwlTd2lzc1NpZ24xCzAJBgNVBAYTAkNIMB4X
+DTA0MDIwNjExNDAzOVoXDTMxMTEyNjIzMjc0MVowgYcxEjAQBgNVBAMTCVNXSVRD
+SCBDQTEiMCAGCSqGSIb3DQEJARYTc3dpdGNoLmNhQHN3aXRjaC5jaDFAMD4GA1UE
+ChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5k
+IEZvcnNjaHVuZzELMAkGA1UEBhMCQ0gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDyOe1v3Cs8/lqTUQW3kShBIWEg76i4deENNgc4aSk29MJGLc5Nd7YF
+ukAUtutWDkR5wlR7W0sz9z2NdtsGa7Rxw1C2dC0djWwX7xbh/2e4T5zE5ZOMX/wU
+Bbd5aWTZID3cF61sJRqXVDd4HMgtuGL9CzjrJqahk+WBeojUe6AzIkkxOL6rXX/A
+dy1kHbBNqE+Fm90jKpHf7Kk5V8eNkswpXQVB8NaCtsgOdtYbrLLAJjgxQjh9/0DW
++tSMBdXm8MvcxALo6GYzFVephWgJqdXhVCmsN3YBII3zk6Ps5r0CnL1G2q0NuVJe
+pIHI9G43f31q9ki+aGY2xo5+d/dSx50jAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQlyQf1FCzQKQXvlfVCQ9XqkI1z
+czAfBgNVHSMEGDAWgBTNoawjv9A7IIpUgc3720Em40pwWjANBgkqhkiG9w0BAQUF
+AAOCAQEAEZALrclenN+L92lBagP3xi6E8Qma1k4XwI4iBr7wNOU07a2kx0nX6N7s
+zY+0dbte/XS6OflCmuJUZEPvyuJktWeOeIOrofNGDmByMatOHCwpccnAurTWcGYH
+LSRW2aMwBiR7idAmUaxq2BQwhhVLD48me1HpNk5Phg+kq2SAreC7ZIJ1JrCoPczD
+vL49ixKiriWEeBYSVGCXuK90MTX+QIOxr5BPMbnjDJNin33VuEyfeZKhZOsgAC7J
+o9jb9MUKKN9/E3ds63E/fbrWoGk+Sc4TP7o5FIbvRE3xcgY5C3S3vqGd8U/mEr8z
+c78euM2bQm5yvlG0D6MgYG22I1WNDw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ <!-- SWITCH Server CA -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIEBDCCAuygAwIBAgIJAJSUwIrQ9v+wMA0GCSqGSIb3DQEBBQUAMIGHMRIwEAYD
+VQQDEwlTV0lUQ0ggQ0ExIjAgBgkqhkiG9w0BCQEWE3N3aXRjaC5jYUBzd2l0Y2gu
+Y2gxQDA+BgNVBAoTN1N3aXRjaCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVy
+IExlaHJlIHVuZCBGb3JzY2h1bmcxCzAJBgNVBAYTAkNIMB4XDTA1MDIxMTA1MDAy
+OVoXDTA3MDMxNTA1MDAyOVowgZUxGTAXBgNVBAMTEFNXSVRDSCBTZXJ2ZXIgQ0Ex
+KTAnBgkqhkiG9w0BCQEWGnN3aXRjaC5zZXJ2ZXIuY2FAc3dpdGNoLmNoMUAwPgYD
+VQQKEzdTV0lUQ0ggLSBUZWxlaW5mb3JtYXRpa2RpZW5zdGUgZnVlciBMZWhyZSB1
+bmQgRm9yc2NodW5nMQswCQYDVQQGEwJDSDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAPQ7EUOpqAtlnbyZo9f3QSk4KQuPNA52i6IXrp1mQJImuWvWZoqT
+gFr89Ac7qYdWX+J2LrZHGuMdwod5+SIW0T5n0kX736RJlSbShjRbSX4bFUFB06Bj
+A0dv+ALozP7wYwLi9niS+MeuiOModFKx132KN9JefAR2jmE5aiXOwo5JDaEOd8XJ
+wg6HVQR4vcPmY0Z3ADHsq3z0v3ym4rbqm+7cbuGOcycsaLt9qZedMnKQiBPsgcby
+X6riWXaBSB3XeLTgSYa2ccqkfn9wq+jCsHfA2JVjr9XSpUPA+T0tcdZU63s8qzUN
+bidAeGgeaYjIUO1M/5rpMS7GMT0HAUFDXjcCAwEAAaNjMGEwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMMl3+UOxsxt2SSy23wQpNtb
+peegMB8GA1UdIwQYMBaAFCXJB/UULNApBe+V9UJD1eqQjXNzMA0GCSqGSIb3DQEB
+BQUAA4IBAQCDHEjFPRuwSGa220vS3yz/Jq/K8MT6OP2FwcQ7qEivusem6kYFVrXc
++O6V2syPQnIm6QGar7Xl8YhEDY50evQzp4HqZYpWldeyPZLxPncGaM8nqU3L89Yz
+EulgV7XQy9jiZTgXLfjh4s2LEJwQzI+YCgwMg5kOXu5ZPKE+WgePkmDecqwBey5d
+XBF4482eVAqDvPp+oVeJUpGNMFzRW+88GuHCJPgw7Q1/La7FS5t3ybWxNT2wanRV
++cpZMxvMPogLiVU9hNCUNZWlGkfz2Zj05EdUch+D0prAylbGB2wypoVYob9SjCzQ
+Q/dOEOtpKgOJ12NFpFHgQDlAfEfnpvDZ
+ </ds:X509Certificate>
+ </ds:X509Data>
+ <!-- new SWITCH Server CA -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIEAzCCAuugAwIBAgIIEBfTTuh1CD8wDQYJKoZIhvcNAQEFBQAwgYcxEjAQBgNV
+BAMTCVNXSVRDSCBDQTEiMCAGCSqGSIb3DQEJARYTc3dpdGNoLmNhQHN3aXRjaC5j
+aDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIg
+TGVocmUgdW5kIEZvcnNjaHVuZzELMAkGA1UEBhMCQ0gwHhcNMDYwMjA5MTI0MTAw
+WhcNMDgwMzEzMTI0MTAwWjCBlTELMAkGA1UEBhMCQ0gxQDA+BgNVBAoTN1NXSVRD
+SCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVyIExlaHJlIHVuZCBGb3JzY2h1
+bmcxGTAXBgNVBAMTEFNXSVRDSCBTZXJ2ZXIgQ0ExKTAnBgkqhkiG9w0BCQEWGnN3
+aXRjaC5zZXJ2ZXIuY2FAc3dpdGNoLmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA4KzBOgjiIeBcR+//lu6yiQxkVLnay+wZoQ5e9A+/kpMFH1V1CqY5
+8xr+A+TK68jiqjgAtJzj5vBcSLcPOzx0sJYvXhfg+1TnpsaP4RRscYMTkLOzRSVJ
+stScTLJIycumpcLmRX1w5cDaSvOKSqKidXEhi0CrIa2HtBrAId1UsIF4qfzlHIp1
+CuO9Jz1MALtwpN8KlF3GMi0MkT2cR8BZjpHpM80zUSd2Q8nAgzcvsdqMIpjb6tIj
+holUK/+7eCwcWWJWEWhdnc6yDTF1K75W6icuBbuswLT5A7I5sCiuKAF0Ils821po
+2xwCeZjxR1lzCPuWwx25OxgEk6VmYwPxYwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUTw0Q79mXN/2x+QHaM1WOLc3V
+ylkwHwYDVR0jBBgwFoAUJckH9RQs0CkF75X1QkPV6pCNc3MwDQYJKoZIhvcNAQEF
+BQADggEBADjbAn4/MOKGyVwGnzPi1P2qezN23ebuGmIZeXhwKlLLKsKz70/XGzgI
+M6R/po/t2DfThIQ2vfSaeA7RpELkdOfrPInGz+Y0zmx309ffifKdUx0hbyybltUK
+zRqFmIhAVXKIMcui7nVbNpnXX4ymH/t/Lk/+xl8J4OXCbUN+0O+kHrqzhv2UwK9U
+abJ0CzpvtJIowUC8qFrb5y0Rq4NgdBpQkcL7oUxqfgMSGxV9KiiWIFX9M+txqug5
+MS7E0CX7ZvDqJcbRURjUDCcI2UcBh0E8LPIYsmB+gisEBcvMkjzRFqdMbe833Nzm
+Df4e4+tSHXKNzAesYsHleWikHBGCpAM=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <!-- TC Trustcenter Class 2 CA -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDXDCCAsWgAwIBAgICA+owDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF
+MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU
+QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI
+MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAyIENBMSkwJwYJKoZIhvcN
+AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla
+Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy
+ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y
+IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1
+c3RDZW50ZXIgQ2xhc3MgMiBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA
+dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANo46O0y
+AClxgwENv4wB3NrGrTmkqYov1YtcaF9QxmL1Zr3KkSLsqh1R1z2zUbKDTl3LSbDw
+TFXlay3HhQswHJJOgtTKAu33b77c4OMUuAVT8pr0VotanoWT0bSCVq5Nu6hLVxa8
+/vhYnvgpjbB7zXjJT6yLZwzxnPv8V5tXXE8NAgMBAAGjazBpMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3
+LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G
+CSqGSIb3DQEBBAUAA4GBAIRS+yjf/x91AbwBvgRWl2p0QiQxg/lGsQaKic+WLDO/
+jLVfenKhhQbOhvgFjuj5Jcrag4wGrOs2bYWRNAQ29ELw+HkuCkhcq8xRT3h2oNms
+Gb0q0WkEKJHKNhAngFdb0lz1wlurZIFjdFH0l7/NEij3TWZ/p/AcASZ4smZHcFFk
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <!-- TC Trustcenter Class 3 CA -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDXDCCAsWgAwIBAgICA+swDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF
+MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU
+QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI
+MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAzIENBMSkwJwYJKoZIhvcN
+AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla
+Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy
+ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y
+IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1
+c3RDZW50ZXIgQ2xhc3MgMyBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA
+dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALa0wTUF
+Lg2N7KBAahwOJ6ZQkmtQGwfeLud2zODa/ISoXoxjaitN2U4CdhHBC/KNecoAtvGw
+Dtf7pBc9r6tpepYnv68zoZoqWarEtTcI8hKlMbZD9TKWcSgoq40oht+77uMMfTDW
+w1Krj10nnGvAo+cFa1dJRLNu6mTP0o56UHd3AgMBAAGjazBpMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3
+LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G
+CSqGSIb3DQEBBAUAA4GBABY9xs3Bu4VxhUafPiCPUSiZ7C1FIWMjWwS7TJC4iJIE
+Tb19AaM/9uzO8d7+feXhPrvGq14L3T2WxMup1Pkm5gZOngylerpuw3yCGdHHsbHD
+2w2Om0B8NwvxXej9H5CIpQ5ON2QhqE6NtJ/x3kit1VYYUimLRzQSCdS7kjXvD9s0
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <!-- Thawte Server CA -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <!-- Thawte Premium Server CA -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <!-- Verisign Class 3 CA -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- Versign Class 3 Public Primary CA -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+ </ds:X509Certificate>
+ </ds:X509Data>
+ <!-- VeriSign International Server CA - Class 3 -->
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDgzCCAuygAwIBAgIQJUuKhThCzONY+MXdriJupDANBgkqhkiG9w0BAQUFADBf
+MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT
+LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+HhcNOTcwNDE3MDAwMDAwWhcNMTExMDI0MjM1OTU5WjCBujEfMB0GA1UEChMWVmVy
+aVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UECxMOVmVyaVNpZ24sIEluYy4xMzAx
+BgNVBAsTKlZlcmlTaWduIEludGVybmF0aW9uYWwgU2VydmVyIENBIC0gQ2xhc3Mg
+MzFJMEcGA1UECxNAd3d3LnZlcmlzaWduLmNvbS9DUFMgSW5jb3JwLmJ5IFJlZi4g
+TElBQklMSVRZIExURC4oYyk5NyBWZXJpU2lnbjCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEA2IKA6NYZAn0fhRg5JaJlK+G/1AXTvOY2O6rwTGxbtueqPHNFVbLx
+veqXQu2aNAoV1Klc9UAl3dkHwTKydWzEyruj/lYncUOqY/UwPpMo5frxCTvzt01O
+OfdcSVq4wR3Tsor+cDCVQsv+K1GLWjw6+SJPkLICp1OcTzTnqwSye28CAwEAAaOB
+4zCB4DAPBgNVHRMECDAGAQH/AgEAMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL0NQUzA0BgNV
+HSUELTArBggrBgEFBQcDAQYIKwYBBQUHAwIGCWCGSAGG+EIEAQYKYIZIAYb4RQEI
+ATALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgEGMDEGA1UdHwQqMCgwJqAk
+oCKGIGh0dHA6Ly9jcmwudmVyaXNpZ24uY29tL3BjYTMuY3JsMA0GCSqGSIb3DQEB
+BQUAA4GBAAgB7ORolANC8XPxI6I63unx2sZUxCM+hurPajozq+qcBBQHNgYL+Yhv
+1RPuKSvD5HKNRO3RrCAJLeH24RkFOLA9D59/+J4C3IYChmFOJl9en5IeDCSk9dBw
+E88mw0M9SR2egi5SX7w+xmYpAY5Okiy8RnUDgqxz6dl+C2fvVFIa
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <!-- EPFL CA -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDbjCCAtegAwIBAgIBADANBgkqhkiG9w0BAQQFADCBhzELMAkGA1UEBhMCQ0gx
+DTALBgNVBAgTBFZhdWQxETAPBgNVBAcTCExhdXNhbm5lMQ0wCwYDVQQKEwRFUEZM
+MSUwIwYDVQQDExxFUEZMIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYJKoZI
+hvcNAQkBFhFjZXJ0LWF1dGhAZXBmbC5jaDAeFw0wMjAxMjMxMzU0NDJaFw0xMjAx
+MjExMzU0NDJaMIGHMQswCQYDVQQGEwJDSDENMAsGA1UECBMEVmF1ZDERMA8GA1UE
+BxMITGF1c2FubmUxDTALBgNVBAoTBEVQRkwxJTAjBgNVBAMTHEVQRkwgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkxIDAeBgkqhkiG9w0BCQEWEWNlcnQtYXV0aEBlcGZs
+LmNoMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl6ERqcEOFgnM/DJSuM8AP
+TwvKJB47u+S9wAbfkhESINc1G0orvRJxIztnHlhp245qzvhgMFukdnn/ZhGivNYb
+tu/N1fGInXIMxWb+1gVKtzpQH/QGX3Dva0Gkr/9iT7JL+nsqNV9Rz6byLMSoBMjM
+lyXC7W7LxjZqdQ1FSimG8QIDAQABo4HnMIHkMB0GA1UdDgQWBBQ7iVSOMlRaUJZC
+4vg8nLKpVeJq2jCBtAYDVR0jBIGsMIGpgBQ7iVSOMlRaUJZC4vg8nLKpVeJq2qGB
+jaSBijCBhzELMAkGA1UEBhMCQ0gxDTALBgNVBAgTBFZhdWQxETAPBgNVBAcTCExh
+dXNhbm5lMQ0wCwYDVQQKEwRFUEZMMSUwIwYDVQQDExxFUEZMIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFjZXJ0LWF1dGhAZXBmbC5jaIIB
+ADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAA+iL5occl7nlrcLDoLA
+5LoeE8i201WkkbUQJddz6UhPtbn5XB4b5p6zo+R93TevgKW01ILPanCkROf49PrR
+iGseMuGV55p4WHvyKGVl5Q4je6vL4lZlixqEgACPQepUI9Qdi4fogSCaZQyC7fIO
+Dul1iSdow7sghBcWrsZu8gVt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </shibmd:KeyAuthority>
+ </Extensions>
+
+
+
+ <!--
+ Identity Provider Definitions
+ -->
+
+ <!-- Université de Lausanne -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unil.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai1.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai1.unil.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai1.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai1.unil.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Université de Lausanne</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Université de Lausanne</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- EPFL Home Org -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:epfl.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shibb-idp.epfl.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.epfl.ch/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.epfl.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shibb-idp.epfl.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.epfl.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">EPFL Home Org</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">EPFL Home Org</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>AAI EPFL Team</SurName>
+ <EmailAddress>aai at epfl.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>AAI EPFL Team</SurName>
+ <EmailAddress>aai at epfl.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- ETHZ - ETH Zurich -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:ethz.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-login.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.ethz.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-login.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ethz.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">ETHZ - ETH Zurich</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">ETHZ - ETH Zurich</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Roland Dietlicher</SurName>
+ <EmailAddress>rdietlicher at ethz.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <SurName>Vladislav Nespor</SurName>
+ <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Vladislav Nespor</SurName>
+ <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Universität Zürich -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unizh.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizh.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unizh.ch:8443/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unizh.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizh.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unizh.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Universität Zürich</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Universität Zürich</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://idp.unizh.ch/aaierror</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Luzian Scherrer</SurName>
+ <EmailAddress>aaiadm at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>Luzian Scherrer</SurName>
+ <EmailAddress>aaiadm at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Luzian Scherrer</SurName>
+ <EmailAddress>aaiadm at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Université de Genève -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unige.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>auth.unige.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.unige.ch:8443/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.unige.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>auth.unige.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.unige.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Université de Genève</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Université de Genève</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://aai.unige.ch/error-origin.html</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Dominique Petitpierre</SurName>
+ <EmailAddress>Dominique.Petitpierre at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Dominique Petitpierre</SurName>
+ <EmailAddress>Dominique.Petitpierre at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>Help Desk for the University of Geneva</SurName>
+ <EmailAddress>helpdesk at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Universität Luzern -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unilu.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilu.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-login.unilu.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.unilu.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilu.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-login.unilu.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.unilu.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Universität Luzern</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Universität Luzern</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Marco Antonini</SurName>
+ <EmailAddress>marco.antonini at unilu.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>Marco Antonini</SurName>
+ <EmailAddress>marco.antonini at unilu.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Marco Antonini</SurName>
+ <EmailAddress>marco.antonini at unilu.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Virtual Home Organization @SWITCHaai -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:vho-switchaai.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vho-switchaai.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai.vho-switchaai.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.vho-switchaai.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vho-switchaai.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>kerinci.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kerinci.switch.ch/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Virtual Home Organization @SWITCHaai</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Virtual Home Organization @SWITCHaai</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.switch.ch/aai/help/</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="support">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="billing">
+ <SurName>Martin Sutter</SurName>
+ <EmailAddress>sutter at switch.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Ueli Kienholz</SurName>
+ <EmailAddress>kienholz at switch.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <SurName>Valery Tschopp</SurName>
+ <EmailAddress>tschopp at switch.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- SWITCH - The Swiss Education & Research Network -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:switch.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-logon.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-aa.switch.ch/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.switch.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-aa.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-aa.switch.ch/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SWITCH - The Swiss Education & Research Network</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">SWITCH - The Swiss Education & Research Network</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.switch.ch/aai/help/</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="billing">
+ <SurName>Martin Sutter</SurName>
+ <EmailAddress>sutter at switch.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Ueli Kienholz</SurName>
+ <EmailAddress>kienholz at switch.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Universität Bern -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unibe.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-homeorg.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-homeorg.unibe.ch:8443/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-homeorg.unibe.ch:443/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-homeorg.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-homeorg.unibe.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Universität Bern</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Universität Bern</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="support">
+ <SurName>Informatikdienste - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <SurName>Peter M. Geiser</SurName>
+ <EmailAddress>peter.geiser at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Zürcher Hochschule Winterthur -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:zhwin.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zhwin.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-logon.zhwin.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.zhwin.ch/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.zhwin.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zhwin.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-logon.zhwin.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.zhwin.ch/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Zürcher Hochschule Winterthur</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Zürcher Hochschule Winterthur</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Christoph Kägi</SurName>
+ <EmailAddress>kgc at zhwin.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>Christoph Kägi</SurName>
+ <EmailAddress>kgc at zhwin.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Peter Eggimann</SurName>
+ <EmailAddress>egp at zhwin.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Université de Neuchâtel -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unine.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unine.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-login.unine.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.unine.ch:8443/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.unine.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unine.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-login.unine.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.unine.ch:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Université de Neuchâtel</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Université de Neuchâtel</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Claude Wacker</SurName>
+ <EmailAddress>claude.wacker at unine.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>Hotline SITEL</SurName>
+ <EmailAddress>hotline.sitel at unine.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <SurName>Mathias Rufer</SurName>
+ <EmailAddress>mathias.rufer at unine.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Université de Fribourg - Universität Freiburg -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unifr.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>switchaai.unifr.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://switchaai.unifr.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai.unifr.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Université de Fribourg - Universität Freiburg</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Université de Fribourg - Universität Freiburg</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="support">
+ <SurName>Helpdesk Uni Fribourg</SurName>
+ <EmailAddress>helpdesk at unifr.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <SurName>Pierrot Héritier</SurName>
+ <EmailAddress>aai-support at unifr.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Pierrot Héritier</SurName>
+ <EmailAddress>aai-support at unifr.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+ <!-- Universität Basel -->
+
+ <EntityDescriptor entityID="urn:mace:switch.ch:SWITCHaai:unibas.ch">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-idp.unibas.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibas.ch/shibboleth-idp/Artifact" index="1"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-idp.unibas.ch/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-idp.unibas.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibas.ch/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Universität Basel</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Universität Basel</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en"/>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Arsène Gschwind</SurName>
+ <EmailAddress>arsene.gschwind at unibas.ch</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
+
+
+
+ <!-- Service Provider Definitions -->
+
+
+ <!-- ETH, ID, TIM Test Machine -->
+
+ <EntityDescriptor entityID="https://tim-test.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tim-test.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-test.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, VHO 1.3 Tools -->
+
+ <EntityDescriptor entityID="https://tools.vho-switchaai.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tools.vho-switchaai.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.vho-switchaai.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.vho-switchaai.ch/password/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>SWITCHaai</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>SWITCHaai</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Valery Tschopp</SurName>
+ <EmailAddress>tschopp at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, Attributes Viewer 1.3 -->
+
+ <EntityDescriptor entityID="https://kelut.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>kelut.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kelut.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>SWITCHaai</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>SWITCHaai</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Valery Tschopp</SurName>
+ <EmailAddress>tschopp at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- AAI Portal to WebCT Vista -->
+
+ <EntityDescriptor entityID="https://login.virtualcampus.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>login.virtualcampus.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.virtualcampus.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>Pauline McNamara</SurName>
+ <EmailAddress>pauline.mcnamara at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Pauline McNamara</SurName>
+ <EmailAddress>pauline.mcnamara at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Philippe Froidevaux</SurName>
+ <EmailAddress>philippe.froidevaux at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab12" -->
+
+ <EntityDescriptor entityID="https://gridlab12.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab12.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab12.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIZH, OLAT-LIVE -->
+
+ <EntityDescriptor entityID="https://www.olat.unizh.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.olat.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.olat.unizh.ch/olat/shib/samlaa" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>olat developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>olat developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>olat developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIGE, DINF, NTIC, test and debug -->
+
+ <EntityDescriptor entityID="https://rodn.unige.ch/shibboleth/target">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>rodn.unige.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rodn.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rodn.unige.ch:4443/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "woodstock" -->
+
+ <EntityDescriptor entityID="https://woodstock.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>woodstock.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodstock.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "cubert" -->
+
+ <EntityDescriptor entityID="https://cubert.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>cubert.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cubert.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "aladin" -->
+
+ <EntityDescriptor entityID="https://aladin.cnds.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aladin.cnds.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aladin.cnds.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab01" -->
+
+ <EntityDescriptor entityID="https://gridlab01.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab01.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab01.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab02" -->
+
+ <EntityDescriptor entityID="https://gridlab02.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab01.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab02.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab03" -->
+
+ <EntityDescriptor entityID="https://gridlab03.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab03.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab03.unibe.ch/shibboleth-sp/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab04" -->
+
+ <EntityDescriptor entityID="https://gridlab04.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab04.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab04.unibe.ch/shibboleth-sp/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab05" -->
+
+ <EntityDescriptor entityID="https://gridlab05.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab05.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab05.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab06" -->
+
+ <EntityDescriptor entityID="https://gridlab06.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab06.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab06.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab07" -->
+
+ <EntityDescriptor entityID="https://gridlab07.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab07.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab07.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab08" -->
+
+ <EntityDescriptor entityID="https://gridlab08.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab08.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab08.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab09" -->
+
+ <EntityDescriptor entityID="https://gridlab09.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab09.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab09.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab 10" -->
+
+ <EntityDescriptor entityID="https://gridlab10.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab10.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab10.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab 11" -->
+
+ <EntityDescriptor entityID="https://gridlab11.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab11.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab11.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>info at vitels.ch</SurName>
+ <EmailAddress>info at vitels.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, eConf Portal -->
+
+ <EntityDescriptor entityID="https://panarea.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>econf.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://panarea.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://econf.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, ID, Sympa Maillisten -->
+
+ <EntityDescriptor entityID="https://sympa.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>sympa.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sympa.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>sympa-owner at sympa.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>sympa-request at sympa.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIGE, Dokeos test -->
+
+ <EntityDescriptor entityID="https://dokeostest.unige.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>dokeostest.unige.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dokeostest.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ganeshatest.unige.ch/in/Shibboleth.sso/showmyinfo/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIZH, OLAT Test Server 1 -->
+
+ <EntityDescriptor entityID="https://olattest.unizh.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>olattest.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olattest.unizh.ch/olat/shib/samlaa" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>OLAT Developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>OLAT Developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>OLAT Developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIZH, OLAT Nightly -->
+
+ <EntityDescriptor entityID="https://nightly.olat.unizh.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>nightly.olat.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nightly.olat.unizh.ch/nightly/shib/samlaa" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>OLAT Developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>OLAT Developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>OLAT Developers</SurName>
+ <EmailAddress>developers at olat.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, Test SP 1.3 (rita3) -->
+
+ <EntityDescriptor entityID="https://rita3.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>rita.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rita3.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://rita3.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, ID, Compicampus Subscriptions -->
+
+ <EntityDescriptor entityID="https://tim-1.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tim-1.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-1.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Wanda Lehrer</SurName>
+ <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Wanda Lehrer</SurName>
+ <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Dévelopement applications adimistratives -->
+
+ <EntityDescriptor entityID="https://bilbo.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>bilbo.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bilbo.unil.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://phpdev.unil.ch/Shibboleth.shire" index="2"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://siainterd.unil.ch/Shibboleth.shire" index="3"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://siaintrad.unil.ch/Shibboleth.shire" index="4"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>HENCHOZ Daniel</SurName>
+ <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>HENCHOZ Daniel</SurName>
+ <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>ROY Alexandre</SurName>
+ <EmailAddress>alexandre.roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, ID, Linkchecker for Zope/Silva WCMS sites -->
+
+ <EntityDescriptor entityID="https://tim-4.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tim-4.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-4.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, ID, Poor Man's Spammer -->
+
+ <EntityDescriptor entityID="https://tim-2.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tim-2.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-2.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>Doris Tomaschewski</SurName>
+ <EmailAddress>poormansspam at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UniZH WWW -->
+
+ <EntityDescriptor entityID="https://www.unizh.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unizh.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Luzian Scherrer</SurName>
+ <EmailAddress>luzian.scherrer at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Roberto Mazzoni</SurName>
+ <EmailAddress>roberto.mazzoni at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Webmaster</SurName>
+ <EmailAddress>webmaster at unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Internet administratif php furio -->
+
+ <EntityDescriptor entityID="https://furio.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>furio.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://furio.unil.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://furio.unil.ch/Shibboleth.shire" index="2"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://zendp.unil.ch/Shibboleth.shire" index="3"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applicationspub.unil.ch/Shibboleth.shire" index="4"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zendp.unil.ch/Shibboleth.shire" index="5"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>HENCHOZ Daniel</SurName>
+ <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>HENCHOZ Daniel</SurName>
+ <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>ROY Alexandre</SurName>
+ <EmailAddress>alexandre.roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, AAIportal HEAD -->
+
+ <EntityDescriptor entityID="https://test.aaiportal.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>test.aaiportal.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.aaiportal.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="administrative">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Valéry Tschopp</SurName>
+ <EmailAddress>tschopp at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Valéry Tschopp</SurName>
+ <EmailAddress>tschopp at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIGE - Dokeos -->
+
+ <EntityDescriptor entityID="https://dokeos.unige.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>dokeos.unige.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dokeos.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, ID, Compicampus -->
+
+ <EntityDescriptor entityID="https://tim-1.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tim-1.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-1.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Wanda Lehrer</SurName>
+ <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Wanda Lehrer</SurName>
+ <EmailAddress>compicampus at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, ID, VIP Software Distribution -->
+
+ <EntityDescriptor entityID="https://tim-3.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tim-3.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-3.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UniBE, Institut für Erziehungswissenschaft (IfE), ILIAS Plattform -->
+
+ <EntityDescriptor entityID="https://ilias.edu.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>ilias.edu.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilias.edu.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Marcel Raimann</SurName>
+ <EmailAddress>marcel.raimann at edu.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Marcel Raimann</SurName>
+ <EmailAddress>marcel.raimann at edu.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Marcel Raimann</SurName>
+ <EmailAddress>marcel.raimann at edu.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Martin Studer</SurName>
+ <EmailAddress>martin.studer at sis.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, CustomX -->
+
+ <EntityDescriptor entityID="https://parnass.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>parnass.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://parnass.switch.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Ses</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Ses</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Ses</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, CustomX-Test -->
+
+ <EntityDescriptor entityID="https://titlis.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>titlis.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://titlis.switch.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Ses</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Ses</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Ses</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- DOIT, Dermatology eLearning -->
+
+ <EntityDescriptor entityID="https://aai.cyberderm.net/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai.cyberderm.net</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/resources/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Patrick Husi</SurName>
+ <EmailAddress>patrick.husi at arpage.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Vahid Djamei</SurName>
+ <EmailAddress>vahid.djamei at usz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Vahid Djamei</SurName>
+ <EmailAddress>vahid.djamei at usz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ZHWIN, elearning Moodle Platform -->
+
+ <EntityDescriptor entityID="https://elearning.zhwin.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>elearning.zhwin.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://elearning.zhwin.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elearning.zhwin.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Daniel Frei</SurName>
+ <EmailAddress>frn at zhwin.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Martin Voegeli</SurName>
+ <EmailAddress>vom at zhwin.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Martin Voegeli</SurName>
+ <EmailAddress>vom at zhwin.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Projekt-Portal (SQUEAK) -->
+
+ <EntityDescriptor entityID="https://squeak.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>squeak.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://squeak.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Patick Chénais</SurName>
+ <EmailAddress>patrick.chenais at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Patick Chénais</SurName>
+ <EmailAddress>patrick.chenais at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Patick Chénais</SurName>
+ <EmailAddress>patrick.chenais at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, NET, ILIAS Testserver -->
+
+ <EntityDescriptor entityID="https://ilias-test.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>ilias-test.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilias-test.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, NET, ViewCVS -->
+
+ <EntityDescriptor entityID="https://bonifaz.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>bonifaz.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bonifaz.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, eConf Test Portal -->
+
+ <EntityDescriptor entityID="http://call-deb5.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>econf.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://call-deb5.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Swiss Bio Grid Certificate Authority -->
+
+ <EntityDescriptor entityID="https://sbgca.unizh.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>sbgca.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbgca.unizh.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>SBG CA Administrator</SurName>
+ <EmailAddress>sbgca at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>SBG CA Administrator</SurName>
+ <EmailAddress>sbgca at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>SBG CA Administrator</SurName>
+ <EmailAddress>sbgca at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH Network Statistics -->
+
+ <EntityDescriptor entityID="https://ezmp1.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>ezmp1.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezmp1.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://ezmp1.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIGE - ShowMyInfo, Attributes Viewer -->
+
+ <EntityDescriptor entityID="https://showmyinfo.unige.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>dokeos.unige.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://showmyinfo.unige.ch:4443/in/Shibboleth.sso/showmyinfo/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, ID, AAI-Portal -->
+
+ <EntityDescriptor entityID="https://aai-portal.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-login.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-portal.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Vladislav Nespor</SurName>
+ <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Vladislav Nespor</SurName>
+ <EmailAddress>vladislav.nespor at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH AAI Wiki: waaikiki -->
+
+ <EntityDescriptor entityID="https://aai-wiki.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tools.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-wiki.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Ueli Kienholz</SurName>
+ <EmailAddress>kienholz at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH Tools -->
+
+ <EntityDescriptor entityID="https://tools.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tools.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Ueli Kienholz</SurName>
+ <EmailAddress>kienholz at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- NFSEN-Tool -->
+
+ <EntityDescriptor entityID="https://id-nfsen.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>id-nfsen.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id-nfsen.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Informatikdienste - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Informatikdienste - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Informatikdienste - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, NET, ILIAS Server -->
+
+ <EntityDescriptor entityID="https://ilias.net.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>ilias.net.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilias.net.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, Play Streaming Service -->
+
+ <EntityDescriptor entityID="https://play.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>play.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- e-Learning Module for VITELS (Firewall Configuration) -->
+
+ <EntityDescriptor entityID="https://diufpc200.unifr.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>diufpc200.unifr.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://diufpc200.unifr.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Aurelius Robert BAIER</SurName>
+ <EmailAddress>aurelius.baier at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Aurelius Robert BAIER</SurName>
+ <EmailAddress>aurelius.baier at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Aurelius Robert BAIER</SurName>
+ <EmailAddress>aurelius.baier at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, AAI Resource Registry -->
+
+ <EntityDescriptor entityID="https://aai-rr.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tools.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-rr.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>AAI Team</SurName>
+ <EmailAddress>aai at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Lukas Haemmerle</SurName>
+ <EmailAddress>haemmerle at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Thomas Lenggenhager</SurName>
+ <EmailAddress>lenggenhager at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH Network Statistics -->
+
+ <EntityDescriptor entityID="https://flow.net.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>flow.net.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://flow.net.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://flow.net.switch.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ADLearn validation server -->
+
+ <EntityDescriptor entityID="https://valid.alzheimerlearn.net/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>valid.bio-med.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://valid.alzheimerlearn.net/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Pascal Py</SurName>
+ <EmailAddress>pascal.py at bli.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Yan Corneille</SurName>
+ <EmailAddress>yan.corneille at bli.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Yan Corneille</SurName>
+ <EmailAddress>yan.corneille at bli.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ScienceDirect -->
+
+ <EntityDescriptor entityID="https://sdauth.sciencedirect.com/">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>sciencedirect.partner-switchaai.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth-cert3.sciencedirect.com/SHIRE" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Chris Shillum</SurName>
+ <EmailAddress>c.shillum at elsevier.com</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Tony Gast</SurName>
+ <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Tony Gast</SurName>
+ <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCHvconf -->
+
+ <EntityDescriptor entityID="https://vconf.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>vconf.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vconf.switch.ch/aai/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Fabio Vena</SurName>
+ <EmailAddress>vena at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Olivier Jeger</SurName>
+ <EmailAddress>jeger at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Paola Wieting</SurName>
+ <EmailAddress>wieting at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH, SMAP / SWITCH Mitarbeiterportal -->
+
+ <EntityDescriptor entityID="https://smap.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>smap.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://smap.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Andreas Hebeisen</SurName>
+ <EmailAddress>hebeisen at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Andreas Hebeisen</SurName>
+ <EmailAddress>hebeisen at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Andreas Hebeisen</SurName>
+ <EmailAddress>hebeisen at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab13" -->
+
+ <EntityDescriptor entityID="https://gridlab13.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab13.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab13.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab14" -->
+
+ <EntityDescriptor entityID="https://gridlab14.unibe.ch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab14.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab14.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab15" -->
+
+ <EntityDescriptor entityID="https://gridlab15.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab15.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab15.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab16" -->
+
+ <EntityDescriptor entityID="https://gridlab16.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab16.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab16.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab17" -->
+
+ <EntityDescriptor entityID="https://gridlab17.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab17.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab17.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab18" -->
+
+ <EntityDescriptor entityID="https://gridlab18.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab18.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab18.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab19" -->
+
+ <EntityDescriptor entityID="https://gridlab19.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab19.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab19.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- VITELS, EuQoS, OS Laboratory Host "gridlab20" -->
+
+ <EntityDescriptor entityID="https://gridlab20.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>gridlab20.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gridlab20.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>vitels at iam.unibe.ch</SurName>
+ <EmailAddress>vitels at iam.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- AAIproxy ETHZ -->
+
+ <EntityDescriptor entityID="https://aaiproxy-consortium.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aaiproxy-consortium.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aaiproxy-consortium.ethz.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Wolfgang Lierz</SurName>
+ <EmailAddress>wolfgang.lierz at library.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Wolfgang Lierz</SurName>
+ <EmailAddress>wolfgang.lierz at library.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Wolfgang Lierz</SurName>
+ <EmailAddress>wolfgang.lierz at library.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SWITCH Network Web Server -->
+
+ <EntityDescriptor entityID="https://www.net.switch.ch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.net.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.net.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>NOC</SurName>
+ <EmailAddress>noc at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SIP User Management -->
+
+ <EntityDescriptor entityID="https://sip.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>sip.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sip.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>Bernhard Höneisen</SurName>
+ <EmailAddress>hoeneisen at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Bernhard Höneisen</SurName>
+ <EmailAddress>hoeneisen at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Lukas Haemmerle</SurName>
+ <EmailAddress>haemmerle at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Test SP rita4 -->
+
+ <EntityDescriptor entityID="https://rita4.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>rita4.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rita4.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://rita4.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Alexandre Roy</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Service WWW statique -->
+
+ <EntityDescriptor entityID="https://rhea.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>rhea.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rhea.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://rhea.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www2.unil.ch/Shibboleth.sso/SAML/POST" index="3"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www3.unil.ch/Shibboleth.sso/SAML/POST" index="4"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://wwwbscw.unil.ch/Shibboleth.sso/SAML/POST" index="5"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://wwwpeople.unil.ch/Shibboleth.sso/SAML/POST" index="6"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rhea.unil.ch:8001/Shibboleth.sso/SAML/POST" index="7"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.unil.ch/Shibboleth.sso/SAML/POST" index="8"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.unil.ch/Shibboleth.sso/SAML/POST" index="9"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwbscw.unil.ch/Shibboleth.sso/SAML/POST" index="10"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwpeople.unil.ch/Shibboleth.sso/SAML/POST" index="11"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Isabelle Moullet</SurName>
+ <EmailAddress>isabelle.moullet at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Isabelle Moullet</SurName>
+ <EmailAddress>isabelle.moullet at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Isabelle Moullet</SurName>
+ <EmailAddress>isabelle.moullet at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- HEC hecho test -->
+
+ <EntityDescriptor entityID="https://hecho.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>hecho.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hecho.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://hecho.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Antoine Christen</SurName>
+ <EmailAddress>antoine.christen at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Antoine Christen</SurName>
+ <EmailAddress>antoine.christen at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Antoine Christen</SurName>
+ <EmailAddress>antoine.christen at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- EuQoS Laboratory Host -->
+
+ <EntityDescriptor entityID="https://wp2.tele.pw.edu.pl/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>wp2.tele.pw.edu.pl</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wp2.tele.pw.edu.pl/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Andrzej Beben</SurName>
+ <EmailAddress>abeben at tele.pw.edu.pl</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Andrzej Beben</SurName>
+ <EmailAddress>abeben at tele.pw.edu.pl</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Andrzej Beben</SurName>
+ <EmailAddress>abeben at tele.pw.edu.pl</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- AAI-Portal UniBE -->
+
+ <EntityDescriptor entityID="https://aai-portal.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-portal.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-portal.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>Informatikdienste - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Informatikdienste - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Peter M. Geiser</SurName>
+ <EmailAddress>peter.geiser at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- IDSECWEB / secure webserver -->
+
+ <EntityDescriptor entityID="https://idsecweb.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idsecweb.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idsecweb.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Computer Service Department - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Computer Service Department - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Computer Service Department - Security</SurName>
+ <EmailAddress>security at unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, NET, Test Application Form BSCW Pro -->
+
+ <EntityDescriptor entityID="https://bonifaz.ethz.ch/bscwproform/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>bonifaz.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bonifaz.ethz.ch/bscwproform/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- SIP User Management (test) -->
+
+ <EntityDescriptor entityID="https://wil.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>wil.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wil.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>Bernhard Höneisen</SurName>
+ <EmailAddress>hoeneisen at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Bernhard Höneisen</SurName>
+ <EmailAddress>hoeneisen at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Lukas Haemmerle</SurName>
+ <EmailAddress>haemmerle at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- BigBrother maintance page -->
+
+ <EntityDescriptor entityID="https://shasta.switch.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shasta.switch.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bb.switch.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Maria von Kaenel</SurName>
+ <EmailAddress>maria.von.kaenel at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>SES</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>SES</SurName>
+ <EmailAddress>ses at switch.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, NET, DokuWiki -->
+
+ <EntityDescriptor entityID="https://bonifaz.ethz.ch/dokuwiki/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>bonifaz.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bonifaz.ethz.ch/dokuwiki/Shibboleth.shire" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- EVA - Einfache virtuelle Ablage(Demo Version) -->
+
+ <EntityDescriptor entityID="https://eva-demo.unibas.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>eva-demo.unibas.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eva-demo.unibas.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIZH, OLAT on idlnxgs -->
+
+ <EntityDescriptor entityID="https://idlnxgs.unizh.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idlnxgs.unizh.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idlnxgs.unizh.ch:8443/olat/shib/samlaa" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Guido Schnider
+</SurName>
+ <EmailAddress>guido at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Guido Schnider</SurName>
+ <EmailAddress>guido at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Guido Schnider</SurName>
+ <EmailAddress>guido at id.unizh.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Production applications adimistratives -->
+
+ <EntityDescriptor entityID="https://falco.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>falco.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://falco.unil.ch/Shibboleth.shire" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.unil.ch/Shibboleth.shire" index="2"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applicationsinter.unil.ch/Shibboleth.shire" index="3"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applicationsz.unil.ch/Shibboleth.shire" index="4"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>HENCHOZ Daniel</SurName>
+ <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>HENCHOZ Daniel</SurName>
+ <EmailAddress>daniel.henchoz at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>ROY Alexandre</SurName>
+ <EmailAddress>Alexandre.Roy at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Claude's SP -->
+
+ <EntityDescriptor entityID="https://slpc1.epfl.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>slpc1.epfl.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slpc1.epfl.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Claude Lecommandeur</SurName>
+ <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Claude Lecommandeur</SurName>
+ <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Claude Lecommandeur</SurName>
+ <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Tequila -->
+
+ <EntityDescriptor entityID="https://tequila.epfl.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>guests.epfl.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tequila.epfl.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Claude Lecommandeur</SurName>
+ <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Claude Lecommandeur</SurName>
+ <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Claude Lecommandeur</SurName>
+ <EmailAddress>Claude.Lecommandeur at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- EPFL ess-aai -->
+
+ <EntityDescriptor entityID="https://ess-aai.epfl.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>ess-aai.epfl.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ess-aai.epfl.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Richard Timsit</SurName>
+ <EmailAddress>Richard.Timsit at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Richard Timsit</SurName>
+ <EmailAddress>Richard.Timsit at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Richard Timsit</SurName>
+ <EmailAddress>Richard.Timsit at epfl.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Test AAI Portal to WebCT Vista -->
+
+ <EntityDescriptor entityID="https://diuflx75.unifr.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>login.virtualcampus.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://diuflx75.unifr.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Pauline McNamara</SurName>
+ <EmailAddress>pauline.mcnamara at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>Philippe Froidevaux</SurName>
+ <EmailAddress>philippe.froidevaux at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Philippe Froidevaux</SurName>
+ <EmailAddress>philippe.froidevaux at unifr.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- services web HEC Lausanne -->
+
+ <EntityDescriptor entityID="https://www.hec.unil.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.hec.unil.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hec.unil.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www.hec.unil.ch/Shibboleth.sso/SAML/POST" index="2"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Antoine Christen</SurName>
+ <EmailAddress>antoine.christen at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Antoine Christen</SurName>
+ <EmailAddress>antoine.christen at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Antoine Christen</SurName>
+ <EmailAddress>antoine.christen at unil.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- EVA - Einfache virtuelle Ablage (Uni Basel) -->
+
+ <EntityDescriptor entityID="https://eva.unibas.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>eva.unibas.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eva.unibas.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- EVA - Einfache virtuelle Ablage (ELBA-ETHZ) -->
+
+ <EntityDescriptor entityID="https://eva-elba.unibas.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>eva-elba.unibas.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eva-elba.unibas.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="support">
+ <SurName>ELBA (ETHZ)</SurName>
+ <EmailAddress>elba at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="technical">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>URZ-LTN</SurName>
+ <EmailAddress>nikt at unibas.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- UNIGE, Dokeos dev -->
+
+ <EntityDescriptor entityID="https://dokeosdev.unige.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>dokeosdev.unige.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dokeosdev.unige.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Nicolas Rod</SurName>
+ <EmailAddress>Nicolas.Rod at adm.unige.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- AAI-Logon UniBE (WebCT6) -->
+
+ <EntityDescriptor entityID="https://aai-logon.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>aai-logon.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-logon.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Christoph Glanzmann</SurName>
+ <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Christoph Glanzmann</SurName>
+ <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Christoph Glanzmann</SurName>
+ <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- elearning2 -->
+
+ <EntityDescriptor entityID="https://elearning2.zhwin.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>elearning2.zhwin.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elearning2.zhwin.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Christoph Kaegi</SurName>
+ <EmailAddress>kgc at zhwin.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Martin Voegeli</SurName>
+ <EmailAddress>vom at zhwin.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Martin Voegeli</SurName>
+ <EmailAddress>vom at zhwin.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Entwicklungs-System tim-5 -->
+
+ <EntityDescriptor entityID="https://tim-5.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>tim-5.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tim-5.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Thedi Gerber</SurName>
+ <EmailAddress>gerber at id.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- Document Folder -->
+
+ <EntityDescriptor entityID="https://naxos.unibe.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>naxos.unibe.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naxos.unibe.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Christoph Glanzmann</SurName>
+ <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Christoph Glanzmann</SurName>
+ <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Christoph Glanzmann</SurName>
+ <EmailAddress>christoph.glanzmann at id.unibe.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- University of Pisa, EuQoS, Traffic Engineering Laboratory -->
+
+ <EntityDescriptor entityID="https://euqos-wp6.iet.unipi.it/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>euqos-wp6.iet.unipi.it</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://euqos-wp6.iet.unipi.it/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Enzo Mingozzi</SurName>
+ <EmailAddress>e.mingozzi at iet.unipi.it</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Enzo Mingozzi</SurName>
+ <EmailAddress>e.mingozzi at iet.unipi.it</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Luca Luigetti</SurName>
+ <EmailAddress>luigetti at cng1.iet.unipi.it</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+ <!-- ETHZ, NET, Moodle Server -->
+
+ <EntityDescriptor entityID="https://moodle.net.ethz.ch/shibboleth">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>moodle.net.ethz.ch</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.net.ethz.ch/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+
+ </SPSSODescriptor>
+
+ <ContactPerson contactType="technical">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="support">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ <ContactPerson contactType="administrative">
+ <SurName>Beat Müller</SurName>
+ <EmailAddress>mueller at net.ethz.ch</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
+
+</EntitiesDescriptor>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/nameIDFormat.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/nameIDFormat.xml
index bb986de..4f0046d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/nameIDFormat.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/nameIDFormat.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- failFastInitialization="false" requireValidMetadata="false"
-
- id="nameIDFormat" xsi:type="metadata:InlineMetadataProvider">
- <metadata:MetadataFilter xsi:type="metadata:NameIDFormat">
- <metadata:Format>foo</metadata:Format>
- <metadata:Entity>https://sp.example.org/sp/shibboleth</metadata:Entity>
- <metadata:Format>bar</metadata:Format>
- <metadata:Entity>https://sp2.example.org/sp/shibboleth</metadata:Entity>
- </metadata:MetadataFilter>
-
- <EntitiesDescriptor Name="ukgroup">
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
-
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-
- <EntityDescriptor ID="uk001503"
- entityID="https://sp2.example.org/sp/shibboleth">
-
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp2.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
- </EntitiesDescriptor>
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ failFastInitialization="false" requireValidMetadata="false"
+
+ id="nameIDFormat" xsi:type="metadata:InlineMetadataProvider">
+ <metadata:MetadataFilter xsi:type="metadata:NameIDFormat">
+ <metadata:Format>foo</metadata:Format>
+ <metadata:Entity>https://sp.example.org/sp/shibboleth</metadata:Entity>
+ <metadata:Format>bar</metadata:Format>
+ <metadata:Entity>https://sp2.example.org/sp/shibboleth</metadata:Entity>
+ </metadata:MetadataFilter>
+
+ <EntitiesDescriptor Name="ukgroup">
+ <EntityDescriptor ID="uk001502"
+ entityID="https://sp.example.org/sp/shibboleth">
+
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+
+ <EntityDescriptor ID="uk001503"
+ entityID="https://sp2.example.org/sp/shibboleth">
+
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp2.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+ </EntitiesDescriptor>
+</metadata:MetadataProvider>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml
index 4b9c3ca..bc8e4e5 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine id="bean.pem" xsi:type="security:StaticExplicitKeySignature"
-xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
->
-<security:Credential
- id="IdPCredential" xsi:type="security:X509Inline">
- <security:Certificate>
-MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
-x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
-lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
-DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
-J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
-T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
-p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
-0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
-BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
-BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
-0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
-8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
-1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
-i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
- </security:Certificate>
-</security:Credential>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:TrustEngine id="bean.pem" xsi:type="security:StaticExplicitKeySignature"
+xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+>
+<security:Credential
+ id="IdPCredential" xsi:type="security:X509Inline">
+ <security:Certificate>
+MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
+x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
+lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
+DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
+J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
+T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
+p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
+0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
+BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
+0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
+8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
+1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
+i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
+ </security:Certificate>
+</security:Credential>
</security:TrustEngine>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntil.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntil.xml
index 66c2bec..05d362b 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntil.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntil.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- failFastInitialization="false" requireValidMetadata="false"
-
- id="requiredValidUntil" xsi:type="metadata:InlineMetadataProvider">
- <metadata:MetadataFilter xsi:type="metadata:RequiredValidUntil"/>
-
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
-
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ failFastInitialization="false" requireValidMetadata="false"
+
+ id="requiredValidUntil" xsi:type="metadata:InlineMetadataProvider">
+ <metadata:MetadataFilter xsi:type="metadata:RequiredValidUntil"/>
+
+ <EntityDescriptor ID="uk001502"
+ entityID="https://sp.example.org/sp/shibboleth">
+
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntilParamNonDuration.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntilParamNonDuration.xml
index 3b1b730..e123049 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntilParamNonDuration.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntilParamNonDuration.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- failFastInitialization="false" requireValidMetadata="false"
-
- id="requiredValidUntil" xsi:type="metadata:InlineMetadataProvider">
- <metadata:MetadataFilter xsi:type="metadata:RequiredValidUntil" maxValidityInterval="2"/>
-
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
-
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ failFastInitialization="false" requireValidMetadata="false"
+
+ id="requiredValidUntil" xsi:type="metadata:InlineMetadataProvider">
+ <metadata:MetadataFilter xsi:type="metadata:RequiredValidUntil" maxValidityInterval="2"/>
+
+ <EntityDescriptor ID="uk001502"
+ entityID="https://sp.example.org/sp/shibboleth">
+
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml
index 3869561..848534a 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- requireValidMetadata="false" failFastInitialization="false"
- id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
-
- <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" certificateFile="%{DIR}/filter/switch.pem"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ requireValidMetadata="false" failFastInitialization="false"
+ id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
+
+ <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" certificateFile="%{DIR}/filter/switch.pem"/>
+
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
index 0fffb5f..c3b9e16 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- requireValidMetadata="false" failFastInitialization="false"
- id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
-
- <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" >
- <metadata:PublicKey>
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCybIFg1nyYpi613JBKHO46CdXE
-M/VQFkT7ntLY5FmDWqLgkTE4kQ+e+Ie6HocRqOWOEAwYfGvrnqloOl9eSYar9huT
-fGZfLYVOcUamMWllRXp1j+gnzau97bsL81VzBnDadhGXkLloIKDH9CVawFPD733v
-bXjX7AEMft1eUn5QaQIDAQAB
- </metadata:PublicKey>
- </metadata:MetadataFilter>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ requireValidMetadata="false" failFastInitialization="false"
+ id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
+
+ <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" >
+ <metadata:PublicKey>
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCybIFg1nyYpi613JBKHO46CdXE
+M/VQFkT7ntLY5FmDWqLgkTE4kQ+e+Ie6HocRqOWOEAwYfGvrnqloOl9eSYar9huT
+fGZfLYVOcUamMWllRXp1j+gnzau97bsL81VzBnDadhGXkLloIKDH9CVawFPD733v
+bXjX7AEMft1eUn5QaQIDAQAB
+ </metadata:PublicKey>
+ </metadata:MetadataFilter>
+
+
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
index 63601bb..6e4eee6 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:security="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- requireValidMetadata="false" failFastInitialization="false" id="signed"
- xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
-
- <security:TrustEngine id="MyTrustEngine" xsi:type="security:StaticExplicitKeySignature">
- <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
- <security:Certificate>%{DIR}/filter/switch.pem</security:Certificate>
- </security:Credential>
- </security:TrustEngine>
-
- <metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
- trustEngineRef="MyTrustEngine" />
-
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:security="urn:mace:shibboleth:2.0:security"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ requireValidMetadata="false" failFastInitialization="false" id="signed"
+ xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
+
+ <security:TrustEngine id="MyTrustEngine" xsi:type="security:StaticExplicitKeySignature">
+ <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
+ <security:Certificate>%{DIR}/filter/switch.pem</security:Certificate>
+ </security:Credential>
+ </security:TrustEngine>
+
+ <metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
+ trustEngineRef="MyTrustEngine" />
+
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata.xml
index c248985..d37c608 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- requireValidMetadata="false" failFastInitialization="false"
- id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
-
- <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" trustEngineRef="bean.pem"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ requireValidMetadata="false" failFastInitialization="false"
+ id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
+
+ <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" trustEngineRef="bean.pem"/>
+
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml
index 37c2d0d..5b1b5da 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine id="bean.pem" xsi:type="security:StaticExplicitKeySignature"
-xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
->
-<security:Credential
- id="IdPCredential" xsi:type="security:X509Inline">
- <security:Certificate>
-MIICrzCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwgZ8xCzAJBgNVBAYTAkNIMUAwPgYDVQQKEzdTV0lU
-Q0ggLSBUZWxlaW5mb3JtYXRpa2RpZW5zdGUgZnVlciBMZWhyZSB1bmQgRm9yc2NodW5nMQwwCgYD
-VQQLEwNBQUkxIjAgBgNVBAMTGVNXSVRDSGFhaSBNZXRhZGF0YSBTaWduZXIxHDAaBgkqhkiG9w0B
-CQEWDWFhaUBzd2l0Y2guY2gwHhcNMDUwODAzMTEyMjUxWhcNMTUwODAxMTEyMjUxWjCBnzELMAkG
-A1UEBhMCQ0gxQDA+BgNVBAoTN1NXSVRDSCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVyIExl
-aHJlIHVuZCBGb3JzY2h1bmcxDDAKBgNVBAsTA0FBSTEiMCAGA1UEAxMZU1dJVENIYWFpIE1ldGFk
-YXRhIFNpZ25lcjEcMBoGCSqGSIb3DQEJARYNYWFpQHN3aXRjaC5jaDCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAsmyBYNZ8mKYutdyQShzuOgnVxDP1UBZE+57S2ORZg1qi4JExOJEPnviHuh6H
-EajljhAMGHxr656paDpfXkmGq/Ybk3xmXy2FTnFGpjFpZUV6dY/oJ82rve27C/NVcwZw2nYRl5C5
-aCCgx/QlWsBTw+9972141+wBDH7dXlJ+UGkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQCcLuNwTINk
-fhBlVCIuTixR1R6mYu/+4KUJWtHlRCOUZhSLFept8HxEvfwnuX9xm+Q6Ju/sOgmI1INuSstUGWwV
-y0AbpCphUDDmIh9A85ye8DrVaBHQrj5b/JEjCvkY0zhLJzgDzZ6btT40TuCnk2GpdAClu5SyCTiy
-56+zDYqPqg==
- </security:Certificate>
-</security:Credential>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:TrustEngine id="bean.pem" xsi:type="security:StaticExplicitKeySignature"
+xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+>
+<security:Credential
+ id="IdPCredential" xsi:type="security:X509Inline">
+ <security:Certificate>
+MIICrzCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwgZ8xCzAJBgNVBAYTAkNIMUAwPgYDVQQKEzdTV0lU
+Q0ggLSBUZWxlaW5mb3JtYXRpa2RpZW5zdGUgZnVlciBMZWhyZSB1bmQgRm9yc2NodW5nMQwwCgYD
+VQQLEwNBQUkxIjAgBgNVBAMTGVNXSVRDSGFhaSBNZXRhZGF0YSBTaWduZXIxHDAaBgkqhkiG9w0B
+CQEWDWFhaUBzd2l0Y2guY2gwHhcNMDUwODAzMTEyMjUxWhcNMTUwODAxMTEyMjUxWjCBnzELMAkG
+A1UEBhMCQ0gxQDA+BgNVBAoTN1NXSVRDSCAtIFRlbGVpbmZvcm1hdGlrZGllbnN0ZSBmdWVyIExl
+aHJlIHVuZCBGb3JzY2h1bmcxDDAKBgNVBAsTA0FBSTEiMCAGA1UEAxMZU1dJVENIYWFpIE1ldGFk
+YXRhIFNpZ25lcjEcMBoGCSqGSIb3DQEJARYNYWFpQHN3aXRjaC5jaDCBnzANBgkqhkiG9w0BAQEF
+AAOBjQAwgYkCgYEAsmyBYNZ8mKYutdyQShzuOgnVxDP1UBZE+57S2ORZg1qi4JExOJEPnviHuh6H
+EajljhAMGHxr656paDpfXkmGq/Ybk3xmXy2FTnFGpjFpZUV6dY/oJ82rve27C/NVcwZw2nYRl5C5
+aCCgx/QlWsBTw+9972141+wBDH7dXlJ+UGkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQCcLuNwTINk
+fhBlVCIuTixR1R6mYu/+4KUJWtHlRCOUZhSLFept8HxEvfwnuX9xm+Q6Ju/sOgmI1INuSstUGWwV
+y0AbpCphUDDmIh9A85ye8DrVaBHQrj5b/JEjCvkY0zhLJzgDzZ6btT40TuCnk2GpdAClu5SyCTiy
+56+zDYqPqg==
+ </security:Certificate>
+</security:Credential>
</security:TrustEngine>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/httpClient.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/httpClient.xml
index 0095930..c6d1e66 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/httpClient.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/httpClient.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="clientBuilder" class="net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder"
- p:userAgent="disguised/1.0.0 hidden/3.4.5" />
-
- <bean id="apacheClient"
- factory-bean="clientBuilder"
- factory-method="buildClient"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <bean id="clientBuilder" class="net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder"
+ p:userAgent="disguised/1.0.0 hidden/3.4.5" />
+
+ <bean id="apacheClient"
+ factory-bean="clientBuilder"
+ factory-method="buildClient"/>
+
</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineChain.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineChain.xml
index 1a12767..e015fe7 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineChain.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineChain.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="chaining" xsi:type="metadata:ChainingMetadataProvider" sortKey="1">
-
- <metadata:MetadataProvider id="c0" xsi:type="metadata:InlineMetadataProvider">
- <EntityDescriptor ID="c0ent"
- entityID="https://idp.example.org/idp2/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idpc0/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
- </metadata:MetadataProvider>
- <metadata:MetadataProvider id="c1" xsi:type="metadata:InlineMetadataProvider">
- <EntityDescriptor ID="c1ENT"
- entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idpc1/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
- </metadata:MetadataProvider>
-
- <metadata:MetadataProvider id="c2" xsi:type="metadata:InlineMetadataProvider">
- <EntityDescriptor ID="c2ent"
- entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idpc2/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
- </metadata:MetadataProvider>
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="chaining" xsi:type="metadata:ChainingMetadataProvider" sortKey="1">
+
+ <metadata:MetadataProvider id="c0" xsi:type="metadata:InlineMetadataProvider">
+ <EntityDescriptor ID="c0ent"
+ entityID="https://idp.example.org/idp2/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idpc0/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+ </metadata:MetadataProvider>
+ <metadata:MetadataProvider id="c1" xsi:type="metadata:InlineMetadataProvider">
+ <EntityDescriptor ID="c1ENT"
+ entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idpc1/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+ </metadata:MetadataProvider>
+
+ <metadata:MetadataProvider id="c2" xsi:type="metadata:InlineMetadataProvider">
+ <EntityDescriptor ID="c2ent"
+ entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idpc2/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+ </metadata:MetadataProvider>
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities.xml
index 06b1d19..9c8420f 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
-failFastInitialization="false" requireValidMetadata="false"
-
- id="inLineEntities" xsi:type="metadata:InlineMetadataProvider">
- <samlmd:EntitiesDescriptor>
-
- <samlmd:EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
-
- <samlmd:SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <samlmd:AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </samlmd:SPSSODescriptor>
- </samlmd:EntityDescriptor>
- </samlmd:EntitiesDescriptor>
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+failFastInitialization="false" requireValidMetadata="false"
+
+ id="inLineEntities" xsi:type="metadata:InlineMetadataProvider">
+ <samlmd:EntitiesDescriptor>
+
+ <samlmd:EntityDescriptor ID="uk001502"
+ entityID="https://sp.example.org/sp/shibboleth">
+
+ <samlmd:SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <samlmd:AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </samlmd:SPSSODescriptor>
+ </samlmd:EntityDescriptor>
+ </samlmd:EntitiesDescriptor>
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities2.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities2.xml
index 47d1049..b7d9a26 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities2.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities2.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="inLineEntity2" xsi:type="metadata:InlineMetadataProvider" sortKey="3">
-
- <EntitiesDescriptor>
- <EntityDescriptor ID="ies1"
- entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idpies2/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
-
- <EntityDescriptor ID="ies2"
- entityID="https://idp.example.org/idp2/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idpies2/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
- </EntitiesDescriptor>
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="inLineEntity2" xsi:type="metadata:InlineMetadataProvider" sortKey="3">
+
+ <EntitiesDescriptor>
+ <EntityDescriptor ID="ies1"
+ entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idpies2/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+
+ <EntityDescriptor ID="ies2"
+ entityID="https://idp.example.org/idp2/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idpies2/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+ </EntitiesDescriptor>
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity.xml
index fd9125c..15b3a06 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="inLineEntity" xsi:type="metadata:InlineMetadataProvider" sortKey="1">
-
- <EntityDescriptor ID="ie1"
- entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idpie1/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
- </EntityDescriptor>
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="inLineEntity" xsi:type="metadata:InlineMetadataProvider" sortKey="1">
+
+ <EntityDescriptor ID="ie1"
+ entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idpie1/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntities.xml
index a4842a9..5615789 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntities.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="resourceClasspathEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
-
- <metadata:MetadataResource xsi:type="resource:ClasspathResource" file="/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="resourceClasspathEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+ <metadata:MetadataResource xsi:type="resource:ClasspathResource" file="/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntity.xml
index 01b5579..5479312 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceClasspathEntity.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="resourceClasspathEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
-
- <metadata:MetadataResource xsi:type="resource:ClasspathResource" file="/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="resourceClasspathEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+ <metadata:MetadataResource xsi:type="resource:ClasspathResource" file="/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntities.xml
index 95fcfe7..2a979d2 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntities.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
- id="resourceFileBackedHTTPEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
-
-
- <metadata:MetadataResource xsi:type="resource:FileBackedHttpResource"
- file="%{DIR}/spoolResourceEntities.xml"
-
- url="%{metadataURL}"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
+ id="resourceFileBackedHTTPEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+
+ <metadata:MetadataResource xsi:type="resource:FileBackedHttpResource"
+ file="%{DIR}/spoolResourceEntities.xml"
+
+ url="%{metadataURL}"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntity.xml
index 08e822d..da69ad8 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileBackedHTTPEntity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="resourceFileBackedHTTPEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
-
- <metadata:MetadataResource
- xsi:type="resource:FileBackedHttpResource"
- file="%{DIR}/spoolResourceEntity.xml"
-
- url="%{metadataURL}"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="resourceFileBackedHTTPEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+ <metadata:MetadataResource
+ xsi:type="resource:FileBackedHttpResource"
+ file="%{DIR}/spoolResourceEntity.xml"
+
+ url="%{metadataURL}"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntities.xml
index a07af6e..2c7887b 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntities.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
- id="resourceFileEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
- <metadata:MetadataResource xsi:type="resource:FilesystemResource" file="%{DIR}/entities.xml"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
+ id="resourceFileEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
+ <metadata:MetadataResource xsi:type="resource:FilesystemResource" file="%{DIR}/entities.xml"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntity.xml
index 80f94c3..fedb3b2 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceFileEntity.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="resourceFileEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
- <metadata:MetadataResource xsi:type="resource:FilesystemResource" file="%{DIR}/entity.xml"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="resourceFileEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
+ <metadata:MetadataResource xsi:type="resource:FilesystemResource" file="%{DIR}/entity.xml"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntities.xml
index 7869fe4..2b9b2a6 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntities.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntities.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
- id="resourceHTTPEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
-
-
- <metadata:MetadataResource xsi:type="resource:HttpResource"
- url="%{metadataURL}"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
+ id="resourceHTTPEntities" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+
+ <metadata:MetadataResource xsi:type="resource:HttpResource"
+ url="%{metadataURL}"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntity.xml
index 04a6fd7..9f5f4c7 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceHTTPEntity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="resourceHTTPEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
-
- <metadata:MetadataResource
- xsi:type="resource:HttpResource"
- url="%{metadataURL}"/>
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="resourceHTTPEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+ <metadata:MetadataResource
+ xsi:type="resource:HttpResource"
+ url="%{metadataURL}"/>
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/serviceBeans.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/serviceBeans.xml
index ff0429d..f062142 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/serviceBeans.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/serviceBeans.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- p:maxPoolSize="1000"
- p:coalescing="true" p:ignoreComments="true"
- p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
- <util:list id="resources">
- <value>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity.xml</value>
- <value>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineChain.xml</value>
- <value>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities2.xml</value>
- </util:list>
-
- <bean id="shibboleth.MetadataResolverService"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- p:serviceConfigurations-ref="resources"
- p:failFast="true" p:reloadCheckDelay="0">
- <constructor-arg name="claz"
- value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
- <constructor-arg name="strategy">
- <bean id="wibble" p:id="wibble"
- class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy" />
- </constructor-arg>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <bean id="myParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="1000"
+ p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
+ <util:list id="resources">
+ <value>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity.xml</value>
+ <value>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineChain.xml</value>
+ <value>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities2.xml</value>
+ </util:list>
+
+ <bean id="shibboleth.MetadataResolverService"
+ class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ p:serviceConfigurations-ref="resources"
+ p:failFast="true" p:reloadCheckDelay="0">
+ <constructor-arg name="claz"
+ value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
+ <constructor-arg name="strategy">
+ <bean id="wibble" p:id="wibble"
+ class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy" />
+ </constructor-arg>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml
index a5046c1..c05a703 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="SVNEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
-
-
- <metadata:MetadataResource xsi:type="resource:SVNResource" resourceFile="entity.xml" repositoryURL="file:///%{SVNDIR}" workingCopyDirectory="%{TMPDIR}/svn" />
-
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="SVNEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+
+ <metadata:MetadataResource xsi:type="resource:SVNResource" resourceFile="entity.xml" repositoryURL="file:///%{SVNDIR}" workingCopyDirectory="%{TMPDIR}/svn" />
+
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnParams.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnParams.xml
index e07531d..5eb9a56 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnParams.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnParams.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resource="urn:mace:shibboleth:2.0:resource"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- id="SVNEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
-
-
- <metadata:MetadataResource xsi:type="resource:SVNResource" resourceFile="entity.xml"
- repositoryURL="file:///%{SVNDIR}" workingCopyDirectory="%{TMPDIR}/svn"
- password="pass" username="user"
- proxyHost="localhost" proxyPassword="procyPpass" proxyPort="123" proxyUsername="proxy"
- revision="5634"/>
-
-
-</metadata:MetadataProvider>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ id="SVNEntity" xsi:type="metadata:ResourceBackedMetadataProvider">
+
+
+ <metadata:MetadataResource xsi:type="resource:SVNResource" resourceFile="entity.xml"
+ repositoryURL="file:///%{SVNDIR}" workingCopyDirectory="%{TMPDIR}/svn"
+ password="pass" username="user"
+ proxyHost="localhost" proxyPassword="procyPpass" proxyPort="123" proxyUsername="proxy"
+ revision="5634"/>
+
+
+</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/propertyPlaceholder.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/propertyPlaceholder.xml
index ec5c8af..6d95162 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/propertyPlaceholder.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/propertyPlaceholder.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <context:property-placeholder
- location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties"/>
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <context:property-placeholder
+ location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties"/>
+</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/beans.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/beans.xml
index eeadba7..2a77205 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/beans.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/beans.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- p:maxPoolSize="1000"
- p:coalescing="true" p:ignoreComments="true"
- p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
-
- <bean id="shibboleth.MetadataResolverService"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- p:serviceConfigurations="classpath:/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml"
- p:failFast="true" p:reloadCheckDelay="0">
- <constructor-arg name="claz"
- value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
- <constructor-arg name="strategy">
- <bean id="wibble" p:id="wibble"
- class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy" />
- </constructor-arg>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <bean id="myParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="1000"
+ p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
+
+ <bean id="shibboleth.MetadataResolverService"
+ class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ p:serviceConfigurations="classpath:/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml"
+ p:failFast="true" p:reloadCheckDelay="0">
+ <constructor-arg name="claz"
+ value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
+ <constructor-arg name="strategy">
+ <bean id="wibble" p:id="wibble"
+ class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy" />
+ </constructor-arg>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml
index 8291d56..0606b1d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- ID="uk001480"
- entityID="https://idp.example.org/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <SingleSignOnService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+ ID="uk001480"
+ entityID="https://idp.example.org/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <SingleSignOnService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.example.org/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
</EntityDescriptor>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml
index 5ae9fb1..0a2266d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
- id="fileEntity" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
+
+ parserPoolRef="myParserPool" refreshDelayFactor="0.5" maxRefreshDelay="PT55M" minRefreshDelay="PT15M"
+ id="fileEntity" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml">
+
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml
index d97800e..b72691a 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml
@@ -1,239 +1,239 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. This file specifies relying
- party dependent configurations for the IdP, for example, whether SAML assertions
- to a particular relying party should be signed. It also includes metadata
- provider and credential definitions used when answering requests to a relying
- party. -->
-<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:metadata="urn:mace:shibboleth:2.0:metadata"
- xmlns:resource="urn:mace:shibboleth:2.0:resource" xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml" xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
- urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
- urn:mace:shibboleth:2.0:security:saml http://shibboleth.net/schema/idp/shibboleth-security-policy-saml.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
-
- <!-- ========================================== -->
- <!-- Relying Party Configurations -->
- <!-- ========================================== -->
- <rp:AnonymousRelyingParty provider="${IDP_ENTITY_ID}"
- defaultSigningCredentialRef="IdPCredential" />
-
- <rp:DefaultRelyingParty provider="${IDP_ENTITY_ID}"
- defaultSigningCredentialRef="IdPCredential">
- <!-- Each attribute in these profiles configuration is set to its default
- value, that is, the values that would be in effect if those attributes were
- not present. We list them here so that people are aware of them (since they
- seem reluctant to read the documentation). -->
- <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile"
- includeAttributeStatement="false" assertionLifetime="PT5M"
- signResponses="conditional" signAssertions="never"
- includeConditionsNotBefore="true" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2SSOSProfile" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML1AttributeQueryProfile"
- assertionLifetime="PT5M" signResponses="conditional" signAssertions="never"
- includeConditionsNotBefore="true" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML1ArtifactResolutionProfile"
- signResponses="conditional" signAssertions="never" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2SSOProfile"
- includeAttributeStatement="true" assertionLifetime="PT5M"
- assertionProxyCount="0" signResponses="never" signAssertions="always"
- encryptAssertions="conditional" encryptNameIds="never"
- includeConditionsNotBefore="true" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
- includeAttributeStatement="true" assertionLifetime="PT5M"
- assertionProxyCount="0" signResponses="never" signAssertions="always"
- encryptAssertions="conditional" encryptNameIds="never"
- includeConditionsNotBefore="true" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2AttributeQueryProfile"
- assertionLifetime="PT5M" assertionProxyCount="0" signResponses="conditional"
- signAssertions="never" encryptAssertions="conditional"
- encryptNameIds="never" includeConditionsNotBefore="true" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2ArtifactResolutionProfile"
- signResponses="never" signAssertions="always" encryptAssertions="conditional"
- encryptNameIds="never" />
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2LogoutRequestProfile"
- signResponses="conditional" />
-
- </rp:DefaultRelyingParty>
-
-
- <!-- ========================================== -->
- <!-- Metadata Configuration -->
- <!-- ========================================== -->
- <!-- MetadataProvider the combining other MetadataProviders -->
- <metadata:MetadataProvider id="ShibbolethMetadata"
- xsi:type="metadata:ChainingMetadataProvider">
-
-
- <!-- Example metadata provider. -->
- <!-- Reads metadata from a URL and store a backup copy on the file system. -->
- <!-- Validates the signature of the metadata and filters out all by SP
- entities in order to save memory -->
- <metadata:MetadataProvider id="URLMD"
- xsi:type="metadata:FilesystemMetadataProvider" metadataFile="${DIR}/test-metadata-out.xml">
- <metadata:MetadataFilter xsi:type="metadata:ChainingFilter">
- <metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
- requireSignedRoot="true">
- <metadata:PublicKey>
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
- uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
- LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
- NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
- nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
- E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
- 4wIDAQAB</metadata:PublicKey>
- </metadata:MetadataFilter>
- <metadata:MetadataFilter xsi:type="metadata:EntityRoleWhiteList">
- <metadata:RetainedRole>samlmd:SPSSODescriptor</metadata:RetainedRole>
- </metadata:MetadataFilter>
- </metadata:MetadataFilter>
- </metadata:MetadataProvider>
-
- </metadata:MetadataProvider>
-
-
- <!-- ========================================== -->
- <!-- Security Configurations -->
- <!-- ========================================== -->
- <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
- <security:PrivateKey>${DIR}/security/credential/key.pem
- </security:PrivateKey>
- <security:Certificate>${DIR}/security/credential/cert.pem
- </security:Certificate>
- </security:Credential>
-
-
- <!-- DO NOT EDIT BELOW THIS POINT -->
- <!-- The following trust engines and rules control every aspect of security
- related to incoming messages. Trust engines evaluate various tokens (like
- digital signatures) for trust worthiness while the security policies establish
- a set of checks that an incoming message must pass in order to be considered
- secure. Naturally some of these checks require the validation of the tokens
- evaluated by the trust engines and so you'll see some rules that reference
- the declared trust engines. -->
-
- <security:TrustEngine id="shibboleth.SignatureTrustEngine"
- xsi:type="security:SignatureChaining">
- <security:TrustEngine
- id="shibboleth.SignatureMetadataExplicitKeyTrustEngine" xsi:type="security:MetadataExplicitKeySignature"
- metadataProviderRef="ShibbolethMetadata" />
- <security:TrustEngine id="shibboleth.SignatureMetadataPKIXTrustEngine"
- xsi:type="security:MetadataPKIXSignature" metadataProviderRef="ShibbolethMetadata" />
- </security:TrustEngine>
-
- <security:TrustEngine id="shibboleth.CredentialTrustEngine"
- xsi:type="security:Chaining">
- <security:TrustEngine
- id="shibboleth.CredentialMetadataExplictKeyTrustEngine" xsi:type="security:MetadataExplicitKey"
- metadataProviderRef="ShibbolethMetadata" />
- <security:TrustEngine id="shibboleth.CredentialMetadataPKIXTrustEngine"
- xsi:type="security:MetadataPKIXX509Credential" metadataProviderRef="ShibbolethMetadata" />
- </security:TrustEngine>
-
- <security:SecurityPolicy id="shibboleth.ShibbolethSSOSecurityPolicy"
- xsi:type="security:SecurityPolicyType">
- <security:Rule xsi:type="samlsec:Replay" required="false" />
- <security:Rule xsi:type="samlsec:IssueInstant" required="false" />
- <security:Rule xsi:type="samlsec:MandatoryIssuer" />
- </security:SecurityPolicy>
-
- <security:SecurityPolicy id="shibboleth.SAML1AttributeQuerySecurityPolicy"
- xsi:type="security:SecurityPolicyType">
- <security:Rule xsi:type="samlsec:Replay" />
- <security:Rule xsi:type="samlsec:IssueInstant" />
- <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="security:ClientCertAuth"
- trustEngineRef="shibboleth.CredentialTrustEngine" />
- <security:Rule xsi:type="samlsec:MandatoryIssuer" />
- <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
- </security:SecurityPolicy>
-
- <security:SecurityPolicy
- id="shibboleth.SAML1ArtifactResolutionSecurityPolicy" xsi:type="security:SecurityPolicyType">
- <security:Rule xsi:type="samlsec:Replay" />
- <security:Rule xsi:type="samlsec:IssueInstant" />
- <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="security:ClientCertAuth"
- trustEngineRef="shibboleth.CredentialTrustEngine" />
- <security:Rule xsi:type="samlsec:MandatoryIssuer" />
- <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
- </security:SecurityPolicy>
-
- <security:SecurityPolicy id="shibboleth.SAML2SSOSecurityPolicy"
- xsi:type="security:SecurityPolicyType">
- <security:Rule xsi:type="samlsec:Replay" />
- <security:Rule xsi:type="samlsec:IssueInstant" />
- <security:Rule xsi:type="samlsec:SAML2AuthnRequestsSigned" />
- <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:MandatoryIssuer" />
- </security:SecurityPolicy>
-
- <security:SecurityPolicy id="shibboleth.SAML2AttributeQuerySecurityPolicy"
- xsi:type="security:SecurityPolicyType">
- <security:Rule xsi:type="samlsec:Replay" />
- <security:Rule xsi:type="samlsec:IssueInstant" />
- <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="security:ClientCertAuth"
- trustEngineRef="shibboleth.CredentialTrustEngine" />
- <security:Rule xsi:type="samlsec:MandatoryIssuer" />
- <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
- </security:SecurityPolicy>
-
- <security:SecurityPolicy
- id="shibboleth.SAML2ArtifactResolutionSecurityPolicy" xsi:type="security:SecurityPolicyType">
- <security:Rule xsi:type="samlsec:Replay" />
- <security:Rule xsi:type="samlsec:IssueInstant" />
- <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="security:ClientCertAuth"
- trustEngineRef="shibboleth.CredentialTrustEngine" />
- <security:Rule xsi:type="samlsec:MandatoryIssuer" />
- <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
- </security:SecurityPolicy>
-
- <security:SecurityPolicy id="shibboleth.SAML2SLOSecurityPolicy"
- xsi:type="security:SecurityPolicyType">
- <security:Rule xsi:type="samlsec:Replay" />
- <security:Rule xsi:type="samlsec:IssueInstant" />
- <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
- trustEngineRef="shibboleth.SignatureTrustEngine" />
- <security:Rule xsi:type="security:ClientCertAuth"
- trustEngineRef="shibboleth.CredentialTrustEngine" />
- <security:Rule xsi:type="samlsec:MandatoryIssuer" />
- <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
- </security:SecurityPolicy>
-
-</rp:RelyingPartyGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is an EXAMPLE configuration file. This file specifies relying
+ party dependent configurations for the IdP, for example, whether SAML assertions
+ to a particular relying party should be signed. It also includes metadata
+ provider and credential definitions used when answering requests to a relying
+ party. -->
+<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:metadata="urn:mace:shibboleth:2.0:metadata"
+ xmlns:resource="urn:mace:shibboleth:2.0:resource" xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml" xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
+ urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+ urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
+ urn:mace:shibboleth:2.0:security:saml http://shibboleth.net/schema/idp/shibboleth-security-policy-saml.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
+
+ <!-- ========================================== -->
+ <!-- Relying Party Configurations -->
+ <!-- ========================================== -->
+ <rp:AnonymousRelyingParty provider="${IDP_ENTITY_ID}"
+ defaultSigningCredentialRef="IdPCredential" />
+
+ <rp:DefaultRelyingParty provider="${IDP_ENTITY_ID}"
+ defaultSigningCredentialRef="IdPCredential">
+ <!-- Each attribute in these profiles configuration is set to its default
+ value, that is, the values that would be in effect if those attributes were
+ not present. We list them here so that people are aware of them (since they
+ seem reluctant to read the documentation). -->
+ <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile"
+ includeAttributeStatement="false" assertionLifetime="PT5M"
+ signResponses="conditional" signAssertions="never"
+ includeConditionsNotBefore="true" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2SSOSProfile" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML1AttributeQueryProfile"
+ assertionLifetime="PT5M" signResponses="conditional" signAssertions="never"
+ includeConditionsNotBefore="true" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML1ArtifactResolutionProfile"
+ signResponses="conditional" signAssertions="never" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2SSOProfile"
+ includeAttributeStatement="true" assertionLifetime="PT5M"
+ assertionProxyCount="0" signResponses="never" signAssertions="always"
+ encryptAssertions="conditional" encryptNameIds="never"
+ includeConditionsNotBefore="true" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
+ includeAttributeStatement="true" assertionLifetime="PT5M"
+ assertionProxyCount="0" signResponses="never" signAssertions="always"
+ encryptAssertions="conditional" encryptNameIds="never"
+ includeConditionsNotBefore="true" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2AttributeQueryProfile"
+ assertionLifetime="PT5M" assertionProxyCount="0" signResponses="conditional"
+ signAssertions="never" encryptAssertions="conditional"
+ encryptNameIds="never" includeConditionsNotBefore="true" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2ArtifactResolutionProfile"
+ signResponses="never" signAssertions="always" encryptAssertions="conditional"
+ encryptNameIds="never" />
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2LogoutRequestProfile"
+ signResponses="conditional" />
+
+ </rp:DefaultRelyingParty>
+
+
+ <!-- ========================================== -->
+ <!-- Metadata Configuration -->
+ <!-- ========================================== -->
+ <!-- MetadataProvider the combining other MetadataProviders -->
+ <metadata:MetadataProvider id="ShibbolethMetadata"
+ xsi:type="metadata:ChainingMetadataProvider">
+
+
+ <!-- Example metadata provider. -->
+ <!-- Reads metadata from a URL and store a backup copy on the file system. -->
+ <!-- Validates the signature of the metadata and filters out all by SP
+ entities in order to save memory -->
+ <metadata:MetadataProvider id="URLMD"
+ xsi:type="metadata:FilesystemMetadataProvider" metadataFile="${DIR}/test-metadata-out.xml">
+ <metadata:MetadataFilter xsi:type="metadata:ChainingFilter">
+ <metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
+ requireSignedRoot="true">
+ <metadata:PublicKey>
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
+ uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
+ LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
+ NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
+ nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
+ E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
+ 4wIDAQAB</metadata:PublicKey>
+ </metadata:MetadataFilter>
+ <metadata:MetadataFilter xsi:type="metadata:EntityRoleWhiteList">
+ <metadata:RetainedRole>samlmd:SPSSODescriptor</metadata:RetainedRole>
+ </metadata:MetadataFilter>
+ </metadata:MetadataFilter>
+ </metadata:MetadataProvider>
+
+ </metadata:MetadataProvider>
+
+
+ <!-- ========================================== -->
+ <!-- Security Configurations -->
+ <!-- ========================================== -->
+ <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
+ <security:PrivateKey>${DIR}/security/credential/key.pem
+ </security:PrivateKey>
+ <security:Certificate>${DIR}/security/credential/cert.pem
+ </security:Certificate>
+ </security:Credential>
+
+
+ <!-- DO NOT EDIT BELOW THIS POINT -->
+ <!-- The following trust engines and rules control every aspect of security
+ related to incoming messages. Trust engines evaluate various tokens (like
+ digital signatures) for trust worthiness while the security policies establish
+ a set of checks that an incoming message must pass in order to be considered
+ secure. Naturally some of these checks require the validation of the tokens
+ evaluated by the trust engines and so you'll see some rules that reference
+ the declared trust engines. -->
+
+ <security:TrustEngine id="shibboleth.SignatureTrustEngine"
+ xsi:type="security:SignatureChaining">
+ <security:TrustEngine
+ id="shibboleth.SignatureMetadataExplicitKeyTrustEngine" xsi:type="security:MetadataExplicitKeySignature"
+ metadataProviderRef="ShibbolethMetadata" />
+ <security:TrustEngine id="shibboleth.SignatureMetadataPKIXTrustEngine"
+ xsi:type="security:MetadataPKIXSignature" metadataProviderRef="ShibbolethMetadata" />
+ </security:TrustEngine>
+
+ <security:TrustEngine id="shibboleth.CredentialTrustEngine"
+ xsi:type="security:Chaining">
+ <security:TrustEngine
+ id="shibboleth.CredentialMetadataExplictKeyTrustEngine" xsi:type="security:MetadataExplicitKey"
+ metadataProviderRef="ShibbolethMetadata" />
+ <security:TrustEngine id="shibboleth.CredentialMetadataPKIXTrustEngine"
+ xsi:type="security:MetadataPKIXX509Credential" metadataProviderRef="ShibbolethMetadata" />
+ </security:TrustEngine>
+
+ <security:SecurityPolicy id="shibboleth.ShibbolethSSOSecurityPolicy"
+ xsi:type="security:SecurityPolicyType">
+ <security:Rule xsi:type="samlsec:Replay" required="false" />
+ <security:Rule xsi:type="samlsec:IssueInstant" required="false" />
+ <security:Rule xsi:type="samlsec:MandatoryIssuer" />
+ </security:SecurityPolicy>
+
+ <security:SecurityPolicy id="shibboleth.SAML1AttributeQuerySecurityPolicy"
+ xsi:type="security:SecurityPolicyType">
+ <security:Rule xsi:type="samlsec:Replay" />
+ <security:Rule xsi:type="samlsec:IssueInstant" />
+ <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="security:ClientCertAuth"
+ trustEngineRef="shibboleth.CredentialTrustEngine" />
+ <security:Rule xsi:type="samlsec:MandatoryIssuer" />
+ <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
+ </security:SecurityPolicy>
+
+ <security:SecurityPolicy
+ id="shibboleth.SAML1ArtifactResolutionSecurityPolicy" xsi:type="security:SecurityPolicyType">
+ <security:Rule xsi:type="samlsec:Replay" />
+ <security:Rule xsi:type="samlsec:IssueInstant" />
+ <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="security:ClientCertAuth"
+ trustEngineRef="shibboleth.CredentialTrustEngine" />
+ <security:Rule xsi:type="samlsec:MandatoryIssuer" />
+ <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
+ </security:SecurityPolicy>
+
+ <security:SecurityPolicy id="shibboleth.SAML2SSOSecurityPolicy"
+ xsi:type="security:SecurityPolicyType">
+ <security:Rule xsi:type="samlsec:Replay" />
+ <security:Rule xsi:type="samlsec:IssueInstant" />
+ <security:Rule xsi:type="samlsec:SAML2AuthnRequestsSigned" />
+ <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:MandatoryIssuer" />
+ </security:SecurityPolicy>
+
+ <security:SecurityPolicy id="shibboleth.SAML2AttributeQuerySecurityPolicy"
+ xsi:type="security:SecurityPolicyType">
+ <security:Rule xsi:type="samlsec:Replay" />
+ <security:Rule xsi:type="samlsec:IssueInstant" />
+ <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="security:ClientCertAuth"
+ trustEngineRef="shibboleth.CredentialTrustEngine" />
+ <security:Rule xsi:type="samlsec:MandatoryIssuer" />
+ <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
+ </security:SecurityPolicy>
+
+ <security:SecurityPolicy
+ id="shibboleth.SAML2ArtifactResolutionSecurityPolicy" xsi:type="security:SecurityPolicyType">
+ <security:Rule xsi:type="samlsec:Replay" />
+ <security:Rule xsi:type="samlsec:IssueInstant" />
+ <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="security:ClientCertAuth"
+ trustEngineRef="shibboleth.CredentialTrustEngine" />
+ <security:Rule xsi:type="samlsec:MandatoryIssuer" />
+ <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
+ </security:SecurityPolicy>
+
+ <security:SecurityPolicy id="shibboleth.SAML2SLOSecurityPolicy"
+ xsi:type="security:SecurityPolicyType">
+ <security:Rule xsi:type="samlsec:Replay" />
+ <security:Rule xsi:type="samlsec:IssueInstant" />
+ <security:Rule xsi:type="samlsec:ProtocolWithXMLSignature"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPRedirectSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign"
+ trustEngineRef="shibboleth.SignatureTrustEngine" />
+ <security:Rule xsi:type="security:ClientCertAuth"
+ trustEngineRef="shibboleth.CredentialTrustEngine" />
+ <security:Rule xsi:type="samlsec:MandatoryIssuer" />
+ <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
+ </security:SecurityPolicy>
+
+</rp:RelyingPartyGroup>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group2.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group2.xml
index 6ee6703..443214f 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group2.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group2.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd">
-
- <!-- ========================================== -->
- <!-- Relying Party Configurations -->
- <!-- ========================================== -->
- <rp:AnonymousRelyingParty provider="AnonIdP" defaultSigningCredentialRef="IdPCredential"/>
-
- <rp:DefaultRelyingParty provider="DefaultIdP" defaultSigningCredentialRef="IdPCredential"/>
- <rp:RelyingParty provider="IdP1" id="the id1"/>
- <rp:RelyingParty provider="IdP2" id="the id2"/>
-
-</rp:RelyingPartyGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd">
+
+ <!-- ========================================== -->
+ <!-- Relying Party Configurations -->
+ <!-- ========================================== -->
+ <rp:AnonymousRelyingParty provider="AnonIdP" defaultSigningCredentialRef="IdPCredential"/>
+
+ <rp:DefaultRelyingParty provider="DefaultIdP" defaultSigningCredentialRef="IdPCredential"/>
+ <rp:RelyingParty provider="IdP1" id="the id1"/>
+ <rp:RelyingParty provider="IdP2" id="the id2"/>
+
+</rp:RelyingPartyGroup>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml
index 533edac..49df2db 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- id="the_RP" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
- nameIDFormatPrecedence="three four"
- detailedErrors="true"
- defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
-
- <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile" includeAttributeStatement="true" securityPolicyRef="ignore"
- outboundArtifactType="6543" />
-</rp:RelyingParty>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ id="the_RP" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+ nameIDFormatPrecedence="three four"
+ detailedErrors="true"
+ defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
+
+ <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile" includeAttributeStatement="true" securityPolicyRef="ignore"
+ outboundArtifactType="6543" />
+</rp:RelyingParty>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecp.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecp.xml
index 44c552e..a47327e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecp.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecp.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML2ECPProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML2ECPProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityAddress.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityAddress.xml
index c1be4de..e995831 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityAddress.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityAddress.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
- nameIDFormatPrecedence="three four"
- defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
- <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
- localityAddress="ignore">
- </rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+ nameIDFormatPrecedence="three four"
+ defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
+ <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
+ localityAddress="ignore">
+ </rp:ProfileConfiguration>
+
</rp:RelyingParty>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityDNSName.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityDNSName.xml
index 5800c18..3561f1b 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityDNSName.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityDNSName.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
- nameIDFormatPrecedence="three four"
- defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
- <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
- localityDNSName="ignore">
- </rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+ nameIDFormatPrecedence="three four"
+ defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
+ <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
+ localityDNSName="ignore">
+ </rp:ProfileConfiguration>
+
</rp:RelyingParty>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpValues.xml
index 0df1a56..a033ddc 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpValues.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
- nameIDFormatPrecedence="three four"
- defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
- <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
- includeAttributeStatement="false" securityPolicyRef="ignore"
- maximumSPSessionLifetime="1" skipEndpointValidationWhenSigned="true"
- artifactType="5437">
- </rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+ nameIDFormatPrecedence="three four"
+ defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
+ <rp:ProfileConfiguration xsi:type="saml:SAML2ECPProfile"
+ includeAttributeStatement="false" securityPolicyRef="ignore"
+ maximumSPSessionLifetime="1" skipEndpointValidationWhenSigned="true"
+ artifactType="5437">
+ </rp:ProfileConfiguration>
+
</rp:RelyingParty>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logout.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logout.xml
index fd8656c..ea7a91e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logout.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logout.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML2LogoutRequestProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML2LogoutRequestProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logoutValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logoutValues.xml
index 1508d36..50d2ce0 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logoutValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logoutValues.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:spring="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
-
- xsi:type="saml:SAML2LogoutRequestProfile"
- encryptNameIds="never" encryptAssertions="always" assertionProxyCount="98"
- assertionLifetime="PT8M" includeConditionsNotBefore="true" artifactType="7"
- signAssertions="${prop.never}" signRequests="conditional" signResponses="never">
- <saml:ProxyAudience>${prop.String1}</saml:ProxyAudience>
-</rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:spring="http://www.springframework.org/schema/beans"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+
+ xsi:type="saml:SAML2LogoutRequestProfile"
+ encryptNameIds="never" encryptAssertions="always" assertionProxyCount="98"
+ assertionLifetime="PT8M" includeConditionsNotBefore="true" artifactType="7"
+ signAssertions="${prop.never}" signRequests="conditional" signResponses="never">
+ <saml:ProxyAudience>${prop.String1}</saml:ProxyAudience>
+</rp:ProfileConfiguration>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifact.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifact.xml
index 344e9aa..a9a1a67 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifact.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifact.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML1ArtifactResolutionProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML1ArtifactResolutionProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml
index dba6a9f..6cebaea 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <rp:AnonymousRelyingParty provider="bar" />
- <rp:DefaultRelyingParty provider="foo"></rp:DefaultRelyingParty>
-
- <rp:RelyingParty id="rp" provider="provider"
- nameIDFormatPrecedence="one two" defaultSigningCredentialRef="signer"
- defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport">
- <rp:ProfileConfiguration xsi:type="saml:SAML1ArtifactResolutionProfile"
-
- securityPolicyRef="wobble" attributeAuthority="wibble"
-
- assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}"
- signingCredentialRef="credref" signAssertions="${prop.never}"
- signRequests="never" signResponses="conditional">
- <saml:Audience>${prop.String1}${prop.String1}</saml:Audience>
- </rp:ProfileConfiguration>
-
-
- </rp:RelyingParty>
- <sec:Credential id="credref" xsi:type="sec:BasicInline">
- <sec:PublicKey>
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
- uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
- LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
- NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
- nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
- E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
- 4wIDAQAB
- </sec:PublicKey>
- </sec:Credential>
-</rp:RelyingPartyGroup>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <rp:AnonymousRelyingParty provider="bar" />
+ <rp:DefaultRelyingParty provider="foo"></rp:DefaultRelyingParty>
+
+ <rp:RelyingParty id="rp" provider="provider"
+ nameIDFormatPrecedence="one two" defaultSigningCredentialRef="signer"
+ defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport">
+ <rp:ProfileConfiguration xsi:type="saml:SAML1ArtifactResolutionProfile"
+
+ securityPolicyRef="wobble" attributeAuthority="wibble"
+
+ assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}"
+ signingCredentialRef="credref" signAssertions="${prop.never}"
+ signRequests="never" signResponses="conditional">
+ <saml:Audience>${prop.String1}${prop.String1}</saml:Audience>
+ </rp:ProfileConfiguration>
+
+
+ </rp:RelyingParty>
+ <sec:Credential id="credref" xsi:type="sec:BasicInline">
+ <sec:PublicKey>
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
+ uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
+ LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
+ NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
+ nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
+ E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
+ 4wIDAQAB
+ </sec:PublicKey>
+ </sec:Credential>
+</rp:RelyingPartyGroup>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQuery.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQuery.xml
index 8bd573c..25c0123 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQuery.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQuery.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML1AttributeQueryProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML1AttributeQueryProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQueryValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQueryValues.xml
index 79b20bf..86f7b6b 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQueryValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1attributeQueryValues.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML1AttributeQueryProfile"
-
- securityPolicyRef="wobble" attributeAuthority="wibble"
-
- assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}" artifactType="${prop.artifactType}1"
- signAssertions="${prop.never}" signRequests="never" signResponses="conditional">
- <saml:Audience>${prop.String1}${prop.String1}</saml:Audience>
- <saml:Audience>${prop.String1}</saml:Audience>
-</rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML1AttributeQueryProfile"
+
+ securityPolicyRef="wobble" attributeAuthority="wibble"
+
+ assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}" artifactType="${prop.artifactType}1"
+ signAssertions="${prop.never}" signRequests="never" signResponses="conditional">
+ <saml:Audience>${prop.String1}${prop.String1}</saml:Audience>
+ <saml:Audience>${prop.String1}</saml:Audience>
+</rp:ProfileConfiguration>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSO.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSO.xml
index 1f3f423..98fc2d0 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSO.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSO.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML2SSOProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML2SSOProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml
index 5c420e6..f8bda90 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <rp:AnonymousRelyingParty provider="bar" />
- <rp:DefaultRelyingParty provider="foo"></rp:DefaultRelyingParty>
-
- <rp:RelyingParty id="rp" provider="provider"
- nameIDFormatPrecedence="one two" defaultSigningCredentialRef="signer"
- defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport">
-
- <rp:ProfileConfiguration xsi:type="saml:SAML2SSOProfile"
- includeAttributeStatement="false" securityPolicyRef="ignore"
- maximumSPSessionLifetime="1" encryptionOptional="true"
- encryptAttributes="always" encryptAssertions="conditional"
- allowDelegation="true" maximumTokenDelegationChainLength="3"
- signRequests="conditional" signAssertions="always" signResponses="never"
- skipEndpointValidationWhenSigned="true" artifactType="7654">
- </rp:ProfileConfiguration>
-
- </rp:RelyingParty>
- <sec:Credential id="signer" xsi:type="sec:BasicInline">
- <sec:PublicKey>
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
- uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
- LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
- NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
- nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
- E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
- 4wIDAQAB
- </sec:PublicKey>
- </sec:Credential>
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:RelyingPartyGroup xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:sec="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
+ urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <rp:AnonymousRelyingParty provider="bar" />
+ <rp:DefaultRelyingParty provider="foo"></rp:DefaultRelyingParty>
+
+ <rp:RelyingParty id="rp" provider="provider"
+ nameIDFormatPrecedence="one two" defaultSigningCredentialRef="signer"
+ defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport">
+
+ <rp:ProfileConfiguration xsi:type="saml:SAML2SSOProfile"
+ includeAttributeStatement="false" securityPolicyRef="ignore"
+ maximumSPSessionLifetime="1" encryptionOptional="true"
+ encryptAttributes="always" encryptAssertions="conditional"
+ allowDelegation="true" maximumTokenDelegationChainLength="3"
+ signRequests="conditional" signAssertions="always" signResponses="never"
+ skipEndpointValidationWhenSigned="true" artifactType="7654">
+ </rp:ProfileConfiguration>
+
+ </rp:RelyingParty>
+ <sec:Credential id="signer" xsi:type="sec:BasicInline">
+ <sec:PublicKey>
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
+ uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
+ LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
+ NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
+ nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
+ E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
+ 4wIDAQAB
+ </sec:PublicKey>
+ </sec:Credential>
</rp:RelyingPartyGroup>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifact.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifact.xml
index 5b78405..a2833bc 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifact.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifact.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:spring="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
-
- xsi:type="saml:SAML2ArtifactResolutionProfile">
-</rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:spring="http://www.springframework.org/schema/beans"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+
+ xsi:type="saml:SAML2ArtifactResolutionProfile">
+</rp:ProfileConfiguration>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifactValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifactValues.xml
index 47bb60e..fd1e933 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifactValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2artifactValues.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML2ArtifactResolutionProfile"
-
- securityPolicyRef="wobble"
-
- encryptNameIds="always" encryptAssertions="${prop.never}" assertionProxyCount="99" attributeAuthority="wibble"
-
- assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}"
- signAssertions="${prop.never}" signRequests="never" signResponses="conditional">
- <saml:Audience>${prop.String1}</saml:Audience>
- <saml:ProxyAudience>ProxyAudience1</saml:ProxyAudience>
- <saml:ProxyAudience>ProxyAudience2</saml:ProxyAudience>
-</rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML2ArtifactResolutionProfile"
+
+ securityPolicyRef="wobble"
+
+ encryptNameIds="always" encryptAssertions="${prop.never}" assertionProxyCount="99" attributeAuthority="wibble"
+
+ assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}"
+ signAssertions="${prop.never}" signRequests="never" signResponses="conditional">
+ <saml:Audience>${prop.String1}</saml:Audience>
+ <saml:ProxyAudience>ProxyAudience1</saml:ProxyAudience>
+ <saml:ProxyAudience>ProxyAudience2</saml:ProxyAudience>
+</rp:ProfileConfiguration>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQuery.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQuery.xml
index 2fc59b4..354a967 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQuery.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQuery.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML2AttributeQueryProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML2AttributeQueryProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQueryValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQueryValues.xml
index f81ce28..acde24e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQueryValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQueryValues.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML2AttributeQueryProfile"
-
- securityPolicyRef="wobble"
-
- encryptNameIds="always" encryptAssertions="${prop.never}" assertionProxyCount="99" attributeAuthority="wibble"
-
- assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}" artifactType="765"
- signAssertions="${prop.never}" signRequests="never" signResponses="conditional">
- <saml:Audience>${prop.String1}</saml:Audience>
- <saml:Audience>Audience2</saml:Audience>
- <saml:ProxyAudience>ProxyAudience1</saml:ProxyAudience>
- <saml:ProxyAudience>${prop.String1}</saml:ProxyAudience>
-</rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML2AttributeQueryProfile"
+
+ securityPolicyRef="wobble"
+
+ encryptNameIds="always" encryptAssertions="${prop.never}" assertionProxyCount="99" attributeAuthority="wibble"
+
+ assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}" artifactType="765"
+ signAssertions="${prop.never}" signRequests="never" signResponses="conditional">
+ <saml:Audience>${prop.String1}</saml:Audience>
+ <saml:Audience>Audience2</saml:Audience>
+ <saml:ProxyAudience>ProxyAudience1</saml:ProxyAudience>
+ <saml:ProxyAudience>${prop.String1}</saml:ProxyAudience>
+</rp:ProfileConfiguration>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSO.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSO.xml
index d0f6271..75ff8dd 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSO.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSO.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:ShibbolethSSOProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:ShibbolethSSOProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSOValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSOValues.xml
index 8e4b17b..4cce2ed 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSOValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSOValues.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
- nameIDFormatPrecedence="three four"
- defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
-
- <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile"
- includeAttributeStatement="true" securityPolicyRef="ignore"
- artifactType="32767"
- signRequests="conditional"/>
-</rp:RelyingParty>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:RelyingParty xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ id="rp" provider="provider" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+ nameIDFormatPrecedence="three four"
+ defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
+
+ <rp:ProfileConfiguration xsi:type="saml:ShibbolethSSOProfile"
+ includeAttributeStatement="true" securityPolicyRef="ignore"
+ artifactType="32767"
+ signRequests="conditional"/>
+</rp:RelyingParty>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssos.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssos.xml
index 0cf4206..1a55255 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssos.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssos.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
-
- xsi:type="saml:SAML2SSOSProfile"
-
-/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd"
+
+ xsi:type="saml:SAML2SSOSProfile"
+
+/>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssosValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssosValues.xml
index e104179..85dfb31 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssosValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ssosValues.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
- xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:spring="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
- urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
-
- xsi:type="saml:SAML2SSOSProfile"
- delegationPredicateRef="jimmy">
-</rp:ProfileConfiguration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<rp:ProfileConfiguration xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
+ xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:spring="http://www.springframework.org/schema/beans"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+ urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+
+ xsi:type="saml:SAML2SSOSProfile"
+ delegationPredicateRef="jimmy">
+</rp:ProfileConfiguration>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertElementsKeyName.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertElementsKeyName.xml
index b9575ed..4bd612e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertElementsKeyName.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertElementsKeyName.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:X509Filesystem" entityID="https://sp.example.org/sp/shibboleth" usage="Signing" >
- <security:KeyName>Name1</security:KeyName>
- <security:KeyName>Name2</security:KeyName>
- <security:Certificate>${DIR}/credential/cert.pem</security:Certificate>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:X509Filesystem" entityID="https://sp.example.org/sp/shibboleth" usage="Signing" >
+ <security:KeyName>Name1</security:KeyName>
+ <security:KeyName>Name2</security:KeyName>
+ <security:Certificate>${DIR}/credential/cert.pem</security:Certificate>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertOnly.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertOnly.xml
index e078f6a..e3ba0db 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertOnly.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileCertOnly.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:X509Filesystem">
- <security:Certificate>classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem</security:Certificate>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:X509Filesystem">
+ <security:Certificate>classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem</security:Certificate>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileKeyCertCrl.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileKeyCertCrl.xml
index a713bd5..d3d21d8 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileKeyCertCrl.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileKeyCertCrl.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:X509Filesystem">
- <security:PrivateKey>${DIR}/credential/key.pem</security:PrivateKey>
- <security:Certificate>${DIR}/credential/certificate.pem</security:Certificate>
- <security:Certificate entityCertificate="true">${DIR}/credential/cert.pem</security:Certificate>
- <security:CRL>${DIR}/credential/crl.pem</security:CRL>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:X509Filesystem">
+ <security:PrivateKey>${DIR}/credential/key.pem</security:PrivateKey>
+ <security:Certificate>${DIR}/credential/certificate.pem</security:Certificate>
+ <security:Certificate entityCertificate="true">${DIR}/credential/cert.pem</security:Certificate>
+ <security:CRL>${DIR}/credential/crl.pem</security:CRL>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileTwoCert.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileTwoCert.xml
index ba88cca..f45e4c4 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileTwoCert.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/fileTwoCert.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:X509Filesystem">
- <security:Certificate entityCertificate="true">${DIR}/credential/certificate.pem</security:Certificate>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:X509Filesystem">
+ <security:Certificate entityCertificate="true">${DIR}/credential/certificate.pem</security:Certificate>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineCertOnly.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineCertOnly.xml
index ea0fd47..5590008 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineCertOnly.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineCertOnly.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:X509Inline">
- <security:Certificate>
- MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
- BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
- aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
- MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
- ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
- x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
- lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
- DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
- J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
- T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
- p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
- 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
- BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
- MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
- BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
- 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
- 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
- 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
- i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
- </security:Certificate>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:X509Inline">
+ <security:Certificate>
+ MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+ BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+ aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
+ MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
+ ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
+ x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
+ lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
+ DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
+ J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
+ T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
+ p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
+ 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+ BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
+ MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
+ BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
+ 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
+ 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
+ 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
+ i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
+ </security:Certificate>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineKeyCertCrl.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineKeyCertCrl.xml
index d1d2e66..a0d5507 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineKeyCertCrl.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineKeyCertCrl.xml
@@ -1,128 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:X509Inline">
- <security:PrivateKey>
- MIIEowIBAAKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRm
- Skki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX6
- 7QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqad
- rHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYi
- dNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+
- zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABAoIBAHG6nLv13zmTdS5a
- UrX4qNPNVgryxs+N4kw51iPqQeFLGVvPB3ZtHSz46+SkhQEJHu37mtqCo3IijRZL
- rIhtIIG8FG3U18sBXNJgiCN9J26ggB2RI3DvyMxww5X6FOcWGjBkEFGtJaE6n//Y
- EbWnO+oxyC+j7DMZVoo2+MBYH8LHPXpMPFPhYbf12LpHY+WeNgX/eemMTlSylBln
- lfhySCtpLcgY7+juYlXaZ9Y1z37QZBcP6yYLTnXJVlhY1KcULh+/PUnmzVpHbkwU
- v/yQiFGFsve1ROp0ztB6sFufLnvGcTa3T1Oeza9ZaX/zjbMbGp3qjSGoknS23U0Q
- ZotRB+ECgYEA9EmvBYLWgEayOlZPcBwKZ3Qrwf9ip3xmtubrf9byIozEeQTKvHmA
- UvK5dKN1pwK0gTaWk5aq+n64HtwJ0+pO4bV32TJJlV/la4xd7wHdH5+S5cdQjd/r
- tuxyejp5FhqT+x2rKibskEeFKhfgIIolpkcNFIKc9xa3/VBOWPxV19kCgYEAz4vl
- xJhD8Cf97bm5hemiJPt2eQMCTGCE39O4UaY6xi5lINoySoh8qd2e59nnneG4YaNp
- tHU23oh00m68Jx8b7wMFliQ/J59lxAkfP262EkBqf/VOAVXQo/iaA8HSwq3Hfwt5
- 0F4HMQEfB6qf7/LGvFHTQ8+Wn1upZGaYP1YAghsCgYBe3FILmNAExe8luihkx26+
- 15y6W5qKoUMdmTQv0175TaJpwBOd9qx/CWQ8x9DDBsjjODhmnWZNmXGUAiwKz3zM
- JvSgMefjCncDOWGskxOz2PppIenE/gQBZ3XYwuYMUEvQgqfZ2X2ZVTx/qP/Ogva1
- x/drVIDxbjAKPOn/ohUPmQKBgQChW5qfZeIr7Gu3TxW1zxaIuhg5rOU0jDXB7tD2
- ac54Fcn56KoA2GxThEHu77LrRHodLvcXnamzCVQJ5p3RrJYDFM5bFIMlQv/TkWQB
- 5QkY14v1P7oNv7IeSUE0epRpVsIrO7jRDsl4h+6f/z+pRY7NCrC9n77y1ki0Di9/
- zlVG0QKBgFXQkO/bf0Qs3COPWUs5nHyQ/sR0ptx1jrFDSjCdGvBC7NrDlwNP3894
- EHCUTrEHhjtAGVzyZakZ6PLAN9cf86N1QhvOdj/oasL5vddWyFK74x2/mtp59VOU
- LaCxnnbG4JoSVX96BSzUFbtRrQbf2+t5ZON9K12IPIxstMkF2j8u
- </security:PrivateKey>
- <security:Certificate>
- MIIDSTCCArKgAwIBAgIJAKg8tR5hjVM4MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
- BAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMK
- V2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYD
- VQQDEwtleGFtcGxlLm9yZzAeFw0wNzA4MDUxMzA4MDJaFw0xNzA4MDIxMzA4MDJa
- MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTET
- MBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJz
- aXR5MRQwEgYDVQQDEwtleGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
- gYkCgYEA5zKHuD5DGPEQH+yLDMIA5M46HwJk7HxlGQ7N9WmkhaI22zXPC0UO8sY4
- AJW/8nlm0pc505iQmbgslg7/JyBemBj1sI7pOp6eCUPs7NR2mwaujXBturiRaJIe
- AX1Gjr3sO+3aLvqxUEu0PWqci4m1uc8XHQCA+PlEQQQnB9UIJwcCAwEAAaOB3DCB
- 2TAdBgNVHQ4EFgQUzEhylzE4wmr4FK1lZ7zjR/KmA24wgakGA1UdIwSBoTCBnoAU
- zEhylzE4wmr4FK1lZ7zjR/KmA26he6R5MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQI
- ExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwG
- A1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYDVQQDEwtleGFtcGxlLm9y
- Z4IJAKg8tR5hjVM4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAGfkM
- HUeWzHzsBkwTu+S2vX4gzlJPjiL3RzL40og/qyGz38P4KVg8IQvsGDjs1VFzzcAJ
- I5ULnSocUOTk5sCTjDKT6VILhgAYJ1jnqIo7Z+VC1r3AS9cSDakzqWTc19EFKxEw
- 6jeBWaqyykdSiVhCAmG5AJsvk+K032zjkWWMo+0=
- </security:Certificate>
- <security:Certificate>
- MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
- MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
- Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
- MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
- dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
- WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
- oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
- tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
- D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
- OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
- AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
- BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
- Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
- bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
- IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
- aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
- L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
- Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
- LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
- cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
- OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
- ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
- AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
- Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
- GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
- pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
- uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
- ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
- 1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
- </security:Certificate>
- <security:Certificate entityCertificate="true">
- MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
- BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
- aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
- MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
- ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
- x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
- lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
- DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
- J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
- T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
- p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
- 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
- BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
- MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
- BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
- 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
- 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
- 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
- i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
- </security:Certificate>
- <security:CRL>
- MIIDBjCCAe4CAQEwDQYJKoZIhvcNAQEEBQAwVjELMAkGA1UEBhMCVVMxHDAaBgNV
- BAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9uIENlcnRp
- ZmljYXRpb24gQXV0aG9yaXR5Fw0wNzA4MDMxNDE0NDhaFw0wNzA5MDIxNDE0NDha
- MIHdMBICAQIXDTA0MDMzMTE5NDk0NFowEgIBDhcNMDQwOTE3MTkzMTUxWjASAgEP
- Fw0wNDA5MTcxOTMyMTRaMBICARYXDTA1MDMyMjE3MTYyMFowEgIBHBcNMDUwMjAx
- MTkyOTUxWjASAgE+Fw0wNjA0MDcxNjM1MzFaMBICAUAXDTA2MDQwNzE2MzQ1NFow
- EgIBQRcNMDYwNDEwMTcyMjE1WjASAgFWFw0wNjA3MjAxNzIyMzVaMBICAW8XDTA2
- MTIxOTIwMTQxMVowEwICAIwXDTA3MDMyOTIxMjE0N1qggYMwgYAwfgYDVR0jBHcw
- dYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYD
- VQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0
- aWZpY2F0aW9uIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOCAQEAeCvRTq70
- RJxkxgbV+crqhN6oh3k974GGXhOxYDTTGjYbhK8JnCXkt1uJcnGfl1xyqrozoSrl
- oxoBUmStA8vVqYwtO/FfGpnCyfOG9H2/rAkzbqwr/EXO+MqSd8e1AIJho97i/QSs
- FWp40h7GeanmiZXL6bc4o9cKb0ROtc1n2nYHkLXptf9bFHte2Z/RhbUr8KaPU4b9
- T9PW9a2Z7Oc4BDHpEUcljZL0AlO6mGI2RtDB9RdrtRY6M9YQbBwUcV9r+/+ylfZY
- ugMRDTNUqL72hHKJgmbnfc0CmkcZKHOIGXdGCIX6ewNsLOQnlFAQEVyojQqbzT8w
- s6E8aj6AzPhKyw==
- </security:CRL>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:X509Inline">
+ <security:PrivateKey>
+ MIIEowIBAAKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRm
+ Skki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX6
+ 7QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqad
+ rHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYi
+ dNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+
+ zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABAoIBAHG6nLv13zmTdS5a
+ UrX4qNPNVgryxs+N4kw51iPqQeFLGVvPB3ZtHSz46+SkhQEJHu37mtqCo3IijRZL
+ rIhtIIG8FG3U18sBXNJgiCN9J26ggB2RI3DvyMxww5X6FOcWGjBkEFGtJaE6n//Y
+ EbWnO+oxyC+j7DMZVoo2+MBYH8LHPXpMPFPhYbf12LpHY+WeNgX/eemMTlSylBln
+ lfhySCtpLcgY7+juYlXaZ9Y1z37QZBcP6yYLTnXJVlhY1KcULh+/PUnmzVpHbkwU
+ v/yQiFGFsve1ROp0ztB6sFufLnvGcTa3T1Oeza9ZaX/zjbMbGp3qjSGoknS23U0Q
+ ZotRB+ECgYEA9EmvBYLWgEayOlZPcBwKZ3Qrwf9ip3xmtubrf9byIozEeQTKvHmA
+ UvK5dKN1pwK0gTaWk5aq+n64HtwJ0+pO4bV32TJJlV/la4xd7wHdH5+S5cdQjd/r
+ tuxyejp5FhqT+x2rKibskEeFKhfgIIolpkcNFIKc9xa3/VBOWPxV19kCgYEAz4vl
+ xJhD8Cf97bm5hemiJPt2eQMCTGCE39O4UaY6xi5lINoySoh8qd2e59nnneG4YaNp
+ tHU23oh00m68Jx8b7wMFliQ/J59lxAkfP262EkBqf/VOAVXQo/iaA8HSwq3Hfwt5
+ 0F4HMQEfB6qf7/LGvFHTQ8+Wn1upZGaYP1YAghsCgYBe3FILmNAExe8luihkx26+
+ 15y6W5qKoUMdmTQv0175TaJpwBOd9qx/CWQ8x9DDBsjjODhmnWZNmXGUAiwKz3zM
+ JvSgMefjCncDOWGskxOz2PppIenE/gQBZ3XYwuYMUEvQgqfZ2X2ZVTx/qP/Ogva1
+ x/drVIDxbjAKPOn/ohUPmQKBgQChW5qfZeIr7Gu3TxW1zxaIuhg5rOU0jDXB7tD2
+ ac54Fcn56KoA2GxThEHu77LrRHodLvcXnamzCVQJ5p3RrJYDFM5bFIMlQv/TkWQB
+ 5QkY14v1P7oNv7IeSUE0epRpVsIrO7jRDsl4h+6f/z+pRY7NCrC9n77y1ki0Di9/
+ zlVG0QKBgFXQkO/bf0Qs3COPWUs5nHyQ/sR0ptx1jrFDSjCdGvBC7NrDlwNP3894
+ EHCUTrEHhjtAGVzyZakZ6PLAN9cf86N1QhvOdj/oasL5vddWyFK74x2/mtp59VOU
+ LaCxnnbG4JoSVX96BSzUFbtRrQbf2+t5ZON9K12IPIxstMkF2j8u
+ </security:PrivateKey>
+ <security:Certificate>
+ MIIDSTCCArKgAwIBAgIJAKg8tR5hjVM4MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
+ BAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMK
+ V2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYD
+ VQQDEwtleGFtcGxlLm9yZzAeFw0wNzA4MDUxMzA4MDJaFw0xNzA4MDIxMzA4MDJa
+ MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTET
+ MBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJz
+ aXR5MRQwEgYDVQQDEwtleGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+ gYkCgYEA5zKHuD5DGPEQH+yLDMIA5M46HwJk7HxlGQ7N9WmkhaI22zXPC0UO8sY4
+ AJW/8nlm0pc505iQmbgslg7/JyBemBj1sI7pOp6eCUPs7NR2mwaujXBturiRaJIe
+ AX1Gjr3sO+3aLvqxUEu0PWqci4m1uc8XHQCA+PlEQQQnB9UIJwcCAwEAAaOB3DCB
+ 2TAdBgNVHQ4EFgQUzEhylzE4wmr4FK1lZ7zjR/KmA24wgakGA1UdIwSBoTCBnoAU
+ zEhylzE4wmr4FK1lZ7zjR/KmA26he6R5MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQI
+ ExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwG
+ A1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYDVQQDEwtleGFtcGxlLm9y
+ Z4IJAKg8tR5hjVM4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAGfkM
+ HUeWzHzsBkwTu+S2vX4gzlJPjiL3RzL40og/qyGz38P4KVg8IQvsGDjs1VFzzcAJ
+ I5ULnSocUOTk5sCTjDKT6VILhgAYJ1jnqIo7Z+VC1r3AS9cSDakzqWTc19EFKxEw
+ 6jeBWaqyykdSiVhCAmG5AJsvk+K032zjkWWMo+0=
+ </security:Certificate>
+ <security:Certificate>
+ MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
+ MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
+ Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
+ MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
+ dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
+ WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
+ oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
+ tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
+ D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
+ OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
+ AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+ BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
+ Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
+ bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
+ IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
+ aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
+ L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
+ Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
+ LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
+ cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
+ OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
+ ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
+ AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
+ Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
+ GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
+ pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
+ uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
+ ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
+ 1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
+ </security:Certificate>
+ <security:Certificate entityCertificate="true">
+ MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+ BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+ aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
+ MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
+ ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
+ x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
+ lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
+ DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
+ J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
+ T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
+ p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
+ 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+ BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
+ MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
+ BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
+ 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
+ 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
+ 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
+ i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
+ </security:Certificate>
+ <security:CRL>
+ MIIDBjCCAe4CAQEwDQYJKoZIhvcNAQEEBQAwVjELMAkGA1UEBhMCVVMxHDAaBgNV
+ BAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9uIENlcnRp
+ ZmljYXRpb24gQXV0aG9yaXR5Fw0wNzA4MDMxNDE0NDhaFw0wNzA5MDIxNDE0NDha
+ MIHdMBICAQIXDTA0MDMzMTE5NDk0NFowEgIBDhcNMDQwOTE3MTkzMTUxWjASAgEP
+ Fw0wNDA5MTcxOTMyMTRaMBICARYXDTA1MDMyMjE3MTYyMFowEgIBHBcNMDUwMjAx
+ MTkyOTUxWjASAgE+Fw0wNjA0MDcxNjM1MzFaMBICAUAXDTA2MDQwNzE2MzQ1NFow
+ EgIBQRcNMDYwNDEwMTcyMjE1WjASAgFWFw0wNjA3MjAxNzIyMzVaMBICAW8XDTA2
+ MTIxOTIwMTQxMVowEwICAIwXDTA3MDMyOTIxMjE0N1qggYMwgYAwfgYDVR0jBHcw
+ dYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYD
+ VQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0
+ aWZpY2F0aW9uIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOCAQEAeCvRTq70
+ RJxkxgbV+crqhN6oh3k974GGXhOxYDTTGjYbhK8JnCXkt1uJcnGfl1xyqrozoSrl
+ oxoBUmStA8vVqYwtO/FfGpnCyfOG9H2/rAkzbqwr/EXO+MqSd8e1AIJho97i/QSs
+ FWp40h7GeanmiZXL6bc4o9cKb0ROtc1n2nYHkLXptf9bFHte2Z/RhbUr8KaPU4b9
+ T9PW9a2Z7Oc4BDHpEUcljZL0AlO6mGI2RtDB9RdrtRY6M9YQbBwUcV9r+/+ylfZY
+ ugMRDTNUqL72hHKJgmbnfc0CmkcZKHOIGXdGCIX6ewNsLOQnlFAQEVyojQqbzT8w
+ s6E8aj6AzPhKyw==
+ </security:CRL>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicOnly.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicOnly.xml
index e7c9d77..4fc9f0e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicOnly.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicOnly.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:BasicInline">
- <security:PublicKey>
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
-uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
-LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
-NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
-nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
-E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
-4wIDAQAB
-</security:PublicKey>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:BasicInline">
+ <security:PublicKey>
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
+uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
+LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
+NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
+nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
+E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
+4wIDAQAB
+</security:PublicKey>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicPrivate.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicPrivate.xml
index 0ffd57f..e270c0e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicPrivate.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicPrivate.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:BasicInline">
- <security:PrivateKey >
-
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGDRPJAA/+0i84
-fz0S1pe5FGfxJjNOPtbVNs1jhW8GahuORGZKSSLiEf3HixCmLrfnCfpa1dM38U02
-aRMrc38uymYFbF9lL6f5xzsjzYTnK8IA9frtCxmCqCCWnZbl28r8WwwwJLpfpJWr
-MEsw/zw16dcrFj4czEyzSxPRQpiHVwASpp2sdEE7rloMFyblrSwFVi30rqmBo4eu
-n/NIhuGdHm0UUuMFu0WS0OkcvcB0YEfc5iJ00YoE7e0ncyzst4pewzT7Rjg/718d
-kg0vZfcTY3oZWcqzk9lOD2w/QW0ikBtib/7MLHtiPURP8SvyYN3q01UZJCyf2znF
-QHAaqfXjAgMBAAECggEAcbqcu/XfOZN1LlpStfio081WCvLGz43iTDnWI+pB4UsZ
-W88Hdm0dLPjr5KSFAQke7fua2oKjciKNFkusiG0ggbwUbdTXywFc0mCII30nbqCA
-HZEjcO/IzHDDlfoU5xYaMGQQUa0loTqf/9gRtac76jHIL6PsMxlWijb4wFgfwsc9
-ekw8U+Fht/XYukdj5Z42Bf956YxOVLKUGWeV+HJIK2ktyBjv6O5iVdpn1jXPftBk
-Fw/rJgtOdclWWFjUpxQuH789SebNWkduTBS//JCIUYWy97VE6nTO0HqwW58ue8Zx
-NrdPU57Nr1lpf/ONsxsaneqNIaiSdLbdTRBmi1EH4QKBgQD0Sa8FgtaARrI6Vk9w
-HApndCvB/2KnfGa25ut/1vIijMR5BMq8eYBS8rl0o3WnArSBNpaTlqr6frge3AnT
-6k7htXfZMkmVX+VrjF3vAd0fn5Llx1CN3+u27HJ6OnkWGpP7HasqJuyQR4UqF+Ag
-iiWmRw0Ugpz3Frf9UE5Y/FXX2QKBgQDPi+XEmEPwJ/3tubmF6aIk+3Z5AwJMYITf
-07hRpjrGLmUg2jJKiHyp3Z7n2eed4bhho2m0dTbeiHTSbrwnHxvvAwWWJD8nn2XE
-CR8/brYSQGp/9U4BVdCj+JoDwdLCrcd/C3nQXgcxAR8Hqp/v8sa8UdNDz5afW6lk
-Zpg/VgCCGwKBgF7cUguY0ATF7yW6KGTHbr7XnLpbmoqhQx2ZNC/TXvlNomnAE532
-rH8JZDzH0MMGyOM4OGadZk2ZcZQCLArPfMwm9KAx5+MKdwM5YayTE7PY+mkh6cT+
-BAFnddjC5gxQS9CCp9nZfZlVPH+o/86C9rXH92tUgPFuMAo86f+iFQ+ZAoGBAKFb
-mp9l4ivsa7dPFbXPFoi6GDms5TSMNcHu0PZpzngVyfnoqgDYbFOEQe7vsutEeh0u
-9xedqbMJVAnmndGslgMUzlsUgyVC/9ORZAHlCRjXi/U/ug2/sh5JQTR6lGlWwis7
-uNEOyXiH7p//P6lFjs0KsL2fvvLWSLQOL3/OVUbRAoGAVdCQ79t/RCzcI49ZSzmc
-fJD+xHSm3HWOsUNKMJ0a8ELs2sOXA0/fz3gQcJROsQeGO0AZXPJlqRno8sA31x/z
-o3VCG852P+hqwvm911bIUrvjHb+a2nn1U5QtoLGedsbgmhJVf3oFLNQVu1GtBt/b
-63lk430rXYg8jGy0yQXaPy4=
-
- </security:PrivateKey>
- <security:PublicKey>
-
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
-uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
-LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
-NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
-nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
-E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
-4wIDAQAB
-
- </security:PublicKey>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:BasicInline">
+ <security:PrivateKey >
+
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGDRPJAA/+0i84
+fz0S1pe5FGfxJjNOPtbVNs1jhW8GahuORGZKSSLiEf3HixCmLrfnCfpa1dM38U02
+aRMrc38uymYFbF9lL6f5xzsjzYTnK8IA9frtCxmCqCCWnZbl28r8WwwwJLpfpJWr
+MEsw/zw16dcrFj4czEyzSxPRQpiHVwASpp2sdEE7rloMFyblrSwFVi30rqmBo4eu
+n/NIhuGdHm0UUuMFu0WS0OkcvcB0YEfc5iJ00YoE7e0ncyzst4pewzT7Rjg/718d
+kg0vZfcTY3oZWcqzk9lOD2w/QW0ikBtib/7MLHtiPURP8SvyYN3q01UZJCyf2znF
+QHAaqfXjAgMBAAECggEAcbqcu/XfOZN1LlpStfio081WCvLGz43iTDnWI+pB4UsZ
+W88Hdm0dLPjr5KSFAQke7fua2oKjciKNFkusiG0ggbwUbdTXywFc0mCII30nbqCA
+HZEjcO/IzHDDlfoU5xYaMGQQUa0loTqf/9gRtac76jHIL6PsMxlWijb4wFgfwsc9
+ekw8U+Fht/XYukdj5Z42Bf956YxOVLKUGWeV+HJIK2ktyBjv6O5iVdpn1jXPftBk
+Fw/rJgtOdclWWFjUpxQuH789SebNWkduTBS//JCIUYWy97VE6nTO0HqwW58ue8Zx
+NrdPU57Nr1lpf/ONsxsaneqNIaiSdLbdTRBmi1EH4QKBgQD0Sa8FgtaARrI6Vk9w
+HApndCvB/2KnfGa25ut/1vIijMR5BMq8eYBS8rl0o3WnArSBNpaTlqr6frge3AnT
+6k7htXfZMkmVX+VrjF3vAd0fn5Llx1CN3+u27HJ6OnkWGpP7HasqJuyQR4UqF+Ag
+iiWmRw0Ugpz3Frf9UE5Y/FXX2QKBgQDPi+XEmEPwJ/3tubmF6aIk+3Z5AwJMYITf
+07hRpjrGLmUg2jJKiHyp3Z7n2eed4bhho2m0dTbeiHTSbrwnHxvvAwWWJD8nn2XE
+CR8/brYSQGp/9U4BVdCj+JoDwdLCrcd/C3nQXgcxAR8Hqp/v8sa8UdNDz5afW6lk
+Zpg/VgCCGwKBgF7cUguY0ATF7yW6KGTHbr7XnLpbmoqhQx2ZNC/TXvlNomnAE532
+rH8JZDzH0MMGyOM4OGadZk2ZcZQCLArPfMwm9KAx5+MKdwM5YayTE7PY+mkh6cT+
+BAFnddjC5gxQS9CCp9nZfZlVPH+o/86C9rXH92tUgPFuMAo86f+iFQ+ZAoGBAKFb
+mp9l4ivsa7dPFbXPFoi6GDms5TSMNcHu0PZpzngVyfnoqgDYbFOEQe7vsutEeh0u
+9xedqbMJVAnmndGslgMUzlsUgyVC/9ORZAHlCRjXi/U/ug2/sh5JQTR6lGlWwis7
+uNEOyXiH7p//P6lFjs0KsL2fvvLWSLQOL3/OVUbRAoGAVdCQ79t/RCzcI49ZSzmc
+fJD+xHSm3HWOsUNKMJ0a8ELs2sOXA0/fz3gQcJROsQeGO0AZXPJlqRno8sA31x/z
+o3VCG852P+hqwvm911bIUrvjHb+a2nn1U5QtoLGedsbgmhJVf3oFLNQVu1GtBt/b
+63lk430rXYg8jGy0yQXaPy4=
+
+ </security:PrivateKey>
+ <security:PublicKey>
+
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
+uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
+LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
+NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
+nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
+E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
+4wIDAQAB
+
+ </security:PublicKey>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineWrongCert.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineWrongCert.xml
index e27b8e5..ec04865 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineWrongCert.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineWrongCert.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="IdPCredential" xsi:type="security:X509Inline">
- <security:PrivateKey>
-MIIEowIBAAKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRm
-Skki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX6
-7QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqad
-rHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYi
-dNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+
-zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABAoIBAHG6nLv13zmTdS5a
-UrX4qNPNVgryxs+N4kw51iPqQeFLGVvPB3ZtHSz46+SkhQEJHu37mtqCo3IijRZL
-rIhtIIG8FG3U18sBXNJgiCN9J26ggB2RI3DvyMxww5X6FOcWGjBkEFGtJaE6n//Y
-EbWnO+oxyC+j7DMZVoo2+MBYH8LHPXpMPFPhYbf12LpHY+WeNgX/eemMTlSylBln
-lfhySCtpLcgY7+juYlXaZ9Y1z37QZBcP6yYLTnXJVlhY1KcULh+/PUnmzVpHbkwU
-v/yQiFGFsve1ROp0ztB6sFufLnvGcTa3T1Oeza9ZaX/zjbMbGp3qjSGoknS23U0Q
-ZotRB+ECgYEA9EmvBYLWgEayOlZPcBwKZ3Qrwf9ip3xmtubrf9byIozEeQTKvHmA
-UvK5dKN1pwK0gTaWk5aq+n64HtwJ0+pO4bV32TJJlV/la4xd7wHdH5+S5cdQjd/r
-tuxyejp5FhqT+x2rKibskEeFKhfgIIolpkcNFIKc9xa3/VBOWPxV19kCgYEAz4vl
-xJhD8Cf97bm5hemiJPt2eQMCTGCE39O4UaY6xi5lINoySoh8qd2e59nnneG4YaNp
-tHU23oh00m68Jx8b7wMFliQ/J59lxAkfP262EkBqf/VOAVXQo/iaA8HSwq3Hfwt5
-0F4HMQEfB6qf7/LGvFHTQ8+Wn1upZGaYP1YAghsCgYBe3FILmNAExe8luihkx26+
-15y6W5qKoUMdmTQv0175TaJpwBOd9qx/CWQ8x9DDBsjjODhmnWZNmXGUAiwKz3zM
-JvSgMefjCncDOWGskxOz2PppIenE/gQBZ3XYwuYMUEvQgqfZ2X2ZVTx/qP/Ogva1
-x/drVIDxbjAKPOn/ohUPmQKBgQChW5qfZeIr7Gu3TxW1zxaIuhg5rOU0jDXB7tD2
-ac54Fcn56KoA2GxThEHu77LrRHodLvcXnamzCVQJ5p3RrJYDFM5bFIMlQv/TkWQB
-5QkY14v1P7oNv7IeSUE0epRpVsIrO7jRDsl4h+6f/z+pRY7NCrC9n77y1ki0Di9/
-zlVG0QKBgFXQkO/bf0Qs3COPWUs5nHyQ/sR0ptx1jrFDSjCdGvBC7NrDlwNP3894
-EHCUTrEHhjtAGVzyZakZ6PLAN9cf86N1QhvOdj/oasL5vddWyFK74x2/mtp59VOU
-LaCxnnbG4JoSVX96BSzUFbtRrQbf2+t5ZON9K12IPIxstMkF2j8u
-
-</security:PrivateKey>
- <security:Certificate>
-MIIDSTCCArKgAwIBAgIJAKg8tR5hjVM4MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
-BAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMK
-V2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYD
-VQQDEwtleGFtcGxlLm9yZzAeFw0wNzA4MDUxMzA4MDJaFw0xNzA4MDIxMzA4MDJa
-MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTET
-MBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJz
-aXR5MRQwEgYDVQQDEwtleGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEA5zKHuD5DGPEQH+yLDMIA5M46HwJk7HxlGQ7N9WmkhaI22zXPC0UO8sY4
-AJW/8nlm0pc505iQmbgslg7/JyBemBj1sI7pOp6eCUPs7NR2mwaujXBturiRaJIe
-AX1Gjr3sO+3aLvqxUEu0PWqci4m1uc8XHQCA+PlEQQQnB9UIJwcCAwEAAaOB3DCB
-2TAdBgNVHQ4EFgQUzEhylzE4wmr4FK1lZ7zjR/KmA24wgakGA1UdIwSBoTCBnoAU
-zEhylzE4wmr4FK1lZ7zjR/KmA26he6R5MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQI
-ExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwG
-A1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYDVQQDEwtleGFtcGxlLm9y
-Z4IJAKg8tR5hjVM4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAGfkM
-HUeWzHzsBkwTu+S2vX4gzlJPjiL3RzL40og/qyGz38P4KVg8IQvsGDjs1VFzzcAJ
-I5ULnSocUOTk5sCTjDKT6VILhgAYJ1jnqIo7Z+VC1r3AS9cSDakzqWTc19EFKxEw
-6jeBWaqyykdSiVhCAmG5AJsvk+K032zjkWWMo+0=
-</security:Certificate>
-<security:Certificate>
-MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
-MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
-dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
-WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
-oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
-tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
-D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
-OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
-AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
-Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
-bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
-aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
-L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
-Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
-LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
-cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
-OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
-ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
-AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
-Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
-GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
-pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
-uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
-ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
-1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
-</security:Certificate>
-</security:Credential>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:Credential xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="IdPCredential" xsi:type="security:X509Inline">
+ <security:PrivateKey>
+MIIEowIBAAKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRm
+Skki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX6
+7QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqad
+rHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYi
+dNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+
+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABAoIBAHG6nLv13zmTdS5a
+UrX4qNPNVgryxs+N4kw51iPqQeFLGVvPB3ZtHSz46+SkhQEJHu37mtqCo3IijRZL
+rIhtIIG8FG3U18sBXNJgiCN9J26ggB2RI3DvyMxww5X6FOcWGjBkEFGtJaE6n//Y
+EbWnO+oxyC+j7DMZVoo2+MBYH8LHPXpMPFPhYbf12LpHY+WeNgX/eemMTlSylBln
+lfhySCtpLcgY7+juYlXaZ9Y1z37QZBcP6yYLTnXJVlhY1KcULh+/PUnmzVpHbkwU
+v/yQiFGFsve1ROp0ztB6sFufLnvGcTa3T1Oeza9ZaX/zjbMbGp3qjSGoknS23U0Q
+ZotRB+ECgYEA9EmvBYLWgEayOlZPcBwKZ3Qrwf9ip3xmtubrf9byIozEeQTKvHmA
+UvK5dKN1pwK0gTaWk5aq+n64HtwJ0+pO4bV32TJJlV/la4xd7wHdH5+S5cdQjd/r
+tuxyejp5FhqT+x2rKibskEeFKhfgIIolpkcNFIKc9xa3/VBOWPxV19kCgYEAz4vl
+xJhD8Cf97bm5hemiJPt2eQMCTGCE39O4UaY6xi5lINoySoh8qd2e59nnneG4YaNp
+tHU23oh00m68Jx8b7wMFliQ/J59lxAkfP262EkBqf/VOAVXQo/iaA8HSwq3Hfwt5
+0F4HMQEfB6qf7/LGvFHTQ8+Wn1upZGaYP1YAghsCgYBe3FILmNAExe8luihkx26+
+15y6W5qKoUMdmTQv0175TaJpwBOd9qx/CWQ8x9DDBsjjODhmnWZNmXGUAiwKz3zM
+JvSgMefjCncDOWGskxOz2PppIenE/gQBZ3XYwuYMUEvQgqfZ2X2ZVTx/qP/Ogva1
+x/drVIDxbjAKPOn/ohUPmQKBgQChW5qfZeIr7Gu3TxW1zxaIuhg5rOU0jDXB7tD2
+ac54Fcn56KoA2GxThEHu77LrRHodLvcXnamzCVQJ5p3RrJYDFM5bFIMlQv/TkWQB
+5QkY14v1P7oNv7IeSUE0epRpVsIrO7jRDsl4h+6f/z+pRY7NCrC9n77y1ki0Di9/
+zlVG0QKBgFXQkO/bf0Qs3COPWUs5nHyQ/sR0ptx1jrFDSjCdGvBC7NrDlwNP3894
+EHCUTrEHhjtAGVzyZakZ6PLAN9cf86N1QhvOdj/oasL5vddWyFK74x2/mtp59VOU
+LaCxnnbG4JoSVX96BSzUFbtRrQbf2+t5ZON9K12IPIxstMkF2j8u
+
+</security:PrivateKey>
+ <security:Certificate>
+MIIDSTCCArKgAwIBAgIJAKg8tR5hjVM4MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
+BAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMK
+V2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYD
+VQQDEwtleGFtcGxlLm9yZzAeFw0wNzA4MDUxMzA4MDJaFw0xNzA4MDIxMzA4MDJa
+MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTET
+MBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJz
+aXR5MRQwEgYDVQQDEwtleGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA5zKHuD5DGPEQH+yLDMIA5M46HwJk7HxlGQ7N9WmkhaI22zXPC0UO8sY4
+AJW/8nlm0pc505iQmbgslg7/JyBemBj1sI7pOp6eCUPs7NR2mwaujXBturiRaJIe
+AX1Gjr3sO+3aLvqxUEu0PWqci4m1uc8XHQCA+PlEQQQnB9UIJwcCAwEAAaOB3DCB
+2TAdBgNVHQ4EFgQUzEhylzE4wmr4FK1lZ7zjR/KmA24wgakGA1UdIwSBoTCBnoAU
+zEhylzE4wmr4FK1lZ7zjR/KmA26he6R5MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQI
+ExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwG
+A1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYDVQQDEwtleGFtcGxlLm9y
+Z4IJAKg8tR5hjVM4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAGfkM
+HUeWzHzsBkwTu+S2vX4gzlJPjiL3RzL40og/qyGz38P4KVg8IQvsGDjs1VFzzcAJ
+I5ULnSocUOTk5sCTjDKT6VILhgAYJ1jnqIo7Z+VC1r3AS9cSDakzqWTc19EFKxEw
+6jeBWaqyykdSiVhCAmG5AJsvk+K032zjkWWMo+0=
+</security:Certificate>
+<security:Certificate>
+MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
+MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
+dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
+WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
+oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
+tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
+D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
+OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
+AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
+Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
+bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
+aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
+L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
+Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
+LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
+cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
+OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
+ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
+AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
+Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
+GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
+pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
+uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
+ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
+1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
+</security:Certificate>
+</security:Credential>
+
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chain.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chain.xml
index 3751b93..04c461e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chain.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chain.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine
- xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- xsi:type="security:SignatureChaining" id="Chain">
- <security:TrustEngine
- id="shibboleth.SignatureMetadataExplicitKeyTrustEngine" xsi:type="security:MetadataExplicitKeySignature"
- metadataProviderRef="ShibbolethMetadata" />
- <security:TrustEngine id="testBean"
- xsi:type="security:StaticExplicitKeySignature">
- <security:Credential id="IdPCredential" xsi:type="security:X509Inline">
- <security:Certificate>
- MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
- BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
- aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
- MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
- ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
- x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
- lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
- DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
- J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
- T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
- p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
- 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
- BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
- MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
- BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
- 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
- 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
- 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
- i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
- </security:Certificate>
- </security:Credential>
- </security:TrustEngine>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:TrustEngine
+ xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ xsi:type="security:SignatureChaining" id="Chain">
+ <security:TrustEngine
+ id="shibboleth.SignatureMetadataExplicitKeyTrustEngine" xsi:type="security:MetadataExplicitKeySignature"
+ metadataProviderRef="ShibbolethMetadata" />
+ <security:TrustEngine id="testBean"
+ xsi:type="security:StaticExplicitKeySignature">
+ <security:Credential id="IdPCredential" xsi:type="security:X509Inline">
+ <security:Certificate>
+ MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+ BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+ aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
+ MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
+ ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
+ x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
+ lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
+ DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
+ J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
+ T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
+ p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
+ 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+ BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
+ MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
+ BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
+ 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
+ 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
+ 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
+ i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
+ </security:Certificate>
+ </security:Credential>
+ </security:TrustEngine>
</security:TrustEngine>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfo.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfo.xml
index e4c61c6..3ee7a7d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfo.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfo.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="validInfoSimple" xsi:type="security:PKIXResourceBacked"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="validInfoSimple" xsi:type="security:PKIXResourceBacked"/>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfoValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfoValues.xml
index ceb53a8..c95b154 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfoValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/filesystemValidationInfoValues.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="validInfoValues" xsi:type="security:PKIXFilesystem" verifyDepth="99">
-
- <security:Certificate>${DIR}/trustengine/cert.pem</security:Certificate>
- <security:Certificate>classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/cert.pem</security:Certificate>
- <security:CRL>${DIR}/trustengine/crl.pem</security:CRL>
-</security:ValidationInfo>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ id="validInfoValues" xsi:type="security:PKIXFilesystem" verifyDepth="99">
+
+ <security:Certificate>${DIR}/trustengine/cert.pem</security:Certificate>
+ <security:Certificate>classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/cert.pem</security:Certificate>
+ <security:CRL>${DIR}/trustengine/crl.pem</security:CRL>
+</security:ValidationInfo>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfo.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfo.xml
index d0658ed..263193d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfo.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfo.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- id="PKIXInline" xsi:type="security:PKIXInline"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
+ id="PKIXInline" xsi:type="security:PKIXInline"/>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfoValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfoValues.xml
index 241ffd7..025db6e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfoValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfoValues.xml
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- id="PKIXInlineValues" xsi:type="security:PKIXInline" verifyDepth="98">
- <security:Certificate>
- MIIDSTCCArKgAwIBAgIJAKg8tR5hjVM4MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
- BAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMK
- V2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYD
- VQQDEwtleGFtcGxlLm9yZzAeFw0wNzA4MDUxMzA4MDJaFw0xNzA4MDIxMzA4MDJa
- MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTET
- MBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJz
- aXR5MRQwEgYDVQQDEwtleGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
- gYkCgYEA5zKHuD5DGPEQH+yLDMIA5M46HwJk7HxlGQ7N9WmkhaI22zXPC0UO8sY4
- AJW/8nlm0pc505iQmbgslg7/JyBemBj1sI7pOp6eCUPs7NR2mwaujXBturiRaJIe
- AX1Gjr3sO+3aLvqxUEu0PWqci4m1uc8XHQCA+PlEQQQnB9UIJwcCAwEAAaOB3DCB
- 2TAdBgNVHQ4EFgQUzEhylzE4wmr4FK1lZ7zjR/KmA24wgakGA1UdIwSBoTCBnoAU
- zEhylzE4wmr4FK1lZ7zjR/KmA26he6R5MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQI
- ExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwG
- A1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYDVQQDEwtleGFtcGxlLm9y
- Z4IJAKg8tR5hjVM4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAGfkM
- HUeWzHzsBkwTu+S2vX4gzlJPjiL3RzL40og/qyGz38P4KVg8IQvsGDjs1VFzzcAJ
- I5ULnSocUOTk5sCTjDKT6VILhgAYJ1jnqIo7Z+VC1r3AS9cSDakzqWTc19EFKxEw
- 6jeBWaqyykdSiVhCAmG5AJsvk+K032zjkWWMo+0=
- </security:Certificate>
- <security:Certificate>
- MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
- MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
- Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
- MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
- dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
- WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
- oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
- tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
- D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
- OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
- AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
- BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
- Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
- bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
- IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
- aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
- L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
- Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
- LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
- cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
- OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
- ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
- AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
- Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
- GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
- pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
- uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
- ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
- 1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
- </security:Certificate>
- <security:CRL>
- MIIDBjCCAe4CAQEwDQYJKoZIhvcNAQEEBQAwVjELMAkGA1UEBhMCVVMxHDAaBgNV
- BAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9uIENlcnRp
- ZmljYXRpb24gQXV0aG9yaXR5Fw0wNzA4MDMxNDE0NDhaFw0wNzA5MDIxNDE0NDha
- MIHdMBICAQIXDTA0MDMzMTE5NDk0NFowEgIBDhcNMDQwOTE3MTkzMTUxWjASAgEP
- Fw0wNDA5MTcxOTMyMTRaMBICARYXDTA1MDMyMjE3MTYyMFowEgIBHBcNMDUwMjAx
- MTkyOTUxWjASAgE+Fw0wNjA0MDcxNjM1MzFaMBICAUAXDTA2MDQwNzE2MzQ1NFow
- EgIBQRcNMDYwNDEwMTcyMjE1WjASAgFWFw0wNjA3MjAxNzIyMzVaMBICAW8XDTA2
- MTIxOTIwMTQxMVowEwICAIwXDTA3MDMyOTIxMjE0N1qggYMwgYAwfgYDVR0jBHcw
- dYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYD
- VQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0
- aWZpY2F0aW9uIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOCAQEAeCvRTq70
- RJxkxgbV+crqhN6oh3k974GGXhOxYDTTGjYbhK8JnCXkt1uJcnGfl1xyqrozoSrl
- oxoBUmStA8vVqYwtO/FfGpnCyfOG9H2/rAkzbqwr/EXO+MqSd8e1AIJho97i/QSs
- FWp40h7GeanmiZXL6bc4o9cKb0ROtc1n2nYHkLXptf9bFHte2Z/RhbUr8KaPU4b9
- T9PW9a2Z7Oc4BDHpEUcljZL0AlO6mGI2RtDB9RdrtRY6M9YQbBwUcV9r+/+ylfZY
- ugMRDTNUqL72hHKJgmbnfc0CmkcZKHOIGXdGCIX6ewNsLOQnlFAQEVyojQqbzT8w
- s6E8aj6AzPhKyw==
- </security:CRL>
-</security:ValidationInfo>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:ValidationInfo xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+ id="PKIXInlineValues" xsi:type="security:PKIXInline" verifyDepth="98">
+ <security:Certificate>
+ MIIDSTCCArKgAwIBAgIJAKg8tR5hjVM4MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
+ BAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMK
+ V2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYD
+ VQQDEwtleGFtcGxlLm9yZzAeFw0wNzA4MDUxMzA4MDJaFw0xNzA4MDIxMzA4MDJa
+ MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQIExREaXN0cmljdCBvZiBDb2x1bWJpYTET
+ MBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwGA1UEChMVR2VvcmdldG93biBVbml2ZXJz
+ aXR5MRQwEgYDVQQDEwtleGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+ gYkCgYEA5zKHuD5DGPEQH+yLDMIA5M46HwJk7HxlGQ7N9WmkhaI22zXPC0UO8sY4
+ AJW/8nlm0pc505iQmbgslg7/JyBemBj1sI7pOp6eCUPs7NR2mwaujXBturiRaJIe
+ AX1Gjr3sO+3aLvqxUEu0PWqci4m1uc8XHQCA+PlEQQQnB9UIJwcCAwEAAaOB3DCB
+ 2TAdBgNVHQ4EFgQUzEhylzE4wmr4FK1lZ7zjR/KmA24wgakGA1UdIwSBoTCBnoAU
+ zEhylzE4wmr4FK1lZ7zjR/KmA26he6R5MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQI
+ ExREaXN0cmljdCBvZiBDb2x1bWJpYTETMBEGA1UEBxMKV2FzaGluZ3RvbjEeMBwG
+ A1UEChMVR2VvcmdldG93biBVbml2ZXJzaXR5MRQwEgYDVQQDEwtleGFtcGxlLm9y
+ Z4IJAKg8tR5hjVM4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAGfkM
+ HUeWzHzsBkwTu+S2vX4gzlJPjiL3RzL40og/qyGz38P4KVg8IQvsGDjs1VFzzcAJ
+ I5ULnSocUOTk5sCTjDKT6VILhgAYJ1jnqIo7Z+VC1r3AS9cSDakzqWTc19EFKxEw
+ 6jeBWaqyykdSiVhCAmG5AJsvk+K032zjkWWMo+0=
+ </security:Certificate>
+ <security:Certificate>
+ MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
+ MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
+ Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
+ MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
+ dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
+ WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
+ oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
+ tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
+ D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
+ OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
+ AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+ BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
+ Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
+ bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
+ IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
+ aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
+ L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
+ Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
+ LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
+ cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
+ OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
+ ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
+ AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
+ Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
+ GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
+ pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
+ uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
+ ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
+ 1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
+ </security:Certificate>
+ <security:CRL>
+ MIIDBjCCAe4CAQEwDQYJKoZIhvcNAQEEBQAwVjELMAkGA1UEBhMCVVMxHDAaBgNV
+ BAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9uIENlcnRp
+ ZmljYXRpb24gQXV0aG9yaXR5Fw0wNzA4MDMxNDE0NDhaFw0wNzA5MDIxNDE0NDha
+ MIHdMBICAQIXDTA0MDMzMTE5NDk0NFowEgIBDhcNMDQwOTE3MTkzMTUxWjASAgEP
+ Fw0wNDA5MTcxOTMyMTRaMBICARYXDTA1MDMyMjE3MTYyMFowEgIBHBcNMDUwMjAx
+ MTkyOTUxWjASAgE+Fw0wNjA0MDcxNjM1MzFaMBICAUAXDTA2MDQwNzE2MzQ1NFow
+ EgIBQRcNMDYwNDEwMTcyMjE1WjASAgFWFw0wNjA3MjAxNzIyMzVaMBICAW8XDTA2
+ MTIxOTIwMTQxMVowEwICAIwXDTA3MDMyOTIxMjE0N1qggYMwgYAwfgYDVR0jBHcw
+ dYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYD
+ VQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0
+ aWZpY2F0aW9uIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOCAQEAeCvRTq70
+ RJxkxgbV+crqhN6oh3k974GGXhOxYDTTGjYbhK8JnCXkt1uJcnGfl1xyqrozoSrl
+ oxoBUmStA8vVqYwtO/FfGpnCyfOG9H2/rAkzbqwr/EXO+MqSd8e1AIJho97i/QSs
+ FWp40h7GeanmiZXL6bc4o9cKb0ROtc1n2nYHkLXptf9bFHte2Z/RhbUr8KaPU4b9
+ T9PW9a2Z7Oc4BDHpEUcljZL0AlO6mGI2RtDB9RdrtRY6M9YQbBwUcV9r+/+ylfZY
+ ugMRDTNUqL72hHKJgmbnfc0CmkcZKHOIGXdGCIX6ewNsLOQnlFAQEVyojQqbzT8w
+ s6E8aj6AzPhKyw==
+ </security:CRL>
+</security:ValidationInfo>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml
index cd5ce38..ec84d99 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine id="testBean"
- xsi:type="security:StaticExplicitKey" xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <security:Credential id="InLineBean" xsi:type="security:X509Inline">
- <security:Certificate>
- MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
- BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
- aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
- MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
- ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
- x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
- lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
- DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
- J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
- T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
- p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
- 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
- BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
- MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
- BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
- 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
- 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
- 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
- i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
- </security:Certificate>
- </security:Credential>
-</security:TrustEngine>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:TrustEngine id="testBean"
+ xsi:type="security:StaticExplicitKey" xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <security:Credential id="InLineBean" xsi:type="security:X509Inline">
+ <security:Certificate>
+ MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+ BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+ aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
+ MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
+ ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9
+ x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgg
+ lp2W5dvK/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65a
+ DBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3t
+ J3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1E
+ T/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGkMB0GA1UdDgQWBBSiQhSu
+ p9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkEiQK7w/Zq
+ 0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+ BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQF
+ MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089H
+ BkgVPOuVuEe803BRlKd4BVIsuxAUAy3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO7
+ 0/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD/Uv0Sqy2nilM8BnMga5tqsL+
+ 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
+ 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
+ i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
+ </security:Certificate>
+ </security:Credential>
+</security:TrustEngine>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml
index 8c50081..20bc02a 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
-
- <context:property-placeholder
- location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties" />
-
- <bean id="staticKeySingle"
- class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
- p:publicKeys="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/publicKey.pem" />
-
- <bean id="staticX509Single"
- class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
- p:certificates="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem" />
-
- <bean id="staticX509Multiple"
- class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
- p:certificates="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/certificate.pem" />
-
- <bean id="staticMixed"
- class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
- p:publicKeys="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/publicKey.pem"
- p:certificates="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem" />
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+ default-init-method="initialize" default-destroy-method="destroy">
+
+ <context:property-placeholder
+ location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties" />
+
+ <bean id="staticKeySingle"
+ class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
+ p:publicKeys="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/publicKey.pem" />
+
+ <bean id="staticX509Single"
+ class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
+ p:certificates="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem" />
+
+ <bean id="staticX509Multiple"
+ class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
+ p:certificates="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/certificate.pem" />
+
+ <bean id="staticMixed"
+ class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
+ p:publicKeys="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/publicKey.pem"
+ p:certificates="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem" />
+
+</beans>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIX.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIX.xml
index 1eeb127..c327787 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIX.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIX.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine id="testBean"
- xsi:type="security:StaticPKIXSignature" xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <security:ValidationInfo id="PKIXInline"
- xsi:type="security:PKIXInline" />
-</security:TrustEngine>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:TrustEngine id="testBean"
+ xsi:type="security:StaticPKIXSignature" xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <security:ValidationInfo id="PKIXInline"
+ xsi:type="security:PKIXInline" />
+</security:TrustEngine>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml
index 4c2eab5..7acfd3e 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine id="testBean"
- xsi:type="security:StaticPKIXSignature" xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <security:TrustedName>Name1</security:TrustedName>
- <security:TrustedName>Name2</security:TrustedName>
- <security:TrustedName>Name3</security:TrustedName>
- <security:ValidationInfo id="PKIXFS"
- xsi:type="security:PKIXFilesystem" verifyDepth="99" />
- <security:ValidationInfo id="PKIXIL"
- xsi:type="security:PKIXInline" verifyDepth="98" />
- <security:ValidationOptions
- processCredentialCRLs="false" processExpiredCRLs="false"
- processEmptyCRLs="false" defaultVerificationDepth="2" />
-</security:TrustEngine>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:TrustEngine id="testBean"
+ xsi:type="security:StaticPKIXSignature" xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <security:TrustedName>Name1</security:TrustedName>
+ <security:TrustedName>Name2</security:TrustedName>
+ <security:TrustedName>Name3</security:TrustedName>
+ <security:ValidationInfo id="PKIXFS"
+ xsi:type="security:PKIXFilesystem" verifyDepth="99" />
+ <security:ValidationInfo id="PKIXIL"
+ xsi:type="security:PKIXInline" verifyDepth="98" />
+ <security:ValidationOptions
+ processCredentialCRLs="false" processExpiredCRLs="false"
+ processEmptyCRLs="false" defaultVerificationDepth="2" />
+</security:TrustEngine>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml
index f0cab3f..4383770 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine id="testBean"
- xsi:type="security:StaticPKIXSignature" xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <security:TrustedName>Name1</security:TrustedName>
- <security:ValidationInfo id="PKIXFS"
- xsi:type="security:PKIXFilesystem" verifyDepth="99" />
- <security:ValidationOptions xsi:type="security:CertPathValidationOptionsType"
- processCredentialCRLs="false" processExpiredCRLs="false"
- processEmptyCRLs="false" defaultVerificationDepth="3"
- anyPolicyInhibit="true" policyMappingInhibit="true" forceRevocationEnabled="true" revocationEnabled="false"
- >
- <security:PolicyOID>1234
- </security:PolicyOID><security:PolicyOID>
-
- </security:PolicyOID>
- </security:ValidationOptions>
-</security:TrustEngine>
+<?xml version="1.0" encoding="UTF-8"?>
+<security:TrustEngine id="testBean"
+ xsi:type="security:StaticPKIXSignature" xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ <security:TrustedName>Name1</security:TrustedName>
+ <security:ValidationInfo id="PKIXFS"
+ xsi:type="security:PKIXFilesystem" verifyDepth="99" />
+ <security:ValidationOptions xsi:type="security:CertPathValidationOptionsType"
+ processCredentialCRLs="false" processExpiredCRLs="false"
+ processEmptyCRLs="false" defaultVerificationDepth="3"
+ anyPolicyInhibit="true" policyMappingInhibit="true" forceRevocationEnabled="true" revocationEnabled="false"
+ >
+ <security:PolicyOID>1234
+ </security:PolicyOID><security:PolicyOID>
+
+ </security:PolicyOID>
+ </security:ValidationOptions>
+</security:TrustEngine>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptions.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptions.xml
index 4cfedc1..eb36a83 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptions.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptions.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions
- xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<security:ValidationOptions
+ xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptionsValues.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptionsValues.xml
index d299f37..7ec42ed 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptionsValues.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptionsValues.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions
- xmlns:security="urn:mace:shibboleth:2.0:security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
+<?xml version="1.0" encoding="UTF-8"?>
+<security:ValidationOptions
+ xmlns:security="urn:mace:shibboleth:2.0:security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+
processCredentialCRLs="false" processExpiredCRLs="true" processEmptyCRLs="false" defaultVerificationDepth="2"/>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-in.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-in.xml
index b443f77..54c8a5f 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-in.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-in.xml
@@ -1,165 +1,165 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="test1-metadata">
-
- <!-- Resign this metadata with the key found in credendial\key.pem -->
-
- <Extensions>
- <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
- <!-- CN=ca.example.org, O=Internet2 , RSA cert -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDXTCCAkWgAwIBAgIBATANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDQwOTA1NDcxMloX
- DTE3MDQwNjA1NDcxMlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5j
- YS5leGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxM
- 5/6mBCcX+S7HApcKtfqdFRZzi6Ra91nkEzXOUcO+BPUdYqSxKGnCCso25ZOZP3gn
- JVkY8Pi7VWrCM6wRgIMyQDvNYqCpNjkZGFkrMoa6fm8BSaDHJ1fz6l/eEl0CVU3U
- uUAf0mXQLGm6Jannq8aMolRujlhE5iRaOJ2qp6wqsvyatK+vTgDngnwYVa4Cqu0j
- UeNF28quST5D3gIuZ0OeFHSM2Z1WUKkwwsHqVkxBBcH1QE1JOGIoSnrxxl/o4VlL
- WGEI8zq5qixE8VYtBBmijBwIL5ETy2fwiqcsvimQaQAtAfbtpO3kBSs8n7nnzMUH
- fRlcebGkwwcNfYcD5hcCAwEAAaOBhzCBhDAdBgNVHQ4EFgQU1e5lU95R2oetQupB
- bvKv1u5GlAswVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0x
- EjAQBgNVBAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEw
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbqrozetM/iBVIUir9k14
- HbLEP0lZ6jOPWFIUFXMOn0t8+Ul7PMp9Rdn+7OGQIoJw97/mam3kpQ/HmjJMFYv6
- MGsDQ4vAOiQiaTKzgMhrnCdVpVH9uz4ARHiysCujnjH9sehTWgybY8pXzzSG5BAj
- EGowHq01nXxq2K4yAJSdAUBYLfuSKW1uRU6cmEa9uzl9EvoZfAF3BLnGlPqu4Zaj
- H2NC9ZY0y19LX4yeJLHL1sY4fyxb3x8QhcCXiI16awBTr/VnUpJjSe9vh+OudWGe
- yCL/KhjlrDkjJ3hIxBF5mP/Y27cFpRnC2gECkieURvh52OyuqkzpbOrTN5rD9fNi
- nA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </shibmd:KeyAuthority>
- </Extensions>
-
- <EntityDescriptor entityID="http://idp.example.org/shibboleth">
- <!-- Protocol FOO -->
- <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO">
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>IDP-SSO-RSA-Key</ds:KeyName>
- <ds:KeyValue>
- <ds:RSAKeyValue>
- <ds:Modulus>
- AN8JWAXYu+G7RDfkW+YBUYxdzeLUyiNyrJtx9Vt+fROD8CPkW+4CIMWD0qka8wcMp0s5j7XGwpmr
- IibnxIWFb7nPnVimduUcaO4O0+09u2ylDukA6ySee9spmvHtEY04nJBkTdCfzxjlkE3MAG6yo1eO
- taVT2bhr5c0gWozhhskv
- </ds:Modulus>
- <ds:Exponent>AQAB</ds:Exponent>
- </ds:RSAKeyValue>
- </ds:KeyValue>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <!-- DSA cert -->
- <ds:X509Certificate>
- MIIECTCCAvGgAwIBAgIBMzANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMTYxMVoX
- DTE3MDUyMjIwMTYxMVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIIBtjCC
- ASsGByqGSM44BAEwggEeAoGBAI+ktw7R9m7TxjaCrT2MHwWNQUAyXPrqbFCcu+DC
- irr861U6R6W/GyqWdcy8/D1Hh/I1U94POQn5yfqVPpVH2ZRS4OMFndHWaoo9V5LJ
- oXTXHiDYB3W4t9tn0fm7It0n7VoUI5C4y9LG32Hq+UIGF/ktNTmo//mEqLS6aJNd
- bMFpAhUArmKGh0hcpmjukYArWcMRvipB4CMCgYBuCiCrUaHBRRtqrk0P/Luq0l2M
- 2718GwSGeLPZip06gACDG7IctMrgH1J+ZIjsx6vffi977wnMDiktqacmaobV+SCR
- W9ijJRdkYpUHmlLvuJGnDPjkvewpbGWJsCabpWEvWdYw3ma8RuHOPj4Jkrdd4VcR
- aFwox/fPJ7cG6kBydgOBhAACgYBxQIPv9DCsmiMHG1FAxSARX0GcRiELJPJ+MtaS
- tdTrVobNa2jebwc3npLiTvUR4U/CDo1mSZb+Sp/wian8kNZHmGcR6KbtJs9UDsa3
- V0pbbgpUar4HcxV+NQJBbhn9RGu85g3PDILUrINiUAf26mhPN5Y0paM+HbM68nUf
- 1OLv16OBsjCBrzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
- bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUIHFAEB/3jIIZzJEJ/qdsuI8v
- N3kwVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0xEjAQBgNV
- BAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEwDQYJKoZI
- hvcNAQEFBQADggEBAJt4Q34+pqjW5tHHhkdzTITSBjOOf8EvYMgxTMRzhagLSHTt
- 9RgO5i/G7ELvnwe1j6187m1XD9iEAWKeKbB//ljeOpgnwzkLR9Er5tr1RI3cbil0
- AX+oX0c1jfRaQnR50Rfb5YoNX6G963iphlxp9C8VLB6eOk/S270XoWoQIkO1ioQ8
- JY4HE6AyDsOpJaOmHpBaxjgsiko52ZWZeZyaCyL98BXwVxeml7pYnHlXWWidB0N/
- Zy+LbvWg3urUkiDjMcB6nGImmEfDSxRdybitcMwbwL26z2WOpwL3llm3mcCydKXg
- Xt8IQhfDhOZOHWckeD2tStnJRP/cqBgO62/qirw=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_FOO"/>
- </IDPSSODescriptor>
-
- <!-- Protocol BAR -->
- <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BAR">
- <!-- Note no 'use' specified. -->
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <!-- RSA cert -->
- <ds:X509Certificate>
- MIIC8TCCAdmgAwIBAgIBMjANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMDk1MVoX
- DTE3MDUyMjIwMDk1MVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIGfMA0G
- CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfCVgF2Lvhu0Q35FvmAVGMXc3i1Mojcqyb
- cfVbfn0Tg/Aj5FvuAiDFg9KpGvMHDKdLOY+1xsKZqyIm58SFhW+5z51YpnblHGju
- DtPtPbtspQ7pAOsknnvbKZrx7RGNOJyQZE3Qn88Y5ZBNzABusqNXjrWlU9m4a+XN
- IFqM4YbJLwIDAQABo4GyMIGvMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9w
- ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT2qDRFTzawttBG
- jN6wxni/12tQQjBVBgNVHSMETjBMgBTV7mVT3lHah61C6kFu8q/W7kaUC6ExpC8w
- LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5jYS5leGFtcGxlLm9yZ4IB
- ATANBgkqhkiG9w0BAQUFAAOCAQEAlJYAou5ko3ujHVhOc4OB2AOOqdXAjThiXg6z
- Tjezs7/F53b9IRt4in/k92y1tKZ87F/JcnH6MrzKfb8m5XtcYwtUSvmFTCp5rrFp
- z1JhXlgnaWVJJ2G2vKLDGuPQvLV9zsWhnkbTPuzocvOotxl7w7LJvO3D/tzTAnnU
- bgg1AfP+CTDs3F/ceHzWGVWTMUAmNGX8gMS2/xh66QoEzl7LBG8Xzpo0j+gSxe7h
- Scb5iS4U/XUEbZylMUbbK57h9Bez8VVeO1jfwAniIBT0Ur9ksiYsAdyXYoXssGiF
- bKW1K3QG1GA9wwGy5GvjyALuuXL4lEzFB0kMsGucNMfyyojX9A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_BAR"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.example.org</ds:KeyName>
- </ds:KeyInfo>> </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
- </AttributeAuthorityDescriptor>
-
- </EntityDescriptor>
-
-
-
- <EntityDescriptor entityID="http://sp.example.org/">
-
- <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO PROTOCOL_BAR">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <!-- RSA cert -->
- <ds:X509Certificate>
- MIIC8DCCAdigAwIBAgIBNDANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMzEwOFoX
- DTE3MDUyMjIwMzEwOFowGTEXMBUGA1UEAxMOc3AuZXhhbXBsZS5vcmcwgZ8wDQYJ
- KoZIhvcNAQEBBQADgY0AMIGJAoGBAKk7xVQ23rc51qieDAcj3CCsumTTpTiFCxGi
- qDA8lStdcBmoNX3v+lBFKkXtQKwebcwOF3YyHFyZ2kXFREfZrG76h/5QBFNQZa6y
- /rJskCl9bnz70HVDzBGizRc3qWVDKP1EQ6rRY2qkeGd33NKHkVUepGMPhHsv3kK+
- zVUR6/v/AgMBAAGjgbIwga8wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
- blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOhBatBFJQgNeKiG
- 1/Ro9W9zmO92MFUGA1UdIwROMEyAFNXuZVPeUdqHrULqQW7yr9buRpQLoTGkLzAt
- MRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnggEB
- MA0GCSqGSIb3DQEBBQUAA4IBAQAhpFQ4+OOrtETiuSagUe9dSqm1hahcQuv3iWRf
- L7Pp6i2x1rR6hlk9zXUC58Oou/UOUOpPWZG/8cr3B50ViuT3zVisIYdaCGeUZ3ef
- EeeeaI77m73xpn/qNI4aIlr6Wmj9C0biJsF3hJvtK2VJu74GCUtxsXkEKyQ0fNx6
- bTd50RxUhM4uto7YqvMfKH6GDJPRcFmsR5YEajxOVihfRtOjvd1rTnOQLWYQRy1O
- ZQek1Z6M7aJmYanYEAjQhyzbKM+R2sqzMlgHbGnbeAADEBnQi8GSkTpgyieT6NC8
- 6SvWhq47gNpBYySYhb9zKx/OcZMK4UBD48HhAatEgovrKCHH
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.example.org/Shibboleth.sso/POST" index="0"/>
- </SPSSODescriptor>
-
- </EntityDescriptor>
-
-</EntitiesDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="test1-metadata">
+
+ <!-- Resign this metadata with the key found in credendial\key.pem -->
+
+ <Extensions>
+ <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
+ <!-- CN=ca.example.org, O=Internet2 , RSA cert -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDXTCCAkWgAwIBAgIBATANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDQwOTA1NDcxMloX
+ DTE3MDQwNjA1NDcxMlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5j
+ YS5leGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxM
+ 5/6mBCcX+S7HApcKtfqdFRZzi6Ra91nkEzXOUcO+BPUdYqSxKGnCCso25ZOZP3gn
+ JVkY8Pi7VWrCM6wRgIMyQDvNYqCpNjkZGFkrMoa6fm8BSaDHJ1fz6l/eEl0CVU3U
+ uUAf0mXQLGm6Jannq8aMolRujlhE5iRaOJ2qp6wqsvyatK+vTgDngnwYVa4Cqu0j
+ UeNF28quST5D3gIuZ0OeFHSM2Z1WUKkwwsHqVkxBBcH1QE1JOGIoSnrxxl/o4VlL
+ WGEI8zq5qixE8VYtBBmijBwIL5ETy2fwiqcsvimQaQAtAfbtpO3kBSs8n7nnzMUH
+ fRlcebGkwwcNfYcD5hcCAwEAAaOBhzCBhDAdBgNVHQ4EFgQU1e5lU95R2oetQupB
+ bvKv1u5GlAswVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0x
+ EjAQBgNVBAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEw
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbqrozetM/iBVIUir9k14
+ HbLEP0lZ6jOPWFIUFXMOn0t8+Ul7PMp9Rdn+7OGQIoJw97/mam3kpQ/HmjJMFYv6
+ MGsDQ4vAOiQiaTKzgMhrnCdVpVH9uz4ARHiysCujnjH9sehTWgybY8pXzzSG5BAj
+ EGowHq01nXxq2K4yAJSdAUBYLfuSKW1uRU6cmEa9uzl9EvoZfAF3BLnGlPqu4Zaj
+ H2NC9ZY0y19LX4yeJLHL1sY4fyxb3x8QhcCXiI16awBTr/VnUpJjSe9vh+OudWGe
+ yCL/KhjlrDkjJ3hIxBF5mP/Y27cFpRnC2gECkieURvh52OyuqkzpbOrTN5rD9fNi
+ nA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </shibmd:KeyAuthority>
+ </Extensions>
+
+ <EntityDescriptor entityID="http://idp.example.org/shibboleth">
+ <!-- Protocol FOO -->
+ <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>IDP-SSO-RSA-Key</ds:KeyName>
+ <ds:KeyValue>
+ <ds:RSAKeyValue>
+ <ds:Modulus>
+ AN8JWAXYu+G7RDfkW+YBUYxdzeLUyiNyrJtx9Vt+fROD8CPkW+4CIMWD0qka8wcMp0s5j7XGwpmr
+ IibnxIWFb7nPnVimduUcaO4O0+09u2ylDukA6ySee9spmvHtEY04nJBkTdCfzxjlkE3MAG6yo1eO
+ taVT2bhr5c0gWozhhskv
+ </ds:Modulus>
+ <ds:Exponent>AQAB</ds:Exponent>
+ </ds:RSAKeyValue>
+ </ds:KeyValue>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <!-- DSA cert -->
+ <ds:X509Certificate>
+ MIIECTCCAvGgAwIBAgIBMzANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMTYxMVoX
+ DTE3MDUyMjIwMTYxMVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIIBtjCC
+ ASsGByqGSM44BAEwggEeAoGBAI+ktw7R9m7TxjaCrT2MHwWNQUAyXPrqbFCcu+DC
+ irr861U6R6W/GyqWdcy8/D1Hh/I1U94POQn5yfqVPpVH2ZRS4OMFndHWaoo9V5LJ
+ oXTXHiDYB3W4t9tn0fm7It0n7VoUI5C4y9LG32Hq+UIGF/ktNTmo//mEqLS6aJNd
+ bMFpAhUArmKGh0hcpmjukYArWcMRvipB4CMCgYBuCiCrUaHBRRtqrk0P/Luq0l2M
+ 2718GwSGeLPZip06gACDG7IctMrgH1J+ZIjsx6vffi977wnMDiktqacmaobV+SCR
+ W9ijJRdkYpUHmlLvuJGnDPjkvewpbGWJsCabpWEvWdYw3ma8RuHOPj4Jkrdd4VcR
+ aFwox/fPJ7cG6kBydgOBhAACgYBxQIPv9DCsmiMHG1FAxSARX0GcRiELJPJ+MtaS
+ tdTrVobNa2jebwc3npLiTvUR4U/CDo1mSZb+Sp/wian8kNZHmGcR6KbtJs9UDsa3
+ V0pbbgpUar4HcxV+NQJBbhn9RGu85g3PDILUrINiUAf26mhPN5Y0paM+HbM68nUf
+ 1OLv16OBsjCBrzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+ bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUIHFAEB/3jIIZzJEJ/qdsuI8v
+ N3kwVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0xEjAQBgNV
+ BAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEwDQYJKoZI
+ hvcNAQEFBQADggEBAJt4Q34+pqjW5tHHhkdzTITSBjOOf8EvYMgxTMRzhagLSHTt
+ 9RgO5i/G7ELvnwe1j6187m1XD9iEAWKeKbB//ljeOpgnwzkLR9Er5tr1RI3cbil0
+ AX+oX0c1jfRaQnR50Rfb5YoNX6G963iphlxp9C8VLB6eOk/S270XoWoQIkO1ioQ8
+ JY4HE6AyDsOpJaOmHpBaxjgsiko52ZWZeZyaCyL98BXwVxeml7pYnHlXWWidB0N/
+ Zy+LbvWg3urUkiDjMcB6nGImmEfDSxRdybitcMwbwL26z2WOpwL3llm3mcCydKXg
+ Xt8IQhfDhOZOHWckeD2tStnJRP/cqBgO62/qirw=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_FOO"/>
+ </IDPSSODescriptor>
+
+ <!-- Protocol BAR -->
+ <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BAR">
+ <!-- Note no 'use' specified. -->
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <!-- RSA cert -->
+ <ds:X509Certificate>
+ MIIC8TCCAdmgAwIBAgIBMjANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMDk1MVoX
+ DTE3MDUyMjIwMDk1MVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIGfMA0G
+ CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfCVgF2Lvhu0Q35FvmAVGMXc3i1Mojcqyb
+ cfVbfn0Tg/Aj5FvuAiDFg9KpGvMHDKdLOY+1xsKZqyIm58SFhW+5z51YpnblHGju
+ DtPtPbtspQ7pAOsknnvbKZrx7RGNOJyQZE3Qn88Y5ZBNzABusqNXjrWlU9m4a+XN
+ IFqM4YbJLwIDAQABo4GyMIGvMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9w
+ ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT2qDRFTzawttBG
+ jN6wxni/12tQQjBVBgNVHSMETjBMgBTV7mVT3lHah61C6kFu8q/W7kaUC6ExpC8w
+ LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5jYS5leGFtcGxlLm9yZ4IB
+ ATANBgkqhkiG9w0BAQUFAAOCAQEAlJYAou5ko3ujHVhOc4OB2AOOqdXAjThiXg6z
+ Tjezs7/F53b9IRt4in/k92y1tKZ87F/JcnH6MrzKfb8m5XtcYwtUSvmFTCp5rrFp
+ z1JhXlgnaWVJJ2G2vKLDGuPQvLV9zsWhnkbTPuzocvOotxl7w7LJvO3D/tzTAnnU
+ bgg1AfP+CTDs3F/ceHzWGVWTMUAmNGX8gMS2/xh66QoEzl7LBG8Xzpo0j+gSxe7h
+ Scb5iS4U/XUEbZylMUbbK57h9Bez8VVeO1jfwAniIBT0Ur9ksiYsAdyXYoXssGiF
+ bKW1K3QG1GA9wwGy5GvjyALuuXL4lEzFB0kMsGucNMfyyojX9A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_BAR"/>
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.example.org</ds:KeyName>
+ </ds:KeyInfo>> </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
+ </AttributeAuthorityDescriptor>
+
+ </EntityDescriptor>
+
+
+
+ <EntityDescriptor entityID="http://sp.example.org/">
+
+ <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO PROTOCOL_BAR">
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <!-- RSA cert -->
+ <ds:X509Certificate>
+ MIIC8DCCAdigAwIBAgIBNDANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMzEwOFoX
+ DTE3MDUyMjIwMzEwOFowGTEXMBUGA1UEAxMOc3AuZXhhbXBsZS5vcmcwgZ8wDQYJ
+ KoZIhvcNAQEBBQADgY0AMIGJAoGBAKk7xVQ23rc51qieDAcj3CCsumTTpTiFCxGi
+ qDA8lStdcBmoNX3v+lBFKkXtQKwebcwOF3YyHFyZ2kXFREfZrG76h/5QBFNQZa6y
+ /rJskCl9bnz70HVDzBGizRc3qWVDKP1EQ6rRY2qkeGd33NKHkVUepGMPhHsv3kK+
+ zVUR6/v/AgMBAAGjgbIwga8wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+ blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOhBatBFJQgNeKiG
+ 1/Ro9W9zmO92MFUGA1UdIwROMEyAFNXuZVPeUdqHrULqQW7yr9buRpQLoTGkLzAt
+ MRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnggEB
+ MA0GCSqGSIb3DQEBBQUAA4IBAQAhpFQ4+OOrtETiuSagUe9dSqm1hahcQuv3iWRf
+ L7Pp6i2x1rR6hlk9zXUC58Oou/UOUOpPWZG/8cr3B50ViuT3zVisIYdaCGeUZ3ef
+ EeeeaI77m73xpn/qNI4aIlr6Wmj9C0biJsF3hJvtK2VJu74GCUtxsXkEKyQ0fNx6
+ bTd50RxUhM4uto7YqvMfKH6GDJPRcFmsR5YEajxOVihfRtOjvd1rTnOQLWYQRy1O
+ ZQek1Z6M7aJmYanYEAjQhyzbKM+R2sqzMlgHbGnbeAADEBnQi8GSkTpgyieT6NC8
+ 6SvWhq47gNpBYySYhb9zKx/OcZMK4UBD48HhAatEgovrKCHH
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.example.org/Shibboleth.sso/POST" index="0"/>
+ </SPSSODescriptor>
+
+ </EntityDescriptor>
+
+</EntitiesDescriptor>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-out.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-out.xml
index 09f3ecb..9584b69 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-out.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-out.xml
@@ -1,219 +1,219 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="test1-metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:SignedInfo>
-<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-<ds:Reference URI="">
-<ds:Transforms>
-<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-</ds:Transforms>
-<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-<ds:DigestValue>Lg88R+9/CPdnRAA/HwwF4zhcb68=</ds:DigestValue>
-</ds:Reference>
-</ds:SignedInfo>
-<ds:SignatureValue>
-nbuCOjgGERaV1Mnk7MkdeLo6ThF/C12eDWFTMe924WO8LxmS5A+2GI0SZ11BnKHklbfT9Sqlswyd
-7Z+bjH0mHChUEXXREQEEyaqtel+cc+sU8v7cZfXX5eJeElc1BBPt9r8RdjRI6fIwj4DG/PsiUdBd
-vsGOrSFPeMl6MkdBFyx/bzLrsnnK7hLmq85Hejo3dFCypj7H6wHyL99HO2I1+5J3kzqfBHaEmDsE
-vI2ZtYMBvFY+Og156gkNScqA8BNuwNU6LcvEdPXdUmQJ/EY01h2D+oENWDwisJma9Cx9T2u1hDBp
-3SOEItQodxRz+l30zSUyxk99JGzcfP+/4g1Kmw==
-</ds:SignatureValue>
-<ds:KeyInfo>
-<ds:KeyValue>
-<ds:RSAKeyValue>
-<ds:Modulus>
-xg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FN
-NmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88NenX
-KxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDp
-HL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+
-zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14w==
-</ds:Modulus>
-<ds:Exponent>AQAB</ds:Exponent>
-</ds:RSAKeyValue>
-</ds:KeyValue>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkFVMRMw
-EQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcN
-MTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29t
-ZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki
-4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK
-/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOH
-rp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6
-GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGk
-MB0GA1UdDgQWBBSiQhSup9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkE
-iQK7w/Zq0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoT
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089HBkgVPOuVuEe803BRlKd4BVIsuxAU
-Ay3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO70/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD
-/Uv0Sqy2nilM8BnMga5tqsL+8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegef
-gGkg2dqCTKIU1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
-i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</ds:Signature>
-
- <!-- Resign this metadata with the key found in credendial\key.pem -->
-
- <Extensions>
- <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
- <!-- CN=ca.example.org, O=Internet2 , RSA cert -->
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDXTCCAkWgAwIBAgIBATANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDQwOTA1NDcxMloX
- DTE3MDQwNjA1NDcxMlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5j
- YS5leGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxM
- 5/6mBCcX+S7HApcKtfqdFRZzi6Ra91nkEzXOUcO+BPUdYqSxKGnCCso25ZOZP3gn
- JVkY8Pi7VWrCM6wRgIMyQDvNYqCpNjkZGFkrMoa6fm8BSaDHJ1fz6l/eEl0CVU3U
- uUAf0mXQLGm6Jannq8aMolRujlhE5iRaOJ2qp6wqsvyatK+vTgDngnwYVa4Cqu0j
- UeNF28quST5D3gIuZ0OeFHSM2Z1WUKkwwsHqVkxBBcH1QE1JOGIoSnrxxl/o4VlL
- WGEI8zq5qixE8VYtBBmijBwIL5ETy2fwiqcsvimQaQAtAfbtpO3kBSs8n7nnzMUH
- fRlcebGkwwcNfYcD5hcCAwEAAaOBhzCBhDAdBgNVHQ4EFgQU1e5lU95R2oetQupB
- bvKv1u5GlAswVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0x
- EjAQBgNVBAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEw
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbqrozetM/iBVIUir9k14
- HbLEP0lZ6jOPWFIUFXMOn0t8+Ul7PMp9Rdn+7OGQIoJw97/mam3kpQ/HmjJMFYv6
- MGsDQ4vAOiQiaTKzgMhrnCdVpVH9uz4ARHiysCujnjH9sehTWgybY8pXzzSG5BAj
- EGowHq01nXxq2K4yAJSdAUBYLfuSKW1uRU6cmEa9uzl9EvoZfAF3BLnGlPqu4Zaj
- H2NC9ZY0y19LX4yeJLHL1sY4fyxb3x8QhcCXiI16awBTr/VnUpJjSe9vh+OudWGe
- yCL/KhjlrDkjJ3hIxBF5mP/Y27cFpRnC2gECkieURvh52OyuqkzpbOrTN5rD9fNi
- nA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </shibmd:KeyAuthority>
- </Extensions>
-
- <EntityDescriptor entityID="http://idp.example.org/shibboleth">
- <!-- Protocol FOO -->
- <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO">
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>IDP-SSO-RSA-Key</ds:KeyName>
- <ds:KeyValue>
- <ds:RSAKeyValue>
- <ds:Modulus>
- AN8JWAXYu+G7RDfkW+YBUYxdzeLUyiNyrJtx9Vt+fROD8CPkW+4CIMWD0qka8wcMp0s5j7XGwpmr
- IibnxIWFb7nPnVimduUcaO4O0+09u2ylDukA6ySee9spmvHtEY04nJBkTdCfzxjlkE3MAG6yo1eO
- taVT2bhr5c0gWozhhskv
- </ds:Modulus>
- <ds:Exponent>AQAB</ds:Exponent>
- </ds:RSAKeyValue>
- </ds:KeyValue>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <!-- DSA cert -->
- <ds:X509Certificate>
- MIIECTCCAvGgAwIBAgIBMzANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMTYxMVoX
- DTE3MDUyMjIwMTYxMVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIIBtjCC
- ASsGByqGSM44BAEwggEeAoGBAI+ktw7R9m7TxjaCrT2MHwWNQUAyXPrqbFCcu+DC
- irr861U6R6W/GyqWdcy8/D1Hh/I1U94POQn5yfqVPpVH2ZRS4OMFndHWaoo9V5LJ
- oXTXHiDYB3W4t9tn0fm7It0n7VoUI5C4y9LG32Hq+UIGF/ktNTmo//mEqLS6aJNd
- bMFpAhUArmKGh0hcpmjukYArWcMRvipB4CMCgYBuCiCrUaHBRRtqrk0P/Luq0l2M
- 2718GwSGeLPZip06gACDG7IctMrgH1J+ZIjsx6vffi977wnMDiktqacmaobV+SCR
- W9ijJRdkYpUHmlLvuJGnDPjkvewpbGWJsCabpWEvWdYw3ma8RuHOPj4Jkrdd4VcR
- aFwox/fPJ7cG6kBydgOBhAACgYBxQIPv9DCsmiMHG1FAxSARX0GcRiELJPJ+MtaS
- tdTrVobNa2jebwc3npLiTvUR4U/CDo1mSZb+Sp/wian8kNZHmGcR6KbtJs9UDsa3
- V0pbbgpUar4HcxV+NQJBbhn9RGu85g3PDILUrINiUAf26mhPN5Y0paM+HbM68nUf
- 1OLv16OBsjCBrzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
- bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUIHFAEB/3jIIZzJEJ/qdsuI8v
- N3kwVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0xEjAQBgNV
- BAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEwDQYJKoZI
- hvcNAQEFBQADggEBAJt4Q34+pqjW5tHHhkdzTITSBjOOf8EvYMgxTMRzhagLSHTt
- 9RgO5i/G7ELvnwe1j6187m1XD9iEAWKeKbB//ljeOpgnwzkLR9Er5tr1RI3cbil0
- AX+oX0c1jfRaQnR50Rfb5YoNX6G963iphlxp9C8VLB6eOk/S270XoWoQIkO1ioQ8
- JY4HE6AyDsOpJaOmHpBaxjgsiko52ZWZeZyaCyL98BXwVxeml7pYnHlXWWidB0N/
- Zy+LbvWg3urUkiDjMcB6nGImmEfDSxRdybitcMwbwL26z2WOpwL3llm3mcCydKXg
- Xt8IQhfDhOZOHWckeD2tStnJRP/cqBgO62/qirw=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_FOO"/>
- </IDPSSODescriptor>
-
- <!-- Protocol BAR -->
- <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BAR">
- <!-- Note no 'use' specified. -->
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <!-- RSA cert -->
- <ds:X509Certificate>
- MIIC8TCCAdmgAwIBAgIBMjANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMDk1MVoX
- DTE3MDUyMjIwMDk1MVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIGfMA0G
- CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfCVgF2Lvhu0Q35FvmAVGMXc3i1Mojcqyb
- cfVbfn0Tg/Aj5FvuAiDFg9KpGvMHDKdLOY+1xsKZqyIm58SFhW+5z51YpnblHGju
- DtPtPbtspQ7pAOsknnvbKZrx7RGNOJyQZE3Qn88Y5ZBNzABusqNXjrWlU9m4a+XN
- IFqM4YbJLwIDAQABo4GyMIGvMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9w
- ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT2qDRFTzawttBG
- jN6wxni/12tQQjBVBgNVHSMETjBMgBTV7mVT3lHah61C6kFu8q/W7kaUC6ExpC8w
- LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5jYS5leGFtcGxlLm9yZ4IB
- ATANBgkqhkiG9w0BAQUFAAOCAQEAlJYAou5ko3ujHVhOc4OB2AOOqdXAjThiXg6z
- Tjezs7/F53b9IRt4in/k92y1tKZ87F/JcnH6MrzKfb8m5XtcYwtUSvmFTCp5rrFp
- z1JhXlgnaWVJJ2G2vKLDGuPQvLV9zsWhnkbTPuzocvOotxl7w7LJvO3D/tzTAnnU
- bgg1AfP+CTDs3F/ceHzWGVWTMUAmNGX8gMS2/xh66QoEzl7LBG8Xzpo0j+gSxe7h
- Scb5iS4U/XUEbZylMUbbK57h9Bez8VVeO1jfwAniIBT0Ur9ksiYsAdyXYoXssGiF
- bKW1K3QG1GA9wwGy5GvjyALuuXL4lEzFB0kMsGucNMfyyojX9A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_BAR"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.example.org</ds:KeyName>
- </ds:KeyInfo>> </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
- </AttributeAuthorityDescriptor>
-
- </EntityDescriptor>
-
-
-
- <EntityDescriptor entityID="http://sp.example.org/">
-
- <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO PROTOCOL_BAR">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <!-- RSA cert -->
- <ds:X509Certificate>
- MIIC8DCCAdigAwIBAgIBNDANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
- cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMzEwOFoX
- DTE3MDUyMjIwMzEwOFowGTEXMBUGA1UEAxMOc3AuZXhhbXBsZS5vcmcwgZ8wDQYJ
- KoZIhvcNAQEBBQADgY0AMIGJAoGBAKk7xVQ23rc51qieDAcj3CCsumTTpTiFCxGi
- qDA8lStdcBmoNX3v+lBFKkXtQKwebcwOF3YyHFyZ2kXFREfZrG76h/5QBFNQZa6y
- /rJskCl9bnz70HVDzBGizRc3qWVDKP1EQ6rRY2qkeGd33NKHkVUepGMPhHsv3kK+
- zVUR6/v/AgMBAAGjgbIwga8wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
- blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOhBatBFJQgNeKiG
- 1/Ro9W9zmO92MFUGA1UdIwROMEyAFNXuZVPeUdqHrULqQW7yr9buRpQLoTGkLzAt
- MRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnggEB
- MA0GCSqGSIb3DQEBBQUAA4IBAQAhpFQ4+OOrtETiuSagUe9dSqm1hahcQuv3iWRf
- L7Pp6i2x1rR6hlk9zXUC58Oou/UOUOpPWZG/8cr3B50ViuT3zVisIYdaCGeUZ3ef
- EeeeaI77m73xpn/qNI4aIlr6Wmj9C0biJsF3hJvtK2VJu74GCUtxsXkEKyQ0fNx6
- bTd50RxUhM4uto7YqvMfKH6GDJPRcFmsR5YEajxOVihfRtOjvd1rTnOQLWYQRy1O
- ZQek1Z6M7aJmYanYEAjQhyzbKM+R2sqzMlgHbGnbeAADEBnQi8GSkTpgyieT6NC8
- 6SvWhq47gNpBYySYhb9zKx/OcZMK4UBD48HhAatEgovrKCHH
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.example.org/Shibboleth.sso/POST" index="0"/>
- </SPSSODescriptor>
-
- </EntityDescriptor>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="test1-metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:SignedInfo>
+<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+<ds:Reference URI="">
+<ds:Transforms>
+<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+</ds:Transforms>
+<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<ds:DigestValue>Lg88R+9/CPdnRAA/HwwF4zhcb68=</ds:DigestValue>
+</ds:Reference>
+</ds:SignedInfo>
+<ds:SignatureValue>
+nbuCOjgGERaV1Mnk7MkdeLo6ThF/C12eDWFTMe924WO8LxmS5A+2GI0SZ11BnKHklbfT9Sqlswyd
+7Z+bjH0mHChUEXXREQEEyaqtel+cc+sU8v7cZfXX5eJeElc1BBPt9r8RdjRI6fIwj4DG/PsiUdBd
+vsGOrSFPeMl6MkdBFyx/bzLrsnnK7hLmq85Hejo3dFCypj7H6wHyL99HO2I1+5J3kzqfBHaEmDsE
+vI2ZtYMBvFY+Og156gkNScqA8BNuwNU6LcvEdPXdUmQJ/EY01h2D+oENWDwisJma9Cx9T2u1hDBp
+3SOEItQodxRz+l30zSUyxk99JGzcfP+/4g1Kmw==
+</ds:SignatureValue>
+<ds:KeyInfo>
+<ds:KeyValue>
+<ds:RSAKeyValue>
+<ds:Modulus>
+xg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FN
+NmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88NenX
+KxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbhnR5tFFLjBbtFktDp
+HL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6GVnKs5PZTg9sP0FtIpAbYm/+
+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14w==
+</ds:Modulus>
+<ds:Exponent>AQAB</ds:Exponent>
+</ds:RSAKeyValue>
+</ds:KeyValue>
+<ds:X509Data>
+<ds:X509Certificate>
+MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkFVMRMw
+EQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcN
+MTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29t
+ZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaXuRRn8SYzTj7W1TbNY4VvBmobjkRmSkki
+4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK
+/FsMMCS6X6SVqzBLMP88NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOH
+rp/zSIbhnR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3E2N6
+GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn14wIDAQABo4GnMIGk
+MB0GA1UdDgQWBBSiQhSup9BYjD2ZuMkEiQK7w/Zq0TB1BgNVHSMEbjBsgBSiQhSup9BYjD2ZuMkE
+iQK7w/Zq0aFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoT
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPmsD+VGldyPMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAHZmIo9GBTSsD5DJfKkCVUvBafwR089HBkgVPOuVuEe803BRlKd4BVIsuxAU
+Ay3oqdJYqf9ptPEx8Ef+ALbcDhRbWINhMgO70/S4x3pS9gOn7/Y9yZplOe4Jd2q3R8QBef+hKLcD
+/Uv0Sqy2nilM8BnMga5tqsL+8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegef
+gGkg2dqCTKIU1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
+i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
+</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</ds:Signature>
+
+ <!-- Resign this metadata with the key found in credendial\key.pem -->
+
+ <Extensions>
+ <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
+ <!-- CN=ca.example.org, O=Internet2 , RSA cert -->
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDXTCCAkWgAwIBAgIBATANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDQwOTA1NDcxMloX
+ DTE3MDQwNjA1NDcxMlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5j
+ YS5leGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxM
+ 5/6mBCcX+S7HApcKtfqdFRZzi6Ra91nkEzXOUcO+BPUdYqSxKGnCCso25ZOZP3gn
+ JVkY8Pi7VWrCM6wRgIMyQDvNYqCpNjkZGFkrMoa6fm8BSaDHJ1fz6l/eEl0CVU3U
+ uUAf0mXQLGm6Jannq8aMolRujlhE5iRaOJ2qp6wqsvyatK+vTgDngnwYVa4Cqu0j
+ UeNF28quST5D3gIuZ0OeFHSM2Z1WUKkwwsHqVkxBBcH1QE1JOGIoSnrxxl/o4VlL
+ WGEI8zq5qixE8VYtBBmijBwIL5ETy2fwiqcsvimQaQAtAfbtpO3kBSs8n7nnzMUH
+ fRlcebGkwwcNfYcD5hcCAwEAAaOBhzCBhDAdBgNVHQ4EFgQU1e5lU95R2oetQupB
+ bvKv1u5GlAswVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0x
+ EjAQBgNVBAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEw
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbqrozetM/iBVIUir9k14
+ HbLEP0lZ6jOPWFIUFXMOn0t8+Ul7PMp9Rdn+7OGQIoJw97/mam3kpQ/HmjJMFYv6
+ MGsDQ4vAOiQiaTKzgMhrnCdVpVH9uz4ARHiysCujnjH9sehTWgybY8pXzzSG5BAj
+ EGowHq01nXxq2K4yAJSdAUBYLfuSKW1uRU6cmEa9uzl9EvoZfAF3BLnGlPqu4Zaj
+ H2NC9ZY0y19LX4yeJLHL1sY4fyxb3x8QhcCXiI16awBTr/VnUpJjSe9vh+OudWGe
+ yCL/KhjlrDkjJ3hIxBF5mP/Y27cFpRnC2gECkieURvh52OyuqkzpbOrTN5rD9fNi
+ nA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </shibmd:KeyAuthority>
+ </Extensions>
+
+ <EntityDescriptor entityID="http://idp.example.org/shibboleth">
+ <!-- Protocol FOO -->
+ <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>IDP-SSO-RSA-Key</ds:KeyName>
+ <ds:KeyValue>
+ <ds:RSAKeyValue>
+ <ds:Modulus>
+ AN8JWAXYu+G7RDfkW+YBUYxdzeLUyiNyrJtx9Vt+fROD8CPkW+4CIMWD0qka8wcMp0s5j7XGwpmr
+ IibnxIWFb7nPnVimduUcaO4O0+09u2ylDukA6ySee9spmvHtEY04nJBkTdCfzxjlkE3MAG6yo1eO
+ taVT2bhr5c0gWozhhskv
+ </ds:Modulus>
+ <ds:Exponent>AQAB</ds:Exponent>
+ </ds:RSAKeyValue>
+ </ds:KeyValue>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <!-- DSA cert -->
+ <ds:X509Certificate>
+ MIIECTCCAvGgAwIBAgIBMzANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMTYxMVoX
+ DTE3MDUyMjIwMTYxMVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIIBtjCC
+ ASsGByqGSM44BAEwggEeAoGBAI+ktw7R9m7TxjaCrT2MHwWNQUAyXPrqbFCcu+DC
+ irr861U6R6W/GyqWdcy8/D1Hh/I1U94POQn5yfqVPpVH2ZRS4OMFndHWaoo9V5LJ
+ oXTXHiDYB3W4t9tn0fm7It0n7VoUI5C4y9LG32Hq+UIGF/ktNTmo//mEqLS6aJNd
+ bMFpAhUArmKGh0hcpmjukYArWcMRvipB4CMCgYBuCiCrUaHBRRtqrk0P/Luq0l2M
+ 2718GwSGeLPZip06gACDG7IctMrgH1J+ZIjsx6vffi977wnMDiktqacmaobV+SCR
+ W9ijJRdkYpUHmlLvuJGnDPjkvewpbGWJsCabpWEvWdYw3ma8RuHOPj4Jkrdd4VcR
+ aFwox/fPJ7cG6kBydgOBhAACgYBxQIPv9DCsmiMHG1FAxSARX0GcRiELJPJ+MtaS
+ tdTrVobNa2jebwc3npLiTvUR4U/CDo1mSZb+Sp/wian8kNZHmGcR6KbtJs9UDsa3
+ V0pbbgpUar4HcxV+NQJBbhn9RGu85g3PDILUrINiUAf26mhPN5Y0paM+HbM68nUf
+ 1OLv16OBsjCBrzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+ bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUIHFAEB/3jIIZzJEJ/qdsuI8v
+ N3kwVQYDVR0jBE4wTIAU1e5lU95R2oetQupBbvKv1u5GlAuhMaQvMC0xEjAQBgNV
+ BAoTCUludGVybmV0MjEXMBUGA1UEAxMOY2EuZXhhbXBsZS5vcmeCAQEwDQYJKoZI
+ hvcNAQEFBQADggEBAJt4Q34+pqjW5tHHhkdzTITSBjOOf8EvYMgxTMRzhagLSHTt
+ 9RgO5i/G7ELvnwe1j6187m1XD9iEAWKeKbB//ljeOpgnwzkLR9Er5tr1RI3cbil0
+ AX+oX0c1jfRaQnR50Rfb5YoNX6G963iphlxp9C8VLB6eOk/S270XoWoQIkO1ioQ8
+ JY4HE6AyDsOpJaOmHpBaxjgsiko52ZWZeZyaCyL98BXwVxeml7pYnHlXWWidB0N/
+ Zy+LbvWg3urUkiDjMcB6nGImmEfDSxRdybitcMwbwL26z2WOpwL3llm3mcCydKXg
+ Xt8IQhfDhOZOHWckeD2tStnJRP/cqBgO62/qirw=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_FOO"/>
+ </IDPSSODescriptor>
+
+ <!-- Protocol BAR -->
+ <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BAR">
+ <!-- Note no 'use' specified. -->
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <!-- RSA cert -->
+ <ds:X509Certificate>
+ MIIC8TCCAdmgAwIBAgIBMjANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMDk1MVoX
+ DTE3MDUyMjIwMDk1MVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIGfMA0G
+ CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfCVgF2Lvhu0Q35FvmAVGMXc3i1Mojcqyb
+ cfVbfn0Tg/Aj5FvuAiDFg9KpGvMHDKdLOY+1xsKZqyIm58SFhW+5z51YpnblHGju
+ DtPtPbtspQ7pAOsknnvbKZrx7RGNOJyQZE3Qn88Y5ZBNzABusqNXjrWlU9m4a+XN
+ IFqM4YbJLwIDAQABo4GyMIGvMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9w
+ ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT2qDRFTzawttBG
+ jN6wxni/12tQQjBVBgNVHSMETjBMgBTV7mVT3lHah61C6kFu8q/W7kaUC6ExpC8w
+ LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5jYS5leGFtcGxlLm9yZ4IB
+ ATANBgkqhkiG9w0BAQUFAAOCAQEAlJYAou5ko3ujHVhOc4OB2AOOqdXAjThiXg6z
+ Tjezs7/F53b9IRt4in/k92y1tKZ87F/JcnH6MrzKfb8m5XtcYwtUSvmFTCp5rrFp
+ z1JhXlgnaWVJJ2G2vKLDGuPQvLV9zsWhnkbTPuzocvOotxl7w7LJvO3D/tzTAnnU
+ bgg1AfP+CTDs3F/ceHzWGVWTMUAmNGX8gMS2/xh66QoEzl7LBG8Xzpo0j+gSxe7h
+ Scb5iS4U/XUEbZylMUbbK57h9Bez8VVeO1jfwAniIBT0Ur9ksiYsAdyXYoXssGiF
+ bKW1K3QG1GA9wwGy5GvjyALuuXL4lEzFB0kMsGucNMfyyojX9A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/shibboleth/SSO_BAR"/>
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.example.org</ds:KeyName>
+ </ds:KeyInfo>> </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
+ </AttributeAuthorityDescriptor>
+
+ </EntityDescriptor>
+
+
+
+ <EntityDescriptor entityID="http://sp.example.org/">
+
+ <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_FOO PROTOCOL_BAR">
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <!-- RSA cert -->
+ <ds:X509Certificate>
+ MIIC8DCCAdigAwIBAgIBNDANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl
+ cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMzEwOFoX
+ DTE3MDUyMjIwMzEwOFowGTEXMBUGA1UEAxMOc3AuZXhhbXBsZS5vcmcwgZ8wDQYJ
+ KoZIhvcNAQEBBQADgY0AMIGJAoGBAKk7xVQ23rc51qieDAcj3CCsumTTpTiFCxGi
+ qDA8lStdcBmoNX3v+lBFKkXtQKwebcwOF3YyHFyZ2kXFREfZrG76h/5QBFNQZa6y
+ /rJskCl9bnz70HVDzBGizRc3qWVDKP1EQ6rRY2qkeGd33NKHkVUepGMPhHsv3kK+
+ zVUR6/v/AgMBAAGjgbIwga8wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+ blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOhBatBFJQgNeKiG
+ 1/Ro9W9zmO92MFUGA1UdIwROMEyAFNXuZVPeUdqHrULqQW7yr9buRpQLoTGkLzAt
+ MRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnggEB
+ MA0GCSqGSIb3DQEBBQUAA4IBAQAhpFQ4+OOrtETiuSagUe9dSqm1hahcQuv3iWRf
+ L7Pp6i2x1rR6hlk9zXUC58Oou/UOUOpPWZG/8cr3B50ViuT3zVisIYdaCGeUZ3ef
+ EeeeaI77m73xpn/qNI4aIlr6Wmj9C0biJsF3hJvtK2VJu74GCUtxsXkEKyQ0fNx6
+ bTd50RxUhM4uto7YqvMfKH6GDJPRcFmsR5YEajxOVihfRtOjvd1rTnOQLWYQRy1O
+ ZQek1Z6M7aJmYanYEAjQhyzbKM+R2sqzMlgHbGnbeAADEBnQi8GSkTpgyieT6NC8
+ 6SvWhq47gNpBYySYhb9zKx/OcZMK4UBD48HhAatEgovrKCHH
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.example.org/Shibboleth.sso/POST" index="0"/>
+ </SPSSODescriptor>
+
+ </EntityDescriptor>
+
</EntitiesDescriptor>
\ No newline at end of file
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml
index 8d38649..83775c7 100644
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml
+++ b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml
@@ -1,108 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <!-- This is what we are trying to reverse map (note bi-directional aliasing, just to confuse things. And me.
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="eduPersonAssurance">
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="otherSAMLName" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" sourceAttributeID="otherPersonAssurance">
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org"
- sourceAttributeID="eduPersonAffiliation">
- <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation"
- scopeDelimiter='#'/>
- </resolver:AttributeDefinition>
-
- <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTargetedID"
- nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="computedID">
- <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
- </resolver:AttributeDefinition>
-
-
- But note that this is unmappable (no source name)
-
- <resolver:AttributeDefinition id="transientId" xsi:type="ad:TransientId">
- <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
- </resolver:AttributeDefinition>
-
-
- -->
-
- <bean id="abstractStringMapper" init-method="initialize" abstract="true"
- class="net.shibboleth.idp.saml.attribute.mapping.impl.RequestedAttributeMapper">
- <property name="valueMapper">
- <bean
- class="net.shibboleth.idp.saml.attribute.mapping.impl.StringAttributeValueMapper" />
- </property>
- </bean>
-
- <bean id="RequestedAttributesMapper"
- class="net.shibboleth.idp.saml.attribute.mapping.impl.RequestedAttributesMapper"
- init-method="initialize" p:id="RequestedAttributesMapper">
- <property name="mappers">
- <list>
- <bean parent="abstractStringMapper">
- <property name="id" value="eduPersonAssurance" />
- <property name="SAMLName" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" />
- <property name="attributeIds">
- <list>
- <value>eduPersonAssurance</value>
- <value>otherPersonAssurance</value>
- </list>
- </property>
- </bean>
- <bean parent="abstractStringMapper">
- <property name="SAMLName" value="http://example.org/name/for/Attribute" />
- <property name="id" value="otherSAMLName" />
- <property name="attributeFormat" value="http://example.org/Format " />
- <property name="attributeIds">
- <list>
- <value>eduPersonAssurance</value>
- </list>
- </property>
- </bean>
- <bean parent="abstractStringMapper">
- <property name="sAMLName" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" />
- <property name="id" value="eduPersonScopedAffiliation" />
- <property name="attributeFormat" value=" format " />
- <property name="valueMapper">
- <bean
- class="net.shibboleth.idp.saml.attribute.mapping.impl.ScopedStringAttributeValueMapper"
- p:delimiter="#" />
- </property>
- <property name="attributeIds">
- <list>
- <value>eduPersonScopedAffiliation</value>
- </list>
- </property>
- </bean>
- <bean parent="abstractStringMapper">
- <property name="attributeFormat" value="format"/>
- <property name="sAMLName" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"/>
- <property name="id" value="eduPersonTargetedID"/>
- <property name="valueMapper">
- <bean
- class="net.shibboleth.idp.saml.attribute.mapping.impl.XMLObjectAttributeValueMapper" />
- </property>
- <property name="attributeIds">
- <list>
- <value>eduPersonTargetedID</value>
- </list>
- </property>
- </bean>
- </list>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!-- This is what we are trying to reverse map (note bi-directional aliasing, just to confuse things. And me.
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="eduPersonAssurance">
+ <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="otherSAMLName" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" sourceAttributeID="otherPersonAssurance">
+ <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org"
+ sourceAttributeID="eduPersonAffiliation">
+ <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation"
+ scopeDelimiter='#'/>
+ </resolver:AttributeDefinition>
+
+ <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTargetedID"
+ nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="computedID">
+ <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
+ <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
+ </resolver:AttributeDefinition>
+
+
+ But note that this is unmappable (no source name)
+
+ <resolver:AttributeDefinition id="transientId" xsi:type="ad:TransientId">
+ <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
+ <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
+ </resolver:AttributeDefinition>
+
+
+ -->
+
+ <bean id="abstractStringMapper" init-method="initialize" abstract="true"
+ class="net.shibboleth.idp.saml.attribute.mapping.impl.RequestedAttributeMapper">
+ <property name="valueMapper">
+ <bean
+ class="net.shibboleth.idp.saml.attribute.mapping.impl.StringAttributeValueMapper" />
+ </property>
+ </bean>
+
+ <bean id="RequestedAttributesMapper"
+ class="net.shibboleth.idp.saml.attribute.mapping.impl.RequestedAttributesMapper"
+ init-method="initialize" p:id="RequestedAttributesMapper">
+ <property name="mappers">
+ <list>
+ <bean parent="abstractStringMapper">
+ <property name="id" value="eduPersonAssurance" />
+ <property name="SAMLName" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" />
+ <property name="attributeIds">
+ <list>
+ <value>eduPersonAssurance</value>
+ <value>otherPersonAssurance</value>
+ </list>
+ </property>
+ </bean>
+ <bean parent="abstractStringMapper">
+ <property name="SAMLName" value="http://example.org/name/for/Attribute" />
+ <property name="id" value="otherSAMLName" />
+ <property name="attributeFormat" value="http://example.org/Format " />
+ <property name="attributeIds">
+ <list>
+ <value>eduPersonAssurance</value>
+ </list>
+ </property>
+ </bean>
+ <bean parent="abstractStringMapper">
+ <property name="sAMLName" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" />
+ <property name="id" value="eduPersonScopedAffiliation" />
+ <property name="attributeFormat" value=" format " />
+ <property name="valueMapper">
+ <bean
+ class="net.shibboleth.idp.saml.attribute.mapping.impl.ScopedStringAttributeValueMapper"
+ p:delimiter="#" />
+ </property>
+ <property name="attributeIds">
+ <list>
+ <value>eduPersonScopedAffiliation</value>
+ </list>
+ </property>
+ </bean>
+ <bean parent="abstractStringMapper">
+ <property name="attributeFormat" value="format"/>
+ <property name="sAMLName" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"/>
+ <property name="id" value="eduPersonTargetedID"/>
+ <property name="valueMapper">
+ <bean
+ class="net.shibboleth.idp.saml.attribute.mapping.impl.XMLObjectAttributeValueMapper" />
+ </property>
+ <property name="attributeIds">
+ <list>
+ <value>eduPersonTargetedID</value>
+ </list>
+ </property>
+ </bean>
+ </list>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/requestedAttributeValues.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/requestedAttributeValues.xml
index 26ba6cf..f60a188 100644
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/requestedAttributeValues.xml
+++ b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/requestedAttributeValues.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeConsumingService xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
- xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
- xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" index="1">
-
- <ServiceName xml:lang="en">Shibboleth Federated Issue
- Tracking
- </ServiceName>
- <RequestedAttribute FriendlyName="stdFormatFriendly"
- Name="stdFormat" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xsi:type="xs:string">String</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xsi:type="xs:boolean">1</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema">U2NvdCBDYW50b3IgaXMgdGhlIGdvZCBvZiBTQU1M
- </saml:AttributeValue>
- <saml:AttributeValue>scope at scoped.example.org</saml:AttributeValue>
- <saml:AttributeValue>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Shibboleth.net
- </mdui:DisplayName>
- <mdui:Description xml:lang="en">An identity provider
- hosted and used by the developers of Shibboleth.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png
- </mdui:Logo>
- </mdui:UIInfo>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Shibboleth.net
- </mdui:DisplayName>
- <mdui:Description xml:lang="en">An identity provider
- hosted and used by the developers of Shibboleth.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png
- </mdui:Logo>
- </mdui:UIInfo>
- </saml:AttributeValue>
- </RequestedAttribute>
- <RequestedAttribute FriendlyName="oddFormatFriendly"
- Name="oddFormat" NameFormat="https://example.org/" />
- <RequestedAttribute FriendlyName="mail"
- Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
- <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">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xsi:type="xs:string">String</saml:AttributeValue>
- </RequestedAttribute>
-</AttributeConsumingService>
+<?xml version="1.0" encoding="UTF-8"?>
+<AttributeConsumingService xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+ xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" index="1">
+
+ <ServiceName xml:lang="en">Shibboleth Federated Issue
+ Tracking
+ </ServiceName>
+ <RequestedAttribute FriendlyName="stdFormatFriendly"
+ Name="stdFormat" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xsi:type="xs:string">String</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xsi:type="xs:boolean">1</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema">U2NvdCBDYW50b3IgaXMgdGhlIGdvZCBvZiBTQU1M
+ </saml:AttributeValue>
+ <saml:AttributeValue>scope at scoped.example.org</saml:AttributeValue>
+ <saml:AttributeValue>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Shibboleth.net
+ </mdui:DisplayName>
+ <mdui:Description xml:lang="en">An identity provider
+ hosted and used by the developers of Shibboleth.
+ </mdui:Description>
+ <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png
+ </mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Shibboleth.net
+ </mdui:DisplayName>
+ <mdui:Description xml:lang="en">An identity provider
+ hosted and used by the developers of Shibboleth.
+ </mdui:Description>
+ <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png
+ </mdui:Logo>
+ </mdui:UIInfo>
+ </saml:AttributeValue>
+ </RequestedAttribute>
+ <RequestedAttribute FriendlyName="oddFormatFriendly"
+ Name="oddFormat" NameFormat="https://example.org/" />
+ <RequestedAttribute FriendlyName="mail"
+ Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
+ <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">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xsi:type="xs:string">String</saml:AttributeValue>
+ </RequestedAttribute>
+</AttributeConsumingService>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql
index 9a2496b..ba342c9 100644
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql
+++ b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql
@@ -1,9 +1,9 @@
-CREATE TABLE shibpid (
- localEntity VARCHAR(50) NOT NULL,
- peerEntity VARCHAR(50) NOT NULL,
- principalName VARCHAR(50) NOT NULL,
- localId VARCHAR(50) NOT NULL,
- persistentId VARCHAR(50) NOT NULL,
- peerProvidedId VARCHAR(50),
- creationDate TIMESTAMP NOT NULL,
- deactivationDate TIMESTAMP);
+CREATE TABLE shibpid (
+ localEntity VARCHAR(50) NOT NULL,
+ peerEntity VARCHAR(50) NOT NULL,
+ principalName VARCHAR(50) NOT NULL,
+ localId VARCHAR(50) NOT NULL,
+ persistentId VARCHAR(50) NOT NULL,
+ peerProvidedId VARCHAR(50),
+ creationDate TIMESTAMP NOT NULL,
+ deactivationDate TIMESTAMP);
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/DeleteStore.sql b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/DeleteStore.sql
index 25c4a8c..9ffe8bd 100644
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/DeleteStore.sql
+++ b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/DeleteStore.sql
@@ -1 +1 @@
-DROP TABLE shibpid;
+DROP TABLE shibpid;
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd
index 6313421..b8a7746 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd
@@ -1,222 +1,222 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:attribute:encoder" elementFormDefault="qualified">
-
- <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
-
- <!-- Encoders that produce SAML 1 or SAML 2 Attribtues -->
- <complexType name="SAML1String">
- <annotation>
- <documentation>Defines a SAML 1 string encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML1Base64">
- <annotation>
- <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML1XMLObject">
- <annotation>
- <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2String">
- <annotation>
- <documentation>Defines a SAML 2 string encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2Base64">
- <annotation>
- <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2XMLObject">
- <annotation>
- <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="BaseScopedAttributeEncoderType">
- <annotation>
- <documentation>Defines an encoder for a scoped attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="scopeType" type="string" use="optional">
- <annotation>
- <documentation>
- The type of scoping to use for the encoded attribute. Valid values are "inline" or
- "attribute".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="scopeDelimiter" type="string" use="optional">
- <annotation>
- <documentation>
- If scopeType is "inline", this is the delimeter used between the attribute value and
- scope.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="scopeAttribute" type="string" use="optional">
- <annotation>
- <documentation>
- If scopeType is "attribute", this is the name of the name of the attribute used to carry the
- scope value.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML1ScopedString">
- <annotation>
- <documentation>Defines a SAML 1 string encoder for a scoped attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="encoder:BaseScopedAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2ScopedString">
- <annotation>
- <documentation>Defines a SAML 2 string encoder for a scoped attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="encoder:BaseScopedAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
-<!-- Encoders that produce SAML 1 or 2 name identifiers -->
- <complexType name="SAML1StringNameIdentifier">
- <annotation>
- <documentation>Defines a SAML 1 string encoder for a NameIdentifier.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 1 NameFormat of the NameIdentifier.</documentation>
- </annotation>
- </attribute>
- <attribute name="nameQualifier" type="string" use="optional">
- <annotation>
- <documentation>The SAML 1 NameQualfier of the NameIdentifier.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2StringNameID">
- <annotation>
- <documentation>Defines a SAML 2 string encoder for a NameID.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the NameID.</documentation>
- </annotation>
- </attribute>
- <attribute name="nameQualifier" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 NameQualfier of the NameID.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:attribute:encoder" elementFormDefault="qualified">
+
+ <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
+
+ <!-- Encoders that produce SAML 1 or SAML 2 Attribtues -->
+ <complexType name="SAML1String">
+ <annotation>
+ <documentation>Defines a SAML 1 string encoder for an attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="namespace" type="string">
+ <annotation>
+ <documentation>The SAML 1 Namespace of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML1Base64">
+ <annotation>
+ <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="namespace" type="string">
+ <annotation>
+ <documentation>The SAML 1 Namespace of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML1XMLObject">
+ <annotation>
+ <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="namespace" type="string">
+ <annotation>
+ <documentation>The SAML 1 Namespace of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML2String">
+ <annotation>
+ <documentation>Defines a SAML 2 string encoder for an attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="nameFormat" type="string">
+ <annotation>
+ <documentation>The SAML 2 NameFormat of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="friendlyName" type="string" use="optional">
+ <annotation>
+ <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML2Base64">
+ <annotation>
+ <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="nameFormat" type="string">
+ <annotation>
+ <documentation>The SAML 2 NameFormat of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="friendlyName" type="string" use="optional">
+ <annotation>
+ <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML2XMLObject">
+ <annotation>
+ <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="nameFormat" type="string">
+ <annotation>
+ <documentation>The SAML 2 NameFormat of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="friendlyName" type="string" use="optional">
+ <annotation>
+ <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="BaseScopedAttributeEncoderType">
+ <annotation>
+ <documentation>Defines an encoder for a scoped attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="scopeType" type="string" use="optional">
+ <annotation>
+ <documentation>
+ The type of scoping to use for the encoded attribute. Valid values are "inline" or
+ "attribute".
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="scopeDelimiter" type="string" use="optional">
+ <annotation>
+ <documentation>
+ If scopeType is "inline", this is the delimeter used between the attribute value and
+ scope.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="scopeAttribute" type="string" use="optional">
+ <annotation>
+ <documentation>
+ If scopeType is "attribute", this is the name of the name of the attribute used to carry the
+ scope value.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML1ScopedString">
+ <annotation>
+ <documentation>Defines a SAML 1 string encoder for a scoped attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="encoder:BaseScopedAttributeEncoderType">
+ <attribute name="namespace" type="string">
+ <annotation>
+ <documentation>The SAML 1 Namespace of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML2ScopedString">
+ <annotation>
+ <documentation>Defines a SAML 2 string encoder for a scoped attribute.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="encoder:BaseScopedAttributeEncoderType">
+ <attribute name="nameFormat" type="string">
+ <annotation>
+ <documentation>The SAML 2 NameFormat of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="friendlyName" type="string" use="optional">
+ <annotation>
+ <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+<!-- Encoders that produce SAML 1 or 2 name identifiers -->
+ <complexType name="SAML1StringNameIdentifier">
+ <annotation>
+ <documentation>Defines a SAML 1 string encoder for a NameIdentifier.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="nameFormat" type="string">
+ <annotation>
+ <documentation>The SAML 1 NameFormat of the NameIdentifier.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="nameQualifier" type="string" use="optional">
+ <annotation>
+ <documentation>The SAML 1 NameQualfier of the NameIdentifier.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SAML2StringNameID">
+ <annotation>
+ <documentation>Defines a SAML 2 string encoder for a NameID.</documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseAttributeEncoderType">
+ <attribute name="nameFormat" type="string">
+ <annotation>
+ <documentation>The SAML 2 NameFormat of the NameID.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="nameQualifier" type="string" use="optional">
+ <annotation>
+ <documentation>The SAML 2 NameQualfier of the NameID.</documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-security.xsd b/idp-schema/src/main/resources/schema/shibboleth-security.xsd
index 4c4ea06..7b6eec6 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-security.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-security.xsd
@@ -1,803 +1,803 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sec="urn:mace:shibboleth:2.0:security" targetNamespace="urn:mace:shibboleth:2.0:security" elementFormDefault="qualified">
-
- <!-- CREDENTIAL RELATED OBJECTS -->
- <element name="Credential" type="sec:CredentialType"/>
-
- <complexType name="X509Inline">
- <annotation>
- <documentation>
- Allows credentials to be components to be specified as content within the child elements. Keys,
- Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:X509Credential"/>
- </complexContent>
- </complexType>
-
- <complexType name="X509Filesystem">
- <annotation>
- <documentation>
- Allows credential components to be specified by filesystem path. Keys, Certificates, and CRLs may be
- PKCS#12, DER, or PEM encoded and may be encrypted or not.
-
- This credential is deprecated in favor of X509ResourceBacked
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:X509Credential"/>
- </complexContent>
- </complexType>
-
- <complexType name="X509ResourceBacked">
- <annotation>
- <documentation>
- Allows credential components to be loaded from a Spring Resource. Keys, Certificates, and CRLs may be
- PKCS#12, DER, or PEM encoded and may be encrypted or not.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:X509Credential"/>
- </complexContent>
- </complexType>
-
- <complexType name="X509Credential" abstract="true">
- <annotation>
- <documentation>
- Defines the components of an X.509 credential.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:CredentialType">
- <sequence>
- <element name="PrivateKey" minOccurs="0">
- <annotation>
- <documentation>Credential's RSA/DSA private key.</documentation>
- </annotation>
- </element>
- <element name="Certificate" minOccurs="1" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Certificate associated with the credential. More than one certificate
- may be present within a single element, if the encoding form used allows
- it, or multiple certificate elements may be used, or both.
- </documentation>
- </annotation>
- </element>
- <element name="CRL" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Certificate revocation list associated with the Credential. More than
- one CRL may be present within a single element, if the encoding form
- used allows it, or multiple CRL elements may be used, or both.
- </documentation>
- </annotation>
- </element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="BasicInline">
- <annotation>
- <documentation>
- Allows credentials to be components to be specified as content within the child elements.
- Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:BasicCredential"/>
- </complexContent>
- </complexType>
-
- <complexType name="BasicFilesystem">
- <annotation>
- <documentation>
- Allows credential components to be specified by filesystem path.
- Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-
- This is deprecated in favor of BasicResourceBacked
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:BasicCredential"/>
- </complexContent>
- </complexType>
-
- <complexType name="BasicResourceBacked">
- <annotation>
- <documentation>
- Allows credential components to be specified by Spring Resource specification.
- Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:BasicCredential"/>
- </complexContent>
- </complexType>
-
- <complexType name="BasicCredential" abstract="true">
- <annotation>
- <documentation>
- Defines the components of a basic credential containing either a
- public key and optional private key, or a symmetric (secret) key.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:CredentialType">
- <sequence>
- <choice>
- <element name="SecretKey">
- <annotation>
- <documentation>Credential's symmetric key.</documentation>
- </annotation>
- <complexType>
- <simpleContent>
- <extension base="string">
- <attribute name="algorithm" type="string" use="required">
- <annotation>
- <documentation>
- The JCA key algorithm identifier.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="encoding" use="required">
- <annotation>
- <documentation>
- The encoded format of the key data. Defaults to: base64.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="binary" />
- <enumeration value="hex" />
- <enumeration value="base64" />
- </restriction>
- </simpleType>
- </attribute>
- </extension>
- </simpleContent>
- </complexType>
- </element>
- <sequence>
- <element name="PrivateKey" minOccurs="0">
- <annotation>
- <documentation>Credential's RSA/DSA private key.</documentation>
- </annotation>
- </element>
- <element name="PublicKey">
- <annotation>
- <documentation>Credential's RSA/DSA public key.</documentation>
- </annotation>
- </element>
- </sequence>
- </choice>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="CredentialType" abstract="true">
- <annotation>
- <documentation>Base type for credential information.</documentation>
- </annotation>
- <sequence>
- <element name="KeyName" type="string" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>Name(s) of the key this credential represents.</documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="id" type="string">
- <annotation>
- <documentation>Unique id for this credential.</documentation>
- </annotation>
- </attribute>
- <attribute name="entityID" type="string">
- <annotation>
- <documentation>Identifier for the entity which owns this credential.</documentation>
- </annotation>
- </attribute>
- <attribute name="usage" type="sec:CredentialUsageType">
- <annotation>
- <documentation>
- Usage type for this credential. Acceptable values are "Encryption" or "Signing". If no usage type is
- given components may choose to use the credential for either encryption or signing operations.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
-
- <simpleType name="CredentialUsageType">
- <restriction base="string">
- <enumeration value="Encryption"/>
- <enumeration value="Signing"/>
- </restriction>
- </simpleType>
-
- <complexType name="PasswordBearingString">
- <simpleContent>
- <extension base="string">
- <attribute name="password" type="string">
- <annotation>
- <documentation>
- Password associated with the resource identified by elements of this type.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </simpleContent>
- </complexType>
-
- <!-- VALIDATION RELATED OBJECTS, FOR EXAMPLE PKIX INFO -->
- <element name="ValidationInfo" type="sec:ValidationInfoType"/>
-
- <element name="ValidationOptions" type="sec:ValidationOptionsType"/>
-
- <complexType name="PKIXInline">
- <annotation>
- <documentation>
- Allows PKIX validation info components to be specified as content within the child elements.
- Certificates and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:PKIXValidationInfoType"/>
- </complexContent>
- </complexType>
-
- <complexType name="PKIXFilesystem">
- <annotation>
- <documentation>
- Allows PKIX validation info components to be specified by filesystem path.
- Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-
- This method is deprecated in favor of the PKIXResourceBacked type employing a filesystem resource.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:PKIXValidationInfoType"/>
- </complexContent>
- </complexType>
-
- <complexType name="PKIXResourceBacked">
- <annotation>
- <documentation>
- Allows PKIX validation info components to be specified by a Spring Resource specification.
- Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:PKIXValidationInfoType"/>
- </complexContent>
- </complexType>
-
- <complexType name="PKIXValidationInfoType" abstract="true">
- <annotation>
- <documentation>
- Defines the components of a set of PKIX validation information.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:ValidationInfoType">
- <sequence>
- <element name="Certificate" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Trusted certificates, typically of root and intermediate CA's , which are used
- as input to the PKIX validation process.
- </documentation>
- </annotation>
- </element>
- <element name="CRL" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Certificate revocation lists which are used as input to the PKIX validation process.
- </documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="verifyDepth" type="string">
- <annotation>
- <documentation>
- The maximum path verification depth to consider when constructing a PKIX cert path.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="ValidationInfoType" abstract="true">
- <annotation>
- <documentation>Base type for validation information.</documentation>
- </annotation>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>Unique id for this validation info set.</documentation>
- </annotation>
- </attribute>
- </complexType>
-
- <complexType name="ValidationOptionsType">
- <annotation>
- <documentation>Type for basic PKIX validation options set for PKIX trust engines.</documentation>
- </annotation>
- <attribute name="processEmptyCRLs" type="string">
- <annotation>
- <documentation>Flag as to whether empty CRL's will be processed. Defaults to true.</documentation>
- </annotation>
- </attribute>
- <attribute name="processExpiredCRLs" type="string">
- <annotation>
- <documentation>Flag as to whether expired CRL's will be processed. Defaults to true.</documentation>
- </annotation>
- </attribute>
- <attribute name="processCredentialCRLs" type="string">
- <annotation>
- <documentation>
- Flag as to whether CRL's supplied in the untrusted credential
- being evaluated will be processed. Defaults to true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="defaultVerificationDepth" type="string">
- <annotation>
- <documentation>Default PKIX path verification depth. Defaults to 1.</documentation>
- </annotation>
- </attribute>
- </complexType>
-
- <complexType name="CertPathValidationOptionsType">
- <annotation>
- <documentation>
- Type specialization for PKIX validation options set for PKIX trust engines
- using the Java CertPath API.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:ValidationOptionsType">
- <sequence>
- <element name="PolicyOID" type="string" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Sets the initial policy identifiers (OID strings) for the underlying CertPath Provider,
- i.e. those policies that are acceptable to the certificate user.
- See also RFC 5280, section 6.1.1 (c).
- If no policy identifier is specified, any policy is considered acceptable.
- </documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="forceRevocationEnabled" type="string">
- <annotation>
- <documentation>
- If true, the revocation behavior of the underlying CertPath provider will be forced to the
- value supplied by the revocationEnabled attribute. If false, the revocation behavior
- of the underlying provider will be determined by the PKIXTrustEvaluator implementation.
- Defaults to false.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="revocationEnabled" type="string">
- <annotation>
- <documentation>
- If the attribute forceRevocationEnabled is true, the revocation behavior of the underlying CertPath
- Provider will be forced to this value. If the former is false, the revocation behavior
- of the underlying provider will be determined by the PKIXTrustEvaluator implementation.
- Defaults to true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="policyMappingInhibit" type="string">
- <annotation>
- <documentation>
- Sets the policy mapping inhibited flag for the underlying CertPath Provider.
- See also RFC 5280, section 6.1.1 (e).
- Defaults to false.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="anyPolicyInhibit" type="string">
- <annotation>
- <documentation>
- Sets the any policy inhibited flag for the underlying CertPath Provider.
- See also RFC 5280, section 6.1.1 (g).
- Defaults to false.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- TRUST ENGINE RELATED OBJECTS -->
- <element name="TrustEngine" type="sec:TrustEngineType"/>
-
- <complexType name="Chaining">
- <annotation>
- <documentation>
- Trust engine which chains together other trust engine instances, evaluating a token
- against each engine in chain order.
-
- If the token to be evaluated can be established as trusted by one member of the chain,
- then the token is trusted. Otherwise it is evaluated as untrusted.
-
- Trust chain members must all evaluate tokens of a compatible type,
- for example a Credential or Signature.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <choice minOccurs="1" maxOccurs="unbounded">
- <element ref="sec:TrustEngine"/>
- <element name="TrustEngineRef">
- <annotation>
- <documentation>Reference to a trust engine.</documentation>
- </annotation>
- <complexType>
- <attribute name="ref">
- <annotation>
- <documentation>Bean reference id for a trust engine declared elsewhere.</documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
- </choice>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SignatureChaining">
- <annotation>
- <documentation>
- Trust engine which chains together other signature trust engine instances, evaluating the signature
- against each engine in chain order.
-
- If the signature to be evaluated can be established as trusted by one member of the chain,
- then the signature is trusted. Otherwise it is evaluated as untrusted.
-
- Trust chain members must all evaluate signatures.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <choice minOccurs="1" maxOccurs="unbounded">
- <element ref="sec:TrustEngine"/>
- <element name="TrustEngineRef">
- <annotation>
- <documentation>Reference to a trust engine.</documentation>
- </annotation>
- <complexType>
- <attribute name="ref">
- <annotation>
- <documentation>Bean reference id for a trust engine declared elsewhere.</documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
- </choice>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Trust engines which use metadata provider-based resolvers -->
- <complexType name="MetadataExplicitKey">
- <annotation>
- <documentation>
- Trust engine used to validate a key against trusted keys obtained from metadata.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <attribute name="metadataProviderRef" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the metadata provider used to look up trust information.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MetadataPKIXX509Credential">
- <annotation>
- <documentation>
- Trust engine used to validate an X509 credential against PKIX information from metadata.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <sequence>
- <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
- <annotation>
- <documentation>
- Set of options to influence PKIX trust validation processing.
- </documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="metadataProviderRef" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the metadata provider used to look up trust information.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MetadataExplicitKeySignature">
- <annotation>
- <documentation>
- Trust engine used to validate signatures with keys from metadata.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <attribute name="metadataProviderRef" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the metadata provider used to look up trust information.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MetadataPKIXSignature">
- <annotation>
- <documentation>
- Trust engine used to validate signatures with PKIX-validated certificates from metadata.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <sequence>
- <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
- <annotation>
- <documentation>
- Set of options to influence PKIX trust validation processing.
- </documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="metadataProviderRef" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the metadata provider used to look up trust information.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Trust engines which use resolvers configured via static information -->
- <complexType name="StaticExplicitKey">
- <annotation>
- <documentation>
- Trust engine used to validate a key against statically-configured trusted keys.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <sequence>
- <element ref="sec:Credential" minOccurs="1" maxOccurs="unbounded">
- <annotation>
- <documentation>
- A trusted credential to be included in the static trusted credential set.
- </documentation>
- </annotation>
- </element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="StaticPKIXX509Credential">
- <annotation>
- <documentation>
- Trust engine used to validate an X509 credential against statically-configured PKIX information.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <sequence>
- <element name="TrustedName" type="string" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Specifies a trusted name against which the target entity
- certificate's public key must be bound for trust processing to be successful.
-
- Supported trusted name formats are:
- 1) Subject DN in RFC 2253 or RFC 1779 format
- 2) CN component of subject DN
- 3) Subject alt names (DNS and URI types)
-
- If multiple instances of this element are present, trust processing
- is successful if the target entity certificate matches at least one of them.
-
- Trusted names are ignored and therefore optional if trustedNameCheckEnabled = false.
- </documentation>
- </annotation>
- </element>
- <element ref="sec:ValidationInfo" minOccurs="1" maxOccurs="unbounded">
- <annotation>
- <documentation>
- PKIX validation info against which to validate an X509 credential.
- </documentation>
- </annotation>
- </element>
- <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
- <annotation>
- <documentation>
- Set of options to influence PKIX trust validation processing.
- </documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="trustedNameCheckEnabled" type="string">
- <annotation>
- <documentation>
- If true, the candidate X509Crednetial's certificate must match one of the
- names indicated via the TrustedName child elements.
- Defaults to true.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="StaticExplicitKeySignature">
- <annotation>
- <documentation>
- Trust engine used to validate a signature against statically-configured trusted keys.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <sequence>
- <element ref="sec:Credential" minOccurs="1" maxOccurs="unbounded">
- <annotation>
- <documentation>
- A trusted credential to be included in the static trusted credential set.
- </documentation>
- </annotation>
- </element>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="StaticPKIXSignature">
- <annotation>
- <documentation>
- Trust engine used to validate signatures against statically-configured PKIX information.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:TrustEngineType">
- <sequence>
- <element name="TrustedName" type="string" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Specifies a trusted name against which the target entity
- certificate's public key must be bound for trust processing to be successful.
-
- Supported trusted name formats are:
- 1) Subject DN in RFC 2253 or RFC 1779 format
- 2) CN component of subject DN
- 3) Subject alt names (DNS and URI types)
-
- If multiple instances of this element are present, trust processing
- is successful if the target entity certificate matches at least one of them.
-
- Trusted names are ignored and therefore optional if trustedNameCheckEnabled=false.
- </documentation>
- </annotation>
- </element>
- <element ref="sec:ValidationInfo" minOccurs="1" maxOccurs="unbounded">
- <annotation>
- <documentation>
- PKIX validation info against which to validate a signature.
- </documentation>
- </annotation>
- </element>
- <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
- <annotation>
- <documentation>
- Set of options to influence PKIX trust validation processing.
- </documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="trustedNameCheckEnabled" type="string">
- <annotation>
- <documentation>
- If true, the candidate X509Crednetial's certificate must match one of the
- names indicated via the TrustedName child elements.
- Defaults to true.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="TrustEngineType" abstract="true">
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- Unique ID of the trust engine.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
-
- <!-- SECURITY POLICY RELATED OBJECTS -->
- <element name="SecurityPolicy" type="sec:SecurityPolicyType"/>
- <complexType name="SecurityPolicyType">
- <annotation>
- <documentation>
- Security policies define a set of rules that are evaluated against incoming messages to
- determine whether the messages should be processed.
- </documentation>
- </annotation>
- <sequence>
- <element ref="sec:Rule" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A unique ID for the policy.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
-
- <element name="Rule" type="sec:SecurityPolicyRuleType"/>
-
- <complexType name="MandatoryMessageAuthentication">
- <annotation>
- <documentation>
- A security rule that requires that an incoming message be authenticated.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:SecurityPolicyRuleType"/>
- </complexContent>
- </complexType>
-
- <complexType name="ClientCertAuth">
- <annotation>
- <documentation>
- A security rule that validates a client certificate, available from the inbound transport, with a trust engine.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="sec:SecurityPolicyRuleType">
- <attribute name="trustEngineRef" type="string" use="required">
- <annotation>
- <documentation>
- Reference to the trust engine used to validate the signature.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SecurityPolicyRuleType" abstract="true">
- <annotation>
- <documentation>
- Base type of security policy rules.
- </documentation>
- </annotation>
- </complexType>
-</schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sec="urn:mace:shibboleth:2.0:security" targetNamespace="urn:mace:shibboleth:2.0:security" elementFormDefault="qualified">
+
+ <!-- CREDENTIAL RELATED OBJECTS -->
+ <element name="Credential" type="sec:CredentialType"/>
+
+ <complexType name="X509Inline">
+ <annotation>
+ <documentation>
+ Allows credentials to be components to be specified as content within the child elements. Keys,
+ Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:X509Credential"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="X509Filesystem">
+ <annotation>
+ <documentation>
+ Allows credential components to be specified by filesystem path. Keys, Certificates, and CRLs may be
+ PKCS#12, DER, or PEM encoded and may be encrypted or not.
+
+ This credential is deprecated in favor of X509ResourceBacked
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:X509Credential"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="X509ResourceBacked">
+ <annotation>
+ <documentation>
+ Allows credential components to be loaded from a Spring Resource. Keys, Certificates, and CRLs may be
+ PKCS#12, DER, or PEM encoded and may be encrypted or not.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:X509Credential"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="X509Credential" abstract="true">
+ <annotation>
+ <documentation>
+ Defines the components of an X.509 credential.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:CredentialType">
+ <sequence>
+ <element name="PrivateKey" minOccurs="0">
+ <annotation>
+ <documentation>Credential's RSA/DSA private key.</documentation>
+ </annotation>
+ </element>
+ <element name="Certificate" minOccurs="1" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ Certificate associated with the credential. More than one certificate
+ may be present within a single element, if the encoding form used allows
+ it, or multiple certificate elements may be used, or both.
+ </documentation>
+ </annotation>
+ </element>
+ <element name="CRL" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ Certificate revocation list associated with the Credential. More than
+ one CRL may be present within a single element, if the encoding form
+ used allows it, or multiple CRL elements may be used, or both.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="BasicInline">
+ <annotation>
+ <documentation>
+ Allows credentials to be components to be specified as content within the child elements.
+ Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:BasicCredential"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="BasicFilesystem">
+ <annotation>
+ <documentation>
+ Allows credential components to be specified by filesystem path.
+ Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
+
+ This is deprecated in favor of BasicResourceBacked
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:BasicCredential"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="BasicResourceBacked">
+ <annotation>
+ <documentation>
+ Allows credential components to be specified by Spring Resource specification.
+ Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:BasicCredential"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="BasicCredential" abstract="true">
+ <annotation>
+ <documentation>
+ Defines the components of a basic credential containing either a
+ public key and optional private key, or a symmetric (secret) key.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:CredentialType">
+ <sequence>
+ <choice>
+ <element name="SecretKey">
+ <annotation>
+ <documentation>Credential's symmetric key.</documentation>
+ </annotation>
+ <complexType>
+ <simpleContent>
+ <extension base="string">
+ <attribute name="algorithm" type="string" use="required">
+ <annotation>
+ <documentation>
+ The JCA key algorithm identifier.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="encoding" use="required">
+ <annotation>
+ <documentation>
+ The encoded format of the key data. Defaults to: base64.
+ </documentation>
+ </annotation>
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="binary" />
+ <enumeration value="hex" />
+ <enumeration value="base64" />
+ </restriction>
+ </simpleType>
+ </attribute>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <sequence>
+ <element name="PrivateKey" minOccurs="0">
+ <annotation>
+ <documentation>Credential's RSA/DSA private key.</documentation>
+ </annotation>
+ </element>
+ <element name="PublicKey">
+ <annotation>
+ <documentation>Credential's RSA/DSA public key.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </choice>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="CredentialType" abstract="true">
+ <annotation>
+ <documentation>Base type for credential information.</documentation>
+ </annotation>
+ <sequence>
+ <element name="KeyName" type="string" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>Name(s) of the key this credential represents.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>Unique id for this credential.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="entityID" type="string">
+ <annotation>
+ <documentation>Identifier for the entity which owns this credential.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="usage" type="sec:CredentialUsageType">
+ <annotation>
+ <documentation>
+ Usage type for this credential. Acceptable values are "Encryption" or "Signing". If no usage type is
+ given components may choose to use the credential for either encryption or signing operations.
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+
+ <simpleType name="CredentialUsageType">
+ <restriction base="string">
+ <enumeration value="Encryption"/>
+ <enumeration value="Signing"/>
+ </restriction>
+ </simpleType>
+
+ <complexType name="PasswordBearingString">
+ <simpleContent>
+ <extension base="string">
+ <attribute name="password" type="string">
+ <annotation>
+ <documentation>
+ Password associated with the resource identified by elements of this type.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </simpleContent>
+ </complexType>
+
+ <!-- VALIDATION RELATED OBJECTS, FOR EXAMPLE PKIX INFO -->
+ <element name="ValidationInfo" type="sec:ValidationInfoType"/>
+
+ <element name="ValidationOptions" type="sec:ValidationOptionsType"/>
+
+ <complexType name="PKIXInline">
+ <annotation>
+ <documentation>
+ Allows PKIX validation info components to be specified as content within the child elements.
+ Certificates and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:PKIXValidationInfoType"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="PKIXFilesystem">
+ <annotation>
+ <documentation>
+ Allows PKIX validation info components to be specified by filesystem path.
+ Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
+
+ This method is deprecated in favor of the PKIXResourceBacked type employing a filesystem resource.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:PKIXValidationInfoType"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="PKIXResourceBacked">
+ <annotation>
+ <documentation>
+ Allows PKIX validation info components to be specified by a Spring Resource specification.
+ Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:PKIXValidationInfoType"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="PKIXValidationInfoType" abstract="true">
+ <annotation>
+ <documentation>
+ Defines the components of a set of PKIX validation information.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:ValidationInfoType">
+ <sequence>
+ <element name="Certificate" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ Trusted certificates, typically of root and intermediate CA's , which are used
+ as input to the PKIX validation process.
+ </documentation>
+ </annotation>
+ </element>
+ <element name="CRL" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ Certificate revocation lists which are used as input to the PKIX validation process.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ <attribute name="verifyDepth" type="string">
+ <annotation>
+ <documentation>
+ The maximum path verification depth to consider when constructing a PKIX cert path.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="ValidationInfoType" abstract="true">
+ <annotation>
+ <documentation>Base type for validation information.</documentation>
+ </annotation>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>Unique id for this validation info set.</documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+
+ <complexType name="ValidationOptionsType">
+ <annotation>
+ <documentation>Type for basic PKIX validation options set for PKIX trust engines.</documentation>
+ </annotation>
+ <attribute name="processEmptyCRLs" type="string">
+ <annotation>
+ <documentation>Flag as to whether empty CRL's will be processed. Defaults to true.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="processExpiredCRLs" type="string">
+ <annotation>
+ <documentation>Flag as to whether expired CRL's will be processed. Defaults to true.</documentation>
+ </annotation>
+ </attribute>
+ <attribute name="processCredentialCRLs" type="string">
+ <annotation>
+ <documentation>
+ Flag as to whether CRL's supplied in the untrusted credential
+ being evaluated will be processed. Defaults to true.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="defaultVerificationDepth" type="string">
+ <annotation>
+ <documentation>Default PKIX path verification depth. Defaults to 1.</documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+
+ <complexType name="CertPathValidationOptionsType">
+ <annotation>
+ <documentation>
+ Type specialization for PKIX validation options set for PKIX trust engines
+ using the Java CertPath API.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:ValidationOptionsType">
+ <sequence>
+ <element name="PolicyOID" type="string" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ Sets the initial policy identifiers (OID strings) for the underlying CertPath Provider,
+ i.e. those policies that are acceptable to the certificate user.
+ See also RFC 5280, section 6.1.1 (c).
+ If no policy identifier is specified, any policy is considered acceptable.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ <attribute name="forceRevocationEnabled" type="string">
+ <annotation>
+ <documentation>
+ If true, the revocation behavior of the underlying CertPath provider will be forced to the
+ value supplied by the revocationEnabled attribute. If false, the revocation behavior
+ of the underlying provider will be determined by the PKIXTrustEvaluator implementation.
+ Defaults to false.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="revocationEnabled" type="string">
+ <annotation>
+ <documentation>
+ If the attribute forceRevocationEnabled is true, the revocation behavior of the underlying CertPath
+ Provider will be forced to this value. If the former is false, the revocation behavior
+ of the underlying provider will be determined by the PKIXTrustEvaluator implementation.
+ Defaults to true.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="policyMappingInhibit" type="string">
+ <annotation>
+ <documentation>
+ Sets the policy mapping inhibited flag for the underlying CertPath Provider.
+ See also RFC 5280, section 6.1.1 (e).
+ Defaults to false.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="anyPolicyInhibit" type="string">
+ <annotation>
+ <documentation>
+ Sets the any policy inhibited flag for the underlying CertPath Provider.
+ See also RFC 5280, section 6.1.1 (g).
+ Defaults to false.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <!-- TRUST ENGINE RELATED OBJECTS -->
+ <element name="TrustEngine" type="sec:TrustEngineType"/>
+
+ <complexType name="Chaining">
+ <annotation>
+ <documentation>
+ Trust engine which chains together other trust engine instances, evaluating a token
+ against each engine in chain order.
+
+ If the token to be evaluated can be established as trusted by one member of the chain,
+ then the token is trusted. Otherwise it is evaluated as untrusted.
+
+ Trust chain members must all evaluate tokens of a compatible type,
+ for example a Credential or Signature.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element ref="sec:TrustEngine"/>
+ <element name="TrustEngineRef">
+ <annotation>
+ <documentation>Reference to a trust engine.</documentation>
+ </annotation>
+ <complexType>
+ <attribute name="ref">
+ <annotation>
+ <documentation>Bean reference id for a trust engine declared elsewhere.</documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+ </choice>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SignatureChaining">
+ <annotation>
+ <documentation>
+ Trust engine which chains together other signature trust engine instances, evaluating the signature
+ against each engine in chain order.
+
+ If the signature to be evaluated can be established as trusted by one member of the chain,
+ then the signature is trusted. Otherwise it is evaluated as untrusted.
+
+ Trust chain members must all evaluate signatures.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element ref="sec:TrustEngine"/>
+ <element name="TrustEngineRef">
+ <annotation>
+ <documentation>Reference to a trust engine.</documentation>
+ </annotation>
+ <complexType>
+ <attribute name="ref">
+ <annotation>
+ <documentation>Bean reference id for a trust engine declared elsewhere.</documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+ </choice>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <!-- Trust engines which use metadata provider-based resolvers -->
+ <complexType name="MetadataExplicitKey">
+ <annotation>
+ <documentation>
+ Trust engine used to validate a key against trusted keys obtained from metadata.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <attribute name="metadataProviderRef" type="string" use="required">
+ <annotation>
+ <documentation>
+ The ID of the metadata provider used to look up trust information.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="MetadataPKIXX509Credential">
+ <annotation>
+ <documentation>
+ Trust engine used to validate an X509 credential against PKIX information from metadata.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <sequence>
+ <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
+ <annotation>
+ <documentation>
+ Set of options to influence PKIX trust validation processing.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ <attribute name="metadataProviderRef" type="string" use="required">
+ <annotation>
+ <documentation>
+ The ID of the metadata provider used to look up trust information.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="MetadataExplicitKeySignature">
+ <annotation>
+ <documentation>
+ Trust engine used to validate signatures with keys from metadata.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <attribute name="metadataProviderRef" type="string" use="required">
+ <annotation>
+ <documentation>
+ The ID of the metadata provider used to look up trust information.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="MetadataPKIXSignature">
+ <annotation>
+ <documentation>
+ Trust engine used to validate signatures with PKIX-validated certificates from metadata.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <sequence>
+ <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
+ <annotation>
+ <documentation>
+ Set of options to influence PKIX trust validation processing.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ <attribute name="metadataProviderRef" type="string" use="required">
+ <annotation>
+ <documentation>
+ The ID of the metadata provider used to look up trust information.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <!-- Trust engines which use resolvers configured via static information -->
+ <complexType name="StaticExplicitKey">
+ <annotation>
+ <documentation>
+ Trust engine used to validate a key against statically-configured trusted keys.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <sequence>
+ <element ref="sec:Credential" minOccurs="1" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ A trusted credential to be included in the static trusted credential set.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="StaticPKIXX509Credential">
+ <annotation>
+ <documentation>
+ Trust engine used to validate an X509 credential against statically-configured PKIX information.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <sequence>
+ <element name="TrustedName" type="string" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ Specifies a trusted name against which the target entity
+ certificate's public key must be bound for trust processing to be successful.
+
+ Supported trusted name formats are:
+ 1) Subject DN in RFC 2253 or RFC 1779 format
+ 2) CN component of subject DN
+ 3) Subject alt names (DNS and URI types)
+
+ If multiple instances of this element are present, trust processing
+ is successful if the target entity certificate matches at least one of them.
+
+ Trusted names are ignored and therefore optional if trustedNameCheckEnabled = false.
+ </documentation>
+ </annotation>
+ </element>
+ <element ref="sec:ValidationInfo" minOccurs="1" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ PKIX validation info against which to validate an X509 credential.
+ </documentation>
+ </annotation>
+ </element>
+ <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
+ <annotation>
+ <documentation>
+ Set of options to influence PKIX trust validation processing.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ <attribute name="trustedNameCheckEnabled" type="string">
+ <annotation>
+ <documentation>
+ If true, the candidate X509Crednetial's certificate must match one of the
+ names indicated via the TrustedName child elements.
+ Defaults to true.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="StaticExplicitKeySignature">
+ <annotation>
+ <documentation>
+ Trust engine used to validate a signature against statically-configured trusted keys.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <sequence>
+ <element ref="sec:Credential" minOccurs="1" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ A trusted credential to be included in the static trusted credential set.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="StaticPKIXSignature">
+ <annotation>
+ <documentation>
+ Trust engine used to validate signatures against statically-configured PKIX information.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:TrustEngineType">
+ <sequence>
+ <element name="TrustedName" type="string" minOccurs="0" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ Specifies a trusted name against which the target entity
+ certificate's public key must be bound for trust processing to be successful.
+
+ Supported trusted name formats are:
+ 1) Subject DN in RFC 2253 or RFC 1779 format
+ 2) CN component of subject DN
+ 3) Subject alt names (DNS and URI types)
+
+ If multiple instances of this element are present, trust processing
+ is successful if the target entity certificate matches at least one of them.
+
+ Trusted names are ignored and therefore optional if trustedNameCheckEnabled=false.
+ </documentation>
+ </annotation>
+ </element>
+ <element ref="sec:ValidationInfo" minOccurs="1" maxOccurs="unbounded">
+ <annotation>
+ <documentation>
+ PKIX validation info against which to validate a signature.
+ </documentation>
+ </annotation>
+ </element>
+ <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
+ <annotation>
+ <documentation>
+ Set of options to influence PKIX trust validation processing.
+ </documentation>
+ </annotation>
+ </element>
+ </sequence>
+ <attribute name="trustedNameCheckEnabled" type="string">
+ <annotation>
+ <documentation>
+ If true, the candidate X509Crednetial's certificate must match one of the
+ names indicated via the TrustedName child elements.
+ Defaults to true.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="TrustEngineType" abstract="true">
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+ Unique ID of the trust engine.
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+
+ <!-- SECURITY POLICY RELATED OBJECTS -->
+ <element name="SecurityPolicy" type="sec:SecurityPolicyType"/>
+ <complexType name="SecurityPolicyType">
+ <annotation>
+ <documentation>
+ Security policies define a set of rules that are evaluated against incoming messages to
+ determine whether the messages should be processed.
+ </documentation>
+ </annotation>
+ <sequence>
+ <element ref="sec:Rule" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+ A unique ID for the policy.
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+
+ <element name="Rule" type="sec:SecurityPolicyRuleType"/>
+
+ <complexType name="MandatoryMessageAuthentication">
+ <annotation>
+ <documentation>
+ A security rule that requires that an incoming message be authenticated.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:SecurityPolicyRuleType"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="ClientCertAuth">
+ <annotation>
+ <documentation>
+ A security rule that validates a client certificate, available from the inbound transport, with a trust engine.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="sec:SecurityPolicyRuleType">
+ <attribute name="trustEngineRef" type="string" use="required">
+ <annotation>
+ <documentation>
+ Reference to the trust engine used to validate the signature.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="SecurityPolicyRuleType" abstract="true">
+ <annotation>
+ <documentation>
+ Base type of security policy rules.
+ </documentation>
+ </annotation>
+ </complexType>
+</schema>
diff --git a/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml b/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml
index c074431..a1bf0c6 100644
--- a/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml
+++ b/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml
@@ -1,72 +1,72 @@
-<EntityDescriptor entityID="https://sp.example.org"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
- urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd">
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol"
- AuthnRequestsSigned="false">
- <Extensions>
- <mdui:UIInfo>
- <mdui:DisplayName>Invalid name with no language</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">TEST SP (display Name)</mdui:DisplayName>
- <mdui:Description xml:lang="en">TEST SP (description)</mdui:Description>
- <mdui:Description xml:lang="fr">TEST SP (en francais
- dans la texte)</mdui:Description>
-
- <mdui:InformationURL>Invalid URL with no language</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://www.example.org</mdui:InformationURL>
- <mdui:PrivacyStatementURL>Invalid URL with no language</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://www.example.org/privacy</mdui:PrivacyStatementURL>
- <mdui:Logo height="65" width="150">https://shibboleth.net/images/shibboleth.png</mdui:Logo>
- <mdui:Logo height="65" width="150" xml:lang="de">https://shibboleth.net/images/shibboleth.pngde</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://example.org/sp/ACS" index="6"/>
- <AttributeConsumingService index="1">
- <ServiceName>Invalid name with no language</ServiceName>
- <ServiceName xml:lang="de">Der Service Name</ServiceName>
- <ServiceName xml:lang="fr">le Service Name</ServiceName>
- <ServiceDescription>Invalid description with no language</ServiceDescription>
- <ServiceDescription xml:lang="fr">Le ServiceDescription</ServiceDescription>
- <ServiceDescription xml:lang="de">Das ServiceDescription</ServiceDescription>
- <ServiceDescription xml:lang="en">The ServiceDescription</ServiceDescription>
- <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- </AttributeConsumingService>
-
- </SPSSODescriptor>
- <Organization>
- <OrganizationName>Invalid name with no language</OrganizationName>
- <OrganizationName xml:lang="is">TSC</OrganizationName>
- <OrganizationName xml:lang="es">LCS</OrganizationName>
- <OrganizationDisplayName>Invalid name with no language</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="fr">Le Consortium 'Shibboleth'</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">The Shibboleth Consortium</OrganizationDisplayName>
- <OrganizationURL>Invalid URL with no language</OrganizationURL>
- <OrganizationURL xml:lang="de">http://shibboleth.net/de</OrganizationURL>
- <OrganizationURL xml:lang="fr">script:moreBadness();</OrganizationURL>
- </Organization>
- <ContactPerson contactType="administrative">
- <GivenName>GNadministrative</GivenName>
- <SurName>Admin</SurName>
- <EmailAddress>mailto:administrative at example.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="billing">
- <GivenName>GNbilling</GivenName>
- <EmailAddress>mailto:billing at example.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="other">
- <SurName>OTHER</SurName>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>GNsupport</GivenName>
- <SurName>Engineer</SurName>
- <EmailAddress>script:VeryDangerous();</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>GNtechnical</GivenName>
- <SurName>Engineer</SurName>
- <EmailAddress>mailto:technical at example.org</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
+<EntityDescriptor entityID="https://sp.example.org"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
+ urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd">
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol"
+ AuthnRequestsSigned="false">
+ <Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName>Invalid name with no language</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">TEST SP (display Name)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">TEST SP (description)</mdui:Description>
+ <mdui:Description xml:lang="fr">TEST SP (en francais
+ dans la texte)</mdui:Description>
+
+ <mdui:InformationURL>Invalid URL with no language</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.example.org</mdui:InformationURL>
+ <mdui:PrivacyStatementURL>Invalid URL with no language</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.example.org/privacy</mdui:PrivacyStatementURL>
+ <mdui:Logo height="65" width="150">https://shibboleth.net/images/shibboleth.png</mdui:Logo>
+ <mdui:Logo height="65" width="150" xml:lang="de">https://shibboleth.net/images/shibboleth.pngde</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://example.org/sp/ACS" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName>Invalid name with no language</ServiceName>
+ <ServiceName xml:lang="de">Der Service Name</ServiceName>
+ <ServiceName xml:lang="fr">le Service Name</ServiceName>
+ <ServiceDescription>Invalid description with no language</ServiceDescription>
+ <ServiceDescription xml:lang="fr">Le ServiceDescription</ServiceDescription>
+ <ServiceDescription xml:lang="de">Das ServiceDescription</ServiceDescription>
+ <ServiceDescription xml:lang="en">The ServiceDescription</ServiceDescription>
+ <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName>Invalid name with no language</OrganizationName>
+ <OrganizationName xml:lang="is">TSC</OrganizationName>
+ <OrganizationName xml:lang="es">LCS</OrganizationName>
+ <OrganizationDisplayName>Invalid name with no language</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="fr">Le Consortium 'Shibboleth'</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">The Shibboleth Consortium</OrganizationDisplayName>
+ <OrganizationURL>Invalid URL with no language</OrganizationURL>
+ <OrganizationURL xml:lang="de">http://shibboleth.net/de</OrganizationURL>
+ <OrganizationURL xml:lang="fr">script:moreBadness();</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <GivenName>GNadministrative</GivenName>
+ <SurName>Admin</SurName>
+ <EmailAddress>mailto:administrative at example.org</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="billing">
+ <GivenName>GNbilling</GivenName>
+ <EmailAddress>mailto:billing at example.org</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="other">
+ <SurName>OTHER</SurName>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>GNsupport</GivenName>
+ <SurName>Engineer</SurName>
+ <EmailAddress>script:VeryDangerous();</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>GNtechnical</GivenName>
+ <SurName>Engineer</SurName>
+ <EmailAddress>mailto:technical at example.org</EmailAddress>
+ </ContactPerson>
+
+</EntityDescriptor>
diff --git a/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata2.xml b/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata2.xml
index d64171f..115d550 100644
--- a/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata2.xml
+++ b/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata2.xml
@@ -1,5 +1,5 @@
-<EntityDescriptor entityID="https://sp.example.org"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
- urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd"/>
+<EntityDescriptor entityID="https://sp.example.org"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
+ urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd"/>
diff --git a/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata3.xml b/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata3.xml
index 666f26d..f7ac0c1 100644
--- a/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata3.xml
+++ b/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata3.xml
@@ -1,5 +1,5 @@
-<EntityDescriptor entityID="urn:sp.example.org"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
- urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd"/>
+<EntityDescriptor entityID="urn:sp.example.org"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
+ urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd"/>
diff --git a/idp-war/src/main/webapp/css/logout.css b/idp-war/src/main/webapp/css/logout.css
index e57319c..26f1893 100644
--- a/idp-war/src/main/webapp/css/logout.css
+++ b/idp-war/src/main/webapp/css/logout.css
@@ -1,12 +1,12 @@
-/* Success/Failure indicators for logout propagation. */
-
-.success {
- background: url(../images/success-32x32.png) no-repeat left center;
- line-height: 36px;
- padding-left: 36px;
-}
-.failure {
- background: url(../images/failure-32x32.png) no-repeat left center;
- line-height: 36px;
- padding-left: 36px;
-}
+/* Success/Failure indicators for logout propagation. */
+
+.success {
+ background: url(../images/success-32x32.png) no-repeat left center;
+ line-height: 36px;
+ padding-left: 36px;
+}
+.failure {
+ background: url(../images/failure-32x32.png) no-repeat left center;
+ line-height: 36px;
+ padding-left: 36px;
+}
diff --git a/idp-war/src/main/webapp/css/main.css b/idp-war/src/main/webapp/css/main.css
index 282c550..116b31e 100644
--- a/idp-war/src/main/webapp/css/main.css
+++ b/idp-war/src/main/webapp/css/main.css
@@ -1,165 +1,165 @@
-* {
- margin: 0;
- padding: 0;
-}
-header, footer, section, nav {
- display: block;
-}
-html, body {
- height: 100%;
-}
-body {
- font-family:Verdana, Geneva, sans-serif;
- font-size: 12px;
- line-height: 1.5;
- color: #717171;
- background: #717171;
-}
-a:link,
-a:visited {
- text-decoration: none;
- color: #717171;
-}
-img {
- max-width: 100%;
- margin-bottom: 12px;
-}
-
-.wrapper {
- background: #ffffff;
-}
-
-.container {
- position: relative;
- left: 34%;
- width: 540px;
- margin-left: -270px;
-}
-.container-footer {
- padding-top: 12px;
-}
- at media only screen and (max-width: 1020px) {
- .container {
- left: 45%;
- }
-}
- at media only screen and (max-width: 650px) {
- .container {
- position: static;
- margin: 0 auto;
- width: 280px;
- }
-}
-
-header {
- padding: 20px 0;
-}
-
-.logo img {
- border: none;
-}
- at media only screen and (max-width: 650px) {
- .logo img {
- display: none;
- }
- .logo {
- background: url(../images/dummylogo-mobile.png) no-repeat top center;
- display: block;
- height: 115px;
- width: 100px;
- margin: 0 auto;
- }
-}
-
-.content {
- padding-bottom: 80px;
- overflow: hidden;
-}
-
-.column {
- float: left;
-}
-.column.one {
- width: 50%;
- margin-right: 48px;
-}
-
-form {
- width: 240px;
- padding-bottom: 21px;
-}
-form label { /* labels are hidden */
- font-weight: bold;
-}
-form legend {
- font-size:1.2em;
- margin-bottom: 12px;
-}
-.form-element-wrapper {
- margin-bottom: 12px;
-}
-.form-element {
- width: 100%;
- padding: 13px 12px;
- border: none;
- font-size: 14px;
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
-}
-.form-field {
- color: #B7B7B7;
- border: 1px solid #B7B7B7;
-}
-.form-field-focus,
-.form-field:focus,
-input[type="text"]:focus {
- color: #333333;
- border-color: #333;
-}
-.form-button {
- background: #B61601;
- box-sizing: content-box;
- -moz-box-sizing: content-box;
- color: #ffffff;
- cursor: pointer;
-}
-.form-button:hover {
- background: #FF6400;
-}
-.form-error {
- padding: 0;
- color: #B61601;
-}
-
-.list-help {
- margin-top: 40px; /* offset padding on first anchor */
- list-style: none;
-}
-.list-help-item a {
- display: block;
- padding: 6px 0;
-}
-.item-marker {
- color: #be0000;
-}
-
-footer {
- color: #ffffff;
- font-size: 11px;
- background: #717171;
-}
-.footer-text {
- margin-bottom: 12px;
-}
-.footer-links a:link,
-.footer-links a:visited {
- color: #ffffff;
- font-weight: bold;
-}
-.footer-links a:after {
- content: "\00a0\00a0\00a0|\00a0\00a0";
-}
-.footer-links a.last:after {
- content: "";
-}
+* {
+ margin: 0;
+ padding: 0;
+}
+header, footer, section, nav {
+ display: block;
+}
+html, body {
+ height: 100%;
+}
+body {
+ font-family:Verdana, Geneva, sans-serif;
+ font-size: 12px;
+ line-height: 1.5;
+ color: #717171;
+ background: #717171;
+}
+a:link,
+a:visited {
+ text-decoration: none;
+ color: #717171;
+}
+img {
+ max-width: 100%;
+ margin-bottom: 12px;
+}
+
+.wrapper {
+ background: #ffffff;
+}
+
+.container {
+ position: relative;
+ left: 34%;
+ width: 540px;
+ margin-left: -270px;
+}
+.container-footer {
+ padding-top: 12px;
+}
+ at media only screen and (max-width: 1020px) {
+ .container {
+ left: 45%;
+ }
+}
+ at media only screen and (max-width: 650px) {
+ .container {
+ position: static;
+ margin: 0 auto;
+ width: 280px;
+ }
+}
+
+header {
+ padding: 20px 0;
+}
+
+.logo img {
+ border: none;
+}
+ at media only screen and (max-width: 650px) {
+ .logo img {
+ display: none;
+ }
+ .logo {
+ background: url(../images/dummylogo-mobile.png) no-repeat top center;
+ display: block;
+ height: 115px;
+ width: 100px;
+ margin: 0 auto;
+ }
+}
+
+.content {
+ padding-bottom: 80px;
+ overflow: hidden;
+}
+
+.column {
+ float: left;
+}
+.column.one {
+ width: 50%;
+ margin-right: 48px;
+}
+
+form {
+ width: 240px;
+ padding-bottom: 21px;
+}
+form label { /* labels are hidden */
+ font-weight: bold;
+}
+form legend {
+ font-size:1.2em;
+ margin-bottom: 12px;
+}
+.form-element-wrapper {
+ margin-bottom: 12px;
+}
+.form-element {
+ width: 100%;
+ padding: 13px 12px;
+ border: none;
+ font-size: 14px;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+}
+.form-field {
+ color: #B7B7B7;
+ border: 1px solid #B7B7B7;
+}
+.form-field-focus,
+.form-field:focus,
+input[type="text"]:focus {
+ color: #333333;
+ border-color: #333;
+}
+.form-button {
+ background: #B61601;
+ box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ color: #ffffff;
+ cursor: pointer;
+}
+.form-button:hover {
+ background: #FF6400;
+}
+.form-error {
+ padding: 0;
+ color: #B61601;
+}
+
+.list-help {
+ margin-top: 40px; /* offset padding on first anchor */
+ list-style: none;
+}
+.list-help-item a {
+ display: block;
+ padding: 6px 0;
+}
+.item-marker {
+ color: #be0000;
+}
+
+footer {
+ color: #ffffff;
+ font-size: 11px;
+ background: #717171;
+}
+.footer-text {
+ margin-bottom: 12px;
+}
+.footer-links a:link,
+.footer-links a:visited {
+ color: #ffffff;
+ font-weight: bold;
+}
+.footer-links a:after {
+ content: "\00a0\00a0\00a0|\00a0\00a0";
+}
+.footer-links a.last:after {
+ content: "";
+}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list