Revert CVE-2021-44228 quick fix

Reverts openhab#1343 because Karaf 4.3.4 uses Pax Logging 2.0.12 which is not vulnerable. Signed-off-by: Wouter Born <[email protected]>
wborn · Dec 15, 2021 · 19b3372 · 19b3372
1 parent afb38de
commit 19b3372
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/distributions/openhab/src/main/resources/bin/setenv b/distributions/openhab/src/main/resources/bin/setenv
@@ -110,8 +110,7 @@ export JAVA_OPTS="${JAVA_OPTS}
   -Dorg.apache.cxf.osgi.http.transport.disable=true
   -Dorg.ops4j.pax.web.listening.addresses=${HTTP_ADDRESS}
   -Dorg.osgi.service.http.port=${HTTP_PORT}
-  -Dorg.osgi.service.http.port.secure=${HTTPS_PORT}
-  -Dlog4j2.formatMsgNoLookups=true"
+  -Dorg.osgi.service.http.port.secure=${HTTPS_PORT}"
 
 #
 # set JVM options

diff --git a/distributions/openhab/src/main/resources/bin/setenv.bat b/distributions/openhab/src/main/resources/bin/setenv.bat
@@ -127,8 +127,7 @@ set JAVA_OPTS=%JAVA_OPTS% ^
   -Dorg.apache.cxf.osgi.http.transport.disable=true ^
   -Dorg.ops4j.pax.web.listening.addresses=%HTTP_ADDRESS% ^
   -Dorg.osgi.service.http.port=%HTTP_PORT% ^
-  -Dorg.osgi.service.http.port.secure=%HTTPS_PORT% ^
-  -Dlog4j2.formatMsgNoLookups=true
+  -Dorg.osgi.service.http.port.secure=%HTTPS_PORT%
 
 :: set jvm options
 set EXTRA_JAVA_OPTS=-XX:+UseG1GC ^