Skip to content

Fix validateCmd to accept multiline values #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ariskataoka wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft

Fix validateCmd to accept multiline values #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76948c3
Fix validateCmd to accept multiline values
ariskataoka Sep 6, 2024
f8d291d
Remove debugging logs
ariskataoka Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions remote/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,20 +348,34 @@ func authenticateProtocolHeader2(data []byte) (string, string, uint16, uint16, i
}

func validateCommand(calledCmd string) (string, error) {
// Check if the command is empty after trimming whitespace
if 0 == len(strings.TrimSpace(calledCmd)) {
return "", errors.New("No WP CLI command specified")
}

cmdParts := strings.Fields(strings.TrimSpace(calledCmd))
if 0 == len(cmdParts) {
// Trim the command and split it into parts while preserving line breaks!
cmdParts := strings.Split(calledCmd, "\n")

// preapring collect valid command parts
var validCmdParts []string
for _, part := range cmdParts {
trimmedPart := strings.TrimSpace(part)
if 0 < len(trimmedPart) {
validCmdParts = append(validCmdParts, trimmedPart)
}
}

// Check if any valid command parts were found
if 0 == len(validCmdParts) {
return "", errors.New("WP CLI command not sent")
}

if 1 == len(cmdParts) {
return strings.TrimSpace(cmdParts[0]), nil
// Return the joined command while preserving line breaks
if 1 == len(validCmdParts) {
return validCmdParts[0], nil // Return the first part if only one
}

return strings.Join(cmdParts, " "), nil
return strings.Join(validCmdParts, "\n"), nil // Join with line breaks if multiple parts
}

func getCleanWpCliArgumentArray(wpCliCmdString string) ([]string, error) {
Expand Down