Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
7373fe86 by lovetox at 2021-09-11T13:25:53+02:00
AdHoc: Make parsing actions more robust
- Ignore unknown actions instead of failing
- Don’t fail on duplicated actions
- - - - -
1 changed file:
- nbxmpp/modules/adhoc.py
Changes:
=====================================
nbxmpp/modules/adhoc.py
=====================================
@@ -151,27 +151,14 @@ def _parse_notes(command):
def _parse_actions(command):
if command.getAttr('status') != 'executing':
- return [], None
+ return set(), None
actions_node = command.getTag('actions')
if actions_node is None:
# If there is no <actions/> element,
# the user-agent can use a single-stage dialog or view.
# The action "execute" is equivalent to the action "complete".
- return [AdHocAction.CANCEL, AdHocAction.COMPLETE], AdHocAction.COMPLETE
-
- actions = []
- for action in actions_node.getChildren():
- name = action.getName()
- if name not in ('prev', 'next', 'complete'):
- raise ValueError('invalid action name: %s' % name)
- actions.append(AdHocAction(name))
-
- if not actions:
- raise ValueError('actions element without actions')
-
- # The action "cancel" is always allowed.
- actions.append(AdHocAction.CANCEL)
+ return {AdHocAction.CANCEL, AdHocAction.COMPLETE}, AdHocAction.COMPLETE
default = actions_node.getAttr('execute')
if default is None:
@@ -183,13 +170,31 @@ def _parse_actions(command):
default = AdHocAction(default)
+ # We use a set because it cannot contain duplicates
+ actions = set()
+ for action in actions_node.getChildren():
+ name = action.getName()
+ if name == 'execute':
+ actions.add(default)
+
+ if name in ('prev', 'next', 'complete'):
+ actions.add(AdHocAction(name))
+
+ if not actions:
+ raise ValueError('actions element without actions')
+
+ # The action "cancel" is always allowed.
+ actions.add(AdHocAction.CANCEL)
+
# A form which has an <actions/> element and an "execute" attribute
# which evaluates (taking the default into account if absent) to an
# action which is not allowed is therefore invalid.
if default not in actions:
# Some implementations don’t respect this rule.
# Take the first action so we don’t fail here.
- default = actions[0]
+ for act in actions:
+ default = act
+ break
return actions, default
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7373fe86752471d8ed25b0d08b50815759d73981
--
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7373fe86752471d8ed25b0d08b50815759d73981
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
