[DRE-commits] [vagrant-libvirt] 01/163: Forward SSH ports <= 1024 using sudo.

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.26
in repository vagrant-libvirt.

commit 22458d273df73c1ecb1f7c44647faca1615a7f45
Author: James Shubin <james at shubin.ca>
Date:   Wed May 21 01:09:45 2014 -0400

    Forward SSH ports <= 1024 using sudo.
    
    It would be nice if we used sudo for the command and not as a cache.
---
 lib/vagrant-libvirt/action/forward_ports.rb | 43 ++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/lib/vagrant-libvirt/action/forward_ports.rb b/lib/vagrant-libvirt/action/forward_ports.rb
index 55a0677..67a55ec 100644
--- a/lib/vagrant-libvirt/action/forward_ports.rb
+++ b/lib/vagrant-libvirt/action/forward_ports.rb
@@ -3,6 +3,8 @@ module VagrantPlugins
     module Action
       # Adds support for vagrant's `forward_ports` configuration directive.
       class ForwardPorts
+        @@lock = Mutex.new
+
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_libvirt::action::forward_ports')
@@ -94,8 +96,21 @@ module VagrantPlugins
           ) + ssh_info[:private_key_path].map do |pk|
               "IdentityFile=#{pk}"
             end).map { |s| s.prepend('-o ') }.join(' ')
-            
-          ssh_cmd = "ssh #{options} #{params}"
+
+          # TODO: instead of this, try and lock and get the stdin from spawn...
+          ssh_cmd = ''
+          if host_port <= 1024
+            @@lock.synchronize do
+              # TODO: add i18n
+              @env[:ui].info 'Requesting sudo for host port(s) <= 1024'
+              r = system('sudo -v')
+              if r
+                ssh_cmd << 'sudo '	# add sudo prefix
+              end
+            end
+          end
+
+          ssh_cmd << "ssh #{options} #{params}"
 
           @logger.debug "Forwarding port with `#{ssh_cmd}`"
           spawn(ssh_cmd,  [:out, :err] => '/dev/null')
@@ -119,6 +134,8 @@ module VagrantPlugins
     module Action
       # Cleans up ssh-forwarded ports on VM halt/destroy.
       class ClearForwardedPorts
+        @@lock = Mutex.new
+
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new(
@@ -133,10 +150,19 @@ module VagrantPlugins
             env[:ui].info I18n.t(
               'vagrant.actions.vm.clear_forward_ports.deleting'
             )
-            ssh_pids.each do |pid|
-              next unless ssh_pid?(pid)
-              @logger.debug "Killing pid #{pid}"
-              system "kill #{pid}"
+            ssh_pids.each do |tag|
+              next unless ssh_pid?(tag[:pid])
+              @logger.debug "Killing pid #{tag[:pid]}"
+              kill_cmd = ''
+
+              if tag[:port] <= 1024
+                kill_cmd << 'sudo '	# add sudo prefix
+              end
+
+              kill_cmd << "kill #{tag[:pid]}"
+              @@lock.synchronize do
+                system(kill_cmd)
+              end
             end
 
             @logger.info 'Removing ssh pid files'
@@ -153,7 +179,10 @@ module VagrantPlugins
         def ssh_pids
           glob = @env[:machine].data_dir.join('pids').to_s + '/ssh_*.pid'
           @ssh_pids = Dir[glob].map do |file|
-            File.read(file).strip.chomp
+            {
+              :pid => File.read(file).strip.chomp,
+              :port => File.basename(file)['ssh_'.length..-1*('.pid'.length+1)].to_i
+            }
           end
         end
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git