Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 5390: Non-POD SquidConfig::ssl_client::sslContext exit crash #273

Closed
wants to merge 4 commits into from
Closed

Bug 5390: Non-POD SquidConfig::ssl_client::sslContext exit crash #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6f30ce
Bug 5390: Non-POD SquidConfig::ssl_client::sslContext exit crash
eduard-bagdasaryan Nov 17, 2024
03fa6e2
Refactored initialization and simplified
eduard-bagdasaryan Nov 20, 2024
6d4463f
Keep delete/assignment paired
eduard-bagdasaryan Nov 20, 2024
dc66a68
Marked Config.ssl_client.sslContext as obsolete/internal
eduard-bagdasaryan Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/SquidConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,8 @@ class SquidConfig
struct {
Security::FuturePeerContext *defaultPeerContext;
// TODO: Remove when FuturePeerContext above becomes PeerContext
Security::ContextPointer sslContext;
/// \deprecated Legacy storage. Use defaultPeerContext instead.
Security::ContextPointer *sslContext_;
#if USE_OPENSSL
char *foreignIntermediateCertsPath;
acl_access *cert_error;
Expand Down
13 changes: 8 additions & 5 deletions src/cache_cf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,18 +959,20 @@ configDoConfigure(void)

if (Security::ProxyOutgoingConfig.encryptTransport) {
debugs(3, 2, "initializing https:// proxy context");
Config.ssl_client.sslContext = Security::ProxyOutgoingConfig.createClientContext(false);
if (!Config.ssl_client.sslContext) {

const auto rawSslContext = Security::ProxyOutgoingConfig.createClientContext(false);
Config.ssl_client.sslContext_ = rawSslContext ? new Security::ContextPointer(rawSslContext) : nullptr;
if (!Config.ssl_client.sslContext_) {
#if USE_OPENSSL
fatal("ERROR: Could not initialize https:// proxy context");
#else
debugs(3, DBG_IMPORTANT, "ERROR: proxying https:// currently still requires --with-openssl");
#endif
}
#if USE_OPENSSL
Ssl::useSquidUntrusted(Config.ssl_client.sslContext.get());
Ssl::useSquidUntrusted(Config.ssl_client.sslContext_->get());
#endif
Config.ssl_client.defaultPeerContext = new Security::FuturePeerContext(Security::ProxyOutgoingConfig, Config.ssl_client.sslContext);
Config.ssl_client.defaultPeerContext = new Security::FuturePeerContext(Security::ProxyOutgoingConfig, *Config.ssl_client.sslContext_);
}

for (const auto &p: CurrentCachePeers()) {
Expand Down Expand Up @@ -3913,7 +3915,8 @@ configFreeMemory(void)
Dns::ResolveClientAddressesAsap = false;
delete Config.ssl_client.defaultPeerContext;
Config.ssl_client.defaultPeerContext = nullptr;
Config.ssl_client.sslContext.reset();
delete Config.ssl_client.sslContext_;
Config.ssl_client.sslContext_ = nullptr;
#if USE_OPENSSL
Ssl::unloadSquidUntrusted();
#endif
Expand Down