Skip to content

Fixes entry condition in matomo proxy #100

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
sgiehl merged 1 commit into from
Mar 31, 2026
Merged

Fixes entry condition in matomo proxy #100

Show file tree
Hide file tree
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
13 changes: 9 additions & 4 deletions matomo-proxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@
$filerequest = isset($_POST['file']) ? $_POST['file'] : null;
}

if (
!(isset($filerequest) && in_array($filerequest, $VALID_FILES))
&& !(isset($module) && isset($action) && in_array("$module.$action", $SUPPORTED_METHODS))
) {
$hasFileRequest = !empty($filerequest);
$hasSupportedMethod = !empty($module) && !empty($action) && in_array("$module.$action", $SUPPORTED_METHODS, true);

if ($hasFileRequest) {
if (!in_array($filerequest, $VALID_FILES, true)) {
http_response_code(404);
exit;
}
} elseif (!$hasSupportedMethod) {
http_response_code(404);
exit;
}
Expand Down
25 changes: 25 additions & 0 deletions tests/ProxyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,31 @@ public function test_indexphp_blocked_post_requests_are_not_proxied()
$this->assertEquals(404, $response->getStatusCode());
}

public function test_indexphp_requests_with_invalid_file_are_not_proxied_even_if_method_is_allowed()
{
$response = $this->send(
'module=CoreAdminHome&action=optOut&file=plugins/CoreAdminHome/javascripts/notAllowed.js',
null,
null,
null,
'/matomo-proxy.php'
);
$this->assertEquals(404, $response->getStatusCode());
}

public function test_indexphp_post_requests_with_invalid_file_are_not_proxied_even_if_method_is_allowed()
{
$response = $this->send(
'module=CoreAdminHome&action=optOut&file=plugins/CoreAdminHome/javascripts/notAllowed.js',
null,
null,
null,
'/matomo-proxy.php',
'POST'
);
$this->assertEquals(404, $response->getStatusCode());
}

public function test_indexphp_empty_requests_are_not_proxied()
{
$response = $this->send('', null, null, null, '/matomo-proxy.php');
Expand Down
Loading