From b76aa7fe11f953d10688fbc01daa65676448c78a Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 11 Sep 2015 02:05:17 +0200 Subject: never import secret keys from keyserver (OKC-01-001) --- .../keychain/operations/ImportOperation.java | 11 +++++++++-- .../keychain/operations/results/OperationResult.java | 5 +++-- OpenKeychain/src/main/res/values-de/strings.xml | 2 +- OpenKeychain/src/main/res/values-es/strings.xml | 2 +- OpenKeychain/src/main/res/values-eu/strings.xml | 2 +- OpenKeychain/src/main/res/values-fr/strings.xml | 2 +- OpenKeychain/src/main/res/values-ja/strings.xml | 2 +- OpenKeychain/src/main/res/values-nl/strings.xml | 2 +- OpenKeychain/src/main/res/values-sr/strings.xml | 2 +- OpenKeychain/src/main/res/values/strings.xml | 3 ++- 10 files changed, 21 insertions(+), 12 deletions(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java index 29264b5a2..89575338f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java @@ -211,7 +211,7 @@ public class ImportOperation extends BaseOperation { } } catch (Keyserver.QueryFailedException e) { Log.d(Constants.TAG, "query failed", e); - log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER_ERROR, 3, e.getMessage()); + log.add(LogType.MSG_IMPORT_FETCH_ERROR_KEYSERVER, 3, e.getMessage()); } } @@ -243,7 +243,7 @@ public class ImportOperation extends BaseOperation { } catch (Keyserver.QueryFailedException e) { // download failed, too bad. just proceed Log.e(Constants.TAG, "query failed", e); - log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER_ERROR, 3, e.getMessage()); + log.add(LogType.MSG_IMPORT_FETCH_ERROR_KEYSERVER, 3, e.getMessage()); } } } @@ -254,6 +254,13 @@ public class ImportOperation extends BaseOperation { continue; } + // never import secret keys from keyserver! + if (entry.mBytes == null && key.isSecret()) { + log.add(LogType.MSG_IMPORT_FETCH_ERROR_KEYSERVER_SECRET, 2); + badKeys += 1; + continue; + } + // Another check if we have been cancelled if (checkCancelled()) { cancelled = true; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 4e528f73e..6e9aca30d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -707,10 +707,11 @@ public abstract class OperationResult implements Parcelable { MSG_IMPORT_FETCH_ERROR (LogLevel.ERROR, R.string.msg_import_fetch_error), MSG_IMPORT_FETCH_ERROR_DECODE (LogLevel.ERROR, R.string.msg_import_fetch_error_decode), + MSG_IMPORT_FETCH_ERROR_KEYSERVER(LogLevel.ERROR, R.string.msg_import_fetch_error_keyserver), + MSG_IMPORT_FETCH_ERROR_KEYSERVER_SECRET (LogLevel.ERROR, R.string.msg_import_fetch_error_keyserver_secret), + MSG_IMPORT_FETCH_KEYBASE (LogLevel.INFO, R.string.msg_import_fetch_keybase), MSG_IMPORT_FETCH_KEYSERVER (LogLevel.INFO, R.string.msg_import_fetch_keyserver), MSG_IMPORT_FETCH_KEYSERVER_OK (LogLevel.DEBUG, R.string.msg_import_fetch_keyserver_ok), - MSG_IMPORT_FETCH_KEYSERVER_ERROR (LogLevel.ERROR, R.string.msg_import_fetch_keyserver_error), - MSG_IMPORT_FETCH_KEYBASE (LogLevel.INFO, R.string.msg_import_fetch_keybase), MSG_IMPORT_KEYSERVER (LogLevel.DEBUG, R.string.msg_import_keyserver), MSG_IMPORT_MERGE (LogLevel.DEBUG, R.string.msg_import_merge), MSG_IMPORT_MERGE_ERROR (LogLevel.ERROR, R.string.msg_import_merge_error), diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 51ec2e1ee..291ebf238 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -1163,7 +1163,7 @@ Fehler beim Dekodieren des abgerufenen Schlüsselbundes! Schlüssel konnte nicht abgerufen werden! (Netzwerkprobleme?) Empfange von keybase.io: %s - Konnte Schlüssel nicht vom Schlüsselserver abrufen: %s + Konnte Schlüssel nicht vom Schlüsselserver abrufen: %s Empfange von Schlüsselserver: %s Schlüssel erfolgreich heruntergeladen Verwende Schlüsselserver %s diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 7ace8f3dd..043918c64 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -1162,7 +1162,7 @@ ¡Error al descifrar juego de claves descargado! ¡La clave no se pudo descargar! (¿problemas con la red?) Descargando desde keybase.io: %s - No se pudo obtener clave de los servidores de claves: %s + No se pudo obtener clave de los servidores de claves: %s Descargando desde el servidor de claves: %s La clave se descargó con éxito Usando el servidor de claves %s diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index 22b77242e..de4fb68d6 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -1060,7 +1060,7 @@ Akatsa berreskuratutako giltza-uztai dekodeatzerakoan! Giltza ezin da berreskuratu! (Sare arazoak?) keybase.io-tik berreskuratzen: %s - Ezin da giltza giltza-zerbitzarietatik berreskuratu: %s + Ezin da giltza giltza-zerbitzarietatik berreskuratu: %s Giltza-zerbitzaritik berreskuratzen: %s Giltza ongi berreskuratu da %s giltza-zerbitzaria erabiltzen diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index ff50c15ce..4a6c2bbfe 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -1162,7 +1162,7 @@ Erreur de décodage du trousseau récupéré ! La clef n\'a pas pu être récupérée ! (problèmes réseau ?) Récupération en provenance du keybase.io : %s - Impossible de récupérer la clef sur les serveurs de clefs : %s + Impossible de récupérer la clef sur les serveurs de clefs : %s Récupération en provenance du serveur de clefs : %s Récupération de la clef est réussie ! Utilisation du serveur de clefs %s diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 02892dfb2..6f735b35b 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -1126,7 +1126,7 @@ 鍵輪のデコードエラー 鍵の展開ができません! (ネットワークの問題?) keybase.ioから回収: %s - 鍵サーバからの展開: %s + 鍵サーバからの展開: %s 鍵サーバからの回収: %s 鍵の展開に成功 鍵サーバ %s を使う diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index f12896b14..1a02fdc07 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -1112,7 +1112,7 @@ Fout bij decoderen van opgehaalde sleutelbos! Sleutel kon niet opgehaald worden! (Netwerkproblemen?) Bezig met ophalen van keybase.io: %s - Kon sleutel niet ophalen van sleutelservers: %s + Kon sleutel niet ophalen van sleutelservers: %s Bezig met ophalen van sleutelserver: %s Ophalen van sleutel geslaagd! Sleutelserver %s wordt gebruikt diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index 8d4134e40..5c6d03950 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -1190,7 +1190,7 @@ Грешка декодирања добављеног привеска! Не могу да добавим кључ! (Проблеми са мрежом?) Добављам са keybase.io: %s - Не могу да добавим кључ са сервера кључева: %s + Не могу да добавим кључ са сервера кључева: %s Добављам са сервера кључева: %s Добављање кључева је успело Користим сервер кључева %s diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f11114830..d55d128d3 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1278,8 +1278,9 @@ "Error decoding retrieved keyring!" "Key could not be retrieved! (Network problems?)" + "Could not retrieve key from keyservers: %s" + "Cannot import secret key from keyserver!" "Retrieving from keybase.io: %s" - "Could not retrieve key from keyservers: %s" "Retrieving from keyserver: %s" "Key retrieval successful" "Using keyserver %s" -- cgit v1.2.3