Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-03 15:11:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce max envelope size for internal users.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-09-10 15:09:46 -04:00
parent 79ee14826d
commit 90ae9e1636
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -185,7 +185,8 @@ public class SignalServiceMessageSender {
private final Scheduler scheduler;
private final long maxEnvelopeSize;
private final BooleanSupplier useRestFallback;
private final UsePqRatchet usePqRatchet;
private final UsePqRatchet usePqRatchet;
private final Optional<Long> internalOnlyMaxEnvelopeSize;
public SignalServiceMessageSender(PushServiceSocket pushServiceSocket,
SignalServiceDataStore store,
@@ -197,25 +198,27 @@ public class SignalServiceMessageSender {
ExecutorService executor,
long maxEnvelopeSize,
BooleanSupplier useRestFallback,
UsePqRatchet usePqRatchet)
UsePqRatchet usePqRatchet,
Optional<Long> internalOnlyMaxEnvelopeSize)
{
CredentialsProvider credentialsProvider = pushServiceSocket.getCredentialsProvider();
this.socket = pushServiceSocket;
this.aciStore = store.aci();
this.sessionLock = sessionLock;
this.localAddress = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
this.localDeviceId = credentialsProvider.getDeviceId();
this.localPni = credentialsProvider.getPni();
this.attachmentApi = attachmentApi;
this.messageApi = messageApi;
this.eventListener = eventListener;
this.maxEnvelopeSize = maxEnvelopeSize;
this.localPniIdentity = store.pni().getIdentityKeyPair();
this.scheduler = Schedulers.from(executor, false, false);
this.keysApi = keysApi;
this.useRestFallback = useRestFallback;
this.usePqRatchet = usePqRatchet;
this.socket = pushServiceSocket;
this.aciStore = store.aci();
this.sessionLock = sessionLock;
this.localAddress = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
this.localDeviceId = credentialsProvider.getDeviceId();
this.localPni = credentialsProvider.getPni();
this.attachmentApi = attachmentApi;
this.messageApi = messageApi;
this.eventListener = eventListener;
this.maxEnvelopeSize = maxEnvelopeSize;
this.localPniIdentity = store.pni().getIdentityKeyPair();
this.scheduler = Schedulers.from(executor, false, false);
this.keysApi = keysApi;
this.useRestFallback = useRestFallback;
this.usePqRatchet = usePqRatchet;
this.internalOnlyMaxEnvelopeSize = internalOnlyMaxEnvelopeSize;
}
/**
@@ -2813,6 +2816,11 @@ public class SignalServiceMessageSender {
if (maxEnvelopeSize > 0 && size > maxEnvelopeSize) {
throw new ContentTooLargeException(size);
}
if (internalOnlyMaxEnvelopeSize.isPresent() && size > internalOnlyMaxEnvelopeSize.get()) {
throw new ContentTooLargeException(size);
}
return content;
}
@@ -2822,6 +2830,11 @@ public class SignalServiceMessageSender {
if (maxEnvelopeSize > 0 && size > maxEnvelopeSize) {
throw new ContentTooLargeException(size);
}
if (internalOnlyMaxEnvelopeSize.isPresent() && size > internalOnlyMaxEnvelopeSize.get()) {
throw new ContentTooLargeException(size);
}
return content;
}