flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-28 01:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

MigrateSshKeys: Reduce code duplication and do not delete the folder

Browse Source 
This migration seems to have gotten really fucked up and I think the ssh
keys are now lost. I'll have to issue a notice on how to fix it.
This commit is contained in:
Vishesh Handa
2020-11-16 16:08:49 +01:00
parent 014d790b17
commit 35483d07d8
1 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
lib/settings_migrations.dart
View File

@ -60,43 +60,7 @@ Future<void> migrateSettings(
}
// Save the ssh keys
var oldSshDir = Directory(p.join(gitBaseDir, '../files/ssh'));
if (oldSshDir.existsSync()) {
var sshPublicKeyPath = p.join(oldSshDir.path, "id_rsa.pub");
var sshPrivateKeyPath = p.join(oldSshDir.path, "id_rsa");
var publicKeyExists = File(sshPublicKeyPath).existsSync();
var privateKeyExists = File(sshPrivateKeyPath).existsSync();
if (publicKeyExists && privateKeyExists) {
var sshPublicKey = await File(sshPublicKeyPath).readAsString();
var sshPrivateKey = await File(sshPrivateKeyPath).readAsString();
await pref.setString("sshPublicKey", sshPublicKey);
await pref.setString("sshPrivateKey", sshPrivateKey);
await pref.setString("sshPassword", "");
}
await oldSshDir.delete(recursive: true);
}
var newSshDir = Directory(p.join(gitBaseDir, 'ssh'));
if (newSshDir.existsSync()) {
var sshPublicKeyPath = p.join(newSshDir.path, "id_rsa.pub");
var sshPrivateKeyPath = p.join(newSshDir.path, "id_rsa");
var publicKeyExists = File(sshPublicKeyPath).existsSync();
var privateKeyExists = File(sshPrivateKeyPath).existsSync();
if (publicKeyExists && privateKeyExists) {
var sshPublicKey = await File(sshPublicKeyPath).readAsString();
var sshPrivateKey = await File(sshPrivateKeyPath).readAsString();
await pref.setString("sshPublicKey", sshPublicKey);
await pref.setString("sshPrivateKey", sshPrivateKey);
await pref.setString("sshPassword", "");
}
await newSshDir.delete(recursive: true);
}
await migrateSshKeys(pref, gitBaseDir);
version = 1;
await pref.setInt("settingsVersion", version);
@ -176,3 +140,40 @@ Future<void> migrateSettings(
await pref.setInt(prefix + "settingsVersion", version);
}
}
Future<void> migrateSshKeys(
SharedPreferences pref,
String gitBaseDir, {
String prefix = "",
}) async {
// Save the ssh keys
var oldSshDir = Directory(p.join(gitBaseDir, '../files/ssh'));
if (oldSshDir.existsSync()) {
await migrateSshKeysFromDir(pref, oldSshDir, prefix: prefix);
}
var newSshDir = Directory(p.join(gitBaseDir, 'ssh'));
if (newSshDir.existsSync()) {
await migrateSshKeysFromDir(pref, newSshDir, prefix: prefix);
}
}
Future<void> migrateSshKeysFromDir(
SharedPreferences pref,
Directory dir, {
String prefix = "",
}) async {
var sshPublicKeyPath = p.join(dir.path, "id_rsa.pub");
var sshPrivateKeyPath = p.join(dir.path, "id_rsa");
var publicKeyExists = File(sshPublicKeyPath).existsSync();
var privateKeyExists = File(sshPrivateKeyPath).existsSync();
if (publicKeyExists && privateKeyExists) {
var sshPublicKey = await File(sshPublicKeyPath).readAsString();
var sshPrivateKey = await File(sshPrivateKeyPath).readAsString();
await pref.setString(prefix + "sshPublicKey", sshPublicKey);
await pref.setString(prefix + "sshPrivateKey", sshPrivateKey);
await pref.setString(prefix + "sshPassword", "");
}
}