Merge pull request #30618 from nextcloud/backport/30609/stable22

[stable22] Fix RequestURL check for cli commands
nextcloud · Jan 12, 2022 · 29a3f2c · 29a3f2c
2 parents 51d4f30 + efe0623
commit 29a3f2c
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/apps/workflowengine/lib/Check/RequestURL.php b/apps/workflowengine/lib/Check/RequestURL.php
@@ -27,8 +27,9 @@
 use OCP\IRequest;
 
 class RequestURL extends AbstractStringCheck {
+	public const CLI = 'cli';
 
-	/** @var string */
+	/** @var ?string */
 	protected $url;
 
 	/** @var IRequest */
@@ -49,7 +50,11 @@ public function __construct(IL10N $l, IRequest $request) {
 	 * @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 @@ protected function getActualValue() {
 		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 ||