Skip to content

feat(attribute_value): Don't target NAN, INF, -INF and > 2^53 #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 26, 2018
Merged

feat(attribute_value): Don't target NAN, INF, -INF and > 2^53 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9606f5a
feat(attribute_value): Don't target NAN, INF, -INF and > 2^53
oakbani Dec 20, 2018
0de41d3
** operator not supported on PHP 5.5
oakbani Dec 20, 2018
c64797c
** operator not supported in PHP 5.5
oakbani Dec 20, 2018
dee3468
Add comment
oakbani Dec 21, 2018
cf40572
refact-nit
oakbani Dec 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 38 additions & 3 deletions src/Optimizely/Utils/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,52 @@ public static function areAttributesValid($attributes)
return count(array_filter(array_keys($attributes), 'is_string')) > 0;
}

/**
* @param $value The value to validate.
*
* @return boolean Representing whether attribute's value is
* a number and not NAN, INF, -INF or greater than absolute limit of 2^53.
*/
public static function isFiniteNumber($value)
{
if (!(is_int($value) || is_float($value))) {
return false;
}

if (is_nan($value) || is_infinite($value)) {
return false;
}

if (abs($value) > pow(2, 53)) {
return false;
}

return true;
}

/**
* @param $attributeKey The key to validate.
* @param $attributeValue The value to validate.
*
* @return boolean Representing whether attribute's key and value are
* valid for event payload or not.
* valid for event payload or not. Valid attribute key must be a string.
* Valid attribute value can be a string, bool, or a finite number.
*/
public static function isAttributeValid($attributeKey, $attributeValue)
{
$validTypes = array('boolean', 'double', 'integer', 'string');
return is_string($attributeKey) && in_array(gettype($attributeValue), $validTypes);
if (!is_string($attributeKey)) {
return false;
}

if (is_string($attributeValue) || is_bool($attributeValue)) {
return true;
}

if (is_int($attributeValue) || is_float($attributeValue)) {
return Validator::isFiniteNumber($attributeValue);
}

return false;
}

/**
Expand Down
28 changes: 28 additions & 0 deletions tests/UtilsTests/ValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,34 @@ public function testisAttributeValidAttributeWithInValidKeyValue()
$this->assertFalse(Validator::isAttributeValid(5.5, 'value'));
}

public function testIsFiniteNumberWithInvalidValues()
{
$this->assertFalse(Validator::IsFiniteNumber('HelloWorld'));
$this->assertFalse(Validator::IsFiniteNumber(true));
$this->assertFalse(Validator::IsFiniteNumber(false));
$this->assertFalse(Validator::IsFiniteNumber(null));
$this->assertFalse(Validator::IsFiniteNumber((object)[]));
$this->assertFalse(Validator::IsFiniteNumber([]));
$this->assertFalse(Validator::IsFiniteNumber(INF));
$this->assertFalse(Validator::IsFiniteNumber(-INF));
$this->assertFalse(Validator::IsFiniteNumber(NAN));
$this->assertFalse(Validator::IsFiniteNumber(pow(2,53) + 1));
$this->assertFalse(Validator::IsFiniteNumber(-pow(2,53) - 1));
$this->assertFalse(Validator::IsFiniteNumber(pow(2,53) + 2.0));
$this->assertFalse(Validator::IsFiniteNumber(-pow(2,53) - 2.0));
}

public function testIsFiniteNumberWithValidValues()
{
$this->assertTrue(Validator::IsFiniteNumber(0));
$this->assertTrue(Validator::IsFiniteNumber(5));
$this->assertTrue(Validator::IsFiniteNumber(5.5));
// float pow(2,53) + 1.0 evaluates to float pow(2,53)
$this->assertTrue(Validator::IsFiniteNumber(pow(2,53) + 1.0));
$this->assertTrue(Validator::IsFiniteNumber(-pow(2,53) - 1.0));
$this->assertTrue(Validator::IsFiniteNumber(pow(2,53)));
}

public function testAreEventTagsValidValidEventTags()
{
// Empty attributes
Expand Down