Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Allow roster pushes from our full JID

Browse source 
SMACK-773
This commit is contained in:
Florian Schmaus 2017-07-02 22:11:14 +02:00
parent 3fbdcfee63
commit 2d4312272c
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
View file

@ -1676,8 +1676,8 @@ public final class Roster extends Manager {
final XMPPConnection connection = connection(); final XMPPConnection connection = connection();
RosterPacket rosterPacket = (RosterPacket) iqRequest; RosterPacket rosterPacket = (RosterPacket) iqRequest;
EntityFullJid localAddress = connection.getUser(); EntityFullJid ourFullJid = connection.getUser();
if (localAddress == null) { if (ourFullJid == null) {
LOGGER.warning("Ignoring roster push " + iqRequest + " while " + connection LOGGER.warning("Ignoring roster push " + iqRequest + " while " + connection
+ " has no bound resource. This may be a server bug."); + " has no bound resource. This may be a server bug.");
return null; return null;
@ -1685,13 +1685,24 @@ public final class Roster extends Manager {
// Roster push (RFC 6121, 2.1.6) // Roster push (RFC 6121, 2.1.6)
// A roster push with a non-empty from not matching our address MUST be ignored // A roster push with a non-empty from not matching our address MUST be ignored
EntityBareJid jid = localAddress.asEntityBareJid(); EntityBareJid ourBareJid = ourFullJid.asEntityBareJid();
Jid from = rosterPacket.getFrom(); Jid from = rosterPacket.getFrom();
if (from != null && !from.equals(jid)) { if (from != null) {
LOGGER.warning("Ignoring roster push with a non matching 'from' ourJid='" + jid + "' from='" + from if (from.equals(ourFullJid)) {
+ "'"); // Since RFC 6121 roster pushes are no longer allowed to
// origin from the full JID as it was the case with RFC
// 3921. Log a warning an continue processing the push.
// See also SMACK-773.
LOGGER.warning(
"Received roster push from full JID. This behavior is since RFC 6121 not longer standard compliant. "
+ "Please ask your server vendor to fix this and comply to RFC 6121 § 2.1.6. IQ roster push stanza: "
+ iqRequest);
} else if (!from.equals(ourBareJid)) {
LOGGER.warning("Ignoring roster push with a non matching 'from' ourJid='" + ourBareJid + "' from='"
+ from + "'");
return IQ.createErrorResponse(iqRequest, Condition.service_unavailable); return IQ.createErrorResponse(iqRequest, Condition.service_unavailable);
} }
}
// A roster push must contain exactly one entry // A roster push must contain exactly one entry
Collection<Item> items = rosterPacket.getRosterItems(); Collection<Item> items = rosterPacket.getRosterItems();