auth fix: init store the admin password can't be empty

apache · Mar 22, 2021 · 8425915 · 8425915
1 parent cdf5640
commit 8425915
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/StandardAuthenticator.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/StandardAuthenticator.java
@@ -65,25 +65,25 @@ private void initAdminUser() throws Exception {
     }
 
     private String inputPassword() {
-        String password = "";
-        String prompt = "Please input the admin password:";
-        String alertMsg = "password must be not empty";
+        String inputPrompt = "Please input the admin password:";
+        String notEmptyPrompt = "The admin password can't be empty";
         Console console = System.console();
-        do {
+        while (true) {
+            String password = "";
             if (console != null) {
-                char[] chars = console.readPassword(prompt);
+                char[] chars = console.readPassword(inputPrompt);
                 password = new String(chars);
             } else {
-                System.out.print(prompt);
+                System.out.print(inputPrompt);
                 @SuppressWarnings("resource") // just wrapper of System.in
                 Scanner scanner = new Scanner(System.in);
                 password = scanner.nextLine();
             }
-            if (password.isEmpty()) {
-                System.out.println(alertMsg);
+            if (!password.isEmpty()) {
+                return password;
             }
-        } while (password.isEmpty());
-        return password;
+            System.out.println(notEmptyPrompt);
+        }
     }
 
     @Override