plugins exts CHANGE ext parsing isolated into a callback
Lots of refactoring and finishing up included.
diff --git a/src/plugins_exts/nacm.c b/src/plugins_exts/nacm.c
index a83e32b..7323cd2 100644
--- a/src/plugins_exts/nacm.c
+++ b/src/plugins_exts/nacm.c
@@ -1,9 +1,10 @@
/**
* @file nacm.c
* @author Radek Krejci <rkrejci@cesnet.cz>
+ * @author Michal Vasko <mvasko@cesnet.cz>
* @brief libyang extension plugin - NACM (RFC 6536)
*
- * Copyright (c) 2019 CESNET, z.s.p.o.
+ * Copyright (c) 2019 - 2022 CESNET, z.s.p.o.
*
* This source code is licensed under BSD 3-Clause License (the "License").
* You may not use this file except in compliance with the License.
@@ -16,11 +17,12 @@
#include <stdlib.h>
#include <string.h>
+#include "compat.h"
#include "libyang.h"
#include "plugins_exts.h"
struct nacm_dfs_arg {
- struct lysc_ext_instance *c_ext;
+ struct lysc_ext_instance *ext;
struct lysc_node *parent;
};
@@ -39,7 +41,7 @@
if ((node != arg->parent) && !(node->nodetype & (LYS_INPUT | LYS_OUTPUT))) {
/* check that the node does not have its own NACM extension instance */
LY_ARRAY_FOR(node->exts, u) {
- if (node->exts[u].def == arg->c_ext->def) {
+ if (node->exts[u].def == arg->ext->def) {
/* the child already have its own NACM flag, so skip the subtree */
*dfs_continue = 1;
return LY_SUCCESS;
@@ -49,99 +51,99 @@
/* duplicate this one to inherit it to the child */
LY_ARRAY_NEW_GOTO(node->module->ctx, node->exts, inherited, ret, emem);
- inherited->def = lysc_ext_dup(arg->c_ext->def);
+ inherited->def = lysc_ext_dup(arg->ext->def);
inherited->parent = node;
- inherited->parent_stmt = lys_nodetype2stmt(node->nodetype);
- if (arg->c_ext->argument) {
- LY_ERR ret;
-
- if ((ret = lydict_insert(node->module->ctx, arg->c_ext->argument, strlen(arg->c_ext->argument),
- &inherited->argument))) {
+ inherited->parent_stmt = lyplg_ext_nodetype2stmt(node->nodetype);
+ if (arg->ext->argument) {
+ if ((ret = lydict_insert(node->module->ctx, arg->ext->argument, 0, &inherited->argument))) {
return ret;
}
}
/* TODO duplicate extension instances */
- inherited->data = arg->c_ext->data;
+ inherited->compiled = arg->ext->compiled;
}
return LY_SUCCESS;
emem:
- lyplg_ext_log(arg->c_ext, LY_LLERR, LY_EMEM, NULL, "Memory allocation failed (%s()).", __func__);
+ lyplg_ext_compile_log(NULL, arg->ext, LY_LLERR, LY_EMEM, "Memory allocation failed (%s()).", __func__);
return ret;
}
/**
- * @brief Compile NAMC's extension instances.
+ * @brief Parse NACM extension instances.
*
- * Implementation of ::lyplg_ext_compile_clb callback set as lyext_plugin::compile.
+ * Implementation of ::lyplg_ext_parse_clb callback set as lyext_plugin::parse.
*/
static LY_ERR
-nacm_compile(struct lysc_ctx *cctx, const struct lysp_ext_instance *p_ext, struct lysc_ext_instance *c_ext)
+nacm_parse(struct lysp_ctx *pctx, struct lysp_ext_instance *ext)
{
- LY_ERR ret;
- struct lysc_node *parent = NULL;
+ struct lysp_node *parent = NULL;
LY_ARRAY_COUNT_TYPE u;
- struct nacm_dfs_arg dfs_arg;
-
- static const uint8_t nacm_deny_all = 1;
- static const uint8_t nacm_deny_write = 2;
-
- /* store the NACM flag */
- if (!strcmp(c_ext->def->name, "default-deny-write")) {
- c_ext->data = (void *)&nacm_deny_write;
- } else if (!strcmp(c_ext->def->name, "default-deny-all")) {
- c_ext->data = (void *)&nacm_deny_all;
- } else {
- return LY_EINT;
- }
/* check that the extension is instantiated at an allowed place - data node */
- if (!LY_STMT_IS_NODE(c_ext->parent_stmt)) {
- lyplg_ext_log(c_ext, LY_LLWRN, 0, lysc_ctx_get_path(cctx),
- "Extension %s is allowed only in a data nodes, but it is placed in \"%s\" statement.",
- p_ext->name, ly_stmt2str(c_ext->parent_stmt));
+ if (!(ext->parent_stmt & LY_STMT_NODE_MASK)) {
+ lyplg_ext_parse_log(pctx, ext, LY_LLWRN, 0, "Extension %s is allowed only in a data nodes, but it is placed in "
+ "\"%s\" statement.", ext->name, lyplg_ext_stmt2str(ext->parent_stmt));
return LY_ENOT;
- } else {
- parent = (struct lysc_node *)c_ext->parent;
- if (!(parent->nodetype & (LYS_CONTAINER | LYS_LEAF | LYS_LEAFLIST | LYS_LIST | LYS_CHOICE | LYS_ANYDATA |
- LYS_CASE | LYS_RPC | LYS_ACTION | LYS_NOTIF))) {
- /* note LYS_AUGMENT and LYS_USES is not in the list since they are not present in the compiled tree. Instead, libyang
- * passes all their extensions to their children nodes */
-invalid_parent:
- lyplg_ext_log(c_ext, LY_LLWRN, 0, lysc_ctx_get_path(cctx),
- "Extension %s is not allowed in %s statement.", p_ext->name, lys_nodetype2str(parent->nodetype));
- return LY_ENOT;
- }
- if ((c_ext->data == (void *)&nacm_deny_write) && (parent->nodetype & (LYS_RPC | LYS_ACTION | LYS_NOTIF))) {
- goto invalid_parent;
- }
+ }
+
+ parent = ext->parent;
+ if (!(parent->nodetype & (LYS_CONTAINER | LYS_LEAF | LYS_LEAFLIST | LYS_LIST | LYS_CHOICE | LYS_ANYDATA |
+ LYS_CASE | LYS_RPC | LYS_ACTION | LYS_NOTIF)) || (!strcmp(strchr(ext->name, ':') + 1, "default-deny-write") &&
+ (parent->nodetype & (LYS_RPC | LYS_ACTION | LYS_NOTIF)))) {
+ /* note LYS_AUGMENT and LYS_USES is not in the list since they are not present in the compiled tree. Instead, libyang
+ * passes all their extensions to their children nodes */
+ lyplg_ext_parse_log(pctx, ext, LY_LLWRN, 0, "Extension %s is not allowed in %s statement.", ext->name,
+ lys_nodetype2str(parent->nodetype));
+ return LY_ENOT;
}
/* check for duplication */
LY_ARRAY_FOR(parent->exts, u) {
- if ((&parent->exts[u] != c_ext) && parent->exts[u].def->plugin &&
- (parent->exts[u].def->plugin->compile == c_ext->def->plugin->compile)) {
+ if ((&parent->exts[u] != ext) && parent->exts[u].record && (parent->exts[u].record->plugin.id == ext->record->plugin.id)) {
/* duplication of a NACM extension on a single node
* We check for all NACM plugins since we want to catch even the situation that there is default-deny-all
* AND default-deny-write */
- if (parent->exts[u].def == c_ext->def) {
- lyplg_ext_log(c_ext, LY_LLERR, LY_EVALID, lysc_ctx_get_path(cctx),
- "Extension %s is instantiated multiple times.", p_ext->name);
+ if (parent->exts[u].name == ext->name) {
+ lyplg_ext_parse_log(pctx, ext, LY_LLERR, LY_EVALID, "Extension %s is instantiated multiple times.", ext->name);
} else {
- lyplg_ext_log(c_ext, LY_LLERR, LY_EVALID, lysc_ctx_get_path(cctx),
+ lyplg_ext_parse_log(pctx, ext, LY_LLERR, LY_EVALID,
"Extension nacm:default-deny-write is mixed with nacm:default-deny-all.");
}
return LY_EVALID;
}
}
- /* inherit the extension instance to all the children nodes */
- dfs_arg.c_ext = c_ext;
- dfs_arg.parent = parent;
- ret = lysc_tree_dfs_full(parent, nacm_inherit_clb, &dfs_arg);
+ return LY_SUCCESS;
+}
- return ret;
+/**
+ * @brief Compile NACM extension instances.
+ *
+ * Implementation of ::lyplg_ext_compile_clb callback set as lyext_plugin::compile.
+ */
+static LY_ERR
+nacm_compile(struct lysc_ctx *UNUSED(cctx), const struct lysp_ext_instance *UNUSED(extp), struct lysc_ext_instance *ext)
+{
+ struct nacm_dfs_arg dfs_arg;
+
+ static const uint8_t nacm_deny_all = 1;
+ static const uint8_t nacm_deny_write = 2;
+
+ /* store the NACM flag */
+ if (!strcmp(ext->def->name, "default-deny-write")) {
+ ext->compiled = (void *)&nacm_deny_write;
+ } else if (!strcmp(ext->def->name, "default-deny-all")) {
+ ext->compiled = (void *)&nacm_deny_all;
+ } else {
+ return LY_EINT;
+ }
+
+ /* inherit the extension instance to all the children nodes */
+ dfs_arg.ext = ext;
+ dfs_arg.parent = ext->parent;
+ return lysc_tree_dfs_full(ext->parent, nacm_inherit_clb, &dfs_arg);
}
/**
@@ -157,49 +159,57 @@
.revision = "2012-02-22",
.name = "default-deny-write",
- .plugin.id = "libyang 2 - NACM, version 1",
- .plugin.compile = &nacm_compile,
+ .plugin.id = "ly2 NACM v1",
+ .plugin.parse = nacm_parse,
+ .plugin.compile = nacm_compile,
.plugin.sprinter = NULL,
- .plugin.free = NULL,
.plugin.node = NULL,
.plugin.snode = NULL,
- .plugin.validate = NULL
+ .plugin.validate = NULL,
+ .plugin.pfree = NULL,
+ .plugin.cfree = NULL
}, {
.module = "ietf-netconf-acm",
.revision = "2018-02-14",
.name = "default-deny-write",
- .plugin.id = "libyang 2 - NACM, version 1",
- .plugin.compile = &nacm_compile,
+ .plugin.id = "ly2 NACM v1",
+ .plugin.parse = nacm_parse,
+ .plugin.compile = nacm_compile,
.plugin.sprinter = NULL,
- .plugin.free = NULL,
.plugin.node = NULL,
.plugin.snode = NULL,
- .plugin.validate = NULL
+ .plugin.validate = NULL,
+ .plugin.pfree = NULL,
+ .plugin.cfree = NULL
}, {
.module = "ietf-netconf-acm",
.revision = "2012-02-22",
.name = "default-deny-all",
- .plugin.id = "libyang 2 - NACM, version 1",
- .plugin.compile = &nacm_compile,
+ .plugin.id = "ly2 NACM v1",
+ .plugin.parse = nacm_parse,
+ .plugin.compile = nacm_compile,
.plugin.sprinter = NULL,
- .plugin.free = NULL,
.plugin.node = NULL,
.plugin.snode = NULL,
- .plugin.validate = NULL
+ .plugin.validate = NULL,
+ .plugin.pfree = NULL,
+ .plugin.cfree = NULL
}, {
.module = "ietf-netconf-acm",
.revision = "2018-02-14",
.name = "default-deny-all",
- .plugin.id = "libyang 2 - NACM, version 1",
- .plugin.compile = &nacm_compile,
+ .plugin.id = "ly2 NACM v1",
+ .plugin.parse = nacm_parse,
+ .plugin.compile = nacm_compile,
.plugin.sprinter = NULL,
- .plugin.free = NULL,
.plugin.node = NULL,
.plugin.snode = NULL,
- .plugin.validate = NULL
+ .plugin.validate = NULL,
+ .plugin.pfree = NULL,
+ .plugin.cfree = NULL
},
{0} /* terminating zeroed item */
};