Commit b64b44b1 authored by Titouan Soulard's avatar Titouan Soulard

BusinessTemplate: improve parser for paths

parent be443444
...@@ -7602,6 +7602,9 @@ class TestBusinessTemplate(BusinessTemplateMixin): ...@@ -7602,6 +7602,9 @@ class TestBusinessTemplate(BusinessTemplateMixin):
business_template.setProperty(property_id, ["aa/**"]) business_template.setProperty(property_id, ["aa/**"])
self.assertEqual(True, method("aa/bb")) self.assertEqual(True, method("aa/bb"))
self.assertEqual(True, method("aa/bb/cc")) self.assertEqual(True, method("aa/bb/cc"))
business_template.setProperty(property_id, ["aa/b*/**"])
self.assertEqual(False, method("aa/bb"))
self.assertEqual(True, method("aa/bb/cc"))
def stepCreateDocumentComponentWhichTriggersAnOperationWhenSubDocumentIsAdded( def stepCreateDocumentComponentWhichTriggersAnOperationWhenSubDocumentIsAdded(
self, sequence=None, **kw): self, sequence=None, **kw):
......
...@@ -5674,14 +5674,45 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -5674,14 +5674,45 @@ Business Template is a set of definitions, such as skins, portal types and categ
return super(BusinessTemplate, self)._edit(*args, **edit_kw) return super(BusinessTemplate, self)._edit(*args, **edit_kw)
def _isInKeepList(self, keep_list, path): def _isInKeepList(self, keep_list, path):
path_components = path.split('/')
path_components_len = len(path_components)
for keep_path in keep_list: for keep_path in keep_list:
if keep_path.endswith('**') and path.startswith(keep_path[:-2]): include_all_subobjects = False
return True
elif keep_path.endswith('*') and path.startswith(keep_path[:-1])\ if keep_path.endswith('**'):
and len(keep_path.split('/')) == len(path.split('/')): include_all_subobjects = True
return True keep_path = keep_path[:-2]
elif path == keep_path:
keep_path_components = keep_path.split('/')
keep_path_components_len = len(keep_path_components)
# Preliminary check: path should have the same number of components
# except when a wildcard is given
if keep_path_components_len != path_components_len:
if not include_all_subobjects:
continue
# In any case, matcher should not have more components than path
elif keep_path_components_len > path_components_len:
continue
path_equal = True
for (i, keep_path_component) in enumerate(keep_path_components):
# Should accept `test_abc` when component is `test_*` (component wildcard)
# but also `test_**` (global wildcard)
if keep_path_component.endswith('*') or (include_all_subobjects and i == keep_path_components_len - 1):
if not path_components[i].startswith(keep_path_component[:-1]):
path_equal = False
break
else:
# Strict equality check when no wildcard is given
if path_components[i] != keep_path_component:
path_equal = False
break
if path_equal:
return True return True
return False return False
security.declarePrivate('isKeepObject') security.declarePrivate('isKeepObject')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment