X-Git-Url: https://git.toastfreeware.priv.at/toast/cookiecaptcha.git/blobdiff_plain/da07c3eb19e055101497090bddbf1b6e9c489b38..def5670e9b43c6204d0fc36ea236f3b7910bd820:/ConfirmEdit.php
diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index d82e023..f6cab65 100644
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -1,29 +1,133 @@
+ * http://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @addtogroup Extensions
+ */
if ( defined( 'MEDIAWIKI' ) ) {
global $wgExtensionFunctions, $wgGroupPermissions;
$wgExtensionFunctions[] = 'ceSetup';
+$wgExtensionCredits['other'][] = array(
+ 'name' => 'ConfirmEdit',
+ 'author' => 'Brion Vibber',
+ 'url' => 'http://www.mediawiki.org/wiki/Extension:ConfirmEdit',
+ 'description' => 'Simple captcha implementation',
+);
+
+# Internationalisation file
+require_once( 'ConfirmEdit.i18n.php' );
-$wgGroupPermissions['*' ]['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$wgGroupPermissions['bot' ]['skipcaptcha'] = true; // registered bots
-$wgGroupPermissions['sysop' ]['skipcaptcha'] = true;
+/**
+ * The 'skipcaptcha' permission key can be given out to
+ * let known-good users perform triggering actions without
+ * having to go through the captcha.
+ *
+ * By default, sysops and registered bot accounts will be
+ * able to skip, while others have to go through it.
+ */
+$wgGroupPermissions['*' ]['skipcaptcha'] = false;
+$wgGroupPermissions['user' ]['skipcaptcha'] = false;
+$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
+$wgGroupPermissions['bot' ]['skipcaptcha'] = true; // registered bots
+$wgGroupPermissions['sysop' ]['skipcaptcha'] = true;
global $wgCaptcha, $wgCaptchaClass, $wgCaptchaTriggers;
$wgCaptcha = null;
$wgCaptchaClass = 'SimpleCaptcha';
+/**
+ * Actions which can trigger a captcha
+ *
+ * If the 'edit' trigger is on, *every* edit will trigger the captcha.
+ * This may be useful for protecting against vandalbot attacks.
+ *
+ * If using the default 'addurl' trigger, the captcha will trigger on
+ * edits that include URLs that aren't in the current version of the page.
+ * This should catch automated linkspammers without annoying people when
+ * they make more typical edits.
+ *
+ * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
+ * which also takes into account per namespace triggering.
+ */
$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit'] = false; // Would check on every edit
-$wgCaptchaTriggers['addurl'] = true; // Check on edits that add URLs
+$wgCaptchaTriggers['edit'] = false; // Would check on every edit
+$wgCaptchaTriggers['create'] = false; // Check on page creation.
+$wgCaptchaTriggers['addurl'] = true; // Check on edits that add URLs
+$wgCaptchaTriggers['createaccount'] = true; // Special:Userlogin&type=signup
+$wgCaptchaTriggers['badlogin'] = true; // Special:Userlogin after failure
+
+/**
+ * You may wish to apply special rules for captcha triggering on some namespaces.
+ * $wgCaptchaTriggersOnNamespace[][] forces an always on /
+ * always off configuration with that trigger for the given namespace.
+ * Leave unset to use the global options ($wgCaptchaTriggers).
+ *
+ * Shall not be used with 'createaccount' (it is not checked).
+ */
+$wgCaptchaTriggersOnNamespace = array();
+
+#Example:
+#$wgCaptchaTriggersOnNamespace[NS_TALK]['create'] = false; //Allow creation of talk pages without captchas.
+#$wgCaptchaTriggersOnNamespace[NS_PROJECT]['edit'] = true; //Show captcha whenever editing Project pages.
+
+/**
+ * Indicate how to store per-session data required to match up the
+ * internal captcha data with the editor.
+ *
+ * 'CaptchaSessionStore' uses PHP's session storage, which is cookie-based
+ * and may fail for anons with cookies disabled.
+ *
+ * 'CaptchaCacheStore' uses $wgMemc, which avoids the cookie dependency
+ * but may be fragile depending on cache configuration.
+ */
+global $wgCaptchaStorageClass;
+$wgCaptchaStorageClass = 'CaptchaSessionStore';
+
+/**
+ * Number of seconds a captcha session should last in the data cache
+ * before expiring when managing through CaptchaCacheStore class.
+ *
+ * Default is a half hour.
+ */
+global $wgCaptchaSessionExpiration;
+$wgCaptchaSessionExpiration = 30 * 60;
+
+/**
+ * Number of seconds after a bad login that a captcha will be shown to
+ * that client on the login form to slow down password-guessing bots.
+ *
+ * Has no effect if 'badlogin' is disabled in $wgCaptchaTriggers or
+ * if there is not a caching engine enabled.
+ *
+ * Default is five minutes.
+ */
+global $wgCaptchaBadLoginExpiration;
+$wgCaptchaBadLoginExpiration = 5 * 60;
/**
* Allow users who have confirmed their e-mail addresses to post
@@ -32,20 +136,61 @@ $wgCaptchaTriggers['addurl'] = true; // Check on edits that add URLs
global $ceAllowConfirmedEmail;
$ceAllowConfirmedEmail = false;
+/**
+ * Regex to whitelist URLs to known-good sites...
+ * For instance:
+ * $wgCaptchaWhitelist = '#^https?://([a-z0-9-]+\\.)?(wikimedia|wikipedia)\.org/#i';
+ * Local admins can define a whitelist under [[MediaWiki:captcha-addurl-whitelist]]
+ */
+$wgCaptchaWhitelist = false;
+
+/**
+ * Additional regexes to check for. Use full regexes; can match things
+ * other than URLs such as junk edits.
+ *
+ * If the new version matches one and the old version doesn't,
+ * toss up the captcha screen.
+ *
+ * @fixme Add a message for local admins to add items as well.
+ */
+$wgCaptchaRegexes = array();
+
+/** Register special page */
+global $wgSpecialPages;
+$wgSpecialPages['Captcha'] = array( /*class*/ 'SpecialPage', /*name*/'Captcha', /*restriction*/ '',
+ /*listed*/ false, /*function*/ false, /*file*/ false );
+
/**
* Set up message strings for captcha utilities.
*/
function ceSetup() {
- global $wgMessageCache, $wgHooks, $wgCaptcha, $wgCaptchaClass;
- $wgMessageCache->addMessage('captcha-short', "Your edit includes new URL links; as a protection
- against automated spam, you'll need to enter the answer to this
- simple arithmetic test:" );
-
- SpecialPage::addPage( new SpecialPage( 'Captcha', false,
- /*listed*/ false, /*function*/ false, /*file*/ false ) );
-
+ # Add messages
+ global $wgMessageCache, $wgConfirmEditMessages;
+ foreach( $wgConfirmEditMessages as $lang => $messages )
+ $wgMessageCache->addMessages( $messages, $lang );
+
+ global $wgHooks, $wgCaptcha, $wgCaptchaClass, $wgSpecialPages;
$wgCaptcha = new $wgCaptchaClass();
$wgHooks['EditFilter'][] = array( &$wgCaptcha, 'confirmEdit' );
+
+ $wgHooks['UserCreateForm'][] = array( &$wgCaptcha, 'injectUserCreate' );
+ $wgHooks['AbortNewAccount'][] = array( &$wgCaptcha, 'confirmUserCreate' );
+
+ $wgHooks['LoginAuthenticateAudit'][] = array( &$wgCaptcha, 'triggerUserLogin' );
+ $wgHooks['UserLoginForm'][] = array( &$wgCaptcha, 'injectUserLogin' );
+ $wgHooks['AbortLogin'][] = array( &$wgCaptcha, 'confirmUserLogin' );
+
+ global $wgGroupPermissions, $wgCaptchaTriggers;
+ if( !$wgGroupPermissions['*']['read'] && $wgCaptchaTriggers['badlogin'] ) {
+ // We need to ensure that the captcha interface is accessible
+ // so that unauthenticated users can actually get in after a
+ // mistaken password typing.
+ global $wgWhitelistRead;
+ $image = Title::makeTitle( NS_SPECIAL, 'Captcha/image' );
+ $help = Title::makeTitle( NS_SPECIAL, 'Captcha/help' );
+ $wgWhitelistRead[] = $image->getPrefixedText();
+ $wgWhitelistRead[] = $help->getPrefixedText();
+ }
}
/**
@@ -63,6 +208,177 @@ function wfSpecialCaptcha( $par = null ) {
}
class SimpleCaptcha {
+ function SimpleCaptcha() {
+ global $wgCaptchaStorageClass;
+ $this->storage = new $wgCaptchaStorageClass;
+ }
+
+ /**
+ * Insert a captcha prompt into the edit form.
+ * This sample implementation generates a simple arithmetic operation;
+ * it would be easy to defeat by machine.
+ *
+ * Override this!
+ *
+ * @return string HTML
+ */
+ function getForm() {
+ $a = mt_rand(0, 100);
+ $b = mt_rand(0, 10);
+ $op = mt_rand(0, 1) ? '+' : '-';
+
+ $test = "$a $op $b";
+ $answer = ($op == '+') ? ($a + $b) : ($a - $b);
+
+ $index = $this->storeCaptcha( array( 'answer' => $answer ) );
+
+ return "
\n" );
+ }
+ return true;
+ }
+
+ /**
+ * Inject a captcha into the user login form after a failed
+ * password attempt as a speedbump for mass attacks.
+ * @fixme if multiple thingies insert a header, could break
+ * @param SimpleTemplate $template
+ * @return bool true to keep running callbacks
+ */
+ function injectUserLogin( &$template ) {
+ if( $this->isBadLoginTriggered() ) {
+ global $wgOut;
+ $template->set( 'header',
+ "