[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/DelegationPol...

[noreply at shibboleth.net]

Author: putmanb
Date: Sun Oct 25 19:37:37 2015
New Revision: 7876

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7876&view=rev
Log:
IDP-671: Port delegation configuration and policy control components

Add schema and XMLObject provider support for a new DelegationPolicy element.
For now just holds a MaximumTokenDelegationChainLength attribute.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/DelegationPolicy.java   (with props)
    trunk/idp-saml-api/src/main/resources/schema/shibboleth-delegation-1.0.xsd   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/DelegationPolicyBuilder.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/DelegationPolicyImpl.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/DelegationPolicyMarshaller.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/DelegationPolicyUnmarshaller.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/xmlobject/impl/DelegationPolicyTest.java   (with props)
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibDelegationPolicy.xml   (with props)
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibDelegationPolicyOptionalAttributes.xml   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java
    trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java?rev=7876&r1=7875&r2=7876&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java	Sun Oct 25 19:37:37 2015
@@ -20,7 +20,7 @@
 /** Constants used in XMLObject extensions. */
 public final class ExtensionsConstants {
 
-    /** URI for XML schema namespace for Shibboleth extensions to SAML metadata. */
+    /** Relative resource path for XML schema for Shibboleth extensions to SAML metadata. */
     public static final String SHIB_MDEXT10_SCHEMA_LOCATION = "/schema/shibboleth-metadata-1.0.xsd";
     
     /** URI for XML schema namespace for Shibboleth extensions to SAML metadata. */
@@ -29,6 +29,15 @@
     /** Namespace QName prefix for Shibboleth extensions to SAML metadata. */
     public static final String SHIB_MDEXT10_PREFIX = "shibmd";
 
+    /** Relative resource path for XML schema for Shibboleth extensions supporting SAML delegation. */
+    public static final String SHIB_DELEXT10_SCHEMA_LOCATION = "/schema/shibboleth-delegation-1.0.xsd";
+    
+    /** URI for XML schema namespace for Shibboleth extensions supporting SAML delegation. */
+    public static final String SHIB_DELEXT10_NS = "urn:mace:shibboleth:delegation:1.0";
+
+    /** Namespace QName prefix for Shibboleth extensions supporting AML delegation. */
+    public static final String SHIB_DELEXT10_PREFIX = "shibdel";
+
     /** Constructor. */
     private ExtensionsConstants() {
     }

Modified: trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml?rev=7876&r1=7875&r2=7876&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml	(original)
+++ trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml	Sun Oct 25 19:37:37 2015
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns="http://www.opensaml.org/xmltooling-config" xsi:schemaLocation="http://www.opensaml.org/xmltooling-config ../../src/schema/xmltooling-config.xsd">
+<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibdel="urn:mace:shibboleth:delegation:1.0" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns="http://www.opensaml.org/xmltooling-config" xsi:schemaLocation="http://www.opensaml.org/xmltooling-config ../../src/schema/xmltooling-config.xsd">
 
-    <!-- Shibboleth SAML Metadata Extensions Object providers -->
+    <!-- Shibboleth Extensions Object providers -->
     <ObjectProviders>
     
-    <!-- Scope provider -->
+        <!-- DelegationPolicy provider -->
+        <ObjectProvider qualifiedName="shibdel:DelegationPolicy">

[... 24 lines stripped ...]