projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgi_error_disabled(): Use status code 403 and an appropriate response line
[privoxy.git]
/
cgi.c
diff --git
a/cgi.c
b/cgi.c
index
759517d
..
5195eac
100644
(file)
--- a/
cgi.c
+++ b/
cgi.c
@@
-1,4
+1,4
@@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.16
2 2016/03/17 10:40:53
fabiankeil Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.16
8 2017/01/23 13:05:12
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
@@
-8,8
+8,8
@@
const char cgi_rcs[] = "$Id: cgi.c,v 1.162 2016/03/17 10:40:53 fabiankeil Exp $"
* This only contains the framework functions, the
* actual handler functions are declared elsewhere.
*
* This only contains the framework functions, the
* actual handler functions are declared elsewhere.
*
- * Copyright : Written by and Copyright (C) 2001-20
04, 2006-2008
- *
the SourceForg
e Privoxy team. http://www.privoxy.org/
+ * Copyright : Written by and Copyright (C) 2001-20
17
+ *
members of th
e Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@
-101,10
+101,15
@@
static const struct cgi_dispatcher cgi_dispatchers[] = {
"View the source code version numbers",
TRUE },
#ifdef FEATURE_CLIENT_TAGS
"View the source code version numbers",
TRUE },
#ifdef FEATURE_CLIENT_TAGS
- { "show-client-tags",
+ /*
+ * This is marked as harmless because despite the description
+ * used in the menu the actual toggling is done through another
+ * path ("/toggle-client-tag").
+ */
+ { "client-tags",
cgi_show_client_tags,
"View or toggle the tags that can be set based on the clients address",
cgi_show_client_tags,
"View or toggle the tags that can be set based on the clients address",
-
FALS
E },
+
TRU
E },
#endif
{ "show-request",
cgi_show_request,
#endif
{ "show-request",
cgi_show_request,
@@
-120,6
+125,12
@@
static const struct cgi_dispatcher cgi_dispatchers[] = {
"Toggle Privoxy on or off",
FALSE },
#endif /* def FEATURE_TOGGLE */
"Toggle Privoxy on or off",
FALSE },
#endif /* def FEATURE_TOGGLE */
+#ifdef FEATURE_CLIENT_TAGS
+ { "toggle-client-tag",
+ cgi_toggle_client_tag,
+ NULL,
+ FALSE },
+#endif
#ifdef FEATURE_CGI_EDIT_ACTIONS
{ "edit-actions", /* Edit the actions list */
cgi_edit_actions,
#ifdef FEATURE_CGI_EDIT_ACTIONS
{ "edit-actions", /* Edit the actions list */
cgi_edit_actions,
@@
-1040,6
+1051,8
@@
jb_err cgi_error_disabled(const struct client_state *csp,
assert(csp);
assert(rsp);
assert(csp);
assert(rsp);
+ rsp->status = strdup_or_die("403 Request not trusted or feature disabled");
+
if (NULL == (exports = default_exports(csp, "cgi-error-disabled")))
{
return JB_ERR_MEMORY;
if (NULL == (exports = default_exports(csp, "cgi-error-disabled")))
{
return JB_ERR_MEMORY;
@@
-1376,7
+1389,7
@@
char *add_help_link(const char *item,
}
else
{
}
else
{
- string_append(&result, "http://");
+ string_append(&result, "http
s
://");
string_append(&result, CGI_SITE_2_HOST);
string_append(&result, "/user-manual/");
}
string_append(&result, CGI_SITE_2_HOST);
string_append(&result, "/user-manual/");
}