summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/de/autogen/plugin_api/completions.txt2
-rw-r--r--doc/de/autogen/user/irc_options.txt8
-rw-r--r--doc/de/autogen/user/sec_options.txt20
-rw-r--r--doc/de/autogen/user/weechat_commands.txt39
-rw-r--r--doc/de/autogen/user/weechat_options.txt4
-rw-r--r--doc/de/weechat_user.de.txt7
-rw-r--r--doc/docgen.py3
-rw-r--r--doc/en/autogen/plugin_api/completions.txt2
-rw-r--r--doc/en/autogen/user/irc_options.txt8
-rw-r--r--doc/en/autogen/user/sec_options.txt20
-rw-r--r--doc/en/autogen/user/weechat_commands.txt39
-rw-r--r--doc/en/autogen/user/weechat_options.txt4
-rw-r--r--doc/en/weechat_user.en.txt6
-rw-r--r--doc/fr/autogen/plugin_api/completions.txt2
-rw-r--r--doc/fr/autogen/user/irc_options.txt8
-rw-r--r--doc/fr/autogen/user/sec_options.txt20
-rw-r--r--doc/fr/autogen/user/weechat_commands.txt39
-rw-r--r--doc/fr/autogen/user/weechat_options.txt4
-rw-r--r--doc/fr/weechat_user.fr.txt6
-rw-r--r--doc/it/autogen/plugin_api/completions.txt2
-rw-r--r--doc/it/autogen/user/irc_options.txt8
-rw-r--r--doc/it/autogen/user/sec_options.txt20
-rw-r--r--doc/it/autogen/user/weechat_commands.txt39
-rw-r--r--doc/it/autogen/user/weechat_options.txt4
-rw-r--r--doc/it/weechat_user.it.txt7
-rw-r--r--doc/ja/autogen/plugin_api/completions.txt2
-rw-r--r--doc/ja/autogen/user/irc_options.txt8
-rw-r--r--doc/ja/autogen/user/sec_options.txt20
-rw-r--r--doc/ja/autogen/user/weechat_commands.txt39
-rw-r--r--doc/ja/autogen/user/weechat_options.txt4
-rw-r--r--doc/ja/weechat_user.ja.txt7
31 files changed, 370 insertions, 31 deletions
diff --git a/doc/de/autogen/plugin_api/completions.txt b/doc/de/autogen/plugin_api/completions.txt
index b8393074d..eb41906a8 100644
--- a/doc/de/autogen/plugin_api/completions.txt
+++ b/doc/de/autogen/plugin_api/completions.txt
@@ -120,6 +120,8 @@
| weechat | proxies_options | Optionen für Proxys
+| weechat | secured_data | names of secured data (file sec.conf, section data)
+
| weechat | weechat_commands | WeeChat Befehle
| weechat | windows_numbers | Nummern der Fenster
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index 2a53bf5b7..aa83b4372 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -409,7 +409,7 @@
** Werte: on, off (Standardwert: `off`)
* [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** Beschreibung: `durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server betreten werden sollen (Beispiel: "#chan1,#chan2,#chan3 key1,key2")`
+** Beschreibung: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2") (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
@@ -449,7 +449,7 @@
** Werte: beliebige Zeichenkette (Standardwert: `""`)
* [[option_irc.server_default.command]] *irc.server_default.command*
-** Beschreibung: `enthält Befehle die nach der Verbindung zum Server ausgeführt werden sollen. Mehrere Befehle müssen durch ein ";" getrennt werden. Möchte man ein Semikolon nutzen muss man "\;" verwenden. Die speziellen Variablen $nick, $channel und $server werden dabei durch den jeweiligen Wert ersetzt`
+** Beschreibung: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
@@ -514,7 +514,7 @@
** Werte: plain, dh-blowfish, dh-aes, external (Standardwert: `plain`)
* [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** Beschreibung: `Passwort für SASL Authentifizierung`
+** Beschreibung: `password for SASL authentication (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
@@ -524,7 +524,7 @@
** Werte: 1 .. 3600 (Standardwert: `15`)
* [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** Beschreibung: `Username für SASL Authentifizierung`
+** Beschreibung: `username for SASL authentication (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
diff --git a/doc/de/autogen/user/sec_options.txt b/doc/de/autogen/user/sec_options.txt
new file mode 100644
index 000000000..311cdb675
--- /dev/null
+++ b/doc/de/autogen/user/sec_options.txt
@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** Beschreibung: `cipher used to crypt data (the number after algorithm is the size of the key in bits)`
+** Typ: integer
+** Werte: aes128, aes192, aes256 (Standardwert: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** Beschreibung: `hash algorithm used to check the decrypted data`
+** Typ: integer
+** Werte: sha224, sha256, sha384, sha512 (Standardwert: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** Beschreibung: `path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** Beschreibung: `use salt when generating key used in encryption (recommended for maximum security); when enabled, the content of crypted data in file sec.conf will be different on each write of the file; if you put the file sec.conf in a version control system, then you can turn off this option to have always same content in file`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index e7412527e..dde392745 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -610,6 +610,45 @@ file: Konfigurationsdatei die gesichert werden soll (ohne Dateinamenserweiterung
Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweiterungen) gesichert.
........................................
+[[command_weechat_secure]]
+[command]*`secure`* manage secured data (passwords or private data encrypted in file sec.conf)::
+........................................
+/secure passphrase <passphrase>|-delete
+ decrypt <passphrase>|-discard
+ set <name> <value>
+ del <name>
+
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+ -delete: delete passphrase
+ decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+ -discard: discard all data still encrypted data
+ set: add or change secured data
+ del: delete secured data
+
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+ - command line argument "--run-command"
+ - irc server options: autojoin, command, password, sasl_{username|password}
+ - options weechat.startup.command_{before|after}_plugins
+ - command /eval.
+
+Examples:
+ set a passphrase:
+ /secure passphrase this is my passphrase
+ encrypt freenode SASL password:
+ /secure set freenode mypassword
+ /set irc.server.freenode.sasl_password "${sec.data.freenode}"
+ encrypt oftc password for nickserv:
+ /secure set oftc mypassword
+ /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+ alias to ghost the nick "mynick":
+ /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
+........................................
+
[[command_weechat_set]]
[command]*`set`* Konfigurationsparameter setzen::
........................................
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index b9f10cda2..ea686a877 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -844,12 +844,12 @@
** Werte: on, off (Standardwert: `on`)
* [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht, nachdem die Erweiterungen geladen worden sind (mehrere Befehle sind durch ";" zu trennen)`
+** Beschreibung: `command executed when WeeChat starts, after loading plugins (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
* [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht, bevor die Erweiterungen geladen werden (mehrere Befehle sind durch ";" zu trennen)`
+** Beschreibung: `command executed when WeeChat starts, before loading plugins (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt
index e050fa052..0efe6cd10 100644
--- a/doc/de/weechat_user.de.txt
+++ b/doc/de/weechat_user.de.txt
@@ -1498,6 +1498,13 @@ Um der Vordergrundfarbe des Terminals das Attribut "fett" zuzuordnen:
/set weechat.color.status_time *99999
----------------------------------------
+// TRANSLATION MISSING
+[[sec_options]]
+Secured data options (sec.conf)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+include::autogen/user/sec_options.txt[]
+
[[weechat_options]]
WeeChat Optionen (weechat.conf)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/docgen.py b/doc/docgen.py
index 7c0fca1f2..5e1fc76f1 100644
--- a/doc/docgen.py
+++ b/doc/docgen.py
@@ -78,7 +78,8 @@ locale_list = ('en_US', 'fr_FR', 'it_IT', 'de_DE', 'ja_JP')
# if plugin is listed without "c", that means plugin has only one command
# /name (where "name" is name of plugin)
# Note: we consider core is a plugin called "weechat"
-plugin_list = { 'weechat' : 'co',
+plugin_list = { 'sec' : 'o',
+ 'weechat' : 'co',
'alias' : '',
'aspell' : 'o',
'charset' : 'co',
diff --git a/doc/en/autogen/plugin_api/completions.txt b/doc/en/autogen/plugin_api/completions.txt
index 4336b2a1d..2b5b4eebf 100644
--- a/doc/en/autogen/plugin_api/completions.txt
+++ b/doc/en/autogen/plugin_api/completions.txt
@@ -120,6 +120,8 @@
| weechat | proxies_options | options for proxies
+| weechat | secured_data | names of secured data (file sec.conf, section data)
+
| weechat | weechat_commands | weechat commands
| weechat | windows_numbers | numbers of windows
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 08f645290..1c28e8d1f 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -409,7 +409,7 @@
** values: on, off (default value: `off`)
* [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** description: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2")`
+** description: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2") (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
@@ -449,7 +449,7 @@
** values: any string (default value: `""`)
* [[option_irc.server_default.command]] *irc.server_default.command*
-** description: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value)`
+** description: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
@@ -514,7 +514,7 @@
** values: plain, dh-blowfish, dh-aes, external (default value: `plain`)
* [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** description: `password for SASL authentication`
+** description: `password for SASL authentication (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
@@ -524,7 +524,7 @@
** values: 1 .. 3600 (default value: `15`)
* [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** description: `username for SASL authentication`
+** description: `username for SASL authentication (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
diff --git a/doc/en/autogen/user/sec_options.txt b/doc/en/autogen/user/sec_options.txt
new file mode 100644
index 000000000..623b13153
--- /dev/null
+++ b/doc/en/autogen/user/sec_options.txt
@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** description: `cipher used to crypt data (the number after algorithm is the size of the key in bits)`
+** type: integer
+** values: aes128, aes192, aes256 (default value: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** description: `hash algorithm used to check the decrypted data`
+** type: integer
+** values: sha224, sha256, sha384, sha512 (default value: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** description: `path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"`
+** type: string
+** values: any string (default value: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** description: `use salt when generating key used in encryption (recommended for maximum security); when enabled, the content of crypted data in file sec.conf will be different on each write of the file; if you put the file sec.conf in a version control system, then you can turn off this option to have always same content in file`
+** type: boolean
+** values: on, off (default value: `on`)
+
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index 3b6a3e8f2..992e470b6 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -610,6 +610,45 @@ file: configuration file to save (without extension ".conf")
Without argument, all files (WeeChat and plugins) are saved.
........................................
+[[command_weechat_secure]]
+[command]*`secure`* manage secured data (passwords or private data encrypted in file sec.conf)::
+........................................
+/secure passphrase <passphrase>|-delete
+ decrypt <passphrase>|-discard
+ set <name> <value>
+ del <name>
+
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+ -delete: delete passphrase
+ decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+ -discard: discard all data still encrypted data
+ set: add or change secured data
+ del: delete secured data
+
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+ - command line argument "--run-command"
+ - irc server options: autojoin, command, password, sasl_{username|password}
+ - options weechat.startup.command_{before|after}_plugins
+ - command /eval.
+
+Examples:
+ set a passphrase:
+ /secure passphrase this is my passphrase
+ encrypt freenode SASL password:
+ /secure set freenode mypassword
+ /set irc.server.freenode.sasl_password "${sec.data.freenode}"
+ encrypt oftc password for nickserv:
+ /secure set oftc mypassword
+ /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+ alias to ghost the nick "mynick":
+ /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
+........................................
+
[[command_weechat_set]]
[command]*`set`* set config options::
........................................
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 012b2a4e1..e19e37611 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -844,12 +844,12 @@
** values: on, off (default value: `on`)
* [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** description: `command executed when WeeChat starts, after loading plugins`
+** description: `command executed when WeeChat starts, after loading plugins (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
* [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** description: `command executed when WeeChat starts, before loading plugins`
+** description: `command executed when WeeChat starts, before loading plugins (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt
index 9279eb3d9..c926b7f90 100644
--- a/doc/en/weechat_user.en.txt
+++ b/doc/en/weechat_user.en.txt
@@ -1471,6 +1471,12 @@ Example of bold with terminal foreground color:
/set weechat.color.status_time *99999
----------------------------------------
+[[sec_options]]
+Secured data options (sec.conf)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+include::autogen/user/sec_options.txt[]
+
[[weechat_options]]
WeeChat options (weechat.conf)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/fr/autogen/plugin_api/completions.txt b/doc/fr/autogen/plugin_api/completions.txt
index 3fd1fc7a4..2f7a2b521 100644
--- a/doc/fr/autogen/plugin_api/completions.txt
+++ b/doc/fr/autogen/plugin_api/completions.txt
@@ -120,6 +120,8 @@
| weechat | proxies_options | options pour les proxies
+| weechat | secured_data | noms de données sécurisées (fichier sec.conf, section data)
+
| weechat | weechat_commands | commandes weechat
| weechat | windows_numbers | numéros des fenêtres
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 54167ccc4..873a8c428 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -409,7 +409,7 @@
** valeurs: on, off (valeur par défaut: `off`)
* [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** description: `liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au serveur (exemple: "#chan1,#chan2,#chan3 key1,key2")`
+** description: `liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au serveur (exemple: "#chan1,#chan2,#chan3 key1,key2") (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
@@ -449,7 +449,7 @@
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_irc.server_default.command]] *irc.server_default.command*
-** description: `commande(s) à exécuter lorsque connecté au serveur (plusieurs commandes doivent être séparées par ";", utilisez "\;" pour un point-virgule, les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)`
+** description: `commande(s) à exécuter lorsque connecté au serveur (plusieurs commandes doivent être séparées par ";", utilisez "\;" pour un point-virgule, les variables spéciales $nick, $channel et $server sont remplacées par leur valeur) (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
@@ -514,7 +514,7 @@
** valeurs: plain, dh-blowfish, dh-aes, external (valeur par défaut: `plain`)
* [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** description: `mot de passe pour l'authentification SASL`
+** description: `mot de passe pour l'authentification SASL (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
@@ -524,7 +524,7 @@
** valeurs: 1 .. 3600 (valeur par défaut: `15`)
* [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** description: `nom d'utilisateur pour l'authentification SASL`
+** description: `nom d'utilisateur pour l'authentification SASL (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
diff --git a/doc/fr/autogen/user/sec_options.txt b/doc/fr/autogen/user/sec_options.txt
new file mode 100644
index 000000000..c086d4552
--- /dev/null
+++ b/doc/fr/autogen/user/sec_options.txt
@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** description: `chiffrement ("cipher") utilisé pour chiffrer les données (le nombre après l'algorithme est la taille de la clé en bits)`
+** type: entier
+** valeurs: aes128, aes192, aes256 (valeur par défaut: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** description: `algorithme de hash pour vérifier les données déchiffrées`
+** type: entier
+** valeurs: sha224, sha256, sha384, sha512 (valeur par défaut: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** description: `chemin vers un fichier contenant la phrase de chiffrement pour (dé)chiffrer les données sécurisées; cette option est utilisée seulement lors de la lecture du fichier sec.conf; seulement la première ligne du fichier est utilisée; ce fichier est utilisé seulement si la variable d'environnement "WEECHAT_PASSPHRASE" n'est pas définie (la variable d'environnement a une priorité plus haute); note de sécurité : il est recommandé de garder ce fichier en lecture seulement par vous et de le stocker en dehors du "home" WeeChat (par exemple dans votre "home"); exemple: "~/.weechat-passphrase"`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** description: `utiliser du sel lors de la génération de la clé utilisée dans le chiffrement (recommandé pour un maximum de sécurité); lorsque cette option est activée, le contenu des données chiffrées dans le fichier sec.conf sera différent à chaque écriture du fichier; si vous utilisez le fichier sec.conf dans un système de contrôle de version, alors vous pouvez désactiver cette option pour avoir toujours le même contenu de fichier`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index cfa39c47b..ad4d214c0 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -610,6 +610,45 @@ fichier: fichier de configuration à sauvegarder (sans l'extension ".conf")
Sans paramètre, tous les fichiers (WeeChat et extensions) sont sauvegardés.
........................................
+[[command_weechat_secure]]
+[command]*`secure`* gestion des données sécurisées (mots de passe ou données privées chiffrés dans le fichier sec.conf)::
+........................................
+/secure passphrase <phrase de chiffrement>|-delete
+ decrypt <phrase de chiffrement>|-discard
+ set <nom> <valeur>
+ del <nom>
+
+passphrase: modifier la phrase de chiffrement (sans phrase de chiffrement, les données sont stockées en texte brut dans le fichier sec.conf)
+ -delete: supprimer la phrase de chiffrement
+ decrypt: déchiffrer les données toujours chiffrées
+ -discard: jeter toutes les données encore chiffrées
+ set: ajouter ou modifier une donnée sécurisée
+ del: supprimer une donnée sécurisée
+
+Sans paramètre, cette commande affiche les données sécurisées dans un nouveau tampon.
+
+Lorsqu'une phrase de chiffrement est utilisée (données chiffrées), elle est demandée au démarrage de WeeChat.
+Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE pour éviter la demande (cette même variable est utilisée par WeeChat sur le /upgrade).
+
+Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisées dans :
+ - le paramètre de ligne de commande "--run-command"
+ - les options de serveur irc: autojoin, command, password, sasl_{username|password}
+ - les options weechat.startup.command_{before|after}_plugins
+ - la commande /eval.
+
+Exemples :
+ définir une phrase de chiffrement :
+ /secure passphrase ceci est ma phrase de chiffrement
+ chiffrer le mot de passe freenode SASL :
+ /secure set freenode motdepasse
+ /set irc.server.freenode.sasl_password "${sec.data.freenode}"
+ chiffrer le mot de passe oftc pour nickserv :
+ /secure set oftc motdepasse
+ /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+ alias pour ghost du pseudo "pseudo" :
+ /alias ghost /eval /msg -server freenode nickserv ghost pseudo ${sec.data.freenode}
+........................................
+
[[command_weechat_set]]
[command]*`set`* modifier des options de configuration::
........................................
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index e6934a4be..51ef5b90e 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -844,12 +844,12 @@
** valeurs: on, off (valeur par défaut: `on`)
* [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** description: `commande exécutée quand WeeChat démarre, après le chargement des extensions`
+** description: `commande exécutée quand WeeChat démarre, après le chargement des extensions (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** description: `commande exécutée quand WeeChat démarre, avant le chargement des extensions`
+** description: `commande exécutée quand WeeChat démarre, avant le chargement des extensions (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt
index a8f1175cd..75a23595a 100644
--- a/doc/fr/weechat_user.fr.txt
+++ b/doc/fr/weechat_user.fr.txt
@@ -1511,6 +1511,12 @@ Exemple de gras avec la couleur de texte du terminal :
/set weechat.color.status_time *99999
----------------------------------------
+[[sec_options]]
+Options des données sécurisées (sec.conf)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+include::autogen/user/sec_options.txt[]
+
[[weechat_options]]
Options WeeChat (weechat.conf)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/it/autogen/plugin_api/completions.txt b/doc/it/autogen/plugin_api/completions.txt
index 898bf3f73..fa9c13e0d 100644
--- a/doc/it/autogen/plugin_api/completions.txt
+++ b/doc/it/autogen/plugin_api/completions.txt
@@ -120,6 +120,8 @@
| weechat | proxies_options | opzioni per i proxy
+| weechat | secured_data | names of secured data (file sec.conf, section data)
+
| weechat | weechat_commands | comandi di weechat
| weechat | windows_numbers | numeri delle finestre
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index fa3abc7fc..a6097fb40 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -409,7 +409,7 @@
** valori: on, off (valore predefinito: `off`)
* [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** descrizione: `elenco separato da virgole di canali in cui entrare quando si è connessi al server (esempio: "#canale1", #canale2, #canale3 chiave1,chiave2")`
+** descrizione: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2") (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
@@ -449,7 +449,7 @@
** valori: qualsiasi stringa (valore predefinito: `""`)
* [[option_irc.server_default.command]] *irc.server_default.command*
-** descrizione: `comando(i) da eseguire quando si è connessi al server (più comandi vanno separati da ":", usare ";" per un punto e virgola, le variabili speciali $nick, $canale e $server vengono sostituite dai loro valori)`
+** descrizione: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
@@ -514,7 +514,7 @@
** valori: plain, dh-blowfish, dh-aes, external (valore predefinito: `plain`)
* [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** descrizione: `password per l'autenticazione SASL`
+** descrizione: `password for SASL authentication (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
@@ -524,7 +524,7 @@
** valori: 1 .. 3600 (valore predefinito: `15`)
* [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** descrizione: `nome utente per l'autenticazione SASL`
+** descrizione: `username for SASL authentication (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
diff --git a/doc/it/autogen/user/sec_options.txt b/doc/it/autogen/user/sec_options.txt
new file mode 100644
index 000000000..b04efe7ef
--- /dev/null
+++ b/doc/it/autogen/user/sec_options.txt
@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** descrizione: `cipher used to crypt data (the number after algorithm is the size of the key in bits)`
+** tipo: intero
+** valori: aes128, aes192, aes256 (valore predefinito: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** descrizione: `hash algorithm used to check the decrypted data`
+** tipo: intero
+** valori: sha224, sha256, sha384, sha512 (valore predefinito: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** descrizione: `path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** descrizione: `use salt when generating key used in encryption (recommended for maximum security); when enabled, the content of crypted data in file sec.conf will be different on each write of the file; if you put the file sec.conf in a version control system, then you can turn off this option to have always same content in file`
+** tipo: bool
+** valori: on, off (valore predefinito: `on`)
+
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 7ae9e44b7..21207d11a 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -610,6 +610,45 @@ file: file di configurazione da salvare (senza estensione ".conf")
Senza argomento, vengono salvati tutti i file (WeeChat e plugin).
........................................
+[[command_weechat_secure]]
+[command]*`secure`* manage secured data (passwords or private data encrypted in file sec.conf)::
+........................................
+/secure passphrase <passphrase>|-delete
+ decrypt <passphrase>|-discard
+ set <name> <value>
+ del <name>
+
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+ -delete: delete passphrase
+ decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+ -discard: discard all data still encrypted data
+ set: add or change secured data
+ del: delete secured data
+
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+ - command line argument "--run-command"
+ - irc server options: autojoin, command, password, sasl_{username|password}
+ - options weechat.startup.command_{before|after}_plugins
+ - command /eval.
+
+Examples:
+ set a passphrase:
+ /secure passphrase this is my passphrase
+ encrypt freenode SASL password:
+ /secure set freenode mypassword
+ /set irc.server.freenode.sasl_password "${sec.data.freenode}"
+ encrypt oftc password for nickserv:
+ /secure set oftc mypassword
+ /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+ alias to ghost the nick "mynick":
+ /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
+........................................
+
[[command_weechat_set]]
[command]*`set`* imposta le opzioni di configurazione::
........................................
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 744bbe429..32d5653ea 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -844,12 +844,12 @@
** valori: on, off (valore predefinito: `on`)
* [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** descrizione: `comando eseguito all'avvio di WeeChat, dopo il caricamento dei plugin`
+** descrizione: `command executed when WeeChat starts, after loading plugins (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
* [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** descrizione: `comando eseguito all'avvio di WeeChat, prima del caricamento dei plugin`
+** descrizione: `command executed when WeeChat starts, before loading plugins (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt
index 9452b7a26..634bdd370 100644
--- a/doc/it/weechat_user.it.txt
+++ b/doc/it/weechat_user.it.txt
@@ -1508,6 +1508,13 @@ Esempio di grassetto con il colore di primo piano del terminale:
/set weechat.color.status_time *99999
----------------------------------------
+// TRANSLATION MISSING
+[[sec_options]]
+Secured data options (sec.conf)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+include::autogen/user/sec_options.txt[]
+
[[weechat_options]]
Opzioni di WeeChat (weechat.conf)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/ja/autogen/plugin_api/completions.txt b/doc/ja/autogen/plugin_api/completions.txt
index 91376ba8e..f3a0baea4 100644
--- a/doc/ja/autogen/plugin_api/completions.txt
+++ b/doc/ja/autogen/plugin_api/completions.txt
@@ -120,6 +120,8 @@
| weechat | proxies_options | プロキシのオプション
+| weechat | secured_data | names of secured data (file sec.conf, section data)
+
| weechat | weechat_commands | weechat コマンド
| weechat | windows_numbers | ウィンドウの数
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index 8d9c1c68d..0ab08aa82 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -409,7 +409,7 @@
** 値: on, off (デフォルト値: `off`)
* [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** 説明: `サーバに接続した際に参加するチャンネルのコンマ区切りリスト(例: "#chan1,#chan2,#chan3 key1,key2")`
+** 説明: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2") (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
@@ -449,7 +449,7 @@
** 値: 未制約文字列 (デフォルト値: `""`)
* [[option_irc.server_default.command]] *irc.server_default.command*
-** 説明: `サーバに接続した際に実行するコマンド (";" で分けて 複数のコマンドを列挙、セミコロンは "\;" とする、特殊変数 $nick、$channel、$server はそれぞれの値に置換される)`
+** 説明: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
@@ -514,7 +514,7 @@
** 値: plain, dh-blowfish, dh-aes, external (デフォルト値: `plain`)
* [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** 説明: `SASL 認証用パスワード`
+** 説明: `password for SASL authentication (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
@@ -524,7 +524,7 @@
** 値: 1 .. 3600 (デフォルト値: `15`)
* [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** 説明: `SASL 認証用ユーザ名`
+** 説明: `username for SASL authentication (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
diff --git a/doc/ja/autogen/user/sec_options.txt b/doc/ja/autogen/user/sec_options.txt
new file mode 100644
index 000000000..a8138b7f1
--- /dev/null
+++ b/doc/ja/autogen/user/sec_options.txt
@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** 説明: `cipher used to crypt data (the number after algorithm is the size of the key in bits)`
+** タイプ: 整数
+** 値: aes128, aes192, aes256 (デフォルト値: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** 説明: `hash algorithm used to check the decrypted data`
+** タイプ: 整数
+** 値: sha224, sha256, sha384, sha512 (デフォルト値: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** 説明: `path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"`
+** タイプ: 文字列
+** 値: 未制約文字列 (デフォルト値: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** 説明: `use salt when generating key used in encryption (recommended for maximum security); when enabled, the content of crypted data in file sec.conf will be different on each write of the file; if you put the file sec.conf in a version control system, then you can turn off this option to have always same content in file`
+** タイプ: ブール
+** 値: on, off (デフォルト値: `on`)
+
diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt
index bec5df1b3..9e7a75043 100644
--- a/doc/ja/autogen/user/weechat_commands.txt
+++ b/doc/ja/autogen/user/weechat_commands.txt
@@ -610,6 +610,45 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要)
引数無しでは、全てのファイル (WeeChat とプラグイン) が保存されます。
........................................
+[[command_weechat_secure]]
+[command]*`secure`* manage secured data (passwords or private data encrypted in file sec.conf)::
+........................................
+/secure passphrase <passphrase>|-delete
+ decrypt <passphrase>|-discard
+ set <name> <value>
+ del <name>
+
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+ -delete: delete passphrase
+ decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+ -discard: discard all data still encrypted data
+ set: add or change secured data
+ del: delete secured data
+
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+ - command line argument "--run-command"
+ - irc server options: autojoin, command, password, sasl_{username|password}
+ - options weechat.startup.command_{before|after}_plugins
+ - command /eval.
+
+Examples:
+ set a passphrase:
+ /secure passphrase this is my passphrase
+ encrypt freenode SASL password:
+ /secure set freenode mypassword
+ /set irc.server.freenode.sasl_password "${sec.data.freenode}"
+ encrypt oftc password for nickserv:
+ /secure set oftc mypassword
+ /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+ alias to ghost the nick "mynick":
+ /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
+........................................
+
[[command_weechat_set]]
[command]*`set`* オプションの設定::
........................................
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index 0fccf9009..69759b07d 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -844,12 +844,12 @@
** 値: on, off (デフォルト値: `on`)
* [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** 説明: `WeeChat が実行され、プラグインのロード後に実行されるコマンド`
+** 説明: `command executed when WeeChat starts, after loading plugins (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
* [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** 説明: `WeeChat が実行され、プラグインのロード前に実行されるコマンド`
+** 説明: `command executed when WeeChat starts, before loading plugins (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt
index 805c14748..ff56c371b 100644
--- a/doc/ja/weechat_user.ja.txt
+++ b/doc/ja/weechat_user.ja.txt
@@ -1437,6 +1437,13 @@ WeeChat はスクリーンに色が表示された時点で色ペアを動的に
/set weechat.color.status_time *99999
----------------------------------------
+// TRANSLATION MISSING
+[[sec_options]]
+Secured data options (sec.conf)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+include::autogen/user/sec_options.txt[]
+
[[weechat_options]]
=== WeeChat オプション (weechat.conf) ===