Changeset - c0a01941fc10
Parent rev.
Child rev.
[Not reviewed]
0 5 0
HanzZ - 14 years ago 2011-05-19 17:53:31
hanzz.k@gmail.com
initial support for private storage
5 files changed with 37 insertions and 1 deletions:
include/transport/sqlite3backend.h
4
include/transport/storagebackend.h
2
include/transport/usermanager.h
2
src/sqlite3backend.cpp
23
1
src/usermanager.cpp
6
0 comments (0 inline, 0 general)
include/transport/sqlite3backend.h
➞
Show inline comments
 
@@ -75,36 +75,40 @@ class SQLite3Backend : public StorageBackend
 

			




	
	
	
		
 
		/// Returns JIDs of all buddies in user's roster.

			




	
	
	
		
 
		/// \param id id of user - UserInfo.id

			




	
	
	
		
 
		/// \param roster string list used to store user's roster

			




	
	
	
		
 
		/// \return true if user has been found in database and roster has been fetched

			




	
	
	
		
 
		bool getBuddies(long id, std::list<BuddyInfo> &roster);

			




	
	
	
		
 

			




	
	
	
		
 
		long addBuddy(long userId, const BuddyInfo &buddyInfo);

			




	
	
	
		
 

			




	
	
	
		
 
		void updateBuddy(long userId, const BuddyInfo &buddyInfo);

			




	
	
	
		
 
		void removeBuddy(long id) {}

			




	
	
	
		
 

			




	
	
	
		
 
		void getUserSetting(long userId, const std::string &variable, int &type, std::string &value);

			




	
	
	
		
 

			




	
	
	
		
 
		void beginTransaction();

			




	
	
	
		
 
		void commitTransaction();

			




	
	
	
		
 

			




	
	
	
		
 
	private:

			




	
	
	
		
 
		bool exec(const std::string &query);

			




	
	
	
		
 

			




	
	
	
		
 
		sqlite3 *m_db;

			




	
	
	
		
 
		Config *m_config;

			




	
	
	
		
 
		std::string m_prefix;

			




	
	
	
		
 

			




	
	
	
		
 
		// statements

			




	
	
	
		
 
		sqlite3_stmt *m_setUser;

			




	
	
	
		
 
		sqlite3_stmt *m_getUser;

			




	
	
	
		
 
		sqlite3_stmt *m_getUserSetting;

			




	
	
	
		
 
		sqlite3_stmt *m_setUserSetting;

			




	
	
	
		
 
		sqlite3_stmt *m_removeUser;

			




	
	
	
		
 
		sqlite3_stmt *m_removeUserBuddies;

			




	
	
	
		
 
		sqlite3_stmt *m_removeUserSettings;

			




	
	
	
		
 
		sqlite3_stmt *m_removeUserBuddiesSettings;

			




	
	
	
		
 
		sqlite3_stmt *m_addBuddy;

			




	
	
	
		
 
		sqlite3_stmt *m_updateBuddy;

			




	
	
	
		
 
		sqlite3_stmt *m_getBuddies;

			




	
	
	
		
 
		sqlite3_stmt *m_getBuddiesSettings;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    include/transport/storagebackend.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -99,21 +99,23 @@ class StorageBackend

			




	
	
	
		
 
		virtual void setUserOnline(long id, bool online) = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		/// removeUser

			




	
	
	
		
 
		virtual bool removeUser(long id) = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		/// getBuddies

			




	
	
	
		
 
		virtual bool getBuddies(long id, std::list<BuddyInfo> &roster) = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		virtual long addBuddy(long userId, const BuddyInfo &buddyInfo) = 0;

			




	
	
	
		
 
		virtual void updateBuddy(long userId, const BuddyInfo &buddyInfo) = 0;

			




	
	
	
		
 
		virtual void removeBuddy(long id) = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		virtual void getUserSetting(long userId, const std::string &variable, int &type, std::string &value) = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		virtual void beginTransaction() = 0;

			




	
	
	
		
 
		virtual void commitTransaction() = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		/// onStorageError

			




	
	
	
		
 
		boost::signal<void (const std::string &statement, const std::string &error)> onStorageError;

			




	
	
	
		
 

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    include/transport/usermanager.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,24 +20,25 @@

			




	
	
	
		
 

			




	
	
	
		
 
#pragma once

			




	
	
	
		
 

			




	
	
	
		
 
#include <string>

			




	
	
	
		
 
#include <map>

			




	
	
	
		
 
#include "Swiften/Swiften.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
class User;

			




	
	
	
		
 
class Component;

			




	
	
	
		
 
class StorageBackend;

			




	
	
	
		
 
class StorageResponder;

			




	
	
	
		
 

			




	
	
	
		
 
/// Manages online XMPP Users.

			




	
	
	
		
 

			




	
	
	
		
 
/// This class handles presences and creates User classes when new user connects.

			




	
	
	
		
 
/// 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);

			




	
	
	
		
 

			




	
	
		
 
@@ -71,15 +72,16 @@ class UserManager {

			




	
	
	
		
 
		void handleMessageReceived(Swift::Message::ref message);

			




	
	
	
		
 
		void handleGeneralPresenceReceived(Swift::Presence::ref presence);

			




	
	
	
		
 
		void handleProbePresence(Swift::Presence::ref presence);

			




	
	
	
		
 
		void handleSubscription(Swift::Presence::ref presence);

			




	
	
	
		
 
// 		void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);

			




	
	
	
		
 
		void addUser(User *user);

			




	
	
	
		
 

			




	
	
	
		
 
		long m_onlineBuddies;

			




	
	
	
		
 
		User *m_cachedUser;

			




	
	
	
		
 
		std::map<std::string, User *> m_users;

			




	
	
	
		
 
		Component *m_component;

			




	
	
	
		
 
		StorageBackend *m_storageBackend;

			




	
	
	
		
 
		StorageResponder *m_storageResponder;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/sqlite3backend.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -76,24 +76,26 @@ SQLite3Backend::~SQLite3Backend(){

			




	
	
	
		
 
		// But requires SQLite3 >= 3.6.0 beta

			




	
	
	
		
 
	

			




	
	
	
		
 
		FINALIZE_STMT(m_setUser);

			




	
	
	
		
 
		FINALIZE_STMT(m_getUser);

			




	
	
	
		
 
		FINALIZE_STMT(m_removeUser);

			




	
	
	
		
 
		FINALIZE_STMT(m_removeUserBuddies);

			




	
	
	
		
 
		FINALIZE_STMT(m_removeUserSettings);

			




	
	
	
		
 
		FINALIZE_STMT(m_removeUserBuddiesSettings);

			




	
	
	
		
 
		FINALIZE_STMT(m_addBuddy);

			




	
	
	
		
 
		FINALIZE_STMT(m_updateBuddy);

			




	
	
	
		
 
		FINALIZE_STMT(m_getBuddies);

			




	
	
	
		
 
		FINALIZE_STMT(m_getBuddiesSettings);

			




	
	
	
		
 
		FINALIZE_STMT(m_getUserSetting);

			




	
	
	
		
 
		FINALIZE_STMT(m_setUserSetting);

			




	
	
	
		
 
		sqlite3_close(m_db);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool SQLite3Backend::connect() {

			




	
	
	
		
 
	if (sqlite3_open(CONFIG_STRING(m_config, "database.database").c_str(), &m_db)) {

			




	
	
	
		
 
		sqlite3_close(m_db);

			




	
	
	
		
 
		return false;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (createDatabase() == false)

			




	
	
	
		
 
		return false;

			




	
	
		
 
@@ -101,24 +103,26 @@ bool SQLite3Backend::connect() {

			




	
	
	
		
 
	PREP_STMT(m_setUser, "INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES (?, ?, ?, ?, ?, DATETIME('NOW'), ?)");

			




	
	
	
		
 
	PREP_STMT(m_getUser, "SELECT id, jid, uin, password, encoding, language, vip FROM " + m_prefix + "users WHERE jid=?");

			




	
	
	
		
 

			




	
	
	
		
 
	PREP_STMT(m_removeUser, "DELETE FROM " + m_prefix + "users WHERE id=?");

			




	
	
	
		
 
	PREP_STMT(m_removeUserBuddies, "DELETE FROM " + m_prefix + "buddies WHERE user_id=?");

			




	
	
	
		
 
	PREP_STMT(m_removeUserSettings, "DELETE FROM " + m_prefix + "users_settings WHERE user_id=?");

			




	
	
	
		
 
	PREP_STMT(m_removeUserBuddiesSettings, "DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=?");

			




	
	
	
		
 

			




	
	
	
		
 
	PREP_STMT(m_addBuddy, "INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)");

			




	
	
	
		
 
	PREP_STMT(m_updateBuddy, "UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?");

			




	
	
	
		
 
	PREP_STMT(m_getBuddies, "SELECT id uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC");

			




	
	
	
		
 
	PREP_STMT(m_getBuddiesSettings, "SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC");

			




	
	
	
		
 
	PREP_STMT(m_getUserSetting, "SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=? AND var=?");

			




	
	
	
		
 
	PREP_STMT(m_setUserSetting, "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES (?,?,?,?)");

			




	
	
	
		
 

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool SQLite3Backend::createDatabase() {

			




	
	
	
		
 
	int not_exist = exec("CREATE TABLE " + m_prefix + "buddies ("

			




	
	
	
		
 
				"  id INTEGER PRIMARY KEY NOT NULL,"

			




	
	
	
		
 
				"  user_id int(10) NOT NULL,"

			




	
	
	
		
 
				"  uin varchar(255) NOT NULL,"

			




	
	
	
		
 
				"  subscription varchar(20) NOT NULL,"

			




	
	
	
		
 
				"  nickname varchar(255) NOT NULL,"

			




	
	
	
		
 
				"  groups varchar(255) NOT NULL,"

			




	
	
		
 
@@ -148,25 +152,25 @@ bool SQLite3Backend::createDatabase() {

			




	
	
	
		
 
					"  encoding varchar(50) NOT NULL DEFAULT 'utf8',"

			




	
	
	
		
 
					"  last_login datetime,"

			




	
	
	
		
 
					"  vip int(1) NOT NULL DEFAULT '0',"

			




	
	
	
		
 
					"  online int(1) NOT NULL DEFAULT '0'"

			




	
	
	
		
 
					");");

			




	
	
	
		
 

			




	
	
	
		
 
		exec("CREATE UNIQUE INDEX IF NOT EXISTS jid ON " + m_prefix + "users (jid);");

			




	
	
	
		
 

			




	
	
	
		
 
		exec("CREATE TABLE " + m_prefix + "users_settings ("

			




	
	
	
		
 
					"  user_id int(10) NOT NULL,"

			




	
	
	
		
 
					"  var varchar(50) NOT NULL,"

			




	
	
	
		
 
					"  type int(4) NOT NULL,"

			




	
	
	
		
 
					"  value varchar(255) NOT NULL,"

			




	
	
	
		
 
					"  value varchar(4095) NOT NULL,"

			




	
	
	
		
 
					"  PRIMARY KEY (user_id, var)"

			




	
	
	
		
 
					");");

			




	
	
	
		
 
					

			




	
	
	
		
 
		exec("CREATE INDEX IF NOT EXISTS user_id03 ON " + m_prefix + "users_settings (user_id);");

			




	
	
	
		
 

			




	
	
	
		
 
		exec("CREATE TABLE IF NOT EXISTS " + m_prefix + "db_version ("

			




	
	
	
		
 
			"  ver INTEGER NOT NULL DEFAULT '3'"

			




	
	
	
		
 
			");");

			




	
	
	
		
 
		exec("REPLACE INTO " + m_prefix + "db_version (ver) values(3)");

			




	
	
	
		
 
	}

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -346,21 +350,39 @@ bool SQLite3Backend::removeUser(long id) {

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	sqlite3_reset(m_removeUserBuddiesSettings);

			




	
	
	
		
 
	sqlite3_bind_int(m_removeUserBuddiesSettings, 1, id);

			




	
	
	
		
 
	if(sqlite3_step(m_removeUserBuddiesSettings) != SQLITE_DONE) {

			




	
	
	
		
 
		onStorageError("removeUserBuddiesSettings query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));

			




	
	
	
		
 
		return false;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void SQLite3Backend::getUserSetting(long id, const std::string &variable, int &type, std::string &value) {

			




	
	
	
		
 
	BEGIN(m_getUserSetting);

			




	
	
	
		
 
	BIND_INT(m_getUserSetting, id);

			




	
	
	
		
 
	BIND_STR(m_getUserSetting, variable);

			




	
	
	
		
 
	if(sqlite3_step(m_setUser) != SQLITE_ROW) {

			




	
	
	
		
 
		BEGIN(m_setUserSetting);

			




	
	
	
		
 
		BIND_INT(m_setUserSetting, id);

			




	
	
	
		
 
		BIND_STR(m_setUserSetting, variable);

			




	
	
	
		
 
		BIND_INT(m_setUserSetting, type);

			




	
	
	
		
 
		BIND_STR(m_setUserSetting, value);

			




	
	
	
		
 
		EXECUTE_STATEMENT(m_setUserSetting, "m_setUserSetting");

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		type = GET_INT(m_getUserSetting);

			




	
	
	
		
 
		value = GET_STR(m_getUserSetting);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void SQLite3Backend::beginTransaction() {

			




	
	
	
		
 
	exec("BEGIN TRANSACTION;");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void SQLite3Backend::commitTransaction() {

			




	
	
	
		
 
	exec("COMMIT TRANSACTION;");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -15,40 +15,46 @@

			




	
	
	
		
 
 *

			




	
	
	
		
 
 * You should have received a copy of the GNU General Public License

			




	
	
	
		
 
 * along with this program; if not, write to the Free Software

			




	
	
	
		
 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
#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 "storageresponder.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
UserManager::UserManager(Component *component, StorageBackend *storageBackend) {

			




	
	
	
		
 
	m_cachedUser = NULL;

			




	
	
	
		
 
	m_onlineBuddies = 0;

			




	
	
	
		
 
	m_component = component;

			




	
	
	
		
 
	m_storageBackend = 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));

			




	
	
	
		
 
// 	component->onDiscoInfoResponse.connect(bind(&UserManager::handleDiscoInfoResponse, this, _1, _2, _3));

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
UserManager::~UserManager(){

			




	
	
	
		
 
	m_storageResponder->stop();

			




	
	
	
		
 
	delete m_storageResponder;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UserManager::addUser(User *user) {

			




	
	
	
		
 
	m_users[user->getJID().toBare().toString()] = user;

			




	
	
	
		
 
	onUserCreated(user);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
User *UserManager::getUser(const std::string &barejid){

			




	
	
	
		
 
	if (m_cachedUser && barejid == m_cachedUser->getJID().toBare().toString()) {

			




	
	
	
		
 
		return m_cachedUser;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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