[SERVER] Update log4j because of the CVE-2021-44228 security flaw

7 files changed, 21 insertions, 14 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
index bfc75b0e..fd8cf3c1 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
@@ -9,7 +9,8 @@ import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocketFactory;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.server.THsHaServer;
 import org.apache.thrift.server.TServer;
@@ -25,7 +26,7 @@ import org.openslx.bwlp.thrift.iface.SatelliteServer;
 import org.openslx.thrifthelper.TBinaryProtocolSafe;
 
 public class BinaryListener implements Runnable {
-	private static final Logger log = Logger.getLogger(BinaryListener.class);
+	private static final Logger log = LogManager.getLogger(BinaryListener.class);
 
 	private static final int MAX_MSG_LEN = 30 * 1000 * 1000;
 	private static final int MINWORKERTHREADS = 2;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 181baef5..8382390a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -6,7 +6,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.sat.RuntimeConfig;
 import org.openslx.bwlp.sat.SupportedFeatures;
@@ -80,7 +81,7 @@ import org.openslx.util.Util;
 
 public class ServerHandler implements SatelliteServer.Iface {
 
-	private static final Logger LOGGER = Logger.getLogger(ServerHandler.class);
+	private static final Logger LOGGER = LogManager.getLogger(ServerHandler.class);
 
 	private static final FileServer fileServer = FileServer.instance();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
index ede5bdea..d4a98737 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
@@ -6,7 +6,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 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.sat.database.mappers.DbUser;
 import org.openslx.bwlp.sat.permissions.User;
 import org.openslx.bwlp.sat.util.Formatter;
@@ -26,7 +27,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class SessionManager {
 
-	private static final Logger LOGGER = Logger.getLogger(SessionManager.class);
+	private static final Logger LOGGER = LogManager.getLogger(SessionManager.class);
 
 	private static class Entry {
 		private static final long SESSION_TIMEOUT = TimeUnit.DAYS.toMillis(1);
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java
index b4ca77f6..1efc72d4 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java
@@ -1,6 +1,7 @@
 package org.openslx.bwlp.sat.thrift.cache;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 
 /**
@@ -12,7 +13,7 @@ import org.apache.thrift.TException;
  */
 public abstract class CacheBase<T> {
 
-	private static final Logger LOGGER = Logger.getLogger(CacheBase.class);
+	private static final Logger LOGGER = LogManager.getLogger(CacheBase.class);
 
 	private static final int TIMEOUT = 10 * 60 * 1000;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
index 2f6bbdbc..f84ae3c2 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
@@ -3,7 +3,8 @@ package org.openslx.bwlp.sat.thrift.cache;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.mappers.DbOsVirt;
@@ -18,7 +19,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class OperatingSystemList extends CacheBase<List<OperatingSystem>> {
 
-	private static final Logger LOGGER = Logger.getLogger(OperatingSystemList.class);
+	private static final Logger LOGGER = LogManager.getLogger(OperatingSystemList.class);
 
 	private static final OperatingSystemList instance = new OperatingSystemList();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
index 3f144f15..9e8ccaf9 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
@@ -3,7 +3,8 @@ package org.openslx.bwlp.sat.thrift.cache;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.mappers.DbOrganization;
@@ -18,7 +19,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class OrganizationList extends CacheBase<List<Organization>> {
 
-	private static final Logger LOGGER = Logger.getLogger(OrganizationList.class);
+	private static final Logger LOGGER = LogManager.getLogger(OrganizationList.class);
 
 	private static final OrganizationList instance = new OrganizationList();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java
index 28463e6b..72a29f63 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java
@@ -3,7 +3,8 @@ package org.openslx.bwlp.sat.thrift.cache;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.mappers.DbOsVirt;
@@ -18,7 +19,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class VirtualizerList extends CacheBase<List<Virtualizer>> {
 
-	private static final Logger LOGGER = Logger.getLogger(VirtualizerList.class);
+	private static final Logger LOGGER = LogManager.getLogger(VirtualizerList.class);
 
 	private static final VirtualizerList instance = new VirtualizerList();