joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

More tests and cleaned up some ancient code

Browse source 
It actually referenced the INI file, lolno.
This commit is contained in:
Joshua Sherman 2014-01-12 21:53:05 -05:00
parent 62133dc1ca
commit 6120933fce
2 changed files with 100 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

32
classes/Security.php
View file

@ -139,34 +139,7 @@ class Security
*/ */
private static function checkLevel(&$access_level) private static function checkLevel(&$access_level)
{ {
if (is_int($access_level)) return is_int($access_level);
{
return true;
}
else
{
$config = Config::getInstance();
// Attempts to validate the string passed
if (isset($config->security[$access_level]))
{
if (is_numeric($config->security[$access_level]))
{
$access_level = (int)$config->security[$access_level];
return true;
}
else
{
throw new Exception('Level "' . $access_level . '" is not numeric in config.ini');
}
}
else
{
throw new Exception('Level "' . $access_level . '" is not defined in config.ini');
}
}
return false;
} }
/** /**
@ -343,7 +316,6 @@ class Security
if (self::getUserLevel() == $access_level) if (self::getUserLevel() == $access_level)
{ {
$is_level = true; $is_level = true;
break;
} }
} }
} }
@ -380,7 +352,6 @@ class Security
if (self::getUserLevel() >= $access_level) if (self::getUserLevel() >= $access_level)
{ {
$has_level = true; $has_level = true;
break;
} }
} }
} }
@ -412,7 +383,6 @@ class Security
if ($user_level >= $low && $user_level <= $high) if ($user_level >= $low && $user_level <= $high)
{ {
$between_level = true; $between_level = true;
break;
} }
} }
} }

99
tests/classes/SecurityTest.php Normal file
View file

@ -0,0 +1,99 @@
<?php
class SecurityTest extends PHPUnit_Framework_TestCase
{
public function testGenerateHashWithDefaultSalts()
{
$this->assertEquals(
'4940e793006aa897db22751bba80dff4cb6a3e08',
Security::generateHash('source')
);
}
public function testGenerateHashWithCustomSalts()
{
$config = Config::getInstance();
$config->data['security']['salt'] = 'salt';
$this->assertEquals(
'4eac88c934c33cfa9a80c0b2eb322f23ac3b13c5',
Security::generateHash('source')
);
}
public function testGenerateSHA256Hash()
{
$this->assertEquals(
'3d04f805aff4838ecaf98c7260a813fffd2b7a8a7f957add8018908a1bbdad04',
Security::generateSHA256Hash('source', 'salt')
);
}
public function testLogin()
{
$this->assertTrue(Security::login(1, 10, 'USER'));
$this->assertTrue(isset($_SESSION['__pickles']['security']));
}
public function testLoginNoSession()
{
session_destroy();
$this->assertFalse(Security::login(1, 10, 'USER'));
}
public function testLogout()
{
session_start();
Security::login(1, 10, 'USER');
$this->assertTrue(Security::logout());
$this->assertFalse(isset($_SESSION['__pickles']['security']));
}
public function testIsLevel()
{
Security::login(1, 10, 'USER');
$this->assertTrue(Security::isLevel(SECURITY_LEVEL_USER));
}
public function testIsLevelArray()
{
Security::login(1, 10, 'USER');
$this->assertTrue(Security::isLevel([SECURITY_LEVEL_USER, SECURITY_LEVEL_ADMIN]));
}
public function testHasLevel()
{
Security::login(1, 10, 'USER');
$this->assertTrue(Security::hasLevel(SECURITY_LEVEL_USER));
}
public function testHasLevelArray()
{
Security::login(1, 10, 'USER');
$this->assertTrue(Security::hasLevel([SECURITY_LEVEL_USER, SECURITY_LEVEL_ADMIN]));
}
public function testBetweenLevel()
{
Security::login(1, 10, 'USER');
$this->assertTrue(Security::betweenLevel(SECURITY_LEVEL_USER, SECURITY_LEVEL_ADMIN));
}
public function testTokenMismatch()
{
Security::login(1, 10, 'USER');
$_SESSION['__pickles']['security']['token'] = 'foo';
$_COOKIE['pickles_security_token'] = 'bar';
$this->assertFalse(Security::isLevel(SECURITY_LEVEL_USER));
}
}
?>