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

AccountArchive: allow to unlock with raw key instead of password

Browse Source 
Change-Id: Ic8b28a32f64862ac2dfae074d06f4eac470ab7e1
This commit is contained in:
Adrien Béraud
2024-01-02 14:44:42 -05:00
parent b627aa9c57
commit c1519ba4ec
24 changed files with 334 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/unitTest/account_archive/account_archive.cpp
View File

@ -149,7 +149,7 @@ AccountArchiveTest::testExportImportPassword()
{
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
CPPUNIT_ASSERT(bobAccount->exportArchive("test.gz", "test"));
CPPUNIT_ASSERT(bobAccount->exportArchive("test.gz", "password", "test"));
std::map<std::string, std::string> details = libjami::getAccountTemplate("RING");
details[ConfProperties::ARCHIVE_PATH] = "test.gz";
@ -168,7 +168,7 @@ AccountArchiveTest::testExportImportPasswordDoubleGunzip()
{
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
CPPUNIT_ASSERT(bobAccount->exportArchive("test.gz", "test"));
CPPUNIT_ASSERT(bobAccount->exportArchive("test.gz", "password", "test"));
auto dat = fileutils::loadFile("test.gz");
archiver::compressGzip(dat, "test.gz");

4
test/unitTest/account_archive/migration.cpp
View File

@ -112,7 +112,7 @@ MigrationTest::testLoadExpiredAccount()
auto accountExpiration = archive.id.second->getExpiration();
// Update validity
CPPUNIT_ASSERT(aliceAccount->setValidity("", {}, 9));
CPPUNIT_ASSERT(aliceAccount->setValidity("", "", {}, 9));
archive = AccountArchive(archivePath, "");
deviceCert = dht::crypto::Certificate(fileutils::loadFile(devicePath));
auto newDeviceExpiration = deviceCert.getExpiration();
@ -295,7 +295,7 @@ MigrationTest::testExpiredDeviceInSwarm()
CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&]() { return aliceRegistering; }));
auto aliceDevice = std::string(aliceAccount->currentDeviceId());
CPPUNIT_ASSERT(aliceAccount->setValidity("", {}, 90));
CPPUNIT_ASSERT(aliceAccount->setValidity("", "", {}, 90));
auto now = std::chrono::system_clock::now();
aliceRegistered = false;
aliceAccount->forceReloadAccount();

2
test/unitTest/namedirectory/namedirectory.cpp
View File

@ -196,7 +196,7 @@ NameDirectoryTest::testRegisterName()
cv.notify_one();
}));
libjami::registerSignalHandlers(confHandlers);
CPPUNIT_ASSERT(libjami::registerName(aliceId, "", "foo"));
CPPUNIT_ASSERT(libjami::registerName(aliceId, "", "password", "foo"));
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&] { return nameRegistered; }));
}

4
test/unitTest/revoke/revoke.cpp
View File

@ -118,7 +118,7 @@ RevokeTest::testRevokeDevice()
auto alice2Account = Manager::instance().getAccount<JamiAccount>(alice2Id);
CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(60), [&] { return knownChanged; }));
alice2Device = std::string(alice2Account->currentDeviceId());
aliceAccount->revokeDevice("", alice2Device);
aliceAccount->revokeDevice(alice2Device);
CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&] { return deviceRevoked; }));
std::remove("test.gz");
@ -143,7 +143,7 @@ RevokeTest::testRevokeInvalidDevice()
cv.notify_one();
}));
libjami::registerSignalHandlers(confHandlers);
aliceAccount->revokeDevice("", "foo");
aliceAccount->revokeDevice("foo");
CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&] { return revokeFailed; }));
}