Support Windows (#14)

* Support Windows

action/clihelper.go

@@ -2,15 +2,12 @@ package action
 
 import (
 	"bufio"
-	"crypto/sha256"
 	"fmt"
 	"os"
-	"os/exec"
 	"os/signal"
 	"sort"
 	"strconv"
 	"strings"
-	"syscall"
 
 	"github.com/justwatchcom/gopass/gpg"
 	"golang.org/x/crypto/ssh/terminal"
@@ -51,22 +48,6 @@ func (s *Action) confirmRecipients(name string, recipients []string) ([]string,
 	}
 }
 
-// clearClipboard will spwan a copy of gopass that waits in a detached background
-// process group until the timeout is expired. It will then compare the contents
-// of the clipboard and erase it if it still contains the data gopass copied
-// to it.
-func clearClipboard(content []byte, timeout int) error {
-	hash := fmt.Sprintf("%x", sha256.Sum256(content))
-
-	cmd := exec.Command(os.Args[0], "unclip", "--timeout", strconv.Itoa(timeout))
-	// https://groups.google.com/d/msg/golang-nuts/shST-SDqIp4/za4oxEiVtI0J
-	cmd.SysProcAttr = &syscall.SysProcAttr{
-		Setpgid: true,
-	}
-	cmd.Env = append(os.Environ(), "GOPASS_UNCLIP_CHECKSUM="+hash)
-	return cmd.Start()
-}
-
 // askForConfirmation asks a yes/no question until the user
 // replies yes or no
 func askForConfirmation(text string) bool {

action/clipboard_others.go

@@ -0,0 +1,28 @@
+// +build !windows
+
+package action
+
+import (
+	"crypto/sha256"
+	"fmt"
+	"os"
+	"os/exec"
+	"strconv"
+	"syscall"
+)
+
+// clearClipboard will spwan a copy of gopass that waits in a detached background
+// process group until the timeout is expired. It will then compare the contents
+// of the clipboard and erase it if it still contains the data gopass copied
+// to it.
+func clearClipboard(content []byte, timeout int) error {
+	hash := fmt.Sprintf("%x", sha256.Sum256(content))
+
+	cmd := exec.Command(os.Args[0], "unclip", "--timeout", strconv.Itoa(timeout))
+	// https://groups.google.com/d/msg/golang-nuts/shST-SDqIp4/za4oxEiVtI0J
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setpgid: true,
+	}
+	cmd.Env = append(os.Environ(), "GOPASS_UNCLIP_CHECKSUM="+hash)
+	return cmd.Start()
+}

action/clipboard_windows.go

@@ -0,0 +1,23 @@
+// +build windows
+
+package action
+
+import (
+	"crypto/sha256"
+	"fmt"
+	"os"
+	"os/exec"
+	"strconv"
+)
+
+// clearClipboard will spwan a copy of gopass that waits in a detached background
+// process group until the timeout is expired. It will then compare the contents
+// of the clipboard and erase it if it still contains the data gopass copied
+// to it.
+func clearClipboard(content []byte, timeout int) error {
+	hash := fmt.Sprintf("%x", sha256.Sum256(content))
+
+	cmd := exec.Command(os.Args[0], "unclip", "--timeout", strconv.Itoa(timeout))
+	cmd.Env = append(os.Environ(), "GOPASS_UNCLIP_CHECKSUM="+hash)
+	return cmd.Start()
+}

action/git.go

@@ -27,6 +27,6 @@ func (s *Action) GitInit(c *cli.Context) error {
 	if err := s.Store.GitInit(store, sk); err != nil {
 		return err
 	}
-	fmt.Println(color.GreenString("Git initialized"))
+	fmt.Fprintln(color.Output, color.GreenString("Git initialized"))
 	return nil
 }

action/init.go

@@ -46,7 +46,7 @@ func (s *Action) Init(c *cli.Context) error {
 		return err
 	}
 
-	fmt.Printf(color.GreenString("Password store initialized for: "))
+	fmt.Fprint(color.Output, color.GreenString("Password store initialized for: "))
 	for _, recipient := range s.Store.ListRecipients(store) {
 		r := "0x" + recipient
 		if kl, err := gpg.ListPublicKeys(recipient); err == nil && len(kl) > 0 {

action/mount.go

@@ -20,7 +20,7 @@ func (s *Action) MountRemove(c *cli.Context) error {
 		return err
 	}
 
-	fmt.Println(color.GreenString("Password Store %s umounted", c.Args()[0]))
+	color.Green("Password Store %s umounted", c.Args()[0])
 	return nil
 }
 
@@ -36,7 +36,7 @@ func (s *Action) MountsPrint(c *cli.Context) error {
 			fmt.Printf("Failed to add mount: %s\n", err)
 		}
 	}
-	fmt.Println(root.Format())
+	fmt.Fprintln(color.Output, root.Format())
 	return nil
 }
 
@@ -65,6 +65,6 @@ func (s *Action) MountAdd(c *cli.Context) error {
 		return err
 	}
 
-	fmt.Println(color.GreenString("Mounted %s as %s", c.Args()[0], c.Args()[1]))
+	color.Green("Mounted %s as %s", c.Args()[0], c.Args()[1])
 	return nil
 }

fsutil/fsutil.go

@@ -6,8 +6,6 @@ import (
 	"os/user"
 	"path/filepath"
 	"strings"
-
-	"golang.org/x/sys/unix"
 )
 
 // CleanPath resolves common aliases in a path and cleans it as much as possible
@@ -62,18 +60,3 @@ func IsFile(path string) bool {
 
 	return fi.Mode().IsRegular()
 }
-
-// Tempdir returns a temporary directory suiteable for sensitive data. It tries
-// /dev/shm but if this isn't working it will return an empty string. Using
-// this with ioutil.Tempdir will ensure that we're getting the "best" tempdir.
-func Tempdir() string {
-	shmDir := "/dev/shm"
-	if fi, err := os.Stat(shmDir); err == nil {
-		if fi.IsDir() {
-			if unix.Access(shmDir, unix.W_OK) == nil {
-				return shmDir
-			}
-		}
-	}
-	return ""
-}

fsutil/fsutil_others.go

@@ -0,0 +1,24 @@
+// +build !windows
+
+package fsutil
+
+import (
+	"os"
+
+	"golang.org/x/sys/unix"
+)
+
+// Tempdir returns a temporary directory suiteable for sensitive data. It tries
+// /dev/shm but if this isn't working it will return an empty string. Using
+// this with ioutil.Tempdir will ensure that we're getting the "best" tempdir.
+func Tempdir() string {
+	shmDir := "/dev/shm"
+	if fi, err := os.Stat(shmDir); err == nil {
+		if fi.IsDir() {
+			if unix.Access(shmDir, unix.W_OK) == nil {
+				return shmDir
+			}
+		}
+	}
+	return ""
+}

fsutil/fsutil_windows.go

@@ -0,0 +1,9 @@
+// +build windows
+
+package fsutil
+
+// Tempdir returns a temporary directory suiteable for sensitive data. On
+// Windows, just return empty string for ioutil.TempFile.
+func Tempdir() string {
+	return ""
+}

gpg/gpg.go

@@ -12,7 +12,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
 )
 
@@ -24,7 +23,7 @@ const (
 func init() {
 	// ensure created files don't have group or world perms set
 	// this setting should be inherited by sub-processes
-	syscall.Umask(077)
+	umask(077)
 }
 
 var (

gpg/umask_others.go

@@ -0,0 +1,9 @@
+// +build !windows
+
+package gpg
+
+import "syscall"
+
+func umask(mask int) int {
+	return syscall.Umask(mask)
+}

gpg/umask_windows.go

@@ -0,0 +1,7 @@
+// +build windows
+
+package gpg
+
+func umask(mask int) int {
+	return -1
+}

main.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/justwatchcom/gopass/action"
+	"github.com/mattn/go-colorable"
 	"github.com/urfave/cli"
 )
 
@@ -36,7 +37,7 @@ func (e errorWriter) Write(p []byte) (int, error) {
 
 func main() {
 	cli.ErrWriter = errorWriter{
-		out: os.Stderr,
+		out: colorable.NewColorableStderr(),
 	}
 
 	cli.VersionPrinter = func(c *cli.Context) {