Page MenuHomePhabricator
Differential D14522

[native] extract constants from `persist.js`
ClosedPublic
Actions

Authored by kamil on Thu, Apr 3, 3:23 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 23, 10:45 AM
Unknown Object (File)
Tue, Apr 22, 1:33 AM
Unknown Object (File)
Sat, Apr 19, 11:28 PM
Unknown Object (File)
Sat, Apr 19, 4:24 AM
Unknown Object (File)
Fri, Apr 18, 9:37 PM
Unknown Object (File)
Fri, Apr 18, 8:26 PM
Unknown Object (File)
Fri, Apr 18, 4:50 AM
Unknown Object (File)
Thu, Apr 17, 12:05 AM
View All 33 Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
Commits
rCOMMe4174e16d28d: [native] extract constants from `persist.js`
Summary

Part of ENG-10477

To be able to call restoreBackupData, we need the store version. Doing the same approach as for the web. In the future, this should be defined in /lib, but I'll take care of this as part of Run the migrations during backup restoration because I am not sure we're ready for it.

Depends on D14521

Test Plan

Flow, build native_rust_library

Diff Detail

Repository
rCOMM Comm
Branch
backup-publish
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Thu, Apr 3, 3:23 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptThu, Apr 3, 3:23 AM
kamil edited the summary of this revision. (Show Details)Thu, Apr 3, 3:25 AM
kamil edited the test plan for this revision. (Show Details)
kamil added a child revision: D14523: [lib][web][native] implement shared function to execute User Data restore.Thu, Apr 3, 3:29 AM
Harbormaster completed remote builds in B33877: Diff 47627.Thu, Apr 3, 3:40 AM
kamil published this revision for review.Thu, Apr 3, 3:52 AM
bartek accepted this revision.Thu, Apr 3, 4:22 AM
bartek added inline comments.
native/native_rust_library/build.rs
141
This revision is now accepted and ready to land.Thu, Apr 3, 4:22 AM
kamil updated this revision to Diff 47684.Mon, Apr 7, 3:37 AM

rebase & review

Harbormaster completed remote builds in B33919: Diff 47684.Mon, Apr 7, 3:56 AM
Closed by commit rCOMMe4174e16d28d: [native] extract constants from `persist.js` (authored by kamil). · Explain WhyMon, Apr 7, 4:09 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMe4174e16d28d: [native] extract constants from `persist.js`.
kamil added a child revision: D14575: [native] update `persistConfig` comment.Mon, Apr 14, 6:54 AM

Revision Contents
Changeset List

PathSize
native/
native_rust_library/
36 lines
redux/
6 lines
5 lines

Diff 47627

View Options

native/native_rust_library/build.rs

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

native/redux/persist-constants.js

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines
View Options

native/redux/persist.js

#import "CommMMKV.h" #import "CommMMKV.h"
#import "../../cpp/CommonCpp/CryptoTools/Tools.h" #import "../../cpp/CommonCpp/CryptoTools/Tools.h"
#import "CommSecureStore.h" #import "CommSecureStore.h"
#import "Logger.h" #import "Logger.h"
#import "Tools.h" #import "Tools.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <MMKV.h> #import <MMKV.h>
#import <MMKVCore/MMKV.h>
// Core MMKV C++ implementation and Android wrapper have public `lock` and
// `unlock` methods while Obj-C wrapper doesn't. However Obj-C wrapper has
// private instance variable of type `mmkv::MMKV *`. Interface redeclaration
// below lets us access it. This pattern is hacky but it is well known in
// Obj-C and used in our codebase in CommSecureStore.
@interface MMKV () {
@public
mmkv::MMKV *m_mmkv;
}
@end
namespace comm { namespace comm {
const int mmkvEncryptionKeySize = 16; const int mmkvEncryptionKeySize = 16;
const int mmkvIDsize = 8; const int mmkvIDsize = 8;
const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey"; const std::string secureStoreMMKVEncryptionKeyID = "comm.mmkvEncryptionKey";
const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID"; const std::string secureStoreMMKVIdentifierKeyID = "comm.mmkvID";
static NSString *mmkvEncryptionKey; static NSString *mmkvEncryptionKey;
static NSString *mmkvIdentifier; static NSString *mmkvIdentifier;
MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) { MMKV *getMMKVInstance(NSString *mmkvID, NSString *encryptionKey) {
MMKV *mmkv = MMKV *mmkv =
[MMKV mmkvWithID:mmkvID [MMKV mmkvWithID:mmkvID
cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding] cryptKey:[encryptionKey dataUsingEncoding:NSUTF8StringEncoding]
mode:MMKVMultiProcess]; mode:MMKVMultiProcess];
if (!mmkv) { if (!mmkv) {
throw std::runtime_error("Failed to instantiate MMKV object."); throw std::runtime_error("Failed to instantiate MMKV object.");
} }
return mmkv; return mmkv;
} }
CommMMKV::ScopedCommMMKVLock::ScopedCommMMKVLock() {
CommMMKV::initialize();
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->lock();
}
CommMMKV::ScopedCommMMKVLock::~ScopedCommMMKVLock() {
MMKV *mmkv = getMMKVInstance(mmkvIdentifier, mmkvEncryptionKey);
mmkv->m_mmkv->unlock();
}
void assignInitializationData() { void assignInitializationData() {
std::string encryptionKey = std::string encryptionKey =
crypto::Tools::generateRandomString(mmkvEncryptionKeySize); crypto::Tools::generateRandomString(mmkvEncryptionKeySize);
std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize); std::string identifier = crypto::Tools::generateRandomString(mmkvIDsize);
CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey); CommSecureStore::set(secureStoreMMKVEncryptionKeyID, encryptionKey);
CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier); CommSecureStore::set(secureStoreMMKVIdentifierKeyID, identifier);
mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str() mmkvEncryptionKey = [NSString stringWithCString:encryptionKey.c_str()
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines