projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report if service does not start under selftest
[mudpy.git]
/
mudpy
/
command.py
diff --git
a/mudpy/command.py
b/mudpy/command.py
index
601bc82
..
ea77939
100644
(file)
--- a/
mudpy/command.py
+++ b/
mudpy/command.py
@@
-23,6
+23,7
@@
def chat(actor, parameters):
actor.send("Exiting chat mode.")
else:
actor.send("Sorry, but you're already busy with something else!")
actor.send("Exiting chat mode.")
else:
actor.send("Sorry, but you're already busy with something else!")
+ return True
def create(actor, parameters):
def create(actor, parameters):
@@
-57,6
+58,7
@@
def create(actor, parameters):
elif len(arguments) > 2:
message = "You can only specify an element and a filename."
actor.send(message)
elif len(arguments) > 2:
message = "You can only specify an element and a filename."
actor.send(message)
+ return True
def delete(actor, parameters):
def delete(actor, parameters):
@@
-84,6
+86,7
@@
def delete(actor, parameters):
+ '". Try "show element ' +
element + '" for verification.')
actor.send(message)
+ '". Try "show element ' +
element + '" for verification.')
actor.send(message)
+ return True
def destroy(actor, parameters):
def destroy(actor, parameters):
@@
-105,13
+108,16
@@
def destroy(actor, parameters):
6
)
actor.send(message)
6
)
actor.send(message)
+ return True
def error(actor, input_data):
"""Generic error for an unrecognized command word."""
# 90% of the time use a generic error
def error(actor, input_data):
"""Generic error for an unrecognized command word."""
# 90% of the time use a generic error
- if random.randrange(10):
+ # Whitelist the random.randrange() call in bandit since it's not used for
+ # security/cryptographic purposes
+ if random.randrange(10): # nosec
message = '''I'm not sure what "''' + input_data + '''" means...'''
# 10% of the time use the classic diku error
message = '''I'm not sure what "''' + input_data + '''" means...'''
# 10% of the time use the classic diku error
@@
-125,6
+131,7
@@
def error(actor, input_data):
mudpy.misc.log(
'Sending a command error to user %s raised exception...\n%s' % (
actor.owner.account.get("name"), traceback.format_exc()))
mudpy.misc.log(
'Sending a command error to user %s raised exception...\n%s' % (
actor.owner.account.get("name"), traceback.format_exc()))
+ return True
def halt(actor, parameters):
def halt(actor, parameters):
@@
-145,6
+152,7
@@
def halt(actor, parameters):
# set a flag to terminate the world
actor.universe.terminate_flag = True
# set a flag to terminate the world
actor.universe.terminate_flag = True
+ return True
def help(actor, parameters):
def help(actor, parameters):
@@
-251,6
+259,7
@@
def help(actor, parameters):
# send the accumulated output to the user
actor.send(output)
# send the accumulated output to the user
actor.send(output)
+ return True
def look(actor, parameters):
def look(actor, parameters):
@@
-259,6
+268,7
@@
def look(actor, parameters):
actor.send("You can't look at or in anything yet.")
else:
actor.look_at(actor.get("location"))
actor.send("You can't look at or in anything yet.")
else:
actor.look_at(actor.get("location"))
+ return True
def move(actor, parameters):
def move(actor, parameters):
@@
-269,6
+279,7
@@
def move(actor, parameters):
actor.move_direction(portal)
return(portal)
actor.send("You cannot go that way.")
actor.move_direction(portal)
return(portal)
actor.send("You cannot go that way.")
+ return True
def preferences(actor, parameters):
def preferences(actor, parameters):
@@
-316,6
+327,7
@@
def preferences(actor, parameters):
'Preference "%s" cannot be set to type "%s".' % (
pref, type(value)))
actor.send(message)
'Preference "%s" cannot be set to type "%s".' % (
pref, type(value)))
actor.send(message)
+ return True
def quit(actor, parameters):
def quit(actor, parameters):
@@
-323,6
+335,7
@@
def quit(actor, parameters):
if actor.owner:
actor.owner.state = "main_utility"
actor.owner.deactivate_avatar()
if actor.owner:
actor.owner.state = "main_utility"
actor.owner.deactivate_avatar()
+ return True
def reload(actor, parameters):
def reload(actor, parameters):
@@
-339,6
+352,7
@@
def reload(actor, parameters):
# set a flag to reload
actor.universe.reload_flag = True
# set a flag to reload
actor.universe.reload_flag = True
+ return True
def say(actor, parameters):
def say(actor, parameters):
@@
-422,6
+436,7
@@
def say(actor, parameters):
# there was no message
else:
actor.send("What do you want to say?")
# there was no message
else:
actor.send("What do you want to say?")
+ return True
def c_set(actor, parameters):
def c_set(actor, parameters):
@@
-459,6
+474,7
@@
def c_set(actor, parameters):
+ '". Try "show element ' +
element + '" for verification.')
actor.send(message)
+ '". Try "show element ' +
element + '" for verification.')
actor.send(message)
+ return True
def show(actor, parameters):
def show(actor, parameters):
@@
-579,3
+595,4
@@
def show(actor, parameters):
else:
message = '''I don't know what "''' + parameters + '" is.'
actor.send(message)
else:
message = '''I don't know what "''' + parameters + '" is.'
actor.send(message)
+ return True