Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions agent/utils/cloud_storage/client/sftp.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package client

import (
"fmt"
"io"
"net"
"os"
Expand Down Expand Up @@ -53,11 +52,12 @@ func NewSftpClient(vars map[string]interface{}) (*sftpClient, error) {
return nil
},
}
if _, err := ssh.Dial("tcp", fmt.Sprintf("%s:%s", address, port), clientConfig); err != nil {
addr := net.JoinHostPort(address, port)
if _, err := ssh.Dial("tcp", addr, clientConfig); err != nil {
return nil, err
}

return &sftpClient{connInfo: fmt.Sprintf("%s:%s", address, port), config: clientConfig}, nil
return &sftpClient{connInfo: addr, config: clientConfig}, nil
}

func (s sftpClient) Upload(src, target string) (bool, error) {
Expand Down
4 changes: 2 additions & 2 deletions agent/utils/cloud_storage/client/webdav.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package client

import (
"crypto/tls"
"fmt"
"io"
"net"
"net/http"
"os"
"path"
Expand All @@ -25,7 +25,7 @@ func NewWebDAVClient(vars map[string]interface{}) (*webDAVClient, error) {
username := loadParamFromVars("username", vars)
bucket := loadParamFromVars("bucket", vars)

url := fmt.Sprintf("%s:%s", address, port)
url := net.JoinHostPort(address, port)
if len(port) == 0 {
url = address
}
Expand Down
7 changes: 3 additions & 4 deletions agent/utils/ssh/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ssh

import (
"fmt"
"net"
"strings"
"time"

Expand All @@ -24,12 +25,10 @@ type SSHClient struct {
}

func NewClient(c ConnInfo) (*SSHClient, error) {
if strings.Contains(c.Addr, ":") {
c.Addr = fmt.Sprintf("[%s]", c.Addr)
}
config := &gossh.ClientConfig{}
config.SetDefaults()
addr := fmt.Sprintf("%s:%d", c.Addr, c.Port)

addr := net.JoinHostPort(c.Addr, fmt.Sprintf("%d", c.Port))
config.User = c.User
if c.AuthMode == "password" {
config.Auth = []gossh.AuthMethod{gossh.Password(c.Password)}
Expand Down
6 changes: 3 additions & 3 deletions core/utils/cloud_storage/client/sftp.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package client

import (
"fmt"
"io"
"net"
"os"
Expand Down Expand Up @@ -56,11 +55,12 @@ func NewSftpClient(vars map[string]interface{}) (*sftpClient, error) {
return nil
},
}
if _, err := ssh.Dial("tcp", fmt.Sprintf("%s:%s", address, port), clientConfig); err != nil {
addr := net.JoinHostPort(address, port)
if _, err := ssh.Dial("tcp", addr, clientConfig); err != nil {
return nil, err
}

return &sftpClient{connInfo: fmt.Sprintf("%s:%s", address, port), config: clientConfig, bucket: bucket}, nil
return &sftpClient{connInfo: addr, config: clientConfig, bucket: bucket}, nil
}

func (s sftpClient) Upload(src, target string) (bool, error) {
Expand Down
4 changes: 2 additions & 2 deletions core/utils/cloud_storage/client/webdav.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package client

import (
"crypto/tls"
"fmt"
"net"
"net/http"
"os"
"path"
Expand All @@ -25,7 +25,7 @@ func NewWebDAVClient(vars map[string]interface{}) (*webDAVClient, error) {
username := loadParamFromVars("username", vars)
bucket := loadParamFromVars("bucket", vars)

url := fmt.Sprintf("%s:%s", address, port)
url := net.JoinHostPort(address, port)
if len(port) == 0 {
url = address
}
Expand Down
5 changes: 1 addition & 4 deletions core/utils/ssh/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@ type SSHClient struct {
}

func NewClient(c ConnInfo) (*SSHClient, error) {
if strings.Contains(c.Addr, ":") {
c.Addr = fmt.Sprintf("[%s]", c.Addr)
}
config := &gossh.ClientConfig{}
config.SetDefaults()
addr := fmt.Sprintf("%s:%d", c.Addr, c.Port)
addr := net.JoinHostPort(c.Addr, fmt.Sprintf("%d", c.Port))
config.User = c.User
if c.AuthMode == "password" {
config.Auth = []gossh.AuthMethod{gossh.Password(c.Password)}
Expand Down
Loading