gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-06-04 19:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hide database connection password from debug logs

Browse source
This commit is contained in:
Wolfgang Lux 2019-12-11 09:40:12 +01:00
parent 5d099c8557
commit ec590a5253
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2019-12-11 Wolfgang Lux <wolfgang.lux@gmail.com>
* Postgres.m: Hide database connection password from debug logs.
2019-08-06 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClientPool.m: Fix error specifying query string in exceptions

22
Postgres.m
View file

@ -287,6 +287,17 @@ newDateFromBuffer(const char *b, int l)
return d;
}
static inline NSString *
sanitize(NSString *str, NSRange range)
{
if (range.length != 0)
{
str = [str stringByReplacingCharactersInRange: range
withString: @"'******'"];
}
return str;
}
@implementation SQLClientPostgres
+ (void) initialize
@ -379,6 +390,7 @@ connectQuote(NSString *str)
NSString *dbase = [self database];
NSString *str;
NSRange r;
NSRange pwRange = NSMakeRange(NSNotFound, 0);
NSMutableString *m;
[[self class] purgeConnections: nil];
@ -430,6 +442,7 @@ connectQuote(NSString *str)
if (str != nil)
{
[m appendString: @" password="];
pwRange = NSMakeRange([m length], [str length]);
[m appendString: str];
}
str = connectQuote([self clientName]);
@ -442,19 +455,19 @@ connectQuote(NSString *str)
if ([self debugging] > 0)
{
[self debug: @"Connect to '%@' as %@ (%@)",
m, [self name], [self clientName]];
sanitize(m, pwRange), [self name], [self clientName]];
}
connection = PQconnectdb([m UTF8String]);
if (PQstatus(connection) != CONNECTION_OK)
{
[self debug: @"Error connecting to '%@' (%@) - %s",
[self name], m, PQerrorMessage(connection)];
[self name], sanitize(m, pwRange), PQerrorMessage(connection)];
[self _backendDisconnected];
}
else if (PQsetClientEncoding(connection, "UTF-8") < 0)
{
[self debug: @"Error setting UTF-8 with '%@' (%@) - %s",
[self name], m, PQerrorMessage(connection)];
[self name], sanitize(m, pwRange), PQerrorMessage(connection)];
[self _backendDisconnected];
}
else
@ -490,7 +503,8 @@ connectQuote(NSString *str)
{
[self debug: @"Error setting string handling"
@" with '%@' (%@) - %s",
[self name], m, PQerrorMessage(connection)];
[self name], sanitize(m, pwRange),
PQerrorMessage(connection)];
if (result != 0)
{
PQclear(result);