Compare commits
No commits in common. "main" and "unofficial_47" have entirely different histories.
main
...
unofficial
6 changed files with 53 additions and 161 deletions
|
|
@ -2,7 +2,7 @@ stages:
|
|||
- build
|
||||
|
||||
variables:
|
||||
version: "v2.15.3_unofficial_50"
|
||||
version: "v2.15.3_unofficial_47"
|
||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||
|
||||
build:
|
||||
|
|
@ -18,15 +18,11 @@ build:
|
|||
- arm-unknown-linux-gnueabihf
|
||||
- armv7-unknown-linux-gnueabihf
|
||||
- x86_64-unknown-linux-gnu
|
||||
- x86_64-unknown-linux-musl
|
||||
|
||||
build darwin:
|
||||
build x86_64-apple-darwin:
|
||||
stage: build
|
||||
tags: [darwin-builder]
|
||||
script:
|
||||
- ./build.sh
|
||||
parallel:
|
||||
matrix:
|
||||
- TARGET:
|
||||
- x86_64-apple-darwin
|
||||
- aarch64-apple-darwin
|
||||
variables:
|
||||
TARGET: x86_64-apple-darwin
|
||||
1
build.sh
1
build.sh
|
|
@ -5,7 +5,6 @@ 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)
|
||||
|
|
|
|||
32
hashes.json
32
hashes.json
|
|
@ -1,34 +1,26 @@
|
|||
{
|
||||
"aarch64-unknown-linux-gnu": {
|
||||
"jar": "802529c1472f7e621cca496c918d7bfec08314572f10e168b0d20b15a5b8101a",
|
||||
"module": "48e315037d2d9af6c7cf7b811d9a81d81b1eff13cbb1837b7638a3803b68f303"
|
||||
"jar": "0f2573702f17f2390bbe084687e9caff7a8526c519a27d58066dd493cd9378da",
|
||||
"module": "bb56193d9d64102e24047e067a35d13b813bc39d715dad92ebe474a78177a4af"
|
||||
},
|
||||
"arm-unknown-linux-gnueabi": {
|
||||
"jar": "8ef66fe1ae28fe7b2918292824ef33a41a3432c3a981cfa55665106c89348327",
|
||||
"module": "7c988dfb2fca57ff0aabd7bd88ebfa5658be8722adb0831a5140aed3d1529097"
|
||||
"jar": "048f8562c03906fdc4e45651272c00ee0a1821f2e5fa9cb4e05a6a360df176a6",
|
||||
"module": "71a4bbbd0678d2fdf43adae7763a03dc02ad01a0947c2960c72219079a3872e6"
|
||||
},
|
||||
"arm-unknown-linux-gnueabihf": {
|
||||
"jar": "446a796b0a2a062c65d9d5cb75a3fd4aadc03ab321b52c39a5bfe1e6f9dc9891",
|
||||
"module": "30e6a82cc6d2b01b57b758d8352c9d90926f31becfe6218c43d2614a309c9cbc"
|
||||
"jar": "afdd3a2728b84e5ea594009680ec9fa888a06a56bf055ccc460735a74f6b1cb6",
|
||||
"module": "0b87fbf1de3d5d7889109e3bd62a807b3f98bdb1f295a469b6eb71114d561db2"
|
||||
},
|
||||
"armv7-unknown-linux-gnueabihf": {
|
||||
"jar": "3e896a52cf5816387094137403c112353de93f4b7591bcfc5965e89ef3777c5b",
|
||||
"module": "39be083718c6b8afe94e2ccff63c918ea1255292881afbb60b12236cd4b70dc6"
|
||||
"jar": "11801051a1bafb9c8e01b94fb3333177fe601e82d81f5a7b0f910b95c4167cb1",
|
||||
"module": "91be468f808b1a615b6ea648fc9e2d2a7698c646c1b1544a971909e7a8558774"
|
||||
},
|
||||
"x86_64-unknown-linux-gnu": {
|
||||
"jar": "b38295eb11df91939b872f49eb8b55b2faf7933da92202b95d82320f4cdcb644",
|
||||
"module": "1b739335cde181864882481f5feca8fca3f7baa439f79c36ac596a781e6d4477"
|
||||
"jar": "22b55eccaae34c001cb0ad4101e76de5405819a6e1fe20ef9d0dfc5d333f6af4",
|
||||
"module": "f6cc6f132c64376c9a4687716a9a41022aae3a5ce2d14fb95a31214c2a165c0e"
|
||||
},
|
||||
"x86_64-apple-darwin": {
|
||||
"jar": "949a72b14d81389a30e330db3162f822a475d0f19087590f334639acdb01b4eb",
|
||||
"module": "7de5da969225585d36d68ba7a87c80d33886e36a04dea9d78ef8c2df9f6a3bf2"
|
||||
},
|
||||
"aarch64-apple-darwin": {
|
||||
"jar": "e7f405b1c521054bbea8ec0ff87c54527f17e8c914079d7805c4def3589e8af1",
|
||||
"module": "3c153a7e01ae317280981e387d3fd002b7106ce65653be1b6e4216a4f4d9d314"
|
||||
},
|
||||
"x86_64-unknown-linux-musl": {
|
||||
"jar": "9a46edb376089b6284cbc76c4e6bc21fa91f8ee7e3daf221d704243cfe0c16cf",
|
||||
"module": "a35abf78dc674557ddc7da348d5eb2d015b4e843d5402df95922ba2780b36169"
|
||||
"jar": "0500c7ea64610754cef7edc65e7a1fbdb8fa325a74375c5c8c3deeed24d7f4c9",
|
||||
"module": "710596dc3f7f08b756586a8827d9be4778817a23c8f617c3f14ce11f67f2ed2a"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,38 +1,34 @@
|
|||
From c51057ae26118490176af0b2421f8fa62d926c00 Mon Sep 17 00:00:00 2001
|
||||
From: signald <nobody@signald.org>
|
||||
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
|
||||
From 27eab116fdf0375d27c90584cd1250a6040b3c3e Mon Sep 17 00:00:00 2001
|
||||
From: nobody <nobody@signald.org>
|
||||
Date: Tue, 26 Apr 2022 17:25:06 -0700
|
||||
Subject: [PATCH] update gradle files
|
||||
|
||||
---
|
||||
build.gradle | 17 +++--------------
|
||||
build.gradle | 17 ++---------------
|
||||
dependencies.gradle | 3 +--
|
||||
gradle/verification-metadata.xml | 13 ++++++++-----
|
||||
gradle/verification-metadata.xml | 15 +++++++++------
|
||||
service/build.gradle | 19 +++++++++----------
|
||||
.../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
|
||||
settings.gradle | 2 --
|
||||
5 files changed, 21 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 2498bfcb..81f7038d 100644
|
||||
index 638912f..dbbfce9 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -9,11 +9,8 @@ buildscript {
|
||||
@@ -9,11 +9,7 @@ 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,10 @@ def getRepositoryPassword() {
|
||||
@@ -23,18 +19,9 @@ def getRepositoryPassword() {
|
||||
return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : ""
|
||||
}
|
||||
|
||||
|
|
@ -44,21 +40,20 @@ index 2498bfcb..81f7038d 100644
|
|||
- }
|
||||
- }
|
||||
-}
|
||||
|
||||
-
|
||||
subprojects {
|
||||
- ext.lib_signal_service_version_number = "2.15.3_unofficial_50"
|
||||
ext.lib_signal_service_version_number = "2.15.3_unofficial_47"
|
||||
- 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 e4b9f8a8..20e0d2f2 100644
|
||||
index 0db5725..03f925a 100644
|
||||
--- a/dependencies.gradle
|
||||
+++ b/dependencies.gradle
|
||||
@@ -8,8 +8,7 @@ dependencyResolutionManagement {
|
||||
alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.48')
|
||||
alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.33')
|
||||
|
||||
// 1st Party
|
||||
- alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client')
|
||||
|
|
@ -68,7 +63,7 @@ index e4b9f8a8..20e0d2f2 100644
|
|||
// 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 fc39d024..59fde59c 100644
|
||||
index 83ef67a..eedf52e 100644
|
||||
--- a/gradle/verification-metadata.xml
|
||||
+++ b/gradle/verification-metadata.xml
|
||||
@@ -482,6 +482,9 @@
|
||||
|
|
@ -82,25 +77,26 @@ index fc39d024..59fde59c 100644
|
|||
<component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
|
||||
<artifact name="core-proto-0.0.8-alpha04.jar">
|
||||
@@ -1133,12 +1136,12 @@
|
||||
<sha256 value="95510c70f1bf0fd65ddc1f39fbf7a42d75d8a064dc3a2cbe52496fa2f2c535f0" origin="Generated by Gradle"/>
|
||||
<sha256 value="e0ad9cb0073a699fce187d527bb1d423a9082fb7a2f75e1fbf89fef6fb880cec" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
- <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">
|
||||
- <component group="org.signal" name="libsignal-client" version="0.15.0">
|
||||
- <artifact name="libsignal-client-0.15.0.jar">
|
||||
- <sha256 value="dfbd132106ef6dbd4355043355a47132874bccbf0d42c85350686013084b953c" origin="Generated by Gradle"/>
|
||||
- </artifact>
|
||||
- <artifact name="libsignal-client-0.15.0.module">
|
||||
- <sha256 value="76625d04c538f791275cb34870ed7805c09fb3a6f3deb3a256e13a48ef440fde" origin="Generated by Gradle"/>
|
||||
+ <component group="org.signald" name="libsignal-client-{TARGET}" version="0.15.0">
|
||||
+ <artifact name="libsignal-client-{TARGET}-0.15.0.jar">
|
||||
+ <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
|
||||
</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">
|
||||
+ </artifact>
|
||||
+ <artifact name="libsignal-client-{TARGET}-0.15.0.module">
|
||||
+ <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.tensorflow" name="tensorflow-lite-metadata" version="0.1.0-rc2">
|
||||
diff --git a/service/build.gradle b/service/build.gradle
|
||||
index ae4df43a..4b0240d8 100644
|
||||
index ae4df43..4b0240d 100644
|
||||
--- a/service/build.gradle
|
||||
+++ b/service/build.gradle
|
||||
@@ -21,6 +21,7 @@ compileJava {
|
||||
|
|
@ -144,69 +140,18 @@ index ae4df43a..4b0240d8 100644
|
|||
- 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 8861c008..8dd03423 100644
|
||||
index 8861c00..4048aab 100644
|
||||
--- a/settings.gradle
|
||||
+++ b/settings.gradle
|
||||
@@ -1,6 +1,5 @@
|
||||
@@ -1,7 +1,5 @@
|
||||
enableFeaturePreview('VERSION_CATALOGS')
|
||||
|
||||
-include ':android'
|
||||
|
||||
-
|
||||
include 'libsignal-service'
|
||||
project(':libsignal-service').projectDir = file('service')
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@ import requests
|
|||
import hashlib
|
||||
import json
|
||||
|
||||
VERSION = "0.17.0"
|
||||
VERSION = "0.15.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-musl",
|
||||
"aarch64-apple-darwin"
|
||||
"x86_64-apple-darwin"
|
||||
]
|
||||
|
||||
urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/libsignal-client-{target}/{version}/libsignal-client-{target}-{version}.{ext}"
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
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
|
||||
|
||||
Loading…
Reference in a new issue