Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 02:08:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Dropwizard 4

Browse Source
This commit is contained in:
Chris Eager
2024-11-11 16:32:24 -06:00
committed by GitHub
parent 09fd5e8819
commit dd4bc23e4f
279 changed files with 1039 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
websocket-resources/src/main/java/org/whispersystems/websocket/WebSocketResourceProvider.java
View File

@@ -7,6 +7,8 @@ package org.whispersystems.websocket;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.net.HttpHeaders;
import com.google.protobuf.UninitializedMessageException;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -22,8 +24,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import org.eclipse.jetty.websocket.api.RemoteEndpoint;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.WebSocketListener;

2
websocket-resources/src/main/java/org/whispersystems/websocket/WebSocketResourceProviderFactory.java
View File

@@ -7,11 +7,11 @@ package org.whispersystems.websocket;
import static java.util.Optional.ofNullable;
import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider;
import jakarta.ws.rs.InternalServerErrorException;
import java.io.IOException;
import java.security.Principal;
import java.util.Map;
import java.util.Optional;
import javax.ws.rs.InternalServerErrorException;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;

5
websocket-resources/src/main/java/org/whispersystems/websocket/WebSocketSecurityContext.java
View File

@@ -4,12 +4,11 @@
*/
package org.whispersystems.websocket;
import jakarta.ws.rs.core.SecurityContext;
import java.security.Principal;
import org.whispersystems.websocket.session.ContextPrincipal;
import org.whispersystems.websocket.session.WebSocketSessionContext;
import javax.ws.rs.core.SecurityContext;
import java.security.Principal;
public class WebSocketSecurityContext implements SecurityContext {
private final ContextPrincipal principal;

6
websocket-resources/src/main/java/org/whispersystems/websocket/auth/WebsocketAuthValueFactoryProvider.java
View File

@@ -5,14 +5,14 @@
package org.whispersystems.websocket.auth;
import io.dropwizard.auth.Auth;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.ws.rs.WebApplicationException;
import java.lang.reflect.ParameterizedType;
import java.security.Principal;
import java.util.Optional;
import java.util.function.Function;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.ws.rs.WebApplicationException;
import org.glassfish.jersey.internal.inject.AbstractBinder;
import org.glassfish.jersey.server.ContainerRequest;
import org.glassfish.jersey.server.internal.inject.AbstractValueParamProvider;

8
websocket-resources/src/main/java/org/whispersystems/websocket/configuration/WebSocketConfiguration.java
View File

@@ -5,10 +5,10 @@
package org.whispersystems.websocket.configuration;
import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import org.whispersystems.websocket.logging.WebsocketRequestLoggerFactory;
public class WebSocketConfiguration {

5
websocket-resources/src/main/java/org/whispersystems/websocket/logging/WebsocketEvent.java
View File

@@ -5,12 +5,11 @@
package org.whispersystems.websocket.logging;
import ch.qos.logback.core.spi.DeferredProcessingAware;
import jakarta.ws.rs.core.MultivaluedMap;
import java.util.List;
import org.glassfish.jersey.server.ContainerRequest;
import org.glassfish.jersey.server.ContainerResponse;
import javax.ws.rs.core.MultivaluedMap;
import java.util.List;
public class WebsocketEvent implements DeferredProcessingAware {
public static final int SENTINEL = -1;

16
websocket-resources/src/main/java/org/whispersystems/websocket/logging/WebsocketRequestLoggerFactory.java
View File

@@ -4,23 +4,21 @@
*/
package org.whispersystems.websocket.logging;
import com.google.common.annotations.VisibleForTesting;
import org.slf4j.LoggerFactory;
import org.whispersystems.websocket.logging.layout.WebsocketEventLayoutFactory;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.Collections;
import java.util.List;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
import com.google.common.annotations.VisibleForTesting;
import io.dropwizard.logging.common.AppenderFactory;
import io.dropwizard.logging.common.ConsoleAppenderFactory;
import io.dropwizard.logging.common.async.AsyncAppenderFactory;
import io.dropwizard.logging.common.filter.LevelFilterFactory;
import io.dropwizard.logging.common.filter.NullLevelFilterFactory;
import io.dropwizard.logging.common.layout.LayoutFactory;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.Collections;
import java.util.List;
import org.slf4j.LoggerFactory;
import org.whispersystems.websocket.logging.layout.WebsocketEventLayoutFactory;
public class WebsocketRequestLoggerFactory {

3
websocket-resources/src/main/java/org/whispersystems/websocket/session/WebSocketSessionContainerRequestValueFactory.java
View File

@@ -4,11 +4,10 @@
*/
package org.whispersystems.websocket.session;
import jakarta.ws.rs.core.SecurityContext;
import org.glassfish.jersey.server.ContainerRequest;
import org.whispersystems.websocket.WebSocketSecurityContext;
import javax.ws.rs.core.SecurityContext;
public class WebSocketSessionContainerRequestValueFactory {
private final ContainerRequest request;

9
websocket-resources/src/main/java/org/whispersystems/websocket/session/WebSocketSessionContextValueFactoryProvider.java
View File

@@ -4,6 +4,10 @@
*/
package org.whispersystems.websocket.session;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.function.Function;
import javax.annotation.Nullable;
import org.glassfish.jersey.internal.inject.AbstractBinder;
import org.glassfish.jersey.server.ContainerRequest;
import org.glassfish.jersey.server.internal.inject.AbstractValueParamProvider;
@@ -11,11 +15,6 @@ import org.glassfish.jersey.server.internal.inject.MultivaluedParameterExtractor
import org.glassfish.jersey.server.model.Parameter;
import org.glassfish.jersey.server.spi.internal.ValueParamProvider;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.function.Function;
@Singleton
public class WebSocketSessionContextValueFactoryProvider extends AbstractValueParamProvider {

7
websocket-resources/src/main/java/org/whispersystems/websocket/setup/WebSocketEnvironment.java
View File

@@ -5,8 +5,10 @@
package org.whispersystems.websocket.setup;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.dropwizard.jersey.DropwizardResourceConfig;
import io.dropwizard.core.setup.Environment;
import io.dropwizard.jersey.DropwizardResourceConfig;
import jakarta.validation.Validator;
import java.security.Principal;
import java.time.Duration;
import org.glassfish.jersey.server.ResourceConfig;
import org.whispersystems.websocket.auth.WebSocketAuthenticator;
@@ -15,9 +17,6 @@ import org.whispersystems.websocket.logging.WebsocketRequestLog;
import org.whispersystems.websocket.messages.WebSocketMessageFactory;
import org.whispersystems.websocket.messages.protobuf.ProtobufWebSocketMessageFactory;
import javax.validation.Validator;
import java.security.Principal;
public class WebSocketEnvironment<T extends Principal> {
private final ResourceConfig jerseyConfig;