libtransport.git Changeset - deba434ac02b

Changeset - deba434ac02b

Parent rev.

Child rev.

[Not reviewed]

0 6 1

Jan Kaluza - 10 years ago 2015-12-24 15:44:25
jkaluza@redhat.com

Fix handling of connection error to 3rd-party network from Slack and add test for that.

7 files changed with 108 insertions and 9 deletions:

spectrum/src/frontends/slack/SlackSession.cpp

spectrum/src/frontends/slack/SlackSession.h

spectrum/src/frontends/slack/SlackUser.cpp

spectrum/src/frontends/slack/SlackUserManager.cpp

spectrum/src/frontends/slack/SlackUserManager.h

tests/slack_jabber/bad_password.py

tests/start.py

0 comments (0 inline, 0 general)

spectrum/src/frontends/slack/SlackSession.cpp

➞

Show inline comments

@@ @@ -43,13 +43,13 @@ @@
 #include <iterator>
 namespace Transport {
 DEFINE_LOGGER(logger, "SlackSession");
 SlackSession::SlackSession(Component *component, StorageBackend *storageBackend, UserInfo uinfo) : m_uinfo(uinfo), m_user(NULL) {
+SlackSession::SlackSession(Component *component, StorageBackend *storageBackend, UserInfo uinfo) : m_uinfo(uinfo), m_user(NULL), m_disconnected(false) {
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_rtm = new SlackRTM(component, storageBackend, uinfo);
 	m_rtm->onRTMStarted.connect(boost::bind(&SlackSession::handleRTMStarted, this));
 	m_rtm->onMessageReceived.connect(boost::bind(&SlackSession::handleMessageReceived, this, _1, _2, _3, _4, false));
+	}
 	else {
 		m_rtm->sendMessage(m_ownerChannel, "Unknown command. Use `.spectrum2 help` for help.");
+	}
+}
 void SlackSession::handleDisconnected() {
 	m_disconnected = true;
+}
 void SlackSession::setUser(User *user) {
 	m_user = user;
+}
 void SlackSession::handleConnected() {
 	if (m_disconnected) {
 		m_rtm->getAPI()->imOpen(m_ownerId, boost::bind(&SlackSession::handleImOpen, this, _1, _2, _3, _4));
 		m_disconnected = false;
+	}
+}
 void SlackSession::handleImOpen(HTTPRequest *req, bool ok, rapidjson::Document &resp, const std::string &data) {
 	m_ownerChannel = m_rtm->getAPI()->getChannelId(req, ok, resp, data);
 	LOG4CXX_INFO(logger, "Opened channel with team owner: " << m_ownerChannel);
 	std::string rooms = "";
 	int type = (int) TYPE_STRING;
+			}
+		}
+	}
+}
 void SlackSession::handleRTMStarted() {
 	std::string ownerId;
 	std::map<std::string, SlackUserInfo> &users = m_rtm->getUsers();
 	for (std::map<std::string, SlackUserInfo>::iterator it = users.begin(); it != users.end(); it++) {
 		SlackUserInfo &info = it->second;
 		if (info.isPrimaryOwner) {
-			ownerId = it->first;
+			m_ownerId = it->first;
 			break;
+		}
+	}
-	m_rtm->getAPI()->imOpen(ownerId, boost::bind(&SlackSession::handleImOpen, this, _1, _2, _3, _4));
+	m_rtm->getAPI()->imOpen(m_ownerId, boost::bind(&SlackSession::handleImOpen, this, _1, _2, _3, _4));
+}
+}

spectrum/src/frontends/slack/SlackSession.h

➞

Show inline comments

@@ @@ -52,15 +52,16 @@ class SlackSession { @@
 		void sendMessage(boost::shared_ptr<Swift::Message> message);
 		void sendMessageToAll(const std::string &msg);
 		void setPurpose(const std::string &purpose, const std::string &channel = "");
 		void setUser(User *user) {
 			m_user = user;
+		}
 		void setUser(User *user);
 		void handleDisconnected();
 		void handleConnected();
 	private:
 		void handleRTMStarted();
 		void handleMessageReceived(const std::string &channel, const std::string &user, const std::string &message, const std::string &ts, bool quiet);
 		void handleImOpen(HTTPRequest *req, bool ok, rapidjson::Document &resp, const std::string &data);
@@ @@ -80,9 +81,11 @@ class SlackSession { @@
 		std::map<std::string, std::string> m_jid2channel;
 		std::map<std::string, std::string> m_channel2jid;
 		std::string m_slackChannel;
 		User *m_user;
 		Swift::Timer::ref m_onlineBuddiesTimer;
 		std::map<std::string, std::string> m_onlineBuddies;
 		bool m_disconnected;
 		std::string m_ownerId;
 };
+}

spectrum/src/frontends/slack/SlackUser.cpp

➞

Show inline comments

 	if (!error.empty()) {
 		m_session->sendMessageToAll(error);
+	}
 	else {
 		m_session->sendMessageToAll("Disconnected from 3rd-party network for unknown reason.");
+	}
 	m_session->handleDisconnected();
 	m_session->sendMessageToAll("Try using ```.spectrum2 reconnect``` to reconnect.");
 	static_cast<SlackUserManager *>(m_userManager)->moveTempSession(m_jid.toString(), m_session);
 	m_session = NULL;
+}

spectrum/src/frontends/slack/SlackUserManager.cpp

➞

Show inline comments

@@ @@ -34,12 +34,14 @@ namespace Transport { @@
 DEFINE_LOGGER(logger, "SlackUserManager");
 SlackUserManager::SlackUserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend) : UserManager(component, userRegistry, storageBackend) {
 	m_component = component;
 	m_storageBackend = storageBackend;
     m_userRegistration = new SlackUserRegistration(component, this, storageBackend);
 	onUserCreated.connect(boost::bind(&SlackUserManager::handleUserCreated, this, _1));
+}
 SlackUserManager::~SlackUserManager() {
     delete m_userRegistration;
+}
+	}
 	return NULL;
+}
 void SlackUserManager::moveTempSession(const std::string &user, SlackSession *session) {
 	m_tempSessions[user] = session;
 	session->setUser(NULL);
+}
 UserRegistration *SlackUserManager::getUserRegistration() {
 	return m_userRegistration;
+}
+}
 std::string SlackUserManager::getOAuth2URL(const std::vector<std::string> &args) {
 	return static_cast<SlackUserRegistration *>(m_userRegistration)->createOAuth2URL(args);
+}
 void SlackUserManager::handleUserCreated(User *user) {
 	LOG4CXX_INFO(logger, "handleUserCreated");
 	static_cast<SlackUser *>(user)->getSession()->handleConnected();
+}
+}

spectrum/src/frontends/slack/SlackUserManager.h

➞

Show inline comments

@@ @@ -59,12 +59,15 @@ class SlackUserManager : public UserManager { @@
 		void sendMessage(boost::shared_ptr<Swift::Message> message);
 		SlackSession *moveTempSession(const std::string &user);
 		void moveTempSession(const std::string &user, SlackSession *session);
 	private:
 		void handleUserCreated(User *user);
 	private:
 		Component *m_component;
 		UserRegistration *m_userRegistration;
 		StorageBackend *m_storageBackend;
 		std::map<std::string, SlackSession *> m_tempSessions;
 };

tests/slack_jabber/bad_password.py

➞

Show inline comments

@@ new file 100644 @@
 import optparse
 import sys
 import time
 import subprocess
 import os
 import sleekxmpp
 class Responder(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, room_password, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.room_password = room_password
 		self.nick = nick
 		self.finished = False
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("message", self.message)
 		self.tests = {}
 		self.tests["not_authorized"] = ["'Not Authorized' received", False]
 		self.tests["help_received"] = ["Help received", False]
 		self.tests["register_received"] = ["Password changed", False]
 		self.tests["abc_received"] = ["Test message received", False]
 	def message(self, msg):
 		if msg['body'] == "Not Authorized":
 			self.tests["not_authorized"][1] = True
 		elif msg['body'].find("Try using") != -1:
 			self.send_message(mto="spectrum2@spectrum2tests.xmpp.slack.com", mbody=".spectrum2 register client@localhost password #spectrum2_contactlist")
 			self.tests["help_received"][1] = True
 		elif msg['body'] == "You have successfully registered 3rd-party account. Spectrum 2 is now connecting to the 3rd-party network.":
 			self.tests["register_received"][1] = True
 		elif msg['body'] == "abc":
 			self.tests["abc_received"][1] = True
 			self.finished = True
 	def start(self, event):
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=False)
 class Client(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("message", self.message)
 		self.finished = False
 		self.tests = {}
 	def message(self, msg):
 		pass
 		#print "client", msg['body']
 		#if msg['body'] == "echo abc" and msg['from'] == self.room + "/responder":
 			#self.tests["echo1_received"][1] = True
 			#self.send_message(mto=self.room + "/responder", mbody="def", mtype='chat')
 		#elif msg['body'] == "echo def" and msg['from'] == self.room + "/responder":
 			#self.tests["echo2_received"][1] = True
 			#self.finished = True
 	def start(self, event):
 		self.getRoster()
 		self.sendPresence()
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
 		self.send_message(mto=self.room, mbody="abc", mtype='groupchat')

tests/start.py

➞

Show inline comments

@@ @@ -161,14 +161,16 @@ class JabberSlackServerModeConf(BaseTest): @@
 		self.responder_room = "spectrum2_room@conference.spectrum2tests.xmpp.slack.com"
 		self.responder_nick = "owner"
 		self.responder_roompassword = "spectrum2tests.rkWHkOrjYucxsmBVkA9K"
 	def skip_test(self, test):
 		os.system("cp ../slack_jabber/slack.sql .")
 		if test in ["muc_whois.py", "muc_change_topic.py", "muc_join_leave.py", "muc_pm.py"]:
 			return True
 		if test.find("bad_password") != -1:
 			print "Changing password to 'badpassword'"
 			os.system("sqlite3 slack.sql \"UPDATE users SET password='badpassword' WHERE id=1\"")
 			#os.system("sqlite3 slack.sql \"SELECT * FROM users\"")
 		return False
 	def pre_test(self):
 		os.system("prosody --config ../slack_jabber/prosody.cfg.lua > prosody.log &")
 		#time.sleep(3)
 		#os.system("../../../spectrum_manager/src/spectrum2_manager -c manager.conf localhostxmpp set_oauth2_code xoxb-17213576196-VV2K8kEwwrJhJFfs5YWv6La6 use_bot_token 2>/dev/null >/dev/null")

0 comments (0 inline, 0 general)