Process cookies on each redirect; upgrade to a more compliant cookie jar

lib/shred.js

@@ -7,8 +7,8 @@
 // Ax is a nice logging library we wrote. You can use any logger, providing it
 // has `info`, `warn`, `debug`, and `error` methods that take a string.
 var Ax = require("ax")
-  , CookieJarLib = require( "cookiejar" )
-  , CookieJar = CookieJarLib.CookieJar
+  , CookieLib = require( "tough-cookie" )
+  , CookieJar = CookieLib.CookieJar
 ;
 
 // Shred takes some options, including a logger and request defaults.

lib/shred/request.js

@@ -361,21 +361,6 @@ var processOptions = function(request,options) {
   // User-Agent string.
   request.setHeader("user-agent",options.agent||"Shred");
   request.setHeaders(options.headers);
-
-  if (request.cookieJar) {
-    var cookies = request.cookieJar.getCookies( CookieAccessInfo( request.host, request.path ) );
-    if (cookies.length) {
-      var cookieString = request.getHeader('cookie')||'';
-      for (var cookieIndex = 0; cookieIndex < cookies.length; ++cookieIndex) {
-          if ( cookieString.length && cookieString[ cookieString.length - 1 ] != ';' )
-          {
-              cookieString += ';';
-          }
-          cookieString += cookies[ cookieIndex ].name + '=' + cookies[ cookieIndex ].value + ';';
-      }
-      request.setHeader("cookie", cookieString);
-    }
-  }
 
   // The content entity can be set either using the `body` or `content` attributes.
   if (options.body||options.content) {
@@ -389,13 +374,30 @@ var processOptions = function(request,options) {
   }
 };
 
+var processCookies = function (request) {
+  if (request.cookieJar) {
+    request.cookieJar.getCookies(request.url, function (err, cookies) {
+      if (cookies.length > 0) {
+        // need the .cookieString value, not the .toString value
+        var keyValueStrings = cookies.map(function (cookie) {
+          return cookie.cookieString();
+        });
+        request.setHeader("Cookie", keyValueStrings.join("; "));
+      }
+    });
+  }
+};
+
 // `createRequest` is also called by the constructor, after `processOptions`.
 // This actually makes the request and processes the response, so `createRequest`
 // is a bit of a misnomer.
 
 var createRequest = function(request) {
   var timeoutId ;
 
+  delete request._raw; // remove old raw request
+  processCookies(request); // re-process cookies
+
   request.log.debug("Creating request ..");
   request.log.debug(request);
 

lib/shred/response.js

@@ -2,8 +2,6 @@
 
 var Content = require("./content")
   , HeaderMixins = require("./mixins/headers")
-  , CookieJarLib = require( "cookiejar" )
-  , Cookie = CookieJarLib.Cookie
 ;
 
 // Browser doesn't have zlib.
@@ -36,35 +34,10 @@ var Response = function(raw, request, callback) {
 
   // store any cookies
   if (request.cookieJar && this.getHeader('set-cookie')) {
-    var cookieStrings = this.getHeader('set-cookie');
-    var cookieObjs = []
-      , cookie;
-
-    for (var i = 0; i < cookieStrings.length; i++) {
-      var cookieString = cookieStrings[i];
-      if (!cookieString) {
-        continue;
-      }
-
-      if (!cookieString.match(/domain\=/i)) {
-        cookieString += '; domain=' + request.host;
-      }
-
-      if (!cookieString.match(/path\=/i)) {
-        cookieString += '; path=' + request.path;
-      }
-
-      try {
-        cookie = new Cookie(cookieString);
-        if (cookie) {
-          cookieObjs.push(cookie);
-        }
-      } catch (e) {
-        console.warn("Tried to set bad cookie: " + cookieString);
-      }
+    var cookieHeaders = this.getHeader('set-cookie');
+    for (var i = 0; i < cookieHeaders.length; i++) {
+      request.cookieJar.setCookie(cookieHeaders[i], request.url, function () {});
     }
-
-    request.cookieJar.setCookies(cookieObjs);
   }
 
   this.request = request;

package.json

@@ -42,7 +42,7 @@
    "dependencies": {
       "sprintf": "0.1.1",
       "ax": "0.1.8",
-      "cookiejar": "1.3.x",
+      "tough-cookie": ">=0.9.15",
       "iconv-lite": ">= 0.1.2"
    },
    "devDependencies": {