[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/attribute-filter.xml conf/global.xml conf...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 11 20:15:37 2014
New Revision: 7071

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7071&view=rev
Log:
First revision of security related beans, move metadata signature config bean to a system file.

Added:
    trunk/idp-conf/src/main/resources/conf/security.xml   (with props)
    trunk/idp-conf/src/main/resources/system/conf/metadata-providers-system.xml   (with props)
    trunk/idp-conf/src/main/resources/system/conf/security-system.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-filter.xml?rev=7071&r1=7070&r2=7071&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-filter.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-filter.xml Thu Dec 11 20:15:37 2014
@@ -14,18 +14,8 @@
                             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 the transient ID to anyone -->
-    <afp:AttributeFilterPolicy id="releaseTransientIdToAnyone">
-        <afp:PolicyRequirementRule xsi:type="basic:ANY" />
-
-        <afp:AttributeRule attributeID="transientId">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
-
-    </afp:AttributeFilterPolicy>
-    
     <!-- TODO: Example policy for testbed and unit tests, remove before final -->
-    <afp:AttributeFilterPolicy id="releaseSomeAttributeToAnyone">
+    <afp:AttributeFilterPolicy id="releaseSomeAttributes">
         <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://sp.example.org" />
 
         <afp:AttributeRule attributeID="eduPersonAffiliation">

Modified: trunk/idp-conf/src/main/resources/conf/global.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global.xml?rev=7071&r1=7070&r2=7071&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global.xml Thu Dec 11 20:15:37 2014
@@ -13,26 +13,5 @@
        default-destroy-method="destroy">
 
     <!-- Use this file to define any custom beans needed globally. -->
-    
-    <bean id="shibboleth.MetadataSignatureValidationStaticCriteria" 
-            class="net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.SignatureValidationCriteriaSetFactoryBean" 
-            p:includeOpenSAMLGlobalConfig="true">
-        <property name="signatureValidationConfigurations">
-            <util:list>
-                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
-                    <property name="whitelistedAlgorithms">
-                        <list>
-                            <!-- Supply algorithm URIs as a sequence of <value> elements. -->
-                        </list>
-                    </property>
-                    <property name="blacklistedAlgorithms">
-                        <list>
-                            <!-- Supply algorithm URIs as a sequence of <value> elements. -->
-                        </list>
-                    </property>
-                </bean>
-            </util:list>
-        </property>
-    </bean>
-    
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=7071&r1=7070&r2=7071&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Thu Dec 11 20:15:37 2014
@@ -74,6 +74,7 @@
 
     <util:list id="shibboleth.MetadataResolverResources">
         <value>%{idp.home}/conf/metadata-providers.xml</value>
+        <value>%{idp.home}/system/conf/metadata-providers-system.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeResolverResources">

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7071&r1=7070&r2=7071&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)

[... 74 lines stripped ...]