From c7b14b07cf6a247d4e85337c3137656329ccf574 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Tue, 15 Feb 2011 11:29:29 +0000 Subject: [PATCH] [0.7.6] Ignore google:jingleinfo pushes from contacts. Previously, Gabble would erroneously process google:jingleinfo updates sent by anybody, rather than only paying attention to those sent by the user's server. This may theoretically allow an attacker to trick Gabble into relaying streamed media through a server of the attacker's choosing, enabling them to intercept, obstruct or modify the user's audio and video calls. This patch addresses this flaw, following the same pattern as the corresponding check in the roster code. Note that even without this flaw, no security guarantees on media in calls can be provided in the presence of malicious network admins or insecure networks: an attacker who can eavesdrop the network traffic still has the ability to intercept the content of the call, as the media is transmitted unencrypted. Signed-off-by: Will Thompson Reviewed-by: Sjoerd Simons --- src/media-factory.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/media-factory.c b/src/media-factory.c index 2a33d75..bb99ac2 100644 --- a/src/media-factory.c +++ b/src/media-factory.c @@ -568,6 +568,22 @@ jingle_info_iq_callback (LmMessageHandler *handler, GabbleMediaFactoryPrivate *priv = GABBLE_MEDIA_FACTORY_GET_PRIVATE (fac); LmMessageSubType sub_type; LmMessageNode *query_node, *node; + const gchar *from = lm_message_node_get_attribute (message->node, "from"); + + if (from != NULL) + { + TpBaseConnection *base_conn = TP_BASE_CONNECTION (priv->conn); + TpHandleRepoIface *contact_repo = tp_base_connection_get_handles ( + base_conn, TP_HANDLE_TYPE_CONTACT); + TpHandle sender = tp_handle_lookup (contact_repo, from, NULL, NULL); + + if (sender != base_conn->self_handle) + { + DEBUG ("ignoring jingleinfo from '%s', not ourself nor the server", + from); + return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; + } + } query_node = lm_message_node_get_child_with_namespace (message->node, "query", NS_GOOGLE_JINGLE_INFO); -- 1.7.2.3