valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 01:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #58 from facebook/plist_parsing

Browse Source 
fixing an issue with json serializing raw data attributes in plists
This commit is contained in:
Mike Arpaia 2014-08-19 20:09:14 -07:00
commit b8e823f190
1 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
osquery/filesystem/plist.mm
View File

@ -15,13 +15,57 @@ namespace pt = boost::property_tree;
namespace osquery { namespace fs {
NSMutableArray* filterArray(id dataStructure);
NSMutableDictionary* filterDictionary(id dataStructure) {
NSMutableDictionary *result = [NSMutableDictionary new];
for (id key in [dataStructure allKeys]) {
NSString *className = NSStringFromClass([[dataStructure objectForKey:key] class]);
if ([className isEqualToString:@"__NSArrayI"] ||
[className isEqualToString:@"__NSArrayM"] ||
[className isEqualToString:@"__NSCFArray"]) {
[result setObject:filterArray([dataStructure objectForKey:key]) forKey:key];
} else if ([className isEqualToString:@"__NSCFDictionary"]) {
[result setObject:filterDictionary([dataStructure objectForKey:key]) forKey:key];
} else if ([className isEqualToString:@"__NSCFData"]) {
[result setObject:@"NSData" forKey:key];
} else {
[result setObject:[dataStructure objectForKey:key] forKey:key];
}
}
return result;
}
NSMutableArray* filterArray(id dataStructure) {
NSMutableArray *result = [NSMutableArray new];
for (id value in dataStructure) {
NSString *className = NSStringFromClass([value class]);
if ([className isEqualToString:@"__NSCFDictionary"]) {
[result addObject:filterDictionary(value)];
} else if ([className isEqualToString:@"__NSArrayI"] ||
[className isEqualToString:@"__NSArrayM"] ||
[className isEqualToString:@"__NSCFArray"]) {
[result addObject:filterArray(value)];
} else if ([className isEqualToString:@"__NSCFData"]) {
[result addObject:@"NSData"];
} else {
[result addObject:value];
}
}
return result;
}
NSMutableDictionary* filterPlist(NSMutableDictionary *plist) {
return filterDictionary(plist);
}
Status parsePlistContent(const std::string& fileContent, pt::ptree& tree) {
NSData *plistContent = [NSData dataWithBytes:fileContent.c_str()
length:fileContent.size()];
NSError *error;
NSPropertyListFormat plistFormat;
NSDictionary *plist = (NSDictionary*)
NSMutableDictionary *plist = (NSMutableDictionary*)
[NSPropertyListSerialization propertyListWithData:plistContent
options:NSPropertyListImmutable
format:&plistFormat
@ -48,6 +92,14 @@ Status parsePlistContent(const std::string& fileContent, pt::ptree& tree) {
}
}
try {
plist = filterPlist(plist);
} catch (const std::exception& e) {
LOG(ERROR) << "An exception occured while filtering the plist: " <<
e.what();
return Status(1, e.what());
}
NSData *jsonDataObjc;
if ([NSJSONSerialization isValidJSONObject:plist]) {
jsonDataObjc = [NSJSONSerialization dataWithJSONObject:plist