VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-20 16:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to display permissions intelligently

Browse Source
This commit is contained in:
Ilia Ross
2024-08-13 22:25:17 +03:00
parent 7198370f9b
commit 9cecabf781
4 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql/lang/en
View File

@ -335,6 +335,8 @@ dbs_hosts=From host permissions
dbs_add=Create new database permissions.
dbs_all=All
dbs_none=None
dbs_except=All, except
dbs_except_and=and
dbs_return=database permissions
dbs_derr=Failed to delete database permissions
dbs_enone=No databases selected

5
mysql/list_dbs.cgi
View File

@ -40,7 +40,8 @@ if (@{$d->{'data'}}) {
: &html_escape($u->[0]));
my @priv;
my ($allprivs, $noprivs) = (1, 1);
foreach my $f (&priv_fields('db')) {
my @priv_fields = &priv_fields('db');
foreach my $f (@priv_fields) {
if ($u->[$fieldmap{$f->[0]}] eq 'Y') {
push(@priv, $f->[1]);
$noprivs = 0;
@ -51,7 +52,7 @@ if (@{$d->{'data'}}) {
}
push(@cols, $allprivs ? $text{'users_all'} :
$noprivs ? $text{'users_none'} :
join(" | ", @priv));
&format_privs(\@priv, \@priv_fields));
print &ui_checked_columns_row(\@cols, \@tds,
"d", join(" ", $u->[0], $u->[1], $u->[2]));
}

6
mysql/list_users.cgi
View File

@ -36,7 +36,8 @@ foreach $u (@{$d->{'data'}}) {
}
my @priv;
my ($allprivs, $noprivs) = (1, 1);
foreach my $f (&priv_fields('user')) {
my @priv_fields = &priv_fields('user');
foreach my $f (@priv_fields) {
if ($u->[$fieldmap{$f->[0]}] eq 'Y') {
push(@priv, $f->[1]);
$noprivs = 0;
@ -46,7 +47,8 @@ foreach $u (@{$d->{'data'}}) {
}
}
push(@cols, $allprivs ? $text{'users_all'} :
$noprivs ? $text{'users_none'} : join(" | ", @priv));
$noprivs ? $text{'users_none'} :
&format_privs(\@priv, \@priv_fields));
print &ui_checked_columns_row(\@cols, \@tds, "d", $u->[0]." ".$u->[1]);
$i++;
}

86
mysql/mysql-lib.pl
View File

@ -2132,5 +2132,91 @@ return 'password' if ($@); # Old version without plugins
return $rv->{'data'}->[0]->[0] =~ /unix_socket/i ? 'socket' : 'password';
}
# format_privs(&privs, &privs_fields)
# Returns best formatted string for a set of privileges
sub format_privs
{
my ($privs, $privs_fields) = @_;
my @privs_all = map { lc($_->[1]) } @{$privs_fields};
my @privs_cur = map { lc($_) } @{$privs};
my $simplify_privs = sub {
my @privs = @_;
my %groups = (
'table_data' => [],
'tables' => [],
'view' => [],
'routine' => [],
);
my @others = ();
foreach my $priv (@privs) {
if ($priv =~ /^(select|insert|update|delete) table data$/) {
push @{$groups{'table_data'}}, $1;
}
elsif ($priv =~ /^(create|drop|alter|create temp|lock) tables?$/) {
push @{$groups{'tables'}}, $1;
}
elsif ($priv =~ /^(create|show) view$/) {
push @{$groups{'view'}}, $1;
}
elsif ($priv =~ /^(create|alter) routine$/) {
push @{$groups{'routine'}}, $1;
}
else {
push @others, $priv;
}
}
# Build simplified string
my @simplified = ();
# Handle 'table data'
if (@{$groups{'table_data'}}) {
my $table_data_str = join(', ', @{$groups{'table_data'}});
$table_data_str =~ s/(.*),/$1 $text{'dbs_except_and'}/
if (@{$groups{'table_data'}} > 1);
push(@simplified, "$table_data_str table data");
}
# Handle 'tables'
if (@{$groups{'tables'}}) {
my $tables_str = join(', ', @{$groups{'tables'}});
$tables_str =~ s/(.*),/$1 $text{'dbs_except_and'}/
if (@{$groups{'tables'}} > 1);
$tables_str .= ' tables';
$tables_str =~ s/create temp tables/create temporary tables/;
push(@simplified, $tables_str);
}
# Handle 'view'
if (@{$groups{'view'}}) {
my $view_str = join(" $text{'dbs_except_and'} ",
@{$groups{'view'}});
push(@simplified, "$view_str view");
}
# Handle 'routine'
if (@{$groups{'routine'}}) {
my $routine_str = join(" $text{'dbs_except_and'} ",
@{$groups{'routine'}});
push(@simplified, "$routine_str routine");
}
# Add other privileges
push(@simplified, @others);
return join('; ', @simplified);
};
if (@privs_cur >= int(0.7 * @privs_all)) {
my %missing = map { $_ => 1 } @privs_all;
delete(@missing{@privs_cur});
my @missing_privs = keys %missing;
my $missing_formatted = $simplify_privs->(@missing_privs);
if (@missing_privs > 1) {
$privs_formatted = "$text{'dbs_except'} ($missing_formatted)";
}
else {
$privs_formatted = "$text{'dbs_except'} $missing_formatted";
}
}
else {
$privs_formatted = $simplify_privs->(@privs_cur);
}
return ucfirst($privs_formatted);
}
1;