[java-identity-provider] branch main updated: IDP-1643 - Configurable activationCondition for WriteFTICKSLog

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=87c90781efe0d1ec7eb5ca71a582249f6f28fc9f

The following commit(s) were added to refs/heads/main by this push:
       new  87c90781e IDP-1643 - Configurable activationCondition for WriteFTICKSLog
87c90781e is described below

commit 87c90781efe0d1ec7eb5ca71a582249f6f28fc9f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jan 20 15:15:45 2021 -0500

    IDP-1643 - Configurable activationCondition for WriteFTICKSLog
    
    https://issues.shibboleth.net/jira/browse/IDP-1643
---
 .../net/shibboleth/idp/flows/saml/saml-abstract-beans.xml     |  2 +-
 idp-conf/src/main/resources/conf/idp.properties               | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
index 668b1a6df..20f49b109 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
@@ -318,7 +318,7 @@
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
         
     <bean id="WriteFTICKSLog" class="net.shibboleth.idp.saml.audit.impl.WriteFTICKSLog" scope="prototype"
-        p:activationCondition="#{'%{idp.fticks.federation:null}' != 'null'}"
+        p:activationCondition-ref="#{'%{idp.fticks.federation:null}' != 'null' ? '%{idp.fticks.condition:shibboleth.Conditions.TRUE}'.trim() : 'shibboleth.Conditions.FALSE'}"
         p:federationId="#{'%{idp.fticks.federation:Undefined}'.trim()}"
         p:digestAlgorithm="#{'%{idp.fticks.algorithm:SHA-256}'.trim()}" p:salt="%{idp.fticks.salt:}" />
 
diff --git a/idp-conf/src/main/resources/conf/idp.properties b/idp-conf/src/main/resources/conf/idp.properties
index 3bc49c0bb..d1f4a2bf0 100644
--- a/idp-conf/src/main/resources/conf/idp.properties
+++ b/idp-conf/src/main/resources/conf/idp.properties
@@ -214,11 +214,12 @@ idp.ui.fallbackLanguages=en,fr,de
 #idp.cas.relyingPartyIdFromMetadata=false
 
 # F-TICKS auditing - set a salt to include hashed username
-#idp.fticks.federation=MyFederation
-#idp.fticks.algorithm=SHA-256
-#idp.fticks.salt=somethingsecret
-#idp.fticks.loghost=localhost
-#idp.fticks.logport=514
+#idp.fticks.federation = MyFederation
+#idp.fticks.condition = MyFTICKSCondition
+#idp.fticks.algorithm = SHA-256
+#idp.fticks.salt = somethingsecret
+#idp.fticks.loghost = localhost
+#idp.fticks.logport = 514
 
 # Set false if you want SAML bindings "spelled out" in audit log
 idp.audit.shortenBindings = true

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.