libtransport.git Changeset - 1e8eb7076f17

Changeset - 1e8eb7076f17

Parent rev.

Child rev.

[Not reviewed]

0 12 0

Jan Kaluza - 14 years ago 2011-06-28 15:18:25
hanzz.k@gmail.com

Initial support for PurpleAccount sharing

12 files changed with 47 insertions and 73 deletions:

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerStanzaChannel.cpp

include/Swiften/Server/SimpleUserRegistry.cpp

include/Swiften/Server/SimpleUserRegistry.h

include/Swiften/Server/UserRegistry.h

include/transport/transport.h

include/transport/usermanager.h

spectrum/src/main.cpp

src/networkpluginserver.cpp

src/transport.cpp

src/user.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -51,23 +51,27 @@ ServerFromClientSession::~ServerFromClientSession() { @@
+	}
+}
 void ServerFromClientSession::handlePasswordValid(const std::string &user) {
 	if (user != JID(user_, getLocalJID().getDomain()).toString())
 		return;
 	if (!isInitialized()) {
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthSuccess>(new AuthSuccess()));
 		authenticated_ = true;
 		getXMPPLayer()->resetParser();
+	}
+}
 void ServerFromClientSession::handlePasswordInvalid(const std::string &user) {
 	if (user != JID(user_, getLocalJID().getDomain()).toString() || authenticated_)
 		return;
 	if (!isInitialized()) {
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));
 		finishSession(AuthenticationFailedError);
+	}
+}
 void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element) {
 	if (isInitialized()) {
 		onElementReceived(element);
+	}
 	else {

include/Swiften/Server/ServerStanzaChannel.cpp

➞

Show inline comments

+}
 void ServerStanzaChannel::handleSessionFinished(const boost::optional<Session::SessionError>&, const boost::shared_ptr<ServerFromClientSession>& session) {
 	removeSession(session);
 	Swift::Presence::ref presence = Swift::Presence::create();
-	presence->setFrom(JID(session->getUser(), session->getLocalJID().getDomain()).toString());
+	presence->setFrom(session->getRemoteJID());
 	presence->setType(Swift::Presence::Unavailable);
 	onPresenceReceived(presence);
+}
 void ServerStanzaChannel::handleElement(boost::shared_ptr<Element> element, const boost::shared_ptr<ServerFromClientSession>& session) {
 	boost::shared_ptr<Stanza> stanza = boost::dynamic_pointer_cast<Stanza>(element);

include/Swiften/Server/SimpleUserRegistry.cpp

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 namespace Swift {
 SimpleUserRegistry::SimpleUserRegistry() {
+}
-bool SimpleUserRegistry::isValidUserPassword(const JID& user, const SafeByteArray& password) const {
 bool SimpleUserRegistry::isValidUserPassword(const JID& user, const SafeByteArray& password) {
 	std::map<JID,SafeByteArray>::const_iterator i = users.find(user);
 	return i != users.end() ? i->second == password : false;
+}
 void SimpleUserRegistry::addUser(const JID& user, const std::string& password) {
 	users.insert(std::make_pair(user, createSafeByteArray(password)));

include/Swiften/Server/SimpleUserRegistry.h

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ namespace Swift { @@
 	class SimpleUserRegistry : public UserRegistry {
 		public:
 			SimpleUserRegistry();
-			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) const;
 			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password);
 			void addUser(const JID& user, const std::string& password);
 		private:
 			std::map<JID, SafeByteArray> users;
 	};
+}

include/Swiften/Server/UserRegistry.h

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ namespace Swift { @@
 	class JID;
 	class UserRegistry {
 		public:
 			virtual ~UserRegistry();
-			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) const = 0;
 			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) = 0;
 			boost::signal<void (const std::string &user)> onPasswordValid;
 			boost::signal<void (const std::string &user)> onPasswordInvalid;
 	};
+}

include/transport/transport.h

➞

Show inline comments

@@ @@ -48,12 +48,13 @@ namespace Transport { @@
 	// 				} SpectrumImportantFeatures;
 	//
 	class StorageBackend;
 	class DiscoInfoResponder;
 	class DiscoItemsResponder;
 	class Factory;
 	class UserRegistry;
 	/// Represents one transport instance.
 	/// It's used to connect the Jabber server and provides transaction layer
 	/// between Jabber server and other classes.
 	///
@@ @@ -68,13 +69,13 @@ namespace Transport { @@
 			/// 	- service.jid
 			/// 	- service.password
 			/// 	- service.server
 			/// 	- service.port
 			/// 	- service.server_mode
 			/// \param factory Transport Abstract factory used to create basic transport structures.
 			Component(Swift::EventLoop *loop, Config *config, Factory *factory);
+			Component(Swift::EventLoop *loop, Config *config, Factory *factory, Transport::UserRegistry *userRegistry = NULL);
 			/// Component destructor.
 			~Component();
 			/// Returns Swift::StanzaChannel associated with this Transport::Component.
@@ @@ -95,20 +96,12 @@ namespace Transport { @@
 			/// Returns True if the component is in server mode.
 			/// \return True if the component is in server mode.
 			bool inServerMode() { return m_server != NULL; }
 			/// Returns user password from internal UserRegistry.
 			/// In server mode, the password user used for login can be obtained by
 			/// this method.
 			/// \param barejid User's bare JID.
 			/// \return User's password.
 			const std::string &getUserRegistryPassword(const std::string &barejid);
 			/// Connects the Jabber server.
 			void start();
 			void stop();
 			/// Sets disco#info features which are sent as answer to disco#info IQ-get.

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -20,12 +20,13 @@ @@
 #pragma once
 #include <string>
 #include <map>
 #include "Swiften/Swiften.h"
 #include "transport/userregistry.h"
 namespace Transport {
 class User;
 class Component;
 class StorageBackend;
@@ @@ -38,13 +39,13 @@ class RosterResponder; @@
 /// It also removes the User class once the last user's resource disconnected.
 class UserManager {
 	public:
 		/// Creates new UserManager.
 		/// \param component Component which's presence will be handled
 		/// \param storageBackend Storage backend used to fetch UserInfos
 		UserManager(Component *component, StorageBackend *storageBackend = NULL);
+		UserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend = NULL);
 		/// Destroys UserManager.
 		~UserManager();
 		/// Returns user according to his bare JID.
 		/// \param barejid bare JID of user
@@ @@ -65,12 +66,29 @@ class UserManager { @@
 		boost::signal<void (User *user)> onUserCreated;
 		/// Called when User class is going to be removed
 		/// \param user removed User class
 		boost::signal<void (User *user)> onUserDestroyed;
 		bool isUserConnected(const std::string &barejid) const {
 			return m_users.find(barejid) != m_users.end();
+		}
 		void connectUser(const Swift::JID &user) {
 			if (m_users.find(user.toBare().toString()) != m_users.end()) {
 				m_userRegistry->onPasswordValid(user);
+			}
 			else {
 				Swift::Presence::ref response = Swift::Presence::create();
 				response->setTo(m_component->getJID());
 				response->setFrom(user);
 				response->setType(Swift::Presence::Available);
 				m_component->onUserPresenceReceived(response);
+			}
+		}
 	private:
 		void handlePresence(Swift::Presence::ref presence);
 		void handleMessageReceived(Swift::Message::ref message);
 		void handleGeneralPresenceReceived(Swift::Presence::ref presence);
 		void handleProbePresence(Swift::Presence::ref presence);
 		void handleSubscription(Swift::Presence::ref presence);
@@ @@ -80,10 +98,11 @@ class UserManager { @@
 		long m_onlineBuddies;
 		User *m_cachedUser;
 		std::map<std::string, User *> m_users;
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		StorageResponder *m_storageResponder;
 		UserRegistry *m_userRegistry;
 		friend class RosterResponder;
 };
+}

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -49,27 +49,29 @@ int main(int argc, char **argv) @@
 	if (!config.load(argv[1])) {
 		std::cerr << "Can't load configuration file.\n";
 		return 1;
+	}
 	UserRegistry userRegistry(&config);
 	Swift::SimpleEventLoop eventLoop;
 	Component transport(&eventLoop, &config, NULL);
+	Component transport(&eventLoop, &config, NULL, &userRegistry);
 	Logger logger(&transport);
 	StorageBackend *storageBackend = NULL;
 	if (CONFIG_STRING(&config, "database.type") == "sqlite3") {
 		storageBackend = new SQLite3Backend(&config);
 		logger.setStorageBackend(storageBackend);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
+		}
+	}
 	UserManager userManager(&transport, storageBackend);
+	UserManager userManager(&transport, &userRegistry, storageBackend);
 	if (storageBackend) {
 		UserRegistration userRegistration(&transport, &userManager, storageBackend);
 		logger.setUserRegistration(&userRegistration);
+	}
 	logger.setUserManager(&userManager);

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -32,13 +32,12 @@ @@
 #include "transport/rosterresponder.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Network/BoostConnectionServer.h"
 #include "Swiften/Elements/AttentionPayload.h"
 #include "Swiften/Elements/XHTMLIMPayload.h"
 #include "pbnetwork.pb.h"
 #include "sys/wait.h"
 #include "sys/signal.h"
 #include "log4cxx/logger.h"
 using namespace log4cxx;
 		msg->setSubject(payload.message());
+	}
 	else {
 		msg->setBody(payload.message());
+	}
 	if (!payload.xhtml().empty()) {
 		msg->addPayload(boost::make_shared<Swift::XHTMLIMPayload>(payload.xhtml()));
+	}
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.buddyname());
 	if (!conv) {
 		conv = new NetworkConversation(user->getConversationManager(), payload.buddyname());
 		conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));
+	}
 		c->connection.reset();
 // 		m_clients.erase(user->connection);
+	}
+}
 void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &msg) {
-	// handle ChatState
 	boost::shared_ptr<Swift::ChatState> statePayload = msg->getPayload<Swift::ChatState>();
 	if (statePayload) {
 		pbnetwork::WrapperMessage_Type type = pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED;
 		switch (statePayload->getChatState()) {
 			case Swift::ChatState::Active:
 				type = pbnetwork::WrapperMessage_Type_TYPE_BUDDY_STOPPED_TYPING;
 			Client *c = (Client *) conv->getConversationManager()->getUser()->getData();
 			send(c->connection, message);
+		}
+	}
 	// Handle attention requests
 	boost::shared_ptr<Swift::AttentionPayload> attentionPayload = msg->getPayload<Swift::AttentionPayload>();
 	if (attentionPayload) {
 		pbnetwork::ConversationMessage m;
 		m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());
 		m.set_buddyname(conv->getLegacyName());
 		m.set_message(msg->getBody());
 		Client *c = (Client *) conv->getConversationManager()->getUser()->getData();
 		send(c->connection, message);
 		return;
+	}
 	std::string xhtml;
 	boost::shared_ptr<Swift::XHTMLIMPayload> xhtmlPayload = msg->getPayload<Swift::XHTMLIMPayload>();
 	if (xhtmlPayload) {
 		xhtml = xhtmlPayload->getBody();
+	}
 	// Send normal message
 	if (!msg->getBody().empty() || !xhtml.empty()) {
 	if (!msg->getBody().empty()) {
 		pbnetwork::ConversationMessage m;
 		m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());
 		m.set_buddyname(conv->getLegacyName());
 		m.set_message(msg->getBody());
 		m.set_xhtml(xhtml);
 		std::string message;
 		m.SerializeToString(&message);
 		WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE);

src/transport.cpp

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ @@
  */
 #include "transport/transport.h"
 #include <boost/bind.hpp>
 #include "transport/storagebackend.h"
 #include "transport/factory.h"
 #include "transport/userregistry.h"
 #include "discoinforesponder.h"
 #include "discoitemsresponder.h"
 #include "storageparser.h"
 #include "Swiften/TLS/OpenSSL/OpenSSLServerContext.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
 #include "Swiften/TLS/OpenSSL/OpenSSLServerContextFactory.h"
@@ @@ -43,49 +44,21 @@ using namespace log4cxx; @@
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("Component");
 static LoggerPtr logger_xml = Logger::getLogger("Component.XML");
 class MyUserRegistry : public Swift::UserRegistry {
 	public:
 		MyUserRegistry(Component *c, Config *cfg) {component = c; config = cfg;}
 		~MyUserRegistry() {}
 		bool isValidUserPassword(const JID& user, const Swift::SafeByteArray& password) const {
 			if (!CONFIG_STRING(config, "service.admin_username").empty() && user.getNode() == CONFIG_STRING(config, "service.admin_username")) {
 				LOG4CXX_INFO(logger, "Admin is trying to login");
 				if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 					onPasswordValid(user);
+				}
 				else {
 					onPasswordInvalid(user);
+				}
 				return true;
+			}
 			users[user.toBare().toString()] = Swift::safeByteArrayToString(password);
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(component->getJID());
 			response->setFrom(user);
 			response->setType(Swift::Presence::Available);
 			component->onUserPresenceReceived(response);
 			return true;
+		}
 		mutable std::map<std::string, std::string> users;
 		mutable Component *component;
 		mutable Config *config;
 };
 Component::Component(Swift::EventLoop *loop, Config *config, Factory *factory) {
 Component::Component(Swift::EventLoop *loop, Config *config, Factory *factory, Transport::UserRegistry *userRegistry) {
 	m_component = NULL;
 	m_userRegistry = NULL;
 	m_server = NULL;
 	m_reconnectCount = 0;
 	m_config = config;
 	m_factory = factory;
 	m_loop = loop;
 	m_userRegistry = userRegistry;
 	if (CONFIG_STRING(m_config, "logging.config").empty()) {
 		LoggerPtr root = Logger::getRootLogger();
 		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
+	}
 	else {
 	m_reconnectTimer = m_factories->getTimerFactory()->createTimer(1000);
 	m_reconnectTimer->onTick.connect(bind(&Component::start, this));
 	if (CONFIG_BOOL(m_config, "service.server_mode")) {
 		LOG4CXX_INFO(logger, "Creating component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_userRegistry = new MyUserRegistry(this, m_config);
 		m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_INT(m_config, "service.port"));
 		if (!CONFIG_STRING(m_config, "service.cert").empty()) {
 			LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert"));
 			TLSServerContextFactory *f = new OpenSSLServerContextFactory();
 			m_server->addTLSEncryption(f, PKCS12Certificate(CONFIG_STRING(m_config, "service.cert"), createSafeByteArray(CONFIG_STRING(m_config, "service.cert_password"))));
+		}
@@ @@ -162,22 +134,15 @@ Component::~Component() { @@
 	delete m_capsMemoryStorage;
 	delete m_discoInfoResponder;
 	if (m_component)
 		delete m_component;
 	if (m_server)
 		delete m_server;
 	if (m_userRegistry)
 		delete m_userRegistry;
 	delete m_factories;
+}
 const std::string &Component::getUserRegistryPassword(const std::string &barejid) {
 	MyUserRegistry *registry = dynamic_cast<MyUserRegistry *>(m_userRegistry);
 	return registry->users[barejid];
+}
 Swift::StanzaChannel *Component::getStanzaChannel() {
 	return m_stanzaChannel;
+}
 Swift::PresenceOracle *Component::getPresenceOracle() {
 	return m_presenceOracle;

src/user.cpp

➞

Show inline comments

@@ @@ -64,14 +64,13 @@ User::~User(){ @@
 const Swift::JID &User::getJID() {
 	return m_jid;
+}
 void User::handlePresence(Swift::Presence::ref presence) {
 	Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
 	std::cout << "PRESENCE " << presence->getFrom().toString() << "\n";
 	if (!m_connected) {
 		// we are not connected to legacy network, so we should do it when disco#info arrive :)
 		if (m_readyForConnect == false) {
 			// Forward status message to legacy network, but only if it's sent from active resource
 // 					if (m_activeResource == presence->getFrom().getResource().getUTF8String()) {
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to join room " << presence->getTo().getNode() << " as " << presence->getTo().getResource());
 			onRoomJoined(presence->getTo().getNode(), presence->getTo().getResource(), "");
+		}
 		return;
+	}
 	Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
 	if (highest) {
 		highest->setTo(presence->getFrom().toBare());
 		highest->setFrom(m_component->getJID());
 		m_component->getStanzaChannel()->sendPresence(highest);
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Changing legacy network presence to " << highest->getType());
 		onPresenceChanged(highest);

src/usermanager.cpp

➞

Show inline comments

@@ @@ -21,36 +21,40 @@ @@
 #include "transport/usermanager.h"
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/conversationmanager.h"
 #include "transport/rostermanager.h"
 #include "transport/userregistry.h"
 #include "storageresponder.h"
 #include "log4cxx/logger.h"
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("UserManager");
 UserManager::UserManager(Component *component, StorageBackend *storageBackend) {
+UserManager::UserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend) {
 	m_cachedUser = NULL;
 	m_onlineBuddies = 0;
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_storageResponder = NULL;
 	m_userRegistry = userRegistry;
 	if (m_storageBackend) {
 		m_storageResponder = new StorageResponder(component->getIQRouter(), m_storageBackend, this);
 		m_storageResponder->start();
+	}
 	component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
 	m_component->getStanzaChannel()->onMessageReceived.connect(bind(&UserManager::handleMessageReceived, this, _1));
 	m_component->getStanzaChannel()->onPresenceReceived.connect(bind(&UserManager::handleGeneralPresenceReceived, this, _1));
 	m_userRegistry->onConnectUser.connect(bind(&UserManager::connectUser, this, _1));
 // 	component->onDiscoInfoResponse.connect(bind(&UserManager::handleDiscoInfoResponse, this, _1, _2, _3));
+}
 UserManager::~UserManager(){
 	if (m_storageResponder) {
 		m_storageResponder->stop();
 					registered = m_storageBackend->getUser(userkey, res);
+				}
 				else {
 					registered = true;
+				}
+			}
-			res.password = m_component->getUserRegistryPassword(userkey);
+			res.password = m_userRegistry->getUserPassword(userkey);
+		}
 		if (!registered) {
 			LOG4CXX_WARN(logger, "Unregistered user " << userkey << " tried to login");
 			// TODO: logging
 			return;

0 comments (0 inline, 0 general)