* Add hooks for captcha in main user login form

* Add hook point for detecting and logging login attempts with invalid password
* Add captcha support for triggering a captcha after a bad password attempt. Legit users shouldn't be inconvenienced much, but password-guesser bots will be severely speedbumped.

diff --git a/docs/hooks.txt b/docs/hooks.txt
index a043bd1..6f66b06 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -237,6 +237,13 @@ protocol came about after MediaWiki 1.4rc1.
 This is a list of known events and parameters; please add to it if
 you're going to add events to the MediaWiki code.
 
+'AbortLogin': Return false to cancel account login.
+$user: the User object being authenticated against
+$password: the password being submitted, not yet checked for validity
+&$retval: a LoginForm class constant to return from authenticateUserData();
+          default is LoginForm::ABORTED. Note that the client may be using
+          a machine API rather than the HTML user interface.
+
 'AbortNewAccount': Return false to cancel account creation.
 $user: the User object about to be created (read-only, incomplete)
 $message: out parameter: error message to display on abort
@@ -402,6 +409,11 @@ after noinclude/includeonly/onlyinclude and other processing.
 &$text: string containing partially parsed text
 &$this->mStripState: Parser's internal StripState object
 
+'LoginBadPass': a login attempt has failed with an invalid password.
+                No return data is accepted; this hook is for auditing only.
+$user: the User object being authenticated against
+$password: the password being submitted and found wanting
+
 'LogPageValidTypes': action being logged. DEPRECATED: Use $wgLogTypes
 &$type: array of strings
 

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 2de164b..26196b8 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -32,6 +32,7 @@ class LoginForm {
        const WRONG_PASS = 5;
        const EMPTY_PASS = 6;
        const RESET_PASS = 7;
+       const ABORTED = 8;
 
        var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
        var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
@@ -364,6 +365,12 @@ class LoginForm {
                        $u->load();
                }
 
+               // Give general extensions, such as a captcha, a chance to abort logins
+               $abort = self::ABORTED;
+               if( !wfRunHooks( 'AbortLogin', array( $u, $this->mPassword, &$abort ) ) ) {
+                       return $abort;
+               }
+               
                if (!$u->checkPassword( $this->mPassword )) {
                        if( $u->checkTemporaryPassword( $this->mPassword ) ) {
                                // The e-mailed temporary password should not be used
@@ -395,6 +402,7 @@ class LoginForm {
                                //
                                return self::RESET_PASS;
                        } else {
+                               wfRunHooks( 'LoginBadPass', array( $u, $this->mPassword ) );
                                return '' == $this->mPassword ? self::EMPTY_PASS : self::WRONG_PASS;
                        }
                } else {

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index ccddfa6..3230291 100644 (file)
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -28,6 +28,7 @@ class UserloginTemplate extends QuickTemplate {
 <form name="userlogin" method="post" action="<?php $this->text('action') ?>">
        <h2><?php $this->msg('login') ?></h2>
        <p id="userloginlink"><?php $this->html('link') ?></p>
+       <?php $this->html('header'); /* pre-table point for form plugins... */ ?>
        <div id="userloginprompt"><?php  $this->msgWiki('loginprompt') ?></div>
        <?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?>
        <table>

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 1fa96e3..b08e4ab 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1180,7 +1180,8 @@ div#userlogin form#userlogin2 h2 {
        padding-top: 0;
 }
 
-div#userlogin .captcha {
+div#userlogin .captcha,
+div#userloginForm .captcha {
        border: 1px solid #bbb;
        padding: 1.5em 2em;
        width: 400px;