Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dima767 committed Nov 26, 2019
1 parent bd0ef4e commit ea745d4
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 144 deletions.
75 changes: 15 additions & 60 deletions backend/src/test/resources/conf/278.2.xml
Original file line number Diff line number Diff line change
@@ -1,66 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This file is an EXAMPLE metadata configuration file. -->
<MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider"
xmlns="urn:mace:shibboleth:2.0:metadata"
xmlns:resource="urn:mace:shibboleth:2.0:resource"
xmlns:security="urn:mace:shibboleth:2.0:security"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd">
<MetadataProvider backgroundInitializationFromCacheDelay="PT2S"
cleanupTaskInterval="PT30M"
connectionRequestTimeout="PT5S"
connectionTimeout="PT5S"
id="DynamicHTTP"
maxCacheDuration="PT8H"
maxConnectionsPerRoute="100"
maxConnectionsTotal="100"
maxIdleEntityData="PT8H"
minCacheDuration="PT10M"
refreshDelayFactor="0.75"
removeIdleEntityData="true"
socketTimeout="PT5S"
supportedContentTypes="[]"
xsi:type="DynamicHttpMetadataProvider">
<MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
<MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
<MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
<MetadataFilter xsi:type="EntityAttributes">
<saml:Attribute
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="here" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:type="xsd:string">there</saml:AttributeValue>
</saml:Attribute>
<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
<MetadataProvider id='DynamicHTTP' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' supportedContentTypes='[]' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<MetadataQueryProtocol transformRef='transformRef'>content</MetadataQueryProtocol>
<MetadataFilter xsi:type='SignatureValidation' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata' certificateFile='%{idp.home}/credentials/inc-md-cert.pem' />
<MetadataFilter xsi:type='RequiredValidUntil' maxValidityInterval='P14D' />
<MetadataFilter xsi:type='EntityAttributes'><saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="here" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">there</saml:AttributeValue>
</saml:Attribute>

<Entity>https://sp1.example.org</Entity>
</MetadataFilter>
<MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<MetadataFilter xsi:type='EntityRoleWhiteList' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
<RetainedRole>md:SPSSODescriptor</RetainedRole>
</MetadataFilter>
</MetadataProvider>
<MetadataProvider id="HTTPMetadata"
xsi:type="FileBackedHTTPMetadataProvider"
backingFile="%{idp.home}/metadata/metadata.xml"
metadataURL="https://idp.unicon.net/idp/shibboleth"
minRefreshDelay='PT0M'
maxRefreshDelay='P1D'>
</MetadataProvider>
<MetadataProvider id="LocalDynamic"
backgroundInitializationFromCacheDelay="PT2S"
cleanupTaskInterval="PT30M"
maxCacheDuration="PT8H"
maxIdleEntityData="PT8H"
minCacheDuration="PT10M"
refreshDelayFactor="0.75"
removeIdleEntityData="true"
sourceDirectory="/tmp"
xsi:type="DynamicHttpMetadataProvider">
<MetadataProvider id='HTTPMetadata' xsi:type='FileBackedHTTPMetadataProvider' backingFile='%{idp.home}/metadata/metadata.xml' metadataURL='https://idp.unicon.net/idp/shibboleth' minRefreshDelay='PT0M' maxRefreshDelay='P1D' />
<MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' />
<MetadataProvider id='ClasspathResourceMetadata' xsi:type='ResourceBackedMetadataProvider' refreshDelayFactor='0.3'>
<MetadataResource xmlns:resource='urn:mace:shibboleth:2.0:resource' xsi:type='resource:ClasspathResource' file='metadata/metadata.xml' />
</MetadataProvider>
<MetadataProvider id="ClasspathResourceMetadata"
refreshDelayFactor="0.3"
xsi:type="ResourceBackedMetadataProvider">
<MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
xsi:type="resource:ClasspathResource"
file="metadata/metadata.xml" />
</MetadataProvider>

</MetadataProvider>
</MetadataProvider>
65 changes: 11 additions & 54 deletions backend/src/test/resources/conf/278.xml
Original file line number Diff line number Diff line change
@@ -1,58 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This file is an EXAMPLE metadata configuration file. -->
<MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider"
xmlns="urn:mace:shibboleth:2.0:metadata"
xmlns:resource="urn:mace:shibboleth:2.0:resource"
xmlns:security="urn:mace:shibboleth:2.0:security"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd">
<MetadataProvider backgroundInitializationFromCacheDelay="PT2S"
cleanupTaskInterval="PT30M"
connectionRequestTimeout="PT5S"
connectionTimeout="PT5S"
id="DynamicHTTP"
maxCacheDuration="PT8H"
maxConnectionsPerRoute="100"
maxConnectionsTotal="100"
maxIdleEntityData="PT8H"
minCacheDuration="PT10M"
refreshDelayFactor="0.75"
removeIdleEntityData="true"
socketTimeout="PT5S"
supportedContentTypes="[]"
xsi:type="DynamicHttpMetadataProvider">
<MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
<MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
<MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
<MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
<MetadataProvider id='DynamicHTTP' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' supportedContentTypes='[]' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<MetadataQueryProtocol transformRef='transformRef'>content</MetadataQueryProtocol>
<MetadataFilter xsi:type='SignatureValidation' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata' certificateFile='%{idp.home}/credentials/inc-md-cert.pem' />
<MetadataFilter xsi:type='RequiredValidUntil' maxValidityInterval='P14D' />
<MetadataFilter xsi:type='EntityRoleWhiteList' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
<RetainedRole>md:SPSSODescriptor</RetainedRole>
</MetadataFilter>
</MetadataProvider>
<MetadataProvider id="HTTPMetadata"
xsi:type="FileBackedHTTPMetadataProvider"
backingFile="%{idp.home}/metadata/metadata.xml"
metadataURL="https://idp.unicon.net/idp/shibboleth"
minRefreshDelay='PT0M'
maxRefreshDelay='P1D'>
<MetadataProvider id='HTTPMetadata' xsi:type='FileBackedHTTPMetadataProvider' backingFile='%{idp.home}/metadata/metadata.xml' metadataURL='https://idp.unicon.net/idp/shibboleth' minRefreshDelay='PT0M' maxRefreshDelay='P1D' />
<MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' />
<MetadataProvider id='ClasspathResourceMetadata' xsi:type='ResourceBackedMetadataProvider' refreshDelayFactor='0.3'>
<MetadataResource xmlns:resource='urn:mace:shibboleth:2.0:resource' xsi:type='resource:ClasspathResource' file='metadata/metadata.xml' />
</MetadataProvider>
<MetadataProvider id="LocalDynamic"
backgroundInitializationFromCacheDelay="PT2S"
cleanupTaskInterval="PT30M"
maxCacheDuration="PT8H"
maxIdleEntityData="PT8H"
minCacheDuration="PT10M"
refreshDelayFactor="0.75"
removeIdleEntityData="true"
sourceDirectory="/tmp"
xsi:type="DynamicHttpMetadataProvider">
</MetadataProvider>
<MetadataProvider id="ClasspathResourceMetadata"
refreshDelayFactor="0.3"
xsi:type="ResourceBackedMetadataProvider">
<MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
xsi:type="resource:ClasspathResource"
file="metadata/metadata.xml" />
</MetadataProvider>
</MetadataProvider>
</MetadataProvider>
4 changes: 2 additions & 2 deletions backend/src/test/resources/conf/704.1.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
<MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' refreshDelayFactor='0.75' minCacheDuration='PT10M' maxCacheDuration='PT8H' maxIdleEntityData='PT8H' removeIdleEntityData='true' cleanupTaskInterval='PT30M' backgroundInitializationFromCacheDelay='PT2S' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<MetadataQueryProtocol transformRef='This is a transformRef'>some content</MetadataQueryProtocol>
</MetadataProvider>
</MetadataProvider>
</MetadataProvider>
4 changes: 2 additions & 2 deletions backend/src/test/resources/conf/704.2.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
<MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' refreshDelayFactor='0.75' minCacheDuration='PT10M' maxCacheDuration='PT8H' maxIdleEntityData='PT8H' removeIdleEntityData='true' cleanupTaskInterval='PT30M' backgroundInitializationFromCacheDelay='PT2S' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<Template encodingStyle='FORM' transformRef='This is a transformRef' velocityEngine='This is a velocityEngine'>some content</Template>
</MetadataProvider>
</MetadataProvider>
</MetadataProvider>
4 changes: 2 additions & 2 deletions backend/src/test/resources/conf/704.3.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
<MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' refreshDelayFactor='0.75' minCacheDuration='PT10M' maxCacheDuration='PT8H' maxIdleEntityData='PT8H' removeIdleEntityData='true' cleanupTaskInterval='PT30M' backgroundInitializationFromCacheDelay='PT2S' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<Regex match='This is the match field'>some content</Regex>
</MetadataProvider>
</MetadataProvider>
</MetadataProvider>
16 changes: 4 additions & 12 deletions backend/src/test/resources/conf/984-2.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MetadataProvider xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
id="ShibbolethMetadata"
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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
xsi:type="ChainingMetadataProvider">
<MetadataProvider backgroundInitializationFromCacheDelay="PT2S" cleanupTaskInterval="PT30M"
connectionRequestTimeout="PT5S" connectionTimeout="PT5S" id="DynamicHttpMetadataResolver"
maxCacheDuration="PT8H" maxConnectionsPerRoute="100" maxConnectionsTotal="100"
maxIdleEntityData="PT8H" minCacheDuration="PT10M" refreshDelayFactor="0.75"
removeIdleEntityData="true" socketTimeout="PT5S" xsi:type="DynamicHttpMetadataProvider">
<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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: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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
<MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
<MetadataQueryProtocol>http://mdq-beta.incommon.org/global</MetadataQueryProtocol>
<MetadataFilter xsi:type="EntityAttributes">
<MetadataFilter xsi:type='EntityAttributes'>
<AttributeFilterScript>
<Script>
<![CDATA[
(function (attribute) {
(function (attribute) {
"use strict";
var namespaces = ["http://shibboleth.net/ns/profiles", "http://scaldingspoon.com/iam"];
// check the parameter
Expand Down
Loading

0 comments on commit ea745d4

Please sign in to comment.