pwn 0.4.388 → 0.4.391

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fff86c0915ceb8c3bda26566fa0f3c49d5c7bc29f8fad99b72936ea62f0d10f
-  data.tar.gz: 7fd7e3bbbc60ee0b1bc3b06664bea5efd410aa03cd4dd3ad9c88d3ade03ad709
+  metadata.gz: 20f6117dd5a357f49c9cb2319b43b5189eca333b73a2607d0c05124cc685e4c7
+  data.tar.gz: e631631795c7b0d4ecc28afb7d544c5b7ad82868a564a6dba4c914a60e477c12
 SHA512:
-  metadata.gz: 665f698b87d92a38d761e58cd9e9081fcbe4303cd9b048c06ce954ae0222e9743683ddf95590283e56d738cf4d4c1088a9e6149a26176850bbfb4eeba18527e9
-  data.tar.gz: c954551ab4b906f75b8c575ec04b733c30cf98030aad0b7aceee001a3095d28abbad8facd5736895568a2381d87b92de314ec3d885361cf2da4410166e26aee3
+  metadata.gz: 82d47c1278b2d7dabb9740beb4dec9bbc20b472dcf368d5dca5e3552ad201cc70d0bad0ac4bf36ac196342e3ccf0ee353e63f4250a31bcaab797e6bf4275a4eb
+  data.tar.gz: a60120db35b707cd6e2678c88c89d702117a4473764708507106e9b42bd41e79090a6b533e977610363fae0e8b943c7f4483fe75492dcfbab70799354512ea9a

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.388]:001 >>> PWN.help
+pwn[v0.4.391]: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.388]:001 >>> PWN.help
+pwn[v0.4.391]: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,22 @@ begin
     end
   end
 
+  prompt = TTY::Prompt.new
+  reader = TTY::Reader.new
+
   cli = Pry
+  cli.config.hooks.add_hook(:before_session, :welcome) do |output, _binding, _pry|
+    output.puts 'Use the #help method for more options.'
+    output.puts 'e.g PWN.help'
+    output.puts 'e.g PWN::Plugins.help'
+    output.puts 'e.g PWN::Plugins::TransparentBrowser.help'
+  end
 
-  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.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 +66,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.388'
+  VERSION = '0.4.391'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.388
+  version: 0.4.391
 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