Update log4j because of the CVE-2021-44228 security flaw

6 files changed, 18 insertions, 12 deletions

diff --git a/src/main/java/org/openslx/filetransfer/util/ChunkList.java b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
index 91d6f1e..ef327e5 100644
--- a/src/main/java/org/openslx/filetransfer/util/ChunkList.java
+++ b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
@@ -10,14 +10,15 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.CRC32;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.filetransfer.LocalChunkSource.ChunkSource;
 import org.openslx.util.ThriftUtil;
 
 public class ChunkList
 {
 
-	private static final Logger LOGGER = Logger.getLogger( ChunkList.class );
+	private static final Logger LOGGER = LogManager.getLogger( ChunkList.class );
 
 	/**
 	 * Here we keep a list of all chunks in the proper order, in case we quickly need to access one
diff --git a/src/main/java/org/openslx/filetransfer/util/FileChunk.java b/src/main/java/org/openslx/filetransfer/util/FileChunk.java
index 6594e31..99b30ea 100644
--- a/src/main/java/org/openslx/filetransfer/util/FileChunk.java
+++ b/src/main/java/org/openslx/filetransfer/util/FileChunk.java
@@ -5,14 +5,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.zip.CRC32;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.filetransfer.FileRange;
 import org.openslx.filetransfer.LocalChunkSource.ChunkSource;
 
 public class FileChunk
 {
 	
-	private static final Logger LOGGER = Logger.getLogger( FileChunk.class );
+	private static final Logger LOGGER = LogManager.getLogger( FileChunk.class );
 	
 	/**
 	 * Length in bytes of binary sha1 representation
diff --git a/src/main/java/org/openslx/filetransfer/util/HashChecker.java b/src/main/java/org/openslx/filetransfer/util/HashChecker.java
index f6b27f7..f6f8876 100644
--- a/src/main/java/org/openslx/filetransfer/util/HashChecker.java
+++ b/src/main/java/org/openslx/filetransfer/util/HashChecker.java
@@ -9,7 +9,8 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class HashChecker
 {
@@ -17,7 +18,7 @@ public class HashChecker
 	public static final int CALC_HASH = 2;
 	public static final int CALC_CRC32 = 4;
 	
-	private static final Logger LOGGER = Logger.getLogger( HashChecker.class );
+	private static final Logger LOGGER = LogManager.getLogger( HashChecker.class );
 
 	private final BlockingQueue<HashTask> queue;
 
diff --git a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
index 300a75f..cadcf3c 100644
--- a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
+++ b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
@@ -14,7 +14,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.TransferState;
 import org.openslx.bwlp.thrift.iface.TransferStatus;
 import org.openslx.filetransfer.DataReceivedCallback;
@@ -30,7 +31,7 @@ import org.openslx.util.ThriftUtil;
 public abstract class IncomingTransferBase extends AbstractTransfer implements HashCheckCallback
 {
 
-	private static final Logger LOGGER = Logger.getLogger( IncomingTransferBase.class );
+	private static final Logger LOGGER = LogManager.getLogger( IncomingTransferBase.class );
 
 	/**
 	 * Remote peer is uploading, so on our end, we have Downloaders
diff --git a/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java b/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java
index 54dd2d0..e1fad97 100644
--- a/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java
+++ b/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java
@@ -9,7 +9,8 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.filetransfer.LocalChunkSource.ChunkSource;
 import org.openslx.filetransfer.LocalChunkSource.SourceFile;
 import org.openslx.util.Util;
@@ -17,7 +18,7 @@ import org.openslx.util.Util;
 public class LocalCopyManager extends Thread
 {
 
-	private static final Logger LOGGER = Logger.getLogger( LocalCopyManager.class );
+	private static final Logger LOGGER = LogManager.getLogger( LocalCopyManager.class );
 
 	private FileChunk currentChunk = null;
 
diff --git a/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java
index 18296c5..15c86fb 100644
--- a/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java
+++ b/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java
@@ -6,7 +6,8 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.filetransfer.Uploader;
 
@@ -17,7 +18,7 @@ public abstract class OutgoingTransferBase extends AbstractTransfer
 	 * Constants
 	 */
 
-	private static final Logger LOGGER = Logger.getLogger( OutgoingTransferBase.class );
+	private static final Logger LOGGER = LogManager.getLogger( OutgoingTransferBase.class );
 
 	private static final long INACTIVITY_TIMEOUT = TimeUnit.MINUTES.toMillis( 5 );