pwn 0.4.391 → 0.4.396

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f6117dd5a357f49c9cb2319b43b5189eca333b73a2607d0c05124cc685e4c7
-  data.tar.gz: e631631795c7b0d4ecc28afb7d544c5b7ad82868a564a6dba4c914a60e477c12
+  metadata.gz: 834d5ea1d9ec4022b881d453fa123d55e09c2adacaab3b6852c2f2fa3106b60d
+  data.tar.gz: 508478f12b0a2ae83ca041f52d7b636b1c34567b1b8dca13d63ceb7898e2a824
 SHA512:
-  metadata.gz: 82d47c1278b2d7dabb9740beb4dec9bbc20b472dcf368d5dca5e3552ad201cc70d0bad0ac4bf36ac196342e3ccf0ee353e63f4250a31bcaab797e6bf4275a4eb
-  data.tar.gz: a60120db35b707cd6e2678c88c89d702117a4473764708507106e9b42bd41e79090a6b533e977610363fae0e8b943c7f4483fe75492dcfbab70799354512ea9a
+  metadata.gz: 3e7c5fde7136dfb271becc97fc15680d42a4ff41bb719f88d4884a623f11f27cf33221707ecaaa85d7d5e0cc945d37115abde30782f05e736f1ad453eea6222d
+  data.tar.gz: 4ce2645863b4384a7ab0c1b4fa6c50a61559dfff32623ac03920dff9594429f0ec46320400ada782b23e67e3d0e8b17513badbc1b93985c974f17239e9f2bfc9

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.391]:001 >>> PWN.help
+pwn[v0.4.396]: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.391]:001 >>> PWN.help
+pwn[v0.4.396]:001 >>> PWN.help
 ```
 
 

data/bin/pwn

@@ -3,12 +3,35 @@
 
 require 'pwn'
 require 'pry'
-require 'tty-prompt'
-require 'tty-reader'
+# require 'tty-prompt'
+# require 'tty-reader'
 
 begin
-  class LineCount
-    attr_accessor :total
+  def gen_ps1_proc(opts = {})
+    delim = opts[:delim]
+
+    # Custom Main & Wait (Multi-Line) Prompts
+    # Bold Red Title
+    title = "\001\e[1m\002\001\e[31m\002pwn\001\e[0m\002"
+
+    # Cyan Version
+    version = "\001\e[36m\002v#{PWN::VERSION}\001\e[0m\002"
+
+    # Green Arrows
+    dchars = "\001\e[32m\002>>>\001\e[0m\002"
+
+    # Yellow Splats
+    dchars = "\001\e[33m\002***\001\e[0m\002" if delim == :splat
+
+    proc do |_target_self, _nest_level, pry|
+      pry.config.pwn_repl_line += 1
+      line_pad = format(
+        '%0.3d',
+        pry.config.pwn_repl_line
+      )
+      line_count = "\001\e[34m\002#{line_pad}\001\e[0m\002" # Blue
+      "#{title}[#{version}]:#{line_count} #{dchars} ".to_s.scrub
+    end
   end
 
   class Pry
@@ -24,8 +47,6 @@ begin
           last_line = nil
         end
 
-        # return line if line == last_line
-
         @history << line
         @history_line_count += 1
         @saver.call(line) if !should_ignore?(line) &&
@@ -37,65 +58,40 @@ 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 |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
+  # Define Custom REPL Commands
+  Pry::Commands.create_command 'toggle-pager' do
     description 'Toggle less on returned objects surpassing the terminal.'
 
     def process
-      _pry_.config.pager ? _pry_.config.pager = false : _pry_.config.pager = true
+      pi = pry_instance
+      pi.config.pager ? pi.config.pager = false : pi.config.pager = true
     end
   end
 
-  # 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
-
-  # 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
+  # Define REPL Hooks
+  Pry.config.hooks.add_hook(:before_session, :welcome) do |output, _binding, _pry|
+    output.puts 'Use the #help method for more options.'
+    output.puts 'e.g help'
+    output.puts 'e.g PWN.help'
+    output.puts 'e.g PWN::Plugins.help'
+    output.puts 'e.g PWN::Plugins::TransparentBrowser.help'
   end
 
+  # Define PS1 Prompt
+  Pry.config.pwn_repl_line = 0
+  arrow_ps1_proc = gen_ps1_proc
+  splat_ps1_proc = gen_ps1_proc(delim: :splat)
   prompt_ps1 = [arrow_ps1_proc, splat_ps1_proc]
 
   pwn_prompt = Pry::Prompt.new(
     :pwn,
-    'PWN_PROTOTYPING_DRIVER',
+    'PWN Prototyping REPL',
     prompt_ps1
   )
 
-  cli.start(
+  # Start PWN REPL
+  Pry.config.prompt_name = :pwn
+  Pry.start(
     self,
     prompt: pwn_prompt
   )

data/lib/pwn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.391
+  version: 0.4.396
 platform: ruby
 authors:
 - 0day Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport