linux_admin 2.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ddedcd6ceb14d076ced3bfb96af9c8f29ad37abd2971dacf4f53259e908e86f
-  data.tar.gz: 999756b223217fcff6fc317a256e8ee2dfaaa7fc18bb97bbfb4c7216be824079
+  metadata.gz: 5a68c70db030c6c422243f781a3500324a224ae653c7e04e6ebac3f5ad902d08
+  data.tar.gz: 2d1d363cd64e3c2ebf64616a0376752f2e04aa7b74c143856d89c1aa2bcd0a7e
 SHA512:
-  metadata.gz: 686d0e331bacae73eed707a30d21fcbf188d14aaa61651a9f606202a62b295e4a0d4c45c73f6a62fa7d3946cd062c2fc49cd791013559b6b057fbed50012be5b
-  data.tar.gz: 1eabbe2ea7f4bd9ce0deb9f590d50a90e03ac880cf3bd3360025a828be206fa9705145bf73fa92f1cb60c27e2175382760db48cc8504d0e136c689580fe88aab
+  metadata.gz: 24c97db1e87afbbb873c963eb0e5c45f54dd1de468b46e301ec44563bcc459ecc2a97c9219a4c221ec8703258328c0c2f476b6e27f91da4c6bb811945ea3cfe7
+  data.tar.gz: 9b1a31fbf403c5b0873dced35a8308870a382c907ae8ef3919a285151c878bebf9297d71179435c09bc4c4a182fffee053e3e1ee8b76b2a50f2e8e8bd2e3d1ee

data/README.md

@@ -1,12 +1,9 @@
 # LinuxAdmin
 
 [![Gem Version](https://badge.fury.io/rb/linux_admin.svg)](http://badge.fury.io/rb/linux_admin)
-[![Build Status](https://travis-ci.com/ManageIQ/linux_admin.svg)](https://travis-ci.com/ManageIQ/linux_admin)
-[![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/linux_admin.svg)](https://codeclimate.com/github/ManageIQ/linux_admin)
-[![Coverage Status](http://img.shields.io/coveralls/ManageIQ/linux_admin.svg)](https://coveralls.io/r/ManageIQ/linux_admin)
-[![Dependency Status](https://gemnasium.com/ManageIQ/linux_admin.svg)](https://gemnasium.com/ManageIQ/linux_admin)
-[![Security](https://hakiri.io/github/ManageIQ/linux_admin/master.svg)](https://hakiri.io/github/ManageIQ/linux_admin/master)
-
+[![CI](https://github.com/ManageIQ/linux_admin/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/linux_admin/actions/workflows/ci.yaml)
+[![Code Climate](https://codeclimate.com/github/ManageIQ/linux_admin.svg)](https://codeclimate.com/github/ManageIQ/linux_admin)
+[![Test Coverage](https://codeclimate.com/github/ManageIQ/linux_admin/badges/coverage.svg)](https://codeclimate.com/github/ManageIQ/linux_admin/coverage)
 
 LinuxAdmin is a module to simplify management of linux systems.
 It should be a single place to manage various system level configurations,

data/lib/linux_admin/common.rb

@@ -4,7 +4,7 @@ module LinuxAdmin
   module Common
     include Logging
 
-    BIN_DIRS = %w(/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin)
+    BIN_DIRS = ENV["PATH"].split(File::PATH_SEPARATOR).freeze
 
     def self.cmd(name)
       BIN_DIRS.collect { |dir| "#{dir}/#{name}" }.detect { |cmd| File.exist?(cmd) }

data/lib/linux_admin/network_interface/network_interface_rh.rb

@@ -12,7 +12,15 @@ module LinuxAdmin
     def initialize(interface)
       @interface_file = self.class.path_to_interface_config_file(interface)
       super
+    end
+
+    # Gathers current network information for this interface
+    #
+    # @return [Boolean] true if network information was gathered successfully
+    def reload
+      super
       parse_conf
+      true
     end
 
     # Parses the interface configuration file into the @interface_config hash

data/lib/linux_admin/network_interface.rb

@@ -1,7 +1,8 @@
-require 'ipaddr'
-
 module LinuxAdmin
   class NetworkInterface
+    require "ipaddr"
+    require "json"
+
     # Cached class instance variable for what distro we are running on
     @dist_class = nil
 
@@ -20,13 +21,28 @@ module LinuxAdmin
       end
     end
 
+    def self.list
+      ip_link.pluck("ifname").map { |iface| new(iface) }
+    rescue AwesomeSpawn::CommandResultError => e
+      raise NetworkInterfaceError.new(e.message, e.result)
+    end
+
+    private_class_method def self.ip_link
+      require "json"
+
+      result = Common.run!(Common.cmd("ip"), :params => ["--json", "link"])
+      JSON.parse(result.output)
+    rescue AwesomeSpawn::CommandResultError, JSON::ParserError => e
+      raise NetworkInterfaceError.new(e.message, e.result)
+    end
+
     # Creates an instance of the correct NetworkInterface subclass for the local distro
     def self.new(*args)
       self == LinuxAdmin::NetworkInterface ? dist_class.new(*args) : super
     end
 
     # @return [String] the interface for networking operations
-    attr_reader :interface
+    attr_reader :interface, :link_type
 
     # @param interface [String] Name of the network interface to manage
     def initialize(interface)
@@ -45,18 +61,25 @@ module LinuxAdmin
         return false
       end
 
-      parse_ip4(ip_output)
-      parse_ip6(ip_output, :global)
-      parse_ip6(ip_output, :link)
+      @link_type = ip_output["link_type"]
+      addr_info  = ip_output["addr_info"]
+
+      parse_ip4(addr_info)
+      parse_ip6(addr_info, "global")
+      parse_ip6(addr_info, "link")
 
-      @network_conf[:mac] = parse_ip_output(ip_output, %r{link/ether}, 1)
+      @network_conf[:mac] = ip_output["address"]
 
       [4, 6].each do |version|
-        @network_conf["gateway#{version}".to_sym] = parse_ip_output(ip_route(version), /^default/, 2)
+        @network_conf["gateway#{version}".to_sym] = ip_route(version, "default")&.dig("gateway")
       end
       true
     end
 
+    def loopback?
+      @link_type == "loopback"
+    end
+
     # Retrieve the IPv4 address assigned to the interface
     #
     # @return [String] IPv4 address for the managed interface
@@ -153,23 +176,15 @@ module LinuxAdmin
 
     private
 
-    # Parses the output of `ip addr show`
-    #
-    # @param output [String] The command output
-    # @param regex  [Regexp] Regular expression to match the desired output line
-    # @param col    [Fixnum] The whitespace delimited column to be returned
-    # @return [String] The parsed data
-    def parse_ip_output(output, regex, col)
-      the_line = output.split("\n").detect { |l| l =~ regex }
-      the_line.nil? ? nil : the_line.strip.split(' ')[col]
-    end
-
     # Runs the command `ip addr show <interface>`
     #
     # @return [String] The command output
     # @raise [NetworkInterfaceError] if the command fails
     def ip_show
-      Common.run!(Common.cmd("ip"), :params => ["addr", "show", @interface]).output
+      output = Common.run!(Common.cmd("ip"), :params => ["--json", "addr", "show", @interface]).output
+      return {} if output.blank?
+
+      JSON.parse(output).first
     rescue AwesomeSpawn::CommandResultError => e
       raise NetworkInterfaceError.new(e.message, e.result)
     end
@@ -179,8 +194,11 @@ module LinuxAdmin
     # @param version [Fixnum] Version of IP protocol (4 or 6)
     # @return [String] The command output
     # @raise [NetworkInterfaceError] if the command fails
-    def ip_route(version)
-      Common.run!(Common.cmd("ip"), :params => ["-#{version}", 'route']).output
+    def ip_route(version, route = "default")
+      output = Common.run!(Common.cmd("ip"), :params => ["--json", "-#{version}", "route", "show", route]).output
+      return {} if output.blank?
+
+      JSON.parse(output).first
     rescue AwesomeSpawn::CommandResultError => e
       raise NetworkInterfaceError.new(e.message, e.result)
     end
@@ -188,26 +206,24 @@ module LinuxAdmin
     # Parses the IPv4 information from the output of `ip addr show <device>`
     #
     # @param ip_output [String] The command output
-    def parse_ip4(ip_output)
-      cidr_ip = parse_ip_output(ip_output, /inet /, 1)
-      return unless cidr_ip
+    def parse_ip4(addr_info)
+      inet = addr_info&.detect { |addr| addr["family"] == "inet" }
+      return if inet.nil?
 
-      parts = cidr_ip.split('/')
-      @network_conf[:address] = parts[0]
-      @network_conf[:prefix] = parts[1].to_i
+      @network_conf[:address] = inet["local"]
+      @network_conf[:prefix]  = inet["prefixlen"]
     end
 
     # Parses the IPv6 information from the output of `ip addr show <device>`
     #
     # @param ip_output [String] The command output
     # @param scope     [Symbol] The IPv6 scope (either `:global` or `:local`)
-    def parse_ip6(ip_output, scope)
-      cidr_ip = parse_ip_output(ip_output, /inet6 .* scope #{scope}/, 1)
-      return unless cidr_ip
+    def parse_ip6(addr_info, scope)
+      inet6 = addr_info&.detect { |addr| addr["family"] == "inet6" && addr["scope"] == scope }
+      return if inet6.nil?
 
-      parts = cidr_ip.split('/')
-      @network_conf["address6_#{scope}".to_sym] = parts[0]
-      @network_conf["prefix6_#{scope}".to_sym] = parts[1].to_i
+      @network_conf["address6_#{scope}".to_sym] = inet6["local"]
+      @network_conf["prefix6_#{scope}".to_sym]  = inet6["prefixlen"]
     end
   end
 end

data/lib/linux_admin/registration_system.rb

@@ -47,7 +47,8 @@ module LinuxAdmin
     private_class_method :white_list_methods
 
     def install_server_certificate(server, cert_path)
-      host = server.start_with?("http") ? URI.parse(server).host : server
+      require 'uri'
+      host = server.start_with?("http") ? ::URI.parse(server).host : server
 
       LinuxAdmin::Rpm.upgrade("http://#{host}/#{cert_path}")
     end

data/lib/linux_admin/service/systemd_service.rb

@@ -1,3 +1,5 @@
+require "time"
+
 module LinuxAdmin
   class SystemdService < Service
     def running?

data/lib/linux_admin/ssh_agent.rb

@@ -32,7 +32,7 @@ module LinuxAdmin
     end
 
     def stop
-      system({'SSH_AGENT_PID' => @pid}, '(ssh-agent -k) &> /dev/null') if process_exists?(@pid)
+      system({'SSH_AGENT_PID' => @pid}, '(ssh-agent -k) >/dev/null 2>&1') if process_exists?(@pid)
       File.delete(@socket) if File.exist?(@socket)
       @socket = nil
       @pid = nil

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "2.0.2".freeze
+  VERSION = "4.0.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -24,11 +24,28 @@ authors:
 - Daniel Berger
 - Satoe Imaishi
 - d-m-u
-autorequire: 
+- whitesource-bolt-for-github[bot]
+- Adam Grare
+- renovate[bot]
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: manageiq-style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +75,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,33 +89,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: awesome_spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: awesome_spawn
+  name: ed25519
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +170,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.2.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -180,19 +237,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
+        version: 0.21.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 0.21.2
 description: |2
 
   LinuxAdmin is a module to simplify management of linux systems.
@@ -202,7 +259,7 @@ email:
 - brandondunne@hotmail.com
 - fryguy9@gmail.com
 - mmorsi@redhat.com
-- jrafanie@redhat.com
+- jrafanie@gmail.com
 - keenan@thebrocks.net
 - twiest@redhat.com
 - ncarboni@redhat.com
@@ -218,7 +275,10 @@ email:
 - nicklamuro@gmail.com
 - djberg96@gmail.com
 - simaishi@redhat.com
-- drewuhlmann@gmail.com
+- 16326669+d-m-u@users.noreply.github.com
+- 42819689+whitesource-bolt-for-github[bot]@users.noreply.github.com
+- adam@grare.com
+- 29139614+renovate[bot]@users.noreply.github.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -268,7 +328,7 @@ homepage: http://github.com/ManageIQ/linux_admin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -276,15 +336,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.
 test_files: []