Skip to content

Please review and apply the patches #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Please review and apply the patches #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75da5c2
Support for extended MySQL authentication for servers above 4.2 (inc…
mnikhil-git Jan 2, 2012
f658b9b
Read the end of the packet correctly for the record set query results.
mnikhil-git Jan 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions MySQL.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ sub _get_server_information
$i += 4;
$self->{salt} = substr $message, $i, 8;
#
$self->{saltold} = $self->{salt};
#
$i += 8+1;
if (length $message >= $i + 1) {
$i += 1;
Expand Down Expand Up @@ -256,7 +258,19 @@ sub _request_authentication
croak "Timeout of authentication";
}
croak substr $auth_result, 7;
}
} elsif (ord(substr $auth_result, 4) == 254 ) {
$self->_send_password();
$mysql->recv($auth_result, BUFFER_LENGTH, 0);
$self->_dump_packet($auth_result) if Net::MySQL->debug;
if ($self->_is_error($auth_result)) {
$mysql->close;
if (length $auth_result < 7) {
croak "Timeout of authentication";
}
croak substr $auth_result, 7;
}

}
print "connect database\n" if Net::MySQL->debug;
}

Expand All @@ -281,6 +295,21 @@ sub _send_login_message
}


sub _send_password
{
my $self = shift;
my $mysql = $self->{socket};
my $body = "\0\0\x03".
Net::MySQL::Password32->scramble(
$self->{password}, $self->{saltold}, $self->{client_capabilities}
);
$body .= "\0";
my $pw_message = chr(length($body)-3). $body;
$mysql->send($pw_message, 0);
$self->_dump_packet($pw_message) if Net::MySQL->debug;
}



sub _execute_command
{
Expand Down Expand Up @@ -457,7 +486,7 @@ sub _has_next_packet
my $self = shift;
#substr($_[0], -1) ne "\xfe";
#$self->_dump_packet(substr($_[0], -5));
return substr($_[0], -5, 1) ne "\xfe";
return (substr($_[0],-5) ne "\xfe\0\0\x02\x00" and substr($_[0], -5) ne "\xfe\0\0\x22\x00");
}


Expand Down