projects / brisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4fb28f6)
proxy management refactored
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Wed, 11 Feb 2015 08:57:19 +0000 (09:57 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Wed, 11 Feb 2015 08:57:19 +0000 (09:57 +0100)
web/Obj/proxyscan.phh [deleted file] patch | blob | history
web/briskin5/index.php patch | blob | history
web/briskin5/index_wr.php patch | blob | history
web/index.php patch | blob | history

diff --git a/web/Obj/proxyscan.phh b/web/Obj/proxyscan.phh
deleted file mode 100644 (file)
index 0124db7..0000000
--- a/web/Obj/proxyscan.phh
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
- *     Proxy Detector v0.1 with brisk customizations
- *             copyrights by: Daantje Eeltink (me@daantje.nl)
- *                                             http://www.daantje.nl
- *
- *             first build: Mon Sep 18 21:43:48 CEST 2006
- *             last build: Tue Sep 19 10:37:12 CEST 2006
- *
- *     Description:
- *             This class can detect if a visitor uses a proxy server by scanning the
- *             headers returned by the user client. When the user uses a proxy server,
- *             most of the proxy servers alter the header. The header is returned to
- *             PHP in the array $_SERVER.
- *
- *     License:
- *             GPL v2 licence. (http://www.gnu.org/copyleft/gpl.txt)
- */
-
-class proxy_detector {
-
-    /**
-     * CONSTRUCTOR
-     * Set defaults...
-     */
-    function proxy_detector(){
-    }
-
-    /*
-      function exists_in_rbl($remote)
-      verify if an host is into a proxy black list or not
-    */
-    function exists_in_rbl($remote) {
-        $rbls = array('http.dnsbl.sorbs.net', 'misc.dnsbl.sorbs.net');
-    
-        if (preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/",
-                       $remote, $matches)) {
-            foreach ($rbls as $rbl) {
-                $rblhost = $matches[4] . "." . $matches[3] . "." .
-                    $matches[2] . "." . $matches[1] . "." . $rbl;
-       
-                $resolved = gethostbyname($rblhost);
-                // echo "RBL ".$rblhost."<br>";
-                if ($resolved != $rblhost) {
-                    return TRUE;
-                }
-            }
-        }
-        return FALSE;
-    }
-
-    /**
-     * BOOL $proxy = detect( $addr )
-     * Start detection and return TRUE if a proxy server is detected...
-     */
-    function detect($addr){
-        GLOBAL $G_proxy_white_list;
-
-        foreach($G_proxy_white_list as $authproxy) {
-            if ($addr == $authproxy)
-                return (FALSE);
-        }
-
-        if ($this->exists_in_rbl($addr) == TRUE)
-            return (TRUE);
-
-        //nope, no proxy was logged...
-        return FALSE;
-    }
-}
-
-//init class
-function is_proxy($addr)
-{
-    $proxy = new proxy_detector();
-  
-    //start detect
-    return ($proxy->detect($addr));
-}
-
-?>
diff --git a/web/briskin5/index.php b/web/briskin5/index.php
index ac0fb12..80bc798 100644 (file)
--- a/web/briskin5/index.php
+++ b/web/briskin5/index.php
@@ -27,7 +27,6 @@
 $G_base = "../";
 
 require_once("../Obj/brisk.phh");
-require_once("../Obj/proxyscan.phh");
 require_once("Obj/briskin5.phh");
 
 $mlang_bin5_index = array( 'aucwin' => array( 'it' => 'Hai vinto l\'asta.<br> Scegli il seme:',
@@ -57,11 +56,6 @@ function bin5_index_main($transp_type, &$header_out, $addr, $get, $post, $cookie
     if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE)
         unset ($sess);
 
-    // Use of proxies isn't allowed.
-    // if (is_proxy()) {
-    // return (FALSE);
-    // }
-    
 // header('Content-type: text/html; charset="utf-8"',true);
     ?>
 <html>
diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index cb761bc..e0bd91e 100644 (file)
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -26,15 +26,8 @@
 $G_base = "../";
 
 require_once("../Obj/brisk.phh");
-// require_once("../Obj/proxyscan.phh");
 require_once("Obj/briskin5.phh");
 
-// Use of proxies isn't allowed.
-// if (is_proxy()) {
-//   sleep(5);
-//   exit;
-//}
-
 /*
  *  MAIN
  */
diff --git a/web/index.php b/web/index.php
index e2d8f98..8f087d8 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -25,7 +25,6 @@
 require_once("Obj/user.phh");
 require_once("Obj/brisk.phh");
 require_once("Obj/auth.phh");
-require_once("Obj/proxyscan.phh");
 
 $mlang_room = array( 'userpassuse'  => array('it' => 'Il tuo nickname &egrave; gi&agrave; in uso.',
                                              'en' => 'Your nickname is already in use.'),
@@ -338,11 +337,6 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
 
     $remote_addr = addrtoipv4($remote_addr_full);
 
-    // Use of proxies isn't allowed.
-    if (!$G_is_local && is_proxy($remote_addr)) {
-        return FALSE;
-    }
-
     $is_login = FALSE;
     $body = "";
     $tables = "";
Brisk - briscola chiamata in salsa Ajax: sources.