From 4aeeb2223e98d574dc842cb0a067b3922b7905df Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Sat, 9 Jul 2011 21:16:06 -0400 Subject: Switched from my hacked code to lithium's new post auth validation https://github.com/UnionOfRAD/lithium/blob/master/security/auth/adapter/Form.php#L109 --- config/bootstrap/auth.php | 21 ++++----------------- libraries/lithium | 2 +- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/config/bootstrap/auth.php b/config/bootstrap/auth.php index 87ee787..ea6ef2e 100644 --- a/config/bootstrap/auth.php +++ b/config/bootstrap/auth.php @@ -24,24 +24,11 @@ Auth::config(array( //'scope' => array('active' => 'true'), //The active field must be true otherwise they can't auth, though we need //to eventually send them to a page that explains they are banned. 'session' => array('options' => array('name' => 'default')), - 'filters' => array( - 'password' => function($password) - { - return $password; //prevents li3 from hashing the password before hand. - }, - function($data) { - if(isset($data['username'])) - { - //Get the user from the database - $user = User::find('first', array('conditions' => array('username' => $data['username']))); - //Hash the submitted password with the stored salt. - $data['password'] = Password::hash($data['password'], $user->salt); - } - return $data; - } - ) + 'validators' => array( + 'password' => function($form, $data) { + return password::check($form, $data); + }) ) - ) ); $secret = "cake"; diff --git a/libraries/lithium b/libraries/lithium index 463e074..a8fd7e5 160000 --- a/libraries/lithium +++ b/libraries/lithium @@ -1 +1 @@ -Subproject commit 463e0743b7a1e01dba9e73f33c42609175dbcc52 +Subproject commit a8fd7e546b666c33b0738cfd5f0970aa7c840430 -- cgit v1.2.3