pwn 0.5.752 → 0.5.754

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f090409a234eeffe46292971f044bd3f6109da51d03e8fae5909d63aa625808
-  data.tar.gz: '082fcd50fde34da2c0bea93a7292a4925fd017e2526e07d6fcf8c9b29bb5db8c'
+  metadata.gz: e01b8e88574a241d780acc3e2c4d70a7e5c07fb1e9e17fa709363a4bfcbc7898
+  data.tar.gz: f50a1f5f35d25f300c396678edb5daa8119f4fca9e1567d71652c7f45bcc1dcb
 SHA512:
-  metadata.gz: 612c4b3a4d8f8311e231c2bbcceee5cd61280134157adc9f2132beb438ef65bbb698ed949aca56d19412414ed10c8540a1feab8327aaf14abcc71c33c2b23ccf
-  data.tar.gz: '09b64fed3ccd1e064a28b4874005e73549c8fbd7d60017dd6c552cce7bd6b45577dfb9202d7aecc54aa13456a2cdc847ef021850d387139bfa064fdc88fbc7d5'
+  metadata.gz: c34deaa7b6835b37cacb76a2863cb0759b4dc727301692014702468aa3d4a04ddc1c76fda3893005f58071b9060768ade05401dbbae1cac2fc3dbfc99bcfa9f0
+  data.tar.gz: de481a34a2b3776fa8003094618af168f6a33341fd236e14daa3247694e8e703e0eddb15ea74556e9bd4814a14a3187d48f51c18be90094f1bd4c83ddcd364b8

data/Gemfile

@@ -20,7 +20,7 @@ gem 'base32', '0.3.4'
 gem 'bitcoin-ruby', '0.0.20'
 gem 'brakeman', '8.0.6'
 gem 'bson', '5.2.0'
-gem 'bundler', '>=4.0.21'
+gem 'bundler', '>=4.0.22'
 gem 'bundler-audit', '>=0.9.3'
 gem 'bunny', '3.4.0'
 gem 'colorize', '1.1.0'
@@ -57,7 +57,7 @@ gem 'msfrpc-client', '1.1.2'
 gem 'netaddr', '2.0.6'
 gem 'net-ldap', '0.20.0'
 gem 'net-openvpn', '0.8.7'
-gem 'net-smtp', '0.5.1'
+gem 'net-smtp', '0.5.2'
 gem 'nexpose', '7.3.0'
 gem 'nokogiri', '1.19.4'
 gem 'nokogiri-diff', '0.3.0'

data/lib/pwn/ai/anthropic.rb

@@ -575,7 +575,7 @@ module PWN
             {
               name: fn[:name] || fn['name'],
               description: fn[:description] || fn['description'],
-              input_schema: fn[:parameters] || fn['parameters'] || { type: 'object', properties: {} }
+              input_schema: anthropic_input_schema(schema: fn[:parameters] || fn['parameters'])
             }
           end
           http_body[:tool_choice] = anth_tool_choice(choice: opts[:tool_choice]) if opts[:tool_choice]
@@ -598,6 +598,78 @@ module PWN
         raise e
       end
 
+      # Anthropic rejects oneOf, allOf, and anyOf at the root of input_schema.
+      # Return a deep copy with those root keys removed and branch properties merged.
+      # Nested combinators and the caller's schema stay unchanged.
+      private_class_method def self.anthropic_input_schema(opts = {})
+        schema = opts[:schema]
+        return { type: 'object', properties: {} } unless schema.is_a?(Hash)
+
+        copy = json_copy(value: schema)
+        notes = []
+        %w[anyOf oneOf allOf].each do |name|
+          key = anthropic_schema_key(schema: copy, name: name)
+          next unless key
+
+          Array(copy.delete(key)).each do |branch|
+            next unless branch.is_a?(Hash)
+
+            anthropic_schema_notes(branch: branch, notes: notes)
+            props = branch[:properties] || branch['properties']
+            next unless props.is_a?(Hash)
+
+            dest = copy.key?('properties') ? 'properties' : :properties
+            copy[dest] = {} unless copy[dest].is_a?(Hash)
+            props.each { |prop, spec| copy[dest][prop] = spec unless copy[dest].key?(prop) }
+          end
+        end
+        copy[:type] = 'object' unless copy.key?(:type) || copy.key?('type')
+        copy[:properties] = {} unless copy.key?(:properties) || copy.key?('properties')
+        unless notes.empty?
+          note = "One of these field sets is required: #{notes.uniq.join('; ')}."
+          copy[:description] = [copy[:description] || copy['description'], note].compact.reject { |part| part.to_s.empty? }.join(' ')
+          copy.delete('description')
+        end
+        copy
+      end
+
+      private_class_method def self.anthropic_schema_notes(opts = {})
+        branch = opts[:branch]
+        notes = opts[:notes]
+        return notes unless branch.is_a?(Hash) && notes.is_a?(Array)
+
+        required = branch[:required] || branch['required']
+        notes << required.join('+') if required.is_a?(Array) && required.any?
+        %w[anyOf oneOf allOf].each do |name|
+          key = anthropic_schema_key(schema: branch, name: name)
+          next unless key
+
+          Array(branch[key]).each { |child| anthropic_schema_notes(branch: child, notes: notes) }
+        end
+        notes
+      end
+
+      private_class_method def self.anthropic_schema_key(opts = {})
+        schema = opts[:schema]
+        name = opts[:name]
+        return name if schema.is_a?(Hash) && schema.key?(name)
+        return name.to_sym if schema.is_a?(Hash) && schema.key?(name.to_sym)
+
+        nil
+      end
+
+      private_class_method def self.json_copy(opts = {})
+        value = opts[:value]
+        case value
+        when Hash
+          value.each_with_object({}) { |(key, item), out| out[key] = json_copy(value: item) }
+        when Array
+          value.map { |item| json_copy(value: item) }
+        else
+          value.is_a?(String) ? value.dup : value
+        end
+      end
+
       # OpenAI messages[] -> [system_string, anthropic messages[]]
       private_class_method def self.oa_messages_to_anthropic(opts = {})
         messages = opts[:messages] ||= []

data/lib/pwn/plugins/repl/ai_console.rb

@@ -1070,10 +1070,10 @@ module PWN
             role = cfg[:system_role_content].to_s.gsub(/\s+/, ' ').strip
             parts = []
             parts << "SYSTEM ROLE CONTENT: #{role}" unless role.empty?
-            parts << "\nTEMP: #{cfg[:temp]}" unless cfg[:temp].nil?
-            parts << " MAX TOKENS: #{cfg[:max_tokens]}" unless cfg[:max_tokens].nil?
+            parts << "\nMAX TOKENS: #{cfg[:max_tokens]}" unless cfg[:max_tokens].nil?
             parts << " MAX PROMPT LENGTH: #{cfg[:max_prompt_length]}" unless cfg[:max_prompt_length].nil?
-            parts << "\nREASONING EFFORT: #{cfg[:reasoning_effort]}" unless cfg[:reasoning_effort].to_s.empty?
+            parts << " REASONING EFFORT: #{cfg[:reasoning_effort]}" unless cfg[:reasoning_effort].to_s.empty?
+            parts << " TEMP: #{cfg[:temp]}" unless cfg[:temp].nil?
             parts.join(' · ')
           rescue StandardError
             ''

data/lib/pwn/version.rb

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

data/spec/lib/pwn/ai/anthropic_spec.rb

@@ -58,4 +58,52 @@ describe PWN::AI::Anthropic do
       expect(src).to include('PromptCache.enabled?')
     end
   end
+
+  it 'drops root combinators from Anthropic input_schema without mutating registry schemas' do
+    allow(PWN::Env).to receive(:[]).with(:ai).and_return(
+      anthropic: { key: 'test-key', model: 'claude-test', temp: 1, max_tokens: 100 }
+    )
+    allow(PWN::AI::Agent::PromptCache).to receive(:enabled?).and_return(false) if defined?(PWN::AI::Agent::PromptCache)
+    tools = PWN::AI::Agent::Registry.definitions(core_only: true)
+    artifact = tools.find { |tool| tool.dig(:function, :name) == 'artifact_read' }
+    original = artifact[:function][:parameters]
+    nested = {
+      type: 'object',
+      properties: {
+        item: { anyOf: [{ type: 'string' }, { type: 'object', properties: { handle: { type: 'string' } } }] }
+      }
+    }
+    union = {
+      'anyOf' => [
+        { 'type' => 'object', 'properties' => { 'handle' => { 'type' => 'string' } }, 'required' => ['handle'] },
+        { 'type' => 'object', 'properties' => { 'path' => { 'type' => 'string' } }, 'required' => ['path'] }
+      ]
+    }
+    sent = tools + [
+      { type: 'function', function: { name: 'nested_union', description: 'keep nested', parameters: nested } },
+      { type: 'function', function: { name: 'root_union', description: 'flatten', parameters: union } }
+    ]
+    captured = nil
+    allow(described_class).to receive(:anthropic_rest_call) do |opts|
+      captured = opts[:http_body]
+      '{"id":"msg_schema","type":"message","role":"assistant","content":[{"type":"text","text":"ok"}],"stop_reason":"end_turn"}'
+    end
+
+    described_class.chat_with_tools(messages: [{ role: 'user', content: 'hello' }], tools: sent, model: 'claude-test')
+
+    expect(original).to have_key(:anyOf)
+    wire = captured[:tools]
+    expect(wire.map { |tool| tool[:name] }[10]).to eq('artifact_read')
+    wire.each do |tool|
+      schema = tool[:input_schema]
+      expect(schema.keys.map(&:to_s)).not_to include('anyOf', 'oneOf', 'allOf')
+    end
+    read_schema = wire[10][:input_schema]
+    expect(read_schema[:properties].keys.map(&:to_s)).to include('handle', 'path', 'ref')
+    expect(read_schema[:description]).to include('handle', 'path', 'ref')
+    expect(wire.find { |tool| tool[:name] == 'nested_union' }[:input_schema][:properties][:item]).to have_key(:anyOf)
+    flat = wire.find { |tool| tool[:name] == 'root_union' }[:input_schema]
+    expect(flat[:properties].keys.map(&:to_s)).to include('handle', 'path')
+    expect(flat[:description]).to include('handle', 'path')
+  end
 end

data/spec/lib/pwn/plugins/repl/ai_console_spec.rb

@@ -535,10 +535,10 @@ describe 'pwn-ai curses launch' do # rubocop:disable Metrics/BlockLength -- publ
       expect(console.instance_variable_get(:@header_text_column)).to eq(2)
     end
     allow(curses).to receive_messages(cols: 120, lines: 26)
-    PWN::Env[:ai][:ollama][:system_role_content] = 'operator ' * 110
+    PWN::Env[:ai][:ollama][:system_role_content] = 'operator ' * 200
     console.draw
     expect(console.instance_variable_get(:@header_text_column)).to eq(2)
-    expect(console.header_lines('ollama', 'fixture', 115).length).to be <= 13
+    expect(console.header_lines('ollama', 'fixture', 115).length).to be > 16
     expect(PWN::Banner).to have_received(:mini_cells).once
     expect([console.instance_variable_get(:@editor).text, console.instance_variable_get(:@editor).cursor]).to eq(['retained draft', 4])
   end
@@ -719,13 +719,15 @@ describe 'pwn-ai curses launch' do # rubocop:disable Metrics/BlockLength -- publ
       expect(actual).to eq(lines)
       expect(header.select { |entry| entry[3] == console.tone(:category) }.map { |entry| entry[2] }.join).to include('SYSTEM ROLE CONTENT:', 'MAX PROMPT LENGTH:', 'REASONING EFFORT:')
       expect(header.select { |entry| entry[3] == console.tone(:header) }.map { |entry| entry[2] }.join).to include('operator', '1024', 'high')
-      if columns == 48
-        labels = header.select { |entry| entry[3] == console.tone(:category) }.map { |entry| entry[2] }
-        expect(labels.join).to include('MAX PROMPT LENGTH:')
-        expect(labels).not_to include(a_string_including('MAX PROMPT LENGTH:'))
-      end
       expect(console.instance_variable_get(:@page_size)).to be >= 1
     end
+    console.header_lines('ollama', 'fixture', 35)
+    labels = []
+    console.instance_variable_get(:@header_spans).each do |row|
+      row.each { |role, text| labels << text if role == :category }
+    end
+    expect(labels.join).to include('MAX PROMPT LENGTH:')
+    expect(labels).not_to include(a_string_including('MAX PROMPT LENGTH:'))
     console.handle("\u000f")
     console.draw
     console.handle(:end)
@@ -1238,7 +1240,9 @@ describe 'pwn-ai curses launch' do # rubocop:disable Metrics/BlockLength -- publ
       if rendered_header.include?('worker-effort')
         expect(rendered_header).to include('worker settings role', '0.42', '4321', '8765')
         expect(painted).to include([a_kind_of(Integer), a_kind_of(Integer), 'MODEL:', 7])
-        expect(painted).to include([a_kind_of(Integer), a_kind_of(Integer), ' worker-effort', 6])
+        value = painted.find { |_y, _x, text, color| color == 6 && text.to_s.include?('worker-effort') }
+        expect(value).not_to be_nil
+        expect(value[2]).not_to include('REASONING EFFORT:')
         "\u0004"
       else
         Thread.pass

data/third_party/pwn_rdoc.jsonl

@@ -1058,13 +1058,17 @@
 {"messages":[{"role":"user","content":"PWN::AI::Agent::VulnGen.authors Usage"},{"role":"assistant","content":"`PWN::AI::Agent::VulnGen.authors`: Author(s)\n\n0day Inc. <support@0dayinc.com>\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::VulnGen.help Usage"},{"role":"assistant","content":"`PWN::AI::Agent::VulnGen.help`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.anth_tool_choice Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.anth_tool_choice`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::Anthropic.anthropic_input_schema Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.anthropic_input_schema`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.anthropic_resp_to_oa Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.anthropic_resp_to_oa`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.anthropic_rest_call Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.anthropic_rest_call`: Supported Method Parameters\n\nanthropic_rest_call(\n\ntoken: 'required - anthropic api key',\nhttp_method: 'optional HTTP method (defaults to GET)',\nbase_uri: 'optional base anthropic api URI (defaults to https://api.anthropic.com/v1)',\nrest_call: 'required rest call to make per the schema',\nparams: 'optional params passed in the URI or HTTP Headers',\nhttp_body: 'optional HTTP body sent in HTTP methods that support it e.g. POST',\ntimeout: 'optional timeout in seconds (defaults to 900)',\nspinner: 'optional - display spinner (defaults to false)'\n\n)\n"}]}
+{"messages":[{"role":"user","content":"PWN::AI::Anthropic.anthropic_schema_key Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.anthropic_schema_key`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::Anthropic.anthropic_schema_notes Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.anthropic_schema_notes`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.authors Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.authors`: Author(s)\n\n0day Inc. <support@0dayinc.com>\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.chat Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.chat`: Supported Method Parameters\n\nresponse = PWN::AI::Anthropic.chat(\n\nrequest: 'required - message to Anthropic',\nmodel: 'optional - model to use for text generation (defaults to PWN::Env[:ai][:anthropic][:model])',\ntemp: 'optional - creative response float (defaults to PWN::Env[:ai][:anthropic][:temp])',\nsystem_role_content: 'optional - context to set up the model behavior for conversation (Default: PWN::Env[:ai][:anthropic][:system_role_content])',\nresponse_history: 'optional - pass response back in to have a conversation',\nspeak_answer: 'optional speak answer using PWN::Plugins::Voice.text_to_speech (Default: nil)',\ntimeout: 'optional timeout in seconds (defaults to 900)',\nspinner: 'optional - display spinner (defaults to false)'\n\n)\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.chat_with_tools Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.chat_with_tools`: Supported Method Parameters\n\nresponse = PWN::AI::Anthropic.chat_with_tools(\n\nmessages: 'required - OpenAI-format messages array (system/user/assistant/tool)',\ntools: 'optional - OpenAI tools array [{type:\"function\", function:{...}}]',\ntool_choice: 'optional - \"auto\" | \"none\" | \"required\" | {type:\"function\", function:{name:..}}',\nmodel: 'optional - overrides PWN::Env[:ai][:anthropic][:model]',\ntemp: 'optional - temperature (defaults to PWN::Env[:ai][:anthropic][:temp] || 1)',\nmax_tokens: 'optional - defaults to PWN::Env[:ai][:anthropic][:max_tokens] || 128_000',\ntimeout: 'optional - seconds (default 900)',\nspinner: 'optional - display spinner (default false)'\n\n)\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.get_models Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.get_models`: Supported Method Parameters\n\nmodels = PWN::AI::Anthropic.get_models\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.help Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.help`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::Anthropic.json_copy Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.json_copy`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.jwt_exp Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.jwt_exp`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.oa_messages_to_anthropic Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.oa_messages_to_anthropic`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Anthropic.oauth_token_expiring? Usage"},{"role":"assistant","content":"`PWN::AI::Anthropic.oauth_token_expiring?`: "}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.752
+  version: 0.5.754
 platform: ruby
 authors:
 - 0day Inc.
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.21
+        version: 4.0.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.21
+        version: 4.0.22
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -617,14 +617,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: nexpose
   requirement: !ruby/object:Gem::Requirement
@@ -7228,7 +7228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Automated Security Testing for CI/CD Pipelines & Beyond
 test_files: []