Author: owulff
Date: Tue Aug 20 18:50:21 2013
New Revision: 1515919
URL: http://svn.apache.org/r1515919
Log:
[FEDIZ-59] Support audit log in STS
Modified:
cxf/fediz/trunk/services/sts/src/main/resources/log4j.properties
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
cxf/fediz/trunk/services/sts/src/realms/resources/log4j.properties
cxf/fediz/trunk/services/sts/src/realms/webapp/WEB-INF/cxf-transport.xml
Modified: cxf/fediz/trunk/services/sts/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/resources/log4j.properties?rev=1515919&r1=1515918&r2=1515919&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/resources/log4j.properties (original)
+++ cxf/fediz/trunk/services/sts/src/main/resources/log4j.properties Tue Aug 20
18:50:21 2013
@@ -1,10 +1,11 @@
# Set root category priority to INFO and its only appender to CONSOLE.
#log4j.rootCategory=FATAL, CONSOLE
log4j.rootLogger=INFO, CONSOLE
-log4j.logger.org.apache.cxf.sts=DEBUG, CONSOLE
+log4j.logger.org.apache.cxf.sts=DEBUG, CONSOLE, LOGFILE
log4j.additivity.org.apache.cxf.sts=false
-log4j.logger.org.apache.cxf.fediz=DEBUG, CONSOLE
+log4j.logger.org.apache.cxf.fediz=DEBUG, CONSOLE, LOGFILE
log4j.additivity.org.apache.cxf.fediz=false
+log4j.logger.org.apache.cxf.sts.event.LoggerListener=DEBUG, AUDIT
# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
@@ -12,3 +13,20 @@ log4j.appender.CONSOLE.Threshold=DEBUG
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
+# LOGFILE is set to be a File appender using a PatternLayout.
+log4j.appender.LOGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.LOGFILE.File=${catalina.base}/logs/sts.log
+log4j.appender.LOGFILE.DatePattern='.'yyyy-MM-dd
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.Threshold=INFO
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
+
+# AUDIT is set to be a File appender using a PatternLayout.
+log4j.appender.AUDIT=org.apache.log4j.FileAppender
+log4j.appender.AUDIT.File=${catalina.base}/logs/audit.log
+log4j.appender.AUDIT.Append=true
+log4j.appender.AUDIT.Threshold=INFO
+log4j.appender.AUDIT.layout=org.apache.cxf.sts.event.LoggerPatternLayoutLog4J
+log4j.appender.AUDIT.layout.ConversionPattern=%m%n
+
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml?rev=1515919&r1=1515918&r2=1515919&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
(original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml Tue
Aug 20 18:50:21 2013
@@ -30,6 +30,8 @@
-->
<import resource="${adapter.resource}.xml" />
+ <bean id="loggerListener"
class="org.apache.cxf.sts.event.LoggerListener" />
+
<bean id="transportSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
<property name="issueOperation" ref="transportIssueDelegate" />
@@ -42,11 +44,13 @@
<property name="services" ref="transportService" />
<property name="stsProperties" ref="transportSTSProperties" />
<property name="claimsManager" ref="claimsManager" />
+ <property name="eventListener" ref="loggerListener" />
</bean>
<bean id="transportValidateDelegate"
class="org.apache.cxf.sts.operation.TokenValidateOperation">
<property name="tokenValidators" ref="transportTokenValidators"
/>
<property name="stsProperties" ref="transportSTSProperties" />
+ <property name="eventListener" ref="loggerListener" />
</bean>
<util:list id="transportTokenProviders">
Modified: cxf/fediz/trunk/services/sts/src/realms/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/realms/resources/log4j.properties?rev=1515919&r1=1515918&r2=1515919&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/realms/resources/log4j.properties
(original)
+++ cxf/fediz/trunk/services/sts/src/realms/resources/log4j.properties Tue Aug
20 18:50:21 2013
@@ -1,10 +1,11 @@
# Set root category priority to INFO and its only appender to CONSOLE.
#log4j.rootCategory=FATAL, CONSOLE
log4j.rootLogger=INFO, CONSOLE
-log4j.logger.org.apache.cxf.sts=DEBUG, CONSOLE
+log4j.logger.org.apache.cxf.sts=DEBUG, CONSOLE, LOGFILE
log4j.additivity.org.apache.cxf.sts=false
-log4j.logger.org.apache.cxf.fediz=DEBUG, CONSOLE
+log4j.logger.org.apache.cxf.fediz=DEBUG, CONSOLE, LOGFILE
log4j.additivity.org.apache.cxf.fediz=false
+log4j.logger.org.apache.cxf.sts.event.LoggerListener=DEBUG, AUDIT
# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
@@ -12,3 +13,19 @@ log4j.appender.CONSOLE.Threshold=DEBUG
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
+# LOGFILE is set to be a File appender using a PatternLayout.
+log4j.appender.LOGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.LOGFILE.File=${catalina.base}/logs/sts.log
+log4j.appender.LOGFILE.DatePattern='.'yyyy-MM-dd
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.Threshold=INFO
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
+
+# AUDIT is set to be a File appender using a PatternLayout.
+log4j.appender.AUDIT=org.apache.log4j.FileAppender
+log4j.appender.AUDIT.File=${catalina.base}/logs/audit.log
+log4j.appender.AUDIT.Append=true
+log4j.appender.AUDIT.Threshold=DEBUG
+log4j.appender.AUDIT.layout=org.apache.cxf.sts.event.LoggerPatternLayoutLog4J
+log4j.appender.AUDIT.layout.ConversionPattern=%m%n
\ No newline at end of file
Modified:
cxf/fediz/trunk/services/sts/src/realms/webapp/WEB-INF/cxf-transport.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/realms/webapp/WEB-INF/cxf-transport.xml?rev=1515919&r1=1515918&r2=1515919&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/realms/webapp/WEB-INF/cxf-transport.xml
(original)
+++ cxf/fediz/trunk/services/sts/src/realms/webapp/WEB-INF/cxf-transport.xml
Tue Aug 20 18:50:21 2013
@@ -18,6 +18,8 @@
http://cxf.apache.org/schemas/configuration/security.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
+
+ <bean id="loggerListener"
class="org.apache.cxf.sts.event.LoggerListener" />
<import resource="passwords.xml" />
<import resource="userClaims.xml" />
@@ -40,11 +42,13 @@
<property name="stsProperties" ref="transportSTSProperties" />
<property name="claimsManager" ref="claimsManager" />
<property name="tokenValidators" ref="transportTokenValidators"
/>
+ <property name="eventListener" ref="loggerListener" />
</bean>
<bean id="transportValidateDelegate"
class="org.apache.cxf.sts.operation.TokenValidateOperation">
<property name="tokenValidators" ref="transportTokenValidators"
/>
<property name="stsProperties" ref="transportSTSProperties" />
+ <property name="eventListener" ref="loggerListener" />
</bean>
<util:list id="relationships">