Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2929 from audiodude/funcparser-search-check

Browse source 
Fix access control check in $search() function
This commit is contained in:
Griatch 2022-10-12 20:46:20 +02:00 • committed by GitHub
commit ea877bb13e
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/utils/funcparser.py
View file

@ -1162,7 +1162,7 @@ def funcparser_callable_search(*args, caller=None, access="control", **kwargs):
) )
for target in targets: for target in targets:
if not target.access(caller, target, access): if not target.access(caller, access):
raise ParsingError("$search Cannot add found entity - access failure.") raise ParsingError("$search Cannot add found entity - access failure.")
return list(targets) if return_list else targets[0] return list(targets) if return_list else targets[0]

2
evennia/utils/tests/test_funcparser.py
View file

@ -528,6 +528,7 @@ class TestCallableSearch(test_resources.BaseEvenniaTest):
""" """
string = "$search(TestAccount, type=account)" string = "$search(TestAccount, type=account)"
expected = self.account expected = self.account
self.account.locks.add("control:id(%s)" % self.char1.dbref)
ret = self.parser.parse(string, caller=self.char1, return_str=False, raise_errors=True) ret = self.parser.parse(string, caller=self.char1, return_str=False, raise_errors=True)
self.assertEqual(expected, ret) self.assertEqual(expected, ret)
@ -539,6 +540,7 @@ class TestCallableSearch(test_resources.BaseEvenniaTest):
""" """
string = "$search(Script, type=script)" string = "$search(Script, type=script)"
expected = self.script expected = self.script
self.script.locks.add("control:id(%s)" % self.char1.dbref)
ret = self.parser.parse(string, caller=self.char1, return_str=False, raise_errors=True) ret = self.parser.parse(string, caller=self.char1, return_str=False, raise_errors=True)
self.assertEqual(expected, ret) self.assertEqual(expected, ret)