Skip to content

fix auth: truncate with SecurityException & clear with Invalid user name admin #1365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javeme merged 1 commit into from
Mar 3, 2021
Merged

fix auth: truncate with SecurityException & clear with Invalid user name admin #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down