debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cache HSTS directives and handle sub domains

Browse source
This commit is contained in:
Christian Dywan 2012-09-02 21:09:18 +02:00
parent fee43b8be6
commit c1d387f958
1 changed files with 58 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
katze/midori-hsts.vala
View file

@ -35,17 +35,37 @@ namespace Midori {
} }
} }
public string? filename { get; set; default = null; } File file;
HashTable<string, Directive> whitelist; HashTable<string, Directive> whitelist;
bool debug = false; bool debug = false;
public HSTS (owned string new_filename) { public HSTS (owned string filename) {
filename = new_filename;
whitelist = new HashTable<string, Directive> (str_hash, str_equal); whitelist = new HashTable<string, Directive> (str_hash, str_equal);
read_cache (File.new_for_path (Paths.get_config_filename (null, "hsts")));
file = File.new_for_path (filename);
read_cache (file);
if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "hsts") == 0) if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "hsts") == 0)
debug = true; debug = true;
} }
async void read_cache (File file) {
try {
var stream = new DataInputStream (yield file.read_async ());
do {
string? line = yield stream.read_line_async ();
if (line == null)
break;
string[] parts = line.split (" ", 2);
if (parts[0] == null || parts[1] == null)
break;
var directive = new Directive.from_header (parts[1]);
if (directive.is_valid ())
append_to_whitelist (parts[0], directive);
} while (true);
}
catch (Error error) { }
}
/* No sub-features */ /* No sub-features */
public bool add_feature (Type type) { return false; } public bool add_feature (Type type) { return false; }
public bool remove_feature (Type type) { return false; } public bool remove_feature (Type type) { return false; }
@ -59,18 +79,44 @@ namespace Midori {
public void request_queued (Soup.Session session, Soup.Message message) { } public void request_queued (Soup.Session session, Soup.Message message) { }
public void request_unqueued (Soup.Session session, Soup.Message msg) { } public void request_unqueued (Soup.Session session, Soup.Message msg) { }
bool should_secure_host (string host) {
Directive? directive = whitelist.lookup (host);
if (directive == null)
directive = whitelist.lookup ("*." + host);
return directive != null && directive.is_valid ();
}
void queued (Soup.Session session, Soup.Message message) { void queued (Soup.Session session, Soup.Message message) {
Directive? directive = whitelist.lookup (message.uri.host); if (should_secure_host (message.uri.host)) {
if (directive != null && directive.is_valid ()) {
message.uri.set_scheme ("https"); message.uri.set_scheme ("https");
session.requeue_message (message); session.requeue_message (message);
if (debug) if (debug)
stdout.printf ("HTPS: Enforce %s\n", message.uri.to_string (false)); stdout.printf ("HSTS: Enforce %s\n", message.uri.host);
} }
else if (message.uri.scheme == "http") else if (message.uri.scheme == "http")
message.finished.connect (strict_transport_security_handled); message.finished.connect (strict_transport_security_handled);
} }
void append_to_whitelist (string host, Directive directive) {
whitelist.insert (host, directive);
if (directive.sub_domains)
whitelist.insert ("*." + host, directive);
}
async void append_to_cache (string host, string header) {
if (Midori.Paths.is_readonly ())
return;
try {
var stream = file.append_to/* FIXME _async*/ (FileCreateFlags.NONE);
yield stream.write_async ((host + " " + header + "\n").data);
yield stream.flush_async ();
}
catch (Error error) {
critical ("Failed to update %s: %s", file.get_path (), error.message);
}
}
void strict_transport_security_handled (Soup.Message message) { void strict_transport_security_handled (Soup.Message message) {
if (message == null || message.uri == null) if (message == null || message.uri == null)
return; return;
@ -80,11 +126,13 @@ namespace Midori {
return; return;
var directive = new Directive.from_header (hsts); var directive = new Directive.from_header (hsts);
if (directive.is_valid ()) if (directive.is_valid ()) {
whitelist.insert (message.uri.host, directive); append_to_whitelist (message.uri.host, directive);
append_to_cache (message.uri.host, hsts);
}
if (debug) if (debug)
stdout.printf ("HTPS: '%s' sets '%s' valid? %s\n", stdout.printf ("HSTS: '%s' sets '%s' valid? %s\n",
message.uri.to_string (false), hsts, directive.is_valid ().to_string ()); message.uri.host, hsts, directive.is_valid ().to_string ());
} }
} }