X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=schemas%2Fshibboleth-2.0-native-sp-config.xsd;h=d192e4633beab1e674b077f95bc89291bbcb879f;hb=b22d0e89f3992535781f8cb5846a874e141bd349;hp=2b7ee702588717201aaff5404545d2a7cbb8b05e;hpb=2e29cd3baf7614913cbf4c45317737a865b195ff;p=shibboleth%2Fsp.git

diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index 2b7ee70..d192e46 100644
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -61,6 +61,26 @@
 				<element ref="conf:Extensions" minOccurs="0"/>
 				<element ref="conf:OutOfProcess"/>
 				<element ref="conf:InProcess"/>
+                <choice minOccurs="0">
+                    <element name="UnixListener">
+                        <complexType>
+                            <attribute name="address" type="conf:string" use="required"/>
+                        </complexType>
+                    </element>
+                    <element name="TCPListener">
+                        <complexType>
+                            <attribute name="address" type="conf:string" use="required"/>
+                            <attribute name="port" type="unsignedInt" use="required"/>
+                            <attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>
+                        </complexType>
+                    </element>
+                    <element name="Listener" type="conf:PluggableType"/>
+                </choice>
+                <element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>
+                <element ref="conf:SessionCache" minOccurs="0"/>
+                <element ref="conf:ReplayCache" minOccurs="0"/>
+                <element ref="conf:ArtifactMap" minOccurs="0"/>
+                <element name="RequestMapper" type="conf:PluggableType" minOccurs="0"/>
 				<element ref="conf:Applications"/>
 				<element ref="conf:SecurityPolicies"/>
 			</sequence>
@@ -151,33 +171,15 @@
 	
 	<element name="OutOfProcess">
 		<annotation>
-			<documentation>Container for shibd out-of-process configuration</documentation>
+			<documentation>Container for out-of-process (shibd) configuration</documentation>
 		</annotation>
 		<complexType>
 			<sequence>
 				<element ref="conf:Extensions" minOccurs="0"/>
-				<choice>
-					<element name="UnixListener">
-						<complexType>
-							<attribute name="address" type="conf:string" use="required"/>
-						</complexType>
-					</element>
-					<element name="TCPListener">
-						<complexType>
-							<attribute name="address" type="conf:string" use="required"/>
-							<attribute name="port" type="unsignedInt" use="required"/>
-							<attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>
-						</complexType>
-					</element>
-					<element name="Listener" type="conf:PluggableType"/>
-				</choice>
-				<element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>
-				<element ref="conf:SessionCache" minOccurs="0"/>
-				<element ref="conf:ReplayCache" minOccurs="0"/>
-				<element ref="conf:ArtifactMap" minOccurs="0"/>
 				<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 			</sequence>
 			<attribute name="logger" type="anyURI"/>
+		    <attribute name="catchAll" type="boolean"/>
 			<anyAttribute namespace="##other" processContents="lax"/>
 		</complexType>
 	</element>
@@ -192,21 +194,13 @@
 		<complexType>
 			<sequence>
 				<element ref="conf:Extensions" minOccurs="0"/>
-				<element ref="conf:SessionCache" minOccurs="0"/>
-				<element name="RequestMapper" type="conf:PluggableType"/>
-				<element name="Implementation" minOccurs="0">
-					<complexType>
-						<sequence>
-							<element ref="conf:ISAPI" minOccurs="0"/>
-							<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-						</sequence>
-					</complexType>
-				</element>
+				<element ref="conf:ISAPI" minOccurs="0"/>
 				<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 			</sequence>
 			<attribute name="logger" type="anyURI"/>
 			<attribute name="unsetHeaderValue" type="string"/>
 			<attribute name="checkSpoofing" type="boolean"/>
+		    <attribute name="catchAll" type="boolean"/>
 			<anyAttribute namespace="##other" processContents="lax"/>
 		</complexType>
 	</element>
@@ -249,6 +243,7 @@
 			<element ref="conf:OR"/>
 			<element ref="conf:NOT"/>
 			<element ref="conf:Rule"/>
+		    <element ref="conf:RuleRegex"/>
 		</choice>
 	</complexType>
 	<complexType name="MultiOperatorType">
@@ -257,6 +252,7 @@
 			<element ref="conf:OR"/>
 			<element ref="conf:NOT"/>
 			<element ref="conf:Rule"/>
+		    <element ref="conf:RuleRegex"/>
 		</choice>
 	</complexType>
 	<element name="Rule">
@@ -264,10 +260,21 @@
 			<simpleContent>
 				<extension base="conf:listOfStrings">
 					<attribute name="require" type="conf:string" use="required"/>
+				    <attribute name="list" type="boolean"/>
 				</extension>
 			</simpleContent>
 		</complexType>
 	</element>
+    <element name="RuleRegex">
+        <complexType>
+            <simpleContent>
+                <extension base="conf:string">
+                    <attribute name="require" type="conf:string" use="required"/>
+                    <attribute name="ignoreCase" type="boolean"/>
+                </extension>
+            </simpleContent>
+        </complexType>
+    </element>
 	
 	<attributeGroup name="ContentSettings">
 		<attribute name="authType" type="conf:string"/>
@@ -275,10 +282,12 @@
 		<attribute name="requireSessionWith" type="conf:string"/>
 		<attribute name="exportAssertion" type="boolean"/>
 		<attribute name="redirectToSSL" type="unsignedInt"/>
+		<attribute name="entityID" type="anyURI"/>
 		<attribute name="isPassive" type="boolean"/>
 		<attribute name="forceAuthn" type="boolean"/>
 		<attribute name="authnContextClassRef" type="anyURI"/>
 		<attribute name="authnContextComparison" type="samlp:AuthnContextComparisonType"/>
+        <attribute name="redirectErrors" type="anyURI"/>
 		<attribute name="sessionError" type="anyURI"/>
 		<attribute name="metadataError" type="anyURI"/>
 		<attribute name="accessError" type="anyURI"/>
@@ -322,6 +331,7 @@
     			<choice minOccurs="0" maxOccurs="unbounded">
     				<element ref="conf:Path"/>
     				<element ref="conf:PathRegex"/>
+    				<element ref="conf:Query"/>
     			</choice>
     		</sequence>
     		<attribute name="scheme">
@@ -353,6 +363,7 @@
 				<choice minOccurs="0" maxOccurs="unbounded">
 					<element ref="conf:Path"/>
 					<element ref="conf:PathRegex"/>
+					<element ref="conf:Query"/>
 				</choice>
 			</sequence>
 			<attribute name="regex" type="conf:string" use="required"/>
@@ -373,6 +384,7 @@
     			<choice minOccurs="0" maxOccurs="unbounded">
     				<element ref="conf:Path"/>
     				<element ref="conf:PathRegex"/>
+    				<element ref="conf:Query"/>
     			</choice>
     		</sequence>
 			<attribute name="name" type="conf:string" use="required"/>
@@ -389,6 +401,7 @@
 					<element ref="conf:AccessControl"/>
 					<element ref="conf:AccessControlProvider"/>
 				</choice>
+				<element ref="conf:Query" minOccurs="0" maxOccurs="unbounded"/>
 			</sequence>
 			<attribute name="regex" type="conf:string" use="required"/>
 			<attribute name="ignoreCase" type="boolean" default="true"/>
@@ -397,6 +410,22 @@
 		</complexType>
 	</element>
 	
+	<element name="Query">
+		<complexType>
+			<sequence>
+				<choice minOccurs="0">
+					<element ref="conf:htaccess"/>
+					<element ref="conf:AccessControl"/>
+					<element ref="conf:AccessControlProvider"/>
+				</choice>
+				<element ref="conf:Query" minOccurs="0" maxOccurs="unbounded"/>
+			</sequence>
+			<attribute name="name" type="conf:string" use="required"/>
+			<attribute name="regex" type="conf:string"/>
+			<attributeGroup ref="conf:ContentSettings"/>
+		</complexType>
+	</element>
+	
 	<element name="Applications">
 		<annotation>
 			<documentation>Container for global settings and application-specific overrides</documentation>
@@ -405,7 +434,7 @@
 			<sequence>
 				<element ref="conf:Sessions"/>
 				<element ref="conf:Errors" minOccurs="0"/>
-				<element ref="conf:DefaultRelyingParty"/>
+				<element ref="conf:RelyingParty" minOccurs="0" maxOccurs="unbounded"/>
 				<element ref="conf:Notify" minOccurs="0" maxOccurs="unbounded"/>
 				<element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
                 <element name="MetadataProvider" type="conf:PluggableType"/>
@@ -420,6 +449,7 @@
 			<attribute name="entityID" type="anyURI" use="required"/>
 			<attribute name="policyId" type="conf:string" use="required"/>
 			<attributeGroup ref="conf:ApplicationGroup"/>
+		    <attributeGroup ref="conf:RelyingPartyGroup"/>
 			<anyAttribute namespace="##other" processContents="lax"/>
 		</complexType>
 	</element>
@@ -432,7 +462,7 @@
 			<sequence>
 				<element ref="conf:Sessions" minOccurs="0"/>
 				<element ref="conf:Errors" minOccurs="0"/>
-				<element ref="conf:DefaultRelyingParty" minOccurs="0"/>
+				<element ref="conf:RelyingParty" minOccurs="0" maxOccurs="unbounded"/>
 				<element ref="conf:Notify" minOccurs="0" maxOccurs="unbounded"/>
 				<element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
 				<element name="MetadataProvider" type="conf:PluggableType" minOccurs="0"/>
@@ -446,6 +476,7 @@
 			<attribute name="entityID" type="anyURI"/>
 			<attribute name="policyId" type="conf:string"/>
 			<attributeGroup ref="conf:ApplicationGroup"/>
+		    <attributeGroup ref="conf:RelyingPartyGroup"/>
 			<anyAttribute namespace="##other" processContents="lax"/>
 		</complexType>
 	</element>
@@ -454,11 +485,31 @@
 		<attribute name="homeURL" type="anyURI" default="/"/>
 		<attribute name="REMOTE_USER" type="conf:listOfStrings"/>
 		<attribute name="unsetHeaders" type="conf:listOfStrings"/>
-		<attribute name="redirectErrors" type="anyURI"/>
+		<attribute name="metadataAttributePrefix" type="conf:string"/>
+	    <attribute name="attributePrefix" type="conf:string"/>
 		<attribute name="localLogout" type="anyURI"/>
 		<attribute name="globalLogout" type="anyURI"/>
 	</attributeGroup>
-		
+
+    <attributeGroup name="RelyingPartyGroup">
+        <attribute name="authType" type="conf:string"/>
+        <attribute name="authUsername" type="conf:string"/>
+        <attribute name="authPassword" type="conf:string"/>
+        <attribute name="signing" type="conf:bindingBoolean"/>
+        <attribute name="signingAlg" type="anyURI"/>
+        <attribute name="digestAlg" type="anyURI"/>
+        <attribute name="encryption" type="conf:bindingBoolean"/>
+        <attribute name="encryptionAlg" type="anyURI"/>
+        <attribute name="keyName" type="conf:string"/>
+        <attribute name="artifactEndpointIndex" type="unsignedShort"/>
+        <attribute name="chunkedEncoding" type="boolean"/>
+        <attribute name="connectTimeout" type="unsignedShort"/>
+        <attribute name="timeout" type="unsignedShort"/>
+        <attribute name="requireConfidentiality" type="boolean"/>
+        <attribute name="requireTransportAuth" type="boolean"/>
+        <attribute name="signedAssertions" type="boolean"/>
+    </attributeGroup>
+    
 	<element name="Sessions">
 		<annotation>
 			<documentation>Container for specifying protocol handlers and session policy</documentation>
@@ -479,6 +530,8 @@
 									<any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 								</sequence>
 								<attribute name="Location" type="anyURI" use="required"/>
+							    <attribute name="acl" type="conf:listOfStrings"/>
+								<anyAttribute namespace="##any" processContents="lax"/>
 							</restriction>
 						</complexContent>
 					</complexType>
@@ -490,10 +543,11 @@
 			<attribute name="exportACL" type="conf:listOfStrings" default="127.0.0.1"/>
 			<attribute name="cookieName" type="conf:string"/>
 			<attribute name="cookieProps" type="conf:string"/>
-			<attribute name="idpHistory" type="boolean" default="true"/>
+			<attribute name="idpHistory" type="boolean" default="false"/>
 			<attribute name="idpHistoryDays" type="unsignedInt"/>
 			<attribute name="lifetime" type="unsignedInt" default="28800"/>
 			<attribute name="timeout" type="unsignedInt" default="3600"/>
+		    <attribute name="maxTimeSinceAuthn" type="unsignedInt"/>
 			<attribute name="checkAddress" type="boolean" default="true"/>
 			<attribute name="consistentAddress" type="boolean" default="true"/>
 			<anyAttribute namespace="##other" processContents="lax"/>
@@ -528,6 +582,10 @@
 					<attribute name="postArtifact" type="boolean"/>
 					<attribute name="acsByIndex" type="boolean"/>
 					<attribute name="defaultACSIndex" type="unsignedShort"/>
+                    <attribute name="isPassive" type="boolean"/>
+                    <attribute name="forceAuthn" type="boolean"/>
+                    <attribute name="authnContextClassRef" type="anyURI"/>
+                    <attribute name="authnContextComparison" type="samlp:AuthnContextComparisonType"/>
 					<anyAttribute namespace="##any" processContents="lax"/>
 				</restriction>
 			</complexContent>
@@ -545,6 +603,7 @@
 						<any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 					</sequence>
 					<attribute name="Location" type="anyURI"/>
+				    <attribute name="relayState" type="conf:string"/>
 					<attribute name="outgoingBindings" type="conf:listOfURIs"/>
 					<attribute name="template" type="anyURI"/>
 					<attribute name="postArtifact" type="boolean"/>
@@ -562,7 +621,8 @@
 			<sequence>
 				<any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
 			</sequence>
-			<attribute name="session" type="anyURI" use="required"/>
+            <attribute name="redirectErrors" type="anyURI"/>
+			<attribute name="session" type="anyURI"/>
 			<attribute name="metadata" type="anyURI"/>
 			<attribute name="access" type="anyURI"/>
 			<attribute name="ssl" type="anyURI"/>
@@ -573,6 +633,18 @@
 		</complexType>
 	</element>
 
+    <element name="RelyingParty">
+        <annotation>
+            <documentation>Container for specifying settings to use with particular peers</documentation>
+        </annotation>
+        <complexType>
+            <sequence/>
+            <attribute name="Name" type="conf:string" use="required"/>
+            <attributeGroup ref="conf:RelyingPartyGroup"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
+        </complexType>
+    </element>
+    
 	<element name="Notify">
 		<annotation>
 			<documentation>Used to specify locations to receive application notifications</documentation>
@@ -592,39 +664,6 @@
 		</complexType>
 	</element>
 	
-	<element name="DefaultRelyingParty">
-		<annotation>
-			<documentation>Container for specifying security methods to use with particular peers</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element name="RelyingParty" minOccurs="0" maxOccurs="unbounded">
-					<complexType>
-						<sequence/>
-						<attribute name="Name" type="conf:string" use="required"/>
-						<attributeGroup ref="conf:RelyingPartyGroup"/>
-						<anyAttribute namespace="##other" processContents="lax"/>
-					</complexType>
-				</element>
-			</sequence>
-			<attributeGroup ref="conf:RelyingPartyGroup"/>
-	        <anyAttribute namespace="##other" processContents="lax"/>
-		</complexType>
-	</element>
-	
-	<attributeGroup name="RelyingPartyGroup">
-		<attribute name="authType" type="conf:string"/>
-		<attribute name="authUsername" type="conf:string"/>
-		<attribute name="authPassword" type="conf:string"/>
-		<attribute name="signing" type="conf:bindingBoolean"/>
-		<attribute name="signingAlg" type="anyURI"/>
-		<attribute name="digestAlg" type="anyURI"/>
-		<attribute name="encryption" type="conf:bindingBoolean"/>
-		<attribute name="encryptionAlg" type="anyURI"/>
-		<attribute name="keyName" type="conf:string"/>
-		<attribute name="artifactEndpointIndex" type="unsignedShort"/>
-	</attributeGroup>
-	
 	<element name="SecurityPolicies">
 		<annotation>
 			<documentation>Container for specifying sets of policy rules to apply to incoming messages</documentation>
@@ -642,12 +681,6 @@
 						</sequence>
 						<attribute name="id" type="conf:string" use="required"/>
 						<attribute name="validate" type="boolean" default="false"/>
-						<attribute name="signedAssertions" type="boolean" default="false"/>
-						<attribute name="requireConfidentiality" type="boolean" default="true"/>
-						<attribute name="requireTransportAuth" type="boolean" default="true"/>
-						<attribute name="chunkedEncoding" type="boolean" default="true"/>
-						<attribute name="connectTimeout" type="unsignedShort" default="15"/>
-						<attribute name="timeout" type="unsignedShort" default="30"/>
 						<anyAttribute namespace="##any" processContents="lax"/>
 					</complexType>
 				</element>