walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Header key and value must be string in mruby script

This commit is contained in:
Tatsuhiro Tsujikawa 2016-11-03 22:58:45 +09:00
parent 5e10cc4cad
commit 6bcdb178a5
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shrpx_mruby_module_request.cc
View File

@ -218,7 +218,7 @@ mrb_value request_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
check_phase(mrb, data->phase, PHASE_REQUEST); check_phase(mrb, data->phase, PHASE_REQUEST);
mrb_value key, values; mrb_value key, values;
mrb_get_args(mrb, "oo", &key, &values); mrb_get_args(mrb, "So", &key, &values);
if (RSTRING_LEN(key) == 0) { if (RSTRING_LEN(key) == 0) {
mrb_raise(mrb, E_RUNTIME_ERROR, "empty key is not allowed"); mrb_raise(mrb, E_RUNTIME_ERROR, "empty key is not allowed");
@ -251,10 +251,14 @@ mrb_value request_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
headers.resize(p); headers.resize(p);
} }
if (mrb_obj_is_instance_of(mrb, values, mrb->array_class)) { if (mrb_array_p(values)) {
auto n = mrb_ary_len(mrb, values); auto n = mrb_ary_len(mrb, values);
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
auto value = mrb_ary_ref(mrb, values, i); auto value = mrb_ary_ref(mrb, values, i);
if (!mrb_string_p(value)) {
mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
}
req.fs.add_header_token( req.fs.add_header_token(
keyref, keyref,
make_string_ref(balloc, make_string_ref(balloc,
@ -262,13 +266,15 @@ mrb_value request_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
static_cast<size_t>(RSTRING_LEN(value))}), static_cast<size_t>(RSTRING_LEN(value))}),
false, token); false, token);
} }
} else if (!mrb_nil_p(values)) { } else if (mrb_string_p(values)) {
req.fs.add_header_token( req.fs.add_header_token(
keyref, keyref,
make_string_ref(balloc, make_string_ref(balloc,
StringRef{RSTRING_PTR(values), StringRef{RSTRING_PTR(values),
static_cast<size_t>(RSTRING_LEN(values))}), static_cast<size_t>(RSTRING_LEN(values))}),
false, token); false, token);
} else {
mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
} }
return mrb_nil_value(); return mrb_nil_value();

12
src/shrpx_mruby_module_response.cc
View File

@ -110,7 +110,7 @@ mrb_value response_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
auto &balloc = downstream->get_block_allocator(); auto &balloc = downstream->get_block_allocator();
mrb_value key, values; mrb_value key, values;
mrb_get_args(mrb, "oo", &key, &values); mrb_get_args(mrb, "So", &key, &values);
if (RSTRING_LEN(key) == 0) { if (RSTRING_LEN(key) == 0) {
mrb_raise(mrb, E_RUNTIME_ERROR, "empty key is not allowed"); mrb_raise(mrb, E_RUNTIME_ERROR, "empty key is not allowed");
@ -143,10 +143,14 @@ mrb_value response_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
headers.resize(p); headers.resize(p);
} }
if (mrb_obj_is_instance_of(mrb, values, mrb->array_class)) { if (mrb_array_p(values)) {
auto n = mrb_ary_len(mrb, values); auto n = mrb_ary_len(mrb, values);
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
auto value = mrb_ary_ref(mrb, values, i); auto value = mrb_ary_ref(mrb, values, i);
if (!mrb_string_p(value)) {
mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
}
resp.fs.add_header_token( resp.fs.add_header_token(
keyref, keyref,
make_string_ref(balloc, make_string_ref(balloc,
@ -154,13 +158,15 @@ mrb_value response_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
static_cast<size_t>(RSTRING_LEN(value))}), static_cast<size_t>(RSTRING_LEN(value))}),
false, token); false, token);
} }
} else if (!mrb_nil_p(values)) { } else if (mrb_string_p(values)) {
resp.fs.add_header_token( resp.fs.add_header_token(
keyref, keyref,
make_string_ref(balloc, make_string_ref(balloc,
StringRef{RSTRING_PTR(values), StringRef{RSTRING_PTR(values),
static_cast<size_t>(RSTRING_LEN(values))}), static_cast<size_t>(RSTRING_LEN(values))}),
false, token); false, token);
} else {
mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
} }
return mrb_nil_value(); return mrb_nil_value();