Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-10 10:26:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Fix initialization errors.

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2022-06-16 07:54:44 +02:00
parent ef73720d2b
commit 66dcab2cd0
19 changed files with 124 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/SP/Http/Request.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -27,7 +27,6 @@ namespace SP\Http;
use Exception;
use Klein\DataCollection\DataCollection;
use Klein\DataCollection\HeaderDataCollection;
use SP\Core\Bootstrap\BootstrapBase;
use SP\Core\Crypt\CryptPKI;
use SP\Core\Crypt\Hash;
use SP\Core\Exceptions\SPException;
@@ -46,8 +45,9 @@ class Request implements RequestInterface
*/
public const SECURE_DIRS = ['css', 'js'];
private HeaderDataCollection $headers;
private \Klein\Request $request;
private CryptPKI $cryptPKI;
private HeaderDataCollection $headers;
private DataCollection $params;
private ?string $method = null;
private ?bool $https = null;
@@ -55,9 +55,10 @@ class Request implements RequestInterface
/**
* Request constructor.
*/
public function __construct(\Klein\Request $request)
public function __construct(\Klein\Request $request, CryptPKI $cryptPKI)
{
$this->request = $request;
$this->cryptPKI = $cryptPKI;
$this->headers = $this->request->headers();
$this->params = $this->getParamsByMethod();
$this->detectHttps();
@@ -211,8 +212,7 @@ class Request implements RequestInterface
try {
// Desencriptar con la clave RSA
$clearData = BootstrapBase::getContainer()->get(CryptPKI::class)
->decryptRSA(base64_decode($encryptedData));
$clearData = $this->cryptPKI->decryptRSA(base64_decode($encryptedData));
// Desencriptar con la clave RSA
if ($clearData === null) {