[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: Fri Nov  6 13:38:18 2015
New Revision: 7954

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7954&view=rev
Log:
IDP-840 - Revamp F-TICKS logging as a dedicated action at the end of SSO flows.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/audit.xml
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-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=7954&r1=7953&r2=7954&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/audit.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/audit.xml	Fri Nov  6 13:38:18 2015
@@ -16,8 +16,6 @@
     -->
     <util:map id="shibboleth.AuditFormattingMap">
         <entry key="Shibboleth-Audit" value="%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i|" />
-        <entry key="Shibboleth-FTICKS"
-            value="F-TICKS/%{idp.fticks.federation:Undefined}/1.0#TS=%T#RP=%SP#AP=%IDP#PN=%HASHEDu#AM=%ac#" />
     </util:map>
 
     <!-- Allows auditing to be disabled selectively for particular profiles/flows. -->

Modified: trunk/idp-conf/src/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=7954&r1=7953&r2=7954&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml	Fri Nov  6 13:38:18 2015
@@ -99,21 +99,6 @@
         </encoder>
     </appender>
 
-    <!-- F-TICKS audit log. -->
-    <appender name="IDP_FTICKS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${idp.home}/logs/idp-fticks.log</File>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.home}/logs/idp-fticks-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>180</maxHistory>
-        </rollingPolicy>
-
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%msg%n</Pattern>
-        </encoder>
-    </appender>
-
     <!-- F-TICKS syslog destination. -->
     <!--
     <appender name="IDP_FTICKS_SYSLOG" class="ch.qos.logback.classic.net.SyslogAppender">
@@ -128,7 +113,6 @@
     </logger>
 
     <logger name="Shibboleth-FTICKS" level="ALL">
-        <appender-ref ref="IDP_FTICKS"/>
         <!-- <appender-ref ref="IDP_FTICKS_SYSLOG"/> -->
     </logger>
 

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=7954&r1=7953&r2=7954&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	Fri Nov  6 13:38:18 2015
@@ -329,6 +329,11 @@
 
     <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:formattingMap-ref="shibboleth.AuditFormattingMap" />
+        
+    <bean id="WriteFTICKSLog" class="net.shibboleth.idp.saml.audit.impl.WriteFTICKSLog" scope="prototype"
+        p:activationCondition="#{'%{idp.fticks.federation:null}' != 'null'}"
+        p:federationId="#{'%{idp.fticks.federation:Undefined}'.trim()}"
+        p:digestAlgorithm="#{'%{idp.fticks.algorithm:SHA-256}'.trim()}" p:salt="%{idp.fticks.salt:}" />
 
     <bean id="LocalErrorPredicate"
             class="org.opensaml.saml.common.profile.logic.DefaultLocalErrorPredicate"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml?rev=7954&r1=7953&r2=7954&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml	Fri Nov  6 13:38:18 2015
@@ -152,6 +152,14 @@
         <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </action-state>
 
+    <!-- Splice in an additional step to write out the F-TICKS log entry on a successful completion. -->
+
+    <end-state id="end">
+        <on-entry>

[... 29 lines stripped ...]