X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cgisimple.c;h=256202d28bf27e61d27098217a9ea94b358ca62b;hb=8070e13f8c6ca18ad8f6fecdcdd7a6506a117065;hp=71b117391a0b4c699e472226fee2dd58ec960093;hpb=f199398dc100edcfa81bcd1b891c644de1dd794d;p=privoxy.git
diff --git a/cgisimple.c b/cgisimple.c
index 71b11739..256202d2 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.55 2007/04/13 13:36:46 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.61 2008/01/26 11:13:25 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,35 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.55 2007/04/13 13:36:46 fabian
*
* Revisions :
* $Log: cgisimple.c,v $
+ * 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
+ * request for the CGI page would be forwarded if it wasn't a
+ * CGI request).
+ *
+ * Revision 1.56 2007/05/21 10:50:35 fabiankeil
+ * - Use strlcpy() instead of strcpy().
+ * - Stop treating actions files special. Expect a complete file name
+ * (with or without path) like it's done for the rest of the files.
+ * Closes FR#588084.
+ * - Don't rerun sed() in cgi_show_request().
+ *
* Revision 1.55 2007/04/13 13:36:46 fabiankeil
* Reference action files in CGI URLs by id instead
* of using the first part of the file name.
@@ -549,7 +578,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;
@@ -1217,7 +1247,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)
@@ -1288,6 +1320,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);
@@ -1472,6 +1511,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
err = map(exports, "matches", 1, "[Invalid URL specified!]" , 1);
if (!err) err = map(exports, "final", 1, lookup(exports, "default"), 1);
+ if (!err) err = map_block_killer(exports, "valid-url");
free_current_action(action);
free_http_request(url_to_query);
@@ -1486,7 +1526,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
}
/*
- * We have a warning about SSL paths. Hide it for insecure sites.
+ * We have a warning about SSL paths. Hide it for unencrypted sites.
*/
if (!url_to_query->ssl)
{
@@ -1519,10 +1559,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;
@@ -1559,6 +1615,19 @@ jb_err cgi_show_url_info(struct client_state *csp,
}
string_append(&matches, "\n");
+ /*
+ * XXX: Kludge to make sure the "Forward settings" section
+ * shows what forward-override{} would do with the requested URL.
+ * No one really cares how the CGI request would be forwarded
+ * if it wasn't intercepted as CGI request in the first place.
+ *
+ * From here on the action bitmask will no longer reflect
+ * the real url (http://config.privoxy.org/show-url-info?url=.*),
+ * but luckily it's no longer required later on anyway.
+ */
+ free_current_action(csp->action);
+ url_actions(url_to_query, csp);
+
/*
* Fill in forwarding settings.
*
@@ -1570,7 +1639,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
*
* XXX: Parts of this code could be reused for the
* "forwarding-failed" template which currently doesn't
- * display the proxy port and an eventuell second forwarder.
+ * display the proxy port and an eventual second forwarder.
*/
{
const struct forward_spec * fwd = forward_url(url_to_query, csp);