fix(omsentinel): multiple fixes and cleanup - #26
Merged
Conversation
frikilax
requested changes
Apr 14, 2026
Member
There was a problem hiding this comment.
isn't there a control problem with the number of bytes received? and the fact that contents may not be NULL terminated?
Member
There was a problem hiding this comment.
this value should be saved along authReply, and used for all manipulations of the variable (especially in loggers and curlAuth())
| curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code); | ||
| if (http_code != 200) | ||
| { | ||
| dbgprintf("omsentinel: http_reply_code=%ld \n", http_code); |
Member
There was a problem hiding this comment.
Suggested change
| dbgprintf("omsentinel: http_reply_code=%ld \n", http_code); | |
| LogError(0, RS_RET_SUSPENDED, "omsentinel[curlAuth]: http_reply_code=%ld", http_code); |
| res = curl_easy_perform(curl); | ||
| if (res != CURLE_OK) | ||
| { | ||
| LogError(0, RS_RET_ERR, "curl: error: %s\n", curl_easy_strerror(res)); |
Member
There was a problem hiding this comment.
Suggested change
| LogError(0, RS_RET_ERR, "curl: error: %s\n", curl_easy_strerror(res)); | |
| LogError(0, RS_RET_SUSPENDED, "omsentinel[curlAuth]: error: %s", curl_easy_strerror(res)); |
| if(!(pData->token = (uchar *)strdup(tokenStr))) | ||
| { | ||
| LogError(0, RS_RET_OUT_OF_MEMORY, | ||
| "omsentinel: could not allocate Bearer token \n"); |
Member
There was a problem hiding this comment.
Suggested change
| "omsentinel[curlAuth]: could not allocate Bearer token"); |
| ABORT_FINALIZE(RS_RET_SUSPENDED); | ||
| } | ||
| json_object_put(parsed_json); | ||
| } |
Member
There was a problem hiding this comment.
Suggested change
| } | |
| } | |
| else | |
| { | |
| LogError(0, RS_RET_SUSPENDED, "omsentinel[curlAuth]: Could not decode a valid JSON in reply"); | |
| ABORT_FINALIZE(RS_RET_SUSPENDED); | |
| } |
| } | ||
| else | ||
| { | ||
| LogError(0, RS_RET_OUT_OF_MEMORY, "omsentinel: could not allocate http response \n"); |
Member
There was a problem hiding this comment.
Suggested change
| LogError(0, RS_RET_OUT_OF_MEMORY, "omsentinel[curlAuth]: could not allocate http response"); |
| // httpHeader | ||
| if (asprintf((char **)&pData->httpHeader, (char *)pData->authorizationHeader, pData->token) < 0) | ||
| { | ||
| LogError(0, RS_RET_OUT_OF_MEMORY, "omsentinel: cannot allocate memory for http header\n"); |
Member
There was a problem hiding this comment.
Suggested change
| LogError(0, RS_RET_OUT_OF_MEMORY, "omsentinel[curlAuth]: cannot allocate memory for http header"); |
| if (pData->httpHeader) | ||
| { | ||
| free(pData->httpHeader); | ||
| } |
Member
There was a problem hiding this comment.
Those variables are relative to the instance, so they can be accessed by several workers at once
I believe:
- the values should be protected by a mutex
- or the values could be relative to the worker (meaning = 1 token per worker = more authentication requests! So maybe not advisable)
|
|
||
| if (pData->token && pData->dce && pData->dcr && pData->stream_name) | ||
| // Before building batch check/regenerate auths | ||
| CHKiRet(initAuth(pWrkrData)); |
Member
There was a problem hiding this comment.
after reflecting on the code, it seems there is a deep misunderstanding (or misuse) of transactions and the doAction macro.
- I believe
doActionshould tell rsyslog how to handle the current transaction (send, keep, drop, etc... see RS_RET_DEFER_COMMIT in rsyslog.h) - Handling of current authentication could be moved to the
endTransactiontransaction (if transactions were correctly used), whensubmitBatch()would be used (and it would be the only call to the function)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR introduces several fixes and improvements to the omsentinel module,
focusing on memory management, resource handling, and overall stability. It also improves the clarity of error logs.
In this PR, each commit targets a specific fix.