Merge remote-tracking branch 'glynnbird/scrubauth' into HEAD

apache · Sep 13, 2015 · fb384c9 · fb384c9
2 parents 4a3f525 + 0f7752d
commit fb384c9
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/lib/nano.js b/lib/nano.js
@@ -60,6 +60,13 @@ module.exports = exports = nano = function dbScope(cfg) {
       return db;
     }
   }
+
+  function scrub(str) {
+    if (str) {
+      str = str.replace(/\/\/(.*)@/,"//XXXXXX:XXXXXX@");
+    }
+    return str;
+  }
 
   function relax(opts, callback) {
     if (typeof opts === 'function') {
@@ -224,6 +231,13 @@ module.exports = exports = nano = function dbScope(cfg) {
       // fix cloudant issues where they give an erlang stacktrace as js
       delete parsed.stack;
 
+      // scrub credentials
+      req.uri = scrub(req.uri);
+      rh.uri = scrub(rh.uri);
+      if (req.headers.cookie) {
+        req.headers.cookie = "XXXXXXX";
+      }
+
       callback(errs.merge({
         message: 'couch returned ' + rh.statusCode,
         scope: 'couch',