Page MenuHomePhabricator
Differential D7024

[web] Implement AES encryption functions
ClosedPublic
Actions

Authored by bartek on Mar 9 2023, 11:05 AM.
Tags
None
Referenced Files
F6235472: D7024.diff
Thu, Apr 24, 2:26 PM
Unknown Object (File)
Sat, Apr 19, 12:28 PM
Unknown Object (File)
Fri, Apr 18, 1:01 PM
Unknown Object (File)
Fri, Apr 18, 11:29 AM
Unknown Object (File)
Fri, Apr 18, 10:13 AM
Unknown Object (File)
Fri, Apr 18, 10:10 AM
Unknown Object (File)
Fri, Apr 18, 5:48 AM
Unknown Object (File)
Thu, Apr 17, 10:05 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
atul
marcin
kamil
michal
Commits
rCOMM0a9f3ff4fc9d: [web] Implement AES encryption functions
Summary

Implemented functions described in https://linear.app/comm/issue/ENG-388#comment-76a38890

Docs: https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto

Depends on D6994

Test Plan

Unit tests will be added in next diff.

In root component (or any other) I did:

import * as AES from './utils/aes-crypto-module.js';

const f = async () => {
  const key = await AES.generateKey();
  console.log('Key', key);
  const plaintextBytes = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
  const ciphertext = await AES.encrypt(key, plaintextBytes);
  console.log('Ciphertext', ciphertext);
  const decrypted = await AES.decrypt(key, ciphertext);
  console.log('Decrypted', decrypted); // should be equal to plaintextBytes
};

React.useEffect(() => {
  f();
}, []);

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

bartek created this revision.Mar 9 2023, 11:05 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptMar 9 2023, 11:05 AM
Harbormaster completed remote builds in B17221: Diff 23587.Mar 9 2023, 11:22 AM
bartek added a child revision: D7025: [web] Add unit tests for AES functions.Mar 9 2023, 11:23 AM
bartek published this revision for review.Mar 9 2023, 11:26 AM
kamil mentioned this in D6994: [web-db] implement types for `SubtleCrypto` module.Mar 10 2023, 7:11 AM
atul accepted this revision.Mar 10 2023, 3:29 PM

Unit tests will be added in next diff.

Sweet, thanks for handling this

web/utils/aes-crypto.js
50 ↗(On Diff #23587)

I think we can do an equality check here?

51 ↗(On Diff #23587)

We mention "size" in the previous error message:

throw new Error('Invalid AES key size');

Should we do the same here for symmetry?

This revision is now accepted and ready to land.Mar 10 2023, 3:29 PM
bartek edited parent revisions, added: D6994: [web-db] implement types for `SubtleCrypto` module; removed: D7023: [web] Add Flow types for WebCrypto / SubtleCrypto.Mar 12 2023, 11:49 PM
bartek edited the summary of this revision. (Show Details)Mar 13 2023, 3:22 AM
bartek updated this revision to Diff 23675.Mar 13 2023, 5:18 AM
  • Rebase on new types
  • Address review feedback
    • Used consistent naming for ciphertext, sealed data etc.
bartek planned changes to this revision.Mar 13 2023, 5:19 AM
bartek added inline comments.
web/utils/aes-crypto.js
50 ↗(On Diff #23587)

Nope, this can be equal (in case data is 0 length) or longer (with data between them).

bartek updated this revision to Diff 23677.Mar 13 2023, 5:21 AM

Revert accidental changes

This revision is now accepted and ready to land.Mar 13 2023, 5:21 AM
Harbormaster failed remote builds in B17288: Diff 23677!Mar 13 2023, 5:32 AM
Harbormaster completed remote builds in B17286: Diff 23675.
Harbormaster completed remote builds in B17288: Diff 23677.Mar 13 2023, 9:49 AM
bartek updated this revision to Diff 23845.Mar 20 2023, 6:57 AM

Rebase before landing

Harbormaster completed remote builds in B17403: Diff 23845.Mar 20 2023, 7:15 AM
Closed by commit rCOMM0a9f3ff4fc9d: [web] Implement AES encryption functions (authored by bartek). · Explain WhyMar 20 2023, 7:30 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMM0a9f3ff4fc9d: [web] Implement AES encryption functions.

Revision Contents
Changeset List

PathSize
native/
451 lines
web/
media/
74 lines

Diff 23675

View Options

native/aestool

Show All 28 Linesclass CreateNewBackupReactor : public ServerBidiReactorBase<
State state = State::USER_ID; State state = State::USER_ID;
std::string userID; std::string userID;
std::string keyEntropy; std::string keyEntropy;
std::string dataHash; std::string dataHash;
std::string holder; std::string holder;
std::string backupID; std::string backupID;
std::shared_ptr<reactor::BlobPutClientReactor> putReactor; std::shared_ptr<reactor::BlobPutClientReactor> putReactor;
ServiceBlobClient blobClient; ServiceBlobClient blobClient;
std::mutex reactorStateMutex; std::mutex reactorStateMutex;
std::condition_variable blobDoneCV;
std::mutex blobDoneCVMutex; std::condition_variable blobPutDoneCV;
std::mutex blobPutDoneCVMutex;
std::string generateBackupID(); std::string generateBackupID();
public: public:
std::unique_ptr<ServerBidiReactorStatus> handleRequest( std::unique_ptr<ServerBidiReactorStatus> handleRequest(
backup::CreateNewBackupRequest request, backup::CreateNewBackupRequest request,
backup::CreateNewBackupResponse *response) override; backup::CreateNewBackupResponse *response) override;
void terminateCallback() override; void terminateCallback() override;
Show All 35 Lines case State::DATA_HASH: {
this->dataHash = request.newcompactionhash(); this->dataHash = request.newcompactionhash();
this->state = State::DATA_CHUNKS; this->state = State::DATA_CHUNKS;
// TODO confirm - holder may be a backup id // TODO confirm - holder may be a backup id
this->backupID = this->generateBackupID(); this->backupID = this->generateBackupID();
response->set_backupid(this->backupID); response->set_backupid(this->backupID);
this->holder = this->backupID; this->holder = this->backupID;
this->putReactor = std::make_shared<reactor::BlobPutClientReactor>( this->putReactor = std::make_shared<reactor::BlobPutClientReactor>(
this->holder, this->dataHash, &this->blobDoneCV); this->holder, this->dataHash, &this->blobPutDoneCV);
this->blobClient.put(this->putReactor); this->blobClient.put(this->putReactor);
return nullptr; return nullptr;
} }
case State::DATA_CHUNKS: { case State::DATA_CHUNKS: {
this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>( this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>(
std::move(*request.mutable_newcompactionchunk()))); std::move(*request.mutable_newcompactionchunk())));
return nullptr; return nullptr;
} }
} }
throw std::runtime_error("new backup - invalid state"); throw std::runtime_error("new backup - invalid state");
} }
void CreateNewBackupReactor::terminateCallback() { void CreateNewBackupReactor::terminateCallback() {
const std::lock_guard<std::mutex> lock(this->reactorStateMutex); const std::lock_guard<std::mutex> lock(this->reactorStateMutex);
if (this->putReactor == nullptr) { if (this->putReactor == nullptr) {
return; return;
} }
this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>("")); this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>(""));
std::unique_lock<std::mutex> lock2(this->blobDoneCVMutex); std::unique_lock<std::mutex> lock2(this->blobPutDoneCVMutex);
if (!this->putReactor->isDone()) { if (this->putReactor->isDone() && !this->putReactor->getStatus().ok()) {
this->blobDoneCV.wait(lock2);
} else if (!this->putReactor->getStatus().ok()) {
throw std::runtime_error(this->putReactor->getStatus().error_message()); throw std::runtime_error(this->putReactor->getStatus().error_message());
} }
if (!this->putReactor->isDone()) {
this->blobPutDoneCV.wait(lock2);
}
try { try {
// TODO add recovery data // TODO add recovery data
// TODO handle attachments holders // TODO handle attachments holders
database::BackupItem backupItem( database::BackupItem backupItem(
this->userID, this->userID,
this->backupID, this->backupID,
getCurrentTimestamp(), getCurrentTimestamp(),
generateRandomString(), generateRandomString(),
Show All 11 Lines
View Options

web/media/aes-crypto-utils.js

Show All 28 Linesclass CreateNewBackupReactor : public ServerBidiReactorBase<
State state = State::USER_ID; State state = State::USER_ID;
std::string userID; std::string userID;
std::string keyEntropy; std::string keyEntropy;
std::string dataHash; std::string dataHash;
std::string holder; std::string holder;
std::string backupID; std::string backupID;
std::shared_ptr<reactor::BlobPutClientReactor> putReactor; std::shared_ptr<reactor::BlobPutClientReactor> putReactor;
ServiceBlobClient blobClient; ServiceBlobClient blobClient;
std::mutex reactorStateMutex; std::mutex reactorStateMutex;
std::condition_variable blobDoneCV;
std::mutex blobDoneCVMutex; std::condition_variable blobPutDoneCV;
std::mutex blobPutDoneCVMutex;
std::string generateBackupID(); std::string generateBackupID();
public: public:
std::unique_ptr<ServerBidiReactorStatus> handleRequest( std::unique_ptr<ServerBidiReactorStatus> handleRequest(
backup::CreateNewBackupRequest request, backup::CreateNewBackupRequest request,
backup::CreateNewBackupResponse *response) override; backup::CreateNewBackupResponse *response) override;
void terminateCallback() override; void terminateCallback() override;
Show All 35 Lines case State::DATA_HASH: {
this->dataHash = request.newcompactionhash(); this->dataHash = request.newcompactionhash();
this->state = State::DATA_CHUNKS; this->state = State::DATA_CHUNKS;
// TODO confirm - holder may be a backup id // TODO confirm - holder may be a backup id
this->backupID = this->generateBackupID(); this->backupID = this->generateBackupID();
response->set_backupid(this->backupID); response->set_backupid(this->backupID);
this->holder = this->backupID; this->holder = this->backupID;
this->putReactor = std::make_shared<reactor::BlobPutClientReactor>( this->putReactor = std::make_shared<reactor::BlobPutClientReactor>(
this->holder, this->dataHash, &this->blobDoneCV); this->holder, this->dataHash, &this->blobPutDoneCV);
this->blobClient.put(this->putReactor); this->blobClient.put(this->putReactor);
return nullptr; return nullptr;
} }
case State::DATA_CHUNKS: { case State::DATA_CHUNKS: {
this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>( this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>(
std::move(*request.mutable_newcompactionchunk()))); std::move(*request.mutable_newcompactionchunk())));
return nullptr; return nullptr;
} }
} }
throw std::runtime_error("new backup - invalid state"); throw std::runtime_error("new backup - invalid state");
} }
void CreateNewBackupReactor::terminateCallback() { void CreateNewBackupReactor::terminateCallback() {
const std::lock_guard<std::mutex> lock(this->reactorStateMutex); const std::lock_guard<std::mutex> lock(this->reactorStateMutex);
if (this->putReactor == nullptr) { if (this->putReactor == nullptr) {
return; return;
} }
this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>("")); this->putReactor->scheduleSendingDataChunk(std::make_unique<std::string>(""));
std::unique_lock<std::mutex> lock2(this->blobDoneCVMutex); std::unique_lock<std::mutex> lock2(this->blobPutDoneCVMutex);
if (!this->putReactor->isDone()) { if (this->putReactor->isDone() && !this->putReactor->getStatus().ok()) {
this->blobDoneCV.wait(lock2);
} else if (!this->putReactor->getStatus().ok()) {
throw std::runtime_error(this->putReactor->getStatus().error_message()); throw std::runtime_error(this->putReactor->getStatus().error_message());
} }
if (!this->putReactor->isDone()) {
this->blobPutDoneCV.wait(lock2);
}
try { try {
// TODO add recovery data // TODO add recovery data
// TODO handle attachments holders // TODO handle attachments holders
database::BackupItem backupItem( database::BackupItem backupItem(
this->userID, this->userID,
this->backupID, this->backupID,
getCurrentTimestamp(), getCurrentTimestamp(),
generateRandomString(), generateRandomString(),
Show All 11 Lines