Changeset - c6224941ceab
Parent rev.
Child rev.
[Not reviewed]
0 7 0
HanzZ - 14 years ago 2011-07-17 03:56:19
hanzz.k@gmail.com
Fixed removing users
7 files changed with 24 insertions and 4 deletions:
include/Swiften/Server/Server.cpp
4
include/Swiften/Server/ServerFromClientSession.cpp
3
include/Swiften/Server/ServerFromClientSession.h
1
include/Swiften/Server/ServerStanzaChannel.cpp
2
4
src/networkpluginserver.cpp
2
src/user.cpp
2
src/usermanager.cpp
10
0 comments (0 inline, 0 general)
include/Swiften/Server/Server.cpp
➞
Show inline comments
 
@@ -19,24 +19,25 @@
 
#include "Swiften/Elements/RosterPayload.h"
 
#include "Swiften/Network/NetworkFactories.h"
 
#include "Swiften/Session/SessionTracer.h"
 
#include "Swiften/Elements/IQ.h"
 
#include "Swiften/Elements/VCard.h"
 
#include "Swiften/Server/UserRegistry.h"
 
#include <string>
 
#include "Swiften/Network/ConnectionServer.h"
 
#include "Swiften/Network/ConnectionFactory.h"
 
#include "Swiften/Server/ServerFromClientSession.h"
 
#include "Swiften/Server/ServerStanzaChannel.h"
 
#include "Swiften/Queries/IQRouter.h"
 
#include <iostream>
 

			




	
	
	
		
 

			




	
	
	
		
 
namespace Swift {

			




	
	
	
		
 

			




	
	
	
		
 
Server::Server(

			




	
	
	
		
 
		EventLoop* eventLoop,

			




	
	
	
		
 
		NetworkFactories* networkFactories,

			




	
	
	
		
 
		UserRegistry *userRegistry,

			




	
	
	
		
 
		const JID& jid,

			




	
	
	
		
 
		int port) :

			




	
	
	
		
 
			userRegistry_(userRegistry),

			




	
	
	
		
 
			port_(port),

			




	
	
		
 
@@ -99,24 +100,27 @@ void Server::stop() {

			




	
	
	
		
 
void Server::handleNewClientConnection(boost::shared_ptr<Connection> connection) {

			




	
	
	
		
 

			




	
	
	
		
 
	boost::shared_ptr<ServerFromClientSession> serverFromClientSession = boost::shared_ptr<ServerFromClientSession>(

			




	
	
	
		
 
			new ServerFromClientSession(idGenerator.generateID(), connection, 

			




	
	
	
		
 
					getPayloadParserFactories(), getPayloadSerializers(), userRegistry_));

			




	
	
	
		
 
	//serverFromClientSession->setAllowSASLEXTERNAL();

			




	
	
	
		
 

			




	
	
	
		
 
	serverFromClientSession->onSessionStarted.connect(

			




	
	
	
		
 
			boost::bind(&Server::handleSessionStarted, this, serverFromClientSession));

			




	
	
	
		
 
	serverFromClientSession->onSessionFinished.connect(

			




	
	
	
		
 
			boost::bind(&Server::handleSessionFinished, this, 

			




	
	
	
		
 
			serverFromClientSession));

			




	
	
	
		
 
	serverFromClientSession->onPasswordInvalid.connect(

			




	
	
	
		
 
			boost::bind(&Server::handleSessionFinished, this, 

			




	
	
	
		
 
			serverFromClientSession));

			




	
	
	
		
 
	serverFromClientSession->onDataRead.connect(boost::bind(&Server::handleDataRead, this, _1));

			




	
	
	
		
 
	serverFromClientSession->onDataWritten.connect(boost::bind(&Server::handleDataWritten, this, _1));

			




	
	
	
		
 

			




	
	
	
		
 
	if (tlsFactory) {

			




	
	
	
		
 
		serverFromClientSession->addTLSEncryption(tlsFactory, cert);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	serverFromClientSession->startSession();

			




	
	
	
		
 

			




	
	
	
		
 
	serverFromClientSessions.push_back(serverFromClientSession);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    include/Swiften/Server/ServerFromClientSession.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -15,24 +15,25 @@

			




	
	
	
		
 
#include <Swiften/Elements/StreamFeatures.h>

			




	
	
	
		
 
#include <Swiften/Elements/ResourceBind.h>

			




	
	
	
		
 
#include <Swiften/Elements/StartSession.h>

			




	
	
	
		
 
#include <Swiften/Elements/IQ.h>

			




	
	
	
		
 
#include <Swiften/Elements/AuthSuccess.h>

			




	
	
	
		
 
#include <Swiften/Elements/AuthFailure.h>

			




	
	
	
		
 
#include <Swiften/Elements/AuthRequest.h>

			




	
	
	
		
 
#include <Swiften/SASL/PLAINMessage.h>

			




	
	
	
		
 
#include <Swiften/StreamStack/StreamStack.h>

			




	
	
	
		
 
#include <Swiften/StreamStack/TLSServerLayer.h>

			




	
	
	
		
 
#include <Swiften/Elements/StartTLSRequest.h>

			




	
	
	
		
 
#include <Swiften/Elements/TLSProceed.h>

			




	
	
	
		
 
#include <iostream>

			




	
	
	
		
 

			




	
	
	
		
 
namespace Swift {

			




	
	
	
		
 

			




	
	
	
		
 
ServerFromClientSession::ServerFromClientSession(

			




	
	
	
		
 
		const std::string& id,

			




	
	
	
		
 
		boost::shared_ptr<Connection> connection, 

			




	
	
	
		
 
		PayloadParserFactoryCollection* payloadParserFactories, 

			




	
	
	
		
 
		PayloadSerializerCollection* payloadSerializers,

			




	
	
	
		
 
		UserRegistry* userRegistry) : 

			




	
	
	
		
 
			Session(connection, payloadParserFactories, payloadSerializers),

			




	
	
	
		
 
			id_(id),

			




	
	
	
		
 
			userRegistry_(userRegistry),

			




	
	
		
 
@@ -56,26 +57,28 @@ void ServerFromClientSession::handlePasswordValid(const std::string &user) {

			




	
	
	
		
 
		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()) {

			




	
	
	
		
 
		user_ = "/././";

			




	
	
	
		
 
		getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));

			




	
	
	
		
 
		finishSession(AuthenticationFailedError);

			




	
	
	
		
 
		onPasswordInvalid();

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element) {

			




	
	
	
		
 
	if (isInitialized()) {

			




	
	
	
		
 
		onElementReceived(element);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		if (AuthRequest* authRequest = dynamic_cast<AuthRequest*>(element.get())) {

			




	
	
	
		
 
			if (authRequest->getMechanism() == "PLAIN" || (allowSASLEXTERNAL && authRequest->getMechanism() == "EXTERNAL")) {

			




	
	
	
		
 
				if (authRequest->getMechanism() == "EXTERNAL") {

			




	
	
	
		
 
						getXMPPLayer()->writeElement(boost::shared_ptr<AuthSuccess>(new AuthSuccess()));

			




        

    


    
    

    

        

                

                    include/Swiften/Server/ServerFromClientSession.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,24 +33,25 @@ namespace Swift {

			




	
	
	
		
 

			




	
	
	
		
 
	class ServerFromClientSession : public Session {

			




	
	
	
		
 
		public:

			




	
	
	
		
 
			ServerFromClientSession(

			




	
	
	
		
 
					const std::string& id,

			




	
	
	
		
 
					boost::shared_ptr<Connection> connection, 

			




	
	
	
		
 
					PayloadParserFactoryCollection* payloadParserFactories, 

			




	
	
	
		
 
					PayloadSerializerCollection* payloadSerializers,

			




	
	
	
		
 
					UserRegistry* userRegistry);

			




	
	
	
		
 
			~ServerFromClientSession();

			




	
	
	
		
 

			




	
	
	
		
 
			boost::signal<void ()> onSessionStarted;

			




	
	
	
		
 
			boost::signal<void ()> onPasswordInvalid;

			




	
	
	
		
 
			void setAllowSASLEXTERNAL();

			




	
	
	
		
 
			const std::string &getUser() {

			




	
	
	
		
 
				return user_;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, const PKCS12Certificate& cert);

			




	
	
	
		
 

			




	
	
	
		
 
		private:

			




	
	
	
		
 
			void handleElement(boost::shared_ptr<Element>);

			




	
	
	
		
 
			void handleStreamStart(const ProtocolHeader& header);

			




	
	
	
		
 
			void handlePasswordValid(const std::string &user);

			




	
	
	
		
 
			void handlePasswordInvalid(const std::string &user);

			




        

    


    
    

    

        

                

                    include/Swiften/Server/ServerStanzaChannel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -46,28 +46,26 @@ void ServerStanzaChannel::sendIQ(boost::shared_ptr<IQ> iq) {

			




	
	
	
		
 

			




	
	
	
		
 
void ServerStanzaChannel::sendMessage(boost::shared_ptr<Message> message) {

			




	
	
	
		
 
	send(message);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ServerStanzaChannel::sendPresence(boost::shared_ptr<Presence> presence) {

			




	
	
	
		
 
	send(presence);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ServerStanzaChannel::finishSession(const JID& to, boost::shared_ptr<Element> element) {

			




	
	
	
		
 
	std::vector<boost::shared_ptr<ServerFromClientSession> > candidateSessions;

			




	
	
	
		
 
	for (std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = sessions[to.toBare().toString()].begin(); i != sessions[to.toBare().toString()].end(); ++i) {

			




	
	
	
		
 
		if ((*i)->getRemoteJID().equals(to, JID::WithoutResource)) {

			




	
	
	
		
 
			(*i)->sendElement(element);

			




	
	
	
		
 
			candidateSessions.push_back(*i);

			




	
	
	
		
 
		}

			




	
	
	
		
 
		(*i)->sendElement(element);

			




	
	
	
		
 
		candidateSessions.push_back(*i);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	for (std::vector<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = candidateSessions.begin(); i != candidateSessions.end(); ++i) {

			




	
	
	
		
 
		(*i)->finishSession();

			




	
	
	
		
 
		sessions[to.toBare().toString()].remove(*i);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
std::string ServerStanzaChannel::getNewIQID() {

			




	
	
	
		
 
	return idGenerator.generateID();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/networkpluginserver.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -513,24 +513,25 @@ void NetworkPluginServer::pingTimeout() {

			




	
	
	
		
 
		if ((*it)->pongReceived) {

			




	
	
	
		
 
			sendPing((*it));

			




	
	
	
		
 
		}

			




	
	
	
		
 
		else {

			




	
	
	
		
 
			exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
	m_pingTimer->start();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleUserCreated(User *user) {

			




	
	
	
		
 
	Backend *c = getFreeClient();

			




	
	
	
		
 

			




	
	
	
		
 
	if (!c) {

			




	
	
	
		
 
		LOG4CXX_ERROR(logger, "There is no backend to handle user " << user->getJID().toString());

			




	
	
	
		
 
		user->handleDisconnected("Internal Server Error (no free backend to handle your session), please reconnect.");

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	user->setData(c);

			




	
	
	
		
 
	c->users.push_back(user);

			




	
	
	
		
 

			




	
	
	
		
 
// 	UserInfo userInfo = user->getUserInfo();

			




	
	
	
		
 
	user->onReadyToConnect.connect(boost::bind(&NetworkPluginServer::handleUserReadyToConnect, this, user));

			




	
	
	
		
 
	user->onPresenceChanged.connect(boost::bind(&NetworkPluginServer::handleUserPresenceChanged, this, user, _1));

			




	
	
	
		
 
	user->onRoomJoined.connect(boost::bind(&NetworkPluginServer::handleRoomJoined, this, user, _1, _2, _3));

			




	
	
		
 
@@ -615,24 +616,25 @@ void NetworkPluginServer::handleRoomLeft(User *user, const std::string &r) {

			




	
	
	
		
 

			




	
	
	
		
 
	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(r);

			




	
	
	
		
 
	if (!conv) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	user->getConversationManager()->removeConversation(conv);

			




	
	
	
		
 

			




	
	
	
		
 
	delete conv;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleUserDestroyed(User *user) {

			




	
	
	
		
 
	std::cout << "HANDLE_DESTROYED\n";

			




	
	
	
		
 
	UserInfo userInfo = user->getUserInfo();

			




	
	
	
		
 

			




	
	
	
		
 
	pbnetwork::Logout logout;

			




	
	
	
		
 
	logout.set_user(user->getJID().toBare());

			




	
	
	
		
 
	logout.set_legacyname(userInfo.uin);

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	logout.SerializeToString(&message);

			




	
	
	
		
 

			




	
	
	
		
 
	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGOUT);

			




	
	
	
		
 
 

			




	
	
	
		
 
	Backend *c = (Backend *) user->getData();

			




        

    


    
    

    

        

                

                    src/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,24 +33,25 @@

			




	
	
	
		
 

			




	
	
	
		
 
using namespace log4cxx;

			




	
	
	
		
 
using namespace boost;

			




	
	
	
		
 

			




	
	
	
		
 
#define foreach         BOOST_FOREACH

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
static LoggerPtr logger = Logger::getLogger("User");

			




	
	
	
		
 

			




	
	
	
		
 
User::User(const Swift::JID &jid, UserInfo &userInfo, Component *component, UserManager *userManager) {

			




	
	
	
		
 
	m_jid = jid;

			




	
	
	
		
 
	m_data = NULL;

			




	
	
	
		
 

			




	
	
	
		
 
	m_component = component;

			




	
	
	
		
 
	m_presenceOracle = component->m_presenceOracle;

			




	
	
	
		
 
	m_entityCapsManager = component->m_entityCapsManager;

			




	
	
	
		
 
	m_userManager = userManager;

			




	
	
	
		
 
	m_userInfo = userInfo;

			




	
	
	
		
 
	m_connected = false;

			




	
	
	
		
 
	m_readyForConnect = false;

			




	
	
	
		
 

			




	
	
	
		
 
	m_reconnectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(10000);

			




	
	
	
		
 
	m_reconnectTimer->onTick.connect(boost::bind(&User::onConnectingTimeout, this)); 

			




	
	
	
		
 

			




	
	
		
 
@@ -181,19 +182,20 @@ void User::handleDisconnected(const std::string &error) {

			




	
	
	
		
 

			




	
	
	
		
 
	boost::shared_ptr<Swift::Message> msg(new Swift::Message());

			




	
	
	
		
 
	msg->setBody(error);

			




	
	
	
		
 
	msg->setTo(m_jid.toBare());

			




	
	
	
		
 
	msg->setFrom(m_component->getJID());

			




	
	
	
		
 
	m_component->getStanzaChannel()->sendMessage(msg);

			




	
	
	
		
 

			




	
	
	
		
 
	// In server mode, server finishes the session and pass unavailable session to userManager,

			




	
	
	
		
 
	// so we can't removeUser() in server mode, because it would be removed twice.

			




	
	
	
		
 
	// Once in finishSession and once in m_userManager->removeUser.

			




	
	
	
		
 
	if (m_component->inServerMode()) {

			




	
	
	
		
 
		dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));

			




	
	
	
		
 
		m_userManager->removeUser(this);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		m_userManager->removeUser(this);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -158,24 +158,32 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {

			




	
	
	
		
 
// // 

			




	
	
	
		
 
// // 

			




	
	
	
		
 
				user = new User(presence->getFrom(), res, m_component, this);

			




	
	
	
		
 
				user->getRosterManager()->setStorageBackend(m_storageBackend);

			




	
	
	
		
 
				// TODO: handle features somehow

			




	
	
	
		
 
// // 			user->setFeatures(isVip ? CONFIG().VIPFeatures : CONFIG().transportFeatures);

			




	
	
	
		
 
// // // 				if (c != NULL)

			




	
	
	
		
 
// // // 					if (Transport::instance()->hasClientCapabilities(c->findAttribute("ver")))

			




	
	
	
		
 
// // // 						user->setResource(stanza.from().resource(), stanza.priority(), Transport::instance()->getCapabilities(c->findAttribute("ver")));

			




	
	
	
		
 
// // // 

			




	
	
	
		
 
			addUser(user);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// User can be handleDisconnected in addUser callbacks...

			




	
	
	
		
 
	user = getUser(userkey);

			




	
	
	
		
 
	if (!user) {

			




	
	
	
		
 
		m_userRegistry->onPasswordInvalid(presence->getFrom());

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	user->handlePresence(presence);

			




	
	
	
		
 

			




	
	
	
		
 
	bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';

			




	
	
	
		
 
	if (isMUC)

			




	
	
	
		
 
		return;

			




	
	
	
		
 

			




	
	
	
		
 
	if (presence->getType() == Swift::Presence::Unavailable) {

			




	
	
	
		
 
		if (user) {

			




	
	
	
		
 
			Swift::Presence::ref highest = m_component->getPresenceOracle()->getHighestPriorityPresence(presence->getFrom().toBare());

			




	
	
	
		
 
			// There's no presence for this user, so disconnect

			




	
	
	
		
 
			if (!highest || (highest && highest->getType() == Swift::Presence::Unavailable)) {

			




	
	
	
		
 
				removeUser(user);

			




	
	
		
 
@@ -247,25 +255,27 @@ void UserManager::handleSubscription(Swift::Presence::ref presence) {

			




	
	
	
		
 
		response->setFrom(presence->getTo());

			




	
	
	
		
 
		response->setTo(presence->getFrom());

			




	
	
	
		
 
		response->setType(Swift::Presence::Unsubscribed);

			




	
	
	
		
 
		m_component->getStanzaChannel()->sendPresence(response);

			




	
	
	
		
 
	}

			




	
	
	
		
 
// 	else {

			




	
	
	
		
 
// // 		Log(presence->getFrom().toString().getUTF8String(), "Subscribe presence received, but this user is not logged in");

			




	
	
	
		
 
// 	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UserManager::connectUser(const Swift::JID &user) {

			




	
	
	
		
 
	if (m_users.find(user.toBare().toString()) != m_users.end()) {

			




	
	
	
		
 
		std::cout << "FOUND\n";

			




	
	
	
		
 
		m_userRegistry->onPasswordValid(user);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		std::cout << "NOT FOUND - PRESENCe\n";

			




	
	
	
		
 
		Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
		response->setTo(m_component->getJID());

			




	
	
	
		
 
		response->setFrom(user);

			




	
	
	
		
 
		response->setType(Swift::Presence::Available);

			




	
	
	
		
 
		m_component->onUserPresenceReceived(response);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-10621
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support