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

[FIXED] JetStream: stream and/or consumer name checks #537

Merged
merged 1 commit into from
Apr 4, 2022
Merged

[FIXED] JetStream: stream and/or consumer name checks #537

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
2 changes: 1 addition & 1 deletion src/js.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1884,7 +1884,7 @@ natsStatus
js_checkDurName(const char *dur)
{
if (strchr(dur, '.') != NULL)
return nats_setError(NATS_INVALID_ARG, "invalid durable name '%s' (cannot contain '.')", dur);
return nats_setError(NATS_INVALID_ARG, "%s '%s' (cannot contain '.')", jsErrInvalidDurableName, dur);
return NATS_OK;
}

Expand Down
5 changes: 5 additions & 0 deletions src/js.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ extern const int64_t jsDefaultRequestWait;
#define jsErrOrderedConsNoQueue "queue can not be set for an ordered consumer"
#define jsErrOrderedConsNoBind "can not bind existing consumer for an ordered consumer"
#define jsErrOrderedConsNoPullMode "can not use pull mode for an ordered consumer"
#define jsErrStreamConfigRequired "stream configuration required"
#define jsErrInvalidStreamName "invalid stream name"
#define jsErrConsumerConfigRequired "consumer configuration required"
#define jsErrInvalidDurableName "invalid durable name"
#define jsErrInvalidConsumerName "invalid consumer name"

#define jsCtrlHeartbeat (1)
#define jsCtrlFlowControl (2)
Expand Down
71 changes: 48 additions & 23 deletions src/jsm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ _marshalTimeUTC(natsBuffer *buf, const char *fieldName, int64_t timeUTC)
// Stream related functions
//

static natsStatus
_checkStreamName(const char *stream)
{
if (nats_IsStringEmpty(stream))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrStreamNameRequired);

if (strchr(stream, '.') != NULL)
return nats_setError(NATS_INVALID_ARG, "%s '%s' (cannot contain '.')", jsErrInvalidStreamName, stream);

return NATS_OK;
}

static void
_destroyPlacement(jsPlacement *placement)
{
Expand Down Expand Up @@ -1013,11 +1025,12 @@ _addUpdateOrGet(jsStreamInfo **new_si, jsStreamAction action, jsCtx *js, jsStrea
if (js == NULL)
return nats_setDefaultError(NATS_INVALID_ARG);

if ((cfg == NULL) || nats_IsStringEmpty(cfg->Name))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrStreamNameRequired);
if (cfg == NULL)
return nats_setError(NATS_INVALID_ARG, "%s", jsErrStreamConfigRequired);

if (strchr(cfg->Name, '.'))
return nats_setError(NATS_INVALID_ARG, "invalid stream name '%s' (cannot contain '.')", cfg->Name);
s = _checkStreamName(cfg->Name);
if (s != NATS_OK)
return NATS_UPDATE_ERR_STACK(s);

switch (action)
{
Expand Down Expand Up @@ -1202,8 +1215,9 @@ _purgeOrDelete(bool purge, jsCtx *js, const char *stream, jsOptions *opts, jsErr
if (js == NULL)
return nats_setDefaultError(NATS_INVALID_ARG);

if (nats_IsStringEmpty(stream))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrStreamNameRequired);
s = _checkStreamName(stream);
if (s != NATS_OK)
return NATS_UPDATE_ERR_STACK(s);

s = js_setOpts(&nc, &freePfx, js, opts, &o);
if (s == NATS_OK)
Expand Down Expand Up @@ -1643,6 +1657,18 @@ jsExternalStream_Init(jsExternalStream *external)
// Consumer related functions
//

static natsStatus
_checkConsumerName(const char *consumer)
{
if (nats_IsStringEmpty(consumer))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrConsumerNameRequired);

if (strchr(consumer, '.') != NULL)
return nats_setError(NATS_INVALID_ARG, "%s '%s' (cannot contain '.')", jsErrInvalidConsumerName, consumer);

return NATS_OK;
}

static natsStatus
_marshalDeliverPolicy(natsBuffer *buf, jsDeliverPolicy p)
{
Expand Down Expand Up @@ -2053,11 +2079,15 @@ js_AddConsumer(jsConsumerInfo **new_ci, jsCtx *js,
if (errCode != NULL)
*errCode = 0;

if ((js == NULL) || (cfg == NULL))
if (js == NULL)
return nats_setDefaultError(NATS_INVALID_ARG);

if (nats_IsStringEmpty(stream))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrStreamNameRequired);
if (cfg == NULL)
return nats_setError(NATS_INVALID_ARG, "%s", jsErrConsumerConfigRequired);

s = _checkStreamName(stream);
if (s != NATS_OK)
return NATS_UPDATE_ERR_STACK(s);

if (!nats_IsStringEmpty(cfg->Durable))
{
Expand Down Expand Up @@ -2106,10 +2136,7 @@ js_UpdateConsumer(jsConsumerInfo **ci, jsCtx *js,
{
natsStatus s;

if (cfg == NULL)
return nats_setDefaultError(NATS_INVALID_ARG);

if (nats_IsStringEmpty(cfg->Durable))
if ((cfg != NULL) && nats_IsStringEmpty(cfg->Durable))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrDurRequired);

s = js_AddConsumer(ci, js, stream, cfg, opts, errCode);
Expand All @@ -2134,11 +2161,10 @@ js_GetConsumerInfo(jsConsumerInfo **new_ci, jsCtx *js,
if ((js == NULL) || (new_ci == NULL))
return nats_setDefaultError(NATS_INVALID_ARG);

if (nats_IsStringEmpty(stream))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrStreamNameRequired);

if (nats_IsStringEmpty(consumer))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrConsumerNameRequired);
s = _checkStreamName(stream);
IFOK(s, _checkConsumerName(consumer))
if (s != NATS_OK)
return NATS_UPDATE_ERR_STACK(s);

s = js_setOpts(&nc, &freePfx, js, opts, &o);
if (s == NATS_OK)
Expand Down Expand Up @@ -2189,11 +2215,10 @@ js_DeleteConsumer(jsCtx *js, const char *stream, const char *consumer,
if (js == NULL)
return nats_setDefaultError(NATS_INVALID_ARG);

if (nats_IsStringEmpty(stream))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrStreamNameRequired);

if (nats_IsStringEmpty(consumer))
return nats_setError(NATS_INVALID_ARG, "%s", jsErrConsumerNameRequired);
s = _checkStreamName(stream);
IFOK(s, _checkConsumerName(consumer))
if (s != NATS_OK)
return NATS_UPDATE_ERR_STACK(s);

s = js_setOpts(&nc, &freePfx, js, opts, &o);
if (s == NATS_OK)
Expand Down
Loading