Skip to content

Commit e686a14

Browse files
kenjiskenjis
authored
Merge pull request #6421 from kenjis/fix-RequestInterface-mixin
fix: CLIRequest Erros in CLI
2 parents 0d90f84 + 5d7f529 commit e686a14

12 files changed

Lines changed: 124 additions & 19 deletions

File tree

‎system/Common.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use CodeIgniter\Debug\Timer;
2020
use CodeIgniter\Files\Exceptions\FileNotFoundException;
2121
use CodeIgniter\HTTP\Exceptions\HTTPException;
22+
use CodeIgniter\HTTP\IncomingRequest;
2223
use CodeIgniter\HTTP\RedirectResponse;
2324
use CodeIgniter\HTTP\RequestInterface;
2425
use CodeIgniter\HTTP\ResponseInterface;
@@ -487,6 +488,10 @@ function force_https(int $duration = 31_536_000, ?RequestInterface $request = nu
487488
$response = Services::response(null, true);
488489
}
489490

491+
if (! $request instanceof IncomingRequest) {
492+
return;
493+
}
494+
490495
if ((ENVIRONMENT !== 'testing' && (is_cli() || $request->isSecure())) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'test')) {
491496
// @codeCoverageIgnoreStart
492497
return;

‎system/Filters/CSRF.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace CodeIgniter\Filters;
1313

14+
use CodeIgniter\HTTP\IncomingRequest;
1415
use CodeIgniter\HTTP\RedirectResponse;
1516
use CodeIgniter\HTTP\RequestInterface;
1617
use CodeIgniter\HTTP\ResponseInterface;
@@ -44,7 +45,7 @@ class CSRF implements FilterInterface
4445
*/
4546
public function before(RequestInterface $request, $arguments = null)
4647
{
47-
if ($request->isCLI()) {
48+
if (! $request instanceof IncomingRequest) {
4849
return;
4950
}
5051

‎system/Filters/Honeypot.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Filters;
1313

1414
use CodeIgniter\Honeypot\Exceptions\HoneypotException;
15+
use CodeIgniter\HTTP\IncomingRequest;
1516
use CodeIgniter\HTTP\RequestInterface;
1617
use CodeIgniter\HTTP\ResponseInterface;
1718
use Config\Services;
@@ -31,6 +32,10 @@ class Honeypot implements FilterInterface
3132
*/
3233
public function before(RequestInterface $request, $arguments = null)
3334
{
35+
if (! $request instanceof IncomingRequest) {
36+
return;
37+
}
38+
3439
if (Services::honeypot()->hasContent($request)) {
3540
throw HoneypotException::isBot();
3641
}

‎system/Filters/InvalidChars.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace CodeIgniter\Filters;
1313

14+
use CodeIgniter\HTTP\IncomingRequest;
1415
use CodeIgniter\HTTP\RequestInterface;
1516
use CodeIgniter\HTTP\ResponseInterface;
1617
use CodeIgniter\Security\Exceptions\SecurityException;
@@ -48,7 +49,7 @@ class InvalidChars implements FilterInterface
4849
*/
4950
public function before(RequestInterface $request, $arguments = null)
5051
{
51-
if ($request->isCLI()) {
52+
if (! $request instanceof IncomingRequest) {
5253
return;
5354
}
5455

‎system/HTTP/CLIRequest.php‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,70 @@ public function isCLI(): bool
214214
{
215215
return true;
216216
}
217+
218+
/**
219+
* Fetch an item from GET data.
220+
*
221+
* @param array|string|null $index Index for item to fetch from $_GET.
222+
* @param int|null $filter A filter name to apply.
223+
* @param mixed|null $flags
224+
*
225+
* @return null
226+
*/
227+
public function getGet($index = null, $filter = null, $flags = null)
228+
{
229+
return $this->returnNullOrEmptyArray($index);
230+
}
231+
232+
/**
233+
* Fetch an item from POST.
234+
*
235+
* @param array|string|null $index Index for item to fetch from $_POST.
236+
* @param int|null $filter A filter name to apply
237+
* @param mixed $flags
238+
*
239+
* @return null
240+
*/
241+
public function getPost($index = null, $filter = null, $flags = null)
242+
{
243+
return $this->returnNullOrEmptyArray($index);
244+
}
245+
246+
/**
247+
* Fetch an item from POST data with fallback to GET.
248+
*
249+
* @param array|string|null $index Index for item to fetch from $_POST or $_GET
250+
* @param int|null $filter A filter name to apply
251+
* @param mixed $flags
252+
*
253+
* @return null
254+
*/
255+
public function getPostGet($index = null, $filter = null, $flags = null)
256+
{
257+
return $this->returnNullOrEmptyArray($index);
258+
}
259+
260+
/**
261+
* Fetch an item from GET data with fallback to POST.
262+
*
263+
* @param array|string|null $index Index for item to be fetched from $_GET or $_POST
264+
* @param int|null $filter A filter name to apply
265+
* @param mixed $flags
266+
*
267+
* @return null
268+
*/
269+
public function getGetPost($index = null, $filter = null, $flags = null)
270+
{
271+
return $this->returnNullOrEmptyArray($index);
272+
}
273+
274+
/**
275+
* @param array|string|null $index
276+
*
277+
* @return array|null
278+
*/
279+
private function returnNullOrEmptyArray($index)
280+
{
281+
return ($index === null || is_array($index)) ? [] : null;
282+
}
217283
}

‎system/HTTP/Negotiate.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Negotiate
2727
/**
2828
* Request
2929
*
30-
* @var IncomingRequest|RequestInterface
30+
* @var IncomingRequest
3131
*/
3232
protected $request;
3333

@@ -37,6 +37,8 @@ class Negotiate
3737
public function __construct(?RequestInterface $request = null)
3838
{
3939
if ($request !== null) {
40+
assert($request instanceof IncomingRequest);
41+
4042
$this->request = $request;
4143
}
4244
}
@@ -48,6 +50,8 @@ public function __construct(?RequestInterface $request = null)
4850
*/
4951
public function setRequest(RequestInterface $request)
5052
{
53+
assert($request instanceof IncomingRequest);
54+
5155
$this->request = $request;
5256

5357
return $this;

‎system/HTTP/RequestInterface.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313

1414
/**
1515
* Expected behavior of an HTTP request
16-
*
17-
* @mixin IncomingRequest
18-
* @mixin CLIRequest
19-
* @mixin CURLRequest
2016
*/
2117
interface RequestInterface
2218
{

‎system/Honeypot/Honeypot.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Honeypot;
1313

1414
use CodeIgniter\Honeypot\Exceptions\HoneypotException;
15+
use CodeIgniter\HTTP\IncomingRequest;
1516
use CodeIgniter\HTTP\RequestInterface;
1617
use CodeIgniter\HTTP\ResponseInterface;
1718
use Config\Honeypot as HoneypotConfig;
@@ -59,6 +60,8 @@ public function __construct(HoneypotConfig $config)
5960
*/
6061
public function hasContent(RequestInterface $request)
6162
{
63+
assert($request instanceof IncomingRequest);
64+
6265
return ! empty($request->getPost($this->config->name));
6366
}
6467

‎system/Security/Security.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use CodeIgniter\Cookie\Cookie;
1515
use CodeIgniter\HTTP\IncomingRequest;
16+
use CodeIgniter\HTTP\Request;
1617
use CodeIgniter\HTTP\RequestInterface;
1718
use CodeIgniter\HTTP\Response;
1819
use CodeIgniter\Security\Exceptions\SecurityException;
@@ -321,6 +322,8 @@ public function verify(RequestInterface $request)
321322
*/
322323
private function removeTokenInRequest(RequestInterface $request): void
323324
{
325+
assert($request instanceof Request);
326+
324327
$json = json_decode($request->getBody() ?? '');
325328

326329
if (isset($_POST[$this->tokenName])) {
@@ -336,6 +339,8 @@ private function removeTokenInRequest(RequestInterface $request): void
336339

337340
private function getPostedToken(RequestInterface $request): ?string
338341
{
342+
assert($request instanceof IncomingRequest);
343+
339344
// Does the token exist in POST, HEADER or optionally php:://input - json data.
340345
if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
341346
$tokenName = $request->header($this->headerName)->getValue();
@@ -580,6 +585,8 @@ private function saveHashInCookie(): void
580585
*/
581586
protected function sendCookie(RequestInterface $request)
582587
{
588+
assert($request instanceof IncomingRequest);
589+
583590
if ($this->cookie->isSecure() && ! $request->isSecure()) {
584591
return false;
585592
}

‎system/Validation/FileRules.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace CodeIgniter\Validation;
1313

14+
use CodeIgniter\HTTP\IncomingRequest;
15+
use CodeIgniter\HTTP\Request;
1416
use CodeIgniter\HTTP\RequestInterface;
1517
use Config\Mimes;
1618
use Config\Services;
@@ -24,21 +26,21 @@ class FileRules
2426
/**
2527
* Request instance. So we can get access to the files.
2628
*
27-
* @var RequestInterface
29+
* @var IncomingRequest
2830
*/
2931
protected $request;
3032

3133
/**
3234
* Constructor.
33-
*
34-
* @param RequestInterface $request
3535
*/
3636
public function __construct(?RequestInterface $request = null)
3737
{
3838
if ($request === null) {
3939
$request = Services::request();
4040
}
4141

42+
assert($request instanceof IncomingRequest);
43+
4244
$this->request = $request;
4345
}
4446

0 commit comments

Comments
 (0)