Fix 'pcopy join' error, add test for it

Author: Philipp Heckel

cmd/pcopy/join.go

@@ -88,7 +88,7 @@ func execJoin(c *cli.Context) error {
 				return err
 			}
 		} else {
-			password, err := readPassword()
+			password, err := readPassword(c)
 			if err != nil {
 				return err
 			}
@@ -122,44 +122,44 @@ func execJoin(c *cli.Context) error {
 	}
 
 	if !quiet {
-		printInstructions(configFile, clipboard, info)
+		printInstructions(c, configFile, clipboard, info)
 	}
 
 	return nil
 }
 
-func readPassword() ([]byte, error) {
-	fmt.Print("Enter password to join clipboard: ")
+func readPassword(c *cli.Context) ([]byte, error) {
+	fmt.Fprint(c.App.ErrWriter, "Enter password to join clipboard: ")
 	password, err := term.ReadPassword(syscall.Stdin)
 	if err != nil {
 		return nil, err
 	}
-	fmt.Print("\r")
+	fmt.Fprint(c.App.ErrWriter, "\r")
 	return password, nil
 }
 
-func printInstructions(configFile string, clipboard string, info *pcopy.ServerInfo) {
+func printInstructions(c *cli.Context, configFile string, clipboard string, info *pcopy.ServerInfo) {
 	clipboardPrefix := ""
 	if clipboard != pcopy.DefaultClipboard {
 		clipboardPrefix = fmt.Sprintf(" %s:", clipboard)
 	}
 
 	if clipboard == pcopy.DefaultClipboard {
-		fmt.Printf("Successfully joined clipboard, config written to %s\n", pcopy.CollapseHome(configFile))
+		fmt.Fprintf(c.App.ErrWriter, "Successfully joined clipboard, config written to %s\n", pcopy.CollapseHome(configFile))
 	} else {
-		fmt.Printf("Successfully joined clipboard as alias '%s', config written to %s\n", clipboard, pcopy.CollapseHome(configFile))
+		fmt.Fprintf(c.App.ErrWriter, "Successfully joined clipboard as alias '%s', config written to %s\n", clipboard, pcopy.CollapseHome(configFile))
 	}
 
 	if info.Cert != nil {
-		fmt.Println()
-		fmt.Println("Warning: The TLS certificate was self-signed and has been pinned.")
-		fmt.Println("Future communication will be secure, but joining could have been intercepted.")
+		fmt.Fprintln(c.App.ErrWriter)
+		fmt.Fprintln(c.App.ErrWriter, "Warning: The TLS certificate was self-signed and has been pinned.")
+		fmt.Fprintln(c.App.ErrWriter, "Future communication will be secure, but joining could have been intercepted.")
 	}
 
-	fmt.Println()
+	fmt.Fprintln(c.App.ErrWriter)
 	if _, err := os.Stat("/usr/bin/pcp"); err == nil {
-		fmt.Printf("You may now use 'pcp%s' and 'ppaste%s'. See 'pcopy -h' for usage details.\n", clipboardPrefix, clipboardPrefix)
+		fmt.Fprintf(c.App.ErrWriter, "You may now use 'pcp%s' and 'ppaste%s'. See 'pcopy -h' for usage details.\n", clipboardPrefix, clipboardPrefix)
 	} else {
-		fmt.Printf("You may now use 'pcopy copy%s' and 'pcopy paste%s'. See 'pcopy -h' for usage details.\n", clipboardPrefix, clipboardPrefix)
+		fmt.Fprintf(c.App.ErrWriter, "You may now use 'pcopy copy%s' and 'pcopy paste%s'. See 'pcopy -h' for usage details.\n", clipboardPrefix, clipboardPrefix)
 	}
 }

cmd/pcopy/join_test.go

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"heckel.io/pcopy"
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestCLI_JoinAndList(t *testing.T) {
+	_, config := newTestConfig(t)
+	serverRouter := startTestServerRouter(t, config)
+	defer serverRouter.Stop()
+
+	waitForPortUp(t, "12345")
+
+	configDir := t.TempDir()
+	os.Setenv(pcopy.EnvConfigDir, configDir)
+
+	app, _, _, stderr := newTestApp()
+	if err := runApp(app, "pcopy", "join", "localhost:12345"); err != nil {
+		t.Fatal(err)
+	}
+
+	assertStrContains(t, stderr.String(), "Successfully joined clipboard, config written to")
+	assertFileExist(t, filepath.Join(configDir, "default.conf"))
+
+	stderr.Reset()
+	if err := runApp(app, "pcopy", "list"); err != nil {
+		t.Fatal(err)
+	}
+	assertStrContains(t, stderr.String(), "default")
+	assertStrContains(t, stderr.String(), "localhost:12345")
+}

cmd/pcopy/list.go

@@ -37,16 +37,16 @@ func execList(c *cli.Context) error {
 		}
 
 		lineFmt := fmt.Sprintf("%%-%ds %%-%ds %%s\n", clipboardMaxLen, serverAddrMaxLen)
-		fmt.Printf(lineFmt, clipboardHeader, serverAddrHeader, "Config file")
-		fmt.Printf(lineFmt, strings.Repeat("-", clipboardMaxLen), strings.Repeat("-", serverAddrMaxLen), strings.Repeat("-", configFileMaxLen))
+		fmt.Fprintf(c.App.ErrWriter, lineFmt, clipboardHeader, serverAddrHeader, "Config file")
+		fmt.Fprintf(c.App.ErrWriter, lineFmt, strings.Repeat("-", clipboardMaxLen), strings.Repeat("-", serverAddrMaxLen), strings.Repeat("-", configFileMaxLen))
 		for filename, config := range configs {
 			clipboard := pcopy.ExtractClipboard(filename)
 			shortName := pcopy.CollapseHome(filename)
 			serverAddr := pcopy.CollapseServerAddr(config.ServerAddr)
-			fmt.Printf(lineFmt, clipboard, serverAddr, shortName)
+			fmt.Fprintf(c.App.ErrWriter, lineFmt, clipboard, serverAddr, shortName)
 		}
 	} else {
-		fmt.Println("No clipboards found. You can use 'pcopy join' to connect to existing clipboards.")
+		fmt.Fprintln(c.App.ErrWriter, "No clipboards found. You can use 'pcopy join' to connect to existing clipboards.")
 	}
 	return nil
 }

cmd/pcopy/main_test.go

@@ -143,6 +143,12 @@ func assertFileNotExist(t *testing.T, filename string) {
 	}
 }
 
+func assertFileExist(t *testing.T, filename string) {
+	if stat, _ := os.Stat(filename); stat == nil {
+		t.Fatalf("expected file %s to exist, but it does not", filename)
+	}
+}
+
 func waitForPortUp(t *testing.T, port string) {
 	success := false
 	for i := 0; i < 100; i++ {

configs/pcopy.conf.tmpl

@@ -115,7 +115,7 @@
 # Default: 7d
 #
 {{$fileExpireAfterStr := durationToHuman .FileExpireAfter -}}
-{{if eq "7d" $fileExpireAfterStr}}# FileExpireAfter 7d{{else}}FileExpireAfter {{$fileExpireAfterStr}}{{end}}
+{{if or (eq "7d" $fileExpireAfterStr) (not .FileExpireAfter)}}# FileExpireAfter 7d{{else}}FileExpireAfter {{$fileExpireAfterStr}}{{end}}
 
 # Modes that are allowed to be set by the client for uploaded files, read-write ("rw") and read-only ("ro).
 # If both modes are set, the client can chose. If no mode is set by the client, the first mode is used as