no identity
+ getIdentity()): echo Dumper::toHtml($user->getIdentity(), [Dumper::LIVE => TRUE]); else: ?>no identity
-
-
-
+
+
+
diff --git a/src/Security/AuthenticationException.php b/src/Security/AuthenticationException.php
index 7dee689c..c03803d9 100644
--- a/src/Security/AuthenticationException.php
+++ b/src/Security/AuthenticationException.php
@@ -1,19 +1,15 @@
parentIsSet($key)) {
+ $this->parentSet($key, $value);
} else {
$this->data[$key] = $value;
@@ -122,8 +126,8 @@ public function __set($key, $value)
*/
public function &__get($key)
{
- if (parent::__isset($key)) {
- return parent::__get($key);
+ if ($this->parentIsSet($key)) {
+ return $this->parentGet($key);
} else {
return $this->data[$key];
@@ -138,19 +142,7 @@ public function &__get($key)
*/
public function __isset($key)
{
- return isset($this->data[$key]) || parent::__isset($key);
- }
-
-
- /**
- * Removes property.
- * @param string property name
- * @return void
- * @throws Nette\MemberAccessException
- */
- public function __unset($name)
- {
- Nette\Utils\ObjectMixin::remove($this, $name);
+ return isset($this->data[$key]) || $this->parentIsSet($key);
}
}
diff --git a/src/Security/Passwords.php b/src/Security/Passwords.php
index cbb771e9..26ad2fb3 100644
--- a/src/Security/Passwords.php
+++ b/src/Security/Passwords.php
@@ -1,8 +1,8 @@
= 5.3.7.
- *
- * @author David Grudl
+ * Passwords tools.
*/
class Passwords
{
+ use Nette\StaticClass;
+
+ /** @deprecated */
const BCRYPT_COST = 10;
/**
* Computes salted password hash.
* @param string
- * @param array with cost (4-31), salt (22 chars)
+ * @param array with cost (4-31)
* @return string 60 chars long
*/
- public static function hash($password, array $options = NULL)
+ public static function hash($password, array $options = [])
{
- $cost = isset($options['cost']) ? (int) $options['cost'] : self::BCRYPT_COST;
- $salt = isset($options['salt']) ? (string) $options['salt'] : Nette\Utils\Random::generate(22, '0-9A-Za-z./');
-
- if (PHP_VERSION_ID < 50307) {
- throw new Nette\NotSupportedException(__METHOD__ . ' requires PHP >= 5.3.7.');
- } elseif (($len = strlen($salt)) < 22) {
- throw new Nette\InvalidArgumentException("Salt must be 22 characters long, $len given.");
- } elseif ($cost < 4 || $cost > 31) {
- throw new Nette\InvalidArgumentException("Cost must be in range 4-31, $cost given.");
+ if (isset($options['cost']) && ($options['cost'] < 4 || $options['cost'] > 31)) {
+ throw new Nette\InvalidArgumentException("Cost must be in range 4-31, $options[cost] given.");
}
- $hash = crypt($password, '$2y$' . ($cost < 10 ? 0 : '') . $cost . '$' . $salt);
- if (strlen($hash) < 60) {
- throw new Nette\InvalidStateException('Hash returned by crypt is invalid.');
+ $hash = password_hash($password, PASSWORD_BCRYPT, $options);
+ if ($hash === FALSE || strlen($hash) < 60) {
+ throw new Nette\InvalidStateException('Hash computed by password_hash is invalid.');
}
return $hash;
}
@@ -53,9 +47,7 @@ public static function hash($password, array $options = NULL)
*/
public static function verify($password, $hash)
{
- return preg_match('#^\$2y\$(?P