libtransport.git Changeset - 83f5f36c94a2

Changeset - 83f5f36c94a2

Parent rev.

Child rev.

[Not reviewed]

0 5 0

HanzZ - 13 years ago 2012-08-07 17:41:13
hanzz.k@gmail.com

Check if JID is valid when calling setName and ignore buddies with invalid JID

5 files changed with 7 insertions and 3 deletions:

include/transport/buddy.h

src/buddy.cpp

src/localbuddy.cpp

src/networkpluginserver.cpp

src/rostermanager.cpp

0 comments (0 inline, 0 general)

include/transport/buddy.h

➞

Show inline comments

@@ @@ -166,17 +166,17 @@ class Buddy { @@
 		/// \return legacy name of buddy from JID.
 		static std::string JIDToLegacyName(const Swift::JID &jid);
 		static BuddyFlag buddFlagsFromJID(const Swift::JID &jid);
 	protected:
 		void generateJID();
 		Swift::JID m_jid;
 	private:
 		long m_id;
 // 		Swift::Presence::ref m_lastPresence;
 		Swift::JID m_jid;
 		BuddyFlag m_flags;
 		RosterManager *m_rosterManager;
 		Subscription m_subscription;
 };
+}

src/buddy.cpp

➞

Show inline comments

@@ @@ -48,17 +48,19 @@ long Buddy::getID() { @@
 	return m_id;
+}
 void Buddy::setFlags(BuddyFlag flags) {
 	m_flags = flags;
 	if (!getSafeName().empty()) {
 		try {
 			generateJID();
 		} catch (...) {
+		}
+	}
+}
 BuddyFlag Buddy::getFlags() {
 	return m_flags;
+}
 const Swift::JID &Buddy::getJID() {

src/localbuddy.cpp

➞

Show inline comments

@@ @@ -36,13 +36,13 @@ bool LocalBuddy::setName(const std::string &name) { @@
 		return true;
+	}
 	std::string oldName = name;
 	m_name = name;
 	try {
 		generateJID();
-		return true;
+		return m_jid.isValid();
 	} catch (...) {
 		m_name = oldName;
 		return false;
+	}
+}

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -92,24 +92,24 @@ class NetworkFactory : public Factory { @@
+		}
 		// Creates new LocalBuddy
 		Buddy *createBuddy(RosterManager *rosterManager, const BuddyInfo &buddyInfo) {
 			LocalBuddy *buddy = new LocalBuddy(rosterManager, buddyInfo.id);
 			buddy->setAlias(buddyInfo.alias);
 			buddy->setFlags((BuddyFlag) (buddyInfo.flags));
 			if (!buddy->setName(buddyInfo.legacyName)) {
 				delete buddy;
 				return NULL;
+			}
 			if (buddyInfo.subscription == "both") {
 				buddy->setSubscription(Buddy::Both);
+			}
 			else {
 				buddy->setSubscription(Buddy::Ask);
+			}
 			buddy->setGroups(buddyInfo.groups);
 			buddy->setFlags((BuddyFlag) (buddyInfo.flags));
 			if (buddyInfo.settings.find("icon_hash") != buddyInfo.settings.end())
 				buddy->setIconHash(buddyInfo.settings.find("icon_hash")->second.s);
 			return buddy;
+		}
 	private:

src/rostermanager.cpp

➞

Show inline comments

 	std::list<BuddyInfo> roster;
 	storageBackend->getBuddies(m_user->getUserInfo().id, roster);
 	for (std::list<BuddyInfo>::const_iterator it = roster.begin(); it != roster.end(); it++) {
 		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;
 			onBuddySet(buddy);
+		}
+	}
 	m_rosterStorage = storage;
+}
 Swift::RosterPayload::ref RosterManager::generateRosterPayload() {
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());

0 comments (0 inline, 0 general)