michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-07-26 03:10:34 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to use physical ACL restore when supported

Browse Source 
ⓘ Detect support for combining `-P` with `setfacl --restore` to prevent acl 2.4.0 security warnings while retaining compatibility with older releases.
This commit is contained in:
Ilia Ross
2026-07-12 23:50:34 +02:00
parent 30018091ee
commit 955daa53c6
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web-lib-funcs.pl
View File

@@ -11390,7 +11390,8 @@ elsif (defined($main::open_tempfiles{$_[0]})) {
}
if ($file_acls) {
# Set original ACLs
open(my $pipe, '|-', "$setfacl --restore=-");
my $restore_command = &get_setfacl_restore_command($setfacl);
open(my $pipe, '|-', $restore_command);
print($pipe $file_acls);
close($pipe);
}
@@ -11455,6 +11456,27 @@ if (!defined($main::selinux_enabled_cache)) {
return $main::selinux_enabled_cache;
}
=head2 get_setfacl_restore_command(setfacl-command)
Returns a command for restoring ACLs from standard input. Uses physical
restore when supported by setfacl, while remaining compatible with versions
older than 2.4.0 which reject -P together with --restore.
=cut
sub get_setfacl_restore_command
{
my ($setfacl) = @_;
state %physical_restore_cache;
if (!exists($physical_restore_cache{$setfacl})) {
my $help = &backquote_command("$setfacl --help 2>&1 </dev/null");
$physical_restore_cache{$setfacl} =
$help =~ /\[-P\]\s+--restore(?:=|\b)/ ? 1 : 0;
}
my $physical = $physical_restore_cache{$setfacl} ? "-P " : "";
return "$setfacl ${physical}--restore=-";
}
=head2 get_clear_file_attributes(file)
Finds file attributes that may prevent writing, clears them and returns them