signald/infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 2.92

Browse source
This commit is contained in:
Finn 2020-06-16 21:37:37 -07:00
parent 67488577d6
commit ce707b6f96
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
signal-server-patches/apply-patches.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
for patch in /tmp/signal-server-patches/*.patch; do for patch in /tmp/signal-server-patches/*.patch; do
echo "patch -p1 < \$patch" echo "patch -p1 < ${patch}"
patch -p1 < $patch patch -p1 < "${patch}"
done done

17
signal-server-patches/remove-sqs.patch
View file

@ -1,19 +1,20 @@
diff --git a/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java b/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java b/service/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java
index bd05995..0d12f57 100644 index af8b89a..c4cad9d 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java --- a/service/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueue.java
@@ -66,26 +66,7 @@ public class DirectoryQueue { @@ -67,27 +67,7 @@ public class DirectoryQueue {
} }
private void sendMessage(String action, String user) { private void sendMessage(String action, UUID uuid, String number) {
- final Map<String, MessageAttributeValue> messageAttributes = new HashMap<>(); - final Map<String, MessageAttributeValue> messageAttributes = new HashMap<>();
- messageAttributes.put("id", new MessageAttributeValue().withDataType("String").withStringValue(user)); - messageAttributes.put("id", new MessageAttributeValue().withDataType("String").withStringValue(number));
- messageAttributes.put("uuid", new MessageAttributeValue().withDataType("String").withStringValue(uuid.toString()));
- messageAttributes.put("action", new MessageAttributeValue().withDataType("String").withStringValue(action)); - messageAttributes.put("action", new MessageAttributeValue().withDataType("String").withStringValue(action));
- SendMessageRequest sendMessageRequest = new SendMessageRequest() - SendMessageRequest sendMessageRequest = new SendMessageRequest()
- .withQueueUrl(queueUrl) - .withQueueUrl(queueUrl)
- .withMessageBody("-") - .withMessageBody("-")
- .withMessageDeduplicationId(user + action) - .withMessageDeduplicationId(UUID.randomUUID().toString())
- .withMessageGroupId(user) - .withMessageGroupId(number)
- .withMessageAttributes(messageAttributes); - .withMessageAttributes(messageAttributes);
- try { - try {
- sqs.sendMessage(sendMessageRequest); - sqs.sendMessage(sendMessageRequest);
@ -26,7 +27,7 @@ index bd05995..0d12f57 100644
- } catch (Throwable t) { - } catch (Throwable t) {
- logger.warn("sqs unexpected error: ", t); - logger.warn("sqs unexpected error: ", t);
- } - }
+ logger.info("Pretending to send SQS message: " + user + " " + action); + logger.info("Pretending to send SQS message: " + action);
} }
} }

2
signal-server.Dockerfile
View file

@ -8,7 +8,7 @@ RUN mvn install -DskipTests
FROM debian:buster FROM debian:buster
RUN apt-get update && apt-get install -y openjdk-11-jre-headless RUN apt-get update && apt-get install -y openjdk-11-jre-headless
COPY --from=build /usr/local/src/Signal-Server/service/target/TextSecureServer-2.55.jar /usr/share/TextSecureServer.jar COPY --from=build /usr/local/src/Signal-Server/service/target/TextSecureServer-2.92.jar /usr/share/TextSecureServer.jar
COPY migrate-and-start-server.sh /usr/bin/migrate-and-start-server COPY migrate-and-start-server.sh /usr/bin/migrate-and-start-server
RUN useradd signal RUN useradd signal
RUN chown -R signal /usr/share/TextSecureServer.jar RUN chown -R signal /usr/share/TextSecureServer.jar