Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 19:28:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Require PNI-associated keys if the target account has a PNI identity key

Browse Source
This commit is contained in:
Jon Chambers
2023-08-08 17:33:29 -04:00
committed by Jon Chambers
parent 4ec97cf006
commit 1dde612855
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
View File

@@ -365,6 +365,12 @@ public class DeviceController {
assert deviceActivationRequest.aciSignedPreKey().isPresent();
assert deviceActivationRequest.aciPqLastResortPreKey().isPresent();
if (account.getPhoneNumberIdentityKey() != null) {
if (deviceActivationRequest.pniSignedPreKey().isEmpty() || deviceActivationRequest.pniPqLastResortPreKey().isEmpty()) {
throw new WebApplicationException(Response.status(422).build());
}
}
final boolean allKeysValid = PreKeySignatureValidator.validatePreKeySignatures(account.getIdentityKey(),
List.of(deviceActivationRequest.aciSignedPreKey().get(), deviceActivationRequest.aciPqLastResortPreKey().get())) &&
deviceActivationRequest.pniSignedPreKey().map(pniSignedPreKey ->