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.

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

Admin user can call arbitrary Module class's constructor via Cart Pri… #35588

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ abstract class Catalog extends Action
/**
* Date filter instance
*
* @var \Magento\Framework\Stdlib\DateTime\Filter\Date
* @var Date
*/
protected $_dateFilter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;

use Magento\Rule\Model\Action\AbstractAction;
declare(strict_types=1);
namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;

/**
* @SuppressWarnings(PHPMD.AllPurposeAction)
*/
class NewActionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
class NewActionHtml extends NewHtml
{
protected string $typeChecked = 'Magento\Rule\Model\Action\AbstractAction';

/**
* Execute new action html.
*
Expand All @@ -24,21 +26,21 @@ public function execute()
$typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type', '')));
$type = $typeArr[0];

$model = $this->_objectManager->create($type)
->setId($id)
->setType($type)
->setRule($this->_objectManager->create(\Magento\CatalogRule\Model\Rule::class))
->setPrefix('actions');
$model = $this->_objectManager->create($type);
if ($this->verifyClassName($model)) {
$model->setId($id)
->setType($type)
->setRule($this->_objectManager->create(\Magento\CatalogRule\Model\Rule::class))
->setPrefix('actions');

if (!empty($typeArr[1])) {
$model->setAttribute($typeArr[1]);
}
if (!empty($typeArr[1])) {
$model->setAttribute($typeArr[1]);
}

if ($model instanceof AbstractAction) {
$model->setJsFormObject($this->getRequest()->getParam('form'));
$html = $model->asHtmlRecursive();
} else {
$html = '';
}else {
$html = $this->getErrorJson();
}
$this->getResponse()->setBody($html);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);
namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;

use Magento\CatalogRule\Model\Rule;
use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
use Magento\Rule\Model\Condition\AbstractCondition;
use Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog as CatalogAction;

class NewConditionHtml extends CatalogAction implements HttpPostActionInterface, HttpGetActionInterface
class NewConditionHtml extends NewHtml implements HttpPostActionInterface, HttpGetActionInterface
{
protected string $typeChecked = 'Magento\Rule\Model\Condition\AbstractCondition';

/**
* Execute new condition html.
*
Expand All @@ -25,23 +28,25 @@ public function execute()
$typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type', '')));
$type = $typeArr[0];

$model = $this->_objectManager->create($type)
->setId($id)
->setType($type)
->setRule($this->_objectManager->create(\Magento\CatalogRule\Model\Rule::class))
->setPrefix('conditions');
$model = $this->_objectManager->create($type);

if (!empty($typeArr[1])) {
$model->setAttribute($typeArr[1]);
}
if ($this->verifyClassName($model)) {
$model->setId($id)
->setType($type)
->setRule($this->_objectManager->create(Rule::class))
->setPrefix('conditions');

if (!empty($typeArr[1])) {
$model->setAttribute($typeArr[1]);
}

if ($model instanceof AbstractCondition) {
$model->setJsFormObject($this->getRequest()->getParam('form'));
$model->setFormName($formName);
$html = $model->asHtmlRecursive();
} else {
$html = '';
$html = $this->getErrorJson();
}

$this->getResponse()->setBody($html);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;

use Magento\Backend\App\Action\Context;
use Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog as CatalogAction;
use Magento\Framework\Registry;
use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\Stdlib\DateTime\Filter\Date;

abstract class NewHtml extends CatalogAction
{
/**
* @var string
*/
protected string $typeChecked = '';

/**
* @var SerializerInterface
*/
protected SerializerInterface $serializer;

public function __construct(
Context $context,
Registry $coreRegistry,
Date $dateFilter,
SerializerInterface $serializer
){
parent::__construct($context, $coreRegistry, $dateFilter);

$this->serializer = $serializer;
}

/**
* Verify class instance
*
* @param mixed $verifyClass
* @return bool
*/
public function verifyClassName($verifyClass): bool
{
if ($verifyClass instanceof $this->typeChecked) {
return true;
}

return false;
}

/**
* Get Error json
*
* @return bool|string
*/
protected function getErrorJson()
{
return $this->serializer->serialize(
[
'error' => true,
'message' => __('Selected type is not inherited from type %1', $this->typeChecked)
]
);
}
}
4 changes: 3 additions & 1 deletion app/code/Magento/Rule/view/adminhtml/web/rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,11 @@ define([
},
onComplete: this.onAddNewChildComplete.bind(this, new_elem),
onSuccess: function (transport) {
let responseElement = '';
if (this._processSuccess(transport)) {
$(new_elem).update(transport.responseText);
responseElement = transport.responseText;
}
$(new_elem).update(responseElement);
}.bind(this),
onFailure: this._processFailure.bind(this)
});
Expand Down
38 changes: 23 additions & 15 deletions app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@
*/
namespace Magento\SalesRule\Controller\Adminhtml\Promo;

abstract class Quote extends \Magento\Backend\App\Action
use Magento\Backend\App\Action;
use Magento\Backend\App\Action\Context;
use Magento\Framework\App\Response\Http\FileFactory;
use Magento\Framework\Registry;
use Magento\Framework\Stdlib\DateTime\Filter\Date;
use Magento\SalesRule\Model\RegistryConstants;
use Magento\SalesRule\Model\Rule;

abstract class Quote extends Action
{
/**
* Authorization level of a basic admin session
Expand All @@ -17,31 +25,31 @@ abstract class Quote extends \Magento\Backend\App\Action
/**
* Core registry
*
* @var \Magento\Framework\Registry
* @var Registry
*/
protected $_coreRegistry = null;

/**
* @var \Magento\Framework\App\Response\Http\FileFactory
* @var FileFactory
*/
protected $_fileFactory;

/**
* @var \Magento\Framework\Stdlib\DateTime\Filter\Date
* @var Date
*/
protected $_dateFilter;

/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
* @param Context $context
* @param Registry $coreRegistry
* @param FileFactory $fileFactory
* @param Date $dateFilter
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
Context $context,
Registry $coreRegistry,
FileFactory $fileFactory,
Date $dateFilter
) {
parent::__construct($context);
$this->_coreRegistry = $coreRegistry;
Expand All @@ -57,8 +65,8 @@ public function __construct(
protected function _initRule()
{
$this->_coreRegistry->register(
\Magento\SalesRule\Model\RegistryConstants::CURRENT_SALES_RULE,
$this->_objectManager->create(\Magento\SalesRule\Model\Rule::class)
RegistryConstants::CURRENT_SALES_RULE,
$this->_objectManager->create(Rule::class)
);
$id = (int)$this->getRequest()->getParam('id');

Expand All @@ -67,7 +75,7 @@ protected function _initRule()
}

if ($id) {
$this->_coreRegistry->registry(\Magento\SalesRule\Model\RegistryConstants::CURRENT_SALES_RULE)->load($id);
$this->_coreRegistry->registry(RegistryConstants::CURRENT_SALES_RULE)->load($id);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);
namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;

use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Rule\Model\Condition\AbstractCondition;
use Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
use Magento\SalesRule\Model\Rule;
use Magento\Rule\Model\Condition\AbstractCondition;

/**
* New action html action
*/
class NewActionHtml extends Quote implements HttpPostActionInterface
class NewActionHtml extends NewHtml
{
/**
* @var string
*/
protected string $typeChecked = 'Magento\Rule\Model\Condition\AbstractCondition';

/**
* New action html action
*
Expand All @@ -30,31 +35,24 @@ public function execute()
);
$type = $typeArr[0];

$model = $this->_objectManager->create(
$type
)->setId(
$id
)->setType(
$type
)->setRule(
$this->_objectManager->create(Rule::class)
)->setPrefix(
'actions'
);
if (!empty($typeArr[1])) {
$model->setAttribute($typeArr[1]);
}
$model = $this->_objectManager->create($type);
if ($this->verifyClassName($model)) {
$model->setId($id)
->setType($type)
->setRule($this->_objectManager->create(Rule::class))
->setPrefix('actions');
if (!empty($typeArr[1])) {
$model->setAttribute($typeArr[1]);
}

if ($model instanceof AbstractCondition) {
$model->setJsFormObject($formName);
$model->setFormName($formName);
$this->setJsFormObject($model);
$html = $model->asHtmlRecursive();
} else {
$html = '';
$html = $this->getErrorJson();
}
$this->getResponse()
->setBody($html);
$this->getResponse()->setBody($html);
}

/**
Expand Down
Loading