Skip to content

Add a shutdown handler to the certifier plugin #9795

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

Closed
bneradt wants to merge 1 commit into from
Closed

Add a shutdown handler to the certifier plugin #9795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions plugins/certifier/certifier.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ class SslLRUList
SslData *next = nullptr;

SslData() = default;
~SslData()
{ /* TSDebug(PLUGIN_NAME, "Deleting ssl data for [%s]", commonName.c_str()); */
}
~SslData() { TSDebug(PLUGIN_NAME, "Deleting ssl data for [%s]", commonName.c_str()); }
};

using scoped_SslData = std::unique_ptr<SslLRUList::SslData>;
Expand Down Expand Up @@ -554,13 +552,23 @@ cert_retriever(TSCont contp, TSEvent event, void *edata)
return TS_SUCCESS;
}

static int
shutdown_handler(TSCont contp, TSEvent event, void *edata)
{
if (event == TS_EVENT_LIFECYCLE_SHUTDOWN) {
ssl_list.reset();
}
return 0;
}

void
TSPluginInit(int argc, const char *argv[])
{
TSDebug(PLUGIN_NAME, "initializing plugin");
// Initialization data and callback
TSPluginRegistrationInfo info;
TSCont cb_shadow = nullptr;
TSCont cb_shutdown = nullptr;
info.plugin_name = "certifier";
info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
Expand Down Expand Up @@ -618,6 +626,8 @@ TSPluginInit(int argc, const char *argv[])
TSError("[%s] Unable to initialize plugin (disabled). Failed to register plugin.", PLUGIN_NAME);
} else if ((cb_shadow = TSContCreate(cert_retriever, nullptr)) == nullptr) {
TSError("[%s] Unable to initialize plugin (disabled). Failed to create shadow cert cb.", PLUGIN_NAME);
} else if ((cb_shutdown = TSContCreate(shutdown_handler, nullptr)) == nullptr) {
TSError("[%s] Unable to initialize plugin (disabled). Failed to create shutdown cb.", PLUGIN_NAME);
} else {
if ((sign_enabled = cert && key && serial)) {
// Dynamic cert generation enabled. Initialize CA key, cert and serial
Expand Down Expand Up @@ -666,6 +676,7 @@ TSPluginInit(int argc, const char *argv[])

/// Add global hooks
TSHttpHookAdd(TS_SSL_CERT_HOOK, cb_shadow);
TSLifecycleHookAdd(TS_LIFECYCLE_SHUTDOWN_HOOK, cb_shutdown);
}

return;
Expand Down