/*
* brisk - brisk.phh
*
- * Copyright (C) 2006-2014 Matteo Nastasi
+ * Copyright (C) 2006-2015 Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
define('DEBUGGING', "no-debugging");
require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
+require_once("${G_base}Obj/ipclass.phh");
$mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
'en' => 'back standing' ),
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "4.17.0";
+$G_brisk_version = "4.18.5";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: gestione accessi da sistemi di anonimizzazione, nuovi termini di utilizzo.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: Puffin riattivato, accessi da cloud disattivati, corretto bug sulla gestione di puffin, riabilitato blocco dei proxy.',
'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: engine refactoring and logout message.',
+ 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: Puffin re-enabled, cloud accesses disabled, fixed puffin mgmt bug, re-enabled proxy access block.',
'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
$G_room_help = array( 'it' => '
/* printf("\n"); */
/* } */
+function ip2int($s)
+{
+ return (ip2long($s));
+}
+
+function int2ip($i)
+{
+ return (long2ip($i));
+}
+
+function int2four($l)
+{
+ if (PHP_INT_SIZE == 4)
+ return ($l);
+
+ return ( ($l & 0x80000000 ? 0xffffffff00000000 : 0x00) | $l );
+}
+
+function four2int($s)
+{
+ return ($s & 0xffffffff);
+}
+
+function ip2four($s)
+{
+ return int2four( ip2int($s) );
+}
+
+function four2ip($i)
+{
+ return int2ip( four2int($i) );
+}
+
function nickserv_msg($dt, $msg) {
return sprintf('chatt_sub("%s",[0x040003,"%s"],"%s");', $dt, NICKSERV, $msg);
}
return 0;
}
+// return string with IPV4 address
function addrtoipv4($addr)
{
$ipv4addr_arr = explode(':' , $addr);
}
-class IPClass {
- var $addr;
- var $mask;
-
- function IPClass($ipset)
- {
- //split
- $elem = split("/", $ipset, 2);
- $addr = $elem[0];
- $mask = (int)$elem[1];
-
- //convert mask
-
- $this->mask = ((1<<($mask))-1) << (32 - $mask);
- $this->addr = ip2long($addr) & $this->mask;
-
- fprintf(STDERR, "New ipclass: %x (%x)\n", $this->addr, $this->mask);
- }
-
- function match($ip)
- {
- fprintf(STDERR, "IP: %x, ADDR: %x, MASK: %x -> (%d)\n",
- $ip, $this->addr, $this->mask, ((ip2long($ip) & $this->mask) == $this->addr));
- return (($ip & $this->mask) == $this->addr);
- }
-}
-
class Vect {
function Vect($a)
{
if ($sitted < PLAYERS_N) {
switch ($this->auth_type) {
case TABLE_AUTH_TY_CERT:
- if ($user->is_cert())
+ if ($user->is_cert() && !$user->is_appr())
$act = "sitcert";
else
$act = 'resercert';
break;
case TABLE_AUTH_TY_AUTH:
- if ($user->is_auth())
+ if ($user->is_auth() && !$user->is_appr())
$act = "sitreser";
else
$act = 'reserved';
define('GHOST_SESS_REAS_TOUT', 3); // room timeout
define('GHOST_SESS_REAS_TTOT', 4); // table timeout
define('GHOST_SESS_REAS_ANON', 5); // anonymizer access
+define('GHOST_SESS_REAS_PROX', 6); // proxy access
class GhostSessEl
{
var $garbage_timeout;
var $shm_sz;
- var $ban_list; // ban list (authized allowed)
- var $black_list; // black list (anti-dos, noone allowed)
+ var $ban_list; // ban list (authized allowed)
+ var $black_list; // black list (anti-dos, noone allowed)
+ var $cloud_smasher; // list of cloud ip ranges to be rejected
var $ghost_sess;
var $delay_mgr;
}
// constructor
- static function create($crystal_filename, $ban_list, $black_list) {
+ static function create($crystal_filename, $ban_list, $black_list, $cloud_smasher) {
if (($brisk_ser = @file_get_contents($crystal_filename)) != FALSE) {
if (($brisk = unserialize($brisk_ser)) != FALSE) {
fprintf(STDERR, "ROOM FROM FILE\n");
rename($crystal_filename, $crystal_filename.".old");
- $brisk->reload(TRUE, $ban_list, $black_list);
+ $brisk->reload(TRUE, $ban_list, $black_list, $cloud_smasher);
return($brisk);
}
$thiz->table = array();
$thiz->match = array();
- $thiz->ban_list = NULL;
- $thiz->black_list = NULL;
+ $thiz->ban_list = IpClass::create();
+ $thiz->black_list = IpClass::create();
+ $thiz->cloud_smasher = IpClass::create();
$thiz->ghost_sess = new GhostSess();
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
static::$sess_cur = FALSE;
- $thiz->reload(TRUE, $ban_list, $black_list);
+ $thiz->reload(TRUE, $ban_list, $black_list, $cloud_smasher);
return ($thiz);
}
- function ipclass_update($ip_out_s, $ip_in)
- {
- fprintf(STDERR, "N_IN: %d\n", count($ip_in));
-
- $ip_out = &$this->$ip_out_s;
-
- // if already set clean the ban_list property
- if ($ip_out) {
- $ct = count($ip_out);
- for ($i = 0 ; $i < $ct ; $i++) {
- unset($ip_out[$i]);
- }
- unset($ip_out);
- }
-
- $ip_out = array();
- for ($i = 0 ; $i < count($ip_in) ; $i++) {
- $ip_out[$i] = new IPClass($ip_in[$i]);
- }
- }
-
- function reload($is_first, $ban_list, $black_list)
+ function reload($is_first, $ban_list, $black_list, $cloud_smasher)
{
- fprintf(STDERR, "RELOAD STUFF (%d)(%d)\n", count($ban_list), count($black_list));
+ fprintf(STDERR, "RELOAD STUFF (%d)(%d)(%d)\n",
+ count($ban_list), count($black_list), count($cloud_smasher));
if (defined('CURL_DE_SAC_VERS')) {
if (brisk_cds_reload($this) == FALSE) {
exit(12);
}
}
- $this->ipclass_update("ban_list", $ban_list);
- $this->ipclass_update("black_list", $black_list);
+ $this->ban_list->update($ban_list);
+ $this->black_list->update($black_list);
+ $this->cloud_smasher->update($cloud_smasher);
if (!$is_first) {
$this->banned_kickoff();
continue;
// check if the IP is blacklisted
- if ($this->black_check($user_cur->ip)) {
+ if ($this->black_check($user_cur->ip) ||
+ $this->cloud_check($user_cur->ip)) {
$user_cur->lacc = 0;
$is_ban = TRUE;
continue;
function ban_check($ip_str)
{
- $ip = ip2long($ip_str);
- fprintf(STDERR, "Brisk::ban_check %d\n", count($this->ban_list));
- for ($i = 0 ; $i < count($this->ban_list) ; $i++) {
- fprintf(STDERR, "ban_list[%d] = %x (%x)\n", $i,
- $this->ban_list[$i]->addr, $this->ban_list[$i]->mask);
- if ($this->ban_list[$i]->match($ip)) {
- fprintf(STDERR, "\n\nMATCHA!\n\n");
- return(TRUE);
- }
- }
- return (FALSE);
+ return ($this->ban_list->check($ip_str));
}
function black_check($ip_str)
{
- $ip = ip2long($ip_str);
- fprintf(STDERR, "Brisk::black_check %d\n", count($this->black_list));
- for ($i = 0 ; $i < count($this->black_list) ; $i++) {
- fprintf(STDERR, "black_list[%d] = %x (%x)\n", $i,
- $this->black_list[$i]->addr, $this->black_list[$i]->mask);
- if ($this->black_list[$i]->match($ip)) {
- fprintf(STDERR, "\n\nMATCHA!\n\n");
- return(TRUE);
- }
- }
- return (FALSE);
+ return ($this->black_list->check($ip_str));
+ }
+
+ function cloud_check($ip_str)
+ {
+ return ($this->cloud_smasher->check($ip_str));
}
function users_cleanup()
$to_user = nickserv_msg($dt, $mlang_brisk['mesgmust'][$G_lang]);
}
}
- else if (strncmp($msg, "/nick ", 6) == 0) {
+ else if (FALSE && strncmp($msg, "/nick ", 6) == 0) {
log_main("chatt_send BEGIN");
do {
if ( TRUE && (! $user->is_auth()) ) {
$to_user = nickserv_msg($dt, xcape("Visto l'elevato numero di molestatori che ultimamente hanno preso dimora su Brisk abbiamo deciso"));
$to_user .= nickserv_msg($dt, xcape("di disattivare temporaneamente la chat in room per i non registrati, non ce ne vogliate e buone feste."));
- $aug_head = array("Tanti", "Tantissimi", "Un enormità", "Un milione", "Un' esagerazione");
- $aug_body = array("a tutti gli utenti", "a tutti gli uomini", "a tutte le donne", "a tutti gli utenti");
- $aug_tail = array("di Brisk", "del sito", "della ciurma", "della comitiva", "del gruppo");
-
- $auguri = sprintf("%s auguri %s %s.",
- $aug_head[mt_rand(0, count($aug_head)-1)],
- $aug_body[mt_rand(0, count($aug_body)-1)],
- $aug_tail[mt_rand(0, count($aug_tail)-1)]);
-
- $to_room = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name),
- xcape($auguri));
+ if (FALSE) {
+ $aug_head = array("Tanti", "Tantissimi", "Un enormità", "Un milione", "Un' esagerazione");
+ $aug_body = array("a tutti gli utenti", "a tutti gli uomini", "a tutte le donne", "a tutti gli utenti");
+ $aug_tail = array("di Brisk", "del sito", "della ciurma", "della comitiva", "del gruppo");
+
+ $auguri = sprintf("%s auguri %s %s.",
+ $aug_head[mt_rand(0, count($aug_head)-1)],
+ $aug_body[mt_rand(0, count($aug_body)-1)],
+ $aug_tail[mt_rand(0, count($aug_tail)-1)]);
+
+ $to_room = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name),
+ xcape($auguri));
+ }
}
else {
$to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape($msg));
function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
{
- GLOBAL $G_ban_list, $G_black_list;
+ GLOBAL $G_ban_list, $G_black_list, $G_cloud_smasher;
printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path);
- $remote_addr = addrtoipv4($addr);
- fprintf(STDERR, "\n\n\n PRE_BLACK_CHECK \n\n\n");
- if ($this->black_check($remote_addr)) {
+ fprintf(STDERR, "\n\n\n PRE_BLACK [%s]\n\n\n", $addr);
+ if ($this->black_check($addr)) {
// TODO: waiting async 5 sec before close
- fprintf(STDERR, "\n\n\n BLACK_CHECK \n\n\n");
+ fprintf(STDERR, "\n\n\n BLACK CHECK\n\n\n");
return (FALSE);
}
+ if ($path != "" && $path != "index.php") {
+ if ($this->cloud_check($addr)) {
+ // TODO: waiting async 5 sec before close
+ return (FALSE);
+ }
+ }
$enc = get_encoding($header);
if (isset($header['User-Agent'])) {
{
$name_new = str_replace(' ', '_', mb_substr(trim($name),0,12, "UTF-8"));
- for ($i = 0 ; $i < strlen($name_new) ; $i++) {
+ for ($i = 0 ; $i < mb_strlen($name_new) ; $i++) {
$c = $name_new[$i];
if (($c >= "a" && $c <= "z") || ($c >= "A" && $c <= "Z") || ($c >= "0" && $c <= "9"))
return ($name_new);
projects / brisk.git / blobdiff