r2582 - sendfile: accept zero or more files as arguments

diff --git a/gateways/sendfile/main b/gateways/sendfile/main
index 3a57fee0dee0662dfb6fce738d094819ed600dc3..1bdab250fe9d66ea80e5ccd12a866d14496f01da 100755 (executable)
--- a/gateways/sendfile/main
+++ b/gateways/sendfile/main
@@ -6,7 +6,7 @@
 #
 # The only supported command is:
 #
-# * submit <username> <endpoint> <handler name> <data file name>: send the file
+# * submit <username> <endpoint> <handler name> [filename1] [filename2] [...] 
 #
 # Handler name can be any string used to distinguish different file processors.
 # The temporary file will be passed to a script in current directory, if it exists.
@@ -22,21 +22,24 @@ do_submit()
        user=$1
        endpoint=$2
        handler=$3
-       cfgfile=$4
+       # 0 or more files
+       files=$4
        # sanity checks
-       if [ -z "$user" -o -z "$endpoint" -o -z "$handler" -o -z "$cfgfile" ]; then
+       if [ -z "$user" -o -z "$endpoint" -o -z "$handler" ]; then
                echo 'ERR!invalid arguments'
                return
        fi
-       if [ ! -f "$cfgfile" ]; then
-               echo "ERR!File $cfgfile is missing."
-               return
-       fi
+       for cfgfile in $files; do
+               if [ ! -f "$cfgfile" ]; then
+                       echo "ERR!File $cfgfile is missing."
+                       return
+               fi
+       done
        if [ ! -x "$MYDIR/$handler.install" ]; then
                echo "ERR!Cannot execute $MYDIR/$handler.install"
                return
        fi
-       "$MYDIR/$handler.install" "$user" "$endpoint" "$cfgfile"
+       "$MYDIR/$handler.install" "$user" "$endpoint" $files
        ret=$?
        if [ $ret = 0 ]; then
                echo "OK!"

diff --git a/inc/gateways.php b/inc/gateways.php
index 167f63cb94df342864e3bd8b4800caa33e76d77e..e4ef876245555f6082880f0457487d14cb95ccee 100644 (file)
--- a/inc/gateways.php
+++ b/inc/gateways.php
@@ -208,21 +208,28 @@ function setSwitchVLANs ($object_id = 0, $setcmd)
 
 // Drop a file off RackTables platform. The gateway will catch the file and pass it to the given
 // installer script.
-// Return a 
-function gwSendFile ($endpoint, $handlername, $filetext = '')
+function gwSendFile ($endpoint, $handlername, $filetext = array())
 {
        global $remote_username;
-       $tmpfilename = tempnam ('', 'RackTables-sendfile-');
-       $tmpfile = fopen ($tmpfilename, 'wb');
-       fwrite ($tmpfile, $filetext);
-       fclose ($tmpfile);
+       $tmpnames = array();
        $endpoint = str_replace (' ', '\ ', $endpoint); // the gateway dispatcher uses read (1) to assign arguments
+       $command = "submit ${remote_username} ${endpoint} ${handlername}";
+       foreach ($filetext as $text)
+       {
+               $name = tempnam ('', 'RackTables-sendfile-');
+               $tmpnames[] = $name;
+               $tmpfile = fopen ($name, 'wb');
+               fwrite ($tmpfile, $text);
+               fclose ($tmpfile);
+               $command .= " ${name}";
+       }
        $outputlines = queryGateway
        (
                'sendfile',
-               array ("submit ${remote_username} ${endpoint} ${handlername} ${tmpfilename}")
+               array ($command)
        );
-       unlink ($tmpfilename);
+       foreach ($tmpnames as $name)
+               unlink ($name);
        if ($outputlines == NULL)
                return oneLiner (163); // unknown gateway failure
        if (count ($outputlines) != 1)
@@ -268,7 +275,7 @@ function gwSendFileToObject ($object_id = 0, $handlername, $filetext = '')
        if (count ($endpoints) > 1)
                return oneLiner (162); // can't pick an address
        $endpoint = str_replace (' ', '+', $endpoints[0]);
-       return gwSendFile ($endpoint, $handlername, $filetext);
+       return gwSendFile ($endpoint, $handlername, array ($filetext));
 }
 
 function gwRecvFileFromObject ($object_id = 0, $handlername, &$output)

diff --git a/inc/ophandlers.php b/inc/ophandlers.php
index e1a47b6c6c5caa3fa807f9480f5288cd9e6055a9..5ee3a60b6782e8f597399401d183db93c98d2de3 100644 (file)
--- a/inc/ophandlers.php
+++ b/inc/ophandlers.php
@@ -1468,7 +1468,7 @@ function submitSLBConfig ()
 {
        assertUIntArg ('object_id', __FUNCTION__);
        $newconfig = buildLVSConfig ($_REQUEST['object_id']);
-       $msglog = gwSendFileToObject ($_REQUEST['object_id'], 'slbconfig', html_entity_decode ($newconfig, ENT_QUOTES, 'UTF-8'));
+       $msglog = gwSendFileToObject ($_REQUEST['object_id'], 'slbconfig', array (html_entity_decode ($newconfig, ENT_QUOTES, 'UTF-8')));
        return buildWideRedirectURL ($msglog);
 }