diff --git a/cake/libs/controller/components/auth/basic_authenticate.php b/cake/libs/controller/components/auth/basic_authenticate.php
new file mode 100644
index 00000000000..af1361bd1ae
--- /dev/null
+++ b/cake/libs/controller/components/auth/basic_authenticate.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Component', 'auth/base_authenticate');
+
+class BasicAuthenticate extends BaseAuthenticate {
+/**
+ * Authenticate a user using basic HTTP auth.  Will use the configured User model and attempt a 
+ * login using basic HTTP auth.
+ *
+ * @return mixed Either false on failure, or an array of user data on success.
+ */
+	public function authenticate(CakeRequest $request) {
+		
+	}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/auth/basic_authenticate.test.php b/cake/tests/cases/libs/controller/components/auth/basic_authenticate.test.php
new file mode 100644
index 00000000000..7da7e692b12
--- /dev/null
+++ b/cake/tests/cases/libs/controller/components/auth/basic_authenticate.test.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake.tests.cases.libs.controller.components.auth
+ * @since         CakePHP(tm) v 2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+App::import('Component', 'auth/basic_authenticate');
+App::import('Model', 'AppModel');
+App::import('Core', 'CakeRequest');
+
+require_once  CAKE_TESTS . 'cases' . DS . 'libs' . DS . 'model' . DS . 'models.php';
+
+/**
+ * Test case for BasicAuthentication
+ *
+ * @package cake.test.cases.controller.components.auth
+ */
+class BasicAuthenticateTest extends CakeTestCase {
+
+	public $fixtures = array('core.user', 'core.auth_user');
+
+/**
+ * setup
+ *
+ * @return void
+ */
+	function setUp() {
+		parent::setUp();
+		$this->auth = new BasicAuthenticate(array(
+			'fields' => array('username' => 'user', 'password' => 'password'),
+			'userModel' => 'User'
+		));
+		$password = Security::hash('password', null, true);
+		ClassRegistry::init('User')->updateAll(array('password' => '"' . $password . '"'));
+	}
+
+/**
+ * test applying settings in the constructor
+ *
+ * @return void
+ */
+	function testConstructor() {
+		$object = new BasicAuthenticate(array(
+			'userModel' => 'AuthUser',
+			'fields' => array('username' => 'user', 'password' => 'password')
+		));
+		$this->assertEquals('AuthUser', $object->settings['userModel']);
+		$this->assertEquals(array('username' => 'user', 'password' => 'password'), $object->settings['fields']);
+	}
+
+/**
+ * test the authenticate method
+ *
+ * @return void
+ */
+	function testAuthenticateNoData() {
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array();
+		$this->assertFalse($this->auth->authenticate($request));
+	}
+
+/**
+ * test the authenticate method
+ *
+ * @return void
+ */
+	function testAuthenticateNoUsername() {
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array('User' => array('password' => 'foobar'));
+		$this->assertFalse($this->auth->authenticate($request));
+	}
+
+/**
+ * test the authenticate method
+ *
+ * @return void
+ */
+	function testAuthenticateNoPassword() {
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array('User' => array('user' => 'mariano'));
+		$this->assertFalse($this->auth->authenticate($request));
+	}
+
+/**
+ * test the authenticate method
+ *
+ * @return void
+ */
+	function testAuthenticateInjection() {
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array(
+			'User' => array(
+				'user' => '> 1',
+				'password' => "' OR 1 = 1"
+		));
+		$this->assertFalse($this->auth->authenticate($request));
+	}
+
+/**
+ * test authenticate sucesss
+ *
+ * @return void
+ */
+	function testAuthenticateSuccess() {
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array('User' => array(
+			'user' => 'mariano',
+			'password' => 'password'
+		));
+		$result = $this->auth->authenticate($request);
+		$expected = array(
+			'id' => 1,
+			'user' => 'mariano',
+			'created' => '2007-03-17 01:16:23',
+			'updated' => '2007-03-17 01:18:31'
+		);
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * test scope failure.
+ *
+ * @return void
+ */
+	function testAuthenticateScopeFail() {
+		$this->auth->settings['scope'] = array('user' => 'nate');
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array('User' => array(
+			'user' => 'mariano',
+			'password' => 'password'
+		));
+
+		$this->assertFalse($this->auth->authenticate($request));
+	}
+
+}
\ No newline at end of file