X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=5ced54c938d568acc7b9d13af29fac75231f3949;hb=8bc46b23dcf95a9bb6f9c214613d2fad44a4c82a;hp=075df85af7c147b46be7779cc67aec9025b01132;hpb=d3b4ffce2745834e8622548bb9915262f3a72ec7;p=privoxy.git
diff --git a/cgisimple.c b/cgisimple.c
index 075df85a..5ced54c9 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.57 2007/06/01 16:53:05 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.65 2008/02/23 16:33:43 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,36 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.57 2007/06/01 16:53:05 fabian
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.65 2008/02/23 16:33:43 fabiankeil
+ * Let forward_url() use the standard parameter ordering
+ * and mark its second parameter immutable.
+ *
+ * Revision 1.64 2008/02/03 13:56:07 fabiankeil
+ * Add SOCKS5 support for show-url-info CGI page.
+ *
+ * Revision 1.63 2008/02/01 06:04:31 fabiankeil
+ * If edit buttons on the show-url-info CGI page are hidden, explain why.
+ *
+ * Revision 1.62 2008/02/01 05:52:40 fabiankeil
+ * Hide edit buttons on the show-url-info CGI page if enable-edit-action
+ * is disabled. Patch by Lee with additional white space adjustments.
+ *
+ * Revision 1.61 2008/01/26 11:13:25 fabiankeil
+ * If enable-edit-actions is disabled, hide the edit buttons and explain why.
+ *
+ * Revision 1.60 2007/10/27 13:12:13 fabiankeil
+ * Finish 1.49 and check write access before
+ * showing edit buttons on show-url-info page.
+ *
+ * Revision 1.59 2007/10/19 16:42:36 fabiankeil
+ * Plug memory leak I introduced five months ago.
+ * Yay Valgrind and Privoxy-Regression-Test.
+ *
+ * Revision 1.58 2007/07/21 12:19:50 fabiankeil
+ * If show-url-info is called with an URL that Privoxy
+ * would reject as invalid, don't show unresolved forwarding
+ * variables, "final matches" or claim the site's secure.
+ *
* Revision 1.57 2007/06/01 16:53:05 fabiankeil
* Adjust cgi_show_url_info() to show what forward-override{}
* would do with the requested URL (instead of showing how the
@@ -562,7 +592,8 @@ jb_err cgi_show_request(struct client_state *csp,
return JB_ERR_MEMORY;
}
- if (map(exports, "processed-request", 1, html_encode(list_to_text(csp->headers)), 0))
+ if (map(exports, "processed-request", 1,
+ html_encode_and_free_original(list_to_text(csp->headers)), 0))
{
free_map(exports);
return JB_ERR_MEMORY;
@@ -1230,7 +1261,9 @@ jb_err cgi_show_status(struct client_state *csp,
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])
+ if ((csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS)
+ && (NULL == strstr(csp->actions_list[i]->filename, "standard.action"))
+ && (NULL != csp->config->actions_file_short[i]))
{
#ifdef HAVE_ACCESS
if (access(csp->config->actions_file[i], W_OK) == 0)
@@ -1301,6 +1334,13 @@ jb_err cgi_show_status(struct client_state *csp,
if (!err) err = map_block_killer(exports, "trust-support");
#endif /* ndef FEATURE_TRUST */
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+ if (!err && (csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS))
+ {
+ err = map_block_killer(exports, "cgi-editor-is-disabled");
+ }
+#endif /* ndef CGI_EDIT_ACTIONS */
+
if (err)
{
free_map(exports);
@@ -1533,10 +1573,26 @@ jb_err cgi_show_url_info(struct client_state *csp,
string_append(&matches, buf);
string_append(&matches, "View");
#ifdef FEATURE_CGI_EDIT_ACTIONS
- snprintf(buf, sizeof(buf), " ", i);
- string_append(&matches, buf);
- string_append(&matches, "Edit");
-#endif
+ if (csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS)
+ {
+#ifdef HAVE_ACCESS
+ if (access(csp->config->actions_file[i], W_OK) == 0)
+ {
+#endif /* def HAVE_ACCESS */
+ snprintf(buf, sizeof(buf),
+ " ", i);
+ string_append(&matches, buf);
+ string_append(&matches, "Edit");
+#ifdef HAVE_ACCESS
+ }
+ else
+ {
+ string_append(&matches, " No write access.");
+ }
+#endif /* def HAVE_ACCESS */
+ }
+#endif /* FEATURE_CGI_EDIT_ACTIONS */
+
string_append(&matches, "\n");
hits = 0;
@@ -1584,7 +1640,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
* but luckily it's no longer required later on anyway.
*/
free_current_action(csp->action);
- url_actions(url_to_query, csp);
+ get_url_actions(csp, url_to_query);
/*
* Fill in forwarding settings.
@@ -1600,7 +1656,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
* display the proxy port and an eventual second forwarder.
*/
{
- const struct forward_spec * fwd = forward_url(url_to_query, csp);
+ const struct forward_spec *fwd = forward_url(csp, url_to_query);
if ((fwd->gateway_host == NULL) && (fwd->forward_host == NULL))
{
@@ -1615,8 +1671,24 @@ jb_err cgi_show_url_info(struct client_state *csp,
if (fwd->gateway_host != NULL)
{
- if (!err) err = map(exports, "socks-type", 1, (fwd->type == SOCKS_4) ?
- "socks4" : "socks4a", 1);
+ char *socks_type = NULL;
+
+ switch (fwd->type)
+ {
+ case SOCKS_4:
+ socks_type = "socks4";
+ break;
+ case SOCKS_4A:
+ socks_type = "socks4a";
+ break;
+ case SOCKS_5:
+ socks_type = "socks5";
+ break;
+ default:
+ log_error(LOG_LEVEL_FATAL, "Unknown socks type: %d.", fwd->type);
+ }
+
+ if (!err) err = map(exports, "socks-type", 1, socks_type, 1);
if (!err) err = map(exports, "gateway-host", 1, fwd->gateway_host, 1);
snprintf(port, sizeof(port), "%d", fwd->gateway_port);
if (!err) err = map(exports, "gateway-port", 1, port, 1);
@@ -1648,7 +1720,14 @@ jb_err cgi_show_url_info(struct client_state *csp,
return JB_ERR_MEMORY;
}
- if (map(exports, "matches", 1, matches , 0))
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+ if ((csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS))
+ {
+ err = map_block_killer(exports, "cgi-editor-is-disabled");
+ }
+#endif /* FEATURE_CGI_EDIT_ACTIONS */
+
+ if (err || map(exports, "matches", 1, matches , 0))
{
free_current_action(action);
free_map(exports);