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

Fixes @locks to block self-escalation. Fixed a few bugs in @reload that caused it to reload also unsafe modules.

Browse source
This commit is contained in:
Griatch 2011-03-17 22:28:30 +00:00
parent bccd84e480
commit de28b2d575
4 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/utils/reloads.py
View file

@ -34,8 +34,8 @@ def reload_modules():
# should never need to do that anyway). Updating src requires a server
# reboot. Modules in except_dirs are considered ok to reload despite being
# inside src/
protected_dirs = ('src.',)
except_dirs = ('src.commands.default.')
protected_dirs = ('src.',) # note that these MUST be tuples!
except_dirs = ('src.commands.default.',) # "
# flag 'dangerous' typeclasses (those which retain a memory
# reference, notably Scripts with a timer component) for
@ -50,7 +50,7 @@ def reload_modules():
def safe_dir_to_reload(modpath):
"Check so modpath is not a subdir of a protected dir, and not an ok exception"
return not any(modpath.startswith(pdir) and not any(modpath.startswith(pdir) for pdir in except_dirs) for pdir in protected_dirs)
return not any(modpath.startswith(pdir) and not any(modpath.startswith(edir) for edir in except_dirs) for pdir in protected_dirs)
def safe_mod_to_reload(modpath):
"Check so modpath is not in an unsafe module"
return not any(mpath.startswith(modpath) for mpath in unsafe_modules)