Skip to content

Migrate forwarded for headers check #41438

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
come-nc merged 6 commits into from
Nov 21, 2023
Merged

Migrate forwarded for headers check #41438

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0107c7e
Migrate Forwarded For Headers check to new API
come-nc Nov 13, 2023
0ebd44a
Migrate tests of forwarded for headers check
come-nc Nov 13, 2023
f47a2bb
Improve wrong configuration error message when we know it’s wrong.
come-nc Nov 20, 2023
f023216
Make it an error if address is not known and we are not in CLI
come-nc Nov 20, 2023
1f4e092
Improve success messages for ForwarderForHeaders setup check
come-nc Nov 20, 2023
ad37286
Fix tests for setupchecks
come-nc Nov 20, 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
Prev Previous commit
Next Next commit
Make it an error if address is not known and we are not in CLI 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Nov 20, 2023
commit f023216cf47ad2d6e69a16d69718d22e4d06ec2f
10 changes: 7 additions & 3 deletions apps/settings/lib/SetupChecks/BruteForceThrottler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ public function getName(): string {
public function run(): SetupResult {
$address = $this->request->getRemoteAddress();
if ($address === '') {
return SetupResult::info(
$this->l10n->t('Your remote address could not be determined.')
);
if (\OC::$CLI) {
/* We were called from CLI */
return SetupResult::info('Your remote address could not be determined.');
} else {
/* Should never happen */
return SetupResult::error('Your remote address could not be determined.');
}
} elseif ($this->throttler->showBruteforceWarning($address)) {
return SetupResult::error(
$this->l10n->t('Your remote address was identified as "%s" and is bruteforce throttled at the moment slowing down the performance of various requests. If the remote address is not your address this can be an indication that a proxy is not configured correctly.', $address),
Expand Down
9 changes: 7 additions & 2 deletions apps/settings/lib/SetupChecks/ForwardedForHeaders.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,13 @@ public function run(): SetupResult {
}

if (($remoteAddress === '') && ($this->request->getRemoteAddress() === '')) {
/* Most likely we were called from CLI */
return SetupResult::info('Your remote address could not be determined.');
if (\OC::$CLI) {
/* We were called from CLI */
return SetupResult::info('Your remote address could not be determined.');
} else {
/* Should never happen */
return SetupResult::error('Your remote address could not be determined.');
}
}

if (empty($trustedProxies) && $this->request->getHeader('X-Forwarded-Host') !== '') {
Expand Down