Lee [Sun, 26 Jul 2020 15:34:30 +0000 (11:34 -0400)]
Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
Fabian Keil [Wed, 22 Jul 2020 18:55:32 +0000 (20:55 +0200)]
Install the GPLv3 with the "install" target
... and include it in the tar ball created with the "gen-dist" target.
Fabian Keil [Wed, 22 Jul 2020 12:26:13 +0000 (14:26 +0200)]
Rebuild man page
Fabian Keil [Wed, 22 Jul 2020 10:27:27 +0000 (12:27 +0200)]
Regenerate docs
Fabian Keil [Wed, 22 Jul 2020 12:45:49 +0000 (14:45 +0200)]
Improve the "ignore-certificate-errors" description
Fabian Keil [Wed, 22 Jul 2020 13:50:30 +0000 (15:50 +0200)]
Clarify that Privoxy is licensed under GPLv2 or later
Fabian Keil [Wed, 22 Jul 2020 12:25:30 +0000 (14:25 +0200)]
Bump copyright
Fabian Keil [Wed, 22 Jul 2020 12:10:06 +0000 (14:10 +0200)]
license.sgml: Explain that Privoxy has to be distributed under the GPLv3 (or later) when linked with mbedTLS
Fabian Keil [Wed, 22 Jul 2020 10:25:41 +0000 (12:25 +0200)]
Include the GPLv3 in the user manual
... and mention that it applies when Privoxy is linked
with mbedTLS.
Fabian Keil [Wed, 22 Jul 2020 08:52:22 +0000 (10:52 +0200)]
Import the GNU GPLv3
It can be used when Privoxy is linked to mbedTLS
whose recent versions are only distributed under the
Apache 2.0 license which is incompatible with the
GPLv2 but compatible with the GPLv3.
Fabian Keil [Wed, 22 Jul 2020 12:00:32 +0000 (14:00 +0200)]
pcrs.3: Update pcrs license
Fabian Keil [Wed, 22 Jul 2020 11:56:32 +0000 (13:56 +0200)]
pcrs.3: Change URL to https://
Fabian Keil [Wed, 22 Jul 2020 10:21:27 +0000 (12:21 +0200)]
Clarify FEATURE_FORCE_LOAD description
It allows to bypass blocking not filtering and only
does it if blocks aren't enforced.
Reported by: Robert Klemme
Fabian Keil [Mon, 20 Jul 2020 13:10:16 +0000 (15:10 +0200)]
Only use the Subject Alternative Name extension if it isn't an IP address
Sponsored by: Robert Klemme
Fabian Keil [Sun, 19 Jul 2020 12:52:24 +0000 (14:52 +0200)]
Regenerate config file
Fabian Keil [Sun, 19 Jul 2020 12:45:01 +0000 (14:45 +0200)]
Regenerate docs
Fabian Keil [Sun, 19 Jul 2020 12:42:29 +0000 (14:42 +0200)]
Fix typo
Fabian Keil [Sun, 19 Jul 2020 12:39:59 +0000 (14:39 +0200)]
config: Rename 'TLS/SSL' section to 'TLS/SSL Inspection'
Suggested by: Lee
Lee [Sun, 19 Jul 2020 06:26:50 +0000 (02:26 -0400)]
Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
Fabian Keil [Sat, 18 Jul 2020 12:04:11 +0000 (14:04 +0200)]
receive_encrypted_request(): Use the socket-timeout when waiting for new data
Previously the keep-alive-timeout was being used which
was inappropriate as we are waiting for data that belongs
to the same request.
Sponsored by: Robert Klemme
Fabian Keil [Sat, 18 Jul 2020 11:47:36 +0000 (13:47 +0200)]
receive_encrypted_request(): Properly deal with pending data
... that has already been received and is thus invisible to
data_is_available().
Previously encrypted client requests that were too large
to be read with a single ssl_recv_data() call could be
rejected as invalid if all the data arrived quickly enough.
Apparently this happended frequently on gmail due to
large Cookies.
Reported by: Robert Klemme
Sponsored by: Robert Klemme
Fabian Keil [Fri, 26 Jun 2020 05:15:34 +0000 (07:15 +0200)]
Sync with updated 'Cautious' template
... which no longer enables the 'no-brotli-accepted' client-header filter.
This reverts commit
3e65e04181a1face1f3c3ef6e1481f674aa1a05f.
Fabian Keil [Fri, 26 Jun 2020 05:13:52 +0000 (07:13 +0200)]
Stop enabling 'no-brotli-accepted' client-header filter in all templates again
... as we have FEATURE_BROTLI now.
This reverts commit
c39e3b6489041ce5a4fa0c30481dd2cae3f4ce5a.
Fabian Keil [Thu, 25 Jun 2020 14:59:01 +0000 (16:59 +0200)]
Remove #159 "Support Brotli compression." which is done
Fabian Keil [Thu, 25 Jun 2020 09:48:41 +0000 (11:48 +0200)]
Bump copyright
Fabian Keil [Thu, 11 Jun 2020 16:31:45 +0000 (18:31 +0200)]
Bump copyright
Fabian Keil [Thu, 11 Jun 2020 09:20:14 +0000 (11:20 +0200)]
Add support for Brotli decompression
Using Google's brotli library:
https://github.com/google/brotli
Sponsored by: Robert Klemme
Fabian Keil [Fri, 19 Jun 2020 15:04:12 +0000 (17:04 +0200)]
Add fast-redirects exception for .wikipedia.org/
Fabian Keil [Mon, 15 Jun 2020 08:34:14 +0000 (10:34 +0200)]
ssl_send_certificate_error(): Add a doctype
Sponsored by: Robert Klemme
Fabian Keil [Fri, 12 Jun 2020 13:08:45 +0000 (15:08 +0200)]
ssl_send_certificate_error(): Add a page title
Sponsored by: Robert Klemme
Fabian Keil [Thu, 11 Jun 2020 18:11:28 +0000 (20:11 +0200)]
Don't add '-Imbedtls/include' to the CFLAGS when not building with mbedTLS
Sponsored by: Robert Klemme
Fabian Keil [Thu, 11 Jun 2020 16:30:13 +0000 (18:30 +0200)]
configure.in: Start --with(out)-mbedtls descriptions with upper-case characters
Sponsored by: Robert Klemme
Fabian Keil [Sat, 6 Jun 2020 07:28:00 +0000 (09:28 +0200)]
ssl_send_certificate_error(): Make it more obvious that the message is coming from Privoxy
Suggested by: Roland
Sponsored by: Robert Klemme
Fabian Keil [Thu, 11 Jun 2020 13:02:34 +0000 (15:02 +0200)]
Disable fast-redirects for .consensu.org/delivery/pixel\.php and block the requests as image instead
Lee [Mon, 15 Jun 2020 02:07:34 +0000 (22:07 -0400)]
Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
Fabian Keil [Tue, 9 Jun 2020 08:07:09 +0000 (10:07 +0200)]
privoxy-log-parser.pl: Unbreak the gathering of host statistics with http requests
... and CONNECT requests.
Fabian Keil [Tue, 9 Jun 2020 07:26:38 +0000 (09:26 +0200)]
privoxy-log-parser.pl: Make gather_loglevel_clf_stats() more tolerant
While at it, count all CLF messages as requests,
even if the request is invalid.
Fabian Keil [Tue, 9 Jun 2020 06:26:29 +0000 (08:26 +0200)]
privoxy-log-parser.pl: Highlight: "Waiting for the next client connection. Currently active threads: 30"
Fabian Keil [Mon, 8 Jun 2020 16:49:50 +0000 (18:49 +0200)]
Add a couple of tests for +client-header-filter{no-brotli-accepted}
Fabian Keil [Mon, 8 Jun 2020 09:38:43 +0000 (11:38 +0200)]
Register dependencies of the ssl object file so it is rebuild when needed
Fabian Keil [Sun, 7 Jun 2020 17:24:00 +0000 (19:24 +0200)]
get_clf_timestamp(): Fix locking of localtime()
Previously we were only locking the actual localtime()
call while we should keep the lock until the returned
pointer is no longer being used.
Fabian Keil [Sun, 7 Jun 2020 17:23:30 +0000 (19:23 +0200)]
get_locale_time(): Fix locking of localtime()
Previously we were only locking the actual localtime()
call while we should keep the lock until the returned
pointer is no longer being used.
Fabian Keil [Sun, 7 Jun 2020 17:22:10 +0000 (19:22 +0200)]
get_clf_timestamp(): Use privoxy_gmtime_r()
Fabian Keil [Sun, 7 Jun 2020 17:12:59 +0000 (19:12 +0200)]
Bump copyright
Fabian Keil [Sun, 7 Jun 2020 15:57:40 +0000 (17:57 +0200)]
parse_header_time(): Use privoxy_gmtime_r()
Previously the function would use gmtime() unlocked
if FEATURE_STRPTIME_SANITY_CHECKS was enabled ...
Fabian Keil [Sun, 7 Jun 2020 15:52:38 +0000 (17:52 +0200)]
client_if_modified_since(): Use privoxy_gmtime_r()
Fabian Keil [Sun, 7 Jun 2020 15:51:31 +0000 (17:51 +0200)]
server_last_modified(): Use privoxy_gmtime_r()
Fabian Keil [Sun, 7 Jun 2020 15:50:23 +0000 (17:50 +0200)]
add_cookie_expiry_date(): Use privoxy_gmtime_r()
Fabian Keil [Sun, 7 Jun 2020 15:48:52 +0000 (17:48 +0200)]
generate_certificate_valid_date(): Use privoxy_gmtime_r()
Fabian Keil [Sun, 7 Jun 2020 15:47:26 +0000 (17:47 +0200)]
Add privoxy_gmtime_r() so we can simplify some code
Fabian Keil [Sun, 7 Jun 2020 15:42:00 +0000 (17:42 +0200)]
write_pid_file(): Rename pidfile to pid_file
So it doesn't shadow the global pidfile.
Fabian Keil [Sun, 7 Jun 2020 15:21:16 +0000 (17:21 +0200)]
Fix the locking of gmtime()
Previously we were only locking the actual gmtime()
call while we should keep the lock until the returned
pointer is no longer being used.
Fabian Keil [Sun, 7 Jun 2020 14:56:05 +0000 (16:56 +0200)]
generate_certificate_valid_date(): Fall back to using gmtime() if gmtime_r() isn't available
As Lee reported it's not available on Windows.
Fabian Keil [Sun, 7 Jun 2020 12:59:28 +0000 (14:59 +0200)]
server(): Add colons that were missing in a log message
Fabian Keil [Sat, 6 Jun 2020 15:47:58 +0000 (17:47 +0200)]
privoxy-log-parser.pl: Properly highlight the filter results message
Previously a brace got lost.
Fabian Keil [Sun, 7 Jun 2020 09:41:48 +0000 (11:41 +0200)]
privoxy-regression-test.pl: Consistently use no space after function names
Fabian Keil [Sun, 7 Jun 2020 07:53:36 +0000 (09:53 +0200)]
Log the "Request:" message for unencrypted requests later
In
b94bbe62a I moved the block in front of the setting
of csp->http->client_ssl which meant the message was emitted
for encrypted requests as well.
This resulted in two "Request:" message instead of one.
Sponsored by: Robert Klemme
Fabian Keil [Sun, 7 Jun 2020 07:46:59 +0000 (09:46 +0200)]
Disable fast-redirects for collector.githubapp.com/ and block requests to it as image instead
Fabian Keil [Sun, 7 Jun 2020 08:08:00 +0000 (10:08 +0200)]
privoxy-regression-test.pl: Bump copyright
Fabian Keil [Sun, 7 Jun 2020 08:07:05 +0000 (10:07 +0200)]
privoxy-regression-test.pl: Allow '[' and ']' in URLs
Fabian Keil [Sun, 7 Jun 2020 08:06:20 +0000 (10:06 +0200)]
privoxy-regression-test.pl: Turn curl's globbing mode off so we can allow more characters in URLs
Fabian Keil [Sat, 6 Jun 2020 15:52:25 +0000 (17:52 +0200)]
privoxy-regression-test.pl: Bump version to 0.7.1
Fabian Keil [Sat, 6 Jun 2020 11:56:24 +0000 (13:56 +0200)]
privoxy-regression-test.pl: Include the action file when complaining about missing Sticky Actions
Fabian Keil [Sat, 6 Jun 2020 07:45:39 +0000 (09:45 +0200)]
Regenerate FAQ
Fabian Keil [Sat, 6 Jun 2020 07:56:09 +0000 (09:56 +0200)]
FAQ: Remove an obsolete comment with a link to the long-gone PDF manual
Fabian Keil [Sat, 6 Jun 2020 07:44:24 +0000 (09:44 +0200)]
Bump copyright
Fabian Keil [Sat, 6 Jun 2020 07:43:28 +0000 (09:43 +0200)]
FAQ: Add a link to the TODO list
Fabian Keil [Sat, 6 Jun 2020 07:42:56 +0000 (09:42 +0200)]
FAQ: Mention http-inspection in two answers
Sponsored by: Robert Klemme
Fabian Keil [Fri, 5 Jun 2020 11:39:57 +0000 (13:39 +0200)]
FAQ: Change the sponsor amounts to USD
... slightly rounding the converted amounts up to get simple numbers.
Receiving USD is apparently easier for SPI and SPI is
preferred by sponsors as they can send invoices.
No objections from: privoxy-devel@
Lee [Fri, 5 Jun 2020 18:06:13 +0000 (14:06 -0400)]
Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
Roland Rosenfeld [Fri, 5 Jun 2020 13:57:30 +0000 (15:57 +0200)]
Debian: Adapt TLS/SSL settings to Debian FHS.
Generate dirs with correct permissions for https-inspection.
Roland Rosenfeld [Fri, 5 Jun 2020 11:39:04 +0000 (13:39 +0200)]
Debian: Compile --with-mbedtls to allow https-inspection.
Roland Rosenfeld [Fri, 5 Jun 2020 10:40:01 +0000 (12:40 +0200)]
Debian: Update to new git version 8097d5 (update all patches)
Fabian Keil [Fri, 5 Jun 2020 14:05:51 +0000 (16:05 +0200)]
Fix spelling of FEATURE_HTTPS_INSPECTION
... so the action editor actually allows to set
https-inspection and ignore-certificate-errors.
Reported by: Roland
Fabian Keil [Fri, 5 Jun 2020 13:48:33 +0000 (15:48 +0200)]
Update http inspection section
It was still using +enable-https-filtering instead of +https-inspection.
Reported by: Roland
Fabian Keil [Fri, 5 Jun 2020 11:52:50 +0000 (13:52 +0200)]
Improve an error message in chat()
... that is emitted when forwarding an encrypted
request through a HTTP proxy fails.
Sponsored by: Robert Klemme
Fabian Keil [Fri, 5 Jun 2020 11:28:48 +0000 (13:28 +0200)]
Use the connect-failed template when the forwarding proxy fails
... with https inspection enabled. Forwarding the response from
the proxy to the client will not work as the client expects
an encrypted response.
Sponsored by: Robert Klemme
Fabian Keil [Fri, 5 Jun 2020 11:25:41 +0000 (13:25 +0200)]
Improve a comment in chat()
... by removing an obsolete sentence and sprinkling a
couple of "the"s.
Sponsored by: Robert Klemme
Fabian Keil [Thu, 12 Mar 2020 11:39:07 +0000 (12:39 +0100)]
Deduplicate some https inspection code in chat()
Once the connection to a HTTP proxy has been
established we can treat the connection the
same way as a direct one.
Sponsored by: Robert Klemme
Fabian Keil [Fri, 5 Jun 2020 10:58:10 +0000 (12:58 +0200)]
Fix commment indentation
Sponsored by: Robert Klemme
Fabian Keil [Fri, 5 Jun 2020 10:19:09 +0000 (12:19 +0200)]
Fix https inspection with HTTP forwarding
Previously Privoxy would not send the CSUCCEED
message to the client so the client would not
send the encrypted request.
Now that we send the CSUCCEED, we don't need to
forward the response from the upstream HTTP proxy
anymore.
Sponsored by: Robert Klemme
Fabian Keil [Fri, 5 Jun 2020 09:55:14 +0000 (11:55 +0200)]
Fix comment typo
Sponsored by: Robert Klemme
Fabian Keil [Wed, 3 Jun 2020 17:13:04 +0000 (19:13 +0200)]
privoxy-log-parser.pl: Accept and highlight: Forwarded the last 1954 bytes
Fabian Keil [Wed, 3 Jun 2020 17:11:04 +0000 (19:11 +0200)]
privoxy-log-parser.pl: Accept and highlight: Forwarding 1954 bytes of encrypted POST data
Fabian Keil [Wed, 3 Jun 2020 09:12:56 +0000 (11:12 +0200)]
privoxy-log-parser.pl: Completely highlight: 'Connection from 192.168.2.1 on 127.0.1.1:8118 (socket 3) dropped due to ACL'
Change the highlight type of the first IP address to "host"
instead of "Number".
Fabian Keil [Tue, 2 Jun 2020 12:49:08 +0000 (14:49 +0200)]
privoxy-log-parser.pl: Rephrase a statistics description
... to clarify the client request bodies aren't counted.
Fabian Keil [Sat, 30 May 2020 09:34:31 +0000 (11:34 +0200)]
privoxy-log-parser.pl: Prefer the number of CLF lines to get the total number of requests
As it works with older Privoxy versions as well.
Fabian Keil [Wed, 3 Jun 2020 06:44:47 +0000 (08:44 +0200)]
Add #160: Add keep-alive support with +https-inspection.
Fabian Keil [Wed, 3 Jun 2020 12:07:29 +0000 (14:07 +0200)]
Silence a warning when compiling without FEATURE_HTTPS_INSPECTION
cgi.c:447:22: warning: unused variable 'alt_prefix_https' [-Wunused-variable]
static const char alt_prefix_https[] = "https://" CGI_SITE_1_HOST "/";
Sponsored by: Robert Klemme
Fabian Keil [Wed, 3 Jun 2020 06:33:25 +0000 (08:33 +0200)]
Add +https-inspection and +ignore-certificate-errors to the list of valid actions
Sponsored by: Robert Klemme
Fabian Keil [Wed, 3 Jun 2020 05:46:47 +0000 (07:46 +0200)]
Add fast-redirects{} exception for sourcepoint.vice.com/
Fabian Keil [Mon, 1 Jun 2020 14:49:57 +0000 (16:49 +0200)]
chat(): Remove a pointless close_client_ssl_connection() call
Sponsored by: Robert Klemme
Fabian Keil [Mon, 1 Jun 2020 14:48:48 +0000 (16:48 +0200)]
Rephrase an error message in chat()
Sponsored by: Robert Klemme
Lee [Tue, 2 Jun 2020 04:35:17 +0000 (00:35 -0400)]
Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
Fabian Keil [Sat, 30 May 2020 09:14:02 +0000 (11:14 +0200)]
privoxy-log-parser.pl: Accept and highlight: Performing the TLS/SSL handshake with client. Hash of host:
bab5296b25e256c7b06b92b17b56bcae
Fabian Keil [Sat, 30 May 2020 09:06:38 +0000 (11:06 +0200)]
privoxy-log-parser.pl: Accept and highlight: Flushed 30 bytes of request body while expecting 30
Fabian Keil [Sat, 30 May 2020 06:05:55 +0000 (08:05 +0200)]
privoxy-log-parser.pl: Only show HTTP version distribution if at least one version has been detected
Fabian Keil [Sat, 30 May 2020 05:56:59 +0000 (07:56 +0200)]
privoxy-log-parser.pl: Only show crunch statistics if crunches were detected
Fabian Keil [Sat, 30 May 2020 05:55:44 +0000 (07:55 +0200)]
privoxy-log-parser.pl: Warn if the request counts differ
Fabian Keil [Sat, 30 May 2020 05:53:47 +0000 (07:53 +0200)]
privoxy-log-parser.pl: Generate statistics if the log only contains LOG_LEVEL_CLF messages
... so it can be used with vanilla webserver logs.
Previously Privoxy-specific "Request:" messages were required.