Allow HEAD requests on collections

swisspol · swisspol · commit d78aa3baae59 · 2014-04-09T13:59:20.000-07:00
diff --git a/GCDWebDAVServer/GCDWebDAVServer.m b/GCDWebDAVServer/GCDWebDAVServer.m
@@ -88,13 +88,15 @@ - (GCDWebServerResponse*)performGET:(GCDWebServerRequest*)request {
   if (![absolutePath hasPrefix:_uploadDirectory] || ![[NSFileManager defaultManager] fileExistsAtPath:absolutePath isDirectory:&isDirectory]) {
     return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_NotFound message:@"\"%@\" does not exist", relativePath];
   }
-  if (isDirectory) {
-    return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_BadRequest message:@"\"%@\" is not a file", relativePath];
+  
+  NSString* itemName = [absolutePath lastPathComponent];
+  if (([itemName hasPrefix:@"."] && !_showHidden) || (!isDirectory && ![self _checkFileExtension:itemName])) {
+    return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Downlading item name \"%@\" is not allowed", itemName];
   }
   
-  NSString* fileName = [absolutePath lastPathComponent];
-  if (([fileName hasPrefix:@"."] && !_showHidden) || ![self _checkFileExtension:fileName]) {
-    return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Downlading file name \"%@\" is not allowed", fileName];
+  // Because HEAD requests are mapped to GET ones, we need to handle directories but it's OK to return nothing per http://webdav.org/specs/rfc4918.html#rfc.section.9.4
+  if (isDirectory) {
+    return [GCDWebServerResponse response];
   }
   
   if ([_delegate respondsToSelector:@selector(davServer:didDownloadFileAtPath:)]) {

Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,15 @@ - (GCDWebServerResponse)performGET:(GCDWebServerRequest)request {`
`88`	`88`	`if (![absolutePath hasPrefix:_uploadDirectory] \|\| ![[NSFileManager defaultManager] fileExistsAtPath:absolutePath isDirectory:&isDirectory]) {`
`89`	`89`	`return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_NotFound message:@"\"%@\" does not exist", relativePath];`
`90`	`90`	`}`
`91`		`- if (isDirectory) {`
`92`		`- return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_BadRequest message:@"\"%@\" is not a file", relativePath];`
	`91`	`+`
	`92`	`+ NSString* itemName = [absolutePath lastPathComponent];`
	`93`	`+ if (([itemName hasPrefix:@"."] && !_showHidden) \|\| (!isDirectory && ![self _checkFileExtension:itemName])) {`
	`94`	`+ return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Downlading item name \"%@\" is not allowed", itemName];`
`93`	`95`	`}`
`94`	`96`
`95`		`- NSString* fileName = [absolutePath lastPathComponent];`
`96`		`- if (([fileName hasPrefix:@"."] && !_showHidden) \|\| ![self _checkFileExtension:fileName]) {`
`97`		`- return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_Forbidden message:@"Downlading file name \"%@\" is not allowed", fileName];`
	`97`	`+ // Because HEAD requests are mapped to GET ones, we need to handle directories but it's OK to return nothing per http://webdav.org/specs/rfc4918.html#rfc.section.9.4`
	`98`	`+ if (isDirectory) {`
	`99`	`+ return [GCDWebServerResponse response];`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`if ([_delegate respondsToSelector:@selector(davServer:didDownloadFileAtPath:)]) {`