mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-07 22:02:12 +08:00
conversation: pinCertificates must be blocking before reload
In the current code, if pinCertificate is too slow, the following getCertificate will fail. https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/340 Change-Id: I0813b5984b4a6952373c7bd0fad3748950139784
This commit is contained in:
@ -379,12 +379,14 @@ Conversation::Impl::convCommitToMap(const ConversationCommit& commit) const
|
||||
if (!cert || !cert->issuer) {
|
||||
JAMI_WARN("No author found for commit %s, reload certificates", commit.id.c_str());
|
||||
if (repository_)
|
||||
repository_->pinCertificates();
|
||||
repository_->pinCertificates(true);
|
||||
// Get certificate from repo
|
||||
try {
|
||||
cert = tls::CertificateStore::instance().getCertificate(authorDevice);
|
||||
if (!cert || !cert->issuer) {
|
||||
JAMI_ERR("No author found for commit %s", commit.id.c_str());
|
||||
JAMI_ERR("No author found for commit %s (device: %s)",
|
||||
commit.id.c_str(),
|
||||
authorDevice.c_str());
|
||||
return std::nullopt;
|
||||
}
|
||||
} catch (...) {
|
||||
|
Reference in New Issue
Block a user