From 811859e46fb1f83f4c5b4d10b7b749a837b3f6c4 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 10 Feb 2016 15:26:01 -0800
Subject: [PATCH] Update domain server to store temporary AC scripts in memory

---
 domain-server/src/DomainServer.cpp | 32 ++++++++++--------------------
 domain-server/src/DomainServer.h   |  2 ++
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 64b4f123f5..d1cb9d4e4a 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -55,6 +55,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     _oauthProviderURL(),
     _oauthClientID(),
     _hostname(),
+    _ephemeralACScripts(),
     _webAuthenticationStateSet(),
     _cookieSessionHash(),
     _automaticNetworkingSetting(),
@@ -1211,13 +1212,14 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
         if (matchingAssignment && matchingAssignment->getType() == Assignment::AgentType) {
             // we have a matching assignment and it is for the right type, have the HTTP manager handle it
             // via correct URL for the script so the client can download
-            QFile scriptFile(pathForAssignmentScript(matchingAssignment->getUUID()));
+            const auto it = _ephemeralACScripts.find(matchingAssignment->getUUID());
 
-            if (scriptFile.exists() && scriptFile.open(QIODevice::ReadOnly)) {
-                connection->respond(HTTPConnection::StatusCode200, scriptFile.readAll(), "application/javascript");
+            if (it != _ephemeralACScripts.end()) {
+                connection->respond(HTTPConnection::StatusCode200, it->second, "application/javascript");
             } else {
                 connection->respond(HTTPConnection::StatusCode404, "Resource not found.");
             }
+
             return true;
         }
         
@@ -1387,29 +1389,15 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
 
             for (int i = 0; i < numInstances; i++) {
-
                 // create an assignment for this saved script
                 Assignment* scriptAssignment = new Assignment(Assignment::CreateCommand, Assignment::AgentType, assignmentPool);
 
-                QString newPath = pathForAssignmentScript(scriptAssignment->getUUID());
+                _ephemeralACScripts[scriptAssignment->getUUID()] = formData[0].second;
 
-                // create a file with the GUID of the assignment in the script host location
-                QFile scriptFile(newPath);
-                if (scriptFile.open(QIODevice::WriteOnly)) {
-                    scriptFile.write(formData[0].second);
-
-                    qDebug() << qPrintable(QString("Saved a script for assignment at %1%2")
-                                           .arg(newPath).arg(assignmentPool == emptyPool ? "" : " - pool is " + assignmentPool));
-
-                    // add the script assigment to the assignment queue
-                    SharedAssignmentPointer sharedScriptedAssignment(scriptAssignment);
-                    _unfulfilledAssignments.enqueue(sharedScriptedAssignment);
-                    _allAssignments.insert(sharedScriptedAssignment->getUUID(), sharedScriptedAssignment);
-                } else {
-                    // unable to save script for assignment - we shouldn't be here but debug it out
-                    qDebug() << "Unable to save a script for assignment at" << newPath;
-                    qDebug() << "Script will not be added to queue";
-                }
+                // add the script assigment to the assignment queue
+                SharedAssignmentPointer sharedScriptedAssignment(scriptAssignment);
+                _unfulfilledAssignments.enqueue(sharedScriptedAssignment);
+                _allAssignments.insert(sharedScriptedAssignment->getUUID(), sharedScriptedAssignment);
             }
 
             // respond with a 200 code for successful upload
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index a4892b446b..afdd7bd26e 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -142,6 +142,8 @@ private:
     QString _oauthClientSecret;
     QString _hostname;
 
+    std::unordered_map<QUuid, QByteArray> _ephemeralACScripts;
+
     QSet<QUuid> _webAuthenticationStateSet;
     QHash<QUuid, DomainServerWebSessionData> _cookieSessionHash;