opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Introduce SSL support on session manager. Code parts from SuperNiFF. Fixes issue #518.

Browse Source
This commit is contained in:
Ansgar Becker
2010-02-26 00:13:17 +00:00
parent f9ea5dc1ec
commit 4e84c99a72
5 changed files with 221 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/mysql_connection.pas
View File

@ -47,7 +47,8 @@ type
TConnectionParameters = class(TObject)
strict private
FHostname, FSocketname, FUsername, FPassword, FStartupScriptFilename: String;
FHostname, FSocketname, FUsername, FPassword, FStartupScriptFilename,
FSSLPrivateKey, FSSLCertificate, FSSLCACertificate: String;
FPort: Integer;
FOptions: TMySQLClientOptions;
public
@ -60,6 +61,9 @@ type
property Password: String read FPassword write FPassword;
property StartupScriptFilename: String read FStartupScriptFilename write FStartupScriptFilename;
property Options: TMySQLClientOptions read FOptions write FOptions;
property SSLPrivateKey: String read FSSLPrivateKey write FSSLPrivateKey;
property SSLCertificate: String read FSSLCertificate write FSSLCertificate;
property SSLCACertificate: String read FSSLCACertificate write FSSLCACertificate;
end;
@ -216,6 +220,9 @@ begin
FUsername := DEFAULT_USER;
FPassword := '';
FPort := DEFAULT_PORT;
FSSLPrivateKey := '';
FSSLCertificate := '';
FSSLCACertificate := '';
FStartupScriptFilename := DEFAULT_STARTUPSCRIPT;
FOptions := [opCompress, opLocalFiles, opInteractive, opProtocol41, opMultiStatements];
end;
@ -254,7 +261,9 @@ var
Connected: PMYSQL;
ClientFlags: Integer;
Error, tmpdb: String;
SSLResult: Byte;
UsingPass, Protocol, CurCharset: String;
IsNamedPipe: Boolean;
begin
FActive := Value;
@ -262,6 +271,32 @@ begin
// Get handle
FHandle := mysql_init(nil);
// Prepare connection
IsNamedPipe := FParameters.Hostname = '.';
if IsNamedPipe then Protocol := 'named pipe' else Protocol := 'TCP/IP';
if FParameters.Password <> '' then UsingPass := 'Yes' else UsingPass := 'No';
Log(lcInfo, 'Connecting to '+FParameters.Hostname+' via '+Protocol+
', username '+FParameters.Username+
', using password: '+UsingPass+' ...');
// Be sure we don't pass mutually exclusive options
if not IsNamedPipe and
(FParameters.SSLPrivateKey <> '') and
(FParameters.SSLCertificate <> '') and
(FParameters.SSLCACertificate <> '') then begin
FParameters.Options := FParameters.Options + [opSSL];
{ TODO : Use Cipher and CAPath parameters }
SSLResult := mysql_ssl_set(
FHandle,
PansiChar(AnsiString(FParameters.SSLPrivateKey)),
PansiChar(AnsiString(FParameters.SSLCertificate)),
PansiChar(AnsiString(FParameters.SSLCACertificate)),
{PansiChar(AnsiString(FParameters.CApath))}nil,
{PansiChar(AnsiString(FParameters.Cipher))}nil);
if SSLresult <> 0 then
raise Exception.CreateFmt('Could not connect using SSL (Error %d)', [SSLresult]);
end;
// Gather client options
ClientFlags := 0;
if opRememberOptions in FParameters.Options then ClientFlags := ClientFlags or CLIENT_REMEMBER_OPTIONS;
@ -285,12 +320,6 @@ begin
if opMultiResults in FParameters.Options then ClientFlags := ClientFlags or CLIENT_MULTI_RESULTS;
if opRememberOptions in FParameters.Options then ClientFlags := ClientFlags or CLIENT_REMEMBER_OPTIONS;
// Prepare connection
if FParameters.Hostname = '.' then Protocol := 'named pipe' else Protocol := 'TCP/IP';
if FParameters.Password <> '' then UsingPass := 'Yes' else UsingPass := 'No';
Log(lcInfo, 'Connecting to '+FParameters.Hostname+' via '+Protocol+
', username '+FParameters.Username+
', using password: '+UsingPass+' ...');
Connected := mysql_real_connect(
FHandle,
PAnsiChar(Utf8Encode(FParameters.Hostname)),