Skip to content

Userlib: Fix endianness in request id calculation #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenyan-dfinity merged 4 commits into from
Jan 16, 2020
Merged

Userlib: Fix endianness in request id calculation #319

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dc4abe
Userlib: CaniterIds are little endian
nomeata Jan 15, 2020
f5d0450
Userlib: Fix endiannessin request id calculation
nomeata Jan 15, 2020
9cd3cde
Remove (hopefully) dead code
nomeata Jan 15, 2020
288f719
Merge branch 'master' into joachim/userlib-request-id
chenyan-dfinity Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/userlib/js/src/request_id.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ export async function hash(data: BinaryBlob): Promise<BinaryBlob> {
return Buffer.from(hashed) as BinaryBlob;
}

const padHex = (hex: string): string => {
return `${'0000000000000000'.slice(hex.length)}${hex}`;
const changeEndianness = (str: string): string => {
const result = [];
let len = str.length - 2;
while (len >= 0) {
result.push(str.substr(len, 2));
len -= 2;
}
return result.join('');
};

async function hashValue(value: unknown): Promise<Buffer> {
Expand All @@ -29,13 +35,8 @@ async function hashValue(value: unknown): Promise<Buffer> {
return hashString(value);
} else if (value instanceof CanisterId) {
// HTTP handler expects canister_id to be an u64 & hashed in this way.
const hex = value.toHex();
const padded = padHex(hex);
return hash(blobFromHex(padded));
} else if (typeof value === 'number') {
const hex = value.toString(16);
const padded = padHex(hex);
return hash(blobFromHex(padded));
// work-around for endianness problem until we switch to blobs
return hash(blobFromHex(changeEndianness(value.toHex())));
} else if (value instanceof Buffer) {
return hash(new Uint8Array(value) as BinaryBlob);
} else if (value instanceof Uint8Array || value instanceof ArrayBuffer) {
Expand Down