Changeset - 65ad5a210697
Parent rev.
Child rev.
[Not reviewed]
0 4 0
Jan Kaluza - 12 years ago 2013-01-24 08:35:24
hanzz.k@gmail.com
Communi: Log 4xx errors and forward 433, 436 and 464 to XMPP client
4 files changed with 84 insertions and 7 deletions:
backends/libcommuni/session.cpp
20
src/conversation.cpp
17
src/tests/conversationmanager.cpp
46
6
src/tests/user.cpp
1
1
0 comments (0 inline, 0 general)
backends/libcommuni/session.cpp
➞
Show inline comments
 
@@ -269,12 +269,28 @@ void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {
 
			LOG4CXX_INFO(logger, user << "Asking /who for channel " << TO_UTF8(channel));
 
			sendCommand(IrcCommand::createWho(channel));
 
			break;
 
		case 432:
 
			np->handleDisconnected(user, pbnetwork::CONNECTION_ERROR_INVALID_USERNAME, "Erroneous Nickname");
 
			break;
 
		case 433:
 
			for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {
 
				np->handleParticipantChanged(user, TO_UTF8(nickName()), it->second->getChannel() + suffix, pbnetwork::PARTICIPANT_FLAG_CONFLICT);
 
			}
 
			np->handleDisconnected(user, pbnetwork::CONNECTION_ERROR_INVALID_USERNAME, "Nickname is already in use");
 
			break;
 
		case 436:
 
			for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {
 
				np->handleParticipantChanged(user, TO_UTF8(nickName()), it->second->getChannel() + suffix, pbnetwork::PARTICIPANT_FLAG_CONFLICT);
 
			}
 
			np->handleDisconnected(user, pbnetwork::CONNECTION_ERROR_INVALID_USERNAME, "Nickname collision KILL");
 
		case 464:
 
			for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {
 
				np->handleParticipantChanged(user, TO_UTF8(nickName()), it->second->getChannel() + suffix, pbnetwork::PARTICIPANT_FLAG_NOT_AUTHORIZED);
 
			}
 
			np->handleDisconnected(user, pbnetwork::CONNECTION_ERROR_INVALID_USERNAME, "Password incorrect");
 
		case 321:
 
			m_rooms.clear();
 
			m_names.clear();
 
			break;
 
		case 322:
 
			m_rooms.push_back(TO_UTF8(parameters[1]));
 
@@ -284,12 +300,16 @@ void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {
 
			np->handleRoomList("", m_rooms, m_names);
 
			break;
 
		default:
 
			break;
 
	}
 

			




	
	
	
		
 
	if (m->code() >= 400 && m->code() < 500) {

			




	
	
	
		
 
			LOG4CXX_INFO(logger, user << ": Error message received: " << message->toData().data());

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	//qDebug() << "numeric message received:" << receiver() << origin << code << params;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MyIrcSession::awayTimeout() {

			




	
	
	
		
 
	for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {

			




	
	
	
		
 
		if (it->second->shouldAskWho()) {

			




        

    


    
    

    

        

                

                    src/conversation.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -27,12 +27,13 @@

			




	
	
	
		
 
#include "transport/rostermanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "Swiften/Elements/MUCItem.h"

			




	
	
	
		
 
#include "Swiften/Elements/MUCOccupant.h"

			




	
	
	
		
 
#include "Swiften/Elements/MUCUserPayload.h"

			




	
	
	
		
 
#include "Swiften/Elements/Delay.h"

			




	
	
	
		
 
#include "Swiften/Elements/MUCPayload.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName, bool isMUC) : m_conversationManager(conversationManager) {

			




	
	
	
		
 
	m_legacyName = legacyName;

			




	
	
	
		
 
	m_muc = isMUC;

			




	
	
		
 
@@ -227,17 +228,33 @@ Swift::Presence::ref Conversation::generatePresence(const std::string &nick, int

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	presence->setShow(s.getType());

			




	
	
	
		
 

			




	
	
	
		
 
	Swift::MUCUserPayload *p = new Swift::MUCUserPayload ();

			




	
	
	
		
 
	if (m_nickname == nickname) {

			




	
	
	
		
 
		if (flag & PARTICIPANT_FLAG_CONFLICT) {

			




	
	
	
		
 
			delete p;

			




	
	
	
		
 
			presence->setType(Swift::Presence::Error);

			




	
	
	
		
 
			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::MUCPayload()));

			




	
	
	
		
 
			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::ErrorPayload(Swift::ErrorPayload::Conflict)));

			




	
	
	
		
 
			return presence;

			




	
	
	
		
 
		}

			




	
	
	
		
 
		else if (flag & PARTICIPANT_FLAG_NOT_AUTHORIZED) {

			




	
	
	
		
 
			delete p;

			




	
	
	
		
 
			presence->setType(Swift::Presence::Error);

			




	
	
	
		
 
			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::MUCPayload()));

			




	
	
	
		
 
			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::ErrorPayload(Swift::ErrorPayload::NotAuthorized, Swift::ErrorPayload::Auth)));

			




	
	
	
		
 
			return presence;

			




	
	
	
		
 
		}

			




	
	
	
		
 
		else {

			




	
	
	
		
 
			Swift::MUCUserPayload::StatusCode c;

			




	
	
	
		
 
			c.code = 110;

			




	
	
	
		
 
			p->addStatusCode(c);

			




	
	
	
		
 
			m_sentInitialPresence = true;

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
	Swift::MUCItem item;

			




	
	
	
		
 
	

			




	
	
	
		
 
	item.affiliation = Swift::MUCOccupant::Member;

			




	
	
	
		
 
	item.role = Swift::MUCOccupant::Participant;

			




        

    


    
    

    

        

                

                    src/tests/conversationmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -32,12 +32,14 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
	CPPUNIT_TEST(handleChatstateMessages);

			




	
	
	
		
 
	CPPUNIT_TEST(handleSubjectMessages);

			




	
	
	
		
 
	CPPUNIT_TEST(handleParticipantChanged);

			




	
	
	
		
 
	CPPUNIT_TEST(handleParticipantChangedTwoResources);

			




	
	
	
		
 
	CPPUNIT_TEST(handlePMFromXMPP);

			




	
	
	
		
 
	CPPUNIT_TEST(handleGroupchatRemoved);

			




	
	
	
		
 
	CPPUNIT_TEST(handleNicknameConflict);

			




	
	
	
		
 
	CPPUNIT_TEST(handleNotAuthorized);

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE_END();

			




	
	
	
		
 

			




	
	
	
		
 
	public:

			




	
	
	
		
 
		TestingConversation *m_conv;

			




	
	
	
		
 
		boost::shared_ptr<Swift::Message> m_msg;

			




	
	
	
		
 

			




	
	
		
 
@@ -112,13 +114,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 

			




	
	
	
		
 
		// No response, because presence with code 110 has not been sent yet and we must not send

			




	
	
	
		
 
		// subject before this one.

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());

			




	
	
	
		
 

			




	
	
	
		
 
		// this user presence - status code 110

			




	
	
	
		
 
		conv->handleParticipantChanged("nickname", 1, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		conv->handleParticipantChanged("nickname", Conversation::PARTICIPANT_FLAG_MODERATOR, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 
		

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getSubject());

			




	
	
	
		
 
		received.clear();

			




	
	
		
 
@@ -469,13 +471,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
		

			




	
	
	
		
 
		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
		conv->setNickname("nickname");

			




	
	
	
		
 
		conv->addJID("user@localhost/resource");

			




	
	
	
		
 

			




	
	
	
		
 
		// normal presence

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", 0, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", Conversation::PARTICIPANT_FLAG_NONE, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::Away, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getShow());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getTo().toString());

			




	
	
		
 
@@ -484,13 +486,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::MUCOccupant::Member, *getStanza(received[0])->getPayload<Swift::MUCUserPayload>()->getItems()[0].affiliation);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::MUCOccupant::Participant, *getStanza(received[0])->getPayload<Swift::MUCUserPayload>()->getItems()[0].role);

			




	
	
	
		
 

			




	
	
	
		
 
		received.clear();

			




	
	
	
		
 

			




	
	
	
		
 
		// this user presence - status code 110

			




	
	
	
		
 
		conv->handleParticipantChanged("nickname", 1, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		conv->handleParticipantChanged("nickname", Conversation::PARTICIPANT_FLAG_MODERATOR, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::Away, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getShow());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getTo().toString());

			




	
	
		
 
@@ -500,13 +502,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::MUCOccupant::Moderator, *getStanza(received[0])->getPayload<Swift::MUCUserPayload>()->getItems()[0].role);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(110, getStanza(received[0])->getPayload<Swift::MUCUserPayload>()->getStatusCodes()[0].code);

			




	
	
	
		
 

			




	
	
	
		
 
		received.clear();

			




	
	
	
		
 

			




	
	
	
		
 
		// renamed - status code 303

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", 1, Swift::StatusShow::Away, "my status message", "hanzz");

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", Conversation::PARTICIPANT_FLAG_MODERATOR, Swift::StatusShow::Away, "my status message", "hanzz");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getType());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getTo().toString());

			




	
	
		
 
@@ -527,13 +529,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
		conv->setNickname("nickname");

			




	
	
	
		
 
		conv->addJID("user@localhost/resource");

			




	
	
	
		
 
		conv->addJID("user@localhost/resource2");

			




	
	
	
		
 

			




	
	
	
		
 
		// normal presence

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", 0, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", Conversation::PARTICIPANT_FLAG_NONE, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) received2.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received2[0])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::Away, dynamic_cast<Swift::Presence *>(getStanza(received2[0]))->getShow());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource2"), dynamic_cast<Swift::Presence *>(getStanza(received2[0]))->getTo().toString());

			




	
	
		
 
@@ -548,13 +550,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);

			




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

			




	
	
	
		
 
		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
		conv->setNickname("nickname");

			




	
	
	
		
 
		conv->setJID("user@localhost/resource");

			




	
	
	
		
 

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", 0, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", Conversation::PARTICIPANT_FLAG_NONE, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		received.clear();

			




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

			




	
	
	
		
 
		msg->setBody("hi there!");

			




	
	
	
		
 
		msg->setFrom("user@localhost/resource");

			




	
	
		
 
@@ -590,9 +592,47 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::None, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getShow());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getTo().toString());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/nickname"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getFrom().toString());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(332, getStanza(received[0])->getPayload<Swift::MUCUserPayload>()->getStatusCodes()[0].code);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handleNicknameConflict() {

			




	
	
	
		
 
		User *user = userManager->getUser("user@localhost");

			




	
	
	
		
 
		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);

			




	
	
	
		
 
		

			




	
	
	
		
 
		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
		conv->setNickname("nickname");

			




	
	
	
		
 
		conv->addJID("user@localhost/resource");

			




	
	
	
		
 

			




	
	
	
		
 
		// normal presence

			




	
	
	
		
 
		conv->handleParticipantChanged("nickname", Conversation::PARTICIPANT_FLAG_CONFLICT, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Error, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getType());

			




	
	
	
		
 
		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::ErrorPayload>());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::ErrorPayload::Conflict, getStanza(received[0])->getPayload<Swift::ErrorPayload>()->getCondition());

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handleNotAuthorized() {

			




	
	
	
		
 
		User *user = userManager->getUser("user@localhost");

			




	
	
	
		
 
		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);

			




	
	
	
		
 
		

			




	
	
	
		
 
		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
		conv->setNickname("nickname");

			




	
	
	
		
 
		conv->addJID("user@localhost/resource");

			




	
	
	
		
 

			




	
	
	
		
 
		// normal presence

			




	
	
	
		
 
		conv->handleParticipantChanged("nickname", Conversation::PARTICIPANT_FLAG_NOT_AUTHORIZED, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Error, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getType());

			




	
	
	
		
 
		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::ErrorPayload>());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::ErrorPayload::NotAuthorized, getStanza(received[0])->getPayload<Swift::ErrorPayload>()->getCondition());

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
CPPUNIT_TEST_SUITE_REGISTRATION (ConversationManagerTest);

			




        

    


    
    

    

        

                

                    src/tests/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -167,13 +167,13 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
	void handlePresenceJoinRoomTwoResources() {

			




	
	
	
		
 
		handlePresenceJoinRoom();

			




	
	
	
		
 
		User *user = userManager->getUser("user@localhost");

			




	
	
	
		
 

			




	
	
	
		
 
		// Add 1 participant

			




	
	
	
		
 
		Conversation *conv = user->getConversationManager()->getConversation("#room");

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", 0, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", Conversation::PARTICIPANT_FLAG_NONE, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 

			




	
	
	
		
 
		// Connect 2nd resource

			




	
	
	
		
 
		connectSecondResource();

			




	
	
	
		
 
		received2.clear();

			




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

			




	
	
	
		
 
		response->setTo("#room@localhost/hanzz");

			




        

    



    


    



    



      

      





    
    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