Skip to content

Commit

Permalink
Merge pull request #105 from aerospike/update-submodules
Browse files Browse the repository at this point in the history 
fix: TOOLS-2993 Ensure Map Keys are not double or boolean
  • Loading branch information
@a-spiker
a-spiker authored Feb 5, 2025
2 parents dd7552a + cc50e8a commit 4efddb1
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 28 deletions.
2 changes: 1 addition & 1 deletion modules/c-client
Submodule c-client updated 232 files
2 changes: 1 addition & 1 deletion modules/libyaml
Submodule libyaml updated 19 files
+28 −0 .github/workflows/dist.yaml
+7 −12 .github/workflows/main.yml
+0 −1 .gitignore
+2 −0 .makefile
+5 −8 Makefile.am
+1 −1 examples/strings.yaml
+18 −4 include/yaml.h
+77 −0 pkg/ReadMe.md
+3 −0 pkg/docker/.gitignore
+32 −0 pkg/docker/Dockerfile
+23 −0 pkg/docker/Makefile
+1 −0 pkg/docker/output/ReadMe
+23 −0 pkg/docker/scripts/libyaml-dist.sh
+41 −0 src/parser.c
+2 −2 src/scanner.c
+1 −1 tests/run-emitter-test-suite.c
+8 −1 tests/run-parser-test-suite.c
+28 −3 tests/run-parser.c
+1 −1 tests/test-reader.c
33 changes: 30 additions & 3 deletions src/main/object_spec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ LOCAL_HELPER void _destroy_consumer_states(struct consumer_state_s* state);
LOCAL_HELPER int _parse_bin_types(as_vector* bin_specs, uint32_t* n_bins,
const char* const obj_spec_str);
LOCAL_HELPER int _parse_const_val(const char* const obj_spec_str,
const char** stream, struct bin_spec_s* bin_spec, char delim);
const char** stream, struct bin_spec_s* bin_spec, char delim, uint8_t type, uint8_t map_state);
LOCAL_HELPER void bin_spec_free(struct bin_spec_s* bin_spec);
LOCAL_HELPER as_val* _gen_random_bool(as_random* random);
LOCAL_HELPER as_val* _gen_random_int(uint8_t range, as_random* random);
Expand Down Expand Up @@ -1160,6 +1160,12 @@ _parse_bin_types(as_vector* bin_specs, uint32_t* n_bins,
break;
}
case 'D':
if (type == CONSUMER_TYPE_MAP && map_state == MAP_KEY) {
_print_parse_error("Map key cannot be double",
obj_spec_str, str);
_destroy_consumer_states(state);
return -1;
}
bin_spec->type = BIN_SPEC_TYPE_DOUBLE;
str++;
break;
Expand Down Expand Up @@ -1228,7 +1234,7 @@ _parse_bin_types(as_vector* bin_specs, uint32_t* n_bins,
default: {
const char* prev_str = str;
// try parsing as a constant value
if (_parse_const_val(obj_spec_str, &str, bin_spec, state->delimiter) != 0) {
if (_parse_const_val(obj_spec_str, &str, bin_spec, state->delimiter, state->type, state->state) != 0) {
_destroy_consumer_states(state);
return -1;
}
Expand Down Expand Up @@ -1376,19 +1382,27 @@ _parse_bin_types(as_vector* bin_specs, uint32_t* n_bins,

LOCAL_HELPER int
_parse_const_val(const char* const obj_spec_str,
const char** str_ptr, struct bin_spec_s* bin_spec, char delim)
const char** str_ptr, struct bin_spec_s* bin_spec, char delim, uint8_t type, uint8_t map_state)
{
const char* str = *str_ptr;
switch (*str) {
case 'T':
if (!isalpha(str[1])) {
if (type == CONSUMER_TYPE_MAP && map_state == MAP_KEY) { // Reject bool as map key
_print_parse_error("Map key cannot be boolean", obj_spec_str, str);
return -1;
}
bin_spec->type = BIN_SPEC_TYPE_BOOL | BIN_SPEC_TYPE_CONST;
bin_spec->const_bool.val = as_true;
*str_ptr = str + 1;
return 0;
}
case 't':
if (strncasecmp(str, "true", 4) == 0 && !isalpha(str[4])) {
if (type == CONSUMER_TYPE_MAP && map_state == MAP_KEY) { // Reject bool as map key
_print_parse_error("Map key cannot be boolean", obj_spec_str, str);
return -1;
}
bin_spec->type = BIN_SPEC_TYPE_BOOL | BIN_SPEC_TYPE_CONST;
bin_spec->const_bool.val = as_true;
*str_ptr = str + 4;
Expand All @@ -1398,13 +1412,21 @@ _parse_const_val(const char* const obj_spec_str,

case 'F':
if (!isalpha(str[1])) {
if (type == CONSUMER_TYPE_MAP && map_state == MAP_KEY) { // Reject bool as map key
_print_parse_error("Map key cannot be boolean", obj_spec_str, str);
return -1;
}
bin_spec->type = BIN_SPEC_TYPE_BOOL | BIN_SPEC_TYPE_CONST;
bin_spec->const_bool.val = as_false;
*str_ptr = str + 1;
return 0;
}
case 'f':
if (strncasecmp(str, "false", 5) == 0 && !isalpha(str[5])) {
if (type == CONSUMER_TYPE_MAP && map_state == MAP_KEY) { // Reject bool as map key
_print_parse_error("Map key cannot be boolean", obj_spec_str, str);
return -1;
}
bin_spec->type = BIN_SPEC_TYPE_BOOL | BIN_SPEC_TYPE_CONST;
bin_spec->const_bool.val = as_false;
*str_ptr = str + 5;
Expand Down Expand Up @@ -1444,6 +1466,11 @@ _parse_const_val(const char* const obj_spec_str,
return -1;
}

if (type == CONSUMER_TYPE_MAP && map_state == MAP_KEY) { // Reject double as map key
_print_parse_error("Map key cannot be double", obj_spec_str, str);
return -1;
}

bin_spec->type = BIN_SPEC_TYPE_DOUBLE | BIN_SPEC_TYPE_CONST;
as_double_init(&bin_spec->const_double.val, val);

Expand Down
46 changes: 23 additions & 23 deletions src/test/unit/obj_spec_parse_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,10 @@ DEFINE_FAILING_TCASE(test_const_D_f, "f", "a single 'f' is not a valid float");
DEFINE_FAILING_TCASE(test_const_D_0f, "0f", "floats must always contain a '.'");
DEFINE_FAILING_TCASE(test_const_D_1f, "1f", "floats must always contain a '.'");

DEFINE_TCASE(test_const_map_key_bool, "{true:S5}");
DEFINE_FAILING_TCASE(test_const_map_key_bool, "{true:S5}", "maps cannot have boolean keys");
DEFINE_TCASE(test_const_map_key_int, "{10:S5}");
DEFINE_TCASE(test_const_map_key_str, "{\"test_key\":S5}");
DEFINE_TCASE(test_const_map_key_double, "{3.14f:S5}");
DEFINE_FAILING_TCASE(test_const_map_key_double, "{3.14f:S5}", "maps cannot have double keys");
DEFINE_FAILING_TCASE(test_const_map_keys, "{5*10:S5}", "constant map keys "
"cannot have multipliers");
DEFINE_FAILING_TCASE(test_const_map_key_bool_rep, "{true:S5,I:I,true:B10}",
Expand Down Expand Up @@ -438,11 +438,11 @@ DEFINE_TCASE(test_map_II, "{I1:I2}");
DEFINE_TCASE(test_map_ID, "{I1:D}");
DEFINE_TCASE(test_map_IS, "{I1:S4}");
DEFINE_TCASE(test_map_IB, "{I1:B5}");
DEFINE_TCASE(test_map_Db, "{D:b}");
DEFINE_TCASE(test_map_DI, "{D:I2}");
DEFINE_TCASE(test_map_DD, "{D:D}");
DEFINE_TCASE(test_map_DS, "{D:S4}");
DEFINE_TCASE(test_map_DB, "{D:B5}");
DEFINE_FAILING_TCASE(test_map_Db, "{D:b}", "maps cannot have double keys");
DEFINE_FAILING_TCASE(test_map_DI, "{D:I2}", "maps cannot have double keys");
DEFINE_FAILING_TCASE(test_map_DD, "{D:D}", "maps cannot have double keys");
DEFINE_FAILING_TCASE(test_map_DS, "{D:S4}", "maps cannot have double keys");
DEFINE_FAILING_TCASE(test_map_DB, "{D:B5}", "maps cannot have double keys");
DEFINE_TCASE(test_map_Sb, "{S2:b}");
DEFINE_TCASE(test_map_SI, "{S2:I2}");
DEFINE_TCASE(test_map_SD, "{S2:D}");
Expand Down Expand Up @@ -495,12 +495,12 @@ DEFINE_FAILING_TCASE(test_spaces, "I1 D", "need commas separating tokens");
*/
DEFINE_TCASE(test_map_to_list, "{I5:[S10,B20,D,b]}");
DEFINE_TCASE(test_list_of_maps, "[{I5:I1},{S10:B20}]");
DEFINE_TCASE(test_mixed_list_of_maps, "[{D:I3},S10,{S20:B1},b]");
DEFINE_FAILING_TCASE(test_mixed_list_of_maps, "[{D:I3},S10,{S20:B1},b]", "map cannot have double keys");
DEFINE_TCASE(test_nested_lists,
"[[S10,I4,[B10,B5,D],D],S20,[B100,I7,D,b],[[I3],[I4,I5,I6]]]");
DEFINE_TCASE(test_nested_maps, "{I5:{S30:{D:{B123:b}}}}");
DEFINE_TCASE(test_nested_mix,
"[{S10:D},[I3,{S10:B20},{I3:{D:[I1,I2,b]}},B10,b],{B32:[b,I3,I5,{I7:D}]}]");
DEFINE_FAILING_TCASE(test_nested_maps, "{I5:{S30:{D:{B123:b}}}}", "map cannot have double keys");
DEFINE_FAILING_TCASE(test_nested_mix,
"[{S10:D},[I3,{S10:B20},{I3:{D:[I1,I2,b]}},B10,b],{B32:[b,I3,I5,{I7:D}]}]", "map cannot have double keys");
DEFINE_FAILING_TCASE(test_map_key_list, "{[I3,I5]:I6}", "map key cannot be a list");
DEFINE_FAILING_TCASE(test_map_key_map, "{{S20:I4}:I1}", "map key cannot be a map");
DEFINE_FAILING_TCASE(test_map_to_undeclared_list, "{I4:I1,I2}", "map value must be single type");
Expand Down Expand Up @@ -532,7 +532,7 @@ DEFINE_TCASE(test_mult_map, "20*{I6:S20}");
DEFINE_TCASE(test_mult_within_list, "2*[5*I1,3*I2,100*S3]");
DEFINE_TCASE(test_mult_within_map, "30*{I3:[5*S20]}");
DEFINE_TCASE(test_mult_map_key_I, "{3*I2:S3}");
DEFINE_TCASE(test_mult_map_key_D, "{5*D:S3}");
DEFINE_FAILING_TCASE(test_mult_map_key_D, "{5*D:S3}", "map cannot have double keys");
DEFINE_TCASE(test_mult_map_key_S, "{2*S2:S3}");
DEFINE_TCASE(test_mult_map_key_B, "{700*B5:S3}");
DEFINE_TCASE(test_mult_map_key_I_high_coverage, "{200*I1:S3}");
Expand Down Expand Up @@ -784,10 +784,10 @@ obj_spec_suite(void)
tcase_add_ftest(tc_constants, test_const_D_0f);
tcase_add_ftest(tc_constants, test_const_D_1f);

tcase_add_ptest(tc_constants, test_const_map_key_bool);
tcase_add_ftest(tc_constants, test_const_map_key_bool);
tcase_add_ptest(tc_constants, test_const_map_key_int);
tcase_add_ptest(tc_constants, test_const_map_key_str);
tcase_add_ptest(tc_constants, test_const_map_key_double);
tcase_add_ftest(tc_constants, test_const_map_key_double);
tcase_add_ftest(tc_constants, test_const_map_keys);
tcase_add_ftest(tc_constants, test_const_map_key_bool_rep);
tcase_add_ftest(tc_constants, test_const_map_key_int_rep);
Expand Down Expand Up @@ -819,11 +819,11 @@ obj_spec_suite(void)
tcase_add_ptest(tc_map, test_map_ID);
tcase_add_ptest(tc_map, test_map_IS);
tcase_add_ptest(tc_map, test_map_IB);
tcase_add_ptest(tc_map, test_map_Db);
tcase_add_ptest(tc_map, test_map_DI);
tcase_add_ptest(tc_map, test_map_DD);
tcase_add_ptest(tc_map, test_map_DS);
tcase_add_ptest(tc_map, test_map_DB);
tcase_add_ftest(tc_map, test_map_Db);
tcase_add_ftest(tc_map, test_map_DI);
tcase_add_ftest(tc_map, test_map_DD);
tcase_add_ftest(tc_map, test_map_DS);
tcase_add_ftest(tc_map, test_map_DB);
tcase_add_ptest(tc_map, test_map_Sb);
tcase_add_ptest(tc_map, test_map_SI);
tcase_add_ptest(tc_map, test_map_SD);
Expand Down Expand Up @@ -872,10 +872,10 @@ obj_spec_suite(void)
tcase_add_checked_fixture(tc_nested, simple_setup, simple_teardown);
tcase_add_ptest(tc_nested, test_map_to_list);
tcase_add_ptest(tc_nested, test_list_of_maps);
tcase_add_ptest(tc_nested, test_mixed_list_of_maps);
tcase_add_ftest(tc_nested, test_mixed_list_of_maps);
tcase_add_ptest(tc_nested, test_nested_lists);
tcase_add_ptest(tc_nested, test_nested_maps);
tcase_add_ptest(tc_nested, test_nested_mix);
tcase_add_ftest(tc_nested, test_nested_maps);
tcase_add_ftest(tc_nested, test_nested_mix);
tcase_add_ftest(tc_nested, test_map_key_list);
tcase_add_ftest(tc_nested, test_map_key_map);
tcase_add_ftest(tc_nested, test_map_to_undeclared_list);
Expand All @@ -902,7 +902,7 @@ obj_spec_suite(void)
tcase_add_ptest(tc_multipliers, test_mult_within_list);
tcase_add_ptest(tc_multipliers, test_mult_within_map);
tcase_add_ptest(tc_multipliers, test_mult_map_key_I);
tcase_add_ptest(tc_multipliers, test_mult_map_key_D);
tcase_add_ftest(tc_multipliers, test_mult_map_key_D);
tcase_add_ptest(tc_multipliers, test_mult_map_key_S);
tcase_add_ptest(tc_multipliers, test_mult_map_key_B);
tcase_add_ptest(tc_multipliers, test_mult_map_key_I_high_coverage);
Expand Down

0 comments on commit 4efddb1

Please sign in to comment.