wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-12-01 03:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "HCaptcha: Inline variables and move closer to usages"

Browse source
This commit is contained in:
jenkins-bot 2024-11-27 19:56:44 +00:00 committed by Gerrit Code Review
parent 658338a155 dbfd17dab8
commit 29c00e36e9
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
includes/hCaptcha/HCaptcha.php
View file

@ -126,18 +126,12 @@ class HCaptcha extends SimpleCaptcha {
* @return bool * @return bool
*/ */
protected function passCaptcha( $_, $token, $user ) { protected function passCaptcha( $_, $token, $user ) {
$webRequest = RequestContext::getMain()->getRequest();
$secretKey = $this->hCaptchaConfig->get( 'HCaptchaSecretKey' );
$sendRemoteIp = $this->hCaptchaConfig->get( 'HCaptchaSendRemoteIP' );
$proxy = $this->hCaptchaConfig->get( 'HCaptchaProxy' );
$url = $this->hCaptchaConfig->get( 'HCaptchaVerifyUrl' );
$data = [ $data = [
'secret' => $secretKey, 'secret' => $this->hCaptchaConfig->get( 'HCaptchaSecretKey' ),
'response' => $token, 'response' => $token,
]; ];
if ( $sendRemoteIp ) { if ( $this->hCaptchaConfig->get( 'HCaptchaSendRemoteIP' ) ) {
$webRequest = RequestContext::getMain()->getRequest();
$data['remoteip'] = $webRequest->getIP(); $data['remoteip'] = $webRequest->getIP();
} }
@ -146,12 +140,13 @@ class HCaptcha extends SimpleCaptcha {
'postData' => $data, 'postData' => $data,
]; ];
$proxy = $this->hCaptchaConfig->get( 'HCaptchaProxy' );
if ( $proxy ) { if ( $proxy ) {
$options['proxy'] = $proxy; $options['proxy'] = $proxy;
} }
$request = MediaWikiServices::getInstance()->getHttpRequestFactory() $request = MediaWikiServices::getInstance()->getHttpRequestFactory()
->create( $url, $options, __METHOD__ ); ->create( $this->hCaptchaConfig->get( 'HCaptchaVerifyUrl' ), $options, __METHOD__ );
$status = $request->execute(); $status = $request->execute();
if ( !$status->isOK() ) { if ( !$status->isOK() ) {