Don't use signaling key anymore

Signaling key was deprecated over 2 years ago. It's time for it to go.

service/src/main/java/org/whispersystems/textsecuregcm/entities/CryptoEncodingException.java

@@ -1,18 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.entities;
-
-public class CryptoEncodingException extends Exception {
-
-  public CryptoEncodingException(String s) {
-    super(s);
-  }
-
-  public CryptoEncodingException(Exception e) {
-    super(e);
-  }
-
-}

service/src/main/java/org/whispersystems/textsecuregcm/entities/EncryptedOutgoingMessage.java

@@ -1,108 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-package org.whispersystems.textsecuregcm.entities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
-import org.whispersystems.textsecuregcm.util.Base64;
-import org.whispersystems.textsecuregcm.util.Util;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-public class EncryptedOutgoingMessage {
-
-  private final Logger logger = LoggerFactory.getLogger(EncryptedOutgoingMessage.class);
-
-  private static final byte[] VERSION         = new byte[]{0x01};
-  private static final int    CIPHER_KEY_SIZE = 32;
-  private static final int    MAC_KEY_SIZE    = 20;
-  private static final int    MAC_SIZE        = 10;
-
-  private final byte[] serialized;
-
-  public EncryptedOutgoingMessage(Envelope outgoingMessage, String signalingKey)
-      throws CryptoEncodingException
-  {
-    byte[]        plaintext = outgoingMessage.toByteArray();
-    SecretKeySpec cipherKey = getCipherKey (signalingKey);
-    SecretKeySpec macKey    = getMacKey(signalingKey);
-
-    this.serialized         = getCiphertext(plaintext, cipherKey, macKey);
-  }
-
-  public byte[] toByteArray() {
-    return serialized;
-  }
-
-  private byte[] getCiphertext(byte[] plaintext, SecretKeySpec cipherKey, SecretKeySpec macKey)
-      throws CryptoEncodingException
-  {
-    try {
-      Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-      cipher.init(Cipher.ENCRYPT_MODE, cipherKey);
-
-      Mac hmac = Mac.getInstance("HmacSHA256");
-      hmac.init(macKey);
-
-      hmac.update(VERSION);
-
-      byte[] ivBytes = cipher.getIV();
-      hmac.update(ivBytes);
-
-      byte[] ciphertext   = cipher.doFinal(plaintext);
-      byte[] mac          = hmac.doFinal(ciphertext);
-      byte[] truncatedMac = new byte[MAC_SIZE];
-      System.arraycopy(mac, 0, truncatedMac, 0, truncatedMac.length);
-
-      return Util.combine(VERSION, ivBytes, ciphertext, truncatedMac);
-    } catch (NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException e) {
-      throw new AssertionError(e);
-    } catch (InvalidKeyException e) {
-      logger.warn("Invalid Key", e);
-      throw new CryptoEncodingException("Invalid key!");
-    }
-  }
-
-  private SecretKeySpec getCipherKey(String signalingKey) throws CryptoEncodingException {
-    try {
-      byte[] signalingKeyBytes = Base64.decode(signalingKey);
-      byte[] cipherKey         = new byte[CIPHER_KEY_SIZE];
-
-      if (signalingKeyBytes.length < CIPHER_KEY_SIZE)
-        throw new CryptoEncodingException("Signaling key too short!");
-
-      System.arraycopy(signalingKeyBytes, 0, cipherKey, 0, cipherKey.length);
-      return new SecretKeySpec(cipherKey, "AES");
-    } catch (IOException e) {
-      throw new CryptoEncodingException(e);
-    }
-  }
-
-  private SecretKeySpec getMacKey(String signalingKey) throws CryptoEncodingException {
-    try {
-      byte[] signalingKeyBytes = Base64.decode(signalingKey);
-      byte[] macKey            = new byte[MAC_KEY_SIZE];
-
-      if (signalingKeyBytes.length < CIPHER_KEY_SIZE + MAC_KEY_SIZE)
-        throw new CryptoEncodingException("Signaling key too short!");
-
-      System.arraycopy(signalingKeyBytes, CIPHER_KEY_SIZE, macKey, 0, macKey.length);
-
-      return new SecretKeySpec(macKey, "HmacSHA256");
-    } catch (IOException e) {
-      throw new CryptoEncodingException(e);
-    }
-  }
-
-}

service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java

@@ -18,8 +18,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.controllers.MessageController;
 import org.whispersystems.textsecuregcm.controllers.NoSuchUserException;
-import org.whispersystems.textsecuregcm.entities.CryptoEncodingException;
-import org.whispersystems.textsecuregcm.entities.EncryptedOutgoingMessage;
 import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity;
 import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntityList;
 import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
@@ -127,22 +125,13 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
   }
 
   private CompletableFuture<WebSocketResponseMessage> sendMessage(final Envelope message, final Optional<StoredMessageInfo> storedMessageInfo) {
-    try {
+    final Optional<byte[]> body = Optional.ofNullable(message.toByteArray());
-      String           header;
-      Optional<byte[]> body;
-
-      if (Util.isEmpty(device.getSignalingKey())) {
-        header = "X-Signal-Key: false";
-        body   = Optional.ofNullable(message.toByteArray());
-      } else {
-        header = "X-Signal-Key: true";
-        body   = Optional.ofNullable(new EncryptedOutgoingMessage(message, device.getSignalingKey()).toByteArray());
-      }
 
     sendMessageMeter.mark();
     bytesSentMeter.mark(body.map(bytes -> bytes.length).orElse(0));
 
-      return client.sendRequest("PUT", "/api/v1/message", List.of(header, TimestampHeaderUtil.getTimestampHeader()), body).whenComplete((response, throwable) -> {
+    // X-Signal-Key: false must be sent until Android stops assuming it missing means true
+    return client.sendRequest("PUT", "/api/v1/message", List.of("X-Signal-Key: false", TimestampHeaderUtil.getTimestampHeader()), body).whenComplete((response, throwable) -> {
       if (throwable == null) {
         if (isSuccessResponse(response)) {
           if (storedMessageInfo.isPresent()) {
@@ -168,10 +157,6 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
         sendFailuresMeter.mark();
       }
     });
-    } catch (CryptoEncodingException e) {
-      logger.warn("Bad signaling key", e);
-      return CompletableFuture.failedFuture(e);
-    }
   }
 
   public static void recordMessageDeliveryDuration(long timestamp, Device messageDestinationDevice) {