clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-21 02:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

add missing use-statement for opcacheinfo page; ease ClientConnectRate ban-filter for proftpd; allow null-mx entry in dns-editor, fixes #1263

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann 2024-07-27 19:51:55 +02:00
parent 585b16d199
commit 75bc0142a0
No known key found for this signature in database
GPG Key ID: C121F97338D7A352
9 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin_opcacheinfo.php
View File

@ -35,6 +35,7 @@ require __DIR__ . '/lib/init.php';
use Froxlor\FroxlorLogger; use Froxlor\FroxlorLogger;
use Froxlor\UI\HTML; use Froxlor\UI\HTML;
use Froxlor\UI\Panel\UI; use Froxlor\UI\Panel\UI;
use Froxlor\UI\Request;
use Froxlor\UI\Response; use Froxlor\UI\Response;
if ($action == 'reset' && function_exists('opcache_reset') && $userinfo['change_serversettings'] == '1') { if ($action == 'reset' && function_exists('opcache_reset') && $userinfo['change_serversettings'] == '1') {

6
lib/Froxlor/Api/Commands/DomainZones.php
View File

@ -227,7 +227,7 @@ class DomainZones extends ApiCommand implements ResourceEntity
// remove it for checks // remove it for checks
$content = substr($content, 0, -1); $content = substr($content, 0, -1);
} }
if (!Validate::validateDomain($content)) { if (!empty($content) && !Validate::validateDomain($content)) {
$errors[] = lng('error.dns_mx_needdom'); $errors[] = lng('error.dns_mx_needdom');
} else { } else {
// check whether there is a CNAME-record for the same resource // check whether there is a CNAME-record for the same resource
@ -244,6 +244,10 @@ class DomainZones extends ApiCommand implements ResourceEntity
} }
// append trailing dot (again) // append trailing dot (again)
$content .= '.'; $content .= '.';
// if content is only ".", the prio needs to be 0 which results in a "null mx" entry
if ($content == '.' && $prio != 0) {
$prio = 0;
}
} elseif ($type == 'NS') { } elseif ($type == 'NS') {
// check for trailing dot // check for trailing dot
if (substr($content, -1) == '.') { if (substr($content, -1) == '.') {

2
lib/configfiles/bookworm.xml
View File

@ -3093,7 +3093,7 @@ MaxLoginAttempts 3
BanLog /var/log/proftpd/ban.log BanLog /var/log/proftpd/ban.log
BanTable /etc/proftpd/ban.tab BanTable /etc/proftpd/ban.tab
BanMessage "User %u was banned." BanMessage "User %u was banned."
BanOnEvent ClientConnectRate 5/00:00:02 12:00:00 "Stop connecting frequently" BanOnEvent ClientConnectRate 10/00:00:02 02:00:00 "Stop connecting frequently"
BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00 BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00
BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99 BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99
BanControlsACLs all allow user root BanControlsACLs all allow user root

2
lib/configfiles/bullseye.xml
View File

@ -4661,7 +4661,7 @@ MaxLoginAttempts 3
BanLog /var/log/proftpd/ban.log BanLog /var/log/proftpd/ban.log
BanTable /etc/proftpd/ban.tab BanTable /etc/proftpd/ban.tab
BanMessage "User %u was banned." BanMessage "User %u was banned."
BanOnEvent ClientConnectRate 5/00:00:02 12:00:00 "Stop connecting frequently" BanOnEvent ClientConnectRate 10/00:00:02 02:00:00 "Stop connecting frequently"
BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00 BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00
BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99 BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99
BanControlsACLs all allow user root BanControlsACLs all allow user root

2
lib/configfiles/focal.xml
View File

@ -3880,7 +3880,7 @@ MaxLoginAttempts 3
BanLog /var/log/proftpd/ban.log BanLog /var/log/proftpd/ban.log
BanTable /etc/proftpd/ban.tab BanTable /etc/proftpd/ban.tab
BanMessage "User %u was banned." BanMessage "User %u was banned."
BanOnEvent ClientConnectRate 5/00:00:02 12:00:00 "Stop connecting frequently" BanOnEvent ClientConnectRate 10/00:00:02 02:00:00 "Stop connecting frequently"
BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00 BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00
BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99 BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99
BanControlsACLs all allow user root BanControlsACLs all allow user root

2
lib/configfiles/jammy.xml
View File

@ -3872,7 +3872,7 @@ MaxLoginAttempts 3
BanLog /var/log/proftpd/ban.log BanLog /var/log/proftpd/ban.log
BanTable /etc/proftpd/ban.tab BanTable /etc/proftpd/ban.tab
BanMessage "User %u was banned." BanMessage "User %u was banned."
BanOnEvent ClientConnectRate 5/00:00:02 12:00:00 "Stop connecting frequently" BanOnEvent ClientConnectRate 10/00:00:02 02:00:00 "Stop connecting frequently"
BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00 BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00
BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99 BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99
BanControlsACLs all allow user root BanControlsACLs all allow user root

2
lib/configfiles/noble.xml
View File

@ -2547,7 +2547,7 @@ MaxLoginAttempts 3
BanLog /var/log/proftpd/ban.log BanLog /var/log/proftpd/ban.log
BanTable /etc/proftpd/ban.tab BanTable /etc/proftpd/ban.tab
BanMessage "User %u was banned." BanMessage "User %u was banned."
BanOnEvent ClientConnectRate 5/00:00:02 12:00:00 "Stop connecting frequently" BanOnEvent ClientConnectRate 10/00:00:02 02:00:00 "Stop connecting frequently"
BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00 BanOnEvent MaxLoginAttempts 3/00:30:00 12:00:00
BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99 BanOnEvent AnonRejectPasswords 1/01:00:00 99:99:99
BanControlsACLs all allow user root BanControlsACLs all allow user root

2
lng/de.lng.php
View File

@ -1824,7 +1824,7 @@ Vielen Dank, Ihr Administrator',
], ],
'documentroot_use_default_value' => [ 'documentroot_use_default_value' => [
'title' => 'Verwende Domainnamen im Documentroot', 'title' => 'Verwende Domainnamen im Documentroot',
'description' => 'Wenn aktiviert wird dem standard Documentroot zusätzlich der Domain-Name angehängt.<br /><br />Beispiel:<br />/var/customers/customer_name/example.tld/<br />/var/customers/customer_name/subdomain.example.tld/', 'description' => 'Wenn aktiviert wird dem standard Documentroot zusätzlich der Domain-Name angehängt.<br /><br />Beispiel:<br />/var/customers/webs/customer_name/example.tld/<br />/var/customers/webs/customer_name/subdomain.example.tld/',
], ],
'panel_phpconfigs_hidesubdomains' => [ 'panel_phpconfigs_hidesubdomains' => [
'title' => 'Verstecke Subdomains in PHP-Konfigurations-Übersicht', 'title' => 'Verstecke Subdomains in PHP-Konfigurations-Übersicht',

2
lng/en.lng.php
View File

@ -1946,7 +1946,7 @@ Yours sincerely, your administrator',
], ],
'documentroot_use_default_value' => [ 'documentroot_use_default_value' => [
'title' => 'Use domain name as default value for DocumentRoot path', 'title' => 'Use domain name as default value for DocumentRoot path',
'description' => 'If enabled and DocumentRoot path is empty, default value will be the (sub)domain name.<br /><br />Examples: <br />/var/customers/customer_name/example.com/<br />/var/customers/customer_name/subdomain.example.com/', 'description' => 'If enabled and DocumentRoot path is empty, default value will be the (sub)domain name.<br /><br />Examples: <br />/var/customers/webs/customer_name/example.com/<br />/var/customers/webs/customer_name/subdomain.example.com/',
], ],
'panel_phpconfigs_hidesubdomains' => [ 'panel_phpconfigs_hidesubdomains' => [
'title' => 'Hide subdomains in PHP-configuration overview', 'title' => 'Hide subdomains in PHP-configuration overview',