add kbs settings patch file

.gitlab-ci.yml

@@ -2,11 +2,11 @@ stages:
   - build
 
 variables:
-  version: "v2.15.3_unofficial_41"
+  version: "v2.15.3_unofficial_50"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 build:
-  image: gradle:7.2
+  image: gradle:7.4
   stage: build
   script:
     - ./build.sh
@@ -17,12 +17,16 @@ build:
           - arm-unknown-linux-gnueabi
           - arm-unknown-linux-gnueabihf
           - armv7-unknown-linux-gnueabihf
-          - x86-64-unknown-linux-gnu
+          - x86_64-unknown-linux-gnu
+          - x86_64-unknown-linux-musl
 
-build x86_64-apple-darwin:
+build darwin:
   stage: build
   tags: [darwin-builder]
   script:
     - ./build.sh
-  variables:
-    TARGET: x86-64-apple-darwin
+  parallel:
+    matrix:
+      - TARGET:
+        - x86_64-apple-darwin
+        - aarch64-apple-darwin

build.sh

@@ -5,6 +5,7 @@ cd libsignal-service-java
 git config user.email nobody@signald.org
 git config user.name signald
 git am ../libsignal-service-java.patch
+git am ../update-kbs-settings.patch
 python3 ../update-verification-metadata.py
 git diff --color=always
 gradle assemble publish || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1)

hashes.json

@@ -1,26 +1,34 @@
 {
     "aarch64-unknown-linux-gnu": {
-        "jar": "bf3465999bbde9e3c7a17c0eec854000f6634edb1aa7617242e58a38e4106a8a",
-        "module": "7c5e147ae703ba2f25695f8f9b2bdb411f76167fb51e865cd10aef8cbf23d487"
+        "jar": "802529c1472f7e621cca496c918d7bfec08314572f10e168b0d20b15a5b8101a",
+        "module": "48e315037d2d9af6c7cf7b811d9a81d81b1eff13cbb1837b7638a3803b68f303"
     },
     "arm-unknown-linux-gnueabi": {
-        "jar": "c01acd3871e3fae71dce49040f3afd9732157d60e7755e416091a36aa8e57372",
-        "module": "187bb9caa9ecb87180326d406f54a5c3dea02b11ba480cb72ab34b030cbaf3fb"
+        "jar": "8ef66fe1ae28fe7b2918292824ef33a41a3432c3a981cfa55665106c89348327",
+        "module": "7c988dfb2fca57ff0aabd7bd88ebfa5658be8722adb0831a5140aed3d1529097"
     },
     "arm-unknown-linux-gnueabihf": {
-        "jar": "8e2ddac2b8debae05dbdf46cbb7c833940ca718b8dd86e13cff841f69a645991",
-        "module": "afc6686faf3a06c25d5564bead161dfebdb8a31dd8ad8a37771c80daf220b352"
+        "jar": "446a796b0a2a062c65d9d5cb75a3fd4aadc03ab321b52c39a5bfe1e6f9dc9891",
+        "module": "30e6a82cc6d2b01b57b758d8352c9d90926f31becfe6218c43d2614a309c9cbc"
     },
     "armv7-unknown-linux-gnueabihf": {
-        "jar": "aed207e50b289f659326aaa4493feca1a55def40e43da2ba45194ca43288e6ae",
-        "module": "80f018eabc5ab2794234e3e4f126c9bff2b3cfa85f0cedabce4fa14042906e59"
+        "jar": "3e896a52cf5816387094137403c112353de93f4b7591bcfc5965e89ef3777c5b",
+        "module": "39be083718c6b8afe94e2ccff63c918ea1255292881afbb60b12236cd4b70dc6"
     },
-    "x86-64-unknown-linux-gnu": {
-        "jar": "e0e7b3587c03dd8cdecf3dbe77da8b2e55854eb728db4bd89b19ef9346d425b5",
-        "module": "9d8106cf0a206d10df464995125194a19dfaf8528a88af501bfbecf57331a264"
+    "x86_64-unknown-linux-gnu": {
+        "jar": "b38295eb11df91939b872f49eb8b55b2faf7933da92202b95d82320f4cdcb644",
+        "module": "1b739335cde181864882481f5feca8fca3f7baa439f79c36ac596a781e6d4477"
     },
-    "x86-64-apple-darwin": {
-        "jar": "eb3e3cc16491a69734ee552bf9a0c3bcc64148b5793f83ecf37a76a254f5b3e3",
-        "module": "6e26dbfa123a6dfeb74f98e2e8f95548bd41ffc867853971ee3e831939436411"
+    "x86_64-apple-darwin": {
+        "jar": "949a72b14d81389a30e330db3162f822a475d0f19087590f334639acdb01b4eb",
+        "module": "7de5da969225585d36d68ba7a87c80d33886e36a04dea9d78ef8c2df9f6a3bf2"
+    },
+    "aarch64-apple-darwin": {
+        "jar": "e7f405b1c521054bbea8ec0ff87c54527f17e8c914079d7805c4def3589e8af1",
+        "module": "3c153a7e01ae317280981e387d3fd002b7106ce65653be1b6e4216a4f4d9d314"
+    },
+    "x86_64-unknown-linux-musl": {
+        "jar": "9a46edb376089b6284cbc76c4e6bc21fa91f8ee7e3daf221d704243cfe0c16cf",
+        "module": "a35abf78dc674557ddc7da348d5eb2d015b4e843d5402df95922ba2780b36169"
     }
 }

libsignal-service-java.patch

@@ -1,41 +1,38 @@
-From 20ce40c4c4a960720ad7ebbe758500ed2c78b475 Mon Sep 17 00:00:00 2001
+From c51057ae26118490176af0b2421f8fa62d926c00 Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
-Date: Fri, 11 Feb 2022 23:16:57 -0800
-Subject: [PATCH] update gradle files
+Date: Thu, 16 Jun 2022 13:04:00 -0700
+Subject: [PATCH] update build files and provide a way for the websocket
+ receive callback to indicate the message was not saved
 
 ---
- build.gradle                     | 18 +++---------------
+ build.gradle                                  | 17 +++--------------
  dependencies.gradle                           |  3 +--
- gradle/verification-metadata.xml | 11 +++++++++++
+ gradle/verification-metadata.xml              | 13 ++++++++-----
  service/build.gradle                          | 19 +++++++++----------
- settings.gradle                  |  2 --
- 5 files changed, 24 insertions(+), 29 deletions(-)
+ .../signalservice/api/NotSavedException.java  |  4 ++++
+ .../signalservice/api/SignalWebSocket.java    | 13 ++++++++++---
+ settings.gradle                               |  1 -
+ 7 files changed, 35 insertions(+), 35 deletions(-)
+ create mode 100644 service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
 
 diff --git a/build.gradle b/build.gradle
-index 41c2533..f486ea8 100644
+index 2498bfcb..81f7038d 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1,5 +1,6 @@
- buildscript {
-     repositories {
-+        maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
-         google()
-         mavenCentral()
-     }
-@@ -9,11 +10,7 @@ buildscript {
+@@ -9,11 +9,8 @@ buildscript {
      }
  }
  
 -plugins {
 -    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 -}
--
+ 
 -project.group = "com.github.turasa"
 +project.group = "org.signald"
  
  def getRepositoryUsername() {
      return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : ""
-@@ -23,18 +20,9 @@ def getRepositoryPassword() {
+@@ -23,18 +20,10 @@ def getRepositoryPassword() {
      return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : ""
  }
  
@@ -47,30 +44,31 @@ index 41c2533..f486ea8 100644
 -        }
 -    }
 -}
--
+ 
  subprojects {
-     ext.lib_signal_service_version_number = "2.15.3_unofficial_41"
+-    ext.lib_signal_service_version_number = "2.15.3_unofficial_50"
 -    ext.lib_signal_service_group_info     = "com.github.turasa"
++    ext.lib_signal_service_version_number = "2.15.3_unofficial_50_signald_2"
 +    ext.lib_signal_service_group_info     = "org.signald"
  
      if (JavaVersion.current().isJava8Compatible()) {
          allprojects {
 diff --git a/dependencies.gradle b/dependencies.gradle
-index b9e6765..85a91ba 100644
+index e4b9f8a8..20e0d2f2 100644
 --- a/dependencies.gradle
 +++ b/dependencies.gradle
 @@ -8,8 +8,7 @@ dependencyResolutionManagement {
-             alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.33')
+             alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.48')
  
              // 1st Party
--            alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client')
--            alias('signal-client-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client')
-+            alias('signal-client-java').to('org.signald', 'signal-client-java-'+ System.getenv("TARGET")).versionRef('signal-client')
+-            alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client')
+-            alias('libsignal-android').to('org.signal', 'libsignal-android').versionRef('libsignal-client')
++            alias('libsignal-client').to('org.signald', 'libsignal-client-' + System.getenv("TARGET")).versionRef('libsignal-client')
  
              // Third Party
              alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.13.0')
 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
-index 77f8957..01c281e 100644
+index fc39d024..59fde59c 100644
 --- a/gradle/verification-metadata.xml
 +++ b/gradle/verification-metadata.xml
 @@ -482,6 +482,9 @@
@@ -83,23 +81,26 @@ index 77f8957..01c281e 100644
        </component>
        <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
           <artifact name="core-proto-0.0.8-alpha04.jar">
-@@ -1125,6 +1128,14 @@
-             <sha256 value="1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865" origin="Generated by Gradle"/>
+@@ -1133,12 +1136,12 @@
+             <sha256 value="95510c70f1bf0fd65ddc1f39fbf7a42d75d8a064dc3a2cbe52496fa2f2c535f0" origin="Generated by Gradle"/>
           </artifact>
        </component>
-+      <component group="org.signald" name="signal-client-java-{TARGET}" version="0.12.3">
-+         <artifact name="signal-client-java-{TARGET}-0.12.3.jar">
+-      <component group="org.signal" name="libsignal-client" version="0.17.0">
+-         <artifact name="libsignal-client-0.17.0.jar">
+-            <sha256 value="3611dc9425d7ef85daedbafa49fa67f49e921bf89e36f601d0b79b1268315619" origin="Generated by Gradle"/>
++      <component group="org.signald" name="libsignal-client-{TARGET}" version="0.17.0">
++         <artifact name="libsignal-client-{TARGET}-0.17.0.jar">
 +            <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
-+         </artifact>
-+         <artifact name="signal-client-java-{TARGET}-0.12.3.module">
+          </artifact>
+-         <artifact name="libsignal-client-0.17.0.module">
+-            <sha256 value="cc6125c6e30421eb39a115576371a41f0adde7ea501e99d2c74192264e6fb1ab" origin="Generated by Gradle"/>
++         <artifact name="libsignal-client-{TARGET}-0.17.0.module">
 +            <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
-+          </artifact>
-+      </component>
+          </artifact>
+       </component>
        <component group="org.tensorflow" name="tensorflow-lite-metadata" version="0.1.0-rc2">
-          <artifact name="tensorflow-lite-metadata-0.1.0-rc2.jar">
-             <sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/>
 diff --git a/service/build.gradle b/service/build.gradle
-index db7d2eb..16b3723 100644
+index ae4df43a..4b0240d8 100644
 --- a/service/build.gradle
 +++ b/service/build.gradle
 @@ -21,6 +21,7 @@ compileJava {
@@ -110,15 +111,7 @@ index db7d2eb..16b3723 100644
      mavenCentral()
      mavenLocal()
  }
-@@ -74,7 +75,6 @@ protobuf {
- idea {
-     module {
-         generatedSourceDirs += file("${protobuf.generatedFilesBaseDir}/main/java")
--        scopes.COMPILE.plus += [configurations.ideaTestFixturesImplementation]
-     }
- }
- 
-@@ -98,7 +98,7 @@ def getRepositoryPassword() {
+@@ -98,7 +99,7 @@ def getRepositoryPassword() {
  publishing {
      publications {
          mavenJava(MavenPublication) {
@@ -127,7 +120,7 @@ index db7d2eb..16b3723 100644
              from components.java
  
              pom {
-@@ -139,16 +139,15 @@ publishing {
+@@ -139,16 +140,14 @@ publishing {
  
      repositories {
          maven {
@@ -139,30 +132,81 @@ index db7d2eb..16b3723 100644
 +            credentials(HttpHeaderCredentials) {
 +                name = 'Job-Token'
 +                value = System.getenv("CI_JOB_TOKEN")
-             }
++            }
 +            authentication {
 +                 header(HttpHeaderAuthentication)
-+             }
              }
          }
      }
- 
+ }
+-
 -signing {
 -    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
 -    sign publishing.publications.mavenJava
 -}
+diff --git a/service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java b/service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
+new file mode 100644
+index 00000000..05d77d1f
+--- /dev/null
++++ b/service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
+@@ -0,0 +1,4 @@
++package org.whispersystems.signalservice.api;
++
++public class NotSavedException extends Exception {
++}
+diff --git a/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java b/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
+index 5a98f3c4..dff24940 100644
+--- a/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
++++ b/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
+@@ -243,6 +243,7 @@ public final class SignalWebSocket {
+     while (true) {
+       WebSocketRequestMessage  request  = getWebSocket().readRequest(timeout);
+       WebSocketResponseMessage response = createWebSocketResponse(request);
++      boolean sendResponse = true; // indicates the acknowledgement should be sent to the server
+       try {
+         if (isSignalServiceEnvelope(request)) {
+           Optional<String> timestampHeader = findHeader(request);
+@@ -258,13 +259,19 @@ public final class SignalWebSocket {
+ 
+           SignalServiceEnvelope envelope = new SignalServiceEnvelope(request.getBody().toByteArray(), timestamp);
+ 
+-          callback.onMessage(envelope);
++          try {
++            callback.onMessage(envelope);
++          } catch (NotSavedException e) {
++            sendResponse = false;
++          }
+           return Optional.of(envelope);
+         } else if (isSocketEmptyRequest(request)) {
+           return Optional.empty();
+         }
+       } finally {
+-        getWebSocket().sendResponse(response);
++        if(sendResponse) {
++          getWebSocket().sendResponse(response);
++        }
+       }
+     }
+   }
+@@ -315,6 +322,6 @@ public final class SignalWebSocket {
+    * received.
+    */
+   public interface MessageReceivedCallback {
+-    void onMessage(SignalServiceEnvelope envelope);
++    void onMessage(SignalServiceEnvelope envelope) throws NotSavedException;
+   }
+ }
 diff --git a/settings.gradle b/settings.gradle
-index 8861c00..4048aab 100644
+index 8861c008..8dd03423 100644
 --- a/settings.gradle
 +++ b/settings.gradle
-@@ -1,7 +1,5 @@
+@@ -1,6 +1,5 @@
  enableFeaturePreview('VERSION_CATALOGS')
  
 -include ':android'
--
+ 
  include 'libsignal-service'
  project(':libsignal-service').projectDir = file('service')
- 
 -- 
 2.30.2
 

update-hashes.py

@@ -3,17 +3,19 @@ import requests
 import hashlib
 import json
 
-VERSION = "0.12.3"
+VERSION = "0.17.0"
 TARGETS = [
     "aarch64-unknown-linux-gnu",
     "arm-unknown-linux-gnueabi",
     "arm-unknown-linux-gnueabihf",
     "armv7-unknown-linux-gnueabihf",
-    "x86-64-unknown-linux-gnu",
-    "x86-64-apple-darwin"
+    "x86_64-unknown-linux-gnu",
+    "x86_64-apple-darwin",
+    "x86_64-unknown-linux-musl",
+    "aarch64-apple-darwin"
 ]
 
-urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/signal-client-java-{target}/{version}/signal-client-java-{target}-{version}.{ext}"
+urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/libsignal-client-{target}/{version}/libsignal-client-{target}-{version}.{ext}"
 output = {}
 
 for target in TARGETS:

update-kbs-settings.patch

@@ -0,0 +1,38 @@
+From d432b9234521947d7bb07434f69a30b407700f5c Mon Sep 17 00:00:00 2001
+From: Greyson Parrelli <greyson@signal.org>
+Date: Thu, 20 Oct 2022 13:12:27 -0400
+Subject: [PATCH 2/2] [Signal-Android] Updated KBS settings.
+ 9941ffe79c2508eb9b1f1fa78b47b84c465d1199
+
+---
+ .../internal/contacts/crypto/RemoteAttestationCipher.java  | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java b/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java
+index 05073edf..32e86c70 100644
+--- a/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java
++++ b/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java
+@@ -24,6 +24,11 @@ import java.util.Set;
+ 
+ public final class RemoteAttestationCipher {
+ 
++  private static final Set<String> ALLOWED_ADVISORIES = new HashSet<String>() {{
++    add("INTEL-SA-00334");
++    add("INTEL-SA-00615");
++  }};
++
+   private RemoteAttestationCipher() {
+   }
+ 
+@@ -100,7 +105,7 @@ public final class RemoteAttestationCipher {
+     if ("OK".equals(entity.getIsvEnclaveQuoteStatus())) {
+       return true;
+     } else if ("SW_HARDENING_NEEDED".equals(entity.getIsvEnclaveQuoteStatus())) {
+-      return entity.getAdvisoryIds().length == 1 && "INTEL-SA-00334".equals(entity.getAdvisoryIds()[0]);
++      return Arrays.stream(entity.getAdvisoryIds()).allMatch(ALLOWED_ADVISORIES::contains);
+     } else {
+       return false;
+     }
+-- 
+2.30.2
+