[node.sh] bug fixes in node.sh. Restore the previous readPassword

cmd/harmony/bls.go

@@ -26,16 +26,16 @@ var (
 
 var (
 	multiBLSPriKey multibls.PrivateKeys
-	blsKeyLoadErr  error
 	onceLoadBLSKey sync.Once
 )
 
-// setupConsensusKeys load bls keys and add the keys to nodeConfig. Return the loaded public keys.
+// setupConsensusKeys load bls keys and set the keys to nodeConfig. Return the loaded public keys.
 func setupConsensusKeys(config *nodeconfig.ConfigType) multibls.PublicKeys {
 	onceLoadBLSKey.Do(func() {
-		multiBLSPriKey, blsKeyLoadErr = loadBLSKeys()
-		if blsKeyLoadErr != nil {
-			fmt.Fprintf(os.Stderr, "ERROR when loading bls key: %v\n", blsKeyLoadErr)
+		var err error
+		multiBLSPriKey, err = loadBLSKeys()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "ERROR when loading bls key: %v\n", err)
 			os.Exit(100)
 		}
 		fmt.Printf("Successfully loaded %v keys\n", len(multiBLSPriKey))

internal/blsgen/console.go

@@ -5,6 +5,9 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"syscall"
+
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 var console consoleItf = &stdConsole{}
@@ -21,7 +24,12 @@ type consoleItf interface {
 type stdConsole struct{}
 
 func (console *stdConsole) readPassword() (string, error) {
-	return console.readln()
+	b, err := terminal.ReadPassword(syscall.Stdin)
+	if err != nil {
+		return "", err
+	}
+	console.println()
+	return strings.TrimSpace(string(b)), nil
 }
 
 func (console *stdConsole) readln() (string, error) {

scripts/node.sh

@@ -251,7 +251,7 @@ OS=$(uname -s)
 
 unset start_clean loop run_as_root blspass do_not_download download_only network node_type shard_id broadcast_invalid_tx
 unset upgrade_rel public_rpc staking_mode pub_port blsfolder blacklist verify TRACEFILE minpeers max_bls_keys_per_node log_level
-unset bls_pass_prompt
+unset no_bls_pass_prompt
 start_clean=false
 loop=true
 run_as_root=true
@@ -272,7 +272,7 @@ minpeers=6
 max_bls_keys_per_node=10
 broadcast_invalid_tx=true
 log_level=3
-bls_pass_prompt=true
+no_bls_pass_prompt=false
 
 ${BLSKEYFILES=}
 ${TRACEFILE=}
@@ -285,7 +285,7 @@ do
    '?') usage "unrecognized option -${OPTARG}";;
    ':') usage "missing argument for -${OPTARG}";;
    c) start_clean=true;;
-   C) bls_pass_prompt=false
+   C) no_bls_pass_prompt=true;;
    1) loop=false;;
    h) print_usage; exit 0;;
    k) BLSKEYFILES="${OPTARG}";;
@@ -320,7 +320,7 @@ do
    l) broadcast_invalid_tx=false;;
    L) log_level="${OPTARG}";;
 
-   M) msg "Legacy flag -M"
+   M) msg "Legacy flag -M";;
    *) err 70 "unhandled option -${OPTARG}";;  # EX_SOFTWARE
    esac
 done
@@ -755,25 +755,25 @@ do
    args+=(
       -is_archival="${archival}"
    )
-   if [ -z "$BLSKEYFILES" ]; then
+   if [ ! -z "$BLSKEYFILES" ]; then
       args+=(
          -blskey_file "${BLSKEYFILES}"
       )
    fi
-   if [ -z "$blsfolder" ]; then
+   if [ ! -z "$blsfolder" ]; then
       args+=(
          -blsfolder "${blsfolder}"
       )
    fi
-   if [ -z "$blspass" ]; then
+   if [ ! -z "$blspass" ]; then
       args+=(
          -blspass "file:${blspass}"
       )
    else
-      if $bls_pass_prompt; then
+      if $no_bls_pass_prompt; then
          args+=(
-         -blspass no-prompt
-      )
+            -blspass no-prompt
+         )
       fi
    fi
    if ${public_rpc}; then
@@ -819,7 +819,7 @@ do
    *) ld_path_var=LD_LIBRARY_PATH;;
    esac
 
-   env "${ld_path_var}=$(pwd)" ./harmony "${args[@]}" "${@}" 
+   env "${ld_path_var}=$(pwd)" ./harmony "${args[@]}" "${@}"
    msg "node process finished with status $?"
 
    ${loop} || break