From b100b3c36beebeb0f7b821125207fd0e194cd1b5 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Fri, 15 Jan 2021 13:14:44 -0800 Subject: [PATCH] Reject traffic without logging exceptions --- .../textsecuregcm/controllers/MessageController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java index a6b0633d8..976a3af70 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java @@ -110,13 +110,14 @@ public class MessageController { @PUT @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public SendMessageResponse sendMessage(@Auth Optional source, + public Response sendMessage(@Auth Optional source, @HeaderParam(OptionalAccess.UNIDENTIFIED) Optional accessKey, @HeaderParam("User-Agent") String userAgent, @PathParam("destination") AmbiguousIdentifier destinationName, @Valid IncomingMessageList messages) throws RateLimitExceededException { + return Response.status(503).build(); /* if (!source.isPresent() && !accessKey.isPresent()) { throw new WebApplicationException(Response.Status.UNAUTHORIZED); } @@ -187,8 +188,6 @@ public class MessageController { .entity(new StaleDevices(e.getStaleDevices())) .build()); } */ - - throw new WebApplicationException(Response.status(503).build()); } @Timed