enable no-shadow lint warnings

remove all shadow variables

Author: msimerson

.eslintrc

@@ -8,6 +8,9 @@
     "one-var": [2, "never"],
     "no-trailing-spaces": [2, { "skipBlankLines": false }],
     "keyword-spacing": [2, {"overrides": {
-      }}]
+      }}],
+    "no-delete-var": 2,
+    "no-label-var": 2,
+    "no-shadow": 2,
   }
 }

.travis.yml

@@ -3,8 +3,8 @@ node_js:
 #   - "0.6"     # no longer supported by async
 #   - "0.8"     # no longer supported by iconv
     - "0.10"
-    - "4.3"
-    - "5.6"
+    - "4"
+    - "5"
 
 services:
     - redis-server

configfile.js

@@ -193,7 +193,6 @@ cfreader.ensure_enoent_timer = function () {
     cfreader._enoent_timer = setInterval(function () {
         var files = Object.keys(cfreader._enoent_files);
         for (var i=0; i<files.length; i++) {
-            var file = files[i];
             /* BLOCK SCOPE */
             (function (file) {
                 fs.stat(file, function (err) {
@@ -206,7 +205,7 @@ cfreader.ensure_enoent_timer = function () {
                         file, {persistent: false},
                         cfreader.on_watch_event(file, args.type, args.options, args.cb));
                 });
-            })(file); // END BLOCK SCOPE
+            })(files[i]); // END BLOCK SCOPE
         }
     }, 60 * 1000);
 };

connection.js

@@ -19,7 +19,7 @@ var plugins     = require('./plugins');
 var constants   = require('./constants');
 var rfc1869     = require('./rfc1869');
 var Address     = require('./address').Address;
-var uuid        = require('./utils').uuid;
+var utils       = require('./utils');
 var outbound    = require('./outbound');
 var date_to_str = require('./utils').date_to_str;
 var indexOfLF   = require('./utils').indexOfLF;
@@ -49,14 +49,14 @@ var nextTick = setImmediate || process.nextTick;
 // copy logger methods into Connection:
 for (var key in logger) {
     if (!/^log\w/.test(key)) continue;
-    Connection.prototype[key] = (function (key) {
+    Connection.prototype[key] = (function (level) {
         return function () {
             // pass the connection instance to logger
             var args = [ this ];
             for (var i=0, l=arguments.length; i<l; i++) {
                 args.push(arguments[i]);
             }
-            logger[key].apply(logger, args);
+            logger[level].apply(logger, args);
         };
     })(key);
 }
@@ -175,7 +175,7 @@ function Connection(client, server) {
     this.prev_state = null;
     this.loop_code = null;
     this.loop_msg = null;
-    this.uuid = uuid();
+    this.uuid = utils.uuid();
     this.notes = {};
     this.transaction = null;
     this.tran_count = 0;
@@ -466,13 +466,15 @@ Connection.prototype.respond = function(code, msg, func) {
     }
     if (!(Array.isArray(msg))) {
         // msg not an array, make it so:
-        messages = msg.toString().split(/\n/).filter(function (msg) {
-            return /\S/.test(msg);
+        messages = msg.toString().split(/\n/).filter(function (msg2) {
+            return /\S/.test(msg2);
         });
     }
     else {
         // copy
-        messages = msg.slice().filter(function (msg) { return /\S/.test(msg);});
+        messages = msg.slice().filter(function (msg2) {
+            return /\S/.test(msg2);
+        });
     }
 
     if (code >= 400) {
@@ -1643,7 +1645,7 @@ Connection.prototype.store_queue_result = function (retval, msg) {
     }
 };
 
-Connection.prototype.queue_outbound_respond = function(retval, msg) {
+Connection.prototype.queue_outbound_respond = function (retval, msg) {
     var self = this;
     if (!msg) msg = this.queue_msg(retval, msg);
     this.store_queue_result(retval, msg);
@@ -1680,25 +1682,25 @@ Connection.prototype.queue_outbound_respond = function(retval, msg) {
             });
             break;
         default:
-            outbound.send_email(this.transaction, function(retval, msg) {
-                if (!msg) msg = self.queue_msg(retval, msg);
-                switch (retval) {
+            outbound.send_email(this.transaction, function(retval2, msg2) {
+                if (!msg2) msg2 = self.queue_msg(retval2, msg2);
+                switch (retval2) {
                     case constants.ok:
-                        if (!msg) msg = self.queue_msg(retval, msg);
-                        plugins.run_hooks('queue_ok', self, msg);
+                        if (!msg2) msg2 = self.queue_msg(retval2, msg2);
+                        plugins.run_hooks('queue_ok', self, msg2);
                         break;
                     case constants.deny:
-                        if (!msg) msg = self.queue_msg(retval, msg);
-                        self.respond(550, msg, function() {
+                        if (!msg2) msg2 = self.queue_msg(retval2, msg2);
+                        self.respond(550, msg2, function() {
                             self.msg_count.reject++;
                             self.reset_transaction(function () {
                                 self.resume();
                             });
                         });
                         break;
                     default:
-                        self.logerror("Unrecognised response from outbound layer: " + retval + " : " + msg);
-                        self.respond(550, msg || "Internal Server Error", function() {
+                        self.logerror("Unrecognised response from outbound layer: " + retval2 + " : " + msg2);
+                        self.respond(550, msg2 || "Internal Server Error", function() {
                             self.msg_count.reject++;
                             self.reset_transaction(function () {
                                 self.resume();

dkim.js

@@ -329,8 +329,8 @@ DKIMObject.prototype.end = function () {
             self.debug(self.identity + ': got DNS record: ' + record);
             var rec = record.replace(/\r?\n/g, '').replace(/\s+/g,'');
             var split = rec.split(';');
-            for (var i=0; i<split.length; i++) {
-                var split2 = split[i].split('=');
+            for (var j=0; j<split.length; j++) {
+                var split2 = split[j].split('=');
                 if (split2[0]) self.dns_fields[split2[0]] = split2[1];
             }
 
@@ -358,8 +358,8 @@ DKIMObject.prototype.end = function () {
             }
             if (self.dns_fields.h) {
                 var hashes = self.dns_fields.h.split(':');
-                for (var h=0; h<hashes.length; h++) {
-                    var hash = hashes[h].trim();
+                for (var k=0; k<hashes.length; k++) {
+                    var hash = hashes[k].trim();
                     if (self.fields.a.indexOf(hash) === -1) {
                         return self.result('inappropriate hash algorithm', 'invalid');
                     }

fsync_writestream.js

@@ -39,9 +39,9 @@ if (version > 0 || subversion >= 10) {
                     self.emit('error', er);
                 }
                 else {
-                    fs.close(fd || self.fd, function(er) {
-                        if (er) {
-                            self.emit('error', er);
+                    fs.close(fd || self.fd, function(err) {
+                        if (err) {
+                            self.emit('error', err);
                         }
                         else {
                             self.emit('close');

logger.js

@@ -24,8 +24,8 @@ logger.levels = {
     EMERG:    0,
 };
 
-for (var level in logger.levels) {
-    logger['LOG' + level] = logger.levels[level];
+for (var le in logger.levels) {
+    logger['LOG' + le] = logger.levels[le];
 }
 
 logger.loglevel     = logger.LOGWARN;

mailheader.js

@@ -46,9 +46,9 @@ Header.prototype.parse = function (lines) {
     }
 
     // Now add decoded versions
-    Object.keys(this.headers).forEach(function (key) {
-        self.headers[key].forEach(function (val) {
-            self._add_header_decode(key, val, "push");
+    Object.keys(this.headers).forEach(function (key2) {
+        self.headers[key2].forEach(function (val2) {
+            self._add_header_decode(key2, val2, 'push');
         })
     })
 };

outbound.js

@@ -4,9 +4,10 @@ var fs          = require('fs');
 var path        = require('path');
 var dns         = require('dns');
 var net         = require('net');
-var util        = require("util");
-var events      = require("events");
+var util        = require('util');
+var events      = require('events');
 var os          = require('os');
+
 var utils       = require('./utils');
 var sock        = require('./line_socket');
 var logger      = require('./logger');
@@ -28,7 +29,7 @@ var core_consts = require('constants');
 var WRITE_EXCL  = core_consts.O_CREAT | core_consts.O_TRUNC | core_consts.O_WRONLY | core_consts.O_EXCL;
 
 var MAX_UNIQ = 10000;
-var host = require('os').hostname().replace(/\\/, '\\057').replace(/:/, '\\072');
+var my_hostname = require('os').hostname().replace(/\\/, '\\057').replace(/:/, '\\072');
 var fn_re = /^(\d+)_(\d+)_/; // I like how this looks like a person
 
 // TODO: For testability, this should be accessible
@@ -340,7 +341,7 @@ function _next_uniq () {
 
 function _fname () {
     var time = new Date().getTime();
-    return time + '_0_' + process.pid + "_" + _next_uniq() + '.' + host;
+    return time + '_0_' + process.pid + "_" + _next_uniq() + '.' + my_hostname;
 }
 
 exports.send_email = function () {
@@ -640,13 +641,13 @@ exports.TODOItem = TODOItem;
 
 var dummy_func = function () {};
 
-function HMailItem (filename, path, notes) {
+function HMailItem (filename, filePath, notes) {
     events.EventEmitter.call(this);
     var matches = filename.match(fn_re);
     if (!matches) {
         throw new Error("Bad filename: " + filename);
     }
-    this.path         = path;
+    this.path         = filePath;
     this.filename     = filename;
     this.next_process = matches[1];
     this.num_failures = matches[2];
@@ -666,22 +667,22 @@ exports.HMailItem = HMailItem;
 // populate log functions - so we can use hooks
 for (var key in logger) {
     if (key.match(/^log\w/)) {
-        exports[key] = (function (key) {
+        exports[key] = (function (key2) {
             return function () {
                 var args = ["[outbound] "];
                 for (var i=0, l=arguments.length; i<l; i++) {
                     args.push(arguments[i]);
                 }
-                logger[key].apply(logger, args);
+                logger[key2].apply(logger, args);
             };
         })(key);
-        HMailItem.prototype[key] = (function (key) {
+        HMailItem.prototype[key] = (function (key2) {
             return function () {
                 var args = [ this ];
                 for (var i=0, l=arguments.length; i<l; i++) {
                     args.push(arguments[i]);
                 }
-                logger[key].apply(logger, args);
+                logger[key2].apply(logger, args);
             };
         })(key);
     }
@@ -879,13 +880,13 @@ exports.lookup_mx = function lookup_mx (domain, cb) {
         // wrap_mx() to return same thing as resolveMx() does.
         wrap_mx = function (a) { return {priority:0,exchange:a}; };
         // IS: IPv6 compatible
-        dns.resolve(domain, function(err, addresses) {
-            if (process_dns(err, addresses)) {
+        dns.resolve(domain, function(err2, addresses2) {
+            if (process_dns(err2, addresses2)) {
                 return;
             }
-            err = new Error("Found nowhere to deliver to");
-            err.code = 'NOMX';
-            cb(err);
+            err2 = new Error("Found nowhere to deliver to");
+            err2.code = 'NOMX';
+            cb(err2);
         });
     });
 };
@@ -987,8 +988,8 @@ HMailItem.prototype.try_deliver = function () {
 
     this.loginfo("Looking up " + family + " records for: " + host);
 
-    // now we have a host, we have to lookup the addresses for that host
-    // and try each one in order they appear
+    // we have a host, look up the addresses for the host
+    // and try each in order they appear
     // IS: IPv6 compatible
     dns.resolve(host, family, function (err, addresses) {
         if (err) {
@@ -1050,7 +1051,9 @@ HMailItem.prototype.try_deliver_host_on_socket = function (mx, host, port, socke
     var self            = this;
     var processing_mail = true;
 
-    this.loginfo("Attempting to deliver to: " + host + ":" + port + (mx.using_lmtp ? " using LMTP" : "") + " (" + delivery_queue.length() + ") (" + temp_fail_queue.length() + ")");
+    this.loginfo("Attempting to deliver to: " + host + ":" + port +
+        (mx.using_lmtp ? " using LMTP" : "") + " (" + delivery_queue.length() +
+        ") (" + temp_fail_queue.length() + ")");
 
     socket.on('error', function (err) {
         if (processing_mail) {
@@ -1192,8 +1195,8 @@ HMailItem.prototype.try_deliver_host_on_socket = function (mx, host, port, socke
 
             if (!mx.auth_type || (mx.auth_type && smtp_properties.auth.indexOf(mx.auth_type.toUpperCase()) === -1)) {
                 // No compatible authentication types offered by the server
-                self.logwarn('AUTH configured for domain ' + self.todo.domain + ' but host ' + host +
-                             'did not offer any compatible types' +
+                self.logwarn('AUTH configured for domain ' + self.todo.domain + ' but host ' +
+                             host + 'did not offer any compatible types' +
                              ((mx.auth_type) ? ' (requested: ' + mx.auth_type + ')' : '') +
                              ' (offered: ' + smtp_properties.auth.join(',') + ')');
                 // Proceed without authentication
@@ -1404,9 +1407,9 @@ HMailItem.prototype.try_deliver_host_on_socket = function (mx, host, port, socke
                         process_ehlo_data();
                         break;
                     case 'starttls':
-                        var key = config.get('tls_key.pem', 'binary');
-                        var cert = config.get('tls_cert.pem', 'binary');
-                        var tls_options = (key && cert) ? { key: key, cert: cert } : {};
+                        var tkey = config.get('tls_key.pem', 'binary');
+                        var tcert = config.get('tls_cert.pem', 'binary');
+                        var tls_options = (tkey && tcert) ? { key: tkey, cert: tcert } : {};
                         var config_options = ['ciphers','requestCert','rejectUnauthorized'];
 
                         for (var i = 0; i < config_options.length; i++) {
@@ -1779,12 +1782,12 @@ HMailItem.prototype.bounce_respond = function (retval, msg) {
 
     var from = new Address ('<>');
     var recip = new Address (this.todo.mail_from.user, this.todo.mail_from.host);
-    this.populate_bounce_message(from, recip, err, function (err, data_lines) {
-        if (err) {
-            return self.double_bounce("Error populating bounce message: " + err);
+    this.populate_bounce_message(from, recip, err, function (err2, data_lines) {
+        if (err2) {
+            return self.double_bounce("Error populating bounce message: " + err2);
         }
 
-        exports.send_email(from, recip, data_lines.join(''), function (code, msg) {
+        exports.send_email(from, recip, data_lines.join(''), function (code, msg2) {
             if (code === constants.deny) {
                 // failed to even queue the mail
                 return self.double_bounce("Unable to queue the bounce message. Not sending bounce!");

plugins.js

@@ -244,13 +244,13 @@ for (var key in logger) {
     if (!/^log\w/.test(key)) continue;
     // console.log('adding Plugin.' + key + ' method');
     /* jshint loopfunc: true */
-    Plugin.prototype[key] = (function (key) {
+    Plugin.prototype[key] = (function (lev) {
         return function () {
             var args = [this];
             for (var i=0, l=arguments.length; i<l; i++) {
                 args.push(arguments[i]);
             }
-            logger[key].apply(logger, args);
+            logger[lev].apply(logger, args);
         };
     })(key);
 }