Compare commits
12 Commits
v1.1.1
...
7370a4e039
| Author | SHA1 | Date | |
|---|---|---|---|
| 7370a4e039 | |||
| e47d4103ae | |||
| 4520739c3a | |||
| ddac7ea41a | |||
| 75a4e6278c | |||
| 218280caa2 | |||
| 06a919cfd5 | |||
| 5f7c977f77 | |||
| 91d28b844d | |||
| 2566f356b2 | |||
| 24331ac3d4 | |||
| 6fd7fc0300 |
@@ -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
|
||||||
@@ -16,6 +16,7 @@ import (
|
|||||||
"goexplore/internal/transfer"
|
"goexplore/internal/transfer"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
@@ -25,6 +26,8 @@ type App struct {
|
|||||||
ctx context.Context
|
ctx context.Context
|
||||||
cfg *config.Config
|
cfg *config.Config
|
||||||
transferManager *transfer.Manager
|
transferManager *transfer.Manager
|
||||||
|
explorers map[string]explorer.Explorer
|
||||||
|
explorersMu sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewApp() *App {
|
func NewApp() *App {
|
||||||
@@ -38,6 +41,7 @@ func NewApp() *App {
|
|||||||
return &App{
|
return &App{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
transferManager: transfer.NewManager(3),
|
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)
|
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) {
|
func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
|
||||||
if id == "local" {
|
if id == "local" {
|
||||||
return local.New(), nil
|
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) {
|
func (a *App) ListDir(connId, path string) ([]explorer.FileEntry, error) {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.ListDir(path)
|
return exp.ListDir(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) MkDir(connId, path string) error {
|
func (a *App) MkDir(connId, path string) error {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.MkDir(path)
|
return exp.MkDir(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) Delete(connId, path string) error {
|
func (a *App) Delete(connId, path string) error {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.Delete(path)
|
return exp.Delete(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -225,14 +252,10 @@ func (a *App) ClearTransfers() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) Rename(connId, src, dst string) error {
|
func (a *App) Rename(connId, src, dst string) error {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.Rename(src, dst)
|
return exp.Rename(src, dst)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+37
-7
@@ -85,18 +85,29 @@ async function loadConnections() {
|
|||||||
el.addEventListener('dragstart', (e) => {
|
el.addEventListener('dragstart', (e) => {
|
||||||
draggedConnId = c.id;
|
draggedConnId = c.id;
|
||||||
e.dataTransfer.effectAllowed = 'move';
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
|
e.dataTransfer.setData('text/plain', c.id);
|
||||||
el.style.opacity = '0.5';
|
el.style.opacity = '0.5';
|
||||||
});
|
});
|
||||||
el.addEventListener('dragend', () => {
|
el.addEventListener('dragend', () => {
|
||||||
draggedConnId = null;
|
draggedConnId = null;
|
||||||
el.style.opacity = '1';
|
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) => {
|
el.addEventListener('dragover', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.dataTransfer.dropEffect = 'move';
|
e.dataTransfer.dropEffect = 'move';
|
||||||
});
|
});
|
||||||
el.addEventListener('drop', async (e) => {
|
el.addEventListener('drop', async (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
el.style.boxShadow = '';
|
||||||
if (!draggedConnId || draggedConnId === c.id) return;
|
if (!draggedConnId || draggedConnId === c.id) return;
|
||||||
|
|
||||||
const ids = connectionsCache.map(conn => conn.id);
|
const ids = connectionsCache.map(conn => conn.id);
|
||||||
@@ -109,10 +120,10 @@ async function loadConnections() {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await ReorderConnections(ids);
|
await ReorderConnections(ids);
|
||||||
await loadConnections();
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Failed to reorder connections:", err);
|
console.error("Failed to reorder connections:", err);
|
||||||
}
|
}
|
||||||
|
await loadConnections();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -562,9 +573,10 @@ window.handleContextMenu = async (action) => {
|
|||||||
const item = selectedItems[0];
|
const item = selectedItems[0];
|
||||||
const newName = prompt(`Enter new name for ${item.name}:`, item.name);
|
const newName = prompt(`Enter new name for ${item.name}:`, item.name);
|
||||||
if (newName && newName !== 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;
|
pathParts[pathParts.length - 1] = newName;
|
||||||
const newPath = pathParts.join('/');
|
const newPath = pathParts.join(sep);
|
||||||
|
|
||||||
await Rename(currentConn, item.path, newPath);
|
await Rename(currentConn, item.path, newPath);
|
||||||
refreshCurrentDir();
|
refreshCurrentDir();
|
||||||
@@ -584,9 +596,18 @@ window.handleContextMenu = async (action) => {
|
|||||||
|
|
||||||
window.navigateUp = () => {
|
window.navigateUp = () => {
|
||||||
if (!currentPath || currentPath === '/') return;
|
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();
|
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);
|
loadDirectory(currentConn, currentPath);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -630,9 +651,18 @@ window.loadTransferDestDirectory = async (connId, path) => {
|
|||||||
tr.innerHTML = `<td>📁 ..</td>`;
|
tr.innerHTML = `<td>📁 ..</td>`;
|
||||||
tr.style.cursor = 'pointer';
|
tr.style.cursor = 'pointer';
|
||||||
tr.ondblclick = () => {
|
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();
|
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);
|
tbody.appendChild(tr);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,6 +57,14 @@ body {
|
|||||||
transition: background 0.2s;
|
transition: background 0.2s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.conn-item * {
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conn-item .edit-btn {
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.conn-item:hover {
|
.conn-item:hover {
|
||||||
background: var(--surface-hover);
|
background: var(--surface-hover);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+2
@@ -11,6 +11,8 @@ export function Delete(arg1:string,arg2:string):Promise<void>;
|
|||||||
|
|
||||||
export function DeleteConnection(arg1: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 GetConnections():Promise<Array<config.ConnectionConfig>>;
|
||||||
|
|
||||||
export function GetTransfers():Promise<Array<transfer.Transfer>>;
|
export function GetTransfers():Promise<Array<transfer.Transfer>>;
|
||||||
|
|||||||
@@ -14,6 +14,10 @@ export function DeleteConnection(arg1) {
|
|||||||
return window['go']['main']['App']['DeleteConnection'](arg1);
|
return window['go']['main']['App']['DeleteConnection'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function DisconnectConnection(arg1) {
|
||||||
|
return window['go']['main']['App']['DisconnectConnection'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function GetConnections() {
|
export function GetConnections() {
|
||||||
return window['go']['main']['App']['GetConnections']();
|
return window['go']['main']['App']['GetConnections']();
|
||||||
}
|
}
|
||||||
|
|||||||
Executable → Regular
Executable → Regular
@@ -4,17 +4,19 @@ go 1.26
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/aws/aws-sdk-go-v2 v1.42.0
|
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/config v1.32.25
|
||||||
github.com/aws/aws-sdk-go-v2/credentials v1.19.23
|
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/aws/aws-sdk-go-v2/service/s3 v1.103.3
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/hirochachacha/go-smb2 v1.1.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/pkg/sftp v1.13.10
|
||||||
github.com/studio-b12/gowebdav v0.12.0
|
github.com/studio-b12/gowebdav v0.12.0
|
||||||
github.com/vmware/go-nfs-client v0.0.0-20190605212624-d43b92724c1b
|
github.com/vmware/go-nfs-client v0.0.0-20190605212624-d43b92724c1b
|
||||||
github.com/wailsapp/wails/v2 v2.12.0
|
github.com/wailsapp/wails/v2 v2.12.0
|
||||||
github.com/zalando/go-keyring v0.2.8
|
github.com/zalando/go-keyring v0.2.8
|
||||||
golang.org/x/crypto v0.53.0
|
golang.org/x/crypto v0.53.0
|
||||||
|
golang.org/x/time v0.15.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -22,6 +24,7 @@ require (
|
|||||||
git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 // indirect
|
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/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/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/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/endpoints/v2 v2.7.29 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 // 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/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/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/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/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/ssooidc v1.36.6 // indirect
|
||||||
github.com/aws/aws-sdk-go-v2/service/sts v1.43.3 // 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/godbus/dbus/v5 v5.2.2 // indirect
|
||||||
github.com/gorilla/websocket v1.5.3 // indirect
|
github.com/gorilla/websocket v1.5.3 // indirect
|
||||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // 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/kr/fs v0.1.0 // indirect
|
||||||
github.com/labstack/echo/v4 v4.13.3 // indirect
|
github.com/labstack/echo/v4 v4.13.3 // indirect
|
||||||
github.com/labstack/gommon v0.4.2 // 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/net v0.55.0 // indirect
|
||||||
golang.org/x/sys v0.46.0 // indirect
|
golang.org/x/sys v0.46.0 // indirect
|
||||||
golang.org/x/text v0.38.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
|
// replace github.com/wailsapp/wails/v2 v2.12.0 => /home/jamie/go/pkg/mod
|
||||||
|
|||||||
@@ -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/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 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.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 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.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 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/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 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/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=
|
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/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 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.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 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/sso v1.31.3/go.mod h1:Lk7PlmoTYryQmyBG0EXqj5BcUbj3whXdU2s3yGI3EAc=
|
||||||
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 h1:yLr03zQE/5Eu5l3QU0Si+xMbLMbSDF2YXsigqXngs6g=
|
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 h1:yLr03zQE/5Eu5l3QU0Si+xMbLMbSDF2YXsigqXngs6g=
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ import (
|
|||||||
"github.com/aws/aws-sdk-go-v2/aws"
|
"github.com/aws/aws-sdk-go-v2/aws"
|
||||||
"github.com/aws/aws-sdk-go-v2/config"
|
"github.com/aws/aws-sdk-go-v2/config"
|
||||||
"github.com/aws/aws-sdk-go-v2/credentials"
|
"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"
|
||||||
|
"github.com/aws/aws-sdk-go-v2/service/s3/types"
|
||||||
appcfg "goexplore/internal/config"
|
appcfg "goexplore/internal/config"
|
||||||
"goexplore/internal/explorer"
|
"goexplore/internal/explorer"
|
||||||
)
|
)
|
||||||
@@ -56,6 +58,8 @@ func (e *S3Explorer) Connect() error {
|
|||||||
o.BaseEndpoint = aws.String(host)
|
o.BaseEndpoint = aws.String(host)
|
||||||
}
|
}
|
||||||
o.UsePathStyle = e.cfg.PathStyle
|
o.UsePathStyle = e.cfg.PathStyle
|
||||||
|
o.RequestChecksumCalculation = aws.RequestChecksumCalculationWhenRequired
|
||||||
|
o.ResponseChecksumValidation = aws.ResponseChecksumValidationWhenRequired
|
||||||
}
|
}
|
||||||
|
|
||||||
e.client = s3.NewFromConfig(awsCfg, clientOpts)
|
e.client = s3.NewFromConfig(awsCfg, clientOpts)
|
||||||
@@ -243,11 +247,61 @@ func (e *S3Explorer) Delete(path string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Try to delete the exact object (might be a file or a folder marker)
|
||||||
_, err = e.client.DeleteObject(context.TODO(), &s3.DeleteObjectInput{
|
_, err = e.client.DeleteObject(context.TODO(), &s3.DeleteObjectInput{
|
||||||
Bucket: aws.String(bucket),
|
Bucket: aws.String(bucket),
|
||||||
Key: aws.String(subpath),
|
Key: aws.String(subpath),
|
||||||
})
|
})
|
||||||
return err
|
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 {
|
func (e *S3Explorer) Rename(src, dst string) error {
|
||||||
@@ -300,7 +354,9 @@ func (e *S3Explorer) WriteFile(path string, r io.Reader, size int64) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
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),
|
Bucket: aws.String(bucket),
|
||||||
Key: aws.String(subpath),
|
Key: aws.String(subpath),
|
||||||
Body: r,
|
Body: r,
|
||||||
|
|||||||
@@ -9,10 +9,11 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/pkg/sftp"
|
|
||||||
"golang.org/x/crypto/ssh"
|
|
||||||
"goexplore/internal/config"
|
"goexplore/internal/config"
|
||||||
"goexplore/internal/explorer"
|
"goexplore/internal/explorer"
|
||||||
|
|
||||||
|
"github.com/pkg/sftp"
|
||||||
|
"golang.org/x/crypto/ssh"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SFTPExplorer struct {
|
type SFTPExplorer struct {
|
||||||
@@ -32,7 +33,7 @@ func (e *SFTPExplorer) Connect() error {
|
|||||||
port = 22
|
port = 22
|
||||||
}
|
}
|
||||||
|
|
||||||
var authMethod ssh.AuthMethod
|
var authMethods []ssh.AuthMethod
|
||||||
|
|
||||||
secretStr := strings.TrimSpace(e.secret)
|
secretStr := strings.TrimSpace(e.secret)
|
||||||
// Handle case where newlines might be escaped by mistake
|
// Handle case where newlines might be escaped by mistake
|
||||||
@@ -43,16 +44,35 @@ func (e *SFTPExplorer) Connect() error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to parse private key: %w", err)
|
return fmt.Errorf("failed to parse private key: %w", err)
|
||||||
}
|
}
|
||||||
authMethod = ssh.PublicKeys(signer)
|
authMethods = append(authMethods, ssh.PublicKeys(signer))
|
||||||
} else {
|
} 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{
|
config := &ssh.ClientConfig{
|
||||||
User: e.cfg.Username,
|
User: e.cfg.Username,
|
||||||
Auth: []ssh.AuthMethod{
|
Auth: authMethods,
|
||||||
authMethod,
|
|
||||||
},
|
|
||||||
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
|
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,9 +103,17 @@ func (e *SFTPExplorer) Disconnect() error {
|
|||||||
|
|
||||||
func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
|
func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
|
||||||
if path == "" {
|
if path == "" {
|
||||||
path = "."
|
if e.cfg.Bucket != "" {
|
||||||
|
path = e.cfg.Bucket
|
||||||
|
} else {
|
||||||
|
path = "/"
|
||||||
|
}
|
||||||
|
} else if path == "." {
|
||||||
|
path = "/"
|
||||||
}
|
}
|
||||||
|
|
||||||
files, err := e.client.ReadDir(path)
|
files, err := e.client.ReadDir(path)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user