Page MenuHomePhabricator
Differential D9832

[lib] Resolve circular dependency issue w/ `MinimallyEncoded*Info` validators
ClosedPublic
Actions

Authored by atul on Nov 10 2023, 1:09 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 12:08 AM
Unknown Object (File)
Mon, Mar 31, 5:11 PM
Unknown Object (File)
Mar 1 2025, 5:28 AM
Unknown Object (File)
Mar 1 2025, 5:28 AM
Unknown Object (File)
Mar 1 2025, 5:15 AM
Unknown Object (File)
Mar 1 2025, 4:19 AM
Unknown Object (File)
Feb 14 2025, 8:09 PM
Unknown Object (File)
Feb 3 2025, 4:00 PM
View All 68 Files
Subscribers
will

Details

Reviewers
ashoat
ginsu
tomek
rohan
Commits
rCOMMfc6569af43d8: [lib] Resolve circular dependency issue w/ `MinimallyEncoded*Info` validators
Summary

Moving the regex validators to main minimally-encoded-thread-permissions file makes the validator file a "leaf node" (except for tests) and resolves the circular dependency issue. Also updated validators to spread in base validators.

Depends on D9811

Test Plan

Jest tests run without issue

Diff Detail

Repository
rCOMM Comm
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

Diff 33085

View Options

lib/permissions/minimally-encoded-thread-permissions.js

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Linesbool CryptoModule::hasSessionFor(const std::string &targetUserId) {
return (this->sessions.find(targetUserId) != this->sessions.end()); return (this->sessions.find(targetUserId) != this->sessions.end());
} }
std::shared_ptr<Session> std::shared_ptr<Session>
CryptoModule::getSessionByUserId(const std::string &userId) { CryptoModule::getSessionByUserId(const std::string &userId) {
return this->sessions.at(userId); return this->sessions.at(userId);
} }
bool CryptoModule::matchesInboundSession(
const std::string &targetUserId,
EncryptedData encryptedData,
const OlmBuffer &theirIdentityKey) const {
OlmSession *session = this->sessions.at(targetUserId)->getOlmSession();
// Check that the inbound session matches the message it was created from.
OlmBuffer tmpEncryptedMessage(encryptedData.message);
if (1 !=
::olm_matches_inbound_session(
session, tmpEncryptedMessage.data(), tmpEncryptedMessage.size())) {
return false;
}
// Check that the inbound session matches the key this message is supposed
// to be from.
tmpEncryptedMessage = OlmBuffer(encryptedData.message);
return 1 ==
::olm_matches_inbound_session_from(
session,
theirIdentityKey.data() + ID_KEYS_PREFIX_OFFSET,
KEYSIZE,
tmpEncryptedMessage.data(),
tmpEncryptedMessage.size());
}
Persist CryptoModule::storeAsB64(const std::string &secretKey) { Persist CryptoModule::storeAsB64(const std::string &secretKey) {
Persist persist; Persist persist;
size_t accountPickleLength = ::olm_pickle_account_length(this->account); size_t accountPickleLength = ::olm_pickle_account_length(this->account);
OlmBuffer accountPickleBuffer(accountPickleLength); OlmBuffer accountPickleBuffer(accountPickleLength);
if (accountPickleLength != if (accountPickleLength !=
::olm_pickle_account( ::olm_pickle_account(
this->account, this->account,
secretKey.data(), secretKey.data(),
▲ Show 20 Lines • Show All 60 Lines • ▼ Show 20 Lines if (-1 ==
encryptedMessage.size())) { encryptedMessage.size())) {
throw std::runtime_error{"error encrypt => ::olm_encrypt"}; throw std::runtime_error{"error encrypt => ::olm_encrypt"};
} }
return {encryptedMessage, messageType}; return {encryptedMessage, messageType};
} }
std::string CryptoModule::decrypt( std::string CryptoModule::decrypt(
const std::string &targetUserId, const std::string &targetUserId,
EncryptedData encryptedData, EncryptedData encryptedData) {
const OlmBuffer &theirIdentityKey) {
if (!this->hasSessionFor(targetUserId)) { if (!this->hasSessionFor(targetUserId)) {
throw std::runtime_error{"error decrypt => uninitialized session"}; throw std::runtime_error{"error decrypt => uninitialized session"};
} }
OlmSession *session = this->sessions.at(targetUserId)->getOlmSession(); OlmSession *session = this->sessions.at(targetUserId)->getOlmSession();
OlmBuffer tmpEncryptedMessage(encryptedData.message); OlmBuffer tmpEncryptedMessage(encryptedData.message);
if (encryptedData.messageType == (size_t)olm::MessageType::PRE_KEY) {
if (!this->matchesInboundSession(
targetUserId, encryptedData, theirIdentityKey)) {
throw std::runtime_error{"error decrypt => matchesInboundSession"};
}
}
size_t maxSize = ::olm_decrypt_max_plaintext_length( size_t maxSize = ::olm_decrypt_max_plaintext_length(
session, session,
encryptedData.messageType, encryptedData.messageType,
tmpEncryptedMessage.data(), tmpEncryptedMessage.data(),
tmpEncryptedMessage.size()); tmpEncryptedMessage.size());
OlmBuffer decryptedMessage(maxSize); OlmBuffer decryptedMessage(maxSize);
size_t decryptedSize = ::olm_decrypt( size_t decryptedSize = ::olm_decrypt(
session, session,
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines
View Options

lib/types/minimally-encoded-thread-permissions-types.js

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Linesbool CryptoModule::hasSessionFor(const std::string &targetUserId) {
return (this->sessions.find(targetUserId) != this->sessions.end()); return (this->sessions.find(targetUserId) != this->sessions.end());
} }
std::shared_ptr<Session> std::shared_ptr<Session>
CryptoModule::getSessionByUserId(const std::string &userId) { CryptoModule::getSessionByUserId(const std::string &userId) {
return this->sessions.at(userId); return this->sessions.at(userId);
} }
bool CryptoModule::matchesInboundSession(
const std::string &targetUserId,
EncryptedData encryptedData,
const OlmBuffer &theirIdentityKey) const {
OlmSession *session = this->sessions.at(targetUserId)->getOlmSession();
// Check that the inbound session matches the message it was created from.
OlmBuffer tmpEncryptedMessage(encryptedData.message);
if (1 !=
::olm_matches_inbound_session(
session, tmpEncryptedMessage.data(), tmpEncryptedMessage.size())) {
return false;
}
// Check that the inbound session matches the key this message is supposed
// to be from.
tmpEncryptedMessage = OlmBuffer(encryptedData.message);
return 1 ==
::olm_matches_inbound_session_from(
session,
theirIdentityKey.data() + ID_KEYS_PREFIX_OFFSET,
KEYSIZE,
tmpEncryptedMessage.data(),
tmpEncryptedMessage.size());
}
Persist CryptoModule::storeAsB64(const std::string &secretKey) { Persist CryptoModule::storeAsB64(const std::string &secretKey) {
Persist persist; Persist persist;
size_t accountPickleLength = ::olm_pickle_account_length(this->account); size_t accountPickleLength = ::olm_pickle_account_length(this->account);
OlmBuffer accountPickleBuffer(accountPickleLength); OlmBuffer accountPickleBuffer(accountPickleLength);
if (accountPickleLength != if (accountPickleLength !=
::olm_pickle_account( ::olm_pickle_account(
this->account, this->account,
secretKey.data(), secretKey.data(),
▲ Show 20 Lines • Show All 60 Lines • ▼ Show 20 Lines if (-1 ==
encryptedMessage.size())) { encryptedMessage.size())) {
throw std::runtime_error{"error encrypt => ::olm_encrypt"}; throw std::runtime_error{"error encrypt => ::olm_encrypt"};
} }
return {encryptedMessage, messageType}; return {encryptedMessage, messageType};
} }
std::string CryptoModule::decrypt( std::string CryptoModule::decrypt(
const std::string &targetUserId, const std::string &targetUserId,
EncryptedData encryptedData, EncryptedData encryptedData) {
const OlmBuffer &theirIdentityKey) {
if (!this->hasSessionFor(targetUserId)) { if (!this->hasSessionFor(targetUserId)) {
throw std::runtime_error{"error decrypt => uninitialized session"}; throw std::runtime_error{"error decrypt => uninitialized session"};
} }
OlmSession *session = this->sessions.at(targetUserId)->getOlmSession(); OlmSession *session = this->sessions.at(targetUserId)->getOlmSession();
OlmBuffer tmpEncryptedMessage(encryptedData.message); OlmBuffer tmpEncryptedMessage(encryptedData.message);
if (encryptedData.messageType == (size_t)olm::MessageType::PRE_KEY) {
if (!this->matchesInboundSession(
targetUserId, encryptedData, theirIdentityKey)) {
throw std::runtime_error{"error decrypt => matchesInboundSession"};
}
}
size_t maxSize = ::olm_decrypt_max_plaintext_length( size_t maxSize = ::olm_decrypt_max_plaintext_length(
session, session,
encryptedData.messageType, encryptedData.messageType,
tmpEncryptedMessage.data(), tmpEncryptedMessage.data(),
tmpEncryptedMessage.size()); tmpEncryptedMessage.size());
OlmBuffer decryptedMessage(maxSize); OlmBuffer decryptedMessage(maxSize);
size_t decryptedSize = ::olm_decrypt( size_t decryptedSize = ::olm_decrypt(
session, session,
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines