Skip to content

[stable22] Fix RequestURL check for cli commands #30618

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 12, 2022
Merged

[stable22] Fix RequestURL check for cli commands #30618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions apps/workflowengine/lib/Check/RequestURL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
use OCP\IRequest;

class RequestURL extends AbstractStringCheck {
public const CLI = 'cli';

/** @var string */
/** @var ?string */
protected $url;

/** @var IRequest */
Expand All @@ -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':
Expand Down Expand Up @@ -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 ||
Expand Down