pwn 0.4.390 → 0.4.394

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1980f14b63483ec6b681ecbe3c97b18acfe587b73a3bb94cc08a6ff6cc9a940e
-  data.tar.gz: b8aedccf9888c441752213c20cf93281755c4e01a0e3902c7b00a5d1c57eeaf1
+  metadata.gz: 00fdd984c56c17e08366de15f8d1627da1a6fb193e55b6eb7a3648f75ab457e5
+  data.tar.gz: 8807dcbe516537df70d8e3e73db1f0431b1390e3395a46bce5c0fc10b0d3499e
 SHA512:
-  metadata.gz: ba09da802442ca21edf0ce271dbc68a81e30fa410e01c8d85f6c54e9dcc068702314d69215d048f87b26ba20d0cd886d8268c42f384dbaac3c6084c66932bd57
-  data.tar.gz: eb03adcd9751694fca6fe5023c3000ed1ec88158bf8236dc0a271a8e8bbe0deb3c95448b88c9babdddb916dcb5ee16111c689ccb065381030709e5b0dddcd48a
+  metadata.gz: 10a1926b599089ccc218a5cac4e60570cd7d9fb27a8ae39d6ab0fc170a24dcf4242f3d504e2ef023fb2c8b62150fe4bfa982bdb44cbbff4a88f8553626e09b40
+  data.tar.gz: 1571134fce31b0218649722d6535d9918af3351f8e3a2cb40fadb3fb8b2a9ecfd554d713bc3662f01ada558294b7ca1e3464faf195867ceb60020378fdb0b69e

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

data/bin/pwn

@@ -7,8 +7,24 @@ 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
+    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
+    dchars = "\001\e[32m\002>>>\001\e[0m\002" # Green
+    dchars = "\001\e[33m\002***\001\e[0m\002" if delim == :splat # Yellow
+
+    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 +40,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,49 +51,30 @@ begin
     end
   end
 
-  prompt = TTY::Prompt.new
-  reader = TTY::Reader.new
-
-  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
+  Pry.config.prompt_name = :pwn
+  Pry.config.pwn_repl_line = 0
+  Pry.config.tty_prompt = TTY::Prompt.new
+  Pry.config.tty_reader = TTY::Reader.new
+
+  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
 
-  cli::Commands.create_command 'toggle-pager' do
+  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
-  end
-
+  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(
@@ -88,7 +83,7 @@ begin
     prompt_ps1
   )
 
-  cli.start(
+  Pry.start(
     self,
     prompt: pwn_prompt
   )

data/lib/pwn/version.rb

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

metadata

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