X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=df5645d576e6e39ea9aa5acc007184eb2e5c8321;hp=c230054bf03ba0dd77b72a0526164548b1ad67c1;hb=47e9a13bb048883664b6e03d5ce325f36b68783c;hpb=9cab80b40992aa50dcbc2560129e89123a9e93fd diff --git a/cgisimple.c b/cgisimple.c index c230054b..df5645d5 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.23 2002/03/26 22:29:54 swa Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.41 2006/10/09 19:18:28 roro Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,114 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.23 2002/03/26 22:29:54 swa Ex * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.41 2006/10/09 19:18:28 roro + * Redirect http://p.p/user-manual (without trailing slash) to + * http://p.p/user-manual/ (with trailing slash), otherwise links will be broken. + * + * Revision 1.40 2006/09/09 13:05:33 fabiankeil + * Modified cgi_send_user_manual to serve binary + * content without destroying it first. Should also be + * faster now. Added ".jpg" check for Content-Type guessing. + * + * Revision 1.39 2006/09/08 09:49:23 fabiankeil + * Deliver documents in the user-manual directory + * with "Content-Type text/css" if their filename + * ends with ".css". + * + * Revision 1.38 2006/09/06 18:45:03 fabiankeil + * Incorporate modified version of Roland Rosenfeld's patch to + * optionally access the user-manual via Privoxy. Closes patch 679075. + * + * Formatting changed to Privoxy style, added call to + * cgi_error_no_template if the requested file doesn't + * exist and modified check whether or not Privoxy itself + * should serve the manual. Should work cross-platform now. + * + * Revision 1.37 2006/07/18 14:48:45 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.35.2.7 2006/01/29 23:10:56 david__schmidt + * Multiple filter file support + * + * Revision 1.35.2.6 2005/07/04 03:13:43 david__schmidt + * Undo some damaging memory leak patches + * + * Revision 1.35.2.5 2005/05/07 21:50:55 david__schmidt + * A few memory leaks plugged (mostly on error paths) + * + * Revision 1.35.2.4 2005/04/04 02:21:24 david__schmidt + * Another instance of: + * Don't show "Edit" buttons #ifndef FEATURE_CGI_EDIT_ACTIONS + * Thanks to Magnus Holmgren for the patch + * + * Revision 1.35.2.3 2003/12/17 16:34:15 oes + * - Prevent line wrap beween "View/Edit" link buttons on status page + * - Some (mostly irrelevant) fixes for Out-of-mem-case handling + * + * Revision 1.35.2.2 2003/04/03 13:48:28 oes + * Don't show "Edit" buttons #ifndef FEATURE_CGI_EDIT_ACTIONS + * + * Revision 1.35.2.1 2002/07/04 15:02:38 oes + * Added ability to send redirects to send-banner CGI, so that it can completely mimic the image blocking action if called with type=auto + * + * Revision 1.35.2.1 2002/07/01 17:32:04 morcego + * Applying patch from Andreas as provided by Hal on the list. + * Message-ID: <20020701121218.V1606@feenix.burgiss.net> + * + * Revision 1.35 2002/05/12 21:44:44 jongfoster + * Adding amiga.[ch] revision information, if on an amiga. + * + * Revision 1.34 2002/04/30 12:06:12 oes + * Deleted unused code from default_cgi + * + * Revision 1.33 2002/04/30 11:14:52 oes + * Made csp the first parameter in *action_to_html + * + * Revision 1.32 2002/04/26 18:29:13 jongfoster + * Fixing this Visual C++ warning: + * cgisimple.c(775) : warning C4018: '<' : signed/unsigned mismatch + * + * Revision 1.31 2002/04/26 12:54:36 oes + * - Kill obsolete REDIRECT_URL code + * - Error handling fixes + * - Style sheet related HTML snipplet changes + * - cgi_show_url_info: + * - Matches now in table, actions on single lines, + * linked to help + * - standard.action suppressed + * - Buttons to View and Edit AFs + * + * Revision 1.30 2002/04/24 02:18:08 oes + * - show-status is now the starting point for editing + * the actions files, generate list of all AFs with buttons + * for viewing and editing, new look for file list (Jon: + * buttons now aligned ;-P ), view mode now supports multiple + * AFs, name changes, no view links for unspecified files, + * no edit link for standard.action. + * + * - Jon's multiple AF patch: cgi_show_url_info now uses all + * AFs and marks the output accordingly + * + * Revision 1.29 2002/04/10 13:38:35 oes + * load_template signature changed + * + * Revision 1.28 2002/04/07 15:42:12 jongfoster + * Fixing send-banner?type=auto when the image-blocker is + * a redirect to send-banner + * + * Revision 1.27 2002/04/05 15:50:48 oes + * added send-stylesheet CGI + * + * Revision 1.26 2002/04/04 00:36:36 gliptak + * always use pcre for matching + * + * Revision 1.25 2002/04/03 22:28:03 gliptak + * Removed references to gnu_regex + * + * Revision 1.24 2002/04/02 16:12:47 oes + * Fix: moving misplaced lines into #ifdef FEATURE_FORCE + * * Revision 1.23 2002/03/26 22:29:54 swa * we have a new homepage! * @@ -156,6 +264,7 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.23 2002/03/26 22:29:54 swa Ex #include "loadcfg.h" #include "parsers.h" #include "urlmatch.h" +#include "errlog.h" const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION; @@ -168,8 +277,9 @@ static jb_err show_defines(struct map *exports); * * Function : cgi_default * - * Description : CGI function that is called if no action was given. - * Lists menu of available unhidden CGIs. + * Description : CGI function that is called for the CGI_SITE_1_HOST + * and CGI_SITE_2_HOST/CGI_SITE_2_PATH base URLs. + * Boring - only exports the default exports. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -180,57 +290,26 @@ static jb_err show_defines(struct map *exports); * * Returns : JB_ERR_OK on success * JB_ERR_MEMORY on out-of-memory - * (Problems other than out-of-memory should be - * handled by this routine - it should set the - * rsp appropriately and return "success") * *********************************************************************/ jb_err cgi_default(struct client_state *csp, struct http_response *rsp, const struct map *parameters) { - char *tmp; struct map *exports; assert(csp); assert(rsp); - assert(parameters); if (NULL == (exports = default_exports(csp, ""))) { return JB_ERR_MEMORY; } - /* If there were other parameters, export a dump as "cgi-parameters" */ - if (parameters->first) - { - tmp = strdup("

What made you think this cgi takes parameters?\n" - "Anyway, here they are, in case you're interested:

\n"); - string_join(&tmp, dump_map(parameters)); - if (tmp == NULL) - { - free_map(exports); - return JB_ERR_MEMORY; - } - if (map(exports, "cgi-parameters", 1, tmp, 0)) - { - return JB_ERR_MEMORY; - } - } - else - { - if (map(exports, "cgi-parameters", 1, "", 1)) - { - return JB_ERR_MEMORY; - } - } - return template_fill_for_cgi(csp, "default", exports, rsp); } - - /********************************************************************* * * Function : cgi_error_404 @@ -396,7 +475,8 @@ jb_err cgi_show_request(struct client_state *csp, * type : Selects the type of banner between "trans", "logo", * and "auto". Defaults to "logo" if absent or invalid. * "auto" means to select as if we were image-blocking. - * (Only the first character really counts). + * (Only the first character really counts; b and t are + * equivalent). * * Returns : JB_ERR_OK on success * JB_ERR_MEMORY on out-of-memory error. @@ -408,40 +488,134 @@ jb_err cgi_send_banner(struct client_state *csp, { char imagetype = lookup(parameters, "type")[0]; - if (imagetype == 'a') /* auto */ + /* + * If type is auto, then determine the right thing + * to do from the set-image-blocker action + */ + if (imagetype == 'a') { - /* Default to pattern */ + /* + * Default to pattern + */ imagetype = 'p'; + #ifdef FEATURE_IMAGE_BLOCKING if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0) { - /* determine HOW images should be blocked */ - const char * p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER]; + static const char prefix1[] = CGI_PREFIX "send-banner?type="; + static const char prefix2[] = "http://" CGI_SITE_1_HOST "/send-banner?type="; + const char *p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER]; - /* and handle accordingly: */ - if ((p != NULL) && (0 == strcmpic(p, "blank"))) + if (p == NULL) + { + /* Use default - nothing to do here. */ + } + else if (0 == strcmpic(p, "blank")) { imagetype = 'b'; } - else if ((p != NULL) && (0 == strcmpic(p, "pattern"))) + else if (0 == strcmpic(p, "pattern")) { imagetype = 'p'; } + + /* + * If the action is to call this CGI, determine + * the argument: + */ + else if (0 == strncmpic(p, prefix1, sizeof(prefix1) - 1)) + { + imagetype = p[sizeof(prefix1) - 1]; + } + else if (0 == strncmpic(p, prefix2, sizeof(prefix2) - 1)) + { + imagetype = p[sizeof(prefix2) - 1]; + } + + /* + * Everything else must (should) be a URL to + * redirect to. + */ + else + { + imagetype = 'r'; + } } #endif /* def FEATURE_IMAGE_BLOCKING */ } - if ((imagetype == 'b') || (imagetype == 't')) /* blank / transparent */ + /* + * Now imagetype is either the non-auto type we were called with, + * or it was auto and has since been determined. In any case, we + * can proceed to actually answering the request by sending a redirect + * or an image as appropriate: + */ + if (imagetype == 'r') { - rsp->body = bindup(image_blank_data, image_blank_length); - rsp->content_length = image_blank_length; - + rsp->status = strdup("302 Local Redirect from Privoxy"); + if (rsp->status == NULL) + { + return JB_ERR_MEMORY; + } + if (enlist_unique_header(rsp->headers, "Location", + csp->action->string[ACTION_STRING_IMAGE_BLOCKER])) + { + return JB_ERR_MEMORY; + } } - else /* pattern */ + else { - rsp->body = bindup(image_pattern_data, image_pattern_length); - rsp->content_length = image_pattern_length; - } + if ((imagetype == 'b') || (imagetype == 't')) + { + rsp->body = bindup(image_blank_data, image_blank_length); + rsp->content_length = image_blank_length; + } + else + { + rsp->body = bindup(image_pattern_data, image_pattern_length); + rsp->content_length = image_pattern_length; + } + + if (rsp->body == NULL) + { + return JB_ERR_MEMORY; + } + if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE)) + { + return JB_ERR_MEMORY; + } + + rsp->is_static = 1; + } + + return JB_ERR_OK; + +} + + +/********************************************************************* + * + * Function : cgi_transparent_image + * + * Description : CGI function that sends a 1x1 transparent image. + * + * 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 : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory error. + * + *********************************************************************/ +jb_err cgi_transparent_image(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + rsp->body = bindup(image_blank_data, image_blank_length); + rsp->content_length = image_blank_length; if (rsp->body == NULL) { @@ -462,9 +636,10 @@ jb_err cgi_send_banner(struct client_state *csp, /********************************************************************* * - * Function : cgi_transparent_image + * Function : cgi_send_stylesheet * - * Description : CGI function that sends a 1x1 transparent image. + * Description : CGI function that sends a css stylesheet found + * in the cgi-style.css template * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -477,27 +652,160 @@ jb_err cgi_send_banner(struct client_state *csp, * JB_ERR_MEMORY on out-of-memory error. * *********************************************************************/ -jb_err cgi_transparent_image(struct client_state *csp, +jb_err cgi_send_stylesheet(struct client_state *csp, struct http_response *rsp, const struct map *parameters) { - rsp->body = bindup(image_blank_data, image_blank_length); - rsp->content_length = image_blank_length; + jb_err err; + + assert(csp); + assert(rsp); - if (rsp->body == NULL) + err = template_load(csp, &rsp->body, "cgi-style.css", 0); + + if (err == JB_ERR_FILE) + { + /* + * No way to tell user; send empty stylesheet + */ + log_error(LOG_LEVEL_ERROR, "Could not find cgi-style.css template"); + } + else if (err) + { + return err; /* JB_ERR_MEMORY */ + } + + if (enlist(rsp->headers, "Content-Type: text/css")) { return JB_ERR_MEMORY; } - if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE)) + return JB_ERR_OK; + +} +/********************************************************************* + * + * Function : cgi_send_user_manual + * + * Description : CGI function that sends a file in the user + * manual directory. + * + * 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 : file=name.html, the name of the HTML file + * (relative to user-manual from config) + * + * Returns : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory error. + * + *********************************************************************/ +jb_err cgi_send_user_manual(struct client_state *csp, + struct http_response *rsp, + const struct map *parameters) +{ + const char * filename; + char *full_path; + FILE *fp; + jb_err err = JB_ERR_OK; + size_t length; + + assert(csp); + assert(rsp); + assert(parameters); + + if (!parameters->first) + { + /* requested http://p.p/user-manual (without trailing slash) */ + return cgi_redirect(rsp, CGI_PREFIX "user-manual/"); + } + + get_string_param(parameters, "file", &filename); + /* Check paramter for hack attempts */ + if (filename && strchr(filename, '/')) + { + return JB_ERR_CGI_PARAMS; + } + if (filename && strstr(filename, "..")) + { + return JB_ERR_CGI_PARAMS; + } + + full_path = make_path(csp->config->usermanual, filename ? filename : "index.html"); + if (full_path == NULL) { return JB_ERR_MEMORY; } - rsp->is_static = 1; + /* Open user-manual file */ +#ifdef WIN32 + /* + * XXX: Do we support other operating systems that + * require special treatment to fopen in binary mode? + */ + if (NULL == (fp = fopen(full_path, "rb"))) +#else + if (NULL == (fp = fopen(full_path, "r"))) +#endif /* def WIN32 */ + { + log_error(LOG_LEVEL_ERROR, "Cannot open user-manual file %s: %E", full_path); + err = cgi_error_no_template(csp, rsp, full_path); + free(full_path); + return err; + } - return JB_ERR_OK; + /* Get file length */ + fseek(fp, 0, SEEK_END); + length = ftell(fp); + fseek(fp, 0, SEEK_SET); + + /* Allocate memory and load the file directly into the body */ + rsp->body = (char *)malloc(length+1); + if (!rsp->body) + { + fclose(fp); + free(full_path); + return JB_ERR_MEMORY; + } + if (!fread(rsp->body, length, 1, fp)) + { + /* + * This happens if we didn't fopen in binary mode. + * If it does, we just log it and serve what we got, + * most likely padded with garbage. + */ + log_error(LOG_LEVEL_ERROR, "Couldn't completely read user-manual file %s.", full_path); + } + fclose(fp); + free(full_path); + + rsp->content_length = (int)length; + + /* Guess correct Content-Type based on the filename's ending */ + if (filename) + { + length = strlen(filename); + } + else + { + length = 0; + } + if((length>=4) && !strcmp(&filename[length-4], ".css")) + { + err = enlist(rsp->headers, "Content-Type: text/css"); + } + else if((length>=4) && !strcmp(&filename[length-4], ".jpg")) + { + err = enlist(rsp->headers, "Content-Type: image/jpeg"); + } + else + { + err = enlist(rsp->headers, "Content-Type: text/html"); + } + return err; } @@ -573,7 +881,8 @@ jb_err cgi_show_status(struct client_state *csp, const struct map *parameters) { char *s = NULL; - int i; + unsigned i; + int j; FILE * fp; char buf[BUFFER_SIZE]; @@ -584,7 +893,9 @@ jb_err cgi_show_status(struct client_state *csp, int local_urls_read; int local_urls_rejected; #endif /* ndef FEATURE_STATISTICS */ - jb_err err; + struct file_list * fl; + struct url_actions * b; + jb_err err = JB_ERR_OK; struct map *exports; @@ -599,19 +910,19 @@ jb_err cgi_show_status(struct client_state *csp, switch (*(lookup(parameters, "file"))) { - case 'p': - if (csp->actions_list) + case 'a': + if (!get_number_param(csp, parameters, "index", &i) && i < MAX_AF_FILES && csp->actions_list[i]) { - filename = csp->actions_list->filename; - file_description = "Actions List"; + filename = csp->actions_list[i]->filename; + file_description = "Actions File"; } break; - case 'r': - if (csp->rlist) + case 'f': + if (!get_number_param(csp, parameters, "index", &i) && i < MAX_AF_FILES && csp->rlist[i]) { - filename = csp->rlist->filename; - file_description = "Regex Filter List"; + filename = csp->rlist[i]->filename; + file_description = "Filter File"; } break; @@ -620,7 +931,7 @@ jb_err cgi_show_status(struct client_state *csp, if (csp->tlist) { filename = csp->tlist->filename; - file_description = "Trust List"; + file_description = "Trust File"; } break; #endif /* def FEATURE_TRUST */ @@ -649,7 +960,6 @@ jb_err cgi_show_status(struct client_state *csp, while ((s != NULL) && fgets(buf, sizeof(buf), fp)) { string_join (&s, html_encode(buf)); - string_append(&s, "
"); } fclose(fp); @@ -663,27 +973,23 @@ jb_err cgi_show_status(struct client_state *csp, return template_fill_for_cgi(csp, "show-status-file", exports, rsp); } - if (map(exports, "redirect-url", 1, html_encode(REDIRECT_URL), 0)) - { - free_map(exports); - return JB_ERR_MEMORY; - } - s = strdup(""); - for (i = 0; (s != NULL) && (i < Argc); i++) + for (j = 0; (s != NULL) && (j < Argc); j++) { - string_join (&s, html_encode(Argv[i])); - string_append(&s, " "); + if (!err) err = string_join (&s, html_encode(Argv[j])); + if (!err) err = string_append(&s, " "); } - if (map(exports, "invocation", 1, s, 0)) + if (!err) err = map(exports, "invocation", 1, s, 0); + + if (!err) err = map(exports, "options", 1, csp->config->proxy_args, 1); + if (!err) err = show_defines(exports); + + if (err) { free_map(exports); return JB_ERR_MEMORY; } - err = map(exports, "options", 1, csp->config->proxy_args, 1); - if (!err) err = show_defines(exports); - #ifdef FEATURE_STATISTICS local_urls_read = urls_read; local_urls_rejected = urls_rejected; @@ -722,23 +1028,67 @@ jb_err cgi_show_status(struct client_state *csp, #else /* ndef FEATURE_STATISTICS */ err = err || map_block_killer(exports, "statistics"); #endif /* ndef FEATURE_STATISTICS */ + + /* + * List all action files in use, together with view and edit links, + * except for standard.action, which should only be viewable. (Not + * enforced in the editor itself) + * FIXME: Shouldn't include hardwired HTML here, use line template instead! + */ + s = strdup(""); + for (i = 0; i < MAX_AF_FILES; i++) + { + if (((fl = csp->actions_list[i]) != NULL) && ((b = fl->f) != NULL)) + { + if (!err) err = string_append(&s, ""); + if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename)); + snprintf(buf, 100, "View", i); + if (!err) err = string_append(&s, buf); + +#ifdef FEATURE_CGI_EDIT_ACTIONS + if (NULL == strstr(csp->actions_list[i]->filename, "standard.action") && NULL != csp->config->actions_file_short[i]) + { + snprintf(buf, 100, "  Edit", csp->config->actions_file_short[i]); + if (!err) err = string_append(&s, buf); + } +#endif - if (csp->actions_list) + if (!err) err = string_append(&s, "\n"); + } + } + if (*s != '\0') { - if (!err) err = map(exports, "actions-filename", 1, html_encode(csp->actions_list->filename), 0); + if (!err) err = map(exports, "actions-filenames", 1, s, 0); } else { - if (!err) err = map(exports, "actions-filename", 1, "None specified", 1); + if (!err) err = map(exports, "actions-filenames", 1, "None specified", 1); } - if (csp->rlist) + /* + * List all re_filterfiles in use, together with view options. + * FIXME: Shouldn't include hardwired HTML here, use line template instead! + */ + s = strdup(""); + for (i = 0; i < MAX_AF_FILES; i++) + { + if (((fl = csp->rlist[i]) != NULL) && ((b = fl->f) != NULL)) + { + if (!err) err = string_append(&s, ""); + if (!err) err = string_join(&s, html_encode(csp->rlist[i]->filename)); + snprintf(buf, 100, "View", i); + if (!err) err = string_append(&s, buf); + if (!err) err = string_append(&s, "\n"); + } + } + if (*s != '\0') { - if (!err) err = map(exports, "re-filter-filename", 1, html_encode(csp->rlist->filename), 0); + if (!err) err = map(exports, "re-filter-filename", 1, s, 0); } else { - if (!err) err = map(exports, "re-filter-filename", 1, "None specified", 1); + if (!err) err = map(exports, "re-filter-filename", 1, "None specified", 1); + if (!err) err = map_block_killer(exports, "have-filterfile"); } #ifdef FEATURE_TRUST @@ -749,6 +1099,7 @@ jb_err cgi_show_status(struct client_state *csp, else { if (!err) err = map(exports, "trust-filename", 1, "None specified", 1); + if (!err) err = map_block_killer(exports, "have-trustfile"); } #else if (!err) err = map_block_killer(exports, "trust-support"); @@ -793,6 +1144,7 @@ jb_err cgi_show_url_info(struct client_state *csp, { char *url_param; struct map *exports; + char buf[150]; assert(csp); assert(rsp); @@ -887,6 +1239,7 @@ jb_err cgi_show_url_info(struct client_state *csp, struct url_actions *b; struct http_request url_to_query[1]; struct current_action_spec action[1]; + int i; if (map(exports, "url", 1, html_encode(url_param), 0)) { @@ -897,8 +1250,7 @@ jb_err cgi_show_url_info(struct client_state *csp, init_current_action(action); - if (map(exports, "default", 1, html_encode_and_free_original( - current_action_to_text(action)), 0)) + if (map(exports, "default", 1, current_action_to_html(csp, action), 0)) { free_current_action(action); free(url_param); @@ -906,29 +1258,13 @@ jb_err cgi_show_url_info(struct client_state *csp, return JB_ERR_MEMORY; } - if (((fl = csp->actions_list) == NULL) || ((b = fl->f) == NULL)) - { - err = map(exports, "matches", 1, "none" , 1); - if (!err) err = map(exports, "final", 1, lookup(exports, "default"), 1); - - free_current_action(action); - free(url_param); - - if (err) - { - free_map(exports); - return JB_ERR_MEMORY; - } - - return template_fill_for_cgi(csp, "show-url-info", exports, rsp); - } - err = parse_http_url(url_param, url_to_query, csp); free(url_param); if (err == JB_ERR_MEMORY) { + free_http_request(url_to_query); free_current_action(action); free_map(exports); return JB_ERR_MEMORY; @@ -941,6 +1277,7 @@ jb_err cgi_show_url_info(struct client_state *csp, if (!err) err = map(exports, "final", 1, lookup(exports, "default"), 1); free_current_action(action); + free_http_request(url_to_query); if (err) { @@ -960,34 +1297,70 @@ jb_err cgi_show_url_info(struct client_state *csp, { free_current_action(action); free_map(exports); + free_http_request(url_to_query); return JB_ERR_MEMORY; } } - matches = strdup(""); + matches = strdup(""); - for (b = b->next; (b != NULL) && (matches != NULL); b = b->next) + for (i = 0; i < MAX_AF_FILES; i++) { - if (url_match(b->url, url_to_query)) + if (NULL == csp->config->actions_file_short[i] + || !strcmp(csp->config->actions_file_short[i], "standard")) continue; + + b = NULL; + hits = 1; + if ((fl = csp->actions_list[i]) != NULL) + { + if ((b = fl->f) != NULL) + { + /* FIXME: Hardcoded HTML! */ + string_append(&matches, "\n"); + + hits = 0; + b = b->next; + } + } + + for (; (b != NULL) && (matches != NULL); b = b->next) { - string_append(&matches, "{"); - string_join (&matches, html_encode_and_free_original( - actions_to_text(b->action))); - string_append(&matches, " }
\n"); - string_join (&matches, html_encode(b->url->spec)); - string_append(&matches, "
\n
\n"); - - if (merge_current_action(action, b->action)) + if (url_match(b->url, url_to_query)) { - freez(matches); - free_http_request(url_to_query); - free_current_action(action); - free_map(exports); - return JB_ERR_MEMORY; + string_append(&matches, "\n"); + + if (merge_current_action(action, b->action)) + { + freez(matches); + free_http_request(url_to_query); + free_current_action(action); + free_map(exports); + return JB_ERR_MEMORY; + } + hits++; } - hits++; + } + + if (!hits) + { + string_append(&matches, "\n"); } } + string_append(&matches, "
In file: "); + string_join (&matches, html_encode(csp->config->actions_file_short[i])); + snprintf(buf, 150, ".action ", i); + string_append(&matches, buf); + string_append(&matches, "View"); +#ifdef FEATURE_CGI_EDIT_ACTIONS + string_append(&matches, " config->actions_file_short[i])); + string_append(&matches, "\">Edit"); +#endif + string_append(&matches, "
{"); + string_join (&matches, actions_to_html(csp, b->action)); + string_append(&matches, " }
\n"); + string_join (&matches, html_encode(b->url->spec)); + string_append(&matches, "
(no matches in this file)
\n"); free_http_request(url_to_query); @@ -998,11 +1371,6 @@ jb_err cgi_show_url_info(struct client_state *csp, return JB_ERR_MEMORY; } - if (!hits) - { - free(matches); - matches = strdup("none"); - } if (map(exports, "matches", 1, matches , 0)) { free_current_action(action); @@ -1010,7 +1378,7 @@ jb_err cgi_show_url_info(struct client_state *csp, return JB_ERR_MEMORY; } - s = html_encode_and_free_original(current_action_to_text(action)); + s = current_action_to_html(csp, action); free_current_action(action); @@ -1171,18 +1539,6 @@ static jb_err show_defines(struct map *exports) if (!err) err = map_conditional(exports, "FEATURE_TRUST", 0); #endif /* ndef FEATURE_TRUST */ -#ifdef REGEX_GNU - if (!err) err = map_conditional(exports, "REGEX_GNU", 1); -#else /* ifndef REGEX_GNU */ - if (!err) err = map_conditional(exports, "REGEX_GNU", 0); -#endif /* def REGEX_GNU */ - -#ifdef REGEX_PCRE - if (!err) err = map_conditional(exports, "REGEX_PCRE", 1); -#else /* ifndef REGEX_PCRE */ - if (!err) err = map_conditional(exports, "REGEX_PCRE", 0); -#endif /* def REGEX_PCRE */ - #ifdef STATIC_PCRE if (!err) err = map_conditional(exports, "STATIC_PCRE", 1); #else /* ifndef STATIC_PCRE */ @@ -1230,6 +1586,10 @@ static char *show_rcs(void) /* In alphabetical order */ SHOW_RCS(actions_h_rcs) SHOW_RCS(actions_rcs) +#ifdef AMIGA + SHOW_RCS(amiga_h_rcs) + SHOW_RCS(amiga_rcs) +#endif /* def AMIGA */ SHOW_RCS(cgi_h_rcs) SHOW_RCS(cgi_rcs) #ifdef FEATURE_CGI_EDIT_ACTIONS @@ -1251,10 +1611,6 @@ static char *show_rcs(void) SHOW_RCS(filters_rcs) SHOW_RCS(gateway_h_rcs) SHOW_RCS(gateway_rcs) -#ifdef GNU_REGEX - SHOW_RCS(gnu_regex_h_rcs) - SHOW_RCS(gnu_regex_rcs) -#endif /* def GNU_REGEX */ SHOW_RCS(jbsockets_h_rcs) SHOW_RCS(jbsockets_rcs) SHOW_RCS(jcc_h_rcs)