pwn 0.4.705 → 0.4.707

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3649788ab9739969e27230bbd48fc1a73e10cf1d725d26a840a56554e5ade27d
-  data.tar.gz: 446c43688c957a5f77c7efb50f1214ce8508f2ec8389151cd05eb9961f8db893
+  metadata.gz: 37cfc2e423ee677fac02ad04aa54d6c49bf88ba3be1fc7f88b728e11d7e1590a
+  data.tar.gz: 7a341899d51adf15fcfda3ec0dc929a6c91da77076a654cdd10bb3c29d5be8cf
 SHA512:
-  metadata.gz: 4b6c2e422c24c0636009984ecbe54b4ee5cc1847bb3f3a259147cb8478f16bd7b8175b7ecd1dffe2f42fc7189bee229725be9c05b6fad22a1aed54714effff21
-  data.tar.gz: '0079c85c8d6dfe8c5cdea947a666bc2afe1d462b5d671f87c4a329106fbbc3bd104931a42c63b47e9b8157cf974dc1e1c1cfba95a735bf77e572a3bf29e4dfc6'
+  metadata.gz: c8046638ca7becec2cb0cdb1e465eb21304d8c3af1afaeaf61fdcc2d193db9a24a8a05e09b3051cb1b4ac166ddec25d34cd8fe736d9e6311ab0f6427b306a3df
+  data.tar.gz: bffdca2fe82e1edf821e0b039c52883394d9ea4d0fe42780bb230ad999bfeb55e11ceff1970f7097dc0eb6ef7eb0ca8f573a92131f79b6ee8eee504135a3f170

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.705]:001 >>> PWN.help
+pwn[v0.4.707]: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.705]:001 >>> PWN.help
+pwn[v0.4.707]:001 >>> PWN.help
 ```
 
 

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,25 @@ 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 :cygwin, :linux
+          cmd = 'ps'
+          format = 'user,pcpu,pid,ppid,uid,group,gid,cpu,command:1000,pmem'
+          params = "-p #{pid} -o #{format}"
+          params = "ax -o #{format}" if pid.nil?
+        when :freebsd, :netbsd, :openbsd, :osx
+          cmd = 'ps'
+          format = 'user,pcpu,pid,ppid,uid,group,gid,cpu,command,pmem'
+          params = "-p #{pid} -o #{format}"
+          params = "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, params)
+
         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.705'
+  VERSION = '0.4.707'
 end

metadata

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