kanrisuru 0.7.3 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8235592e090d7f6466a0e78d0d7b4eff7d31a2c47649aadd7cf822df11847642
-  data.tar.gz: 20c8730f24d486687c1161f0da1dc330bf93ec7f273db14c258cd0a83ce766e8
+  metadata.gz: 7986958e7a5a32bb79f6f8cd225b73e996f68329e9adb95c324ad898efaa8bdc
+  data.tar.gz: '02279420cd5ff6017234d4058847173f3be44810267e57c59cb2b09be8f9dadc'
 SHA512:
-  metadata.gz: f8d141bf32e49bd47acb9adc6d4307264be9b6ee30f83a581f2c033bb662205610d6cdbd495f56d195a91df8bcd5501a4f72bdf681db20bcaf5f5d23527e244a
-  data.tar.gz: 0a9b31637b3a15cd4928abbcb7e2edcfd925ec9c9f61b008a44e7ef80c39b083b1f16b103281c8b6ed81ea758144dc2ea3eb5b50223a8dbce121fcc868abf453
+  metadata.gz: 7fedbd06614d36213c5d7df56c22e1f88ecb5b41732704a02b41eff1272559db3f8dc22eaa1112188cd5b0204f4c81f40e1d7f66689c41ca2d34ef0c125fbd9e
+  data.tar.gz: a451f3c5c4cb26ff0bf733371175c99f148ccd9531bcf0366b08d063b4ac495b1fdd3aafe47ff40b4a2cbd9df94b2de3c7dff8e0afa1f9717b3e54271a4ef75b

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Kanrisuru 0.8.3 (August 20, 2021) ##
+* Fix bug with disk usage, `du` command by escaping the awk variables in the command.
+* Update `du` command to execute with shell user. 
+
+## Kanrisuru 0.8.2 (August 19, 2021) ##
+* Convert `major` and `minor` device field values to an `integer` in lsblk system module.
+
+## Kanrisuru 0.8.1 (August 19, 2021) ##
+* Fix `nodeps` flag value for `lsblk` command in disk module. 
+
+## Kanrisuru 0.8.0 (August 18, 2021) ##
+* Add last / lastb implementation in system core module. 
+
 ## Kanrisuru 0.7.3 (August 9, 2021) ##
 * Fixed bug with zypper remove package, where the package names weren't being added to the linux command. 
 * Test case added to ensure package is removed.

data/lib/kanrisuru/core/disk.rb

@@ -31,9 +31,9 @@ module Kanrisuru
 
         command = Kanrisuru::Command.new('du')
         command.append_arg('-s', path)
-        command | "awk '{print $1, $2}'"
+        command | "awk '{print \\$1, \\$2}'"
 
-        execute(command)
+        execute_shell(command)
 
         Kanrisuru::Result.new(command) do |cmd|
           string = cmd.to_s
@@ -144,7 +144,7 @@ module Kanrisuru
 
         command.append_flag('-a', all)
         command.append_flag('-p', paths)
-        command.append_flag('-p', nodeps)
+        command.append_flag('-d', nodeps)
 
         command.append_arg('-o', 'NAME,FSTYPE,MAJ:MIN,MOUNTPOINT,SIZE,UUID,RO,RM,OWNER,GROUP,MODE,TYPE')
         execute(command)
@@ -244,8 +244,8 @@ module Kanrisuru
               current_device.fs_type = value
             when 'MAJ:MIN'
               maj, min = value.split(':')
-              current_device.maj_dev = maj
-              current_device.min_dev = min
+              current_device.maj_dev = maj ? maj.to_i : nil
+              current_device.min_dev = min ? min.to_i : nil
             when 'MOUNTPOINT'
               current_device.mount_point = value
             when 'SIZE'
@@ -281,8 +281,8 @@ module Kanrisuru
 
           LsblkDevice.new(
             device['name'],
-            maj_min ? maj_min.split(':')[0] : nil,
-            maj_min ? maj_min.split(':')[1] : nil,
+            maj_min ? maj_min.split(':')[0].to_i : nil,
+            maj_min ? maj_min.split(':')[1].to_i : nil,
             device['rm'],
             device['ro'],
             device['owner'],

data/lib/kanrisuru/core/system.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'date'
+require 'ipaddr'
 
 module Kanrisuru
   module Core
@@ -19,6 +20,7 @@ module Kanrisuru
       os_define :linux, :kstat
 
       os_define :linux, :lsof
+      os_define :linux, :last
 
       os_define :linux, :uptime
 
@@ -116,6 +118,19 @@ module Kanrisuru
         :name
       )
 
+      SessionDetail = Struct.new(
+        :tty,
+        :login_at,
+        :logout_at,
+        :ip_address,
+        :success
+      )
+
+      LoginUser = Struct.new(
+        :user,
+        :sessions
+      )
+
       def load_env
         command = Kanrisuru::Command.new('env')
         execute_shell(command)
@@ -271,6 +286,65 @@ module Kanrisuru
         Kanrisuru::Result.new(command, &:to_i)
       end
 
+      def last(opts = {})
+        command =
+          if opts[:failed_attempts]
+            Kanrisuru::Command.new('lastb')
+          else
+            Kanrisuru::Command.new('last')
+          end
+
+        command.append_flag('-i')
+        command.append_flag('-F')
+        command.append_arg('-f', opts[:file])
+
+        ## Some systems only use 1 space between user and TTY field
+        ## Add an additional space in output formatting for simple parsing
+        ## logic.
+        command | "sed 's/ /  /'"
+
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          lines = cmd.to_a
+
+          mapping = {}
+
+          lines.each do |line|
+            next if Kanrisuru::Util.blank?(line)
+            next if line.include?('wtmp') || line.include?('btmp')
+
+            line = line.gsub('  still logged in', '- still logged in') if line.include?('still logged in')
+
+            values = line.split(/\s{2,}/, 4)
+            user   = values[0]
+            tty    = values[1]
+            ip     = IPAddr.new(values[2])
+
+            date_range = values[3]
+            login, logout = date_range.split(' - ')
+
+            login = parse_last_date(login) if login
+
+            logout = parse_last_date(logout) if logout
+
+            detail = SessionDetail.new
+            detail.tty = tty
+            detail.ip_address = ip
+            detail.login_at = login
+            detail.logout_at = logout
+
+            detail.success = !Kanrisuru::Util.present?(opts[:failed_attemps])
+
+            mapping[user] = LoginUser.new(user, []) unless mapping.key?(user)
+
+            mapping[user].sessions << detail
+          end
+
+          mapping.values
+        end
+      end
+
       def ps(opts = {})
         group = opts[:group]
         user  = opts[:user]
@@ -567,6 +641,19 @@ module Kanrisuru
         line.split(char, 2)[1]
       end
 
+      def parse_last_date(string)
+        tokens = string.split
+
+        return if tokens.length < 4
+
+        month_abbr = tokens[1]
+        day = tokens[2]
+        timestamp = tokens[3]
+        year = tokens[4]
+
+        DateTime.parse("#{day} #{month_abbr} #{year} #{timestamp}")
+      end
+
       def parse_policy_abbr(value)
         case value
         when '-'

data/lib/kanrisuru/core/zypper.rb

@@ -713,7 +713,7 @@ module Kanrisuru
         zypper_repos_opt(command, opts)
         zypper_package_type_opt(command, opts)
         zypper_solver_opts(command, opts)
-        
+
         packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
         command << packages
 

data/lib/kanrisuru/os_package.rb

@@ -159,7 +159,6 @@ module Kanrisuru
           os_method_names.each do |method_name|
             if namespace
               namespace_class.class_eval do
-
                 define_method method_name do |*args, &block|
                   unbound_method = nil
 
@@ -193,7 +192,7 @@ module Kanrisuru
             else
               define_method method_name do |*args, &block|
                 unbound_method = nil
-                
+
                 host = self
                 os_method_cache = host.instance_variable_get(:@os_method_cache) || {}
 

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.7.3'
+  VERSION = '0.8.3'
 end

data/spec/functional/core/disk_spec.rb

@@ -65,6 +65,13 @@ RSpec.describe Kanrisuru::Core::Disk do
         expect(result[0].path).to eq("#{host_json['home']}/.bashrc")
       end
 
+      it 'gets disk usage root' do
+        host.su('root')
+        result = host.du(path: '/etc')
+        expect(result).to be_success
+        expect(result[0].path).to eq("/etc")
+      end
+
       it 'gets disk free for system' do
         expect(host.df.data).to be_instance_of(Array)
         expect(host.df(inodes: true).data).to be_instance_of(Array)

data/spec/functional/core/system_spec.rb

@@ -96,6 +96,21 @@ RSpec.describe Kanrisuru::Core::System do
         expect(result.cpus.length).to eq(host.cpu.cores)
       end
 
+      it 'gets login details' do
+        host.su('root')
+
+        result = host.last
+        expect(result).to be_success
+      end
+
+      it 'gets failed login attempts' do
+        host.su('root')
+
+        result = host.last(failed_attempts: true)
+        puts result.data
+        expect(result).to be_success
+      end
+
       it 'gets process details' do
         result = host.ps
 

data/spec/functional/os_package_spec.rb

@@ -162,10 +162,10 @@ RSpec.describe Kanrisuru::OsPackage do
 
     expect(cluster).to respond_to(:output)
     expect(cluster.output).to eq([
-      {:host=>"ubuntu-host", :result=>"debian"},
-      {:host=>"centos-host", :result=>"fedora"},
-      {:host=>"opensuse-host", :result=>"sles"}
-    ])
+                                   { host: 'ubuntu-host', result: 'debian' },
+                                   { host: 'centos-host', result: 'fedora' },
+                                   { host: 'opensuse-host', result: 'sles' }
+                                 ])
 
     expect(host1).to respond_to(:alias)
     expect(host2).to respond_to(:alias)
@@ -180,10 +180,10 @@ RSpec.describe Kanrisuru::OsPackage do
     expect(cluster).to respond_to(:alias)
     expect(cluster.alias).to respond_to(:output)
     expect(cluster.alias.output).to eq([
-      {:host=>"ubuntu-host", :result=>"debian"},
-      {:host=>"centos-host", :result=>"fedora"},
-      {:host=>"opensuse-host", :result=>"sles"}
-    ])
+                                         { host: 'ubuntu-host', result: 'debian' },
+                                         { host: 'centos-host', result: 'fedora' },
+                                         { host: 'opensuse-host', result: 'sles' }
+                                       ])
 
     host1.disconnect
     host2.disconnect

data/spec/unit/core/system_spec.rb

@@ -86,5 +86,17 @@ RSpec.describe Kanrisuru::Core::System do
       :inode,
       :name
     )
+    expect(Kanrisuru::Core::System::SessionDetail.new).to respond_to(
+      :tty,
+      :login_at,
+      :logout_at,
+      :ip_address,
+      :success
+    )
+
+    expect(Kanrisuru::Core::System::LoginUser.new).to respond_to(
+      :user,
+      :sessions
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.3
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec