Modifying UserManagerProxy causes hugegraph data cleanup issues

apache · Feb 23, 2021 · a34ba24 · a34ba24
1 parent 7f63b57
commit a34ba24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java
@@ -679,14 +679,14 @@ public void clearBackend() {
     @Override
     public void truncateBackend() {
         verifyAdminPermission();
-        HugeUser admin = this.hugegraph.userManager()
-                             .findUser(HugeAuthenticator.USER_ADMIN);
+        UserManager userManager = this.hugegraph.userManager();
+        HugeUser admin = userManager.findUser(HugeAuthenticator.USER_ADMIN);
         try {
             this.hugegraph.truncateBackend();
         } finally {
-            if (admin != null) {
+            if (admin != null && userManager instanceof StandardUserManager) {
                 // Restore admin user to continue to do any operation
-                this.hugegraph.userManager().createUser(admin);
+                userManager.createUser(admin);
             }
         }
     }

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
@@ -66,6 +66,7 @@ public class HugeSecurityManager extends SecurityManager {
     private static final Set<String> WHITE_SYSTEM_PROPERTYS = ImmutableSet.of(
             "line.separator",
             "file.separator",
+            "java.specification.version", // Sofa
             "socksProxyHost", // MySQL
             "file.encoding" // PostgreSQL
     );
@@ -306,6 +307,7 @@ public void checkSetFactory() {
 
     @Override
     public void checkPropertiesAccess() {
+        System.getProperties();
         if (callFromGremlin()) {
             throw newSecurityException(
                   "Not allowed to access system properties via Gremlin");