pwn 0.5.777 → 0.5.778

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77cd821e27ebf793d043b1b73139ff68b17badf106a91f42832769ac7760785e
-  data.tar.gz: '0708df0d0f8258f249e0b57556898e3a1e675ef90a8caa162eac0fc4366b652e'
+  metadata.gz: 3bd715a7f2fae3e39f56f1c2e0d47629de11144461591acbfcbc7399e8a1da9a
+  data.tar.gz: 80b713ca6f117ba5f9862416f2796f777e3c4a1e1bba68fdf05fda02ea758635
 SHA512:
-  metadata.gz: 338c0443dd72e44e29b50c8b3afd11251ab84643f1b105304c698789cda148f69e4f68468b9c2cdc4824dc1570591f2d9d51c17d5a678c4cea4eace72c27be4e
-  data.tar.gz: d60694fcbbe66c4b48eb2e35f5235e508d5bcc66f5d2172b7a5ebd604b755a778b83c428ea47578c61985078231382a5182dfca213e46400c61af5bdf8f9fd9a
+  metadata.gz: e17ff89a41133b10913a559880f90220940fa02ae6e74694e6c914d1c74af793d94907b05bd5655f7a9ee27afac498e896888c2d8a0c206381e7910ed8233dca
+  data.tar.gz: acc1ceac0c1e58354e730a115e06d312d5873cabaf1775ab7f39149ebfa99bb20094e83eae12b9e33108d046bcba61ab0887b7c869471fe9c0a9c655d29a2c72

data/Gemfile

@@ -24,7 +24,7 @@ gem 'bundler', '>=4.0.23'
 gem 'bundler-audit', '>=0.9.3'
 gem 'bunny', '3.4.0'
 gem 'colorize', '1.1.0'
-gem 'credit_card_validations', '9.0.0'
+gem 'credit_card_validations', '10.0.0'
 gem 'curses', '1.7.0'
 gem 'diffy', '3.4.4'
 gem 'eventmachine', '1.2.7'

data/Rakefile

@@ -38,9 +38,8 @@ default_tasks = %i[spec rubocop]
 default_tasks << :rerdoc if defined?(RDoc::Task)
 task default: default_tasks
 
-desc 'Regenerate etc/default_skills/pwn from live PWN modules'
+desc 'Regenerate etc/default_skills/pwn from live PWN modules. Not a spec dependency: writing the checkout blocks git merge on upgrade.'
 task :module_skills do
   require 'pwn'
   PWN::ModuleSkills.refresh!
 end
-Rake::Task[:spec].enhance([:module_skills])

data/build_gem.sh

@@ -19,6 +19,20 @@ git config pull.rebase false
 # Sync fork with upstream to avoid merge conflicts and ensure we are building the latest codebase
 git remote -v | grep 'upstream' || git remote add upstream https://github.com/0dayinc/pwn.git
 git fetch upstream
+# Preserve legacy generated-skill changes before switching branches or merging.
+# Leave the stash saved: popping it would recreate the next upgrade conflict.
+generated_skills=()
+while IFS= read -r skill; do
+  [[ -f "$skill" ]] || continue
+  [[ "$skill" == */SKILL.md ]] || continue
+  grep -Eq '^[[:space:]]*generated:[[:space:]]*true[[:space:]]*$' "$skill" || continue
+  grep -Eq '^[[:space:]]*preserve:[[:space:]]*true[[:space:]]*$' "$skill" && continue
+  generated_skills+=("$skill")
+done < <(git diff --name-only HEAD -- etc/default_skills/pwn)
+if (( ${#generated_skills[@]} )); then
+  git stash push -m 'pwn upgrade: saved generated module skills' -- "${generated_skills[@]}"
+  printf '%s\n' 'Generated skill edits saved in git stash; not reapplied after upgrade.'
+fi
 git checkout master
 git merge upstream/master
 git pull

data/documentation/Installation.md

@@ -381,8 +381,27 @@ edited SOP `SKILL.md`). Generated module skills under `etc/default_skills/pwn/`
 `PWN::` module, plus `references/` when the source has CWE/NIST/URLs) are
 copied to `~/.pwn/skills/pwn/` and **are** overwritten on
 `pwn setup --migrate` / first launch so they stay in sync with `lib/pwn`.
-`bundle exec rake` runs `:module_skills` (`PWN::ModuleSkills.refresh!`)
-before spec so `etc/default_skills/pwn` matches live `PWN::` class methods.
+`bundle exec rake` does not rewrite `etc/default_skills/pwn`. `rake module_skills`
+is the explicit regenerate. A spec or rake run that writes the checkout
+leaves a local `SKILL.md` edit, and the next `upgrade_pwn.sh` merge aborts.
+The upgrade saves modified generated module `SKILL.md` files in a named Git
+stash before merging; it does not automatically reapply those stale files.
+Skills marked `preserve: true` and unrelated edits are left alone.
+
+For a clone already blocked before it can obtain this fix, no reclone is needed:
+
+```bash
+cd /opt/pwn
+git stash push -m 'pwn: preserve legacy generated skills before upgrade' -- etc/default_skills/pwn
+./upgrade_pwn.sh
+```
+
+The stash preserves the prior skill edits for review with `git stash list` and
+`git stash show -p`. Do not blindly pop it after upgrading: that restores stale
+generated files and can recreate the conflict. The one-time command saves all
+edits under that skill subtree, including any hand-edited skills; recover those
+selectively after reviewing them. Other local changes are not stashed.
+
 `pwn setup --migrate` and `pwn-ai` start copy that tree to `~/.pwn/skills/pwn`. Add at least one
 LLM engine key with the `pwn-vault` REPL command to enable `pwn-ai` - see
 [Configuration](Configuration.md). `pwn setup` will report the AI-engine

data/lib/pwn/version.rb

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

data/spec/lib/pwn/module_skills_spec.rb

@@ -3,8 +3,46 @@
 require 'spec_helper'
 require 'fileutils'
 require 'tmpdir'
+require 'open3'
 
 describe PWN::ModuleSkills do
+  it 'saves legacy generated edits and merges without discarding unrelated edits' do
+    script = File.read(File.expand_path('../../../build_gem.sh', __dir__))
+    recovery = script.split('generated_skills=()', 2).last.split('git checkout master', 2).first
+    Dir.mktmpdir('pwn_upgrade') do |dir|
+      git = lambda do |*args|
+        out, status = Open3.capture2e('git', *args, chdir: dir)
+        expect(status.success?).to be(true), out
+        out
+      end
+      git.call('init', '-b', 'master')
+      git.call('config', 'user.email', 'test@example.invalid')
+      git.call('config', 'user.name', 'Upgrade Test')
+      skill = 'etc/default_skills/pwn/json_text/SKILL.md'
+      path = File.join(dir, skill)
+      FileUtils.mkdir_p(File.dirname(path))
+      original = "---\ngenerated: true\n---\noriginal\n"
+      File.write(path, original)
+      File.write(File.join(dir, 'notes'), 'original')
+      git.call('add', '.')
+      git.call('commit', '-m', 'base')
+      git.call('checkout', '-b', 'incoming')
+      File.write(path, "#{original}upstream\n")
+      git.call('commit', '-am', 'update')
+      git.call('checkout', 'master')
+      File.write(path, "#{original}local regeneration\n")
+      File.write(File.join(dir, 'notes'), 'keep my edit')
+      _, blocked = Open3.capture2e('git', 'merge', '--ff-only', 'incoming', chdir: dir)
+      expect(blocked.success?).to be(false)
+      out, status = Open3.capture2e('bash', '-ec', "generated_skills=()#{recovery}", chdir: dir)
+      expect(status.success?).to be(true), out
+      git.call('merge', '--ff-only', 'incoming')
+      expect(File.read(path)).to eq("#{original}upstream\n")
+      expect(File.read(File.join(dir, 'notes'))).to eq('keep my edit')
+      expect(git.call('show', "stash@{0}:#{skill}")).to include('local regeneration')
+    end
+  end
+
   it 'should display information for authors' do
     expect(described_class).to respond_to :authors
   end
@@ -23,48 +61,50 @@ describe PWN::ModuleSkills do
     expect(described_class.relpath(source: 'pwn.rb')).to eq('pwn/SKILL.md')
   end
 
-  it 'refreshes etc/default_skills/pwn from every lib/pwn module' do
-    report = described_class.refresh!
-    expect(report[:modules]).to be > 50
-    tb = File.join(PWN::ModuleSkills::GEM_SKILLS, 'plugins', 'transparent_browser', 'SKILL.md')
-    expect(File.file?(tb)).to eq(true), tb
-    expect(File).not_to exist(File.join(PWN::ModuleSkills::GEM_SKILLS, 'plugins', 'transparent_browser.md'))
-    body = File.read(tb)
-    expect(body).to include('PWN::Plugins::TransparentBrowser')
-    expect(body).to include('open')
-    expect(body).not_to match(/hermes/i)
+  it 'refreshes a temp skill tree and does not rewrite the checkout' do
+    checkout = File.join(PWN::ModuleSkills::GEM_SKILLS, 'json_text', 'SKILL.md')
+    before = File.read(checkout)
+    Dir.mktmpdir('pwn_mod_refresh') do |dir|
+      report = described_class.refresh!(dest: dir)
+      expect(report[:modules]).to be > 50
+      tb = File.join(dir, 'pwn', 'plugins', 'transparent_browser', 'SKILL.md')
+      expect(File.file?(tb)).to eq(true), tb
+      expect(File).not_to exist(File.join(dir, 'pwn', 'plugins', 'transparent_browser.md'))
+      body = File.read(tb)
+      expect(body).to include('PWN::Plugins::TransparentBrowser')
+      expect(body).to include('open')
+      expect(body).not_to match(/hermes/i)
 
-    pw = File.join(PWN::ModuleSkills::GEM_SKILLS, 'sast', 'password', 'SKILL.md')
-    expect(File.file?(pw)).to eq(true), pw
-    expect(File.file?(File.join(PWN::ModuleSkills::GEM_SKILLS, 'sast', 'password', 'references', 'security.md'))).to eq(true)
+      pw = File.join(dir, 'pwn', 'sast', 'password', 'SKILL.md')
+      expect(File.file?(pw)).to eq(true), pw
+      expect(File.file?(File.join(dir, 'pwn', 'sast', 'password', 'references', 'security.md'))).to eq(true)
+
+      described_class.enumerate.each do |rec|
+        path = File.join(dir, described_class.relpath(source: rec[:source], const: rec[:const]))
+        expect(File.file?(path)).to eq(true), path
+        expect(File.read(path)).to include(rec[:const])
+        expect(File.read(path)).not_to match(/hermes/i)
+      end
+      drift = described_class.drift(dest: dir)
+      expect(drift[:missing]).to eq([])
+      expect(drift[:stale]).to eq([])
+      expect(drift[:orphans]).to eq([])
+    end
+    expect(File.read(checkout)).to eq(before)
 
     gw = File.join(PWN::ModuleSkills::GEM_SKILLS, 'plugins', 'google_workspace', 'SKILL.md')
     expect(File.read(gw)).to include('preserve: true')
     expect(File.read(gw)).to include('gmail_search')
     expect(File.read(gw)).to include('daily-brief.md')
     expect(File).not_to exist(File.join(PWN::Config.default_skills_dir, 'productivity', 'google-workspace', 'SKILL.md'))
-
-    described_class.enumerate.each do |rec|
-      path = File.join(
-        File.dirname(PWN::ModuleSkills::GEM_SKILLS),
-        described_class.relpath(source: rec[:source], const: rec[:const])
-      )
-      expect(File.file?(path)).to eq(true), path
-      expect(File.read(path)).to include(rec[:const])
-      expect(File.read(path)).not_to match(/hermes/i)
-    end
-    drift = described_class.drift
-    expect(drift[:missing]).to eq([])
-    expect(drift[:stale]).to eq([])
-    expect(drift[:orphans]).to eq([])
   end
 
-  it 'exposes drift so rake/spec can refuse a stale gem skill tree' do
-    expect(described_class).to respond_to(:drift)
+  it 'does not rewrite the checkout before spec' do
     rake = File.read(File.expand_path('../../../Rakefile', __dir__))
-    expect(rake).to match(/module_skills/)
+    expect(rake).to match(/task :module_skills do/)
     expect(rake).to match(/ModuleSkills\.refresh!/)
-    expect(rake).to match(/Task\[:spec\]\.enhance|task spec: :module_skills/)
+    expect(rake).not_to match(/Task\[:spec\]\.enhance\(\[:module_skills\]\)/)
+    expect(rake).not_to match(/module_skills_drift/)
   end
 
   it 'install overwrites existing generated module skills' do
@@ -83,7 +123,6 @@ describe PWN::ModuleSkills do
   end
 
   it 'ships no credential-shaped artifacts under etc/default_skills' do
-    described_class.refresh!
     rx = described_class.const_get(:ARTIFACT_RX)
     leftovers = []
     Dir.glob(File.join(PWN::Config.default_skills_dir, '**', '*')).each do |path|

data/third_party/pwn_rdoc.jsonl

@@ -3397,18 +3397,6 @@
 {"messages":[{"role":"user","content":"PWN::Plugins::REDB.strings Usage"},{"role":"assistant","content":"`PWN::Plugins::REDB.strings`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REDB.with_db Usage"},{"role":"assistant","content":"`PWN::Plugins::REDB.with_db`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REDB.xrefs_to Usage"},{"role":"assistant","content":"`PWN::Plugins::REDB.xrefs_to`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.add_commands Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.add_commands`: Supported Method Parameters\n\nPWN::Plugins::REPL.add_commands\n"}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.add_hooks Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.add_hooks`: Supported Method Parameters\n\nPWN::Plugins::REPL.add_hooks\n"}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.authors`: Author(s)\n\n0day Inc. <support@0dayinc.com>\n"}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.compact_context_tokens Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.compact_context_tokens`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.enable_autocomplete Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.enable_autocomplete`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.help Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.help`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.leave_special_mode! Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.leave_special_mode!`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.ready_tty! Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.ready_tty!`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.refresh_ps1_proc Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.refresh_ps1_proc`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.reset_reline_editor Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.reset_reline_editor`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.start Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.start`: Supported Method Parameters\n\nPWN::Plugins::REPL.start\n"}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL.process Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL.process`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AI.add_commands Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AI.add_commands`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AI.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AI.authors`: Author(s)\n\n0day Inc. <support@0dayinc.com>\n"}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AI.help Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AI.help`: "}]}
@@ -3677,13 +3665,6 @@
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh.authors`: Author(s)\n\n0day Inc. <support@0dayinc.com>\n"}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh.help Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh.help`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh.process Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh.process`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.install_pwn_mesh_completer! Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.install_pwn_mesh_completer!`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.mesh_menu_pick Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.mesh_menu_pick`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.mesh_reset_input! Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.mesh_reset_input!`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.persist_mesh_env Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.persist_mesh_env`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.pwn_mesh_complete Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.pwn_mesh_complete`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.pwn_mesh_dispatch_slash! Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.pwn_mesh_dispatch_slash!`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.pwn_mesh_menu_rows Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Mesh::PWN::Plugins::REPL.pwn_mesh_menu_rows`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::PWNMultiLineInput.new Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::PWNMultiLineInput.new`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::PWNMultiLineInput.ensure_tmux_extended_keys Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::PWNMultiLineInput.ensure_tmux_extended_keys`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::PWNMultiLineInput.ensure_vte_shift_enter Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::PWNMultiLineInput.ensure_vte_shift_enter`: "}]}
@@ -3692,10 +3673,6 @@
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::PWNMultiLineInput.reline_config Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::PWNMultiLineInput.reline_config`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::PWNMultiLineInput.tty? Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::PWNMultiLineInput.tty?`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::PWNMultiLineInput.winsize Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::PWNMultiLineInput.winsize`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Vault.add_commands Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Vault.add_commands`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Vault.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Vault.authors`: Author(s)\n\n0day Inc. <support@0dayinc.com>\n"}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Vault.help Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Vault.help`: "}]}
-{"messages":[{"role":"user","content":"PWN::Plugins::REPL::Vault.process Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::Vault.process`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::ROP.annotate Usage"},{"role":"assistant","content":"`PWN::Plugins::ROP.annotate`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::ROP.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::ROP.authors`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::ROP.canonical_register Usage"},{"role":"assistant","content":"`PWN::Plugins::ROP.canonical_register`: "}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.777
+  version: 0.5.778
 platform: ruby
 authors:
 - 0day Inc.
@@ -197,14 +197,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement