Skip to content

gracefully handle TSReleaseAsserts in statichit and generator plugins #7269

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

Merged
randall merged 1 commit into from
Oct 13, 2020
Merged

gracefully handle TSReleaseAsserts in statichit and generator plugins #7269

Show file tree
Hide file tree
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
30 changes: 24 additions & 6 deletions plugins/experimental/statichit/statichit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,25 @@ HeaderFieldStringSet(const StaticHitHttpHeader &http, const char *field_name, in
TSHandleMLocRelease(http.buffer, http.header, field);
}

static void
static TSReturnCode
WriteResponseHeader(StaticHitRequest *trq, TSCont contp, TSHttpStatus status)
{
StaticHitHttpHeader response;

VDEBUG("writing response header");

TSReleaseAssert(TSHttpHdrTypeSet(response.buffer, response.header, TS_HTTP_TYPE_RESPONSE) == TS_SUCCESS);
TSReleaseAssert(TSHttpHdrVersionSet(response.buffer, response.header, TS_HTTP_VERSION(1, 1)) == TS_SUCCESS);
TSReleaseAssert(TSHttpHdrStatusSet(response.buffer, response.header, status) == TS_SUCCESS);
if (TSHttpHdrTypeSet(response.buffer, response.header, TS_HTTP_TYPE_RESPONSE) != TS_SUCCESS) {
VERROR("failed to set type");
return TS_ERROR;
}
if (TSHttpHdrVersionSet(response.buffer, response.header, TS_HTTP_VERSION(1, 1)) != TS_SUCCESS) {
VERROR("failed to set HTTP version");
return TS_ERROR;
}
if (TSHttpHdrStatusSet(response.buffer, response.header, status) != TS_SUCCESS) {
VERROR("failed to set HTTP status");
return TS_ERROR;
}

TSHttpHdrReasonSet(response.buffer, response.header, TSHttpHdrReasonLookup(status), -1);

Expand Down Expand Up @@ -275,6 +284,8 @@ WriteResponseHeader(StaticHitRequest *trq, TSCont contp, TSHttpStatus status)
TSVIOReenable(trq->writeio.vio);

TSStatIntIncrement(StatCountBytes, hdrlen);

return TS_SUCCESS;
}

static bool
Expand Down Expand Up @@ -384,7 +395,11 @@ StaticHitInterceptHook(TSCont contp, TSEvent event, void *edata)
cdata.trq->writeio.write(TSVIOVConnGet(arg.vio), contp);
TSVIONBytesSet(cdata.trq->writeio.vio, 0);

WriteResponseHeader(cdata.trq, contp, status);
if (WriteResponseHeader(cdata.trq, contp, status) != TS_SUCCESS) {
VERROR("failure writing response");
return TS_EVENT_ERROR;
}

return TS_EVENT_NONE;

case TS_PARSE_CONT:
Expand Down Expand Up @@ -496,7 +511,10 @@ StaticHitTxnHook(TSCont contp, TSEvent event, void *edata)
TSMLoc hdr_loc;
const char *method;

TSReleaseAssert(TSHttpTxnCacheLookupStatusGet(arg.txn, &status) == TS_SUCCESS);
if (TSHttpTxnCacheLookupStatusGet(arg.txn, &status) != TS_SUCCESS) {
VERROR("failed to get client request handle");
goto done;
}

if (TSHttpTxnClientReqGet(arg.txn, &bufp, &hdr_loc) != TS_SUCCESS) {
VERROR("Couldn't retrieve client request header");
Expand Down
54 changes: 42 additions & 12 deletions plugins/generator/generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,17 +284,26 @@ GeneratorGetRequestHeader(GeneratorHttpHeader &request, const char *field_name,
return default_value;
}

static void
static TSReturnCode
GeneratorWriteResponseHeader(GeneratorRequest *grq, TSCont contp)
{
GeneratorHttpHeader response;

VDEBUG("writing response header");

TSReleaseAssert(TSHttpHdrTypeSet(response.buffer, response.header, TS_HTTP_TYPE_RESPONSE) == TS_SUCCESS);
TSReleaseAssert(TSHttpHdrVersionSet(response.buffer, response.header, TS_HTTP_VERSION(1, 1)) == TS_SUCCESS);
if (TSHttpHdrTypeSet(response.buffer, response.header, TS_HTTP_TYPE_RESPONSE) != TS_SUCCESS) {
VERROR("failed to set type");
return TS_ERROR;
}
if (TSHttpHdrVersionSet(response.buffer, response.header, TS_HTTP_VERSION(1, 1)) != TS_SUCCESS) {
VERROR("failed to set HTTP version");
return TS_ERROR;
}
if (TSHttpHdrStatusSet(response.buffer, response.header, TS_HTTP_STATUS_OK) != TS_SUCCESS) {
VERROR("failed to set HTTP status");
return TS_ERROR;
}

TSReleaseAssert(TSHttpHdrStatusSet(response.buffer, response.header, TS_HTTP_STATUS_OK) == TS_SUCCESS);
TSHttpHdrReasonSet(response.buffer, response.header, TSHttpHdrReasonLookup(TS_HTTP_STATUS_OK), -1);

// Set the Content-Length header.
Expand All @@ -320,6 +329,8 @@ GeneratorWriteResponseHeader(GeneratorRequest *grq, TSCont contp)
TSVIOReenable(grq->writeio.vio);

TSStatIntIncrement(StatCountBytes, hdrlen);

return TS_SUCCESS;
}

static bool
Expand All @@ -346,8 +357,16 @@ GeneratorParseRequest(GeneratorRequest *grq)
grq->maxage = GeneratorGetRequestHeader(grq->rqheader, "Generator-MaxAge", lengthof("Generator-MaxAge"), grq->maxage);

// Next, parse our parameters out of the URL.
TSReleaseAssert(TSHttpHdrUrlGet(grq->rqheader.buffer, grq->rqheader.header, &url) == TS_SUCCESS);
TSReleaseAssert(path = TSUrlPathGet(grq->rqheader.buffer, url, &pathsz));
if (TSHttpHdrUrlGet(grq->rqheader.buffer, grq->rqheader.header, &url) != TS_SUCCESS) {
VERROR("failed to get URI handle");
return false;
}

path = TSUrlPathGet(grq->rqheader.buffer, url, &pathsz);
if (!path) {
VDEBUG("empty path");
return false;
}

VDEBUG("requested path is %.*s", pathsz, path);

Expand Down Expand Up @@ -504,7 +523,10 @@ GeneratorInterceptHook(TSCont contp, TSEvent event, void *edata)
return TS_EVENT_NONE;
}

GeneratorWriteResponseHeader(cdata.grq, contp);
if (GeneratorWriteResponseHeader(cdata.grq, contp) != TS_SUCCESS) {
VERROR("failure writing response");
return TS_EVENT_ERROR;
}
return TS_EVENT_NONE;

case TS_PARSE_CONT:
Expand Down Expand Up @@ -580,7 +602,10 @@ GeneratorInterceptHook(TSCont contp, TSEvent event, void *edata)
// Our response delay expired, so write the headers now, which
// will also trigger the read+write event flow.
argument_type cdata = TSContDataGet(contp);
GeneratorWriteResponseHeader(cdata.grq, contp);
if (GeneratorWriteResponseHeader(cdata.grq, contp) != TS_SUCCESS) {
VERROR("failure writing response");
return TS_EVENT_ERROR;
}
return TS_EVENT_NONE;
}

Expand Down Expand Up @@ -623,8 +648,14 @@ GeneratorTxnHook(TSCont contp, TSEvent event, void *edata)
TSMLoc url_loc;
TSMLoc hdr_loc;

TSReleaseAssert(TSHttpTxnClientReqGet(arg.txn, &recp, &hdr_loc) == TS_SUCCESS);
TSReleaseAssert(TSHttpHdrUrlGet(recp, hdr_loc, &url_loc) == TS_SUCCESS);
if (TSHttpTxnClientReqGet(arg.txn, &recp, &hdr_loc) != TS_SUCCESS) {
VERROR("failed to get client request handle");
break;
}
if (TSHttpHdrUrlGet(recp, hdr_loc, &url_loc) != TS_SUCCESS) {
VERROR("failed to get URI handle");
break;
}
CheckCacheable(arg.txn, url_loc, recp);
TSHandleMLocRelease(recp, hdr_loc, url_loc);
TSHandleMLocRelease(recp, TS_NULL_MLOC, hdr_loc);
Expand All @@ -634,8 +665,7 @@ GeneratorTxnHook(TSCont contp, TSEvent event, void *edata)
case TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE: {
int status;

TSReleaseAssert(TSHttpTxnCacheLookupStatusGet(arg.txn, &status) == TS_SUCCESS);
if (status != TS_CACHE_LOOKUP_HIT_FRESH) {
if (TSHttpTxnCacheLookupStatusGet(arg.txn, &status) == TS_SUCCESS && status != TS_CACHE_LOOKUP_HIT_FRESH) {
// This transaction is going to be a cache miss, so intercept it.
VDEBUG("intercepting origin server request for txn=%p", arg.txn);
TSHttpTxnServerIntercept(TSContCreate(GeneratorInterceptHook, TSMutexCreate()), arg.txn);
Expand Down