Use redis for abusive hosts autoblock

Also delete postgres dependencies that we no longer need

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java

@@ -143,11 +143,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private RedisClusterConfiguration clientPresenceCluster;
 
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DatabaseConfiguration abuseDatabase;
-
   @Valid
   @NotNull
   @JsonProperty
@@ -337,10 +332,6 @@ public class WhisperServerConfiguration extends Configuration {
     return rateLimitersCluster;
   }
 
-  public DatabaseConfiguration getAbuseDatabaseConfiguration() {
-    return abuseDatabase;
-  }
-
   public RateLimitsConfiguration getLimitsConfiguration() {
     return limits;
   }

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -114,7 +114,6 @@ import org.whispersystems.textsecuregcm.limits.PushChallengeManager;
 import org.whispersystems.textsecuregcm.limits.RateLimitChallengeManager;
 import org.whispersystems.textsecuregcm.limits.RateLimitChallengeOptionManager;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
-import org.whispersystems.textsecuregcm.liquibase.NameableMigrationsBundle;
 import org.whispersystems.textsecuregcm.mappers.CompletionExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.DeviceLimitExceededExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.IOExceptionMapper;
@@ -244,13 +243,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     bootstrap.addCommand(new SetUserDiscoverabilityCommand());
     bootstrap.addCommand(new ReserveUsernameCommand());
     bootstrap.addCommand(new AssignUsernameCommand());
-
-    bootstrap.addBundle(new NameableMigrationsBundle<WhisperServerConfiguration>("abusedb", "abusedb.xml") {
-      @Override
-      public PooledDataSourceFactory getDataSourceFactory(WhisperServerConfiguration configuration) {
-        return configuration.getAbuseDatabaseConfiguration();
-      }
-    });
   }
 
   @Override
@@ -308,12 +300,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     ResourceBundleLevelTranslator resourceBundleLevelTranslator = new ResourceBundleLevelTranslator(
         headerControlledResourceBundleLookup);
 
-    JdbiFactory jdbiFactory = new JdbiFactory(DefaultNameStrategy.CHECK_EMPTY);
-    Jdbi abuseJdbi = jdbiFactory.build(environment, config.getAbuseDatabaseConfiguration(), "abusedb");
-
-    FaultTolerantDatabase abuseDatabase = new FaultTolerantDatabase("abuse_database", abuseJdbi,
-        config.getAbuseDatabaseConfiguration().getCircuitBreakerConfiguration());
-
     DynamoDbAsyncClient dynamoDbAsyncClient = DynamoDbFromConfig.asyncClient(
         config.getDynamoDbClientConfiguration(),
         software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
@@ -359,7 +345,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient,
         config.getDynamoDbTables().getMessages().getTableName(),
         config.getDynamoDbTables().getMessages().getExpiration());
-    AbusiveHostRules abusiveHostRules = new AbusiveHostRules(abuseDatabase);
     RemoteConfigs remoteConfigs = new RemoteConfigs(dynamoDbClient,
         config.getDynamoDbTables().getRemoteConfig().getTableName());
     PushChallengeDynamoDb pushChallengeDynamoDb = new PushChallengeDynamoDb(dynamoDbClient,
@@ -438,6 +423,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     ExternalServiceCredentialGenerator paymentsCredentialsGenerator = new ExternalServiceCredentialGenerator(
         config.getPaymentsServiceConfiguration().getUserAuthenticationTokenSharedSecret(), true);
 
+    AbusiveHostRules           abusiveHostRules           = new AbusiveHostRules(rateLimitersCluster, dynamicConfigurationManager);
     SecureBackupClient         secureBackupClient         = new SecureBackupClient(backupCredentialsGenerator, backupServiceExecutor, config.getSecureBackupServiceConfiguration());
     SecureStorageClient        secureStorageClient        = new SecureStorageClient(storageCredentialsGenerator, storageServiceExecutor, config.getSecureStorageServiceConfiguration());
     ClientPresenceManager      clientPresenceManager      = new ClientPresenceManager(clientPresenceCluster, recurringJobExecutor, keyspaceNotificationDispatchExecutor);

service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicAbusiveHostRulesConfiguration.java

@@ -0,0 +1,14 @@
+package org.whispersystems.textsecuregcm.configuration.dynamic;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.time.Duration;
+
+public class DynamicAbusiveHostRulesConfiguration {
+
+  @JsonProperty
+  private Duration expirationTime = Duration.ofDays(1);
+
+  public Duration getExpirationTime() {
+    return expirationTime;
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java

@@ -60,6 +60,10 @@ public class DynamicConfiguration {
   @Valid
   private DynamicTurnConfiguration turn = new DynamicTurnConfiguration();
 
+  @JsonProperty
+  @Valid
+  DynamicAbusiveHostRulesConfiguration abusiveHostRules = new DynamicAbusiveHostRulesConfiguration();
+
   public Optional<DynamicExperimentEnrollmentConfiguration> getExperimentEnrollmentConfiguration(
       final String experimentName) {
     return Optional.ofNullable(experiments.get(experimentName));
@@ -117,4 +121,7 @@ public class DynamicConfiguration {
     return turn;
   }
 
+  public DynamicAbusiveHostRulesConfiguration getAbusiveHostRules() {
+    return abusiveHostRules;
+  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java

@@ -82,7 +82,6 @@ import org.whispersystems.textsecuregcm.push.GcmMessage;
 import org.whispersystems.textsecuregcm.recaptcha.RecaptchaClient;
 import org.whispersystems.textsecuregcm.sms.SmsSender;
 import org.whispersystems.textsecuregcm.sms.TwilioVerifyExperimentEnrollmentManager;
-import org.whispersystems.textsecuregcm.storage.AbusiveHostRule;
 import org.whispersystems.textsecuregcm.storage.AbusiveHostRules;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
@@ -108,9 +107,7 @@ public class AccountController {
   private final Logger         logger                   = LoggerFactory.getLogger(AccountController.class);
   private final MetricRegistry metricRegistry           = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
   private final Meter          blockedHostMeter         = metricRegistry.meter(name(AccountController.class, "blocked_host"             ));
-  private final Meter          blockedPrefixMeter       = metricRegistry.meter(name(AccountController.class, "blocked_prefix"           ));
   private final Meter          countryFilterApplicable  = metricRegistry.meter(name(AccountController.class, "country_filter_applicable"));
-  private final Meter          filteredHostMeter        = metricRegistry.meter(name(AccountController.class, "filtered_host"            ));
   private final Meter          countryFilteredHostMeter = metricRegistry.meter(name(AccountController.class, "country_limited_host"     ));
   private final Meter          rateLimitedHostMeter     = metricRegistry.meter(name(AccountController.class, "rate_limited_host"        ));
   private final Meter          rateLimitedPrefixMeter   = metricRegistry.meter(name(AccountController.class, "rate_limited_prefix"      ));
@@ -246,7 +243,7 @@ public class AccountController {
 
       if (requirement.isAutoBlock() && shouldAutoBlock(sourceHost)) {
         logger.info("Auto-block: {}", sourceHost);
-        abusiveHostRules.setBlockedHost(sourceHost, "Auto-Block");
+        abusiveHostRules.setBlockedHost(sourceHost);
       }
 
       return Response.status(402).build();
@@ -780,7 +777,10 @@ public class AccountController {
     DynamicCaptchaConfiguration captchaConfig = dynamicConfigurationManager.getConfiguration()
         .getCaptchaConfiguration();
     boolean countryFiltered = captchaConfig.getSignupCountryCodes().contains(countryCode);
-    if (shouldBlock(transport, forwardedFor, sourceHost, number)) {
+
+    if (abusiveHostRules.isBlocked(sourceHost)) {
+      blockedHostMeter.mark();
+      logger.info("Blocked host: {}, {}, {} ({})", transport, number, sourceHost, forwardedFor);
       if (countryFiltered) {
         // this host was caught in the abusiveHostRules filter, but
         // would be caught by country filter as well
@@ -813,33 +813,6 @@ public class AccountController {
     return new CaptchaRequirement(false, false);
   }
 
-  private boolean shouldBlock(final String transport, final String forwardedFor, final String sourceHost, final String number) {
-    List<AbusiveHostRule> abuseRules = abusiveHostRules.getAbusiveHostRulesFor(sourceHost);
-
-    for (AbusiveHostRule abuseRule : abuseRules) {
-      if (abuseRule.blocked()) {
-        logger.info("Blocked host: {}, {}, {} ({}) matched rule: {}", transport, number, sourceHost, forwardedFor, abuseRule.host());
-
-        // did we match based on an ip block or an exact match
-        if (abuseRule.cidrPrefix().filter(i -> i < 32).isPresent()) {
-          blockedPrefixMeter.mark();
-        } else {
-          blockedHostMeter.mark();
-        }
-        return true;
-      }
-
-      if (!abuseRule.regions().isEmpty()) {
-        if (abuseRule.regions().stream().noneMatch(number::startsWith)) {
-          logger.info("Restricted host: {}, {}, {} ({}) matched rule: {}/{}", transport, number, sourceHost, forwardedFor, abuseRule.host(), abuseRule.regions());
-          filteredHostMeter.mark();
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
   @Timed
   @DELETE
   @Path("/me")

service/src/main/java/org/whispersystems/textsecuregcm/liquibase/AbstractLiquibaseCommand.java

@@ -1,68 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.liquibase;
-
-import com.codahale.metrics.MetricRegistry;
-import net.sourceforge.argparse4j.inf.Namespace;
-
-import java.sql.SQLException;
-
-import io.dropwizard.Configuration;
-import io.dropwizard.cli.ConfiguredCommand;
-import io.dropwizard.db.DatabaseConfiguration;
-import io.dropwizard.db.ManagedDataSource;
-import io.dropwizard.db.PooledDataSourceFactory;
-import io.dropwizard.setup.Bootstrap;
-import liquibase.Liquibase;
-import liquibase.exception.LiquibaseException;
-import liquibase.exception.ValidationFailedException;
-
-public abstract class AbstractLiquibaseCommand<T extends Configuration> extends ConfiguredCommand<T> {
-
-  private final DatabaseConfiguration<T> strategy;
-  private final Class<T>                 configurationClass;
-  private final String                   migrations;
-
-  protected AbstractLiquibaseCommand(String name,
-                                     String description,
-                                     String migrations,
-                                     DatabaseConfiguration<T> strategy,
-                                     Class<T> configurationClass) {
-    super(name, description);
-    this.migrations         = migrations;
-    this.strategy           = strategy;
-    this.configurationClass = configurationClass;
-  }
-
-  @Override
-  protected Class<T> getConfigurationClass() {
-    return configurationClass;
-  }
-
-  @Override
-  @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  protected void run(Bootstrap<T> bootstrap, Namespace namespace, T configuration) throws Exception {
-    final PooledDataSourceFactory dbConfig = strategy.getDataSourceFactory(configuration);
-    dbConfig.asSingleConnectionPool();
-
-    try (final CloseableLiquibase liquibase = openLiquibase(dbConfig, namespace)) {
-      run(namespace, liquibase);
-    } catch (ValidationFailedException e) {
-      e.printDescriptiveError(System.err);
-      throw e;
-    }
-  }
-
-  private CloseableLiquibase openLiquibase(final PooledDataSourceFactory dataSourceFactory, final Namespace namespace)
-      throws ClassNotFoundException, SQLException, LiquibaseException
-  {
-    final ManagedDataSource dataSource = dataSourceFactory.build(new MetricRegistry(), "liquibase");
-    return new CloseableLiquibase(dataSource, migrations);
-  }
-
-  protected abstract void run(Namespace namespace, Liquibase liquibase) throws Exception;
-
-}

service/src/main/java/org/whispersystems/textsecuregcm/liquibase/CloseableLiquibase.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.liquibase;
-
-import java.sql.SQLException;
-
-import io.dropwizard.db.ManagedDataSource;
-import liquibase.Liquibase;
-import liquibase.database.jvm.JdbcConnection;
-import liquibase.exception.LiquibaseException;
-import liquibase.resource.ClassLoaderResourceAccessor;
-
-
-public class CloseableLiquibase extends Liquibase implements AutoCloseable {
-  private final ManagedDataSource dataSource;
-
-  public CloseableLiquibase(ManagedDataSource dataSource, String migrations)
-      throws LiquibaseException, ClassNotFoundException, SQLException
-  {
-    super(migrations,
-          new ClassLoaderResourceAccessor(),
-          new JdbcConnection(dataSource.getConnection()));
-    this.dataSource = dataSource;
-  }
-
-  @Override
-  public void close() throws Exception {
-    dataSource.stop();
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/liquibase/DbMigrateCommand.java

@@ -1,77 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.liquibase;
-
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-
-import java.io.OutputStreamWriter;
-import java.util.List;
-
-import io.dropwizard.Configuration;
-import io.dropwizard.db.DatabaseConfiguration;
-import liquibase.Liquibase;
-
-public class DbMigrateCommand<T extends Configuration> extends AbstractLiquibaseCommand<T> {
-
-  public DbMigrateCommand(String migration, DatabaseConfiguration<T> strategy, Class<T> configurationClass) {
-    super("migrate", "Apply all pending change sets.", migration, strategy, configurationClass);
-  }
-
-  @Override
-  public void configure(Subparser subparser) {
-    super.configure(subparser);
-
-    subparser.addArgument("-n", "--dry-run")
-             .action(Arguments.storeTrue())
-             .dest("dry-run")
-             .setDefault(Boolean.FALSE)
-             .help("output the DDL to stdout, don't run it");
-
-    subparser.addArgument("-c", "--count")
-             .type(Integer.class)
-             .dest("count")
-             .help("only apply the next N change sets");
-
-    subparser.addArgument("-i", "--include")
-             .action(Arguments.append())
-             .dest("contexts")
-             .help("include change sets from the given context");
-  }
-
-  @Override
-  @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  public void run(Namespace namespace, Liquibase liquibase) throws Exception {
-    final String context = getContext(namespace);
-    final Integer count = namespace.getInt("count");
-    final Boolean dryRun = namespace.getBoolean("dry-run");
-    if (count != null) {
-      if (dryRun) {
-        liquibase.update(count, context, new OutputStreamWriter(System.out, Charsets.UTF_8));
-      } else {
-        liquibase.update(count, context);
-      }
-    } else {
-      if (dryRun) {
-        liquibase.update(context, new OutputStreamWriter(System.out, Charsets.UTF_8));
-      } else {
-        liquibase.update(context);
-      }
-    }
-  }
-
-  private String getContext(Namespace namespace) {
-    final List<Object> contexts = namespace.getList("contexts");
-    if (contexts == null) {
-      return "";
-    }
-    return Joiner.on(',').join(contexts);
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/liquibase/DbStatusCommand.java

@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.liquibase;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-
-import java.io.OutputStreamWriter;
-import java.util.List;
-
-import io.dropwizard.Configuration;
-import io.dropwizard.db.DatabaseConfiguration;
-import liquibase.Liquibase;
-
-public class DbStatusCommand <T extends Configuration> extends AbstractLiquibaseCommand<T> {
-
-  public DbStatusCommand(String migrations, DatabaseConfiguration<T> strategy, Class<T> configurationClass) {
-    super("status", "Check for pending change sets.", migrations, strategy, configurationClass);
-  }
-
-  @Override
-  public void configure(Subparser subparser) {
-    super.configure(subparser);
-
-    subparser.addArgument("-v", "--verbose")
-             .action(Arguments.storeTrue())
-             .dest("verbose")
-             .help("Output verbose information");
-    subparser.addArgument("-i", "--include")
-             .action(Arguments.append())
-             .dest("contexts")
-             .help("include change sets from the given context");
-  }
-
-  @Override
-  @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  public void run(Namespace namespace, Liquibase liquibase) throws Exception {
-    liquibase.reportStatus(namespace.getBoolean("verbose"),
-                           getContext(namespace),
-                           new OutputStreamWriter(System.out, Charsets.UTF_8));
-  }
-
-  private String getContext(Namespace namespace) {
-    final List<Object> contexts = namespace.getList("contexts");
-    if (contexts == null) {
-      return "";
-    }
-    return Joiner.on(',').join(contexts);
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/liquibase/NameableDbCommand.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.liquibase;
-
-import com.google.common.collect.Maps;
-import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-
-import java.util.SortedMap;
-
-import io.dropwizard.Configuration;
-import io.dropwizard.db.DatabaseConfiguration;
-import liquibase.Liquibase;
-
-public class NameableDbCommand<T extends Configuration> extends AbstractLiquibaseCommand<T> {
-  private static final String COMMAND_NAME_ATTR = "subcommand";
-  private final SortedMap<String, AbstractLiquibaseCommand<T>> subcommands;
-
-  public NameableDbCommand(String name, String migrations, DatabaseConfiguration<T> strategy, Class<T> configurationClass) {
-    super(name, "Run database migrations tasks", migrations, strategy, configurationClass);
-    this.subcommands = Maps.newTreeMap();
-    addSubcommand(new DbMigrateCommand<>(migrations, strategy, configurationClass));
-    addSubcommand(new DbStatusCommand<>(migrations, strategy, configurationClass));
-  }
-
-  private void addSubcommand(AbstractLiquibaseCommand<T> subcommand) {
-    subcommands.put(subcommand.getName(), subcommand);
-  }
-
-  @Override
-  public void configure(Subparser subparser) {
-    for (AbstractLiquibaseCommand<T> subcommand : subcommands.values()) {
-      final Subparser cmdParser = subparser.addSubparsers()
-                                           .addParser(subcommand.getName())
-                                           .setDefault(COMMAND_NAME_ATTR, subcommand.getName())
-                                           .description(subcommand.getDescription());
-      subcommand.configure(cmdParser);
-    }
-  }
-
-  @Override
-  public void run(Namespace namespace, Liquibase liquibase) throws Exception {
-    final AbstractLiquibaseCommand<T> subcommand = subcommands.get(namespace.getString(COMMAND_NAME_ATTR));
-    subcommand.run(namespace, liquibase);
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/liquibase/NameableMigrationsBundle.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.liquibase;
-
-import io.dropwizard.Bundle;
-import io.dropwizard.Configuration;
-import io.dropwizard.db.DatabaseConfiguration;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import io.dropwizard.util.Generics;
-
-public abstract class NameableMigrationsBundle<T extends Configuration> implements Bundle, DatabaseConfiguration<T> {
-
-  private final String name;
-  private final String migrations;
-
-  public NameableMigrationsBundle(String name, String migrations) {
-    this.name       = name;
-    this.migrations = migrations;
-  }
-
-  public final void initialize(Bootstrap<?> bootstrap) {
-    Class klass = Generics.getTypeParameter(this.getClass(), Configuration.class);
-    bootstrap.addCommand(new NameableDbCommand(name, migrations, this, klass));
-  }
-
-  public final void run(Environment environment) {
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/storage/AbusiveHostRule.java

@@ -1,25 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.storage;
-
-import java.util.List;
-import java.util.Optional;
-
-public record AbusiveHostRule(String host, boolean blocked, List<String> regions) {
-
-  public Optional<Integer> cidrPrefix() {
-    String[] split = host.split("/");
-    if (split.length != 2) {
-      return Optional.empty();
-    }
-    try {
-      return Optional.of(Integer.parseInt(split[1]));
-    } catch (NumberFormatException e) {
-      return Optional.empty();
-    }
-  }
-
-}

service/src/main/java/org/whispersystems/textsecuregcm/storage/AbusiveHostRules.java

@@ -10,52 +10,43 @@ import static com.codahale.metrics.MetricRegistry.name;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.SharedMetricRegistries;
 import com.codahale.metrics.Timer;
-import java.util.List;
-import org.whispersystems.textsecuregcm.storage.mappers.AbusiveHostRuleRowMapper;
+import java.time.Duration;
+import com.google.common.annotations.VisibleForTesting;
+import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
+import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
 import org.whispersystems.textsecuregcm.util.Constants;
 
 public class AbusiveHostRules {
 
-  public static final String ID = "id";
-  public static final String HOST = "host";
-  public static final String BLOCKED = "blocked";
-  public static final String REGIONS = "regions";
-  public static final String NOTES = "notes";
-
+  private static final String KEY_PREFIX = "abusive_hosts::";
   private final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
   private final Timer getTimer = metricRegistry.timer(name(AbusiveHostRules.class, "get"));
   private final Timer insertTimer = metricRegistry.timer(name(AbusiveHostRules.class, "setBlockedHost"));
 
-  private final FaultTolerantDatabase database;
+  private final FaultTolerantRedisCluster redisCluster;
+  private final DynamicConfigurationManager<DynamicConfiguration> configurationManager;
 
-  public AbusiveHostRules(FaultTolerantDatabase database) {
-
-    this.database = database;
-    this.database.getDatabase().registerRowMapper(new AbusiveHostRuleRowMapper());
+  public AbusiveHostRules(FaultTolerantRedisCluster redisCluster, final DynamicConfigurationManager<DynamicConfiguration> configurationManager) {
+    this.redisCluster = redisCluster;
+    this.configurationManager = configurationManager;
   }
 
-  public List<AbusiveHostRule> getAbusiveHostRulesFor(String host) {
-    return database.with(jdbi -> jdbi.withHandle(handle -> {
-      try (Timer.Context timer = getTimer.time()) {
-        return handle.createQuery("SELECT * FROM abusive_host_rules WHERE :host::inet <<= " + HOST)
-            .bind("host", host)
-            .mapTo(AbusiveHostRule.class)
-            .list();
-      }
-    }));
+  public boolean isBlocked(String host) {
+    try (Timer.Context timer = getTimer.time()) {
+      return this.redisCluster.withCluster(connection -> connection.sync().exists(prefix(host))) > 0;
+    }
   }
 
-  public void setBlockedHost(String host, String notes) {
-    database.use(jdbi -> jdbi.useHandle(handle -> {
-      try (Timer.Context timer = insertTimer.time()) {
-        handle.createUpdate(
-                "INSERT INTO abusive_host_rules(host, blocked, notes) VALUES(:host::inet, :blocked, :notes) ON CONFLICT DO NOTHING")
-            .bind("host", host)
-            .bind("blocked", 1)
-            .bind("notes", notes)
-            .execute();
-      }
-    }));
+  public void setBlockedHost(String host) {
+    Duration expireTime = configurationManager.getConfiguration().getAbusiveHostRules().getExpirationTime();
+    try (Timer.Context timer = insertTimer.time()) {
+      this.redisCluster.useCluster(connection -> connection.sync().setex(prefix(host), expireTime.toSeconds(), "1"));
+    }
+  }
+
+  @VisibleForTesting
+  public static String prefix(String keyName) {
+    return KEY_PREFIX + keyName;
   }
 
 }

service/src/main/java/org/whispersystems/textsecuregcm/storage/mappers/AbusiveHostRuleRowMapper.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.storage.mappers;
-
-import org.jdbi.v3.core.mapper.RowMapper;
-import org.jdbi.v3.core.statement.StatementContext;
-import org.whispersystems.textsecuregcm.storage.AbusiveHostRule;
-import org.whispersystems.textsecuregcm.storage.AbusiveHostRules;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-
-public class AbusiveHostRuleRowMapper implements RowMapper<AbusiveHostRule> {
-  @Override
-  public AbusiveHostRule map(ResultSet resultSet, StatementContext ctx) throws SQLException {
-    String regionsData = resultSet.getString(AbusiveHostRules.REGIONS);
-
-    List<String> regions;
-
-    if (regionsData == null) regions = new LinkedList<>();
-    else                     regions = Arrays.asList(regionsData.split(","));
-
-
-    return new AbusiveHostRule(resultSet.getString(AbusiveHostRules.HOST), resultSet.getInt(AbusiveHostRules.BLOCKED) == 1, regions);
-  }
-}