Skip to content

Commit

Permalink
image scp: don't require port for ssh URL
Browse files Browse the repository at this point in the history
SSH uses 22 as default so it is really not necessary to require the
port. The backend code already does this but the parsing in the
frontend always tried to parse the port.

[NO NEW TESTS NEEDED] This would require actual remote host ssh setup in
CI so it is not possible to be check but I verified it locally.

Fixes https://issues.redhat.com/browse/RHEL-17776

Signed-off-by: Paul Holzinger <[email protected]>
  • Loading branch information
Luap99 authored and openshift-cherrypick-robot committed Mar 1, 2024
1 parent ec47e28 commit 88b5715
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions pkg/domain/utils/scp.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,14 @@ func LoginUser(user string) (*exec.Cmd, error) {
// and copies the saved image dir over to the remote host and then loads it onto the machine
// returns a string containing output or an error
func LoadToRemote(dest entities.ImageScpOptions, localFile string, tag string, url *url.URL, iden string, sshEngine ssh.EngineMode) (string, string, error) {
port, err := strconv.Atoi(url.Port())
if err != nil {
return "", "", err
port := 0
urlPort := url.Port()
if urlPort != "" {
var err error
port, err = strconv.Atoi(url.Port())
if err != nil {
return "", "", err
}
}

remoteFile, err := ssh.Exec(&ssh.ConnectionExecOptions{Host: url.String(), Identity: iden, Port: port, User: url.User, Args: []string{"mktemp"}}, sshEngine)
Expand Down Expand Up @@ -257,9 +262,14 @@ func SaveToRemote(image, localFile string, tag string, uri *url.URL, iden string
return fmt.Errorf("renaming of an image is currently not supported: %w", define.ErrInvalidArg)
}

port, err := strconv.Atoi(uri.Port())
if err != nil {
return err
port := 0
urlPort := uri.Port()
if urlPort != "" {
var err error
port, err = strconv.Atoi(uri.Port())
if err != nil {
return err
}
}

remoteFile, err := ssh.Exec(&ssh.ConnectionExecOptions{Host: uri.String(), Identity: iden, Port: port, User: uri.User, Args: []string{"mktemp"}}, sshEngine)
Expand Down

0 comments on commit 88b5715

Please sign in to comment.