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

Jump to bottom

[XrdTls] The start of the CRLRefresh thread is now triggered in the constructor of the XrdTlsContext class #1791

Merged
merged 2 commits into from
Sep 29, 2022
Merged

[XrdTls] The start of the CRLRefresh thread is now triggered in the constructor of the XrdTlsContext class #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19038b5
[XrdTls] The start of the CRLRefresh thread is now triggered in the c…
ccaffy Sep 29, 2022
b180a24
[XrdTlsContext] Remove the flag to start the CRL refresh thread from …
ccaffy Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/XrdHttp/XrdHttpProtocol.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,11 +1133,6 @@ int XrdHttpProtocol::Config(const char *ConfigFN, XrdOucEnv *myEnv) {
eDest.Say("------ HTTPS initialization ", how);
if (NoGo) return NoGo;

// Turn on the refreshing
//
if (!NoGo && xrdctx->x509Verify() && !(xrdctx->SetCrlRefresh()))
eDest.Say("Config warning: CRL refreshing could not be enabled!");

// We can now load all the external handlers
//
if (LoadExtHandler(extHIVec, ConfigFN, *myEnv)) return 1;
Expand Down Expand Up @@ -1690,7 +1685,7 @@ bool XrdHttpProtocol::InitTLS() {

std::string eMsg;
uint64_t opts = XrdTlsContext::servr | XrdTlsContext::logVF |
XrdTlsContext::artON;
XrdTlsContext::artON | XrdTlsContext::scRefr;

// Create a new TLS context
//
Expand Down
15 changes: 12 additions & 3 deletions src/XrdTls/XrdTlsContext.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,8 +724,11 @@ XrdTlsContext::XrdTlsContext(const char *cert, const char *key,
if (SSL_CTX_check_private_key(pImpl->ctx) != 1 )
FATAL_SSL("Unable to create TLS context; cert-key mismatch.");

// All went well, so keep the context.
// All went well, start the CRL refresh thread and keep the context.
//
if(opts & scRefr) {
SetCrlRefresh();
}
ctx_tracker.Keep();
}

Expand All @@ -749,7 +752,7 @@ XrdTlsContext::~XrdTlsContext()
/* C l o n e */
/******************************************************************************/

XrdTlsContext *XrdTlsContext::Clone(bool full)
XrdTlsContext *XrdTlsContext::Clone(bool full,bool startCRLRefresh)
{
XrdTlsContext::CTX_Params &my = pImpl->Parm;
const char *cert = (my.cert.size() ? my.cert.c_str() : 0);
Expand All @@ -763,7 +766,13 @@ XrdTlsContext *XrdTlsContext::Clone(bool full)

// Cloning simply means getting a object with the old parameters.
//
XrdTlsContext *xtc = new XrdTlsContext(cert, pkey, caD, caF, my.opts);
uint64_t myOpts = my.opts;
if(startCRLRefresh){
myOpts |= XrdTlsContext::scRefr;
} else {
myOpts &= ~XrdTlsContext::scRefr;
}
XrdTlsContext *xtc = new XrdTlsContext(cert, pkey, caD, caF, myOpts,nullptr);

// Verify that the context was built
//
Expand Down
3 changes: 2 additions & 1 deletion src/XrdTls/XrdTlsContext.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public:
//! the session cache is set to off with no identifier.
//------------------------------------------------------------------------

XrdTlsContext *Clone(bool full=true);
XrdTlsContext *Clone(bool full=true, bool startCRLRefresh = false);

//------------------------------------------------------------------------
//! Get the underlying context (should not be used).
Expand Down Expand Up @@ -130,6 +130,7 @@ static const int scNone = 0x00000000; //!< Do not change any option settings
static const int scOff = 0x00010000; //!< Turn off cache
static const int scSrvr = 0x00020000; //!< Turn on cache server mode (default)
static const int scClnt = 0x00040000; //!< Turn on cache client mode
static const int scRefr = 0x20000000; //!< Turn on the CRL refresh thread
static const int scKeep = 0x40000000; //!< Info: TLS-controlled flush disabled
static const int scIdErr= 0x80000000; //!< Info: Id not set, is too long
static const int scFMax = 0x00007fff; //!< Maximum flush interval in seconds
Expand Down
2 changes: 1 addition & 1 deletion src/XrdXrootd/XrdXrootdConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ int XrdXrootdProtocol::Config(const char *ConfigFN)
// context must be of the non-verified kind as we don't accept certs.
//
if (!NoGo && tlsCtx)
{tlsCtx = tlsCtx->Clone(false);
{tlsCtx = tlsCtx->Clone(false,true);
if (!tlsCtx)
{eDest.Say("Config failure: unable to setup TLS for protocol!");
NoGo = 1;
Expand Down