From 9330c3d4f32162f7f8d247d1217dcaee75701f6b Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 22 Jan 2016 15:55:43 -0800 Subject: [PATCH] Fix DS assignment scripts responses --- domain-server/src/DomainServer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 8d9a28513d..db3c2df408 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1171,7 +1171,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url const QString JSON_MIME_TYPE = "application/json"; const QString URI_ASSIGNMENT = "/assignment"; - const QString URI_ASSIGNMENT_SCRIPTS = URI_ASSIGNMENT + "/scripts"; const QString URI_NODES = "/nodes"; const QString URI_SETTINGS = "/settings"; @@ -1212,13 +1211,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 - - QUrl scriptURL = url; - scriptURL.setPath(URI_ASSIGNMENT + "/scripts/" - + uuidStringWithoutCurlyBraces(matchingAssignment->getUUID())); - - // have the HTTPManager serve the appropriate script file - return _httpManager.handleHTTPRequest(connection, scriptURL, true); + QFile scriptFile(pathForAssignmentScript(matchingAssignment->getUUID())); + + if (scriptFile.exists() && scriptFile.open(QIODevice::ReadOnly)) { + connection->respond(HTTPConnection::StatusCode200, scriptFile.readAll(), "application/javascript"); + } else { + connection->respond(HTTPConnection::StatusCode404, "Resource not found."); + } + return true; } // request not handled