Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-18 14:55:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the "unrecognized UA" remote deprecation reason

Browse Source
This commit is contained in:
Jon Chambers
2026-03-23 16:43:44 -04:00
committed by Jon Chambers
parent 5d59538924
commit 9dc807a255
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicRemoteDeprecationConfiguration.java
View File

@@ -16,15 +16,13 @@ public record DynamicRemoteDeprecationConfiguration(
@NotNull Map<ClientPlatform, Semver> minimumVersions, @NotNull Map<ClientPlatform, Semver> minimumVersions,
@NotNull Map<ClientPlatform, Semver> versionsPendingDeprecation, @NotNull Map<ClientPlatform, Semver> versionsPendingDeprecation,
@NotNull Map<ClientPlatform, Set<Semver>> blockedVersions, @NotNull Map<ClientPlatform, Set<Semver>> blockedVersions,
@NotNull Map<ClientPlatform, Set<Semver>> versionsPendingBlock, @NotNull Map<ClientPlatform, Set<Semver>> versionsPendingBlock) {
@NotNull Boolean unrecognizedUserAgentAllowed) {
public static DynamicRemoteDeprecationConfiguration DEFAULT = new DynamicRemoteDeprecationConfiguration( public static DynamicRemoteDeprecationConfiguration DEFAULT = new DynamicRemoteDeprecationConfiguration(
Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyMap(), Collections.emptyMap());
true);
public DynamicRemoteDeprecationConfiguration { public DynamicRemoteDeprecationConfiguration {
if (minimumVersions == null) { if (minimumVersions == null) {
@@ -42,9 +40,5 @@ public record DynamicRemoteDeprecationConfiguration(
if (versionsPendingBlock == null) { if (versionsPendingBlock == null) {
versionsPendingBlock = DEFAULT.versionsPendingBlock(); versionsPendingBlock = DEFAULT.versionsPendingBlock();
} }
if (unrecognizedUserAgentAllowed == null) {
unrecognizedUserAgentAllowed = DEFAULT.unrecognizedUserAgentAllowed();
}
} }
} }

7
service/src/main/java/org/whispersystems/textsecuregcm/filters/RemoteDeprecationFilter.java
View File

@@ -52,7 +52,6 @@ public class RemoteDeprecationFilter implements Filter, ServerInterceptor {
private static final String REASON_TAG_NAME = "reason"; private static final String REASON_TAG_NAME = "reason";
private static final String EXPIRED_CLIENT_REASON = "expired"; private static final String EXPIRED_CLIENT_REASON = "expired";
private static final String BLOCKED_CLIENT_REASON = "blocked"; private static final String BLOCKED_CLIENT_REASON = "blocked";
private static final String UNRECOGNIZED_UA_REASON = "unrecognized_user_agent";
public RemoteDeprecationFilter(final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager) { public RemoteDeprecationFilter(final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager) {
this.dynamicConfigurationManager = dynamicConfigurationManager; this.dynamicConfigurationManager = dynamicConfigurationManager;
@@ -110,11 +109,7 @@ public class RemoteDeprecationFilter implements Filter, ServerInterceptor {
boolean shouldBlock = false; boolean shouldBlock = false;
if (userAgent == null) { if (userAgent == null) {
if (configuration.unrecognizedUserAgentAllowed()) { return false;
return false;
}
recordDeprecation(null, UNRECOGNIZED_UA_REASON);
return true;
} }
if (blockedVersionsByPlatform.containsKey(userAgent.platform())) { if (blockedVersionsByPlatform.containsKey(userAgent.platform())) {

3
service/src/test/java/org/whispersystems/textsecuregcm/filters/RemoteDeprecationFilterTest.java
View File

@@ -111,8 +111,7 @@ class RemoteDeprecationFilterTest {
minimumVersionsByPlatform, minimumVersionsByPlatform,
versionsPendingDeprecationByPlatform, versionsPendingDeprecationByPlatform,
blockedVersionsByPlatform, blockedVersionsByPlatform,
versionsPendingBlockByPlatform, versionsPendingBlockByPlatform);
true);
} }
@ParameterizedTest @ParameterizedTest