X-Git-Url: https://git.toastfreeware.priv.at/toast/cookiecaptcha.git/blobdiff_plain/65178dfeda0c6e5eae59cffe743d2096ab6a4d29..8d11567eae5c9f89b38015d58663364ebf465f5f:/CookieCaptcha.class.php?ds=sidebyside diff --git a/CookieCaptcha.class.php b/CookieCaptcha.class.php index f559f0f..1ab2879 100644 --- a/CookieCaptcha.class.php +++ b/CookieCaptcha.class.php @@ -1,53 +1,6 @@ get( $wgCaptchaFileBackend ); - } else { - static $backend = null; - if ( !$backend ) { - $backend = new FSFileBackend( array( - 'name' => 'captcha-backend', - 'lockManager' => 'nullLockManager', - 'containerPaths' => array( 'captcha-render' => $wgCaptchaDirectory ), - 'fileMode' => 777 - ) ); - } - return $backend; - } - } - - /** - * @return integer Estimate of the number of captchas files - */ - public function estimateCaptchaCount() { - global $wgCaptchaDirectoryLevels; - - $factor = 1; - $sampleDir = $this->getBackend()->getRootStoragePath() . '/captcha-render'; - if ( $wgCaptchaDirectoryLevels >= 1 ) { // 1/16 sample if 16 shards - $sampleDir .= '/' . dechex( mt_rand( 0, 15 ) ); - $factor = 16; - } - if ( $wgCaptchaDirectoryLevels >= 3 ) { // 1/256 sample if 4096 shards - $sampleDir .= '/' . dechex( mt_rand( 0, 15 ) ); - $factor = 256; - } - - $count = 0; - foreach ( $this->getBackend()->getFileList( array( 'dir' => $sampleDir ) ) as $file ) { - ++$count; - } - - return ( $count * $factor ); - } - +class CookieCaptcha extends SimpleCaptcha { /** * Check if the submitted form matches the captcha session data provided * by the plugin when the form was generated. @@ -56,6 +9,7 @@ class FancyCaptcha extends SimpleCaptcha { * @param array $info * @return bool */ + /* function keyMatch( $answer, $info ) { global $wgCaptchaSecret; @@ -70,7 +24,9 @@ class FancyCaptcha extends SimpleCaptcha { return false; } } + */ + /* function addCaptchaAPI( &$resultArr ) { $info = $this->pickImage(); if ( !$info ) { @@ -84,10 +40,12 @@ class FancyCaptcha extends SimpleCaptcha { $resultArr['captcha']['id'] = $index; $resultArr['captcha']['url'] = $title->getLocalUrl( 'wpCaptchaId=' . urlencode( $index ) ); } + */ /** * Insert the captcha prompt into the edit form. */ + /* function getForm() { $info = $this->pickImage(); if ( !$info ) { @@ -129,209 +87,7 @@ class FancyCaptcha extends SimpleCaptcha { 'tabindex' => 1 ) ) . // tab in before the edit textarea "

\n"; } - - /** - * Select a previously generated captcha image from the queue. - * @return mixed tuple of (salt key, text hash) or false if no image to find - */ - protected function pickImage() { - global $wgCaptchaDirectoryLevels; - - $lockouts = 0; // number of times another process claimed a file before this one - $baseDir = $this->getBackend()->getRootStoragePath() . '/captcha-render'; - return $this->pickImageDir( $baseDir, $wgCaptchaDirectoryLevels, $lockouts ); - } - - /** - * @param $directory string - * @param $levels integer - * @param $lockouts integer - * @return Array|bool - */ - protected function pickImageDir( $directory, $levels, &$lockouts ) { - global $wgMemc; - - if ( $levels <= 0 ) { // $directory has regular files - return $this->pickImageFromDir( $directory, $lockouts ); - } - - $backend = $this->getBackend(); - - $key = "fancycaptcha:dirlist:{$backend->getWikiId()}:" . sha1( $directory ); - $dirs = $wgMemc->get( $key ); // check cache - if ( !is_array( $dirs ) ) { // cache miss - $dirs = array(); // subdirs actually present... - foreach ( $backend->getTopDirectoryList( array( 'dir' => $directory ) ) as $entry ) { - if ( ctype_xdigit( $entry ) && strlen( $entry ) == 1 ) { - $dirs[] = $entry; - } - } - wfDebug( "Cache miss for $directory subdirectory listing.\n" ); - $wgMemc->set( $key, $dirs, 86400 ); - } - - if ( !count( $dirs ) ) { - // Remove this directory if empty so callers don't keep looking here - $backend->clean( array( 'dir' => $directory ) ); - return false; // none found - } - - $place = mt_rand( 0, count( $dirs ) - 1 ); // pick a random subdir - // In case all dirs are not filled, cycle through next digits... - for ( $j = 0; $j < count( $dirs ); $j++ ) { - $char = $dirs[( $place + $j ) % count( $dirs )]; - $info = $this->pickImageDir( "$directory/$char", $levels - 1, $lockouts ); - if ( $info ) { - return $info; // found a captcha - } else { - wfDebug( "Could not find captcha in $directory.\n" ); - $wgMemc->delete( $key ); // files changed on disk? - } - } - - return false; // didn't find any images in this directory... empty? - } - - /** - * @param $directory string - * @param $lockouts integer - * @return Array|bool - */ - protected function pickImageFromDir( $directory, &$lockouts ) { - global $wgMemc; - - $backend = $this->getBackend(); - - $key = "fancycaptcha:filelist:{$backend->getWikiId()}:" . sha1( $directory ); - $files = $wgMemc->get( $key ); // check cache - if ( !is_array( $files ) ) { // cache miss - $files = array(); // captcha files - foreach ( $backend->getTopFileList( array( 'dir' => $directory ) ) as $entry ) { - $files[] = $entry; - if ( count( $files ) >= 500 ) { // sanity - wfDebug( 'Skipping some captchas; $wgCaptchaDirectoryLevels set too low?.' ); - break; - } - } - $wgMemc->set( $key, $files, 86400 ); - wfDebug( "Cache miss for $directory captcha listing.\n" ); - } - - if ( !count( $files ) ) { - // Remove this directory if empty so callers don't keep looking here - $backend->clean( array( 'dir' => $directory ) ); - return false; - } - - $info = $this->pickImageFromList( $directory, $files, $lockouts ); - if ( !$info ) { - wfDebug( "Could not find captcha in $directory.\n" ); - $wgMemc->delete( $key ); // files changed on disk? - } - - return $info; - } - - /** - * @param $directory string - * @param $files array - * @param $lockouts integer - * @return boolean - */ - protected function pickImageFromList( $directory, array $files, &$lockouts ) { - global $wgMemc, $wgCaptchaDeleteOnSolve; - - if ( !count( $files ) ) { - return false; // none found - } - - $backend = $this->getBackend(); - $place = mt_rand( 0, count( $files ) - 1 ); // pick a random file - $misses = 0; // number of files in listing that don't actually exist - for ( $j = 0; $j < count( $files ); $j++ ) { - $entry = $files[( $place + $j ) % count( $files )]; - if ( preg_match( '/^image_([0-9a-f]+)_([0-9a-f]+)\\.png$/', $entry, $matches ) ) { - if ( $wgCaptchaDeleteOnSolve ) { // captcha will be deleted when solved - $key = "fancycaptcha:filelock:{$backend->getWikiId()}:" . sha1( $entry ); - // Try to claim this captcha for 10 minutes (for the user to solve)... - if ( ++$lockouts <= 10 && !$wgMemc->add( $key, '1', 600 ) ) { - continue; // could not acquire (skip it to avoid race conditions) - } - } - $fsFile = $backend->getLocalReference( array( 'src' => "$directory/$entry" ) ); - if ( !$fsFile || !$fsFile->exists() ) { - if ( ++$misses >= 5 ) { // too many files in the listing don't exist - break; // listing cache too stale? break out so it will be cleared - } - continue; // try next file - } - $size = getimagesize( $fsFile->getPath() ); - return array( - 'salt' => $matches[1], - 'hash' => $matches[2], - 'width' => $size[0], - 'height' => $size[1], - 'viewed' => false, - ); - } - } - - return false; // none found - } - - function showImage() { - global $wgOut; - - $wgOut->disable(); - - $info = $this->retrieveCaptcha(); - if ( $info ) { - $timestamp = new MWTimestamp(); - $info['viewed'] = $timestamp->getTimestamp(); - $this->storeCaptcha( $info ); - - $salt = $info['salt']; - $hash = $info['hash']; - - return $this->getBackend()->streamFile( array( - 'src' => $this->imagePath( $salt, $hash ), - 'headers' => array( "Cache-Control: private, s-maxage=0, max-age=3600" ) - ) )->isOK(); - } - - wfHttpError( 500, 'Internal Error', 'Requested bogus captcha image' ); - return false; - } - - /** - * @param $salt string - * @param $hash string - * @return string - */ - public function imagePath( $salt, $hash ) { - global $wgCaptchaDirectoryLevels; - - $file = $this->getBackend()->getRootStoragePath() . '/captcha-render/'; - for ( $i = 0; $i < $wgCaptchaDirectoryLevels; $i++ ) { - $file .= $hash{ $i } . '/'; - } - $file .= "image_{$salt}_{$hash}.png"; - - return $file; - } - - /** - * @param $basename string - * @return Array (salt, hash) - * @throws MWException - */ - public function hashFromImageName( $basename ) { - if ( preg_match( '/^image_([0-9a-f]+)_([0-9a-f]+)\\.png$/', $basename, $matches ) ) { - return array( $matches[1], $matches[2] ); - } else { - throw new MWException( "Invalid filename '$basename'.\n" ); - } - } + */ /** * Show a message asking the user to enter a captcha on edit @@ -340,6 +96,7 @@ class FancyCaptcha extends SimpleCaptcha { * @param $action string Action being performed * @return string */ + /* function getMessage( $action ) { $name = 'fancycaptcha-' . $action; $text = wfMessage( $name )->text(); @@ -348,22 +105,6 @@ class FancyCaptcha extends SimpleCaptcha { return wfMessage( $name, $text )->isDisabled() ? wfMessage( 'fancycaptcha-edit' )->text() : $text; } - - /** - * Delete a solved captcha image, if $wgCaptchaDeleteOnSolve is true. */ - function passCaptcha() { - global $wgCaptchaDeleteOnSolve; - - $info = $this->retrieveCaptcha(); // get the captcha info before it gets deleted - $pass = parent::passCaptcha(); - if ( $pass && $wgCaptchaDeleteOnSolve ) { - $this->getBackend()->quickDelete( array( - 'src' => $this->imagePath( $info['salt'], $info['hash'] ) - ) ); - } - - return $pass; - } }