Implement DeviceGroupsInputStream (and fix its dependencies)

Author: Trolldemorted

libsignal-service-dotnet/SignalServiceMessageReceiver.cs

@@ -10,8 +10,10 @@
 using libsignalservice.websocket;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Security.Cryptography;
+using System.Text;
 using System.Threading;
 using static libsignalservice.messages.SignalServiceAttachment;
 using static libsignalservice.SignalServiceMessagePipe;
@@ -88,6 +90,7 @@ public Stream RetrieveProfileAvatar(string path, FileStream destination, byte[]
         public Stream RetrieveAttachment(SignalServiceAttachmentPointer pointer, Stream tmpCipherDestination, int maxSizeBytes, IProgressListener listener)
         {
             Socket.RetrieveAttachment(pointer.Relay, pointer.Id, tmpCipherDestination, maxSizeBytes);
+            tmpCipherDestination.Position = 0;
             return AttachmentCipherInputStream.CreateFor(tmpCipherDestination, pointer.Size != null ? pointer.Size.Value : 0, pointer.Key, pointer.Digest);
         }
 

libsignal-service-dotnet/SignalServiceMessageSender.cs

@@ -180,6 +180,10 @@ public void SendMessage(SignalServiceSyncMessage message)
                 SendMessage(message.Verified);
                 return;
             }
+            else if (message.Request != null)
+            {
+                content = CreateRequestContent(message.Request);
+            }
             else
             {
                 throw new Exception("Unsupported sync message!");
@@ -454,6 +458,16 @@ private byte[] CreateMultiDeviceReadContent(List<ReadMessage> readMessages)
             return content.ToByteArray();
         }
 
+        private byte[] CreateRequestContent(RequestMessage request)
+        {
+            Content content = new Content { };
+            SyncMessage syncMessage = CreateSyncMessage();
+
+            syncMessage.Request = request.Request;
+            content.SyncMessage = syncMessage;
+            return content.ToByteArray();
+        }
+
         private byte[] CreateMultiDeviceBlockedContent(BlockedListMessage blocked)
         {
             Content content = new Content { };
@@ -645,7 +659,7 @@ private AttachmentPointer CreateAttachmentPointer(SignalServiceAttachmentStream
             byte[] attachmentKey = Util.GetSecretBytes(64);
             long paddedLength = PaddingInputStream.GetPaddedSize(attachment.Length);
             long ciphertextLength = AttachmentCipherInputStream.GetCiphertextLength(paddedLength);
-            PushAttachmentData attachmentData = new PushAttachmentData(attachment.getContentType(),
+            PushAttachmentData attachmentData = new PushAttachmentData(attachment.ContentType,
                                                                        new PaddingInputStream(attachment.InputStream, attachment.Length),
                                                                        ciphertextLength,
                                                                        new AttachmentCipherOutputStreamFactory(attachmentKey),
@@ -655,7 +669,7 @@ private AttachmentPointer CreateAttachmentPointer(SignalServiceAttachmentStream
 
             var attachmentPointer = new AttachmentPointer
             {
-                ContentType = attachment.getContentType(),
+                ContentType = attachment.ContentType,
                 Id = id,
                 Key = ByteString.CopyFrom(attachmentKey),
                 Digest = ByteString.CopyFrom(digest),
@@ -694,7 +708,7 @@ private AttachmentPointer CreateAttachmentPointerFromPointer(SignalServiceAttach
         {
             var attachmentPointer = new AttachmentPointer()
             {
-                ContentType = attachment.getContentType(),
+                ContentType = attachment.ContentType,
                 Id = attachment.Id,
                 Key = ByteString.CopyFrom(attachment.Key),
                 Digest = ByteString.CopyFrom(attachment.Digest),

libsignal-service-dotnet/crypto/AttachmentCipherInputStream.cs

@@ -2,6 +2,7 @@
 using libsignalservice.util;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -21,7 +22,7 @@ public class AttachmentCipherInputStream : Stream
         private readonly CryptoStream Cipher;
         private readonly ICryptoTransform Decryptor;
         private readonly MemoryStream TmpStream = new MemoryStream();
-        private long TotalDataSize;
+        private readonly long TotalDataSize;
         private long TotalRead = 0;
 
         public override bool CanRead => true;
@@ -33,7 +34,7 @@ public class AttachmentCipherInputStream : Stream
         public static Stream CreateFor(Stream inputStream, long plaintextLength, byte[] combinedKeyMaterial, byte[] digest)
         {
             long fileSize = inputStream.Length;
-            byte[][] keyParts = Util.Split(combinedKeyMaterial, 32, 32);
+            byte[][] keyParts = Util.Split(combinedKeyMaterial, CIPHER_KEY_SIZE, MAC_KEY_SIZE);
             IncrementalHash mac = IncrementalHash.CreateHMAC(HashAlgorithmName.SHA256, keyParts[1]);
             VerifyMac(inputStream, mac, digest);
             inputStream.Seek(0, SeekOrigin.Begin);
@@ -79,6 +80,7 @@ public override int Read(byte[] buffer, int offset, int count)
             {
                 int read = Cipher.Read(buffer, offset, (int)Math.Min(count, TotalDataSize - TotalRead));
                 TotalRead += read;
+
                 return read;
             }
             return 0;

libsignal-service-dotnet/crypto/SignalServiceCipher.cs

@@ -1,5 +1,6 @@
 using Google.Protobuf;
 using libsignal;
+using libsignal.messages.multidevice;
 using libsignal.protocol;
 using libsignal.state;
 using libsignal_service_dotnet.messages.calls;
@@ -148,7 +149,7 @@ private SignalServiceDataMessage CreateSignalServiceMessage(SignalServiceEnvelop
 
             foreach (AttachmentPointer pointer in content.Attachments)
             {
-                attachments.Add(CreateAttachmentPointer(envelope, pointer));
+                attachments.Add(CreateAttachmentPointer(envelope.GetRelay(), pointer));
             }
 
             if (content.TimestampOneofCase == DataMessage.TimestampOneofOneofCase.Timestamp && (long) content.Timestamp != envelope.GetTimestamp())
@@ -199,6 +200,18 @@ private SignalServiceSyncMessage CreateSynchronizeMessage(SignalServiceEnvelope
                 return SignalServiceSyncMessage.ForRead(readMessages);
             }
 
+            if (content.ContactsOneofCase == SyncMessage.ContactsOneofOneofCase.Contacts)
+            {
+                AttachmentPointer pointer = content.Contacts.Blob;
+                return SignalServiceSyncMessage.ForContacts(new ContactsMessage(CreateAttachmentPointer(envelope.GetRelay(), pointer), content.Contacts.Complete));
+            }
+
+            if (content.GroupsOneofCase == SyncMessage.GroupsOneofOneofCase.Groups)
+            {
+                AttachmentPointer pointer = content.Groups.Blob;
+                return SignalServiceSyncMessage.ForGroups(CreateAttachmentPointer(envelope.GetRelay(), pointer));
+            }
+
             if (content.VerifiedOneofCase == SyncMessage.VerifiedOneofOneofCase.Verified)
             {
                 try
@@ -348,7 +361,7 @@ private SignalServiceDataMessage.SignalServiceQuote CreateQuote(SignalServiceEnv
             {
                 attachments.Add(new SignalServiceQuotedAttachment(pointer.ContentType,
                     pointer.FileName,
-                    pointer.ThumbnailOneofCase == Types.Quote.Types.QuotedAttachment.ThumbnailOneofOneofCase.Thumbnail ? CreateAttachmentPointer(envelope, pointer.Thumbnail) : null));
+                    pointer.ThumbnailOneofCase == Types.Quote.Types.QuotedAttachment.ThumbnailOneofOneofCase.Thumbnail ? CreateAttachmentPointer(envelope.GetRelay(), pointer.Thumbnail) : null));
             }
 
             return new SignalServiceDataMessage.SignalServiceQuote((long) content.Quote.Id,
@@ -357,7 +370,7 @@ private SignalServiceDataMessage.SignalServiceQuote CreateQuote(SignalServiceEnv
                 attachments);
         }
 
-        private SignalServiceAttachmentPointer CreateAttachmentPointer(SignalServiceEnvelope envelope, AttachmentPointer pointer)
+        private SignalServiceAttachmentPointer CreateAttachmentPointer(string relay, AttachmentPointer pointer)
         {
             uint? size = null;
             if (pointer.SizeOneofCase == AttachmentPointer.SizeOneofOneofCase.Size)
@@ -367,7 +380,7 @@ private SignalServiceAttachmentPointer CreateAttachmentPointer(SignalServiceEnve
             return new SignalServiceAttachmentPointer(pointer.Id,
                 pointer.ContentType,
                 pointer.Key.ToByteArray(),
-                envelope.GetRelay(),
+                relay,
                 size,
                 pointer.ThumbnailOneofCase == AttachmentPointer.ThumbnailOneofOneofCase.Thumbnail ? pointer.Thumbnail.ToByteArray() : null,
                 (int) pointer.Width,

libsignal-service-dotnet/libsignal-service-dotnet.csproj

@@ -31,7 +31,7 @@
     <PackageReference Include="libphonenumber-csharp" Version="8.8.6" />
     <PackageReference Include="libsignal-protocol-dotnet" Version="2.6.2" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.2" />
     <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />

libsignal-service-dotnet/messages/SignalServiceAttachment.cs

@@ -13,11 +13,6 @@ internal SignalServiceAttachment(String contentType)
             this.ContentType = contentType;
         }
 
-        public String getContentType()
-        {
-            return ContentType;
-        }
-
         public abstract bool IsStream();
 
         public abstract bool IsPointer();