refactoring of ExternalServiceCredentialGenerator

service/src/main/java/org/whispersystems/textsecuregcm/util/HeaderUtils.java

@@ -1,14 +1,19 @@
 /*
- * Copyright 2022 Signal Messenger, LLC
+ * Copyright 2023 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
 package org.whispersystems.textsecuregcm.util;
 
+import static java.util.Objects.requireNonNull;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
+import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials;
 
 public final class HeaderUtils {
 
@@ -22,6 +27,16 @@ public final class HeaderUtils {
     // utility class
   }
 
+  public static String basicAuthHeader(final ExternalServiceCredentials credentials) {
+    return basicAuthHeader(credentials.username(), credentials.password());
+  }
+
+  public static String basicAuthHeader(final String username, final String password) {
+    requireNonNull(username);
+    requireNonNull(password);
+    return "Basic " + Base64.getEncoder().encodeToString((username + ":" + password).getBytes(StandardCharsets.UTF_8));
+  }
+
   @Nonnull
   public static String getTimestampHeader() {
     return TIMESTAMP_HEADER + ":" + System.currentTimeMillis();

service/src/main/java/org/whispersystems/textsecuregcm/util/HmacUtils.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.util;
+
+import java.nio.charset.StandardCharsets;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.HexFormat;
+
+public final class HmacUtils {
+
+  private static final HexFormat HEX = HexFormat.of();
+
+  private static final String HMAC_SHA_256 = "HmacSHA256";
+
+  private static final ThreadLocal<Mac> THREAD_LOCAL_HMAC_SHA_256 = ThreadLocal.withInitial(() -> {
+    try {
+      return Mac.getInstance(HMAC_SHA_256);
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException(e);
+    }
+  });
+
+  public static byte[] hmac256(final byte[] key, final byte[] input) {
+    try {
+      final Mac mac = THREAD_LOCAL_HMAC_SHA_256.get();
+      mac.init(new SecretKeySpec(key, HMAC_SHA_256));
+      return mac.doFinal(input);
+    } catch (final InvalidKeyException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static byte[] hmac256(final byte[] key, final String input) {
+    return hmac256(key, input.getBytes(StandardCharsets.UTF_8));
+  }
+
+  public static String hmac256ToHexString(final byte[] key, final byte[] input) {
+    return HEX.formatHex(hmac256(key, input));
+  }
+
+  public static String hmac256ToHexString(final byte[] key, final String input) {
+    return hmac256ToHexString(key, input.getBytes(StandardCharsets.UTF_8));
+  }
+
+  public static byte[] hmac256Truncated(final byte[] key, final byte[] input, final int length) {
+    return Util.truncate(hmac256(key, input), length);
+  }
+
+  public static byte[] hmac256Truncated(final byte[] key, final String input, final int length) {
+    return hmac256Truncated(key, input.getBytes(StandardCharsets.UTF_8), length);
+  }
+
+  public static String hmac256TruncatedToHexString(final byte[] key, final byte[] input, final int length) {
+    return HEX.formatHex(Util.truncate(hmac256(key, input), length));
+  }
+
+  public static String hmac256TruncatedToHexString(final byte[] key, final String input, final int length) {
+    return hmac256TruncatedToHexString(key, input.getBytes(StandardCharsets.UTF_8), length);
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/util/HttpUtils.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.util;
+
+public final class HttpUtils {
+
+  private HttpUtils() {
+    // utility class
+  }
+
+  public static boolean isSuccessfulResponse(final int statusCode) {
+    return statusCode >= 200 && statusCode < 300;
+  }
+}