aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-18 07:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: jump server (#190)

Browse Source
This commit is contained in:
lollipopkit
2023-10-30 17:10:29 +08:00
parent 4971239bfc
commit bff799afd9
9 changed files with 103 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/data/model/sftp/req.dart
View File

@@ -1,5 +1,8 @@
import 'dart:async';
import 'package:toolbox/data/res/logger.dart';
import 'package:toolbox/data/res/store.dart';
import '../../../core/utils/server.dart';
import '../server/server_private_info.dart';
import 'worker.dart';
@@ -10,6 +13,8 @@ class SftpReq {
final String localPath;
final SftpReqType type;
String? privateKey;
ServerPrivateInfo? jumpSpi;
String? jumpPrivateKey;
SftpReq(
this.spi,
@@ -17,8 +22,13 @@ class SftpReq {
this.localPath,
this.type,
) {
if (spi.pubKeyId != null) {
privateKey = getPrivateKey(spi.pubKeyId!);
final keyId = spi.keyId;
if (keyId != null) {
privateKey = getPrivateKey(keyId);
}
if (spi.jumpId != null) {
jumpSpi = Stores.server.box.get(spi.jumpId);
jumpPrivateKey = Stores.key.get(jumpSpi?.keyId)?.key;
}
}
}
@@ -83,7 +93,9 @@ class SftpReqStatus {
break;
default:
error = Exception('sftp worker event: $event');
Loggers.app.warning(error);
dispose();
break;
}
notifyListeners();
}

14
lib/data/model/sftp/worker.dart
View File

@@ -81,7 +81,12 @@ Future<void> _download(
try {
mainSendPort.send(SftpWorkerStatus.preparing);
final watch = Stopwatch()..start();
final client = await genClient(req.spi, privateKey: req.privateKey);
final client = await genClient(
req.spi,
privateKey: req.privateKey,
jumpSpi: req.jumpSpi,
jumpPrivateKey: req.jumpPrivateKey,
);
mainSendPort.send(SftpWorkerStatus.sshConnectted);
/// Create the directory if not exists
@@ -131,7 +136,12 @@ Future<void> _upload(
try {
mainSendPort.send(SftpWorkerStatus.preparing);
final watch = Stopwatch()..start();
final client = await genClient(req.spi, privateKey: req.privateKey);
final client = await genClient(
req.spi,
privateKey: req.privateKey,
jumpSpi: req.jumpSpi,
jumpPrivateKey: req.jumpPrivateKey,
);
mainSendPort.send(SftpWorkerStatus.sshConnectted);
final local = File(req.localPath);