Merge pull request 'feat: implement S3 manager uploader and enable checksum validation for S3 operations' (#10) from v1.1.5 into main

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

.gitea/workflows/sonarqube.yml

@@ -0,0 +1,32 @@
+name: SonarQube
+
+on:
+  workflow_dispatch:
+
+jobs:
+  sonarqube:
+    name: SonarQube
+    runs-on: build-htz-01
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Create Valid Project Key
+        id: sonar_setup
+        run: |
+          CLEAN_KEY=$(echo "${{ gitea.repository }}" | tr '/' ':')
+          echo "key=$CLEAN_KEY" >> $GITHUB_OUTPUT
+
+      - name: SonarQube Scan
+        uses: sonarsource/sonarqube-scan-action@master
+        continue-on-error: true
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+        with:
+          args: >
+            -Dsonar.projectKey=${{ steps.sonar_setup.outputs.key }}
+            -Dsonar.projectName=${{ gitea.repository }}
+            -Dsonar.qualitygate.wait=true

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,6 +85,7 @@ 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', () => {
@@ -94,11 +95,11 @@ async function loadConnections() {
                 el.addEventListener('dragenter', (e) => {
                     e.preventDefault();
                     if (draggedConnId && draggedConnId !== c.id) {
-                        el.style.borderTop = '2px solid var(--accent)';
+                        el.style.boxShadow = 'inset 0 2px 0 var(--accent)';
                     }
                 });
                 el.addEventListener('dragleave', (e) => {
-                    el.style.borderTop = '';
+                    el.style.boxShadow = '';
                 });
                 el.addEventListener('dragover', (e) => {
                     e.preventDefault();
@@ -106,7 +107,7 @@ async function loadConnections() {
                 });
                 el.addEventListener('drop', async (e) => {
                     e.preventDefault();
-                    el.style.borderTop = '';
+                    el.style.boxShadow = '';
                     if (!draggedConnId || draggedConnId === c.id) return;
                     
                     const ids = connectionsCache.map(conn => conn.id);
@@ -572,9 +573,10 @@ window.handleContextMenu = async (action) => {
             const item = selectedItems[0];
             const newName = prompt(`Enter new name for ${item.name}:`, item.name);
             if (newName && newName !== item.name) {
-                const pathParts = item.path.split('/');
+                const sep = item.path.includes('\\') ? '\\' : '/';
+                const pathParts = item.path.split(/[/\\]/);
                 pathParts[pathParts.length - 1] = newName;
-                const newPath = pathParts.join('/');
+                const newPath = pathParts.join(sep);
 
                 await Rename(currentConn, item.path, newPath);
                 refreshCurrentDir();
@@ -594,9 +596,18 @@ window.handleContextMenu = async (action) => {
 
 window.navigateUp = () => {
     if (!currentPath || currentPath === '/') return;
-    const parts = currentPath.split('/').filter(p => p);
+    const startsWithSlash = currentPath.startsWith('/');
+    const sep = currentPath.includes('\\') ? '\\' : '/';
+    const parts = currentPath.split(/[/\\]/).filter(p => p);
     parts.pop();
-    currentPath = parts.length ? '/' + parts.join('/') : '';
+    if (parts.length === 0) {
+        currentPath = '';
+    } else {
+        currentPath = (startsWithSlash ? '/' : '') + parts.join(sep);
+        if (!startsWithSlash && parts.length === 1 && parts[0].endsWith(':')) {
+            currentPath += sep;
+        }
+    }
     loadDirectory(currentConn, currentPath);
 };
 
@@ -640,9 +651,18 @@ window.loadTransferDestDirectory = async (connId, path) => {
             tr.innerHTML = `<td>📁 ..</td>`;
             tr.style.cursor = 'pointer';
             tr.ondblclick = () => {
-                const parts = path.split('/').filter(p => p);
+                const startsWithSlash = path.startsWith('/');
+                const sep = path.includes('\\') ? '\\' : '/';
+                const parts = path.split(/[/\\]/).filter(p => p);
                 parts.pop();
-                loadTransferDestDirectory(connId, parts.length ? '/' + parts.join('/') : '');
+                let newPath = '';
+                if (parts.length > 0) {
+                    newPath = (startsWithSlash ? '/' : '') + parts.join(sep);
+                    if (!startsWithSlash && parts.length === 1 && parts[0].endsWith(':')) {
+                        newPath += sep;
+                    }
+                }
+                loadTransferDestDirectory(connId, newPath);
             };
             tbody.appendChild(tr);
         }

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

@@ -4,17 +4,19 @@ go 1.26
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.42.0
-	github.com/aws/aws-sdk-go-v2/config v1.32.24
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.23
+	github.com/aws/aws-sdk-go-v2/config v1.32.25
+	github.com/aws/aws-sdk-go-v2/credentials v1.19.24
 	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
 )
 
@@ -22,6 +24,7 @@ require (
 	git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.27 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 // indirect
@@ -29,7 +32,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.22 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.29 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.1.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/signin v1.2.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.43.3 // indirect
@@ -41,7 +44,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 +66,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

go.sum

@@ -6,10 +6,16 @@ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 h1:p1BBrg/Hhp6uK7z
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13/go.mod h1:8cIfkE9MDhkRZGpQ22aV6/lkYeYSozpz16Smrs5x4Ls=
 github.com/aws/aws-sdk-go-v2/config v1.32.24 h1:aEDEj533yGdVvEHfkCY0D/1FbDrjnZr4pIulxRjqpHs=
 github.com/aws/aws-sdk-go-v2/config v1.32.24/go.mod h1:yZtrGKJGlqfEW+/m2uTsJK+Jz7xF5R0eZfgcIG9m1ss=
+github.com/aws/aws-sdk-go-v2/config v1.32.25 h1:ACCejvStYoilgwrfegSt5ZntCbPrk52qfwyNcnl3omM=
+github.com/aws/aws-sdk-go-v2/config v1.32.25/go.mod h1:LJyU8sDRbXUxFn8xMJIGP+v9QYYwveNLI8a/giAOiAs=
 github.com/aws/aws-sdk-go-v2/credentials v1.19.23 h1:Zhu3GOpRCkNjtE/gJpuPDsytSnaCCTQk8neAGsgzG5Y=
 github.com/aws/aws-sdk-go-v2/credentials v1.19.23/go.mod h1:VsJF2ropPB37gDr7M2rLSpCE8IQWdpl62uae7qxZmqU=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.24 h1:2hQqYCV9yqyePQ9o6dCrZc/zO8U3TwPr9mIKlZnPu/I=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.24/go.mod h1:IDwpACtwqHLISdzfwUUNq4P9DsB/h5BLg4FwJPNfqFY=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 h1:r6qZHbT+wxgWO/e9vYNUEtg7lv5+UN3pRqKhLXvnArg=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29/go.mod h1:QRnaRcTVGKPGRy8w78HMQtKUGRYcnMZAANATkeVA6Mo=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.27 h1:gb+HtIZdwcIoLxv/xwGumQr1DmGmGGCQnjKKVVSMYsU=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.27/go.mod h1:2b/8jZl/qwUMBZpSAcxX+IdM3zj6RUyfnB2IdLt9I+I=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 h1:f3vKqSo13fhTYb+JEcXwXefZQE26I1FB5eTSniU67ko=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29/go.mod h1:MzoLFUArKGpGD+ukmPiTPG1X5x4o6M2kq4v2dr1FiEc=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 h1:RdwIf/CuUsvJX3RgJagbOyotl/cxoLY4xviKuE7p2GY=
@@ -28,6 +34,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3 h1:JRseEu/vIDMaWis4bSw0QbXL+cvI
 github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3/go.mod h1:77ZAgynvx1txMvDG8gGWoWkO1augYDxkp9JElWFgjQU=
 github.com/aws/aws-sdk-go-v2/service/signin v1.1.5 h1:6Xt6Ztjkwdia/7EtEaG7ki/qZUYlCcd7tGUotQed1QE=
 github.com/aws/aws-sdk-go-v2/service/signin v1.1.5/go.mod h1:LxYujSTLPRlp2vTtcUO/+1ilrew8ytt6SvQyOgejzFQ=
+github.com/aws/aws-sdk-go-v2/service/signin v1.2.0 h1:3nXpRcFwRCW8n7HgO2QGy0Dc20eQNfBuUemGQhpF8m8=
+github.com/aws/aws-sdk-go-v2/service/signin v1.2.0/go.mod h1:LxYujSTLPRlp2vTtcUO/+1ilrew8ytt6SvQyOgejzFQ=
 github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 h1:ey1XLTYXb9PcLt4535632o5kCGXNXEhNb620Dqwuylo=
 github.com/aws/aws-sdk-go-v2/service/sso v1.31.3/go.mod h1:Lk7PlmoTYryQmyBG0EXqj5BcUbj3whXdU2s3yGI3EAc=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 h1:yLr03zQE/5Eu5l3QU0Si+xMbLMbSDF2YXsigqXngs6g=

internal/protocols/s3/s3.go

@@ -11,7 +11,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	appcfg "goexplore/internal/config"
 	"goexplore/internal/explorer"
 )
@@ -56,6 +58,8 @@ func (e *S3Explorer) Connect() error {
 			o.BaseEndpoint = aws.String(host)
 		}
 		o.UsePathStyle = e.cfg.PathStyle
+		o.RequestChecksumCalculation = aws.RequestChecksumCalculationWhenRequired
+		o.ResponseChecksumValidation = aws.ResponseChecksumValidationWhenRequired
 	}
 
 	e.client = s3.NewFromConfig(awsCfg, clientOpts)
@@ -243,13 +247,63 @@ func (e *S3Explorer) Delete(path string) error {
 		return err
 	}
 	
+	// Try to delete the exact object (might be a file or a folder marker)
 	_, err = e.client.DeleteObject(context.TODO(), &s3.DeleteObjectInput{
 		Bucket: aws.String(bucket),
 		Key:    aws.String(subpath),
 	})
+	if err != nil {
+		// Ignore error; it might just be a prefix with no exact marker
+	}
+
+	// Also treat subpath as a folder prefix and delete all matching objects
+	prefix := subpath
+	if !strings.HasSuffix(prefix, "/") {
+		prefix += "/"
+	}
+
+	var continuationToken *string
+	for {
+		listInput := &s3.ListObjectsV2Input{
+			Bucket:            aws.String(bucket),
+			Prefix:            aws.String(prefix),
+			ContinuationToken: continuationToken,
+		}
+		listOutput, err := e.client.ListObjectsV2(context.TODO(), listInput)
+		if err != nil {
 			return err
 		}
 
+		if len(listOutput.Contents) > 0 {
+			var objectsToDelete []types.ObjectIdentifier
+			for _, obj := range listOutput.Contents {
+				objectsToDelete = append(objectsToDelete, types.ObjectIdentifier{
+					Key: obj.Key,
+				})
+			}
+
+			_, err = e.client.DeleteObjects(context.TODO(), &s3.DeleteObjectsInput{
+				Bucket: aws.String(bucket),
+				Delete: &types.Delete{
+					Objects: objectsToDelete,
+					Quiet:   aws.Bool(true),
+				},
+			})
+			if err != nil {
+				return err
+			}
+		}
+
+		if listOutput.IsTruncated != nil && *listOutput.IsTruncated {
+			continuationToken = listOutput.NextContinuationToken
+		} else {
+			break
+		}
+	}
+	
+	return nil
+}
+
 func (e *S3Explorer) Rename(src, dst string) error {
 	bucket1, subpath1, _, err := e.getBucketAndPath(src)
 	if err != nil {
@@ -300,7 +354,9 @@ func (e *S3Explorer) WriteFile(path string, r io.Reader, size int64) error {
 	if err != nil {
 		return err
 	}
-	_, err = e.client.PutObject(context.TODO(), &s3.PutObjectInput{
+	
+	uploader := manager.NewUploader(e.client)
+	_, err = uploader.Upload(context.TODO(), &s3.PutObjectInput{
 		Bucket: aws.String(bucket),
 		Key:    aws.String(subpath),
 		Body:   r,

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 {
@@ -102,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