machinery-tool 1.16.4 → 1.17.0

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "493384074f90a69256c6fa174a1e1e05ae5ce219"
+const VERSION = "8bfc2e6ccf6d9ff87a018bd15002a20182fd6709"

data/man/generated/machinery.1.html

@@ -855,6 +855,10 @@ See the <a href="#Scopes" data-bare-link="true">Scope section</a> for more infor
 This user needs to be allowed to run certain commands using sudo (see
 PREREQUISITES for more information).
 To change the default-user use <code>machinery config remote-user=USER</code></p></dd>
+<dt><code>-p SSH-PORT</code>, <code>--ssh-port SSH-PORT</code> (optional)</dt><dd><p>Specifies the SSH port of the remote SSH server.</p></dd>
+<dt><code>-i SSH-IDENTITY-FILE</code>, <code>--ssh-identity-file SSH-IDENTITY-FILE</code> (optional)</dt><dd><p>Specifies the SSH private key what should be used to authenticate with the
+remote SSH server. Keys with a passphrase are not allowed here. Use the ssh-agent
+instead.</p></dd>
 <dt><code>-x</code>, <code>--extract-files</code> (optional)</dt><dd><p>Extract changed configuration and unmanaged files from the inspected system.
 Shortcut for the combination of <code>--extract-changed-config-files</code>,
 <code>--extract-unmanaged-files</code>, and <code>--extract-changed-managed-files</code></p></dd>
@@ -889,10 +893,10 @@ via <code>ssh-copy-id</code> to the inspected host, e.g.: <code>ssh-copy-id root
 <li><p>The system to be inspected needs to have the following commands:</p>
 
 <ul>
-<li><code>rpm</code></li>
-<li><code>zypper</code> or <code>yum</code></li>
+<li><code>rpm</code> or <code>dpkg</code></li>
+<li><code>zypper</code>, <code>yum</code> or <code>apt-cache</code></li>
 <li><code>rsync</code></li>
-<li><code>chkconfig</code></li>
+<li><code>chkconfig</code>, <code>initctl</code> or <code>systemctl</code></li>
 <li><code>cat</code></li>
 <li><code>sed</code></li>
 <li><code>find</code></li>
@@ -900,9 +904,17 @@ via <code>ssh-copy-id</code> to the inspected host, e.g.: <code>ssh-copy-id root
 </ul>
 </li>
 <li><p>When inspecting as non-root the user has to have the following command
-whitelist given in the sudoers file:</p>
+whitelist given in the sudoers file.</p>
 
-<p>machinery ALL=(ALL) NOPASSWD: /usr/bin/find,/usr/bin/cat,/bin/cat,/usr/bin/rsync,/bin/rpm -Va *,/bin/tar --create *,/usr/bin/stat</p></li>
+<dl>
+<dt>On rpm based systems, like SUSE or Red Hat:</dt><dd><p></p>
+
+<p>machinery ALL=(ALL) NOPASSWD: /usr/bin/find,/usr/bin/cat,/bin/cat,/usr/bin/rsync,/bin/rpm -Va *,/bin/tar --create *,/usr/bin/stat</p></dd>
+<dt>On dpkg based systems, like Debian or Ubuntu:</dt><dd><p></p>
+
+<p>machinery ALL=(ALL) NOPASSWD: /usr/bin/find,/usr/bin/cat,/bin/cat,/usr/bin/rsync,/bin/tar --create *,/usr/bin/stat,/usr/bin/dpkg,/bin/readlink</p></dd>
+</dl>
+</li>
 <li><p>To add a remote <code>machinery</code> user run as root:</p>
 
 <h1><code>useradd -m machinery -c "remote user for machinery"</code></h1>
@@ -1006,10 +1018,9 @@ by adding an '@' before the path, e.g.</p>
 <li><p>The image to be inspected needs to have the following commands:</p>
 
 <ul>
-<li><code>rpm</code></li>
-<li><code>zypper</code> or <code>yum</code></li>
+<li><code>rpm</code> or <code>dpkg</code></li>
+<li><code>zypper</code>, <code>yum</code> or <code>apt-cache</code></li>
 <li><code>rsync</code></li>
-<li><code>chkconfig</code></li>
 <li><code>cat</code></li>
 <li><code>sed</code></li>
 <li><code>find</code></li>

data/plugins/changed_managed_files/changed_managed_files_inspector.rb

@@ -55,21 +55,21 @@ class ChangedManagedFilesInspector < Inspector
     end
 
     scope.extracted = !!options[:extract_changed_managed_files]
-    scope.files = ChangedManagedFileList.new(result.sort_by(&:name))
+    scope += result.sort_by(&:name)
 
     @description["changed_managed_files"] = scope
   end
 
   def summary
     "#{@description.changed_managed_files.extracted ? "Extracted" : "Found"} " +
-      "#{@description.changed_managed_files.files.count} changed files."
+      "#{@description.changed_managed_files.count} changed files."
   end
 
   private
 
   def changed_files
     count = 0
-    files = @system.rpm_database.changed_files do |chunk|
+    files = @system.managed_files_database.changed_files do |chunk|
       count += chunk.lines.reject { |l| l.chomp.end_with?(":") || l.split(" ")[1] == "c" }.count
       Machinery::Ui.progress(" -> Found #{count} changed #{Machinery::pluralize(count, "file")}...")
     end

data/plugins/changed_managed_files/changed_managed_files_model.rb

@@ -39,5 +39,7 @@ end
 class ChangedManagedFilesScope < FileScope
   include Machinery::Scope
   include ScopeFileAccessFlat
-  has_property :files, class: ChangedManagedFileList
+
+  has_attributes :extracted
+  has_elements class: ChangedManagedFile
 end

data/plugins/changed_managed_files/changed_managed_files_renderer.rb

@@ -19,8 +19,8 @@ class ChangedManagedFilesRenderer < Renderer
   def content(description)
     return unless description["changed_managed_files"]
 
-    if description["changed_managed_files"].files
-      files, errors = description["changed_managed_files"].files.partition do |file|
+    if description["changed_managed_files"]
+      files, errors = description["changed_managed_files"].partition do |file|
         file.status != "error"
       end
     end

data/plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v6.json

@@ -0,0 +1,168 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "properties": {
+    "_attributes": {
+      "type": "object",
+      "required": [
+        "extracted"
+      ],
+      "properties": {
+        "extracted": {
+          "type": "boolean"
+        }
+      }
+    },
+    "_elements": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "name",
+          "package_name",
+          "package_version"
+        ],
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "package_name": {
+            "type": "string",
+            "minLength": 1
+          },
+          "package_version": {
+            "type": "string",
+            "minLength": 1
+          }
+        },
+        "oneOf": [
+          {
+            "$ref": "#/definitions/file_changed"
+          },
+          {
+            "$ref": "#/definitions/file_error"
+          }
+        ]
+      }
+    }
+  },
+  "definitions": {
+    "file_changed": {
+      "required": ["status"],
+      "properties": {
+        "status": {
+          "enum": ["changed"]
+        }
+      },
+      "oneOf": [
+        { "$ref": "#/definitions/file_changed_modified" },
+        { "$ref": "#/definitions/link_changed_modified" },
+        { "$ref": "#/definitions/file_changed_deleted" }
+      ]
+    },
+    "file_changed_modified": {
+      "required": ["changes", "mode", "user", "group", "type"],
+      "properties": {
+        "changes": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "size",
+              "mode",
+              "md5",
+              "device_number",
+              "link_path",
+              "user",
+              "group",
+              "time",
+              "capabilities",
+              "replaced",
+              "other_rpm_changes"
+            ]
+          },
+          "minItems": 1
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-7]{3,4}$"
+        },
+        "user": {
+          "type": "string",
+          "minLength": 1
+        },
+        "group": {
+          "type": "string",
+          "minLength": 1
+        },
+        "type": {
+          "enum": ["file", "dir"]
+        }
+      }
+    },
+    "link_changed_modified": {
+      "required": ["target", "changes", "mode", "user", "group", "type"],
+      "properties": {
+        "changes": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "size",
+              "mode",
+              "md5",
+              "device_number",
+              "link_path",
+              "user",
+              "group",
+              "time",
+              "capabilities",
+              "replaced",
+              "other_rpm_changes"
+            ]
+          },
+          "minItems": 1
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-7]{3,4}$"
+        },
+        "user": {
+          "type": "string",
+          "minLength": 1
+        },
+        "group": {
+          "type": "string",
+          "minLength": 1
+        },
+        "type": {
+          "enum": ["link"]
+        },
+        "target": {
+          "type": "string"
+        }
+      }
+    },
+    "file_changed_deleted": {
+      "required": ["changes"],
+      "properties": {
+        "changes": {
+          "enum": [["deleted"]]
+        }
+      }
+    },
+    "file_error": {
+      "required": ["status", "error_message"],
+      "properties": {
+        "status": {
+          "enum": ["error"]
+        },
+        "error_message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}

data/plugins/config_files/config_files_inspector.rb

@@ -41,7 +41,7 @@ class ConfigFilesInspector < Inspector
     system.check_retrieve_files_dependencies if do_extract
 
     count = 0
-    files = @system.rpm_database.changed_files do |chunk|
+    files = @system.managed_files_database.changed_files do |chunk|
       count += chunk.lines.count { |l| !l.chomp.end_with?(":") && l.split(" ")[1] == "c" }
       Machinery::Ui.progress(" -> Found #{count} config #{Machinery::pluralize(count, "file")}...")
     end
@@ -62,20 +62,20 @@ class ConfigFilesInspector < Inspector
     if do_extract
       file_store.create
       extracted_paths = result.reject do |file|
-        file.changes == Machinery::Array.new(["deleted"]) ||
+        file.changes == ["deleted"] ||
         file.link? || file.directory?
       end.map(&:name)
       scope.retrieve_files_from_system(@system, extracted_paths)
     end
 
     scope.extracted = !!do_extract
-    scope.files = ConfigFileList.new(result.sort_by(&:name))
+    scope += result.sort_by(&:name)
 
     @description["config_files"] = scope
   end
 
   def summary
     "#{@description.config_files.extracted ? "Extracted" : "Found"} " +
-      "#{@description.config_files.files.count} changed configuration files."
+      "#{@description.config_files.count} changed configuration files."
   end
 end

data/plugins/config_files/config_files_model.rb

@@ -39,5 +39,7 @@ end
 class ConfigFilesScope < FileScope
   include Machinery::Scope
   include ScopeFileAccessFlat
-  has_property :files, class: ConfigFileList
+
+  has_attributes :extracted
+  has_elements class: ConfigFile
 end

data/plugins/config_files/config_files_renderer.rb

@@ -31,9 +31,9 @@ class ConfigFilesRenderer < Renderer
 
     list do
       file_status = description["config_files"].extracted
-      files = description["config_files"].files
+      files = description["config_files"]
 
-      if files.empty?
+      if files.elements.empty?
         puts "There are no config files."
       elsif !file_status.nil?
         puts "Files extracted: #{file_status ? "yes" : "no"}"

data/plugins/config_files/schema/system-description-config-files.schema-v6.json

@@ -0,0 +1,160 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "properties": {
+    "_attributes": {
+      "type": "object",
+      "required": [
+        "extracted"
+      ],
+      "properties": {
+        "extracted": {
+          "type": "boolean"
+        }
+      }
+    },
+    "_elements": {
+      "type": "array",
+        "items" : {
+          "type": "object",
+          "required": ["name", "package_name", "package_version"],
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "package_name": {
+              "type": "string",
+              "minLength": 1
+            },
+            "package_version": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "oneOf": [
+            { "$ref": "#/definitions/file_changed" },
+            { "$ref": "#/definitions/file_error" }
+          ]
+        }
+    }
+  },
+  "definitions": {
+    "file_changed": {
+      "required": ["status"],
+      "properties": {
+        "status": {
+          "enum": ["changed"]
+        }
+      },
+      "oneOf": [
+        { "$ref": "#/definitions/file_changed_modified" },
+        { "$ref": "#/definitions/link_changed_modified" },
+        { "$ref": "#/definitions/file_changed_deleted" }
+      ]
+    },
+    "file_changed_modified": {
+      "required": ["changes", "mode", "user", "group", "type"],
+      "properties": {
+        "changes": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "size",
+              "mode",
+              "md5",
+              "device_number",
+              "link_path",
+              "user",
+              "group",
+              "time",
+              "capabilities",
+              "replaced",
+              "other_rpm_changes"
+            ]
+          },
+          "minItems": 1
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-7]{3,4}$"
+        },
+        "user": {
+          "type": "string",
+          "minLength": 1
+        },
+        "group": {
+          "type": "string",
+          "minLength": 1
+        },
+        "type": {
+          "enum": ["file", "dir"]
+        }
+      }
+    },
+    "link_changed_modified": {
+      "required": ["target", "changes", "mode", "user", "group", "type"],
+      "properties": {
+        "changes": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "size",
+              "mode",
+              "md5",
+              "device_number",
+              "link_path",
+              "user",
+              "group",
+              "time",
+              "capabilities",
+              "replaced",
+              "other_rpm_changes"
+            ]
+          },
+          "minItems": 1
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-7]{3,4}$"
+        },
+        "user": {
+          "type": "string",
+          "minLength": 1
+        },
+        "group": {
+          "type": "string",
+          "minLength": 1
+        },
+        "type": {
+          "enum": ["link"]
+        },
+        "target": {
+          "type": "string"
+        }
+      }
+    },
+    "file_changed_deleted": {
+      "required": ["changes"],
+      "properties": {
+        "changes": {
+          "enum": [["deleted"]]
+        }
+      }
+    },
+    "file_error": {
+      "required": ["status", "error_message"],
+      "properties": {
+        "status": {
+          "enum": ["error"]
+        },
+        "error_message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}