maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
5,764 Commits 6 Branches 188 Tags
c89d320957575d284f9d5b5e560432e2ce79ac2a
Commit Graph

2970 Commits

Author SHA1 Message Date
Michael Kaufmann
c89d320957 use Request-wrapper-class for every access to superglobal 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-16 08:30:35 +02:00
Michael Kaufmann
597f338353 add force-updatecheck renew icon for update-check popover 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-12 14:15:05 +02:00
Michael Kaufmann
cda0b3116f make docs url dynamic based on (night/testing) version 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-12 13:51:03 +02:00
Michael Kaufmann
73182a6909 check for already existing symlink to bin/froxlor-cli; remove some very old dkim related settings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-12 11:09:48 +02:00
Michael Kaufmann
1a5680d2a8 never allow {{ }} in user-input 2024-05-10 17:23:25 +02:00
Michael Kaufmann
c07ff16274 Merge branch 'main' of github.com:froxlor/Froxlor 2024-05-10 17:09:59 +02:00
rex2630
cf18140499 Automatic assigment of "worker_processes" in nginx (#1252) 
* Upgrade of nginx config by default reference
 2024-05-10 17:09:25 +02:00
Michael Kaufmann
7934684982 use Request-wrapper-class for every access to $_GET superglobal 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-09 16:03:46 +02:00
Michael Kaufmann
fce310049a use Request-wrapper-class for every access to $_POST superglobal 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-09 15:48:23 +02:00
Michael Kaufmann
914204b483 Merge branch 'main' of github.com:froxlor/Froxlor 2024-05-07 19:45:13 +02:00
rex2630
fc3f0d8ebf Add config for Ubuntu 24.04 - Noble Numbat (#1251) 
* Add config for Ubuntu 24.04 - Noble Numbat

* Use php 8.3 by default
 2024-05-07 19:45:00 +02:00
Michael Kaufmann
27753962cf use default caching_sha2_password auth plugin for mysql8 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-03 09:02:22 +02:00
Michael Kaufmann
1b44ee2e06 Merge pull request from GHSA-x525-54hf-xr53 
* do not log unvalidated user-input to mysql-log (if enabled)

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

* clean log-text to only allow a subset of special characters

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

* clean log-text when selecting from database to avoid possible previously added malicious entries

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

---------

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-05-03 07:54:13 +02:00
Michael Kaufmann
7f8b36e0bd select homedir/maildir from emails if called interally as it is also called by customers via EmailAccounts.delete() 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-04-28 14:03:38 +02:00
Michael Kaufmann
71746f8dac select homedir/maildir from emails if called by admin 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-04-28 13:58:27 +02:00
Michael Kaufmann
d6b8eb08c0 add delete-userfiles flag for Domain.delete() to remove email-account data on the filesystem (if any); fixes #1239 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-04-28 13:49:07 +02:00
Michael Kaufmann
5625503e2d add compatibility for mariadb-dump executable instead of mysqldump 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-04-27 10:22:42 +02:00
Michael Kaufmann
ff4c54a9d5 also add logfiles to virtual-host if it's a redirect 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-27 10:17:02 +01:00
Wiebe Cazemier
7c3e89ccc0 Fix "expires" option cannot have a year greater than 9999 (#1246) 
This fixes the exception: '"expires" option cannot have a year greater
than 9999', which happens on upgrade from Debian 11 to 12. The session
timeout in the DB is 9999999999999, so we constrain the value.
 2024-03-23 15:14:11 +01:00
Michael Kaufmann
76c23cf9b1 wrap SetHandler to php-fpm in file-exists check, as we do for customer-domains already 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-17 08:23:57 +01:00
Michael Kaufmann
ee7b47c3c0 correctly save pass_authorizationheader flag for php-configs if FCGID is used; correctly add 'FcgidPassHeader' for froxlor-vhost itself if set 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-11 08:00:26 +01:00
Michael Kaufmann
537b274b4c correctly validate if a symlink is within the customers home-directory if it's not an absolute path; fixes #1242 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-08 09:23:21 +01:00
Michael Kaufmann
d8b86fc3c5 correctly disabled ssl-related settings when domain update sets ssl-enbled flag to false; fixes #1241 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-04 16:48:35 +01:00
Michael Kaufmann
b675c84ae4 correctly add user-wide mysql-user when creating user with mysql-resources (accesst to all databases starting with the loginname) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-04 10:21:46 +01:00
Michael Kaufmann
c0fdc62032 correctly convert allowed_mysqlserver json-string to array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-03 11:44:29 +01:00
Michael Kaufmann
b14eaf454c reset Database::needRoot flag after root-user session 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-03 11:34:57 +01:00
Michael Kaufmann
2fc319b991 fix typo 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-03 10:39:22 +01:00
Michael Kaufmann
d86da23187 remove unused hidden-settings; correct setting-language-strings-layout; add blacklist for usernames when creating a Customer which may lead to internal issues 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-03 10:35:58 +01:00
Michael Kaufmann
70b3e61f4c re-trigger vhost regeneration on tmp. ssl-redirect 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-03-03 10:32:32 +01:00
Michael Kaufmann
8132976559 implement 'master database user for customers'; fixes #1227 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-02-11 10:27:18 +01:00
sro0
686ca84a30 Ensure that DMARC entries are generated as subdomain, Allow overwriting of DMARC and SPF subdomain records (#1237) 
* Ensure that DMARC entries are generated as subdomain
- see https://datatracker.ietf.org/doc/html/rfc7489#section-6.1

* Add tests for DNS DMARC

* Allow custom SPF and DMARC subdomain records to replace default records

* Improve tests for DMARC, add DMARC tests for subdomain
 2024-02-09 08:11:41 +01:00
sro0
953baec023 Allow service ftpserver to be specified via configuration-template-xml default (#1234) 2024-02-09 08:06:57 +01:00
Michael Kaufmann
396274d954 fix adding/editing domains as customer when php is not enabled for the domain; don't add custom-vhost-content to deactivated domain-vhosts 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-02-05 22:09:49 +01:00
Michael Kaufmann
4e23b9652c fix regression bug in 'incorrect top-5 customers' sorting in traffic-overview which leads to incorrect customer-links due to wrong indexing in the array; fixes #1236 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-02-04 19:54:19 +01:00
Michael Kaufmann
ece4b34f25 fix password crypt hash being always evaluated to argon2i as the case always returns true if PASSWORD_ARGON2I is defined but the froxlor setting might be set to another hash leading to a useless password 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-02-03 10:12:36 +01:00
Michael Kaufmann
9c70976018 fix check for allowed_phpconfigs if using mod_php when adding/editing a customer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-30 19:31:21 +01:00
Michael Kaufmann
594d7d84bb Merge branch 'main' of github.com:Froxlor/Froxlor 2024-01-29 20:27:12 +01:00
sro0
9d4bc94aef Rename dovecot config file generated be renew hook to ensure it gets included (#1233) 
after default froxlor config file
 2024-01-29 20:26:38 +01:00
Michael Kaufmann
f03b49d0db api documentation additions for Customers.add()/update() and Admins.add()/update() 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-28 10:03:56 +01:00
Michael Kaufmann
bcf0818faf set correct channel for update-check if switching from apt-installed stable/testing to nightly 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-26 13:56:01 +01:00
Michael Kaufmann
dd765089c9 fix wrong setting-name for dkim-keylength when generating dkim-keys 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-26 13:55:14 +01:00
Michael Kaufmann
a7ee5e0ae3 create empty dns-server config if no (dns-enabled) domain is determined; fixes #1230 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-24 08:38:32 +01:00
Michael Kaufmann
2629718b22 add new 'http2 on' directive for nginx >=1.25.1 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-23 00:01:12 +01:00
Michael Kaufmann
9b20f4ac39 fix wrong order of ecc/non-ecc in proftpd config adjustment for let's encrypt renew-hook 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-19 16:09:24 +01:00
Michael Kaufmann
616dcb1fda use correct syntax for postconf in Let's Encrypt renew-hook service-configuration replacement; add missing language strings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-19 16:01:31 +01:00
Michael Kaufmann
bc1892d4ec fix incorrect top-5 customers in traffic overview for admins; show manual update command if webupdate is disabled 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-19 09:21:38 +01:00
sro0
83047019b0 Check for argon2 support before using constant PASSWORD_ARGON2X (#1228) 2024-01-16 21:34:17 +01:00
Michael Kaufmann
f420551888 added configuration adjustment for prodtpd if renew-hook for lets encrypt is used; updater-compatibility if gui_access field is not present yet (froxlor <2.2); removed depercated gentoo config templates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-14 09:40:33 +01:00
sro0
854c930696 Ensure XPath for ConfigDaemon matches exactly one element (#1224) 2024-01-13 12:31:15 +01:00
Michael Kaufmann
8740947323 initial integration of let's encrypt renew-hook for froxlor-vhost; refs #1186 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-13 11:12:48 +01:00