Skip to content

[stable27] Fix: config param 'overwritecondaddr' not working #43182

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
blizzz merged 3 commits into from
Jan 30, 2024
Merged

[stable27] Fix: config param 'overwritecondaddr' not working #43182

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55991f9
fixing bug #6914: Config Param 'overwritecondaddr' not working
pavelkryl Jan 13, 2022
6c9f968
code style: ommited space, reverted [code review]
pavelkryl Jan 13, 2022
6490e50
test(unit): fix RequestTest
blizzz Jan 26, 2024
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
Next Next commit
fixing bug #6914: Config Param 'overwritecondaddr' not working 
- just ignoring/removing extra parameter 'protocol' as suggested by
  blizzz

Signed-off-by: Pavel Kryl <[email protected]>
  • Loading branch information
@pavelkryl @backportbot
pavelkryl authored and backportbot[bot] committed Jan 29, 2024
commit 55991f93c2fae9a31f0a43b4d6a078ffb9cef5e1
10 changes: 4 additions & 6 deletions lib/private/AppFramework/Http/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public function __unset($id) {
* @return string
*/
public function getHeader(string $name): string {
$name = strtoupper(str_replace('-', '_', $name));
$name = strtoupper(str_replace('-', '_',$name));
if (isset($this->server['HTTP_' . $name])) {
return $this->server['HTTP_' . $name];
}
Expand Down Expand Up @@ -626,14 +626,12 @@ public function getRemoteAddress(): string {

/**
* Check overwrite condition
* @param string $type
* @return bool
*/
private function isOverwriteCondition(string $type = ''): bool {
private function isOverwriteCondition(): bool {
$regex = '/' . $this->config->getSystemValueString('overwritecondaddr', '') . '/';
$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
return $regex === '//' || preg_match($regex, $remoteAddr) === 1
|| $type !== 'protocol';
return $regex === '//' || preg_match($regex, $remoteAddr) === 1;
}

/**
Expand All @@ -643,7 +641,7 @@ private function isOverwriteCondition(string $type = ''): bool {
*/
public function getServerProtocol(): string {
if ($this->config->getSystemValueString('overwriteprotocol') !== ''
&& $this->isOverwriteCondition('protocol')) {
&& $this->isOverwriteCondition()) {
return $this->config->getSystemValueString('overwriteprotocol');
}

Expand Down