From c7751efa711d5f59024beee0102be8e1ed2ac25d Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Thu, 14 May 2020 15:08:28 +0200
Subject: [PATCH] Some updates

---
 file/include/files/FileServer.h            |  4 +++-
 file/local_server/LocalFileTransfer.cpp    | 11 +++++++++++
 server/src/FileServerHandler.cpp           |  4 ++++
 server/src/client/command_handler/file.cpp | 11 +++++++++++
 shared                                     |  2 +-
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/file/include/files/FileServer.h b/file/include/files/FileServer.h
index da63a13..8f815b7 100644
--- a/file/include/files/FileServer.h
+++ b/file/include/files/FileServer.h
@@ -273,7 +273,9 @@ namespace ts::server::file {
                 NETWORK_IO_ERROR,
 
                 UNEXPECTED_CLIENT_DISCONNECT,
-                UNEXPECTED_DISK_EOF
+                UNEXPECTED_DISK_EOF,
+
+                USER_REQUEST
             } error_type{UNKNOWN};
             std::string error_message{};
         };
diff --git a/file/local_server/LocalFileTransfer.cpp b/file/local_server/LocalFileTransfer.cpp
index 3ab049f..8633a94 100644
--- a/file/local_server/LocalFileTransfer.cpp
+++ b/file/local_server/LocalFileTransfer.cpp
@@ -248,6 +248,15 @@ std::shared_ptr<ExecuteResponse<TransferInitError, std::shared_ptr<Transfer>>> L
             response->emplace_fail(TransferInitError::IO_ERROR, "file_size");
             return response;
         }
+
+        if(info.download_client_quota_limit > 0 && info.download_client_quota_limit <= transfer->expected_file_size) {
+            response->emplace_fail(TransferInitError::CLIENT_QUOTA_EXCEEDED, "");
+            return response;
+        }
+        if(info.download_server_quota_limit > 0 && info.download_server_quota_limit <= transfer->expected_file_size) {
+            response->emplace_fail(TransferInitError::SERVER_QUOTA_EXCEEDED, "");
+            return response;
+        }
     }
 
     {
@@ -297,11 +306,13 @@ std::shared_ptr<ExecuteResponse<TransferActionError>> LocalFileTransfer::stop_tr
     }
 
     if(connected_transfer) {
+        this->invoke_aborted_callback(connected_transfer, { TransferError::USER_REQUEST, "" });
         logMessage(LOG_FT, "{} Stopping transfer due to an user request.", connected_transfer->log_prefix());
 
         std::unique_lock slock{connected_transfer->state_mutex};
         this->disconnect_client(connected_transfer, slock, flush);
     } else {
+        this->invoke_aborted_callback(transfer, { TransferError::USER_REQUEST, "" });
         logMessage(LOG_FT, "Removing pending file transfer for id {}", id);
     }
 
diff --git a/server/src/FileServerHandler.cpp b/server/src/FileServerHandler.cpp
index d863d31..7b92e92 100644
--- a/server/src/FileServerHandler.cpp
+++ b/server/src/FileServerHandler.cpp
@@ -123,6 +123,10 @@ void FileServerHandler::callback_transfer_aborted(const std::shared_ptr<transfer
             case ErrorType::UNEXPECTED_DISK_EOF:
                 notify.put_unchecked(0, "status", (int) error::file_transfer_interrupted);
                 notify.put_unchecked(0, "msg", findError(error::file_transfer_interrupted).message);
+
+            case ErrorType::USER_REQUEST:
+                notify.put_unchecked(0, "status", (int) error::file_transfer_canceled);
+                notify.put_unchecked(0, "msg", findError(error::file_transfer_canceled).message);
                 break;
         }
         notify.put_unchecked(0, "extra_msg", error.error_message);
diff --git a/server/src/client/command_handler/file.cpp b/server/src/client/command_handler/file.cpp
index bb1b2a3..cd4fa60 100644
--- a/server/src/client/command_handler/file.cpp
+++ b/server/src/client/command_handler/file.cpp
@@ -569,6 +569,11 @@ command_result ConnectedClient::handleCommandFTInitUpload(ts::Command &cmd) {
     std::shared_ptr<file::ExecuteResponse<file::transfer::TransferInitError, std::shared_ptr<file::transfer::Transfer>>> transfer_response{};
 
     info.max_bandwidth = -1;
+    {
+        auto max_quota = this->calculate_permission(permission::i_ft_max_bandwidth_upload, this->getClientId());
+        if(max_quota.has_value)
+            info.max_bandwidth = max_quota.value;
+    }
     info.file_offset = 0;
     info.expected_file_size = cmd["size"].as<size_t>();
     info.override_exiting = cmd["overwrite"].as<bool>();
@@ -721,6 +726,12 @@ command_result ConnectedClient::handleCommandFTInitDownload(ts::Command &cmd) {
     }
 
     info.max_bandwidth = -1;
+    {
+        auto max_quota = this->calculate_permission(permission::i_ft_max_bandwidth_download, this->getClientId());
+        if(max_quota.has_value)
+            info.max_bandwidth = max_quota.value;
+    }
+
     info.file_offset = cmd["seekpos"].as<size_t>();
     info.override_exiting = false;
     info.file_path = cmd["name"].string();
diff --git a/shared b/shared
index a4febf7..f404d5e 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit a4febf7b5af191d41c566292958c55155128f16f
+Subproject commit f404d5e1fa5ed1cfbe3ef9a97c0e81c1fba943ff