From 9ee60949d3ceca3ab1fcf47c9214f7bf6baf89c6 Mon Sep 17 00:00:00 2001 From: amohamad Date: Fri, 26 Jun 2020 12:40:11 -0400 Subject: Upgrade Vulnerable Direct Dependencies [log4j] Signed-off-by: amohamad Issue-ID: SDC-3051 Upgrade from the vulnerable log4j 1.x to log4j 2.13.1 Add a log4j version property in sdc-main pom.xml Add two maven dependencies to respective child pom.xml Change name of log4j .properties and .xml config files to reflect log4j2 naming Update the configuration files to the totally new log4j 2 config syntax Replace PropertyConfigurator with LoggerContext Remove the abandoned log4j.lf5.util.ResourceUtils Signed-off-by: amohamad Change-Id: Ie0f141eb2e0337ee5b63b61dc1395ccd8040558d --- ui-ci/src/main/resources/ci/conf/log4j.properties | 34 ---------------- ui-ci/src/main/resources/ci/conf/log4j2.properties | 46 ++++++++++++++++++++++ ui-ci/src/main/resources/ci/scripts/startTest.sh | 2 +- 3 files changed, 47 insertions(+), 35 deletions(-) delete mode 100644 ui-ci/src/main/resources/ci/conf/log4j.properties create mode 100644 ui-ci/src/main/resources/ci/conf/log4j2.properties (limited to 'ui-ci/src') diff --git a/ui-ci/src/main/resources/ci/conf/log4j.properties b/ui-ci/src/main/resources/ci/conf/log4j.properties deleted file mode 100644 index 0bdf0fad8c..0000000000 --- a/ui-ci/src/main/resources/ci/conf/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -# Define the root logger with appender file -log4j.rootLogger = DEBUG, FILE, stdout - -# Define the file appender -log4j.appender.FILE=org.apache.log4j.RollingFileAppender -log4j.appender.FILE.File=${targetlog}logs/ci-log.out - -# Define the layout for file appender -log4j.appender.FILE.layout=org.apache.log4j.PatternLayout -log4j.appender.FILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n - -# Set the maximum file size before rollover -log4j.appender.FILE.maxFileSize=5MB - -# Set the the backup index -log4j.appender.FILE.maxBackupIndex=10 - - -############################################################# - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n - -log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG -log4j.logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout - -log4j.logger.org.openecomp.sdc.ci.tests.utils=TRACE, FILE, stdout -log4j.additivity.org.openecomp.sdc.ci.tests.utils=false - - diff --git a/ui-ci/src/main/resources/ci/conf/log4j2.properties b/ui-ci/src/main/resources/ci/conf/log4j2.properties new file mode 100644 index 0000000000..0dde1c99c3 --- /dev/null +++ b/ui-ci/src/main/resources/ci/conf/log4j2.properties @@ -0,0 +1,46 @@ +status = error +dest = err +name = PropertiesConfig + +property.filename = ${targetlog}logs/ci-log.out + +#filter.threshold.type = ThresholdFilter +#filter.threshold.level = debug + +appender.rolling.type = RollingFile +appender.rolling.name = RollingFile +appender.rolling.fileName = ${filename} +appender.rolling.filePattern = ${targetlog}logs/ci-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz +appender.rolling.layout.type = PatternLayout +appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n +appender.rolling.policies.type = Policies +appender.rolling.policies.size.type = SizeBasedTriggeringPolicy +appender.rolling.policies.size.size=5MB +appender.rolling.strategy.type = DefaultRolloverStrategy +appender.rolling.strategy.max = 10 + +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n +appender.console.filter.threshold.type = ThresholdFilter +appender.console.filter.threshold.level = info + +logger.rolling.name = RollingAppender +logger.rolling.level = info +logger.rolling.additivity = false +logger.rolling.appenderRef.rolling.ref = RollingFile + +logger.org.apache.cassandra.service.StorageProxy.level=debug +logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.level =info +logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.rolling.ref = RollingFile +logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.stdout.ref = STDOUT + +logger.org.openecomp.sdc.ci.tests.utils.level = trace +logger.org.openecomp.sdc.ci.tests.utils.appendRef.rolling.ref = RollingFile +logger.org.openecomp.sdc.ci.tests.utils.appendRef.stdout.ref = STDOUT +logger.org.openecomp.sdc.ci.tests.utils.additivity = false + +rootLogger.level = debug +rootLogger.appenderRef.stdout.ref = STDOUT +rootLogger.appenderRef.rolling.ref = RollingFile diff --git a/ui-ci/src/main/resources/ci/scripts/startTest.sh b/ui-ci/src/main/resources/ci/scripts/startTest.sh index 93064d0678..20afd86414 100644 --- a/ui-ci/src/main/resources/ci/scripts/startTest.sh +++ b/ui-ci/src/main/resources/ci/scripts/startTest.sh @@ -90,7 +90,7 @@ then else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j.properties +LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j2.properties ############################################# TARGET_DIR=${FULL_PATH}/target CONF_FILE=${FULL_PATH}/conf/attsdc.yaml -- cgit 1.2.3-korg