Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Hörist <forenjunkie@chello.at>2017-05-27 00:10:05 +0300
committerPhilipp Hörist <forenjunkie@chello.at>2017-05-27 00:10:05 +0300
commitcb65cfc5aed9efe05208ebbb7fb2d41fcf7253cc (patch)
tree22b44130c83b09c76be3a36633f3ecd79f91ec79 /src
parentd5d9456d4239d5e1e6b76e999894c084081eb560 (diff)
Add config option to activate XEP-0146 commands
Some of the Commands have security implications, thats why we disable them per default Fixes #8378
Diffstat (limited to 'src')
-rw-r--r--src/common/commands.py7
-rw-r--r--src/common/config.py1
2 files changed, 5 insertions, 3 deletions
diff --git a/src/common/commands.py b/src/common/commands.py
index 19d8c1397..0eeb57c8e 100644
--- a/src/common/commands.py
+++ b/src/common/commands.py
@@ -345,9 +345,10 @@ class ConnectionCommands:
def __init__(self):
# a list of all commands exposed: node -> command class
self.__commands = {}
- for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
- LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
- self.__commands[cmdobj.commandnode] = cmdobj
+ if gajim.config.get('remote_commands'):
+ for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
+ LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
+ self.__commands[cmdobj.commandnode] = cmdobj
# a list of sessions; keys are tuples (jid, sessionid, node)
self.__sessions = {}
diff --git a/src/common/config.py b/src/common/config.py
index cde1f8138..fe254558d 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -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')],
'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],
+ 'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
}, {})
__options_per_key = {