Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2025-12-31 21:03:11 +01:00
Code Issues Projects Releases Wiki Activity

fix (ftp): connection string for ftp:// or ftps://

Browse source
This commit is contained in:
Mickael Kerjean 2020-05-08 16:34:56 +10:00
parent 107cfd87ce
commit 9f25c317ea
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/model/backend/ftp.go
View file

@ -37,8 +37,6 @@ func (f Ftp) Init(params map[string]string, app *App) (IBackend, error) {
if params["hostname"] == "" {
params["hostname"] = "localhost"
}
params["hostname"] = strings.TrimPrefix(params["hostname"], "ftp://")
params["hostname"] = strings.TrimPrefix(params["hostname"], "ftps://")
if params["port"] == "" {
params["port"] = "21"
@ -72,7 +70,7 @@ func (f Ftp) Init(params map[string]string, app *App) (IBackend, error) {
var backend *Ftp = nil
// Attempt to connect using FTPS
if client, err := goftp.DialConfig(configWithTLS, fmt.Sprintf("%s:%s", params["hostname"], params["port"])); err == nil {
if client, err := goftp.DialConfig(configWithTLS, fmt.Sprintf("%s:%s", strings.TrimPrefix(params["hostname"], "ftps://"), params["port"])); err == nil {
if _, err := client.ReadDir("/"); err != nil {
client.Close()
} else {
@ -82,7 +80,7 @@ func (f Ftp) Init(params map[string]string, app *App) (IBackend, error) {
// Attempt to create an FTP connection if FTPS isn't available
if backend == nil {
client, err := goftp.DialConfig(configWithoutTLS, fmt.Sprintf("%s:%s", params["hostname"], params["port"]))
client, err := goftp.DialConfig(configWithoutTLS, fmt.Sprintf("%s:%s", strings.TrimPrefix(params["hostname"], "ftp://"), params["port"]))
if err != nil {
return backend, err
}