pwn 0.5.746 → 0.5.748

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aacb6a992222f92a5a198def002962a7f92105b68489ae2a9dd01fb9207332f9
-  data.tar.gz: d48b7f1c97a7a18bba283685075d887d9e539280abe3cc41064a88374e9bf355
+  metadata.gz: 02f94f46fc7627fd28e1b815d61a9ff8988739c4394054e21fd7001e0cbedb1b
+  data.tar.gz: ee53f4520e4d847623db8918e3ece5c182939d17a0e8ba9984be8d98ed21237e
 SHA512:
-  metadata.gz: 614149c9170c27dad853ec23b90f3990ae9182001bd6d2b7e4b919095a003bc2b85b949946c834e32052e37ba0f4b785c59adbaeb127a1f90298025ec657cfe6
-  data.tar.gz: 40f3119856e9a6965b5977494fcb1afb4ea8ef13f226a7044353232be87a46dda4bd4970b6806677d327e18e53af6bb328852bd170fd4c9095821b8947222a5f
+  metadata.gz: 6c0ee2ce5915bebaea32f40413080d0c36ed34547911deee16f7dab729f238c0fc5e7352152c5764618925a882c7046bd5b1bb5f2ae35bb23d4be3ce847498f5
+  data.tar.gz: 032bb3d28b79afd00223158af6b2747d16fb7101b6a852dbe356ccf961d813906c44b1d0efb2972020c82f48a8518b3317f804a955a5a4f6682b153377b1161c

data/Gemfile

@@ -50,7 +50,7 @@ gem 'libusb', '0.8.0'
 gem 'luhn', '3.0.0'
 gem 'mail', '2.9.1'
 gem 'mcp', '1.6.0'
-gem 'meshtastic', '0.0.184'
+gem 'meshtastic', '0.0.186'
 gem 'metasm', '1.0.6'
 gem 'mongo', '2.26.0'
 gem 'msfrpc-client', '1.1.2'
@@ -77,7 +77,7 @@ gem 'rbvmomi2', '3.10.0'
 gem 'rdoc', '7.0.4'
 gem 'rest-client', '2.1.0'
 gem 'rex', '2.0.13'
-gem 'rmagick', '7.1.4'
+gem 'rmagick', '7.1.5'
 gem 'rqrcode', '3.2.0'
 gem 'rspec', '3.13.2'
 gem 'rtesseract', '3.1.4'

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

@@ -149,11 +149,14 @@ module PWN
           end
         end
         PWN_MESH_TRANSPORTS = %i[serial bluetooth tcp mqtt].freeze
-        # meshtastic 0.0.184 loses protobuf defaults in Data#to_h. Empty
-        # decoded data is not an unsupported application payload.
+        # meshtastic 0.0.184 Data#to_h omits empty payload bytes, and an
+        # unknown PortNum stays an integer (51 is not in the enum). That is
+        # not an undecodable application payload. Bytes on an unsupported
+        # port still warn.
         EMPTY_DATA_DECODER = Module.new do
           define_method(:decode_payload) do |opts = {}|
-            return nil if opts[:payload].nil? && opts[:msg_type].nil?
+            payload = opts[:payload]
+            return nil if payload.nil? || payload == ''
 
             super(opts)
           end
@@ -1140,6 +1143,9 @@ module PWN
             text = opts[:text].to_s.dup.force_encoding(Encoding::UTF_8).scrub
             text.gsub!(/\e\[[0-9;?]*[A-Za-z]/, '')
             text.gsub!(/[\x00-\x08\x0b\x0c\x0e-\x1f]/, '')
+            # Serial.subscribe prints this on startup. It is not a diagnostic,
+            # and capturing it opens a NOTICE before the TUI can be used.
+            text.gsub!('Subscribing to serial FromRadio stream...', '')
             text.strip!
             text.empty? ? nil : text
           end

data/lib/pwn/version.rb

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

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

@@ -18,8 +18,26 @@ describe PWN::Plugins::REPL, 'mesh compose history' do
     described_class.send(:mesh_subscribe, obj: { from_radio_queue: queue }, psks: {}, on_message: proc { |message| received << message })
     expect(received.size).to eq(2)
     expect(output.string).not_to include("Can't decode")
-    Meshtastic::MeshInterface.new.decode_payload(payload: 'unsupported', msg_type: :PRIVATE_APP)
-    expect(output.string).to include("Can't decode", 'unsupported')
+    # meshtastic 0.0.186 returns unknown application bytes instead of warning.
+    decoded = Meshtastic::MeshInterface.new.decode_payload(payload: 'unsupported', msg_type: :PRIVATE_APP)
+    expect(decoded).to eq('unsupported')
+    expect(output.string).not_to include("Can't decode")
+  ensure
+    $stdout = old
+  end
+
+  it 'does not warn when a packet has an unknown portnum and no payload' do
+    stub_const('PWN::MeshTransport', :serial)
+    queue = Queue.new
+    encoded = Meshtastic::FromRadio.new(packet: { decoded: Meshtastic::Data.new(portnum: 51) }).to_proto
+    queue << Meshtastic::FromRadio.decode(encoded)
+    queue.close
+    output = StringIO.new
+    old = $stdout
+    $stdout = output
+    described_class.send(:mesh_subscribe, obj: { from_radio_queue: queue }, psks: {}, on_message: proc { |_message| })
+    expect(output.string).not_to include("Can't decode")
+    expect(output.string).not_to include('portnum: 51')
   ensure
     $stdout = old
   end
@@ -69,6 +87,25 @@ describe PWN::Plugins::REPL, 'mesh compose history' do
     expect(events).to be_empty
   end
 
+  it 'does not open a notice for the serial subscribe banner' do
+    events = Queue.new
+    stub_const('PWN::MeshEvents', events)
+    described_class.send(:mesh_capture_output, run: proc {
+      puts 'Subscribing to serial FromRadio stream...'
+    })
+    expect(events).to be_empty
+  end
+
+  it 'keeps a warning that shares a chunk with the serial subscribe banner' do
+    events = Queue.new
+    stub_const('PWN::MeshEvents', events)
+    described_class.send(:mesh_capture_output, run: proc {
+      $stdout.write("Subscribing to serial FromRadio stream...\nWARNING: decoder fixture\n")
+    })
+    expect(events.pop(true)[:notice]).to eq('WARNING: decoder fixture')
+    expect(events).to be_empty
+  end
+
   it 'captures dependency stdout and stderr and restores both streams on failure' do
     events = Queue.new
     stub_const('PWN::MeshEvents', events)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.746
+  version: 0.5.748
 platform: ruby
 authors:
 - 0day Inc.
@@ -519,14 +519,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.184
+        version: 0.0.186
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.184
+        version: 0.0.186
 - !ruby/object:Gem::Dependency
   name: metasm
   requirement: !ruby/object:Gem::Requirement
@@ -897,14 +897,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.1.5
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement