Changeset 326 in code for trunk/cmd

Timestamp:

Jun 8, 2020, 8:30:09 PM (5 years ago)

Author:

delthas

Message:

Fix: Check the stdin scanner for errors when reading the password

Reading from stdin with Scanner.Scan() can either fail because of a read
error, or return no bytes because the EOF was reached.

This adds support for checking these cases before actually reading the
password.

File:

• trunk/cmd/sojuctl/main.go (modified) (1 diff)

trunk/cmd/sojuctl/main.go

@@ -121 +121 @@
                 fmt.Fprintf(os.Stderr, "Warning: Reading password from stdin.\n")
                 scanner := bufio.NewScanner(os.Stdin)
-                scanner.Scan()
+                if !scanner.Scan() {
+                        if err := scanner.Err(); err != nil {
+                                log.Fatalf("failed to read password from stdin: %v", err)
+                        }
+                        log.Fatalf("failed to read password from stdin: stdin is empty")
+                }
                 password = scanner.Bytes()