Refactoring of the module. The validator still needs improvement and …

…specialisation if applied to node-forward/discussions#15.

package.json

@@ -2,7 +2,7 @@
 	"name": "node-cerberus",
 	"private": false,
 	"version": "0.0.2",
-	"description": "Cerberus aka. Fluffy, is a validation and fuzzing library for arguments of Node.js core modules.",
+	"description": "Cerberus aka. Fluffy, is a validation and fuzzing library for Node.js core module method parameters.",
 	"main": "src/cerberus.js",
 	"scripts": {
 		"test": "grunt ci"

src/cerberus.js

@@ -1,4 +1,5 @@
-var Fuzzer = require('./fuzzer');
+var Validator = require('./validator/validator');
+var Fuzzer = require('./fuzzer/fuzzer');
 
 module.exports = (function () {
 	'use strict';
@@ -11,9 +12,6 @@ module.exports = (function () {
 
 	};
 
-	Fuzzer.fuzzModules();
-	// console.log(Fuzzer.generatePayloads());
-
 	return Cerberus;
 
 })();

src/fuzzer.js → src/fuzzer/fuzzer.js

@@ -48,11 +48,11 @@ module.exports = (function () {
 
 		this.modules = {
 			crypto: crypto
-		}
+		};
 
 		this.schemas = {
 			crypto: CryptoSchema
-		}
+		};
 	}
 
 	Fuzzer.prototype.fuzzModules = function (config) {

src/payloads/arrays.js → src/fuzzer/payloads/arrays.js

@@ -1,9 +1,9 @@
-var list = ['a'];
+var array = ['a'];
 
 module.exports = [
 	[],
 	[1, 'a'],
-	(list['test'] = 1) && list,
+	(array.a = 1) && array,
 	new Array(),
 	new Array(5)
 ];

src/payloads/buffers.js → src/fuzzer/payloads/buffers.js

@@ -1,7 +1,6 @@
 module.exports = [
 	new Buffer(0),
 	new Buffer(1),
-	new Buffer(10, 'binary'),
 	new Buffer('fl∂∏', 'utf8'),
 	new Buffer('fl∂∏', 'ucs2'),
 	new Buffer('fl∂∏', 'utf16le'),

src/fuzzer/payloads/strings.js

@@ -0,0 +1,42 @@
+module.exports = [
+	'',
+	'`',
+	'´',
+	'_',
+	'.',
+	'-',
+	'+',
+	'˙',
+	'"',
+	'<',
+	'>',
+	';',
+	'&',
+	'@',
+	'--',
+	'\\',
+	'//',
+	'\n',
+	'\r',
+	'\'',
+	'://',
+	'\n\r',
+	'%00',
+	'\\x00',
+	'\u0000',
+	'\\0',
+	'null',
+	'undefined',
+	new Buffer(0x32).toString('utf8'),
+	String.fromCharCode(0),
+	String.fromCharCode(1),
+	String.fromCharCode(Math.pow(2, 8)),
+	String.fromCharCode(Math.pow(2, 8) + 1),
+	String.fromCharCode(Math.pow(2, 8) - 1),
+	String.fromCharCode(Math.pow(2, 16)),
+	String.fromCharCode(Math.pow(2, 16) + 1),
+	String.fromCharCode(Math.pow(2, 16) - 1),
+	String.fromCharCode(Math.pow(2, 32)),
+	String.fromCharCode(Math.pow(2, 32) + 1),
+	String.fromCharCode(Math.pow(2, 32) - 1)
+];

src/validator.js → src/validator/validator.js

@@ -8,11 +8,13 @@ module.exports = (function () {
 
 	function Validator () {
 		this.config = {
+			wildcardKey: '$',
+
 			typeStrict: true,
 			formatStrict: true,
 			existenceStrict: true,
 
-			nullAsExistence: false,
+			nullAsExistence: true,
 			undefinedAsExistence: false
 		};
 	}
@@ -22,7 +24,7 @@ module.exports = (function () {
 
 		for (var key in (config || {})) {
 			val = config[key];
-			if (key in this.config && (typeof val === 'boolean')) {
+			if (typeof this.config[key] === typeof val) {
 				this.config[key] = val;
 			}
 		}
@@ -55,20 +57,20 @@ module.exports = (function () {
 
 		var isArray = util.isArray(object);
 
-		var diffMismatch =  Math.abs(len - Object.keys(object).length);
-		var hasDiffMismatch = !isArray && diffMismatch !== 0;
+		var diffMissmatch =  Math.abs(len - Object.keys(object).length);
+		var hasDiffMissmatch = !isArray && diffMissmatch !== 0;
 
 		while (len-- && valid) {
 			key = keys[len];
 
-			if (isArray && key === '$') {
+			if (isArray && key === this.config.wildcardKey) {
 				valid = this.loopArray(schema[key], object);
 			}
 			else if (!(key in object)) {
 				valid = schema[key].optional || !this.config.existenceStrict;
 
 				if (valid) {
-					diffMismatch -= 1;
+					diffMissmatch -= 1;
 				}
 			}
 			else if ((val = object[key]) == null) {
@@ -87,7 +89,7 @@ module.exports = (function () {
 			}
 		}
 
-		return (!hasDiffMismatch || diffMismatch === 0) && valid;
+		return (!hasDiffMissmatch || diffMissmatch === 0) && valid;
 	};
 
 	Validator.prototype.loopArray = function (schema, array) {

test/validator/negative-test-common.js

@@ -1,7 +1,6 @@
 var assert = require('assert');
 
-var Validator = require('../coverage/instrument/src/validator');
-// var Validator = require('../../src/Validator');
+var Validator = require('../coverage/instrument/src/validator/validator');
 
 module.exports = function () {
 	'use strict';
@@ -160,7 +159,7 @@ module.exports = function () {
 		}), false);
 	});
 
-	it('missing-key, array, $-selector, multi-key', function () {
+	it('missing-key, array, $ wildcard key selector, multi-key', function () {
 		assert.deepEqual(Validator.validate({
 			a: {
 				type: 'Array',

test/validator/test-common.js

@@ -1,7 +1,6 @@
 var assert = require('assert');
 
-var Validator = require('../coverage/instrument/src/validator');
-// var Validator = require('../../src/Validator');
+var Validator = require('../coverage/instrument/src/validator/validator');
 
 module.exports = function () {
 	'use strict';
@@ -185,7 +184,7 @@ module.exports = function () {
 		}), true);
 	});
 
-	it('array, $-selector, multi-key', function () {
+	it('array, $ wildcard key selector, multi-key', function () {
 		assert.deepEqual(Validator.validate({
 			a: {
 				type: 'Array',

test/validator/test-optional-mode.js

@@ -1,7 +1,6 @@
 var assert = require('assert');
 
-var Validator = require('../coverage/instrument/src/validator');
-// var Validator = require('../../src/Validator');
+var Validator = require('../coverage/instrument/src/validator/validator');
 
 module.exports = function () {
 	'use strict';
@@ -42,7 +41,7 @@ module.exports = function () {
 		}), true);
 	});
 
-	it('unspecified null value', function () {
+	it('unspecified undefined value', function () {
 		Validator.configure({
 			nullAsExistence: false
 		});

test/validator/test-strict-mode.js

@@ -1,7 +1,6 @@
 var assert = require('assert');
 
-var Validator = require('../coverage/instrument/src/validator');
-// var Validator = require('../../src/Validator');
+var Validator = require('../coverage/instrument/src/validator/validator');
 
 module.exports = function () {
 	'use strict';