pwn 0.5.774 → 0.5.776

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcf08f4e689259063fd8b459d824890336bda15e3756416871cff38a21135730
-  data.tar.gz: cf3c78ae724f5fbf5702510ef6d7cd13800bbdba292a8613cf25d5216200da5d
+  metadata.gz: 2a6df0a18952a14c2cd3acf7263a3e3393fb1406bf04d742fb80706b094a73df
+  data.tar.gz: abbe212e8cdfa3e4bc042b817092f05fa68ce20518587f432120563822049544
 SHA512:
-  metadata.gz: 7bbf2b429a197fc2a5157764d50bc7e3c890351035f306fe46426362b5dd9925890135168ff6b6a49af0fa75f18943b6929dfa2b83c21f017d3560dc294cbb4b
-  data.tar.gz: '08eb6976dc48727a1baab7625500b214b30f1f1ffe3185c561b7bd9b8ceed18a827017b797280f67c986f29ad70d28c2c46c0c77168193b0aaeae7d054f84ac2'
+  metadata.gz: 19dea9476ce02f9c29d35783856054e8a4910dbe6e1366a96c280e9e76864274e5fe5b119f8d17d76937dba828f16407ebd4ab1be50e7bdbec11be39e7e6cb69
+  data.tar.gz: b7d5a2ae8f764dd3ffbf3cf2d73aa3a995f896b722279bae74e438ccabef6ac9571ace8f3bb5eddbf227cd2af105a847fa1b8967902de23030151ce4fe2d9bc7

data/etc/default_skills/pwn/json_text/SKILL.md

@@ -0,0 +1,47 @@
+---
+name: pwn-jsontext
+description: Drive PWN::JSONText from pwn_eval.
+license: MIT
+allowed-tools: [pwn, pwn_eval]
+metadata:
+  bundled: true
+  generated: true
+  module: PWN::JSONText
+  source: pwn/json_text.rb
+---
+
+# PWN::JSONText
+
+Retag or scrub strings before the JSON generator sees them.
+
+## When to use
+
+Call `PWN::JSONText` from `pwn_eval` when the task needs this module.
+Do not reimplement it in shell.
+
+## Methodologies
+
+Generated from `pwn/json_text.rb`. Prefer the public class methods below.
+Class methods take `(opts = {})` and read `opts`.
+
+## How to call
+
+```ruby
+PWN::JSONText.help
+PWN::JSONText.prepare(opts)
+```
+
+## Public methods
+
+- `prepare`
+- `authors`
+- `help`
+
+## Source
+
+`pwn/json_text.rb`
+
+## Verification
+
+`PWN::JSONText.respond_to?(:prepare)` after the
+module is loaded. Read the source for parameter names.

data/lib/pwn/json_text.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+# Retag or scrub strings before the JSON generator sees them.
+module PWN
+  # json 2.21 warns when valid UTF-8 is still tagged BINARY, and raises
+  # JSON::GeneratorError on a malformed sequence. Both show up in the session pane.
+  module JSONText
+    # Supported Method Parameters::
+    # safe = PWN::JSONText.prepare(
+    #   value: 'required - string, hash, or array that may contain binary-tagged text',
+    #   depth: 'optional - nesting already walked; containers stop at 100'
+    # )
+
+    public_class_method def self.prepare(opts = {})
+      value = opts[:value]
+      depth = opts[:depth].to_i
+      case value
+      when String
+        utf = value.dup.force_encoding(Encoding::UTF_8)
+        utf.valid_encoding? ? utf : utf.scrub
+      when Hash
+        return value if depth >= 100
+
+        value.each_with_object({}) do |(key, item), out|
+          out[key.is_a?(String) ? prepare(value: key, depth: depth + 1) : key] = prepare(value: item, depth: depth + 1)
+        end
+      when Array
+        return value if depth >= 100
+
+        value.map { |item| prepare(value: item, depth: depth + 1) }
+      else
+        value
+      end
+    end
+
+    # Author(s):: 0day Inc. <support@0dayinc.com>
+
+    public_class_method def self.authors
+      "AUTHOR(S):\n  0day Inc. <support@0dayinc.com>\n"
+    end
+
+    # Display Usage for this Module.
+
+    public_class_method def self.help
+      puts "USAGE:
+        # Retag valid UTF-8 that is still tagged binary, or scrub an illegal sequence.
+        #{self}.prepare(
+          value: 'required - string, hash, or array that may contain binary-tagged text',
+          depth: 'optional - nesting already walked; containers stop at 100'
+        )
+
+        # Print the AUTHOR(S) string for this module.
+        #{self}.authors
+      "
+      constants.sort
+    end
+  end
+end
+
+# json 2.21 warns inside JSON.generate before State.generate. json 2.18 warns
+# inside the C to_json methods. Retag at both doors.
+class << JSON
+  %i[generate fast_generate pretty_generate dump].each do |name|
+    alias_method :"#{name}_without_json_text", name
+    define_method(name) do |obj, *rest|
+      public_send(:"#{name}_without_json_text", PWN::JSONText.prepare(value: obj), *rest)
+    end
+  end
+end
+
+if defined?(JSON::Ext::Generator::GeneratorMethods)
+  JSON::Ext::Generator::GeneratorMethods.constants.each do |kind|
+    mod = JSON::Ext::Generator::GeneratorMethods.const_get(kind)
+    next unless mod.is_a?(Module) && mod.method_defined?(:to_json)
+
+    mod.class_eval do
+      alias_method :to_json_without_json_text, :to_json unless method_defined?(:to_json_without_json_text)
+      define_method(:to_json) do |*rest|
+        prepared = PWN::JSONText.prepare(value: self)
+        mod.instance_method(:to_json_without_json_text).bind_call(prepared, *rest)
+      end
+    end
+  end
+end

data/lib/pwn/version.rb

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

data/lib/pwn.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'pwn/json_text'
 require 'pwn/runtime_fingerprint'
 require 'pwn/version'
 require 'yaml'

data/spec/lib/pwn/ai/agent/result_spec.rb

@@ -40,6 +40,27 @@ describe PWN::AI::Agent::Result do
     expect(described_class.utf8_text(text: text)).to eq("status \u2022 ok")
   end
 
+  it 'does not warn or raise when JSON.generate sees binary-tagged or malformed text' do
+    require 'pwn'
+    binary = "status \u2022 ok".b
+    malformed = "\xff\xfe".b
+    err = +''
+    prev = $stderr
+    $stderr = StringIO.new
+    generated = JSON.generate(stdout: binary)
+    dumped = JSON.dump(stdout: binary.dup)
+    wired = { stdout: binary.dup }.to_json
+    scrubbed = JSON.generate(stdout: malformed)
+    err = $stderr.string
+    expect(err).not_to include('UTF-8 string passed as BINARY')
+    expect(generated).to include('status')
+    expect(dumped).to include('status')
+    expect(wired).to include('status')
+    expect { JSON.parse(scrubbed) }.not_to raise_error
+  ensure
+    $stderr = prev
+  end
+
   it 'preserves the JSON nesting boundary for finite valid results' do
     value = 'leaf'
     100.times { value = [value] }

data/spec/lib/pwn/json_text_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe PWN::JSONText do
+  it 'should display information for authors' do
+    expect(described_class).to respond_to :authors
+  end
+
+  it 'should display information for existing help method' do
+    expect(described_class).to respond_to :help
+  end
+
+  it 'retags binary UTF-8 and scrubs malformed bytes before JSON encode' do
+    binary = "status \u2022 ok".b
+    malformed = "\xff\xfe".b
+    prev = $stderr
+    $stderr = StringIO.new
+    generated = JSON.generate(stdout: binary)
+    dumped = JSON.dump(stdout: binary.dup)
+    wired = { stdout: binary.dup }.to_json
+    scrubbed = JSON.generate(stdout: malformed)
+    err = $stderr.string
+    expect(err).not_to include('UTF-8 string passed as BINARY')
+    expect(generated).to include('status')
+    expect(dumped).to include('status')
+    expect(wired).to include('status')
+    expect { JSON.parse(scrubbed) }.not_to raise_error
+    expect(described_class.prepare(value: binary)).to eq("status \u2022 ok")
+  ensure
+    $stderr = prev
+  end
+end

data/third_party/pwn_rdoc.jsonl

@@ -818,6 +818,8 @@
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Result.spill_summary Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Result.spill_summary`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Result.token_limit Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Result.token_limit`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Result.transport_value Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Result.transport_value`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::Agent::Result.utf8_text Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Result.utf8_text`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::Agent::Result.utf8_value Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Result.utf8_value`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Reward.agent_flag Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Reward.agent_flag`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Reward.annotate_session Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Reward.annotate_session`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Reward.atomic_write Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Reward.atomic_write`: "}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.774
+  version: 0.5.776
 platform: ruby
 authors:
 - 0day Inc.
@@ -5234,6 +5234,7 @@ files:
 - etc/default_skills/pwn/ffi/soapy_sdr/SKILL.md
 - etc/default_skills/pwn/ffi/stdio/SKILL.md
 - etc/default_skills/pwn/ffi/volk/SKILL.md
+- etc/default_skills/pwn/json_text/SKILL.md
 - etc/default_skills/pwn/memory/SKILL.md
 - etc/default_skills/pwn/memory_index/SKILL.md
 - etc/default_skills/pwn/migrate/SKILL.md
@@ -6239,6 +6240,7 @@ files:
 - lib/pwn/ffi/soapy_sdr.rb
 - lib/pwn/ffi/stdio.rb
 - lib/pwn/ffi/volk.rb
+- lib/pwn/json_text.rb
 - lib/pwn/memory.rb
 - lib/pwn/memory_index.rb
 - lib/pwn/migrate.rb
@@ -6931,6 +6933,7 @@ files:
 - spec/lib/pwn/ffi/stdio_spec.rb
 - spec/lib/pwn/ffi/volk_spec.rb
 - spec/lib/pwn/ffi_spec.rb
+- spec/lib/pwn/json_text_spec.rb
 - spec/lib/pwn/memory_index_spec.rb
 - spec/lib/pwn/memory_spec.rb
 - spec/lib/pwn/migrate_spec.rb