X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=a171273782a7f67b33ce115c68d427d4db0638a3;hp=2efb2ffc94b1d02379249ec194bfa26600ad5f16;hb=6d8db1ee47d3c0bb14133d3ab2e0a6bdc7ed60a0;hpb=ad9bfccebd7532f3283ef6cc0733a47973c9a44e
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 2efb2ff..a171273 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2,7 +2,7 @@
/*
* brisk - brisk.phh
*
- * Copyright (C) 2006-2013 Matteo Nastasi
+ * Copyright (C) 2006-2015 Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@ -64,22 +64,23 @@ define('NICKSERV', "BriskServ");
define('LOCK_SHARE_MAX', 10000);
-define('DBG_ONL2', 0x0001);
-define('DBG_ONLY', 0x0002);
-define('DBG_MAIN', 0x0004);
-define('DBG_READ', 0x0008);
-define('DBG_REA2', 0x0010);
-define('DBG_SEND', 0x0020);
-define('DBG_LOCK', 0x0040);
-define('DBG_WRIT', 0x0080);
-define('DBG_LOAD', 0x0100);
-define('DBG_AUTH', 0x0200);
-define('DBG_CRIT', 0x0400);
-define('DBG_LMOP', 0x0800);
-define('DBG_TRAC', 0x1000);
-define('DBG_SHME', 0x2000);
-define('DBG_ENGI', 0x4000);
-define('DBG_CDS', 0x8000);
+define('DBG_ONL2', 0x000001);
+define('DBG_ONLY', 0x000002);
+define('DBG_MAIN', 0x000004);
+define('DBG_READ', 0x000008);
+define('DBG_REA2', 0x000010);
+define('DBG_SEND', 0x000020);
+define('DBG_LOCK', 0x000040);
+define('DBG_WRIT', 0x000080);
+define('DBG_LOAD', 0x000100);
+define('DBG_AUTH', 0x000200);
+define('DBG_CRIT', 0x000400);
+define('DBG_LMOP', 0x000800);
+define('DBG_TRAC', 0x001000);
+define('DBG_SHME', 0x002000);
+define('DBG_ENGI', 0x004000);
+define('DBG_CDS', 0x008000);
+define('DBG_STEP', 0x010000);
// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols
define('BRISK_DEBUG', 0x0800);
@@ -88,6 +89,7 @@ define('BRISK_SINGLE_SESS', "");
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' ),
@@ -138,26 +140,24 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
'en' => 'Connection to the database failed
All authentications are suspended temporarly, you login as normal user.
We are about the limitation'),
'tos_old' => array( 'it' => '%s ha sottoscritto dei Termini del Servizio antecedenti a quelli necessari per poter richiedere questa funzionalità .',
- 'en' => 'EN %s ha sottoscritto dei Termini del Servizio antecedenti a quelli necessari per poter richiedere questa funzionalità .'),
- 'gua_nfd' => array( 'it' => 'Non è stato trovato un garante per %s.',
+ 'en' => 'EN %s ha sottoscritto dei Termini del Servizio antecedenti a quelli necessarig per poter richiedere questa funzionalità .'),
+ 'inf_self' => array( 'it' => 'Non puoi informarti su te stesso.',
+ 'en' => 'EN Non puoi informarti su te stesso.'),
+ 'inf_nfd' => array( 'it' => 'Non è stato trovato un garante per %s.',
'en' => 'EN Non è stato trovato un garante per %s.'),
- 'gua_self' => array( 'it' => '%s si è auto-garantito.',
- 'en' => 'EN %s si è auto-garantito.'),
- 'gua_info' => array( 'it' => 'Il garante di %s è %s.',
- 'en' => 'EN Il garante di %s è %s.'),
- 'gua_err' => array( 'it' => 'Error %d. Utilizzo: /guar <login>.',
- 'en' => 'Error %d. Usage: /guar <login>.')
+ 'inf_err' => array( 'it' => 'Error %d. Utilizzo: /info <login>.',
+ 'en' => 'Error %d. Usage: /info <login>.')
);
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "4.14.5";
+$G_brisk_version = "4.18.5";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di registrazione degli utenti, aggiunto reinvio dell\' email di verifica, ban con classi di IP, nuovi colori, nuovo sistema bi banner laterali per gli eventi',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': Puffin riattivato, accessi da cloud disattivati, corretto bug sulla gestione di puffin, riabilitato blocco dei proxy.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: new users subscription system, refactored sidebanner system.',
+ 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: Puffin re-enabled, cloud accesses disabled, fixed puffin mgmt bug, re-enabled proxy access block.',
'If you want to subscribe our Mailing List, click it!' ) );
$G_room_help = array( 'it' => '
@@ -185,7 +185,7 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
/tav <frase di invito> - invito per gli altri giocatori al tavolo dove si è seduti
/st <stato> - cambia l\'icona associata al tuo user; stato può valere: \\"normale\\", \\"fuori\\", \\"pausa\\", \\"cibo\\", \\"cane\\", \\"lavoro\\", \\"presente\\" oppure \\"sigaretta\\"
/cont <id partita> - quando si è a un tavolo per garantiti, permette di proseguire una partita giocata in precedenza con gli stessi giocatori
-/guar <login> - mostra il garante dell\'utente con il login passato come argomento
+/info <login> - mostra lo stato corrente dell\'utente passato come argomento e in che relazione siete
/authreq - se si è autenticati permette di garantire per un utente fidato
/mesgtoadm - se si è autenticati permette di lasciare un messaggio all\'amministratore del sito
/listen <all or auth> - se si è autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all)
@@ -218,7 +218,7 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
/tav <frase di invito> - invito per gli altri giocatori al tavolo dove si è seduti
/st <stato> - cambia l\'icona associata al tuo user; stato può valere: \\"normale\\", \\"fuori\\", \\"pausa\\", \\"cibo\\", \\"cane\\", \\"lavoro\\", \\"presente\\" oppure \\"sigaretta\\"
/cont <id partita> - quando si è a un tavolo per garantiti, permette di proseguire una partita giocata in precedenza con gli stessi giocatori
-/guar <login> - mostra il garante dell\'utente con il login passato come argomento
+/info <login> - mostra lo stato corrente dell\'utente passato come argomento e in che relazione siete
/authreq - se si è autenticati permette di garantire per un utente fidato
/mesgtoadm - se si è autenticati permette di lasciare un messaggio all\'amministratore del sito
/listen <all or auth> - se si è autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all)
@@ -343,6 +343,39 @@ $G_PG_cons_n = 345;
/* 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);
}
@@ -444,6 +477,7 @@ function versions_cmp($v1, $v2)
return 0;
}
+// return string with IPV4 address
function addrtoipv4($addr)
{
$ipv4addr_arr = explode(':' , $addr);
@@ -582,33 +616,6 @@ function xcapemesg($s)
}
-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)
{
@@ -807,13 +814,13 @@ class Table {
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';
@@ -982,6 +989,73 @@ class Client_prefs {
}
}
+define('GHOST_SESS_TOUT', 1800);
+define('GHOST_SESS_REAS_LOUT', 1); // logout
+define('GHOST_SESS_REAS_ANOT', 2); // another user get session
+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 $time;
+ var $sess;
+ var $reas;
+
+ function GhostSessEl($time, $sess, $reas)
+ {
+ $this->time = $time + GHOST_SESS_TOUT;
+ $this->sess = $sess;
+ $this->reas = $reas;
+ }
+}
+
+class GhostSess
+{
+ var $gs;
+
+ function GhostSess()
+ {
+ $this->gs = array();
+ }
+
+ // push or update for this session
+ function push($time, $sess, $reas)
+ {
+ foreach($this->gs as $el) {
+ if ($el->sess == "$sess") {
+ $el->reas = $reas;
+ $el->time = $time + GHOST_SESS_TOUT;
+ return TRUE;
+ }
+ }
+
+ $this->gs[] = new GhostSessEl($time, $sess, $reas);
+ return TRUE;
+ }
+
+ function pop($sess)
+ {
+ foreach($this->gs as $key => $el) {
+ if ($el->sess == "$sess") {
+ $ret = $this->gs[$key];
+ unset($this->gs[$key]);
+ return ($ret);
+ }
+ }
+ return FALSE;
+ }
+
+ function garbage_manager($curtime)
+ {
+ foreach($this->gs as $key => $el) {
+ if ($el->time < $curtime) {
+ unset($this->gs[$key]);
+ }
+ }
+ }
+}
class Brisk
{
@@ -996,9 +1070,10 @@ class Brisk
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;
var $cds;
@@ -1011,13 +1086,13 @@ class Brisk
}
// 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);
}
@@ -1031,8 +1106,10 @@ class 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++) {
$thiz->user[$i] = User::create($thiz, $i, "", "");
@@ -1048,38 +1125,24 @@ class Brisk
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)
+ function reload($is_first, $ban_list, $black_list, $cloud_smasher)
{
- fprintf(STDERR, "N_IN: %d\n", count($ip_in));
-
- $ip_out = &$this->$ip_out_s;
+ fprintf(STDERR, "RELOAD STUFF (%d)(%d)(%d)\n",
+ count($ban_list), count($black_list), count($cloud_smasher));
- // 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]);
+ if (defined('CURL_DE_SAC_VERS')) {
+ if (brisk_cds_reload($this) == FALSE) {
+ exit(12);
}
- 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)
- {
- fprintf(STDERR, "RELOAD STUFF (%d)(%d)\n", count($ban_list), count($black_list));
-
- $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();
@@ -1110,11 +1173,12 @@ class Brisk
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
- if ($user_cur->sess == "")
+ if ($user_cur->is_active() == FALSE)
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;
@@ -1136,32 +1200,28 @@ class Brisk
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 ($this->black_list->check($ip_str));
+ }
+
+ function cloud_check($ip_str)
+ {
+ return ($this->cloud_smasher->check($ip_str));
+ }
+
+ function users_cleanup()
+ {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $user_cur = $this->user[$i];
+
+ if ($user_cur->the_end) {
+ $user_cur->reset(); // users_cleanup, OK
}
}
- return (FALSE);
}
function garbage_manager($force)
@@ -1230,10 +1290,15 @@ class Brisk
$bin5_user = $bin5->user[$i];
$user_cur->subst = $bin5_user->subst;
+ $user_cur->rd_step = $bin5_user->rd_step;
$user_cur->step = $bin5_user->step;
$user_cur->lacc = $bin5_user->lacc;
$user_cur->laccwr = $bin5_user->lacc;
$user_cur->bantime = $bin5_user->bantime;
+ $user_cur->the_end = $bin5_user->the_end;
+ if ($user_cur->the_end) {
+ $this->ghost_sess->push($curtime, $user_cur->sess, GHOST_SESS_REAS_TTOT);
+ }
}
log_legal($curtime, $user_cur->ip, $user_cur, "STAT:DESTROY_GAME", $plist);
@@ -1286,22 +1351,23 @@ class Brisk
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
-
+
log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst);
-
- if ($user_cur->sess == "")
+
+ if ($user_cur->is_active() == FALSE)
continue;
-
+
if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) {
// Auto logout dell'utente
log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime - delta ".($curtime - $delta));
+ $this->ghost_sess->push($curtime, $user_cur->sess, GHOST_SESS_REAS_TOUT);
+ $user_cur->the_end = TRUE;
+
+ log_rd2("AUTO LOGOUT.");
if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
log_auth($user_cur->sess, "Autologout session.");
- $user_cur->reset();
-
- log_rd2("AUTO LOGOUT.");
if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
$this->room_wakeup($user_cur);
else if ($user_cur->subst == 'standup')
@@ -1326,6 +1392,8 @@ class Brisk
$this->garbage_timeout = $curtime + GARBAGE_TIMEOUT;
$ismod = TRUE;
+ $this->ghost_sess->garbage_manager($curtime);
+
$this->delay_mgr->lastcheck_set($curtime);
return ($ismod);
}
@@ -1384,7 +1452,6 @@ class Brisk
return ($ret);
}
-
function room_wakeup($user)
{
$table_idx = $user->table;
@@ -1396,44 +1463,43 @@ class Brisk
$from_table = ($user->stat == "table");
if ($from_table) {
- log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
+ log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
- for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = $this->user[$table->player[$i]];
- log_main("PREIMPOST: INLOOP name: ".$user_cur->name);
+ for ($i = 0 ; $i < $table->player_n ; $i++) {
+ $user_cur = $this->user[$table->player[$i]];
+ log_main("PREIMPOST: INLOOP name: ".$user_cur->name);
- if ($user->idx_get() != $table->player[$i]) {
- $user_cur->stat_set("room");
- $user_cur->subst = "sitdown";
- $user_cur->laccwr = $curtime;
- }
- else if ($user->sess != "") {
- $user_cur->stat_set("room");
- $user_cur->subst = "standup";
- $user_cur->laccwr = $curtime;
- $user_cur->table = -1;
+ if ($user->idx_get() != $table->player[$i]) {
+ $user_cur->stat_set("room");
+ $user_cur->subst = "sitdown";
+ $user_cur->laccwr = $curtime;
+ }
+ else if ($user->is_active()) {
+ $user_cur->stat_set("room");
+ $user_cur->subst = "standup";
+ $user_cur->laccwr = $curtime;
+ $user_cur->table = -1;
+ }
}
- }
}
else {
- $user->stat_set("room");
- $user->subst = "standup";
- $user->laccwr = $curtime;
+ $user->stat_set("room");
+ $user->subst = "standup";
+ $user->laccwr = $curtime;
}
$remove_wagon = FALSE;
if($table->wag_own == $user->idx_get()) {
- $table->wag_reset($curtime);
- $remove_wagon = TRUE;
+ $table->wag_reset($curtime);
+ $remove_wagon = TRUE;
}
-
/* aggiorna l'array dei giocatori al tavolo. */
$table->user_rem($this, $user);
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
- if ($user_cur->sess == '' || $user_cur->stat != 'room')
+ if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room'
continue;
// log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user);
@@ -1449,7 +1515,7 @@ class Brisk
$ret .= $this->table_content($user_cur, $table_idx);
$ret .= $this->standup_content($user_cur);
-
+
// $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE);
$ret .= $table->act_content($user);
@@ -1488,31 +1554,32 @@ class Brisk
log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = $this->user[$table->player[$i]];
- log_main("PREIMPOST INLOOP name: ".$user_cur->name);
- if ($user_cur->sess != "") {
+ $user_cur = $this->user[$table->player[$i]];
+ log_main("PREIMPOST INLOOP name: ".$user_cur->name);
+ if ($user_cur->is_empty()) {
+ continue;
+ }
if ($update_lacc == TRUE) {
- $user_cur->laccwr = $curtime;
+ $user_cur->laccwr = $curtime;
}
log_main("cur: ".$user_cur->name." subst: ".$user_cur->subst);
if ($user_cur->subst == "shutdowned") {
- $user_cur->stat_set("room");
- $user_cur->subst = "sitdown";
+ $user_cur->stat_set("room");
+ $user_cur->subst = "sitdown";
}
else if ($user_cur->subst == "shutdowner") {
- $user_cur->stat_set("room");
- $user_cur->subst = "standup";
- $user_cur->table = -1;
- $user_wup[$user_wup_n++] = $user_cur;
-
- $remove_wagon = FALSE;
- if($table->wag_own == $table->player[$i]) {
- $remove_wagon = TRUE;
- $table->wag_reset($curtime);
- }
+ $user_cur->stat_set("room");
+ $user_cur->subst = "standup";
+ $user_cur->table = -1;
+ $user_wup[$user_wup_n++] = $user_cur;
+
+ $remove_wagon = FALSE;
+ if($table->wag_own == $table->player[$i]) {
+ $remove_wagon = TRUE;
+ $table->wag_reset($curtime);
+ }
}
$user_tab[$user_tab_n++] = $table->player[$i];
- }
}
for ($wup_idx = 0 ; $wup_idx < $user_wup_n ; $wup_idx++)
@@ -1523,7 +1590,7 @@ class Brisk
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
log_main("START LOOP");
$user_cur = $this->user[$i];
- if ($user_cur->sess == '' || $user_cur->stat != 'room') {
+ if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') { // is not active user or the stat isn't 'room'
log_main("name: ".$user_cur->name."skip subst: ".$user_cur->subst);
continue;
}
@@ -1537,7 +1604,7 @@ class Brisk
$ret .= $this->table_content($user_cur, $table_idx);
$ret .= $this->standup_content($user_cur);
-
+
$ret .= $table->act_content($user_cur);
@@ -1576,10 +1643,11 @@ class Brisk
}
}
- function guarantee_show($user, $user_login, $dt)
+ function info_show($user, $user_login, $dt)
{
GLOBAL $G_lang, $mlang_brisk, $G_base;
+ $mesg = "";
$user_code = -1;
$ret = 0;
@@ -1596,6 +1664,11 @@ class Brisk
$ret = 3;
break;
}
+ if ($user_login == $user->name) {
+ $ret = 4;
+ $mesg = sprintf($mlang_brisk['inf_self'][$G_lang]);
+ break;
+ }
if (($guar_item = $bdb->getitem_bycode($user_item->guar_code_get())) != FALSE) {
$guar_login = $guar_item->login_get();
}
@@ -1605,28 +1678,25 @@ class Brisk
$user_tos_vers = $user_item->tos_vers_get();
if (versions_cmp($user_tos_vers, "1.2") < 0) {
- $mesg = nickserv_msg($dt, sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login)));
+ $mesg = sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login));
}
else if ($guar_login == "") {
- $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_nfd'][$G_lang], xcape($user_login)));
- }
- else if ($guar_login == $user_login) {
- $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_self'][$G_lang], xcape($user_login)));
- }
- else {
- $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_info'][$G_lang],
- xcape($user_login), xcape($guar_login)));
+ $mesg = sprintf($mlang_brisk['inf_nfd'][$G_lang], xcape($user_login));
}
} while (0);
- if ($ret > 0) {
- $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_err'][$G_lang], $ret));
+ if ($ret > 0 && $mesg == "") {
+ $mesg = sprintf($mlang_brisk['inf_err'][$G_lang], $ret);
}
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ".$mesg;
- $user->step_inc();
+ if ($ret != 0) {
+ $jret = json_encode(array("ret" => $ret, "mesg" => $mesg));
+ }
+ else {
+ $jret = json_encode(array("ret" => 0, "mesg" => "", "guar" => $guar_login));
+ }
- return TRUE;
+ return $jret;
}
function room_outstandup($user)
@@ -1646,8 +1716,8 @@ class Brisk
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$ret = "";
$user_cur = $this->user[$i];
- if ($user_cur->sess == '' || $user_cur->stat != 'room')
- continue;
+ if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room'
+ continue;
$ret = "gst.st = ".($user_cur->step+1)."; ";
if ($table_idx > -1)
@@ -1687,7 +1757,7 @@ class Brisk
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$ret = "";
$user_cur = $this->user[$i];
- if ($user_cur->sess == '' || $user_cur->stat != 'room')
+ if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room'
continue;
$ret = "gst.st = ".($user_cur->step+1)."; ".$train_app;
@@ -1713,11 +1783,75 @@ class Brisk
}
}
+ function kickuser($user, $out_reas)
+ {
+ $curtime = time();
+
+ fprintf(STDERR, "MOP: GHOST_SESS: %d\n", $out_reas);
+
+ $this->ghost_sess->push($curtime, $user->sess, $out_reas);
+
+ fprintf(STDERR, "MOP: status out: %s %s %d\n", $user->stat, $user->subst, $user->idx);
+ if ($user->stat == 'table' && $user->subst != 'sitdown') {
+ $bin5 = &$this->match[$user->table];
+ $user_bin5 = &$bin5->user[$user->table_pos];
+ fprintf(STDERR, "MOP: status in: %s %s %d\n", $user_bin5->stat, $user_bin5->subst, $user_bin5->idx);
+ $bin5->table_wakeup($user_bin5);
+ $user->the_end = TRUE;
+ $this->room_wakeup($user);
+ return;
+ }
+
+ if ($user->stat == 'table' || $user->stat == 'room') {
+ $user->the_end = TRUE;
+ if ($user->subst == 'sitdown' || $user->stat == 'table') {
+ $this->room_wakeup($user);
+ }
+ else if ($user->subst == 'standup') {
+ fprintf(STDERR, "MOP: KICK here [%s]\n", btrace_line(debug_backtrace()));
+ $this->room_outstandup($user);
+ }
+ else {
+ log_rd2("LOGOUT FROM WHAT ???");
+ }
+ }
+ }
+
+ function kickuser_by_name($name, $out_reas)
+ {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $user_out = $this->user[$i];
+ if (strcmp($user_out->name, $name) == 0) {
+ return ($this->kickuser($user_out, $out_reas));
+ }
+ }
+ return FALSE;
+ }
+
+ function kickuser_by_sess($sess, $out_reas)
+ {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $user_out = $this->user[$i];
+ if (strcmp($user_out->sess, $sess) == 0) {
+ return ($this->kickuser($user_out, $out_reas));
+ }
+ }
+ return FALSE;
+ }
+
+ function kickuser_by_idx($idx, $out_reas)
+ {
+ $user_out = $this->user[$idx];
+ return ($this->kickuser($user_out, $out_reas));
+ }
+
function chatt_send($user, $mesg)
{
GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang;
$only_you = FALSE;
+ fprintf(STDERR, "WE ARE HERE: [%s]\n", $mesg);
+
// common settings
$msg = mb_substr($mesg, 6, 128, "UTF-8");
$curtime = time();
@@ -1775,7 +1909,12 @@ class Brisk
/* for old isolation management $is_ticker = TRUE; */
} while (0);
} // /tav chat command
-
+ // just for development use currently
+ else if (FALSE && strncmp($msg, "/out ", 5) == 0) {
+ fprintf(STDERR, "MOP OUT\n");
+ $target = substr($msg, 5);
+ $this->kickuser_by_name($target, GHOST_SESS_REAS_ANON);
+ }
else if (strncmp($msg, "/alarm ", 7) == 0) {
if (strncmp($msg, "/alarm to ", 10) == 0) {
$sp_pos = strpos($msg, " ", 10);
@@ -1858,7 +1997,7 @@ class Brisk
$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 {
@@ -1871,7 +2010,7 @@ class Brisk
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
- if ($user_cur->sess == '')
+ if ($user_cur->is_active() == FALSE)
continue;
if (strcasecmp($user_cur->name,$name_new) == 0)
break;
@@ -1919,10 +2058,11 @@ class Brisk
$update_room = TRUE;
} while (0);
} // nick chat command
- else if (strncmp($msg, "/guar ", 6) == 0 || $msg == "/guar") {
+ else if (strncmp($msg, "/info ", 6) == 0) {
$guar_user = substr($msg, 6);
- $this->guarantee_show($user, $guar_user, $dt);
+ error_log("here [" . $guar_user."]");
+ echo $this->info_show($user, $guar_user, $dt);
}
else if (strncmp($msg, "/st ", 4) == 0) {
log_main("chatt_send BEGIN");
@@ -2016,10 +2156,29 @@ class Brisk
$to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape("== chat ban =="));
}
else {
- $to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape($msg));
- // temporary silentiation for troll (will became array check)
- // if (strcasecmp($user->name,'JackRokka') != 0 && $user->sess != '47ea653f602e8')
- $to_room = $to_user;
+ 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."));
+ 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));
+ // temporary silentiation for troll (will became array check)
+ // if (strcasecmp($user->name,'JackRokka') != 0 && $user->sess != '47ea653f602e8')
+ $to_room = $to_user;
+ }
}
log_legal($curtime, $user->ip, $user,
@@ -2050,7 +2209,9 @@ class Brisk
$user_cur = $this->user[$i];
if ($target != "" && $user_cur->name != $target)
continue;
- if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i)
+ if ($user_cur->is_active() == FALSE // is not active user
+ || $user_cur->stat == 'table' // or stat is 'table'
+ || $user->idx_get() == $i) // or the $user idx is equal to current var
continue;
if ($is_normchat == TRUE) {
@@ -2115,30 +2276,32 @@ class Brisk
function get_user($sess, &$idx)
{
- GLOBAL $PHP_SELF;
+ GLOBAL $PHP_SELF;
- if (validate_sess($sess)) {
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- if (strcmp($sess, $this->user[$i]->sess) == 0) {
- // find it
- $idx = $i;
- $ret = $this->user[$i];
- return ($ret);
- }
+ if (validate_sess($sess)) {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ if ($this->user[$i]->is_empty())
+ continue;
+ if (strcmp($sess, $this->user[$i]->sess) == 0) {
+ // find it
+ $idx = $i;
+ $ret = $this->user[$i];
+ return ($ret);
+ }
+ }
+ log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
+ // for ($i = 0 ; $i < MAX_PLAYERS ; $i++)
+ // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess));
+ }
+ else {
+ log_main(sprintf("get_user: Wrong strlen [%s]",$sess));
}
- log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
- // for ($i = 0 ; $i < MAX_PLAYERS ; $i++)
- // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess));
- }
- else {
- log_main(sprintf("get_user: Wrong strlen [%s]",$sess));
- }
- return (FALSE);
+ return (FALSE);
}
/*
- * function add_user(&$brisk, &$sess, &$idx, $name, $pass, $ip)
+ * function add_user(&$brisk, &$sess, &$idx, $name, $pass, $ip, $header, $cookie)
*
* RETURN VALUE:
* if ($idx > -1 && ret == FALSE) => duplicated nick
@@ -2146,10 +2309,10 @@ class Brisk
* if ($idx == -3 && ret == FALSE) => wrong password
* if ($idx == -1 && ret == FALSE) => no space left
* if ($idx == 0 && ret == user) => SUCCESS
- * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db)
+ * if ($idx == -($idx + 1) && ret == user) => SUCCESS (but the login exists in the auth db)
*/
- function add_user(&$sess, &$idx, $name, $pass, $ip, $cookie)
+ function add_user(&$sess, &$idx, $name, $pass, $ip, $header, $cookie)
{
GLOBAL $G_base;
@@ -2200,25 +2363,28 @@ class Brisk
// no actions at this moment
}
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- /* free user ? */
- if (strcmp($sess, $this->user[$i]->sess) == 0) {
- if ($idx == -1)
- $idx = $i;
- }
- if ($idfree == -1 && strcmp($this->user[$i]->sess, "") == 0) {
- $idfree = $i;
- continue; // NOTE: CHECK IT !!
- }
- if (strcasecmp($this->user[$i]->name, $name_new) == 0) {
- if ($authenticate != FALSE) {
- $ghost = $i;
- $ghost_auth = $this->user[$i]->is_auth();
- }
- else {
- $idx = $i;
- break;
- }
- }
+ /* free user ? */
+ if ($this->user[$i]->is_empty()) {
+ if ($idfree == -1) {
+ $idfree = $i;
+ }
+ continue;
+ }
+ if (strcmp($sess, $this->user[$i]->sess) == 0) {
+ if ($idx == -1) {
+ $idx = $i;
+ }
+ }
+ if (strcasecmp($this->user[$i]->name, $name_new) == 0) {
+ if ($authenticate != FALSE) {
+ $ghost = $i;
+ $ghost_auth = $this->user[$i]->is_auth();
+ }
+ else {
+ $idx = $i;
+ break;
+ }
+ }
}
if ($idx == -1)
$idx = $idfree;
@@ -2232,6 +2398,7 @@ class Brisk
$ghost_user = $this->user[$ghost];
$curtime = time();
+ $this->ghost_sess->push($curtime, $ghost_user->sess, GHOST_SESS_REAS_ANOT);
$ghost_user->comm[$ghost_user->step % COMM_N] = "";
$ghost_user->step_inc();
if ($sess == "") {
@@ -2258,6 +2425,9 @@ class Brisk
}
$idx = $ghost;
+ if (defined('CURL_DE_SAC_VERS')) {
+ brisk_cds_execute($this, $ghost, $idx, $sess, $ip, $authenticate, $header);
+ }
return ($this->user[$ghost]);
}
else if ($idx != -1 && $i == MAX_PLAYERS) {
@@ -2357,10 +2527,9 @@ class Brisk
log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] name [%s] code [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name, $this->user[$real_idx]->code));
$ret = $this->user[$real_idx];
- if ($this->cds->execute("tor_chk", $this, $real_idx, $sess, $ip) == FALSE) {
- log_main("cds_execute failed");
+ if (defined('CURL_DE_SAC_VERS')) {
+ brisk_cds_execute($this, $ghost, $real_idx, $sess, $ip, $authenticate, $header);
}
-
return ($ret);
}
@@ -2371,7 +2540,7 @@ class Brisk
{
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
- if ($user_cur->sess == '')
+ if ($user_cur->is_active() == FALSE)
continue;
log_main("STANDUP START: ".$user_cur->stat);
@@ -2382,7 +2551,7 @@ class Brisk
$user_cur->comm[$user_cur->step % COMM_N] .= $user->myname_innerHTML();
}
log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
-
+
$user_cur->step_inc();
}
}
@@ -2402,24 +2571,17 @@ class Brisk
function standup_content($user)
{
$ret = "";
- $content = "";
if ($user->stat != 'room')
return;
- for ($i = 0 , $ct = 0 ; $ct < 4 && $i < MAX_PLAYERS ; $i++) {
- if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "")
- continue;
- $ct++;
- }
-
- // $content .= sprintf('', $ct);
-
$content = ' j_stand_cont( [ ';
$user_cur_id = $user->idx_get();
for ($i = 0 , $ct = 0 ; $i < MAX_PLAYERS ; $i++) {
- if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "")
+ if ($this->user[$i]->is_active() == FALSE // is not active user
+ || $this->user[$i]->stat != "room" // or the stat isn't 'room'
+ || $this->user[$i]->name == "") // or the name is empty, happens when user is reset (TODO: check it)
continue;
$flags = $this->user[$i]->flags;
@@ -2491,17 +2653,22 @@ class Brisk
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'])) {
@@ -2521,7 +2688,7 @@ class Brisk
case "":
case "index.php":
ob_start();
- index_main($this, $transp_type, $header_out, $addr, $get, $post, $cookie);
+ index_main($this, $transp_type, $header, $header_out, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
@@ -2713,6 +2880,33 @@ function log_mop($step, $log)
}
}
+function log_step($log)
+{
+ GLOBAL $PHP_SELF;
+
+ if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_STEP) == 0)
+ return;
+
+ $sess = Brisk::sess_cur_get();
+ if (isset($sess) == FALSE)
+ $ssess = "XXXX";
+ else
+ $ssess = $sess;
+
+ if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_STEP) == 0)
+ return;
+
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
+ if (($fp = @fopen(LEGAL_PATH."/step.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("STEP: [%f] [%s] [%s]\n", gettimeofday(TRUE), $log, $btrace));
+ fclose($fp);
+ }
+}
+
+
function log_cds($log)
{
@@ -3142,7 +3336,7 @@ function validate_name($name)
{
$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);