mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Update mediaName derivation to hex encoding

Browse source
This commit is contained in:
trevor-signal 2024-08-01 02:13:38 -04:00 • committed by GitHub
parent 5173b3d01a
commit 0433264eed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 44 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ts/test-electron/backup/filePointer_test.ts
View file

@ -161,6 +161,9 @@ describe('convertFilePointerToAttachment', () => {
});
});
const defaultDigest = Bytes.fromBase64('digest');
const defaultMediaName = Bytes.toHex(defaultDigest);
function composeAttachment(
overrides: Partial<AttachmentType> = {}
): AttachmentType {
@ -171,7 +174,7 @@ function composeAttachment(
cdnNumber: 2,
path: 'path/to/file.png',
key: 'key',
digest: 'digest',
digest: Bytes.toBase64(defaultDigest),
iv: 'iv',
width: 100,
height: 100,
@ -202,17 +205,16 @@ const defaultAttachmentLocator = new Backups.FilePointer.AttachmentLocator({
cdnKey: 'cdnKey',
cdnNumber: 2,
key: Bytes.fromBase64('key'),
digest: Bytes.fromBase64('digest'),
digest: defaultDigest,
size: 100,
uploadTimestamp: Long.fromNumber(1234),
});
const defaultMediaName = 'digest';
const defaultBackupLocator = new Backups.FilePointer.BackupLocator({
mediaName: defaultMediaName,
cdnNumber: null,
key: Bytes.fromBase64('key'),
digest: Bytes.fromBase64('digest'),
digest: defaultDigest,
size: Long.fromNumber(100),
transitCdnKey: 'cdnKey',
transitCdnNumber: 2,
@ -455,7 +457,7 @@ describe('getFilePointerForAttachment', () => {
...defaultBackupLocator,
key: newKey,
digest: newDigest,
mediaName: Bytes.toBase64(newDigest),
mediaName: Bytes.toHex(newDigest),
transitCdnKey: undefined,
transitCdnNumber: undefined,
}),
@ -497,7 +499,7 @@ describe('getFilePointerForAttachment', () => {
...defaultBackupLocator,
key: newKey,
digest: newDigest,
mediaName: Bytes.toBase64(newDigest),
mediaName: Bytes.toHex(newDigest),
transitCdnKey: undefined,
transitCdnNumber: undefined,
}),
@ -590,14 +592,14 @@ describe('getBackupJobForAttachmentAndFilePointer', async () => {
getBackupCdnInfo: notInBackupCdn,
}),
{
mediaName: 'digest',
mediaName: Bytes.toHex(defaultDigest),
receivedAt: 100,
type: 'standard',
data: {
path: 'path/to/file.png',
contentType: IMAGE_PNG,
keys: 'key',
digest: 'digest',
digest: Bytes.toBase64(defaultDigest),
iv: 'iv',
size: 100,
localKey: attachment.localKey,