github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2026-08-19 09:23:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix HSTS matching

Browse Source 
* src/hsts.c (hsts_find_entry): Check for includeSubdomains,
  (test_hsts_new_entry): Fix test,
  (test_hsts_url_rewrite_superdomain): Improve test.

Reported-by: Hanno Böck <hanno@hboeck.de
This commit is contained in:
Tim Rühsen
2024-02-18 13:22:12 +01:00
parent 3aa53a6220
commit b32cc7afe0
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/hsts.c
View File

@@ -120,7 +120,6 @@ hsts_find_entry (hsts_store_t store,
struct hsts_kh *k = NULL; struct hsts_kh *k = NULL;
struct hsts_kh_info *khi = NULL; struct hsts_kh_info *khi = NULL;
enum hsts_kh_match match = NO_MATCH; enum hsts_kh_match match = NO_MATCH;
char *pos = NULL;
char *org_ptr = NULL; char *org_ptr = NULL;
k = (struct hsts_kh *) xnew (struct hsts_kh); k = (struct hsts_kh *) xnew (struct hsts_kh);
@@ -137,14 +136,15 @@ hsts_find_entry (hsts_store_t store,
goto end; goto end;
} }
while (match == NO_MATCH && for (char *p = k->host; (p = strchr(p, '.')); )
(pos = strchr (k->host, '.')) && pos - k->host > 0 &&
strchr (pos + 1, '.'))
{ {
k->host += (pos - k->host + 1); k->host = ++p;
khi = (struct hsts_kh_info *) hash_table_get (store->table, k); khi = (struct hsts_kh_info *) hash_table_get (store->table, k);
if (khi) if (khi && khi->include_subdomains)
match = SUPERDOMAIN_MATCH; {
match = SUPERDOMAIN_MATCH;
break;
}
} }
end: end:
@@ -735,7 +735,7 @@ test_hsts_new_entry (void)
mu_assert("Should've been no match", match == NO_MATCH); mu_assert("Should've been no match", match == NO_MATCH);
khi = hsts_find_entry (s, ".www.foo.com", MAKE_EXPLICIT_PORT (SCHEME_HTTPS, 443), &match, NULL); khi = hsts_find_entry (s, ".www.foo.com", MAKE_EXPLICIT_PORT (SCHEME_HTTPS, 443), &match, NULL);
mu_assert("Should've been no match", match == NO_MATCH); mu_assert("Should've been no match", match == SUPERDOMAIN_MATCH);
hsts_store_close (s); hsts_store_close (s);
close_hsts_test_store (s); close_hsts_test_store (s);
@@ -752,11 +752,15 @@ test_hsts_url_rewrite_superdomain (void)
s = open_hsts_test_store (); s = open_hsts_test_store ();
mu_assert("Could not open the HSTS store", s != NULL); mu_assert("Could not open the HSTS store", s != NULL);
created = hsts_store_entry (s, SCHEME_HTTPS, "www.foo.com", 443, 1234, true); created = hsts_store_entry (s, SCHEME_HTTPS, "example.com", 443, 1234, true);
mu_assert("A new entry should've been created", created == true); mu_assert("A new entry should've been created", created == true);
TEST_URL_RW (s, "www.foo.com", 80); created = hsts_store_entry (s, SCHEME_HTTPS, "rep.example.com", 443, 1234, false);
TEST_URL_RW (s, "bar.www.foo.com", 80); mu_assert("A new entry should've been created", created == true);
TEST_URL_RW (s, "example.com", 80);
TEST_URL_RW (s, "rep.example.com", 80);
TEST_URL_RW (s, "rep.rep.example.com", 80);
hsts_store_close (s); hsts_store_close (s);
close_hsts_test_store (s); close_hsts_test_store (s);