jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

conversation_module: fix removeContact with self

Browse Source 
removeContact("SELF") MUST NOT remove all swarm.

Change-Id: I421a235fd2beb2fc33276fd58aa1413454b40233
GitLab: #665
This commit is contained in:
Sébastien Blin
2021-11-12 11:08:57 -05:00
parent 94882a0abc
commit e89bf17249
2 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/jamidht/conversation_module.cpp
View File

@ -1487,8 +1487,9 @@ ConversationModule::removeContact(const std::string& uri, bool)
if (itConv->second->mode() == ConversationMode::ONE_TO_ONE) { if (itConv->second->mode() == ConversationMode::ONE_TO_ONE) {
auto initMembers = itConv->second->getInitialMembers(); auto initMembers = itConv->second->getInitialMembers();
if ((isSelf && initMembers.size() == 1) if ((isSelf && initMembers.size() == 1)
|| std::find(initMembers.begin(), initMembers.end(), uri) || (!isSelf
!= initMembers.end()) { && std::find(initMembers.begin(), initMembers.end(), uri)
!= initMembers.end())) {
// Mark as removed // Mark as removed
conv.removed = std::time(nullptr); conv.removed = std::time(nullptr);
toRm.emplace_back(convId); toRm.emplace_back(convId);

72
test/unitTest/conversation/conversationRequest.cpp
View File

@ -61,6 +61,7 @@ public:
void testAddContactDeleteAndReAdd(); void testAddContactDeleteAndReAdd();
void testInviteFromMessageAfterRemoved(); void testInviteFromMessageAfterRemoved();
void testRemoveContact(); void testRemoveContact();
void testRemoveSelfDoesntRemoveConversation();
void testRemoveConversationUpdateContactDetails(); void testRemoveConversationUpdateContactDetails();
void testBanContact(); void testBanContact();
void testBanContactRemoveTrustRequest(); void testBanContactRemoveTrustRequest();
@ -87,6 +88,7 @@ private:
CPPUNIT_TEST(testAddContactDeleteAndReAdd); CPPUNIT_TEST(testAddContactDeleteAndReAdd);
CPPUNIT_TEST(testInviteFromMessageAfterRemoved); CPPUNIT_TEST(testInviteFromMessageAfterRemoved);
CPPUNIT_TEST(testRemoveContact); CPPUNIT_TEST(testRemoveContact);
CPPUNIT_TEST(testRemoveSelfDoesntRemoveConversation);
CPPUNIT_TEST(testRemoveConversationUpdateContactDetails); CPPUNIT_TEST(testRemoveConversationUpdateContactDetails);
CPPUNIT_TEST(testBanContact); CPPUNIT_TEST(testBanContact);
CPPUNIT_TEST(testBanContactRemoveTrustRequest); CPPUNIT_TEST(testBanContactRemoveTrustRequest);
@ -568,6 +570,76 @@ ConversationRequestTest::testRemoveContact()
CPPUNIT_ASSERT(!fileutils::isDirectory(repoPath)); CPPUNIT_ASSERT(!fileutils::isDirectory(repoPath));
} }
void
ConversationRequestTest::testRemoveSelfDoesntRemoveConversation()
{
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
auto bobUri = bobAccount->getUsername();
auto aliceUri = aliceAccount->getUsername();
std::mutex mtx;
std::unique_lock<std::mutex> lk {mtx};
std::condition_variable cv;
std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>> confHandlers;
bool conversationReady = false, requestReceived = false, memberMessageGenerated = false,
conversationRemoved = false;
std::string convId = "";
confHandlers.insert(DRing::exportable_callback<DRing::ConfigurationSignal::IncomingTrustRequest>(
[&](const std::string& account_id,
const std::string& /*from*/,
const std::string& /*conversationId*/,
const std::vector<uint8_t>& /*payload*/,
time_t /*received*/) {
if (account_id == bobId)
requestReceived = true;
cv.notify_one();
}));
confHandlers.insert(DRing::exportable_callback<DRing::ConversationSignal::ConversationReady>(
[&](const std::string& accountId, const std::string& conversationId) {
if (accountId == aliceId) {
convId = conversationId;
} else if (accountId == bobId) {
conversationReady = true;
}
cv.notify_one();
}));
confHandlers.insert(DRing::exportable_callback<DRing::ConversationSignal::ConversationRemoved>(
[&](const std::string& accountId, const std::string&) {
if (accountId == bobId)
conversationRemoved = true;
cv.notify_one();
}));
confHandlers.insert(DRing::exportable_callback<DRing::ConversationSignal::MessageReceived>(
[&](const std::string& accountId,
const std::string& conversationId,
std::map<std::string, std::string> message) {
if (accountId == aliceId && conversationId == convId && message["type"] == "member") {
memberMessageGenerated = true;
}
cv.notify_one();
}));
DRing::registerSignalHandlers(confHandlers);
aliceAccount->addContact(bobUri);
aliceAccount->sendTrustRequest(bobUri, {});
// Check created files
CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(30), [&]() {
return !convId.empty() && requestReceived;
}));
memberMessageGenerated = false;
CPPUNIT_ASSERT(bobAccount->acceptTrustRequest(aliceUri));
CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(30), [&]() {
return conversationReady && memberMessageGenerated;
}));
conversationRemoved = false;
aliceAccount->removeContact(aliceUri, false);
CPPUNIT_ASSERT(
!cv.wait_for(lk, std::chrono::seconds(10), [&]() { return conversationRemoved; }));
auto repoPath = fileutils::get_data_dir() + DIR_SEPARATOR_STR + aliceAccount->getAccountID()
+ DIR_SEPARATOR_STR + "conversations" + DIR_SEPARATOR_STR + convId;
CPPUNIT_ASSERT(fileutils::isDirectory(repoPath));
}
void void
ConversationRequestTest::testRemoveConversationUpdateContactDetails() ConversationRequestTest::testRemoveConversationUpdateContactDetails()
{ {