1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ACL option for own logs only

Browse Source
This commit is contained in:
Jamie Cameron 2019-12-07 07:56:10 -08:00
parent ef37f01d6b
commit f6b554a247
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
safeacl Normal file
View File

@ -0,0 +1,5 @@
root=
fileunix=
feedback=0
rpc=0
negative=0

23
webminlog/acl_security.pl
View File

@ -6,13 +6,15 @@ do 'webminlog-lib.pl';
# Output HTML for editing security options for the acl module # Output HTML for editing security options for the acl module
sub acl_security_form sub acl_security_form
{ {
my ($o) = @_;
# Allowed modules # Allowed modules
print &ui_table_row($text{'acl_mods'}, print &ui_table_row($text{'acl_mods'},
&ui_radio("mods_def", $_[0]->{'mods'} eq "*" ? 1 : 0, &ui_radio("mods_def", $o->{'mods'} eq "*" ? 1 : 0,
[ [ 1, $text{'acl_all'} ], [ [ 1, $text{'acl_all'} ],
[ 0, $text{'acl_sel'} ] ])."<br>\n". [ 0, $text{'acl_sel'} ] ])."<br>\n".
&ui_select("mods", &ui_select("mods",
[ split(/\s+/, $_[0]->{'mods'}) ], [ split(/\s+/, $o->{'mods'}) ],
[ map { [ $_->{'dir'}, $_->{'desc'} ] } [ map { [ $_->{'dir'}, $_->{'desc'} ] }
&get_all_module_infos() ], &get_all_module_infos() ],
10, 1), 10, 1),
@ -20,26 +22,31 @@ print &ui_table_row($text{'acl_mods'},
# Allowed users # Allowed users
print &ui_table_row($text{'acl_users'}, print &ui_table_row($text{'acl_users'},
&ui_radio("users_def", $_[0]->{'users'} eq "*" ? 1 : 0, &ui_radio("users_def", $o->{'users'} eq "*" ? 1
$o->{'users'} eq "~" ? 2 : 0,
[ [ 1, $text{'acl_all'} ], [ [ 1, $text{'acl_all'} ],
[ 2, $text{'acl_self'} ],
[ 0, $text{'acl_sel'} ] ])."<br>\n". [ 0, $text{'acl_sel'} ] ])."<br>\n".
&ui_select("users", &ui_select("users",
[ split(/\s+/, $_[0]->{'users'}) ], [ split(/\s+/, $o->{'users'}) ],
[ map { $_->{'name'} } &acl::list_users() ], [ map { $_->{'name'} } &acl::list_users() ],
10, 1), 10, 1),
3); 3);
# Rollback # Rollback
print &ui_table_row($text{'acl_rollback'}, print &ui_table_row($text{'acl_rollback'},
&ui_yesno_radio("rollback", $_[0]->{'rollback'})); &ui_yesno_radio("rollback", $o->{'rollback'}));
} }
# acl_security_save(&options) # acl_security_save(&options)
# Parse the form for security options for the acl module # Parse the form for security options for the acl module
sub acl_security_save sub acl_security_save
{ {
$_[0]->{'mods'} = $in{'mods_def'} ? "*" : join(" ", split(/\0/, $in{'mods'})); my ($o) = @_;
$_[0]->{'users'} = $in{'users_def'} ? "*" : join(" ", split(/\0/,$in{'users'})); $o->{'mods'} = $in{'mods_def'} ? "*" : join(" ", split(/\0/, $in{'mods'}));
$_[0]->{'rollback'} = $in{'rollback'}; $o->{'users'} = $in{'users_def'} == 1 ? "*" :
$in{'users_def'} == 2 ? "~" :
join(" ", split(/\0/,$in{'users'}));
$o->{'rollback'} = $in{'rollback'};
} }

2
webminlog/safeacl Normal file
View File

@ -0,0 +1,2 @@
rollback=0
users=~

8
webminlog/webminlog-lib.pl
View File

@ -315,7 +315,10 @@ Returns 1 if the current Webmin user can view log entries for the given user.
=cut =cut
sub can_user sub can_user
{ {
return $access_users{'*'} || $access_users{$_[0]}; my ($user) = @_;
return $access_users{'*'} ||
$access_users{'~'} && $user eq $remote_user ||
$access_users{$user};
} }
=head2 can_mod(module) =head2 can_mod(module)
@ -325,7 +328,8 @@ Returns 1 if the current Webmin user can view log entries for the given module.
=cut =cut
sub can_mod sub can_mod
{ {
return $access_mods{'*'} || $access_mods{$_[0]}; my ($mod) = @_;
return $access_mods{'*'} || $access_mods{$mod};
} }
=head2 get_action(id) =head2 get_action(id)