PCRS-based popup filters can do the same and are less
unreliable.
- The inspect-jpegs action has been removed.
+- The send-wafer and send-vanilla-wafer actions have been removed.
+ They weren't particular useful and their behaviour could be emulated
+ with add-header anyway.
*** Version 3.0.8 ***
*
* Revisions :
* $Log: actionlist.h,v $
+ * Revision 1.32 2008/03/28 15:13:42 fabiankeil
+ * Remove inspect-jpegs action.
+ *
* Revision 1.31 2008/03/27 18:27:20 fabiankeil
* Remove kill-popups action.
*
DEFINE_ACTION_BOOL ("prevent-compression", ACTION_NO_COMPRESSION)
DEFINE_ACTION_STRING ("redirect", ACTION_REDIRECT, ACTION_STRING_REDIRECT)
DEFINE_CGI_PARAM_NO_RADIO("redirect", ACTION_REDIRECT, ACTION_STRING_REDIRECT, "http://localhost/")
-DEFINE_ACTION_BOOL ("send-vanilla-wafer", ACTION_VANILLA_WAFER)
-DEFINE_ACTION_MULTI ("send-wafer", ACTION_MULTI_WAFER)
DEFINE_ACTION_MULTI ("server-header-filter", ACTION_MULTI_SERVER_HEADER_FILTER)
DEFINE_ACTION_MULTI ("server-header-tagger", ACTION_MULTI_SERVER_HEADER_TAGGER)
DEFINE_ACTION_BOOL ("session-cookies-only", ACTION_NO_COOKIE_KEEP)
DEFINE_ACTION_BOOL ("no-cookies-keep", ACTION_NO_COOKIE_KEEP)
DEFINE_ACTION_BOOL ("no-cookies-read", ACTION_NO_COOKIE_READ)
DEFINE_ACTION_BOOL ("no-cookies-set", ACTION_NO_COOKIE_SET)
-DEFINE_ACTION_BOOL ("vanilla-wafer", ACTION_VANILLA_WAFER)
-DEFINE_ACTION_MULTI ("wafer", ACTION_MULTI_WAFER)
#endif /* if DEFINE_ACTION_ALIAS */
#undef DEFINE_ACTION_MULTI
-const char actions_rcs[] = "$Id: actions.c,v 1.47 2008/03/28 15:13:37 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.48 2008/03/28 18:17:14 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
*
* Revisions :
* $Log: actions.c,v $
+ * Revision 1.48 2008/03/28 18:17:14 fabiankeil
+ * In action_used_to_be_valid(), loop through an array of formerly
+ * valid actions instead of using an OR-chain of strcmpic() calls.
+ *
* Revision 1.47 2008/03/28 15:13:37 fabiankeil
* Remove inspect-jpegs action.
*
static const char *formerly_valid_actions[] = {
"inspect-jpegs",
"kill-popups",
- "treat-forbidden-connects-like-blocks"
+ "send-vanilla-wafer",
+ "send-wafer",
+ "treat-forbidden-connects-like-blocks",
+ "vanilla-wafer",
+ "wafer"
};
int i;
#
# File : $Source: /cvsroot/ijbswa/current/default.action.master,v $
#
-# $Id: default.action.master,v 1.120 2008/03/27 18:27:36 fabiankeil Exp $
+# $Id: default.action.master,v 1.121 2008/03/28 15:13:39 fabiankeil Exp $
#
# Requires : This version requires Privoxy v3.0.9 or later due to
# syntax changes.
# +name{param} # enable and set parameter to "param"
# -name # disable
#
-# Multi-value (e.g. "add-header", "send-wafer"):
+# Multi-value (e.g. "add-header", "filter"):
# +name{param} # enable and add parameter "param"
# -name{param} # remove the parameter "param"
# -name # disable totally
# another location and the browser should get it from the specified
# URL.
#
-# +send-vanilla-wafer
-# This action only applies if you are using a jarfile. It sends a
-# cookie to every site stating that you do not accept any copyright
-# on cookies sent to you, and asking them not to track you. Of
-# course, this is a (relatively) unique header they could use to
-# track you.
-#
-# +send-wafer{name=value}
-# This allows you to add an arbitrary cookie. Specify it multiple
-# times in order to add several cookies.
-#
#############################################################################
#############################################################################
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: user-manual.sgml,v 2.67 2008/03/27 18:31:21 fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.68 2008/03/28 15:13:43 fabiankeil Exp $
Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
See LICENSE.
</subscript>
</pubdate>
-<pubdate>$Id: user-manual.sgml,v 2.67 2008/03/27 18:31:21 fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.68 2008/03/28 15:13:43 fabiankeil Exp $</pubdate>
<!--
</sect3>
-<!-- ~~~~~ New section ~~~~~ -->
-<sect3 renderas="sect4" id="send-vanilla-wafer">
-<title>send-vanilla-wafer</title>
-
-<variablelist>
- <varlistentry>
- <term>Typical use:</term>
- <listitem>
- <para>
- Feed log analysis scripts with useless data.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Effect:</term>
- <listitem>
- <para>
- Sends a cookie with each request stating that you do not accept any copyright
- on cookies sent to you, and asking the site operator not to track you.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Type:</term>
- <!-- Boolean, Parameterized, Multi-value -->
- <listitem>
- <para>Boolean.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Parameter:</term>
- <listitem>
- <para>
- N/A
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Notes:</term>
- <listitem>
- <para>
- The vanilla wafer is a (relatively) unique header and could conceivably be used to track you.
- </para>
- <para>
- This action is rarely used and not enabled in the default configuration.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Example usage:</term>
- <listitem>
- <para>
- <screen>+send-vanilla-wafer</screen>
- </para>
- </listitem>
- </varlistentry>
-
-</variablelist>
-</sect3>
-
-
-<!-- ~~~~~ New section ~~~~~ -->
-<sect3 renderas="sect4" id="send-wafer">
-<title>send-wafer</title>
-
-<variablelist>
- <varlistentry>
- <term>Typical use:</term>
- <listitem>
- <para>
- Send custom cookies or feed log analysis scripts with even more useless data.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Effect:</term>
- <listitem>
- <para>
- Sends a custom, user-defined cookie with each request.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Type:</term>
- <!-- Boolean, Parameterized, Multi-value -->
- <listitem>
- <para>Multi-value.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Parameter:</term>
- <listitem>
- <para>
- A string of the form <quote><replaceable class="option">name</replaceable>=<replaceable
- class="parameter">value</replaceable></quote>.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Notes:</term>
- <listitem>
- <para>
- Being multi-valued, multiple instances of this action can apply to the same request,
- resulting in multiple cookies being sent.
- </para>
- <para>
- This action is rarely used and not enabled in the default configuration.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Example usage (section):</term>
- <listitem>
- <para>
- <screen>{+send-wafer{UsingPrivoxy=true}}
-my-internal-testing-server.void</screen>
- </para>
- </listitem>
- </varlistentry>
-</variablelist>
-</sect3>
-
-
<!-- ~~~~~ New section ~~~~~ -->
<sect3 renderas="sect4" id="server-header-filter">
<title>server-header-filter</title>
-overwrite-last-modified
-prevent-compression
-redirect
- -send-vanilla-wafer
- -send-wafer
-server-header-filter{xml-to-html}
-server-header-filter{html-to-xml}
-session-cookies-only
-overwrite-last-modified
+prevent-compression
-redirect
- -send-vanilla-wafer
- -send-wafer
-server-header-filter{xml-to-html}
-server-header-filter{html-to-xml}
+session-cookies-only
USA
$Log: user-manual.sgml,v $
+ Revision 2.68 2008/03/28 15:13:43 fabiankeil
+ Remove inspect-jpegs action.
+
Revision 2.67 2008/03/27 18:31:21 fabiankeil
Remove kill-popups action.
-const char parsers_rcs[] = "$Id: parsers.c,v 1.121 2008/01/05 21:37:03 fabiankeil Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.122 2008/03/28 15:13:39 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.122 2008/03/28 15:13:39 fabiankeil
+ * Remove inspect-jpegs action.
+ *
* Revision 1.121 2008/01/05 21:37:03 fabiankeil
* Let client_range() also handle Request-Range headers
* which apparently are still supported by many servers.
static jb_err server_content_disposition(struct client_state *csp, char **header);
static jb_err client_host_adder (struct client_state *csp);
-static jb_err client_cookie_adder (struct client_state *csp);
static jb_err client_xtra_adder (struct client_state *csp);
static jb_err connection_close_adder (struct client_state *csp);
const add_header_func_ptr add_client_headers[] = {
client_host_adder,
- client_cookie_adder,
client_xtra_adder,
/* Temporarily disabled: client_accept_encoding_adder, */
connection_close_adder,
NULL
};
-/* The vanilla wafer. */
-static const char VANILLA_WAFER[] =
- "NOTICE=TO_WHOM_IT_MAY_CONCERN_"
- "Do_not_send_me_any_copyrighted_information_other_than_the_"
- "document_that_I_am_requesting_or_any_of_its_necessary_components._"
- "In_particular_do_not_send_me_any_cookies_that_"
- "are_subject_to_a_claim_of_copyright_by_anybody._"
- "Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_"
- "(copyright_or_otherwise)_applying_to_any_cookie._";
-
/*********************************************************************
*
* Function : flush_socket
}
-/*********************************************************************
- *
- * Function : client_cookie_adder
- *
- * Description : Used in the add_client_headers list to add "wafers".
- * Called from `sed'.
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- *
- * Returns : JB_ERR_OK on success, or
- * JB_ERR_MEMORY on out-of-memory error.
- *
- *********************************************************************/
-jb_err client_cookie_adder(struct client_state *csp)
-{
- char *tmp;
- struct list_entry *wafer;
- struct list_entry *wafer_list;
- jb_err err;
-
- /*
- * If the user has not supplied any wafers, and the user has not
- * told us to suppress the vanilla wafer, then send the vanilla wafer.
- */
- if ((0 != (csp->action->flags & ACTION_VANILLA_WAFER))
- && list_is_empty(csp->action->multi[ACTION_MULTI_WAFER]))
- {
- enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER);
- }
-
- wafer_list = csp->action->multi[ACTION_MULTI_WAFER]->first;
-
- if (NULL == wafer_list)
- {
- /* Nothing to do */
- return JB_ERR_OK;
- }
-
- tmp = strdup("Cookie: ");
-
- for (wafer = wafer_list; (NULL != tmp) && (NULL != wafer); wafer = wafer->next)
- {
- if (wafer != wafer_list)
- {
- /* As this isn't the first wafer, we need a delimiter. */
- string_append(&tmp, "; ");
- }
- string_join(&tmp, cookie_encode(wafer->str));
- }
-
- if (tmp == NULL)
- {
- return JB_ERR_MEMORY;
- }
-
- log_error(LOG_LEVEL_HEADER, "addh: %s", tmp);
- err = enlist(csp->headers, tmp);
- free(tmp);
- return err;
-}
-
-
#if 0
/*********************************************************************
*
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
/** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.108 2008/03/27 18:27:36 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.109 2008/03/28 15:13:41 fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.109 2008/03/28 15:13:41 fabiankeil
+ * Remove inspect-jpegs action.
+ *
* Revision 1.108 2008/03/27 18:27:36 fabiankeil
* Remove kill-popups action.
*
#define ACTION_NO_COOKIE_SET 0x00002000UL
/** Action bitmap: Override the forward settings in the config file */
#define ACTION_FORWARD_OVERRIDE 0x00004000UL
-/** Action bitmap: Send a vanilla wafer. */
-#define ACTION_VANILLA_WAFER 0x00008000UL
+/** Action bitmap: Block as empty document */
+#define ACTION_HANDLE_AS_EMPTY_DOCUMENT 0x00008000UL
/** Action bitmap: Limit CONNECT requests to safe ports. */
#define ACTION_LIMIT_CONNECT 0x00010000UL
/** Action bitmap: Redirect request. */
#define ACTION_OVERWRITE_LAST_MODIFIED 0x02000000UL
/** Action bitmap: Replace or block Accept-Language header */
#define ACTION_HIDE_ACCEPT_LANGUAGE 0x04000000UL
-/** Action bitmap: Block as empty document */
-#define ACTION_HANDLE_AS_EMPTY_DOCUMENT 0x08000000UL
/** Action string index: How to deanimate GIFs */
/** Index into current_action_spec::multi[] for headers to add. */
#define ACTION_MULTI_ADD_HEADER 0
-/** Index into current_action_spec::multi[] for headers to add. */
-#define ACTION_MULTI_WAFER 1
/** Index into current_action_spec::multi[] for content filters to apply. */
-#define ACTION_MULTI_FILTER 2
+#define ACTION_MULTI_FILTER 1
/** Index into current_action_spec::multi[] for server-header filters to apply. */
-#define ACTION_MULTI_SERVER_HEADER_FILTER 3
+#define ACTION_MULTI_SERVER_HEADER_FILTER 2
/** Index into current_action_spec::multi[] for client-header filters to apply. */
-#define ACTION_MULTI_CLIENT_HEADER_FILTER 4
+#define ACTION_MULTI_CLIENT_HEADER_FILTER 3
/** Index into current_action_spec::multi[] for client-header tags to apply. */
-#define ACTION_MULTI_CLIENT_HEADER_TAGGER 5
+#define ACTION_MULTI_CLIENT_HEADER_TAGGER 4
/** Index into current_action_spec::multi[] for server-header tags to apply. */
-#define ACTION_MULTI_SERVER_HEADER_TAGGER 6
+#define ACTION_MULTI_SERVER_HEADER_TAGGER 5
/** Number of multi-string actions. */
-#define ACTION_MULTI_COUNT 7
+#define ACTION_MULTI_COUNT 6
/**
#############################################################################
-# $Id: regression-tests.action,v 1.62 2008/03/28 08:42:51 fk Exp $
+# $Id: regression-tests.action,v 1.63 2008/03/28 19:03:49 fk Exp $
#############################################################################
#
# This is a configuration file for Privoxy-Regression-Test.
}
TAG:^prevent-compression$
-#######################################################
-# Test send-wafer.
-#######################################################
-
-# Set Header = X-Does-Not-Matter: Foo bar
-# Expect Header = Cookie: Tracking+me+is+easy+due+to+my+stupid+wafer+cookie
-{\
- +send-wafer{Tracking me is easy due to my stupid wafer cookie}\
- -send-vanilla-wafer \
-}
-TAG:^send-wafer\{Tracking me is easy due to my stupid wafer cookie\}$
-
-#######################################################
-# Test send-vanilla-wafer.
-#######################################################
-
-# Set Header = X-Does-Not-Matter: Foo bar
-# Expect Header = Cookie: NOTICE=TO_WHOM_IT_MAY_CONCERN_Do_not_send_me_any_copyrighted_information_other_than_the_document_that_I_am_requesting_or_any_of_its_necessary_components._In_particular_do_not_send_me_any_cookies_that_are_subject_to_a_claim_of_copyright_by_anybody._Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_(copyright_or_otherwise)_applying_to_any_cookie._
-{\
- +send-vanilla-wafer \
- -send-wafer \
-}
-TAG:^send-vanilla-wafer$
-
#######################################################
# Test content filters which could cause problems with
# range requests.
#
# Revisions :
# $Log: edit-actions-for-url,v $
+# Revision 1.53 2008/03/28 15:13:45 fabiankeil
+# Remove inspect-jpegs action.
+#
# Revision 1.52 2008/03/15 14:52:36 fabiankeil
# Add CGI editor support for the "disable all filters of this type"
# directives "-client-header-filter", "-server-header-filter",
target.style.display = (tf ? "" : "none");
}
-function show_send_wafer_opts(tf)
-{
- if (document.getElementById) {
- target = document.getElementById("send_wafer_opts");
- } else if (document.all) {
- target = document.send_wafer_opts;
- } else {
- return;
- }
- target.style.display = (tf ? "" : "none");
-}
-
//-->
</script>
</head>
value="@redirect-param@"></td>
</tr>
- <tr class="bg1" align="left" valign="top">
- <td class="en1" align="center" valign="middle"><input type="radio"
- name="send_vanilla_wafer" value="Y" @send-vanilla-wafer-y@
- ></td>
- <td class="dis1" align="center" valign="middle"><input type="radio"
- name="send_vanilla_wafer" value="N" @send-vanilla-wafer-n@
- ></td>
- <td class="noc1" align="center" valign="middle"><input type="radio"
- name="send_vanilla_wafer" value="X" @send-vanilla-wafer-x@
- ></td>
- <td class="action"><a href="@user-manual@@actions-help-prefix@SEND-VANILLA-WAFER">send-vanilla-wafer</a></td>
- <td>Adds a special wafer (standard cookie) to all your requests. Not recommended.</td>
- </tr>
- <tr class="bg1" align="left" valign="top">
- <td class="en1" align="center" valign="middle"><input type="radio"
- name="send_wafer" id="send_wafer_y" value="Y" @send-wafer-y@
- onclick="show_send_wafer_opts(true)"></td>
- <td class="dis1" align="center" valign="middle"><input type="radio"
- name="send_wafer" id="send_wafer_n" value="N" @send-wafer-n@
- onclick="show_send_wafer_opts(false)"></td>
- <td class="noc1" align="center" valign="middle"><input type="radio"
- name="send_wafer" id="send_wafer_x" value="X" @send-wafer-x@
- onclick="show_send_wafer_opts(false)"></td>
- <td class="action"><a href="@user-manual@@actions-help-prefix@SEND-WAFER">send-wafer</a></td>
- <td>Adds user-specified cookies.</td>
- </tr>
- <tr class="bg1" align="left" valign="top" id="send_wafer_opts">
- <td class="en1"> </td>
- <td class="dis1"> </td>
- <td class="noc1"> </td>
- <td> </td>
- <td>Editing the settings for this option, or turning
- it on if it was off, is not yet supported using this web-based
- editor.</td>
- </tr>
<tr class="bg1" align="left" valign="top">
<td class="en1"> </td>
<td class="dis1" align="center" valign="middle"><input type="radio"
projects / privoxy.git / commitdiff