pwn 0.4.704 → 0.4.706

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d620db070015a7a752384a7ab89962a4123d5af5a8fe934b42fdd48fced848e
-  data.tar.gz: 4fb7055ad49d1c63ae772f29fc580b43f7f306e0756266cb116b387dd14205bc
+  metadata.gz: d297206c67aed46fc11f899ebeb049b99268321cfd43de12ad9bdabdbe800e18
+  data.tar.gz: 227bc9a6a41c960e7b8d8d9b4901d06dcf5d50fb326967113fedea7352c99dd9
 SHA512:
-  metadata.gz: b439cd9b4dd11a9113f68b40413887e026bbe9c3e3b3104f8261158d62a4acb92b797c894d6c1fd5972e9c49ac5c23b8cdbcb010007a635c73aed276f7897f40
-  data.tar.gz: 11c1ce9cfb9024f51c7e5c23a7a6783c27d306a356d49e00a045989107fd9818da1687f3c607bb6d3092ba13ea719ea644c89d85b69f56e4bf16fd683b92b2df
+  metadata.gz: 79cff249d43ec99c285f53ccf476a1a962420547f09d99733517b1c59849404b74c5abc17ee5ce3b1f17cb80489a4db38f29a6657a190b7d5361a97448ba402c
+  data.tar.gz: d06d828ddb31e7d6915a5615338ea52a121341fa8db5801976cec9428e94a4f6fa850a6824802327ec6e84729b02c07d496d27556c34cab445d1445ef6993a17

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.704]:001 >>> PWN.help
+pwn[v0.4.706]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.704]:001 >>> PWN.help
+pwn[v0.4.706]:001 >>> PWN.help
 ```
 
 

data/bin/pwn

@@ -18,6 +18,17 @@ OptionParser.new do |options|
 end.parse!
 
 begin
+  def cleanup_pids(opts = {})
+    pids_arr = opts[:pids_arr]
+
+    pids_arr.each do |pid_line|
+      pid = pid_line[2].to_i
+      Process.kill('TERM', pid)
+    rescue Errno::ESRCH
+      next
+    end
+  end
+
   def refresh_ps1_proc(opts = {})
     mode = opts[:mode]
 
@@ -312,21 +323,6 @@ ensure
   end
   # pp grandkid_pids_arr
 
-  grandkid_pids_arr.each do |grandkid_pid|
-    begin
-      pid = grandkid_pid[2].to_i
-      Process.kill('TERM', pid)
-    rescue Errno::ESRCH
-      next
-    end
-  end
-
-  kid_pids_arr.each do |kid_pid|
-    begin
-      pid = kid_pid[2].to_i
-      Process.kill('TERM', pid)
-    rescue Errno::ESRCH
-      next
-    end
-  end
+  cleanup_pids(pids_arr: grandkid_pids_arr)
+  cleanup_pids(pids_arr: kid_pids_arr)
 end

data/lib/pwn/plugins/detect_os.rb

@@ -11,7 +11,10 @@ module PWN
 
       public_class_method def self.type
         return :cygwin if OS.cygwin?
+        return :freebsd if OS.freebsd?
         return :linux if OS.linux?
+        return :netbsd if OS.host_os.include?('netbsd')
+        return :openbsd if OS.host_os.include?('openbsd')
         return :osx if OS.osx?
         return :windows if OS.windows?
       rescue StandardError => e

data/lib/pwn/plugins/ps.rb

@@ -12,25 +12,23 @@ module PWN
       public_class_method def self.list(opts = {})
         pid = opts[:pid]
 
-        format = 'user,pcpu,pid,ppid,uid,gid,euid,egid,uname,group,args:1000,pmem'
+        which_os = PWN::Plugins::DetectOS.type
 
-        if pid.nil?
-          stdout, _stderr, _status = Open3.capture3(
-            'ps',
-            'ax',
-            '-o',
-            format
-          )
+        case which_os
+        when :linux
+          format = 'user,pcpu,pid,ppid,uid,group,gid,cpu,command:1000,pmem'
+          cmd = ['ps', '-p', pid.to_s, '-o', format]
+          cmd = ['ps', 'ax', '-o', format] if pid.nil?
+        when :freebsd, :netbsd, :openbsd, :osx
+          format = 'user,pcpu,pid,ppid,uid,group,gid,cpu,command,pmem'
+          cmd = ['ps', '-p', pid.to_s, '-o', format]
+          cmd = ['ps', 'ax', '-o', format] if pid.nil?
         else
-          stdout, _stderr, _status = Open3.capture3(
-            'ps',
-            '-p',
-            pid.to_s,
-            '-o',
-            format
-          )
+          raise "Unsupported OS: #{which_os}"
         end
 
+        stdout, _stderr, _status = Open3.capture3(cmd)
+
         proc_list_arr = []
         stdout_arr = stdout.split("\n")
         stdout_arr.each do |line|

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.4.704'
+  VERSION = '0.4.706'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.704
+  version: 0.4.706
 platform: ruby
 authors:
 - 0day Inc.