Fix RequestURL check for cli commands

Fix https://github.com/nextcloud/files_automatedtagging/issues/526

Fix https://github.com/nextcloud/groupfolders/issues/1855

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
pull/30609/head
Carl Schwan 4 years ago
parent 796764aafd
commit 08bf47a5de
No known key found for this signature in database
GPG Key ID: 06B35D38387B67BE
  1. 17
      apps/workflowengine/lib/Check/RequestURL.php

@ -27,8 +27,9 @@ use OCP\IL10N;
use OCP\IRequest;
class RequestURL extends AbstractStringCheck {
public const CLI = 'cli';
/** @var string */
/** @var ?string */
protected $url;
/** @var IRequest */
@ -49,7 +50,11 @@ class RequestURL extends AbstractStringCheck {
* @return bool
*/
public function executeCheck($operator, $value) {
$actualValue = $this->getActualValue();
if (\OC::$CLI) {
$actualValue = $this->url = RequestURL::CLI;
} else {
$actualValue = $this->getActualValue();
}
if (in_array($operator, ['is', '!is'])) {
switch ($value) {
case 'webdav':
@ -79,10 +84,10 @@ class RequestURL extends AbstractStringCheck {
return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
}
/**
* @return bool
*/
protected function isWebDAVRequest() {
protected function isWebDAVRequest(): bool {
if ($this->url === RequestURL::CLI) {
return false;
}
return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
$this->request->getPathInfo() === '/webdav' ||
strpos($this->request->getPathInfo(), '/webdav/') === 0 ||

Loading…
Cancel
Save