Compare commits
2 Commits
f52f1c2c35
...
ca4052740c
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ca4052740c | ||
![]() |
a329a52505 |
@ -28,6 +28,7 @@ use TYPO3\CMS\Extbase\Service\EnvironmentService;
|
||||
use TYPO3\CMS\Extbase\Service\ExtensionService;
|
||||
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
|
||||
use Blueways\BwCaptcha\Validation\Validator\CaptchaValidator;
|
||||
use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication;
|
||||
|
||||
class ActionController extends BaseController
|
||||
{
|
||||
@ -839,23 +840,40 @@ class ActionController extends BaseController
|
||||
/** **/
|
||||
protected function valideCaptcha($captchaId, $value
|
||||
) {
|
||||
$cacheIdentifier = $GLOBALS['TSFE']->fe_user->getKey('ses', $captchaId);
|
||||
|
||||
if (!$cacheIdentifier) {
|
||||
$captchaPhrases = $this->getFeUser()->getKey('ses', 'captchaPhrases');
|
||||
if (!$captchaPhrases || !is_array($captchaPhrases) || !is_string($value)) {
|
||||
$this->addValidationError(
|
||||
'captcha',
|
||||
'validator.notvalid'
|
||||
);
|
||||
}
|
||||
// get captcha secret from cache and compare
|
||||
$cache = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('bwcaptcha');
|
||||
$phrase = $cache->get($cacheIdentifier);
|
||||
if ($phrase && $phrase === $value) {
|
||||
$time = time();
|
||||
$captchaPhrases = array_filter(
|
||||
$captchaPhrases,
|
||||
function ($captchaLifetime) use ($time) {
|
||||
return $captchaLifetime > $time;
|
||||
},
|
||||
ARRAY_FILTER_USE_KEY
|
||||
);
|
||||
foreach ($captchaPhrases as $lifetime => $captchaPhrase) {
|
||||
$isValid = !empty($captchaPhrase) && $captchaPhrase === $value;
|
||||
if ($isValid) {
|
||||
// remove solved captcha
|
||||
unset($captchaPhrases[$lifetime]);
|
||||
$this->getFeUser()->setKey('ses', 'captchaPhrases', $captchaPhrases);
|
||||
$this->getFeUser()->storeSessionData();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
$this->addValidationError(
|
||||
'captcha',
|
||||
'validator.notvalid'
|
||||
);
|
||||
}
|
||||
|
||||
protected function getFeUser(): FrontendUserAuthentication
|
||||
{
|
||||
return $GLOBALS['TSFE']->fe_user;
|
||||
}
|
||||
}
|
||||
|
@ -45,7 +45,7 @@ class StringUtility
|
||||
return $string;
|
||||
}
|
||||
|
||||
function getRandomString(
|
||||
public static function getRandomString(
|
||||
int $length = 64,
|
||||
string $keyspace = null
|
||||
): string {
|
||||
|
@ -30,17 +30,7 @@ return [
|
||||
'exclude' => true,
|
||||
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'renderType' => 'selectSingle',
|
||||
'special' => 'languages',
|
||||
'items' => [
|
||||
[
|
||||
'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
|
||||
-1,
|
||||
'flags-multiple'
|
||||
]
|
||||
],
|
||||
'default' => 0,
|
||||
'type' => 'language',
|
||||
],
|
||||
],
|
||||
'l10n_parent' => [
|
||||
|
@ -30,17 +30,7 @@ return [
|
||||
'exclude' => true,
|
||||
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'renderType' => 'selectSingle',
|
||||
'special' => 'languages',
|
||||
'items' => [
|
||||
[
|
||||
'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
|
||||
-1,
|
||||
'flags-multiple'
|
||||
]
|
||||
],
|
||||
'default' => 0,
|
||||
'type' => 'language',
|
||||
],
|
||||
],
|
||||
'l10n_parent' => [
|
||||
|
Loading…
x
Reference in New Issue
Block a user