X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.c;h=d5f877032aa5aa98c785c40252479c194e549f1d;hp=de82743d08187d6521318fd0606778d4d3e32bbd;hb=cfc8ee482223c9310f360242c8db24c3b73ffd73;hpb=2465a9102eb7d4f7a53bd454596e61edd16acb85 diff --git a/cgi.c b/cgi.c index de82743d..d5f87703 100644 --- a/cgi.c +++ b/cgi.c @@ -1,10 +1,12 @@ -const char cgi_rcs[] = "$Id: cgi.c,v 1.25 2001/09/16 15:02:35 jongfoster Exp $"; +const char cgi_rcs[] = "$Id: cgi.c,v 1.33 2001/10/14 22:28:41 jongfoster 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,46 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.25 2001/09/16 15:02:35 jongfoster Exp $"; * * Revisions : * $Log: cgi.c,v $ + * Revision 1.33 2001/10/14 22:28:41 jongfoster + * Fixing stupid typo. + * + * Revision 1.32 2001/10/14 22:20:18 jongfoster + * - Changes to CGI dispatching method to match CGI names exactly, + * rather than doing a prefix match. + * - No longer need to count the length of the CGI handler names by hand. + * - Adding new handler for 404 error when disptching a CGI, if none of + * the handlers match. + * - Adding new handlers for CGI actionsfile editor. + * + * Revision 1.31 2001/10/10 10:56:39 oes + * Failiure to load template now fatal. Before, the user got a hard-to-understand assertion failure from cgi.c + * + * Revision 1.30 2001/10/02 15:30:57 oes + * Introduced show-request cgi + * + * Revision 1.29 2001/09/20 15:47:44 steudten + * + * Fix BUG: Modify int size to size_t size in fill_template() + * - removes big trouble on machines where sizeof(int) != sizeof(size_t). + * + * 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. @@ -197,57 +239,64 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.25 2001/09/16 15:02:35 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." }, +static const struct cgi_dispatcher cgi_dispatchers[] = { + { "", + cgi_default, + "Junkbuster main page" }, { "show-status", - 11, cgi_show_status, + cgi_show_status, "Show information about the current configuration" }, - { "show-url-info", - 13, cgi_show_url_info, - "Show which actions apply to a URL and why" }, { "show-version", - 12, cgi_show_version, + cgi_show_version, "Show the source code version numbers" }, - { "send-banner", - 11, cgi_send_banner, - "HIDE Send the transparent or \"Junkbuster\" gif" }, + { "show-request", + cgi_show_request, + "Show the client's request headers." }, + { "show-url-info", + cgi_show_url_info, + "Show which actions apply to a URL and why" }, #ifdef FEATURE_CGI_EDIT_ACTIONS - { "edit-actions-list", - 17, cgi_edit_actions_list, + { "edit-actions", + cgi_edit_actions, "Edit the actions list" }, +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ + +#ifdef FEATURE_CGI_EDIT_ACTIONS + { "edit-actions-for-url", + cgi_edit_actions_for_url, + NULL /* Edit the actions for (a) specified URL(s) */ }, + { "edit-actions-list", + cgi_edit_actions_list, + NULL /* 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)" }, + cgi_edit_actions_submit, + NULL /* Change the actions for (a) specified URL(s) */ }, #endif /* def FEATURE_CGI_EDIT_ACTIONS */ - { "", - 0, cgi_default, - "Junkbuster main page" }, - { NULL, 0, NULL, NULL } + { "robots.txt", + cgi_robots_txt, + NULL /* Sends a robots.txt file to tell robots to go away. */ }, + { "send-banner", + cgi_send_banner, + NULL /* Send the transparent or \"Junkbuster\" gif */ }, + { NULL, /* NULL Indicates end of list and default page */ + cgi_error_404, + NULL /* Unknown CGI page */ } }; /* * Some images * - * Hint: You can encode your own GIFs like that: + * Hint: You can encode your own GIFs like this: * perl -e 'while (read STDIN, $c, 1) { printf("\\%.3o,", unpack("C", $c)); }' */ @@ -272,16 +321,18 @@ const char image_blank_gif_data[] = const int image_blank_gif_length = sizeof(image_blank_gif_data) - 1; +static struct http_response *dispatch_known_cgi(struct client_state * csp, + const char * path); + + /********************************************************************* * * Function : dispatch_cgi * * Description : Checks if a request URL has either the magical hostname - * i.j.b or matches HOME_PAGE_URL/config/. If so, it parses - * the (rest of the) path as a cgi name plus query string, - * prepares a map that maps CGI parameter names to their values, - * initializes the http_response struct, and calls the - * relevant CGI handler function. + * i.j.b or matches HOME_PAGE_URL/config/. If so, it passes + * the (rest of the) path onto dispatch_known_cgi, which + * calls the relevant CGI handler function. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -291,31 +342,40 @@ const int image_blank_gif_length = sizeof(image_blank_gif_data) - 1; *********************************************************************/ struct http_response *dispatch_cgi(struct client_state *csp) { - char *argstring = NULL; - const struct cgi_dispatcher *d; - struct map *param_list; - struct http_response *rsp; + const char *host = csp->http->host; + const char *path = csp->http->path; /* * Should we intercept ? */ /* Either the host matches CGI_PREFIX_HOST ..*/ - if (0 == strcmpic(csp->http->host, CGI_PREFIX_HOST)) + if ( (0 == strcmpic(host, CGI_PREFIX_HOST)) + && (path[0] == '/') ) { - /* ..then the path will all be for us */ - argstring = csp->http->path; + /* ..then the path will all be for us. Remove leading '/' */ + path++; } - /* Or it's the host part HOME_PAGE_URL, and the path /config ? */ - else if ( (0 == strcmpic(csp->http->host, HOME_PAGE_URL + 7 )) - && (0 == strncmpic(csp->http->path,"/config", 7)) - && ((csp->http->path[7] == '/') || (csp->http->path[7] == '\0'))) + /* Or it's the host part HOME_PAGE_URL, and the path /config/ */ + else if ( (0 == strcmpic(host, HOME_PAGE_URL + 7 )) + && (0 == strncmpic(path,"/config", 7)) ) { - /* then it's everything following "/config" */ - argstring = csp->http->path + 7; + /* take everything following "/config" */ + path += 7; + if (*path == '/') + { + /* skip the forward slash after "/config" */ + path++; + } + else if (*path != '\0') + { + /* wierdness: URL is /configXXX, where XXX is some string */ + return NULL; + } } else { + /* Not a CGI */ return NULL; } @@ -323,17 +383,74 @@ struct http_response *dispatch_cgi(struct client_state *csp) * This is a CGI call. */ - /* Get mem for response or fail*/ - if (NULL == (rsp = alloc_http_response())) + return dispatch_known_cgi(csp, path); +} + + +/********************************************************************* + * + * Function : dispatch_known_cgi + * + * Description : Processes a CGI once dispatch_cgi has determined that + * it matches one of the magic prefixes. Parses the path + * as a cgi name plus query string, prepares a map that + * maps CGI parameter names to their values, initializes + * the http_response struct, and calls the relevant CGI + * handler function. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : path = Path of CGI, with the CGI prefix removed. + * Should not have a leading "/". + * + * Returns : http_response, or NULL on handler failure or out of + * memory. + * + *********************************************************************/ +static struct http_response *dispatch_known_cgi(struct client_state * csp, + const char * path) +{ + const struct cgi_dispatcher *d; + struct map *param_list; + struct http_response *rsp; + char *query_args_start; + char *path_copy; + int result; + + if (NULL == (path_copy = strdup(path))) { return NULL; } + query_args_start = path_copy; + while (*query_args_start && *query_args_start != '?') + { + query_args_start++; + } + if (*query_args_start == '?') + { + *query_args_start++ = '\0'; + } + + if (NULL == (param_list = parse_cgi_parameters(query_args_start))) + { + free(path_copy); + return(NULL); + } + + + /* + * At this point: + * path_copy = CGI call name + * param_list = CGI params, as map + */ - /* Remove leading slash */ - if (*argstring == '/') + /* Get mem for response or fail*/ + if (NULL == (rsp = alloc_http_response())) { - argstring++; + free(path_copy); + free_map(param_list); + return NULL; } log_error(LOG_LEVEL_GPC, "%s%s cgi call", csp->http->hostport, csp->http->path); @@ -341,32 +458,26 @@ struct http_response *dispatch_cgi(struct client_state *csp) csp->ip_addr_str, csp->http->cmd); /* Find and start the right CGI function*/ - for (d = cgi_dispatcher; d->handler; d++) + for (d = cgi_dispatchers; FOREVER; d++) { - if (strncmp(argstring, d->name, d->name_length) == 0) + if ((d->name == NULL) || (strcmp(path_copy, d->name) == 0)) { - if (NULL == (param_list = - parse_cgi_parameters(argstring + d->name_length))) + result = (d->handler)(csp, rsp, param_list); + free(path_copy); + free_map(param_list); + if (result) { - free_map(param_list); + /* Error in handler */ free_http_response(rsp); return(NULL); } - if ((d->handler)(csp, rsp, param_list)) + else { - free_map(param_list); - free_http_response(rsp); - return(NULL); + /* It worked */ + return(finish_http_response(rsp)); } - - free_map(param_list); - return(finish_http_response(rsp)); } } - - /* Can't get here, since cgi_default will match all requests */ - free_http_response(rsp); - return(NULL); } @@ -378,14 +489,14 @@ struct http_response *dispatch_cgi(struct client_state *csp) * pairs and store them in a struct map list. * * Parameters : - * 1 : string = string to be parsed + * 1 : string = string to be parsed. Will be trashed. * * Returns : pointer to param list, or NULL if out of memory. * *********************************************************************/ -struct map *parse_cgi_parameters(char *argstring) +static struct map *parse_cgi_parameters(char *argstring) { - char *tmp, *p; + char *p; char *vector[BUFFER_SIZE]; int pairs, i; struct map *cgi_params; @@ -395,17 +506,7 @@ struct map *parse_cgi_parameters(char *argstring) return NULL; } - if(*argstring == '?') - { - argstring++; - } - if (NULL == (tmp = strdup(argstring))) - { - free_map(cgi_params); - return NULL; - } - - pairs = ssplit(tmp, "&", vector, SZ(vector), 1, 1); + pairs = ssplit(argstring, "&", vector, SZ(vector), 1, 1); for (i = 0; i < pairs; i++) { @@ -416,489 +517,11 @@ struct map *parse_cgi_parameters(char *argstring) } } - free(tmp); return(cgi_params); } -/********************************************************************* - * - * 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; -#ifdef FEATURE_STATISTICS - float perc_rej; /* Percentage of http requests rejected */ - int local_urls_read; - int local_urls_rejected; -#endif /* ndef FEATURE_STATISTICS */ - - 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 - local_urls_read = urls_read; - 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); - } - -#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 @@ -946,6 +569,7 @@ struct http_response *error_response(struct client_state *csp, const char *templ } return(finish_http_response(rsp)); + } @@ -966,7 +590,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" }; @@ -981,13 +605,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 */ @@ -1005,6 +622,7 @@ static void get_http_time(int time_offset, char * buf) t->tm_sec ); buf[32] = '\0'; + } @@ -1111,9 +729,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)); + } @@ -1149,9 +768,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...) @@ -1173,7 +791,7 @@ char *template_load(struct client_state *csp, const char *templatename) if(NULL == (fp = fopen(buf, "r"))) { - log_error(LOG_LEVEL_ERROR, "error loading template %s: %E", buf); + log_error(LOG_LEVEL_FATAL, "error loading template %s: %E", buf); return NULL; } @@ -1194,6 +812,7 @@ char *template_load(struct client_state *csp, const char *templatename) fclose(fp); return(file_buffer); + } @@ -1201,10 +820,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. @@ -1216,16 +838,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); @@ -1274,7 +896,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; @@ -1287,6 +909,7 @@ void template_fill(char ** template_ptr, struct map *exports) * Return */ *template_ptr = file_buffer; + } @@ -1307,15 +930,15 @@ 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]; + int local_help_exists = 0; struct map * exports = new_map(); map(exports, "version", 1, VERSION, 1); map(exports, "my-ip-address", 1, csp->my_ip_addr_str ? csp->my_ip_addr_str : "unknown", 1); map(exports, "my-hostname", 1, csp->my_hostname ? csp->my_hostname : "unknown", 1); - map(exports, "admin-address", 1, csp->config->admin_address ? csp->config->admin_address : "fill@me.in.please", 1); map(exports, "homepage", 1, HOME_PAGE_URL, 1); map(exports, "default-cgi", 1, HOME_PAGE_URL "/config", 1); map(exports, "menu", 1, make_menu(caller), 0); @@ -1329,16 +952,31 @@ struct map * default_exports(const struct client_state *csp, const char *caller) map_block_killer(exports, "unstable"); } + if(csp->config->admin_address != NULL) + { + map(exports, "admin-address", 1, csp->config->admin_address, 1); + local_help_exists = 1; + } + else + { + map_block_killer(exports, "have-adminaddr-info"); + } + if(csp->config->proxy_info_url != NULL) { map(exports, "proxy-info-url", 1, csp->config->proxy_info_url, 1); + local_help_exists = 1; } else { map_block_killer(exports, "have-proxy-info"); - } + } + + if (local_help_exists == 0) + map_block_killer(exports, "have-help-info"); return (exports); + } @@ -1365,6 +1003,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); + } @@ -1404,6 +1043,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); + } @@ -1431,9 +1071,9 @@ char *make_menu(const char *self) } /* List available unhidden CGI's and export as "other-cgis" */ - for (d = cgi_dispatcher; d->handler; d++) + for (d = cgi_dispatchers; d->name; d++) { - if (strncmp(d->description, "HIDE", 4) && strcmp(d->name, self)) + if (d->description && strcmp(d->name, self)) { snprintf(buf, BUFFER_SIZE, "
  • %s
    • \n", HOME_PAGE_URL, d->name, d->description); @@ -1480,47 +1120,6 @@ char *dump_map(const struct map *the_map) } -/********************************************************************* - * - * Function : cgi_robots_txt - * - * Description : CGI function to return "/robots.txt". - * - * 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 : None - * - * Returns : 0 - * - *********************************************************************/ -int cgi_robots_txt(struct client_state *csp, struct http_response *rsp, - struct map *parameters) -{ - char buf[100]; - - rsp->body = strdup( - "# This is the Internet Junkbuster control interface.\n" - "# It isn't very useful to index it, and you're likely to break stuff.\n" - "# So go away!\n" - "\n" - "User-agent: *\n" - "Disallow: /\n" - "\n"); - - enlist_unique(rsp->headers, "Content-Type: text/plain", 13); - - rsp->is_static = 1; - - get_http_time(7 * 24 * 60 * 60, buf); /* 7 days into future */ - enlist_unique_header(rsp->headers, "Expires", buf); - - return 0; -} - - /* Local Variables: tab-width: 3