Fix ClearProcess

clip/clipClearProcess.go

@@ -41,7 +41,7 @@ func ClearProcess(assignedContents []byte) error {
 	if err != nil {
 		return errors.New("unable to read clipboard contents")
 	}
-	if bytes.Equal(assignedContents, newContents) {
+	if bytes.Equal(assignedContents, bytes.TrimRight(newContents, "\r\n")) {
 		if err = clearClipboard(); err != nil {
 			return err
 		}

clip/copy_MAC.go

@@ -7,17 +7,21 @@ import (
 	"os/exec"
 
 	"github.com/rwinkhart/go-boilerplate/back"
+	"github.com/rwinkhart/go-boilerplate/security"
 )
 
 // CopyBytes copies a byte slice to the clipboard.
 func CopyBytes(clearClipboardAutomatically bool, copySubject []byte) error {
 	cmd := exec.Command("pbcopy")
-	_ = back.WriteToStdinAndZeroizeInput(cmd, copySubject)
+	_ = back.WriteToStdin(cmd, copySubject, false)
 	if err := cmd.Run(); err != nil {
+		security.ZeroizeBytes(copySubject)
 		return errors.New("unable to copy to clipboard: " + err.Error())
 	}
 	if clearClipboardAutomatically {
 		LaunchClearProcess(copySubject)
+	} else {
+		security.ZeroizeBytes(copySubject)
 	}
 	return nil
 }
@@ -25,6 +29,6 @@ func CopyBytes(clearClipboardAutomatically bool, copySubject []byte) error {
 // getClipCommands returns the commands for pasting and clearing the clipboard contents.
 func getClipCommands() (*exec.Cmd, *exec.Cmd, error) {
 	cmdClear := exec.Command("pbcopy")
-	_ = back.WriteToStdinAndZeroizeInput(cmdClear, nil)
+	_ = back.WriteToStdin(cmdClear, nil, false)
 	return exec.Command("pbpaste"), cmdClear, nil
 }

clip/copy_UNIX.go

@@ -8,6 +8,7 @@ import (
 	"os/exec"
 
 	"github.com/rwinkhart/go-boilerplate/back"
+	"github.com/rwinkhart/go-boilerplate/security"
 )
 
 // CopyBytes copies a byte slice to the clipboard.
@@ -24,12 +25,15 @@ func CopyBytes(clearClipboardAutomatically bool, copySubject []byte) error {
 		cmdCopy = exec.Command("xclip", "-sel", "c", "-t", "text/plain")
 	}
 
-	_ = back.WriteToStdinAndZeroizeInput(cmdCopy, copySubject)
+	_ = back.WriteToStdin(cmdCopy, copySubject, false)
 	if err = cmdCopy.Run(); err != nil {
+		security.ZeroizeBytes(copySubject)
 		return errors.New("unable to copy to clipboard: " + err.Error())
 	}
 	if clearClipboardAutomatically {
 		LaunchClearProcess(copySubject)
+	} else {
+		security.ZeroizeBytes(copySubject)
 	}
 	return nil
 }

clip/copy_WIN.go

@@ -7,17 +7,21 @@ import (
 	"os/exec"
 
 	"github.com/rwinkhart/go-boilerplate/back"
+	"github.com/rwinkhart/go-boilerplate/security"
 )
 
 // CopyBytes copies a byte slice to the clipboard.
 func CopyBytes(clearClipboardAutomatically bool, copySubject []byte) error {
 	cmd := exec.Command("clip.exe")
-	_ = back.WriteToStdinAndZeroizeInput(cmd, copySubject)
+	_ = back.WriteToStdin(cmd, copySubject, false)
 	if err := cmd.Run(); err != nil {
+		security.ZeroizeBytes(copySubject)
 		return errors.New("unable to copy to clipboard: " + err.Error())
 	}
 	if clearClipboardAutomatically {
 		LaunchClearProcess(copySubject)
+	} else {
+		security.ZeroizeBytes(copySubject)
 	}
 	return nil
 }
@@ -25,6 +29,6 @@ func CopyBytes(clearClipboardAutomatically bool, copySubject []byte) error {
 // getClipCommands returns the commands for pasting and clearing the clipboard contents.
 func getClipCommands() (*exec.Cmd, *exec.Cmd, error) {
 	clearCMD := exec.Command("clip.exe")
-	_ = back.WriteToStdinAndZeroizeInput(clearCMD, nil)
+	_ = back.WriteToStdin(clearCMD, nil, false)
 	return exec.Command("powershell.exe", "-c", "Get-Clipboard"), clearCMD, nil
 }

clip/launchClipClearProcessCLI_GENERIC.go

@@ -15,7 +15,7 @@ import (
 func LaunchClearProcess(copySubject []byte) {
 	cmd := exec.Command(os.Args[0], "clipclear")
 	cmd.SysProcAttr = global.GetSysProcAttr()
-	_ = back.WriteToStdinAndZeroizeInput(cmd, copySubject)
+	_ = back.WriteToStdin(cmd, copySubject, true)
 	_ = cmd.Start()
 	os.Exit(0) // use os.Exit directly since this version of this function is only meant for non-interactive CLI implementations
 }