extensions CHANGE use the validate callback of extension plugin
The validate callback was not used so far. It is now used for validating
data nodes by extension instances placed in the nodes themselves or in
their types (compiled types, so not matter where the extension came
from, the node's type itself or a used typedef's type).
diff --git a/src/validation.c b/src/validation.c
index 75ada9e..27d5371 100644
--- a/src/validation.c
+++ b/src/validation.c
@@ -225,8 +225,59 @@
return ret;
}
+struct node_ext {
+ struct lyd_node *node;
+ struct lysc_ext_instance *ext;
+};
+
+static LY_ERR
+node_ext_tovalidate_add(struct ly_set *node_exts, struct lysc_ext_instance *exts, struct lyd_node *node)
+{
+ LY_ERR ret = LY_SUCCESS;
+ struct lysc_ext_instance *ext;
+ struct node_ext *rec;
+
+ LY_ARRAY_FOR(exts, const struct lysc_ext_instance, ext) {
+ if (ext->def->plugin->validate) {
+ rec = malloc(sizeof *rec);
+ LY_CHECK_ERR_RET(!rec, LOGMEM(LYD_CTX(node)), LY_EMEM);
+ rec->ext = ext;
+ rec->node = node;
+
+ ret = ly_set_add(node_exts, rec, 1, NULL);
+ if (ret) {
+ free(rec);
+ break;
+ }
+ }
+ }
+
+ return ret;
+}
+
LY_ERR
-lyd_validate_unres(struct lyd_node **tree, const struct lys_module *mod, struct ly_set *node_when,
+lysc_node_ext_tovalidate(struct ly_set *node_exts, struct lyd_node *node)
+{
+ const struct lysc_node *schema = node->schema;
+
+ if (!schema) {
+ /* nothing to do */
+ return LY_SUCCESS;
+ }
+
+ /* node's extensions */
+ LY_CHECK_RET(node_ext_tovalidate_add(node_exts, schema->exts, node));
+
+ if (schema->nodetype & (LYS_LEAF | LYS_LEAFLIST)) {
+ /* type's extensions */
+ LY_CHECK_RET(node_ext_tovalidate_add(node_exts, ((struct lysc_node_leaf *)schema)->type->exts, node));
+ }
+
+ return LY_SUCCESS;
+}
+
+LY_ERR
+lyd_validate_unres(struct lyd_node **tree, const struct lys_module *mod, struct ly_set *node_when, struct ly_set *node_exts,
struct ly_set *node_types, struct ly_set *meta_types, struct lyd_node **diff)
{
LY_ERR ret = LY_SUCCESS;
@@ -245,6 +296,23 @@
assert(!node_when->count);
}
+ if (node_exts && node_exts->count) {
+ i = node_exts->count;
+ do {
+ --i;
+
+ struct node_ext *item = node_exts->objs[i];
+
+ LOG_LOCSET(item->node->schema, item->node, NULL, NULL);
+ ret = item->ext->def->plugin->validate(item->ext, item->node);
+ LOG_LOCBACK(item->node->schema ? 1 : 0, 1, 0, 0);
+ LY_CHECK_RET(ret);
+
+ /* remove this node from the set */
+ ly_set_rm_index(node_exts, i, free);
+ } while (i);
+ }
+
if (node_types && node_types->count) {
/* finish incompletely validated terminal values (traverse from the end for efficient set removal) */
i = node_types->count;
@@ -1310,6 +1378,7 @@
*
* @param[in] root Subtree root.
* @param[in,out] node_when Set for nodes with when conditions.
+ * @param[in,out] node_exts Set for nodes and extension instances with validation plugin callback.
* @param[in,out] node_types Set for unres node types.
* @param[in,out] meta_types Set for unres metadata types.
* @param[in] impl_opts Implicit options, see @ref implicitoptions.
@@ -1317,7 +1386,7 @@
* @return LY_ERR value.
*/
static LY_ERR
-lyd_validate_subtree(struct lyd_node *root, struct ly_set *node_when, struct ly_set *node_types,
+lyd_validate_subtree(struct lyd_node *root, struct ly_set *node_when, struct ly_set *node_exts, struct ly_set *node_types,
struct ly_set *meta_types, uint32_t impl_opts, struct lyd_node **diff)
{
const struct lyd_meta *meta;
@@ -1339,13 +1408,14 @@
LY_CHECK_RET(lyd_validate_new(lyd_node_child_p(node), node->schema, NULL, diff));
/* add nested defaults */
- LY_CHECK_RET(lyd_new_implicit_r(node, lyd_node_child_p(node), NULL, NULL, NULL, NULL, impl_opts, diff));
+ LY_CHECK_RET(lyd_new_implicit_r(node, lyd_node_child_p(node), NULL, NULL, NULL, NULL, NULL, impl_opts, diff));
}
if (lysc_has_when(node->schema)) {
/* when evaluation */
LY_CHECK_RET(ly_set_add(node_when, (void *)node, 1, NULL));
}
+ LY_CHECK_RET(lysc_node_ext_tovalidate(node_exts, node));
LYD_TREE_DFS_END(root, node);
}
@@ -1355,20 +1425,22 @@
LY_ERR
lyd_validate(struct lyd_node **tree, const struct lys_module *module, const struct ly_ctx *ctx, uint32_t val_opts,
- ly_bool validate_subtree, struct ly_set *node_when_p, struct ly_set *node_types_p, struct ly_set *meta_types_p,
- struct lyd_node **diff)
+ ly_bool validate_subtree, struct ly_set *node_when_p, struct ly_set *node_exts_p,
+ struct ly_set *node_types_p, struct ly_set *meta_types_p, struct lyd_node **diff)
{
LY_ERR ret = LY_SUCCESS;
struct lyd_node *first, *next, **first2, *iter;
const struct lys_module *mod;
- struct ly_set node_types = {0}, meta_types = {0}, node_when = {0};
+ struct ly_set node_types = {0}, meta_types = {0}, node_when = {0}, node_exts = {0};
uint32_t i = 0;
assert(tree && ctx);
- assert((node_when_p && node_types_p && meta_types_p) || (!node_when_p && !node_types_p && !meta_types_p));
+ assert((node_when_p && node_exts_p && node_types_p && meta_types_p) ||
+ (!node_when_p && !node_exts_p && !node_types_p && !meta_types_p));
if (!node_when_p) {
node_when_p = &node_when;
+ node_exts_p = &node_exts;
node_types_p = &node_types;
meta_types_p = &meta_types;
}
@@ -1396,7 +1468,7 @@
/* add all top-level defaults for this module, if going to validate subtree, do not add into unres sets
* (lyd_validate_subtree() adds all the nodes in that case) */
- ret = lyd_new_implicit_r(NULL, first2, NULL, mod, validate_subtree ? NULL : node_when_p,
+ ret = lyd_new_implicit_r(NULL, first2, NULL, mod, validate_subtree ? NULL : node_when_p, validate_subtree ? NULL : node_exts_p,
validate_subtree ? NULL : node_types_p, (val_opts & LYD_VALIDATE_NO_STATE) ? LYD_IMPLICIT_NO_STATE : 0, diff);
LY_CHECK_GOTO(ret, cleanup);
@@ -1408,14 +1480,14 @@
if (validate_subtree) {
/* process nested nodes */
LY_LIST_FOR(*first2, iter) {
- ret = lyd_validate_subtree(iter, node_when_p, node_types_p, meta_types_p,
+ ret = lyd_validate_subtree(iter, node_when_p, node_exts_p, node_types_p, meta_types_p,
(val_opts & LYD_VALIDATE_NO_STATE) ? LYD_IMPLICIT_NO_STATE : 0, diff);
LY_CHECK_GOTO(ret, cleanup);
}
}
/* finish incompletely validated terminal values/attributes and when conditions */
- ret = lyd_validate_unres(first2, mod, node_when_p, node_types_p, meta_types_p, diff);
+ ret = lyd_validate_unres(first2, mod, node_when_p, node_exts_p, node_types_p, meta_types_p, diff);
LY_CHECK_GOTO(ret, cleanup);
/* perform final validation that assumes the data tree is final */
@@ -1425,6 +1497,7 @@
cleanup:
ly_set_erase(&node_when, NULL);
+ ly_set_erase(&node_exts, NULL);
ly_set_erase(&node_types, NULL);
ly_set_erase(&meta_types, NULL);
return ret;
@@ -1441,7 +1514,7 @@
*diff = NULL;
}
- return lyd_validate(tree, NULL, ctx, val_opts, 1, NULL, NULL, NULL, diff);
+ return lyd_validate(tree, NULL, ctx, val_opts, 1, NULL, NULL, NULL, NULL, diff);
}
API LY_ERR
@@ -1452,7 +1525,7 @@
*diff = NULL;
}
- return lyd_validate(tree, module, (*tree) ? LYD_CTX(*tree) : module->ctx, val_opts, 1, NULL, NULL, NULL, diff);
+ return lyd_validate(tree, module, (*tree) ? LYD_CTX(*tree) : module->ctx, val_opts, 1, NULL, NULL, NULL, NULL, diff);
}
/**
@@ -1527,6 +1600,7 @@
* @param[in] int_opts Internal parser options.
* @param[in] validate_subtree Whether subtree was already validated (as part of data parsing) or not (separate validation).
* @param[in] node_when_p Set of nodes with when conditions, if NULL a local set is used.
+ * @param[in] node_exts Set of nodes with extension instances with validation plugin callback, if NULL a local set is used.
* @param[in] node_types_p Set of unres node types, if NULL a local set is used.
* @param[in] meta_types_p Set of unres metadata types, if NULL a local set is used.
* @param[out] diff Optional diff with any changes made by the validation.
@@ -1535,18 +1609,20 @@
*/
static LY_ERR
_lyd_validate_op(struct lyd_node *op_tree, struct lyd_node *op_node, const struct lyd_node *dep_tree,
- uint32_t int_opts, ly_bool validate_subtree, struct ly_set *node_when_p, struct ly_set *node_types_p,
- struct ly_set *meta_types_p, struct lyd_node **diff)
+ uint32_t int_opts, ly_bool validate_subtree, struct ly_set *node_when_p, struct ly_set *node_exts_p,
+ struct ly_set *node_types_p, struct ly_set *meta_types_p, struct lyd_node **diff)
{
LY_ERR rc = LY_SUCCESS;
struct lyd_node *tree_sibling, *tree_parent, *op_subtree, *op_parent, *child;
- struct ly_set node_types = {0}, meta_types = {0}, node_when = {0};
+ struct ly_set node_types = {0}, meta_types = {0}, node_when = {0}, node_exts = {0};
assert(op_tree && op_node);
- assert((node_when_p && node_types_p && meta_types_p) || (!node_when_p && !node_types_p && !meta_types_p));
+ assert((node_when_p && node_exts_p && node_types_p && meta_types_p) ||
+ (!node_when_p && !node_exts_p && !node_types_p && !meta_types_p));
if (!node_when_p) {
node_when_p = &node_when;
+ node_exts_p = &node_exts;
node_types_p = &node_types;
meta_types_p = &meta_types;
}
@@ -1564,26 +1640,28 @@
if (int_opts & LYD_INTOPT_REPLY) {
/* add output children defaults */
- rc = lyd_new_implicit_r(op_node, lyd_node_child_p(op_node), NULL, NULL, node_when_p, node_types_p,
+ rc = lyd_new_implicit_r(op_node, lyd_node_child_p(op_node), NULL, NULL, node_when_p, node_exts_p, node_types_p,
LYD_IMPLICIT_OUTPUT, diff);
LY_CHECK_GOTO(rc, cleanup);
if (validate_subtree) {
/* skip validating the operation itself, go to children directly */
LY_LIST_FOR(lyd_child(op_node), child) {
- LY_CHECK_GOTO(rc = lyd_validate_subtree(child, node_when_p, node_types_p, meta_types_p, 0, diff), cleanup);
+ rc = lyd_validate_subtree(child, node_when_p, node_exts_p, node_types_p, meta_types_p, 0, diff);
+ LY_CHECK_GOTO(rc, cleanup);
}
}
} else {
if (validate_subtree) {
/* prevalidate whole operation subtree */
- LY_CHECK_GOTO(rc = lyd_validate_subtree(op_node, node_when_p, node_types_p, meta_types_p, 0, diff), cleanup);
+ rc = lyd_validate_subtree(op_node, node_when_p, node_exts_p, node_types_p, meta_types_p, 0, diff);
+ LY_CHECK_GOTO(rc, cleanup);
}
}
/* finish incompletely validated terminal values/attributes and when conditions on the full tree */
- LY_CHECK_GOTO(rc = lyd_validate_unres((struct lyd_node **)&dep_tree, NULL, node_when_p, node_types_p, meta_types_p,
- diff), cleanup);
+ LY_CHECK_GOTO(rc = lyd_validate_unres((struct lyd_node **)&dep_tree, NULL,
+ node_when_p, node_exts_p, node_types_p, meta_types_p, diff), cleanup);
/* perform final validation of the operation/notification */
lyd_validate_obsolete(op_node);
@@ -1601,6 +1679,7 @@
}
ly_set_erase(&node_when, NULL);
+ ly_set_erase(&node_exts, NULL);
ly_set_erase(&node_types, NULL);
ly_set_erase(&meta_types, NULL);
return rc;
@@ -1648,5 +1727,5 @@
}
/* validate */
- return _lyd_validate_op(op_tree, op_node, dep_tree, int_opts, 1, NULL, NULL, NULL, diff);
+ return _lyd_validate_op(op_tree, op_node, dep_tree, int_opts, 1, NULL, NULL, NULL, NULL, diff);
}