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

Escape single quotes and backslash in all PostgreSQL connection string values, including password. Closes #1417

Browse Source
This commit is contained in:
Ansgar Becker
2021-07-24 08:55:15 +02:00
parent 475e191a59
commit 04e8d683b4
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/dbconnection.pas
View File

@ -2603,8 +2603,10 @@ var
FinalPort: Integer;
function EscapeConnectOption(Option: String): String;
begin // See issue #704
begin
// See issue #704 and #1417, and docs: https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
Result := StringReplace(Option, '\', '\\', [rfReplaceAll]);
Result := StringReplace(Result, '''', '\''', [rfReplaceAll]);
end;
begin
if Value then begin
@ -2629,12 +2631,12 @@ begin
end;
end;
ConnInfo := 'host='''+FinalHost+''' '+
ConnInfo := 'host='''+EscapeConnectOption(FinalHost)+''' '+
'port='''+IntToStr(FinalPort)+''' '+
'user='''+FParameters.Username+''' ' +
'password='''+FParameters.Password+''' '+
'dbname='''+dbname+''' '+
'application_name='''+APPNAME+'''';
'user='''+EscapeConnectOption(FParameters.Username)+''' ' +
'password='''+EscapeConnectOption(FParameters.Password)+''' '+
'dbname='''+EscapeConnectOption(dbname)+''' '+
'application_name='''+EscapeConnectOption(APPNAME)+'''';
if FParameters.WantSSL then begin
ConnInfo := ConnInfo + ' sslmode=''require''';
if FParameters.SSLPrivateKey <> '' then