From 96b753cfd05cca3d486562c445c6fe4905f5861a Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Fri, 13 Jan 2023 10:07:45 -0800 Subject: [PATCH] Add an extra kb to max sticker size --- .../java/org/whispersystems/textsecuregcm/util/Constants.java | 2 +- .../textsecuregcm/tests/controllers/StickerControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/util/Constants.java b/service/src/main/java/org/whispersystems/textsecuregcm/util/Constants.java index 986487d12..7035be3a8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/util/Constants.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/util/Constants.java @@ -9,6 +9,6 @@ import io.dropwizard.util.DataSize; public class Constants { public static final String METRICS_NAME = "textsecure"; - public static final int MAXIMUM_STICKER_SIZE_BYTES = (int) DataSize.kibibytes(300).toBytes(); + public static final int MAXIMUM_STICKER_SIZE_BYTES = (int) DataSize.kibibytes(300 + 1).toBytes(); // add 1 kiB for encryption overhead public static final int MAXIMUM_STICKER_MANIFEST_SIZE_BYTES = (int) DataSize.kibibytes(10).toBytes(); } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/StickerControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/StickerControllerTest.java index d4894f759..021d55913 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/StickerControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/StickerControllerTest.java @@ -79,7 +79,7 @@ class StickerControllerTest { assertThat(attributes.getStickers().get(i).getKey()).isEqualTo("stickers/" + attributes.getPackId() + "/full/" + i); assertThat(attributes.getStickers().get(i).getAcl()).isEqualTo("private"); assertThat(attributes.getStickers().get(i).getPolicy()).isNotEmpty(); - assertThat(new String(Base64.getDecoder().decode(attributes.getStickers().get(i).getPolicy()))).contains("[\"content-length-range\", 1, 307200]"); + assertThat(new String(Base64.getDecoder().decode(attributes.getStickers().get(i).getPolicy()))).contains("[\"content-length-range\", 1, 308224]"); assertThat(attributes.getStickers().get(i).getSignature()).isNotEmpty(); assertThat(attributes.getStickers().get(i).getAlgorithm()).isEqualTo("AWS4-HMAC-SHA256"); assertThat(attributes.getStickers().get(i).getCredential()).isNotEmpty();