feat: handle tunnel rules

avwo · Aug 10, 2018 · 8c1859a · 8c1859a
1 parent fe0ced5
commit 8c1859a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/init.js b/lib/init.js
@@ -111,7 +111,7 @@ module.exports = function(req, res, next) {
     var tunnelRules = req.headers[TUNNEL_KEY];
     if (tunnelRules) {
       try {
-        socket.tunnelRules = JSON.parse(tunnelRules);
+        socket.tunnelRules = JSON.parse(decodeURIComponent(tunnelRules));
       } catch(e) {}
     }
   }

diff --git a/lib/rules/index.js b/lib/rules/index.js
@@ -292,7 +292,7 @@ function getTunneRules(req) {
   tunnelRules = req.headers[TUNNEL_KEY];
   if (tunnelRules) {
     try {
-      return JSON.parse(tunnelRules);
+      return JSON.parse(decodeURIComponent(tunnelRules));
     } catch(e) {}
   }
   return '';
@@ -324,7 +324,7 @@ function getHost(req, tunnelRules) {
   if (tunnelHost && host !== tunnelHost && tunnelHost !== getFullHost(req)) {
     tunnelHost = host.split(':')[0] + ' host://' + tunnelHost +
       ' # from tunnel';
-    return hostHeader ? hostHeader + '\n' + tunnelHost : tunnelHost;
+    return joinRules(hostHeader, tunnelHost);
   }
   return hostHeader;
 }