<element ref="conf:Extensions" minOccurs="0"/>\r
<element ref="conf:OutOfProcess"/>\r
<element ref="conf:InProcess"/>\r
- <element ref="conf:Applications"/>\r
+ <choice minOccurs="0">\r
+ <element name="UnixListener">\r
+ <complexType>\r
+ <attribute name="address" type="conf:string" use="required"/>\r
+ </complexType>\r
+ </element>\r
+ <element name="TCPListener">\r
+ <complexType>\r
+ <attribute name="address" type="conf:string" use="required"/>\r
+ <attribute name="port" type="unsignedInt" use="required"/>\r
+ <attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>\r
+ </complexType>\r
+ </element>\r
+ <element name="Listener" type="conf:PluggableType"/>\r
+ </choice>\r
+ <element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>\r
+ <element ref="conf:SessionCache" minOccurs="0"/>\r
+ <element ref="conf:ReplayCache" minOccurs="0"/>\r
+ <element ref="conf:ArtifactMap" minOccurs="0"/>\r
+ <element name="RequestMapper" type="conf:PluggableType" minOccurs="0"/>\r
+ <element ref="conf:ApplicationDefaults"/>\r
<element ref="conf:SecurityPolicies"/>\r
</sequence>\r
<attribute name="logger" type="anyURI"/>\r
\r
<element name="OutOfProcess">\r
<annotation>\r
- <documentation>Container for shibd out-of-process configuration</documentation>\r
+ <documentation>Container for out-of-process (shibd) configuration</documentation>\r
</annotation>\r
<complexType>\r
<sequence>\r
<element ref="conf:Extensions" minOccurs="0"/>\r
- <choice>\r
- <element name="UnixListener">\r
- <complexType>\r
- <attribute name="address" type="conf:string" use="required"/>\r
- </complexType>\r
- </element>\r
- <element name="TCPListener">\r
- <complexType>\r
- <attribute name="address" type="conf:string" use="required"/>\r
- <attribute name="port" type="unsignedInt" use="required"/>\r
- <attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>\r
- </complexType>\r
- </element>\r
- <element name="Listener" type="conf:PluggableType"/>\r
- </choice>\r
- <element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>\r
- <element ref="conf:SessionCache" minOccurs="0"/>\r
- <element ref="conf:ReplayCache" minOccurs="0"/>\r
- <element ref="conf:ArtifactMap" minOccurs="0"/>\r
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
</sequence>\r
<attribute name="logger" type="anyURI"/>\r
<complexType>\r
<sequence>\r
<element ref="conf:Extensions" minOccurs="0"/>\r
- <element ref="conf:SessionCache" minOccurs="0"/>\r
- <element name="RequestMapper" type="conf:PluggableType"/>\r
- <element name="Implementation" minOccurs="0">\r
- <complexType>\r
- <sequence>\r
- <element ref="conf:ISAPI" minOccurs="0"/>\r
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
- </sequence>\r
- </complexType>\r
- </element>\r
+ <element ref="conf:ISAPI" minOccurs="0"/>\r
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
</sequence>\r
<attribute name="logger" type="anyURI"/>\r
<element ref="conf:OR"/>\r
<element ref="conf:NOT"/>\r
<element ref="conf:Rule"/>\r
+ <element ref="conf:RuleRegex"/>\r
</choice>\r
</complexType>\r
<complexType name="MultiOperatorType">\r
<element ref="conf:OR"/>\r
<element ref="conf:NOT"/>\r
<element ref="conf:Rule"/>\r
+ <element ref="conf:RuleRegex"/>\r
</choice>\r
</complexType>\r
<element name="Rule">\r
<simpleContent>\r
<extension base="conf:listOfStrings">\r
<attribute name="require" type="conf:string" use="required"/>\r
+ <attribute name="list" type="boolean"/>\r
</extension>\r
</simpleContent>\r
</complexType>\r
</element>\r
+ <element name="RuleRegex">\r
+ <complexType>\r
+ <simpleContent>\r
+ <extension base="conf:string">\r
+ <attribute name="require" type="conf:string" use="required"/>\r
+ <attribute name="ignoreCase" type="boolean"/>\r
+ </extension>\r
+ </simpleContent>\r
+ </complexType>\r
+ </element>\r
\r
<attributeGroup name="ContentSettings">\r
<attribute name="authType" type="conf:string"/>\r
</complexType>\r
</element>\r
\r
- <element name="Applications">\r
+ <element name="ApplicationDefaults">\r
<annotation>\r
- <documentation>Container for global settings and application-specific overrides</documentation>\r
+ <documentation>Container for default settings and application-specific overrides</documentation>\r
</annotation>\r
<complexType>\r
<sequence>\r
<element ref="conf:Sessions"/>\r
<element ref="conf:Errors" minOccurs="0"/>\r
- <element ref="conf:DefaultRelyingParty"/>\r
+ <element ref="conf:RelyingParty" minOccurs="0" maxOccurs="unbounded"/>\r
<element ref="conf:Notify" minOccurs="0" maxOccurs="unbounded"/>\r
<element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>\r
<element name="MetadataProvider" type="conf:PluggableType"/>\r
<element name="AttributeResolver" type="conf:PluggableType" minOccurs="0"/>\r
<element name="AttributeFilter" type="conf:PluggableType" minOccurs="0"/>\r
<element name="CredentialResolver" type="conf:PluggableType" minOccurs="0"/>\r
- <element ref="conf:Application" minOccurs="0" maxOccurs="unbounded"/>\r
+ <element ref="conf:ApplicationOverride" minOccurs="0" maxOccurs="unbounded"/>\r
</sequence>\r
<attribute name="id" type="conf:string" fixed="default"/>\r
<attribute name="entityID" type="anyURI" use="required"/>\r
<attribute name="policyId" type="conf:string" use="required"/>\r
<attributeGroup ref="conf:ApplicationGroup"/>\r
+ <attributeGroup ref="conf:RelyingPartyGroup"/>\r
<anyAttribute namespace="##other" processContents="lax"/>\r
</complexType>\r
</element>\r
\r
- <element name="Application">\r
+ <element name="ApplicationOverride">\r
<annotation>\r
<documentation>Container for application-specific overrides</documentation>\r
</annotation>\r
<sequence>\r
<element ref="conf:Sessions" minOccurs="0"/>\r
<element ref="conf:Errors" minOccurs="0"/>\r
- <element ref="conf:DefaultRelyingParty" minOccurs="0"/>\r
+ <element ref="conf:RelyingParty" minOccurs="0" maxOccurs="unbounded"/>\r
<element ref="conf:Notify" minOccurs="0" maxOccurs="unbounded"/>\r
<element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>\r
<element name="MetadataProvider" type="conf:PluggableType" minOccurs="0"/>\r
<attribute name="entityID" type="anyURI"/>\r
<attribute name="policyId" type="conf:string"/>\r
<attributeGroup ref="conf:ApplicationGroup"/>\r
+ <attributeGroup ref="conf:RelyingPartyGroup"/>\r
<anyAttribute namespace="##other" processContents="lax"/>\r
</complexType>\r
</element>\r
<attribute name="REMOTE_USER" type="conf:listOfStrings"/>\r
<attribute name="unsetHeaders" type="conf:listOfStrings"/>\r
<attribute name="metadataAttributePrefix" type="conf:string"/>\r
- <attribute name="localLogout" type="anyURI"/>\r
- <attribute name="globalLogout" type="anyURI"/>\r
+ <attribute name="attributePrefix" type="conf:string"/>\r
</attributeGroup>\r
- \r
+\r
+ <attributeGroup name="RelyingPartyGroup">\r
+ <attribute name="authType" type="conf:string"/>\r
+ <attribute name="authUsername" type="conf:string"/>\r
+ <attribute name="authPassword" type="conf:string"/>\r
+ <attribute name="signing" type="conf:bindingBoolean"/>\r
+ <attribute name="signingAlg" type="anyURI"/>\r
+ <attribute name="digestAlg" type="anyURI"/>\r
+ <attribute name="encryption" type="conf:bindingBoolean"/>\r
+ <attribute name="encryptionAlg" type="anyURI"/>\r
+ <attribute name="keyName" type="conf:string"/>\r
+ <attribute name="artifactEndpointIndex" type="unsignedShort"/>\r
+ <attribute name="chunkedEncoding" type="boolean"/>\r
+ <attribute name="connectTimeout" type="unsignedShort"/>\r
+ <attribute name="timeout" type="unsignedShort"/>\r
+ <attribute name="requireConfidentiality" type="boolean"/>\r
+ <attribute name="requireTransportAuth" type="boolean"/>\r
+ <attribute name="requireSignedAssertions" type="boolean"/>\r
+ </attributeGroup>\r
+ \r
<element name="Sessions">\r
<annotation>\r
<documentation>Container for specifying protocol handlers and session policy</documentation>\r
<attribute name="idpHistoryDays" type="unsignedInt"/>\r
<attribute name="lifetime" type="unsignedInt" default="28800"/>\r
<attribute name="timeout" type="unsignedInt" default="3600"/>\r
- <attribute name="authnskew" type="unsignedInt"/>\r
+ <attribute name="maxTimeSinceAuthn" type="unsignedInt"/>\r
<attribute name="checkAddress" type="boolean" default="true"/>\r
<attribute name="consistentAddress" type="boolean" default="true"/>\r
<anyAttribute namespace="##other" processContents="lax"/>\r
<attribute name="postArtifact" type="boolean"/>\r
<attribute name="acsByIndex" type="boolean"/>\r
<attribute name="defaultACSIndex" type="unsignedShort"/>\r
+ <attribute name="isPassive" type="boolean"/>\r
+ <attribute name="forceAuthn" type="boolean"/>\r
+ <attribute name="authnContextClassRef" type="anyURI"/>\r
+ <attribute name="authnContextComparison" type="samlp:AuthnContextComparisonType"/>\r
<anyAttribute namespace="##any" processContents="lax"/>\r
</restriction>\r
</complexContent>\r
<any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
</sequence>\r
<attribute name="Location" type="anyURI"/>\r
+ <attribute name="relayState" type="conf:string"/>\r
<attribute name="outgoingBindings" type="conf:listOfURIs"/>\r
<attribute name="template" type="anyURI"/>\r
<attribute name="postArtifact" type="boolean"/>\r
<attribute name="metadata" type="anyURI"/>\r
<attribute name="access" type="anyURI"/>\r
<attribute name="ssl" type="anyURI"/>\r
+ <attribute name="localLogout" type="anyURI"/>\r
+ <attribute name="globalLogout" type="anyURI"/>\r
<attribute name="supportContact" type="conf:string"/>\r
<attribute name="logoLocation" type="anyURI"/>\r
<attribute name="styleSheet" type="anyURI"/>\r
</complexType>\r
</element>\r
\r
+ <element name="RelyingParty">\r
+ <annotation>\r
+ <documentation>Container for specifying settings to use with particular peers</documentation>\r
+ </annotation>\r
+ <complexType>\r
+ <sequence/>\r
+ <attribute name="Name" type="conf:string" use="required"/>\r
+ <attributeGroup ref="conf:RelyingPartyGroup"/>\r
+ <attribute name="entityID" type="anyURI"/>\r
+ <anyAttribute namespace="##other" processContents="lax"/>\r
+ </complexType>\r
+ </element>\r
+ \r
<element name="Notify">\r
<annotation>\r
<documentation>Used to specify locations to receive application notifications</documentation>\r
</complexType>\r
</element>\r
\r
- <element name="DefaultRelyingParty">\r
- <annotation>\r
- <documentation>Container for specifying security methods to use with particular peers</documentation>\r
- </annotation>\r
- <complexType>\r
- <sequence>\r
- <element name="RelyingParty" minOccurs="0" maxOccurs="unbounded">\r
- <complexType>\r
- <sequence/>\r
- <attribute name="Name" type="conf:string" use="required"/>\r
- <attributeGroup ref="conf:RelyingPartyGroup"/>\r
- <anyAttribute namespace="##other" processContents="lax"/>\r
- </complexType>\r
- </element>\r
- </sequence>\r
- <attributeGroup ref="conf:RelyingPartyGroup"/>\r
- <anyAttribute namespace="##other" processContents="lax"/>\r
- </complexType>\r
- </element>\r
- \r
- <attributeGroup name="RelyingPartyGroup">\r
- <attribute name="authType" type="conf:string"/>\r
- <attribute name="authUsername" type="conf:string"/>\r
- <attribute name="authPassword" type="conf:string"/>\r
- <attribute name="signing" type="conf:bindingBoolean"/>\r
- <attribute name="signingAlg" type="anyURI"/>\r
- <attribute name="digestAlg" type="anyURI"/>\r
- <attribute name="encryption" type="conf:bindingBoolean"/>\r
- <attribute name="encryptionAlg" type="anyURI"/>\r
- <attribute name="keyName" type="conf:string"/>\r
- <attribute name="artifactEndpointIndex" type="unsignedShort"/>\r
- </attributeGroup>\r
- \r
<element name="SecurityPolicies">\r
<annotation>\r
<documentation>Container for specifying sets of policy rules to apply to incoming messages</documentation>\r
</sequence>\r
<attribute name="id" type="conf:string" use="required"/>\r
<attribute name="validate" type="boolean" default="false"/>\r
- <attribute name="signedAssertions" type="boolean" default="false"/>\r
- <attribute name="requireConfidentiality" type="boolean" default="true"/>\r
- <attribute name="requireTransportAuth" type="boolean" default="true"/>\r
- <attribute name="chunkedEncoding" type="boolean" default="true"/>\r
- <attribute name="connectTimeout" type="unsignedShort" default="15"/>\r
- <attribute name="timeout" type="unsignedShort" default="30"/>\r
<anyAttribute namespace="##any" processContents="lax"/>\r
</complexType>\r
</element>\r