pwn 0.5.715 → 0.5.716

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146297356f4ed277ec4d96fafaa37ceada293450ed65899f36fd0c87b791941e
-  data.tar.gz: 95b240666596894709e70488300794a0af67a8a04b4da0b2f82c9a907c3e851d
+  metadata.gz: 7c150ee7139d2079946756fe2751fab31308638e437a01429a4258c71abced27
+  data.tar.gz: e59a0e5214fc91f3aea199a17a2e9877af881ae7a79009c948ad7e4fe876de25
 SHA512:
-  metadata.gz: d840608a734d085d102064010d0a83daa4d3941ef36854fe2e2a4bf445ef994f331599e9ef3dfc9d24ea40b26fed8b383677cf53901ff7904a0a3a02e00d3d12
-  data.tar.gz: b118fad0b02e1a1e3587243487b8896c469f679d49c76518e76487324918e21d0cccb6c50687e74e366a6e633c8ad6666a51e7cc53f9ca0fbc2b48d653a5aa91
+  metadata.gz: 597caaccaf0f1b9a4d439ecc4abd2f5ab93229779ae27e0147c45f5afd375f98a6af777864040868ce49667c27a9c614d73123928b09996864bcfad25e0d9f07
+  data.tar.gz: d7209f26b10365db59e3532ebb6c6c6cfc29c95d6a251d476cf5e167d76e320cc22e69d8aadf682367468bdd4c9dc2759d02c58158e42e28b51f01a217380dea

data/lib/pwn/plugins/detect_os.rb

@@ -27,6 +27,16 @@ module PWN
         'mswin' => :windows
       }.freeze
 
+      PATH_NOISE = %w[
+        sh bash zsh fish csh tcsh dash true false echo test pwd ls cat cp mv rm
+        mkdir rmdir chmod chown chgrp ln touch head tail more less grep egrep fgrep
+        sed awk sort uniq wc find xargs tar gzip gunzip zcat bzip2 xz make
+        python python2 python3 ruby perl php node java git svn hg
+        vi vim nvi nano ed ex
+        apt apt-get dpkg rpm yum dnf pacman brew port pkg pkg_add
+        sudo doas su login id whoami uname hostname env export
+      ].freeze
+
       public_class_method def self.type
         os = :cygwin if OS.cygwin?
         os = :freebsd if OS.freebsd?
@@ -162,7 +172,8 @@ module PWN
       # PWN::Plugins::DetectOS.living_off_the_land(
       #   os_release: 'optional - /etc/os-release body (defaults to reading the file)',
       #   which: 'optional - Hash of binary name => present Boolean (skips live PATH)',
-      #   bins: 'optional - extra binary names to probe besides plugin required_bins'
+      #   bins: 'optional - extra host binary names to include when present',
+      #   pwn_bins: 'optional - Array of names pwn setup already installs (skipped)'
       # )
 
       public_class_method def self.living_off_the_land(opts = {})
@@ -171,18 +182,19 @@ module PWN
         ver = version(opts)
         cpu = opts[:arch] || arch
         endn = opts[:endian] || endian
-        names = inventory_names(bins: opts[:bins])
-        which = opts[:which]
-        present = []
-        missing = []
-        names.each do |name|
-          ok = if which.is_a?(Hash)
-                 which[name] || which[name.to_sym]
+        found = host_path_names(opts)
+        extra = Array(opts[:bins]).map(&:to_s).reject(&:empty?)
+        extra.each do |name|
+          ok = if opts[:which].is_a?(Hash)
+                 opts[:which][name] || opts[:which][name.to_sym]
                else
                  bin_present?(name: name)
                end
-          (ok ? present : missing) << name
+          found << name if ok
         end
+        owned = pwn_installed_bins(pwn_bins: opts[:pwn_bins])
+        native = (found.map(&:to_s) - owned - PATH_NOISE).reject(&:empty?).uniq.sort
+        native = native.first(256)
         cap = if opts.key?(:cap_net_raw)
                 opts[:cap_net_raw]
               else
@@ -193,15 +205,15 @@ module PWN
                  else
                    docker_live
                  end
-        summary = "#{flavor} #{ver} #{cpu} present=#{present.first(24).join(',')} missing=#{missing.first(12).join(',')}"
+        sample = native.first(24).join(',')
+        summary = "#{flavor} #{ver} #{cpu} native=#{sample}"
         {
           type: os_type,
           distro: flavor,
           version: ver,
           arch: cpu.to_s,
           endian: endn,
-          present: present,
-          missing: missing,
+          native: native,
           cap_net_raw: cap,
           docker: docker,
           summary: summary
@@ -250,14 +262,15 @@ module PWN
             version: 'optional - force a version string instead of detecting'
           )
 
-          # Profile this host: distro, arch, and which plugin bins are on PATH.
+          # Inventory extra PATH binaries on this host that pwn plugins do not already wrap.
           #{self}.living_off_the_land(
             os_release: 'optional - /etc/os-release body (defaults to reading the file)',
             lsb_release: 'optional - /etc/lsb-release body',
             build_prop: 'optional - Android /system/build.prop body',
             type: 'optional - OS family from #type',
             which: 'optional - Hash of binary name => true/false (skips live PATH when set)',
-            bins: 'optional - extra binary names to probe besides plugin required_bins',
+            bins: 'optional - extra host binary names to include when present on PATH',
+            pwn_bins: 'optional - extra names to treat as already wrapped (skipped from native)',
             arch: 'optional - CPU arch override',
             endian: 'optional - :little or :big override',
             cap_net_raw: 'optional - Boolean CAP_NET_RAW override',
@@ -270,14 +283,46 @@ module PWN
         constants.sort
       end
 
-      private_class_method def self.inventory_names(opts = {})
-        extra = Array(opts[:bins]).map(&:to_s).reject(&:empty?)
+      private_class_method def self.host_path_names(opts = {})
+        return Array(opts[:path_names]).map(&:to_s) if opts.key?(:path_names)
+
+        if opts.key?(:which)
+          which = opts[:which]
+          return [] unless which.is_a?(Hash)
+
+          return which.select { |_n, ok| ok }.keys.map(&:to_s)
+        end
+
+        scan_path_executables
+      end
+
+      private_class_method def self.scan_path_executables(opts = {})
+        return [] if opts[:skip]
+
+        names = []
+        ENV.fetch('PATH', '').split(File::PATH_SEPARATOR).each do |dir|
+          next unless File.directory?(dir)
+
+          Dir.children(dir).each do |base|
+            path = File.join(dir, base)
+            next unless File.file?(path) && File.executable?(path)
+
+            names << base.sub(/\.(exe|bat|cmd|com)\z/i, '')
+          end
+        rescue StandardError
+          next
+        end
+        names.uniq
+      end
+
+      private_class_method def self.pwn_installed_bins(opts = {})
+        extra = Array(opts[:pwn_bins]).map(&:to_s)
         deps = if defined?(PWN::Plugins::PreflightChecker::PLUGIN_DEPS)
-                 PWN::Plugins::PreflightChecker::PLUGIN_DEPS.values.flat_map { |row| Array(row[:bins]) }
+                 PWN::Plugins::PreflightChecker::PLUGIN_DEPS.values.flat_map { |row| Array(row[:bins]).map(&:to_s) }
                else
                  []
                end
-        (deps + extra).map(&:to_s).reject(&:empty?).uniq
+        (extra + deps).reject(&:empty?).uniq
       end
 
       private_class_method def self.bin_present?(opts = {})

data/lib/pwn/version.rb

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

data/spec/lib/pwn/plugins/detect_os_spec.rb

@@ -64,42 +64,48 @@ describe PWN::Plugins::DetectOS do
   end
 
   describe '.living_off_the_land' do
-    it 'profiles distro, arch, and which host bins are present from fixtures' do
+    it 'reports extra PATH binaries that pwn setup does not install' do
       body = "ID=kali\nVERSION_ID=\"2026.3\"\n"
       row = described_class.living_off_the_land(
         os_release: body,
         type: :linux,
-        which: { 'gdb' => true, 'r2' => true, 'nuclei' => false }
+        pwn_bins: %w[gdb r2 nuclei],
+        which: { 'jq' => true, 'gdb' => true, 'r2' => true, 'yara' => true, 'nuclei' => false }
       )
       expect(row[:distro]).to eq(:kali)
       expect(row[:version]).to eq('2026.3')
       expect(row[:arch]).to be_a(String)
       expect(row[:endian]).to be_a(Symbol)
-      expect(row[:present]).to include('gdb', 'r2')
-      expect(row[:missing]).to include('nuclei')
-      expect(row[:present]).not_to include('nuclei')
+      expect(row[:native]).to include('jq', 'yara')
+      expect(row[:native]).not_to include('gdb', 'r2', 'nuclei')
+      expect(row).not_to have_key(:missing)
       expect(row[:summary]).to include('kali')
-      expect(row[:summary]).to include('gdb')
+      expect(row[:summary]).to include('jq')
+      expect(row[:summary]).not_to include('missing=')
     end
 
     it 'does not fall through to live os-release when fixtures are passed' do
       row = described_class.living_off_the_land(
         os_release: "ID=alpine\nVERSION_ID=3.20.0\n",
         type: :linux,
+        pwn_bins: %w[],
         which: {}
       )
       expect(row[:distro]).to eq(:alpine)
       expect(row[:version]).to eq('3.20.0')
+      expect(row[:native]).to eq([])
     end
 
-    it 'probes extra bins from opts without inventing a PATH dump' do
+    it 'does not treat plugin required_bins gaps as the inventory' do
       row = described_class.living_off_the_land(
         os_release: "ID=debian\nVERSION_ID=12\n",
         type: :linux,
+        pwn_bins: %w[gdb r2],
         bins: %w[jq],
-        which: { 'jq' => true }
+        which: { 'jq' => true, 'gdb' => false }
       )
-      expect(row[:present]).to include('jq')
+      expect(row[:native]).to include('jq')
+      expect(row[:native]).not_to include('gdb')
     end
   end
 end

data/third_party/pwn_rdoc.jsonl

@@ -1974,16 +1974,18 @@
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.docker_live Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.docker_live`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.endian Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.endian`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.help Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.help`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.inventory_names Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.inventory_names`: "}]}
+{"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.host_path_names Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.host_path_names`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.ios_host? Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.ios_host?`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.live_sw_vers Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.live_sw_vers`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.live_uname_r Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.live_uname_r`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.live_uname_s Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.live_uname_s`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.live_win_ver Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.live_win_ver`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.living_off_the_land Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.living_off_the_land`: Supported Method Parameters\n\nPWN::Plugins::DetectOS.living_off_the_land(\n\nos_release: 'optional - /etc/os-release body (defaults to reading the file)',\nwhich: 'optional - Hash of binary name => present Boolean (skips live PATH)',\nbins: 'optional - extra binary names to probe besides plugin required_bins'\n\n)\n"}]}
+{"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.living_off_the_land Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.living_off_the_land`: Supported Method Parameters\n\nPWN::Plugins::DetectOS.living_off_the_land(\n\nos_release: 'optional - /etc/os-release body (defaults to reading the file)',\nwhich: 'optional - Hash of binary name => present Boolean (skips live PATH)',\nbins: 'optional - extra host binary names to include when present',\npwn_bins: 'optional - Array of names pwn setup already installs (skipped)'\n\n)\n"}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.normalize_id Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.normalize_id`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.parse_kv Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.parse_kv`: "}]}
+{"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.pwn_installed_bins Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.pwn_installed_bins`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.read_if_present Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.read_if_present`: "}]}
+{"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.scan_path_executables Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.scan_path_executables`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.type Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.type`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::DetectOS.version Usage"},{"role":"assistant","content":"`PWN::Plugins::DetectOS.version`: Supported Method Parameters\n\nPWN::Plugins::DetectOS.version(\n\nos_release: 'optional - /etc/os-release body',\nlsb_release: 'optional - /etc/lsb-release body',\nbuild_prop: 'optional - Android build.prop body',\nsw_vers: 'optional - macOS/iOS product version',\nwin_ver: 'optional - Windows ver output',\nuname_r: 'optional - uname -r string',\ntype: 'optional - OS family from #type'\n\n)\n"}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::EIN.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::EIN.authors`: Author(s)\n\n0day Inc. <support@0dayinc.com>\n"}]}

metadata

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