From 3e9a45345d2790530a0aa91b29ba4738b96004f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 19 Sep 2019 13:41:26 -0400
Subject: [PATCH] archive_account_manager: fix import from backup
+ The export was incorrect, insert only add new values, but if the
value is not present, it's not updated. We should use the []
operator.
+ The import should use ns uri, not username for nameServer_
Change-Id: I7d271f48ba4fb6392333fd19e0e0f364bf267b48
---
src/jamidht/archive_account_manager.cpp | 3 +-
src/jamidht/jamiaccount.cpp | 40 +------------------------
2 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/src/jamidht/archive_account_manager.cpp b/src/jamidht/archive_account_manager.cpp
index cf2e6ba2c6..de90098f20 100644
--- a/src/jamidht/archive_account_manager.cpp
+++ b/src/jamidht/archive_account_manager.cpp
@@ -524,7 +524,7 @@ ArchiveAccountManager::updateArchive(AccountArchive& archive) const
archive.config.emplace(it.first, base64::encode(fileutils::loadFile(it.second)));
} catch (...) {}
} else
- archive.config.insert(it);
+ archive.config[it.first] = it.second;
}
archive.contacts = info_->contacts->getContacts();
}
@@ -537,7 +537,6 @@ ArchiveAccountManager::saveArchive(AccountArchive& archive, const std::string& p
if (archivePath_.empty())
archivePath_ = "export.gz";
archive.save(fileutils::getFullPath(path_, archivePath_), pwd);
- //archiveHasPassword_ = not pwd.empty();
} catch (const std::runtime_error& ex) {
JAMI_ERR("[Auth] Can't export archive: %s", ex.what());
return;
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index 4742765459..f9e5a36697 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -777,44 +777,6 @@ void JamiAccount::unserialize(const YAML::Node &node)
loadAccount();
}
-/*
-
-void
-JamiAccount::updateArchive(AccountArchive& archive) const
-{
- using namespace DRing::Account::ConfProperties;
-
- // Keys not exported to archive
- static const auto filtered_keys = { Ringtone::PATH,
- ARCHIVE_PATH,
- RING_DEVICE_ID,
- RING_DEVICE_NAME,
- Conf::CONFIG_DHT_PORT };
-
- // Keys with meaning of file path where the contents has to be exported in base64
- static const auto encoded_keys = { TLS::CA_LIST_FILE,
- TLS::CERTIFICATE_FILE,
- TLS::PRIVATE_KEY_FILE };
-
- JAMI_DBG("[Account %s] building account archive", getAccountID().c_str());
- for (const auto& it : getAccountDetails()) {
- // filter-out?
- if (std::any_of(std::begin(filtered_keys), std::end(filtered_keys),
- [&](const auto& key){ return key == it.first; }))
- continue;
-
- // file contents?
- if (std::any_of(std::begin(encoded_keys), std::end(encoded_keys),
- [&](const auto& key){ return key == it.first; })) {
- try {
- archive.config.emplace(it.first, base64::encode(fileutils::loadFile(it.second)));
- } catch (...) {}
- } else
- archive.config.insert(it);
- }
- archive.contacts = contactList_->getContacts();
-}
-*/
bool
JamiAccount::changeArchivePassword(const std::string& password_old, const std::string& password_new)
@@ -1022,7 +984,7 @@ JamiAccount::loadAccount(const std::string& archive_password, const std::string&
if (ringDeviceName_.empty())
ringDeviceName_ = info.deviceId.substr(8);
- auto nameServerIt = config.find(DRing::Account::ConfProperties::RingNS::ACCOUNT);
+ auto nameServerIt = config.find(DRing::Account::ConfProperties::RingNS::URI);
if (nameServerIt != config.end()) {
nameServer_ = nameServerIt->second;
}
--
GitLab