anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Only process PEP messages from bare JIDs

Browse source
This commit is contained in:
fiaxh 2022-01-10 16:52:13 +01:00
parent 82a492b33f
commit f2ef2bcfe7
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/omemo/src/protocol/stream_module.vala
View file

@ -30,7 +30,8 @@ public class StreamModule : XmppStreamModule {
} }
public override void attach(XmppStream stream) { public override void attach(XmppStream stream) {
stream.get_module(Pubsub.Module.IDENTITY).add_filtered_notification(stream, NODE_DEVICELIST, (stream, jid, id, node) => parse_device_list(stream, jid, id, node), null); stream.get_module(Pubsub.Module.IDENTITY).add_filtered_notification(stream, NODE_DEVICELIST, true,
(stream, jid, id, node) => parse_device_list(stream, jid, id, node), null);
} }
public override void detach(XmppStream stream) { public override void detach(XmppStream stream) {

11
xmpp-vala/src/module/xep/0060_pubsub.vala
View file

@ -16,8 +16,9 @@ namespace Xmpp.Xep.Pubsub {
private HashMap<string, ItemListenerDelegate> item_listeners = new HashMap<string, ItemListenerDelegate>(); private HashMap<string, ItemListenerDelegate> item_listeners = new HashMap<string, ItemListenerDelegate>();
private HashMap<string, RetractListenerDelegate> retract_listeners = new HashMap<string, RetractListenerDelegate>(); private HashMap<string, RetractListenerDelegate> retract_listeners = new HashMap<string, RetractListenerDelegate>();
private ArrayList<string> pep_subset_listeners = new ArrayList<string>();
public void add_filtered_notification(XmppStream stream, string node, public void add_filtered_notification(XmppStream stream, string node, bool pep_subset,
owned ItemListenerDelegate.ResultFunc? item_listener, owned ItemListenerDelegate.ResultFunc? item_listener,
owned RetractListenerDelegate.ResultFunc? retract_listener) { owned RetractListenerDelegate.ResultFunc? retract_listener) {
stream.get_module(ServiceDiscovery.Module.IDENTITY).add_feature_notify(stream, node); stream.get_module(ServiceDiscovery.Module.IDENTITY).add_feature_notify(stream, node);
@ -27,6 +28,9 @@ namespace Xmpp.Xep.Pubsub {
if (retract_listener != null) { if (retract_listener != null) {
retract_listeners[node] = new RetractListenerDelegate((owned)retract_listener); retract_listeners[node] = new RetractListenerDelegate((owned)retract_listener);
} }
if (pep_subset) {
pep_subset_listeners.add(node);
}
} }
public void remove_filtered_notification(XmppStream stream, string node) { public void remove_filtered_notification(XmppStream stream, string node) {
@ -166,6 +170,11 @@ namespace Xmpp.Xep.Pubsub {
if (items_node == null) return; if (items_node == null) return;
string node = items_node.get_attribute("node", NS_URI_EVENT); string node = items_node.get_attribute("node", NS_URI_EVENT);
if (!message.from.is_bare() && pep_subset_listeners.contains(node)) {
warning("Got a PEP message from a full JID (%s), ignoring:\n%s", message.from.to_string(), message.stanza.to_string());
return;
}
StanzaNode? item_node = items_node.get_subnode("item", NS_URI_EVENT); StanzaNode? item_node = items_node.get_subnode("item", NS_URI_EVENT);
if (item_node != null) { if (item_node != null) {
string id = item_node.get_attribute("id", NS_URI_EVENT); string id = item_node.get_attribute("id", NS_URI_EVENT);

2
xmpp-vala/src/module/xep/0084_user_avatars.vala
View file

@ -43,7 +43,7 @@ namespace Xmpp.Xep.UserAvatars {
public signal void received_avatar_hash(XmppStream stream, Jid jid, string id); public signal void received_avatar_hash(XmppStream stream, Jid jid, string id);
public override void attach(XmppStream stream) { public override void attach(XmppStream stream) {
stream.get_module(Pubsub.Module.IDENTITY).add_filtered_notification(stream, NS_URI_METADATA, on_pupsub_event, null); stream.get_module(Pubsub.Module.IDENTITY).add_filtered_notification(stream, NS_URI_METADATA, true, on_pupsub_event, null);
} }
public override void detach(XmppStream stream) { public override void detach(XmppStream stream) {

2
xmpp-vala/src/module/xep/0402_bookmarks2.vala
View file

@ -98,7 +98,7 @@ public class Module : BookmarksProvider, XmppStreamModule {
} }
public override void attach(XmppStream stream) { public override void attach(XmppStream stream) {
stream.get_module(Pubsub.Module.IDENTITY).add_filtered_notification(stream, NS_URI, on_pupsub_item, on_pupsub_retract); stream.get_module(Pubsub.Module.IDENTITY).add_filtered_notification(stream, NS_URI, true, on_pupsub_item, on_pupsub_retract);
} }
public override void detach(XmppStream stream) { public override void detach(XmppStream stream) {