X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=actions.c;h=379c5e97b4ad6ad807960aaafd17fc797dc29163;hb=1603ca22d9a21bc6f0a181994e6971fd62cd3697;hp=a6854356372b9ce185ca151c891bb758d05bfd00;hpb=c7da782c447e25210ca3a98a71e079b21fce7340;p=privoxy.git
diff --git a/actions.c b/actions.c
index a6854356..379c5e97 100644
--- a/actions.c
+++ b/actions.c
@@ -1,12 +1,11 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.92 2013/12/24 13:35:23 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
*
* Purpose : Declares functions to work with actions files
*
- * Copyright : Written by and Copyright (C) 2001-2011 the
- * Privoxy team. http://www.privoxy.org/
+ * Copyright : Written by and Copyright (C) 2001-2016 the
+ * Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@ -57,9 +56,6 @@ const char actions_rcs[] = "$Id: actions.c,v 1.92 2013/12/24 13:35:23 fabiankeil
#include "ssplit.h"
#include "filters.h"
-const char actions_h_rcs[] = ACTIONS_H_VERSION;
-
-
/*
* We need the main list of options.
*
@@ -124,7 +120,10 @@ static const struct action_name action_names[] =
};
-static int load_one_actions_file(struct client_state *csp, int fileid);
+#ifndef FUZZ
+static
+#endif
+int load_one_actions_file(struct client_state *csp, int fileid);
/*********************************************************************
@@ -548,6 +547,12 @@ jb_err get_actions(char *line,
return JB_ERR_PARSE;
}
}
+#ifdef FEATURE_EXTENDED_STATISTICS
+ if (0 == strcmpic(action->name, "+block"))
+ {
+ register_block_reason_for_statistics(value);
+ }
+#endif
/* FIXME: should validate option string here */
freez (cur_action->string[action->index]);
cur_action->string[action->index] = strdup(value);
@@ -823,8 +828,12 @@ int update_action_bits_for_tag(struct client_state *csp, const char *tag)
continue;
}
+#ifdef HAVE_PCRE2
+ if (pcre2_pattern_matches(b->url->pattern.tag_regex, tag))
+#else
/* and check if one of the tag patterns matches the tag, */
if (0 == regexec(b->url->pattern.tag_regex, tag, 0, NULL, 0))
+#endif
{
/* if it does, update the action bit map, */
if (merge_current_action(csp->action, b->action))
@@ -879,7 +888,11 @@ jb_err check_negative_tag_patterns(struct client_state *csp, unsigned int flag)
}
for (tag = csp->tags->first; NULL != tag; tag = tag->next)
{
+#ifdef HAVE_PCRE2
+ if (pcre2_pattern_matches(b->url->pattern.tag_regex, tag->str))
+#else
if (0 == regexec(b->url->pattern.tag_regex, tag->str, 0, NULL, 0))
+#endif
{
/*
* The pattern matches at least one tag, thus the action
@@ -1080,6 +1093,52 @@ int load_action_files(struct client_state *csp)
}
+/*********************************************************************
+ *
+ * Function : filter_type_to_string
+ *
+ * Description : Converts a filter type enum into a string.
+ *
+ * Parameters :
+ * 1 : filter_type = filter_type as enum
+ *
+ * Returns : Pointer to static string.
+ *
+ *********************************************************************/
+static const char *filter_type_to_string(enum filter_type filter_type)
+{
+ switch (filter_type)
+ {
+ case FT_CONTENT_FILTER:
+ return "content filter";
+ case FT_CLIENT_HEADER_FILTER:
+ return "client-header filter";
+ case FT_SERVER_HEADER_FILTER:
+ return "server-header filter";
+ case FT_CLIENT_HEADER_TAGGER:
+ return "client-header tagger";
+ case FT_SERVER_HEADER_TAGGER:
+ return "server-header tagger";
+ case FT_SUPPRESS_TAG:
+ return "suppress tag filter";
+ case FT_CLIENT_BODY_FILTER:
+ return "client body filter";
+ case FT_CLIENT_BODY_TAGGER:
+ return "client body tagger";
+ case FT_ADD_HEADER:
+ return "add-header action";
+#ifdef FEATURE_EXTERNAL_FILTERS
+ case FT_EXTERNAL_CONTENT_FILTER:
+ return "external content filter";
+#endif
+ case FT_INVALID_FILTER:
+ return "invalid filter type";
+ }
+
+ return "unknown filter type";
+
+}
+
/*********************************************************************
*
* Function : referenced_filters_are_missing
@@ -1106,7 +1165,8 @@ static int referenced_filters_are_missing(const struct client_state *csp,
{
if (NULL == get_filter(csp, filtername->str, filter_type))
{
- log_error(LOG_LEVEL_ERROR, "Missing filter '%s'", filtername->str);
+ log_error(LOG_LEVEL_ERROR, "Missing %s '%s'",
+ filter_type_to_string(filter_type), filtername->str);
return 1;
}
}
@@ -1141,7 +1201,8 @@ static int action_spec_is_valid(struct client_state *csp, const struct action_sp
{ACTION_MULTI_CLIENT_HEADER_FILTER, FT_CLIENT_HEADER_FILTER},
{ACTION_MULTI_SERVER_HEADER_FILTER, FT_SERVER_HEADER_FILTER},
{ACTION_MULTI_CLIENT_HEADER_TAGGER, FT_CLIENT_HEADER_TAGGER},
- {ACTION_MULTI_SERVER_HEADER_TAGGER, FT_SERVER_HEADER_TAGGER}
+ {ACTION_MULTI_SERVER_HEADER_TAGGER, FT_SERVER_HEADER_TAGGER},
+ {ACTION_MULTI_CLIENT_BODY_FILTER, FT_CLIENT_BODY_FILTER}
};
int errors = 0;
int i;
@@ -1161,7 +1222,7 @@ static int action_spec_is_valid(struct client_state *csp, const struct action_sp
*
* Function : load_one_actions_file
*
- * Description : Read and parse a action file and add to files
+ * Description : Read and parse an action file and add to files
* list.
*
* Parameters :
@@ -1171,7 +1232,10 @@ static int action_spec_is_valid(struct client_state *csp, const struct action_sp
* Returns : 0 => Ok, everything else is an error.
*
*********************************************************************/
-static int load_one_actions_file(struct client_state *csp, int fileid)
+#ifndef FUZZ
+static
+#endif
+int load_one_actions_file(struct client_state *csp, int fileid)
{
/*
@@ -1212,13 +1276,7 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
return 1; /* never get here */
}
- fs->f = last_perm = (struct url_actions *)zalloc(sizeof(*last_perm));
- if (last_perm == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "can't load actions file '%s': out of memory!",
- csp->config->actions_file[fileid]);
- return 1; /* never get here */
- }
+ fs->f = last_perm = zalloc_or_die(sizeof(*last_perm));
if ((fp = fopen(csp->config->actions_file[fileid], "r")) == NULL)
{
@@ -1362,15 +1420,7 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
cur_action = NULL;
}
cur_action_used = 0;
- cur_action = (struct action_spec *)zalloc(sizeof(*cur_action));
- if (cur_action == NULL)
- {
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load actions file '%s': out of memory",
- csp->config->actions_file[fileid]);
- return 1; /* never get here */
- }
+ cur_action = zalloc_or_die(sizeof(*cur_action));
init_action(cur_action);
/*
@@ -1381,10 +1431,13 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
*
* buf + 1 to skip the leading '{'
*/
- actions_buf = strdup_or_die(buf + 1);
+ actions_buf = end = strdup_or_die(buf + 1);
/* check we have a trailing } and then trim it */
- end = actions_buf + strlen(actions_buf) - 1;
+ if (strlen(actions_buf))
+ {
+ end += strlen(actions_buf) - 1;
+ }
if (*end != '}')
{
/* No closing } */
@@ -1483,14 +1536,7 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
return 1; /* never get here */
}
- if ((new_alias = zalloc(sizeof(*new_alias))) == NULL)
- {
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load actions file '%s': out of memory!",
- csp->config->actions_file[fileid]);
- return 1; /* never get here */
- }
+ new_alias = zalloc_or_die(sizeof(*new_alias));
/* Eat any the whitespace before the '=' */
end--;
@@ -1541,14 +1587,7 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
/* it's an URL pattern */
/* allocate a new node */
- if ((perm = zalloc(sizeof(*perm))) == NULL)
- {
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load actions file '%s': out of memory!",
- csp->config->actions_file[fileid]);
- return 1; /* never get here */
- }
+ perm = zalloc_or_die(sizeof(*perm));
perm->action = cur_action;
cur_action_used = 1;
@@ -1617,7 +1656,7 @@ static int load_one_actions_file(struct client_state *csp, int fileid)
*
* Function : actions_to_text
*
- * Description : Converts a actionsfile entry from the internal
+ * Description : Converts an actionsfile entry from the internal
* structure into a text line. The output is split
* into one line for each action with line continuation.
*
@@ -1703,7 +1742,7 @@ char * actions_to_text(const struct action_spec *action)
*
* Function : actions_to_html
*
- * Description : Converts a actionsfile entry from numeric form
+ * Description : Converts an actionsfile entry from numeric form
* ("mask" and "add") to a
-separated HTML string
* in which each action is linked to its chapter in
* the user manual.
@@ -1810,7 +1849,7 @@ char * actions_to_html(const struct client_state *csp,
*
* Function : current_actions_to_html
*
- * Description : Converts a curren action spec to a
separated HTML
+ * Description : Converts a current action spec to a
separated HTML
* text in which each action is linked to its chapter in
* the user manual.
*
@@ -1906,7 +1945,7 @@ char *current_action_to_html(const struct client_state *csp,
*
* Function : action_to_line_of_text
*
- * Description : Converts a action spec to a single text line
+ * Description : Converts an action spec to a single text line
* listing the enabled actions.
*
* Parameters :