smart_proxy_remote_execution_ssh 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638dd025cee7176c1140d55daad36647756d2c86
-  data.tar.gz: a3bf4cd13dfaa4011f187fd2c14b2581aef6c317
+  metadata.gz: d1ead2e0c7291668c08d8c00301f82011bddd74d
+  data.tar.gz: 6fea98dc76b79bce6725a6cb208ad89e7bf21896
 SHA512:
-  metadata.gz: cb4cc423186ca8dcd71cee29466be2c635219ac26eee9d36e6614471cc3c5f2eb33f6cd66f807db1d3d29e14517e5cd07632539d3f3fd98d70ae3d6db60aed94
-  data.tar.gz: 793edc8274aba67e83e4575fbb0cf1e724e8c79c7d16820e7ce338a7166993e5a3487f0537eb090987534fe74b02810815fef8d8ab466a08d6b957424a9e309a
+  metadata.gz: 3ec16052339edbfbe8e427944aa7016a6221c24414a1a49f85cb8070001337111276c50a473780f793181f80102b871a485eda2a473e2d9cd740f0202363b0bf
+  data.tar.gz: 71e75aa680faf8dc450b13f36de22a1a82c92bcba88d49a016ba0be22c0455e692e08cbbf52152722190b215c0fbe142425c28df529607af0074f80ef5e7d59d

data/README.md

@@ -1,3 +1,8 @@
+[![Build Status](https://img.shields.io/jenkins/s/http/ci.theforeman.org/test_plugin_smart_proxy_remote_execution_ssh_master.svg)](http://ci.theforeman.org/job/test_plugin_smart_proxy_remote_execution_ssh_master)
+[![Gem Version](https://img.shields.io/gem/v/smart_proxy_remote_execution_ssh.svg)](https://rubygems.org/gems/smart_proxy_remote_execution_ssh)
+[![Code Climate](https://codeclimate.com/github/theforeman/smart_proxy_remote_execution_ssh/badges/gpa.svg)](https://codeclimate.com/github/theforeman/smart_proxy_remote_execution_ssh)
+[![GPL License](https://img.shields.io/github/license/theforeman/smart_proxy_remote_execution_ssh.svg)](https://github.com/theforeman/smart_proxy_remote_execution_ssh/blob/master/LICENSE)
+
 # Smart-proxy Ssh plugin 
 
 This a plugin for foreman smart-proxy allowing using ssh for the

data/lib/smart_proxy_remote_execution_ssh/command_action.rb

@@ -40,14 +40,15 @@ module Proxy::RemoteExecution::Ssh
     end
 
     def command
-      @command ||= Dispatcher::Command.new(:id               => input[:task_id],
-                                           :host             => input[:hostname],
-                                           :ssh_user         => input[:ssh_user] || 'root',
-                                           :effective_user   => input[:effective_user],
-                                           :script           => input[:script],
-                                           :host_public_key  => input[:host_public_key],
-                                           :verify_host      => input[:verify_host],
-                                           :suspended_action => suspended_action)
+      @command ||= Dispatcher::Command.new(:id                    => input[:task_id],
+                                           :host                  => input[:hostname],
+                                           :ssh_user              => input[:ssh_user] || 'root',
+                                           :effective_user        => input[:effective_user],
+                                           :script                => input[:script],
+                                           :effective_user_method => input[:effective_user_method],
+                                           :host_public_key       => input[:host_public_key],
+                                           :verify_host           => input[:verify_host],
+                                           :suspended_action      => suspended_action)
     end
 
     def init_run

data/lib/smart_proxy_remote_execution_ssh/connector.rb

@@ -22,6 +22,8 @@ module Proxy::RemoteExecution::Ssh
     def async_run(command)
       started = false
       session.open_channel do |channel|
+        channel.request_pty
+
         channel.on_data { |ch, data| yield CommandUpdate::StdoutData.new(data) }
 
         channel.on_extended_data { |ch, type, data| yield CommandUpdate::StderrData.new(data) }

data/lib/smart_proxy_remote_execution_ssh/dispatcher.rb

@@ -7,18 +7,19 @@ module Proxy::RemoteExecution::Ssh
   class Dispatcher < ::Dynflow::Actor
     # command comming from action
     class Command
-      attr_reader :id, :host, :ssh_user, :effective_user, :script, :host_public_key, :suspended_action
+      attr_reader :id, :host, :ssh_user, :effective_user, :effective_user_method, :script, :host_public_key, :suspended_action
 
       def initialize(data)
         validate!(data)
 
-        @id               = data[:id]
-        @host             = data[:host]
-        @ssh_user         = data[:ssh_user]
-        @effective_user   = data[:effective_user]
-        @script           = data[:script]
-        @host_public_key  = data[:host_public_key]
-        @suspended_action = data[:suspended_action]
+        @id                    = data[:id]
+        @host                  = data[:host]
+        @ssh_user              = data[:ssh_user]
+        @effective_user        = data[:effective_user]
+        @effective_user_method = data[:effective_user_method] || 'su'
+        @script                = data[:script]
+        @host_public_key       = data[:host_public_key]
+        @suspended_action      = data[:suspended_action]
       end
 
       def validate!(data)

data/lib/smart_proxy_remote_execution_ssh/session.rb

@@ -25,9 +25,6 @@ module Proxy::RemoteExecution::Ssh
       @logger.debug("initalizing command [#{@command}]")
       open_connector
       remote_script = cp_script_to_remote
-      if @command.effective_user && @command.effective_user != @command.ssh_user
-        su_prefix = "su - #{@command.effective_user} -c "
-      end
       output_path = File.join(File.dirname(remote_script), 'output')
 
       # pipe the output to tee while capturing the exit code
@@ -37,6 +34,7 @@ module Proxy::RemoteExecution::Ssh
         exec 4>&-
         exit $exit_code
       SCRIPT
+      @logger.debug("executing script:\n#{script.lines.map { |line| "  | #{line}" }.join}")
       @connector.async_run(script) do |data|
         @command_buffer << data
       end
@@ -104,6 +102,18 @@ module Proxy::RemoteExecution::Ssh
 
     private
 
+    def su_prefix
+      return if @command.effective_user.nil? || @command.effective_user == @command.ssh_user
+      case @command.effective_user_method
+      when 'sudo'
+        "sudo -n -u #{@command.effective_user} "
+      when 'su'
+        "su - #{@command.effective_user} -c "
+      else
+        raise "effective_user_method ''#{@command.effective_user_method}'' not supported"
+      end
+    end
+
     def open_connector
       raise 'Connector already opened' if @connector
       options = { :logger => @logger }

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.0.8'
+      VERSION = '0.0.9'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler