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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 18 13:31:58 2014
New Revision: 6438

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6438&view=rev
Log:
IDP-375 - some refactoring, and added session ID, username, and attrs extractors

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/AttributesAuditExtractor.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/SingletonAuditExtractor.java
      - copied, changed from r6434, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/ContextDataAuditExtractor.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/context/navigate/SessionContextIDLookupFunction.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/audit.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    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
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/ContextDataAuditExtractor.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java

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=6438&r1=6437&r2=6438&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/audit.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/audit.xml Mon Aug 18 13:31:58 2014
@@ -38,5 +38,12 @@
             </map>
         </property>
     </bean>
+
+    <bean id="shibboleth.ErrorViewAuditExtractors" parent="shibboleth.DefaultErrorViewAuditExtractors">
+        <property name="sourceMap">
+            <map merge="true">
+            </map>
+        </property>
+    </bean>
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6438&r1=6437&r2=6438&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Aug 18 13:31:58 2014
@@ -129,6 +129,8 @@
 # and reload check interval (0 == never reload).
 #idp.service.logging.failFast=true
 #idp.service.logging.checkInterval=PT5M
+#Set true to generate audit log entries for errors trapped locally
+#idp.service.logging.auditLocalErrors=false
 # Format of audit log entries, defaults to V2-compatible
 #idp.service.logging.audit=%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i
 

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=6438&r1=6437&r2=6438&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 Mon Aug 18 13:31:58 2014
@@ -79,14 +79,14 @@
                     <key>
                         <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.SERVICE_PROVIDER"/>
                     </key>
-                    <bean class="net.shibboleth.idp.profile.audit.impl.ContextDataAuditExtractor"
+                    <bean class="net.shibboleth.idp.profile.audit.impl.SingletonAuditExtractor"
                         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"
+                    <bean class="net.shibboleth.idp.profile.audit.impl.SingletonAuditExtractor"
                         c:fn-ref="shibboleth.ResponderIdLookup.Simple" />
                 </entry>
             </map>
@@ -167,6 +167,46 @@
             <map>
                 <entry>
                     <key>
+                        <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.USERNAME"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.profile.audit.impl.SingletonAuditExtractor">
+                        <constructor-arg>
+                            <bean class="com.google.common.base.Functions" factory-method="compose">
+                                <constructor-arg name="g">
+                                    <bean class="net.shibboleth.idp.profile.context.navigate.SubjectContextPrincipalLookupFunction" />

[... 210 lines stripped ...]