Merge pull request 'fix: reordering connections' (#5) from v1.1.3 into main

Reviewed-on: http://git.jdbnet.co.uk/jamie/goexplore/pulls/5

app.go

@@ -16,6 +16,7 @@ import (
 	"goexplore/internal/transfer"
 	"os"
 	"path/filepath"
+	"sync"
 
 	"github.com/google/uuid"
 	"github.com/wailsapp/wails/v2/pkg/runtime"
@@ -25,6 +26,8 @@ type App struct {
 	ctx             context.Context
 	cfg             *config.Config
 	transferManager *transfer.Manager
+	explorers       map[string]explorer.Explorer
+	explorersMu     sync.Mutex
 }
 
 func NewApp() *App {
@@ -38,6 +41,7 @@ func NewApp() *App {
 	return &App{
 		cfg:             cfg,
 		transferManager: transfer.NewManager(3),
+		explorers:       make(map[string]explorer.Explorer),
 	}
 }
 
@@ -123,6 +127,41 @@ func (a *App) ReorderConnections(ids []string) error {
 	return config.SaveConfig(a.cfg)
 }
 
+func (a *App) getConnection(id string) (explorer.Explorer, error) {
+	if id == "local" {
+		return local.New(), nil
+	}
+	
+	a.explorersMu.Lock()
+	defer a.explorersMu.Unlock()
+
+	if exp, ok := a.explorers[id]; ok {
+		return exp, nil
+	}
+
+	exp, err := a.getExplorerForConnection(id)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := exp.Connect(); err != nil {
+		return nil, err
+	}
+
+	a.explorers[id] = exp
+	return exp, nil
+}
+
+func (a *App) DisconnectConnection(id string) {
+	a.explorersMu.Lock()
+	defer a.explorersMu.Unlock()
+
+	if exp, ok := a.explorers[id]; ok {
+		exp.Disconnect()
+		delete(a.explorers, id)
+	}
+}
+
 func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
 	if id == "local" {
 		return local.New(), nil
@@ -160,38 +199,26 @@ func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
 }
 
 func (a *App) ListDir(connId, path string) ([]explorer.FileEntry, error) {
-	exp, err := a.getExplorerForConnection(connId)
+	exp, err := a.getConnection(connId)
 	if err != nil {
 		return nil, err
 	}
-	if err := exp.Connect(); err != nil {
-		return nil, err
-	}
-	defer exp.Disconnect()
 	return exp.ListDir(path)
 }
 
 func (a *App) MkDir(connId, path string) error {
-	exp, err := a.getExplorerForConnection(connId)
+	exp, err := a.getConnection(connId)
 	if err != nil {
 		return err
 	}
-	if err := exp.Connect(); err != nil {
-		return err
-	}
-	defer exp.Disconnect()
 	return exp.MkDir(path)
 }
 
 func (a *App) Delete(connId, path string) error {
-	exp, err := a.getExplorerForConnection(connId)
+	exp, err := a.getConnection(connId)
 	if err != nil {
 		return err
 	}
-	if err := exp.Connect(); err != nil {
-		return err
-	}
-	defer exp.Disconnect()
 	return exp.Delete(path)
 }
 
@@ -225,14 +252,10 @@ func (a *App) ClearTransfers() {
 }
 
 func (a *App) Rename(connId, src, dst string) error {
-	exp, err := a.getExplorerForConnection(connId)
+	exp, err := a.getConnection(connId)
 	if err != nil {
 		return err
 	}
-	if err := exp.Connect(); err != nil {
-		return err
-	}
-	defer exp.Disconnect()
 	return exp.Rename(src, dst)
 }
 

frontend/src/main.js

@@ -85,18 +85,29 @@ async function loadConnections() {
                 el.addEventListener('dragstart', (e) => {
                     draggedConnId = c.id;
                     e.dataTransfer.effectAllowed = 'move';
+                    e.dataTransfer.setData('text/plain', c.id);
                     el.style.opacity = '0.5';
                 });
                 el.addEventListener('dragend', () => {
                     draggedConnId = null;
                     el.style.opacity = '1';
                 });
+                el.addEventListener('dragenter', (e) => {
+                    e.preventDefault();
+                    if (draggedConnId && draggedConnId !== c.id) {
+                        el.style.boxShadow = 'inset 0 2px 0 var(--accent)';
+                    }
+                });
+                el.addEventListener('dragleave', (e) => {
+                    el.style.boxShadow = '';
+                });
                 el.addEventListener('dragover', (e) => {
                     e.preventDefault();
                     e.dataTransfer.dropEffect = 'move';
                 });
                 el.addEventListener('drop', async (e) => {
                     e.preventDefault();
+                    el.style.boxShadow = '';
                     if (!draggedConnId || draggedConnId === c.id) return;
                     
                     const ids = connectionsCache.map(conn => conn.id);
@@ -109,10 +120,10 @@ async function loadConnections() {
                         
                         try {
                             await ReorderConnections(ids);
-                            await loadConnections();
                         } catch (err) {
                             console.error("Failed to reorder connections:", err);
                         }
+                        await loadConnections();
                     }
                 });
 

frontend/src/style.css

@@ -57,6 +57,14 @@ body {
     transition: background 0.2s;
 }
 
+.conn-item * {
+    pointer-events: none;
+}
+
+.conn-item .edit-btn {
+    pointer-events: auto;
+}
+
 .conn-item:hover {
     background: var(--surface-hover);
 }

frontend/wailsjs/go/main/App.d.ts

@@ -11,6 +11,8 @@ export function Delete(arg1:string,arg2:string):Promise<void>;
 
 export function DeleteConnection(arg1:string):Promise<void>;
 
+export function DisconnectConnection(arg1:string):Promise<void>;
+
 export function GetConnections():Promise<Array<config.ConnectionConfig>>;
 
 export function GetTransfers():Promise<Array<transfer.Transfer>>;

frontend/wailsjs/go/main/App.js

@@ -14,6 +14,10 @@ export function DeleteConnection(arg1) {
   return window['go']['main']['App']['DeleteConnection'](arg1);
 }
 
+export function DisconnectConnection(arg1) {
+  return window['go']['main']['App']['DisconnectConnection'](arg1);
+}
+
 export function GetConnections() {
   return window['go']['main']['App']['GetConnections']();
 }

go.mod

@@ -9,12 +9,14 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3
 	github.com/google/uuid v1.6.0
 	github.com/hirochachacha/go-smb2 v1.1.0
+	github.com/jlaffaye/ftp v0.2.1
 	github.com/pkg/sftp v1.13.10
 	github.com/studio-b12/gowebdav v0.12.0
 	github.com/vmware/go-nfs-client v0.0.0-20190605212624-d43b92724c1b
 	github.com/wailsapp/wails/v2 v2.12.0
 	github.com/zalando/go-keyring v0.2.8
 	golang.org/x/crypto v0.53.0
+	golang.org/x/time v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -41,7 +43,6 @@ require (
 	github.com/godbus/dbus/v5 v5.2.2 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
-	github.com/jlaffaye/ftp v0.2.1 // indirect
 	github.com/kr/fs v0.1.0 // indirect
 	github.com/labstack/echo/v4 v4.13.3 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
@@ -64,7 +65,6 @@ require (
 	golang.org/x/net v0.55.0 // indirect
 	golang.org/x/sys v0.46.0 // indirect
 	golang.org/x/text v0.38.0 // indirect
-	golang.org/x/time v0.15.0 // indirect
 )
 
 // replace github.com/wailsapp/wails/v2 v2.12.0 => /home/jamie/go/pkg/mod

internal/protocols/sftp/sftp.go

@@ -9,10 +9,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/sftp"
-	"golang.org/x/crypto/ssh"
 	"goexplore/internal/config"
 	"goexplore/internal/explorer"
+
+	"github.com/pkg/sftp"
+	"golang.org/x/crypto/ssh"
 )
 
 type SFTPExplorer struct {
@@ -32,7 +33,7 @@ func (e *SFTPExplorer) Connect() error {
 		port = 22
 	}
 
-	var authMethod ssh.AuthMethod
+	var authMethods []ssh.AuthMethod
 
 	secretStr := strings.TrimSpace(e.secret)
 	// Handle case where newlines might be escaped by mistake
@@ -43,16 +44,35 @@ func (e *SFTPExplorer) Connect() error {
 		if err != nil {
 			return fmt.Errorf("failed to parse private key: %w", err)
 		}
-		authMethod = ssh.PublicKeys(signer)
+		authMethods = append(authMethods, ssh.PublicKeys(signer))
 	} else {
-		authMethod = ssh.Password(e.secret)
+		authMethods = append(authMethods, ssh.Password(e.secret))
 	}
 
+	// Always add KeyboardInteractive to support Duo MFA and servers that require interactive auth.
+	authMethods = append(authMethods, ssh.KeyboardInteractive(func(user, instruction string, questions []string, echos []bool) (answers []string, err error) {
+		answers = make([]string, len(questions))
+		for i, q := range questions {
+			qLower := strings.ToLower(q)
+			if strings.Contains(secretStr, "-----BEGIN") {
+				// If using a private key, we don't have a password.
+				// If it's a Duo prompt asking for an option, "1" is typically Duo Push.
+				if strings.Contains(qLower, "duo push") || strings.Contains(qLower, "passcode or option") {
+					answers[i] = "1"
+				} else {
+					answers[i] = ""
+				}
+			} else {
+				// Otherwise, respond with the password to keyboard interactive prompts
+				answers[i] = e.secret
+			}
+		}
+		return answers, nil
+	}))
+
 	config := &ssh.ClientConfig{
 		User:            e.cfg.Username,
-		Auth: []ssh.AuthMethod{
+		Auth:            authMethods,
-			authMethod,
-		},
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
 
@@ -83,9 +103,17 @@ func (e *SFTPExplorer) Disconnect() error {
 
 func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
 	if path == "" {
-		path = "."
+		if e.cfg.Bucket != "" {
+			path = e.cfg.Bucket
+		} else {
+			path = "/"
 		}
+	} else if path == "." {
+		path = "/"
+	}
+
 	files, err := e.client.ReadDir(path)
+
 	if err != nil {
 		return nil, err
 	}

main.go

@@ -27,6 +27,12 @@ func installLinux() {
 		return
 	}
 
+	for _, arg := range os.Args {
+		if arg == "--debug" {
+			return
+		}
+	}
+
 	exe, err := os.Executable()
 	if err != nil {
 		return