Merge pull request 'fix: improve private key parsing by handling escaped newlines and whitespace in credentials' (#3) from v1.1.1 into main

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

app.go

@@ -95,6 +95,34 @@ func (a *App) DeleteConnection(id string) error {
 	return config.SaveConfig(a.cfg)
 }
 
+func (a *App) ReorderConnections(ids []string) error {
+	var newConns []config.ConnectionConfig
+	connMap := make(map[string]config.ConnectionConfig)
+	for _, c := range a.cfg.Connections {
+		connMap[c.ID] = c
+	}
+
+	for _, id := range ids {
+		if c, ok := connMap[id]; ok {
+			newConns = append(newConns, c)
+		}
+	}
+
+	// Add any connections that might have been missed
+	added := make(map[string]bool)
+	for _, c := range newConns {
+		added[c.ID] = true
+	}
+	for _, c := range a.cfg.Connections {
+		if !added[c.ID] {
+			newConns = append(newConns, c)
+		}
+	}
+
+	a.cfg.Connections = newConns
+	return config.SaveConfig(a.cfg)
+}
+
 func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
 	if id == "local" {
 		return local.New(), nil

frontend/index.html

@@ -95,7 +95,7 @@
                         <label>Host</label>
                         <input type="text" id="conn-host" placeholder="example.com">
                     </div>
-                    <div class="form-group" style="flex: 1;">
+                    <div class="form-group" style="flex: 1;" id="port-group">
                         <label>Port</label>
                         <input type="number" id="conn-port" placeholder="22">
                     </div>
@@ -104,7 +104,7 @@
                 <div id="bucket-fields" style="display: none;">
                     <div class="form-row">
                         <div class="form-group" style="flex: 1;">
-                            <label>Bucket / Share</label>
+                            <label id="bucket-label">Bucket / Share</label>
                             <input type="text" id="conn-bucket" placeholder="my-bucket-or-share">
                         </div>
                         <div class="form-group" style="flex: 1;" id="region-group">
@@ -123,7 +123,7 @@
                     <label style="margin: 0;">Use FTPS (Secure Explicit TLS)</label>
                 </div>
 
-                <div class="form-row">
+                <div class="form-row" id="auth-row">
                     <div class="form-group" style="flex: 1;">
                         <label>Username / Access Key</label>
                         <input type="text" id="conn-username" placeholder="user">

frontend/src/main.js

@@ -1,4 +1,4 @@
-import { GetVersion, ListDir, GetConnections, SaveConnection, DeleteConnection, Delete, Rename, PromptUploadFiles, PromptUploadDirectory, PromptDownload, TransferItems, GetTransfers, ClearTransfers } from '../wailsjs/go/main/App.js';
+import { GetVersion, ListDir, GetConnections, SaveConnection, DeleteConnection, Delete, Rename, PromptUploadFiles, PromptUploadDirectory, PromptDownload, TransferItems, GetTransfers, ClearTransfers, ReorderConnections } from '../wailsjs/go/main/App.js';
 
 let currentConn = 'local';
 let currentPath = '';
@@ -8,6 +8,7 @@ let lastSelectedPath = null;
 let showHiddenFiles = false;
 let sortField = 'name';
 let sortAsc = true;
+let draggedConnId = null;
 
 function uuidv4() {
     return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
@@ -79,6 +80,42 @@ async function loadConnections() {
                 el.className = `conn-item ${currentConn === c.id ? 'active' : ''}`;
                 el.innerHTML = `<span class="badge">${c.protocol}</span> <span style="flex:1">${c.name}</span> <svg class="edit-btn" viewBox="0 0 24 24" width="16" height="16" fill="var(--accent)" style="cursor: pointer;" onclick="event.stopPropagation(); editConnection('${c.id}')"><path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.06-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.73,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.06,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.43-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.49-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"/></svg>`;
                 el.onclick = () => switchConn(c.id);
+                
+                el.draggable = true;
+                el.addEventListener('dragstart', (e) => {
+                    draggedConnId = c.id;
+                    e.dataTransfer.effectAllowed = 'move';
+                    el.style.opacity = '0.5';
+                });
+                el.addEventListener('dragend', () => {
+                    draggedConnId = null;
+                    el.style.opacity = '1';
+                });
+                el.addEventListener('dragover', (e) => {
+                    e.preventDefault();
+                    e.dataTransfer.dropEffect = 'move';
+                });
+                el.addEventListener('drop', async (e) => {
+                    e.preventDefault();
+                    if (!draggedConnId || draggedConnId === c.id) return;
+                    
+                    const ids = connectionsCache.map(conn => conn.id);
+                    const draggedIdx = ids.indexOf(draggedConnId);
+                    const targetIdx = ids.indexOf(c.id);
+                    
+                    if (draggedIdx !== -1 && targetIdx !== -1) {
+                        ids.splice(draggedIdx, 1);
+                        ids.splice(targetIdx, 0, draggedConnId);
+                        
+                        try {
+                            await ReorderConnections(ids);
+                            await loadConnections();
+                        } catch (err) {
+                            console.error("Failed to reorder connections:", err);
+                        }
+                    }
+                });
+
                 list.appendChild(el);
             });
         }
@@ -137,9 +174,27 @@ window.closeConnModal = () => {
 window.updateProtocolFields = () => {
     const protocol = document.getElementById('conn-protocol').value;
 
-    const showBucket = protocol === 's3' || protocol === 'smb';
+    const showBucket = protocol === 's3' || protocol === 'smb' || protocol === 'nfs';
     document.getElementById('bucket-fields').style.display = showBucket ? 'block' : 'none';
 
+    const bucketLabel = document.getElementById('bucket-label');
+    if (bucketLabel) {
+        if (protocol === 'nfs') {
+            bucketLabel.innerText = 'Export Path';
+        } else if (protocol === 'smb') {
+            bucketLabel.innerText = 'Share';
+        } else {
+            bucketLabel.innerText = 'Bucket';
+        }
+    }
+
+    const isNFS = protocol === 'nfs';
+    const portGroup = document.getElementById('port-group');
+    if (portGroup) portGroup.style.display = isNFS ? 'none' : 'block';
+    
+    const authRow = document.getElementById('auth-row');
+    if (authRow) authRow.style.display = isNFS ? 'none' : 'flex';
+
     // Only show S3 specific fields when S3 is selected
     const showS3Specific = protocol === 's3';
     document.getElementById('region-group').style.display = showS3Specific ? 'flex' : 'none';
@@ -427,8 +482,19 @@ document.addEventListener('contextmenu', (e) => {
         document.getElementById('ctx-divider').style.display = 'block';
 
         menu.style.display = 'block';
-        menu.style.left = `${e.pageX}px`;
+        
-        menu.style.top = `${e.pageY}px`;
+        let left = e.pageX;
+        let top = e.pageY;
+        
+        if (left + menu.offsetWidth > window.innerWidth) {
+            left = window.innerWidth - menu.offsetWidth;
+        }
+        if (top + menu.offsetHeight > window.innerHeight) {
+            top = window.innerHeight - menu.offsetHeight;
+        }
+        
+        menu.style.left = `${left}px`;
+        menu.style.top = `${top}px`;
     } else if (isBrowserPane && !e.target.closest('#transfer-dest-list')) {
         e.preventDefault();
 
@@ -439,8 +505,19 @@ document.addEventListener('contextmenu', (e) => {
         document.getElementById('ctx-divider').style.display = 'none';
 
         menu.style.display = 'block';
-        menu.style.left = `${e.pageX}px`;
+        
-        menu.style.top = `${e.pageY}px`;
+        let left = e.pageX;
+        let top = e.pageY;
+        
+        if (left + menu.offsetWidth > window.innerWidth) {
+            left = window.innerWidth - menu.offsetWidth;
+        }
+        if (top + menu.offsetHeight > window.innerHeight) {
+            top = window.innerHeight - menu.offsetHeight;
+        }
+        
+        menu.style.left = `${left}px`;
+        menu.style.top = `${top}px`;
     }
 });
 

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

@@ -27,10 +27,12 @@ export function PromptUploadDirectory(arg1:string,arg2:string):Promise<void>;
 
 export function PromptUploadFiles(arg1:string,arg2:string):Promise<void>;
 
-export function QueueTransfer(arg1:string,arg2:string,arg3:string,arg4:string,arg5:string,arg6:string,arg7:number):Promise<void>;
+export function QueueTransfer(arg1:string,arg2:string,arg3:string,arg4:string,arg5:string,arg6:string,arg7:number,arg8:boolean,arg9:number):Promise<void>;
 
 export function Rename(arg1:string,arg2:string,arg3:string):Promise<void>;
 
+export function ReorderConnections(arg1:Array<string>):Promise<void>;
+
 export function SaveConnection(arg1:config.ConnectionConfig,arg2:string):Promise<void>;
 
-export function TransferItems(arg1:string,arg2:string,arg3:string,arg4:Array<main.TransferItem>):Promise<void>;
+export function TransferItems(arg1:string,arg2:string,arg3:string,arg4:Array<main.TransferItem>,arg5:boolean,arg6:number):Promise<void>;

frontend/wailsjs/go/main/App.js

@@ -46,18 +46,22 @@ export function PromptUploadFiles(arg1, arg2) {
   return window['go']['main']['App']['PromptUploadFiles'](arg1, arg2);
 }
 
-export function QueueTransfer(arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
+export function QueueTransfer(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
-  return window['go']['main']['App']['QueueTransfer'](arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+  return window['go']['main']['App']['QueueTransfer'](arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 }
 
 export function Rename(arg1, arg2, arg3) {
   return window['go']['main']['App']['Rename'](arg1, arg2, arg3);
 }
 
+export function ReorderConnections(arg1) {
+  return window['go']['main']['App']['ReorderConnections'](arg1);
+}
+
 export function SaveConnection(arg1, arg2) {
   return window['go']['main']['App']['SaveConnection'](arg1, arg2);
 }
 
-export function TransferItems(arg1, arg2, arg3, arg4) {
+export function TransferItems(arg1, arg2, arg3, arg4, arg5, arg6) {
-  return window['go']['main']['App']['TransferItems'](arg1, arg2, arg3, arg4);
+  return window['go']['main']['App']['TransferItems'](arg1, arg2, arg3, arg4, arg5, arg6);
 }

frontend/wailsjs/go/models.ts

@@ -9,6 +9,7 @@ export namespace config {
 	    bucket?: string;
 	    region?: string;
 	    path_style?: boolean;
+	    secure?: boolean;
 	    username?: string;
 	    keychain_key?: string;
 	
@@ -26,6 +27,7 @@ export namespace config {
 	        this.bucket = source["bucket"];
 	        this.region = source["region"];
 	        this.path_style = source["path_style"];
+	        this.secure = source["secure"];
 	        this.username = source["username"];
 	        this.keychain_key = source["keychain_key"];
 	    }
@@ -96,6 +98,8 @@ export namespace transfer {
 	    eta_seconds: number;
 	    status: string;
 	    error?: string;
+	    verify: boolean;
+	    limit_mbps: number;
 	
 	    static createFrom(source: any = {}) {
 	        return new Transfer(source);
@@ -113,6 +117,8 @@ export namespace transfer {
 	        this.eta_seconds = source["eta_seconds"];
 	        this.status = source["status"];
 	        this.error = source["error"];
+	        this.verify = source["verify"];
+	        this.limit_mbps = source["limit_mbps"];
 	    }
 	}
 

internal/protocols/sftp/sftp.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/pkg/sftp"
@@ -32,8 +33,16 @@ func (e *SFTPExplorer) Connect() error {
 	}
 	
 	var authMethod ssh.AuthMethod
-	signer, err := ssh.ParsePrivateKey([]byte(e.secret))
+	
-	if err == nil {
+	secretStr := strings.TrimSpace(e.secret)
+	// Handle case where newlines might be escaped by mistake
+	secretStr = strings.ReplaceAll(secretStr, "\\n", "\n")
+
+	if strings.Contains(secretStr, "-----BEGIN") {
+		signer, err := ssh.ParsePrivateKey([]byte(secretStr))
+		if err != nil {
+			return fmt.Errorf("failed to parse private key: %w", err)
+		}
 		authMethod = ssh.PublicKeys(signer)
 	} else {
 		authMethod = ssh.Password(e.secret)