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

#109 fix: path sep on win

Browse Source
This commit is contained in:
lollipopkit
2023-08-07 17:41:35 +08:00
parent c4925ee2c7
commit 20c859b0a1
6 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/view/page/private_key/list.dart
View File

@@ -9,7 +9,6 @@ import 'package:toolbox/data/store/private_key.dart';
import 'package:toolbox/locator.dart';
import '../../../core/route.dart';
import '../../../core/utils/misc.dart';
import '../../../core/utils/platform.dart';
import '../../../data/model/server/private_key_info.dart';
import '../../../data/provider/private_key.dart';

33
lib/view/page/server/tab.dart
View File

@@ -1,4 +1,4 @@
import 'dart:io' show File, Platform, Process;
import 'dart:io' show Directory, File, Platform, Process;
import 'package:after_layout/after_layout.dart';
import 'package:circle_chart/circle_chart.dart';
@@ -8,7 +8,6 @@ import 'package:get_it/get_it.dart';
import 'package:nil/nil.dart';
import 'package:provider/provider.dart';
import 'package:toolbox/core/extension/order.dart';
import 'package:toolbox/core/utils/misc.dart';
import 'package:toolbox/data/model/app/net_view.dart';
import 'package:toolbox/data/model/server/snippet.dart';
import 'package:toolbox/data/provider/snippet.dart';
@@ -17,6 +16,7 @@ import 'package:toolbox/view/widget/tag/picker.dart';
import 'package:toolbox/view/widget/tag/switcher.dart';
import '../../../core/route.dart';
import '../../../core/utils/misc.dart' hide pathJoin;
import '../../../core/utils/platform.dart';
import '../../../core/utils/server.dart';
import '../../../core/utils/ui.dart';
@@ -453,17 +453,24 @@ class _ServerPageState extends State<ServerPage>
AppRoute(SSHPage(spi: spi), 'ssh page').go(context);
return;
}
List<String> extarArgs = [];
final path = "/tmp/.serverbox_pk_${spi.pubKeyId}";
final file = File(path);
if (spi.pubKeyId != null) {
await file.delete();
await file.writeAsString(getPrivateKey(spi.pubKeyId!));
extarArgs += ["-i", path];
final extraArgs = <String>[];
if (spi.port != 22) {
extraArgs.addAll(['-p', '${spi.port}']);
}
List<String> sshCommand = ["ssh", "${spi.user}@${spi.ip}"] + extarArgs;
final path = () {
final tempKeyFileName = 'srvbox_pk_${spi.pubKeyId}';
return pathJoin(Directory.systemTemp.path, tempKeyFileName);
}();
final file = File(path);
final shouldGenKey = spi.pubKeyId != null;
if (shouldGenKey) {
await file.delete();
await file.writeAsString(getPrivateKey(spi.pubKeyId!));
extraArgs.addAll(["-i", path]);
}
List<String> sshCommand = ["ssh", "${spi.user}@${spi.ip}"] + extraArgs;
final system = Platform.operatingSystem;
switch (system) {
case "windows":
@@ -482,7 +489,9 @@ class _ServerPageState extends State<ServerPage>
showSnackBar(context, Text('Mismatch system: $system'));
}
// For security reason, delete the private key file after use
await file.delete();
if (shouldGenKey) {
await Future.delayed(const Duration(seconds: 2), file.delete);
}
}
@override