From: Dmitry Volyntsev Date: Wed, 18 Nov 2026 01:16:32 +0000 (-0800) Subject: HTTP: split QuickJS request arguments before decoding X-Git-Url: https://git.kaiwu.me/http/%7B@url%7D?a=commitdiff_plain;h=adbb92806f8769cbb5c9c7834e681bdabe99fd77;p=njs.git HTTP: split QuickJS request arguments before decoding Previously, percent decoding the whole query string made encoded ampersands and equals signs act as separators. Use the QuickJS querystring parser to split the raw query before decoding each field. Match the njs engine by accepting empty names and limiting the parse to the first 1000 segments. The issue was introduced in 201b1276 (0.8.6). --- diff --git a/external/qjs_query_string_module.c b/external/qjs_query_string_module.c index 605a2555..3e4a645f 100644 --- a/external/qjs_query_string_module.c +++ b/external/qjs_query_string_module.c @@ -198,6 +198,10 @@ qjs_query_string_decode(JSContext *cx, const u_char *start, size_t size) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; + if (size == 0) { + return JS_NewStringLen(cx, "", 0); + } + NJS_CHB_CTX_INIT(&chain, cx); njs_utf8_decode_init(&ctx); @@ -236,8 +240,7 @@ qjs_query_string_decode(JSContext *cx, const u_char *start, size_t size) dst = njs_chb_reserve(&chain, 4); if (dst == NULL) { - JS_ThrowOutOfMemory(cx); - return JS_EXCEPTION; + goto failed; } njs_chb_written(&chain, njs_utf8_encode(dst, cp) - dst); @@ -246,16 +249,19 @@ qjs_query_string_decode(JSContext *cx, const u_char *start, size_t size) if (cp == NJS_UNICODE_CONTINUE) { dst = njs_chb_reserve(&chain, 3); if (dst == NULL) { - JS_ThrowOutOfMemory(cx); - return JS_EXCEPTION; + goto failed; } njs_chb_written(&chain, njs_utf8_encode(dst, NJS_UNICODE_REPLACEMENT) - dst); } - return qjs_string_create_chb(cx, &chain); + +failed: + + njs_chb_destroy(&chain); + return JS_ThrowOutOfMemory(cx); } @@ -469,6 +475,13 @@ exception: } +JSValue +qjs_vm_query_string_parse(JSContext *cx, u_char *start, u_char *end) +{ + return qjs_query_string_parser(cx, start, end, NULL, NULL, JS_NULL, 1000); +} + + static JSValue qjs_query_string_parser(JSContext *cx, u_char *query, u_char *end, njs_str_t *sep, njs_str_t *eq, JSValue decode, unsigned max_keys) @@ -528,6 +541,10 @@ qjs_query_string_parser(JSContext *cx, u_char *query, u_char *end, next: + if (part == end) { + break; + } + key = part + sep->length; } diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index 5c6a857d..60c1d6fb 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -6114,105 +6114,11 @@ ngx_engine_njs_clone(ngx_js_ctx_t *ctx, ngx_js_loc_conf_t *cf, #if (NJS_HAVE_QUICKJS) -static ngx_int_t -ngx_http_qjs_query_string_decode(njs_chb_t *chain, const u_char *start, - size_t size) -{ - u_char *dst; - uint32_t cp; - njs_bool_t consumed; - const u_char *p, *end; - njs_unicode_decode_t ctx; - - static const int8_t hex[256] - njs_aligned(32) = - { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - }; - - njs_utf8_decode_init(&ctx); - - cp = 0; - - p = start; - end = p + size; - - while (p < end) { - if (*p == '%' && end - p > 2 && hex[p[1]] >= 0 && hex[p[2]] >= 0) { - cp = njs_utf8_consume(&ctx, (hex[p[1]] << 4) | hex[p[2]], - &consumed); - if (consumed) { - p += 3; - } - - } else { - if (*p == '+') { - cp = njs_utf8_consume(&ctx, ' ', &consumed); - if (consumed) { - p++; - } - - } else { - cp = njs_utf8_decode(&ctx, &p, end); - } - } - - if (cp > NJS_UNICODE_MAX_CODEPOINT) { - if (cp == NJS_UNICODE_CONTINUE) { - continue; - } - - cp = NJS_UNICODE_REPLACEMENT; - } - - dst = njs_chb_reserve(chain, 4); - if (dst == NULL) { - return NGX_ERROR; - } - - njs_chb_written(chain, njs_utf8_encode(dst, cp) - dst); - } - - if (cp == NJS_UNICODE_CONTINUE) { - dst = njs_chb_reserve(chain, 3); - if (dst == NULL) { - return NGX_ERROR; - } - - njs_chb_written(chain, - njs_utf8_encode(dst, NJS_UNICODE_REPLACEMENT) - dst); - } - - return NGX_OK; -} - - static JSValue ngx_http_qjs_ext_args(JSContext *cx, JSValueConst this_val) { - u_char *start, *end, *p, *v; - uint32_t len; - JSAtom key; - JSValue args, val, prev, length, arr; - njs_str_t decoded; - njs_int_t ret; - ngx_int_t rc; - njs_chb_t chain; + u_char *data; + JSValue args; ngx_http_request_t *r; ngx_http_qjs_request_t *req; @@ -6222,147 +6128,19 @@ ngx_http_qjs_ext_args(JSContext *cx, JSValueConst this_val) return JS_EXCEPTION; } - if (!JS_IsUndefined(req->args)) { - return JS_DupValue(cx, req->args); - } - - args = JS_NewObjectProto(cx, JS_NULL); - if (JS_IsException(args)) { - return JS_EXCEPTION; - } - - NJS_CHB_CTX_INIT(&chain, cx); - - r = req->opaque.external; - - rc = ngx_http_qjs_query_string_decode(&chain, r->args.data, r->args.len); - if (rc != NGX_OK) { - njs_chb_destroy(&chain); - return JS_ThrowOutOfMemory(cx); - } - - ret = njs_chb_join(&chain, &decoded); - njs_chb_destroy(&chain); - - if (ret != NJS_OK) { - return JS_ThrowOutOfMemory(cx); - } - - start = decoded.start; - end = start + decoded.length; - - while (start < end) { - p = ngx_strlchr(start, end, '&'); - if (p == NULL) { - p = end; - } - - v = ngx_strlchr(start, p, '='); - if (v == NULL) { - v = p; - } - - if (v == start) { - start = p + 1; - continue; - } - - key = JS_NewAtomLen(cx, (const char *) start, v - start); - if (key == JS_ATOM_NULL) { - chain.free(cx, decoded.start); - return JS_EXCEPTION; - } - - val = qjs_string_create(cx, v + 1, (p == v) ? 0 : p - v - 1); - if (JS_IsException(val)) { - chain.free(cx, decoded.start); - JS_FreeAtom(cx, key); - return JS_EXCEPTION; - } + if (JS_IsUndefined(req->args)) { + r = req->opaque.external; + data = (r->args.len != 0) ? r->args.data : (u_char *) ""; - prev = JS_GetProperty(cx, args, key); - if (JS_IsException(prev)) { - chain.free(cx, decoded.start); - JS_FreeAtom(cx, key); - JS_FreeValue(cx, val); + args = qjs_vm_query_string_parse(cx, data, data + r->args.len); + if (JS_IsException(args)) { return JS_EXCEPTION; } - arr = JS_UNDEFINED; - - if (JS_IsUndefined(prev)) { - if (JS_SetProperty(cx, args, key, val) < 0) { - val = JS_UNDEFINED; - goto exception; - } - - } else if (qjs_is_array(cx, prev)) { - length = JS_GetPropertyStr(cx, prev, "length"); - - if (JS_ToUint32(cx, &len, length)) { - JS_FreeValue(cx, length); - goto exception; - } - - JS_FreeValue(cx, length); - - if (JS_SetPropertyUint32(cx, prev, len, val) < 0) { - val = JS_UNDEFINED; - goto exception; - } - - val = JS_UNDEFINED; - JS_FreeValue(cx, prev); - prev = JS_UNDEFINED; - - } else { - - arr = JS_NewArray(cx); - if (JS_IsException(arr)) { - goto exception; - } - - if (JS_SetPropertyUint32(cx, arr, 0, prev) < 0) { - prev = JS_UNDEFINED; - goto exception; - } - - prev = JS_UNDEFINED; - - if (JS_SetPropertyUint32(cx, arr, 1, val) < 0) { - val = JS_UNDEFINED; - goto exception; - } - - val = JS_UNDEFINED; - - if (JS_SetProperty(cx, args, key, arr) < 0) { - arr = JS_UNDEFINED; - goto exception; - } - - arr = JS_UNDEFINED; - } - - JS_FreeAtom(cx, key); - start = p + 1; + req->args = args; } - chain.free(cx, decoded.start); - req->args = args; - - return JS_DupValue(cx, args); - -exception: - - chain.free(cx, decoded.start); - JS_FreeAtom(cx, key); - JS_FreeValue(cx, val); - JS_FreeValue(cx, prev); - JS_FreeValue(cx, arr); - JS_FreeValue(cx, args); - - return JS_EXCEPTION; + return JS_DupValue(cx, req->args); } diff --git a/nginx/t/js_args.t b/nginx/t/js_args.t index c69e0562..60969873 100644 --- a/nginx/t/js_args.t +++ b/nginx/t/js_args.t @@ -133,7 +133,7 @@ $t->write_file('test.js', <try_run('no njs')->plan(29); +$t->try_run('no njs')->plan(32); ############################################################################### @@ -176,6 +176,8 @@ like(http_get('/enumerate?__proto__=1&__proto__=2&a=3'), qr/^__proto__,a$/m, is(get_json('/object'), '{}', 'empty object'); is(get_json('/object?a=1&b=2&c=3'), '{"a":"1","b":"2","c":"3"}', 'ordinary object'); +is(get_json('/object?=first&=second&a=3'), '{"":["first","second"],"a":"3"}', + 'empty argument name'); is(get_json('/object?a=1&A=2'), '{"A":"2","a":"1"}', 'case sensitive object'); is(get_json('/object?a=1&A=2&a=3'), '{"A":"2","a":["1","3"]}', @@ -184,6 +186,11 @@ is(get_json('/object?%61=1&a=2'), '{"a":["1","2"]}', 'keys percent-encoded object'); is(get_json('/object?a=%62%63&b=%63%64'), '{"a":"bc","b":"cd"}', 'values percent-encoded object'); +is(get_json('/object?title=Salt+%26+Pepper&quantity=2'), + '{"quantity":"2","title":"Salt & Pepper"}', + 'encoded ampersand in a value'); +is(get_json('/object?x%3Dy=first&x%3Dy=second'), + '{"x=y":["first","second"]}', 'encoded equals in a repeated key'); is(get_json('/object?a=%6&b=%&c=%%&d=%zz'), '{"a":"%6","b":"%","c":"%%","d":"%zz"}', 'values percent-encoded broken object'); diff --git a/src/qjs.h b/src/qjs.h index 8c1e33d0..82fe5bf5 100644 --- a/src/qjs.h +++ b/src/qjs.h @@ -109,6 +109,7 @@ int qjs_hex_decode(JSContext *ctx, const njs_str_t *src, njs_str_t *dst); size_t qjs_hex_decode_length(JSContext *ctx, const njs_str_t *src); JSValue qjs_process_object(JSContext *ctx, int argc, const char **argv); +JSValue qjs_vm_query_string_parse(JSContext *cx, u_char *start, u_char *end); typedef struct { int tag;