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

Clean up inviteLink handling, harden compose input

Browse source
This commit is contained in:
Scott Nonnenberg 2021-05-06 12:06:20 -07:00 • committed by GitHub
parent 986d8a66bc
commit fc12d02a8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 59 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/textsecure/WebAPI.ts
View file

@ -2119,6 +2119,7 @@ export function initialize({
auth.groupPublicParamsHex,
auth.authCredentialPresentationHex
);
const safeInviteLinkPassword = toWebSafeBase64(inviteLinkPassword);
const response: ArrayBuffer = await _ajax({
basicAuth,
@ -2127,7 +2128,8 @@ export function initialize({
host: storageUrl,
httpType: 'GET',
responseType: 'arraybuffer',
urlParameters: `/${toWebSafeBase64(inviteLinkPassword)}`,
urlParameters: `/${safeInviteLinkPassword}`,
redactUrl: _createRedactor(safeInviteLinkPassword),
});
return window.textsecure.protobuf.GroupJoinInfo.decode(response);
@ -2143,6 +2145,9 @@ export function initialize({
options.authCredentialPresentationHex
);
const data = changes.toArrayBuffer();
const safeInviteLinkPassword = inviteLinkBase64
? toWebSafeBase64(inviteLinkBase64)
: undefined;
const response: ArrayBuffer = await _ajax({
basicAuth,
@ -2152,8 +2157,11 @@ export function initialize({
host: storageUrl,
httpType: 'PATCH',
responseType: 'arraybuffer',
urlParameters: inviteLinkBase64
? `?inviteLinkPassword=${toWebSafeBase64(inviteLinkBase64)}`
urlParameters: safeInviteLinkPassword
? `?inviteLinkPassword=${safeInviteLinkPassword}`
: undefined,
redactUrl: safeInviteLinkPassword
? _createRedactor(safeInviteLinkPassword)
: undefined,
});