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

Fix format of pniSignature.pniBytes

Browse source
This commit is contained in:
Fedor Indutny 2023-09-14 22:39:51 +02:00 • committed by GitHub
parent d0296ececa
commit 654215e136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -195,7 +195,7 @@
"@electron/fuses": "1.5.0", "@electron/fuses": "1.5.0",
"@formatjs/intl": "2.6.7", "@formatjs/intl": "2.6.7",
"@mixer/parallel-prettier": "2.0.3", "@mixer/parallel-prettier": "2.0.3",
"@signalapp/mock-server": "4.1.0", "@signalapp/mock-server": "4.1.1",
"@storybook/addon-a11y": "6.5.6", "@storybook/addon-a11y": "6.5.6",
"@storybook/addon-actions": "6.5.6", "@storybook/addon-actions": "6.5.6",
"@storybook/addon-controls": "6.5.6", "@storybook/addon-controls": "6.5.6",

4
ts/test-mock/pnp/pni_signature_test.ts
View file

@ -128,9 +128,7 @@ describe('pnp/PNI Signature', function needsName() {
} }
assert.deepEqual( assert.deepEqual(
Pni.parseFromServiceIdBinary( Pni.fromUuidBytes(Buffer.from(message.pni)).getServiceIdString(),
Buffer.from(message.pni)
).getServiceIdString(),
desktop.pni, desktop.pni,
`Incorrect pni in pni signature message from ${source}` `Incorrect pni in pni signature message from ${source}`
); );

4
ts/textsecure/MessageReceiver.ts
View file

@ -2754,9 +2754,7 @@ export default class MessageReceiver
const { pni: pniBytes, signature } = pniSignatureMessage; const { pni: pniBytes, signature } = pniSignatureMessage;
strictAssert(Bytes.isNotEmpty(pniBytes), `${logId}: missing PNI bytes`); strictAssert(Bytes.isNotEmpty(pniBytes), `${logId}: missing PNI bytes`);
const pni = fromPniObject( const pni = fromPniObject(Pni.fromUuidBytes(Buffer.from(pniBytes)));
Pni.parseFromServiceIdBinary(Buffer.from(pniBytes))
);
strictAssert(pni, `${logId}: missing PNI`); strictAssert(pni, `${logId}: missing PNI`);
strictAssert(Bytes.isNotEmpty(signature), `${logId}: empty signature`); strictAssert(Bytes.isNotEmpty(signature), `${logId}: empty signature`);
strictAssert(isAciString(aci), `${logId}: invalid ACI`); strictAssert(isAciString(aci), `${logId}: invalid ACI`);

2
ts/textsecure/SendMessage.ts
View file

@ -598,7 +598,7 @@ function addPniSignatureMessageToProto({
proto.pniSignatureMessage = { proto.pniSignatureMessage = {
pni: Pni.parseFromServiceIdString( pni: Pni.parseFromServiceIdString(
pniSignatureMessage.pni pniSignatureMessage.pni
).getServiceIdBinary(), ).getRawUuidBytes(),
signature: pniSignatureMessage.signature, signature: pniSignatureMessage.signature,
}; };
} }

8
yarn.lock
View file

@ -3379,10 +3379,10 @@
node-gyp-build "^4.2.3" node-gyp-build "^4.2.3"
uuid "^8.3.0" uuid "^8.3.0"
"@signalapp/mock-server@4.1.0": "@signalapp/mock-server@4.1.1":
version "4.1.0" version "4.1.1"
resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-4.1.0.tgz#2a96981a3e375df0cbab37476fa448b99df3d143" resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-4.1.1.tgz#563a31a30cbefcb6c443a8fe7c77d9f20d3920db"
integrity sha512-sVcw384ZjkymsQ4f8GSgUTaF3IIhaMBIYqW76Trzf0U46Uw8gD3hhGjBSBb5GAJQWgJKcAusirXhx/D5mF8z3Q== integrity sha512-u+8BJK3Nl1Daw/I1J5ki4LtB99NvwSCUassEcTllWQppSg0wU0nxOwlDedMseyUvIhtUIePu2/nmysT1E3jRiw==
dependencies: dependencies:
"@signalapp/libsignal-client" "^0.30.2" "@signalapp/libsignal-client" "^0.30.2"
debug "^4.3.2" debug "^4.3.2"