sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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/30617/head
Carl Schwan 2022-01-11 19:14:28 +07:00 committed by backportbot[bot]
parent b7f3c7c8d6
commit 056b109b69
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/workflowengine/lib/Check/RequestURL.php
Unescape Escape View File

@ -25,8 +25,9 @@ use OCP\IL10N;
use OCP\IRequest;
class RequestURL extends AbstractStringCheck {
public const CLI = 'cli';
/** @var string */
/** @var ?string */
protected $url;
/** @var IRequest */
@ -47,7 +48,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':
@ -77,10 +82,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 ||