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

Refactor adblock_is_matched_by_key into adblock_check_rule

Browse source
This commit is contained in:
Alexander Butenko 2011-11-28 20:48:55 +01:00 committed by Christian Dywan
parent 75c5f57f91
commit f8b6792756
1 changed files with 33 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
extensions/adblock.c
View file

@ -596,29 +596,35 @@ adblock_open_preferences_cb (MidoriExtension* extension)
gtk_window_present (GTK_WINDOW (dialog)); gtk_window_present (GTK_WINDOW (dialog));
} }
static inline gboolean static inline gint
adblock_check_filter_options (GRegex* regex, adblock_check_rule (GRegex* regex,
const gchar* opts, const gchar* patt,
const gchar* req_uri, const gchar* req_uri,
const gchar* page_uri) const gchar* page_uri)
{ {
if (g_regex_match_simple (",third-party", opts, gchar* opts;
if (!g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL))
return FALSE;
opts = g_hash_table_lookup (optslist, patt);
if (opts && g_regex_match_simple (",third-party", opts,
G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
{ {
if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL)) if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL))
return TRUE; return FALSE;
} }
/* TODO: Domain opt check */ /* TODO: Domain opt check */
return FALSE; adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri);
return TRUE;
} }
static inline gboolean static inline gboolean
adblock_is_matched_by_pattern (const gchar* req_uri, adblock_is_matched_by_pattern (const gchar* req_uri,
const gchar* page_uri) const gchar* page_uri)
{ {
GHashTableIter iter; GHashTableIter iter;
gpointer patt, regex; gpointer patt, regex;
gchar* opts;
if (USE_PATTERN_MATCHING == 0) if (USE_PATTERN_MATCHING == 0)
return FALSE; return FALSE;
@ -626,31 +632,24 @@ adblock_is_matched_by_pattern (const gchar* req_uri,
g_hash_table_iter_init (&iter, pattern); g_hash_table_iter_init (&iter, pattern);
while (g_hash_table_iter_next (&iter, &patt, &regex)) while (g_hash_table_iter_next (&iter, &patt, &regex))
{ {
if (g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL)) if (adblock_check_rule (regex, patt, req_uri, page_uri))
{ return TRUE;
opts = g_hash_table_lookup (optslist, patt);
if (opts && adblock_check_filter_options (regex, opts, req_uri, page_uri) == TRUE)
return FALSE;
else
{
adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri);
return TRUE;
}
}
} }
return FALSE; return FALSE;
} }
static inline gboolean static inline gboolean
adblock_is_matched_by_key (const gchar* req_uri, adblock_is_matched_by_key (const gchar* req_uri,
const gchar* page_uri) const gchar* page_uri)
{ {
gchar* uri; gchar* uri;
gint len; gint len;
int pos = 0; int pos = 0;
GList* regex_bl = NULL; GList* regex_bl = NULL;
GString* guri; GString* guri;
gboolean ret = FALSE;
/* Signatures are made on pattern, so we need to convert url to a pattern as well */
guri = adblock_fixup_regexp ("", (gchar*)req_uri); guri = adblock_fixup_regexp ("", (gchar*)req_uri);
uri = guri->str; uri = guri->str;
len = guri->len; len = guri->len;
@ -659,35 +658,23 @@ adblock_is_matched_by_key (const gchar* req_uri,
{ {
gchar* sig = g_strndup (uri + pos, SIGNATURE_SIZE); gchar* sig = g_strndup (uri + pos, SIGNATURE_SIZE);
GRegex* regex = g_hash_table_lookup (keys, sig); GRegex* regex = g_hash_table_lookup (keys, sig);
gchar* opts;
if (regex && !g_list_find (regex_bl, regex)) /* Dont check if regex is already blacklisted */
if (!regex || g_list_find (regex_bl, regex))
{ {
if (g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL)) g_free (sig);
{ continue;
opts = g_hash_table_lookup (optslist, sig);
g_free (sig);
if (opts && adblock_check_filter_options (regex, opts, req_uri, page_uri))
{
g_free (uri);
g_list_free (regex_bl);
return FALSE;
}
else
{
adblock_debug ("blocked by regexp=%s -- %s", g_regex_get_pattern (regex), uri);
g_free (uri);
g_list_free (regex_bl);
return TRUE;
}
}
regex_bl = g_list_prepend (regex_bl, regex);
} }
ret = adblock_check_rule (regex, sig, req_uri, page_uri);
g_free (sig); g_free (sig);
if (!ret)
regex_bl = g_list_prepend (regex_bl, regex);
else
break;
} }
g_string_free (guri, TRUE); g_string_free (guri, TRUE);
g_list_free (regex_bl); g_list_free (regex_bl);
return FALSE; return ret;
} }
static gboolean static gboolean