relay: add support of secured data in option relay.network.password (evaluate content) (patch from Nils Görs)

10 files changed, 60 insertions, 55 deletions

diff --git a/doc/de/autogen/user/relay_options.txt b/doc/de/autogen/user/relay_options.txt
index 2b3eae798..2aea004ab 100644
--- a/doc/de/autogen/user/relay_options.txt
+++ b/doc/de/autogen/user/relay_options.txt
@@ -104,7 +104,7 @@
 ** Werte: 1 .. 1024 (Standardwert: `5`)
 
 * [[option_relay.network.password]] *relay.network.password*
-** Beschreibung: `Passwort wird von Clients benötigt um Zugriff auf dieses Relay zu erhalten (kein Eintrag bedeutet dass kein Passwort benötigt wird)`
+** Beschreibung: `password required by clients to access this relay (empty value means no password required) (note: content is evaluated, see /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index 65bc908b1..80cb93d3f 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -622,35 +622,36 @@ Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweite
          set <name> <value>
          del <name>
 
-passphrase: ändern der Passphrase (ohne Passphrase, werden die Daten in der Datei sec.conf in Klartext gesichert)
-   -delete: löscht Passphrase
-   decrypt: entschlüsselt Daten nachträglich (dies passiert nur die Passphrase beim Start nicht angegeben wurde)
-  -discard: verwirft alle verschlüsselten Daten
-       set: ändert eine schutzwürdige Information oder fügt eine hinzu
-       del: entfernt eine schutzwürdige Information
-
-Ohne Angabe von Argumenten wird ein neuer Buffer geöffnet und die geschützten Daten können dort eingesehen werden.
-
-Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat beim Start nach der Passphrase.
-Es ist möglich eine Umgebungsvariable "WEECHAT_PASSPHRASE" zu setzen um die Eingabeaufforderung beim Programmstart zu vermeiden (diese Variable wird auch von WeeChat beim /upgrade verwendet).
-
-schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt werden:
-  - Argument in der Befehlszeile für "--run-command"
-  - IRC Server Optionen: autojoin, command, password, sasl_{username|password}
-  - Option weechat.startup.command_{before|after}_plugins
-  - Befehl /eval.
-
-Beispiele:
-  setzen einer Passphrase:
-    /secure passphrase Dies ist meine Passphrase
-  verschlüsselt freenode SASL Passwort:
-    /secure set freenode meinPasswort
+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
+       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}
+  - option relay.network.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}"
-  verschlüsselt oftc Passwort für nickserv:
-    /secure set oftc meinPasswort
+  encrypt oftc password for nickserv:
+    /secure set oftc mypassword
     /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
-  alias um den eigenen Nick zu ghosten:
-    /alias ghost /eval /msg -server freenode nickserv ghost meinNick ${sec.data.freenode}
+  alias to ghost the nick "mynick":
+    /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
 ........................................
 
 [[command_weechat_set]]
diff --git a/doc/en/autogen/user/relay_options.txt b/doc/en/autogen/user/relay_options.txt
index 8e0253657..ee41354cf 100644
--- a/doc/en/autogen/user/relay_options.txt
+++ b/doc/en/autogen/user/relay_options.txt
@@ -104,7 +104,7 @@
 ** values: 1 .. 1024 (default value: `5`)
 
 * [[option_relay.network.password]] *relay.network.password*
-** description: `password required by clients to access this relay (empty value means no password required)`
+** description: `password required by clients to access this relay (empty value means no password required) (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index 0f007aade..68caff3bb 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -637,6 +637,7 @@ It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the p
 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}
+  - option relay.network.password
   - options weechat.startup.command_{before|after}_plugins
   - command /eval.
 
diff --git a/doc/fr/autogen/user/relay_options.txt b/doc/fr/autogen/user/relay_options.txt
index 15b45b5ef..aa7b9c0e7 100644
--- a/doc/fr/autogen/user/relay_options.txt
+++ b/doc/fr/autogen/user/relay_options.txt
@@ -104,7 +104,7 @@
 ** valeurs: 1 .. 1024 (valeur par défaut: `5`)
 
 * [[option_relay.network.password]] *relay.network.password*
-** description: `mot de passe requis par les clients pour accéder à ce relai (une valeur vide indique que le mot de passe n'est pas nécessaire)`
+** description: `mot de passe requis par les clients pour accéder à ce relai (une valeur vide indique que le mot de passe n'est pas nécessaire) (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/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index d759b1478..3a24caf22 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -637,6 +637,7 @@ Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE pour
 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}
+  - l'option relay.network.password
   - les options weechat.startup.command_{before|after}_plugins
   - la commande /eval.
 
diff --git a/doc/it/autogen/user/relay_options.txt b/doc/it/autogen/user/relay_options.txt
index 986d37acf..cba008d27 100644
--- a/doc/it/autogen/user/relay_options.txt
+++ b/doc/it/autogen/user/relay_options.txt
@@ -104,7 +104,7 @@
 ** valori: 1 .. 1024 (valore predefinito: `5`)
 
 * [[option_relay.network.password]] *relay.network.password*
-** descrizione: `password richiesta dai client per accedere a questo relay (un valore nullo corrisponde a nessuna password richiesta)`
+** descrizione: `password required by clients to access this relay (empty value means no password required) (note: content is evaluated, see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 308f29c8e..6c12f01d5 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -637,6 +637,7 @@ It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the p
 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}
+  - option relay.network.password
   - options weechat.startup.command_{before|after}_plugins
   - command /eval.
 
diff --git a/doc/ja/autogen/user/relay_options.txt b/doc/ja/autogen/user/relay_options.txt
index 153116dcd..feafecf52 100644
--- a/doc/ja/autogen/user/relay_options.txt
+++ b/doc/ja/autogen/user/relay_options.txt
@@ -104,7 +104,7 @@
 ** 値: 1 .. 1024 (デフォルト値: `5`)
 
 * [[option_relay.network.password]] *relay.network.password*
-** 説明: `このリレーを利用するためにクライアントが必要なパスワード (空の場合パスワードなし)`
+** 説明: `password required by clients to access this relay (empty value means no password required) (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt
index ad91b636e..e7c91da0b 100644
--- a/doc/ja/autogen/user/weechat_commands.txt
+++ b/doc/ja/autogen/user/weechat_commands.txt
@@ -622,34 +622,35 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要)
          set <name> <value>
          del <name>
 
-passphrase: パスフレーズを変更 (パスフレーズがない場合、sec.conf ファイルに平文でデータを保存します)
-   -delete: パスフレーズを削除
-   decrypt: 暗号化されているデータを復号化 (起動時にパスフレーズが設定されていない場合に起きます)
-  -discard: 全ての暗号化データを破棄
-       set: 保護データを追加または変更
-       del: 保護データを削除
-
-引数がない場合、新しいバッファに保護データを表示します。
-
-パスフレーズを利用する場合 (データが暗号化されている場合)、WeeChat は起動時にパスフレーズを尋ねます。
-環境変数 "WEECHAT_PASSPHRASE" を利用すれば入力を回避できます (WeeChat は /upgrade の時に同じ変数を利用します)。
-
-${sec.data.xxx} の形でフォーマットされた保護データは以下の様に利用できます:
-  - コマンドライン引数 "--run-command"
-  - irc サーバオプション: autojoin、command、password、sasl_{username|password}
-  - weechat.startup.command_{before|after}_plugins オプション
-  - /eval コマンド。
-
-例:
-  パスフレーズを設定:
+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
+       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}
+  - option relay.network.password
+  - options weechat.startup.command_{before|after}_plugins
+  - command /eval.
+
+Examples:
+  set a passphrase:
     /secure passphrase this is my passphrase
-  freenode の SASL パスワードを暗号化:
+  encrypt freenode SASL password:
     /secure set freenode mypassword
     /set irc.server.freenode.sasl_password "${sec.data.freenode}"
-  oftc の nickserv 用パスワードを暗号化:
+  encrypt oftc password for nickserv:
     /secure set oftc mypassword
     /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
-  ニックネーム "mynick" を取り戻すためのエイリアス ghost を設定
+  alias to ghost the nick "mynick":
     /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
 ........................................