From 71c7e305480aa3cb8af8c99ae04a20e925e3af47 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 19 Dec 2019 10:17:14 -0800 Subject: [PATCH] Increase max size for sticker manifest --- .../textsecuregcm/controllers/StickerController.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/controllers/StickerController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/StickerController.java index a16e93eb9..f5210e258 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/StickerController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/StickerController.java @@ -50,7 +50,7 @@ public class StickerController { String packId = generatePackId(); String packLocation = "stickers/" + packId; String manifestKey = packLocation + "/manifest.proto"; - Pair manifestPolicy = policyGenerator.createFor(now, manifestKey, 1024); + Pair manifestPolicy = policyGenerator.createFor(now, manifestKey, 10240); String manifestSignature = policySigner.getSignature(now, manifestPolicy.second()); StickerPackFormUploadItem manifest = new StickerPackFormUploadItem(-1, manifestKey, manifestPolicy.first(), "private", "AWS4-HMAC-SHA256", now.format(PostPolicyGenerator.AWS_DATE_TIME), manifestPolicy.second(), manifestSignature); 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 9f8a3a17f..93126137b 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 @@ -58,7 +58,7 @@ public class StickerControllerTest { assertThat(attributes.getManifest().getKey()).isEqualTo("stickers/" + attributes.getPackId() + "/manifest.proto"); assertThat(attributes.getManifest().getAcl()).isEqualTo("private"); assertThat(attributes.getManifest().getPolicy()).isNotEmpty(); - assertThat(new String(Base64.decode(attributes.getManifest().getPolicy()))).contains("[\"content-length-range\", 1, 1024]"); + assertThat(new String(Base64.decode(attributes.getManifest().getPolicy()))).contains("[\"content-length-range\", 1, 10240]"); assertThat(attributes.getManifest().getSignature()).isNotEmpty(); assertThat(attributes.getManifest().getAlgorithm()).isEqualTo("AWS4-HMAC-SHA256"); assertThat(attributes.getManifest().getCredential()).isNotEmpty();