From 4c049fb347b30841179cc10ec4204200fcd603dc Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Wed, 1 Feb 2017 23:17:15 +0000
Subject: [PATCH] Add carbons from barejid check

---
 src/xmpp/message.c                   | 7 +++++++
 tests/functionaltests/test_carbons.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 5581521c..f6bb8642 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -687,6 +687,13 @@ _handle_carbons(xmpp_stanza_t * const stanza)
         return FALSE;
     }
 
+    Jid *my_jid = jid_create(jabber_get_fulljid());
+    const char *const stanza_from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
+    if (g_strcmp0(my_jid->barejid, stanza_from) != 0) {
+        log_warning("Invalid carbon received, from: %s", stanza_from);
+        return TRUE;
+    }
+
     char *name = xmpp_stanza_get_name(carbons);
     if ((g_strcmp0(name, "received") == 0) || (g_strcmp0(name, "sent")) == 0) {
         xmpp_stanza_t *forwarded = xmpp_stanza_get_child_by_ns(carbons, STANZA_NS_FORWARD);
diff --git a/tests/functionaltests/test_carbons.c b/tests/functionaltests/test_carbons.c
index 96639d60..3bbe65d4 100644
--- a/tests/functionaltests/test_carbons.c
+++ b/tests/functionaltests/test_carbons.c
@@ -70,7 +70,7 @@ receive_carbon(void **state)
     prof_output_exact("unencrypted");
 
     stbbr_send(
-        "<message type=\"chat\" to=\"stabber@localhost/profanity\" from=\"buddy1@localhost\">"
+        "<message type=\"chat\" to=\"stabber@localhost/profanity\" from=\"stabber@localhost\">"
             "<received xmlns=\"urn:xmpp:carbons:2\">"
                 "<forwarded xmlns=\"urn:xmpp:forward:0\">"
                     "<message id=\"prof_msg_7\" xmlns=\"jabber:client\" type=\"chat\" lang=\"en\" to=\"stabber@localhost/profanity\" from=\"buddy1@localhost/mobile\">"