copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add config option to activate XEP-0146 commands 

Some of the Commands have security implications, thats why we disable them per default
Fixes #8378
This commit is contained in:
Philipp Hörist 2017-05-26 23:10:05 +02:00
parent d5d9456d42
commit cb65cfc5ae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/commands.py
View File

@ -345,9 +345,10 @@ class ConnectionCommands:
def __init__(self): def __init__(self):
# a list of all commands exposed: node -> command class # a list of all commands exposed: node -> command class
self.__commands = {} self.__commands = {}
for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand, if gajim.config.get('remote_commands'):
LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand): for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
self.__commands[cmdobj.commandnode] = cmdobj LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
self.__commands[cmdobj.commandnode] = cmdobj
# a list of sessions; keys are tuples (jid, sessionid, node) # a list of sessions; keys are tuples (jid, sessionid, node)
self.__sessions = {} self.__sessions = {}

1
src/common/config.py
View File

@ -315,6 +315,7 @@ class Config:
'show_avatar_in_tabs': [ opt_bool, False, _('Show a mini avatar in chat window tabs and in window icon')], 'show_avatar_in_tabs': [ opt_bool, False, _('Show a mini avatar in chat window tabs and in window icon')],
'use_keyring': [opt_bool, True, _('If True, Gajim will use the Systems Keyring to store account passwords.')], 'use_keyring': [opt_bool, True, _('If True, Gajim will use the Systems Keyring to store account passwords.')],
'pgp_encoding': [ opt_str, '', _('Sets the encoding used by python-gnupg'), True], 'pgp_encoding': [ opt_str, '', _('Sets the encoding used by python-gnupg'), True],
'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
}, {}) }, {})
__options_per_key = { __options_per_key = {