Changeset 308 in code for trunk/cmd

Timestamp:

Jun 3, 2020, 1:51:56 PM (5 years ago)

Author:

admin

Message:

Allow to read password when stdin is not a tty.

File:

• trunk/cmd/sojuctl/main.go (modified) (4 diffs)

trunk/cmd/sojuctl/main.go

@@ -2 +2 @@
 
 import (
+        "bufio"
         "flag"
         "fmt"
@@ -55 +56 @@
                 }
 
-                fmt.Printf("Password: ")
-                password, err := terminal.ReadPassword(int(os.Stdin.Fd()))
+                password, err := readPassword()
                 if err != nil {
                         log.Fatalf("failed to read password: %v", err)
                 }
-                fmt.Printf("\n")
 
                 hashed, err := bcrypt.GenerateFromPassword(password, bcrypt.DefaultCost)
@@ -81 +80 @@
                 }
 
-                fmt.Printf("New password: ")
-                password, err := terminal.ReadPassword(int(os.Stdin.Fd()))
+                password, err := readPassword()
                 if err != nil {
-                        log.Fatalf("failed to read new password: %v", err)
+                        log.Fatalf("failed to read password: %v", err)
                 }
-                fmt.Printf("\n")
 
                 hashed, err := bcrypt.GenerateFromPassword(password, bcrypt.DefaultCost)
@@ -108 +105 @@
         }
 }
+
+func readPassword() ([]byte, error) {
+        var password []byte
+        var err error
+        fd := int(os.Stdin.Fd())
+
+        if terminal.IsTerminal(fd) {
+                fmt.Printf("Password: ")
+                password, err = terminal.ReadPassword(int(os.Stdin.Fd()))
+                if err != nil {
+                        return nil, err
+                }
+                fmt.Printf("\n")
+        } else {
+                fmt.Fprintf(os.Stderr, "Warning: Reading password from stdin.\n")
+                scanner := bufio.NewScanner(os.Stdin)
+                scanner.Scan()
+                password = scanner.Bytes()
+
+                if len(password) == 0 {
+                        return nil, fmt.Errorf("zero length password")
+                }
+        }
+
+        return password, nil
+}