X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=cfebe2050eea133e1ab38258670ad6dbd5554608;hb=8d7cdc537ab4b1329fe0ef8c4d976545c12e14c3;hp=e4e020da15dd1d48d8682ac1e64bf883ea3854f1;hpb=706f411d26dee22befc679885d715dd620b674e5;p=brisk.git diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh index e4e020d..cfebe20 100644 --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@ -3,7 +3,7 @@ * brisk - Obj/sac-a-push.phh * * Copyright (C) 2012-2014 Matteo Nastasi - * mailto: nastasi@alternativeoutput.it + * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it * @@ -22,7 +22,7 @@ * */ -define('SITE_PREFIX', '/brisk/'); +define('SITE_PREFIX', "/brisk/"); define('SITE_PREFIX_LEN', 7); define('DIRECT_ST_READ', 1); @@ -30,6 +30,22 @@ define('DIRECT_ST_WRITE', 2); declare(ticks = 1); +/* this list is created with bin/get_globals.sh */ +$_globals_list = array( +'G_admin_mail', 'G_alarm_passwd', 'G_all_points', 'G_ban_list', 'G_base', +'G_black_list', 'G_brisk_version', 'G_btrace_pref_sub', 'G_cloud_smasher', +'G_crypt_key', 'G_dbasetype', 'G_dbauth', 'G_dbpfx', 'G_doc_path', +'G_proto', 'G_domain', 'G_donors_all', 'G_donors_cur', 'G_is_local', 'G_lang', 'G_lng', +'G_mail_seed', 'G_notguar_code', 'G_PG_cons', 'G_PG_cons_n', 'G_PG_vow', +'G_PG_vow_n', 'G_poll_entries', 'G_poll_name', 'G_poll_title', +'G_provider_proxy', 'G_proxy_white_list', 'G_room_about', 'G_room_help', +'G_room_passwdhowto', 'G_room_roadmap', +'G_selfreg_mask', 'G_selfreg_tout', 'G_shutdown', 'G_sidebanner', +'G_sidebanner_idx', 'G_splash_content', 'G_splash_contents', +'G_splash_cont_idx', 'G_splash_h', 'G_splash_idx', 'G_splash_interval', +'G_splash_timeout', 'G_splash_w', 'G_topbanner', 'G_tos_dthard', +'G_tos_dtsoft', 'G_tos_fname', 'G_tos_idx', 'G_tos_vers', 'G_webbase'); + function global_dump() { GLOBAL $G_alarm_passwd, $G_ban_list, $G_black_list, $G_btrace_pref_sub, $G_dbauth; @@ -40,7 +56,7 @@ function global_dump() GLOBAL $G_splash_h, $G_splash_idx, $G_splash_interval, $G_splash_timeout; GLOBAL $G_splash_w, $G_topbanner, $G_with_donors, $G_with_poll; GLOBAL $G_with_splash, $G_sidebanner, $G_sidebanner_idx; - GLOBAL $G_with_topbanner; + GLOBAL $G_with_topbanner, $G_selfreg_tout, $G_selfreg_mask; fprintf(STDERR, "G_alarm_passwd = [%s]\n", print_r($G_alarm_passwd, TRUE)); fprintf(STDERR, "G_ban_list = [%s]\n", print_r($G_ban_list, TRUE)); @@ -73,6 +89,10 @@ function global_dump() fprintf(STDERR, "G_sidebanner_idx = [%s]\n", print_r($G_sidebanner_idx, TRUE)); fprintf(STDERR, "G_with_splash = [%s]\n", print_r($G_with_splash, TRUE)); fprintf(STDERR, "G_with_topbanner = [%s]\n", print_r($G_with_topbanner, TRUE)); + fprintf(STDERR, "G_selfreg_mask = [%x]\n", print_r($G_selfreg_mask, TRUE)); + + fprintf(STDERR, "G_selfreg_tout = [%s]\n", print_r($G_selfreg_tout, TRUE)); + } function pid_save() @@ -119,7 +139,7 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo $post = array(); $rest = 0; foreach(preg_split("/(\r?\n)/", $stream_info) as $line) { - printf("LINE: [%s]\n", $line); + // printf("LINE: [%s]\n", $line); if ($check_post) { if (!isset($header['The-Request'])) { return FALSE; @@ -153,9 +173,11 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo $path = $get_vars[0]; if (count($get_vars) > 1) { $a = explode('&', $get_vars[1]); - printf("A COUNT: [%s] %d\n", $a[0], count($a)); + // printf("A COUNT: [%s] %d\n", $a[0], count($a)); for ($i = 0 ; $i < count($a) ; $i++) { $b = explode('=', $a[$i]); + if ($b[0] == "") + continue; $get[$b[0]] = urldecode($b[1]); } } @@ -168,12 +190,12 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo // if (content-type is wrong || content-length isn't set) // return false - if ($header['Content-Type'] != 'application/x-www-form-urlencoded' + if ($header['Content-Type'] != 'application/x-www-form-urlencoded' || !isset($header['Content-Length'])) { return FALSE; } $post_len = mb_strlen($line, "ASCII"); - printf("INFO: postlen: %d\n", $post_len); + // printf("INFO: postlen: %d\n", $post_len); $rest = (int)($header['Content-Length']) - $post_len; if ($rest == 0) { @@ -198,13 +220,13 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo function gpcs_var($name, $get, $post, $cookie) { - if (isset($GLOBALS[$name])) + if (isset($GLOBALS[$name])) return FALSE; - else if (isset($cookie[$name])) + else if (isset($cookie[$name])) return ($cookie[$name]); - else if (isset($post[$name])) + else if (isset($post[$name])) return ($post[$name]); - else if (isset($get[$name])) + else if (isset($get[$name])) return ($get[$name]); return FALSE; @@ -399,7 +421,9 @@ class Sac_a_push { static $fixed_fd = 3; static $cnt_master = NULL; static $cnt_slave = NULL; - + + var $provider_proxy; // list of provider/browser that offer proxy service + var $file_socket; var $unix_socket; var $direct_socket; // socket where read direct commands @@ -442,7 +466,7 @@ class Sac_a_push { exit(1); } break; - case SIGHUP: + case SIGHUP: if (static::$cnt_master != NULL) { fwrite(static::$cnt_master, "\nreload\n"); fflush(static::$cnt_master); @@ -451,11 +475,14 @@ class Sac_a_push { } } - static function create(&$app, $sockname, $debug, $blocking_mode, $argv) - { + static function create(&$app, $sockname, $debug, $blocking_mode, $provider_proxy, $argv) + { $thiz = new Sac_a_push(); - + $thiz->app = $app; + + $thiz->provider_proxy = ProviderProxy::create(); + $thiz->file_socket = $sockname; $thiz->unix_socket = "unix://$sockname"; $thiz->direct_socket = "unix://${sockname}2"; @@ -491,14 +518,14 @@ class Sac_a_push { else $thiz->rndstr .= chr(mt_rand(65, 90)); } - + if (file_exists($thiz->file_socket)) { unlink($thiz->file_socket); } if (file_exists($thiz->file_socket."2")) { unlink($thiz->file_socket."2"); } - + $old_umask = umask(0); if (($thiz->list_web = stream_socket_server($thiz->unix_socket, $err, $errs)) === FALSE) { return (FALSE); @@ -515,6 +542,7 @@ class Sac_a_push { } $thiz->main_loop = FALSE; + $thiz->reload(TRUE, $provider_proxy); return ($thiz); } @@ -543,13 +571,13 @@ class Sac_a_push { function pendpage_try_addcont(&$new_socket, $tout, $method, $header, $get, $post, $cookie, $path, $addr, $rest, $cont) { - $pendpage = PendingPage::pendingpage_continue(&$new_socket, $this->curtime, $tout, $method, + $pendpage = PendingPage::pendingpage_continue( $new_socket, $this->curtime, $tout, $method, $header, $get, $post, $cookie, $path, $addr, $rest, $cont); $pendpage->try_flush($this->curtime); // Add $pendpage to the pendpage array (in any case) - fprintf(STDERR, "IMPORTANT: Pendadd: %d\n", $pendpage->status); + // fprintf(STDERR, "IMPORTANT: Pendadd: %d\n", $pendpage->status); $this->pendpage_add($pendpage); } @@ -603,24 +631,42 @@ class Sac_a_push { foreach ($this->socks as $k => $sock) { $id = intval($sock); if (isset($this->s2u[$id])) { - if ($this->s2u[$id]->sess == '') { - if ($this->s2u[$id]->rd_socket_get() != NULL) { - $this->s2u[$id]->rd_socket_set(NULL); + $user = $this->s2u[$id]; + if ($user->the_end) { + if (($user->rd_toflush == FALSE && $user->rd_step == $user->step) + || $user->rd_endtime_is_expired($this->curtime)) { + if ($user->rd_socket_get() != NULL) { + $user->rd_socket_set(NULL); + } + unset($this->socks[$id]); + unset($this->s2u[$id]); + fclose($sock); + // printf("CLOSE ON GARBAGE MANAGER\n"); } - unset($this->socks[$id]); - unset($this->s2u[$id]); - fclose($sock); - printf("CLOSE ON GARBAGE MANAGER\n"); } } } + $this->app->users_cleanup(); + } + + function check_globals() + { + GLOBAL $_globals_list; + foreach ($_globals_list as $g) { + if (!array_search($g, $GLOBALS) || !isset($GLOBALS[$g])) { + error_log(sprintf("Global [%s] not declared", $g)); + return FALSE; + } + } + return TRUE; } function run() { GLOBAL $DOCUMENT_ROOT, $HTTP_HOST; - GLOBAL $G_alarm_passwd, $G_ban_list, $G_black_list, $G_btrace_pref_sub, $G_dbauth; + GLOBAL $G_alarm_passwd, $G_ban_list, $G_black_list, $G_cloud_smasher, $G_provider_proxy; + GLOBAL $G_btrace_pref_sub, $G_dbauth; GLOBAL $G_dbpfx, $G_donors_all, $G_donors_cur, $G_is_local, $G_lang; GLOBAL $G_poll_entries, $G_poll_name, $G_poll_title, $G_proxy_white_list; GLOBAL $G_room_roadmap, $G_shutdown; @@ -631,17 +677,26 @@ class Sac_a_push { GLOBAL $G_with_topbanner; GLOBAL $G_tos_vers, $G_tos_fname, $G_tos_dtsoft, $G_tos_dthard, $G_tos_idx, $G_doc_path; + if (!$this->check_globals()) { + fprintf(STDERR, "Take a look to the phplog file, GLOBALS missing!\n"); + sleep(10); + } + if ($this->main_loop) { return (FALSE); } - + $this->main_loop = TRUE; - + + $lastime = 0; + $dump_users = TRUE; while ($this->main_loop) { $this->app->sess_cur_set(FALSE); $this->curtime = time(); - fprintf(STDERR, "IN LOOP: Current opened: %d pending_pages: %d\n", count($this->socks), count($this->pending_pages)); - + if ($lastime != ($this->curtime >> 2)) { + fprintf(STDERR, "\nIN LOOP: Current opened: %d pending_pages: %d\n", count($this->socks), count($this->pending_pages)); + } + /* Prepare the read array */ /* // when we manage it ... */ /* if ($shutdown) */ @@ -657,7 +712,7 @@ class Sac_a_push { else { $read = $pre_read; } - + if ($this->debug > 1) { printf("PRE_SELECT\n"); print_r($read); @@ -665,12 +720,15 @@ class Sac_a_push { $write = NULL; $except = NULL; $num_changed_sockets = @stream_select($read, $write, $except, 0, 500000); - + if ($num_changed_sockets == 0) { - printf(" no data in 5 secs, splash [%d]\n", $G_with_splash); - } + // printf(" no data in 5 secs, splash [%d]\n", $G_with_splash); + ; + } else if ($num_changed_sockets > 0) { - printf("num sock %d num_of_socket: %d\n", $num_changed_sockets, count($read)); + if ($lastime != ($this->curtime >> 2)) { + printf("num sock %d num_of_socket: %d\n", $num_changed_sockets, count($read)); + } if ($this->debug > 1) { print_r($read); } @@ -684,7 +742,7 @@ class Sac_a_push { continue; } if ($sock === $this->list_web) { - printf("NUOVA CONNEX\n"); + // printf("NUOVA CONNEX\n"); if (($new_unix = stream_socket_accept($this->list_web)) == FALSE) { printf("SOCKET_ACCEPT FAILED\n"); continue; @@ -697,19 +755,32 @@ class Sac_a_push { $rest = 0; $cont = ""; if (($new_socket = ancillary_getstream($new_unix, $stream_info)) !== FALSE) { - printf("NEW_SOCKET: %d\n", intval($new_socket)); + // printf("NEW_SOCKET: %d\n", intval($new_socket)); stream_set_blocking($new_socket, $this->blocking_mode); // Set the stream to non-blocking - printf("RECEIVED HEADER:\n%s", $stream_info); + // error_log(sprintf("RECEIVED HEADER:\n%s", $stream_info)); if (($path = spu_process_info($stream_info, $method, $header, $get, $post, $cookie, $rest, $cont)) == FALSE) { fprintf(STDERR, "TODO: fix wrong header management\n"); } - $addr = stream_socket_get_name($new_socket, TRUE); - printf("PATH: [%s]\n", $path); + + // We try to get real IP from header (passed by proxy) and then fallback to direct connection IP + // error_log(sprintf("addr: [%s]", $addr)); + // error_log(sprintf("X-Real-Ip: [%s]", array_key_exists('X-Real-Ip', $header) ? $header['X-Real-Ip'] : "Not exists")); + if (array_key_exists('X-Real-Ip', $header)) { + $addr = $header['X-Real-Ip']; + } + else { + $addr = addrtoipv4(stream_socket_get_name($new_socket, TRUE)); + } + + // FOR TEST $header['X-Forwarded-For'] = '154.155.22.33'; + $addr = $this->pproxy_realip($header, $addr); + + // printf("PATH: [%s] [%s]\n", $path, print_r($header, TRUE)); if ($method == "POST" && $rest > 0) { if (isset($header['Expect']) && $header['Expect'] == '100-continue') { - fprintf(STDERR, "\nPOSTA DE CHE\n\n"); + // fprintf(STDERR, "\nPOSTA DE CHE\n\n"); $this->pendpage_try_addcont($new_socket, 20, $method, $header, $get, $post, $cookie, $path, $addr, $rest, $cont); @@ -724,14 +795,14 @@ class Sac_a_push { $manage_page = TRUE; } - printf("number of sockets after %d\n", count($this->socks)); + // printf("number of sockets after %d\n", count($this->socks)); } else { printf("WARNING: ancillary_getstream failed\n"); } } else if ($sock === $this->list_cmd) { - printf("NUOVA DIRECT CONNEX\n"); + // printf("NUOVA DIRECT CONNEX\n"); if (($new_unix = stream_socket_accept($this->list_cmd)) == FALSE) { printf("SOCKET_ACCEPT FAILED\n"); continue; @@ -745,18 +816,19 @@ class Sac_a_push { if ($buf == FALSE || feof($sock)) { // close socket case if ($buf == FALSE) { - printf("INFO: read return false\n"); + // printf("INFO: read return false\n"); + ; } if ($sock === $this->list_web) { - printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); return(21); } else if ($sock === $this->list_cmd) { - printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); return(23); } else if ($sock === $this->in || $sock === static::$cnt_slave) { - printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); return(22); } else { @@ -774,7 +846,7 @@ class Sac_a_push { } } fclose($sock); - printf("CLOSE ON READ\n"); + // printf("CLOSE ON READ\n"); if ($this->debug > 1) { printf("post unset\n"); @@ -786,19 +858,30 @@ class Sac_a_push { print_r($read); } if ($sock === $this->list_web) { - printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + ; } else if ($sock === $this->list_cmd) { - printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); + ; } else if ($sock === $this->in || $sock === static::$cnt_slave) { - printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); $line = trim($buf); if ($line == "reload") { require("$DOCUMENT_ROOT/Etc/".BRISK_CONF); - $this->app->reload(FALSE, $G_ban_list, $G_black_list); + $this->reload(FALSE, $G_provider_proxy); + $this->app->reload(FALSE, $G_ban_list, $G_black_list, + $G_cloud_smasher); + if (!$this->check_globals()) { + fprintf(STDERR, "Take a look to the phplog file, GLOBALS missing!\n"); + sleep(10); + } global_dump(); } + else if ($line == "dump") { + $dump_users = TRUE; + } else if ($line == "shutdown" || $line == "sd") { if ($this->app->dump_data()) { return(0); @@ -810,7 +893,79 @@ class Sac_a_push { } else { // data arrived from not special socket $key = array_search("$sock", $this->socks); - fprintf(STDERR, "Arrivati %d bytes dalla socket n. %d\n", mb_strlen($buf, "ASCII"), $key); + // fprintf(STDERR, "Arrivati %d bytes dalla socket n. %d\n", mb_strlen($buf, "ASCII"), $key); + + if (isset($this->s2u[$id])) { + // + // TODO: + // fix $addr + // fix $this->pendpage_try_addflush below (probably not required) + // + $addr = "127.0.0.1"; + $user = $this->s2u[$id]; + + // fprintf(STDERR, 'POST USER'); + if ($user && $user->rd_transp && strpos($user->rd_transp->type, "websocket") !== FALSE) { + $clie_cmd = $user->rd_transp->unchunk($buf); + $clie_cmd = json_decode($clie_cmd, TRUE); + // fprintf(STDERR, "HERE WE ARE INCOMING DATA [%s]\n", print_r($clie_cmd, TRUE)); + + $wr_addr = substr(parse_url($clie_cmd["target"])["path"], strlen(SITE_PREFIX)); + if ($wr_addr == "index_wr.php") { + ob_start(); + // complete: index_wr_main($this->app, $addr, $get, $post, $cookie); + index_wr_main($this->app, $addr, $clie_cmd, NULL, NULL); + $content = ob_get_contents(); + ob_end_clean(); + } + else if ($wr_addr == "briskin5/index_wr.php") { + $table_idx = $clie_cmd['table_idx']; + $table_token = $clie_cmd['table_token']; + + if (($bri = $this->app->match_get($table_idx, $table_token)) != FALSE) { + ob_start(); + bin5_index_wr_main($bri, $addr, $clie_cmd, NULL, NULL); + $content = ob_get_contents(); + ob_end_clean(); + } + } + /* + briskin5/index_wr.php + + if (isset($table_idx) && isset($table_token)) { + if (($bri = $s_a_p->app->match_get($table_idx, $table_token)) != FALSE) { + ob_start(); + bin5_index_wr_main($bri, $addr, $get, $post, $cookie); + $content = ob_get_contents(); + ob_end_clean(); + } + else { + $content = "Bin5 Load data error"; + } + } + else { + $content = "Bin5 Load data error"; + } + $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content); + */ + } + } + else { + fprintf(STDERR, "User associated with ID: %s not found\n", $id); + } + + if (isset($this->s2u[$id])) { + $user = $this->s2u[$id]; + + fprintf(STDERR, 'POST USER'); + if ($user && $user->rd_transp && strpos($user->rd_transp->type, "websocket") !== FALSE) { + fprintf(STDERR, "HERE WE ARE INCOMING DATA [%s]\n", $user->rd_transp->deframe($buf)); + + } + } + else { + fprintf(STDERR, "REC ID: %s\n", $id); + } if (isset($this->s2p[$id])) { $this->s2p[$id]->rest -= mb_strlen($buf, "ASCII"); $this->s2p[$id]->cont .= $buf; @@ -830,6 +985,7 @@ class Sac_a_push { } if ($manage_page == TRUE) { + /* printf("M: %s\nHEADER:\n", $method); print_r($header); printf("GET:\n"); @@ -838,6 +994,7 @@ class Sac_a_push { print_r($post); printf("COOKIE:\n"); print_r($cookie); + */ $header_out = array(); // TODO: MOVE DOWN request_mgr to factorize new_sockets and POST closed @@ -848,6 +1005,7 @@ class Sac_a_push { if ($rret == FALSE) { // FIXME: manage 404 !!! printf("TODO: fix unknown page\n"); + fclose($new_socket); } } } @@ -862,7 +1020,7 @@ class Sac_a_push { unset($this->pending_pages[$k]); } } - + /* $response: raw stream data not sent $content: html consistent data (