From 1fc9997ef6d2a02d7d396941e27d4b404e4b80d1 Mon Sep 17 00:00:00 2001 From: Alphastaire Date: Mon, 12 Aug 2024 16:15:41 -0700 Subject: [PATCH] Sanitize internal storage file names Sanitize an internally downloaded file's name during save process to prevent file transfer error for Windows users. --- libdino/src/service/file_manager.vala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala index ed9524cb8..4d5d378df 100644 --- a/libdino/src/service/file_manager.vala +++ b/libdino/src/service/file_manager.vala @@ -46,6 +46,12 @@ public class FileManager : StreamInteractionModule, Object { return ret; } + // Required to allow Windows users to receive files with illegal characters in name + private string sanitize_filename(string filename) { + GLib.Regex regex = new GLib.Regex("[<>:\"/\\|?*]"); + return regex.replace(filename, -1, 0, "_"); + } + public async void send_file(File file, Conversation conversation) { FileTransfer file_transfer = new FileTransfer(); file_transfer.account = conversation.account; @@ -243,7 +249,7 @@ public class FileManager : StreamInteractionModule, Object { } // Save file - string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name; + string filename = Random.next_int().to_string("%x") + "_" + sanitize_filename(file_transfer.file_name); File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename)); OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION); @@ -332,7 +338,7 @@ public class FileManager : StreamInteractionModule, Object { private async void save_file(FileTransfer file_transfer) throws FileSendError { try { - string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name; + string filename = Random.next_int().to_string("%x") + "_" + sanitize_filename(file_transfer.file_name); File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename)); OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION); yield os.splice_async(file_transfer.input_stream, OutputStreamSpliceFlags.CLOSE_SOURCE|OutputStreamSpliceFlags.CLOSE_TARGET);