Skip to content

Commit 307f16c

Browse files
committed
Fix check of source of MAM message
1 parent e84f2c4 commit 307f16c

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Diff for: xmpp-vala/src/module/xep/0313_message_archive_management.vala

+6-1
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,16 @@ public class ReceivedPipelineListener : StanzaListener<MessageStanza> {
9494
public override string[] after_actions { get { return after_actions_const; } }
9595

9696
public override async bool run(XmppStream stream, MessageStanza message) {
97-
// if (message.from != stream.remote_name) return;
9897
if (stream.get_flag(Flag.IDENTITY) == null) return false;
9998

10099
StanzaNode? message_node = message.stanza.get_deep_subnode(NS_VER(stream) + ":result", "urn:xmpp:forward:0:forwarded", Xmpp.NS_URI + ":message");
101100
if (message_node != null) {
101+
// MAM messages must come from our server // TODO or a MUC server
102+
if (!message.from.equals(stream.get_flag(Bind.Flag.IDENTITY).my_jid.bare_jid)) {
103+
warning("Received alledged MAM message from %s, ignoring", message.from.to_string());
104+
return true;
105+
}
106+
102107
StanzaNode? forward_node = message.stanza.get_deep_subnode(NS_VER(stream) + ":result", "urn:xmpp:forward:0:forwarded", DelayedDelivery.NS_URI + ":delay");
103108
DateTime? datetime = DelayedDelivery.Module.get_time_for_node(forward_node);
104109
message.add_flag(new MessageFlag(datetime));

0 commit comments

Comments
 (0)