machinery-tool 1.22.0 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33037a49f9cd5990355d5c07ad549d035542379b
-  data.tar.gz: ea404796918a26ef4e0571a568bf60045d4dbd0b
+  metadata.gz: dacdd7ed294b3fa071ce5c205cff0c9bc4888c33
+  data.tar.gz: e5679c290377bd246cbde4d82c3bab5ad64c2ef7
 SHA512:
-  metadata.gz: 2c93f3958a8423294a50709550983a336fc65ab4f9588f1a5957a4d6c3ed10eda6d899986941194694525f8de96a28b3e5b7095e7984d3565bcfee6c24df7e6d
-  data.tar.gz: e7a29850ca4d1891e2bf1719870fe24a9f37312d0dcd3814e69274f2a012c9ed1e3fcbdf1c9356fb220842da15f1a3e5274644e66d1f7e49b9ccbc026bf6bceb
+  metadata.gz: b66684bde79b39bb03551a8249a600b1c9c1811df5582ae4d48559c240a4dfc46a975e6bbb8425747216a576599297cb43b2419385cb15be5d36c5dd94569572
+  data.tar.gz: aba642cb4e81b629a4cf1aa6a0090c97507b2995ba36097387eaed96a0a7f7f107ce976f3af602655b042f4c557ba4d2425655557ce884614d29df4133d3e86b

data/.git_revision

@@ -1 +1 @@
-964505b0908b5f767f7fb74053b19884ae2e0954
+c9cc765d7146920c59d05dd9e483a82eb5f836df

data/NEWS

@@ -1,6 +1,12 @@
 # Machinery Release Notes
 
 
+## Version 1.22.1 - Fri Oct 14 16:13:50 CEST 2016 - thardeck@suse.de
+
+* Only use sudo for reading files when necessary (gh#SUSE/machinery#2077)
+* Gracefully handle RequireTTY enabled sudo configs (gh#SUSE/machinery#2135)
+* Add rsync requirement check for remote system (gh#SUSE/machinery#2165)
+
 ## Version 1.22.0 - Thu Oct 06 17:03:33 CEST 2016 - thardeck@suse.de
 
 * Add remaining systemd service states in Kiwi export (gh#SUSE/machinery#2122)

data/lib/docker_system.rb

@@ -54,7 +54,7 @@ class DockerSystem < System
   end
 
   # Reads a file from the System. Returns nil if it does not exist.
-  def read_file(file)
+  def read_file(file, _options = {})
     run_command("cat", file, stdout: :capture)
   rescue Cheetah::ExecutionFailed => e
     if e.status.exitstatus == 1

data/lib/exceptions.rb

@@ -118,12 +118,23 @@ module Machinery
       end
 
       def to_s
-        "sudo isn't configured on the inspected host '#{@host}' for user '#{@remote_user}' to " \
+        "'sudo' isn't configured on the inspected host '#{@host}' for user '#{@remote_user}' to " \
         "give all required commands enough privileges. See 'PREREQUISITES' section in the " \
         "machinery documentation for a description on how to configure sudo on the inspected host."
       end
     end
 
+    class SudoMissingTTY < MachineryError
+      def initialize(host)
+        @host = host
+      end
+
+      def to_s
+        "'sudo' isn't configured on the inspected host '#{@host}'." \
+        " Remove the RequireTTY settings from sudoers.conf."
+      end
+    end
+
     class MigrationError < MachineryError; end
 
     class InvalidFilter < MachineryError; end

data/lib/local_system.rb

@@ -138,7 +138,7 @@ You can install it by running `zypper install #{package}`.
   end
 
   # Reads a file from the System. Returns nil if it does not exist.
-  def read_file(file)
+  def read_file(file, _options = {})
     File.read(file)
   rescue Errno::ENOENT
     # File not found, return nil

data/lib/remote_system.rb

@@ -41,6 +41,11 @@ class RemoteSystem < System
     false
   end
 
+  def connect
+    check_connection
+    check_sudo if sudo_required?
+  end
+
   def run_command(*args)
     options = args.last.is_a?(Hash) ? args.pop : {}
 
@@ -83,45 +88,24 @@ class RemoteSystem < System
       cheetah_class = LoggedCheetah
     end
 
-    sudo = ["sudo", "-n"] if options[:privileged] && remote_user != "root"
+    sudo = ["sudo", "-n"] if options[:privileged] && sudo_required?
     cmds = [
       *build_command(:ssh), "#{remote_user}@#{host}", "-o", \
       "LogLevel=ERROR", sudo, "LANGUAGE=", "LC_ALL=#{locale}", *piped_args, options
     ].compact.flatten
 
     cheetah_class.run(*cmds)
-  rescue Cheetah::ExecutionFailed => e
-    if e.stderr && e.stderr.include?("password is required")
-      raise Machinery::Errors::InsufficientPrivileges.new(remote_user, host)
-    else
-      raise e
-    end
-  end
-
-  # Tries to run the noop-command(:) on the remote system as root (without a password or passphrase)
-  # and raises an Machinery::Errors::SshConnectionFailed exception when it's not successful.
-  def connect
-    LoggedCheetah.run(*build_command(:ssh), "-q", "-o", "BatchMode=yes",
-      "#{remote_user}@#{host}", ":")
-  rescue Cheetah::ExecutionFailed
-    raise Machinery::Errors::SshConnectionFailed.new(
-      "Could not establish SSH connection to host '#{host}'. Please make sure that " \
-      "you can connect non-interactively as #{remote_user}, e.g. using ssh-agent.\n\n" \
-      "To copy your default ssh key to the machine run:\n" \
-      "ssh-copy-id #{remote_user}@#{host}"
-    )
   end
 
-
   # Retrieves files specified in filelist from the remote system and raises an
   # Machinery::Errors::RsyncFailed exception when it's not successful. Destination is
   # the directory where to put the files.
   def retrieve_files(filelist, destination)
     source = "#{remote_user}@#{host}:/"
-    if remote_user != "root"
-      rsync_path = "sudo -n rsync"
+    rsync_path = if sudo_required?
+      "sudo -n rsync"
     else
-      rsync_path = "rsync"
+      "rsync"
     end
 
     cmd = [
@@ -146,12 +130,17 @@ class RemoteSystem < System
   end
 
   def check_retrieve_files_dependencies
-    LocalSystem.new.check_requirement("rsync", "--version")
+    LocalSystem.validate_existence_of_command("rsync", "rsync")
+    check_requirement("rsync", "--version")
   end
 
   # Reads a file from the System. Returns nil if it does not exist.
-  def read_file(file)
-    run_command("cat", file, stdout: :capture, privileged: true)
+  def read_file(file, options = {})
+    command_options = {
+      stdout: :capture,
+      privileged: options.fetch(:privileged, false)
+    }
+    run_command("cat", file, command_options)
   rescue Cheetah::ExecutionFailed => e
     if e.status.exitstatus == 1
       # File not found, return nil
@@ -191,6 +180,38 @@ class RemoteSystem < System
 
   private
 
+  def sudo_required?
+    remote_user != "root"
+  end
+
+  # Tries to run the noop-command(:) on the remote system as root (without a password or passphrase)
+  # and raises an Machinery::Errors::SshConnectionFailed exception when it's not successful.
+  def check_connection
+    LoggedCheetah.run(*build_command(:ssh), "-q", "-o", "BatchMode=yes",
+                      "#{remote_user}@#{host}", ":")
+  rescue Cheetah::ExecutionFailed
+    raise Machinery::Errors::SshConnectionFailed.new(
+      "Could not establish SSH connection to host '#{host}'. Please make sure that " \
+      "you can connect non-interactively as #{remote_user}, e.g. using ssh-agent.\n\n" \
+      "To copy your default ssh key to the machine run:\n" \
+      "ssh-copy-id #{remote_user}@#{host}"
+    )
+  end
+
+  def check_sudo
+    check_requirement("sudo", "-h")
+    LoggedCheetah.run(*build_command(:ssh), "-q", "-o", "BatchMode=yes",
+      "#{remote_user}@#{host}", "sudo", "id")
+  rescue Cheetah::ExecutionFailed => e
+    if e.stderr && e.stderr.include?("password is required")
+      raise Machinery::Errors::InsufficientPrivileges.new(remote_user, host)
+    elsif e.stderr && e.stderr.include?("you must have a tty to run sudo")
+      raise Machinery::Errors::SudoMissingTTY.new(host)
+    else
+      raise e
+    end
+  end
+
   def build_command(name)
     raise Machinery::Errors::MachineryError.new("You must set one of these flags in " \
       "build_command: :ssh or :scp") unless [:ssh, :scp].include?(name)

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.22.0"
+  VERSION = "1.22.1"
 
 end

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "964505b0908b5f767f7fb74053b19884ae2e0954"
+const VERSION = "c9cc765d7146920c59d05dd9e483a82eb5f836df"

data/manual/site/sitemap.xml

@@ -4,7 +4,7 @@
     
     <url>
      <loc>None/docs/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -12,7 +12,7 @@
     
     <url>
      <loc>None/machinery_main_general.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -20,7 +20,7 @@
     
     <url>
      <loc>None/machinery_main_scopes.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -28,7 +28,7 @@
     
     <url>
      <loc>None/machinery_main_usecases.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -36,7 +36,7 @@
     
     <url>
      <loc>None/machinery_main_security_implications.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -45,115 +45,115 @@
         
     <url>
      <loc>None/machinery-analyze.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-build.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-compare.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-config.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-copy.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-deploy.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-autoyast.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-kiwi.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-html.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-inspect.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-inspect-container.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-list.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-man.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-move.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-remove.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-serve.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-show.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-upgrade-format.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-validate.1/</loc>
-     <lastmod>2016-10-06</lastmod>
+     <lastmod>2016-10-14</lastmod>
      <changefreq>daily</changefreq>
     </url>
         

data/plugins/users/users_inspector.rb

@@ -25,7 +25,7 @@ class UsersInspector < Inspector
 
   def inspect(_filter, _options = {})
     passwd = @system.read_file("/etc/passwd")
-    shadow = @system.read_file("/etc/shadow")
+    shadow = @system.read_file("/etc/shadow", privileged: true)
 
     users = passwd ? parse_users(passwd, shadow) : []
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.22.1
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah