Skip to content

Handle ip behind proxies #914

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

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Handle ip behind proxies #914

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fc33876
move IP detection function to more global location
michield Jul 10, 2021
98ad57f
replace (almost) all REMOTE_ADDR with getClientIP(), so that it conti…
michield Jul 10, 2021
66bf671
Merge branch 'master' into handle_IP_behind_proxies
michield Oct 17, 2021
8676f77
cache the ip address found
michield Oct 20, 2021
02faef6
tidy up
michield Oct 20, 2021
dcff53c
detect proxy in hostname
michield Dec 13, 2022
bb458e6
Merge branch 'main' into handle_IP_behind_proxies
michield Dec 13, 2022
27c00fb
Allow config to set ADMIN_WWWROOT and USER_WWWROOT to bypass the URL …
michield Jul 27, 2023
3771d43
Merge branch 'main' into handle_IP_behind_proxies
michield Jul 27, 2023
a26eccf
add section to config_extended about the new values
michield Jul 27, 2023
0b472cd
fix publicBaseUrl initialisation, as functions and vars are not avail…
michield Jul 30, 2023
e5a17ad
default to http:// to make CI pass
michield Jul 30, 2023
b7e3265
define new global vars for user and admin base urls
michield Aug 28, 2023
d853540
keep the URL config method as before, but override the config when fe…
michield Aug 28, 2023
da74e1a
use new global adminBaseUrl
michield Aug 28, 2023
66a1a78
use intermediate config var for initialisation of the config URLs
michield Aug 28, 2023
7a36207
use new global adminBaseUrl
michield Aug 28, 2023
6cbfdec
update pageroot only when not set, and add explanation in config_exte…
michield Sep 4, 2023
a1e9bc3
fix some more links with the new global var
michield Sep 4, 2023
0b36b40
remove obsolete line
michield Sep 4, 2023
0dadc39
fix typo
michield Sep 4, 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
fix some more links with the new global var
  • Loading branch information
@michield
michield committed Sep 4, 2023
commit a1e9bc3cf746bf1ef7710cf027b7f52651068c90
6 changes: 3 additions & 3 deletions public_html/lists/admin/sendemaillib.php
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

    $clicktrack_root = sprintf('%s://%s/lt.php', $GLOBALS['public_scheme'], $website.$GLOBALS['pageroot']);

This needs to change to use $publicBaseUrl .

Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
if (CLICKTRACK && $hash != 'forwarded' && !empty($userdata['id'])) {
// convert html message
preg_match_all('/<a (.*)href=(["\'])(.*)\2([^>]*)>(.*)<\/a>/Umis', $htmlmessage, $links);
$clicktrack_root = sprintf('%s://%s/lt.php', $GLOBALS['public_scheme'], $website.$GLOBALS['pageroot']);
$clicktrack_root = sprintf('%s/lt.php', $GLOBALS['publicBaseUrl']);

for ($i = 0; $i < count($links[3]); ++$i) {
$link = cleanUrl(trim($links[3][$i]));
Expand Down Expand Up @@ -584,7 +584,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
$masked = str_replace('=', '', base64_encode(hex2bin(str_replace('-', '', $masked))));

if (SIGN_WITH_HMAC) {
$masked .= '&hm='.hash_hmac(HASH_ALGO, sprintf('%s://%s/lt.php?tid=%s', $GLOBALS['public_scheme'], $website.$GLOBALS['pageroot'], $masked), HMACKEY);
$masked .= '&hm='.hash_hmac(HASH_ALGO, sprintf('/lt.php?tid=%s', $GLOBALS['publicBaseUrl'], $masked), HMACKEY);
}

if (!CLICKTRACK_LINKMAP) {
Expand Down Expand Up @@ -1062,7 +1062,7 @@ function addAttachments($msgid, &$mail, $type,$hash = '')
break;

case 'text':
$viewurl = $GLOBALS['public_scheme'].'://'.$website.$GLOBALS['pageroot'].'/dl.php?id='.$att['id'];
$viewurl = $GLOBALS['publicBaseUrl'].'/dl.php?id='.$att['id'];
if (!empty($hash)) {
$viewurl .= '&uid='.$hash;
}
Expand Down