Skip to content
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

Jump to bottom

Fix migration false positives #787

Merged
merged 2 commits into from
Jun 26, 2023
Merged

Fix migration false positives #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fb6327
migrate: Decode urls prior transmission
nilmerg Jun 22, 2023
75f6fa1
migrate: Already migrate monitoring urls with wildcards
nilmerg Jun 22, 2023
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
4 changes: 2 additions & 2 deletions application/controllers/MigrateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function monitoringUrlAction()
$url = Url::fromPath($urlString);
if (UrlMigrator::isSupportedUrl($url)) {
try {
$urlString = UrlMigrator::transformUrl($url)->getAbsoluteUrl();
$urlString = rawurldecode(UrlMigrator::transformUrl($url)->getAbsoluteUrl());
} catch (Exception $e) {
$errors[$urlString] = [
IcingaException::describe($e),
Expand Down Expand Up @@ -108,7 +108,7 @@ public function searchUrlAction()
$url = Url::fromPath($urlString);
$filter = QueryString::parse($url->getQueryString());
$filter = $traverseFilter($filter) ?? $filter;
$result[] = $url->setQueryString(QueryString::render($filter))->getAbsoluteUrl();
$result[] = rawurldecode($url->setQueryString(QueryString::render($filter))->getAbsoluteUrl());
}

$response = $this->getResponse()->json();
Expand Down
16 changes: 16 additions & 0 deletions library/Icingadb/Compat/UrlMigrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ protected function rewrite(Filter\Rule $filter, array $legacyColumns, Filter\Cha
default:
$filter->setValue($exprRule);
}

$rewritten = $this->transformWildcardFilter($rewritten);
} elseif ($column === 'sort') {
$column = $filter->getValue();
if (isset($legacyColumns[$column])) {
Expand Down Expand Up @@ -178,6 +180,7 @@ protected function rewrite(Filter\Rule $filter, array $legacyColumns, Filter\Cha
return false;
} elseif (preg_match('/^_(host|service)_([\w.]+)/i', $column, $groups)) {
$rewritten = $filter->setColumn($groups[1] . '.vars.' . $groups[2]);
$rewritten = $this->transformWildcardFilter($rewritten);
}
} else {
/** @var Filter\Chain $filter */
Expand All @@ -198,6 +201,19 @@ protected function rewrite(Filter\Rule $filter, array $legacyColumns, Filter\Cha
return $rewritten;
}

private function transformWildcardFilter(Filter\Condition $filter)
{
if (is_string($filter->getValue()) && strpos($filter->getValue(), '*') !== false) {
if ($filter instanceof Filter\Equal) {
return Filter::like($filter->getColumn(), $filter->getValue());
} elseif ($filter instanceof Filter\Unequal) {
return Filter::unlike($filter->getColumn(), $filter->getValue());
}
}

return $filter;
}

protected static function commonColumns(): array
{
return [
Expand Down