mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/action.c: validate action type when assigning arguments

Browse source 
Before this patch it was possible to assign an argument with an
existing name to an action that didn't support the given argument.
An example of this is using `direction` for `GoToDesktop`.

This patch now only creates action arguments that are actually
defined for the given action type and logs an error for
unsupported arguments.

The commit also makes sure to always supply the argument name.
This will reduce required checks in other parts of the codebase
in future commits.

Partly fixes: #894
This commit is contained in:
Consolatis 2023-05-11 23:36:51 +02:00
parent 7ad5200f2e
commit ab8ab3dd86
1 changed files with 63 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/action.c
View file

@ -11,6 +11,7 @@
#include "common/mem.h" #include "common/mem.h"
#include "common/parse-bool.h" #include "common/parse-bool.h"
#include "common/spawn.h" #include "common/spawn.h"
#include "common/string-helpers.h"
#include "debug.h" #include "debug.h"
#include "labwc.h" #include "labwc.h"
#include "menu/menu.h" #include "menu/menu.h"
@ -135,35 +136,69 @@ void
action_arg_from_xml_node(struct action *action, char *nodename, char *content) action_arg_from_xml_node(struct action *action, char *nodename, char *content)
{ {
assert(action); assert(action);
if (!strcmp(nodename, "command.action")) {
/* Execute */ char *argument = xstrdup(nodename);
action_arg_add_str(action, NULL, content); string_truncate_at_pattern(argument, ".action");
} else if (!strcmp(nodename, "execute.action")) {
switch (action->type) {
case ACTION_TYPE_EXECUTE:
if (!strcmp(argument, "command")) {
action_arg_add_str(action, argument, content);
goto cleanup;
} else if (!strcmp(argument, "execute")) {
/* /*
* <action name="Execute"><execute>foo</execute></action> * <action name="Execute"><execute>foo</execute></action>
* is deprecated, but we support it anyway for backward * is deprecated, but we support it anyway for backward
* compatibility with old openbox-menu generators * compatibility with old openbox-menu generators
*/ */
action_arg_add_str(action, NULL, content); action_arg_add_str(action, "command", content);
} else if (!strcmp(nodename, "direction.action")) { goto cleanup;
/* MoveToEdge, SnapToEdge */
action_arg_add_str(action, NULL, content);
} else if (!strcmp(nodename, "menu.action")) {
/* ShowMenu */
action_arg_add_str(action, NULL, content);
} else if (!strcmp(nodename, "to.action")) {
/* GoToDesktop, SendToDesktop */
action_arg_add_str(action, "to", content);
} else if (!strcmp(nodename, "follow.action")) {
/* SendToDesktop */
action_arg_add_bool(action, "follow", parse_bool(content, true));
} else if (!strcmp(nodename, "region.action")) {
/* SnapToRegion */
action_arg_add_str(action, NULL, content);
} else if (!strcmp(nodename, "output.action")) {
/* FocusOutput */
action_arg_add_str(action, NULL, content);
} }
break;
case ACTION_TYPE_MOVE_TO_EDGE:
case ACTION_TYPE_SNAP_TO_EDGE:
if (!strcmp(argument, "direction")) {
action_arg_add_str(action, argument, content);
goto cleanup;
}
break;
case ACTION_TYPE_SHOW_MENU:
if (!strcmp(argument, "menu")) {
action_arg_add_str(action, argument, content);
goto cleanup;
}
break;
case ACTION_TYPE_SEND_TO_DESKTOP:
if (!strcmp(argument, "follow")) {
action_arg_add_bool(action, argument, parse_bool(content, true));
goto cleanup;
}
/* Falls through to GoToDesktop */
case ACTION_TYPE_GO_TO_DESKTOP:
if (!strcmp(argument, "to")) {
action_arg_add_str(action, argument, content);
goto cleanup;
}
break;
case ACTION_TYPE_SNAP_TO_REGION:
if (!strcmp(argument, "region")) {
action_arg_add_str(action, argument, content);
goto cleanup;
};
break;
case ACTION_TYPE_FOCUS_OUTPUT:
if (!strcmp(argument, "output")) {
action_arg_add_str(action, argument, content);
goto cleanup;
}
break;
}
wlr_log(WLR_ERROR, "Invalid argument for action %s: '%s'",
action_names[action->type], argument);
cleanup:
free(argument);
} }
static const char * static const char *