-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Check structural validity of prekeys at upload time
- Loading branch information
1 parent
0ab66f2
commit ecd207f
Showing
9 changed files
with
191 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
service/src/main/java/org/whispersystems/textsecuregcm/util/ValidPreKey.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Copyright 2023 Signal Messenger, LLC | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| package org.whispersystems.textsecuregcm.util; | ||
|
|
||
| import static java.lang.annotation.ElementType.FIELD; | ||
| import static java.lang.annotation.ElementType.PARAMETER; | ||
| import static java.lang.annotation.ElementType.TYPE_USE; | ||
| import static java.lang.annotation.RetentionPolicy.RUNTIME; | ||
| import java.lang.annotation.Documented; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.Target; | ||
| import javax.validation.Constraint; | ||
| import javax.validation.Payload; | ||
|
|
||
| @Target({FIELD, PARAMETER, TYPE_USE}) | ||
| @Retention(RUNTIME) | ||
| @Constraint(validatedBy = {ValidPreKeyValidator.class}) | ||
| @Documented | ||
| public @interface ValidPreKey { | ||
|
|
||
| public enum PreKeyType { | ||
| ECC, | ||
| KYBER | ||
| } | ||
|
|
||
| PreKeyType type(); | ||
|
|
||
| String message() default "{org.whispersystems.textsecuregcm.util.ValidPreKey.message}"; | ||
|
|
||
| Class<?>[] groups() default { }; | ||
|
|
||
| Class<? extends Payload>[] payload() default { }; | ||
|
|
||
| } |
38 changes: 38 additions & 0 deletions
38
service/src/main/java/org/whispersystems/textsecuregcm/util/ValidPreKeyValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2013-2020 Signal Messenger, LLC | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| package org.whispersystems.textsecuregcm.util; | ||
|
|
||
| import javax.validation.ConstraintValidator; | ||
| import javax.validation.ConstraintValidatorContext; | ||
| import org.signal.libsignal.protocol.InvalidKeyException; | ||
| import org.signal.libsignal.protocol.ecc.Curve; | ||
| import org.signal.libsignal.protocol.kem.KEMPublicKey; | ||
| import org.whispersystems.textsecuregcm.entities.PreKey; | ||
|
|
||
| public class ValidPreKeyValidator implements ConstraintValidator<ValidPreKey, PreKey> { | ||
| private ValidPreKey.PreKeyType type; | ||
|
|
||
| @Override | ||
| public void initialize(ValidPreKey annotation) { | ||
| type = annotation.type(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isValid(PreKey value, ConstraintValidatorContext context) { | ||
| if (value == null) { | ||
| return true; | ||
| } | ||
| try { | ||
| switch (type) { | ||
| case ECC -> Curve.decodePoint(value.getPublicKey(), 0); | ||
| case KYBER -> new KEMPublicKey(value.getPublicKey()); | ||
| } | ||
| } catch (IllegalArgumentException | InvalidKeyException e) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| } |
Oops, something went wrong.