libtransport.git Changeset - 94337d703e24

Changeset - 94337d703e24

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Alexander Skovpen - 13 years ago 2012-04-08 22:28:42
a.n.skovpen@gmail.com

partially #258

3 files changed with 41 insertions and 11 deletions:

src/admininterface.cpp

src/usermanager.cpp

src/userregistry.cpp

0 comments (0 inline, 0 general)

src/admininterface.cpp

➞

Show inline comments

@@ @@ -38,53 +38,55 @@ DEFINE_LOGGER(logger, "AdminInterface"); @@
 static std::string getArg(const std::string &body) {
 	std::string ret;
 	if (body.find(" ") == std::string::npos)
 		return ret;
 	return body.substr(body.find(" ") + 1);
+}
 AdminInterface::AdminInterface(Component *component, UserManager *userManager, NetworkPluginServer *server, StorageBackend *storageBackend) {
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_userManager = userManager;
 	m_server = server;
 	m_component->getStanzaChannel()->onMessageReceived.connect(bind(&AdminInterface::handleMessageReceived, this, _1));
+}
 AdminInterface::~AdminInterface() {
+}
 void AdminInterface::handleMessageReceived(Swift::Message::ref message) {
 	if (!message->getTo().getNode().empty())
 		return;
 	if (message->getFrom().toBare().toString() != CONFIG_STRING(m_component->getConfig(), "service.admin_jid")) {
 		LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().toBare().toString());
 		return;
 	std::list<std::string> const &x = CONFIG_LIST(m_component->getConfig(),"service.admin_jid");
 	if (std::find(x.begin(), x.end(), message->getFrom().toBare().toString()) == x.end()) {
 	    LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().toBare().toString());
 	    return;
+	}
 	// Ignore empty messages
 	if (message->getBody().empty()) {
 		return;
+	}
 	LOG4CXX_INFO(logger, "Message from admin received");
 	message->setTo(message->getFrom());
 	message->setFrom(m_component->getJID());
 	if (message->getBody() == "status") {
 		int users = m_userManager->getUserCount();
 		int backends = m_server->getBackendCount();
 		message->setBody("Running (" + boost::lexical_cast<std::string>(users) + " users connected using " + boost::lexical_cast<std::string>(backends) + " backends)");
+	}
 	else if (message->getBody() == "online_users") {
 		std::string lst;
 		const std::map<std::string, User *> &users = m_userManager->getUsers();
 		if (users.size() == 0)
 			lst = "0";
 		for (std::map<std::string, User *>::const_iterator it = users.begin(); it != users.end(); it ++) {
 			lst += (*it).first + "\n";
+		}

src/usermanager.cpp

➞

Show inline comments

@@ @@ -129,66 +129,91 @@ void UserManager::removeAllUsers(bool onUserBehalf) { @@
+	}
+}
 int UserManager::getUserCount() {
 	return m_users.size();
+}
 void UserManager::handleDiscoInfo(const Swift::JID& jid, boost::shared_ptr<Swift::DiscoInfo> info) {
 	User *user = getUser(jid.toBare().toString());
 	if (!user) {
 		return;
+	}
 	user->handleDiscoInfo(jid, info);
+}
 void UserManager::handlePresence(Swift::Presence::ref presence) {
 	std::string barejid = presence->getTo().toBare().toString();
 	std::string userkey = presence->getFrom().toBare().toString();
 	User *user = getUser(userkey);
 	// Create user class if it's not there
 	if (!user) {
 		// Admin user is not legacy network user, so do not create User class instance for him
 /*
 		if (m_component->inServerMode() && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
 			// Send admin contact to the user.
 			Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 			Swift::RosterItemPayload item;
 			item.setJID(m_component->getJID());
 			item.setName("Admin");
 			item.setSubscription(Swift::RosterItemPayload::Both);
 			payload->addItem(item);
 			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());
 			request->send();
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(presence->getFrom());
 			response->setFrom(m_component->getJID());
 			m_component->getStanzaChannel()->sendPresence(response);
 			return;
+		}
 */
 		if (m_component->inServerMode()) {
 		//  && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
 		    std::list<std::string> const &x = CONFIG_LIST(m_component->getConfig(),"service.admin_jid");
 		    if (std::find(x.begin(), x.end(), presence->getFrom().toBare().toString()) != x.end()) {
 			// Send admin contact to the user.
 			Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 			Swift::RosterItemPayload item;
 			item.setJID(m_component->getJID());
 			item.setName("Admin");
 			item.setSubscription(Swift::RosterItemPayload::Both);
 			payload->addItem(item);
 			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());
 			request->send();
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(presence->getFrom());
 			response->setFrom(m_component->getJID());
 			m_component->getStanzaChannel()->sendPresence(response);
 			return;
+		    }
+		}
 		// No user and unavailable presence -> answer with unavailable
 		if (presence->getType() == Swift::Presence::Unavailable) {
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(presence->getFrom());
 			response->setFrom(presence->getTo());
 			response->setType(Swift::Presence::Unavailable);
 			m_component->getStanzaChannel()->sendPresence(response);
 			// Set user offline in database
 			if (m_storageBackend) {
 				UserInfo res;
 				bool registered = m_storageBackend->getUser(userkey, res);
 				if (registered) {
 					m_storageBackend->setUserOnline(res.id, false);
+				}
+			}
 			return;
+		}
 		UserInfo res;
 		bool registered = m_storageBackend ? m_storageBackend->getUser(userkey, res) : false;
 		// In server mode, there's no registration, but we store users into database

src/userregistry.cpp

➞

Show inline comments

@@ @@ -17,58 +17,61 @@ @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <string>
 #include <map>
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/UserRegistry.h"
 #include "transport/userregistry.h"
 #include "transport/logging.h"
 namespace Transport {
 DEFINE_LOGGER(logger, "UserRegistry");
 UserRegistry::UserRegistry(Config *cfg, Swift::NetworkFactories *factories) {
 	config = cfg;
 	m_removeTimer = factories->getTimerFactory()->createTimer(1);
 	m_inRemoveLater = false;
+}
 UserRegistry::~UserRegistry() { m_removeTimer->stop(); }
 void UserRegistry::isValidUserPassword(const Swift::JID& user, Swift::ServerFromClientSession *session, const Swift::SafeByteArray& password) {
 	if (!CONFIG_STRING(config, "service.admin_jid").empty() && user.toBare().toString() == CONFIG_STRING(config, "service.admin_jid")) {
 		if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 	if (!CONFIG_STRING(config, "service.admin_jid").empty() ) {
 		std::list<std::string> const &x = CONFIG_LIST(config,"service.admin_jid");
 		if (std::find(x.begin(), x.end(), user.toBare().toString()) != x.end()) {
 		    if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 			session->handlePasswordValid();
+		}
 		else {
+		    }
 		    else {
 			session->handlePasswordInvalid();
+		}
 		return;
+		    }
 		    return;
+	    }
+	}
 	std::string key = user.toBare().toString();
 	// Users try to connect twice
 	if (users.find(key) != users.end()) {
 		// Kill the first session
 		LOG4CXX_INFO(logger, key << ": Removing previous session and making this one active");
 		Swift::ServerFromClientSession *tmp = users[key].session;
 		users[key].session = session;
 		tmp->handlePasswordInvalid();
+	}
 	LOG4CXX_INFO(logger, key << ": Connecting this user to find if password is valid");
 	users[key].password = Swift::safeByteArrayToString(password);
 	users[key].session = session;
 	onConnectUser(user);
 	return;
+}
 void UserRegistry::stopLogin(const Swift::JID& user, Swift::ServerFromClientSession *session) {
 	std::string key = user.toBare().toString();
 	if (users.find(key) != users.end()) {
 		if (users[key].session == session) {

0 comments (0 inline, 0 general)