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

(fix) make sure to handle nil vs. NSNull values correctly

pull/217/head
Ludovic Marcotte 2016-07-05 22:25:01 -04:00
parent 197123143b
commit 749c77ce05
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SoObjects/SOGo/SOGoUserManager.m
View File

@ -598,6 +598,9 @@ static Class NSNullK;
jsonUser = [[SOGoCache sharedCache] userAttributesForLogin: username];
currentUser = [jsonUser objectFromJSONString];
if ([currentUser isKindOfClass: NSNullK])
currentUser = nil;
//
// If we are using multidomain and the UIDFieldName is not part of the email address
// we must bind without the domain part since internally, SOGo will use
@ -611,7 +614,7 @@ static Class NSNullK;
// and authenticates with "foo", using bindFields = (uid, mail) and SOGoEnableDomainBasedUID = YES;
// Otherwise, -_sourceCheckLogin:... would have failed because SOGo would try to bind using: foo@example.com
//
if ([[currentUser objectForKey: @"DomainLessLogin"] boolValue])
if (currentUser && [[currentUser objectForKey: @"DomainLessLogin"] boolValue])
{
NSRange r;
@ -619,7 +622,7 @@ static Class NSNullK;
_login = [_login substringToIndex: r.location];
}
dictPassword = [currentUser objectForKey: @"password"];
dictPassword = (currentUser ? [currentUser objectForKey: @"password"] : nil);
if (useCache && currentUser && dictPassword)
{
checkOK = ([dictPassword isEqualToString: [_pwd asSHA1String]]);
@ -711,6 +714,9 @@ static Class NSNullK;
jsonUser = [[SOGoCache sharedCache] userAttributesForLogin: login];
currentUser = [jsonUser objectFromJSONString];
if ([currentUser isKindOfClass: NSNullK])
currentUser = nil;
if ([self _sourceChangePasswordForLogin: login
inDomain: domain
oldPassword: oldPassword