Page MenuHomePhabricator
Differential D4761

[Services] Clang fixes for services/lib/src
ClosedPublic
Actions

Authored by • jon on Aug 5 2022, 4:40 PM.
Tags
None
Referenced Files
F5925824: D4761.diff
Fri, Apr 18, 12:13 AM
Unknown Object (File)
Tue, Apr 8, 9:39 PM
Unknown Object (File)
Tue, Apr 8, 9:39 PM
Unknown Object (File)
Tue, Apr 8, 9:39 PM
Unknown Object (File)
Tue, Apr 8, 9:39 PM
Unknown Object (File)
Fri, Mar 28, 6:23 PM
Unknown Object (File)
Fri, Mar 28, 6:50 AM
Unknown Object (File)
Mar 16 2025, 6:11 PM
View All Files
Subscribers
• abosh
• adrian
ashoat
tomek

Details

Reviewers
atul
• karol
• max
Commits
rCOMM4aef791d3ab1: [Services] Clang fixes for services/lib/src
Summary

Clang is a bit more pedantic. Make it happy.

Occurred to me that this was never an existing workflow.
So I made it into another diff.

Allows for D4489 to be built from a MacOS device

Test Plan

Follow nix test plan from D4489 on a mac device

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jon created this revision.Aug 5 2022, 4:40 PM
Herald added subscribers: • abosh, • adrian, tomek, ashoat. · View Herald TranscriptAug 5 2022, 4:40 PM
• jon added a child revision: D4489: [Services] Export shared services cpp as CMake Project.Aug 5 2022, 4:41 PM
Harbormaster completed remote builds in B11180: Diff 15387.Aug 5 2022, 4:52 PM
• jon requested review of this revision.Aug 5 2022, 4:52 PM
• jon mentioned this in D4489: [Services] Export shared services cpp as CMake Project.Aug 5 2022, 6:20 PM
• jon retitled this revision from [Services] Clang fixes services/lib/src to [Services] Clang fixes for services/lib/src.Aug 6 2022, 10:17 AM
atul accepted this revision.Aug 8 2022, 10:29 AM
atul added inline comments.
services/lib/src/ReactorStatusHolder.h
25 ↗(On Diff #15387)

Could we do

std::atomic<ReactorState> state{ReactorState::NONE};

here?

Screen_Shot_2022-08-04_at_4.29.45_PM.png (1×902 px, 226 KB)

This revision is now accepted and ready to land.Aug 8 2022, 10:29 AM
• jon requested review of this revision.Aug 8 2022, 10:55 AM
• jon added inline comments.
services/lib/src/ReactorStatusHolder.h
25 ↗(On Diff #15387)

I'm not going to act like I know best practices in C++

cc @max

Looks like they are equivalent: https://stackoverflow.com/questions/40378205/c-initialising-fields-directly-vs-initialisation-list-in-default-constructor

atul added inline comments.Aug 8 2022, 11:03 AM
services/lib/src/ReactorStatusHolder.h
25 ↗(On Diff #15387)

Gotcha, seems reasonable to leave as is

Also don't know much C++, just been blindly following that braced initialization rule.

atul accepted this revision.Aug 8 2022, 11:04 AM
atul attached a referenced file: F131041: Screen_Shot_2022-08-04_at_4.29.45_PM.png. (Show Details)
This revision is now accepted and ready to land.Aug 8 2022, 11:04 AM
Closed by commit rCOMM4aef791d3ab1: [Services] Clang fixes for services/lib/src (authored by • jon). · Explain WhyAug 8 2022, 11:34 AM
This revision was automatically updated to reflect the committed changes.
• jon added a commit: rCOMM4aef791d3ab1: [Services] Clang fixes for services/lib/src.

Revision Contents
Changeset List

PathSize
services/
lib/
src/
2 lines
server-base-reactors/
2 lines

Diff 15436

View Options

services/lib/src/ReactorStatusHolder.h

  • This file was moved from web/database/utils/worker-crypto-utils.js.
// @flow // @flow
const ENCRYPTION_ALGORITHM = 'AES-GCM'; const ENCRYPTION_ALGORITHM = 'AES-GCM';
const ENCRYPTION_KEY_USAGES: $ReadOnlyArray<CryptoKey$Usages> = [ const ENCRYPTION_KEY_USAGES: $ReadOnlyArray<CryptoKey$Usages> = [
'encrypt', 'encrypt',
'decrypt', 'decrypt',
]; ];
type EncryptedData = { type EncryptedData = {
+iv: BufferSource, +iv: BufferSource,
+ciphertext: Uint8Array, +ciphertext: Uint8Array,
}; };
function generateDatabaseCryptoKey({ function generateCryptoKey({
extractable, extractable,
}: { }: {
+extractable: boolean, +extractable: boolean,
}): Promise<CryptoKey> { }): Promise<CryptoKey> {
return crypto.subtle.generateKey( return crypto.subtle.generateKey(
{ {
name: ENCRYPTION_ALGORITHM, name: ENCRYPTION_ALGORITHM,
length: 256, length: 256,
}, },
extractable, extractable,
ENCRYPTION_KEY_USAGES, ENCRYPTION_KEY_USAGES,
); );
} }
function generateIV(): BufferSource { function generateIV(): BufferSource {
return crypto.getRandomValues(new Uint8Array(12)); return crypto.getRandomValues(new Uint8Array(12));
} }
async function encryptDatabaseFile( async function encryptData(
data: Uint8Array, data: Uint8Array,
key: CryptoKey, key: CryptoKey,
): Promise<EncryptedData> { ): Promise<EncryptedData> {
const iv = generateIV(); const iv = generateIV();
const ciphertext = await crypto.subtle.encrypt( const ciphertext = await crypto.subtle.encrypt(
{ {
name: ENCRYPTION_ALGORITHM, name: ENCRYPTION_ALGORITHM,
iv: iv, iv: iv,
}, },
key, key,
data, data,
); );
return { return {
ciphertext: new Uint8Array(ciphertext), ciphertext: new Uint8Array(ciphertext),
iv, iv,
}; };
} }
async function decryptDatabaseFile( async function decryptData(
encryptedData: EncryptedData, encryptedData: EncryptedData,
key: CryptoKey, key: CryptoKey,
): Promise<Uint8Array> { ): Promise<Uint8Array> {
const { ciphertext, iv } = encryptedData; const { ciphertext, iv } = encryptedData;
const decrypted = await crypto.subtle.decrypt( const decrypted = await crypto.subtle.decrypt(
{ {
name: ENCRYPTION_ALGORITHM, name: ENCRYPTION_ALGORITHM,
iv, iv,
Show All 18 Lines return await crypto.subtle.importKey(
jwkKey, jwkKey,
ENCRYPTION_ALGORITHM, ENCRYPTION_ALGORITHM,
true, true,
ENCRYPTION_KEY_USAGES, ENCRYPTION_KEY_USAGES,
); );
} }
export { export {
generateDatabaseCryptoKey, generateCryptoKey,
encryptDatabaseFile, encryptData,
decryptDatabaseFile, decryptData,
exportKeyToJWK, exportKeyToJWK,
importJWKKey, importJWKKey,
}; };
View Options

services/lib/src/server-base-reactors/ServerWriteReactorBase.h

  • This file was moved from web/database/utils/worker-crypto-utils.js.
// @flow // @flow
const ENCRYPTION_ALGORITHM = 'AES-GCM'; const ENCRYPTION_ALGORITHM = 'AES-GCM';
const ENCRYPTION_KEY_USAGES: $ReadOnlyArray<CryptoKey$Usages> = [ const ENCRYPTION_KEY_USAGES: $ReadOnlyArray<CryptoKey$Usages> = [
'encrypt', 'encrypt',
'decrypt', 'decrypt',
]; ];
type EncryptedData = { type EncryptedData = {
+iv: BufferSource, +iv: BufferSource,
+ciphertext: Uint8Array, +ciphertext: Uint8Array,
}; };
function generateDatabaseCryptoKey({ function generateCryptoKey({
extractable, extractable,
}: { }: {
+extractable: boolean, +extractable: boolean,
}): Promise<CryptoKey> { }): Promise<CryptoKey> {
return crypto.subtle.generateKey( return crypto.subtle.generateKey(
{ {
name: ENCRYPTION_ALGORITHM, name: ENCRYPTION_ALGORITHM,
length: 256, length: 256,
}, },
extractable, extractable,
ENCRYPTION_KEY_USAGES, ENCRYPTION_KEY_USAGES,
); );
} }
function generateIV(): BufferSource { function generateIV(): BufferSource {
return crypto.getRandomValues(new Uint8Array(12)); return crypto.getRandomValues(new Uint8Array(12));
} }
async function encryptDatabaseFile( async function encryptData(
data: Uint8Array, data: Uint8Array,
key: CryptoKey, key: CryptoKey,
): Promise<EncryptedData> { ): Promise<EncryptedData> {
const iv = generateIV(); const iv = generateIV();
const ciphertext = await crypto.subtle.encrypt( const ciphertext = await crypto.subtle.encrypt(
{ {
name: ENCRYPTION_ALGORITHM, name: ENCRYPTION_ALGORITHM,
iv: iv, iv: iv,
}, },
key, key,
data, data,
); );
return { return {
ciphertext: new Uint8Array(ciphertext), ciphertext: new Uint8Array(ciphertext),
iv, iv,
}; };
} }
async function decryptDatabaseFile( async function decryptData(
encryptedData: EncryptedData, encryptedData: EncryptedData,
key: CryptoKey, key: CryptoKey,
): Promise<Uint8Array> { ): Promise<Uint8Array> {
const { ciphertext, iv } = encryptedData; const { ciphertext, iv } = encryptedData;
const decrypted = await crypto.subtle.decrypt( const decrypted = await crypto.subtle.decrypt(
{ {
name: ENCRYPTION_ALGORITHM, name: ENCRYPTION_ALGORITHM,
iv, iv,
Show All 18 Lines return await crypto.subtle.importKey(
jwkKey, jwkKey,
ENCRYPTION_ALGORITHM, ENCRYPTION_ALGORITHM,
true, true,
ENCRYPTION_KEY_USAGES, ENCRYPTION_KEY_USAGES,
); );
} }
export { export {
generateDatabaseCryptoKey, generateCryptoKey,
encryptDatabaseFile, encryptData,
decryptDatabaseFile, decryptData,
exportKeyToJWK, exportKeyToJWK,
importJWKKey, importJWKKey,
}; };