Now detects proxy usage

[ctracker.git] / libs / lib_detector.php

diff --git a/libs/lib_detector.php b/libs/lib_detector.php
index 4ea881f267e5e29151f26874f476eebf75cb542d..4459a5821e7c397227e9adb1806a05adf5692798 100644 (file)
--- a/libs/lib_detector.php
+++ b/libs/lib_detector.php
@@ -107,7 +107,7 @@ function sendCrackerTrackerMail () {
        // Mail content
        $mail = "Attack detected:
 -----------------------------------------------------
-Remote-IP       : ".$_SERVER['REMOTE_ADDR']."
+Remote-IP       : ".determineRealRemoteAddress()."
 User-Agent      : ".$_SERVER['HTTP_USER_AGENT']."
 Request-string  : ".$_SERVER['QUERY_STRING']."
 Filtered string : ".$GLOBALS['checkworm']."
@@ -131,7 +131,7 @@ Referrer        : ".$_SERVER['HTTP_REFERRER']."
 function crackerTrackerSendMail ($mail) {
        // Construct dummy array
        $rowData = array(
-               'remote_addr' => $_SERVER['REMOTE_ADDR'],
+               'remote_addr' => determineRealRemoteAddress(),
                'check_worm'  => $GLOBALS['checkworm'],
                'server_name' => $_SERVER['SERVER_NAME']
        );
@@ -160,7 +160,7 @@ function sendCrackerTrackerPostMail () {
        // Mail text
        $mail = "POST-Attack detected:
 -----------------------------------------------------
-Remote-IP            : ".$_SERVER['REMOTE_ADDR']."
+Remote-IP            : ".determineRealRemoteAddress()."
 User-Agent           : ".$_SERVER['HTTP_USER_AGENT']."
 Request-string       : ".$_SERVER['QUERY_STRING']."
 Filtered string      : ".$GLOBALS['checkworm']."
@@ -200,10 +200,18 @@ function crackerTrackerLogAttack () {
        // Aquire database link
        aquireCrackerTrackerDatabaseLink();
 
+       // By default no proxy is used
+       $proxyUsed = 'N';
+
+       // Did the attacker use a proxy?
+       if (isProxyUsed()) {
+               // Set it
+               $proxyUsed = 'Y';
+       } // END - if
 
        // Prepare array for database insert
        $rowData = array(
-               'remote_addr' => $_SERVER['REMOTE_ADDR'],
+               'remote_addr' => determineRealRemoteAddress(),
                'user_agent'  => $_SERVER['HTTP_USER_AGENT'],
                'get_data'    => $_SERVER['QUERY_STRING'],
                'post_data'   => $GLOBALS['post_track'],
@@ -211,7 +219,8 @@ function crackerTrackerLogAttack () {
                'check_post'  => $GLOBALS['check_post'],
                'server_name' => $_SERVER['SERVER_NAME'],
                'script_name' => $_SERVER['SCRIPT_NAME'],
-               'referer'     => $_SERVER['HTTP_REFERER']
+               'referer'     => $_SERVER['HTTP_REFERER'],
+               'proxy_used'  => $proxyUsed
        );
 
        // Insert the array in database