Changeset 1547

Timestamp:

05/18/12 03:25:55 (12 months ago)

Author:

bruno

Message:

• Add the shorewall plugin
• cbusterize now uses only Net::SSH2 and supports getting files owned by root with sudo called remotely (no passwd asked)

Location:

projects/casparbuster/devel

Files:

• bin/cbusterize (modified) (9 diffs)
• etc/cb/plugins/shorewall.conf (copied) (copied from projects/casparbuster/devel/etc/cb/plugins/named.conf) (5 diffs)

projects/casparbuster/devel/bin/cbusterize

@@ -7 +7 @@
 =head1 SYNOPSIS
 
-cbusterize [options] --source /path/to/file/to/CasparBusterize
+cbusterize [options] [--source /path/to/file/to/CasparBusterize | --plugin PluginName]
 
  Options:
@@ -116 +116 @@
 use Data::Dumper;
 use Net::SSH2;
+use Cwd;
+use Archive::Tar;
+use Carp;
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
@@ -131 +134 @@
 my $log = undef;
 my $LOG = undef;
+my $ssh2 = undef;
+my $chan = undef;
 
 my ($cbver,$cbrev) = cb_version_init();
@@ -242 +247 @@
 }
 
+$ssh2->disconnect() if (defined $machine);
+
 sub cb_busterize {
 
@@ -252 +259 @@
 my $srcfile = undef;
 my $cmd = undef;
-my $ssh2;
 my $sftp;
 
@@ -263 +269 @@
     }
 } else {
-    $ssh2 = Net::SSH2->new();
-    $ssh2->connect($machine);
-    my $hdir = (getpwnam(getpwuid($<)))[7];
-    if ($ssh2->auth_publickey($remote,"$hdir/.ssh/id_dsa.pub","$hdir/.ssh/id_dsa")) {
-        $sftp = $ssh2->sftp;
-        my %dirs = $sftp->stat("$source/.");
-        my $res = 0;
-        $res = -1 if (not defined $dirs{'mode'});
-        pb_log(2,"DEBUG: Found res = $res\n");
-        if ($res == 0) {
-            $srcdir = $source;
-            pb_log(1,"DEBUG: Found remote dir = $source\n");
-        } else {
-            $srcdir = dirname($source);
-            $srcfile = basename($source);
-            pb_log(1,"DEBUG: Found remote file = $source\n");
-        }
+    if (not defined $ssh2) {
+        pb_log(1,"DEBUG: First time so we need to create the SSH::Net2 object\n");
+        $ssh2 = Net::SSH2->new();
+        if ($debug >= 3) {
+            $ssh2->debug(1);
+        }
+        $ssh2->connect($machine) || confess "Unable to connect to $remote\@$machine: $!";
+        my $hdir = (getpwnam(getpwuid($<)))[7];
+        confess "Unable to connect to $remote\@$machine: $!" if (not $ssh2->auth_publickey($remote,"$hdir/.ssh/id_dsa.pub","$hdir/.ssh/id_dsa"));
+        $chan = $ssh2->channel();
+        die "Unable to create channel for $remote\@$machine: $!" if (not defined $chan);
+        my ($code, $error_name, $error_string) = $ssh2->error();
+        if ($code ne 0) {
+            pb_log(0,"code = $code");
+            pb_log(0,"error_name = $error_name");
+            pb_log(0,"error_string = $error_string");
+        }
+        #$ssh2->blocking(0);
+        if ($debug) {
+            pb_log(1,"DEBUG: launching a shell via Net:SSH2 ($remote\@$machine)");
+        }
+        confess "Unable to launch remote shell through Net:SSH2 ($remote\@$machine)" if (not $chan->shell());
+    }
+    $sftp = $ssh2->sftp;
+    die "Unable to create sftp channel for $remote\@$machine: $!" if (not defined $sftp);
+    my %dirs = $sftp->stat("$source/.");
+    my $res = 0;
+    $res = -1 if (not defined $dirs{'mode'});
+    pb_log(2,"DEBUG: Found res = $res\n");
+    if ($res == 0) {
+        $srcdir = $source;
+        pb_log(1,"DEBUG: Found remote dir = $source\n");
+    } else {
+        $srcdir = dirname($source);
+        $srcfile = basename($source);
+        pb_log(1,"DEBUG: Found remote file = $source\n");
     }
 }
@@ -305 +330 @@
         pb_log(1,"DEBUG: Creating recursively directory $target\n");
     } else {
-        pb_mkdir_p($target) || die "Unable to recursively create $target: $!";
+        pb_mkdir_p($target) || confess "Unable to recursively create $target: $!";
     }
     # Add all the dirs in it to VCS (in reverse order)
@@ -322 +347 @@
 }
 
-# We need to know where to get the content from
+# For local handling
 my $cmdopt = "";
-
 # Recursive if we copy dirs
 $cmdopt = "-r" if (not defined $srcfile);
-
-if (defined $machine) {
-    # TODO replace by $chan->exec + sudo + cat to avoid root access issues
-    $cmd = "scp -p -q $cmdopt $remote\@$machine:\'$source\' $target";
-} else {
-    $cmd = "cp -p $cmdopt $source $target";
-}
-
-# Now add content if not already there
+$cmd = "cp -p $cmdopt $source $target";
+
 if (defined $srcfile) {
     # File case
     if ((! -f "$target/$srcfile") || (defined $force)) {
+        # doesn't exist locally
+        if (defined $machine) {
+            # Remote
+            cb_ssh_do($remote,$source,$target,$debug);
+        } else {
+            # Local
+            if ($debug) {
+                pb_log(1,"DEBUG: launching $cmd\n");
+            } else {
+                pb_system($cmd);
+            }
+        }
         if ($debug) {
-            pb_log(1,"DEBUG: launching $cmd\n");
+            pb_log(1,"DEBUG: Adding $target/$srcfile to your $scheme system\n");
         } else {
-            pb_system($cmd);
             pb_vcs_add($scheme,"$target/$srcfile");
             pb_log(0,"INFO: Created $target/$srcfile and added it to your $scheme system\n");
@@ -351 +379 @@
 } else {
     # Directory case
+    if ($recur eq "true") {
+        # with files in it
+        if ((! -d "$target") || (defined $force)) {
+            # doesn't exist locally
+            if (defined $machine) {
+                # Remote
+                cb_ssh_do($remote,$source,$target,$debug);
+            } else {
+                # Local
+                if ($debug) {
+                    pb_log(1,"DEBUG: launching $cmd\n");
+                } else {
+                    pb_system($cmd);
+                }
+            }
+        } else {
+            pb_log(0,"INFO: Directory $target already there\n");
+        }
+    } else {
+        # Only deal with that dir, nothing below, so just created locally
+        if ($debug) {
+            pb_log(1,"DEBUG: mkdir -p $target\n");
+        } else {
+            pb_mkdir_p("$target");
+        }
+    }
     if ($debug) {
-        if ($recur eq "true") {
-            pb_log(1,"DEBUG: launching $cmd\n");
-        } else {
-            pb_log(1,"DEBUG: mkdir -p $target\n");
-        }
-    } else {
-        if ($recur eq "true") {
-            pb_system($cmd);
-        }
+        pb_log(1,"DEBUG: Adding $target to your $scheme system\n");
+    } else {
         pb_vcs_add($scheme,"$target");
         pb_log(0,"INFO: Created $target and added it to your $scheme system\n");
     }
 }
-$ssh2->disconnect() if (defined $machine);
+
 pb_log(2,"Exiting cb_busterize\n");
 }
+
+sub cb_ssh_do {
+
+my $remote = shift;
+my $source = shift;
+my $target = shift;
+my $debug = shift;
+
+# TODO: if sudo asks a passwd it won't work.
+my $cmd = "sudo tar cvhf /tmp/cb.$$.tar $source\n"; 
+if ($debug) {
+    pb_log(1,"DEBUG: launching through Net:SSH2 ($remote\@$machine) $cmd");
+}
+print $chan "$cmd";
+pb_log(1,"DEBUG: LINE : $_") while <$chan>;
+$cmd = "sudo chmod 600 /tmp/cb.$$.tar\n"; 
+if ($debug) {
+    pb_log(1,"DEBUG: launching through Net:SSH2 ($remote\@$machine) $cmd");
+}
+print $chan "$cmd";
+pb_log(1,"DEBUG: LINE : $_") while <$chan>;
+$cmd = "sudo chown $remote /tmp/cb.$$.tar\n"; 
+if ($debug) {
+    pb_log(1,"DEBUG: launching through Net:SSH2 ($remote\@$machine) $cmd");
+}
+print $chan "$cmd";
+pb_log(1,"DEBUG: LINE : $_") while <$chan>;
+if ($debug) {
+    pb_log(1,"DEBUG: gettting through Net:SSH2 ($remote\@$machine) /tmp/cb.$$.tar\n");
+}
+$ssh2->scp_get("/tmp/cb.$$.tar","/tmp/cb.$$.tar");
+if ($debug) {
+    pb_log(1,"DEBUG: erasing through Net:SSH2 ($remote\@$machine) /tmp/cb.$$.tar\n");
+} else {
+    print $chan "sudo rm -f /tmp/cb.$$.tar\n";
+}
+my $tar = Archive::Tar->new("/tmp/cb.$$.tar");
+$tar->setcwd($target);
+if ($debug) {
+    pb_log(1,"DEBUG: Extracting /tmp/cb.$$.tar\n");
+    foreach my $f ($tar->list_files()) {
+        pb_log(1,"DEBUG: $f\n");
+    }
+} else {
+    $tar->extract();
+}
+if ($debug) {
+    pb_log(1,"DEBUG: cleanup\n");
+} else {
+    $tar->clear;
+    unlink("/tmp/cb.$$.tar");
+}
+}

projects/casparbuster/devel/etc/cb/plugins/shorewall.conf

@@ -1 +1 @@
 #=head1 NAME
 #
-# Configuration file for CasparBuster for the named plugin
+# Configuration file for CasparBuster for the shorewall plugin
 #
 #=head1 SYNOPSIS
 #
-# Define the main parameters for the Named plugin for CasparBuster
+# Define the main parameters for the ShoreWall plugin for CasparBuster
 #
 #=head1 CONFIGURATION ITEMS
@@ -20 +20 @@
 #=cut
 #
-cbpluginfiles named = /var/lib/named/etc/named.conf|root,root,0644;/var/lib/named/etc/bind.keys|root,named,0644;/var/lib/named/etc/bogon_acl.conf|root,root,0644;/var/lib/named/etc/rndc.conf|root,named,0640;/var/lib/named/etc/rndc.key|root,named,0640;/var/lib/named/etc/trusted_networks_acl.conf|root,named,0644;/var/lib/named/etc/named.conf.flecha|root,named,0644;/var/lib/named/etc/db.*|root,named,0640
+cbpluginfiles shorewall = /etc/shorewall/*|root,root,0600
 #
 #=item B<cbplugindirs>
 #
-# Define the list of directories to recursively copy remotely on the target machine. 
+# Define the list of directories to create remotely on the target machine. 
 # Parameters are ';' separated. 
 # A parameter is then '|' separated, the first part being the full path name of the file
@@ -30 +30 @@
 #
 #=cut
-cbplugindirs named = /var/lib/named/etc|root,named,0755;/var/lib/named/dev|root,root,0755;/var/lib/named/proc|root,root,0755;/var/lib/named/var/tmp|named,named,0755;/var/lib/named/var/log|named,named,0755;/var/lib/named/var/run|named,named,0755;
+cbplugindirs shorewall = /etc/shorewall|root,root,0750
 #
 #=item B<cbplugindirsandfiles>
@@ -36 +36 @@
 # Define the list of directories to recursively copy remotely on the target machine. 
 # Parameters are ';' separated. 
-# A parameter is then '|' separated, the first part being the full path name of the file
+# A parameter is then '|' separated, the first part being the full path name of the dir
 # and the second part being the uid, gid and mode to set on the target machine, ',' separated
 #
 #=cut
-cbplugindirsandfiles named =
+cbplugindirsandfiles shorewall =
 #
 #=item B<cbpluginreload>
@@ -47 +47 @@
 #
 #=cut
-cbpluginreload named = sudo /etc/init.d/named restart
+cbpluginreload shorewall = sudo /etc/init.d/shorewall restart