diff --git a/ChangeLog.adoc b/ChangeLog.adoc index c15921a82..bf6bd6cf3 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -21,6 +21,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] New features:: * buflist: evaluate option buflist.look.sort so that sort can be customized for each of the three buflist bar items (issue #1465) + * relay: add option relay.network.auth_timeout * relay: update default colors for client status * trigger: evaluate arguments of command when the trigger is created (issue #1472) diff --git a/doc/de/autogen/user/relay_options.adoc b/doc/de/autogen/user/relay_options.adoc index 903052218..5c6405f48 100644 --- a/doc/de/autogen/user/relay_options.adoc +++ b/doc/de/autogen/user/relay_options.adoc @@ -12,19 +12,19 @@ ** Beschreibung: pass:none[Textfarbe für Status: "Verbindung hergestellt"] ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen -** Standardwert: `+lightblue+` +** Standardwert: `+green+` * [[option_relay.color.status_auth_failed]] *relay.color.status_auth_failed* ** Beschreibung: pass:none[Textfarbe für Status: "Authentifizierung gescheitert"] ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen -** Standardwert: `+lightred+` +** Standardwert: `+lightmagenta+` * [[option_relay.color.status_connecting]] *relay.color.status_connecting* ** Beschreibung: pass:none[Textfarbe für Status: "verbinde"] ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen -** Standardwert: `+yellow+` +** Standardwert: `+white+` * [[option_relay.color.status_disconnected]] *relay.color.status_disconnected* ** Beschreibung: pass:none[Textfarbe für Status: "Verbindung getrennt"] @@ -36,7 +36,7 @@ ** Beschreibung: pass:none[Textfarbe für Status: "warte auf Authentifizierung"] ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen -** Standardwert: `+brown+` +** Standardwert: `+yellow+` * [[option_relay.color.text]] *relay.color.text* ** Beschreibung: pass:none[Textfarbe in Relay-Buffer] @@ -116,6 +116,12 @@ ** Werte: beliebige Zeichenkette ** Standardwert: `+""+` +* [[option_relay.network.auth_timeout]] *relay.network.auth_timeout* +** Beschreibung: pass:none[timeout (in seconds) for client authentication: connection is closed if the client is still not authenticated after this delay and the client status is set to "authentication failed" (0 = wait forever)] +** Typ: integer +** Werte: 0 .. 2147483647 +** Standardwert: `+60+` + * [[option_relay.network.bind_address]] *relay.network.bind_address* ** Beschreibung: pass:none[Adresse für Bind (falls nicht gesetzt ist eine Verbindung zu allen Interfaces möglich. Wird die Adresse "127.0.0.1" genutzt kann nur eine Verbindung mit dem lokalen Rechner hergestellt werden)] ** Typ: Zeichenkette diff --git a/doc/en/autogen/user/relay_options.adoc b/doc/en/autogen/user/relay_options.adoc index f3ae28135..ad86251b0 100644 --- a/doc/en/autogen/user/relay_options.adoc +++ b/doc/en/autogen/user/relay_options.adoc @@ -12,19 +12,19 @@ ** description: pass:none[text color for "connected" status] ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** default value: `+lightblue+` +** default value: `+green+` * [[option_relay.color.status_auth_failed]] *relay.color.status_auth_failed* ** description: pass:none[text color for "authentication failed" status] ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** default value: `+lightred+` +** default value: `+lightmagenta+` * [[option_relay.color.status_connecting]] *relay.color.status_connecting* ** description: pass:none[text color for "connecting" status] ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** default value: `+yellow+` +** default value: `+white+` * [[option_relay.color.status_disconnected]] *relay.color.status_disconnected* ** description: pass:none[text color for "disconnected" status] @@ -36,7 +36,7 @@ ** description: pass:none[text color for "waiting authentication" status] ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** default value: `+brown+` +** default value: `+yellow+` * [[option_relay.color.text]] *relay.color.text* ** description: pass:none[text color in relay buffer] @@ -116,6 +116,12 @@ ** values: any string ** default value: `+""+` +* [[option_relay.network.auth_timeout]] *relay.network.auth_timeout* +** description: pass:none[timeout (in seconds) for client authentication: connection is closed if the client is still not authenticated after this delay and the client status is set to "authentication failed" (0 = wait forever)] +** type: integer +** values: 0 .. 2147483647 +** default value: `+60+` + * [[option_relay.network.bind_address]] *relay.network.bind_address* ** description: pass:none[address for bind (if empty, connection is possible on all interfaces, use "127.0.0.1" to allow connections from local machine only)] ** type: string diff --git a/doc/fr/autogen/user/relay_options.adoc b/doc/fr/autogen/user/relay_options.adoc index 5adc8ec43..7337a7b45 100644 --- a/doc/fr/autogen/user/relay_options.adoc +++ b/doc/fr/autogen/user/relay_options.adoc @@ -12,19 +12,19 @@ ** description: pass:none[couleur du texte pour le statut "connecté"] ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné -** valeur par défaut: `+lightblue+` +** valeur par défaut: `+green+` * [[option_relay.color.status_auth_failed]] *relay.color.status_auth_failed* ** description: pass:none[couleur du texte pour le statut "échec auth"] ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné -** valeur par défaut: `+lightred+` +** valeur par défaut: `+lightmagenta+` * [[option_relay.color.status_connecting]] *relay.color.status_connecting* ** description: pass:none[couleur du texte pour le statut "connexion"] ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné -** valeur par défaut: `+yellow+` +** valeur par défaut: `+white+` * [[option_relay.color.status_disconnected]] *relay.color.status_disconnected* ** description: pass:none[couleur du texte pour le statut "déconnecté"] @@ -36,7 +36,7 @@ ** description: pass:none[couleur du texte pour le statut "attente auth"] ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné -** valeur par défaut: `+brown+` +** valeur par défaut: `+yellow+` * [[option_relay.color.text]] *relay.color.text* ** description: pass:none[couleur du texte dans le tampon relay] @@ -116,6 +116,12 @@ ** valeurs: toute chaîne ** valeur par défaut: `+""+` +* [[option_relay.network.auth_timeout]] *relay.network.auth_timeout* +** description: pass:none[temps maximum (en secondes) pour l'authentification du client ; la connexion est fermée si le client n'est toujours pas authentifié après ce délai et le statut est positionné à "échec d'authentification" (0 = attendre sans fin)] +** type: entier +** valeurs: 0 .. 2147483647 +** valeur par défaut: `+60+` + * [[option_relay.network.bind_address]] *relay.network.bind_address* ** description: pass:none[adresse pour le bind (si vide, la connexion est possible sur toutes les interfaces, utiliser "127.0.0.1" pour autoriser les connections depuis la machine locale seulement)] ** type: chaîne diff --git a/doc/it/autogen/user/relay_options.adoc b/doc/it/autogen/user/relay_options.adoc index 03e9c6faf..5a58effc4 100644 --- a/doc/it/autogen/user/relay_options.adoc +++ b/doc/it/autogen/user/relay_options.adoc @@ -12,19 +12,19 @@ ** descrizione: pass:none[colore del testo per lo status "connesso"] ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** valore predefinito: `+lightblue+` +** valore predefinito: `+green+` * [[option_relay.color.status_auth_failed]] *relay.color.status_auth_failed* ** descrizione: pass:none[colore del testo per lo status "autenticazione fallita"] ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** valore predefinito: `+lightred+` +** valore predefinito: `+lightmagenta+` * [[option_relay.color.status_connecting]] *relay.color.status_connecting* ** descrizione: pass:none[colore del testo per lo status "connessione in corso"] ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** valore predefinito: `+yellow+` +** valore predefinito: `+white+` * [[option_relay.color.status_disconnected]] *relay.color.status_disconnected* ** descrizione: pass:none[colore del testo per lo status "disconnesso"] @@ -36,7 +36,7 @@ ** descrizione: pass:none[colore del testo per lo status "in attesa dell'autenticazione"] ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline -** valore predefinito: `+brown+` +** valore predefinito: `+yellow+` * [[option_relay.color.text]] *relay.color.text* ** descrizione: pass:none[colore del testo nei buffer relay] @@ -116,6 +116,12 @@ ** valori: qualsiasi stringa ** valore predefinito: `+""+` +* [[option_relay.network.auth_timeout]] *relay.network.auth_timeout* +** descrizione: pass:none[timeout (in seconds) for client authentication: connection is closed if the client is still not authenticated after this delay and the client status is set to "authentication failed" (0 = wait forever)] +** tipo: intero +** valori: 0 .. 2147483647 +** valore predefinito: `+60+` + * [[option_relay.network.bind_address]] *relay.network.bind_address* ** descrizione: pass:none[indirizzo per l'associazione (se vuoto, la connessione è possibile su tutte le interfacce, usare "127.0.0.1" per consentire le connessioni solo dalla macchina locale)] ** tipo: stringa diff --git a/doc/ja/autogen/user/relay_options.adoc b/doc/ja/autogen/user/relay_options.adoc index ff2710b61..d8b19979f 100644 --- a/doc/ja/autogen/user/relay_options.adoc +++ b/doc/ja/autogen/user/relay_options.adoc @@ -12,19 +12,19 @@ ** 説明: pass:none["接続済み" 状態のテキスト色] ** タイプ: 色 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" -** デフォルト値: `+lightblue+` +** デフォルト値: `+green+` * [[option_relay.color.status_auth_failed]] *relay.color.status_auth_failed* ** 説明: pass:none["認証失敗" 状態のテキスト色] ** タイプ: 色 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" -** デフォルト値: `+lightred+` +** デフォルト値: `+lightmagenta+` * [[option_relay.color.status_connecting]] *relay.color.status_connecting* ** 説明: pass:none["接続中" 状態のテキスト色] ** タイプ: 色 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" -** デフォルト値: `+yellow+` +** デフォルト値: `+white+` * [[option_relay.color.status_disconnected]] *relay.color.status_disconnected* ** 説明: pass:none["接続切断" 状態のテキスト色] @@ -36,7 +36,7 @@ ** 説明: pass:none["認証待ち" 状態のテキスト色] ** タイプ: 色 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" -** デフォルト値: `+brown+` +** デフォルト値: `+yellow+` * [[option_relay.color.text]] *relay.color.text* ** 説明: pass:none[リレーバッファ内のテキスト色] @@ -116,6 +116,12 @@ ** 値: 未制約文字列 ** デフォルト値: `+""+` +* [[option_relay.network.auth_timeout]] *relay.network.auth_timeout* +** 説明: pass:none[timeout (in seconds) for client authentication: connection is closed if the client is still not authenticated after this delay and the client status is set to "authentication failed" (0 = wait forever)] +** タイプ: 整数 +** 値: 0 .. 2147483647 +** デフォルト値: `+60+` + * [[option_relay.network.bind_address]] *relay.network.bind_address* ** 説明: pass:none[割り当てるアドレス (空の場合、全てのインターフェースからの接続を受け付ける、"127.0.0.1" を使えばローカルマシンからの接続のみ許可)] ** タイプ: 文字列 diff --git a/doc/pl/autogen/user/relay_options.adoc b/doc/pl/autogen/user/relay_options.adoc index c3696e88a..cf113418b 100644 --- a/doc/pl/autogen/user/relay_options.adoc +++ b/doc/pl/autogen/user/relay_options.adoc @@ -12,19 +12,19 @@ ** opis: pass:none[kolor statusu "connected"] ** typ: kolor ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie -** domyślna wartość: `+lightblue+` +** domyślna wartość: `+green+` * [[option_relay.color.status_auth_failed]] *relay.color.status_auth_failed* ** opis: pass:none[kolor statusu "authentication failed"] ** typ: kolor ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie -** domyślna wartość: `+lightred+` +** domyślna wartość: `+lightmagenta+` * [[option_relay.color.status_connecting]] *relay.color.status_connecting* ** opis: pass:none[kolor statusu "connecting"] ** typ: kolor ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie -** domyślna wartość: `+yellow+` +** domyślna wartość: `+white+` * [[option_relay.color.status_disconnected]] *relay.color.status_disconnected* ** opis: pass:none[kolor statusu "disconnected"] @@ -36,7 +36,7 @@ ** opis: pass:none[kolor statusu "waiting authentication"] ** typ: kolor ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie -** domyślna wartość: `+brown+` +** domyślna wartość: `+yellow+` * [[option_relay.color.text]] *relay.color.text* ** opis: pass:none[kolor tekstu w buforze pośrednika] @@ -116,6 +116,12 @@ ** wartości: dowolny ciąg ** domyślna wartość: `+""+` +* [[option_relay.network.auth_timeout]] *relay.network.auth_timeout* +** opis: pass:none[timeout (in seconds) for client authentication: connection is closed if the client is still not authenticated after this delay and the client status is set to "authentication failed" (0 = wait forever)] +** typ: liczba +** wartości: 0 .. 2147483647 +** domyślna wartość: `+60+` + * [[option_relay.network.bind_address]] *relay.network.bind_address* ** opis: pass:none[adres do przypisania (jeśli puste, połączenie jest możliwe na wszystkich interfejsach, użyj "127.0.0.1", aby pozwolić tylko na połączenia z tej maszyny)] ** typ: ciąg diff --git a/po/cs.po b/po/cs.po index 0fd18d865..c4d3bc20b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-03-08 14:22+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -11019,6 +11019,12 @@ msgid "" "\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" msgstr "" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/de.po b/po/de.po index 15fa78765..db8b551e8 100644 --- a/po/de.po +++ b/po/de.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-04-03 20:03+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -12965,6 +12965,12 @@ msgstr "" "Kleinschreibung zu unterscheiden muss die Zeichenkette mit \"(?-i)\" " "eingeleitet werden), Beispiele: \"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/es.po b/po/es.po index 6b3235514..9e258cca5 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-03-08 14:22+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -11364,6 +11364,12 @@ msgstr "" "mapeada a IPv6 (como: \"::ffff:127.0.0.1\"), ejemplo: \"^((::ffff:)?" "123\\.45\\.67\\.89|192\\.160\\..*)$\"" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/fr.po b/po/fr.po index d350cf7e1..07b7939fc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" -"PO-Revision-Date: 2020-04-12 17:28+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" +"PO-Revision-Date: 2020-04-12 19:35+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -12693,6 +12693,15 @@ msgstr "" "(insensible à la casse, utilisez \"(?-i)\" en début de chaîne pour la rendre " "insensible à la casse), exemple : \"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" +"temps maximum (en secondes) pour l'authentification du client ; la connexion " +"est fermée si le client n'est toujours pas authentifié après ce délai et le " +"statut est positionné à \"échec d'authentification\" (0 = attendre sans fin)" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/hu.po b/po/hu.po index bedeca8c1..88fb26a7b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-03-08 14:22+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -10365,6 +10365,12 @@ msgid "" "\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" msgstr "" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/it.po b/po/it.po index c38624223..fdd28822d 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-03-08 14:22+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -11565,6 +11565,12 @@ msgstr "" "ffff:127.0.0.1\",come: \"::ffff:127.0.0.1\"), esempio: \"^((::ffff:)?" "123\\.45\\.67\\.89|192\\.160\\..*)$\"" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/ja.po b/po/ja.po index e67c31968..4f674d613 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-03-08 14:22+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -12414,6 +12414,12 @@ msgstr "" "początku sprawi, że wielość znaków będzie miała znaczenie), przykład: " "\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/pt.po b/po/pt.po index f5adabf11..1c92251ca 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-03-08 14:22+0100\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -12012,6 +12012,12 @@ msgstr "" "(não destinge maiúscula e minúscula, use \"(?-i)\" no início para " "distinguir), exemplo: \"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 143012ea4..e437df231 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2019-11-03 08:38+0100\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -10814,6 +10814,12 @@ msgstr "" "expressão regular com IPs permitidos a usar o relay, por exemplo: " "\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/ru.po b/po/ru.po index ed1c60fd3..063278e7b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2020-03-08 14:22+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -10401,6 +10401,12 @@ msgid "" "\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" msgstr "" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/tr.po b/po/tr.po index 8b2148344..f839e32bd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2019-11-03 08:38+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -9453,6 +9453,12 @@ msgid "" "\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" msgstr "" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/po/weechat.pot b/po/weechat.pot index b49a191ea..a620a0c6d 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-12 17:27+0200\n" +"POT-Creation-Date: 2020-04-12 19:34+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -9314,6 +9314,12 @@ msgid "" "\"^(123\\.45\\.67\\.89|192\\.160\\..*)$\"" msgstr "" +msgid "" +"timeout (in seconds) for client authentication: connection is closed if the " +"client is still not authenticated after this delay and the client status is " +"set to \"authentication failed\" (0 = wait forever)" +msgstr "" + msgid "" "address for bind (if empty, connection is possible on all interfaces, use " "\"127.0.0.1\" to allow connections from local machine only)" diff --git a/src/plugins/relay/relay-client.c b/src/plugins/relay/relay-client.c index acc6363d8..d3d157e9e 100644 --- a/src/plugins/relay/relay-client.c +++ b/src/plugins/relay/relay-client.c @@ -1209,7 +1209,7 @@ int relay_client_timer_cb (const void *pointer, void *data, int remaining_calls) { struct t_relay_client *ptr_client, *ptr_next_client; - int purge_delay; + int purge_delay, auth_timeout; time_t current_time; /* make C compiler happy */ @@ -1218,6 +1218,7 @@ relay_client_timer_cb (const void *pointer, void *data, int remaining_calls) (void) remaining_calls; purge_delay = weechat_config_integer (relay_config_network_clients_purge_delay); + auth_timeout = weechat_config_integer (relay_config_network_auth_timeout); current_time = time (NULL); @@ -1237,7 +1238,19 @@ relay_client_timer_cb (const void *pointer, void *data, int remaining_calls) } else if (ptr_client->sock >= 0) { + /* send messages in outqueue */ relay_client_send_outqueue (ptr_client); + + /* disconnect clients not authenticated */ + if ((auth_timeout > 0) + && (ptr_client->status == RELAY_STATUS_WAITING_AUTH)) + { + if (current_time - ptr_client->start_time > auth_timeout) + { + relay_client_set_status (ptr_client, + RELAY_STATUS_AUTH_FAILED); + } + } } ptr_client = ptr_next_client; diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c index 6f9e66667..f9c66ce47 100644 --- a/src/plugins/relay/relay-config.c +++ b/src/plugins/relay/relay-config.c @@ -60,6 +60,7 @@ struct t_config_option *relay_config_color_text_selected; struct t_config_option *relay_config_network_allow_empty_password; struct t_config_option *relay_config_network_allowed_ips; +struct t_config_option *relay_config_network_auth_timeout; struct t_config_option *relay_config_network_bind_address; struct t_config_option *relay_config_network_clients_purge_delay; struct t_config_option *relay_config_network_compression_level; @@ -1031,6 +1032,15 @@ relay_config_init () NULL, NULL, NULL, &relay_config_change_network_allowed_ips, NULL, NULL, NULL, NULL, NULL); + relay_config_network_auth_timeout = weechat_config_new_option ( + relay_config_file, ptr_section, + "auth_timeout", "integer", + N_("timeout (in seconds) for client authentication: connection is " + "closed if the client is still not authenticated after this delay " + "and the client status is set to \"authentication failed\" " + "(0 = wait forever)"), + NULL, 0, INT_MAX, "60", NULL, 0, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); relay_config_network_bind_address = weechat_config_new_option ( relay_config_file, ptr_section, "bind_address", "string", diff --git a/src/plugins/relay/relay-config.h b/src/plugins/relay/relay-config.h index 355c4ab41..35253abb9 100644 --- a/src/plugins/relay/relay-config.h +++ b/src/plugins/relay/relay-config.h @@ -39,6 +39,7 @@ extern struct t_config_option *relay_config_color_text_selected; extern struct t_config_option *relay_config_network_allow_empty_password; extern struct t_config_option *relay_config_network_allowed_ips; +extern struct t_config_option *relay_config_network_auth_timeout; extern struct t_config_option *relay_config_network_bind_address; extern struct t_config_option *relay_config_network_clients_purge_delay; extern struct t_config_option *relay_config_network_compression_level;