From 025e9ba5ab0697c1698e367f8c0baf07a341b98a Mon Sep 17 00:00:00 2001
From: zhangyi51 <zhangyi51@baidu.com>
Date: Mon, 13 Dec 2021 11:28:31 +0800
Subject: [PATCH] fix log4j error

Change-Id: I991e975d254bb3522070a52d73326c6ea99424ab
---
 .../baidu/hugegraph/security/HugeSecurityManager.java | 11 ++++++++++-
 pom.xml                                               |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java
index 4ccf9e9eb4..c0c8492498 100644
--- a/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java
+++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java
@@ -108,6 +108,11 @@ public class HugeSecurityManager extends SecurityManager {
             "com.baidu.hugegraph.backend.store.raft.rpc.RpcForwarder"
     );
 
+    private static final Map<String, Set<String>> NEW_SECURITY_EXCEPTION = ImmutableMap.of(
+            "com.baidu.hugegraph.security.HugeSecurityManager",
+            ImmutableSet.of("newSecurityException")
+    );
+
     @Override
     public void checkPermission(Permission permission) {
         if (DENIED_PERMISSIONS.contains(permission.getName()) &&
@@ -306,7 +311,7 @@ public void checkSetFactory() {
 
     @Override
     public void checkPropertiesAccess() {
-        if (callFromGremlin()) {
+        if (callFromGremlin() && !callFromNewSecurityException()) {
             throw newSecurityException(
                   "Not allowed to access system properties via Gremlin");
         }
@@ -441,6 +446,10 @@ private static boolean callFromRaft() {
         return callFromWorkerWithClass(RAFT_CLASSES);
     }
 
+    private static boolean callFromNewSecurityException() {
+        return callFromMethods(NEW_SECURITY_EXCEPTION);
+    }
+
     private static boolean callFromWorkerWithClass(Set<String> classes) {
         Thread curThread = Thread.currentThread();
         if (curThread.getName().startsWith(GREMLIN_SERVER_WORKER) ||
diff --git a/pom.xml b/pom.xml
index 0e11102214..393f7f94cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
         <compiler.target>1.8</compiler.target>
         <slf4j.version>1.7.5</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
-        <log4j2.version>2.12.1</log4j2.version>
+        <log4j2.version>2.15.0</log4j2.version>
         <junit.version>4.12</junit.version>
         <tinkerpop.version>3.4.3</tinkerpop.version>
         <commons.io.version>2.4</commons.io.version>