X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.c;h=d9d6f28d75b560edab083a0b65106130b0a289a8;hp=6860dd9196454cfd2ec94fd29e68da8fb89522cc;hb=05dfb69d1ff3a6e1aad8887f645a24268a9bb6b4;hpb=c35324374411cae44d7c40dd8403e30ef53ea1f0
diff --git a/cgi.c b/cgi.c
index 6860dd91..d9d6f28d 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,10 +1,12 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.23 2001/09/16 11:16:05 jongfoster Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.28 2001/09/19 18:00:37 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
*
* Purpose : Declares functions to intercept request, generate
* html or gif answers, and to compose HTTP resonses.
+ * This only contains the framework functions, the
+ * actual handler functions are declared elsewhere.
*
* Functions declared include:
*
@@ -36,6 +38,36 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.23 2001/09/16 11:16:05 jongfoster Exp $";
*
* Revisions :
* $Log: cgi.c,v $
+ * Revision 1.28 2001/09/19 18:00:37 oes
+ * - Deletef time() FIXME (Can't fail under Linux either, if
+ * the argument is guaranteed to be in out address space,
+ * which it is.)
+ * - Fixed comments
+ * - Pointer notation cosmetics
+ * - Fixed a minor bug in template_fill(): Failiure of
+ * pcrs_execute() now secure.
+ *
+ * Revision 1.27 2001/09/16 17:08:54 jongfoster
+ * Moving simple CGI functions from cgi.c to new file cgisimple.c
+ *
+ * Revision 1.26 2001/09/16 15:47:37 jongfoster
+ * First version of CGI-based edit interface. This is very much a
+ * work-in-progress, and you can't actually use it to edit anything
+ * yet. You must #define FEATURE_CGI_EDIT_ACTIONS for these changes
+ * to have any effect.
+ *
+ * Revision 1.25 2001/09/16 15:02:35 jongfoster
+ * Adding i.j.b/robots.txt.
+ * Inlining add_stats() since it's only ever called from one place.
+ *
+ * Revision 1.24 2001/09/16 11:38:01 jongfoster
+ * Splitting fill_template() into 2 functions:
+ * template_load() loads the file
+ * template_fill() performs the PCRS regexps.
+ * This is because the CGI edit interface has a "table row"
+ * template which is used many times in the page - this
+ * change means it's only loaded from disk once.
+ *
* Revision 1.23 2001/09/16 11:16:05 jongfoster
* Better error handling in dispatch_cgi() and parse_cgi_parameters()
*
@@ -185,17 +217,19 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.23 2001/09/16 11:16:05 jongfoster Exp $";
#include "list.h"
#include "encode.h"
#include "ssplit.h"
-#include "jcc.h"
-#include "filters.h"
-#include "actions.h"
#include "errlog.h"
#include "miscutil.h"
-#include "showargs.h"
-#include "loadcfg.h"
+#include "cgisimple.h"
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+#include "cgiedit.h"
+#endif /* def FEATURE_CGI_EDIT_ACTIONS */
const char cgi_h_rcs[] = CGI_H_VERSION;
const struct cgi_dispatcher cgi_dispatcher[] = {
+ { "robots.txt",
+ 10, cgi_robots_txt,
+ "HIDE Sends a robots.txt file to tell robots to go away." },
{ "show-status",
11, cgi_show_status,
"Show information about the current configuration" },
@@ -208,6 +242,17 @@ const struct cgi_dispatcher cgi_dispatcher[] = {
{ "send-banner",
11, cgi_send_banner,
"HIDE Send the transparent or \"Junkbuster\" gif" },
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+ { "edit-actions-list",
+ 17, cgi_edit_actions_list,
+ "Edit the actions list" },
+ { "edit-actions-submit",
+ 19, cgi_edit_actions_submit,
+ "HIDE Change the actions for (a) specified URL(s)" },
+ { "edit-actions",
+ 12, cgi_edit_actions,
+ "HIDE Edit the actions for (a) specified URL(s)" },
+#endif /* def FEATURE_CGI_EDIT_ACTIONS */
{ "",
0, cgi_default,
"Junkbuster main page" },
@@ -300,6 +345,7 @@ struct http_response *dispatch_cgi(struct client_state *csp)
return NULL;
}
+
/* Remove leading slash */
if (*argstring == '/')
{
@@ -337,6 +383,7 @@ struct http_response *dispatch_cgi(struct client_state *csp)
/* Can't get here, since cgi_default will match all requests */
free_http_response(rsp);
return(NULL);
+
}
@@ -392,445 +439,6 @@ struct map *parse_cgi_parameters(char *argstring)
}
-/*********************************************************************
- *
- * Function : cgi_default
- *
- * Description : CGI function that is called if no action was given.
- * Lists menu of available unhidden CGIs.
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
- *
- * Returns : 0
- *
- *********************************************************************/
-int cgi_default(struct client_state *csp, struct http_response *rsp,
- struct map *parameters)
-{
- char *p;
- char *tmp = NULL;
- struct map * exports = default_exports(csp, "");
-
- /* If there were other parameters, export a dump as "cgi-parameters" */
- if(parameters)
- {
- p = dump_map(parameters);
- tmp = strsav(tmp, "What made you think this cgi takes parameters?\n"
- "Anyway, here they are, in case you're interested:
\n");
- tmp = strsav(tmp, p);
- map(exports, "cgi-parameters", 1, tmp, 0);
- free(p);
- }
- else
- {
- map(exports, "cgi-parameters", 1, "", 1);
- }
-
- rsp->body = template_load(csp, "default");
- template_fill(&rsp->body, exports);
- free_map(exports);
- return(0);
-
-}
-
-
-/*********************************************************************
- *
- * Function : cgi_send_banner
- *
- * Description : CGI function that returns a banner.
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
- *
- * CGI Parameters :
- * type : Selects the type of banner between "trans" and "jb".
- * Defaults to "jb" if absent or != "trans".
- *
- * Returns : 0
- *
- *********************************************************************/
-int cgi_send_banner(struct client_state *csp, struct http_response *rsp,
- struct map *parameters)
-{
- if(strcmp(lookup(parameters, "type"), "trans"))
- {
- rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length);
- rsp->content_length = image_junkbuster_gif_length;
- }
- else
- {
- rsp->body = bindup(image_blank_gif_data, image_blank_gif_length);
- rsp->content_length = image_blank_gif_length;
- }
-
- enlist(rsp->headers, "Content-Type: image/gif");
- rsp->is_static = 1;
-
- return(0);
-
-}
-
-
-/*********************************************************************
- *
- * Function : cgi_show_version
- *
- * Description : CGI function that returns a a web page describing the
- * file versions of IJB.
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
- *
- * CGI Parameters :
- * type : Selects the type of banner between "trans" and "jb".
- * Defaults to "jb" if absent or != "trans".
- *
- * Returns : 0
- *
- *********************************************************************/
-int cgi_show_version(struct client_state *csp, struct http_response *rsp,
- struct map *parameters)
-{
- struct map * exports = default_exports(csp, "show-version");
-
- map(exports, "sourceversions", 1, show_rcs(), 0);
-
- rsp->body = template_load(csp, "show-version");
- template_fill(&rsp->body, exports);
- free_map(exports);
- return(0);
-
-}
-
-
-/*********************************************************************
- *
- * Function : cgi_show_status
- *
- * Description : CGI function that returns a a web page describing the
- * current status of IJB.
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
- *
- * CGI Parameters :
- * type : Selects the type of banner between "trans" and "jb".
- * Defaults to "jb" if absent or != "trans".
- *
- * Returns : 0
- *
- *********************************************************************/
-int cgi_show_status(struct client_state *csp, struct http_response *rsp,
- struct map *parameters)
-{
- char *s = NULL;
- int i;
-
- FILE * fp;
- char buf[BUFFER_SIZE];
- char * p;
- const char * filename = NULL;
- char * file_description = NULL;
-
- struct map * exports = default_exports(csp, "show-status");
-
- switch (*(lookup(parameters, "file")))
- {
- case 'p':
- if (csp->actions_list)
- {
- filename = csp->actions_list->filename;
- file_description = "Actions List";
- }
- break;
-
- case 'r':
- if (csp->rlist)
- {
- filename = csp->rlist->filename;
- file_description = "Regex Filter List";
- }
- break;
-
-#ifdef FEATURE_TRUST
- case 't':
- if (csp->tlist)
- {
- filename = csp->tlist->filename;
- file_description = "Trust List";
- }
- break;
-#endif /* def FEATURE_TRUST */
- }
-
- if (NULL != filename)
- {
- map(exports, "file-description", 1, file_description, 1);
- map(exports, "filepath", 1, html_encode(filename), 0);
-
- if ((fp = fopen(filename, "r")) == NULL)
- {
- map(exports, "content", 1, "ERROR OPENING FILE!
", 1);
- }
- else
- {
- while (fgets(buf, sizeof(buf), fp))
- {
- p = html_encode(buf);
- if (p)
- {
- s = strsav(s, p);
- freez(p);
- s = strsav(s, "
");
- }
- }
- fclose(fp);
- map(exports, "contents", 1, s, 0);
- }
- rsp->body = template_load(csp, "show-status-file");
- template_fill(&rsp->body, exports);
- free_map(exports);
- return(0);
-
- }
-
- map(exports, "redirect-url", 1, REDIRECT_URL, 1);
-
- s = NULL;
- for (i=0; i < Argc; i++)
- {
- s = strsav(s, Argv[i]);
- s = strsav(s, " ");
- }
- map(exports, "invocation", 1, s, 0);
-
- map(exports, "options", 1, csp->config->proxy_args, 1);
- show_defines(exports);
-
-#ifdef FEATURE_STATISTICS
- add_stats(exports);
-#else /* ndef FEATURE_STATISTICS */
- map_block_killer(exports, "statistics");
-#endif /* ndef FEATURE_STATISTICS */
-
- if (csp->actions_list)
- {
- map(exports, "actions-filename", 1, csp->actions_list->filename, 1);
- }
- else
- {
- map(exports, "actions-filename", 1, "None specified", 1);
- }
-
- if (csp->rlist)
- {
- map(exports, "re-filter-filename", 1, csp->rlist->filename, 1);
- }
- else
- {
- map(exports, "re-filter-filename", 1, "None specified", 1);
- }
-
-#ifdef FEATURE_TRUST
- if (csp->tlist)
- {
- map(exports, "trust-filename", 1, csp->tlist->filename, 1);
- }
- else
- {
- map(exports, "trust-filename", 1, "None specified", 1);
- }
-#else
- map_block_killer(exports, "trust-support");
-#endif /* ndef FEATURE_TRUST */
-
- rsp->body = template_load(csp, "show-status");
- template_fill(&rsp->body, exports);
- free_map(exports);
- return(0);
-
-}
-
-
-/*********************************************************************
- *
- * Function : cgi_show_url_info
- *
- * Description : CGI function that determines and shows which actions
- * junkbuster will perform for a given url, and which
- * matches starting from the defaults have lead to that.
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
- *
- * CGI Parameters :
- * url : The url whose actions are to be determined.
- * If url is unset, the url-given conditional will be
- * set, so that all but the form can be suppressed in
- * the template.
- *
- * Returns : 0
- *
- *********************************************************************/
-int cgi_show_url_info(struct client_state *csp, struct http_response *rsp,
- struct map *parameters)
-{
- char *url_param;
- char *host = NULL;
- struct map * exports = default_exports(csp, "show-url-info");
-
- if (NULL == (url_param = strdup(lookup(parameters, "url"))) || *url_param == '\0')
- {
- map_block_killer(exports, "url-given");
- map(exports, "url", 1, "", 1);
- }
- else
- {
- char *matches = NULL;
- char *path;
- char *s;
- int port = 80;
- int hits = 0;
- struct file_list *fl;
- struct url_actions *b;
- struct url_spec url[1];
- struct current_action_spec action[1];
-
- host = url_param;
- host += (strncmp(url_param, "http://", 7)) ? 0 : 7;
-
- map(exports, "url", 1, host, 1);
- map(exports, "url-html", 1, html_encode(host), 0);
-
- init_current_action(action);
-
- s = current_action_to_text(action);
- map(exports, "default", 1, s , 0);
-
- if (((fl = csp->actions_list) == NULL) || ((b = fl->f) == NULL))
- {
- map(exports, "matches", 1, "none" , 1);
- map(exports, "final", 1, lookup(exports, "default"), 1);
-
- freez(url_param);
- free_current_action(action);
-
- rsp->body = template_load(csp, "show-url-info");
- template_fill(&rsp->body, exports);
- free_map(exports);
-
- return 0;
- }
-
- s = strchr(host, '/');
- if (s != NULL)
- {
- path = strdup(s);
- *s = '\0';
- }
- else
- {
- path = strdup("");
- }
- s = strchr(host, ':');
- if (s != NULL)
- {
- *s++ = '\0';
- port = atoi(s);
- s = NULL;
- }
-
- *url = dsplit(host);
-
- /* if splitting the domain fails, punt */
- if (url->dbuf == NULL)
- {
- map(exports, "matches", 1, "none" , 1);
- map(exports, "final", 1, lookup(exports, "default"), 1);
-
- freez(url_param);
- freez(path);
- free_current_action(action);
-
- rsp->body = template_load(csp, "show-url-info");
- template_fill(&rsp->body, exports);
- free_map(exports);
-
- return 0;
- }
-
- for (b = b->next; NULL != b; b = b->next)
- {
- if ((b->url->port == 0) || (b->url->port == port))
- {
- if ((b->url->domain[0] == '\0') || (domaincmp(b->url, url) == 0))
- {
- if ((b->url->path == NULL) ||
-#ifdef REGEX
- (regexec(b->url->preg, path, 0, NULL, 0) == 0)
-#else
- (strncmp(b->url->path, path, b->url->pathlen) == 0)
-#endif
- )
- {
- s = actions_to_text(b->action);
- matches = strsav(matches, "{");
- matches = strsav(matches, s);
- matches = strsav(matches, " }
\n");
- matches = strsav(matches, b->url->spec);
- matches = strsav(matches, "
\n
\n");
- freez(s);
-
- merge_current_action(action, b->action);
- hits++;
- }
- }
- }
- }
-
- if (hits)
- {
- map(exports, "matches", 1, matches , 0);
- }
- else
- {
- map(exports, "matches", 1, "none", 1);
- }
- matches = NULL;
-
- freez(url->dbuf);
- freez(url->dvec);
-
- freez(url_param);
- freez(path);
-
- s = current_action_to_text(action);
- map(exports, "final", 1, s, 0);
- s = NULL;
-
- free_current_action(action);
- }
-
- rsp->body = template_load(csp, "show-url-info");
- template_fill(&rsp->body, exports);
- free_map(exports);
- return 0;
-
-}
-
-
/*********************************************************************
*
* Function : error_response
@@ -878,6 +486,7 @@ struct http_response *error_response(struct client_state *csp, const char *templ
}
return(finish_http_response(rsp));
+
}
@@ -898,7 +507,7 @@ struct http_response *error_response(struct client_state *csp, const char *templ
* Returns : N/A
*
*********************************************************************/
-static void get_http_time(int time_offset, char * buf)
+void get_http_time(int time_offset, char *buf)
{
static const char day_names[7][4] =
{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
@@ -913,13 +522,6 @@ static void get_http_time(int time_offset, char * buf)
time(¤t_time); /* get current time */
-/* FIXME: is this needed? time() can't fail on Win32. What about Linux?
- if(current_time <= 0)
- {
- return NULL;
- }
-*/
-
current_time += time_offset;
/* get and save the gmt */
@@ -937,6 +539,7 @@ static void get_http_time(int time_offset, char * buf)
t->tm_sec
);
buf[32] = '\0';
+
}
@@ -1043,9 +646,10 @@ struct http_response *finish_http_response(struct http_response *rsp)
* Returns : pointer to a new http_response, or NULL.
*
*********************************************************************/
-struct http_response * alloc_http_response(void)
+struct http_response *alloc_http_response(void)
{
return (struct http_response *) zalloc(sizeof(struct http_response));
+
}
@@ -1081,9 +685,8 @@ void free_http_response(struct http_response *rsp)
* Function : fill_template
*
* Description : CGI support function that loads a given HTML
- * template from the confdir, and fills it in
- * by replacing @name@ with value using pcrs,
- * for each item in the output map.
+ * template from the confdir, ignoring comment
+ * lines.
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
@@ -1126,6 +729,7 @@ char *template_load(struct client_state *csp, const char *templatename)
fclose(fp);
return(file_buffer);
+
}
@@ -1133,10 +737,13 @@ char *template_load(struct client_state *csp, const char *templatename)
*
* Function : fill_template
*
- * Description : CGI support function that loads a given HTML
- * template from the confdir, and fills it in
- * by replacing @name@ with value using pcrs,
- * for each item in the output map.
+ * Description : CGI support function that fills in a pre-loaded
+ * HTML template by replacing @name@ with value using
+ * pcrs, for each item in the output map.
+ *
+ * Note that a leading '$' charachter in the export map's
+ * values will be stripped and toggle on backreference
+ * interpretation.
*
* Parameters :
* 1 : template_ptr = IN: Template to be filled out.
@@ -1148,16 +755,16 @@ char *template_load(struct client_state *csp, const char *templatename)
* Returns : N/A
*
*********************************************************************/
-void template_fill(char ** template_ptr, struct map *exports)
+void template_fill(char **template_ptr, struct map *exports)
{
struct map_entry *m;
pcrs_job *job;
char buf[BUFFER_SIZE];
char *tmp_out_buffer;
char *file_buffer;
- int size;
+ size_t size;
int error;
- const char * flags;
+ const char *flags;
assert(template_ptr);
assert(*template_ptr);
@@ -1206,7 +813,7 @@ void template_fill(char ** template_ptr, struct map *exports)
else
{
pcrs_execute(job, file_buffer, size, &tmp_out_buffer, &size);
- if (file_buffer != tmp_out_buffer)
+ if (NULL != tmp_out_buffer)
{
free(file_buffer);
file_buffer = tmp_out_buffer;
@@ -1219,6 +826,7 @@ void template_fill(char ** template_ptr, struct map *exports)
* Return
*/
*template_ptr = file_buffer;
+
}
@@ -1239,7 +847,7 @@ void template_fill(char ** template_ptr, struct map *exports)
* Returns : NULL if no memory, else map
*
*********************************************************************/
-struct map * default_exports(const struct client_state *csp, const char *caller)
+struct map *default_exports(const struct client_state *csp, const char *caller)
{
char buf[20];
struct map * exports = new_map();
@@ -1271,6 +879,7 @@ struct map * default_exports(const struct client_state *csp, const char *caller)
}
return (exports);
+
}
@@ -1297,6 +906,7 @@ void map_block_killer(struct map *exports, const char *name)
snprintf(buf, 1000, "if-%s-start.*if-%s-end", name, name);
map(exports, buf, 1, "", 1);
+
}
@@ -1336,6 +946,7 @@ void map_conditional(struct map *exports, const char *name, int choose_first)
snprintf(buf, 1000, (choose_first ? "if-%s-then" : "endif-%s"), name);
map(exports, buf, 1, "", 1);
+
}
@@ -1412,63 +1023,6 @@ char *dump_map(const struct map *the_map)
}
-#ifdef FEATURE_STATISTICS
-/*********************************************************************
- *
- * Function : add_stats
- *
- * Description : Add the blocking statistics to a given map.
- *
- * Parameters :
- * 1 : exports = map to write to.
- *
- * Returns : pointer to extended map
- *
- *********************************************************************/
-struct map *add_stats(struct map *exports)
-{
- float perc_rej; /* Percentage of http requests rejected */
- char buf[1000];
- int local_urls_read = urls_read;
- int local_urls_rejected = urls_rejected;
-
- /*
- * Need to alter the stats not to include the fetch of this
- * page.
- *
- * Can't do following thread safely! doh!
- *
- * urls_read--;
- * urls_rejected--; * This will be incremented subsequently *
- */
-
- if (local_urls_read == 0)
- {
- map_block_killer(exports, "have-stats");
- }
- else
- {
- map_block_killer(exports, "have-no-stats");
-
- perc_rej = (float)local_urls_rejected * 100.0F /
- (float)local_urls_read;
-
- sprintf(buf, "%d", local_urls_read);
- map(exports, "requests-received", 1, buf, 1);
-
- sprintf(buf, "%d", local_urls_rejected);
- map(exports, "requests-blocked", 1, buf, 1);
-
- sprintf(buf, "%6.2f", perc_rej);
- map(exports, "percent-blocked", 1, buf, 1);
- }
-
- return(exports);
-
-}
-#endif /* def FEATURE_STATISTICS */
-
-
/*
Local Variables:
tab-width: 3