]> git.ipfire.org Git - thirdparty/squid.git/log
thirdparty/squid.git
7 years agoC++11: Remove GnuRegex and all -lregex related code
Amos Jeffries [Sun, 20 Nov 2016 09:12:00 +0000 (22:12 +1300)] 
C++11: Remove GnuRegex and all -lregex related code

Squid is now exclusively using the STL std::regex API provided on all
operating systems in a portable manner.

We no longer have any need of detecting if the system is providing a
libregex, or user has configured one, or if it actually works, or how
to call it, or use the GnuRegex code as a backup when one of those
complex details goes wrong.

7 years agoBug 4599 pt3: use wrapper functions to access BIO object internals
Christos Tsantilas [Sat, 19 Nov 2016 13:25:15 +0000 (02:25 +1300)] 
Bug 4599 pt3: use wrapper functions to access BIO object internals

7 years agoCleanup: replace HTTP Request bitmap flags with boolean
Amos Jeffries [Sat, 19 Nov 2016 07:24:46 +0000 (20:24 +1300)] 
Cleanup: replace HTTP Request bitmap flags with boolean

7 years agoFix Null pointer dereferences after rev.14913
Amos Jeffries [Fri, 18 Nov 2016 18:08:30 +0000 (07:08 +1300)] 
Fix Null pointer dereferences after rev.14913

on_unsupported_protocol with non-HTTP requests occurs without
an HTTP request object. Some ACLs will not be possible to check
but that is not a reason to crash.

 Detected by Coverity Scan. Issue 1394291.

7 years agoTLS: Add ErrorString() function to libsecurity API
Amos Jeffries [Fri, 18 Nov 2016 08:42:13 +0000 (21:42 +1300)] 
TLS: Add ErrorString() function to libsecurity API

To convert library error codes to strings in a library agnostic way.

7 years agoFix ICAP Allow header containing only trailers option
Amos Jeffries [Fri, 18 Nov 2016 06:19:19 +0000 (19:19 +1300)] 
Fix ICAP Allow header containing only trailers option

r14941 added 'tailers' option to te Allow header but did not send it when
only that option was used, without the 204 or 206 features.

 Detected by Coverity Scan. Issue 1394381.

7 years agoFix r14945: Fixed Write.cc:41 "!ccb->active()" assertion.
Christos Tsantilas [Thu, 17 Nov 2016 10:13:41 +0000 (12:13 +0200)] 
Fix r14945:  Fixed Write.cc:41 "!ccb->active()" assertion.

The r14945 patch has a major bug:
 When the Http::One::Server::writeControlMsgAndCall fails to write the control
message, schedules a Comm::Write callback using just a ScheduleCallHere command.
The callback called withtout the CommIoCbParams details and squid is crashes.

This patch fixes the ConnStateData::writeControlMsgAndCall to return false if it
fails to write the control message and allow the caller to handle the failure.

This is a Measurement Factory project

7 years agoSourceFormat Enforcement
Source Maintenance [Tue, 15 Nov 2016 12:12:01 +0000 (12:12 +0000)] 
SourceFormat Enforcement

7 years agoFix build tests error after r14945 patch: 'Fixed Write.cc:41 "\!ccb->active()" assert...
Christos Tsantilas [Tue, 15 Nov 2016 10:50:21 +0000 (12:50 +0200)] 
Fix build tests error after r14945 patch: 'Fixed Write.cc:41 "\!ccb->active()" assertion.'

7 years agoFixed Write.cc:41 "!ccb->active()" assertion.
Christos Tsantilas [Tue, 15 Nov 2016 09:41:26 +0000 (11:41 +0200)] 
Fixed Write.cc:41 "!ccb->active()" assertion.

The following sequence of events triggers this assertion:
  - The server sends an 1xx control message.
  - http.cc schedules ConnStateData::sendControlMsg call.
  - Before sendControlMsg is fired, http.cc detects an error (e.g., I/O
    error or timeout) and starts writing the reply to the user.
  - The ConnStateData::sendControlMsg is fired, starts writing 1xx, and
    hits the "no concurrent writes" assertion.

We could only reproduce this sequence in the lab after changing Squid
code to trigger a timeout at the right moment, but the sequence looks
plausible. Other event sequences might result in the same outcome.

To avoid concurrent writes, Squid now drops the control message if
Http::One::Server detects that a reply is already being written. Also,
ConnStateData delays reply writing until a pending control message write
has been completed.

This is a Measurement Factory project.

7 years agoBug 4630: user credentials cache cleanup not re-scheduled
Garri Djavadyan [Tue, 15 Nov 2016 09:34:16 +0000 (22:34 +1300)] 
Bug 4630: user credentials cache cleanup not re-scheduled

7 years agoBug 4599 pt2: use functor for locking in libsecurity Pointers
Amos Jeffries [Tue, 15 Nov 2016 06:50:00 +0000 (19:50 +1300)] 
Bug 4599 pt2: use functor for locking in libsecurity Pointers

7 years agoDocs: release notes for ICAP Trailers
Amos Jeffries [Tue, 15 Nov 2016 06:49:07 +0000 (19:49 +1300)] 
Docs: release notes for ICAP Trailers

7 years agoICAP: Initial support for trailers
Eduard Bagdasaryan [Tue, 15 Nov 2016 05:08:59 +0000 (18:08 +1300)] 
ICAP: Initial support for trailers

ICAP trailers are currently specified by
https://datatracker.ietf.org/doc/draft-rousskov-icap-trailers/

This implementation complies with version -01 of that draft:

- Squid unconditionally announces ICAP Trailer support via the ICAP
  Allow request header field.

- Squid parses the ICAP response trailer if and only if the ICAP server
  signals its presence by sending both Trailer header and Allow/trailers
  in the ICAP response.

Squid logs and ignores all parsed ICAP header fields (for now).

Also refactored HttpHeader parsing methods in order to reuse them for
ICAP trailer parsing.

Also simplified and fixed headers isolating code while dealing with
empty (i.e. zero header fields) headers. Old httpMsgIsolateHeaders()
tried to re-implement header end detection/processing logic that is
actually covered by headersEnd(). Old httpMsgIsolateHeaders() could
return success for some garbage input (e.g., a buffer of several CRs)
even if no end of headers was found.

7 years agoBug 3533: Cache still valid after HTTP/1.1 303 See Other
Garri Djavadyan [Mon, 14 Nov 2016 13:17:06 +0000 (02:17 +1300)] 
Bug 3533: Cache still valid after HTTP/1.1 303 See Other

RFC7231 does not mention 303 response as non-cacheable.
So, assuming that means it *is* cacheable.

7 years agoSourceFormat Enforcement
Source Maintenance [Sat, 12 Nov 2016 12:12:17 +0000 (12:12 +0000)] 
SourceFormat Enforcement

7 years agoImprove JoinContainerToSBuf
Francesco Chemolli [Sat, 12 Nov 2016 10:37:07 +0000 (10:37 +0000)] 
Improve JoinContainerToSBuf

7 years agoReady for testing
Francesco Chemolli [Fri, 11 Nov 2016 22:43:43 +0000 (22:43 +0000)] 
Ready for testing

7 years agoFix 'ftpSendEPRT defined but not used' compile error after patch r14936
Christos Tsantilas [Fri, 11 Nov 2016 16:26:54 +0000 (18:26 +0200)] 
Fix 'ftpSendEPRT defined but not used' compile error after patch r14936

7 years agoSegfault via Ftp::Client::readControlReply.
Christos Tsantilas [Fri, 11 Nov 2016 16:14:16 +0000 (18:14 +0200)] 
Segfault via Ftp::Client::readControlReply.

Added nil dereference checks for Ftp::Client::ctrl.conn, including:
- Ftp::Client::handlePasvReply() and handleEpsvReply() that dereference
  ctrl.conn in DBG_IMPORTANT messages.
- Many functions inside FtpClient.cc and FtpGateway.cc files.

TODO: We need to find a better way to handle nil ctrl.conn. It is only
a matter of time when we forget to add another dereference check or
discover a place we missed during this change.

Also disabled forwarding of EPRT and PORT commands to origin servers.
Squid support for those commands is broken and their forwarding may
cause segfaults (bug #4004). Active FTP is still supported, of course.

This is a Measurement Factory project

7 years agoFix some missing returns after rev.14934
Amos Jeffries [Fri, 11 Nov 2016 04:28:06 +0000 (17:28 +1300)] 
Fix some missing returns after rev.14934

7 years agoBug 3379: Combination of If-Match and a Cache Hit result in TCP Connection Failure
Garri Djavadyan [Thu, 10 Nov 2016 15:40:47 +0000 (04:40 +1300)] 
Bug 3379: Combination of If-Match and a Cache Hit result in TCP Connection Failure

7 years agoDocs: add Release Notes template for Squid-5
Amos Jeffries [Thu, 10 Nov 2016 12:25:53 +0000 (01:25 +1300)] 
Docs: add Release Notes template for Squid-5

7 years agoBranch 5.0.0
Source Maintenance [Wed, 9 Nov 2016 13:36:29 +0000 (13:36 +0000)] 
Branch 5.0.0

7 years agoTLS: use Security::SessionPointer for helper state maintenance
Amos Jeffries [Tue, 8 Nov 2016 06:37:32 +0000 (19:37 +1300)] 
TLS: use Security::SessionPointer for helper state maintenance

7 years agoImprove debugs warnings when loading signing certs fails
Amos Jeffries [Tue, 8 Nov 2016 06:34:59 +0000 (19:34 +1300)] 
Improve debugs warnings when loading signing certs fails

7 years agoMake key= before cert= a fatal error instead of quietly hiding the issue
Amos Jeffries [Tue, 8 Nov 2016 06:33:38 +0000 (19:33 +1300)] 
Make key= before cert= a fatal error instead of quietly hiding the issue

7 years agoBug 4599 pt1: initial support for OpenSSL v1.1
Amos Jeffries [Mon, 7 Nov 2016 10:49:37 +0000 (23:49 +1300)] 
Bug 4599 pt1: initial support for OpenSSL v1.1

Converts some CRYPTO_add(..., CRYPTO_LOCK_X509) calls with portability
wrapper for X509_up_ref(). Just the calls which are in code not yet using
Security::CertPointer.

7 years agoBug 4610 pt2: compile errors on Solaris 11.3 with Oracle Studio 12.5
Amos Jeffries [Mon, 7 Nov 2016 07:37:33 +0000 (20:37 +1300)] 
Bug 4610 pt2: compile errors on Solaris 11.3 with Oracle Studio 12.5

7 years agoCleanup: remove needless get() in libsecurity
Amos Jeffries [Mon, 7 Nov 2016 06:15:04 +0000 (19:15 +1300)] 
Cleanup: remove needless get() in libsecurity

7 years agoCleanup: remove unused Config::ext_methods
Amos Jeffries [Mon, 7 Nov 2016 05:24:26 +0000 (18:24 +1300)] 
Cleanup: remove unused Config::ext_methods

7 years agoCleanup: remove unused wordlist API functions
Amos Jeffries [Mon, 7 Nov 2016 02:41:30 +0000 (15:41 +1300)] 
Cleanup: remove unused wordlist API functions

7 years agosecurity_file_certgen: remove useless get()
Amos Jeffries [Sun, 6 Nov 2016 15:57:02 +0000 (04:57 +1300)] 
security_file_certgen: remove useless get()

7 years agoUse Security::CertPointer in ACLServerCertificateStrategy
Amos Jeffries [Sun, 6 Nov 2016 15:54:33 +0000 (04:54 +1300)] 
Use Security::CertPointer in ACLServerCertificateStrategy

7 years agoFix missing return in HardFun functor template
Amos Jeffries [Sat, 5 Nov 2016 09:42:15 +0000 (22:42 +1300)] 
Fix missing return in HardFun functor template

7 years agoSourceFormat Enforcement
Source Maintenance [Sat, 5 Nov 2016 00:12:14 +0000 (00:12 +0000)] 
SourceFormat Enforcement

7 years agoDo not hide an already constant SBuf::id or expose its internals.
Alex Rousskov [Fri, 4 Nov 2016 22:05:07 +0000 (16:05 -0600)] 
Do not hide an already constant SBuf::id or expose its internals.

7 years agoImproved testAppendSBuf to actually test SBuf::append() optimization.
Alex Rousskov [Fri, 4 Nov 2016 22:04:34 +0000 (16:04 -0600)] 
Improved testAppendSBuf to actually test SBuf::append() optimization.

... rather than to test SBuf::id preservation across assignments
[currently used by that optimization].

Trunk r14911 talks about bitwise object copy but making sure that SBuf
has a working assignment operator is an issue unrelated to append() and
its optimization. Besides, it is not really the prohibited by C++
bitwise copy that we might worry about but the default member-wise
assignment that we may forget to customize.

7 years agoHonor SBufReservationRequirements::minSize regardless of idealSize.
Alex Rousskov [Fri, 4 Nov 2016 21:14:54 +0000 (15:14 -0600)] 
Honor SBufReservationRequirements::minSize regardless of idealSize.

In a fully specified SBufReservationRequirements, idealSize would
naturally match or exceed minSize. However, the idealSize default value
(zero) may not. We should honor minSize regardless of idealSize, just as
the API documentation promises to do.

No runtime changes expected right now because the only existing user of
SBufReservationRequirements sets .idealSize to CLIENT_REQ_BUF_SZ (4096)
and .minSize to 1024.

7 years agoSourceFormat Enforcement
Source Maintenance [Fri, 4 Nov 2016 18:12:20 +0000 (18:12 +0000)] 
SourceFormat Enforcement

7 years agoMinor polishing fixes inside tunnelPeerSelectComplete function
Christos Tsantilas [Fri, 4 Nov 2016 17:05:48 +0000 (19:05 +0200)] 
Minor polishing fixes inside tunnelPeerSelectComplete function

7 years agoFwdState::connectStart() cleanup
Christos Tsantilas [Fri, 4 Nov 2016 16:48:53 +0000 (18:48 +0200)] 
FwdState::connectStart() cleanup

 The pinned_connection->stopPinnedConnectionMonitoring() call does not needed,
it is already called from inside pinned_connection->borrowPinnedConnection
called two lines before.

This is a Measurement Factory project

7 years agoSupport tunneling of bumped non-HTTP traffic. Other SslBump fixes.
Christos Tsantilas [Fri, 4 Nov 2016 16:47:34 +0000 (18:47 +0200)] 
Support tunneling of bumped non-HTTP traffic. Other SslBump fixes.

Use case: Skype groups appear to use TLS-encrypted MSNP protocol instead
of HTTPS. This change allows Squid admins using SslBump to tunnel Skype
groups and similar non-HTTP traffic bytes via "on_unsupported_protocol
tunnel all". Previously, the combination resulted in encrypted HTTP 400
(Bad Request) messages sent to the client (that does not speak HTTP).

Also this patch:
 * fixes bug 4529: !EBIT_TEST(entry->flags, ENTRY_FWD_HDR_WAIT)
   assertion in FwdState.cc.

 * when splicing transparent connections during SslBump step1, avoid
   access-logging an extra record and log %ssl::bump_mode as the expected
   "splice" not "none".

 * handles an XXX comment inside clientTunnelOnError for possible memory
   leak of client streams related objects

 * fixes TunnelStateData logging in the case of splicing after peek.

This is a Measurement Factory project.

7 years agoOptimize appending to empty SBufs, a common use case.
Alex Rousskov [Thu, 3 Nov 2016 13:57:02 +0000 (02:57 +1300)] 
Optimize appending to empty SBufs, a common use case.

Most appends start with an empty buffer. Some append only once. There
is no reason to allocate new memory for that first append or force the
appender to write code to optimize that first append.

Why also check that SBuf has never been configured or altered then? To
preserve pre-allocated SBufs, such as those [ab]used as I/O buffers.

7 years agoTests: improve SBuf::append tests
Amos Jeffries [Thu, 3 Nov 2016 12:51:17 +0000 (01:51 +1300)] 
Tests: improve SBuf::append tests

This adds tests to verify append properly updates
the content of destination SBuf without altering
other critical internal fields (ie no bitwise copy)

7 years agoFix spelling for digest nonce cache maintenance event
Garri Djavadyan [Thu, 3 Nov 2016 03:18:09 +0000 (16:18 +1300)] 
Fix spelling for digest nonce cache maintenance event

7 years agoCleanup: use SBufList for /etc/hosts parsing
Amos Jeffries [Wed, 2 Nov 2016 04:37:37 +0000 (17:37 +1300)] 
Cleanup: use SBufList for /etc/hosts parsing

Remove one more use of wordlist in favour of SBufList

Also, fixes bug in layer-02-maximus configure options

7 years agoTests: add regression tests for cachemgr_passwd parsing
Amos Jeffries [Tue, 1 Nov 2016 13:00:30 +0000 (02:00 +1300)] 
Tests: add regression tests for cachemgr_passwd parsing

7 years agoCleanup: replace cachemgr_passwd with SBufList
Amos Jeffries [Tue, 1 Nov 2016 01:41:39 +0000 (14:41 +1300)] 
Cleanup: replace cachemgr_passwd with SBufList

Remove one more use of wordlist in favour of SBufList

Also, updates the debug warning during config parse to
use the quieter PARSE_NOTE macro.

7 years agoDocs: fix spelling errors in purge.1 manpage
Amos Jeffries [Mon, 31 Oct 2016 02:20:18 +0000 (15:20 +1300)] 
Docs: fix spelling errors in purge.1 manpage

7 years agoDocs: add mention of generate-host-certificates default change
Amos Jeffries [Mon, 31 Oct 2016 02:13:35 +0000 (15:13 +1300)] 
Docs: add mention of generate-host-certificates default change

7 years ago4.0.16 SQUID_4_0_16
Amos Jeffries [Sun, 30 Oct 2016 12:24:09 +0000 (01:24 +1300)] 
4.0.16

7 years agoBug 4627: fix generate-host-certificates and dynamic_cert_mem_cache_size defaults
Amos Jeffries [Sun, 30 Oct 2016 12:00:00 +0000 (01:00 +1300)] 
Bug 4627: fix generate-host-certificates and dynamic_cert_mem_cache_size defaults

For Squid-4 and later make these options actually do what has been documented.
Which is to generate by default with a 4MB cache.

7 years agoFix debug message in ACLChecklist::bannedAction()
Garri Djavadyan [Sun, 30 Oct 2016 06:38:32 +0000 (19:38 +1300)] 
Fix debug message in ACLChecklist::bannedAction()

7 years agoSourceFormat Enforcement
Source Maintenance [Fri, 28 Oct 2016 12:12:05 +0000 (12:12 +0000)] 
SourceFormat Enforcement

7 years agoBug 4567: Strange IPv6 shown in access.log
Amos Jeffries [Fri, 28 Oct 2016 11:55:44 +0000 (00:55 +1300)] 
Bug 4567: Strange IPv6 shown in access.log

7 years agoFix GCC 4.9 build after rev.14893
Amos Jeffries [Fri, 28 Oct 2016 08:41:57 +0000 (21:41 +1300)] 
Fix GCC 4.9 build after rev.14893

GCC 4.9 does not support some corner cases of C++11 syntax. In this case
when it is presented with default nulptr initialization of function
pointers it gets confused with 'pure virtual' initialization:

    error: invalid pure specifier (only '= 0' is allowed) before ';' token

7 years agossl::server_name ACL badly broken since inception (trunk r14008).
Christos Tsantilas [Fri, 28 Oct 2016 08:31:53 +0000 (11:31 +0300)] 
ssl::server_name ACL badly broken since inception (trunk r14008).

The original server_name code mishandled all SNI checks and some rare
host checks:

* The SNI-derived value was pointing to an already freed memory storage.
* Missing host-derived values were not detected (host() is never nil).
* Mismatches were re-checked with an undocumented "none" value
  instead of being treated as mismatches.

Same for ssl::server_name_regex.

Also set SNI for more server-first and client-first transactions.

This is a Measurement Factory project.

7 years agoHTTP: initial support for Cache-Control:immutable
Amos Jeffries [Fri, 28 Oct 2016 07:56:00 +0000 (20:56 +1300)] 
HTTP: initial support for Cache-Control:immutable

The 'immutable' cache control is a proposed standardization of
behaviour equivalent to the refresh_pattern 'ignore-reload' option.
Reducing latency delays from revalidation when an object is known not
to be updated until it expires.

When a server emits it on responses a recipient cache is expected to
treat the response as not requiring any revalidation until it becomes
stale. For the duration of its freshness period it may be used as-is
to respond to client requests - including reload (CC:max-age=0)
requests.

This initial code does not yet support preventing IMS conditional
requests behaviour when the 'immutable' signal is received.

Note that CC:no-cache in requests, and If-None-Match ETag based
conditionals can still make an 'immutable' response be irrelevant to
a particular client request. So server contact is not completely
prevented.

Use 'immutable' option in preference over the refresh_pattern
'ignore-reload' in order to track whether that override is still
relevant.

7 years agoCleanup: Remove custom StrList/link_list implementation
Amos Jeffries [Fri, 28 Oct 2016 01:37:51 +0000 (14:37 +1300)] 
Cleanup: Remove custom StrList/link_list implementation

Use FIFO queue STL container instead.

7 years agoSourceFormat Enforcement
Source Maintenance [Thu, 27 Oct 2016 12:12:18 +0000 (12:12 +0000)] 
SourceFormat Enforcement

7 years agoRefactor acl/RegexData to use SBufList in place of wordlist
Francesco Chemolli [Thu, 27 Oct 2016 07:08:28 +0000 (08:08 +0100)] 
Refactor acl/RegexData to use SBufList in place of wordlist

7 years agoMerge from trunk
Francesco Chemolli [Thu, 27 Oct 2016 07:05:49 +0000 (08:05 +0100)] 
Merge from trunk

7 years agoClarify some variable names, use const-ref in iterations when possible
Francesco Chemolli [Thu, 27 Oct 2016 07:03:21 +0000 (08:03 +0100)] 
Clarify some variable names, use const-ref in iterations when possible

7 years agoClean debug up, use emplace_back in place of push_back in several cases
Francesco Chemolli [Wed, 26 Oct 2016 23:17:42 +0000 (00:17 +0100)] 
Clean debug up, use emplace_back in place of push_back in several cases

7 years agoDo not include worlist.h
Francesco Chemolli [Wed, 26 Oct 2016 20:11:34 +0000 (21:11 +0100)] 
Do not include worlist.h

7 years agoRefactor wordlist to SBufList in ACLRegexData
Francesco Chemolli [Wed, 26 Oct 2016 20:07:59 +0000 (21:07 +0100)] 
Refactor wordlist to SBufList in ACLRegexData

7 years agoCleanup: use C++11 initializers for some DiskThreads classes
Amos Jeffries [Wed, 26 Oct 2016 18:17:55 +0000 (07:17 +1300)] 
Cleanup: use C++11 initializers for some DiskThreads classes

Fixes AIOCounts wrong values due to uninitialized struct.

Fixes wrong pointer initialization in squidaio_ctrl_t.

7 years agoCopyright: add some missing blurbs and contributor details
Amos Jeffries [Wed, 26 Oct 2016 11:46:52 +0000 (00:46 +1300)] 
Copyright: add some missing blurbs and contributor details

7 years agoHTTP/1.1: make Vary:* objects cacheable
Amos Jeffries [Tue, 25 Oct 2016 08:03:32 +0000 (21:03 +1300)] 
HTTP/1.1: make Vary:* objects cacheable

Under new clauses from RFC 7231 section 7.1.4 and HTTP response
containing header Vary:* (wifcard variant) can be cached, but
requires revalidation with server before each use.

Use the new mandatory revalidation flags to allow storing of any
wildcard Vary:* response.

Note that responses with headers like Vary:A,B,C,* are equivalent
to Vary:*. The cache key string for these objects is normalized.

7 years agoCleanup: convert AclDenyInfoList and AclNameList to MEMPROXY_CLASS
Amos Jeffries [Mon, 24 Oct 2016 12:46:35 +0000 (01:46 +1300)] 
Cleanup: convert AclDenyInfoList and AclNameList to MEMPROXY_CLASS

Use the C++ new/delete operators provided by MEMPROXY_CLASS and
associated as-needed pool creation instead of C Alloc/Free
functions and pre-initialized pool.

Remove now unused MEM_ACL_DENY_INFO_LIST and MEM_ACL_NAME_LIST
memory pools.

Remove apparently unused DenyInfoList global.

Fixes a memory leak on shutdown/reconfigure when
aclDestroyDenyInfoList() frees a list of AclDenyInfoList object
but not the AclNameList objects attached to them.

Fixes a memory leak when reconfigure frees a list of AclDenyInfoList
objects but not the URL/page-name strings attached to them.

7 years agoFix bug introduced by r14838.
Christos Tsantilas [Mon, 24 Oct 2016 08:31:40 +0000 (11:31 +0300)] 
Fix bug introduced by r14838.

Squid crashed because HttpMsg::body_pipe was used without check that it
was initialized. The message lacks body pipe when it has no body or
empty body.

7 years agoFix external_acl_type default children documentations
Amos Jeffries [Mon, 24 Oct 2016 06:46:02 +0000 (19:46 +1300)] 
Fix external_acl_type default children documentations

The max children has always been 5, not 20.

Also, make mgr:config report dumper actually hide only the real default
values. (sync with helper/ChildConfig.cc defaults)

7 years agoCleanup: use new/delete allocation from netdbEntry class
Amos Jeffries [Wed, 19 Oct 2016 21:14:13 +0000 (10:14 +1300)] 
Cleanup: use new/delete allocation from netdbEntry class

Use the C++ new/delete operators provided by MEMPRXY_CLASS and
associated as-needed pool creation instead of C Alloc/Free
functions and pre-initialized pool.

Use class initializers for members to demonstrate mixed default
and explicit member initialization.

Add unit test for the new constructor logic.

7 years agoAvoid segfaults when we lack the server name for certificate validator.
Christos Tsantilas [Mon, 17 Oct 2016 11:02:18 +0000 (14:02 +0300)] 
Avoid segfaults when we lack the server name for certificate validator.

Squid could crash when transparently proxying a TLS client that does not
send SNI because the code composing certificate validator request
assumed that the intended server name is always available. There could
have been other use cases leading to the same kind of crash.

Fixed Squid sends an empty domain name to the certificate validator when
SSL_ex_data[ssl_ex_index_server] does not exist.

This is a Measurement Factory project.

7 years agoBug 4620: NetBSD build error with --enable-ipf-transparent
Takahiro Kambe [Mon, 17 Oct 2016 04:10:26 +0000 (17:10 +1300)] 
Bug 4620: NetBSD build error with --enable-ipf-transparent

On NetBSD sys/param.h must be included before netinet/ip_compat.h

7 years agoFixed r14838 build with eCAP but whithout ICAP support.
Alex Rousskov [Sat, 15 Oct 2016 02:31:11 +0000 (20:31 -0600)] 
Fixed r14838 build with eCAP but whithout ICAP support.

That is, when ./configured with --enable-ecap --disable-icap-client.

AccessLogEntry::icap requires ICAP_CLIENT, not just USE_ADAPTATION.

7 years agoTests: make bootstrap testing display branch details
Amos Jeffries [Thu, 13 Oct 2016 03:50:37 +0000 (16:50 +1300)] 
Tests: make bootstrap testing display branch details

7 years agoCleanup: convert htcpSpecifier to Refcountable class
Amos Jeffries [Wed, 12 Oct 2016 09:25:08 +0000 (22:25 +1300)] 
Cleanup: convert htcpSpecifier to Refcountable class

Use refcounting Pointer to manage htcpSpecifier object deletion
instead of explicit Free function calls.

Use HttpRequestPointer for members to ensure proper refcounting
for those as well. Combined with C++11 default member initialization
this permits default constructors and destructors to be used.

7 years ago4.0.15 SQUID_4_0_15
Amos Jeffries [Sun, 9 Oct 2016 18:52:53 +0000 (07:52 +1300)] 
4.0.15

7 years agoPrep for 4.0.15 and 3.5.22
Amos Jeffries [Sun, 9 Oct 2016 18:14:18 +0000 (07:14 +1300)] 
Prep for 4.0.15 and 3.5.22

7 years agoHTTP: MUST ignore a [revalidation] response with an older Date header.
Eduard Bagdasaryan [Sat, 8 Oct 2016 22:19:44 +0000 (11:19 +1300)] 
HTTP: MUST ignore a [revalidation] response with an older Date header.

Before this patch, Squid violated the RFC 7234 section 4 MUST
requirement: "When more than one suitable response is stored, a cache
MUST use the most recent response (as determined by the Date header
field)." This problem may be damaging in cache hierarchies where
parent caches may have different responses. Trusting the older response
may lead to excessive IMS requests, cache thrashing and other problems.

7 years agoOptimized/simplified buffering: Appending nothing is always possible.
Alex Rousskov [Fri, 7 Oct 2016 21:18:05 +0000 (15:18 -0600)] 
Optimized/simplified buffering: Appending nothing is always possible.

This change avoids CoW when appending an empty buffer to MemBlob or
SBuf, making "if !empty then append()" caller complications unnecessary.

7 years agoDo not leak Downloader-related objects.
Christos Tsantilas [Fri, 7 Oct 2016 08:16:42 +0000 (11:16 +0300)] 
Do not leak Downloader-related objects.

The downloadFinished() method was responsible for the job clean up, but
that asynchronous method is not called when the Downloader job quits
before the call can be fired. This early termination happens when, for
example, the job finishes while still inside the start() method (e.g., a
memory hit with no async ACLs to check). It also happens if an exception
is thrown while the job is running under async call protections.

Ensure the cleanup happens regardless of the job path to finish.

This is a Measurement Factory project.

7 years agoFix known "concurrent c_str()s" violations of SBuf API.
Alex Rousskov [Thu, 6 Oct 2016 22:05:50 +0000 (16:05 -0600)] 
Fix known "concurrent c_str()s" violations of SBuf API.

The second c_str() call destroys the buffer still being used by the
first c_str() result, leading to many "Invalid read of size N" errors.

IMO, we must instead fix SBuf to make similar violations unlikely, but
there is currently no squid-dev consensus on whether and how to do that.
See "[RFC] Support concurrent SBuf::c_str() calls" thread on squid-dev.

7 years agoFix header name mismatching after rev.14870
Amos Jeffries [Thu, 6 Oct 2016 21:02:32 +0000 (10:02 +1300)] 
Fix header name mismatching after rev.14870

When a mime header set contains two custom headers and one
name is the prefix for the other the name lookup using a
fixed length for String comparison can wrongly match the
longer header as being equal to the shorter one, since only
the identical prefix portion is compared.

To avoid this we must check that the lengths are also matching.

This also improves performance very slightly as the common
case for custom headers is to have an "X-" prefix which is
slower to compare than total length. Headers having same
length and same prefix is quite rare.

7 years agoHide OpenSSL tricks from Valgrind far-reaching initialization errors.
Alex Rousskov [Thu, 6 Oct 2016 00:05:38 +0000 (18:05 -0600)] 
Hide OpenSSL tricks from Valgrind far-reaching initialization errors.

This change has no effect unless ./configured --with-valgrind-debug.

OpenSSL, including its Assembly code, contains many optimizations and
timing defenses that Valgrind misinterprets as uninitialized value
usage. Most of those tricks can be disabled by #defining PURIFY when
building OpenSSL, but some are not protected with PURIFY and most
OpenSSL libraries are (and should be) built without that #define.

To make matters worse, once Valgrind misdetects uninitialized memory, it
will complain about every usage of that memory. Those complaints create
a lot of noise, complicate triage, and effectively mask true bugs.
AFAICT, they cannot be suppressed by listing the source of that memory.

For example, this OpenSSL Assembly trick:
    Uninitialised value was created by a stack allocation
       at 0x556C2F7: aesni_cbc_encrypt (aesni-x86_64.s:2081)

Triggers many false errors like this one:
    Conditional jump or move depends on uninitialised value(s)
       by 0x750838: Debug::Finish()
       by 0x942E68: Http::One::ResponseParser::parse(SBuf const&)
       ...

This change marks OpenSSL-returned decrypted bytes as initialized. This
might miss some true OpenSSL bugs, but we should focus on Squid bugs.

7 years agoDo not leak serialized metadata when updating rock-stored headers.
Alex Rousskov [Wed, 5 Oct 2016 22:42:54 +0000 (16:42 -0600)] 
Do not leak serialized metadata when updating rock-stored headers.

I added this valgrind-exposed regression in r14584 (Bug 7 fix).

7 years agoBug 4610: compile errors on Solaris 11.3 with Oracle Studio 12.5
Stefan Kruger [Wed, 5 Oct 2016 14:24:30 +0000 (03:24 +1300)] 
Bug 4610: compile errors on Solaris 11.3 with Oracle Studio 12.5

Note: this patch is incomplete. Additional changes are required
to fully build Squid-4. see the bug report for details.

7 years agoAvoid segfaults when debugging section 4 at level 9.
Alex Rousskov [Wed, 5 Oct 2016 04:34:38 +0000 (22:34 -0600)] 
Avoid segfaults when debugging section 4 at level 9.

The bug was probably added in r11496. It was exposed by Valgrind's
"Conditional jump or move depends on uninitialised value(s)" error.

7 years agoFixed "Invalid read of size 1" bug in non-standard HTTP header search.
Alex Rousskov [Wed, 5 Oct 2016 04:24:28 +0000 (22:24 -0600)] 
Fixed "Invalid read of size 1" bug in non-standard HTTP header search.

Valgrind error report:
Invalid read of size 1
   at strcasecmp
   by String::caseCmp(char const*) const
   by HttpHeader::getByNameIfPresent(char const*, int, String&)
   by HttpHeader::getByNameIfPresent(SBuf const&, String&)
   by HttpHeader::getByName(SBuf const&) const
   by assembleVaryKey(String&, SBuf&, HttpRequest const&)
   ...

The bug is probably not specific to Vary assembly and may have been
present since r14285 (gperf perfect hash refactoring).

7 years agoDo not leak X509s found by SslBump in Server Hellos since r14769.
Alex Rousskov [Wed, 5 Oct 2016 04:10:26 +0000 (22:10 -0600)] 
Do not leak X509s found by SslBump in Server Hellos since r14769.

ParseCertificate() overlocked X509 structures returned by d2i_X509().

Also made ParseCertificate() exception-safe.

7 years agoQA: Fix unit tests after rev.14866
Amos Jeffries [Tue, 4 Oct 2016 23:56:33 +0000 (12:56 +1300)] 
QA: Fix unit tests after rev.14866

7 years agoSourceFormat Enforcement
Source Maintenance [Tue, 4 Oct 2016 18:12:15 +0000 (18:12 +0000)] 
SourceFormat Enforcement

7 years agoHTTP/1.1: handle syntactically valid requests with unsupported HTTP versions
Eduard Bagdasaryan [Tue, 4 Oct 2016 14:25:15 +0000 (03:25 +1300)] 
HTTP/1.1: handle syntactically valid requests with unsupported HTTP versions

Before this change, when a syntactically valid HTTP/1 request indicated
HTTP major version 2, Squid mangled and forwarded the request as an
HTTP/1 message. Since Squid does not and cannot correctly interpret an
HTTP/1 request using HTTP/2 rules, returning an error and closing the
connection appears to be the only correct action possible.

If a version label matches the "HTTP/" 1*DIGIT "." 1*DIGIT pattern from
RFC 2616 it should not be handled as 0.9 syntax. All unacceptible
versions that begin with "HTTP/" should get a 505.

To be compliant with RFC 7230 as well:

- versions 1.2 thru 1.9 accept and handle normally. That is a SHOULD
  requirement in RFC 7230 section 2.6 final paragraph.

- other single-digit versions should get the 505 error.

 - versions with multiple digits should get the 505 error.

7 years agoBug 4302 pt2: IPFilter v5 transparent interception
Amos Jeffries [Tue, 4 Oct 2016 12:39:27 +0000 (01:39 +1300)] 
Bug 4302 pt2: IPFilter v5 transparent interception

7 years agoRemove unused SBuf::Scanf method
Amos Jeffries [Mon, 3 Oct 2016 20:06:25 +0000 (09:06 +1300)] 
Remove unused SBuf::Scanf method

This method is unused and requires the risky c_str() API to operate.

Code wanting to parse an SBuf should use a Tokenizer or Parser instead.

7 years agoConvert DNS shutdown to use a registered runner
Amos Jeffries [Mon, 3 Oct 2016 04:33:08 +0000 (17:33 +1300)] 
Convert DNS shutdown to use a registered runner

This patch adds a Runner to manage the DNS component state on shutdown
(and the matching reconfigure port closures). The actions taken on
reconfigure and shutdown are not changed, just their timing.

Visible differences are now that Squid logs when DNS ports are being
closed (and the reason), also that the still-open FD table report no
longer lists the DNS listening FD as being open on shutdown when
comm_exit() is called and forces all fd_table entries to close.

NP: I have not moved the Dns::Init() operations to the runner at this
stage because it needs some deeper analysis and redesign as to which
Squid processes DNS is enabled/initialized. Currently everything from
coordinator to Diskers enable the internal-DNS state.

One BUG found but not fixed:
 DNS sockets being closed during reconfigure produces a race between
 any already active connections (or ones received between closing DNS
 sockets and server listening sockets) and the reconfigure completing
 (Runner syncConfig() being run). Transactions which loose this race
 will produce DNS timeouts (or whatever the caller set) as the queries
 never get queued to be re-tried after the DNS sockets are re-opened.

7 years agoCleanup: polish dns/forward.h
Amos Jeffries [Sat, 1 Oct 2016 12:02:44 +0000 (01:02 +1300)] 
Cleanup: polish dns/forward.h

7 years agoCleanup: polish Config2 using C++ features
Amos Jeffries [Fri, 30 Sep 2016 19:15:17 +0000 (08:15 +1300)] 
Cleanup: polish Config2 using C++ features

We now seem to have had several patches successfully use members
declared with default values (C++11 feature) and/or with the
"*this = Foo();" shortcut for a reset/clear method.

So I think we can start using these to replace old C-style
initialization and clear() functions.

This patch begins by replacing the Config2 use of memset(). I for one am
constantly mistaking which of the Config objects has memset() applied to
it at the global level when reconfigure happens. Now we do not need to
care, each object handles its own clearing one way or another.