diff options
author | pacien | 2020-01-20 19:18:12 +0100 |
---|---|---|
committer | pacien | 2020-01-20 19:18:12 +0100 |
commit | b04d9581adb3e3176586f31ffdba123125546201 (patch) | |
tree | 468776749a6596b299d7075ab998117a06c58813 /app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt | |
parent | 883b5abc7b2a770146683e7e27bf275bd4064511 (diff) | |
download | tincapp-b04d9581adb3e3176586f31ffdba123125546201.tar.gz |
use private temp files to pass decrypted private keys
Android 10 (API 29) doesn't allow us to pass them by sharing file
descriptors anymore, making the use of temp files mandatory.
GitHub: https://github.com/pacien/tincapp/issues/92
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt b/app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt index bae38ac..89bb246 100644 --- a/app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt +++ b/app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
3 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2020 Pacien TRAN-GIRARD |
4 | * | 4 | * |
5 | * This program is free software: you can redistribute it and/or modify | 5 | * This program is free software: you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -18,10 +18,11 @@ | |||
18 | 18 | ||
19 | package org.pacien.tincapp.utils | 19 | package org.pacien.tincapp.utils |
20 | 20 | ||
21 | import android.os.ParcelFileDescriptor | ||
22 | import org.pacien.tincapp.commands.TincApp | 21 | import org.pacien.tincapp.commands.TincApp |
22 | import org.pacien.tincapp.context.AppPaths | ||
23 | import java.io.File | 23 | import java.io.File |
24 | import java.io.FileNotFoundException | 24 | import java.io.FileNotFoundException |
25 | import java.io.FileWriter | ||
25 | 26 | ||
26 | /** | 27 | /** |
27 | * @author pacien | 28 | * @author pacien |
@@ -33,12 +34,25 @@ object TincKeyring { | |||
33 | false | 34 | false |
34 | } | 35 | } |
35 | 36 | ||
36 | fun openPrivateKey(f: File?, passphrase: String?): ParcelFileDescriptor? { | 37 | fun unlockKey(target: String, input: File?, passphrase: String?): File? { |
37 | if (f == null || !f.exists() || passphrase == null) return null | 38 | if (input == null || !input.exists() || passphrase == null) return null |
38 | val pipe = ParcelFileDescriptor.createPipe() | 39 | val decryptedKey = PemUtils.decrypt(PemUtils.read(input), passphrase) |
39 | val decryptedKey = PemUtils.decrypt(PemUtils.read(f), passphrase) | 40 | val decryptedFile = tempKey(target) |
40 | val outputStream = ParcelFileDescriptor.AutoCloseOutputStream(pipe[1]) | 41 | PemUtils.write(decryptedKey, FileWriter(decryptedFile, false)) |
41 | PemUtils.write(decryptedKey, outputStream.writer()) | 42 | return decryptedFile |
42 | return pipe[0] | 43 | } |
44 | |||
45 | private fun tempKey(name: String): File { | ||
46 | val file = File(AppPaths.internalCacheDir(), name) | ||
47 | file.createNewFile() | ||
48 | file.deleteOnExit() | ||
49 | file.makePrivate() | ||
50 | return file | ||
51 | } | ||
52 | |||
53 | private fun File.makePrivate() { | ||
54 | this.setExecutable(false, false) | ||
55 | this.setReadable(true, true) | ||
56 | this.setWritable(true, true) | ||
43 | } | 57 | } |
44 | } | 58 | } |