LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't leak database passwords in the logs 

Fixes #2953
pull/64/head
Francis Lachapelle 2014-10-14 12:54:04 -04:00
parent 3264458f4b
commit e2136e0413
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -1,6 +1,9 @@
2.2.10 (2014-xx-xx) 2.2.10 (2014-xx-xx)
------------------- -------------------
Enhancements
- no longer leaking database passwords in the logs (#2953)
Bug fixes Bug fixes
- fixed freebusy lookup with "Show time as busy" (#2930) - fixed freebusy lookup with "Show time as busy" (#2930)
- don't escape <br>'s in a card's note field - don't escape <br>'s in a card's note field
@ -21,7 +24,7 @@ New features
- support for recurrent tasks (#2160) - support for recurrent tasks (#2160)
- support for alarms on recurrent events / tasks - support for alarms on recurrent events / tasks
Enchancements Enhancements
- alarms can now be snoozed for 1 day - alarms can now be snoozed for 1 day
- better iOS/Mac OS X Calendar compability regarding alarms (#1920) - better iOS/Mac OS X Calendar compability regarding alarms (#1920)
- force default classification over CalDAV if none is set (#2326) - force default classification over CalDAV if none is set (#2326)
@ -46,7 +49,7 @@ New features
- new user settings for threads collapsing - new user settings for threads collapsing
- IMAP global search support (#2670) - IMAP global search support (#2670)
Enchancements Enhancements
- major refactoring of the GCS component saving code (dropped OGoContentStore) - major refactoring of the GCS component saving code (dropped OGoContentStore)
- printing calendars in colors is now possible in all views; list, daily, weekly and multicolumns - printing calendars in colors is now possible in all views; list, daily, weekly and multicolumns
- new option to print calendars events and tasks with a background color or with a border color - new option to print calendars events and tasks with a background color or with a border color

12
SOPE/GDLContentStore/GCSChannelManager.m
View File

@ -276,7 +276,7 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
EOAdaptorChannel *channel; EOAdaptorChannel *channel;
GCSChannelHandle *handle; GCSChannelHandle *handle;
NSCalendarDate *now, *lastFailure; NSCalendarDate *now, *lastFailure;
NSString *urlId; NSString *urlId, *url;
channel = nil; channel = nil;
urlId = [_url gcsURLId]; urlId = [_url gcsURLId];
@ -304,10 +304,10 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
} }
else else
{ {
url = [NSString stringWithFormat: @"%@://%@%@", [_url scheme], [_url host], [_url path]];
if (debugPools) if (debugPools)
{ {
[self logWithFormat: @"DBPOOL: create new DB channel for URL: %@", [self logWithFormat: @"DBPOOL: create new DB channel for %@", url];
[_url absoluteString]];
} }
/* create channel */ /* create channel */
@ -330,15 +330,13 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
if (lastFailure) if (lastFailure)
{ {
[self logWithFormat: @"db for %@ is now back up", [self logWithFormat: @"db for %@ is now back up", url];
[_url absoluteString]];
[lastFailures removeObjectForKey: urlId]; [lastFailures removeObjectForKey: urlId];
} }
} }
else else
{ {
[self errorWithFormat: @"could not open channel %@ for URL: %@", [self errorWithFormat: @"could not open channel %@ for %@", channel, url];
channel, [_url absoluteString]];
channel = nil; channel = nil;
[lastFailures setObject: now forKey: urlId]; [lastFailures setObject: now forKey: urlId];
[self warnWithFormat: @" will prevent opening of this" [self warnWithFormat: @" will prevent opening of this"