X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Fmisc.py;h=e9845d5c349678d4f789f31762c9211c03b4651f;hp=e737a287687a784e282b57113dd8797617b0664e;hb=4f7b0a6280ab17e1ccfd4aa603cdd647e92ac12b;hpb=87065461784719196154b37340e6c8f76b4d801f diff --git a/mudpy/misc.py b/mudpy/misc.py index e737a28..e9845d5 100644 --- a/mudpy/misc.py +++ b/mudpy/misc.py @@ -184,6 +184,11 @@ class Element: 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()) @@ -195,12 +200,16 @@ class Element: 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 - if not command.get("administrative"): + if not command.is_restricted(): 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) + def debug_mode(self): + """Boolean method to indicate whether unsafe debugging is enabled.""" + return self.groups["mudpy"]["limit"].get("debug", False) + 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[ - "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] @@ -2108,6 +2121,8 @@ def setup(): log("Running version: %s" % universe.versions.version, 1) log("Initial directory: %s" % universe.startdir, 1) log("Command line: %s" % " ".join(sys.argv), 1) + if universe.debug_mode(): + log("WARNING: Unsafe debugging mode is enabled!", 6) # pass the initialized universe back return universe