libtransport.git Changeset - af75453834dd

Changeset - af75453834dd

Parent rev.

Child rev.

[Not reviewed]

0 13 0

Jan Kaluza - 10 years ago 2016-01-22 15:17:51
jkaluza@redhat.com

Fix #86 - Support case-sensitive buddy names transparently. When lower-cased name is received from frontend, it is mapped to case-sensitive name sent by the backend originally.

13 files changed with 120 insertions and 46 deletions:

backends/libpurple/main.cpp

include/transport/Buddy.h

libtransport/Buddy.cpp

libtransport/ConversationManager.cpp

libtransport/RosterManager.cpp

spectrum/src/frontends/slack/SlackSession.cpp

spectrum/src/frontends/xmpp/XMPPRosterManager.cpp

spectrum/src/frontends/xmpp/blockresponder.cpp

spectrum/src/frontends/xmpp/rosterresponder.cpp

spectrum/src/frontends/xmpp/vcardresponder.cpp

tests/libtransport/basictest.cpp

tests/libtransport/conversationmanager.cpp

tests/libtransport/rostermanager.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -1259,7 +1259,6 @@ static PurpleConnectionUiOps conn_ui_ops = @@
 static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotifyUserInfo *user_info) {
 	PurpleAccount *account = purple_connection_get_account_wrapped(gc);
 	std::string name(purple_normalize_wrapped(account, who));
 	std::transform(name.begin(), name.end(), name.begin(), ::tolower);
 	size_t pos = name.find("/");
 	if (pos != std::string::npos)

include/transport/Buddy.h

➞

Show inline comments

@@ @@ -28,6 +28,7 @@ @@
 namespace Transport {
 class RosterManager;
 class User;
 typedef enum { 	BUDDY_NO_FLAG = 0,
 				BUDDY_JID_ESCAPING = 2,
@@ @@ -164,7 +165,8 @@ class Buddy { @@
 		/// \param jid Jabber ID.
 		/// \return legacy name of buddy from JID.
 		static std::string JIDToLegacyName(const Swift::JID &jid);
 		static std::string JIDToLegacyName(const Swift::JID &jid, User *user = NULL);
 		static Buddy *JIDToBuddy(const Swift::JID &jid, User *user);
 		static BuddyFlag buddyFlagsFromJID(const Swift::JID &jid);
 	protected:

libtransport/Buddy.cpp

➞

Show inline comments

 	m_rosterManager->getUser()->getComponent()->getFrontend()->sendVCard(vcard, m_rosterManager->getUser()->getJID());
+}
 std::string Buddy::JIDToLegacyName(const Swift::JID &jid) {
+std::string Buddy::JIDToLegacyName(const Swift::JID &jid, User *user) {
 	std::string name;
 	if (jid.getUnescapedNode() == jid.getNode()) {
 		name = jid.getNode();
+	}
 	else {
 		name = jid.getUnescapedNode();
 		// Psi sucks...
 // 		if (name.find_last_of("\\40") != std::string::npos) {
 // 			name.replace(name.find_last_of("\\40"), 1, "@"); // OK
 // 		}
+	}
 	// If we have User associated with this request, we will find the
 	// buddy in his Roster, because JID received from network can be lower-case
 	// version of the original legacy name, but in the roster, we store the
 	// case-sensitive version of the legacy name.
 	if (user) {
 		Buddy *b = user->getRosterManager()->getBuddy(name);
 		if (b) {
 			return b->getName();
+		}
+	}
 	return name;
+}
 Buddy *Buddy::JIDToBuddy(const Swift::JID &jid, User *user) {
 	std::string name;
 	if (jid.getUnescapedNode() == jid.getNode()) {
 		name = jid.getNode();
 		if (name.find_last_of("%") != std::string::npos) {
 			name.replace(name.find_last_of("%"), 1, "@"); // OK
+		}
+	}
 	else {
 		name = jid.getUnescapedNode();
+	}
 	// If we have User associated with this request, we will find the
 	// buddy in his Roster, because JID received from network can be lower-case
 	// version of the original legacy name, but in the roster, we store the
 	// case-sensitive version of the legacy name.
 	if (user) {
 		Buddy *b = user->getRosterManager()->getBuddy(name);
 		if (b) {
 			return b;
+		}
+	}
 	return NULL;
+}
 BuddyFlag Buddy::buddyFlagsFromJID(const Swift::JID &jid) {
 	if (jid.getUnescapedNode() == jid.getNode()) {
 		return BUDDY_NO_FLAG;

libtransport/ConversationManager.cpp

➞

Show inline comments

 // 	if (name.find_last_of("%") != std::string::npos) { // OK when commented
 // 		name.replace(name.find_last_of("%"), 1, "@"); // OK when commented
 // 	}
 	std::string name = Buddy::JIDToLegacyName(message->getTo());
+	std::string name = Buddy::JIDToLegacyName(message->getTo(), m_user);
 	if (name.empty()) {
 		LOG4CXX_WARN(logger, m_user->getJID().toString() << ": Tried to create empty conversation");
 		return;

libtransport/RosterManager.cpp

➞

Show inline comments

@@ @@ -33,6 +33,7 @@ @@
 #include "Swiften/Elements/Nickname.h"
 #include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/algorithm/string.hpp>
 #include <map>
 #include <iterator>
@@ @@ -68,7 +69,9 @@ RosterManager::~RosterManager() { @@
 		delete m_rosterStorage;
+}
 void RosterManager::removeBuddy(const std::string &name) {
 void RosterManager::removeBuddy(const std::string &_name) {
 	std::string name = _name;
 	boost::algorithm::to_lower(name);
 	Buddy *buddy = getBuddy(name);
 	if (!buddy) {
 		LOG4CXX_WARN(logger, m_user->getJID().toString() << ": Tried to remove unknown buddy " << name);
@@ @@ -114,8 +117,10 @@ void RosterManager::handleBuddyChanged(Buddy *buddy) { @@
+}
 void RosterManager::setBuddy(Buddy *buddy) {
 	LOG4CXX_INFO(logger, "Associating buddy " << buddy->getName() << " with " << m_user->getJID().toString());
 	m_buddies[buddy->getName()] = buddy;
 	std::string name = buddy->getName();
 	boost::algorithm::to_lower(name);
 	LOG4CXX_INFO(logger, "Associating buddy " << name << " with " << m_user->getJID().toString());
 	m_buddies[name] = buddy;
 	onBuddySet(buddy);
 	doAddBuddy(buddy);
@@ @@ -125,7 +130,9 @@ void RosterManager::setBuddy(Buddy *buddy) { @@
+}
 void RosterManager::unsetBuddy(Buddy *buddy) {
 	m_buddies.erase(buddy->getName());
 	std::string name = buddy->getName();
 	boost::algorithm::to_lower(name);
 	m_buddies.erase(name);
 	if (m_rosterStorage)
 		m_rosterStorage->removeBuddyFromQueue(buddy);
 	onBuddyUnset(buddy);
@@ @@ -137,13 +144,15 @@ void RosterManager::storeBuddy(Buddy *buddy) { @@
+	}
+}
 Buddy *RosterManager::getBuddy(const std::string &name) {
 Buddy *RosterManager::getBuddy(const std::string &_name) {
 	std::string name = _name;
 	boost::algorithm::to_lower(name);
 	return m_buddies[name];
+}
 void RosterManager::handleSubscription(Swift::Presence::ref presence) {
 	std::string legacyName = Buddy::JIDToLegacyName(presence->getTo());
+	std::string legacyName = Buddy::JIDToLegacyName(presence->getTo(), m_user);
 	if (legacyName.empty()) {
 		return;
+	}
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(presence->getFrom().toBare());
 		response->setFrom(presence->getTo().toBare());
-		Buddy *buddy = getBuddy(Buddy::JIDToLegacyName(presence->getTo()));
+		Buddy *buddy = getBuddy(legacyName);
 		if (buddy) {
-			LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Subscription received and buddy " << Buddy::JIDToLegacyName(presence->getTo()) << " is already there => answering");
+			LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Subscription received and buddy " << legacyName << " is already there => answering");
 			switch (presence->getType()) {
 				case Swift::Presence::Subscribe:
 					onBuddyAdded(buddy);
 				case Swift::Presence::Subscribe:
 					buddyInfo.id = -1;
 					buddyInfo.alias = "";
-					buddyInfo.legacyName = Buddy::JIDToLegacyName(presence->getTo());
+					buddyInfo.legacyName = legacyName;
 					buddyInfo.subscription = "both";
 					buddyInfo.flags = Buddy::buddyFlagsFromJID(presence->getTo());
 					LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Subscription received for new buddy " << buddyInfo.legacyName << " => adding to legacy network");
 				case Swift::Presence::Unsubscribe:
 					buddyInfo.id = -1;
 					buddyInfo.alias = "";
-					buddyInfo.legacyName = Buddy::JIDToLegacyName(presence->getTo());
+					buddyInfo.legacyName = legacyName;
 					buddyInfo.subscription = "both";
 					buddyInfo.flags = Buddy::buddyFlagsFromJID(presence->getTo());
 		response->setTo(presence->getFrom().toBare());
 		response->setFrom(presence->getTo().toBare());
-		Buddy *buddy = getBuddy(Buddy::JIDToLegacyName(presence->getTo()));
+		Buddy *buddy = getBuddy(legacyName);
 		if (buddy) {
 			std::vector<Swift::Presence::ref> &presences = buddy->generatePresenceStanzas(255);
 			switch (presence->getType()) {
 				case Swift::Presence::Subscribe:
 					buddyInfo.id = -1;
 					buddyInfo.alias = "";
-					buddyInfo.legacyName = Buddy::JIDToLegacyName(presence->getTo());
+					buddyInfo.legacyName = legacyName;
 					buddyInfo.subscription = "both";
 					buddyInfo.flags = Buddy::buddyFlagsFromJID(presence->getTo());
 				case Swift::Presence::Unsubscribe:
 					buddyInfo.id = -1;
 					buddyInfo.alias = "";
-					buddyInfo.legacyName = Buddy::JIDToLegacyName(presence->getTo());
+					buddyInfo.legacyName = legacyName;
 					buddyInfo.subscription = "both";
 					buddyInfo.flags = Buddy::buddyFlagsFromJID(presence->getTo());
 		Buddy *buddy = m_component->getFactory()->createBuddy(this, *it);
 		if (buddy) {
 			LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Adding cached buddy " << buddy->getName() << " fom database");
 			m_buddies[buddy->getName()] = buddy;
 			std::string name = buddy->getName();
 			boost::algorithm::to_lower(name);
 			m_buddies[name] = buddy;
 			onBuddySet(buddy);
+		}
+	}
+}
 void RosterManager::sendCurrentPresence(const Swift::JID &from, const Swift::JID &to) {
-	Buddy *buddy = getBuddy(Buddy::JIDToLegacyName(from));
+	Buddy *buddy = Buddy::JIDToBuddy(from, m_user);
 	if (buddy) {
 		std::vector<Swift::Presence::ref> &presences = buddy->generatePresenceStanzas(255);
 		BOOST_FOREACH(Swift::Presence::ref &presence, presences) {

spectrum/src/frontends/slack/SlackSession.cpp

➞

Show inline comments

 			return;
+		}
 		channel = m_slackChannel;
 		from = Buddy::JIDToLegacyName(message->getFrom());
+		from = Buddy::JIDToLegacyName(message->getFrom(), m_user);
 		Buddy *b;
 		if (m_user && (b = m_user->getRosterManager()->getBuddy(from)) != NULL) {

spectrum/src/frontends/xmpp/XMPPRosterManager.cpp

➞

Show inline comments

@@ @@ -177,9 +177,10 @@ void XMPPRosterManager::doUpdateBuddy(Buddy *buddy) { @@
 void XMPPRosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key) {
 	LOG4CXX_INFO(logger, "handleBuddyRosterPushResponse called for buddy " << key);
 	if (m_buddies[key] != NULL) {
 		if (m_buddies[key]->isAvailable()) {
 			std::vector<Swift::Presence::ref> &presences = m_buddies[key]->generatePresenceStanzas(255);
 	Buddy *b = getBuddy(key);
 	if (b) {
 		if (b->isAvailable()) {
 			std::vector<Swift::Presence::ref> &presences = b->generatePresenceStanzas(255);
 			BOOST_FOREACH(Swift::Presence::ref &presence, presences) {
 				m_component->getFrontend()->sendPresence(presence);
+			}
 	return;
 	BOOST_FOREACH(const Swift::RosterItemPayload &item, payload->getItems()) {
 		std::string legacyName = Buddy::JIDToLegacyName(item.getJID());
 		if (m_buddies.find(legacyName) != m_buddies.end()) {
 		std::string legacyName = Buddy::JIDToLegacyName(item.getJID(), m_user);
 		Buddy *b = getBuddy(legacyName);
 		if (b) {
 			continue;
+		}

spectrum/src/frontends/xmpp/blockresponder.cpp

➞

Show inline comments

 		return true;
+	}
-	Buddy *buddy = user->getRosterManager()->getBuddy(Buddy::JIDToLegacyName(to));
+	Buddy *buddy = Buddy::JIDToBuddy(to, user);
 	if (!buddy) {
 		LOG4CXX_WARN(logger, from.toBare().toString() << ": Buddy " << Buddy::JIDToLegacyName(to) << " does not exist");
+		LOG4CXX_WARN(logger, from.toBare().toString() << ": Buddy " << Buddy::JIDToLegacyName(to, user) << " does not exist");
 		return true;
+	}
 	if (buddy->isBlocked()) {
-		LOG4CXX_INFO(logger, from.toBare().toString() << ": Unblocking buddy " << Buddy::JIDToLegacyName(to));
+		LOG4CXX_INFO(logger, from.toBare().toString() << ": Unblocking buddy " << buddy->getName());
+	}
 	else {
-		LOG4CXX_INFO(logger, from.toBare().toString() << ": Blocking buddy " << Buddy::JIDToLegacyName(to));
+		LOG4CXX_INFO(logger, from.toBare().toString() << ": Blocking buddy " << buddy->getName());
+	}
 	onBlockToggled(buddy);

spectrum/src/frontends/xmpp/rosterresponder.cpp

➞

Show inline comments

 		return true;
+	}
-	Buddy *buddy = user->getRosterManager()->getBuddy(Buddy::JIDToLegacyName(item.getJID()));
+	Buddy *buddy = Buddy::JIDToBuddy(item.getJID(), user);
 	if (buddy) {
 		if (item.getSubscription() == Swift::RosterItemPayload::Remove) {
 			LOG4CXX_INFO(logger, from.toBare().toString() << ": Removing buddy " << buddy->getName());
 		BuddyInfo buddyInfo;
 		buddyInfo.id = -1;
 		buddyInfo.alias = item.getName();
 		buddyInfo.legacyName = Buddy::JIDToLegacyName(item.getJID());
+		buddyInfo.legacyName = Buddy::JIDToLegacyName(item.getJID(), user);
 		buddyInfo.subscription = "both";
 		buddyInfo.flags = Buddy::buddyFlagsFromJID(item.getJID());
 		LOG4CXX_INFO(logger, from.toBare().toString() << ": Adding buddy " << buddyInfo.legacyName);

spectrum/src/frontends/xmpp/vcardresponder.cpp

➞

Show inline comments

 		to_ = user->getJID();
+	}
 	name = Buddy::JIDToLegacyName(to_);
+	name = Buddy::JIDToLegacyName(to_, user);
 	LOG4CXX_INFO(logger, from.toBare().toString() << ": Requested VCard of " << name);

tests/libtransport/basictest.cpp

➞

Show inline comments

@@ @@ -255,7 +255,7 @@ void BasicTest::add2Buddies() { @@
 	std::vector<std::string> grp;
 	grp.push_back("group1");
-	LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1", "Buddy 1", grp, BUDDY_JID_ESCAPING);
+	LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "BuddY1", "Buddy 1", grp, BUDDY_JID_ESCAPING);
 	user->getRosterManager()->setBuddy(buddy);
 	buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status1");

tests/libtransport/conversationmanager.cpp

➞

Show inline comments

 	CPPUNIT_TEST_SUITE(ConversationManagerTest);
 	CPPUNIT_TEST(conversationSize);
 	CPPUNIT_TEST(handleNormalMessages);
 	CPPUNIT_TEST(handleNormalMessagesInitiatedFromXMPP);
 	CPPUNIT_TEST(handleNormalMessagesHeadline);
 	CPPUNIT_TEST(handleGroupchatMessages);
 	CPPUNIT_TEST(handleGroupchatMessagesBouncer);
 		received.clear();
+	}
 	void handleNormalMessagesInitiatedFromXMPP() {
 		User *user = userManager->getUser("user@localhost");
 		boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 		msg->setFrom("user@localhost/resource");
 		msg->setTo("buddy1@localhost/bot");
 		msg->setBody("hi there<>!");
 		injectMessage(msg);
 		// Forward it
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), m_msg->getBody());
 		CPPUNIT_ASSERT_EQUAL(std::string("BuddY1"), m_conv->getLegacyName());
 		TestingConversation *conv = (TestingConversation *) user->getConversationManager()->getConversation("BuddY1");
 		CPPUNIT_ASSERT(conv);
 		CPPUNIT_ASSERT_EQUAL(std::string("BuddY1"), conv->getLegacyName());
+	}
 	void handleNormalMessagesHeadline() {
 		User *user = userManager->getUser("user@localhost");
 		user->addUserSetting("send_headlines", "1");

tests/libtransport/rostermanager.cpp

➞

Show inline comments

 		CPPUNIT_ASSERT(payload1);
 		CPPUNIT_ASSERT_EQUAL(1, (int) payload1->getItems().size());
 		Swift::RosterItemPayload item = payload1->getItems()[0];
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID()));
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID(), user));
 		CPPUNIT_ASSERT_EQUAL(std::string(""), item.getName());
+	}
 	void setBuddy() {
 		User *user = userManager->getUser("user@localhost");
 		add2Buddies();
 		CPPUNIT_ASSERT_EQUAL(4, (int) received.size());
 		CPPUNIT_ASSERT(payload1);
 		CPPUNIT_ASSERT_EQUAL(1, (int) payload1->getItems().size());
 		Swift::RosterItemPayload item = payload1->getItems()[0];
-		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID()));
+		CPPUNIT_ASSERT_EQUAL(std::string("BuddY1"), Buddy::JIDToLegacyName(item.getJID(), user));
 		CPPUNIT_ASSERT_EQUAL(std::string("Buddy 1"), item.getName());
 		CPPUNIT_ASSERT_EQUAL(std::string("localhost"), getStanza(received[0])->getFrom().toString());
 		CPPUNIT_ASSERT(payload2);
 		CPPUNIT_ASSERT_EQUAL(1, (int) payload2->getItems().size());
 		item = payload2->getItems()[0];
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy2"), Buddy::JIDToLegacyName(item.getJID()));
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy2"), Buddy::JIDToLegacyName(item.getJID(), user));
 		CPPUNIT_ASSERT_EQUAL(std::string("Buddy 2"), item.getName());
 		// send responses back
+	}
 	void removeBuddy() {
 		User *user = userManager->getUser("user@localhost");
 		add2Buddies();
 		CPPUNIT_ASSERT_EQUAL(4, (int) received.size());
 		received.clear();
 		User *user = userManager->getUser("user@localhost");
 		user->getRosterManager()->removeBuddy("buddy1");
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(payload1);
 		CPPUNIT_ASSERT_EQUAL(1, (int) payload1->getItems().size());
 		Swift::RosterItemPayload item = payload1->getItems()[0];
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID()));
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID(), user));
 		CPPUNIT_ASSERT_EQUAL(Swift::RosterItemPayload::Remove, item.getSubscription());
+	}
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Subscribed, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getType());
-		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), m_buddy);
+		CPPUNIT_ASSERT_EQUAL(std::string("BuddY1"), m_buddy);
+	}
 	void subscribeNewBuddy() {
 		User *user = userManager->getUser("user@localhost");
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo("buddy1@localhost");
 		response->setFrom("user@localhost/resource");
 		Swift::RosterPayload::ref payload1 = getStanza(received[0])->getPayload<Swift::RosterPayload>();
 		CPPUNIT_ASSERT_EQUAL(1, (int) payload1->getItems().size());
 		Swift::RosterItemPayload item = payload1->getItems()[0];
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID()));
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID(), user));
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[1])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Subscribed, dynamic_cast<Swift::Presence *>(getStanza(received[1]))->getType());
+	}
 	void unsubscribeExistingBuddy() {
 		User *user = userManager->getUser("user@localhost");
 		add2Buddies();
 		received.clear();
 		Swift::RosterPayload::ref payload1 = getStanza(received[0])->getPayload<Swift::RosterPayload>();
 		CPPUNIT_ASSERT_EQUAL(1, (int) payload1->getItems().size());
 		Swift::RosterItemPayload item = payload1->getItems()[0];
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID()));
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID(), user));
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[1])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unsubscribed, dynamic_cast<Swift::Presence *>(getStanza(received[1]))->getType());
-		CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), m_buddy);
+		CPPUNIT_ASSERT_EQUAL(std::string("BuddY1"), m_buddy);
+	}
 	void unsubscribeNewBuddy() {

0 comments (0 inline, 0 general)