mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22410 from nextcloud/backport/22359/stable19 

[stable19] fix possible leaking scope in Flow
This commit is contained in:
Roeland Jago Douma 2020-08-26 20:22:37 +02:00 committed by GitHub
parent 7aeb222426 f8417cca0f
commit c9a1379bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/workflowengine/lib/AppInfo/Application.php
View File

@ -95,6 +95,7 @@ class Application extends \OCP\AppFramework\App {
/** @var IOperation $operation */ /** @var IOperation $operation */
$operation = $this->getContainer()->query($operationClass); $operation = $this->getContainer()->query($operationClass);
$ruleMatcher->setEventName($eventName);
$ruleMatcher->setEntity($entity); $ruleMatcher->setEntity($entity);
$ruleMatcher->setOperation($operation); $ruleMatcher->setOperation($operation);

14
apps/workflowengine/lib/Service/RuleMatcher.php
View File

@ -62,6 +62,8 @@ class RuleMatcher implements IRuleMatcher {
protected $entity; protected $entity;
/** @var Logger */ /** @var Logger */
protected $logger; protected $logger;
/** @var string */
protected $eventName;
public function __construct( public function __construct(
IUserSession $session, IUserSession $session,
@ -101,6 +103,13 @@ class RuleMatcher implements IRuleMatcher {
$this->entity = $entity; $this->entity = $entity;
} }
public function setEventName(string $eventName): void {
if ($this->eventName !== null) {
throw new RuntimeException('This method must not be called more than once');
}
$this->eventName = $eventName;
}
public function getEntity(): IEntity { public function getEntity(): IEntity {
if ($this->entity === null) { if ($this->entity === null) {
throw new \LogicException('Entity was not set yet'); throw new \LogicException('Entity was not set yet');
@ -155,6 +164,11 @@ class RuleMatcher implements IRuleMatcher {
$matches = []; $matches = [];
foreach ($operations as $operation) { foreach ($operations as $operation) {
$configuredEvents = json_decode($operation['events'], true);
if ($this->eventName !== null && !in_array($this->eventName, $configuredEvents)) {
continue;
}
$checkIds = json_decode($operation['checks'], true); $checkIds = json_decode($operation['checks'], true);
$checks = $this->manager->getChecks($checkIds); $checks = $this->manager->getChecks($checkIds);

10
lib/public/WorkflowEngine/IRuleMatcher.php
View File

@ -78,4 +78,14 @@ interface IRuleMatcher extends IFileCheck {
* @since 18.0.0 * @since 18.0.0
*/ */
public function getEntity(): IEntity; public function getEntity(): IEntity;
/**
* this method can be called once to set the event name that is currently
* being processed. The workflow engine takes care of this usually, only an
* IComplexOperation might want to make use of it.
*
* @throws RuntimeException
* @since 19.0.3
*/
public function setEventName(string $eventName): void;
} }