Page MenuHomePhabricator
Differential D11302

Send keyserverID in web and desktop notifications
ClosedPublic
Actions

Authored by marcin on Mar 11 2024, 9:22 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 10:14 AM
Unknown Object (File)
Sun, Mar 16, 3:12 PM
Unknown Object (File)
Feb 21 2025, 12:08 PM
Unknown Object (File)
Feb 21 2025, 12:08 PM
Unknown Object (File)
Feb 21 2025, 12:08 PM
Unknown Object (File)
Feb 21 2025, 12:08 PM
Unknown Object (File)
Feb 21 2025, 12:08 PM
Unknown Object (File)
Feb 21 2025, 12:08 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
kamil
Commits
rCOMM3fa1401d8bc9: Send keyserverID in web and desktop notifications
Summary

This differential adds unencrypted keyserverID to web and desktop notification payload. Additionally necessary types are updated.

Test Plan
  1. Flow
  2. Test that notifications aren' broken on web and desktop.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

marcin created this revision.Mar 11 2024, 9:22 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptMar 11 2024, 9:22 AM
marcin added a parent revision: D11235: Add keyserverID to Android and iOS notification payload..Mar 11 2024, 9:33 AM
marcin added a child revision: D11303: Boilerplate for web and desktop to look for keyserverID during notifications session creation and notification decryption.
marcin updated this revision to Diff 38001.Mar 11 2024, 9:35 AM

Rebase to update commit message

marcin edited the summary of this revision. (Show Details)Mar 11 2024, 9:36 AM
Harbormaster completed remote builds in B27449: Diff 37998.Mar 11 2024, 9:38 AM
Harbormaster completed remote builds in B27452: Diff 38001.Mar 11 2024, 9:50 AM
marcin requested review of this revision.Mar 11 2024, 9:50 AM
michal accepted this revision.Mar 12 2024, 8:24 AM
This revision is now accepted and ready to land.Mar 12 2024, 8:24 AM
marcin updated this revision to Diff 38221.Mar 20 2024, 4:16 AM

Rebase before landing

Harbormaster completed remote builds in B27623: Diff 38221.Mar 20 2024, 4:32 AM
Closed by commit rCOMM3fa1401d8bc9: Send keyserverID in web and desktop notifications (authored by marcin). · Explain WhyMar 20 2024, 5:37 AM
This revision was automatically updated to reflect the committed changes.
marcin added a commit: rCOMM3fa1401d8bc9: Send keyserverID in web and desktop notifications.

Revision Contents
Changeset List

PathSize
keyserver/
src/
push/
19 lines
17 lines
lib/
types/
10 lines

Diff 37998

View Options

keyserver/src/push/crypto.js

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

keyserver/src/push/send.js

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

lib/types/notif-types.js

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm