Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-09 17:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add config option for request uri field (#8738) (#8770)

Browse Source 
This can be used to read a custom header sent by a reverse proxy to resolve the absolute path to Roundcube

* add check against the proxy_whitelist option before using a HTTP header field value for the request uri composition.
* refactor the rcmail::url() method to also work when composing fully qualified urls.
* fix/adapt tests
This commit is contained in:
Thomas B
2022-11-23 21:05:00 +01:00
committed by Aleksander Machniak
parent 6807820eed
commit be4c12a55e
5 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
program/include/rcmail.php
View File

@@ -1117,7 +1117,11 @@ class rcmail extends rcube
}
$base_path = '';
if (!empty($_SERVER['REDIRECT_SCRIPT_URL'])) {
$server_var = $this->get_request_uri_field();
if ($server_var && !empty($_SERVER[$server_var])) {
$base_path = preg_replace('/[?&].*$/', '', $_SERVER[$server_var]);
}
else if (!empty($_SERVER['REDIRECT_SCRIPT_URL'])) {
$base_path = $_SERVER['REDIRECT_SCRIPT_URL'];
}
else if (!empty($_SERVER['SCRIPT_NAME'])) {
@@ -1152,17 +1156,25 @@ class rcmail extends rcube
$prefix = rtrim($prefix, '/') . '/';
}
else {
if (isset($_SERVER['REQUEST_URI'])) {
$prefix = preg_replace('/[?&].*$/', '', $_SERVER['REQUEST_URI']) ?: './';
}
else {
$prefix = './';
}
$prefix = $base_path ?: './';
}
return $prefix . $url;
}
/**
* Get the 'request_uri_field' config option
* with an additional check against the 'proxy_whitelist' config
*/
protected function get_request_uri_field()
{
$server_var = $this->config->get('request_uri_field');
if (!empty($server_var) && (strpos($server_var, 'HTTP_') !== 0 || rcube_utils::check_proxy_whitelist_ip())) {
return $server_var;
}
return null;
}
/**
* Function to be executed in script shutdown
*/