X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=6ed7a0e6a5fe300d6bc1e4256e940618efeeb57e;hb=ad9bfccebd7532f3283ef6cc0733a47973c9a44e;hp=27ed4c4f5f70fa9c35378aa72d9f384c0aa4cc7f;hpb=43b825479e2c58fe49b714e8d09fbbf472b8e662;p=brisk.git

diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 27ed4c4..6ed7a0e 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,25 @@
 define('SITE_PREFIX', '/brisk/');
 define('SITE_PREFIX_LEN', 7);
 
+define('DIRECT_ST_READ',  1);
+define('DIRECT_ST_WRITE', 2);
+
 declare(ticks = 1);
 
 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_splash, $G_sidebanner, $G_sidebanner_idx;
     GLOBAL $G_with_topbanner;
 
     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 +58,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,8 +69,8 @@ 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));
 }
@@ -400,13 +402,15 @@ class Sac_a_push {
     
     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;
@@ -454,6 +458,7 @@ class Sac_a_push {
         $thiz->app = $app;
         $thiz->file_socket = $sockname;
         $thiz->unix_socket = "unix://$sockname";
+        $thiz->direct_socket = "unix://${sockname}2";
         $thiz->debug = $debug;
         $thiz->socks = array();
         $thiz->s2u  = array();
@@ -490,13 +495,20 @@ 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);
@@ -608,14 +620,14 @@ class Sac_a_push {
     {
         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_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;
 
@@ -635,7 +647,8 @@ class Sac_a_push {
             /* if ($shutdown)  */
             /*     $read   = array_merge(array("$in" => $in), $socks); */
             /* else */
-            $pre_read = array_merge(array(intval($this->list) => $this->list,
+            $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) {
@@ -670,9 +683,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;
                         }
@@ -717,18 +730,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("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);
@@ -754,20 +780,23 @@ 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->app->reload(FALSE, $G_ban_list, $G_black_list);
                                     global_dump();
                                 }
                                 else if ($line == "shutdown" || $line == "sd") {
@@ -779,7 +808,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])) {
@@ -899,11 +928,94 @@ class Sac_a_push {
                         fclose($sock);
                         printf("CLOSE ON LOOP\n");
                     }
-                }
+                }  // if (isset($this->s2u[$id]...
             }  // foreach ($this->socks...
             printf("\n");
+            $this->app->cds->process();
         }  // while (...
     }  // function run(...
-}
 
+    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
 ?>