Add configuration for regional SMS verification text

service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java

@@ -5,6 +5,8 @@
 package org.whispersystems.textsecuregcm.configuration;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.util.Collections;
+import java.util.Map;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -37,20 +39,11 @@ public class TwilioConfiguration {
   @Valid
   private RetryConfiguration retry = new RetryConfiguration();
 
-  @NotEmpty
-  private String iosVerificationText;
+  @Valid
+  private TwilioVerificationTextConfiguration defaultClientVerificationTexts;
 
-  @NotEmpty
-  private String androidNgVerificationText;
-
-  @NotEmpty
-  private String android202001VerificationText;
-
-  @NotEmpty
-  private String android202103VerificationText;
-
-  @NotEmpty
-  private String genericVerificationText;
+  @Valid
+  private Map<String,TwilioVerificationTextConfiguration> regionalClientVerificationTexts = Collections.emptyMap();
 
   @NotEmpty
   private String androidAppHash;
@@ -129,49 +122,23 @@ public class TwilioConfiguration {
     this.retry = retry;
   }
 
-  public String getIosVerificationText() {
-    return iosVerificationText;
+  public TwilioVerificationTextConfiguration getDefaultClientVerificationTexts() {
+    return defaultClientVerificationTexts;
   }
 
   @VisibleForTesting
-  public void setIosVerificationText(String iosVerificationText) {
-    this.iosVerificationText = iosVerificationText;
+  public void setDefaultClientVerificationTexts(TwilioVerificationTextConfiguration defaultClientVerificationTexts) {
+    this.defaultClientVerificationTexts = defaultClientVerificationTexts;
   }
 
-  public String getAndroidNgVerificationText() {
-    return androidNgVerificationText;
+
+  public Map<String,TwilioVerificationTextConfiguration> getRegionalClientVerificationTexts() {
+    return regionalClientVerificationTexts;
   }
 
   @VisibleForTesting
-  public void setAndroidNgVerificationText(String androidNgVerificationText) {
-    this.androidNgVerificationText = androidNgVerificationText;
-  }
-
-  public String getAndroid202001VerificationText() {
-    return android202001VerificationText;
-  }
-
-  @VisibleForTesting
-  public void setAndroid202001VerificationText(String android202001VerificationText) {
-    this.android202001VerificationText = android202001VerificationText;
-  }
-
-  public String getAndroid202103VerificationText() {
-    return android202103VerificationText;
-  }
-
-  @VisibleForTesting
-  public void setAndroid202103VerificationText(String android202103VerificationText) {
-    this.android202103VerificationText = android202103VerificationText;
-  }
-
-  public String getGenericVerificationText() {
-    return genericVerificationText;
-  }
-
-  @VisibleForTesting
-  public void setGenericVerificationText(String genericVerificationText) {
-    this.genericVerificationText = genericVerificationText;
+  public void setRegionalClientVerificationTexts(final Map<String,TwilioVerificationTextConfiguration> regionalClientVerificationTexts) {
+    this.regionalClientVerificationTexts = regionalClientVerificationTexts;
   }
 
   public String getAndroidAppHash() {

service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioVerificationTextConfiguration.java

@@ -0,0 +1,70 @@
+package org.whispersystems.textsecuregcm.configuration;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import javax.validation.constraints.NotEmpty;
+
+public class TwilioVerificationTextConfiguration {
+
+  @JsonProperty
+  @NotEmpty
+  private String ios;
+
+  @JsonProperty
+  @NotEmpty
+  private String androidNg;
+
+  @JsonProperty
+  @NotEmpty
+  private String android202001;
+
+  @JsonProperty
+  @NotEmpty
+  private String android202103;
+
+  @JsonProperty
+  @NotEmpty
+  private String generic;
+
+  public String getIosText() {
+    return ios;
+  }
+
+  public void setIosText(String ios) {
+    this.ios = ios;
+  }
+
+  public String getAndroidNgText() {
+    return androidNg;
+  }
+
+  public void setAndroidNgText(final String androidNg) {
+    this.androidNg = androidNg;
+  }
+
+  public String getAndroid202001Text() {
+    return android202001;
+  }
+
+  public void setAndroid202001Text(final String android202001) {
+    this.android202001 = android202001;
+  }
+
+  public String getAndroid202103Text() {
+    return android202103;
+  }
+
+  public void setAndroid202103Text(final String android202103) {
+    this.android202103 = android202103;
+  }
+
+  public String getGenericText() {
+    return generic;
+  }
+
+  public void setGenericText(final String generic) {
+    this.generic = generic;
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java

@@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.configuration.TwilioConfiguration;
+import org.whispersystems.textsecuregcm.configuration.TwilioVerificationTextConfiguration;
 import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient;
 import org.whispersystems.textsecuregcm.http.FormDataBodyPublisher;
 import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
@@ -64,11 +65,9 @@ public class TwilioSmsSender {
   private final String            nanpaMessagingServiceSid;
   private final String            localDomain;
   private final Random            random;
-  private final String            androidNgVerificationText;
-  private final String            android202001VerificationText;
-  private final String            android202103VerificationText;
-  private final String            iosVerificationText;
-  private final String            genericVerificationText;
+
+  private final TwilioVerificationTextConfiguration defaultClientVerificationTexts;
+  private final Map<String,TwilioVerificationTextConfiguration> regionalClientVerificationTexts;
 
   private final FaultTolerantHttpClient httpClient;
   private final URI                     smsUri;
@@ -88,11 +87,6 @@ public class TwilioSmsSender {
     this.messagingServiceSid           = twilioConfiguration.getMessagingServiceSid();
     this.nanpaMessagingServiceSid      = twilioConfiguration.getNanpaMessagingServiceSid();
     this.random                        = new Random(System.currentTimeMillis());
-    this.androidNgVerificationText     = twilioConfiguration.getAndroidNgVerificationText();
-    this.android202001VerificationText = twilioConfiguration.getAndroid202001VerificationText();
-    this.android202103VerificationText = twilioConfiguration.getAndroid202103VerificationText();
-    this.iosVerificationText           = twilioConfiguration.getIosVerificationText();
-    this.genericVerificationText       = twilioConfiguration.getGenericVerificationText();
     this.smsUri                        = URI.create(baseUri + "/2010-04-01/Accounts/" + accountId + "/Messages.json");
     this.voxUri                        = URI.create(baseUri + "/2010-04-01/Accounts/" + accountId + "/Calls.json"   );
     this.httpClient                    = FaultTolerantHttpClient.newBuilder()
@@ -105,6 +99,9 @@ public class TwilioSmsSender {
                                                                 .withName("twilio")
                                                                 .build();
 
+    this.defaultClientVerificationTexts = twilioConfiguration.getDefaultClientVerificationTexts();
+    this.regionalClientVerificationTexts = twilioConfiguration.getRegionalClientVerificationTexts();
+
     this.dynamicConfigurationManager   = dynamicConfigurationManager;
     this.twilioVerifySender = new TwilioVerifySender(baseVerifyUri, httpClient, twilioConfiguration);
   }
@@ -134,19 +131,25 @@ public class TwilioSmsSender {
   }
 
   private String getBodyFormatString(@Nonnull String destination, @Nullable String clientType) {
+
+    final String countryCode = Util.getCountryCode(destination);
+
+    final TwilioVerificationTextConfiguration verificationTexts = regionalClientVerificationTexts
+        .getOrDefault(countryCode, defaultClientVerificationTexts);
+
     final String result;
     if ("ios".equals(clientType)) {
-      result = iosVerificationText;
+      result = verificationTexts.getIosText();
     } else if ("android-ng".equals(clientType)) {
-      result = androidNgVerificationText;
+      result = verificationTexts.getAndroidNgText();
     } else if ("android-2020-01".equals(clientType)) {
-      result = android202001VerificationText;
+      result = verificationTexts.getAndroid202001Text();
     } else if ("android-2021-03".equals(clientType)) {
-      result = android202103VerificationText;
+      result = verificationTexts.getAndroid202103Text();
     } else {
-      result = genericVerificationText;
+      result = verificationTexts.getGenericText();
     }
-    if (destination.startsWith("+86")) {  // is China
+    if ("86".equals(countryCode)) {  // is China
       return result + "\u2008";
       // Twilio recommends adding this character to the end of strings delivered to China because some carriers in
       // China are blocking GSM-7 encoding and this will force Twilio to send using UCS-2 instead.