[FIXED] JetStream: js_GetConsumerInfo should check consumer name

The API should check that the provided consumer name is valid. If it contains "." (which is illegal), the call will fail with a timeout instead of `NATS_INVALID_ARG`. Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
nats-io · Apr 4, 2022 · 5e891b5 · 5e891b5
1 parent 28029e6
commit 5e891b5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/js.c b/src/js.c
@@ -1881,10 +1881,10 @@ _processConsInfo(const char **dlvSubject, jsConsumerInfo *info, jsConsumerConfig
 }
 
 natsStatus
-js_checkDurName(const char *dur)
+js_checkConsumerName(const char *cons, bool isDurable)
 {
-    if (strchr(dur, '.') != NULL)
-        return nats_setError(NATS_INVALID_ARG, "invalid durable name '%s' (cannot contain '.')", dur);
+    if (strchr(cons, '.') != NULL)
+        return nats_setError(NATS_INVALID_ARG, "invalid %s name '%s' (cannot contain '.')", (isDurable ? "durable" : "consumer"), cons);
     return NATS_OK;
 }
 
@@ -1996,7 +1996,7 @@ _subscribe(natsSubscription **new_sub, jsCtx *js, const char *subject, const cha
     // If a durable name is specified, check that it is valid
     if (!nats_IsStringEmpty(durable))
     {
-        if ((s = js_checkDurName(durable)) != NATS_OK)
+        if ((s = js_checkConsumerName(durable, true)) != NATS_OK)
             return NATS_UPDATE_ERR_STACK(s);
     }
 

diff --git a/src/js.h b/src/js.h
@@ -207,7 +207,7 @@ void
 js_cleanStreamState(jsStreamState *state);
 
 natsStatus
-js_checkDurName(const char *dur);
+js_checkConsumerName(const char *cons, bool isDurable);
 
 natsStatus
 js_getMetaData(const char *reply,

diff --git a/src/jsm.c b/src/jsm.c
@@ -2061,7 +2061,7 @@ js_AddConsumer(jsConsumerInfo **new_ci, jsCtx *js,
 
     if (!nats_IsStringEmpty(cfg->Durable))
     {
-        if ((s = js_checkDurName(cfg->Durable)) != NATS_OK)
+        if ((s = js_checkConsumerName(cfg->Durable, true)) != NATS_OK)
             return NATS_UPDATE_ERR_STACK(s);
     }
 
@@ -2140,6 +2140,10 @@ js_GetConsumerInfo(jsConsumerInfo **new_ci, jsCtx *js,
     if (nats_IsStringEmpty(consumer))
         return nats_setError(NATS_INVALID_ARG, "%s", jsErrConsumerNameRequired);
 
+    s = js_checkConsumerName(consumer, false);
+    if (s != NATS_OK)
+        return NATS_UPDATE_ERR_STACK(s);
+
     s = js_setOpts(&nc, &freePfx, js, opts, &o);
     if (s == NATS_OK)
     {

diff --git a/test/test.c b/test/test.c
@@ -22896,6 +22896,12 @@ test_JetStreamMgtConsumers(void)
                 && (strstr(nats_GetLastError(NULL), jsErrConsumerNameRequired) != NULL));
     nats_clearLastError();
 
+    test("Get consumer info (consumer name invalid): ");
+    s = js_GetConsumerInfo(&ci, js, "MY_STREAM", "bad.consumer.name", NULL, &jerr);
+    testCond((s == NATS_INVALID_ARG)
+                && (strstr(nats_GetLastError(NULL), "invalid consumer name") != NULL));
+    nats_clearLastError();
+
     test("Get consumer info: ");
     s = js_GetConsumerInfo(&ci, js, "MY_STREAM", "dur", NULL, &jerr);
     testCond((s == NATS_OK) && (jerr == 0) && (ci != NULL)