Skip to content

lib.yang.path_data: do not mutate memoized keys #1539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eugeneia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

lib.yang.path_data: do not mutate memoized keys #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 21 additions & 38 deletions src/lib/yang/path.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,28 @@ local function parse_query(grammar, query)
end
end

function copy_path(path)
if type(path) == 'string' then
return path
end
local copy = {relative=path.relative}
for i, part in ipairs(path) do
local query = {}
for k, v in pairs(part.query) do
query[k] = part.query[k]
end
copy[i] = {
name = part.name,
grammar = part.grammar,
key = part.key,
query = query
}
end
return copy
end

function parse_path(path, grammar)
path = copy_path(path)
if type(path) == 'string' then
path = parse_path1(path)
end
Expand All @@ -182,44 +203,6 @@ function parse_path(path, grammar)
return path
end

local function unparse_query(grammar, key)
if grammar.type == 'array' then
return {['position()']=tonumber(key)}
elseif grammar.type == 'list' then
if not grammar.list.has_key then
error("Invalid key: list has no key.")
end
local query = {}
for k,grammar in pairs(grammar.keys) do
local key_primitive_type = grammar.argument_type.primitive_type
local tostring = valuelib.types[key_primitive_type].tostring
local id = normalize_id(k)
if key[id] then
query[k] = tostring(key[id])
elseif grammar.default then
query[k] = grammar.default
else
error("Invalid key: missing required key '"..k.."'")
end
end
return query
else
error("Invalid key: can only query list or leaf-list.")
end
end

function unparse_path(path, grammar)
path = lib.deepcopy(path)
for _, part in ipairs(path) do
grammar = extract_grammar_node(grammar, part.name)
part.grammar = grammar
if part.key then
part.query = unparse_query(grammar, part.key)
end
end
return path
end

function normalize_path(path, grammar)
path = parse_path(path, grammar)
local ret = {}
Expand Down
70 changes: 58 additions & 12 deletions src/lib/yang/path_data.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ local data = require("lib.yang.data")
local value = require("lib.yang.value")
local schema = require("lib.yang.schema")
local path = require("lib.yang.path")
local copy_path = path.copy_path
local parse_path = path.parse_path
local unparse_path = path.unparse_path
local parse_relative_path = path.parse_relative_path
local normalize_path = path.normalize_path
local util = require("lib.yang.util")
Expand Down Expand Up @@ -320,10 +320,8 @@ end

function checker_from_grammar(grammar, checker)
local function path_add(path, name)
local p = {}
function p.unparse() return unparse_path(p, grammar) end
for i, part in ipairs(path) do p[i] = part end
p[#p+1] = {name=name, query={}}
local p = copy_path(path)
table.insert(p, {name=name, query={}})
return p
end
local function visitor(node, path)
Expand Down Expand Up @@ -356,10 +354,9 @@ function checker_from_grammar(grammar, checker)
root = root or data
if check then check(data, root) end
for idx, elt in ipairs(data) do
path[#path].key = idx
path[#path].query = {['position()']=idx} -- for error message in check_elt, consistency_error
check_elt(elt, root)
end
path[#path].key = nil
end
end
return check
Expand Down Expand Up @@ -397,7 +394,6 @@ function checker_from_grammar(grammar, checker)
end

local function consistency_error(path, msg, ...)
if path.unparse then path = path.unparse() end
error(("Consistency error in '%s': %s")
:format(normalize_path(path), msg:format(...)))
end
Expand All @@ -415,11 +411,11 @@ local function leafref_checker(node, path, grammar)
-- NYI: queries in leafrefs are currently ignored.
part.query = {}
end
local ok, err = pcall(parse_relative_path, leafref, path, grammar)
local ok, leafref = pcall(parse_relative_path, leafref, path, grammar)
if not ok then
consistency_error(path,
"invalid leafref '%s' (%s)",
node.argument_type.leafref, err)
node.argument_type.leafref, leafref)
end
if node.require_instances ~= false then
-- We only support one simple case:
Expand All @@ -434,8 +430,7 @@ local function leafref_checker(node, path, grammar)
return function (data, root)
local ok, err = pcall(function ()
list.query = {[leaf.name]=assert(data, "missing leafref value")}
local p = parse_relative_path(leafref, unparse_path(path, grammar))
return resolver(grammar, p)(root)
return resolver(grammar, parse_path(leafref))(root)
end)
if not ok then
consistency_error(path,
Expand Down Expand Up @@ -980,6 +975,57 @@ function selftest()
assert(not ok)
print(err)

-- Test leafref inconsistency #1535
local leafref_schema2 = schema.load_schema([[module leafref_schema2 {
namespace "urn:ietf:params:xml:ns:yang:leafref_schema2";
prefix "test";

list foo {
key name;
leaf name {
type string;
}
}

list bar {
key name;
leaf name {
type leafref {
path "/foo/name";
require-instance true;
}
}
}

}]])

-- Test leafref inconsistency in list entry (should fail)
local ok, err = pcall(
consistency_checker_from_schema(leafref_schema2, true),
data.load_config_for_schema(leafref_schema2,
mem.open_input_string [[
foo { name a; }
foo { name b; }

bar { name a; }
bar { name c; }
]]))
assert(not ok)
print(err)

-- Test leafref inconsistency in list entry (should fail)
local ok, err = pcall(
consistency_checker_from_schema(leafref_schema2, true),
data.load_config_for_schema(leafref_schema2,
mem.open_input_string [[
foo { name a; }
foo { name b; }

bar { name c; }
bar { name b; }
]]))
assert(not ok)
print(err)

print("selftest: ok")
end