MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `401` on `/v1/keepalive`

This commit is contained in:
Chris Eager 2023-05-09 14:19:23 -05:00 committed by Chris Eager
parent 1057bd7e1f
commit 3214852a41
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeepAliveController.java
View File

@ -12,6 +12,7 @@ import io.dropwizard.auth.Auth;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.Tags;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.Optional;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
@ -32,7 +33,8 @@ public class KeepAliveController {
private final ClientPresenceManager clientPresenceManager; private final ClientPresenceManager clientPresenceManager;
private static final String NO_LOCAL_SUBSCRIPTION_COUNTER_NAME = name(KeepAliveController.class, "noLocalSubscription"); private static final String NO_LOCAL_SUBSCRIPTION_COUNTER_NAME = name(KeepAliveController.class,
"noLocalSubscription");
public KeepAliveController(final ClientPresenceManager clientPresenceManager) { public KeepAliveController(final ClientPresenceManager clientPresenceManager) {
this.clientPresenceManager = clientPresenceManager; this.clientPresenceManager = clientPresenceManager;
@ -40,9 +42,10 @@ public class KeepAliveController {
@Timed @Timed
@GET @GET
public Response getKeepAlive(@Auth AuthenticatedAccount auth, public Response getKeepAlive(@Auth Optional<AuthenticatedAccount> maybeAuth,
@WebSocketSession WebSocketSessionContext context) { @WebSocketSession WebSocketSessionContext context) {
if (auth != null) {
maybeAuth.ifPresent(auth -> {
if (!clientPresenceManager.isLocallyPresent(auth.getAccount().getUuid(), auth.getAuthenticatedDevice().getId())) { if (!clientPresenceManager.isLocallyPresent(auth.getAccount().getUuid(), auth.getAuthenticatedDevice().getId())) {
logger.debug("***** No local subscription found for {}::{}; age = {}ms, User-Agent = {}", logger.debug("***** No local subscription found for {}::{}; age = {}ms, User-Agent = {}",
auth.getAccount().getUuid(), auth.getAuthenticatedDevice().getId(), auth.getAccount().getUuid(), auth.getAuthenticatedDevice().getId(),
@ -52,10 +55,10 @@ public class KeepAliveController {
context.getClient().close(1000, "OK"); context.getClient().close(1000, "OK");
Metrics.counter(NO_LOCAL_SUBSCRIPTION_COUNTER_NAME, Metrics.counter(NO_LOCAL_SUBSCRIPTION_COUNTER_NAME,
Tags.of(UserAgentTagUtil.getPlatformTag(context.getClient().getUserAgent()))) Tags.of(UserAgentTagUtil.getPlatformTag(context.getClient().getUserAgent())))
.increment(); .increment();
} }
} });
return Response.ok().build(); return Response.ok().build();
} }