comparison libpurple/protocols/jabber/jabber.c @ 32777:3b1070cb4f29

jabber: Validate user moods, and make the /mood cmd behave flexibly. A user in Pidgin running "/mood ?" or "/mood -" would result in invalid XML being sent to the server (similar to #14342, except '<-/>' or '<?/>'). Prevent this by ensuring the user is specifying something from the list. The /mood command will also now try to treat its entire arguments as a single string, and set that as the mood -- I figure this is what a user would expect?

32776:804239d704ff

{
	PurpleAccount *account = purple_conversation_get_account(conv);
	JabberStream *js = purple_connection_get_protocol_data(purple_account_get_connection(account));

	if (js->pep) {
		/* if no argument was given, unset mood */
		if (!args || !args[0]) {
			jabber_mood_set(js, NULL, NULL);
		} else if (!args[1]) {
			jabber_mood_set(js, args[0], NULL);
		} else {
			jabber_mood_set(js, args[0], args[1]);
		}

		return PURPLE_CMD_RET_OK;
	} else {
		/* account does not support PEP, can't set a mood */
		purple_conversation_write(conv, NULL,
		    _("Account does not support PEP, can't set mood"),
		    PURPLE_MESSAGE_ERROR, time(NULL));

	id = purple_cmd_register("mood", "ws", PURPLE_CMD_P_PRPL,
	    			  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM |
	    			  PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS,
	    			  "prpl-jabber", jabber_cmd_mood,
	    			  _("mood: Set current user mood"), NULL);
	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));

	g_hash_table_insert(jabber_cmds, plugin, commands);
}

32777:3b1070cb4f29

{
	PurpleAccount *account = purple_conversation_get_account(conv);
	JabberStream *js = purple_connection_get_protocol_data(purple_account_get_connection(account));

	if (js->pep) {
		gboolean ret;

		if (!args || !args[0]) {
			/* No arguments; unset mood */
			ret = jabber_mood_set(js, NULL, NULL);
		} else {
			/* At least one argument.  Relying on the list of arguments
			 * being NULL-terminated.
			 */
			ret = jabber_mood_set(js, args[0], args[1]);
			if (!ret) {
				/* Let's try again */
				char *tmp = g_strjoin(" ", args[0], args[1], NULL);
				ret = jabber_mood_set(js, "undefined", tmp);
				g_free(tmp);
			}
		}

		if (ret) {
			return PURPLE_CMD_RET_OK;
		} else {
			purple_conversation_write(conv, NULL,
				_("Failed to specify mood"),
				PURPLE_MESSAGE_ERROR, time(NULL));
			return PURPLE_CMD_RET_FAILED;
		}
	} else {
		/* account does not support PEP, can't set a mood */
		purple_conversation_write(conv, NULL,
		    _("Account does not support PEP, can't set mood"),
		    PURPLE_MESSAGE_ERROR, time(NULL));

	id = purple_cmd_register("mood", "ws", PURPLE_CMD_P_PRPL,
	    			  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM |
	    			  PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS,
	    			  "prpl-jabber", jabber_cmd_mood,
	    			  _("mood <mood> [text]: Set current user mood"), NULL);
	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));

	g_hash_table_insert(jabber_cmds, plugin, commands);
}