amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-02-25 02:26:24 +00:00
Code Issues Projects Releases Wiki Activity

Used log4j2.formatMsgNoLookups as fallback for non-vanilla

Browse Source 
#1180
This commit is contained in:
Geoff Bourne
2021-12-10 20:50:40 -06:00
parent fb6fa9b7d7
commit 3bb21d8581
21 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/start-finalExec
View File

@@ -96,10 +96,9 @@ patchLog4jConfig() {
}
# Patch Log4j remote code execution vulnerability
# NOTE: Paper, bukkit, and spigot are normalized to SPIGOT
if [[ ${TYPE^^} != SPIGOT ]] && versionLessThan 1.12; then
if isFamily VANILLA && versionLessThan 1.12; then
patchLog4jConfig log4j2_17-111.xml https://launcher.mojang.com/v1/objects/dd2b723346a8dcd48e7f4d245f6bf09e98db9696/log4j2_17-111.xml
elif [[ ${TYPE^^} != SPIGOT ]] && versionLessThan 1.17; then
elif isFamily VANILLA && versionLessThan 1.17; then
patchLog4jConfig log4j2_112-116.xml https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml
elif versionLessThan 1.18.1; then
JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"