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

[fix] Correct missing caller arg in security message

Browse source
This commit is contained in:
Griatch 2018-10-06 14:21:24 +02:00
parent be8f5b93fa
commit a5b4f41397
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/commands/default/admin.py
View file

@ -95,7 +95,7 @@ class CmdBoot(COMMAND_DEFAULT_CLASS):
for session in boot_list: for session in boot_list:
session.msg(feedback) session.msg(feedback)
session.account.disconnect_session_from_account(session) session.account.disconnect_session_from_account(session)
if pobj and boot_list: if pobj and boot_list:
logger.log_sec('Booted: %s (Reason: %s, Caller: %s, IP: %s).' % (pobj, reason, caller, self.session.address)) logger.log_sec('Booted: %s (Reason: %s, Caller: %s, IP: %s).' % (pobj, reason, caller, self.session.address))
@ -435,9 +435,9 @@ class CmdNewPassword(COMMAND_DEFAULT_CLASS):
account = caller.search_account(self.lhs) account = caller.search_account(self.lhs)
if not account: if not account:
return return
newpass = self.rhs newpass = self.rhs
# Validate password # Validate password
validated, error = account.validate_password(newpass) validated, error = account.validate_password(newpass)
if not validated: if not validated:
@ -445,7 +445,7 @@ class CmdNewPassword(COMMAND_DEFAULT_CLASS):
string = "\n".join(errors) string = "\n".join(errors)
caller.msg(string) caller.msg(string)
return return
account.set_password(newpass) account.set_password(newpass)
account.save() account.save()
self.msg("%s - new password set to '%s'." % (account.name, newpass)) self.msg("%s - new password set to '%s'." % (account.name, newpass))
@ -557,7 +557,7 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
target_result.append("\n%s gives you (%s, %s) the permission '%s'." target_result.append("\n%s gives you (%s, %s) the permission '%s'."
% (caller.name, obj.name, plystring, perm)) % (caller.name, obj.name, plystring, perm))
logger.log_sec('Permissions Added: %s, %s (Caller: %s, IP: %s).' % (obj, perm, caller, self.session.address)) logger.log_sec('Permissions Added: %s, %s (Caller: %s, IP: %s).' % (obj, perm, caller, self.session.address))
caller.msg("".join(caller_result).strip()) caller.msg("".join(caller_result).strip())
if target_result: if target_result:
obj.msg("".join(target_result).strip()) obj.msg("".join(target_result).strip())

3
evennia/commands/default/comms.py
View file

@ -434,7 +434,8 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS):
# disconnect account # disconnect account
channel.disconnect(account) channel.disconnect(account)
CHANNELHANDLER.update() CHANNELHANDLER.update()
logger.log_sec('Channel Boot: %s (Channel: %s, Reason: %s, Caller: %s, IP: %s).' % (account, channel, reason, caller, self.session.address)) logger.log_sec('Channel Boot: %s (Channel: %s, Reason: %s, Caller: %s, IP: %s).' % (
account, channel, reason, self.caller, self.session.address))
class CmdCemit(COMMAND_DEFAULT_CLASS): class CmdCemit(COMMAND_DEFAULT_CLASS):