25739 Commits

Author SHA1 Message Date
Ilia Ross
3a2b2b8671 Fix UI Demo module category
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
2.670
2026-09-21 03:50:10 +02:00
Ilia Ross
fcd0f80ad9 Fix FTPS data session reuse
This patch fixes FTPS backups failing on servers that require TLS session reuse.

It reuses the control connection's TLS session for data uploads.

It adds coverage for an actual passive-mode upload and was verified against a live ProFTPD server.

https://github.com/webmin/webmin/issues/2849#issuecomment-5752478469
2026-09-21 00:58:14 +02:00
Ilia Ross
78d307aa77 Fix textbox width for backup server and path inputs 2026-09-20 23:50:49 +02:00
Ilia Ross
b0cca9edf2 Fix backup destination selector handling
This patch fixes the Backup Configuration destination selector by using the new select-based UI.

It keeps existing field names and backup behavior unchanged.

It also ensures browser downloads bypass AJAX and submit correctly.
2026-09-20 23:46:07 +02:00
Ilia Ross
eb93c7aac3 Fix to collect searches across allowed directories
290ab1aaea (r201223944)
2026-09-20 22:47:26 +02:00
Jamie Cameron
290ab1aaea Fix support for multiple allowed directories 2026-09-20 13:26:28 -07:00
Ilia Ross
bfa733907e Fix explicit FTPS backup negotiation
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
https://github.com/webmin/webmin/issues/2849#issuecomment-5751772604
2026-09-20 21:33:54 +02:00
Jamie Cameron
dedf55cba2 Make extra sure that search results are under allowed paths 2026-09-20 12:15:21 -07:00
Jamie Cameron
2402ed97d7 new version bump 2026-09-20 09:27:01 -07:00
Jamie Cameron
cc95d6285a Ensure that old password is requested before new one is sent 2026-09-20 09:20:31 -07:00
Jamie Cameron
5a03eafaa8 Merge branch 'master' of github.com:webmin/webmin 2026-09-20 09:12:59 -07:00
Jamie Cameron
6a53df97ef Ensure directory is at or under the chroot 2026-09-20 09:12:53 -07:00
Ilia Ross
1867e9a069 Update changelog 2026-09-20 18:11:44 +02:00
Jamie Cameron
dc558631ef Don't create empty log file until all validation passes 2026-09-20 09:05:15 -07:00
Ilia Ross
6b80935024 Update changelog
[no-build] [no-review]
2026-09-20 17:54:42 +02:00
Ilia Ross
95c974edc4 Fix comments on skipped Apache conditionals
This patch fixes comments before skipped `IfModule`, `IfDefine`, and `IfVersion` blocks being attached to the next parsed directive.

For example:

```apache
# SSL-only settings
<IfModule mod_ssl.c>
    SSLEngine on
</IfModule>
ServerName example.test
```

When `mod_ssl` was unavailable, Webmin attached `# SSL-only settings` to `ServerName`. Deleting `ServerName` could then remove the wrong line and produce:

```apache
# SSL-only settings
<IfModule mod_ssl.c>
    SSLEngine on
```

This fix clears comments belonging to skipped conditionals. Deleting `ServerName` now leaves the complete `IfModule` block unchanged.
2026-09-20 17:22:17 +02:00
Ilia Ross
dc0b2ff04e Fix comment
For rebuild to trigger
2026-09-20 16:18:31 +02:00
Jamie Cameron
a0a20063fa Call correct function to check file paths
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Close inactive / close-inactive (push) Has been cancelled
2026-09-19 21:01:05 -07:00
Jamie Cameron
ef22c05115 Merge pull request #2842 from webmin/dev/nginx-concurrency-fix
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Fix concurrent Nginx configuration updates
2026-09-19 17:41:56 -07:00
Jamie Cameron
1b029fb2c3 Merge pull request #2847 from webmin/dev/preserve-apache-comments
Add Apache comment preservation
2026-09-19 17:33:05 -07:00
Jamie Cameron
c5cf9242c7 Add missing param to -H flag
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Close inactive / close-inactive (push) Has been cancelled
00~https://github.com/webmin/webmin/issues/284801~
2026-09-18 20:43:31 -07:00
Jamie Cameron
08d9ef3cd0 Add checks for allowed .htaccess file path
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
2026-09-18 16:57:34 -07:00
Jamie Cameron
5f020599de Reduce number of interations from 10 by default
https://github.com/webmin/webmin/issues/2848
2026-09-18 16:49:17 -07:00
Ilia Ross
c134426e2a Drop unused Nginx lock parent arg 2026-09-19 01:10:42 +02:00
Jamie Cameron
fa98ace56d Merge branch 'master' of github.com:webmin/webmin 2026-09-18 15:43:47 -07:00
Jamie Cameron
991840e890 Use my instead of local 2026-09-18 15:43:40 -07:00
Ilia Ross
a8a1b70015 Fix Nginx cache handling for caller-owned locks 2026-09-18 18:13:47 +02:00
Ilia Ross
afb0929dd9 Update Nginx lock discovery loop
https://github.com/webmin/webmin/pull/2842#discussion_r4039699490
2026-09-17 20:14:42 +02:00
Ilia Ross
1c80e8f298 Update Nginx lock loop comment 2026-09-17 03:24:37 +02:00
Ilia Ross
efe1dddca8 Fix to change Apache comments to use directive fields
https://github.com/webmin/webmin/pull/2847#issuecomment-5705632150
2026-09-17 01:46:50 +02:00
Jamie Cameron
beb843bb2b Merge pull request #2846 from webmin/dev/fix-nested-apache-directives
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Close inactive / close-inactive (push) Has been cancelled
Fix nested Apache directive rewrites
2026-09-16 15:39:40 -07:00
Ilia Ross
dcd929e7e3 Add Apache comment preservation
This PR fixes full-line comments being removed when Webmin rewrites Apache configuration blocks.
2026-09-17 00:07:52 +02:00
Ilia Ross
faaef530f2 Drop Apache comment preservation from this PR 2026-09-17 00:01:01 +02:00
Ilia Ross
3d27aca04a Fix nested Apache directive rewrites
This PR fixes incorrect line numbers when Apache directives contain nested blocks.

It preserves comments during rewrites and correctly tracks every nested line.

This prevents Virtualmin from corrupting custom Apache configurations.

Fixes: https://github.com/virtualmin/virtualmin-gpl/issues/1153
2026-09-16 23:00:38 +02:00
Jamie Cameron
b0e8115db7 Merge pull request #2844 from Deltaman-MWI/bind8-dmarc-pct-optional
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Close inactive / close-inactive (push) Has been cancelled
bind8: allow the DMARC pct field to be left empty
2026-09-15 16:56:40 -07:00
Deltaman-MWI
ee420bef24 Allow the DMARC pct field to be left empty in bind8
RFC 9989 (DMARCbis) removes the pct tag, but the DMARC form validated
the percentage as mandatory and always assigned it, so every record
written through Webmin contained pct=.

Treat the field like the sp field directly below it: when it is empty,
delete the tag. Values 0-100 are still accepted and validated for
anyone who deliberately uses pct during a rollout. join_dmarc() already
skips tags with an empty value, so no change was needed there.

Fixes #2843

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-09-15 13:05:08 +02:00
Ilia Ross
9766789a94 Drop redundant Nginx lock error cleanup 2026-09-15 05:17:58 +02:00
Jamie Cameron
3eb7493989 Disallow multiple null-separate parameter values
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Close inactive / close-inactive (push) Has been cancelled
2026-09-14 19:40:24 -07:00
Ilia Ross
0c7fc411aa Fix to change Nginx lock check to use proper API
https://github.com/webmin/webmin/pull/2842#discussion_r4010494535
2026-09-15 01:37:46 +02:00
Ilia Ross
d3c0409f0e Update EAB fields to use placeholders
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
2026-09-15 01:04:14 +02:00
Ilia Ross
f206cbb23a Fix concurrent Nginx configuration updates
This PR fixes concurrent Nginx updates using stale config data.

It reloads the config after locking and safely handles nested locks and included files.
2026-09-14 21:54:26 +02:00
Jamie Cameron
09e6a57f28 Merge pull request #2841 from webmin/dev/defer-ipv6-lookup
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Close inactive / close-inactive (push) Has been cancelled
Fix IPv4 delays caused by IPv6 lookups
2026-09-13 16:40:48 -07:00
Ilia Ross
8a20f7ea34 Fix socket tests without Socket6 2026-09-14 01:36:41 +02:00
Jamie Cameron
49019cb2db Make sure param values are quoted 2026-09-13 15:19:22 -07:00
Ilia Ross
267b6bc07f Fix IPv4 delays caused by IPv6 lookups
This PR fixes delays when IPv6 DNS lookups stall otherwise working IPv4 connections.

The earlier changes ([04c74877](04c74877c3) and [8a6f7784](8a6f778410)) added fallback across available IPv4 and IPv6 addresses, which this PR preserves.

Resolving both families upfront appears to have been an implementation choice, yet now IPv6 is resolved only when no IPv4 connection succeeds.

Unit tests and real socket compatibility tests passed on Alma 10 and Debian 13.
2026-09-13 23:49:36 +02:00
Ilia Ross
29f595dbdf Fix to change Software Packages file validation
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
2026-09-13 12:55:28 +02:00
Ilia Ross
7242171885 Fix reboot-required detection on DNF systems
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Close inactive / close-inactive (push) Has been cancelled
https://forum.virtualmin.com/t/137973
2026-09-13 04:41:48 +02:00
Ilia Ross
afc256831c Fix TLS client certificate verification
ⓘ Prevent certificate-chain errors from being overwritten while preserving password-login fallback for invalid optional certificates.

Reset verification state for every TLS handshake and add regression coverage.
2026-09-13 03:17:13 +02:00
Ilia Ross
d4c14d8d5e Merge pull request #2835 from webmin/dev/nftables-remove-meta-config-layer
Some checks failed
Tests / prove (push) Has been cancelled
Package and upload artifacts / build (push) Has been cancelled
Cleanup meta-confg layer
2026-09-13 01:35:52 +02:00
Ilia Ross
a06590c17e Fix to change nftables migration to prefix and validate tables 2026-09-13 01:34:46 +02:00