[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/audit.xml idp-conf/src/main/resources/sys...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 14 16:42:34 2014
New Revision: 6424

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6424&view=rev
Log:
IDP-375 - second audit extraction point for IdP/SP identity

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/ContextDataAuditExtractor.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/audit.xml
    trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/audit.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/audit.xml?rev=6424&r1=6423&r2=6424&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/audit.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/audit.xml Thu Aug 14 16:42:34 2014
@@ -17,5 +17,12 @@
             </map>
         </property>
     </bean>
+
+    <bean id="shibboleth.PostLookupAuditExtractors" parent="shibboleth.DefaultPostLookupAuditExtractors">
+        <property name="sourceMap">
+            <map merge="true">
+            </map>
+        </property>
+    </bean>
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/audit-system.xml?rev=6424&r1=6423&r2=6424&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/audit-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/audit-system.xml Thu Aug 14 16:42:34 2014
@@ -55,7 +55,6 @@
                         </constructor-arg>
                     </bean>
                 </entry>
-                <!-- SAML Request IssueInstant -->
                 <entry>
                     <key>
                         <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_ISSUE_INSTANT"/>
@@ -72,4 +71,26 @@
         </property>
     </bean>
         
+    <bean id="shibboleth.DefaultPostLookupAuditExtractors"
+            class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
+        <property name="sourceMap">
+            <map>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.SERVICE_PROVIDER"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.profile.audit.impl.ContextDataAuditExtractor"
+                        c:fn-ref="shibboleth.RelyingPartyIdLookup.Simple" />
+                </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.IDENTITY_PROVIDER"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.profile.audit.impl.ContextDataAuditExtractor"
+                        c:fn-ref="shibboleth.ResponderIdLookup.Simple" />
+                </entry>
+            </map>
+        </property>
+    </bean>
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6424&r1=6423&r2=6424&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Thu Aug 14 16:42:34 2014
@@ -62,6 +62,9 @@
     <bean id="shibboleth.ChildLookup.SAMLBindingContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLBindingContext) }" />
+    <bean id="shibboleth.ChildLookup.SAMLPeerEntityContext"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext) }" />
     <bean id="shibboleth.ChildLookupOrCreate.SAMLMessageInfoContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext) }"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=6424&r1=6423&r2=6424&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)

[... 37 lines stripped ...]