libpurple/protocols/jabber/data.c

Tue, 28 Feb 2023 03:23:06 -0600

author
Elliott Sales de Andrade <quantum.analyst@gmail.com>
date
Tue, 28 Feb 2023 03:23:06 -0600
changeset 42105
e431d160e3a1
parent 41967
025eee9e6f1d
child 42172
7c2d151b410d
permissions
-rw-r--r--

Fix leaks in requests

Fixes a leak for images in requests:
```
3,627 bytes in 1 blocks are definitely lost in loss record 35,636 of 36,499
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x4980168: g_malloc (gmem.c:130)
by 0x4995723: UnknownInlinedFun (gstrfuncs.c:426)
by 0x4995723: g_memdup2 (gstrfuncs.c:419)
by 0x4D3E534: purple_request_field_image_new (request.c:1677)
by 0x1CA970B1: purple_demo_protocol_request_fields_activate (purpledemoprotocolactions.c:553)
by 0x4DB5FBF: g_closure_invoke (gclosure.c:832)
by 0x4DE3D85: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
by 0x4DD3419: g_signal_emit_valist (gsignal.c:3549)
by 0x4DD3632: g_signal_emit (gsignal.c:3606)
by 0x581C784: g_simple_action_activate (gsimpleaction.c:227)
by 0x581B132: g_action_activate (gaction.c:399)
by 0x51221B6: UnknownInlinedFun (gtkmenutrackeritem.c:842)
by 0x51221B6: gtk_popover_item_activate.lto_priv.0 (gtkmenusectionbox.c:200)
```
and leak of the GObject wrapper for request fields:
```
4 bytes in 1 blocks are possibly lost in loss record 713 of 36,499
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x4980168: g_malloc (gmem.c:130)
by 0x4995602: g_strdup (gstrfuncs.c:363)
by 0x488B324: create_list_field (gtkrequest.c:1504)
by 0x488D1D7: pidgin_request_fields (gtkrequest.c:2160)
by 0x4D3FFB8: purple_request_fields (request.c:2283)
by 0x1CA971D6: purple_demo_protocol_request_fields_activate (purpledemoprotocolactions.c:562)
by 0x4DB5FBF: g_closure_invoke (gclosure.c:832)
by 0x4DE3D85: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
by 0x4DD3419: g_signal_emit_valist (gsignal.c:3549)
by 0x4DD3632: g_signal_emit (gsignal.c:3606)
by 0x581C784: g_simple_action_activate (gsimpleaction.c:227)
56 bytes in 1 blocks are possibly lost in loss record 19,209 of 36,499
at 0x48486AF: realloc (vg_replace_malloc.c:1451)
by 0x498071F: g_realloc (gmem.c:201)
by 0x49592C4: g_data_set_internal (gdataset.c:474)
by 0x488B347: create_list_field (gtkrequest.c:1504)
by 0x488D1D7: pidgin_request_fields (gtkrequest.c:2160)
by 0x4D3FFB8: purple_request_fields (request.c:2283)
by 0x1CA971D6: purple_demo_protocol_request_fields_activate (purpledemoprotocolactions.c:562)
by 0x4DB5FBF: g_closure_invoke (gclosure.c:832)
by 0x4DE3D85: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
by 0x4DD3419: g_signal_emit_valist (gsignal.c:3549)
by 0x4DD3632: g_signal_emit (gsignal.c:3606)
by 0x581C784: g_simple_action_activate (gsimpleaction.c:227)
614 (192 direct, 422 indirect) bytes in 8 blocks are definitely lost in loss record 33,122 of 36,499
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x4980168: g_malloc (gmem.c:130)
by 0x4997AB5: g_slice_alloc (gslice.c:1074)
by 0x49980EC: g_slice_alloc0 (gslice.c:1100)
by 0x4DDF04B: g_type_create_instance (gtype.c:1913)
by 0x4DC4C1F: g_object_new_internal (gobject.c:2228)
by 0x4DC6247: g_object_new_with_properties (gobject.c:2391)
by 0x4DC6FF0: g_object_new (gobject.c:2037)
by 0x488B2D5: create_list_field (gtkrequest.c:1499)
by 0x488D1D7: pidgin_request_fields (gtkrequest.c:2160)
by 0x4D3FFB8: purple_request_fields (request.c:2283)
by 0x1CA971D6: purple_demo_protocol_request_fields_activate (purpledemoprotocolactions.c:562)
```
and a request label:
```
128 bytes in 1 blocks are definitely lost in loss record 27,735 of 36,499
at 0x484378A: malloc (vg_replace_malloc.c:392)
by 0x484870B: realloc (vg_replace_malloc.c:1451)
by 0x498071F: g_realloc (gmem.c:201)
by 0x499A343: g_string_maybe_expand (gstring.c:92)
by 0x499A3BF: g_string_sized_new (gstring.c:116)
by 0x4981BCB: g_markup_escape_text (gmarkup.c:2323)
by 0x4887D8A: pidgin_request_escape (gtkrequest.c:360)
by 0x488CED9: pidgin_request_fields (gtkrequest.c:2105)
by 0x4D3FFB8: purple_request_fields (request.c:2283)
by 0x1CA971D6: purple_demo_protocol_request_fields_activate (purpledemoprotocolactions.c:562)
by 0x4DB5FBF: g_closure_invoke (gclosure.c:832)
by 0x4DE3D85: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
```
and one in the demo protocol:
```
40 bytes in 1 blocks are definitely lost in loss record 15,277 of 36,499
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x4AE3017: __vasprintf_internal (vasprintf.c:71)
by 0x49C2E81: UnknownInlinedFun (stdio2.h:169)
by 0x49C2E81: g_vasprintf (gprintf.c:340)
by 0x4998EA0: g_strdup_vprintf (gstrfuncs.c:553)
by 0x4998F5C: g_strdup_printf (gstrfuncs.c:583)
by 0x1CA9584E: purple_demo_protocol_request_input_activate (purpledemoprotocolactions.c:203)
by 0x4DB5FBF: g_closure_invoke (gclosure.c:832)
by 0x4DE3D85: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
by 0x4DD3419: g_signal_emit_valist (gsignal.c:3549)
by 0x4DD3632: g_signal_emit (gsignal.c:3606)
by 0x581C784: g_simple_action_activate (gsimpleaction.c:227)
by 0x581B132: g_action_activate (gaction.c:399)
```

Testing Done:
Ran valgrind and confirmed above leaks were not there after opening Request Input and Request Fields.

Reviewed at https://reviews.imfreedom.org/r/2300/

23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
1 /*
35099
9bea64da7c15 Fix summary description of these files.
Mark Doliner <mark@kingant.net>
parents: 34935
diff changeset
2 * purple - Handling of XEP-0231: Bits of Binary.
30184
a8de64b7cbfd Fix license to refer to GPLv2 in a files...
Marcus Lundblad <malu@pidgin.im>
parents: 30123
diff changeset
3 *
28321
c8d617c408ab Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents: 27155
diff changeset
4 * Purple is the legal property of its developers, whose names are too numerous
c8d617c408ab Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents: 27155
diff changeset
5 * to list here. Please refer to the COPYRIGHT file distributed with this
c8d617c408ab Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents: 27155
diff changeset
6 * source distribution.
c8d617c408ab Update various header copyrights thanks to licensecheck.
Paul Aurich <darkrain42@pidgin.im>
parents: 27155
diff changeset
7 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
8 * This program is free software; you can redistribute it and/or modify
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
9 * it under the terms of the GNU General Public License as published by
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
10 * the Free Software Foundation; either version 2 of the License, or
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
11 * (at your option) any later version.
26042
4dabdb5fe213 Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24386
diff changeset
12 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
13 * This program is distributed in the hope that it will be useful,
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30184
a8de64b7cbfd Fix license to refer to GPLv2 in a files...
Marcus Lundblad <malu@pidgin.im>
parents: 30123
diff changeset
16 * GNU General Public License for more details.
26042
4dabdb5fe213 Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24386
diff changeset
17 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
18 * You should have received a copy of the GNU General Public License
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
19 * along with this program; if not, write to the Free Software
28345
57a838c454b0 Oops, Elliott correctly pointed out this was wrong...
Paul Aurich <darkrain42@pidgin.im>
parents: 28321
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
30184
a8de64b7cbfd Fix license to refer to GPLv2 in a files...
Marcus Lundblad <malu@pidgin.im>
parents: 30123
diff changeset
21 *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
22 */
26042
4dabdb5fe213 Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24386
diff changeset
23
40439
e9838d634d5e Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents: 40358
diff changeset
24 #include <glib/gi18n-lib.h>
28981
4e3922ab4844 Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <darkrain42@pidgin.im>
parents: 28979
diff changeset
25
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
26 #include <stdlib.h>
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
27 #include <glib.h>
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
28 #include <string.h>
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
29
40358
e6fe6fc1f516 move all protocols, purple plugins, and purple tests to use purple.h instead of including files individually
Gary Kramlich <grim@reaperworld.com>
parents: 39491
diff changeset
30 #include <purple.h>
40756
3a58ef28ee44 Implement mitigation for GHSL-2021-045
Gary Kramlich <grim@reaperworld.com>
parents: 40439
diff changeset
31 #include "libpurple/glibcompat.h"
40358
e6fe6fc1f516 move all protocols, purple plugins, and purple tests to use purple.h instead of including files individually
Gary Kramlich <grim@reaperworld.com>
parents: 39491
diff changeset
32
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
33 #include "data.h"
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
34 #include "iq.h"
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
35
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
36 static GHashTable *local_data_by_alt = NULL;
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
37 static GHashTable *local_data_by_cid = NULL;
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
38 static GHashTable *remote_data_by_cid = NULL;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
39
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
40 JabberData *
41967
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
41 jabber_data_create_from_data(gconstpointer rawdata, gsize size,
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
42 const char *type, gboolean ephemeral,
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
43 G_GNUC_UNUSED JabberStream *js)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
44 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
45 JabberData *data;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
46 gchar *checksum;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
47
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
48 g_return_val_if_fail(rawdata != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
49 g_return_val_if_fail(size > 0, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
50 g_return_val_if_fail(type != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
51
38327
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
52 checksum = g_compute_checksum_for_data(G_CHECKSUM_SHA1, rawdata, size);
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
53
39491
0dfac00d800e Replace g_snprintf+g_strdup by g_strdup_printf.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
54 data = g_new0(JabberData, 1);
0dfac00d800e Replace g_snprintf+g_strdup by g_strdup_printf.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
55 data->cid = g_strdup_printf("sha1+%s@bob.xmpp.org", checksum);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
56 data->type = g_strdup(type);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
57 data->size = size;
27423
36dfce0b39e9 Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents: 27422
diff changeset
58 data->ephemeral = ephemeral;
40756
3a58ef28ee44 Implement mitigation for GHSL-2021-045
Gary Kramlich <grim@reaperworld.com>
parents: 40439
diff changeset
59 data->data = g_memdup2(rawdata, size);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
60
39491
0dfac00d800e Replace g_snprintf+g_strdup by g_strdup_printf.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
61 g_free(checksum);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
62 return data;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
63 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
64
29910
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
65 static void
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
66 jabber_data_delete(gpointer cbdata)
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
67 {
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
68 JabberData *data = cbdata;
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
69
29910
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
70 g_free(data->cid);
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
71 g_free(data->type);
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
72 g_free(data->data);
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
73 g_free(data);
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
74 }
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
75
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
76
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
77 JabberData *
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
78 jabber_data_create_from_xml(PurpleXmlNode *tag)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
79 {
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
80 JabberData *data;
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
81 gchar *raw_data = NULL;
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
82 const gchar *cid, *type;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
83
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
84 g_return_val_if_fail(tag != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
85
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
86 /* check if this is a "data" tag */
38259
c593fc9f5438 Replace strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 31294
diff changeset
87 if (!purple_strequal(tag->name, "data")) {
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
88 purple_debug_error("jabber", "Invalid data element\n");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
89 return NULL;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
90 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
91
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
92 cid = purple_xmlnode_get_attrib(tag, "cid");
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
93 type = purple_xmlnode_get_attrib(tag, "type");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
94
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
95 if (!cid || !type) {
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
96 purple_debug_error("jabber", "cid or type missing\n");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
97 return NULL;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
98 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
99
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
100 raw_data = purple_xmlnode_get_data(tag);
28442
2da956f23839 Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents: 28345
diff changeset
101
28447
1c533c2efd06 Minor merge duplication.
Paul Aurich <darkrain42@pidgin.im>
parents: 28444
diff changeset
102 if (raw_data == NULL || *raw_data == '\0') {
28442
2da956f23839 Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents: 28345
diff changeset
103 purple_debug_error("jabber", "data element was empty");
28450
19c55a6cca66 Eighth^WNinth time's the charm...
Paul Aurich <darkrain42@pidgin.im>
parents: 28447
diff changeset
104 g_free(raw_data);
28442
2da956f23839 Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents: 28345
diff changeset
105 return NULL;
2da956f23839 Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents: 28345
diff changeset
106 }
2da956f23839 Don't crash when receiving an error iq response when trying fetch a custom
Marcus Lundblad <malu@pidgin.im>
parents: 28345
diff changeset
107
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
108 data = g_new0(JabberData, 1);
38341
3da74e727e78 Remove purple_base64_encode/decode() wrappers
Mike Ruprecht <cmaiku@gmail.com>
parents: 38327
diff changeset
109 data->data = g_base64_decode(raw_data, &data->size);
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
110 g_free(raw_data);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
111
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
112 if (data->data == NULL) {
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
113 purple_debug_error("jabber", "Malformed base64 data\n");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
114 g_free(data);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
115 return NULL;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
116 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
117
28439
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
118 data->cid = g_strdup(cid);
f5746ce9d72d jabber: Stricter parsing of a BoB data stanza
Paul Aurich <darkrain42@pidgin.im>
parents: 28345
diff changeset
119 data->type = g_strdup(type);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
120
29910
f1c6e586e5c1 jabber: Validate the hash on incoming BoB objects (in case the CID is on the
Marcus Lundblad <malu@pidgin.im>
parents: 29907
diff changeset
121 return data;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
122 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
123
27422
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
124 void
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
125 jabber_data_destroy(JabberData *data)
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
126 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
127 g_return_if_fail(data != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
128
27422
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
129 jabber_data_delete(data);
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
130 }
e073924c74db Added a function to destroy JabberData instances.
Marcus Lundblad <malu@pidgin.im>
parents: 27421
diff changeset
131
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
132 const char *
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
133 jabber_data_get_cid(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
134 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
135 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
136
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
137 return data->cid;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
138 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
139
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
140
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
141 const char *
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
142 jabber_data_get_type(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
143 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
144 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
145
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
146 return data->type;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
147 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
148
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
149 gsize
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
150 jabber_data_get_size(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
151 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
152 g_return_val_if_fail(data != NULL, 0);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
153
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
154 return data->size;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
155 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
156
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
157 gpointer
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
158 jabber_data_get_data(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
159 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
160 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
161
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
162 return data->data;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
163 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
164
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
165 PurpleXmlNode *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
166 jabber_data_get_xml_definition(const JabberData *data)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
167 {
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
168 PurpleXmlNode *tag;
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
169 char *base64data;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
170
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
171 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
172
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
173 tag = purple_xmlnode_new("data");
38341
3da74e727e78 Remove purple_base64_encode/decode() wrappers
Mike Ruprecht <cmaiku@gmail.com>
parents: 38327
diff changeset
174 base64data = g_base64_encode(data->data, data->size);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
175
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
176 purple_xmlnode_set_namespace(tag, NS_BOB);
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
177 purple_xmlnode_set_attrib(tag, "cid", data->cid);
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
178 purple_xmlnode_set_attrib(tag, "type", data->type);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
179
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
180 purple_xmlnode_insert_data(tag, base64data, -1);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
181
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
182 g_free(base64data);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
183
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
184 return tag;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
185 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
186
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
187 PurpleXmlNode *
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
188 jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
189 {
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
190 PurpleXmlNode *img;
30452
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
191 char *src;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
192
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
193 g_return_val_if_fail(data != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
194 g_return_val_if_fail(alt != NULL, NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
195
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
196 img = purple_xmlnode_new("img");
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
197 purple_xmlnode_set_attrib(img, "alt", alt);
30452
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
198
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
199 src = g_strconcat("cid:", data->cid, NULL);
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
200 purple_xmlnode_set_attrib(img, "src", src);
30452
30db199e757d jabber: Don't use a static array when it might not be sufficient.
Paul Aurich <darkrain42@pidgin.im>
parents: 30451
diff changeset
201 g_free(src);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
202
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
203 return img;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
204 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
205
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
206 static PurpleXmlNode *
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
207 jabber_data_get_xml_request(const gchar *cid)
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
208 {
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
209 PurpleXmlNode *tag = purple_xmlnode_new("data");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
210
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
211 purple_xmlnode_set_namespace(tag, NS_BOB);
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
212 purple_xmlnode_set_attrib(tag, "cid", cid);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
213
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
214 return tag;
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
215 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
216
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
217 static gboolean
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
218 jabber_data_has_valid_hash(const JabberData *data)
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
219 {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
220 const gchar *cid = jabber_data_get_cid(data);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
221 gchar **cid_parts = g_strsplit(cid, "@", -1);
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
222 guint num_cid_parts = 0;
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
223 gboolean ret = FALSE;
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
224
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
225 if (cid_parts)
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
226 num_cid_parts = g_strv_length(cid_parts);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
227
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
228 if (num_cid_parts == 2 && purple_strequal(cid_parts[1], "bob.xmpp.org")) {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
229 gchar **sub_parts = g_strsplit(cid_parts[0], "+", -1);
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
230 guint num_sub_parts = 0;
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
231
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
232 if (sub_parts)
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
233 num_sub_parts = g_strv_length(sub_parts);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
234
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
235 if (num_sub_parts == 2) {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
236 const gchar *hash_algo = sub_parts[0];
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
237 const gchar *hash_value = sub_parts[1];
38327
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
238 GChecksumType hash_type;
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
239 gboolean valid_hash_type = TRUE;
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
240
38327
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
241 if (purple_strequal(hash_algo, "sha1"))
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
242 hash_type = G_CHECKSUM_SHA1;
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
243 else if (purple_strequal(hash_algo, "sha256"))
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
244 hash_type = G_CHECKSUM_SHA256;
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
245 else if (purple_strequal(hash_algo, "sha512"))
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
246 hash_type = G_CHECKSUM_SHA512;
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
247 else if (purple_strequal(hash_algo, "md5"))
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
248 hash_type = G_CHECKSUM_MD5;
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
249 else
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
250 valid_hash_type = FALSE;
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
251
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
252 if (valid_hash_type) {
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
253 gchar *digest = g_compute_checksum_for_data(
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
254 hash_type, jabber_data_get_data(data),
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
255 jabber_data_get_size(data));
c842a56b9967 jabber: Port to use GChecksum instead of PurpleHash
Mike Ruprecht <cmaiku@gmail.com>
parents: 35099
diff changeset
256
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
257 ret = purple_strequal(digest, hash_value);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
258
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
259 if (!ret)
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
260 purple_debug_warning("jabber", "Unable to validate BoB "
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
261 "hash; expecting %s, got %s\n",
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
262 cid, digest);
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
263
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
264 g_free(digest);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
265 } else {
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
266 purple_debug_warning("jabber", "Unable to validate BoB hash; "
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
267 "unknown hash algorithm %s\n", hash_algo);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
268 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
269 } else {
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
270 purple_debug_warning("jabber", "Malformed BoB CID\n");
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
271 }
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
272
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
273 g_strfreev(sub_parts);
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
274 }
29936
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
275
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
276 g_strfreev(cid_parts);
8e4d3e3481ab jabber: Plug some leaks and make the success case quieter.
Paul Aurich <darkrain42@pidgin.im>
parents: 29912
diff changeset
277 return ret;
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
278 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
279
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
280
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
281 typedef struct {
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
282 gpointer userdata;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
283 gchar *alt;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
284 gboolean ephemeral;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
285 JabberDataRequestCallback *cb;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
286 } JabberDataRequestData;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
287
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
288 static void
41967
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
289 jabber_data_request_cb(JabberStream *js, const char *from, JabberIqType type,
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
290 G_GNUC_UNUSED const char *id, PurpleXmlNode *packet,
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
291 gpointer data)
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
292 {
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
293 JabberDataRequestData *request_data = (JabberDataRequestData *) data;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
294 gpointer userdata = request_data->userdata;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
295 gchar *alt = request_data->alt;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
296 gboolean ephemeral = request_data->ephemeral;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
297 JabberDataRequestCallback *cb = request_data->cb;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
298
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
299 PurpleXmlNode *data_element = purple_xmlnode_get_child(packet, "data");
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
300 PurpleXmlNode *item_not_found = purple_xmlnode_get_child(packet, "item-not-found");
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
301
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
302 /* did we get a data element as result? */
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
303 if (data_element && type == JABBER_IQ_RESULT) {
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
304 JabberData *data = jabber_data_create_from_xml(data_element);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
305
30453
206741a404ca jabber: Fix a crash in the BoB code when receiving from Jabbim.
Paul Aurich <darkrain42@pidgin.im>
parents: 30452
diff changeset
306 if (data && !ephemeral) {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
307 jabber_data_associate_remote(js, from, data);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
308 }
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
309 cb(data, alt, userdata);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
310 } else if (item_not_found) {
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
311 purple_debug_info("jabber",
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
312 "Responder didn't recognize requested data\n");
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
313 cb(NULL, alt, userdata);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
314 } else {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
315 purple_debug_warning("jabber", "Unknown response to data request\n");
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
316 cb(NULL, alt, userdata);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
317 }
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
318
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
319 g_free(request_data);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
320 }
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
321
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
322 void
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
323 jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who,
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
324 gchar *alt, gboolean ephemeral, JabberDataRequestCallback cb,
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
325 gpointer userdata)
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
326 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
327 JabberIq *request;
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
328 PurpleXmlNode *data_request;
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
329 JabberDataRequestData *data;
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
330
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
331 g_return_if_fail(cid != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
332 g_return_if_fail(who != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
333 g_return_if_fail(alt != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
334
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
335 request = jabber_iq_new(js, JABBER_IQ_GET);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
336 data_request = jabber_data_get_xml_request(cid);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
337 data = g_new0(JabberDataRequestData, 1);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
338
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
339 data->userdata = userdata;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
340 data->alt = alt;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
341 data->ephemeral = ephemeral;
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
342 data->cb = cb;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
343
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
344 purple_xmlnode_set_attrib(request->node, "to", who);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
345 jabber_iq_set_callback(request, jabber_data_request_cb, data);
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
346 purple_xmlnode_insert_child(request->node, data_request);
29906
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
347 jabber_iq_send(request);
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
348 }
2403e9d40e4a jabber: Refactor BoB request code to reside inside data.c
Marcus Lundblad <malu@pidgin.im>
parents: 29380
diff changeset
349
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
350 const JabberData *
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
351 jabber_data_find_local_by_alt(const gchar *alt)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
352 {
27426
bf461113e8be Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents: 27425
diff changeset
353 purple_debug_info("jabber", "looking up local data object with alt = %s\n", alt);
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
354 return g_hash_table_lookup(local_data_by_alt, alt);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
355 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
356
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
357 const JabberData *
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
358 jabber_data_find_local_by_cid(const gchar *cid)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
359 {
27426
bf461113e8be Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents: 27425
diff changeset
360 purple_debug_info("jabber", "lookup local data object with cid = %s\n", cid);
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
361 return g_hash_table_lookup(local_data_by_cid, cid);
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
362 }
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
363
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
364 const JabberData *
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
365 jabber_data_find_remote_by_cid(JabberStream *js, const gchar *who,
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
366 const gchar *cid)
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
367 {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
368 const JabberData *data = g_hash_table_lookup(remote_data_by_cid, cid);
27426
bf461113e8be Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents: 27425
diff changeset
369 purple_debug_info("jabber", "lookup remote data object with cid = %s\n", cid);
26042
4dabdb5fe213 Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24386
diff changeset
370
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
371 if (data == NULL) {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
372 gchar *jid_cid =
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
373 g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain,
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
374 js->user->resource, who, cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
375 purple_debug_info("jabber",
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
376 "didn't find BoB object by pure CID, try including JIDs: %s\n",
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
377 jid_cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
378 data = g_hash_table_lookup(remote_data_by_cid, jid_cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
379 g_free(jid_cid);
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
380 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
381 return data;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
382 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
383
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
384 void
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
385 jabber_data_associate_local(JabberData *data, const gchar *alt)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
386 {
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
387 g_return_if_fail(data != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
388
27426
bf461113e8be Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents: 27425
diff changeset
389 purple_debug_info("jabber", "associating local data object\n alt = %s, cid = %s\n",
bf461113e8be Change debug outputs to say "data object" instead of "smiley", since BoB is not
Marcus Lundblad <malu@pidgin.im>
parents: 27425
diff changeset
390 alt , jabber_data_get_cid(data));
27421
0aeae425286d Allow the "alt" property on a Bits of Binary object to be NULL (do not store
Marcus Lundblad <malu@pidgin.im>
parents: 27155
diff changeset
391 if (alt)
0aeae425286d Allow the "alt" property on a Bits of Binary object to be NULL (do not store
Marcus Lundblad <malu@pidgin.im>
parents: 27155
diff changeset
392 g_hash_table_insert(local_data_by_alt, g_strdup(alt), data);
26042
4dabdb5fe213 Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24386
diff changeset
393 g_hash_table_insert(local_data_by_cid, g_strdup(jabber_data_get_cid(data)),
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
394 data);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
395 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
396
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
397 void
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
398 jabber_data_associate_remote(JabberStream *js, const gchar *who, JabberData *data)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
399 {
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
400 gchar *cid;
30450
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
401
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
402 g_return_if_fail(data != NULL);
71b63f79a6a4 jabber: Add a bunch of g_return_if_fail checks to the BoB code
Paul Aurich <darkrain42@pidgin.im>
parents: 30184
diff changeset
403
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
404 if (jabber_data_has_valid_hash(data)) {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
405 cid = g_strdup(jabber_data_get_cid(data));
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
406 } else {
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
407 cid = g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain,
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
408 js->user->resource, who, jabber_data_get_cid(data));
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
409 }
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
410
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
411 purple_debug_info("jabber", "associating remote BoB object with cid = %s\n",
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
412 cid);
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30453
diff changeset
413
29912
4f8e1c3bbc4a jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
Marcus Lundblad <malu@pidgin.im>
parents: 29910
diff changeset
414 g_hash_table_insert(remote_data_by_cid, cid, data);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
415 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
416
41791
3bf884522663 xmpp: Remove unused prototypes and code
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40756
diff changeset
417 /* Handles iq requests. */
3bf884522663 xmpp: Remove unused prototypes and code
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40756
diff changeset
418 static void
41967
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
419 jabber_data_parse(JabberStream *js, const char *who,
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
420 G_GNUC_UNUSED JabberIqType type, const char *id,
025eee9e6f1d Bump C standard to C99 for XMPP and fix warnings
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41791
diff changeset
421 PurpleXmlNode *data_node)
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
422 {
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
423 JabberIq *result = NULL;
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
424 const char *cid = purple_xmlnode_get_attrib(data_node, "cid");
25817
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
425 const JabberData *data = cid ? jabber_data_find_local_by_cid(cid) : NULL;
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
426
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
427 if (!data) {
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
428 PurpleXmlNode *item_not_found = purple_xmlnode_new("item-not-found");
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
429
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
430 result = jabber_iq_new(js, JABBER_IQ_ERROR);
25817
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
431 if (who)
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
432 purple_xmlnode_set_attrib(result->node, "to", who);
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
433 purple_xmlnode_set_attrib(result->node, "id", id);
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
434 purple_xmlnode_insert_child(result->node, item_not_found);
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
435 } else {
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
436 result = jabber_iq_new(js, JABBER_IQ_RESULT);
25817
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
437 if (who)
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
438 purple_xmlnode_set_attrib(result->node, "to", who);
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
439 purple_xmlnode_set_attrib(result->node, "id", id);
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34297
diff changeset
440 purple_xmlnode_insert_child(result->node,
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
441 jabber_data_get_xml_definition(data));
27423
36dfce0b39e9 Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents: 27422
diff changeset
442 /* if the data object is temporary, destroy it and remove the references
36dfce0b39e9 Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents: 27422
diff changeset
443 to it */
36dfce0b39e9 Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents: 27422
diff changeset
444 if (data->ephemeral) {
36dfce0b39e9 Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents: 27422
diff changeset
445 g_hash_table_remove(local_data_by_cid, cid);
36dfce0b39e9 Added an "ephemeral" argument when creating local data objects (given a CID).
Marcus Lundblad <malu@pidgin.im>
parents: 27422
diff changeset
446 }
23629
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
447 }
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
448 jabber_iq_send(result);
05adde07702c New files used for custom smileys.
Marcus Lundblad <malu@pidgin.im>
parents:
diff changeset
449 }
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
450
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
451 void
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
452 jabber_data_init(void)
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
453 {
34297
0f1f0b8c84f8 Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 31294
diff changeset
454 if (purple_debug_is_verbose())
0f1f0b8c84f8 Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 31294
diff changeset
455 purple_debug_misc("jabber", "creating hash tables for data objects");
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
456 local_data_by_alt = g_hash_table_new_full(g_str_hash, g_str_equal,
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
457 g_free, NULL);
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
458 local_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal,
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
459 g_free, jabber_data_delete);
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
460 remote_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal,
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
461 g_free, jabber_data_delete);
26704
e6dba3759625 Gratuitous alphabetization of the IQ handlers (again!) and move the data handler to jabber_data_init
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
462
28979
191942cc7747 jabber: Start putting all the namespaces in one location with consistent naming.
Paul Aurich <darkrain42@pidgin.im>
parents: 28450
diff changeset
463 jabber_iq_register_handler("data", NS_BOB, jabber_data_parse);
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
464 }
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
465
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
466 void
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
467 jabber_data_uninit(void)
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
468 {
34297
0f1f0b8c84f8 Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 31294
diff changeset
469 if (purple_debug_is_verbose())
0f1f0b8c84f8 Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 31294
diff changeset
470 purple_debug_info("jabber", "destroying hash tables for data objects");
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
471 g_hash_table_destroy(local_data_by_alt);
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
472 g_hash_table_destroy(local_data_by_cid);
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
473 g_hash_table_destroy(remote_data_by_cid);
24737
b8a96a07e7ac Add more jabber plugin unloading functions to clean up more data structures
Paul Aurich <darkrain42@pidgin.im>
parents: 24386
diff changeset
474 local_data_by_alt = local_data_by_cid = remote_data_by_cid = NULL;
24254
2d990726bf92 Updated to use latest spec. in XEP-0231
Marcus Lundblad <malu@pidgin.im>
parents: 23629
diff changeset
475 }

mercurial