From 2a760367dfb060d57b977ce07f1aaa0bbb603918 Mon Sep 17 00:00:00 2001
From: Pierre Carrier <pc@rrier.ca>
Date: Thu, 28 Jan 2021 22:40:11 -0500
Subject: [PATCH 1/2] support csv

---
 gauth.go | 59 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/gauth.go b/gauth.go
index 8cbd13e..87abee3 100644
--- a/gauth.go
+++ b/gauth.go
@@ -3,11 +3,13 @@ package main
 import (
 	"bytes"
 	"encoding/csv"
+	"flag"
 	"fmt"
 	"log"
 	"os"
 	"os/user"
 	"path"
+	"strconv"
 	"strings"
 	"syscall"
 	"text/tabwriter"
@@ -16,14 +18,20 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 )
 
+var (
+	useCSV = flag.Bool("csv", false, "Output CSV for easy machine processing")
+)
+
 func main() {
+	flag.Parse()
+
 	cfgPath := os.Getenv("GAUTH_CONFIG")
 	if cfgPath == "" {
-		user, err := user.Current()
+		usr, err := user.Current()
 		if err != nil {
 			log.Fatal(err)
 		}
-		cfgPath = path.Join(user.HomeDir, ".config/gauth.csv")
+		cfgPath = path.Join(usr.HomeDir, ".config/gauth.csv")
 	}
 
 	cfgContent, err := gauth.LoadConfigFile(cfgPath, getPassword)
@@ -42,22 +50,45 @@ func main() {
 
 	currentTS, progress := gauth.IndexNow()
 
-	tw := tabwriter.NewWriter(os.Stdout, 0, 8, 1, ' ', 0)
-	fmt.Fprintln(tw, "\tprev\tcurr\tnext")
-	for _, record := range cfg {
-		name, secret := record[0], record[1]
-		prev, curr, next, err := gauth.Codes(secret, currentTS)
-		if err != nil {
-			log.Fatalf("Generating codes: %v", err)
+	if *useCSV {
+		cw := csv.NewWriter(os.Stdout)
+		for _, record := range cfg {
+			name, secret := record[0], record[1]
+			_, curr, next, err := gauth.Codes(secret, currentTS)
+			if err != nil {
+				log.Fatalf("Generating codes: %v", err)
+			}
+			if err := cw.Write([]string{name, curr, next, strconv.Itoa(30 - progress)}); err != nil {
+				log.Fatalf("Printing CSV: %v", err)
+			}
 		}
-		fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", name, prev, curr, next)
+		cw.Flush()
+	} else {
+		tw := tabwriter.NewWriter(os.Stdout, 0, 8, 1, ' ', 0)
+		if _, err := fmt.Fprintln(tw, "\tprev\tcurr\tnext"); err != nil {
+			log.Fatalf("Printing header: %v", err)
+		}
+		for _, record := range cfg {
+			name, secret := record[0], record[1]
+			prev, curr, next, err := gauth.Codes(secret, currentTS)
+			if err != nil {
+				log.Fatalf("Generating codes: %v", err)
+			}
+			if _, err := fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", name, prev, curr, next); err != nil {
+				log.Fatalf("Printing %v: %v", name, err)
+			}
+		}
+		if err := tw.Flush(); err != nil {
+			log.Fatalf("Flushing: %v", err)
+		}
+		fmt.Printf("[%-29s]\n", strings.Repeat("=", progress))
 	}
-	tw.Flush()
-	fmt.Printf("[%-29s]\n", strings.Repeat("=", progress))
 }
 
 func getPassword() ([]byte, error) {
-	fmt.Printf("Encryption password: ")
+	if _, err := fmt.Printf("Encryption password: "); err != nil {
+		log.Fatalf("Printing encryption password prompt")
+	}
 	defer fmt.Println()
-	return terminal.ReadPassword(int(syscall.Stdin))
+	return terminal.ReadPassword(syscall.Stdin)
 }

From 03a86a0e2c96304a67e7803d1a915f01aaa62654 Mon Sep 17 00:00:00 2001
From: Pierre Carrier <pc@rrier.ca>
Date: Sun, 1 Aug 2021 15:50:17 +0200
Subject: [PATCH 2/2] feedback

---
 gauth.go | 12 ++++++++----
 go.sum   |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gauth.go b/gauth.go
index 87abee3..db4acda 100644
--- a/gauth.go
+++ b/gauth.go
@@ -27,11 +27,11 @@ func main() {
 
 	cfgPath := os.Getenv("GAUTH_CONFIG")
 	if cfgPath == "" {
-		usr, err := user.Current()
+		u, err := user.Current()
 		if err != nil {
 			log.Fatal(err)
 		}
-		cfgPath = path.Join(usr.HomeDir, ".config/gauth.csv")
+		cfgPath = path.Join(u.HomeDir, ".config/gauth.csv")
 	}
 
 	cfgContent, err := gauth.LoadConfigFile(cfgPath, getPassword)
@@ -54,15 +54,19 @@ func main() {
 		cw := csv.NewWriter(os.Stdout)
 		for _, record := range cfg {
 			name, secret := record[0], record[1]
-			_, curr, next, err := gauth.Codes(secret, currentTS)
+			prev, curr, next, err := gauth.Codes(secret, currentTS)
 			if err != nil {
 				log.Fatalf("Generating codes: %v", err)
 			}
-			if err := cw.Write([]string{name, curr, next, strconv.Itoa(30 - progress)}); err != nil {
+			if err := cw.Write([]string{name, curr, next, prev, strconv.Itoa(30 - progress)}); err != nil {
 				log.Fatalf("Printing CSV: %v", err)
 			}
 		}
 		cw.Flush()
+		err := cw.Error()
+		if err != nil {
+			log.Fatalf("Flushing: %v", err)
+		}
 	} else {
 		tw := tabwriter.NewWriter(os.Stdout, 0, 8, 1, ' ', 0)
 		if _, err := fmt.Fprintln(tw, "\tprev\tcurr\tnext"); err != nil {
diff --git a/go.sum b/go.sum
index 17e2488..7d71043 100644
--- a/go.sum
+++ b/go.sum
@@ -4,7 +4,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201020230747-6e5568b54d1a h1:e3IU37lwO4aq3uoRKINC7JikojFmE5gO7xhfxs8VC34=