xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Constrain plugin collections to flat by default

Browse Source 
When asking for a path that exceeds the plugincollection,
thten provide generic 'not found' behavior.
This commit is contained in:
Jarrod Johnson 2021-06-04 14:48:31 -04:00
parent 58157b23d7
commit bbe9bc3e06
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
confluent_server/confluent/core.py
View File

@ -77,13 +77,15 @@ try:
except NameError:
unicode = str
def seek_element(currplace, currkey):
def seek_element(currplace, currkey, depth):
try:
return currplace[currkey]
except TypeError:
if isinstance(currplace, PluginCollection):
# we hit a plugin curated collection, all children
# are up to the plugin to comprehend
if currplace.maxdepth and depth > currplace.maxdepth:
raise
return currplace
raise
@ -91,8 +93,9 @@ def seek_element(currplace, currkey):
def nested_lookup(nestdict, key):
try:
currloc = nestdict
for currk in key:
currloc = seek_element(currloc, currk)
for i in range(len(key)):
currk = key[i]
currloc = seek_element(currloc, currk, len(key) - i)
return currloc
except TypeError:
raise exc.NotFoundException("Invalid element requested")
@ -143,8 +146,9 @@ class PluginRoute(object):
class PluginCollection(object):
def __init__(self, routedict):
def __init__(self, routedict, maxdepth=1):
self.routeinfo = routedict
self.maxdepth = maxdepth
def handle_deployment(configmanager, inputdata, pathcomponents,