Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Magento 2.4.6-p6 Csp bugfix (jquery getScript bug) #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Magento 2.4.6-p6 Csp bugfix (jquery getScript bug) #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 17 additions & 35 deletions Model/ApiFacade/TpayConfig/ConfigFacade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,36 @@
namespace Tpay\Magento2\Model\ApiFacade\TpayConfig;

use Exception;
use Magento\Framework\View\Asset\Repository;
use Tpay\Magento2\Api\TpayConfigInterface;
use Tpay\Magento2\Api\TpayInterface;
use Tpay\Magento2\Model\ApiFacade\Transaction\TransactionOriginApi;
use Tpay\Magento2\Service\TpayService;
use Tpay\Magento2\Service\TpayTokensService;

class ConfigFacade
{
/** @var ConfigOrigin */
/** @var ConfigOrigin\Proxy */
private $originConfig;

/** @var ConfigOpen */
/** @var ConfigOpen\Proxy */
private $openApi;

/** @var CardConfigFacade */
/** @var CardConfigFacade\Proxy */
private $cardConfig;

/** @var TpayInterface */
private $tpay;

/** @var TpayConfigInterface */
private $tpayConfig;

/** @var Repository */
private $assetRepository;

/** @var TpayTokensService */
private $tokensService;

/** @var TpayService */
private $tpayService;

/** @var bool */
private $useOpenApi;

public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService, TpayService $tpayService)
{
$this->tpay = $tpay;
public function __construct(
TpayConfigInterface $tpayConfig,
ConfigOrigin\Proxy $originConfig,
ConfigOpen\Proxy $openApi,
CardConfigFacade\Proxy $cardConfig
) {
$this->tpayConfig = $tpayConfig;
$this->assetRepository = $assetRepository;
$this->tokensService = $tokensService;
$this->tpayService = $tpayService;
$this->originConfig = $originConfig;
$this->openApi = $openApi;
$this->cardConfig = $cardConfig;
}

public function getConfig(): array
Expand All @@ -63,29 +50,26 @@ private function getCurrentApi()
private function connectApi()
{
if (null == $this->openApi && null === $this->originConfig) {
$this->createOriginApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService);
$this->createOpenApiInstance($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService);
$this->cardConfig = new CardConfigFacade($this->tpay, $this->tpayConfig, $this->assetRepository, $this->tokensService, $this->tpayService);
$this->createOriginApiInstance($this->tpayConfig);
$this->createOpenApiInstance($this->tpayConfig);
}
}

private function createOriginApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService)
private function createOriginApiInstance(TpayConfigInterface $tpayConfig)
{
if (!$tpayConfig->isOriginApiEnabled()) {
$this->originConfig = null;

return;
}

try {
new TransactionOriginApi($tpayConfig->getApiPassword(), $tpayConfig->getApiKey(), $tpayConfig->getMerchantId(), $tpayConfig->getSecurityCode(), !$tpayConfig->useSandboxMode());
$this->originConfig = new ConfigOrigin($tpay, $tpayConfig, $assetRepository, $tokensService);
} catch (Exception $exception) {
$this->originConfig = null;
return;
}
}

private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService)
private function createOpenApiInstance(TpayConfigInterface $tpayConfig)
{
if (!$tpayConfig->isPlnPayment() || !$tpayConfig->isOpenApiEnabled()) {
$this->openApi = null;
Expand All @@ -95,11 +79,9 @@ private function createOpenApiInstance(TpayInterface $tpay, TpayConfigInterface
}

try {
$this->openApi = new ConfigOpen($tpay, $tpayConfig, $assetRepository, $tokensService);
$this->openApi->authorization();
$this->useOpenApi = true;
} catch (Exception $exception) {
$this->openApi = null;
$this->useOpenApi = false;
}
}
Expand Down
27 changes: 23 additions & 4 deletions Model/ApiFacade/TpayConfig/ConfigOpen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Tpay\Magento2\Model\ApiFacade\TpayConfig;

use Magento\Csp\Helper\CspNonceProvider;
use Magento\Framework\Escaper;
use Magento\Framework\View\Asset\Repository;
use Tpay\Magento2\Api\TpayConfigInterface;
use Tpay\Magento2\Api\TpayInterface;
Expand All @@ -23,12 +25,26 @@ class ConfigOpen extends TpayApi
/** @var Repository */
private $assetRepository;

public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService)
{
/** @var CspNonceProvider */
private $cspNonceProvider;

/** @var Escaper */
private $escaper;

public function __construct(
TpayInterface $tpay,
TpayConfigInterface $tpayConfig,
Repository $assetRepository,
TpayTokensService $tokensService,
CspNonceProvider $cspNonceProvider,
Escaper $escaper
) {
$this->tpay = $tpay;
$this->tpayConfig = $tpayConfig;
$this->assetRepository = $assetRepository;
$this->tokensService = $tokensService;
$this->cspNonceProvider = $cspNonceProvider;
$this->escaper = $escaper;
parent::__construct($tpayConfig->getOpenApiClientId(), $tpayConfig->getOpenApiPassword(), !$tpayConfig->useSandboxMode());
}

Expand Down Expand Up @@ -68,9 +84,12 @@ public function showChannels(): ?string
public function createScript(string $script): string
{
return "
<script type=\"text/javascript\">
<script nonce='{$this->cspNonceProvider->generateNonce()}'>
require(['jquery'], function ($) {
$.getScript('{$this->generateURL($script)}');
let script = document.createElement('script');
script.nonce = '{$this->cspNonceProvider->generateNonce()}';
script.textContent = '{$this->escaper->escapeJs($this->assetRepository->createAsset($script)->getContent())}';
document.head.appendChild(script);

});
</script>";
Expand Down
27 changes: 23 additions & 4 deletions Model/ApiFacade/TpayConfig/ConfigOrigin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Tpay\Magento2\Model\ApiFacade\TpayConfig;

use Magento\Csp\Helper\CspNonceProvider;
use Magento\Framework\Escaper;
use Magento\Framework\View\Asset\Repository;
use Tpay\Magento2\Api\TpayConfigInterface;
use Tpay\Magento2\Api\TpayInterface;
Expand All @@ -22,12 +24,26 @@ class ConfigOrigin
/** @var TpayConfigInterface */
private $tpayConfig;

public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig, Repository $assetRepository, TpayTokensService $tokensService)
{
/** @var CspNonceProvider */
private $cspNonceProvider;

/** @var Escaper */
private $escaper;

public function __construct(
TpayInterface $tpay,
TpayConfigInterface $tpayConfig,
Repository $assetRepository,
TpayTokensService $tokensService,
CspNonceProvider $cspNonceProvider,
Escaper $escaper
) {
$this->tpay = $tpay;
$this->tpayConfig = $tpayConfig;
$this->assetRepository = $assetRepository;
$this->tokensService = $tokensService;
$this->cspNonceProvider = $cspNonceProvider;
$this->escaper = $escaper;
}

public function getConfig(): array
Expand Down Expand Up @@ -69,9 +85,12 @@ public function showChannels(): ?string
public function createScript(string $script): string
{
return "
<script type=\"text/javascript\">
<script nonce='{$this->cspNonceProvider->generateNonce()}'>
require(['jquery'], function ($) {
$.getScript('{$this->generateURL($script)}');
let script = document.createElement('script');
script.nonce = '{$this->cspNonceProvider->generateNonce()}';
script.textContent = '{$this->escaper->escapeJs($this->assetRepository->createAsset($script)->getContent())}';
document.head.appendChild(script);

});
</script>";
Expand Down
15 changes: 4 additions & 11 deletions Model/TpayConfigProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@
namespace Tpay\Magento2\Model;

use Magento\Checkout\Model\ConfigProviderInterface;
use Magento\Framework\View\Asset\Repository;
use Magento\Payment\Helper\Data as PaymentHelper;
use Tpay\Magento2\Api\TpayConfigInterface;
use Tpay\Magento2\Api\TpayInterface;
use Tpay\Magento2\Model\ApiFacade\TpayConfig\ConfigFacade;
use Tpay\Magento2\Model\ApiFacade\Transaction\TransactionApiFacade;
use Tpay\Magento2\Service\TpayService;
use Tpay\Magento2\Service\TpayTokensService;

class TpayConfigProvider implements ConfigProviderInterface
{
Expand All @@ -22,28 +18,25 @@ class TpayConfigProvider implements ConfigProviderInterface
/** @var TpayInterface */
protected $paymentMethod;

/** @var ConfigFacade */
/** @var ConfigFacade\Proxy */
protected $configFacade;

/** @var TransactionApiFacade */
protected $transactionApi;

public function __construct(
PaymentHelper $paymentHelper,
Repository $assetRepository,
TpayTokensService $tokensService,
TransactionApiFacade $transactionApiFacade,
TpayService $tpayService,
TpayConfigInterface $tpayConfig
ConfigFacade\Proxy $configFacade
) {
$this->paymentHelper = $paymentHelper;
$this->transactionApi = $transactionApiFacade;
$this->configFacade = new ConfigFacade($this->getPaymentMethodInstance(), $tpayConfig, $assetRepository, $tokensService, $tpayService);
$this->configFacade = $configFacade;
}

public function getConfig(): array
{
if (!$this->paymentMethod->isAvailable()) {
if (!$this->getPaymentMethodInstance()->isAvailable()) {
return [];
}

Expand Down
Loading