X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=a3fe932112e2a8ab33e5d971dcbb6881ee417a68;hb=a0b24745843fc7bad6f8291ef6f660e255af7825;hp=fdf5541a771afffb89ed1c222fbe729ef4515c3f;hpb=28be75bdd1253bb56c8bef5476f59be63013eb71;p=brisk.git diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh index fdf5541..a3fe932 100644 --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@ -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_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() @@ -401,6 +421,8 @@ 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; @@ -453,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"; @@ -517,6 +542,7 @@ class Sac_a_push { } $thiz->main_loop = FALSE; + $thiz->reload(TRUE, $provider_proxy); return ($thiz); } @@ -619,11 +645,23 @@ 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_ban_list, $G_black_list, $G_provider_proxy; + 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; @@ -635,6 +673,11 @@ 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); } @@ -709,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"); @@ -800,8 +846,13 @@ class Sac_a_push { $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_provider_proxy); + $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" || $line == "sd") { @@ -953,6 +1004,18 @@ class Sac_a_push { } // 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;