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

Add javax.validation.Validator to SpamFilter#configure

This commit is contained in:
Chris Eager 2024-04-26 18:01:51 -05:00 committed by Chris Eager
parent 4a28ab6317
commit 223b2fc263
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@ -873,7 +873,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
.map(ServiceLoader.Provider::get)
.flatMap(filter -> {
try {
filter.configure(config.getSpamFilterConfiguration().getEnvironment());
filter.configure(config.getSpamFilterConfiguration().getEnvironment(), environment.getValidator());
return Stream.of(filter);
} catch (Exception e) {
log.warn("Failed to register spam filter: {}", filter.getClass().getName(), e);

11
service/src/main/java/org/whispersystems/textsecuregcm/spam/SpamFilter.java
View File

@ -5,16 +5,17 @@
package org.whispersystems.textsecuregcm.spam;
import io.dropwizard.configuration.ConfigurationValidationException;
import io.dropwizard.lifecycle.Managed;
import org.whispersystems.textsecuregcm.storage.ReportedMessageListener;
import javax.ws.rs.container.ContainerRequestFilter;
import java.io.IOException;
import javax.validation.Validator;
import org.whispersystems.textsecuregcm.storage.ReportedMessageListener;
/**
* A spam filter provides various checkers and listeners to detect and respond to patterns of spam and fraud.
* <p/>
* Spam filters are managed components that are generally loaded dynamically via a {@link java.util.ServiceLoader}.
* Their {@link #configure(String)} method will be called prior to be adding to the server's pool of {@link Managed}
* Their {@link #configure(String, Validator)} method will be called prior to be adding to the server's pool of {@link Managed}
* objects.
* <p/>
*/
@ -26,9 +27,11 @@ public interface SpamFilter extends Managed {
*
* @param environmentName the name of the environment in which this filter is running (e.g. "staging" or
* "production")
* @param validator may be used to validate configuration
* @throws IOException if the filter could not read its configuration source for any reason
* @throws ConfigurationValidationException if the configuration failed validation
*/
void configure(String environmentName) throws IOException;
void configure(String environmentName, Validator validator) throws IOException, ConfigurationValidationException;
/**
* Builds a spam report token provider. This will generate tokens used by the spam reporting system.