Add an exception mapper for CompletionExceptions
This commit is contained in:
parent
99b1f48e0e
commit
1053a47e42
|
@ -114,6 +114,7 @@ import org.whispersystems.textsecuregcm.limits.RateLimitResetMetricsManager;
|
||||||
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
import org.whispersystems.textsecuregcm.limits.RateLimiters;
|
||||||
import org.whispersystems.textsecuregcm.limits.UnsealedSenderRateLimiter;
|
import org.whispersystems.textsecuregcm.limits.UnsealedSenderRateLimiter;
|
||||||
import org.whispersystems.textsecuregcm.liquibase.NameableMigrationsBundle;
|
import org.whispersystems.textsecuregcm.liquibase.NameableMigrationsBundle;
|
||||||
|
import org.whispersystems.textsecuregcm.mappers.CompletionExceptionMapper;
|
||||||
import org.whispersystems.textsecuregcm.mappers.DeviceLimitExceededExceptionMapper;
|
import org.whispersystems.textsecuregcm.mappers.DeviceLimitExceededExceptionMapper;
|
||||||
import org.whispersystems.textsecuregcm.mappers.IOExceptionMapper;
|
import org.whispersystems.textsecuregcm.mappers.IOExceptionMapper;
|
||||||
import org.whispersystems.textsecuregcm.mappers.ImpossiblePhoneNumberExceptionMapper;
|
import org.whispersystems.textsecuregcm.mappers.ImpossiblePhoneNumberExceptionMapper;
|
||||||
|
@ -743,6 +744,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
|
||||||
|
|
||||||
List.of(
|
List.of(
|
||||||
new LoggingUnhandledExceptionMapper(),
|
new LoggingUnhandledExceptionMapper(),
|
||||||
|
new CompletionExceptionMapper(),
|
||||||
new IOExceptionMapper(),
|
new IOExceptionMapper(),
|
||||||
new RateLimitExceededExceptionMapper(),
|
new RateLimitExceededExceptionMapper(),
|
||||||
new InvalidWebsocketAddressExceptionMapper(),
|
new InvalidWebsocketAddressExceptionMapper(),
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2020 Signal Messenger, LLC
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.whispersystems.textsecuregcm.mappers;
|
||||||
|
|
||||||
|
import java.util.concurrent.CompletionException;
|
||||||
|
import javax.ws.rs.core.Context;
|
||||||
|
import javax.ws.rs.core.Response;
|
||||||
|
import javax.ws.rs.ext.ExceptionMapper;
|
||||||
|
import javax.ws.rs.ext.Provider;
|
||||||
|
import javax.ws.rs.ext.Providers;
|
||||||
|
|
||||||
|
@Provider
|
||||||
|
public class CompletionExceptionMapper implements ExceptionMapper<CompletionException> {
|
||||||
|
|
||||||
|
@Context
|
||||||
|
private Providers providers;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Response toResponse(final CompletionException exception) {
|
||||||
|
final Throwable cause = exception.getCause();
|
||||||
|
|
||||||
|
if (cause != null) {
|
||||||
|
final Class type = cause.getClass();
|
||||||
|
return providers.getExceptionMapper(type).toResponse(cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Response.serverError().build();
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue