From 5f51ed0210b24393098f9cd46620db07bb1eda8c Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 16 Nov 2018 09:44:21 -0800
Subject: [PATCH] Keep pending content per remote address

---
 domain-server/src/DomainServer.cpp | 28 ++++++++++++++++------------
 domain-server/src/DomainServer.h   |  5 +++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 3e68cd0fc4..670e179f81 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2521,33 +2521,37 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u
 bool DomainServer::processPendingContent(HTTPConnection* connection, QString itemName, QString filename, QByteArray dataChunk) {
     if (filename.endsWith(".zip", Qt::CaseInsensitive)) {
         static const QString TEMPORARY_CONTENT_FILEPATH { QDir::tempPath() + "/hifiUploadContent_XXXXXX.zip" };
+        const auto peerAddressHash = qHash(connection->socket()->peerAddress());
 
-        if (!_pendingFileContent) {
-            _pendingFileContent = std::make_unique<QTemporaryFile>(TEMPORARY_CONTENT_FILEPATH);
+        if (_pendingContentFiles.find(peerAddressHash) == _pendingContentFiles.end()) {
+            _pendingContentFiles.emplace(peerAddressHash, TEMPORARY_CONTENT_FILEPATH);
         }
-        if (!_pendingFileContent->open()) {
-            _pendingFileContent = nullptr;
+
+        QTemporaryFile& _pendingFileContent = _pendingContentFiles[peerAddressHash];
+        if (!_pendingFileContent.open()) {
+            _pendingContentFiles.erase(peerAddressHash);
             connection->respond(HTTPConnection::StatusCode400);
             return false;
         }
-        _pendingFileContent->seek(_pendingFileContent->size());
-        _pendingFileContent->write(dataChunk);
-        _pendingFileContent->close();
+        _pendingFileContent.seek(_pendingFileContent.size());
+        _pendingFileContent.write(dataChunk);
+        _pendingFileContent.close();
         
         // Respond immediately - will timeout if we wait for restore.
         connection->respond(HTTPConnection::StatusCode200);
         if (itemName == "restore-file-chunk-final" || itemName == "restore-file") {
             auto deferred = makePromise("recoverFromUploadedBackup");
 
-            deferred->then([this](QString error, QVariantMap result) {
-                _pendingFileContent = nullptr;
+            deferred->then([this, peerAddressHash](QString error, QVariantMap result) {
+                _pendingContentFiles.erase(peerAddressHash);
             });
 
-            _contentManager->recoverFromUploadedFile(deferred, _pendingFileContent->fileName());
-        } else {
+            _contentManager->recoverFromUploadedFile(deferred, _pendingFileContent.fileName());
         }
     } else if (filename.endsWith(".json", Qt::CaseInsensitive)
         || filename.endsWith(".json.gz", Qt::CaseInsensitive)) {
+        auto peerAddressHash = qHash(connection->socket()->peerAddress());
+        QByteArray& _pendingUploadedContent = _pendingUploadedContents[peerAddressHash];
         _pendingUploadedContent += dataChunk;
         connection->respond(HTTPConnection::StatusCode200);
 
@@ -2555,7 +2559,7 @@ bool DomainServer::processPendingContent(HTTPConnection* connection, QString ite
             // invoke our method to hand the new octree file off to the octree server
             QMetaObject::invokeMethod(this, "handleOctreeFileReplacement",
                 Qt::QueuedConnection, Q_ARG(QByteArray, _pendingUploadedContent));
-            _pendingUploadedContent.clear();
+            _pendingUploadedContents.erase(peerAddressHash);
         }
     } else {
         connection->respond(HTTPConnection::StatusCode400);
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 73e23bb3fe..2d5729be59 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -20,6 +20,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QThread>
 #include <QtCore/QUrl>
+#include <QHostAddress>
 #include <QAbstractNativeEventFilter>
 
 #include <Assignment.h>
@@ -283,8 +284,8 @@ private:
 
     QHash<QUuid, QPointer<HTTPSConnection>> _pendingOAuthConnections;
 
-    QByteArray _pendingUploadedContent;
-    std::unique_ptr<QTemporaryFile> _pendingFileContent;
+    std::unordered_map<uint, QByteArray> _pendingUploadedContents;
+    std::unordered_map<uint, QTemporaryFile> _pendingContentFiles;
 
     QThread _assetClientThread;
 };