From 42c1c98c2119896c2dc4b6effdf1a4e3ec5f5517 Mon Sep 17 00:00:00 2001
From: TarikBR <64391349+TarikBR@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:55:40 -0300
Subject: [PATCH] fix(log): log4j with incorrect configuration (#6822)

* fix[log]: log4j with incorrect configuration, mostly in newer minecraft versions

* fix[log]: add xml configuration for minecraft 1.21.2+

* refactor[log] improved getLog4jConfiguration()

* refactor[log]: just change version number instead unpacking in a method to get the log4j config
---
 .../security/log4j-rce-patch-1.21.2.xml       | 32 +++++++++++++++++++
 .../main/assets/components/security/version   |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.21.2.xml

diff --git a/app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.21.2.xml b/app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.21.2.xml
new file mode 100644
index 000000000..6a45a2ece
--- /dev/null
+++ b/app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.21.2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+            </Policies>
+        </Console>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+            </Policies>
+        </RollingRandomAccessFile>
+        <Listener name="Tracy">
+            <PatternLayout pattern="(%F:%L): %msg{nolookups}%n"/>
+        </Listener>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="SysOut"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="Tracy"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/app_pojavlauncher/src/main/assets/components/security/version b/app_pojavlauncher/src/main/assets/components/security/version
index 56a6051ca..d8263ee98 100644
--- a/app_pojavlauncher/src/main/assets/components/security/version
+++ b/app_pojavlauncher/src/main/assets/components/security/version
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file