pwn 0.5.778 → 0.5.779

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd715a7f2fae3e39f56f1c2e0d47629de11144461591acbfcbc7399e8a1da9a
-  data.tar.gz: 80b713ca6f117ba5f9862416f2796f777e3c4a1e1bba68fdf05fda02ea758635
+  metadata.gz: 7dd747b247b7c7039df9bba24c9542ecd37b65df6c650b09730ce6b9803d599b
+  data.tar.gz: b355d2d146e6b26c833319ac265b76e8fa3fe85892ff53e7c78e1f0238daf067
 SHA512:
-  metadata.gz: e17ff89a41133b10913a559880f90220940fa02ae6e74694e6c914d1c74af793d94907b05bd5655f7a9ee27afac498e896888c2d8a0c206381e7910ed8233dca
-  data.tar.gz: acc1ceac0c1e58354e730a115e06d312d5873cabaf1775ab7f39149ebfa99bb20094e83eae12b9e33108d046bcba61ab0887b7c869471fe9c0a9c655d29a2c72
+  metadata.gz: 6f594c419c8095b788c397b64dcaa417a8efbc3992007b40079f121d93a8dc6ee67b3b41bb5bf48526e55720d99f2fe7cad5ae1fb5a563d71421a866240c4f04
+  data.tar.gz: 87e8e462103a8954fd94e9859fbde5e528d1f6803e3dda5abdadbe0e58524a56125fc084747edf0171289b99f84bfcc75d65d5ff4ac10d95d2d44cfe9d002205

data/Gemfile

@@ -69,7 +69,7 @@ gem 'packetfu', '2.0.0'
 gem 'packetgen', '4.1.1'
 gem 'pdf-reader', '2.16.0'
 gem 'pg', '1.7.0'
-gem 'pry', '0.16.0'
+gem 'pry', '0.16.1'
 gem 'pry-doc', '1.7.0'
 gem 'rake', '13.4.2'
 gem 'rb-readline', '0.5.5'
@@ -94,7 +94,7 @@ gem 'selenium-webdriver', '4.51.0'
 gem 'slack-ruby-client', '3.3.0'
 gem 'socksify', '1.8.1'
 gem 'spreadsheet', '1.3.5'
-gem 'sqlite3', '2.10.0'
+gem 'sqlite3', '2.10.1'
 gem 'thin', '2.0.1'
 gem 'tty-prompt', '0.23.1'
 gem 'tty-spinner', '0.9.3'

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

@@ -2624,9 +2624,9 @@ class << PWN::Plugins::REPL # rubocop:disable Metrics/ClassLength
     value = opts[:value].to_s
     value = '—' if value.empty?
     prefix = "#{opts[:label]}: "
-    return [{ text: "#{prefix}#{value}" }] if Unicode::DisplayWidth.of("#{prefix}#{value}") <= width
+    return [{ text: "#{prefix}#{value}", label: prefix.rstrip }] if Unicode::DisplayWidth.of("#{prefix}#{value}") <= width
 
-    [{ text: prefix.rstrip }].concat(mesh_wrap_text(text: value, width: width).map { |line| { text: line } })
+    [{ text: prefix.rstrip, label: prefix.rstrip }].concat(mesh_wrap_text(text: value, width: width).map { |line| { text: line } })
   end
 
   def mesh_gps_labeled_rows(opts = {})
@@ -2637,9 +2637,9 @@ class << PWN::Plugins::REPL # rubocop:disable Metrics/ClassLength
     coord, url = label.split(' >> ', 2)
     prefix = 'GPS: '
     if Unicode::DisplayWidth.of("#{prefix}#{coord}") <= width
-      [{ text: "#{prefix}#{coord}", link: true, link_at: prefix.length, url: url }]
+      [{ text: "#{prefix}#{coord}", label: 'GPS:', link: true, link_at: prefix.length, url: url }]
     else
-      [{ text: 'GPS:' }, { text: coord, link: true, url: url }]
+      [{ text: 'GPS:', label: 'GPS:' }, { text: coord, link: true, url: url }]
     end
   end
 
@@ -2964,7 +2964,12 @@ class << PWN::Plugins::REPL # rubocop:disable Metrics/ClassLength
           at = line[:link_at].to_i
           prefix = text[0, at].to_s
           coord = text[at..] || ''
-          win.addstr(prefix) unless prefix.empty?
+          unless prefix.empty?
+            win.attron(Curses.color_pair(24) | Curses::A_BOLD)
+            win.addstr(prefix.rstrip)
+            win.attroff(Curses.color_pair(24) | Curses::A_BOLD)
+            win.addstr(prefix[prefix.rstrip.length..])
+          end
           win.attron(Curses::A_UNDERLINE)
           win.addstr(coord)
           win.attroff(Curses::A_UNDERLINE)
@@ -2973,9 +2978,11 @@ class << PWN::Plugins::REPL # rubocop:disable Metrics/ClassLength
           hit[:pane] = opts[:pane]
           opts[:hits] << hit
         elsif line[:label] && win.respond_to?(:attron)
-          win.attron(Curses.color_pair(20) | Curses::A_BOLD)
-          win.addstr(text)
-          win.attroff(Curses.color_pair(20) | Curses::A_BOLD)
+          label = text[0, line[:label].to_s.length]
+          win.attron(Curses.color_pair(24) | Curses::A_BOLD)
+          win.addstr(label)
+          win.attroff(Curses.color_pair(24) | Curses::A_BOLD)
+          win.addstr(text[label.length..].to_s)
         else
           win.addstr(text)
         end

data/lib/pwn/version.rb

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

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

@@ -4,6 +4,21 @@ require 'spec_helper'
 require 'meshtastic'
 
 describe PWN::Plugins::REPL, 'mesh primary display, MQTT sender, and GPS link' do
+  it 'paints field labels bold white without changing value attributes' do
+    attrs = 0
+    painted = []
+    allow(Curses).to receive(:color_pair).with(20).and_return(0)
+    allow(Curses).to receive(:color_pair).with(24).and_return(256)
+    allow(details).to receive(:attron) { |value| attrs |= value }
+    allow(details).to receive(:attroff) { |value| attrs &= ~value }
+    allow(details).to receive(:addstr) { |text| painted << [text, attrs] }
+    rows = described_class.send(:mesh_value_rows, label: 'Node ID', value: '!00001337', width: 28)
+    rows += described_class.send(:mesh_value_rows, label: 'GPS', value: 'N/A', width: 28)
+    described_class.send(:mesh_paint_side, win: details, title: 'SENDER', focus: :sndr, rows: rows, hits: [])
+    expect(painted).to include(['Node ID:', 256 | Curses::A_BOLD], ['GPS:', 256 | Curses::A_BOLD])
+    expect(painted).to include([' !00001337', 0], [' N/A', 0])
+  end
+
   let(:env) do
     { transport: 'serial', mqtt: { host: 'offline.invalid', region: 'US' },
       channel: { active: 'LongFast', LongFast: { psk: 'AQ==', region: 'US', topic: '2/e/LongFast/#', from: '!00001337' } } }
@@ -224,7 +239,7 @@ describe PWN::Plugins::REPL, 'mesh primary display, MQTT sender, and GPS link' d
     colors = []
     allow(details).to receive(:attron) { |attr| colors << attr }
     described_class.send(:mesh_handle_rx, env: env, obj: radio, msg: { packet: packet, mesh_transport: :serial })
-    painted = details.lines.join("\n")
+    painted = details.lines.join
     expect(painted).to include('SENDER', 'Node ID: !421f6f22', 'GPS:')
     expect(painted).not_to include('VIA')
     node_num = 0x421f6f22

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.778
+  version: 0.5.779
 platform: ruby
 authors:
 - 0day Inc.
@@ -785,14 +785,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
@@ -1121,14 +1121,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.1
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement