MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert unidentifiedDelivery.certificate configuration to byte[]

This commit is contained in:
Chris Eager 2025-05-27 14:08:12 -05:00 committed by Chris Eager
parent ccb209ad37
commit 401165d0d6
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/config/sample-secrets-bundle.yml
View File

@ -66,7 +66,6 @@ cdn.accessSecret: test # AWS Access Secret
cdn3StorageManager.clientSecret: test cdn3StorageManager.clientSecret: test
unidentifiedDelivery.certificate: ABCD1234
unidentifiedDelivery.privateKey: ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789AAAAAAA unidentifiedDelivery.privateKey: ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789AAAAAAA
keyTransparencyService.clientPrivateKey: | keyTransparencyService.clientPrivateKey: |

2
service/config/sample.yml
View File

@ -265,7 +265,7 @@ dogstatsd:
host: 127.0.0.1 host: 127.0.0.1
unidentifiedDelivery: unidentifiedDelivery:
certificate: secret://unidentifiedDelivery.certificate certificate: CgIIAQ==
privateKey: secret://unidentifiedDelivery.privateKey privateKey: secret://unidentifiedDelivery.privateKey
expiresDays: 7 expiresDays: 7

2
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@ -1080,7 +1080,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
new ArchiveController(backupAuthManager, backupManager, backupMetrics), new ArchiveController(backupAuthManager, backupManager, backupMetrics),
new CallRoutingControllerV2(rateLimiters, cloudflareTurnCredentialsManager), new CallRoutingControllerV2(rateLimiters, cloudflareTurnCredentialsManager),
new CallLinkController(rateLimiters, callingGenericZkSecretParams), new CallLinkController(rateLimiters, callingGenericZkSecretParams),
new CertificateController(new CertificateGenerator(config.getDeliveryCertificate().certificate().value(), new CertificateController(new CertificateGenerator(config.getDeliveryCertificate().certificate(),
config.getDeliveryCertificate().ecPrivateKey(), config.getDeliveryCertificate().expiresDays()), config.getDeliveryCertificate().ecPrivateKey(), config.getDeliveryCertificate().expiresDays()),
zkAuthOperations, callingGenericZkSecretParams, clock), zkAuthOperations, callingGenericZkSecretParams, clock),
new ChallengeController(rateLimitChallengeManager, challengeConstraintChecker), new ChallengeController(rateLimitChallengeManager, challengeConstraintChecker),

3
service/src/main/java/org/whispersystems/textsecuregcm/configuration/UnidentifiedDeliveryConfiguration.java
View File

@ -5,6 +5,7 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import org.signal.libsignal.protocol.InvalidKeyException; import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.ecc.Curve; import org.signal.libsignal.protocol.ecc.Curve;
@ -12,7 +13,7 @@ import org.signal.libsignal.protocol.ecc.ECPrivateKey;
import org.whispersystems.textsecuregcm.configuration.secrets.SecretBytes; import org.whispersystems.textsecuregcm.configuration.secrets.SecretBytes;
import org.whispersystems.textsecuregcm.util.ExactlySize; import org.whispersystems.textsecuregcm.util.ExactlySize;
public record UnidentifiedDeliveryConfiguration(@NotNull SecretBytes certificate, public record UnidentifiedDeliveryConfiguration(@NotNull @NotEmpty byte[] certificate,
@ExactlySize(32) SecretBytes privateKey, @ExactlySize(32) SecretBytes privateKey,
int expiresDays) { int expiresDays) {
public ECPrivateKey ecPrivateKey() throws InvalidKeyException { public ECPrivateKey ecPrivateKey() throws InvalidKeyException {

2
service/src/test/resources/config/test.yml
View File

@ -264,7 +264,7 @@ dogstatsd:
host: 127.0.0.1 host: 127.0.0.1
unidentifiedDelivery: unidentifiedDelivery:
certificate: secret://unidentifiedDelivery.certificate certificate: CgIIAQ==
privateKey: secret://unidentifiedDelivery.privateKey privateKey: secret://unidentifiedDelivery.privateKey
expiresDays: 7 expiresDays: 7