From b0a88373c964ed31e953edc68b75d657b85c3e69 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 1 Apr 2024 17:19:06 +0200 Subject: [PATCH 01/13] wolfSSL: Use LIBWOLFSSL_VERSION_HEX to decide whether or not to use WOLFSSL_X509_V_OK As Roland pointed out, in older wolfSSL releases X509_V_OK is an enum so the previous commit 838bc3c0e did not work as expected there. --- wolfssl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wolfssl.c b/wolfssl.c index 10ecd6b0..7f6c9646 100644 --- a/wolfssl.c +++ b/wolfssl.c @@ -1201,10 +1201,10 @@ extern int create_server_ssl_connection(struct client_state *csp) { long verify_result = wolfSSL_get_error(ssl, connect_ret); -#ifdef X509_V_OK - if (verify_result == X509_V_OK) -#else +#if LIBWOLFSSL_VERSION_HEX > 0x05005004 if (verify_result == WOLFSSL_X509_V_OK) +#else + if (verify_result == X509_V_OK) #endif { ret = 0; -- 2.39.2 From 8c0fbf0eccf28fea856c3f21997de3c398e91adc Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 3 May 2024 15:40:19 +0200 Subject: [PATCH 02/13] Add www.proxidize.com as Bronze level sponsor --- doc/webserver/sponsors/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/webserver/sponsors/index.html b/doc/webserver/sponsors/index.html index a4c800c3..f251f72c 100644 --- a/doc/webserver/sponsors/index.html +++ b/doc/webserver/sponsors/index.html @@ -18,6 +18,7 @@

Bronze sponsors

https://www.betrugstest.com/

https://moneybanker.fr/

+

https://www.proxidize.com/

https://vpnxpert.com/

Becoming a Privoxy sponsor

If you want to become a sponsor, please have a look at the Date: Fri, 3 May 2024 15:50:01 +0200 Subject: [PATCH 03/13] Bump copyright --- doc/source/webserver/index.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml index d77e57b0..1f74108d 100644 --- a/doc/source/webserver/index.sgml +++ b/doc/source/webserver/index.sgml @@ -172,7 +172,7 @@ - Copyright __copy 2001-2023 by Privoxy Developers + Copyright __copy 2001-2024 by Privoxy Developers -- 2.39.2 From 2d90c51a046fef0d29a6977e338341fabf389a58 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 22 May 2024 14:30:58 +0200 Subject: [PATCH 04/13] Remove bronze sponsor www.betrugstest.com --- doc/webserver/sponsors/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/webserver/sponsors/index.html b/doc/webserver/sponsors/index.html index f251f72c..a900628f 100644 --- a/doc/webserver/sponsors/index.html +++ b/doc/webserver/sponsors/index.html @@ -16,7 +16,6 @@

Vocal Remover by Lalal.ai

Bronze sponsors

-

https://www.betrugstest.com/

https://moneybanker.fr/

https://www.proxidize.com/

https://vpnxpert.com/

-- 2.39.2 From 79bdfa09f38588ea1be8657ab37c3c26b334d8cd Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 22 May 2024 14:31:32 +0200 Subject: [PATCH 05/13] Remove bronze sponsor moneybanker.fr --- doc/webserver/sponsors/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/webserver/sponsors/index.html b/doc/webserver/sponsors/index.html index a900628f..78e31116 100644 --- a/doc/webserver/sponsors/index.html +++ b/doc/webserver/sponsors/index.html @@ -16,7 +16,6 @@

Vocal Remover by Lalal.ai

Bronze sponsors

-

https://moneybanker.fr/

https://www.proxidize.com/

https://vpnxpert.com/

Becoming a Privoxy sponsor

-- 2.39.2 From ecc806f8c7acdd503d4d6880eefec67bbe1ba05d Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 22 May 2024 14:32:36 +0200 Subject: [PATCH 06/13] Remove bronze sponsor vpnxpert.com --- doc/webserver/sponsors/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/webserver/sponsors/index.html b/doc/webserver/sponsors/index.html index 78e31116..6aa5c08b 100644 --- a/doc/webserver/sponsors/index.html +++ b/doc/webserver/sponsors/index.html @@ -17,7 +17,6 @@ "Vocal Remover by Lalal.ai">

Bronze sponsors

https://www.proxidize.com/

-

https://vpnxpert.com/

Becoming a Privoxy sponsor

If you want to become a sponsor, please have a look at the sponsor -- 2.39.2 From 5484d0acce8d711b97e65af080d9944b7728972a Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 22 May 2024 14:36:25 +0200 Subject: [PATCH 07/13] Remove silver sponsor scrubtheweb.com --- doc/webserver/sponsors/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/webserver/sponsors/index.html b/doc/webserver/sponsors/index.html index 6aa5c08b..e217aded 100644 --- a/doc/webserver/sponsors/index.html +++ b/doc/webserver/sponsors/index.html @@ -12,7 +12,6 @@

This page lists Privoxy sponsors and their sponsor level with the exception of sponsors that preferred not to be listed here.

Silver sponsors

-

https://scrubtheweb.com/

Vocal Remover by Lalal.ai

Bronze sponsors

-- 2.39.2 From 58e96466f948ed510d4c8335e0dfdbb2830ff97b Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 3 Jun 2024 16:57:34 +0200 Subject: [PATCH 08/13] log_error(): Add missing space and new line in fatal error message --- errlog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/errlog.c b/errlog.c index 27bb4e0c..75040d16 100644 --- a/errlog.c +++ b/errlog.c @@ -692,8 +692,8 @@ void log_error(int loglevel, const char *fmt, ...) #endif if (loglevel == LOG_LEVEL_FATAL) { - fatal_error("Fatal error. You're not supposed to" - "see this message. Please file a bug report."); + fatal_error("Fatal error. You're not supposed to " + "see this message. Please file a bug report.\n"); } return; } -- 2.39.2 From 907208585259858e5ab7c6707bd645a0a4eacd60 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 2 Jun 2024 15:02:09 +0200 Subject: [PATCH 09/13] Remove stray space --- errlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/errlog.c b/errlog.c index 75040d16..f135e31c 100644 --- a/errlog.c +++ b/errlog.c @@ -86,7 +86,7 @@ static FILE *logfp = NULL; static int debug = (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR); /* static functions */ -static void fatal_error(const char * error_message); +static void fatal_error(const char *error_message); #ifdef _WIN32 static char *w32_socket_strerr(int errcode, char *tmp_buf); #endif -- 2.39.2 From e4b753a13a031ed6a5d46fa06c19a0f2259b8b46 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 2 Jun 2024 15:45:16 +0200 Subject: [PATCH 10/13] Remove stray space --- errlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/errlog.c b/errlog.c index f135e31c..3446b721 100644 --- a/errlog.c +++ b/errlog.c @@ -652,7 +652,7 @@ void log_error(int loglevel, const char *fmt, ...) char outbuf[LOG_BUFFER_SIZE+1]; char tempbuf[LOG_BUFFER_SIZE]; size_t length = 0; - const char * src = fmt; + const char *src = fmt; long thread_id; char timestamp[30]; const size_t log_buffer_size = LOG_BUFFER_SIZE; -- 2.39.2 From 64171176825fbce07d5caadb800d15dc7208f098 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 9 Jun 2024 14:42:28 +0200 Subject: [PATCH 11/13] is_untrusted_url(): Remove stray space --- filters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filters.c b/filters.c index 9915bf5d..5bb5666d 100644 --- a/filters.c +++ b/filters.c @@ -1393,7 +1393,7 @@ int is_untrusted_url(const struct client_state *csp) struct block_spec *b; struct pattern_spec **trusted_url; struct http_request rhttp[1]; - const char * referer; + const char *referer; jb_err err; /* -- 2.39.2 From d01b378bd66411aab21d9c51cf670ba6e71b7817 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 9 Jun 2024 14:50:34 +0200 Subject: [PATCH 12/13] is_untrusted_url(): Search the encrypted headers for the Referer ... when the client is using https and https inspection is enabled. Fixes the trust mechanism for https requests. Reported by Laurent Caumont in #1767. --- filters.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/filters.c b/filters.c index 5bb5666d..7b834948 100644 --- a/filters.c +++ b/filters.c @@ -1417,12 +1417,24 @@ int is_untrusted_url(const struct client_state *csp) } } - if (NULL == (referer = get_header_value(csp->headers, "Referer:"))) +#ifdef FEATURE_HTTPS_INSPECTION + if (client_use_ssl(csp)) { - /* no referrer was supplied */ - return 1; + if (NULL == (referer = get_header_value(csp->https_headers, "Referer:"))) + { + /* no referrer was supplied */ + return 1; + } + } + else +#endif + { + if (NULL == (referer = get_header_value(csp->headers, "Referer:"))) + { + /* no referrer was supplied */ + return 1; + } } - /* * If not, do we maybe trust its referrer? -- 2.39.2 From c32b25f7b85ad332c415ff89577523a62369a313 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 9 Jun 2024 15:22:08 +0200 Subject: [PATCH 13/13] Bump copyright --- filters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filters.c b/filters.c index 7b834948..7f4a3e46 100644 --- a/filters.c +++ b/filters.c @@ -4,7 +4,7 @@ * * Purpose : Declares functions to parse/crunch headers and pages. * - * Copyright : Written by and Copyright (C) 2001-2020 the + * Copyright : Written by and Copyright (C) 2001-2024 the * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written -- 2.39.2