pwn 0.4.387 → 0.4.390

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e0d57c1556e5adb3cfd5afe9c38f43dcf4158ec0dea58b76b05dade6124818
-  data.tar.gz: 28d847dcf1306254508beb5bed47486762d5051d0251586738619ee443d1fe8b
+  metadata.gz: 1980f14b63483ec6b681ecbe3c97b18acfe587b73a3bb94cc08a6ff6cc9a940e
+  data.tar.gz: b8aedccf9888c441752213c20cf93281755c4e01a0e3902c7b00a5d1c57eeaf1
 SHA512:
-  metadata.gz: a581d275147b239b3b022fdcfb2b436acb3e2bd70489bb59fffc03522645539440d07218c3a8d4502b8015a23e70a3329670ad62d298d57cdc485e0cf1cc4c4c
-  data.tar.gz: 1575cebddfe1b9d9667afc53f1de79c26e633721c0688c6638dc53eac856e1636f2ea16ebede288a714c5d0c93eb2982ca67d65befbb106458ed6eb6c2807df6
+  metadata.gz: ba09da802442ca21edf0ce271dbc68a81e30fa410e01c8d85f6c54e9dcc068702314d69215d048f87b26ba20d0cd886d8268c42f384dbaac3c6084c66932bd57
+  data.tar.gz: eb03adcd9751694fca6fe5023c3000ed1ec88158bf8236dc0a271a8e8bbe0deb3c95448b88c9babdddb916dcb5ee16111c689ccb065381030709e5b0dddcd48a

data/Gemfile

@@ -47,7 +47,6 @@ gem 'packetfu', '1.1.13'
 gem 'pdf-reader', '2.9.2'
 gem 'pg', '1.3.5'
 gem 'pry', '0.14.1'
-gem 'pry-bond', '0.0.1'
 gem 'pry-doc', '1.3.0'
 gem 'rake', '13.0.6'
 gem 'rb-readline', '0.5.5'

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.1.1@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.387]:001 >>> PWN.help
+pwn[v0.4.390]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.1.1@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.387]:001 >>> PWN.help
+pwn[v0.4.390]:001 >>> PWN.help
 ```
 
 

data/bin/pwn

@@ -3,12 +3,14 @@
 
 require 'pwn'
 require 'pry'
-require 'pry_bond'
 require 'tty-prompt'
 require 'tty-reader'
 
 begin
-  # TODO: Remove once this feature is available in mainline
+  class LineCount
+    attr_accessor :total
+  end
+
   class Pry
     # Overwrite Pry::History.push method in History class to get duplicate history entries
     # in order to properly replay automation in this prototyping driver
@@ -35,12 +37,15 @@ begin
     end
   end
 
-  cli = Pry
+  prompt = TTY::Prompt.new
+  reader = TTY::Reader.new
 
-  cli.config.hooks.add_hook(:before_eval, :autocomplete) do
-    prompt = TTY::Prompt.new
-    reader = TTY::Reader.new
-    reader.on(:keypress) { |key_event| prompt(key_event) }
+  cli = Pry
+  cli.config.hooks.add_hook(:before_eval, :autocomplete) do |output, _binding, _pry|
+    reader.on(:keypress) do |key_event|
+      output.puts "Key: #{key_event.inspect}"
+      prompt.select('', key_event)
+    end
   end
 
   cli::Commands.create_command 'toggle-pager' do
@@ -54,22 +59,39 @@ begin
   # Custom Main & Wait (Multi-Line) Prompts
   title = "\001\e[1m\002\001\e[31m\002pwn\001\e[0m\002" # Bold Red
   version = "\001\e[36m\002v#{PWN::VERSION}\001\e[0m\002" # Cyan
+  @line_count = LineCount.new
+  @line_count.total = 0
   arrow = "\001\e[32m\002>>>\001\e[0m\002" # Green
   splat = "\001\e[33m\002***\001\e[0m\002" # Yellow
 
-  prompt = [
-    proc do |_target_self, _nest_level, pry|
-      line_pad = format('%0.3d', pry.input_ring.size)
-      line_count = "\001\e[34m\002#{line_pad}\001\e[0m\002" # Blue
-      "#{title}[#{version}]:#{line_count} #{arrow} ".to_s.scrub
-    end,
-    proc do |_target_self, _nest_level, pry|
-      line_pad = format('%0.3d', pry.input_ring.size)
-      line_count = "\001\e[34m\002#{line_pad}\001\e[0m\002" # Blue
-      "#{title}[#{version}]:#{line_count} #{splat} ".to_s.scrub
-    end
-  ]
-  cli.start(self, prompt: Pry::Prompt.new(:pwn, 'PWN_PROTOTYPING_DRIVER', prompt))
+  # arrow_ps1_proc = proc do |_target_self, _nest_level, _pry|
+  arrow_ps1_proc = proc do
+    @line_count.total += 1
+    line_pad = format('%0.3d', @line_count.total)
+    line_count = "\001\e[34m\002#{line_pad}\001\e[0m\002" # Blue
+    "#{title}[#{version}]:#{line_count} #{arrow} ".to_s.scrub
+  end
+
+  # splat_ps1_proc = proc do |_target_self, _nest_level, _pry|
+  splat_ps1_proc = proc do
+    @line_count.total += 1
+    line_pad = format('%0.3d', @line_count.total)
+    line_count = "\001\e[34m\002#{line_pad}\001\e[0m\002" # Blue
+    "#{title}[#{version}]:#{line_count} #{splat} ".to_s.scrub
+  end
+
+  prompt_ps1 = [arrow_ps1_proc, splat_ps1_proc]
+
+  pwn_prompt = Pry::Prompt.new(
+    :pwn,
+    'PWN_PROTOTYPING_DRIVER',
+    prompt_ps1
+  )
+
+  cli.start(
+    self,
+    prompt: pwn_prompt
+  )
 rescue StandardError => e
   raise e
 end

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.387
+  version: 0.4.390
 platform: ruby
 authors:
 - 0day Inc.
@@ -486,20 +486,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.14.1
-- !ruby/object:Gem::Dependency
-  name: pry-bond
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement