Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retrieve Participant List, Send Message to Channel and Real JID lookup of participants proxy JID #89

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Retrieve Participant List, Send Message to Channel and Real JID lookup of participants proxy JID #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d00927
Add MIXRegistry for handling joined MIX objects
tarun018 Aug 4, 2017
26b46ed
Add Limber MIX Mock Server and MIX Example
tarun018 Aug 13, 2017
24a3bd0
Sync registry with requested roster
tarun018 Aug 17, 2017
829213a
Updated based on feedback
tarun018 Aug 22, 2017
50cf8d0
Update based on feedback
tarun018 Aug 23, 2017
00bcfc1
Updated based on feedback
tarun018 Aug 23, 2017
bedefc2
Retrieve Participant List, Send Message to Channel and Real JID looku…
tarun018 Aug 21, 2017
ce70d34
Update 1
tarun018 Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add Limber MIX Mock Server and MIX Example 
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.

Test-Information:
Tests added for joining and leaving MIX channels as in XEP-0369, which passes.
Tested on Ubuntu 16.04 LTS.

Change-Id: Ib85d6e866e09db060b9b2da428f074dfbfd26385
  • Loading branch information
@tarun018
tarun018 committed Aug 16, 2017
commit 26b46edb0febbb53a8138facd8bb244bdd09c674
219 changes: 219 additions & 0 deletions Limber/MIXMockServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
/*
* Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
/*
* Copyright (c) 2017 Tarun Gupta
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/

#include <iostream>
#include <memory>
#include <string>
#include <unordered_set>

#include <boost/bind.hpp>

#include <Swiften/Base/IDGenerator.h>
#include <Swiften/Elements/IQ.h>
#include <Swiften/Elements/DiscoInfo.h>
#include <Swiften/Elements/DiscoItems.h>
#include <Swiften/Elements/MIXJoin.h>
#include <Swiften/Elements/MIXLeave.h>
#include <Swiften/Elements/RosterPayload.h>
#include <Swiften/Elements/RosterItemPayload.h>
#include <Swiften/Elements/Stanza.h>
#include <Swiften/EventLoop/EventLoop.h>
#include <Swiften/EventLoop/EventOwner.h>
#include <Swiften/EventLoop/SimpleEventLoop.h>
#include <Swiften/MIX/MIX.h>
#include <Swiften/Network/BoostConnection.h>
#include <Swiften/Network/BoostConnectionServer.h>
#include <Swiften/Network/BoostIOServiceThread.h>
#include <Swiften/Network/ConnectionServer.h>
#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
#include <Swiften/Parser/PlatformXMLParserFactory.h>
#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>

#include <Limber/Server/ServerFromClientSession.h>
#include <Limber/Server/SimpleUserRegistry.h>

#include <Swiften/Base/Log.h>

using namespace Swift;

class SimpleMIXChannelRegistry {

public:
SimpleMIXChannelRegistry() {}

void addMIXChannel(const JID& channelJID) {
channels_.insert(channelJID);
}

std::unordered_set<std::string>& getChannels() {
return channels_;
}

bool hasMIXChannel(const JID& jid) {
return channels_.find(jid) != channels_.end();
}

private:
std::unordered_set<std::string> channels_;
};

class Server {
public:
Server(UserRegistry* userRegistry, SimpleMIXChannelRegistry* mixChannelRegistry, EventLoop* eventLoop) : userRegistry_(userRegistry), mixChannelRegistry_(mixChannelRegistry) {
serverFromClientConnectionServer_ = BoostConnectionServer::create(5222, boostIOServiceThread_.getIOService(), eventLoop);
serverFromClientConnectionServer_->onNewConnection.connect(boost::bind(&Server::handleNewConnection, this, _1));
serverFromClientConnectionServer_->start();
}

private:
void handleNewConnection(std::shared_ptr<Connection> c) {
auto session = std::make_shared<ServerFromClientSession>(idGenerator_.generateID(), c, &payloadParserFactories_, &payloadSerializers_, &xmlParserFactory, userRegistry_);
serverFromClientSessions_.push_back(session);
session->onElementReceived.connect(boost::bind(&Server::handleElementReceived, this, _1, session));
session->onSessionFinished.connect(boost::bind(&Server::handleSessionFinished, this, session));
session->startSession();
}

void handleSessionFinished(std::shared_ptr<ServerFromClientSession> session) {
serverFromClientSessions_.erase(std::remove(serverFromClientSessions_.begin(), serverFromClientSessions_.end(), session), serverFromClientSessions_.end());
}

void handleElementReceived(std::shared_ptr<ToplevelElement> element, std::shared_ptr<ServerFromClientSession> session) {
std::shared_ptr<Stanza> stanza(std::dynamic_pointer_cast<Stanza>(element));
if (!stanza) {
return;
}
stanza->setFrom(session->getRemoteJID());

auto iq = std::dynamic_pointer_cast<IQ>(stanza);
if (iq) {
if(iq->getPayload<RosterPayload>()) {
SWIFT_LOG(debug) << "Query: Roster" << std::endl;
session->sendElement(IQ::createResult(iq->getFrom(), iq->getID(), std::make_shared<RosterPayload>()));
}
} else {
session->sendElement(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::BadRequest, ErrorPayload::Cancel));
}

//If request comes to domain service
if (stanza->getTo().isValid() && stanza->getTo() == session->getLocalJID()) {
if (std::shared_ptr<IQ> iq = std::dynamic_pointer_cast<IQ>(stanza)) {
if (iq->getPayload<DiscoItems>()) {
SWIFT_LOG(debug) << "Query: Channel List" << std::endl;
auto responsePayload = std::make_shared<DiscoItems>();
for (auto channel : mixChannelRegistry_->getChannels()) {
responsePayload->addItem(DiscoItems::Item(JID(channel).getNode(), JID(channel)));
}
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), responsePayload));
}
}
}

//If request comes to own local server
if (stanza->getTo().isValid() && stanza->getTo() == session->getRemoteJID().toBare()) {
if (auto incomingJoinPayload = iq->getPayload<MIXJoin>()) {
if (boost::optional<JID> channelJID = incomingJoinPayload->getChannel()) {
SWIFT_LOG(debug) << "Request: Channel Join - " << *channelJID << std::endl;
if (mixChannelRegistry_->hasMIXChannel(*channelJID)) {

auto responsePayload = createJoinResult(incomingJoinPayload->getSubscriptions());
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), responsePayload));

auto rosterUpdatePayload = std::make_shared<RosterPayload>();
auto itemPayload = RosterItemPayload(*channelJID, channelJID->getNode(), RosterItemPayload::Subscription::Both);
itemPayload.setMIXChannel(true);
rosterUpdatePayload->addItem(itemPayload);

session->sendElement(IQ::createRequest(IQ::Set, iq->getFrom(), iq->getID(), rosterUpdatePayload));
} else {
SWIFT_LOG(debug) << "Channel " << *channelJID << "not hosted on domain." <<std::endl;
}
} else {
session->sendElement(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::BadRequest, ErrorPayload::Cancel));
}
}

if (auto incomingLeavePayload = iq->getPayload<MIXLeave>()) {
if (boost::optional<JID> channelJID = incomingLeavePayload->getChannel()) {
SWIFT_LOG(debug) << "Request: Channel Leave - " << *channelJID << std::endl;
if (mixChannelRegistry_->hasMIXChannel(*channelJID)) {

session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), std::make_shared<MIXLeave>()));

auto rosterUpdatePayload = std::make_shared<RosterPayload>();
auto itemPayload = RosterItemPayload(*channelJID, channelJID->getNode(), RosterItemPayload::Subscription::Remove);
itemPayload.setMIXChannel(true);
rosterUpdatePayload->addItem(itemPayload);

session->sendElement(IQ::createRequest(IQ::Set, iq->getFrom(), iq->getID(), rosterUpdatePayload));
} else {
SWIFT_LOG(debug) << "Channel " << *channelJID << "not hosted on domain." <<std::endl;
}
} else {
session->sendElement(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::BadRequest, ErrorPayload::Cancel));
}
}
}

//If request comes to particular channel supported by service.
if (stanza->getTo().isValid() && mixChannelRegistry_->hasMIXChannel(stanza->getTo())) {
if (iq->getPayload<DiscoItems>()->getNode() == "mix") {
SWIFT_LOG(debug) << "Query: Channel Nodes Supported" << std::endl;
auto responsePayload = std::make_shared<DiscoItems>();
responsePayload->addItem(DiscoItems::Item(MIX::ParticipantsNode, JID(iq->getTo())));
responsePayload->addItem(DiscoItems::Item(MIX::MessagesNode, JID(iq->getTo())));
responsePayload->addItem(DiscoItems::Item(MIX::PresenceNode, JID(iq->getTo())));
responsePayload->addItem(DiscoItems::Item(MIX::JIDMapNode, JID(iq->getTo())));
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), responsePayload));
}
else {
session->sendElement(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::BadRequest, ErrorPayload::Cancel));
}
}
}

MIXJoin::ref createJoinResult(const std::unordered_set<std::string>& nodes) {
auto joinResultPayload = std::make_shared<MIXJoin>();
for (auto node : nodes) {
joinResultPayload->addSubscription(node);
}
joinResultPayload->setJID(JID("123456#coven@example.tg"));
return joinResultPayload;
}

private:
IDGenerator idGenerator_;
PlatformXMLParserFactory xmlParserFactory;
UserRegistry* userRegistry_;
SimpleMIXChannelRegistry* mixChannelRegistry_;
BoostIOServiceThread boostIOServiceThread_;
std::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer_;
std::vector< std::shared_ptr<ServerFromClientSession> > serverFromClientSessions_;
FullPayloadParserFactoryCollection payloadParserFactories_;
FullPayloadSerializerCollection payloadSerializers_;
};

int main() {
//Log::setLogLevel(Log::Severity::debug);

SimpleEventLoop eventLoop;
SimpleUserRegistry userRegistry;

userRegistry.addUser(JID("some@example.tg"), "mixtest");
userRegistry.addUser(JID("another@example.tg"), "mixtest2");

SimpleMIXChannelRegistry mixChannelRegistry;
mixChannelRegistry.addMIXChannel(JID("coven@example.tg"));

Server server(&userRegistry, &mixChannelRegistry, &eventLoop);
eventLoop.run();
return 0;
}
1 change: 1 addition & 0 deletions Limber/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ elif env["SCONS_STAGE"] == "build" :
myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.UseFlags(env["SWIFTEN_FLAGS"])
myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
myenv.Program("MIXMockServer", ["MIXMockServer.cpp"])
myenv.Program("limber", ["main.cpp"])

env.Append(UNITTEST_SOURCES = [
Expand Down
Loading