VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to dynamically list auth plugins in MySQL/MariaDB

Browse Source
This commit is contained in:
Ilia Ross
2025-03-29 16:25:42 +02:00
parent 99889c1f30
commit a67e327627
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql/edit_user.cgi
View File

@ -89,12 +89,12 @@ if (!$in{'new'} && $hashpass) {
} }
# Plugin for setting password # Plugin for setting password
my @plugins = &list_authentication_plugins(); my $plugins = &list_authentication_plugins();
if (@plugins) { if ($plugins) {
print &ui_table_row($text{'user_plugin'}, print &ui_table_row($text{'user_plugin'},
&ui_select("plugin", $plugin && $u->[$plugin], &ui_select("plugin", $plugin && $u->[$plugin],
[ [ '', $text{'default'} ], [ [ '', $text{'default'} ],
@plugins ])); @{$plugins} ]));
} }
# Allowed host / network # Allowed host / network

7
mysql/mysql-lib.pl
View File

@ -2181,13 +2181,16 @@ return $rv->{'data'}->[0]->[0] =~ /unix_socket/i ? 'socket' : 'password';
} }
# list_authentication_plugins() # list_authentication_plugins()
# Returns a list of supported authentication plugins for setting passwords # Returns a list ref of supported authentication plugins for setting passwords
sub list_authentication_plugins sub list_authentication_plugins
{ {
my ($ver, $variant) = &get_remote_mysql_variant(); my ($ver, $variant) = &get_remote_mysql_variant();
if ($variant eq "mariadb" && &compare_version_numbers($ver, "10.4") >= 0 || if ($variant eq "mariadb" && &compare_version_numbers($ver, "10.4") >= 0 ||
$variant eq "mysql" && &compare_version_numbers($ver, "5.7.6") >= 0) { $variant eq "mysql" && &compare_version_numbers($ver, "5.7.6") >= 0) {
return ('mysql_native_password', 'caching_sha2_password', 'unix_socket'); my $rv = &execute_sql($master_db, "show plugins");
my @plugins = map { $_->[0] } grep { $_->[1] eq 'ACTIVE' &&
$_->[2] eq 'AUTHENTICATION' } @{ $rv->{data} };
return @plugins ? \@plugins : ['mysql_native_password'];
} }
return (); return ();
} }