Skip to content

Commit

Permalink
Validate UInt hex input
Browse files Browse the repository at this point in the history
  • Loading branch information
@wltsmrz
wltsmrz committed Jun 18, 2015
1 parent ff6ac03 commit 2ad6a1a
Show file tree
Hide file tree
Showing 4 changed files with 1,832 additions and 55 deletions.
14 changes: 7 additions & 7 deletions src/core/serializedobject.js
View file
Expand Up @@ -54,7 +54,7 @@ SerializedObject.from_json = function(obj_) {
// Create a copy of the object so we don't modify it
const obj = extend(true, {}, obj_);

let so = new SerializedObject();
const so = new SerializedObject();
let typedef;

if (typeof obj.TransactionType === 'number') {
Expand Down Expand Up @@ -216,7 +216,7 @@ SerializedObject.prototype.to_json = function() {

this.resetPointer();

let output = { };
const output = { };

while (this.pointer < this.buffer.length) {
const key_and_value = stypes.parse(this);
Expand Down Expand Up @@ -265,10 +265,10 @@ SerializedObject.jsonify_structure = function(structure, field_name) {
// new Array or Object
output = new structure.constructor();

let keys = Object.keys(structure);
const keys = Object.keys(structure);

for (let i = 0, l = keys.length; i < l; i++) {
let key = keys[i];
const key = keys[i];
output[key] = SerializedObject.jsonify_structure(structure[key], key);
}
}
Expand Down Expand Up @@ -297,7 +297,7 @@ SerializedObject.prototype.serialize = function(typedef, obj) {
};

SerializedObject.prototype.hash = function(prefix) {
let sign_buffer = new SerializedObject();
const sign_buffer = new SerializedObject();

// Add hashing prefix
if (typeof prefix !== 'undefined') {
Expand All @@ -310,7 +310,7 @@ SerializedObject.prototype.hash = function(prefix) {
const bits = sjcl.codec.bytes.toBits(sign_buffer.buffer);
const sha512hex = sjcl.codec.hex.fromBits(sjcl.hash.sha512.hash(bits));

return UInt256.from_hex(sha512hex.substr(0, 64));
return UInt256.from_hex(sha512hex.substr(0, 64).toUpperCase());
};

// DEPRECATED
Expand All @@ -334,7 +334,7 @@ SerializedObject.prototype.serialize_field = function(spec, obj) {
};

SerializedObject.get_field_header = function(type_id, field_id) {
let buffer = [0];
const buffer = [0];

if (type_id > 0xF) {
buffer.push(type_id & 0xFF);
Expand Down
83 changes: 52 additions & 31 deletions src/core/uint.js
View file
Expand Up @@ -2,8 +2,10 @@

/*eslint new-cap: 1*/

var utils = require('./utils');
var sjcl = utils.sjcl;
const assert = require('assert');
const lodash = require('lodash');
const utils = require('./utils');
const sjcl = utils.sjcl;

//
// Abstract UInt class
Expand All @@ -14,7 +16,6 @@ var sjcl = utils.sjcl;
function UInt() {
// Internal form: NaN or sjcl.bn
this._value = NaN;
this._update();
}

UInt.json_rewrite = function(j, opts) {
Expand All @@ -26,6 +27,7 @@ UInt.from_generic = function(j) {
if (j instanceof this) {
return j.clone();
}

return (new this()).parse_generic(j);
};

Expand All @@ -34,6 +36,7 @@ UInt.from_hex = function(j) {
if (j instanceof this) {
return j.clone();
}

return (new this()).parse_hex(j);
};

Expand All @@ -42,6 +45,7 @@ UInt.from_json = function(j) {
if (j instanceof this) {
return j.clone();
}

return (new this()).parse_json(j);
};

Expand All @@ -50,6 +54,7 @@ UInt.from_bits = function(j) {
if (j instanceof this) {
return j.clone();
}

return (new this()).parse_bits(j);
};

Expand All @@ -58,6 +63,7 @@ UInt.from_bytes = function(j) {
if (j instanceof this) {
return j.clone();
}

return (new this()).parse_bytes(j);
};

Expand All @@ -66,6 +72,7 @@ UInt.from_bn = function(j) {
if (j instanceof this) {
return j.clone();
}

return (new this()).parse_bn(j);
};

Expand All @@ -74,6 +81,7 @@ UInt.from_number = function(j) {
if (j instanceof this) {
return j.clone();
}

return (new this()).parse_number(j);
};

Expand Down Expand Up @@ -130,34 +138,46 @@ UInt.prototype._update = function() {

// value = NaN on error.
UInt.prototype.parse_generic = function(j) {
const subclass = this.constructor;

assert(typeof subclass.width === 'number', 'UInt missing width');

this._value = NaN;

switch (j) {
case undefined:
case '0':
case this.constructor.STR_ZERO:
case this.constructor.ACCOUNT_ZERO:
case this.constructor.HEX_ZERO:
case subclass.STR_ZERO:
case subclass.ACCOUNT_ZERO:
case subclass.HEX_ZERO:
this._value = new sjcl.bn(0);
break;

case '1':
case this.constructor.STR_ONE:
case this.constructor.ACCOUNT_ONE:
case this.constructor.HEX_ONE:
case subclass.STR_ONE:
case subclass.ACCOUNT_ONE:
case subclass.HEX_ONE:
this._value = new sjcl.bn(1);
break;

default:
if (typeof j !== 'string') {
this._value = NaN;
} else if (this.constructor.width === j.length) {
var hex = utils.arrayToHex(utils.stringToArray(j));
this._value = new sjcl.bn(hex, 16);
} else if ((this.constructor.width * 2) === j.length) {
// XXX Check char set!
this._value = new sjcl.bn(j, 16);
} else {
this._value = NaN;
if (lodash.isString(j)) {
switch (j.length) {
case subclass.width:
const hex = utils.arrayToHex(utils.stringToArray(j));
this._value = new sjcl.bn(hex, 16);
break;
case subclass.width * 2:
// Assume hex, check char set
this.parse_hex(j);
break;
}
} else if (lodash.isNumber(j)) {
this.parse_number(j);
} else if (lodash.isArray(j)) {
// Assume bytes array
this.parse_bytes(j);
}
}

this._update();
Expand All @@ -166,7 +186,7 @@ UInt.prototype.parse_generic = function(j) {
};

UInt.prototype.parse_hex = function(j) {
if (typeof j === 'string' && j.length === (this.constructor.width * 2)) {
if (new RegExp(`^[0-9A-Fa-f]{${this.constructor.width * 2}}$`).test(j)) {
this._value = new sjcl.bn(j, 16);
} else {
this._value = NaN;
Expand All @@ -178,12 +198,12 @@ UInt.prototype.parse_hex = function(j) {
};

UInt.prototype.parse_bits = function(j) {
if (sjcl.bitArray.bitLength(j) !== this.constructor.width * 8) {
this._value = NaN;
} else {
if (sjcl.bitArray.bitLength(j) === this.constructor.width * 8) {
this._value = sjcl.bn.fromBits(j);
// var bytes = sjcl.codec.bytes.fromBits(j);
// let bytes = sjcl.codec.bytes.fromBits(j);
// this.parse_bytes(bytes);
} else {
this._value = NaN;
}

this._update();
Expand All @@ -193,11 +213,11 @@ UInt.prototype.parse_bits = function(j) {


UInt.prototype.parse_bytes = function(j) {
if (!Array.isArray(j) || j.length !== this.constructor.width) {
this._value = NaN;
} else {
var bits = sjcl.codec.bytes.toBits(j);
if (Array.isArray(j) && j.length === this.constructor.width) {
const bits = sjcl.codec.bytes.toBits(j);
this._value = sjcl.bn.fromBits(bits);
} else {
this._value = NaN;
}

this._update();
Expand All @@ -209,8 +229,7 @@ UInt.prototype.parse_bytes = function(j) {
UInt.prototype.parse_json = UInt.prototype.parse_hex;

UInt.prototype.parse_bn = function(j) {
if ((j instanceof sjcl.bn) &&
j.bitLength() <= this.constructor.width * 8) {
if ((j instanceof sjcl.bn) && j.bitLength() <= this.constructor.width * 8) {
this._value = new sjcl.bn(j);
} else {
this._value = NaN;
Expand Down Expand Up @@ -238,13 +257,15 @@ UInt.prototype.to_bytes = function() {
if (!this.is_valid()) {
return null;
}

return sjcl.codec.bytes.fromBits(this.to_bits());
};

UInt.prototype.to_hex = function() {
if (!this.is_valid()) {
return null;
}

return sjcl.codec.hex.fromBits(this.to_bits()).toUpperCase();
};

Expand All @@ -263,7 +284,7 @@ UInt.prototype.to_bn = function() {
return null;
}

var bits = this.to_bits();
const bits = this.to_bits();

return sjcl.bn.fromBits(bits);
};
Expand Down

0 comments on commit 2ad6a1a

Please sign in to comment.