Page MenuHomePhabricator
Files F3112021

D6776.id23321.diff
No OneTemporary
Actions

D6776.id23321.diff
View Options

diff --git a/native/cpp/CommonCpp/Notifications/BackgroundDataStorage/NotificationsCryptoModule.cpp b/native/cpp/CommonCpp/Notifications/BackgroundDataStorage/NotificationsCryptoModule.cpp
--- a/native/cpp/CommonCpp/Notifications/BackgroundDataStorage/NotificationsCryptoModule.cpp
+++ b/native/cpp/CommonCpp/Notifications/BackgroundDataStorage/NotificationsCryptoModule.cpp
@@ -61,4 +61,68 @@
return crypto::CryptoModule{
notificationsCryptoAccountID, picklingKey, {account, sessions}};
}
+
+void NotificationsCryptoModule::serializeAndFlushCryptoModule(
+ crypto::CryptoModule &cryptoModule,
+ const std::string &path,
+ const std::string &picklingKey,
+ const std::string &callingProcessName) {
+ crypto::Persist persist = cryptoModule.storeAsB64(picklingKey);
+
+ folly::dynamic sessions = folly::dynamic::object;
+ for (auto &sessionKeyValuePair : persist.sessions) {
+ std::string targetUserID = sessionKeyValuePair.first;
+ crypto::OlmBuffer sessionData = sessionKeyValuePair.second;
+ sessions[targetUserID] =
+ std::string(sessionData.begin(), sessionData.end());
+ }
+
+ std::string account =
+ std::string(persist.account.begin(), persist.account.end());
+ folly::dynamic persistJSON =
+ folly::dynamic::object("account", account)("sessions", sessions);
+ std::string pickledPersist = folly::toJson(persistJSON);
+
+ std::string temporaryPath = path + callingProcessName;
+ // This is for the case if any of the steps below failed/app was killed
+ // in a previous call to this method leaving temporary file unremoved.
+ // We supply `callingProcessName` as function argument in order to name
+ // temporary file in a deterministic way. Otherwise we would need to use
+ // directory search API to retrieve unremoved files paths.
+ remove(temporaryPath.c_str());
+ mode_t readWritePermissionsMode = 0666;
+ int temporaryFD =
+ open(temporaryPath.c_str(), O_CREAT | O_WRONLY, readWritePermissionsMode);
+ if (temporaryFD == -1) {
+ throw std::runtime_error(
+ "Failed to create temporary file. Unable to atomically update "
+ "notifications crypto account. Details: " +
+ std::string(strerror(errno)));
+ }
+ ssize_t bytesWritten =
+ write(temporaryFD, pickledPersist.c_str(), pickledPersist.length());
+ if (bytesWritten == -1 || bytesWritten != pickledPersist.length()) {
+ remove(temporaryPath.c_str());
+ throw std::runtime_error(
+ "Failed to write all data to temporary file. Unable to atomically "
+ "update notifications crypto account. Details: " +
+ std::string(strerror(errno)));
+ }
+ if (fsync(temporaryFD) == -1) {
+ remove(temporaryPath.c_str());
+ throw std::runtime_error(
+ "Failed to synchronize temporary file data with hardware storage. "
+ "Unable to atomically update notifications crypto account. Details: " +
+ std::string(strerror(errno)));
+ };
+ close(temporaryFD);
+ if (rename(temporaryPath.c_str(), path.c_str()) == -1) {
+ remove(temporaryPath.c_str());
+ throw std::runtime_error(
+ "Failed to replace temporary file content with notifications crypto "
+ "account. Unable to atomically update notifications crypto account. "
+ "Details: " +
+ std::string(strerror(errno)));
+ }
+}
} // namespace comm

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 1, 4:05 PM (17 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2399243
Default Alt Text
D6776.id23321.diff (3 KB)

Event Timeline