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

Add encryption support when importing archive

Browse Source 
Save password and scheme on new device during
linking. Set archiveHasPassword flag in config
when saving the archive.

Change-Id: I8822c746d2f7968fef5493ee3f4c92f121274c5a
This commit is contained in:
pknellore
2025-07-07 14:49:32 -04:00
committed by Adrien Beraud
parent edfa4fa623
commit 18b6ae56db
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/jamidht/archive_account_manager.cpp
View File

@ -537,6 +537,9 @@ ArchiveAccountManager::provideAccountAuthentication(const std::string& key,
JAMI_WARNING("[LinkDevice] Invalid state for providing account authentication.");
return false;
}
ctx->linkDevCtx->authScheme = scheme;
ctx->linkDevCtx->credentialsFromUser = key;
// After authentication, the next step is to receive the account archive from the exporting device
ctx->linkDevCtx->state = AuthDecodingState::DATA;
emitSignal<libjami::ConfigurationSignal::DeviceAuthStateChanged>(
@ -1363,10 +1366,16 @@ ArchiveAccountManager::onArchiveLoaded(AuthContext& ctx, AccountArchive&& a, boo
dhtnet::fileutils::check_dir(path_, 0700);
if (isLinkDevProtocol) {
a.config[libjami::Account::ConfProperties::ARCHIVE_HAS_PASSWORD] =
ctx.linkDevCtx->authScheme.empty() ? FALSE_STR : TRUE_STR;
a.save(fileutils::getFullPath(path_, archivePath_),
ctx.linkDevCtx->authScheme,
ctx.linkDevCtx->credentialsFromUser);
} else {
a.config[libjami::Account::ConfProperties::ARCHIVE_HAS_PASSWORD] =
ctx.credentials->password_scheme.empty() ? FALSE_STR : TRUE_STR;
a.save(fileutils::getFullPath(path_, archivePath_),
ctx.credentials ? ctx.credentials->password_scheme : "",
ctx.credentials ? ctx.credentials->password : "");

9
src/jamidht/jamiaccount.cpp
View File

@ -1395,7 +1395,14 @@ JamiAccount::loadAccount(const std::string& archive_password_scheme,
std::tie(conf.tlsPrivateKeyFile, conf.tlsCertificateFile)
= saveIdentity(id, idPath_, DEVICE_ID_PATH);
conf.tlsPassword = {};
conf.archiveHasPassword = hasPassword;
auto passwordIt = config.find(
libjami::Account::ConfProperties::ARCHIVE_HAS_PASSWORD);
if (passwordIt != config.end() && !passwordIt->second.empty()) {
conf.archiveHasPassword = passwordIt->second == "true";
} else {
conf.archiveHasPassword = hasPassword;
}
if (not conf.managerUri.empty()) {
conf.registeredName = conf.managerUsername;
registeredName_ = conf.managerUsername;