Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-06 16:46:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved (trusted) client IP retrieval

Browse Source
This commit is contained in:
mattpass
2020-03-08 12:24:32 +00:00
parent 6ded70720d
commit 551e19e53a
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor.php
View File

@@ -114,7 +114,7 @@ h2 {color: rgba(0,198,255,0.7)}
<span class="heading"><?php echo $t['Browser'];?></span><br>
<?php echo xssClean($_SERVER['HTTP_USER_AGENT'],"html");?><br><br>
<span class="heading"><?php echo $t['Your IP'];?></span><br>
<?php echo $_SERVER['REMOTE_ADDR'];?><br><br>
<?php echo getUserIP();?><br><br>
</div>
<div style="float: left">

11
lib/settings-common.php
View File

@@ -75,6 +75,17 @@ if (!file_exists(dirname(__FILE__)."/../data/backups")) {
mkdir(dirname(__FILE__)."/../data/backups");
}
// Walk through possibilities in the order we'd like to determine an user IP
function getUserIP() {
return $_SERVER['HTTP_CLIENT_IP']
?: $_SERVER['HTTP_X_FORWARDED_FOR']
?: $_SERVER['HTTP_X_FORWARDED']
?: $_SERVER['HTTP_FORWARDED_FOR']
?: $_SERVER['HTTP_FORWARDED']
?: $_SERVER['REMOTE_ADDR']
?: 'Unknown';
}
// Get data from a fopen or CURL connection
function getData($url,$type='fopen',$dieMessage=false,$timeout=60) {
global $context;

2
lib/settings.php
View File

@@ -154,7 +154,7 @@ for ($i=0;$i<count($settingsArray);$i++) {
}
// Check IP permissions
if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
if (!in_array(getUserIP(), $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
header('Location: /');
$reqsPassed = false;
$reqsFailures = ["systemIPRestriction"];