Debugging output for subscription issue

This commit is contained in:
Francis Lachapelle
2018-05-28 10:50:54 -04:00
parent fc6aafe4a6
commit c6e11606e9
2 changed files with 24 additions and 11 deletions
+4 -1
View File
@@ -169,7 +169,10 @@ static NSArray *childRecordFields = nil;
[newFolder setOwner: login];
[newFolder setIsSubscription: localIsSubscription];
if (![newFolder displayName])
newFolder = nil;
{
[self errorWithFormat: @"No displayName for %@", newFolder];
newFolder = nil;
}
return newFolder;
}
+20 -10
View File
@@ -291,18 +291,28 @@ static SoSecurityManager *sm = nil;
// This is important because user A could delete folder X, and user B has subscribed to it.
// If the "default roles" are enabled for calendars/address books, -validatePermission:.. will
// work (grabbing the default role) and the deleted resource will be incorrectly returned.
if (subscribedFolder
&& [subscribedFolder ocsFolderForPath: [subscribedFolder ocsPath]]
&& ![sm validatePermission: SOGoPerm_AccessObject
onObject: subscribedFolder
inContext: context])
if (!subscribedFolder)
{
[subscribedSubFolders setObject: subscribedFolder
forKey: [subscribedFolder nameInContainer]];
return YES;
[self errorWithFormat: @"Can't find subscription %@", sourceKey];
return NO;
}
return NO;
if (![subscribedFolder ocsFolderForPath: [subscribedFolder ocsPath]])
{
[self errorWithFormat: @"Folder vanished for subscription %@", sourceKey];
return NO;
}
if ([sm validatePermission: SOGoPerm_AccessObject
onObject: subscribedFolder
inContext: context])
{
[self errorWithFormat: @"User %@ has no right to access %@", [[context activeUser] login], sourceKey];
return NO;
}
[subscribedSubFolders setObject: subscribedFolder
forKey: [subscribedFolder nameInContainer]];
return YES;
}
- (NSException *) appendSubscribedSources