skip processing invalid lines (#6)

* skip processing invalid lines

* noop: lint WS updates

* version bump & changes update

* add regex coverage

* add ini file with garbage

Changes.md

@@ -1,4 +1,8 @@
 
+# 1.0.6 - 2016-11-10
+
+    * handle invalid .ini lines properly (skip them)
+
 # 1.0.5 - 2016-10-25
 
     * do not leave behind a `*` section in config (due to wildcard boolean)

package.json

@@ -3,7 +3,7 @@
   "name": "haraka-config",
   "license": "MIT",
   "description": "Haraka's config file loader",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",

readers/ini.js

@@ -15,7 +15,6 @@ exports.load = function (name, options, regex) {
     result = this.init_booleans(options, result);
 
     var match;
-    var is_array_match;
     var setter;
     var pre = '';
 
@@ -45,9 +44,10 @@ exports.load = function (name, options, regex) {
         if (!match) {
             exports.logger(
                     'Invalid line in config file \'' + name + '\': ' + line);
+            return;
         }
 
-        is_array_match = regex.is_array.exec(match[1]);
+        var is_array_match = regex.is_array.exec(match[1]);
         if (is_array_match) {
             setter = function(key, value) {
                 key = key.replace('[]', '');

test/config/goobers.ini

@@ -0,0 +1 @@
+SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4

test/configfile.js

@@ -111,8 +111,10 @@ exports.load_config = {
     'test.ini, sect1, opts, w/defaults' : function (test) {
         test.expect(6);
         var r = this.cfreader.load_config('test/config/test.ini', 'ini', {
-            booleans: ['+sect1.bool_true','-sect1.bool_false',
-                       '+sect1.bool_true_default', 'sect1.-bool_false_default']
+            booleans: [
+                '+sect1.bool_true','-sect1.bool_false',
+                '+sect1.bool_true_default', 'sect1.-bool_false_default'
+            ]
         });
         test.strictEqual(r.sect1.bool_true, true);
         test.strictEqual(r.sect1.bool_false, false);
@@ -299,3 +301,74 @@ exports.get_cache_key = {
         test.done();
     }
 };
+
+exports.regex = {
+    setUp: _set_up,
+    'section': function (test) {
+        test.expect(4);
+        test.equal(this.cfreader.regex.section.test('[foo]'), true);
+        test.equal(this.cfreader.regex.section.test('bar'), false);
+        test.equal(this.cfreader.regex.section.test('[bar'), false);
+        test.equal(this.cfreader.regex.section.test('bar]'), false);
+        test.done();
+    },
+    'param': function (test) {
+        test.expect(2);
+        test.equal(this.cfreader.regex.param.exec('foo=true')[1], 'foo');
+        test.equal(this.cfreader.regex.param.exec(';foo=true'), undefined);
+        test.done();
+    },
+    'comment': function (test) {
+        test.expect(2);
+        test.equal(this.cfreader.regex.comment.test('; true'), true);
+        test.equal(this.cfreader.regex.comment.test('false'), false);
+        test.done();
+    },
+    'line': function (test) {
+        test.expect(2);
+        test.equal(this.cfreader.regex.line.test(' boo '), true);
+        test.equal(this.cfreader.regex.line.test('foo'), true);
+        test.done();
+    },
+    'blank': function (test) {
+        test.expect(2);
+        test.equal(this.cfreader.regex.blank.test('foo'), false);
+        test.equal(this.cfreader.regex.blank.test(' '), true);
+        test.done();
+    },
+    // 'continuation': function (test) {
+    //     test.expect(1);
+    //     test.done();
+    // },
+    'is_integer': function (test) {
+        test.expect(3);
+        test.equal(this.cfreader.regex.is_integer.test(1), true);
+        test.equal(this.cfreader.regex.is_integer.test(''), false);
+        test.equal(this.cfreader.regex.is_integer.test('a'), false);
+        test.done();
+    },
+    'is_float': function (test) {
+        test.expect(3);
+        test.equal(this.cfreader.regex.is_float.test('1.0'), true);
+        test.equal(this.cfreader.regex.is_float.test(''), false);
+        test.equal(this.cfreader.regex.is_float.test('45'), false);
+        test.done();
+    },
+    'is_truth': function (test) {
+        test.expect(6);
+        test.equal(this.cfreader.regex.is_truth.test('no'), false);
+        test.equal(this.cfreader.regex.is_truth.test('nope'), false);
+        test.equal(this.cfreader.regex.is_truth.test('nuh uh'), false);
+        test.equal(this.cfreader.regex.is_truth.test('yes'), true);
+        test.equal(this.cfreader.regex.is_truth.test('true'), true);
+        test.equal(this.cfreader.regex.is_truth.test(true), true);
+        test.done();
+    },
+    'is_array': function (test) {
+        test.expect(3);
+        test.equal(this.cfreader.regex.is_array.test('foo=bar'), false);
+        test.equal(this.cfreader.regex.is_array.test('foo'), false);
+        test.equal(this.cfreader.regex.is_array.test('foo[]'), true);
+        test.done();
+    },
+}

test/readers/ini.js

@@ -26,11 +26,10 @@ exports.load = {
         test.expect(1);
         var result = this.ini.load('test/config/test.ini',  {}, regex);
         // console.log(result);
-        test.deepEqual(result.main,
-                { bool_true: 'true', bool_false: 'false',
-                    str_true: 'true', str_false: 'false'
-                }
-                );
+        test.deepEqual(result.main, {
+            bool_true: 'true', bool_false: 'false',
+            str_true: 'true', str_false: 'false'
+        });
         test.done();
     },
     'test.ini, no opts' : function (test) {
@@ -154,3 +153,13 @@ exports.empty = {
         test.done();
     },
 };
+
+exports.invalid = {
+    setUp: _set_up,
+    'goobers.ini has invalid entry' : function (test) {
+        test.expect(1);
+        var result = this.ini.load('test/config/goobers.ini',  {}, regex);
+        test.deepEqual(result, { main: { } } );
+        test.done();
+    },
+}