nginx-devel

nginx-devel@nginx.org

14 participants
8433 discussions

[njs] HTTP: adding a warning for ignored outgoing header assignments.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/ef0e05668f39 branches: changeset: 1961:ef0e05668f39 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Thu Sep 22 19:05:36 2022 -0700 description: HTTP: adding a warning for ignored outgoing header assignments. diffstat: nginx/ngx_http_js_module.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 74d30c2d70f3 -r ef0e05668f39 nginx/ngx_http_js_module.c --- a/nginx/ngx_http_js_module.c Tue Sep 20 17:44:25 2022 -0700 +++ b/nginx/ngx_http_js_module.c Thu Sep 22 19:05:36 2022 -0700 @@ -1565,6 +1565,11 @@ ngx_http_js_ext_header_out(njs_vm_t *vm, return NJS_DECLINED; } + if (r->header_sent && setval != NULL) { + njs_vm_warn(vm, "ignored setting of response header \"%V\" because" + " headers were already sent", &name); + } + for (h = headers_out; h->name.length > 0; h++) { if (h->name.length == name.length && ngx_strncasecmp(h->name.start, name.start, name.length) == 0)

1 day, 16 hours

[njs] Introduced "name" instance property for a function object.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/74d30c2d70f3 branches: changeset: 1960:74d30c2d70f3 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Tue Sep 20 17:44:25 2022 -0700 description: Introduced "name" instance property for a function object. This closes #360 issue on Github. diffstat: src/njs_async.c | 7 +++ src/njs_disassembler.c | 8 ++- src/njs_error.c | 5 ++ src/njs_function.c | 99 +++++++++++++++++++++++++++++++++++------------ src/njs_function.h | 4 + src/njs_generator.c | 92 ++++++++++++++++++++++++++++++++++++++++--- src/njs_object_prop.c | 5 ++ src/njs_parser.c | 10 ++-- src/njs_value.c | 1 + src/njs_value.h | 1 + src/njs_vm.c | 1 + src/njs_vm.h | 1 + src/njs_vmcode.c | 36 +++++++++++++--- src/njs_vmcode.h | 2 + src/test/njs_unit_test.c | 71 +++++++++++++++++++++++++++++++++- 15 files changed, 293 insertions(+), 50 deletions(-) diffs (670 lines): diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_async.c --- a/src/njs_async.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_async.c Tue Sep 20 17:44:25 2022 -0700 @@ -228,6 +228,13 @@ const njs_object_prop_t njs_async_funct .value = njs_prop_handler(njs_function_instance_length), .configurable = 1, }, + + { + .type = NJS_PROPERTY_HANDLER, + .name = njs_string("name"), + .value = njs_prop_handler(njs_function_instance_name), + .configurable = 1, + }, }; diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_disassembler.c --- a/src/njs_disassembler.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_disassembler.c Tue Sep 20 17:44:25 2022 -0700 @@ -74,8 +74,12 @@ static njs_code_name_t code_names[] = { njs_str("VOID ") }, { NJS_VMCODE_TYPEOF, sizeof(njs_vmcode_2addr_t), njs_str("TYPEOF ") }, - { NJS_VMCODE_TO_PROPERTY_KEY, sizeof(njs_vmcode_3addr_t), - njs_str("TO PROPERTY KEY ") }, + { NJS_VMCODE_TO_PROPERTY_KEY, sizeof(njs_vmcode_2addr_t), + njs_str("TO PROP KEY ") }, + { NJS_VMCODE_TO_PROPERTY_KEY_CHK, sizeof(njs_vmcode_3addr_t), + njs_str("TO PROP KEY CHK ") }, + { NJS_VMCODE_SET_FUNCTION_NAME, sizeof(njs_vmcode_2addr_t), + njs_str("SET FUNC NAME ") }, { NJS_VMCODE_UNARY_PLUS, sizeof(njs_vmcode_2addr_t), njs_str("PLUS ") }, diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_error.c --- a/src/njs_error.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_error.c Tue Sep 20 17:44:25 2022 -0700 @@ -1319,6 +1319,11 @@ njs_add_backtrace_entry(njs_vm_t *vm, nj if (code != NULL) { be->name = code->name; + + if (be->name.length == 0) { + be->name = njs_entry_anonymous; + } + be->line = njs_lookup_line(code->lines, native_frame->pc - code->start); if (!vm->options.quiet) { be->file = code->file; diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_function.c --- a/src/njs_function.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_function.c Tue Sep 20 17:44:25 2022 -0700 @@ -145,29 +145,34 @@ njs_function_name_set(njs_vm_t *vm, njs_ } if (prefix != NULL || symbol != 0) { - value = prop->value; - (void) njs_string_prop(&string, &value); + if (njs_is_defined(&prop->value)) { + value = prop->value; + (void) njs_string_prop(&string, &value); - len = (prefix != NULL) ? njs_strlen(prefix) + 1: 0; - p = njs_string_alloc(vm, &prop->value, string.size + len + symbol, - string.length + len + symbol); - if (njs_slow_path(p == NULL)) { - return NJS_ERROR; - } + len = (prefix != NULL) ? njs_strlen(prefix) + 1: 0; + p = njs_string_alloc(vm, &prop->value, string.size + len + symbol, + string.length + len + symbol); + if (njs_slow_path(p == NULL)) { + return NJS_ERROR; + } - if (len != 0) { - p = njs_cpymem(p, prefix, len - 1); - *p++ = ' '; - } + if (len != 0) { + p = njs_cpymem(p, prefix, len - 1); + *p++ = ' '; + } + + if (symbol != 0) { + *p++ = '['; + } - if (symbol != 0) { - *p++ = '['; - } + p = njs_cpymem(p, string.start, string.size); - p = njs_cpymem(p, string.start, string.size); + if (symbol != 0) { + *p++ = ']'; + } - if (symbol != 0) { - *p++ = ']'; + } else { + njs_value_assign(&prop->value, &njs_string_empty); } } @@ -1253,6 +1258,12 @@ njs_function_constructor(njs_vm_t *vm, n function->global_this = 1; function->args_count = lambda->nargs - lambda->rest_parameters; + ret = njs_function_name_set(vm, function, + njs_value_arg(&njs_string_anonymous), NULL); + if (njs_slow_path(ret == NJS_ERROR)) { + return ret; + } + njs_set_function(&vm->retval, function); return NJS_OK; @@ -1324,6 +1335,30 @@ njs_function_instance_length(njs_vm_t *v } +njs_int_t +njs_function_instance_name(njs_vm_t *vm, njs_object_prop_t *prop, + njs_value_t *value, njs_value_t *setval, njs_value_t *retval) +{ + njs_function_t *function; + + function = njs_object_proto_lookup(njs_object(value), NJS_FUNCTION, + njs_function_t); + if (njs_slow_path(function == NULL)) { + njs_set_undefined(retval); + return NJS_DECLINED; + } + + if (!function->native) { + njs_value_assign(retval, &function->u.lambda->name); + return NJS_OK; + } + + njs_value_assign(retval, &njs_string_empty); + + return NJS_OK; +} + + static njs_int_t njs_function_prototype_call(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) @@ -1447,11 +1482,10 @@ static njs_int_t njs_function_prototype_bind(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - size_t size; - njs_int_t ret; - njs_value_t *values, name; - njs_function_t *function; - njs_lvlhsh_query_t lhq; + size_t size; + njs_int_t ret; + njs_value_t *values, name; + njs_function_t *function; if (!njs_is_function(&args[0])) { njs_type_error(vm, "\"this\" argument is not a function"); @@ -1476,9 +1510,8 @@ njs_function_prototype_bind(njs_vm_t *vm function->u.bound_target = njs_function(&args[0]); - njs_object_property_init(&lhq, &njs_string_name, NJS_NAME_HASH); - - ret = njs_object_property(vm, &args[0], &lhq, &name); + ret = njs_value_property(vm, &args[0], njs_value_arg(&njs_string_name), + &name); if (njs_slow_path(ret == NJS_ERROR)) { return ret; } @@ -1616,6 +1649,13 @@ const njs_object_prop_t njs_function_in { .type = NJS_PROPERTY_HANDLER, + .name = njs_string("name"), + .value = njs_prop_handler(njs_function_instance_name), + .configurable = 1, + }, + + { + .type = NJS_PROPERTY_HANDLER, .name = njs_string("prototype"), .value = njs_prop_handler(njs_function_prototype_create), .writable = 1 @@ -1637,6 +1677,13 @@ const njs_object_prop_t njs_arrow_insta .value = njs_prop_handler(njs_function_instance_length), .configurable = 1, }, + + { + .type = NJS_PROPERTY_HANDLER, + .name = njs_string("name"), + .value = njs_prop_handler(njs_function_instance_name), + .configurable = 1, + }, }; diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_function.h --- a/src/njs_function.h Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_function.h Tue Sep 20 17:44:25 2022 -0700 @@ -23,6 +23,8 @@ struct njs_function_lambda_s { uint8_t ctor; /* 1 bit */ uint8_t rest_parameters; /* 1 bit */ + njs_value_t name; + u_char *start; }; @@ -99,6 +101,8 @@ njs_int_t njs_function_constructor(njs_v njs_uint_t nargs, njs_index_t unused); njs_int_t njs_function_instance_length(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); +njs_int_t njs_function_instance_name(njs_vm_t *vm, njs_object_prop_t *prop, + njs_value_t *value, njs_value_t *setval, njs_value_t *retval); njs_int_t njs_eval_function(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); njs_int_t njs_function_native_frame(njs_vm_t *vm, njs_function_t *function, diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_generator.c --- a/src/njs_generator.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_generator.c Tue Sep 20 17:44:25 2022 -0700 @@ -1050,10 +1050,12 @@ static njs_int_t njs_generate_var_statement_after(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_int_t ret; - njs_variable_t *var; - njs_parser_node_t *lvalue, *expr; - njs_vmcode_move_t *move; + ssize_t length; + njs_int_t ret; + njs_variable_t *var; + njs_parser_node_t *lvalue, *expr; + njs_vmcode_move_t *move; + const njs_lexer_entry_t *lex_entry; lvalue = node->left; expr = node->right; @@ -1080,6 +1082,29 @@ njs_generate_var_statement_after(njs_vm_ node->index = expr->index; node->temporary = expr->temporary; + if ((expr->token_type == NJS_TOKEN_FUNCTION_EXPRESSION + || expr->token_type == NJS_TOKEN_ASYNC_FUNCTION_EXPRESSION) + && njs_values_same(&expr->u.value.data.u.lambda->name, + &njs_string_empty)) + { + lex_entry = njs_lexer_entry(node->left->u.reference.unique_id); + if (njs_slow_path(lex_entry == NULL)) { + return NJS_ERROR; + } + + length = njs_utf8_length(lex_entry->name.start, lex_entry->name.length); + if (njs_slow_path(length < 0)) { + return NJS_ERROR; + } + + ret = njs_string_new(vm, &expr->u.value.data.u.lambda->name, + lex_entry->name.start, lex_entry->name.length, + length); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + } + return njs_generator_stack_pop(vm, generator, NULL); } @@ -2854,7 +2879,9 @@ njs_generate_assignment_end(njs_vm_t *vm njs_parser_node_t *node) { njs_int_t ret; + njs_index_t prop_index; njs_parser_node_t *lvalue, *expr, *object, *property; + njs_vmcode_2addr_t *set_function, *to_prop_key; njs_vmcode_prop_set_t *prop_set; lvalue = node->left; @@ -2862,9 +2889,34 @@ njs_generate_assignment_end(njs_vm_t *vm object = lvalue->left; property = lvalue->right; + prop_index = property->index; switch (lvalue->token_type) { case NJS_TOKEN_PROPERTY_INIT: + + if ((expr->token_type == NJS_TOKEN_FUNCTION + || expr->token_type == NJS_TOKEN_FUNCTION_EXPRESSION + || expr->token_type == NJS_TOKEN_ASYNC_FUNCTION_EXPRESSION)) + { + if (property->token_type == NJS_TOKEN_STRING) { + njs_value_assign(&expr->u.value.data.u.lambda->name, + &property->u.value); + + } else { + njs_generate_code(generator, njs_vmcode_2addr_t, to_prop_key, + NJS_VMCODE_TO_PROPERTY_KEY, 2, property); + + to_prop_key->src = property->index; + to_prop_key->dst = prop_index; + + njs_generate_code(generator, njs_vmcode_2addr_t, set_function, + NJS_VMCODE_SET_FUNCTION_NAME, 2, expr); + + set_function->dst = expr->index; + set_function->src = prop_index; + } + } + njs_generate_code(generator, njs_vmcode_prop_set_t, prop_set, NJS_VMCODE_PROPERTY_INIT, 3, expr); break; @@ -2882,7 +2934,7 @@ njs_generate_assignment_end(njs_vm_t *vm prop_set->value = expr->index; prop_set->object = object->index; - prop_set->property = property->index; + prop_set->property = prop_index; node->index = expr->index; node->temporary = expr->temporary; @@ -3063,7 +3115,7 @@ njs_generate_operation_assignment_prop(n } njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, - NJS_VMCODE_TO_PROPERTY_KEY, 2, property); + NJS_VMCODE_TO_PROPERTY_KEY_CHK, 2, property); to_property_key->src2 = object->index; to_property_key->src1 = property->index; @@ -3233,6 +3285,7 @@ static njs_int_t njs_generate_function_expression(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { + ssize_t length; njs_int_t ret; njs_variable_t *var; njs_function_lambda_t *lambda; @@ -3262,6 +3315,17 @@ njs_generate_function_expression(njs_vm_ return ret; } + length = njs_utf8_length(lex_entry->name.start, lex_entry->name.length); + if (njs_slow_path(length < 0)) { + return NJS_ERROR; + } + + ret = njs_string_new(vm, &lambda->name, lex_entry->name.start, + lex_entry->name.length, length); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + njs_generate_code(generator, njs_vmcode_function_t, function, NJS_VMCODE_FUNCTION, 1, node); function->lambda = lambda; @@ -3289,7 +3353,7 @@ njs_generate_function(njs_vm_t *vm, njs_ lambda = node->u.value.data.u.lambda; ret = njs_generate_function_scope(vm, generator, lambda, node, - &njs_entry_anonymous); + &njs_entry_empty); if (njs_slow_path(ret != NJS_OK)) { return ret; } @@ -3731,7 +3795,7 @@ found: } njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, - NJS_VMCODE_TO_PROPERTY_KEY, 2, node); + NJS_VMCODE_TO_PROPERTY_KEY_CHK, 2, node); to_property_key->src2 = lvalue->left->index; to_property_key->src1 = lvalue->right->index; @@ -3787,6 +3851,7 @@ static njs_int_t njs_generate_function_declaration(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { + ssize_t length; njs_int_t ret; njs_bool_t async; njs_variable_t *var; @@ -3811,6 +3876,17 @@ njs_generate_function_declaration(njs_vm return NJS_ERROR; } + length = njs_utf8_length(lex_entry->name.start, lex_entry->name.length); + if (njs_slow_path(length < 0)) { + return NJS_ERROR; + } + + ret = njs_string_new(vm, &lambda->name, lex_entry->name.start, + lex_entry->name.length, length); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + ret = njs_generate_function_scope(vm, generator, lambda, node, &lex_entry->name); if (njs_slow_path(ret != NJS_OK)) { diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_object_prop.c --- a/src/njs_object_prop.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_object_prop.c Tue Sep 20 17:44:25 2022 -0700 @@ -452,6 +452,11 @@ done: pq.lhq.value = NULL; goto set_prop; } + + } else { + + prev->type = prop->type; + njs_value_assign(&prev->value, &prop->value); } } else { diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_parser.c --- a/src/njs_parser.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_parser.c Tue Sep 20 17:44:25 2022 -0700 @@ -6872,9 +6872,9 @@ njs_parser_function_parse(njs_parser_t * } -static const njs_lexer_entry_t njs_parser_anonymous_entry = -{ - .name = njs_str("anonymous") +static const njs_lexer_entry_t njs_parser_empty_entry = +{ + .name = njs_str("") }; @@ -6909,7 +6909,7 @@ njs_parser_function_expression(njs_parse } } else { - unique_id = (uintptr_t) &njs_parser_anonymous_entry; + unique_id = (uintptr_t) &njs_parser_empty_entry; } if (token->type != NJS_TOKEN_OPEN_PARENTHESIS) { @@ -7155,7 +7155,7 @@ njs_parser_arrow_function(njs_parser_t * node->left = name; - unique_id = (uintptr_t) &njs_parser_anonymous_entry; + unique_id = (uintptr_t) &njs_parser_empty_entry; var = njs_variable_scope_add(parser, parser->scope, parser->scope, unique_id, NJS_VARIABLE_FUNCTION, 1); diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_value.c --- a/src/njs_value.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_value.c Tue Sep 20 17:44:25 2022 -0700 @@ -54,6 +54,7 @@ const njs_value_t njs_string_external = const njs_value_t njs_string_invalid = njs_string("invalid"); const njs_value_t njs_string_object = njs_string("object"); const njs_value_t njs_string_function = njs_string("function"); +const njs_value_t njs_string_anonymous = njs_string("anonymous"); const njs_value_t njs_string_memory_error = njs_string("MemoryError"); diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_value.h --- a/src/njs_value.h Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_value.h Tue Sep 20 17:44:25 2022 -0700 @@ -836,6 +836,7 @@ extern const njs_value_t njs_string_ext extern const njs_value_t njs_string_invalid; extern const njs_value_t njs_string_object; extern const njs_value_t njs_string_function; +extern const njs_value_t njs_string_anonymous; extern const njs_value_t njs_string_memory_error; diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_vm.c --- a/src/njs_vm.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_vm.c Tue Sep 20 17:44:25 2022 -0700 @@ -12,6 +12,7 @@ static njs_int_t njs_vm_init(njs_vm_t *v static njs_int_t njs_vm_handle_events(njs_vm_t *vm); +const njs_str_t njs_entry_empty = njs_str(""); const njs_str_t njs_entry_main = njs_str("main"); const njs_str_t njs_entry_module = njs_str("module"); const njs_str_t njs_entry_native = njs_str("native"); diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_vm.h --- a/src/njs_vm.h Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_vm.h Tue Sep 20 17:44:25 2022 -0700 @@ -267,6 +267,7 @@ void *njs_lvlhsh_alloc(void *data, size_ void njs_lvlhsh_free(void *data, void *p, size_t size); +extern const njs_str_t njs_entry_empty; extern const njs_str_t njs_entry_main; extern const njs_str_t njs_entry_module; extern const njs_str_t njs_entry_native; diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_vmcode.c --- a/src/njs_vmcode.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_vmcode.c Tue Sep 20 17:44:25 2022 -0700 @@ -889,21 +889,41 @@ next: break; case NJS_VMCODE_TO_PROPERTY_KEY: + case NJS_VMCODE_TO_PROPERTY_KEY_CHK: njs_vmcode_operand(vm, (njs_index_t) value2, retval); - njs_vmcode_operand(vm, vmcode->operand3, value2); - - if (njs_slow_path(njs_is_null_or_undefined(value2))) { - (void) njs_throw_cannot_property(vm, value2, value1, - "get"); - goto error; + + if (op == NJS_VMCODE_TO_PROPERTY_KEY_CHK) { + njs_vmcode_operand(vm, vmcode->operand3, value2); + + if (njs_slow_path(njs_is_null_or_undefined(value2))) { + (void) njs_throw_cannot_property(vm, value2, value1, + "get"); + goto error; + } } - ret = njs_value_to_string(vm, retval, value1); + ret = njs_value_to_key(vm, retval, value1); if (njs_fast_path(ret == NJS_ERROR)) { goto error; } - ret = sizeof(njs_vmcode_3addr_t); + ret = (op == NJS_VMCODE_TO_PROPERTY_KEY) + ? sizeof(njs_vmcode_2addr_t) + : sizeof(njs_vmcode_3addr_t); + break; + + case NJS_VMCODE_SET_FUNCTION_NAME: + njs_vmcode_operand(vm, (njs_index_t) value2, value2); + + njs_assert(njs_is_function(value2)); + + ret = njs_function_name_set(vm, njs_function(value2), value1, + NULL); + if (njs_slow_path(ret == NJS_ERROR)) { + return ret; + } + + ret = sizeof(njs_vmcode_2addr_t); break; case NJS_VMCODE_PROTO_INIT: diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/njs_vmcode.h --- a/src/njs_vmcode.h Mon Sep 19 17:36:02 2022 -0700 +++ b/src/njs_vmcode.h Tue Sep 20 17:44:25 2022 -0700 @@ -50,6 +50,8 @@ enum { NJS_VMCODE_ARGUMENTS, NJS_VMCODE_PROTO_INIT, NJS_VMCODE_TO_PROPERTY_KEY, + NJS_VMCODE_TO_PROPERTY_KEY_CHK, + NJS_VMCODE_SET_FUNCTION_NAME, NJS_VMCODE_IMPORT, NJS_VMCODE_AWAIT, diff -r 33fcc9fc6704 -r 74d30c2d70f3 src/test/njs_unit_test.c --- a/src/test/njs_unit_test.c Mon Sep 19 17:36:02 2022 -0700 +++ b/src/test/njs_unit_test.c Tue Sep 20 17:44:25 2022 -0700 @@ -3846,6 +3846,24 @@ static njs_unit_test_t njs_test[] = { njs_str("({[{toString(){return {}}}]:1})"), njs_str("TypeError: Cannot convert object to primitive value") }, + { njs_str("({['a' + 'v'](){}}).av.name"), + njs_str("av") }, + + { njs_str("({[Symbol.toStringTag](){}})[Symbol.toStringTag].name"), + njs_str("[Symbol.toStringTag]") }, + + { njs_str("var anonSym = Symbol(); ({[anonSym]: () => {}})[anonSym].name"), + njs_str("") }, + + { njs_str("var named = Symbol('xxx'); ({[named]: () => {}})[named].name"), + njs_str("[xxx]") }, + + { njs_str("var called = false;" + "({" + " [{toString(){ if (called) throw 'OOps'; called = true; return 'a'}}](){}" + "}).a.name"), + njs_str("a") }, + { njs_str("var o = { [new Number(12345)]: 1000 }; o[12345]"), njs_str("1000") }, @@ -7740,6 +7758,10 @@ static njs_unit_test_t njs_test[] = "var o = { toString: f }; o"), njs_str("0,1,2") }, + { njs_str("var f = function F() {};" + "[f.name, f.bind().name, f.bind().bind().name]"), + njs_str("F,bound F,bound bound F") }, + { njs_str("var f = Object.defineProperty(function() {}, 'name', {value: 'F'});" "[f.name, f.bind().name, f.bind().bind().name]"), njs_str("F,bound F,bound bound F") }, @@ -9948,6 +9970,53 @@ static njs_unit_test_t njs_test[] = "f.length"), njs_str("42") }, + { njs_str("function f(){}; f.name"), + njs_str("f") }, + + { njs_str("function f(){}; njs.dump(Object.getOwnPropertyDescriptor(f, 'name'))"), + njs_str("{value:'f',writable:false,enumerable:false,configurable:true}") }, + + { njs_str("function f(){}; Object.defineProperty(f, 'name', {value: 'F'}); f.name"), + njs_str("F") }, + + { njs_str("function f(){}; Object.defineProperty(f, 'name', {value: 'F'});" + "njs.dump(Object.getOwnPropertyDescriptor(f, 'name'))"), + njs_str("{value:'F',writable:false,enumerable:false,configurable:true}") }, + + { njs_str("function f() {}; f.name = 'a'"), + njs_str("TypeError: Cannot assign to read-only property \"name\" of function") }, + + { njs_str("(function f () { return f.name})()"), + njs_str("f") }, + + { njs_str("var a = function () {}; a.name"), + njs_str("a") }, + + { njs_str("(function () {}).name"), + njs_str("") }, + + { njs_str("var a = (null, function () {}); a.name"), + njs_str("") }, + + { njs_str("var a = async function () {}; a.name"), + njs_str("a") }, + + { njs_str("let a = () => {}; a.name"), + njs_str("a") }, + + { njs_str("let a = async () => {}; a.name"), + njs_str("a") }, + + { njs_str("Function().name"), + njs_str("anonymous") }, + + { njs_str("var o = {f: function (){}, g: () => {}, h: async function(){}};" + "[o.f.name, o.g.name, o.h.name]"), + njs_str("f,g,h") }, + + { njs_str("({t(){}}).t.name"), + njs_str("t") }, + /* Function nesting depth. */ { njs_str("() => () => () => () => () => () => () => () => () => () => () =>" @@ -14789,7 +14858,7 @@ static njs_unit_test_t njs_test[] = njs_str("0,1,2,length") }, { njs_str("Object.getOwnPropertyNames(function() {})"), - njs_str("length,prototype") }, + njs_str("length,name,prototype") }, { njs_str("Object.getOwnPropertyNames(Array)"), njs_str("name,length,prototype,isArray,of") },

3 days, 18 hours

[PATCH] Core: support for reading PROXY protocol v2 TLVs

by Roman Arutyunyan

# HG changeset patch # User Roman Arutyunyan <arut(a)nginx.com> # Date 1661436099 -14400 # Thu Aug 25 18:01:39 2022 +0400 # Node ID 4b856f1dff939e4eb9c131e17af061cf2c38cfac # Parent 069a4813e8d6d7ec662d282a10f5f7062ebd817f Core: support for reading PROXY protocol v2 TLVs. The TLV values are available in HTTP and Stream variables $proxy_protocol_tlv_0xN, where N is a hexadecimal TLV type number with no leading zeroes. diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c --- a/src/core/ngx_proxy_protocol.c +++ b/src/core/ngx_proxy_protocol.c @@ -40,6 +40,12 @@ typedef struct { } ngx_proxy_protocol_inet6_addrs_t; +typedef struct { + u_char type; + u_char len[2]; +} ngx_proxy_protocol_tlv_t; + + static u_char *ngx_proxy_protocol_read_addr(ngx_connection_t *c, u_char *p, u_char *last, ngx_str_t *addr); static u_char *ngx_proxy_protocol_read_port(u_char *p, u_char *last, @@ -273,8 +279,11 @@ ngx_proxy_protocol_v2_read(ngx_connectio size_t len; socklen_t socklen; ngx_uint_t version, command, family, transport; + ngx_list_t *pp_tlv; ngx_sockaddr_t src_sockaddr, dst_sockaddr; + ngx_table_elt_t *t; ngx_proxy_protocol_t *pp; + ngx_proxy_protocol_tlv_t *tlv; ngx_proxy_protocol_header_t *header; ngx_proxy_protocol_inet_addrs_t *in; #if (NGX_HAVE_INET6) @@ -412,8 +421,63 @@ ngx_proxy_protocol_v2_read(ngx_connectio &pp->src_addr, pp->src_port, &pp->dst_addr, pp->dst_port); if (buf < end) { - ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0, - "PROXY protocol v2 %z bytes of tlv ignored", end - buf); + pp_tlv = ngx_list_create(c->pool, 1, sizeof(ngx_table_elt_t)); + if (pp_tlv == NULL) { + return NULL; + } + + while (buf < end) { + if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_tlv_t)) { + ngx_log_error(NGX_LOG_ERR, c->log, 0, + "broken PROXY protocol TLV"); + return NULL; + } + + tlv = (ngx_proxy_protocol_tlv_t *) buf; + + buf += sizeof(ngx_proxy_protocol_tlv_t); + + len = ngx_proxy_protocol_parse_uint16(tlv->len); + + if ((size_t) (end - buf) < len) { + ngx_log_error(NGX_LOG_ERR, c->log, 0, + "broken PROXY protocol TLV"); + return NULL; + } + + ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol v2 TLV type:0x%0xd len:%uz", + tlv->type, len); + + t = ngx_list_push(pp_tlv); + if (t == NULL) { + return NULL; + } + + t->hash = 1; + t->lowcase_key = NULL; + + t->key.data = ngx_pnalloc(c->pool, 2); + if (t->key.data == NULL) { + return NULL; + } + + t->key.len = ngx_sprintf(t->key.data, "%0xd", tlv->type) + - t->key.data; + + t->value.data = ngx_pnalloc(c->pool, len); + if (t->value.data == NULL) { + return NULL; + } + + ngx_memcpy(t->value.data, buf, len); + + t->value.len = len; + + buf += len; + } + + pp->tlv = pp_tlv; } c->proxy_protocol = pp; diff --git a/src/core/ngx_proxy_protocol.h b/src/core/ngx_proxy_protocol.h --- a/src/core/ngx_proxy_protocol.h +++ b/src/core/ngx_proxy_protocol.h @@ -21,6 +21,7 @@ struct ngx_proxy_protocol_s { ngx_str_t dst_addr; in_port_t src_port; in_port_t dst_port; + ngx_list_t *tlv; }; diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -61,6 +61,8 @@ static ngx_int_t ngx_http_variable_proxy ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_proxy_protocol_port(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); +static ngx_int_t ngx_http_variable_proxy_protocol_tlv(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_server_addr(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_server_port(ngx_http_request_t *r, @@ -214,6 +216,10 @@ static ngx_http_variable_t ngx_http_cor ngx_http_variable_proxy_protocol_port, offsetof(ngx_proxy_protocol_t, dst_port), 0, 0 }, + { ngx_string("proxy_protocol_tlv_0x"), NULL, + ngx_http_variable_proxy_protocol_tlv, + 0, NGX_HTTP_VAR_PREFIX, 0 }, + { ngx_string("server_addr"), NULL, ngx_http_variable_server_addr, 0, 0, 0 }, { ngx_string("server_port"), NULL, ngx_http_variable_server_port, 0, 0, 0 }, @@ -1387,6 +1393,24 @@ ngx_http_variable_proxy_protocol_port(ng static ngx_int_t +ngx_http_variable_proxy_protocol_tlv(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data) +{ + ngx_proxy_protocol_t *pp; + + pp = r->connection->proxy_protocol; + if (pp == NULL || pp->tlv == NULL) { + v->not_found = 1; + return NGX_OK; + } + + return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data, + &pp->tlv->part, + sizeof("proxy_protocol_tlv_0x") - 1); +} + + +static ngx_int_t ngx_http_variable_server_addr(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) { diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c --- a/src/stream/ngx_stream_variables.c +++ b/src/stream/ngx_stream_variables.c @@ -23,6 +23,8 @@ static ngx_int_t ngx_stream_variable_pro ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_stream_variable_proxy_protocol_port( ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data); +static ngx_int_t ngx_stream_variable_proxy_protocol_tlv( + ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_stream_variable_server_addr(ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_stream_variable_server_port(ngx_stream_session_t *s, @@ -51,6 +53,10 @@ static ngx_int_t ngx_stream_variable_tim static ngx_int_t ngx_stream_variable_protocol(ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data); +static ngx_int_t ngx_stream_variable_unknown_header(ngx_stream_session_t *s, + ngx_stream_variable_value_t *v, ngx_str_t *var, ngx_list_part_t *part, + size_t prefix); + static ngx_stream_variable_t ngx_stream_core_variables[] = { @@ -79,6 +85,10 @@ static ngx_stream_variable_t ngx_stream ngx_stream_variable_proxy_protocol_port, offsetof(ngx_proxy_protocol_t, dst_port), 0, 0 }, + { ngx_string("proxy_protocol_tlv_0x"), NULL, + ngx_stream_variable_proxy_protocol_tlv, + 0, NGX_STREAM_VAR_PREFIX, 0 }, + { ngx_string("server_addr"), NULL, ngx_stream_variable_server_addr, 0, 0, 0 }, @@ -622,6 +632,24 @@ ngx_stream_variable_proxy_protocol_port( static ngx_int_t +ngx_stream_variable_proxy_protocol_tlv(ngx_stream_session_t *s, + ngx_stream_variable_value_t *v, uintptr_t data) +{ + ngx_proxy_protocol_t *pp; + + pp = s->connection->proxy_protocol; + if (pp == NULL || pp->tlv == NULL) { + v->not_found = 1; + return NGX_OK; + } + + return ngx_stream_variable_unknown_header(s, v, (ngx_str_t *) data, + &pp->tlv->part, + sizeof("proxy_protocol_tlv_0x") - 1); +} + + +static ngx_int_t ngx_stream_variable_server_addr(ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data) { @@ -911,6 +939,116 @@ ngx_stream_variable_protocol(ngx_stream_ } +static ngx_int_t +ngx_stream_variable_unknown_header(ngx_stream_session_t *s, + ngx_stream_variable_value_t *v, ngx_str_t *var, + ngx_list_part_t *part, size_t prefix) +{ + u_char *p, ch; + size_t len; + ngx_uint_t i, n; + ngx_table_elt_t *header, *h, **ph; + + ph = &h; +#if (NGX_SUPPRESS_WARN) + len = 0; +#endif + + header = part->elts; + + for (i = 0; /* void */ ; i++) { + + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } + + part = part->next; + header = part->elts; + i = 0; + } + + if (header[i].hash == 0) { + continue; + } + + if (header[i].key.len != var->len - prefix) { + continue; + } + + for (n = 0; n < var->len - prefix; n++) { + ch = header[i].key.data[n]; + + if (ch >= 'A' && ch <= 'Z') { + ch |= 0x20; + + } else if (ch == '-') { + ch = '_'; + } + + if (var->data[n + prefix] != ch) { + break; + } + } + + if (n != var->len - prefix) { + continue; + } + + len += header[i].value.len + 2; + + *ph = &header[i]; + ph = &header[i].next; + } + + *ph = NULL; + + if (h == NULL) { + v->not_found = 1; + return NGX_OK; + } + + len -= 2; + + if (h->next == NULL) { + + v->len = h->value.len; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->data = h->value.data; + + return NGX_OK; + } + + p = ngx_pnalloc(s->connection->pool, len); + if (p == NULL) { + return NGX_ERROR; + } + + v->len = len; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->data = p; + + for ( ;; ) { + + p = ngx_copy(p, h->value.data, h->value.len); + + if (h->next == NULL) { + break; + } + + *p++ = ','; *p++ = ' '; + + h = h->next; + } + + return NGX_OK; +} + + void * ngx_stream_map_find(ngx_stream_session_t *s, ngx_stream_map_t *map, ngx_str_t *match)

4 days, 16 hours

[njs] Improved complex assignments when key is a primitive object.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/33fcc9fc6704 branches: changeset: 1959:33fcc9fc6704 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Mon Sep 19 17:36:02 2022 -0700 description: Improved complex assignments when key is a primitive object. When key is a primitive object NJS_VMCODE_TO_PROPERTY_KEY is not necessary. diffstat: src/njs_generator.c | 52 +++++++++++++++++++++++++++-------------------- src/njs_parser.h | 5 ++++ src/test/njs_unit_test.c | 30 +++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 22 deletions(-) diffs (124 lines): diff -r 75e7a7bb6b06 -r 33fcc9fc6704 src/njs_generator.c --- a/src/njs_generator.c Fri Sep 16 17:07:04 2022 -0700 +++ b/src/njs_generator.c Mon Sep 19 17:36:02 2022 -0700 @@ -3054,17 +3054,21 @@ njs_generate_operation_assignment_prop(n } } - prop_index = njs_generate_node_temp_index_get(vm, generator, node); - if (njs_slow_path(prop_index == NJS_INDEX_ERROR)) { - return NJS_ERROR; - } - - njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, - NJS_VMCODE_TO_PROPERTY_KEY, 2, property); - - to_property_key->src2 = object->index; - to_property_key->src1 = property->index; - to_property_key->dst = prop_index; + prop_index = property->index; + + if (!njs_parser_is_primitive(property)) { + prop_index = njs_generate_node_temp_index_get(vm, generator, node); + if (njs_slow_path(prop_index == NJS_INDEX_ERROR)) { + return NJS_ERROR; + } + + njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, + NJS_VMCODE_TO_PROPERTY_KEY, 2, property); + + to_property_key->src2 = object->index; + to_property_key->src1 = property->index; + to_property_key->dst = prop_index; + } index = njs_generate_node_temp_index_get(vm, generator, node); if (njs_slow_path(index == NJS_INDEX_ERROR)) { @@ -3718,17 +3722,21 @@ njs_generate_inc_dec_operation_prop(njs_ found: - prop_index = njs_generate_temp_index_get(vm, generator, node); - if (njs_slow_path(prop_index == NJS_INDEX_ERROR)) { - return NJS_ERROR; - } - - njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, - NJS_VMCODE_TO_PROPERTY_KEY, 2, node); - - to_property_key->src2 = lvalue->left->index; - to_property_key->src1 = lvalue->right->index; - to_property_key->dst = prop_index; + prop_index = lvalue->right->index; + + if (!njs_parser_is_primitive(lvalue->right)) { + prop_index = njs_generate_temp_index_get(vm, generator, node); + if (njs_slow_path(prop_index == NJS_INDEX_ERROR)) { + return NJS_ERROR; + } + + njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, + NJS_VMCODE_TO_PROPERTY_KEY, 2, node); + + to_property_key->src2 = lvalue->left->index; + to_property_key->src1 = lvalue->right->index; + to_property_key->dst = prop_index; + } post = *((njs_bool_t *) generator->context); diff -r 75e7a7bb6b06 -r 33fcc9fc6704 src/njs_parser.h --- a/src/njs_parser.h Fri Sep 16 17:07:04 2022 -0700 +++ b/src/njs_parser.h Mon Sep 19 17:36:02 2022 -0700 @@ -157,6 +157,11 @@ njs_int_t njs_parser_serialize_ast(njs_p || (node)->token_type == NJS_TOKEN_PROPERTY) +#define njs_parser_is_primitive(node) \ + ((node)->token_type >= NJS_TOKEN_NULL \ + && (node)->token_type <= NJS_TOKEN_STRING) + + #define njs_parser_syntax_error(parser, fmt, ...) \ njs_parser_lexer_error(parser, NJS_OBJ_TYPE_SYNTAX_ERROR, fmt, \ ##__VA_ARGS__) diff -r 75e7a7bb6b06 -r 33fcc9fc6704 src/test/njs_unit_test.c --- a/src/test/njs_unit_test.c Fri Sep 16 17:07:04 2022 -0700 +++ b/src/test/njs_unit_test.c Mon Sep 19 17:36:02 2022 -0700 @@ -3647,6 +3647,36 @@ static njs_unit_test_t njs_test[] = { njs_str("var a = 1; var b = { x:2 }; a = b.x += (a = 1)"), njs_str("3") }, + { njs_str("var o = {true:1}; o[true] += 1; o.true"), + njs_str("2") }, + + { njs_str("var o = {false:1}; o[false] += 1; o.false"), + njs_str("2") }, + + { njs_str("var o = {undefined:1}; o[undefined] += 1; o.undefined"), + njs_str("2") }, + + { njs_str("var o = {'5':1}; o[5] += 1; o[5]"), + njs_str("2") }, + + { njs_str("var o = {a:1}; o[{toString:()=>'a'}] += 1; o.a"), + njs_str("2") }, + + { njs_str("var o = {true:1}; o[true]++; o.true"), + njs_str("2") }, + + { njs_str("var o = {false:1}; o[false]++; o.false"), + njs_str("2") }, + + { njs_str("var o = {undefined:1}; o[undefined]++; o.undefined"), + njs_str("2") }, + + { njs_str("var o = {'5':1}; o[5]++; o[5]"), + njs_str("2") }, + + { njs_str("var o = {a:1}; o[{toString:()=>'a'}]++; o.a"), + njs_str("2") }, + { njs_str("var a = undefined; a.b++; a.b"), njs_str("TypeError: cannot get property \"b\" of undefined") },

4 days, 18 hours

[PATCH] Tests: fixed try_run() to remove temporary directory on failure

by Sergey Kandaurov

# HG changeset patch # User Sergey Kandaurov <pluknet(a)nginx.com> # Date 1662472340 -14400 # Tue Sep 06 17:52:20 2022 +0400 # Node ID 7eb87eaf06f4b9161cfe298f195947dbddedd01d # Parent 78fe648d54a79822a72f3a5f8cc79651b3b1f5a7 Tests: fixed try_run() to remove temporary directory on failure. Keeping the file handle pointing to the "stderr" file prevented removal of the temporary directory on win32 if execution aborted in run(). The fix is to move safe file operations surrounding run() out of the eval block such that the state of file handles is consistent. Fixes a1874249496d. diff -r 78fe648d54a7 -r 7eb87eaf06f4 lib/Test/Nginx.pm --- a/lib/Test/Nginx.pm Tue Aug 30 17:24:16 2022 +0400 +++ b/lib/Test/Nginx.pm Tue Sep 06 17:52:20 2022 +0400 @@ -290,8 +290,9 @@ sub has_daemon($) { sub try_run($$) { my ($self, $message) = @_; + open OLDERR, ">&", \*STDERR; + eval { - open OLDERR, ">&", \*STDERR; open NEWERR, ">", $self->{_testdir} . '/stderr' or die "Can't open stderr: $!"; close STDERR; @@ -299,10 +300,10 @@ sub try_run($$) { close NEWERR; $self->run(); + }; - close STDERR; - open STDERR, ">&", \*OLDERR; - }; + close STDERR; + open STDERR, ">&", \*OLDERR; return $self unless $@;

1 week

[njs] Fixed typo introduced in 82f41f43abd4.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/75e7a7bb6b06 branches: changeset: 1958:75e7a7bb6b06 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Fri Sep 16 17:07:04 2022 -0700 description: Fixed typo introduced in 82f41f43abd4. diffstat: src/njs_vmcode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 52b3e1f2a3e1 -r 75e7a7bb6b06 src/njs_vmcode.c --- a/src/njs_vmcode.c Fri Sep 16 12:27:40 2022 -0700 +++ b/src/njs_vmcode.c Fri Sep 16 17:07:04 2022 -0700 @@ -883,6 +883,7 @@ next: case NJS_VMCODE_ARGUMENTS: ret = njs_vmcode_arguments(vm, pc); if (njs_slow_path(ret == NJS_ERROR)) { + goto error; } break;

1 week

[PATCH 00 of 11] SSL session handling patches

by Maxim Dounin

Hello! Below is a patch series to address various issues with SSL session caching and session tickets, notably: - session cache trashing with OpenSSL and TLSv1.3 - excessive logging of session cache allocation failures It also introduces automatic rotation of session ticket keys (as long as session cache in the shared memory is configured). -- Maxim Dounin http://mdounin.ru/

1 week

[njs] Modules: added js_preload_object directive.

by Vadim Zhestikov

details: https://hg.nginx.org/njs/rev/52b3e1f2a3e1 branches: changeset: 1957:52b3e1f2a3e1 user: Vadim Zhestikov <v.zhestikov(a)f5.com> date: Fri Sep 16 12:27:40 2022 -0700 description: Modules: added js_preload_object directive. diffstat: nginx/ngx_http_js_module.c | 100 +++++++++++++++++++- nginx/ngx_js.c | 200 +++++++++++++++++++++++++++++++++++++++++++ nginx/ngx_js.h | 7 +- nginx/ngx_stream_js_module.c | 100 +++++++++++++++++++- 4 files changed, 392 insertions(+), 15 deletions(-) diffs (599 lines): diff -r 82f41f43abd4 -r 52b3e1f2a3e1 nginx/ngx_http_js_module.c --- a/nginx/ngx_http_js_module.c Thu Sep 15 20:20:11 2022 -0700 +++ b/nginx/ngx_http_js_module.c Fri Sep 16 12:27:40 2022 -0700 @@ -294,6 +294,13 @@ static ngx_command_t ngx_http_js_comman 0, NULL }, + { ngx_string("js_preload_object"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE13, + ngx_js_preload_object, + NGX_HTTP_LOC_CONF_OFFSET, + 0, + NULL }, + { ngx_string("js_path"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_str_array_slot, @@ -1212,8 +1219,12 @@ ngx_http_js_init_vm(ngx_http_request_t * { njs_int_t rc; ngx_str_t exception; + njs_str_t key; + ngx_uint_t i; ngx_http_js_ctx_t *ctx; + njs_opaque_value_t retval; ngx_pool_cleanup_t *cln; + ngx_js_named_path_t *preload; ngx_http_js_loc_conf_t *jlcf; jlcf = ngx_http_get_module_loc_conf(r, ngx_http_js_module); @@ -1253,6 +1264,27 @@ ngx_http_js_init_vm(ngx_http_request_t * cln->handler = ngx_http_js_cleanup_ctx; cln->data = ctx; + /* bind objects from preload vm */ + + if (jlcf->preload_objects != NGX_CONF_UNSET_PTR) { + preload = jlcf->preload_objects->elts; + + for (i = 0; i < jlcf->preload_objects->nelts; i++) { + key.start = preload[i].name.data; + key.length = preload[i].name.len; + + rc = njs_vm_value(jlcf->preload_vm, &key, njs_value_arg(&retval)); + if (rc != NJS_OK) { + return NGX_ERROR; + } + + rc = njs_vm_bind(ctx->vm, &key, njs_value_arg(&retval), 0); + if (rc != NJS_OK) { + return NGX_ERROR; + } + } + } + if (njs_vm_start(ctx->vm) == NJS_ERROR) { ngx_js_retval(ctx->vm, NULL, &exception); @@ -1288,9 +1320,13 @@ ngx_http_js_cleanup_ctx(void *data) static void ngx_http_js_cleanup_vm(void *data) { - njs_vm_t *vm = data; - - njs_vm_destroy(vm); + ngx_http_js_loc_conf_t *jlcf = data; + + njs_vm_destroy(jlcf->vm); + + if (jlcf->preload_objects != NGX_CONF_UNSET_PTR) { + njs_vm_destroy(jlcf->preload_vm); + } } @@ -4172,8 +4208,8 @@ ngx_http_js_merge_vm(ngx_conf_t *cf, ngx { ngx_str_t *path, *s; ngx_uint_t i; - ngx_array_t *imports, *paths; - ngx_js_named_path_t *import, *pi; + ngx_array_t *imports, *preload_objects, *paths; + ngx_js_named_path_t *import, *pi, *pij, *preload; if (prev->imports != NGX_CONF_UNSET_PTR && prev->vm == NULL) { if (ngx_http_js_init_conf_vm(cf, prev) != NGX_OK) { @@ -4182,16 +4218,58 @@ ngx_http_js_merge_vm(ngx_conf_t *cf, ngx } if (conf->imports == NGX_CONF_UNSET_PTR - && conf->paths == NGX_CONF_UNSET_PTR) + && conf->paths == NGX_CONF_UNSET_PTR + && conf->preload_objects == NGX_CONF_UNSET_PTR) { if (prev->vm != NULL) { + conf->preload_objects = prev->preload_objects; conf->imports = prev->imports; conf->paths = prev->paths; conf->vm = prev->vm; + + conf->preload_vm = prev->preload_vm; + return NGX_OK; } } + if (prev->preload_objects != NGX_CONF_UNSET_PTR) { + if (conf->preload_objects == NGX_CONF_UNSET_PTR) { + conf->preload_objects = prev->preload_objects; + + } else { + preload_objects = ngx_array_create(cf->pool, 4, + sizeof(ngx_js_named_path_t)); + if (preload_objects == NULL) { + return NGX_ERROR; + } + + pij = prev->preload_objects->elts; + + for (i = 0; i < prev->preload_objects->nelts; i++) { + preload = ngx_array_push(preload_objects); + if (preload == NULL) { + return NGX_ERROR; + } + + *preload = pij[i]; + } + + pij = conf->preload_objects->elts; + + for (i = 0; i < conf->preload_objects->nelts; i++) { + preload = ngx_array_push(preload_objects); + if (preload == NULL) { + return NGX_ERROR; + } + + *preload = pij[i]; + } + + conf->preload_objects = preload_objects; + } + } + if (prev->imports != NGX_CONF_UNSET_PTR) { if (conf->imports == NGX_CONF_UNSET_PTR) { conf->imports = prev->imports; @@ -4291,6 +4369,12 @@ ngx_http_js_init_conf_vm(ngx_conf_t *cf, static const njs_str_t line_number_key = njs_str("lineNumber"); static const njs_str_t file_name_key = njs_str("fileName"); + if (conf->preload_objects != NGX_CONF_UNSET_PTR) { + if (ngx_js_init_preload_vm(cf, (ngx_js_conf_t *)conf) != NGX_OK) { + return NGX_ERROR; + } + } + size = 0; import = conf->imports->elts; @@ -4352,7 +4436,7 @@ ngx_http_js_init_conf_vm(ngx_conf_t *cf, } cln->handler = ngx_http_js_cleanup_vm; - cln->data = conf->vm; + cln->data = conf; path.start = ngx_cycle->conf_prefix.data; path.length = ngx_cycle->conf_prefix.len; @@ -4619,6 +4703,7 @@ ngx_http_js_create_loc_conf(ngx_conf_t * * set by ngx_pcalloc(): * * conf->vm = NULL; + * conf->preload_vm = NULL; * conf->content = { 0, NULL }; * conf->header_filter = { 0, NULL }; * conf->body_filter = { 0, NULL }; @@ -4630,6 +4715,7 @@ ngx_http_js_create_loc_conf(ngx_conf_t * conf->paths = NGX_CONF_UNSET_PTR; conf->imports = NGX_CONF_UNSET_PTR; + conf->preload_objects = NGX_CONF_UNSET_PTR; conf->buffer_size = NGX_CONF_UNSET_SIZE; conf->max_response_body_size = NGX_CONF_UNSET_SIZE; diff -r 82f41f43abd4 -r 52b3e1f2a3e1 nginx/ngx_js.c --- a/nginx/ngx_js.c Thu Sep 15 20:20:11 2022 -0700 +++ b/nginx/ngx_js.c Fri Sep 16 12:27:40 2022 -0700 @@ -493,3 +493,203 @@ ngx_js_import(ngx_conf_t *cf, ngx_comman return NGX_CONF_OK; } + +char * +ngx_js_preload_object(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) +{ + ngx_js_conf_t *jscf = conf; + + u_char *p, *end, c; + ngx_int_t from; + ngx_str_t *value, name, path; + ngx_js_named_path_t *preload; + + value = cf->args->elts; + from = (cf->args->nelts == 4); + + if (from) { + if (ngx_strcmp(value[2].data, "from") != 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid parameter \"%V\"", &value[2]); + return NGX_CONF_ERROR; + } + } + + name = value[1]; + path = (from ? value[3] : value[1]); + + if (!from) { + end = name.data + name.len; + + for (p = end - 1; p >= name.data; p--) { + if (*p == '/') { + break; + } + } + + name.data = p + 1; + name.len = end - p - 1; + + if (name.len < 5 + || ngx_memcmp(&name.data[name.len - 5], ".json", 5) != 0) + { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "cannot extract export name from file path " + "\"%V\", use extended \"from\" syntax", &path); + return NGX_CONF_ERROR; + } + + name.len -= 5; + } + + if (name.len == 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "empty global name"); + return NGX_CONF_ERROR; + } + + p = name.data; + end = name.data + name.len; + + while (p < end) { + c = ngx_tolower(*p); + + if (*p != '_' && (c < 'a' || c > 'z')) { + if (p == name.data) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "cannot start " + "with \"%c\" in global name \"%V\"", *p, + &name); + return NGX_CONF_ERROR; + } + + if (*p < '0' || *p > '9' || *p == '.') { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid character " + "\"%c\" in global name \"%V\"", *p, + &name); + return NGX_CONF_ERROR; + } + } + + p++; + } + + if (ngx_strchr(path.data, '\'') != NULL) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid character \"'\" " + "in file path \"%V\"", &path); + return NGX_CONF_ERROR; + } + + if (jscf->preload_objects == NGX_CONF_UNSET_PTR) { + jscf->preload_objects = ngx_array_create(cf->pool, 4, + sizeof(ngx_js_named_path_t)); + if (jscf->preload_objects == NULL) { + return NGX_CONF_ERROR; + } + } + + preload = ngx_array_push(jscf->preload_objects); + if (preload == NULL) { + return NGX_CONF_ERROR; + } + + preload->name = name; + preload->path = path; + preload->file = cf->conf_file->file.name.data; + preload->line = cf->conf_file->line; + + return NGX_CONF_OK; +} + + +ngx_int_t +ngx_js_init_preload_vm(ngx_conf_t *cf, ngx_js_conf_t *conf) +{ + u_char *p, *start; + size_t size; + njs_vm_t *vm; + njs_int_t ret; + ngx_uint_t i; + njs_vm_opt_t options; + ngx_js_named_path_t *preload; + + njs_vm_opt_init(&options); + + options.init = 1; + + vm = njs_vm_create(&options); + if (vm == NULL) { + goto error; + } + + ret = ngx_js_core_init(vm, cf->log); + if (njs_slow_path(ret != NJS_OK)) { + goto error; + } + + njs_str_t str = njs_str( + "import fs from 'fs';" + + "let g = (function (np, no, nf, nsp, r) {" + "return function (n, p) {" + "p = (p[0] == '/') ? p : ngx.conf_prefix + p;" + "let o = r(p);" + "globalThis[n] = np(" + "o," + "function (k, v) {" + "if (v instanceof no) {" + "nf(nsp(v, null));" + "}" + "return v;" + "}" + ");" + "return;" + "}" + "})(JSON.parse,Object,Object.freeze," + "Object.setPrototypeOf,fs.readFileSync);\n" + ); + + size = str.length; + + preload = conf->preload_objects->elts; + for (i = 0; i < conf->preload_objects->nelts; i++) { + size += sizeof("g('','');\n") - 1 + preload[i].name.len + + preload[i].path.len; + } + + start = ngx_pnalloc(cf->pool, size); + if (start == NULL) { + return NGX_ERROR; + } + + p = ngx_cpymem(start, str.start, str.length); + + preload = conf->preload_objects->elts; + for (i = 0; i < conf->preload_objects->nelts; i++) { + p = ngx_cpymem(p, "g('", sizeof("g('") - 1); + p = ngx_cpymem(p, preload[i].name.data, preload[i].name.len); + p = ngx_cpymem(p, "','", sizeof("','") - 1); + p = ngx_cpymem(p, preload[i].path.data, preload[i].path.len); + p = ngx_cpymem(p, "');\n", sizeof("');\n") - 1); + } + + ret = njs_vm_compile(vm, &start, start + size); + if (ret != NJS_OK) { + goto error; + } + + ret = njs_vm_start(vm); + if (ret != NJS_OK) { + goto error; + } + + conf->preload_vm = vm; + + return NGX_OK; + +error: + + if (vm != NULL) { + njs_vm_destroy(vm); + } + + return NGX_ERROR; +} diff -r 82f41f43abd4 -r 52b3e1f2a3e1 nginx/ngx_js.h --- a/nginx/ngx_js.h Thu Sep 15 20:20:11 2022 -0700 +++ b/nginx/ngx_js.h Fri Sep 16 12:27:40 2022 -0700 @@ -49,7 +49,10 @@ typedef struct { #define NGX_JS_COMMON_CONF \ njs_vm_t *vm; \ ngx_array_t *imports; \ - ngx_array_t *paths \ + ngx_array_t *paths; \ + \ + njs_vm_t *preload_vm; \ + ngx_array_t *preload_objects \ typedef struct { NGX_JS_COMMON_CONF; @@ -93,6 +96,8 @@ njs_int_t ngx_js_ext_log(njs_vm_t *vm, n void ngx_js_logger(njs_vm_t *vm, njs_external_ptr_t external, njs_log_level_t level, const u_char *start, size_t length); char * ngx_js_import(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); +char * ngx_js_preload_object(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); +ngx_int_t ngx_js_init_preload_vm(ngx_conf_t *cf, ngx_js_conf_t *conf); njs_int_t ngx_js_ext_string(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); diff -r 82f41f43abd4 -r 52b3e1f2a3e1 nginx/ngx_stream_js_module.c --- a/nginx/ngx_stream_js_module.c Thu Sep 15 20:20:11 2022 -0700 +++ b/nginx/ngx_stream_js_module.c Fri Sep 16 12:27:40 2022 -0700 @@ -169,6 +169,13 @@ static ngx_command_t ngx_stream_js_comm 0, NULL }, + { ngx_string("js_preload_object"), + NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE13, + ngx_js_preload_object, + NGX_STREAM_SRV_CONF_OFFSET, + 0, + NULL }, + { ngx_string("js_path"), NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, ngx_conf_set_str_array_slot, @@ -858,8 +865,12 @@ static ngx_int_t ngx_stream_js_init_vm(ngx_stream_session_t *s) { njs_int_t rc; + njs_str_t key; ngx_str_t exception; + ngx_uint_t i; + njs_opaque_value_t retval; ngx_pool_cleanup_t *cln; + ngx_js_named_path_t *preload; ngx_stream_js_ctx_t *ctx; ngx_stream_js_srv_conf_t *jscf; @@ -898,6 +909,27 @@ ngx_stream_js_init_vm(ngx_stream_session cln->handler = ngx_stream_js_cleanup; cln->data = s; + /* bind objects from preload vm */ + + if (jscf->preload_objects != NGX_CONF_UNSET_PTR) { + preload = jscf->preload_objects->elts; + + for (i = 0; i < jscf->preload_objects->nelts; i++) { + key.start = preload[i].name.data; + key.length = preload[i].name.len; + + rc = njs_vm_value(jscf->preload_vm, &key, njs_value_arg(&retval)); + if (rc != NJS_OK) { + return NGX_ERROR; + } + + rc = njs_vm_bind(ctx->vm, &key, njs_value_arg(&retval), 0); + if (rc != NJS_OK) { + return NGX_ERROR; + } + } + } + if (njs_vm_start(ctx->vm) == NJS_ERROR) { ngx_js_retval(ctx->vm, NULL, &exception); @@ -953,9 +985,13 @@ ngx_stream_js_cleanup(void *data) static void ngx_stream_js_cleanup_vm(void *data) { - njs_vm_t *vm = data; - - njs_vm_destroy(vm); + ngx_stream_js_srv_conf_t *jscf = data; + + njs_vm_destroy(jscf->vm); + + if (jscf->preload_objects != NGX_CONF_UNSET_PTR) { + njs_vm_destroy(jscf->preload_vm); + } } @@ -1644,8 +1680,8 @@ ngx_stream_js_merge_vm(ngx_conf_t *cf, n { ngx_str_t *path, *s; ngx_uint_t i; - ngx_array_t *imports, *paths; - ngx_js_named_path_t *import, *pi; + ngx_array_t *imports, *preload_objects, *paths; + ngx_js_named_path_t *import, *pi, *pij, *preload; if (prev->imports != NGX_CONF_UNSET_PTR && prev->vm == NULL) { if (ngx_stream_js_init_conf_vm(cf, prev) != NGX_OK) { @@ -1654,16 +1690,58 @@ ngx_stream_js_merge_vm(ngx_conf_t *cf, n } if (conf->imports == NGX_CONF_UNSET_PTR - && conf->paths == NGX_CONF_UNSET_PTR) + && conf->paths == NGX_CONF_UNSET_PTR + && conf->preload_objects == NGX_CONF_UNSET_PTR) { if (prev->vm != NULL) { + conf->preload_objects = prev->preload_objects; conf->imports = prev->imports; conf->paths = prev->paths; conf->vm = prev->vm; + + conf->preload_vm = prev->preload_vm; + return NGX_OK; } } + if (prev->preload_objects != NGX_CONF_UNSET_PTR) { + if (conf->preload_objects == NGX_CONF_UNSET_PTR) { + conf->preload_objects = prev->preload_objects; + + } else { + preload_objects = ngx_array_create(cf->pool, 4, + sizeof(ngx_js_named_path_t)); + if (preload_objects == NULL) { + return NGX_ERROR; + } + + pij = prev->preload_objects->elts; + + for (i = 0; i < prev->preload_objects->nelts; i++) { + preload = ngx_array_push(preload_objects); + if (preload == NULL) { + return NGX_ERROR; + } + + *preload = pij[i]; + } + + pij = conf->preload_objects->elts; + + for (i = 0; i < conf->preload_objects->nelts; i++) { + preload = ngx_array_push(preload_objects); + if (preload == NULL) { + return NGX_ERROR; + } + + *preload = pij[i]; + } + + conf->preload_objects = preload_objects; + } + } + if (prev->imports != NGX_CONF_UNSET_PTR) { if (conf->imports == NGX_CONF_UNSET_PTR) { conf->imports = prev->imports; @@ -1763,6 +1841,12 @@ ngx_stream_js_init_conf_vm(ngx_conf_t *c static const njs_str_t line_number_key = njs_str("lineNumber"); static const njs_str_t file_name_key = njs_str("fileName"); + if (conf->preload_objects != NGX_CONF_UNSET_PTR) { + if (ngx_js_init_preload_vm(cf, (ngx_js_conf_t *)conf) != NGX_OK) { + return NGX_ERROR; + } + } + size = 0; import = conf->imports->elts; @@ -1823,7 +1907,7 @@ ngx_stream_js_init_conf_vm(ngx_conf_t *c } cln->handler = ngx_stream_js_cleanup_vm; - cln->data = conf->vm; + cln->data = conf; path.start = ngx_cycle->conf_prefix.data; path.length = ngx_cycle->conf_prefix.len; @@ -2026,6 +2110,7 @@ ngx_stream_js_create_srv_conf(ngx_conf_t * set by ngx_pcalloc(): * * conf->vm = NULL; + * conf->preload_vm = NULL; * conf->access = { 0, NULL }; * conf->preread = { 0, NULL }; * conf->filter = { 0, NULL }; @@ -2040,6 +2125,7 @@ ngx_stream_js_create_srv_conf(ngx_conf_t conf->buffer_size = NGX_CONF_UNSET_SIZE; conf->max_response_body_size = NGX_CONF_UNSET_SIZE; conf->timeout = NGX_CONF_UNSET_MSEC; + conf->preload_objects = NGX_CONF_UNSET_PTR; #if (NGX_STREAM_SSL) conf->ssl_verify = NGX_CONF_UNSET;

1 week

[njs] Fixed complex assignments.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/82f41f43abd4 branches: changeset: 1956:82f41f43abd4 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Thu Sep 15 20:20:11 2022 -0700 description: Fixed complex assignments. A new instruction is introduced NJS_VMCODE_TO_PROPERTY_KEY to ensure that property key is evaluated only once. diffstat: src/njs_disassembler.c | 2 ++ src/njs_generator.c | 45 +++++++++++++++++++++++++++++++++++++-------- src/njs_value.c | 8 +++++--- src/njs_vmcode.c | 17 +++++++++++++++++ src/njs_vmcode.h | 1 + src/test/njs_unit_test.c | 7 +++++-- 6 files changed, 67 insertions(+), 13 deletions(-) diffs (231 lines): diff -r 23caaca15f08 -r 82f41f43abd4 src/njs_disassembler.c --- a/src/njs_disassembler.c Thu Sep 15 20:20:10 2022 -0700 +++ b/src/njs_disassembler.c Thu Sep 15 20:20:11 2022 -0700 @@ -74,6 +74,8 @@ static njs_code_name_t code_names[] = { njs_str("VOID ") }, { NJS_VMCODE_TYPEOF, sizeof(njs_vmcode_2addr_t), njs_str("TYPEOF ") }, + { NJS_VMCODE_TO_PROPERTY_KEY, sizeof(njs_vmcode_3addr_t), + njs_str("TO PROPERTY KEY ") }, { NJS_VMCODE_UNARY_PLUS, sizeof(njs_vmcode_2addr_t), njs_str("PLUS ") }, diff -r 23caaca15f08 -r 82f41f43abd4 src/njs_generator.c --- a/src/njs_generator.c Thu Sep 15 20:20:10 2022 -0700 +++ b/src/njs_generator.c Thu Sep 15 20:20:11 2022 -0700 @@ -3016,9 +3016,10 @@ static njs_int_t njs_generate_operation_assignment_prop(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_index_t index, src; + njs_index_t index, src, prop_index; njs_parser_node_t *lvalue, *object, *property; njs_vmcode_move_t *move; + njs_vmcode_3addr_t *to_property_key; njs_vmcode_prop_get_t *prop_get; lvalue = node->left; @@ -3053,6 +3054,18 @@ njs_generate_operation_assignment_prop(n } } + prop_index = njs_generate_node_temp_index_get(vm, generator, node); + if (njs_slow_path(prop_index == NJS_INDEX_ERROR)) { + return NJS_ERROR; + } + + njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, + NJS_VMCODE_TO_PROPERTY_KEY, 2, property); + + to_property_key->src2 = object->index; + to_property_key->src1 = property->index; + to_property_key->dst = prop_index; + index = njs_generate_node_temp_index_get(vm, generator, node); if (njs_slow_path(index == NJS_INDEX_ERROR)) { return NJS_ERROR; @@ -3062,13 +3075,14 @@ njs_generate_operation_assignment_prop(n NJS_VMCODE_PROPERTY_GET, 3, property); prop_get->value = index; prop_get->object = object->index; - prop_get->property = property->index; + prop_get->property = prop_index; njs_generator_next(generator, njs_generate, node->right); return njs_generator_after(vm, generator, njs_queue_first(&generator->stack), node, - njs_generate_operation_assignment_end, NULL, 0); + njs_generate_operation_assignment_end, + &prop_index, sizeof(njs_index_t)); } @@ -3077,6 +3091,7 @@ njs_generate_operation_assignment_end(nj njs_parser_node_t *node) { njs_int_t ret; + njs_index_t prop_index; njs_parser_node_t *lvalue, *expr; njs_vmcode_3addr_t *code; njs_vmcode_prop_set_t *prop_set; @@ -3084,6 +3099,8 @@ njs_generate_operation_assignment_end(nj lvalue = node->left; expr = node->right; + prop_index = *((njs_index_t *) generator->context); + njs_generate_code(generator, njs_vmcode_3addr_t, code, node->u.operation, 3, expr); code->dst = node->index; @@ -3094,7 +3111,7 @@ njs_generate_operation_assignment_end(nj NJS_VMCODE_PROPERTY_SET, 3, expr); prop_set->value = node->index; prop_set->object = lvalue->left->index; - prop_set->property = lvalue->right->index; + prop_set->property = prop_index; ret = njs_generate_children_indexes_release(vm, generator, lvalue); if (njs_slow_path(ret != NJS_OK)) { @@ -3677,9 +3694,9 @@ njs_generate_inc_dec_operation_prop(njs_ { njs_int_t ret; njs_bool_t post; - njs_index_t index, dest_index; + njs_index_t index, dest_index, prop_index; njs_parser_node_t *lvalue; - njs_vmcode_3addr_t *code; + njs_vmcode_3addr_t *code, *to_property_key; njs_vmcode_prop_get_t *prop_get; njs_vmcode_prop_set_t *prop_set; @@ -3701,6 +3718,18 @@ njs_generate_inc_dec_operation_prop(njs_ found: + prop_index = njs_generate_temp_index_get(vm, generator, node); + if (njs_slow_path(prop_index == NJS_INDEX_ERROR)) { + return NJS_ERROR; + } + + njs_generate_code(generator, njs_vmcode_3addr_t, to_property_key, + NJS_VMCODE_TO_PROPERTY_KEY, 2, node); + + to_property_key->src2 = lvalue->left->index; + to_property_key->src1 = lvalue->right->index; + to_property_key->dst = prop_index; + post = *((njs_bool_t *) generator->context); index = post ? njs_generate_temp_index_get(vm, generator, node) @@ -3714,7 +3743,7 @@ found: NJS_VMCODE_PROPERTY_GET, 3, node); prop_get->value = index; prop_get->object = lvalue->left->index; - prop_get->property = lvalue->right->index; + prop_get->property = prop_index; njs_generate_code(generator, njs_vmcode_3addr_t, code, node->u.operation, 3, node); @@ -3726,7 +3755,7 @@ found: NJS_VMCODE_PROPERTY_SET, 3, node); prop_set->value = index; prop_set->object = lvalue->left->index; - prop_set->property = lvalue->right->index; + prop_set->property = prop_index; if (post) { ret = njs_generate_index_release(vm, generator, index); diff -r 23caaca15f08 -r 82f41f43abd4 src/njs_value.c --- a/src/njs_value.c Thu Sep 15 20:20:10 2022 -0700 +++ b/src/njs_value.c Thu Sep 15 20:20:11 2022 -0700 @@ -586,12 +586,14 @@ njs_property_query(njs_vm_t *vm, njs_pro if (njs_fast_path(ret == NJS_OK)) { njs_string_get(&pq->key, &pq->lhq.key); - njs_type_error(vm, "cannot get property \"%V\" of undefined", - &pq->lhq.key); + njs_type_error(vm, "cannot get property \"%V\" of %s", + &pq->lhq.key, njs_is_null(value) ? "null" + : "undefined"); return NJS_ERROR; } - njs_type_error(vm, "cannot get property \"unknown\" of undefined"); + njs_type_error(vm, "cannot get property \"unknown\" of %s", + njs_is_null(value) ? "null" : "undefined"); return NJS_ERROR; } diff -r 23caaca15f08 -r 82f41f43abd4 src/njs_vmcode.c --- a/src/njs_vmcode.c Thu Sep 15 20:20:10 2022 -0700 +++ b/src/njs_vmcode.c Thu Sep 15 20:20:11 2022 -0700 @@ -883,9 +883,26 @@ next: case NJS_VMCODE_ARGUMENTS: ret = njs_vmcode_arguments(vm, pc); if (njs_slow_path(ret == NJS_ERROR)) { + } + + break; + + case NJS_VMCODE_TO_PROPERTY_KEY: + njs_vmcode_operand(vm, (njs_index_t) value2, retval); + njs_vmcode_operand(vm, vmcode->operand3, value2); + + if (njs_slow_path(njs_is_null_or_undefined(value2))) { + (void) njs_throw_cannot_property(vm, value2, value1, + "get"); goto error; } + ret = njs_value_to_string(vm, retval, value1); + if (njs_fast_path(ret == NJS_ERROR)) { + goto error; + } + + ret = sizeof(njs_vmcode_3addr_t); break; case NJS_VMCODE_PROTO_INIT: diff -r 23caaca15f08 -r 82f41f43abd4 src/njs_vmcode.h --- a/src/njs_vmcode.h Thu Sep 15 20:20:10 2022 -0700 +++ b/src/njs_vmcode.h Thu Sep 15 20:20:11 2022 -0700 @@ -49,6 +49,7 @@ enum { NJS_VMCODE_THIS, NJS_VMCODE_ARGUMENTS, NJS_VMCODE_PROTO_INIT, + NJS_VMCODE_TO_PROPERTY_KEY, NJS_VMCODE_IMPORT, NJS_VMCODE_AWAIT, diff -r 23caaca15f08 -r 82f41f43abd4 src/test/njs_unit_test.c --- a/src/test/njs_unit_test.c Thu Sep 15 20:20:10 2022 -0700 +++ b/src/test/njs_unit_test.c Thu Sep 15 20:20:11 2022 -0700 @@ -3651,7 +3651,7 @@ static njs_unit_test_t njs_test[] = njs_str("TypeError: cannot get property \"b\" of undefined") }, { njs_str("var a = null; a.b++; a.b"), - njs_str("TypeError: cannot get property \"b\" of undefined") }, + njs_str("TypeError: cannot get property \"b\" of null") }, { njs_str("var a = true; a.b++; a.b"), njs_str("TypeError: property set on primitive boolean type") }, @@ -4423,6 +4423,9 @@ static njs_unit_test_t njs_test[] = { njs_str("var o = null; o[{toString:()=>{throw 'OOps'}}] = 1"), njs_str("TypeError: cannot set property \"[object Object]\" of null") }, + { njs_str("var o = null; o[{toString:()=>{throw 'OOps'}}] += 1"), + njs_str("TypeError: cannot get property \"[object Object]\" of null") }, + /**/ { njs_str("Array.isArray()"), @@ -12281,7 +12284,7 @@ static njs_unit_test_t njs_test[] = njs_str("TypeError: Cyclic __proto__ value") }, { njs_str("Object.prototype.__proto__.f()"), - njs_str("TypeError: cannot get property \"f\" of undefined") }, + njs_str("TypeError: cannot get property \"f\" of null") }, { njs_str("var obj = Object.create(null); obj.one = 1;" "var res = [];"

1 week, 1 day

[njs] Fixed property set instruction when key modifies base binding.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/23caaca15f08 branches: changeset: 1955:23caaca15f08 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Thu Sep 15 20:20:10 2022 -0700 description: Fixed property set instruction when key modifies base binding. Previously, when obj[prop] expression was evaluated, and prop was an object with custom "toString" method, which modifies obj binding as its side-effect, the binding update was visible to property set instruction which is not correct. This closes #550 issue on Github. diffstat: src/njs_object.c | 22 ++++++++++-- src/njs_value.c | 25 +++++++++------ src/njs_value.h | 4 ++ src/njs_vmcode.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++- src/test/njs_unit_test.c | 16 +++++++++- 5 files changed, 129 insertions(+), 18 deletions(-) diffs (294 lines): diff -r 75922905bd9c -r 23caaca15f08 src/njs_object.c --- a/src/njs_object.c Thu Sep 15 17:56:35 2022 -0700 +++ b/src/njs_object.c Thu Sep 15 20:20:10 2022 -0700 @@ -2450,7 +2450,7 @@ njs_object_prototype_has_own_property(nj njs_uint_t nargs, njs_index_t unused) { njs_int_t ret; - njs_value_t *value, *property; + njs_value_t *value, *property, lvalue; njs_property_query_t pq; value = njs_argument(args, 0); @@ -2461,7 +2461,14 @@ njs_object_prototype_has_own_property(nj return NJS_ERROR; } - property = njs_arg(args, nargs, 1); + property = njs_lvalue_arg(&lvalue, args, nargs, 1); + + if (njs_slow_path(!njs_is_key(property))) { + ret = njs_value_to_key(vm, property, property); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + } njs_property_query_init(&pq, NJS_PROPERTY_QUERY_GET, 1); @@ -2488,7 +2495,7 @@ njs_object_prototype_prop_is_enumerable( njs_uint_t nargs, njs_index_t unused) { njs_int_t ret; - njs_value_t *value, *property; + njs_value_t *value, *property, lvalue; const njs_value_t *retval; njs_object_prop_t *prop; njs_property_query_t pq; @@ -2501,7 +2508,14 @@ njs_object_prototype_prop_is_enumerable( return NJS_ERROR; } - property = njs_arg(args, nargs, 1); + property = njs_lvalue_arg(&lvalue, args, nargs, 1); + + if (njs_slow_path(!njs_is_key(property))) { + ret = njs_value_to_key(vm, property, property); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + } njs_property_query_init(&pq, NJS_PROPERTY_QUERY_GET, 1); diff -r 75922905bd9c -r 23caaca15f08 src/njs_value.c --- a/src/njs_value.c Thu Sep 15 17:56:35 2022 -0700 +++ b/src/njs_value.c Thu Sep 15 20:20:10 2022 -0700 @@ -535,20 +535,11 @@ njs_property_query(njs_vm_t *vm, njs_pro uint32_t index; njs_int_t ret; njs_object_t *obj; - njs_value_t prop; njs_function_t *function; - if (njs_slow_path(!njs_is_primitive(key))) { - ret = njs_value_to_string(vm, &prop, key); - if (ret != NJS_OK) { - return ret; - } - - key = &prop; - } + njs_assert(njs_is_index_or_key(key)); switch (value->type) { - case NJS_BOOLEAN: case NJS_NUMBER: case NJS_SYMBOL: @@ -1004,6 +995,8 @@ njs_value_property(njs_vm_t *vm, njs_val njs_typed_array_t *tarray; njs_property_query_t pq; + njs_assert(njs_is_index_or_key(key)); + if (njs_fast_path(njs_is_number(key))) { num = njs_number(key); @@ -1135,6 +1128,8 @@ njs_value_property_set(njs_vm_t *vm, njs static const njs_str_t length_key = njs_str("length"); + njs_assert(njs_is_index_or_key(key)); + if (njs_fast_path(njs_is_number(key))) { num = njs_number(key); @@ -1330,9 +1325,19 @@ njs_value_property_delete(njs_vm_t *vm, njs_value_t *removed, njs_bool_t thrw) { njs_int_t ret; + njs_value_t primitive; njs_object_prop_t *prop; njs_property_query_t pq; + if (njs_slow_path(!njs_is_key(key))) { + ret = njs_value_to_key(vm, &primitive, key); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + + key = &primitive; + } + njs_property_query_init(&pq, NJS_PROPERTY_QUERY_DELETE, 1); ret = njs_property_query(vm, &pq, value, key); diff -r 75922905bd9c -r 23caaca15f08 src/njs_value.h --- a/src/njs_value.h Thu Sep 15 17:56:35 2022 -0700 +++ b/src/njs_value.h Thu Sep 15 20:20:10 2022 -0700 @@ -532,6 +532,10 @@ typedef struct { (njs_is_string(value) || njs_is_symbol(value)) +#define njs_is_index_or_key(value) \ + (njs_is_number(value) || njs_is_key(value)) + + /* * The truth field coincides with short_string.size and short_string.length * so when string size and length are zero the string's value is false and diff -r 75922905bd9c -r 23caaca15f08 src/njs_vmcode.c --- a/src/njs_vmcode.c Thu Sep 15 17:56:35 2022 -0700 +++ b/src/njs_vmcode.c Thu Sep 15 20:20:10 2022 -0700 @@ -58,6 +58,8 @@ static njs_jump_off_t njs_vmcode_try_end static njs_jump_off_t njs_vmcode_finally(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval, u_char *pc); static void njs_vmcode_error(njs_vm_t *vm, u_char *pc); +static njs_int_t njs_throw_cannot_property(njs_vm_t *vm, njs_value_t *object, + njs_value_t *key, const char *what); static njs_jump_off_t njs_string_concat(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2); @@ -185,6 +187,21 @@ next: get = (njs_vmcode_prop_get_t *) pc; njs_vmcode_operand(vm, get->value, retval); + if (njs_slow_path(!njs_is_index_or_key(value2))) { + if (njs_slow_path(njs_is_null_or_undefined(value1))) { + (void) njs_throw_cannot_property(vm, value1, value2, + "get"); + goto error; + } + + ret = njs_value_to_key(vm, &primitive1, value2); + if (njs_slow_path(ret != NJS_OK)) { + goto error; + } + + value2 = &primitive1; + } + ret = njs_value_property(vm, value1, value2, retval); if (njs_slow_path(ret == NJS_ERROR)) { goto error; @@ -670,6 +687,23 @@ next: set = (njs_vmcode_prop_set_t *) pc; njs_vmcode_operand(vm, set->value, retval); + if (njs_slow_path(!njs_is_index_or_key(value2))) { + if (njs_slow_path(njs_is_null_or_undefined(value1))) { + (void) njs_throw_cannot_property(vm, value1, value2, + "set"); + goto error; + } + + njs_value_assign(&primitive1, value1); + ret = njs_value_to_key(vm, &primitive2, value2); + if (njs_slow_path(ret != NJS_OK)) { + goto error; + } + + value1 = &primitive1; + value2 = &primitive2; + } + ret = njs_value_property_set(vm, value1, value2, retval); if (njs_slow_path(ret == NJS_ERROR)) { goto error; @@ -768,6 +802,21 @@ next: case NJS_VMCODE_METHOD_FRAME: method_frame = (njs_vmcode_method_frame_t *) pc; + if (njs_slow_path(!njs_is_key(value2))) { + if (njs_slow_path(njs_is_null_or_undefined(value1))) { + (void) njs_throw_cannot_property(vm, value1, value2, + "get"); + goto error; + } + + ret = njs_value_to_key(vm, &primitive1, value2); + if (njs_slow_path(ret != NJS_OK)) { + goto error; + } + + value2 = &primitive1; + } + ret = njs_value_property(vm, value1, value2, &dst); if (njs_slow_path(ret == NJS_ERROR)) { goto error; @@ -1417,6 +1466,7 @@ static njs_jump_off_t njs_vmcode_property_in(njs_vm_t *vm, njs_value_t *value, njs_value_t *key) { njs_int_t ret; + njs_value_t primitive; njs_property_query_t pq; if (njs_slow_path(njs_is_primitive(value))) { @@ -1425,11 +1475,13 @@ njs_vmcode_property_in(njs_vm_t *vm, njs return NJS_ERROR; } - if (njs_slow_path(!njs_is_key(key))) { - ret = njs_value_to_key(vm, key, key); + if (njs_slow_path(!njs_is_index_or_key(key))) { + ret = njs_value_to_key(vm, &primitive, key); if (njs_slow_path(ret != NJS_OK)) { - return ret; + return NJS_ERROR; } + + key = &primitive; } njs_property_query_init(&pq, NJS_PROPERTY_QUERY_GET, 0); @@ -2186,3 +2238,25 @@ njs_vmcode_error(njs_vm_t *vm, u_char *p njs_error_fmt_new(vm, &vm->retval, err->type, "%V", &err->u.message); } } + + +static njs_int_t +njs_throw_cannot_property(njs_vm_t *vm, njs_value_t *object, njs_value_t *key, + const char *what) +{ + njs_int_t ret; + njs_str_t string; + njs_value_t dst; + + ret = njs_value_to_key2(vm, &dst, key, 0); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + + njs_key_string_get(vm, &dst, &string); + + njs_type_error(vm, "cannot %s property \"%V\" of %s", what, + &string, njs_is_null(object) ? "null" : "undefined"); + + return NJS_OK; +} diff -r 75922905bd9c -r 23caaca15f08 src/test/njs_unit_test.c --- a/src/test/njs_unit_test.c Thu Sep 15 17:56:35 2022 -0700 +++ b/src/test/njs_unit_test.c Thu Sep 15 20:20:10 2022 -0700 @@ -3462,7 +3462,7 @@ static njs_unit_test_t njs_test[] = { njs_str("function f() { Object.prototype.toString = 1; };" "Object.prototype.toString = f;" "(function () { try { 's'[{}](); } catch (e) { throw e; } })()"), - njs_str("TypeError: Cannot convert object to primitive value") }, + njs_str("TypeError: (intermediate value)[\"undefined\"] is not a function") }, { njs_str("var i; for (i = 0; i < 10; i++) { i += 1 } i"), njs_str("10") }, @@ -4409,6 +4409,20 @@ static njs_unit_test_t njs_test[] = "var a = [1,2]; a[1.5] = 5; '' + (n in a) + (delete a[n])"), njs_str("truetrue") }, + { njs_str("var o = {}, v = o;" + "v[{toString: () => { v = 'V'; return 'a';}}] = 1;" + "[v, o.a]"), + njs_str("V,1") }, + + { njs_str("var o = null; o[{toString:()=>{throw 'OOps'}}]"), + njs_str("TypeError: cannot get property \"[object Object]\" of null") }, + + { njs_str("var o = null; o[{toString:()=>{throw 'OOps'}}]()"), + njs_str("TypeError: cannot get property \"[object Object]\" of null") }, + + { njs_str("var o = null; o[{toString:()=>{throw 'OOps'}}] = 1"), + njs_str("TypeError: cannot set property \"[object Object]\" of null") }, + /**/ { njs_str("Array.isArray()"),

1 week, 1 day

Jump to page:

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

nginx-devel