X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=a52b5749bb1d8639c51dbee2af2a561cc6aa5b5a;hb=538a0d6de8e953d27fb8b0f0eb664fc33b297761;hp=7292a7bbf934e498fba28839217482c3855d22dc;hpb=a986416b1b23aed3e6c92e8786c754a9f165abb9;p=brisk.git diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh index 7292a7b..a52b574 100644 --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@ -2,8 +2,8 @@ /* * brisk - Obj/sac-a-push.phh * - * Copyright (C) 2012 Matteo Nastasi - * mailto: nastasi@alternativeoutput.it + * Copyright (C) 2012-2014 Matteo Nastasi + * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it * @@ -22,24 +22,44 @@ * */ -define('SITE_PREFIX', '/brisk/'); +define('SITE_PREFIX', "/brisk/"); define('SITE_PREFIX_LEN', 7); +define('DIRECT_ST_READ', 1); +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_black_list, $G_btrace_pref_sub, $G_dbauth; + GLOBAL $G_alarm_passwd, $G_ban_list, $G_black_list, $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, $G_sidebanner, $G_sidebanner2; + GLOBAL $G_room_roadmap, $G_shutdown; GLOBAL $G_splash_content, $G_splash_contents, $G_splash_cont_idx; 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_sidebanner, $G_with_sidebanner2, $G_with_splash; - GLOBAL $G_with_topbanner; + GLOBAL $G_with_splash, $G_sidebanner, $G_sidebanner_idx; + 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)); fprintf(STDERR, "G_black_list = [%s]\n", print_r($G_black_list, TRUE)); fprintf(STDERR, "G_btrace_pref_sub = [%s]\n", print_r($G_btrace_pref_sub, TRUE)); fprintf(STDERR, "G_dbauth = [%s]\n", print_r($G_dbauth, TRUE)); @@ -54,8 +74,6 @@ function global_dump() fprintf(STDERR, "G_proxy_white_list = [%s]\n", print_r($G_proxy_white_list, TRUE)); fprintf(STDERR, "G_room_roadmap = [%s]\n", print_r($G_room_roadmap, TRUE)); fprintf(STDERR, "G_shutdown = [%s]\n", print_r($G_shutdown, TRUE)); - fprintf(STDERR, "G_sidebanner = [%s]\n", print_r($G_sidebanner, TRUE)); - fprintf(STDERR, "G_sidebanner2 = [%s]\n", print_r($G_sidebanner2, TRUE)); fprintf(STDERR, "G_splash_content = [%s]\n", print_r($G_splash_content, TRUE)); fprintf(STDERR, "G_splash_contents = [%s]\n", print_r($G_splash_contents, TRUE)); fprintf(STDERR, "G_splash_cont_idx = [%s]\n", print_r($G_splash_cont_idx, TRUE)); @@ -67,10 +85,14 @@ function global_dump() fprintf(STDERR, "G_topbanner = [%s]\n", print_r($G_topbanner, TRUE)); fprintf(STDERR, "G_with_donors = [%s]\n", print_r($G_with_donors, TRUE)); fprintf(STDERR, "G_with_poll = [%s]\n", print_r($G_with_poll, TRUE)); - fprintf(STDERR, "G_with_sidebanner = [%s]\n", print_r($G_with_sidebanner, TRUE)); - fprintf(STDERR, "G_with_sidebanner2 = [%s]\n", print_r($G_with_sidebanner2, TRUE)); + fprintf(STDERR, "G_sidebanner = [%s]\n", print_r($G_sidebanner, TRUE)); + 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() @@ -117,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; @@ -151,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]); } } @@ -166,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) { @@ -196,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; @@ -397,15 +421,21 @@ class Sac_a_push { static $fixed_fd = 3; static $cnt_master = NULL; static $cnt_slave = NULL; - - var $file_socket; - var $unix_socket; + + var $provider_proxy; // list of provider/browser that offer proxy service + + var $file_socket_pfx; + var $unix_socket_pfx; + var $direct_socket; // socket where read direct commands var $socks; var $s2u; // user associated with input socket var $s2p; // pending page associated with input socket + var $s2c; // ws sockets in closing phase var $pending_pages; + var $is_daemon; - var $list; + var $list_web; + var $list_cmd; var $in; var $debug; @@ -437,7 +467,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); @@ -446,18 +476,29 @@ class Sac_a_push { } } - static function create(&$app, $sockname, $debug, $blocking_mode) - { + static function create(&$app, $sockname_pfx, $debug, $blocking_mode, $provider_proxy, $argv) + { $thiz = new Sac_a_push(); - + $thiz->app = $app; - $thiz->file_socket = $sockname; - $thiz->unix_socket = "unix://$sockname"; + + $thiz->provider_proxy = ProviderProxy::create(); + + $thiz->file_socket_pfx = $sockname_pfx; + $thiz->unix_socket_pfx = "unix://$sockname_pfx"; + $thiz->direct_socket = "unix://${sockname_pfx}_admin.sock"; $thiz->debug = $debug; + $thiz->list_web = array(); $thiz->socks = array(); $thiz->s2u = array(); $thiz->s2p = array(); + $thiz->s2c = array(); $thiz->pending_pages = array(); + $thiz->is_daemon = FALSE; + + if (array_search("-d", $argv) !== FALSE || array_search("--daemon", $argv) !== FALSE) { + $thiz->is_daemon = TRUE; + } // create a couple of sockets for control management if (($sockpair = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, @@ -480,36 +521,56 @@ class Sac_a_push { else $thiz->rndstr .= chr(mt_rand(65, 90)); } - - if (file_exists($thiz->file_socket)) { - unlink($thiz->file_socket); + + for ($i = 0 ; $i < USOCK_POOL_N ; $i++) { + $file_socket = $thiz->file_socket_pfx . sprintf("%d.sock", $i); + if (file_exists($file_socket)) { + unlink($file_socket); + } + } + $file_socket_admin = $thiz->file_socket_pfx . "_admin.sock"; + if (file_exists($file_socket_admin)) { + unlink($file_socket_admin); } - + $old_umask = umask(0); - if (($thiz->list = stream_socket_server($thiz->unix_socket, $err, $errs)) === FALSE) { + for ($i = 0 ; $i < USOCK_POOL_N ; $i++) { + $unix_socket = sprintf("%s%d.sock", $thiz->unix_socket_pfx, $i); + if (($list_sock = stream_socket_server($unix_socket, $err, $errs)) === FALSE) { + return (FALSE); + } + array_push($thiz->list_web, $list_sock); + } + if (($thiz->list_cmd = stream_socket_server($thiz->direct_socket, $err, $errs)) === FALSE) { return (FALSE); } umask($old_umask); - stream_set_blocking($thiz->list, $thiz->blocking_mode); # Set the stream to non-blocking + for ($i = 0 ; $i < USOCK_POOL_N ; $i++) { + stream_set_blocking($thiz->list_web[$i], $thiz->blocking_mode); # Set the stream to non-blocking + } + stream_set_blocking($thiz->list_cmd, $thiz->blocking_mode); # Set the stream to non-blocking if (($thiz->in = fopen("php://stdin", "r")) === FALSE) { return(FALSE); } $thiz->main_loop = FALSE; + $thiz->reload(TRUE, $provider_proxy); return ($thiz); } - function socks_set($sock, $user, $pendpage) + function socks_set($sock, $user, $pendpage, $postclose = NULL) { $id = intval($sock); $this->socks[$id] = $sock; if ($user != NULL) - $this->s2u[$id] = $user; + $this->s2u[$id] = $user; if ($pendpage != NULL) - $this->s2p[$id] = $pendpage; + $this->s2p[$id] = $pendpage; + if ($postclose != NULL) + $this->s2c[$id] = $postclose; } function socks_unset($sock) @@ -520,18 +581,20 @@ class Sac_a_push { unset($this->s2u[$id]); if (isset($this->s2p[$id])) unset($this->s2p[$id]); + if (isset($this->s2c[$id])) + unset($this->s2c[$id]); unset($this->socks[$id]); } 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); } @@ -584,54 +647,103 @@ 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); - } - unset($this->socks[$id]); - unset($this->s2u[$id]); + if (isset($this->s2c[$id])) { + $postclose = $this->s2c[$id]; + if ($postclose->read('', $this->curtime) == 0) { fclose($sock); - printf("CLOSE ON GARBAGE MANAGER\n"); + $this->socks_unset($sock); + } + } + else if (isset($this->s2u[$id])) { + $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"); + } } } } + $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_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, $G_sidebanner, $G_sidebanner2; + GLOBAL $G_room_roadmap, $G_shutdown; GLOBAL $G_splash_content, $G_splash_contents, $G_splash_cont_idx; 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_sidebanner, $G_with_sidebanner2, $G_with_splash; + GLOBAL $G_with_splash, $G_sidebanner, $G_sidebanner_idx; 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; - + + $list_web_arr = array(); + for ($i = 0 ; $i < USOCK_POOL_N ; $i++) { + $list_web_arr[intval($this->list_web[$i])] = $this->list_web[$i]; + } + + $lastime = 0; + $dump_users = TRUE; + $sock_shard_cur = -1; while ($this->main_loop) { + $sock_shard_cur = ($sock_shard_cur + 1) % SOCK_SHARD_N; + $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) */ /* $read = array_merge(array("$in" => $in), $socks); */ /* else */ - $read = array_merge(array(intval($this->list) => $this->list, intval($this->in) => $this->in, - intval(static::$cnt_slave) => static::$cnt_slave), - $this->socks); - + $pre_read = array_merge($list_web_arr, array( + intval($this->list_cmd) => $this->list_cmd, + intval(static::$cnt_slave) => static::$cnt_slave), + $this->socks); + if ($this->is_daemon == FALSE) { + $read = array_merge($pre_read, array(intval($this->in) => $this->in)); + } + else { + $read = $pre_read; + } + if ($this->debug > 1) { printf("PRE_SELECT\n"); print_r($read); @@ -639,12 +751,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); } @@ -657,9 +772,11 @@ class Sac_a_push { if (!is_resource($sock)) { continue; } - if ($sock === $this->list) { - printf("NUOVA CONNEX\n"); - if (($new_unix = stream_socket_accept($this->list)) == FALSE) { + $list_web_idx = array_search($sock, $this->list_web, TRUE); + if ($list_web_idx !== FALSE) { + $list_web_usock = $this->list_web[$list_web_idx]; + // printf("NUOVA CONNEX\n"); + if (($new_unix = stream_socket_accept($list_web_usock)) == FALSE) { printf("SOCKET_ACCEPT FAILED\n"); continue; } @@ -671,19 +788,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); @@ -698,26 +828,41 @@ 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 { + else if ($sock === $this->list_cmd) { + // printf("NUOVA DIRECT CONNEX\n"); + if (($new_unix = stream_socket_accept($this->list_cmd)) == FALSE) { + printf("SOCKET_ACCEPT FAILED\n"); + continue; + } + stream_set_blocking($new_unix, $this->blocking_mode); + $this->direct_mgmt($new_unix); + } // not socket_list nor socket_list_cmd + else if ($id % SOCK_SHARD_N == $sock_shard_cur) { // already opened socket $buf = fread($sock, 4096); // if socket is closed - if ($buf == FALSE || mb_strlen($buf, "ASCII") == 0) { + if ($buf == FALSE || mb_strlen($buf, "ASCII") == 0 || feof($sock)) { + $postclose = NULL; // close socket case if ($buf == FALSE) { - printf("INFO: read return false\n"); + // printf("INFO: read return false\n"); + ; } - if ($sock === $this->list) { - printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + if (array_search($sock, $this->list_web, TRUE) !== FALSE) { + // 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")); + 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 { @@ -727,6 +872,7 @@ class Sac_a_push { if ($this->s2u[$id]->rd_socket_get() != NULL) { // try to send close frame (for websocket) $clo = $this->s2u[$id]->stream_close(); + $postclose = $user->stream_postclose_get($sock, $this->curtime); $clo_l = mb_strlen($clo, "ASCII"); @fwrite($sock, $clo, $clo_l); $this->s2u[$id]->rd_socket_set(NULL); @@ -734,29 +880,49 @@ class Sac_a_push { unset($this->s2u[$id]); } } - fclose($sock); - printf("CLOSE ON READ\n"); + if ($postclose != NULL) { + // print("POSTCLOSE found!"); + $this->socks_set($sock, NULL, NULL, $postclose); + } + else { + fclose($sock); + } + // printf("CLOSE ON READ\n"); if ($this->debug > 1) { printf("post unset\n"); print_r($this->socks); } - } - else { + } // if ($buf == FALSE || mb_strlen($buf, "ASCII") == 0) { + else { // data on the socket if ($this->debug > 1) { print_r($read); } - if ($sock === $this->list) { - printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + if (array_search($sock, $this->list_web, TRUE) !== FALSE) { + // 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")); + ; } 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->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); @@ -766,9 +932,72 @@ class Sac_a_push { } } } - else { + 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, $sock); + $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(); + } + } + else { + fprintf(STDERR, "Unknown page [%s]\n", $wr_addr); + } + /* + 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->s2p[$id])) { $this->s2p[$id]->rest -= mb_strlen($buf, "ASCII"); $this->s2p[$id]->cont .= $buf; @@ -783,11 +1012,23 @@ class Sac_a_push { $manage_page = TRUE; } } + + // postclose case + if (isset($this->s2c[$id])) { + $postclose = $this->s2c[$id]; + // printf("POSTCLOSE: found pc in s2c list\n"); + if ($postclose->read($buf, $this->curtime) == 0) { + printf("POSTCLOSE: received end opcode, close\n"); + fclose($sock); + $this->socks_unset($sock); + } + } } } } if ($manage_page == TRUE) { + /* printf("M: %s\nHEADER:\n", $method); print_r($header); printf("GET:\n"); @@ -796,6 +1037,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 @@ -805,7 +1047,8 @@ class Sac_a_push { } if ($rret == FALSE) { // FIXME: manage 404 !!! - printf("TODO: fix unknown page\n"); + printf("TODO: fix unknown page: %s\n", $path); + fclose($new_socket); } } } @@ -820,7 +1063,7 @@ class Sac_a_push { unset($this->pending_pages[$k]); } } - + /* $response: raw stream data not sent $content: html consistent data (