From 6d60ac0445984436221788b6967c6c1459efe08c Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Thu, 7 Mar 2013 14:12:22 +0000 Subject: [PATCH] Rebuild documentation for enable-proxy-authentication-forwarding --- doc/webserver/user-manual/actions-file.html | 18 +++--- doc/webserver/user-manual/appendix.html | 28 ++++----- doc/webserver/user-manual/config.html | 60 ++++++++++++++++++++ doc/webserver/user-manual/configuration.html | 8 ++- doc/webserver/user-manual/filter-file.html | 2 +- doc/webserver/user-manual/index.html | 27 +++++---- doc/webserver/user-manual/quickstart.html | 2 +- doc/webserver/user-manual/startup.html | 4 +- doc/webserver/user-manual/whatsnew.html | 19 +++++-- 9 files changed, 121 insertions(+), 47 deletions(-) diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index faa5e629..896fc341 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -117,7 +117,7 @@ in default.action are:

- +

Table 1. Default Configurations

@@ -314,7 +314,7 @@ actions.

-

8.1. Finding the Right +

8.1. Finding the Right Mix

Note that some actions, like @@ -339,7 +339,7 @@

-

8.2. How to +

8.2. How to Edit

The easiest way to edit the actions files is with a browser by using @@ -529,7 +529,7 @@

-

8.4.1. The Domain +

8.4.1. The Domain Pattern

The matching of the domain part offers some flexible options: if @@ -634,7 +634,7 @@

-

8.4.2. The Path +

8.4.2. The Path Pattern

Privoxy uses

-

8.5.35. +

8.5.35. Summary

Note that many of these actions have the potential to cause a page @@ -4495,7 +4495,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not together:

-

8.7.1. +

8.7.1. match-all.action

Remember all actions @@ -4544,7 +4544,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not

-

8.7.2. +

8.7.2. default.action

If you aren't a developer, there's no need for you to edit the @@ -4887,7 +4887,7 @@ wiki.

-

8.7.3. +

8.7.3. user.action

So far we are painting with a broad brush by setting general diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index 5a07a155..9b1cc1bf 100644 --- a/doc/webserver/user-manual/appendix.html +++ b/doc/webserver/user-manual/appendix.html @@ -293,7 +293,7 @@

-

14.2. Privoxy's +

14.2. Privoxy's Internal Pages

Since Privoxy proxies each @@ -313,7 +313,7 @@

+ +
+

7.4.9. + enable-proxy-authentication-forwarding

+ +
+
+
Specifies:
+ +
+

Whether or not proxy authentication through Privoxy should work.

+
+ +
Type of value:
+ +
+

0 or 1

+
+ +
Default value:
+ +
+

0

+
+ +
Effect if unset:
+ +
+

Proxy authentication headers are removed.

+
+ +
Notes:
+ +
+

Privoxy itself does not support proxy authentication, but + can allow clients to authenticate against Privoxy's parent + proxy.

+ +

By default Privoxy (3.0.21 and later) don't do that and + remove Proxy-Authorization headers in requests and + Proxy-Authenticate headers in responses to make it harder for + malicious sites to trick inexperienced users into providing + login information.

+ +

If this option is enabled the headers are forwarded.

+ +

Enabling this option is not recommended if there is no parent + proxy that requires authentication or if the local network + between Privoxy and the parent proxy isn't trustworthy. If + proxy authentication is only required for some requests, it is + recommended to use a client header filter to remove the + authentication headers for requests where they aren't + needed.

+
+
+
+

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html index 9f25f72d..1e2e346c 100644 --- a/doc/webserver/user-manual/configuration.html +++ b/doc/webserver/user-manual/configuration.html @@ -46,7 +46,7 @@ controlled easily with a web browser.

-

6.1. Controlling +

6.1. Controlling Privoxy with Your Web Browser

Privoxy's user interface can be @@ -63,8 +63,10 @@ -

    Privoxy Menu

+

    Privoxy Menu

+
+
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html index a9aac417..f01f6893 100644 --- a/doc/webserver/user-manual/filter-file.html +++ b/doc/webserver/user-manual/filter-file.html @@ -151,7 +151,7 @@ FILTER: foo Replace all "foo" with "bar" started.

-

9.1. Filter File +

9.1. Filter File Tutorial

Now, let's complete our "foo" content diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html index 95276124..28bf43a3 100644 --- a/doc/webserver/user-manual/index.html +++ b/doc/webserver/user-manual/index.html @@ -23,7 +23,7 @@ 2001-2013 by Privoxy Developers

-

$Id: user-manual.sgml,v 2.173 2013/03/01 17:44:24 +

$Id: user-manual.sgml,v 2.174 2013/03/02 14:39:24 fabiankeil Exp $

@@ -173,7 +173,7 @@
-
6.1. Controlling Privoxy +
6.1. Controlling Privoxy with Your Web Browser
6.2. Configuration @@ -267,6 +267,9 @@
7.4.8. buffer-limit
+ +
7.4.9. enable-proxy-authentication-forwarding
@@ -342,10 +345,10 @@
-
8.1. Finding the Right +
8.1. Finding the Right Mix
-
8.2. How to Edit
+
8.2. How to Edit
8.3. How Actions are Applied to Requests
@@ -355,10 +358,10 @@
-
8.4.1. The Domain +
8.4.1. The Domain Pattern
-
8.4.2. The Path +
8.4.2. The Path Pattern
8.4.3. The Tag @@ -472,7 +475,7 @@ "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker
8.5.35. Summary
+ "actions-file.html#AEN4827">Summary
@@ -484,13 +487,13 @@
8.7.1. match-all.action
+ "actions-file.html#AEN4891">match-all.action
8.7.2. default.action
+ "actions-file.html#AEN4913">default.action
8.7.3. user.action
+ "actions-file.html#AEN5026">user.action
@@ -500,7 +503,7 @@
-
9.1. Filter File +
9.1. Filter File Tutorial
9.2. The @@ -564,7 +567,7 @@
14.1. Regular Expressions
-
14.2. Privoxy's Internal +
14.2. Privoxy's Internal Pages
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html index 13d9b237..880d3bd7 100644 --- a/doc/webserver/user-manual/quickstart.html +++ b/doc/webserver/user-manual/quickstart.html @@ -343,7 +343,7 @@ "GUIBUTTON">Edit":

- +

Figure 1. Actions Files in Use

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index 664c2272..c0868408 100644 --- a/doc/webserver/user-manual/startup.html +++ b/doc/webserver/user-manual/startup.html @@ -55,7 +55,7 @@ protocols.

- +

Figure 2. Proxy Configuration Showing Mozilla/Netscape HTTP and HTTPS (SSL) Settings

@@ -112,7 +112,7 @@ only HTTP and HTTPS (SSL)!

- +

Figure 3. Proxy Configuration Showing Internet Explorer HTTP and HTTPS (Secure) Settings

diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html index 0d3e4bf6..07a5a289 100644 --- a/doc/webserver/user-manual/whatsnew.html +++ b/doc/webserver/user-manual/whatsnew.html @@ -42,9 +42,9 @@ Release

Privoxy 3.0.21 stable is a bug-fix - release for Privoxy 3.0.20 beta. It also addresses a security issue that - affects all previous Privoxy versions (on some platforms). The changes - since 3.0.20 beta are:

+ release for Privoxy 3.0.20 beta. It also addresses two security issues + that affect all previous Privoxy versions. The changes since 3.0.20 beta + are:

  • @@ -58,6 +58,14 @@ limit to be reached.

  • +
  • +

    Proxy authentication headers are removed unless the new + directive enable-proxy-authentication-forwarding is used. + Forwarding the headers potentionally allows malicious sites to + trick the user into providing it with login information. Reported + by Chris John Riley.

    +
  • +
  • Compiles on OS/2 again now that unistd.h is only included on platforms that have it.

    @@ -105,9 +113,10 @@

    Unblock '.advrider.com/' and '/.*ADVrider'. Anonymously reported in #3603636.

  • +
  • -

    Stop blocking '/js/slider\.js'. - Reported by Adam Piggott in #3606635 and _lvm in #2791160.

    +

    Stop blocking '/js/slider\.js'. Reported by Adam Piggott in + #3606635 and _lvm in #2791160.

-- 2.39.2