Changeset - 1fa8a9d97508
Parent rev.
Child rev.
[Not reviewed]
0 2 0
Jan Kaluza - 13 years ago 2012-12-19 14:22:57
hanzz.k@gmail.com
Do not pass char * which won't survive till sqlite3 statement execution.
2 files changed with 26 insertions and 2 deletions:
src/sqlite3backend.cpp
4
2
src/tests/util.cpp
22
0 comments (0 inline, 0 general)
src/sqlite3backend.cpp
➞
Show inline comments
 
@@ -238,127 +238,129 @@ bool SQLite3Backend::getUser(const std::string &barejid, UserInfo &user) {
 

			




	
	
	
		
 
	int ret;

			




	
	
	
		
 
	while((ret = sqlite3_step(m_getUser)) == SQLITE_ROW) {

			




	
	
	
		
 
		user.id = sqlite3_column_int(m_getUser, 0);

			




	
	
	
		
 
		user.jid = (const char *) sqlite3_column_text(m_getUser, 1);

			




	
	
	
		
 
		user.uin = (const char *) sqlite3_column_text(m_getUser, 2);

			




	
	
	
		
 
		user.password = (const char *) sqlite3_column_text(m_getUser, 3);

			




	
	
	
		
 
		user.encoding = (const char *) sqlite3_column_text(m_getUser, 4);

			




	
	
	
		
 
		user.language = (const char *) sqlite3_column_text(m_getUser, 5);

			




	
	
	
		
 
		user.vip = sqlite3_column_int(m_getUser, 6) != 0;

			




	
	
	
		
 
		while((ret = sqlite3_step(m_getUser)) == SQLITE_ROW) {

			




	
	
	
		
 
		}

			




	
	
	
		
 
		return true;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (ret != SQLITE_DONE) {

			




	
	
	
		
 
		LOG4CXX_ERROR(logger, "getUser query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return false;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void SQLite3Backend::setUserOnline(long id, bool online) {

			




	
	
	
		
 
	BEGIN(m_setUserOnline);

			




	
	
	
		
 
	BIND_INT(m_setUserOnline, (int)online);

			




	
	
	
		
 
	BIND_INT(m_setUserOnline, id);

			




	
	
	
		
 
	EXECUTE_STATEMENT(m_setUserOnline, "setUserOnline query");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool SQLite3Backend::getOnlineUsers(std::vector<std::string> &users) {

			




	
	
	
		
 
	sqlite3_reset(m_getOnlineUsers);

			




	
	
	
		
 

			




	
	
	
		
 
	int ret;

			




	
	
	
		
 
	while((ret = sqlite3_step(m_getOnlineUsers)) == SQLITE_ROW) {

			




	
	
	
		
 
		std::string jid = (const char *) sqlite3_column_text(m_getOnlineUsers, 0);

			




	
	
	
		
 
		users.push_back(jid);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (ret != SQLITE_DONE) {

			




	
	
	
		
 
		LOG4CXX_ERROR(logger, "getOnlineUsers query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));

			




	
	
	
		
 
		return false;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
long SQLite3Backend::addBuddy(long userId, const BuddyInfo &buddyInfo) {

			




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

			




	
	
	
		
 
	std::string groups = StorageBackend::serializeGroups(buddyInfo.groups);

			




	
	
	
		
 
	BEGIN(m_addBuddy);

			




	
	
	
		
 
	BIND_INT(m_addBuddy, userId);

			




	
	
	
		
 
	BIND_STR(m_addBuddy, buddyInfo.legacyName);

			




	
	
	
		
 
	BIND_STR(m_addBuddy, buddyInfo.subscription);

			




	
	
	
		
 
	BIND_STR(m_addBuddy, StorageBackend::serializeGroups(buddyInfo.groups));

			




	
	
	
		
 
	BIND_STR(m_addBuddy, groups);

			




	
	
	
		
 
	BIND_STR(m_addBuddy, buddyInfo.alias);

			




	
	
	
		
 
	BIND_INT(m_addBuddy, buddyInfo.flags);

			




	
	
	
		
 

			




	
	
	
		
 
	if(sqlite3_step(m_addBuddy) != SQLITE_DONE) {

			




	
	
	
		
 
		LOG4CXX_ERROR(logger, "addBuddy query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));

			




	
	
	
		
 
		return -1;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	long id = (long) sqlite3_last_insert_rowid(m_db);

			




	
	
	
		
 

			




	
	
	
		
 
// 	INSERT OR REPLACE INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?)

			




	
	
	
		
 
	BEGIN(m_updateBuddySetting);

			




	
	
	
		
 
	BIND_INT(m_updateBuddySetting, userId);

			




	
	
	
		
 
	BIND_INT(m_updateBuddySetting, id);

			




	
	
	
		
 
	BIND_STR(m_updateBuddySetting, buddyInfo.settings.find("icon_hash")->first);

			




	
	
	
		
 
	BIND_INT(m_updateBuddySetting, TYPE_STRING);

			




	
	
	
		
 
	BIND_STR(m_updateBuddySetting, buddyInfo.settings.find("icon_hash")->second.s);

			




	
	
	
		
 

			




	
	
	
		
 
	EXECUTE_STATEMENT(m_updateBuddySetting, "updateBuddySetting query");

			




	
	
	
		
 
	return id;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void SQLite3Backend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {

			




	
	
	
		
 
// 	UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?

			




	
	
	
		
 
	std::string groups = StorageBackend::serializeGroups(buddyInfo.groups);

			




	
	
	
		
 
	BEGIN(m_updateBuddy);

			




	
	
	
		
 
	BIND_STR(m_updateBuddy, StorageBackend::serializeGroups(buddyInfo.groups));

			




	
	
	
		
 
	BIND_STR(m_updateBuddy, groups);

			




	
	
	
		
 
	BIND_STR(m_updateBuddy, buddyInfo.alias);

			




	
	
	
		
 
	BIND_INT(m_updateBuddy, buddyInfo.flags);

			




	
	
	
		
 
	BIND_STR(m_updateBuddy, buddyInfo.subscription);

			




	
	
	
		
 
	BIND_INT(m_updateBuddy, userId);

			




	
	
	
		
 
	BIND_STR(m_updateBuddy, buddyInfo.legacyName);

			




	
	
	
		
 

			




	
	
	
		
 
	EXECUTE_STATEMENT(m_updateBuddy, "updateBuddy query");

			




	
	
	
		
 

			




	
	
	
		
 
// 	INSERT OR REPLACE INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?)

			




	
	
	
		
 
	BEGIN(m_updateBuddySetting);

			




	
	
	
		
 
	BIND_INT(m_updateBuddySetting, userId);

			




	
	
	
		
 
	BIND_INT(m_updateBuddySetting, buddyInfo.id);

			




	
	
	
		
 
	BIND_STR(m_updateBuddySetting, buddyInfo.settings.find("icon_hash")->first);

			




	
	
	
		
 
	BIND_INT(m_updateBuddySetting, TYPE_STRING);

			




	
	
	
		
 
	BIND_STR(m_updateBuddySetting, buddyInfo.settings.find("icon_hash")->second.s);

			




	
	
	
		
 

			




	
	
	
		
 
	EXECUTE_STATEMENT(m_updateBuddySetting, "updateBuddySetting query");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
//	SELECT id, uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC

			




	
	
	
		
 
	BEGIN(m_getBuddies);

			




	
	
	
		
 
	BIND_INT(m_getBuddies, id);

			




	
	
	
		
 

			




	
	
	
		
 
// 	"SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC"

			




	
	
	
		
 
	BEGIN(m_getBuddiesSettings);

			




	
	
	
		
 
	BIND_INT(m_getBuddiesSettings, id);

			




	
	
	
		
 

			




	
	
	
		
 
	SettingVariableInfo var;

			




	
	
	
		
 
	long buddy_id = -1;

			




	
	
	
		
 
	std::string key;

			




	
	
	
		
 

			




	
	
	
		
 
	int ret;

			




	
	
	
		
 
	while((ret = sqlite3_step(m_getBuddies)) == SQLITE_ROW) {

			




	
	
	
		
 
		BuddyInfo b;

			




	
	
	
		
 
		RESET_GET_COUNTER(m_getBuddies);

			




	
	
	
		
 
		b.id = GET_INT(m_getBuddies);

			




	
	
	
		
 
		b.legacyName = GET_STR(m_getBuddies);

			




	
	
	
		
 
		b.subscription = GET_STR(m_getBuddies);

			




	
	
	
		
 
		b.alias = GET_STR(m_getBuddies);

			




	
	
	
		
 
		std::string groups = GET_STR(m_getBuddies);

			




	
	
	
		
 
		b.groups = StorageBackend::deserializeGroups(groups);

			




	
	
	
		
 
		b.flags = GET_INT(m_getBuddies);

			




	
	
	
		
 

			




	
	
	
		
 
		if (buddy_id == b.id) {

			




	
	
	
		
 
			std::cout << "Adding buddy info " << key << "\n";

			




	
	
	
		
 
			b.settings[key] = var;

			




	
	
	
		
 
			buddy_id = -1;

			




        

    


    
    

    

        

                

                    src/tests/util.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
#include "transport/userregistry.h"

			




	
	
	
		
 
#include "transport/config.h"

			




	
	
	
		
 
#include "transport/storagebackend.h"

			




	
	
	
		
 
#include "transport/user.h"

			




	
	
	
		
 
#include "transport/transport.h"

			




	
	
	
		
 
#include "transport/storagebackend.h"

			




	
	
	
		
 
#include "transport/conversation.h"

			




	
	
	
		
 
#include "transport/usermanager.h"

			




	
	
	
		
 
#include "transport/localbuddy.h"

			




	
	
	
		
 
#include <cppunit/TestFixture.h>

			




	
	
	
		
 
#include <cppunit/extensions/HelperMacros.h>

			




	
	
	
		
 
#include <Swiften/Swiften.h>

			




	
	
	
		
 
#include <Swiften/EventLoop/DummyEventLoop.h>

			




	
	
	
		
 
#include <Swiften/Server/Server.h>

			




	
	
	
		
 
#include <Swiften/Network/DummyNetworkFactories.h>

			




	
	
	
		
 
#include <Swiften/Network/DummyConnectionServer.h>

			




	
	
	
		
 
#include "Swiften/Server/ServerStanzaChannel.h"

			




	
	
	
		
 
#include "Swiften/Server/ServerFromClientSession.h"

			




	
	
	
		
 
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"

			




	
	
	
		
 
#include "basictest.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "transport/util.h"

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
class UtilTest : public CPPUNIT_NS :: TestFixture{

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE(UtilTest);

			




	
	
	
		
 
	CPPUNIT_TEST(encryptDecryptPassword);

			




	
	
	
		
 
	CPPUNIT_TEST(serializeGroups);

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE_END();

			




	
	
	
		
 

			




	
	
	
		
 
	public:

			




	
	
	
		
 
		void setUp (void) {

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void tearDown (void) {

			




	
	
	
		
 

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
	void encryptDecryptPassword() {

			




	
	
	
		
 
		std::string encrypted = StorageBackend::encryptPassword("password", "key");

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("password"), StorageBackend::decryptPassword(encrypted, "key"));

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void serializeGroups() {

			




	
	
	
		
 
		std::vector<std::string> groups;

			




	
	
	
		
 
		std::string g = "";

			




	
	
	
		
 
		

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::serializeGroups(groups));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(0, (int) StorageBackend::deserializeGroups(g).size());

			




	
	
	
		
 

			




	
	
	
		
 
		groups.push_back("Buddies");

			




	
	
	
		
 
		g = "Buddies";

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::serializeGroups(groups));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) StorageBackend::deserializeGroups(g).size());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::deserializeGroups(g)[0]);

			




	
	
	
		
 

			




	
	
	
		
 
		groups.push_back("Buddies2");

			




	
	
	
		
 
		g = "Buddies\nBuddies2";

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::serializeGroups(groups));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(2, (int) StorageBackend::deserializeGroups(g).size());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Buddies"), StorageBackend::deserializeGroups(g)[0]);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Buddies2"), StorageBackend::deserializeGroups(g)[1]);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
CPPUNIT_TEST_SUITE_REGISTRATION (UtilTest);

			




        

    



    


    



    



      

      





    
    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