amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-15 02:18:00 +00:00
Code Issues Projects Releases Wiki Activity

fix(dav): return 405 when collection already exists

Browse Source 
See https://datatracker.ietf.org/doc/html/rfc4918#section-9.3.1
This commit is contained in:
Francis Lachapelle
2022-08-09 12:17:55 -04:00
parent efe78c5179
commit 95eecc402a
8 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoParentFolder.m
+14 -5
View File
@@ -178,7 +178,7 @@ static SoSecurityManager *sm = nil;
[folder setDisplayName: [self defaultFolderName]];
[folder setOCSPath: [NSString stringWithFormat: @"%@/%@", OCSPath, folderName]];
if ([folder create])
if (![folder create])
[subFolders setObject: folder forKey: folderName];
}
else if (folderType == SOGoCollectedFolder)
@@ -190,7 +190,7 @@ static SoSecurityManager *sm = nil;
[folder setDisplayName: [self collectedFolderName]];
[folder setOCSPath: [NSString stringWithFormat: @"%@/%@", OCSPath, folderName]];
if ([folder create])
if (![folder create])
[subFolders setObject: folder forKey: folderName];
[ud setSelectedAddressBook:folderName];
@@ -406,14 +406,23 @@ static SoSecurityManager *sm = nil;
[newFolder setDisplayName: name];
[newFolder setOCSPath: [NSString stringWithFormat: @"%@/%@",
OCSPath, newNameInContainer]];
if ([newFolder create])
error = [newFolder create];
if (!error)
{
[subFolders setObject: newFolder forKey: newNameInContainer];
error = nil;
}
else if ([[error name] isEqual: @"GCSExitingFolder"])
{
error = [self exceptionWithHTTPStatus: 405
reason: [error reason]];
}
else
error = [self exceptionWithHTTPStatus: 400
reason: @"The new folder could not be created"];
{
[self errorWithFormat: @"An error occured when creating a folder: %@ - %@", [error name], [error reason]];
error = [self exceptionWithHTTPStatus: 400
reason: @"The new folder could not be created"];
}
}
return error;