Restructure (http) file provider flow: Separate download&get_info, download in provider, move XmppStreamModule into xmpp-vala

3 files changed, 23 insertions, 10 deletions

diff --git a/libdino/src/entity/file_transfer.vala b/libdino/src/entity/file_transfer.vala
index be472796..2c45aa08 100644
--- a/libdino/src/entity/file_transfer.vala
+++ b/libdino/src/entity/file_transfer.vala
@@ -18,6 +18,12 @@ public class FileTransfer : Object {
     public Account account { get; set; }
     public Jid counterpart { get; set; }
     public Jid ourpart { get; set; }
+    public Jid? from {
+        get { return direction == DIRECTION_SENT ? ourpart : counterpart; }
+    }
+    public Jid? to {
+        get { return direction == DIRECTION_SENT ? counterpart : ourpart; }
+    }
     public bool direction { get; set; }
     public DateTime time { get; set; }
     public DateTime? local_time { get; set; }
@@ -47,7 +53,7 @@ public class FileTransfer : Object {
         set { server_file_name_ = value; }
     }
     public string path { get; set; }
-    public string mime_type { get; set; }
+    public string? mime_type { get; set; }
     public int size { get; set; }
 
     public State state { get; set; }
diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala
index 340205af..b35a4e09 100644
--- a/libdino/src/service/file_manager.vala
+++ b/libdino/src/service/file_manager.vala
@@ -16,7 +16,7 @@ public class FileManager : StreamInteractionModule, Object {
     private StreamInteractor stream_interactor;
     private Database db;
     private Gee.List<FileSender> file_senders = new ArrayList<FileSender>();
-    private Gee.List<IncommingFileProcessor> incomming_processors = new ArrayList<IncommingFileProcessor>();
+    public Gee.List<IncommingFileProcessor> incomming_processors = new ArrayList<IncommingFileProcessor>();
     private Gee.List<OutgoingFileProcessor> outgoing_processors = new ArrayList<OutgoingFileProcessor>();
 
     public static void start(StreamInteractor stream_interactor, Database db) {
@@ -116,7 +116,7 @@ public class FileManager : StreamInteractionModule, Object {
     }
 
     public void add_provider(FileProvider file_provider) {
-        file_provider.file_incoming.connect(handle_incomming_file);
+        file_provider.file_incoming.connect((file_transfer, conversation) => { handle_incomming_file.begin(file_provider, file_transfer, conversation); });
     }
 
     public void add_sender(FileSender file_sender) {
@@ -134,13 +134,18 @@ public class FileManager : StreamInteractionModule, Object {
         outgoing_processors.add(processor);
     }
 
-    private void handle_incomming_file(FileTransfer file_transfer, Conversation conversation) {
-        foreach (IncommingFileProcessor processor in incomming_processors) {
-            if (processor.can_process(file_transfer)) {
-                processor.process(file_transfer);
-            }
-        }
-        save_file(file_transfer);
+    public bool is_sender_trustworthy(FileTransfer file_transfer, Conversation conversation) {
+        Jid relevant_jid = stream_interactor.get_module(MucManager.IDENTITY).get_real_jid(file_transfer.from, conversation.account) ?? conversation.counterpart;
+        bool in_roster = stream_interactor.get_module(RosterManager.IDENTITY).get_roster_item(conversation.account, relevant_jid) != null;
+        return file_transfer.direction == FileTransfer.DIRECTION_SENT || in_roster;
+    }
+
+    private async void handle_incomming_file(FileProvider file_provider, FileTransfer file_transfer, Conversation conversation) {
+        if (!is_sender_trustworthy(file_transfer, conversation)) return;
+
+        string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name;
+        File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename));
+        yield file_provider.download(file_transfer, file);
 
         try {
             FileInfo file_info = file_transfer.get_file().query_info("*", FileQueryInfoFlags.NONE);
@@ -170,6 +175,7 @@ public class FileManager : StreamInteractionModule, Object {
 
 public interface FileProvider : Object {
     public signal void file_incoming(FileTransfer file_transfer, Conversation conversation);
+    public abstract async void download(FileTransfer file_transfer, File file);
 }
 
 public interface FileSender : Object {
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala
index b9197f90..41a2c6a0 100644
--- a/libdino/src/service/module_manager.vala
+++ b/libdino/src/service/module_manager.vala
@@ -77,6 +77,7 @@ public class ModuleManager {
             module_map[account].add(new Xep.DelayedDelivery.Module());
             module_map[account].add(new StreamError.Module());
             module_map[account].add(new Xep.InBandRegistration.Module());
+            module_map[account].add(new Xep.HttpFileUpload.Module());
             initialize_account_modules(account, module_map[account]);
         }
     }