Skip to content

Harden QuickLook string usage #1445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Harden QuickLook string usage #1445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 50 additions & 28 deletions extensions/DigiDocQL/PreviewViewController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <digidocpp/Conf.h>
#import <QuickLookUI/QuickLookUI.h>

#include <array>
#include <string_view>

using namespace digidoc;

Expand All @@ -37,11 +37,23 @@
std::string TSLCache() const final
{
NSURL *directory = [NSFileManager.defaultManager containerURLForSecurityApplicationGroupIdentifier:@"group.ee.ria.qdigidoc4.tsl"];
return directory.path.UTF8String;
const char *path = directory.path.fileSystemRepresentation;
return path ? path : "";
}
};

@implementation NSString (Digidoc)
+ (NSString*)fromUTF8:(std::string_view)value
{
if (value.empty())
return @"";
NSString *result = [[NSString alloc] initWithBytes:value.data() length:value.size() encoding:NSUTF8StringEncoding];
if (result)
return result;
result = [[NSString alloc] initWithBytes:value.data() length:value.size() encoding:NSISOLatin1StringEncoding];
return result ?: @"";
}

+ (NSString*)fileSize:(unsigned long)bytes
{
if (const auto gb = 1UL << 3; bytes >= gb)
Expand All @@ -55,30 +67,31 @@ + (NSString*)fileSize:(unsigned long)bytes

+ (void)parseException:(const Exception&)e result:(NSMutableArray *)result
{
[result addObject:[NSString stringWithUTF8String:e.msg().c_str()]];
[result addObject:[self htmlEntityEncode:e.msg()]];
for (const Exception &i : e.causes()) {
[self parseException:i result:result];
}
}

+ (NSString*)htmlEntityEncode:(std::string) s
+ (NSString*)htmlEntityEncodeString:(NSString*)value
{
using pair = std::pair<std::string_view, std::string_view>;
constexpr std::array replace = std::to_array({
pair{"&", "&amp;"},
pair{"\"", "&quot;"},
pair{"'", "&apos;"},
pair{"<", "&lt;"},
pair{">", "&gt;"}
});
for(const auto &[from, to]: replace) {
size_t startPos = 0;
while ((startPos = s.find(from, startPos)) != std::string::npos) {
s.replace(startPos, from.length(), to);
startPos += to.length();
}
};
return [NSString stringWithUTF8String:s.c_str()];
NSMutableString *result = [NSMutableString stringWithString:value ?: @""];
for (NSArray<NSString*> *replacement in @[
@[@"&", @"&amp;"],
@[@"\"", @"&quot;"],
@[@"'", @"&apos;"],
@[@"<", @"&lt;"],
@[@">", @"&gt;"]
]) {
[result replaceOccurrencesOfString:replacement[0] withString:replacement[1]
options:0 range:NSMakeRange(0, result.length)];
}
return result;
}

+ (NSString*)htmlEntityEncode:(std::string_view)value
{
return [self htmlEntityEncodeString:[self fromUTF8:value]];
}
@end

Expand All @@ -104,14 +117,19 @@ - (void)providePreviewForFileRequest:(QLFilePreviewRequest *)request

NSMutableString *h = [NSMutableString stringWithString:@R"(
<html><head><meta charset="UTF-8"><style>
* { font-family: 'Lucida Sans Unicode', 'Lucida Grande', sans-serif };
body { font-size: 10pt };
h2 { padding-left: 50px; background: url('cid:asic.icns'); background-size: 42px 42px; background-repeat:no-repeat; };
font, dt { color: #808080 };
dt { float: left; clear: left; margin-left: 30px; margin-right: 10px };
dl { margin-bottom: 10px };
:root { color-scheme: light dark; }
* { font-family: -apple-system, system-ui, sans-serif; }
body { font-size: 10pt; }
h2 img { width: 42px; height: 42px; vertical-align: middle; margin-right: 8px; }
font, dt { color: #808080; }
dt { float: left; clear: left; margin-left: 30px; margin-right: 10px; }
dl { margin-bottom: 10px; }
@media (prefers-color-scheme: dark) {
font, dt { color: #a8a8a8; }
}
</style></head><body>)"];
[h appendFormat:@"<h2>%@<hr size='1' /></h2>", [NSString htmlEntityEncode:request.fileURL.lastPathComponent.UTF8String]];
[h appendFormat:@"<h2><img src=\"cid:asic.icns\" />%@<hr size='1' /></h2>",
[NSString htmlEntityEncodeString:request.fileURL.lastPathComponent]];
try
{
static const bool initialized = [] {
Expand All @@ -137,7 +155,7 @@ - (void)providePreviewForFileRequest:(QLFilePreviewRequest *)request
for (const Signature *s : d->signatures()) {
[h appendFormat:@"<dl><dt>Signer</dt><dd>%@</dd>", [NSString htmlEntityEncode:s->signedBy()]];

NSString *date = [NSString stringWithUTF8String:s->trustedSigningTime().c_str()];
NSString *date = [NSString fromUTF8:s->trustedSigningTime()];
[h appendFormat:@"<dt>Time</dt><dd>%@</dd>", [dto stringFromDate:[dfrom dateFromString:date]]];

Signature::Validator v(s);
Expand Down Expand Up @@ -183,6 +201,10 @@ - (void)providePreviewForFileRequest:(QLFilePreviewRequest *)request
NSMutableArray *err = [NSMutableArray array];
[NSString parseException:e result:err];
[h appendFormat:@"Failed to load document:<br />%@", [err componentsJoinedByString:@"<br />"]];
} catch (const std::exception &e) {
[h appendFormat:@"Failed to load document:<br />%@", [NSString htmlEntityEncode:e.what()]];
} catch (...) {
[h appendString:@"Failed to load document:<br />Unknown error"];
}
[h appendString:@"</body></html>"];
return [h dataUsingEncoding:NSUTF8StringEncoding];
Expand Down
Loading