cuong/GCDWebServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added GCDWebServerNormalizePath() API

Browse Source
This commit is contained in:
Pierre-Olivier Latour
2019-01-04 18:58:43 -08:00
parent 79d9fb389c
commit ec800b43d5
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
GCDWebServer/Core/GCDWebServerFunctions.h
View File

@ -102,6 +102,11 @@ NSString* GCDWebServerFormatISO8601(NSDate* date);
*/
NSDate* _Nullable GCDWebServerParseISO8601(NSString* string);
/**
* Removes "//", "/./" and "/../" components from path as well as any trailing slash.
*/
NSString* GCDWebServerNormalizePath(NSString* path);
#ifdef __cplusplus
}
#endif

15
GCDWebServer/Core/GCDWebServerFunctions.m
View File

@ -314,3 +314,18 @@ NSString* GCDWebServerComputeMD5Digest(NSString* format, ...) {
buffer[2 * CC_MD5_DIGEST_LENGTH] = 0;
return (NSString*)[NSString stringWithUTF8String:buffer];
}
NSString* GCDWebServerNormalizePath(NSString* path) {
NSMutableArray* components = [[NSMutableArray alloc] init];
for (NSString* component in [path componentsSeparatedByString:@"/"]) {
if ([component isEqualToString:@".."]) {
[components removeLastObject];
} else if (component.length && ![component isEqualToString:@"."]) {
[components addObject:component];
}
}
if (path.length && ([path characterAtIndex:0] == '/')) {
return [@"/" stringByAppendingString:[components componentsJoinedByString:@"/"]]; // Preserve initial slash
}
return [components componentsJoinedByString:@"/"];
}