eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

content_saw_insecure_objects: Fix various corner cases 

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2019-12-01 17:03:59 +00:00
parent 868c42b344
commit 2e07d955b6
No known key found for this signature in database
GPG Key ID: C30DF439F2987D74
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
content/content.c
View File

@ -569,7 +569,8 @@ bool content_exec(struct hlcache_handle *h, const char *src, size_t srclen)
bool content_saw_insecure_objects(struct hlcache_handle *h)
{
struct content *c = hlcache_handle_get_content(h);
lwc_string *scheme = nsurl_get_component(content_get_url(c), NSURL_SCHEME);
struct nsurl *url = hlcache_handle_get_url(h);
lwc_string *scheme = nsurl_get_component(url, NSURL_SCHEME);
bool match;
/* Is this an internal scheme? If so, we trust here and stop */
@ -581,6 +582,14 @@ bool content_saw_insecure_objects(struct hlcache_handle *h)
(match == true)) ||
(lwc_string_isequal(scheme, corestring_lwc_resource,
&match) == lwc_error_ok &&
(match == true)) ||
/* Our internal x-ns-css scheme is secure */
(lwc_string_isequal(scheme, corestring_lwc_x_ns_css,
&match) == lwc_error_ok &&
(match == true)) ||
/* We also treat file: as "not insecure" here */
(lwc_string_isequal(scheme, corestring_lwc_file,
&match) == lwc_error_ok &&
(match == true))) {
/* No insecurity to find */
return false;
@ -595,13 +604,13 @@ bool content_saw_insecure_objects(struct hlcache_handle *h)
}
/* I am supposed to be secure, but was I overridden */
if (urldb_get_cert_permissions(content_get_url(c))) {
if (urldb_get_cert_permissions(url)) {
/* I was https:// but I was overridden, that's no good */
return true;
}
/* Otherwise try and chain through the handler */
if (c->handler->saw_insecure_objects != NULL) {
if (c != NULL && c->handler->saw_insecure_objects != NULL) {
return c->handler->saw_insecure_objects(c);
}