From ae2404d1f34c5ef6c7e12a83920ec539d80ebed6 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 12 Dec 2013 21:52:36 -0800
Subject: [PATCH 1/4] Remove trailing slashes on pathnames for proxy bindings

---
 packages/webapp/webapp_server.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 80841838f4..207f944f15 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -661,7 +661,7 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
         throw err;
       outstanding--;
       checkComplete();
-    }
+    };
   };
 
   // for now, have our (temporary) requiresAuth flag apply to all
@@ -701,7 +701,8 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
         parsedUrl.pathname = "";
       if (! parsedUrl.pathname.indexOf("/") !== 0) {
         // Relative path
-        parsedUrl.pathname = bindPathPrefix + "/" + parsedUrl.pathname;
+        parsedUrl.pathname = bindPathPrefix +
+          (parsedUrl.pathname !== "" ? "/" + parsedUrl.pathname : "");
       }
     }
 

From 4ba6d3f08d9f387b5e83daa11c7ea0e2e8c4b754 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 12 Dec 2013 23:34:22 -0800
Subject: [PATCH 2/4] Correct use of  on galaxy login

---
 tools/auth.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/auth.js b/tools/auth.js
index 45e03a39e4..f1aebed691 100644
--- a/tools/auth.js
+++ b/tools/auth.js
@@ -355,11 +355,11 @@ var logInToGalaxy = function (galaxyName) {
 
   if (response.statusCode !== 200 ||
       ! body ||
-      ! _.has(response.setCookie, 'GALAXY_AUTH'))
+      ! _.has(galaxyResult.setCookie, 'GALAXY_AUTH'))
     return { error: 'access-denied' };
 
   return {
-    token: response.setCookie.GALAXY_AUTH,
+    token: galaxyResult.setCookie.GALAXY_AUTH,
     tokenId: body.tokenId
   };
 };

From 1ab704be4542a54e7acf6c15635e069c1fb4af40 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 12 Dec 2013 23:35:09 -0800
Subject: [PATCH 3/4] Fix double slash in proxy pathname

---
 packages/webapp/webapp_server.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 207f944f15..c760488a04 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -701,8 +701,7 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
         parsedUrl.pathname = "";
       if (! parsedUrl.pathname.indexOf("/") !== 0) {
         // Relative path
-        parsedUrl.pathname = bindPathPrefix +
-          (parsedUrl.pathname !== "" ? "/" + parsedUrl.pathname : "");
+        parsedUrl.pathname = bindPathPrefix + parsedUrl.pathname;
       }
     }
 

From 685431fb20a2af8bcd5a8f76540f4f19d0e75443 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 12 Dec 2013 23:35:52 -0800
Subject: [PATCH 4/4] Fix check on forwardTo url

---
 packages/webapp/webapp_server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index c760488a04..c3dc8fee9a 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -721,8 +721,8 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
       proxyToPort = ourPort;
       proxyToPathPrefix = bindPathPrefix;
     } else {
-      var parsedFwdUrl = url.parse(route.forwardTo);
-      if (! parsedUrl.hostname || parsedUrl.protocol)
+      var parsedFwdUrl = url.parse(route.forwardTo, false, true);
+      if (! parsedFwdUrl.hostname || parsedFwdUrl.protocol)
         throw new Error("Bad forward url");
       proxyToHost = parsedFwdUrl.hostname;
       proxyToPort = parseInt(parsedFwdUrl.port || "80");