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

Support for configured test devices with hardcoded verification.

Browse Source 
Closes #40

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-05-13 14:34:06 -07:00
parent c6810d7460
commit 6363be81e0
5 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
View File

@@ -25,12 +25,18 @@ import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
import org.whispersystems.textsecuregcm.configuration.RedPhoneConfiguration;
import org.whispersystems.textsecuregcm.configuration.RedisConfiguration;
import org.whispersystems.textsecuregcm.configuration.S3Configuration;
import org.whispersystems.textsecuregcm.configuration.TestDeviceConfiguration;
import org.whispersystems.textsecuregcm.configuration.TwilioConfiguration;
import org.whispersystems.textsecuregcm.configuration.WebsocketConfiguration;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import io.dropwizard.Configuration;
import io.dropwizard.client.JerseyClientConfiguration;
import io.dropwizard.db.DataSourceFactory;
@@ -70,6 +76,10 @@ public class WhisperServerConfiguration extends Configuration {
@JsonProperty
private DataSourceFactory messageStore;
@Valid
@NotNull
@JsonProperty
private List<TestDeviceConfiguration> testDevices = new LinkedList<>();
@Valid
@JsonProperty
@@ -157,4 +167,15 @@ public class WhisperServerConfiguration extends Configuration {
public RedPhoneConfiguration getRedphoneConfiguration() {
return redphone;
}
public Map<String, Integer> getTestDevices() {
Map<String, Integer> results = new HashMap<>();
for (TestDeviceConfiguration testDeviceConfiguration : testDevices) {
results.put(testDeviceConfiguration.getNumber(),
testDeviceConfiguration.getCode());
}
return results;
}
}