percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-04 19:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #687 from Tusamarco/PT-2247-1212

Browse Source 
Adding the option to use in session print_identified_with_as_hex as a…
This commit is contained in:
Marco Tusa
2023-09-25 15:15:26 +02:00
committed by GitHub
parent 4a812d4a79 e3a3d973e2
commit a8bb50951e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/pt-show-grants
View File

@@ -2042,6 +2042,9 @@ sub main {
if (( VersionCompare::cmp($version, '5.7.6') >= 0 ) ||
( VersionCompare::cmp($version, '10.0.0') <= 0 )) {
eval {
if (( VersionCompare::cmp($version, '8.0.17') >= 0 ) && ($o->get('print_identified_with_as_hex'))){
$dbh->do("SET print_identified_with_as_hex=1") or die();
}
@create_user = @{ $dbh->selectcol_arrayref("SHOW CREATE USER $user_host") };
};
if ( $EVAL_ERROR ) {
@@ -2051,6 +2054,7 @@ sub main {
if ($#create_user >= 0){
PTDEBUG && _d('CreateUser:', Dumper(\@create_user));
#given caching_sha2_password issue we need to select the password in binary format and replace the one coming from the create
#my $query = "SELECT authentication_string as sha2, convert(authentication_string using Binary) as bin from mysql.user where user='$u->{User}' and host='$u->{Host}'";
my $query = "SELECT authentication_string sha2 from mysql.user where user='$u->{User}' and host='$u->{Host}'";
PTDEBUG && _d('get password:', Dumper($query));
my ( $pw_sha2) = $dbh->selectrow_array($query);
@@ -2065,7 +2069,7 @@ sub main {
$create =~ s{CREATE USER}{CREATE USER IF NOT EXISTS};
$create =~ s{ IDENTIFIED VIA }{ IDENTIFIED AS };
$create =~ s{ BY }{ AS };
if ( $create =~ m/caching_sha2_password/ ) {
if (( $create =~ m/caching_sha2_password/ ) && !($o->get('print_identified_with_as_hex'))) {
print "-- Converting $user_host caching_sha2_password to binary for correct export/import\n";
$create =~ s/\sAS\s.*'\s/ AS $pw_bin /g;
}
@@ -2466,6 +2470,12 @@ Only show grants for this comma-separated list of users.
When set it convert some of the proprietary MariaDB syntax into valid MySQL form
=item --print_identified_with_as_hex
Enabling print_identified_with_as_hex causes SHOW CREATE USER to display such hash values as hexadecimal strings rather than as regular string literals.
Hash values that do not contain unprintable characters still display as regular string literals, even with this variable enabled.
=item --password
short form: -p; type: string