fix(wp): handling of CR characters

[sjinks]

Description

This PR strips CR characters from the input stream, making --prompt option work.

Ref: pbq1wL-1LP#comment-1898

Pull request checklist

• Update SETUP.md with any new environmental variables.
• Update the documentation.
• Manually test the relevant changes.
• Follow the pull request checklist
• Add/update automated tests as needed.

New release checklist

• Automated tests pass.
• The Preparing for release checklist is completed.

Steps to Test

Try vip @env -y -- wp option update --prompt command to ensure they work.

[github-actions]

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

OpenSSF Scorecard

Package	Version	Score	Details

Scanned Files

[sjinks]

The alternative is to ignore CR characters in cron-control-runner's TTY:

diff --git a/remote/remote.go b/remote/remote.go
index 4e81932..7fdabb7 100644
--- a/remote/remote.go
+++ b/remote/remote.go
@@ -32,6 +32,7 @@ import (
        "github.com/hashicorp/go-retryablehttp"
        "github.com/howeyc/fsnotify"
        "golang.org/x/net/websocket"
+       "golang.org/x/sys/unix"
        "golang.org/x/term"
 )
 
@@ -440,6 +441,16 @@ func processShutdown(conn net.Conn, wpcli *wpCLIProcess) {
        wpcli.padlock.Unlock()
 }
 
+func setPtyToIgnoreCR(fd int) error {
+       termios, err := unix.IoctlGetTermios(fd, unix.TCGETS)
+       if err == nil {
+               termios.Iflag |= unix.IGNCR
+               return unix.IoctlSetTermios(fd, unix.TCSETS, termios)
+       }
+
+       return err
+}
+
 func processTCPConnectionData(conn net.Conn, wpcli *wpCLIProcess) {
        data := make([]byte, 8192)
        var size, written int
@@ -775,6 +786,10 @@ func runWpCliCmdRemote(conn net.Conn, GUID string, rows uint16, cols uint16, wpC
        }
        defer func() { _ = term.Restore(int(tty.Fd()), prevState) }()
 
+       if e := setPtyToIgnoreCR(int(tty.Fd())); e != nil {
+               return fmt.Errorf("runWpCliCmdRemote: error setting the WP CLI tty to send LF: %s", e.Error())
+       }
+
        readFile, err := os.OpenFile(logFileName, os.O_RDONLY, os.ModeCharDevice)
        if nil != err {
                conn.Close()

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud