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

ringaccount: make archive password optional

Browse Source 
This patch makes possible to not encrypt RingAccount archive.
This is trigged with empty password strîng.

Change-Id: Ib848a413d91538a22b67b2f007a33e8d37500a94
This commit is contained in:
Guillaume Roguez
2017-07-19 09:17:08 -04:00
parent 38faaebf1d
commit 420a6bb560
1 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/ringdht/ringaccount.cpp
View File

@ -989,12 +989,14 @@ RingAccount::readArchive(const std::string& pwd) const
throw;
}
// Decrypt
try {
data = dht::crypto::aesDecrypt(data, pwd);
} catch (const std::exception& e) {
RING_ERR("[Account %s] archive decrypt error: %s", getAccountID().c_str(), e.what());
throw;
if (not pwd.empty()) {
// Decrypt
try {
data = dht::crypto::aesDecrypt(data, pwd);
} catch (const std::exception& e) {
RING_ERR("[Account %s] archive decrypt error: %s", getAccountID().c_str(), e.what());
throw;
}
}
// Unserialize data
@ -1116,22 +1118,25 @@ RingAccount::makeArchive(const ArchiveContent& archive) const
void
RingAccount::saveArchive(const ArchiveContent& archive_content, const std::string& pwd)
{
std::vector<uint8_t> archive;
std::vector<uint8_t> data;
try {
archive = makeArchive(archive_content);
data = makeArchive(archive_content);
} catch (const std::runtime_error& ex) {
RING_ERR("[Account %s] Can't export archive: %s", getAccountID().c_str(), ex.what());
return;
}
// Encrypt using provided password
auto encrypted = dht::crypto::aesEncrypt(archive, pwd);
if (not pwd.empty()) {
// Encrypt using provided password
data = dht::crypto::aesEncrypt(data, pwd);
} else
RING_WARN("[account %s] unsecured archiving (no password)", getAccountID().c_str());
// Write
try {
if (archivePath_.empty())
archivePath_ = "export.gz";
fileutils::saveFile(fileutils::getFullPath(idPath_, archivePath_), encrypted);
fileutils::saveFile(fileutils::getFullPath(idPath_, archivePath_), data);
} catch (const std::runtime_error& ex) {
RING_ERR("Export failed: %s", ex.what());
return;
@ -1521,42 +1526,28 @@ RingAccount::loadAccount(const std::string& archive_password, const std::string&
if (not hasArchive)
RING_WARN("[Account %s] account archive not found, won't be able to add new devices", getAccountID().c_str());
} else if (hasArchive) {
if (archive_password.empty()) {
RING_WARN("[Account %s] password needed to read archive", getAccountID().c_str());
setRegistrationState(RegistrationState::ERROR_NEED_MIGRATION);
if (needsMigration(id)) {
RING_WARN("[Account %s] account certificate needs update", getAccountID().c_str());
migrateAccount(archive_password, id);
} else {
if (needsMigration(id)) {
RING_WARN("[Account %s] account certificate needs update", getAccountID().c_str());
migrateAccount(archive_password, id);
} else {
RING_WARN("[Account %s] archive present but no valid receipt: creating new device", getAccountID().c_str());
try {
initRingDevice(readArchive(archive_password));
} catch (...) {
Migration::setState(accountID_, Migration::State::INVALID);
return;
}
Migration::setState(accountID_, Migration::State::SUCCESS);
setRegistrationState(RegistrationState::UNREGISTERED);
RING_WARN("[Account %s] archive present but no valid receipt: creating new device", getAccountID().c_str());
try {
initRingDevice(readArchive(archive_password));
} catch (...) {
Migration::setState(accountID_, Migration::State::INVALID);
return;
}
Manager::instance().saveConfig();
loadAccount();
Migration::setState(accountID_, Migration::State::SUCCESS);
setRegistrationState(RegistrationState::UNREGISTERED);
}
Manager::instance().saveConfig();
loadAccount();
} else {
// no receipt or archive, creating new account
if (archive_password.empty()) {
RING_WARN("[Account %s] password needed to create archive", getAccountID().c_str());
if (id.first) {
ringAccountId_ = id.first->getPublicKey().getId().toString();
username_ = RING_URI_PREFIX+ringAccountId_;
}
setRegistrationState(RegistrationState::ERROR_NEED_MIGRATION);
if (archive_pin.empty()) {
createAccount(archive_password, std::move(id));
} else {
if (archive_pin.empty()) {
createAccount(archive_password, std::move(id));
} else {
loadAccountFromDHT(archive_password, archive_pin);
}
loadAccountFromDHT(archive_password, archive_pin);
}
}
} catch (const std::exception& e) {