r-train 0.11.4 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badb26613fa1301a65ec04b815788aa1657e4a92
-  data.tar.gz: 02fdc25e6e5e23d047feb1d19ce4ba55a9fe530d
+  metadata.gz: 6f599a09f2898092c2acb8062296eddde686a362
+  data.tar.gz: b1a3d340d9e4d62b3095ff5194f9b566fb117d08
 SHA512:
-  metadata.gz: 64cee5ec0bf2dd51a3851e7f3e409d41019fa55aea3337fc4557e53af1b415ced2e91479746983ea93ac93c78e7ef5ff0b6a11b545355e620f6c417a94e97608
-  data.tar.gz: 4f10393af9a9d47ebb98a2da0132bd2841434a889efaf8f8595208f5a6c27a04123da73495a837d6ffe663d9d85e6d71b23de293012afbead1dfdd36d156d450
+  metadata.gz: 6ed0ba89f1c1533b4f6ed4535170c734f6e96355f267463a9080a07ae9a4716ccf08bd3b3b1e2c997c8c43486f22aee54427402081ba4ffbcaa3ef1162556846
+  data.tar.gz: 7f631bab01ea0c2fe9e278633eab0cab75a21c92a38eab6c160e09b3084d01f34d7f48055a8bbb2625eb18078ca7a2edb39ec446d9c637ba6f147d46645f4092

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [0.11.4](https://github.com/chef/train/tree/0.11.4) (2016-05-13)
-[Full Changelog](https://github.com/chef/train/compare/v0.11.3...0.11.4)
+## [0.12.0](https://github.com/chef/train/tree/0.12.0) (2016-05-16)
+[Full Changelog](https://github.com/chef/train/compare/v0.11.4...0.12.0)
+
+**Merged pull requests:**
+
+- Custom sudo command [\#107](https://github.com/chef/train/pull/107) ([jeremymv2](https://github.com/jeremymv2))
+
+## [v0.11.4](https://github.com/chef/train/tree/v0.11.4) (2016-05-13)
+[Full Changelog](https://github.com/chef/train/compare/v0.11.3...v0.11.4)
 
 **Fixed bugs:**
 
@@ -9,6 +16,10 @@
 - Add a space to avoid matching partial paths [\#104](https://github.com/chef/train/pull/104) ([alexpop](https://github.com/alexpop))
 - Update README.md [\#102](https://github.com/chef/train/pull/102) ([mcquin](https://github.com/mcquin))
 
+**Merged pull requests:**
+
+- 0.11.4 [\#106](https://github.com/chef/train/pull/106) ([arlimus](https://github.com/arlimus))
+
 ## [v0.11.3](https://github.com/chef/train/tree/v0.11.3) (2016-05-10)
 [Full Changelog](https://github.com/chef/train/compare/v0.11.2...v0.11.3)
 

data/lib/train/extras/command_wrapper.rb

@@ -32,6 +32,7 @@ module Train::Extras
     option :sudo, default: false
     option :sudo_options, default: nil
     option :sudo_password, default: nil
+    option :sudo_command, default: nil
     option :user
 
     def initialize(backend, options)
@@ -41,6 +42,7 @@ module Train::Extras
       @sudo = options[:sudo]
       @sudo_options = options[:sudo_options]
       @sudo_password = options[:sudo_password]
+      @sudo_command = options[:sudo_command]
       @user = options[:user]
       @prefix = build_prefix
     end
@@ -83,11 +85,11 @@ module Train::Extras
       return '' unless @sudo
       return '' if @user == 'root'
 
-      res = 'sudo '
+      res = (@sudo_command || 'sudo') + ' '
 
       unless @sudo_password.nil?
         b64pw = Base64.strict_encode64(@sudo_password + "\n")
-        res = "echo #{b64pw} | base64 -d | sudo -S "
+        res = "echo #{b64pw} | base64 -d | #{res}-S "
       end
 
       res << @sudo_options.to_s + ' ' unless @sudo_options.nil?

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = '0.11.4'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/test/integration/cookbooks/test/recipes/default.rb

@@ -26,7 +26,7 @@ execute 'test ssh connection' do
 end
 
 # prepare a few users
-%w{ nopasswd passwd nosudo reqtty }.each do |name|
+%w{ nopasswd passwd nosudo reqtty customcommand }.each do |name|
   user name do
     password '$1$7MCNTXPI$r./jqCEoVlLlByYKSL3sZ.'
     manage_home true
@@ -53,6 +53,12 @@ sudo 'reqtty' do
   defaults ['requiretty']
 end
 
+sudo 'customcommand' do
+  user 'customcommand'
+  nopasswd true
+  defaults ['!requiretty']
+end
+
 # execute tests
 execute 'bundle install' do
   command '/opt/chef/embedded/bin/bundle install --without integration tools'
@@ -69,7 +75,7 @@ execute 'run ssh tests' do
   cwd '/tmp/kitchen/data'
 end
 
-%w{passwd nopasswd reqtty}.each do |name|
+%w{passwd nopasswd reqtty customcommand}.each do |name|
   execute "run local sudo tests as #{name}" do
     command "/opt/chef/embedded/bin/ruby -I lib test/integration/sudo/#{name}.rb"
     cwd '/tmp/kitchen/data'
@@ -87,7 +93,7 @@ execute 'fix sudoers for reqtty' do
 end
 
 # if it's fixed, it should behave like user 'nopasswd'
-execute "run local sudo tests as reqtty, no longer requiring a tty" do
+execute 'run local sudo tests as reqtty, no longer requiring a tty' do
   command "/opt/chef/embedded/bin/ruby -I lib test/integration/sudo/nopasswd.rb"
   cwd '/tmp/kitchen/data'
   user 'reqtty'

data/test/integration/cookbooks/test/recipes/prep_files.rb

@@ -22,13 +22,20 @@ directory '/tmp/folder' do
   group gid
 end
 
-link '/tmp/symlink'do
+link '/tmp/symlink' do
   to '/tmp/file'
   owner 'root'
   group gid
   mode '0777'
 end
 
+link '/usr/bin/allyourbase' do
+  to '/usr/bin/sudo'
+  owner 'root'
+  group gid
+  mode '0777'
+end
+
 execute 'create pipe/fifo' do
   command 'mkfifo /tmp/pipe'
   not_if 'test -e /tmp/pipe'

data/test/integration/sudo/customcommand.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+# author: Jeremy Miller
+
+require_relative 'run_as'
+
+describe 'run custom sudo command' do
+  it 'is running as non-root without sudo' do
+    run_as('whoami').stdout.wont_match(/root/i)
+  end
+
+  it 'is running nopasswd custom sudo command' do
+    run_as('whoami', { sudo: true, sudo_command: 'allyourbase' })
+      .stdout.must_match(/root/i)
+  end
+end

data/test/unit/extras/command_wrapper_test.rb

@@ -38,6 +38,27 @@ describe 'linux command' do
     bpw = Base64.strict_encode64(pw + "\n")
     lc.run(cmd).must_equal "echo #{bpw} | base64 -d | sudo -S #{cmd}"
   end
+
+  it 'wraps commands in sudo_command instead of sudo' do
+    sudo_command = rand.to_s
+    lc = cls.new(backend, { sudo: true, sudo_command: sudo_command })
+    lc.run(cmd).must_equal "#{sudo_command} #{cmd}"
+  end
+
+  it 'wraps commands in sudo_command with all options' do
+    opts = rand.to_s
+    sudo_command = rand.to_s
+    lc = cls.new(backend, { sudo: true, sudo_command: sudo_command, sudo_options: opts })
+    lc.run(cmd).must_equal "#{sudo_command} #{opts} #{cmd}"
+  end
+
+  it 'runs commands in sudo_command with password' do
+    pw = rand.to_s
+    sudo_command = rand.to_s
+    lc = cls.new(backend, { sudo: true, sudo_command: sudo_command, sudo_password: pw })
+    bpw = Base64.strict_encode64(pw + "\n")
+    lc.run(cmd).must_equal "echo #{bpw} | base64 -d | #{sudo_command} -S #{cmd}"
+  end
 end
 
 describe 'powershell command' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-train
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -182,6 +182,7 @@ files:
 - test/integration/docker_test.rb
 - test/integration/docker_test_container.rb
 - test/integration/helper.rb
+- test/integration/sudo/customcommand.rb
 - test/integration/sudo/nopasswd.rb
 - test/integration/sudo/passwd.rb
 - test/integration/sudo/reqtty.rb
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Transport interface to talk to different backends.
@@ -255,6 +256,7 @@ test_files:
 - test/integration/docker_test.rb
 - test/integration/docker_test_container.rb
 - test/integration/helper.rb
+- test/integration/sudo/customcommand.rb
 - test/integration/sudo/nopasswd.rb
 - test/integration/sudo/passwd.rb
 - test/integration/sudo/reqtty.rb