blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: set max length to 4096 for /secure passphrase (closes #1323)

Browse Source
This commit is contained in:
Sébastien Helleu 2019-03-12 21:30:01 +01:00
parent bc6c1f274c
commit 99e48d7fa3
17 changed files with 86 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -30,6 +30,7 @@ New features::
Bug fixes:: Bug fixes::
* core: set max length to 4096 for /secure passphrase (issue #1323)
* core: refilter only affected buffers on filter change (issue #1309, issue #1311) * core: refilter only affected buffers on filter change (issue #1309, issue #1311)
* fset: fix slow refresh of fset buffer during /reload (issue #1313) * fset: fix slow refresh of fset buffer during /reload (issue #1313)
* irc: quote NICK command argument sent to the server (issue #1319) * irc: quote NICK command argument sent to the server (issue #1319)

6
po/cs.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -874,6 +874,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "" msgstr ""
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Heslo smazáno" msgstr "Heslo smazáno"

6
po/de.po
View File

@ -24,7 +24,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n" "Language-Team: German <kde-i18n-de@kde.org>\n"
@ -913,6 +913,10 @@ msgid ""
msgstr "" msgstr ""
"%sDie Daten müssen zuerst entschlüsselt werden, bevor man diese nutzen kann" "%sDie Daten müssen zuerst entschlüsselt werden, bevor man diese nutzen kann"
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Passphrase gelöscht" msgstr "Passphrase gelöscht"

6
po/es.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -866,6 +866,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "" msgstr ""
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
#, fuzzy #, fuzzy
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Barra eliminada" msgstr "Barra eliminada"

9
po/fr.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-12 21:28+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n" "Language: fr\n"
@ -895,6 +895,11 @@ msgstr ""
"%sVous devez déchiffrer les données toujours chiffrées avant de faire une " "%sVous devez déchiffrer les données toujours chiffrées avant de faire une "
"opération sur une donnée sécurisée ou la phrase de chiffrement" "opération sur une donnée sécurisée ou la phrase de chiffrement"
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
"%sErreur : la prase de chiffrement est trop longue (max : %d caractères)"
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Phrase de chiffrement supprimée" msgstr "Phrase de chiffrement supprimée"

6
po/hu.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-02-28 20:18+0100\n" "PO-Revision-Date: 2019-02-28 20:18+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -894,6 +894,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "" msgstr ""
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
#, fuzzy #, fuzzy
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "a felhasználók le lettek tiltva" msgstr "a felhasználók le lettek tiltva"

6
po/it.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -855,6 +855,10 @@ msgstr ""
"%sÈ necessario decifrare i dati ancora cifrati prima di qualsiasi operazione " "%sÈ necessario decifrare i dati ancora cifrati prima di qualsiasi operazione "
"sui dati sicuri o sulla chiave di cifratura" "sui dati sicuri o sulla chiave di cifratura"
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Chiave di cifratura eliminata" msgstr "Chiave di cifratura eliminata"

6
po/ja.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@ -886,6 +886,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "%s保護データやパスフレーズを操作する前にデータを復号してください" msgstr "%s保護データやパスフレーズを操作する前にデータを復号してください"
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "パスフレーズを削除しました" msgstr "パスフレーズを削除しました"

6
po/pl.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@ -894,6 +894,10 @@ msgstr ""
"%sMusisz odszyfrować zaszyfrowane dane przed wykonaniem jakiejś operacji na " "%sMusisz odszyfrować zaszyfrowane dane przed wykonaniem jakiejś operacji na "
"zabezpieczonych danych lub haśle" "zabezpieczonych danych lub haśle"
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Usunięto hasło" msgstr "Usunięto hasło"

6
po/pt.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n" "Language-Team: Portuguese <>\n"
@ -879,6 +879,10 @@ msgstr ""
"%sDeve desencriptar os dados que ainda estão encriptados antes de efetuar " "%sDeve desencriptar os dados que ainda estão encriptados antes de efetuar "
"alguma operação sobre os dados protegidos ou sobre a frase de acesso" "alguma operação sobre os dados protegidos ou sobre a frase de acesso"
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Frase de acesso eliminada" msgstr "Frase de acesso eliminada"

6
po/pt_BR.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -889,6 +889,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "" msgstr ""
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "Password deletado" msgstr "Password deletado"

6
po/ru.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -909,6 +909,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "" msgstr ""
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
#, fuzzy #, fuzzy
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "команда users отключена" msgstr "команда users отключена"

6
po/tr.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-01-29 21:05+0100\n" "PO-Revision-Date: 2019-01-29 21:05+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -810,6 +810,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "" msgstr ""
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "" msgstr ""

6
po/weechat.pot
View File

@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-03-11 20:59+0100\n" "POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -810,6 +810,10 @@ msgid ""
"secured data or passphrase" "secured data or passphrase"
msgstr "" msgstr ""
#, c-format
msgid "%sError: passphrase is too long (max: %d chars)"
msgstr ""
msgid "Passphrase deleted" msgid "Passphrase deleted"
msgstr "" msgstr ""

10
src/core/wee-command.c
View File

@ -5466,6 +5466,16 @@ COMMAND_CALLBACK(secure)
if (string_strcasecmp (argv[1], "passphrase") == 0) if (string_strcasecmp (argv[1], "passphrase") == 0)
{ {
COMMAND_MIN_ARGS(3, "passphrase"); COMMAND_MIN_ARGS(3, "passphrase");
if ((strcmp (argv[2], "-delete") != 0)
&& (strlen (argv_eol[2]) > SECURE_PASSPHRASE_MAX_LENGTH))
{
gui_chat_printf (NULL,
_("%sError: passphrase is too long "
"(max: %d chars)"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
SECURE_PASSPHRASE_MAX_LENGTH);
return WEECHAT_RC_OK;
}
passphrase_was_set = 0; passphrase_was_set = 0;
if (secure_passphrase) if (secure_passphrase)
{ {

2
src/core/wee-secure-config.c
View File

@ -54,7 +54,7 @@ void
secure_config_get_passphrase_from_user (const char *error) secure_config_get_passphrase_from_user (const char *error)
{ {
const char *prompt[5]; const char *prompt[5];
char passphrase[1024]; char passphrase[SECURE_PASSPHRASE_MAX_LENGTH + 1];
prompt[0] = _("Please enter your passphrase to decrypt the data secured " prompt[0] = _("Please enter your passphrase to decrypt the data secured "
"by WeeChat:"); "by WeeChat:");

13
src/core/wee-secure.h
View File

@ -22,12 +22,13 @@
#include <time.h> #include <time.h>
#define SECURE_ENV_PASSPHRASE "WEECHAT_PASSPHRASE" #define SECURE_ENV_PASSPHRASE "WEECHAT_PASSPHRASE"
#define SECURE_SALT_DEFAULT "WeeChat!" #define SECURE_PASSPHRASE_MAX_LENGTH 4096
#define SECURE_DATA_PASSPHRASE_FLAG "__passphrase__" #define SECURE_SALT_DEFAULT "WeeChat!"
#define SECURE_SALT_SIZE 8 #define SECURE_DATA_PASSPHRASE_FLAG "__passphrase__"
#define SECURE_TOTP_MIN_DIGITS 4 #define SECURE_SALT_SIZE 8
#define SECURE_TOTP_MAX_DIGITS 10 #define SECURE_TOTP_MIN_DIGITS 4
#define SECURE_TOTP_MAX_DIGITS 10
enum t_secure_config_hash_algo enum t_secure_config_hash_algo
{ {