X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=619d0b20032fe08782b36e258c6597da78256656;hb=ad168d33f53581e082fa52a392c84af861afe47d;hp=502670d9ceab8d86d368efa5c374d42e3e000414;hpb=9a17da4020740578e3a744630fd6be96c8237cab;p=brisk.git diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh index 502670d..619d0b2 100644 --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@ -2,7 +2,7 @@ /* * brisk - Obj/sac-a-push.phh * - * Copyright (C) 2012 Matteo Nastasi + * Copyright (C) 2012-2014 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -25,21 +25,41 @@ 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_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_room_whysupport', +'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() @@ -154,6 +176,8 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo 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]); } } @@ -221,6 +245,14 @@ function headers_render($header, $len) } else if (isset($header['HTTP-Response'])) { $s = sprintf("HTTP/1.1 %s\r\n", $header['HTTP-Response']); + foreach($header as $key => $value) { + if (strtolower($key) == "http-response") + continue; + $s .= sprintf("%s: %s\r\n", $key, $value); + } + if ($len >= 0) { + $s .= sprintf("Content-Length: %ld\r\n", $len); + } } else { $s = "HTTP/1.1 200 OK\r\n"; @@ -389,15 +421,20 @@ 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 var $socks; var $s2u; // user associated with input socket var $s2p; // pending page associated with input socket var $pending_pages; + var $is_daemon; - var $list; + var $list_web; + var $list_cmd; var $in; var $debug; @@ -438,18 +475,27 @@ class Sac_a_push { } } - static function create(&$app, $sockname, $debug, $blocking_mode) + 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"; $thiz->debug = $debug; $thiz->socks = array(); $thiz->s2u = array(); $thiz->s2p = 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, @@ -476,19 +522,27 @@ class Sac_a_push { 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 = stream_socket_server($thiz->unix_socket, $err, $errs)) === FALSE) { + if (($thiz->list_web = stream_socket_server($thiz->unix_socket, $err, $errs)) === FALSE) { + return (FALSE); + } + 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 + stream_set_blocking($thiz->list_web, $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); } @@ -577,7 +631,7 @@ 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]->the_end) { if ($this->s2u[$id]->rd_socket_get() != NULL) { $this->s2u[$id]->rd_socket_set(NULL); } @@ -588,21 +642,41 @@ class Sac_a_push { } } } + $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); @@ -611,6 +685,7 @@ class Sac_a_push { $this->main_loop = 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)); @@ -619,9 +694,16 @@ class Sac_a_push { /* 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(array(intval($this->list_web) => $this->list_web, + 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"); @@ -648,9 +730,9 @@ class Sac_a_push { if (!is_resource($sock)) { continue; } - if ($sock === $this->list) { + if ($sock === $this->list_web) { printf("NUOVA CONNEX\n"); - if (($new_unix = stream_socket_accept($this->list)) == FALSE) { + if (($new_unix = stream_socket_accept($this->list_web)) == FALSE) { printf("SOCKET_ACCEPT FAILED\n"); continue; } @@ -670,8 +752,11 @@ class Sac_a_push { == FALSE) { fprintf(STDERR, "TODO: fix wrong header management\n"); } - $addr = stream_socket_get_name($new_socket, TRUE); - printf("PATH: [%s]\n", $path); + $addr_full = stream_socket_get_name($new_socket, TRUE); + // FOR TEST $header['X-Forwarded-For'] = '154.155.22.33'; + $addr = $this->pproxy_realip($header, addrtoipv4($addr_full)); + + 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"); @@ -695,18 +780,31 @@ class Sac_a_push { 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 { // already opened socket $buf = fread($sock, 4096); // if socket is closed - if ($buf == FALSE || mb_strlen($buf, "ASCII") == 0) { + if ($buf == FALSE || feof($sock)) { // close socket case if ($buf == FALSE) { - printf("ERROR READING\n"); + printf("INFO: read return false\n"); } - if ($sock === $this->list) { + if ($sock === $this->list_web) { 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")); return(22); @@ -716,6 +814,10 @@ class Sac_a_push { if (isset($this->s2u[$id])) { // $user_a[$s2u[$id]]->disable(); if ($this->s2u[$id]->rd_socket_get() != NULL) { + // try to send close frame (for websocket) + $clo = $this->s2u[$id]->stream_close(); + $clo_l = mb_strlen($clo, "ASCII"); + @fwrite($sock, $clo, $clo_l); $this->s2u[$id]->rd_socket_set(NULL); } unset($this->s2u[$id]); @@ -728,23 +830,32 @@ class Sac_a_push { 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) { + if ($sock === $this->list_web) { 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")); $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 == "shutdown") { + else if ($line == "shutdown" || $line == "sd") { if ($this->app->dump_data()) { return(0); } @@ -753,7 +864,7 @@ 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); if (isset($this->s2p[$id])) { @@ -790,10 +901,10 @@ class Sac_a_push { if (!strncmp($path, SITE_PREFIX, SITE_PREFIX_LEN)) { $rret = $this->app->request_mgr($this, $header, $header_out, $new_socket, substr($path, SITE_PREFIX_LEN), $addr, $get, $post, $cookie); } - fprintf(STDERR, "\n\n DI QUI PASSA [%s]\n\n", $rret); if ($rret == FALSE) { // FIXME: manage 404 !!! printf("TODO: fix unknown page\n"); + fclose($new_socket); } } } @@ -820,6 +931,13 @@ class Sac_a_push { $id = intval($sock); if (isset($this->s2u[$id])) { $user = $this->s2u[$id]; + + if ($user->rd_toflush) { + if (fflush($sock) == FALSE) + continue; + else + $user->rd_toflush = FALSE; + } $response = $user->rd_cache_get(); $do_ping = FALSE; if (($this->curtime - $user->lacc) > (EXPIRE_TIME_RD / 3)) { @@ -849,7 +967,7 @@ class Sac_a_push { // echo "SPIA: [".substr($response, 0, 60)."...]\n"; // echo "SPIA: [".$response."]\n"; $response_l = mb_strlen($response, "ASCII"); - $wret = @fwrite($sock, $response); + $wret = @fwrite($sock, $response, $response_l); if ($wret < $response_l) { printf("TROUBLE WITH FWRITE: %d\n", $wret); $user->rd_cache_set(mb_substr($response, $wret, $response_l - $wret, "ASCII")); @@ -857,7 +975,10 @@ class Sac_a_push { else { $user->rd_cache_set(""); } - fflush($sock); + if (fflush($sock) == FALSE) { + $user->rd_toflush = TRUE; + continue; + } $user->rd_kalive_reset($this->curtime); } @@ -868,14 +989,114 @@ class Sac_a_push { } unset($this->socks[$id]); unset($this->s2u[$id]); + $clo = $user->stream_close(); + $clo_l = mb_strlen($clo, "ASCII"); + @fwrite($sock, $clo, $clo_l); fclose($sock); printf("CLOSE ON LOOP\n"); } - } + } // if (isset($this->s2u[$id]... } // foreach ($this->socks... printf("\n"); + if (defined('CURL_DE_SAC_VERS')) { + $this->app->cds->process(); + } } // while (... } // function run(... -} + function pproxy_realip(&$header, $ip_str) + { + return ($this->provider_proxy->realip($header, $ip_str)); + } + + function reload($is_first, $prov_proxy) + { + fprintf(STDERR, "SAP RELOAD STUFF (%d)\n", count($prov_proxy)); + + $this->provider_proxy->update($prov_proxy); + } + + function direct_command($cmdstr) + { + GLOBAL $G_alarm_passwd; + + $cmd = cmd_deserialize($cmdstr); + + if (!isset($cmd['cmd'])) { + return cmd_return(500, 'no cmd found'); + } + // "cmd" => "userauth", "sess" => 'xxxxxxxxxxx', 'private' => 'it_must_be_correct', + // 'the_end' => 'true' ); + // cmd=userauth&sess=52d796ac08c47&private=yourpasswd192.168.122.152d796ac08c47&the_end=true + if ($cmd['cmd'] == 'userauth') { + if (!isset($cmd['sess']) || !isset($cmd['private'])) { + return cmd_return(401, 'malformed cmd'); + } + $idx = -1; + if (($user = $this->app->get_user($cmd['sess'], &$idx)) == FALSE) + return cmd_return(402, 'user not found'); + + if (($user->flags & USER_FLAG_TY_ADMIN) == 0x00) + return cmd_return(403, 'permission denied'); + + if (md5($G_alarm_passwd.$user->ip.$user->sess) != $cmd['private']) + return cmd_return(404, 'authentication failed ['.$cmd['private'].']['.$G_alarm_passwd.$user->ip.$user->sess.']'); + + return cmd_return(200, 'success'); + } + + return cmd_return(501, 'no cmd found'); + } + + function direct_mgmt($socket) + { + printf("DIRECT: begin\n"); + $st = DIRECT_ST_READ; + $cmd_all = ""; + $endtime = $this->curtime + 3; + + while(time() <= $endtime) { + printf("DIRECT: init loop %d\n", $st); + if ($st == DIRECT_ST_READ) { + $buf = fread($socket, 4096); + if ($buf == FALSE && feof($socket)) { + break; + } + else if ($buf != FALSE && strlen($buf) > 0) { + $cmd_all .= $buf; + + if (substr(trim($cmd_all), -13) == "&the_end=true") { + $output_arr = $this->direct_command($cmd_all); + $output = cmd_serialize($output_arr); + $output_cur = 0; + $output_len = mb_strlen($output, "ASCII"); + $st = DIRECT_ST_WRITE; + continue; + } + } + } + else if ($st == DIRECT_ST_WRITE) { + $ret = fwrite($socket, $output, $output_len); + if ($ret === FALSE) { + if (feof($socket)) { + break; + } + } + else if ($ret > 0 && $ret < $output_len) { + $output = substr($output, -($output_len - $ret)); + $output_len -= $ret; + continue; + } + else if ($ret == $output_len) { + fclose($socket); + return TRUE; + } + } + usleep(10000); + } + + fclose($socket); + return FALSE; + } +} // class Sac_a_push ?>