git.droids-corp.org
/
protos
/
libecoli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
export schema lookup
[protos/libecoli.git]
/
lib
/
ecoli_config.c
diff --git
a/lib/ecoli_config.c
b/lib/ecoli_config.c
index
838438e
..
63b5725
100644
(file)
--- a/
lib/ecoli_config.c
+++ b/
lib/ecoli_config.c
@@
-18,6
+18,13
@@
EC_LOG_TYPE_REGISTER(config);
EC_LOG_TYPE_REGISTER(config);
+const char *ec_config_reserved_keys[] = {
+ "id",
+ "attrs",
+ "help",
+ "type",
+};
+
static int
__ec_config_dump(FILE *out, const char *key, const struct ec_config *config,
size_t indent);
static int
__ec_config_dump(FILE *out, const char *key, const struct ec_config *config,
size_t indent);
@@
-25,6
+32,18
@@
static int
ec_config_dict_validate(const struct ec_keyval *dict,
const struct ec_config_schema *schema);
ec_config_dict_validate(const struct ec_keyval *dict,
const struct ec_config_schema *schema);
+bool
+ec_config_key_is_reserved(const char *name)
+{
+ size_t i;
+
+ for (i = 0; i < EC_COUNT_OF(ec_config_reserved_keys); i++) {
+ if (!strcmp(name, ec_config_reserved_keys[i]))
+ return true;
+ }
+ return false;
+}
+
/* return ec_value type as a string */
static const char *
ec_config_type_str(enum ec_config_type type)
/* return ec_value type as a string */
static const char *
ec_config_type_str(enum ec_config_type type)
@@
-82,6
+101,13
@@
__ec_config_schema_validate(const struct ec_config_schema *schema,
}
for (i = 0; schema[i].type != EC_CONFIG_TYPE_NONE; i++) {
}
for (i = 0; schema[i].type != EC_CONFIG_TYPE_NONE; i++) {
+ if (schema[i].key != NULL &&
+ ec_config_key_is_reserved(schema[i].key)) {
+ errno = EINVAL;
+ EC_LOG(EC_LOG_ERR,
+ "key name <%s> is reserved\n", schema[i].key);
+ return -1;
+ }
/* check for duplicate name if more than one element */
for (j = i + 1; schema[j].type != EC_CONFIG_TYPE_NONE; j++) {
if (!strcmp(schema[i].key, schema[j].key)) {
/* check for duplicate name if more than one element */
for (j = i + 1; schema[j].type != EC_CONFIG_TYPE_NONE; j++) {
if (!strcmp(schema[i].key, schema[j].key)) {
@@
-334,15
+360,14
@@
ec_config_list(void)
return value;
}
return value;
}
-
static
const struct ec_config_schema *
+const struct ec_config_schema *
ec_config_schema_lookup(const struct ec_config_schema *schema,
ec_config_schema_lookup(const struct ec_config_schema *schema,
- const char *key
, enum ec_config_type type
)
+ const char *key)
{
size_t i;
for (i = 0; schema[i].type != EC_CONFIG_TYPE_NONE; i++) {
{
size_t i;
for (i = 0; schema[i].type != EC_CONFIG_TYPE_NONE; i++) {
- if (!strcmp(key, schema[i].key) &&
- type == schema[i].type)
+ if (!strcmp(key, schema[i].key))
return &schema[i];
}
return &schema[i];
}
@@
-510,12
+535,11
@@
ec_config_dict_validate(const struct ec_keyval *dict,
key = ec_keyval_iter_get_key(iter);
value = ec_keyval_iter_get_val(iter);
key = ec_keyval_iter_get_key(iter);
value = ec_keyval_iter_get_val(iter);
- sch = ec_config_schema_lookup(schema, key
, value->type
);
- if (sch == NULL) {
+ sch = ec_config_schema_lookup(schema, key);
+ if (sch == NULL
|| sch->type != value->type
) {
errno = EBADMSG;
goto fail;
}
errno = EBADMSG;
goto fail;
}
-
if (value->type == EC_CONFIG_TYPE_LIST) {
if (ec_config_list_validate(&value->list,
sch->subschema) < 0)
if (value->type == EC_CONFIG_TYPE_LIST) {
if (ec_config_list_validate(&value->list,
sch->subschema) < 0)
@@
-935,6
+959,11
@@
static int ec_config_testcase(void)
int testres = 0;
int ret;
int testres = 0;
int ret;
+ testres |= EC_TEST_CHECK(ec_config_key_is_reserved("id"),
+ "'id' should be reserved");
+ testres |= EC_TEST_CHECK(!ec_config_key_is_reserved("foo"),
+ "'foo' should not be reserved");
+
node = ec_node("empty", EC_NO_ID);
if (node == NULL)
goto fail;
node = ec_node("empty", EC_NO_ID);
if (node == NULL)
goto fail;