From patchwork Mon Aug 10 17:12:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 3300 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BQMwh1tvTz3x0w for ; Mon, 10 Aug 2020 17:12:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BQMwf6Zzmzg7; Mon, 10 Aug 2020 17:12:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BQMwf5BZKz2yjB; Mon, 10 Aug 2020 17:12:50 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BQMwd09RMz2xl0 for ; Mon, 10 Aug 2020 17:12:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BQMwc2CK7zg7; Mon, 10 Aug 2020 17:12:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1597079568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w/vC4kZH8Sj4f+iQ6APm+OTqfs/FGwHhxii+DjNvNTY=; b=0rCq2EUwgOh0PTo/V3e63k9edfsvxpYL4RtMmbXgLGLeBHZEFJh89xMjFHq3Xbn43S7gbL 79A1lTELlR+6xhBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1597079568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w/vC4kZH8Sj4f+iQ6APm+OTqfs/FGwHhxii+DjNvNTY=; b=tZY9N4eUst+c2MCcYzzYxOQUqZen5h88jYfBR9h37nGTSzRfgCeVlcPlJ/2Po+QrVGC4nP fiIn0kNpXvslSxLPR0fqXIo8YQ0fkvnrXpxpmfJfq9svFTSIvFqtdSQjWTuekYfRuu4BbN tYUiUMPvpqVAtEl4QkxtWWR//GyoXbl+cypfca0+eqH+XYqF8SKXdSe7SwnQc2g3ED8+vn lKLEi1/oBQC4XqpbOGVSA/1qDhltebKEq5bwOpH7P/qg06tAqlgTtNnKd3uAF1AjokX6eD fqO8x3IfrCfGEA6jNOwZ0VNg+vLRk2pdCmlqQWSisw9wDCfpOSjFnimF2DLbOg== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH v2] OpenVPN: max-clients value has been enhanced Date: Mon, 10 Aug 2020 19:12:19 +0200 Message-Id: <20200810171219.1364-1-ummeegge@ipfire.org> In-Reply-To: <51808fb02046e2fb84914bd63680f2c2cbe4f010.camel@ipfire.org> References: <51808fb02046e2fb84914bd63680f2c2cbe4f010.camel@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=ummeegge@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The --max-client value has been enhanced from 255 clients to 1024 clients. Error message gives now explanation if the maximum has been reached. Patch has been triggered by https://community.ipfire.org/t/openvpn-max-vpn-clients-quantity-and-connections/2925 . Signed-off-by: Erik Kapfer Reviewed-by: Michael Tremer --- html/cgi-bin/ovpnmain.cgi | 2 +- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 457ebcf1f..e80ee23a7 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -890,7 +890,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { undef $vpnsettings{'ROUTES_PUSH'}; &write_routepushfile; } - if ((length($cgiparams{'MAX_CLIENTS'}) == 0) || (($cgiparams{'MAX_CLIENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 255 )) { + if ((length($cgiparams{'MAX_CLIENTS'}) == 0) || (($cgiparams{'MAX_CLIENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 1024 )) { $errormessage = $Lang::tr{'invalid input for max clients'}; goto ADV_ERROR; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b01e75eb5..bcea33320 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1457,7 +1457,7 @@ 'invalid input for keepalive 1:2' => 'Ungültige Eingabe für Keepalive (mindestens ein Verhältnis von 1:2)', 'invalid input for keepalive 2' => 'Ungültige Eingabe für Keepalive ping-restart', 'invalid input for local ip address' => 'Ungültige Eingabe für die lokale IP-Adresse', -'invalid input for max clients' => 'Ungültige Eingabe für Max Clients', +'invalid input for max clients' => 'Ungültige Eingabe für Max Clients. Das Maximum von 1024 Clients wurde überschritten', 'invalid input for mode' => 'Ungültige Eingabe des Modus', 'invalid input for name' => 'Ungültige Eingabe für vollen Namen des Benutzers oder des System Hostnamens', 'invalid input for oink code' => 'Ungültige Eingabe für Oink Code', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7e3bbec89..95ee46393 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1481,7 +1481,7 @@ 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2', 'invalid input for keepalive 2' => 'Invalid input for Keepalive ping-restart', 'invalid input for local ip address' => 'Invalid input for local IP address', -'invalid input for max clients' => 'Invalid input for Max Clients', +'invalid input for max clients' => 'Invalid input for Max Clients. The maximum of 1024 clients has been exceeded', 'invalid input for mode' => 'Invalid input for mode', 'invalid input for name' => 'Invalid input for user\'s full name or system hostname', 'invalid input for oink code' => 'Invalid input for Oink code', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index c75a47324..8a611e181 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -980,7 +980,7 @@ 'invalid input for keepalive 1' => 'Entrada no válida para ping Keepalive', 'invalid input for keepalive 1:2' => 'Entrada no válida para Keepalive, use por lo menos una relación 1:2', 'invalid input for keepalive 2' => 'Entrada no válida para reinicio de ping Keepalive', -'invalid input for max clients' => 'Entrada no válida para Máximo número de Clientes', +'invalid input for max clients' => 'Entrada no válida para Máximo número de Clientes. Se superó el máximo de 1024 clientes.', 'invalid input for name' => 'Entrada no válida para nombre completo de usuario o nombre de host del sistema', 'invalid input for oink code' => 'Entrada no válida para código Oink', 'invalid input for organization' => 'Entrada no válida para organización', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index d9930230f..fc19257bf 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1487,7 +1487,7 @@ 'invalid input for keepalive 1:2' => 'Keepalive non valide, utilisez au minimum un ratio de 1:2', 'invalid input for keepalive 2' => 'Redémarrage ping keepalive non valide', 'invalid input for local ip address' => 'Entrée non valide pour l\'adresse IP locale', -'invalid input for max clients' => 'Nombre de clients maximum non valide', +'invalid input for max clients' => 'Nombre de clients maximum non valide. Le maximum de 1024 clients a été dépassé.', 'invalid input for mode' => 'Entrée non valide pour le mode', 'invalid input for name' => 'Mauvaise saisie pour le nom d\'utilisateur ou le nom d\'hôte du système', 'invalid input for oink code' => 'Oink code non valide', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 6c9137c28..fa4591b67 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1298,7 +1298,7 @@ 'invalid input for keepalive 1' => 'Invalid input for Keepalive ping', 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2', 'invalid input for keepalive 2' => 'Invalid input for Keepalive ping-restart', -'invalid input for max clients' => 'Invalid input for Max Clients', +'invalid input for max clients' => 'Invalid input for Max Clients. È stato superato il massimo di 1024 client.', 'invalid input for name' => 'Invalid input for user\'s full name or system hostname', 'invalid input for oink code' => 'Invalid input for Oink code', 'invalid input for organization' => 'Invalid input for organization', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 5fa89b1ac..4be11d5c1 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1277,7 +1277,7 @@ 'invalid input for keepalive 1' => ' Ongeldige invoer voor keepalive ping', 'invalid input for keepalive 1:2' => ' Ongeldige invoer voor keepalive gebruik tenminste een ratio van 1:2', 'invalid input for keepalive 2' => ' Ongeldige invoer voor keepalive ping-herstart', -'invalid input for max clients' => ' Ongeldige invoer voor max. clients', +'invalid input for max clients' => ' Ongeldige invoer voor max. clients. Het maximum van 1024 clients is overschreden.', 'invalid input for name' => ' Ongeldige invoer voor gebruikersnaam of systeemhostnaam', 'invalid input for oink code' => ' Ongeldige invoer voor Oink code', 'invalid input for organization' => ' Ongeldige invoer voor organisatie', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 521381af2..e77120273 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -989,7 +989,7 @@ 'invalid input for keepalive 1' => 'Niepoprawna wartość w polu Keepalive ping', 'invalid input for keepalive 1:2' => 'Niepoprawna wartość w polu Keepalive. Używaj min. współczynnika 1:2', 'invalid input for keepalive 2' => 'Niepoprawna wartość w polu Keepalive ping-restart', -'invalid input for max clients' => 'Niepoprawna wartość w polu Max Klientów', +'invalid input for max clients' => 'Niepoprawna wartość w polu Max Klientów. Przekroczono maksymalną liczbę 1024 klientów.', 'invalid input for name' => 'Niepoprawna wartość w polu pełna nazwa użytkownika lub nazwa hosta systemu', 'invalid input for oink code' => 'Niepoprawny OINKCODE', 'invalid input for organization' => 'Niepoprawna wartość w polu organizacja', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 9ac46d459..29e6b5f93 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -982,7 +982,7 @@ 'invalid input for keepalive 1' => 'Неверно указан Keepalive ping.', 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2.', 'invalid input for keepalive 2' => 'Неверно указан Keepalive ping-restart.', -'invalid input for max clients' => 'Неверно указано максимальное число клиентов.', +'invalid input for max clients' => 'Неверно указано максимальное число клиентов. Превышено максимально 1024 клиентов.', 'invalid input for name' => 'Неверно указано полное имя пользователя или системное имя хоста.', 'invalid input for oink code' => 'Неверно указан Oink code', 'invalid input for organization' => 'Неверно указана организация', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index c23ff5df6..ea2047609 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1415,7 +1415,7 @@ 'invalid input for keepalive 1' => 'Ping komutunu canlı tutma için geçersiz giriş.', 'invalid input for keepalive 1:2' => '1:2 oranında, en az bir oranı canlı tutma kullanım için geçersiz giriş', 'invalid input for keepalive 2' => 'Ping komutunu yeniden başlatmada canlı tutmak için geçersiz giriş.', -'invalid input for max clients' => 'En fazla istemci için geçersiz giriş.', +'invalid input for max clients' => 'En fazla istemci için geçersiz giriş. Maksimum 1024 müşteri aşıldı.', 'invalid input for name' => 'Kullanıcının tam adı veya sistem ana bilgisayar adı için geçersiz giriş', 'invalid input for oink code' => 'Oink kodu için geçersiz giriş.', 'invalid input for organization' => 'Kuruluş için geçersiz giriş.',