projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add TLS/SSL interception support
[privoxy.git]
/
cgiedit.c
diff --git
a/cgiedit.c
b/cgiedit.c
index
cb824f9
..
8817586
100644
(file)
--- a/
cgiedit.c
+++ b/
cgiedit.c
@@
-1,4
+1,3
@@
-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.78 2013/11/24 14:22:51 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
@@
-13,7
+12,7
@@
const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.78 2013/11/24 14:22:51 fabiankeil
*
* Stick to the short names in this file for consistency.
*
*
* Stick to the short names in this file for consistency.
*
- * Copyright : Written by and Copyright (C) 2001-20
08 the SourceForg
e
+ * Copyright : Written by and Copyright (C) 2001-20
14 th
e
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-71,8
+70,6
@@
const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.78 2013/11/24 14:22:51 fabiankeil
#endif /* def FEATURE_TOGGLE */
#include "urlmatch.h"
#endif /* def FEATURE_TOGGLE */
#include "urlmatch.h"
-const char cgiedit_h_rcs[] = CGIEDIT_H_VERSION;
-
#ifdef FEATURE_CGI_EDIT_ACTIONS
#ifdef FEATURE_CGI_EDIT_ACTIONS
@@
-243,6
+240,14
@@
static const struct filter_type_info filter_type_info[] =
"server-header-tagger-all", "server_header_tagger_all",
"E", "SERVER-HEADER-TAGGER"
},
"server-header-tagger-all", "server_header_tagger_all",
"E", "SERVER-HEADER-TAGGER"
},
+#ifdef FEATURE_EXTERNAL_FILTERS
+ {
+ ACTION_MULTI_EXTERNAL_FILTER,
+ "external-content-filter-params", "external-filter",
+ "external-content-filter-all", "external_content_filter_all",
+ "E", "EXTERNAL-CONTENT-FILTER"
+ },
+#endif
};
/* FIXME: Following non-static functions should be prototyped in .h or made static */
};
/* FIXME: Following non-static functions should be prototyped in .h or made static */
@@
-338,7
+343,7
@@
static char *section_target(const unsigned sectionid)
{
char buf[30];
{
char buf[30];
- snprintf(buf, sizeof(buf), "#l%
d
", sectionid);
+ snprintf(buf, sizeof(buf), "#l%
u
", sectionid);
return(strdup(buf));
}
return(strdup(buf));
}
@@
-360,7
+365,7
@@
static char *stringify(const unsigned number)
{
char buf[6];
{
char buf[6];
- snprintf(buf, sizeof(buf), "%
i
", number);
+ snprintf(buf, sizeof(buf), "%
u
", number);
return strdup(buf);
}
return strdup(buf);
}
@@
-835,11
+840,7
@@
jb_err edit_write_file(struct editable_file * file)
freez(file->version_str);
snprintf(version_buf, sizeof(version_buf), "%u", file->version);
version_buf[sizeof(version_buf)-1] = '\0';
freez(file->version_str);
snprintf(version_buf, sizeof(version_buf), "%u", file->version);
version_buf[sizeof(version_buf)-1] = '\0';
- file->version_str = strdup(version_buf);
- if (version_buf == NULL)
- {
- return JB_ERR_MEMORY;
- }
+ file->version_str = strdup_or_die(version_buf);
return JB_ERR_OK;
}
return JB_ERR_OK;
}
@@
-1203,6
+1204,7
@@
jb_err edit_parse_actions_file(struct editable_file * file)
err = split_line_on_equals(cur_line->unprocessed, &name, &value);
if (err == JB_ERR_MEMORY)
{
err = split_line_on_equals(cur_line->unprocessed, &name, &value);
if (err == JB_ERR_MEMORY)
{
+ free_alias_list(alias_list);
return err;
}
else if (err != JB_ERR_OK)
return err;
}
else if (err != JB_ERR_OK)
@@
-1210,17
+1212,11
@@
jb_err edit_parse_actions_file(struct editable_file * file)
/* Line does not contain a name=value pair */
file->parse_error = cur_line;
file->parse_error_text = "Expected a name=value pair on this {{alias}} line, but couldn't find one.";
/* Line does not contain a name=value pair */
file->parse_error = cur_line;
file->parse_error_text = "Expected a name=value pair on this {{alias}} line, but couldn't find one.";
+ free_alias_list(alias_list);
return JB_ERR_PARSE;
}
return JB_ERR_PARSE;
}
- if ((new_alias = zalloc(sizeof(*new_alias))) == NULL)
- {
- /* Out of memory */
- free(name);
- free(value);
- free_alias_list(alias_list);
- return JB_ERR_MEMORY;
- }
+ new_alias = zalloc_or_die(sizeof(*new_alias));
err = get_actions(value, alias_list, new_alias->action);
if (err)
err = get_actions(value, alias_list, new_alias->action);
if (err)
@@
-1388,11
+1384,7
@@
jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile, int *newline)
*pfile = NULL;
*pfile = NULL;
- cur_line = first_line = zalloc(sizeof(struct file_line));
- if (cur_line == NULL)
- {
- return JB_ERR_MEMORY;
- }
+ cur_line = first_line = zalloc_or_die(sizeof(struct file_line));
cur_line->type = FILE_LINE_UNPROCESSED;
cur_line->type = FILE_LINE_UNPROCESSED;
@@
-1408,13
+1400,7
@@
jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile, int *newline)
do
{
prev_line = cur_line;
do
{
prev_line = cur_line;
- cur_line = prev_line->next = zalloc(sizeof(struct file_line));
- if (cur_line == NULL)
- {
- /* Out of memory */
- edit_free_file_lines(first_line);
- return JB_ERR_MEMORY;
- }
+ cur_line = prev_line->next = zalloc_or_die(sizeof(struct file_line));
cur_line->type = FILE_LINE_UNPROCESSED;
cur_line->type = FILE_LINE_UNPROCESSED;
@@
-1544,12
+1530,7
@@
jb_err edit_read_file(struct client_state *csp,
return err;
}
return err;
}
- file = (struct editable_file *) zalloc(sizeof(*file));
- if (err)
- {
- edit_free_file_lines(lines);
- return err;
- }
+ file = zalloc_or_die(sizeof(*file));
file->lines = lines;
file->newline = newline;
file->lines = lines;
file->newline = newline;
@@
-1561,12
+1542,7
@@
jb_err edit_read_file(struct client_state *csp,
freez(file->version_str);
snprintf(version_buf, sizeof(version_buf), "%u", file->version);
version_buf[sizeof(version_buf)-1] = '\0';
freez(file->version_str);
snprintf(version_buf, sizeof(version_buf), "%u", file->version);
version_buf[sizeof(version_buf)-1] = '\0';
- file->version_str = strdup(version_buf);
- if (version_buf == NULL)
- {
- edit_free_file(file);
- return JB_ERR_MEMORY;
- }
+ file->version_str = strdup_or_die(version_buf);
*pfile = file;
return JB_ERR_OK;
*pfile = file;
return JB_ERR_OK;
@@
-2341,7
+2317,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
{
if (!strncmp(b->url->spec, "standard.", 9) && *(b->url->spec + 9) != '\0')
{
{
if (!strncmp(b->url->spec, "standard.", 9) && *(b->url->spec + 9) != '\0')
{
- if (err
|| (NULL == (section_exports = new_map()))
)
+ if (err)
{
freez(buttons);
free(section_template);
{
freez(buttons);
free(section_template);
@@
-2350,6
+2326,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
return JB_ERR_MEMORY;
}
return JB_ERR_MEMORY;
}
+ section_exports = new_map();
err = map(section_exports, "button-name", 1, b->url->spec + 9, 1);
if (err || (NULL == (s = strdup(section_template))))
err = map(section_exports, "button-name", 1, b->url->spec + 9, 1);
if (err || (NULL == (s = strdup(section_template))))
@@
-2378,9
+2355,9
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
*/
if (!err) err = map_conditional(exports, "all-urls-present", 1);
*/
if (!err) err = map_conditional(exports, "all-urls-present", 1);
- snprintf(buf, sizeof(buf), "%
d
", line_number);
+ snprintf(buf, sizeof(buf), "%
u
", line_number);
if (!err) err = map(exports, "all-urls-s", 1, buf, 1);
if (!err) err = map(exports, "all-urls-s", 1, buf, 1);
- snprintf(buf, sizeof(buf), "%
d
", line_number + 2);
+ snprintf(buf, sizeof(buf), "%
u
", line_number + 2);
if (!err) err = map(exports, "all-urls-s-next", 1, buf, 1);
if (!err) err = map(exports, "all-urls-actions", 1,
actions_to_html(csp, cur_line->data.action), 0);
if (!err) err = map(exports, "all-urls-s-next", 1, buf, 1);
if (!err) err = map(exports, "all-urls-actions", 1,
actions_to_html(csp, cur_line->data.action), 0);
@@
-2481,17
+2458,9
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
while ((cur_line != NULL) && (cur_line->type == FILE_LINE_ACTION))
{
while ((cur_line != NULL) && (cur_line->type == FILE_LINE_ACTION))
{
- if (NULL == (section_exports = new_map()))
- {
- free(sections);
- free(section_template);
- free(url_template);
- edit_free_file(file);
- free_map(exports);
- return JB_ERR_MEMORY;
- }
+ section_exports = new_map();
- snprintf(buf, sizeof(buf), "%
d
", line_number);
+ snprintf(buf, sizeof(buf), "%
u
", line_number);
err = map(section_exports, "s", 1, buf, 1);
if (!err) err = map(section_exports, "actions", 1,
actions_to_html(csp, cur_line->data.action), 0);
err = map(section_exports, "s", 1, buf, 1);
if (!err) err = map(section_exports, "actions", 1,
actions_to_html(csp, cur_line->data.action), 0);
@@
-2511,7
+2480,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
if (prev_section_line_number != ((unsigned)(-1)))
{
/* Not last section */
if (prev_section_line_number != ((unsigned)(-1)))
{
/* Not last section */
- snprintf(buf, sizeof(buf), "%
d
", prev_section_line_number);
+ snprintf(buf, sizeof(buf), "%
u
", prev_section_line_number);
if (!err) err = map(section_exports, "s-prev", 1, buf, 1);
if (!err) err = map_block_keep(section_exports, "s-prev-exists");
}
if (!err) err = map(section_exports, "s-prev", 1, buf, 1);
if (!err) err = map_block_keep(section_exports, "s-prev-exists");
}
@@
-2553,19
+2522,9
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
while ((cur_line != NULL) && (cur_line->type == FILE_LINE_URL))
{
while ((cur_line != NULL) && (cur_line->type == FILE_LINE_URL))
{
- if (NULL == (url_exports = new_map()))
- {
- free(urls);
- free(sections);
- free(section_template);
- free(url_template);
- edit_free_file(file);
- free_map(exports);
- free_map(section_exports);
- return JB_ERR_MEMORY;
- }
+ url_exports = new_map();
- snprintf(buf, sizeof(buf), "%
d
", line_number);
+ snprintf(buf, sizeof(buf), "%
u
", line_number);
err = map(url_exports, "p", 1, buf, 1);
snprintf(buf, sizeof(buf), "%d", url_1_2);
err = map(url_exports, "p", 1, buf, 1);
snprintf(buf, sizeof(buf), "%d", url_1_2);
@@
-2631,7
+2590,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
/* Could also do section-specific exports here, but it wouldn't be as fast */
/* Could also do section-specific exports here, but it wouldn't be as fast */
- snprintf(buf, sizeof(buf), "%
d
", line_number);
+ snprintf(buf, sizeof(buf), "%
u
", line_number);
if (!err) err = map(section_exports, "s-next", 1, buf, 1);
if ((cur_line != NULL)
if (!err) err = map(section_exports, "s-next", 1, buf, 1);
if ((cur_line != NULL)
@@
-2820,6
+2779,10
@@
jb_err cgi_edit_actions_for_url(struct client_state *csp,
}
}
}
}
+#ifndef FEATURE_EXTERNAL_FILTERS
+ if (!err) err = map_block_killer(exports, "external-content-filters");
+#endif
+
if (err)
{
edit_free_file(file);
if (err)
{
edit_free_file(file);
@@
-2870,7
+2833,7
@@
jb_err cgi_edit_actions_for_url(struct client_state *csp,
char number[20];
struct list_entry *filter_name;
struct map *line_exports;
char number[20];
struct list_entry *filter_name;
struct map *line_exports;
- const
int
type = filter_group->type;
+ const
enum filter_type
type = filter_group->type;
const int multi_action_index = filter_type_info[type].multi_action_index;
assert(type < MAX_FILTER_TYPES);
const int multi_action_index = filter_type_info[type].multi_action_index;
assert(type < MAX_FILTER_TYPES);
@@
-3230,8
+3193,8
@@
jb_err cgi_edit_actions_submit(struct client_state *csp,
return err;
}
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
i#l%d
",
- (long) time(NULL), file->identifier, sectionid);
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
u#l%u
",
+ (
unsigned
long) time(NULL), file->identifier, sectionid);
edit_free_file(file);
edit_free_file(file);
@@
-3351,8
+3314,8
@@
jb_err cgi_edit_actions_url(struct client_state *csp,
return err;
}
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
i#l%d
",
- (long) time(NULL), file->identifier, section_start_line_number);
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
u#l%u
",
+ (
unsigned
long) time(NULL), file->identifier, section_start_line_number);
edit_free_file(file);
edit_free_file(file);
@@
-3447,13
+3410,7
@@
jb_err cgi_edit_actions_add_url(struct client_state *csp,
/* At this point, the section header is in cur_line - add after this. */
/* Allocate the new line */
/* At this point, the section header is in cur_line - add after this. */
/* Allocate the new line */
- new_line = (struct file_line *)zalloc(sizeof(*new_line));
- if (new_line == NULL)
- {
- free(new_pattern);
- edit_free_file(file);
- return JB_ERR_MEMORY;
- }
+ new_line = zalloc_or_die(sizeof(*new_line));
/* Fill in the data members of the new line */
new_line->raw = NULL;
/* Fill in the data members of the new line */
new_line->raw = NULL;
@@
-3480,8
+3437,8
@@
jb_err cgi_edit_actions_add_url(struct client_state *csp,
return err;
}
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
i#l%d
",
- (long) time(NULL), file->identifier, sectionid);
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
u#l%u
",
+ (
unsigned
long) time(NULL), file->identifier, sectionid);
edit_free_file(file);
edit_free_file(file);
@@
-3591,8
+3548,8
@@
jb_err cgi_edit_actions_remove_url(struct client_state *csp,
return err;
}
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
i#l%d
",
- (long) time(NULL), file->identifier, section_start_line_number);
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
u#l%u
",
+ (
unsigned
long) time(NULL), file->identifier, section_start_line_number);
edit_free_file(file);
edit_free_file(file);
@@
-3713,8
+3670,8
@@
jb_err cgi_edit_actions_section_remove(struct client_state *csp,
return err;
}
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
i
",
- (long) time(NULL), file->identifier);
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
u
",
+ (
unsigned
long) time(NULL), file->identifier);
edit_free_file(file);
edit_free_file(file);
@@
-3840,13
+3797,7
@@
jb_err cgi_edit_actions_section_add(struct client_state *csp,
}
/* Allocate the new line */
}
/* Allocate the new line */
- new_line = (struct file_line *)zalloc(sizeof(*new_line));
- if (new_line == NULL)
- {
- free(new_text);
- edit_free_file(file);
- return JB_ERR_MEMORY;
- }
+ new_line = zalloc_or_die(sizeof(*new_line));
/* Fill in the data members of the new line */
new_line->raw = NULL;
/* Fill in the data members of the new line */
new_line->raw = NULL;
@@
-3882,8
+3833,8
@@
jb_err cgi_edit_actions_section_add(struct client_state *csp,
return err;
}
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
i
",
- (long) time(NULL), file->identifier);
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
u
",
+ (
unsigned
long) time(NULL), file->identifier);
edit_free_file(file);
edit_free_file(file);
@@
-4071,8
+4022,8
@@
jb_err cgi_edit_actions_section_swap(struct client_state *csp,
}
} /* END if (section1 != section2) */
}
} /* END if (section1 != section2) */
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
i
",
- (long) time(NULL), file->identifier);
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%
u
",
+ (
unsigned
long) time(NULL), file->identifier);
edit_free_file(file);
edit_free_file(file);
@@
-4453,6
+4404,8
@@
jb_err cgi_toggle(struct client_state *csp,
global_toggle_state = !global_toggle_state;
}
global_toggle_state = !global_toggle_state;
}
+ log_error(LOG_LEVEL_INFO, "Now toggled %s.", global_toggle_state ? "ON" : "OFF");
+
if (NULL == (exports = default_exports(csp, "toggle")))
{
return JB_ERR_MEMORY;
if (NULL == (exports = default_exports(csp, "toggle")))
{
return JB_ERR_MEMORY;