projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add restricted debug mode
[mudpy.git]
/
mudpy
/
misc.py
diff --git
a/mudpy/misc.py
b/mudpy/misc.py
index
e737a28
..
3968039
100644
(file)
--- a/
mudpy/misc.py
+++ b/
mudpy/misc.py
@@
-184,6
+184,11
@@
class Element:
prepend_padding
)
prepend_padding
)
+ def is_restricted(self):
+ """Boolean check whether command is administrative or debugging."""
+ return(
+ self.get("administrative", False) or self.get("debugging", False))
+
def is_admin(self):
"""Boolean check whether an actor is controlled by an admin owner."""
return(self.owner and self.owner.is_admin())
def is_admin(self):
"""Boolean check whether an actor is controlled by an admin owner."""
return(self.owner and self.owner.is_admin())
@@
-195,12
+200,16
@@
class Element:
if command not in self.universe.groups["command"].values():
return(False)
if command not in self.universe.groups["command"].values():
return(False)
+ # debugging commands are not allowed outside debug mode
+ if command.get("debugging") and not self.universe.debug_mode():
+ return(False)
+
# avatars of administrators can run any command
if self.is_admin():
return(True)
# everyone can run non-administrative commands
# avatars of administrators can run any command
if self.is_admin():
return(True)
# everyone can run non-administrative commands
- if not command.
get("administrative"
):
+ if not command.
is_restricted(
):
return(True)
# otherwise the command cannot be run by this actor
return(True)
# otherwise the command cannot be run by this actor
@@
-477,6
+486,10
@@
class Universe:
if fallback not in self.files:
mudpy.data.Data(fallback, self, flags=flags)
if fallback not in self.files:
mudpy.data.Data(fallback, self, flags=flags)
+ def debug_mode(self):
+ """Boolean method to indicate whether unsafe debugging is enabled."""
+ return self.groups["mudpy"]["limit"].get("debug", False)
+
class User:
class User:
@@
-1506,7
+1519,7
@@
def find_command(command_name):
else:
for candidate in sorted(universe.groups["command"]):
if candidate.startswith(command_name) and not universe.groups[
else:
for candidate in sorted(universe.groups["command"]):
if candidate.startswith(command_name) and not universe.groups[
- "command"][candidate].
get("administrative"
):
+ "command"][candidate].
is_restricted(
):
# the command matches the start of a command word and is not
# restricted to administrators
command = universe.groups["command"][candidate]
# the command matches the start of a command word and is not
# restricted to administrators
command = universe.groups["command"][candidate]