From f0e7bf0462228dcc24605ab3723e1235edec4092 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 31 Jul 2014 15:13:33 -0700
Subject: [PATCH] allow assignments to pull script without session cookie

---
 domain-server/src/DomainServer.cpp | 65 +++++++++++++++---------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 2ea66c2ee3..e05025284b 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -952,6 +952,39 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
         return true;
     }
     
+    // check if this is a request for a scripted assignment (with a temp unique UUID)
+    const QString  ASSIGNMENT_REGEX_STRING = QString("\\%1\\/(%2)\\/?$").arg(URI_ASSIGNMENT).arg(UUID_REGEX_STRING);
+    QRegExp assignmentRegex(ASSIGNMENT_REGEX_STRING);
+    
+    if (connection->requestOperation() == QNetworkAccessManager::GetOperation
+        && assignmentRegex.indexIn(url.path()) != -1) {
+        QUuid matchingUUID = QUuid(assignmentRegex.cap(1));
+        
+        SharedAssignmentPointer matchingAssignment = _allAssignments.value(matchingUUID);
+        if (!matchingAssignment) {
+            // check if we have a pending assignment that matches this temp UUID, and it is a scripted assignment
+            PendingAssignedNodeData* pendingData = _pendingAssignedNodes.value(matchingUUID);
+            if (pendingData) {
+                matchingAssignment = _allAssignments.value(pendingData->getAssignmentUUID());
+                
+                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 + "/"
+                                      + uuidStringWithoutCurlyBraces(pendingData->getAssignmentUUID()));
+                    
+                    // have the HTTPManager serve the appropriate script file
+                    return _httpManager.handleHTTPRequest(connection, scriptURL);
+                }
+            }
+        }
+        
+        // request not handled
+        return false;
+    }
+    
     if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
         if (url.path() == "/assignments.json") {
             // user is asking for json list of assignments
@@ -1068,38 +1101,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
                 return false;
             }
-
-            // check if this is a request for a scripted assignment (with a temp unique UUID)
-            const QString  ASSIGNMENT_REGEX_STRING = QString("\\%1\\/(%2)\\/?$").arg(URI_ASSIGNMENT).arg(UUID_REGEX_STRING);
-            QRegExp assignmentRegex(ASSIGNMENT_REGEX_STRING);
-
-            if (assignmentRegex.indexIn(url.path()) != -1) {
-                QUuid matchingUUID = QUuid(assignmentRegex.cap(1));
-
-                SharedAssignmentPointer matchingAssignment = _allAssignments.value(matchingUUID);
-                if (!matchingAssignment) {
-                    // check if we have a pending assignment that matches this temp UUID, and it is a scripted assignment
-                    PendingAssignedNodeData* pendingData = _pendingAssignedNodes.value(matchingUUID);
-                    if (pendingData) {
-                        matchingAssignment = _allAssignments.value(pendingData->getAssignmentUUID());
-
-                        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 + "/"
-                                              + uuidStringWithoutCurlyBraces(pendingData->getAssignmentUUID()));
-
-                            // have the HTTPManager serve the appropriate script file
-                            return _httpManager.handleHTTPRequest(connection, scriptURL);
-                        }
-                    }
-                }
-
-                // request not handled
-                return false;
-            }
         }
     } else if (connection->requestOperation() == QNetworkAccessManager::PostOperation) {
         if (url.path() == URI_ASSIGNMENT) {