pwn 0.5.192 → 0.5.194

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 943acf516461b6defab89c118dce50021fbe4a54149e383cb94be08570cb4735
-  data.tar.gz: 88ed9ddeec7d76c97a0b4665b26d14db609b9a820786905ab81a2d1f9115f65b
+  metadata.gz: d8e2618c43661322179b1ea623b1dc19c5fc079373197c1ba64d78e63e17d68f
+  data.tar.gz: 7c36ee8c5c48c6c181a7a4204911bdb6c9079f945b1814daafa5ccf433e71bd6
 SHA512:
-  metadata.gz: 15fea999df3f0b8f05358f285980cf34851d3dde2992e325f8b1cc3d550be9e24a18fe78a7147531d811992f8b15b9ef2e89300cade9d9873534addc513ecd65
-  data.tar.gz: 13f05cebbee3ddd043f8f397a733a78daa7e8aa1efae393659d2e8f9bd493cc940bcea1d953fd2bcebeaece47eb29f9abad9184f41ce5a3b587e6285a981beb0
+  metadata.gz: 8449c2bfcc574dab0613478ac7f9cc249f039c7fc8ea3d27fd14045ce399377f2be3fdcdd760ffeb93f2812c0157e8c6daa99645d965e59835e35d5bf40b8f0b
+  data.tar.gz: a5018bad53afa6a41bcf41c9b9c3abc0508ab2430f4905ab0368fd2beb479706c2f117bb48cb2414e641e5f39efe3cc28fd05bd7e5ad74ec165f2f9884ed615b

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.192]:001 >>> PWN.help
+pwn[v0.5.194]: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.3.3@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.192]:001 >>> PWN.help
+pwn[v0.5.194]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.3.3@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.192]:001 >>> PWN.help
+pwn[v0.5.194]:001 >>> PWN.help
 ```
 
 PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`.  The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

data/lib/pwn/plugins/repl.rb

@@ -605,7 +605,8 @@ module PWN
                 model: model,
                 request: request.chomp,
                 response_history: response_history,
-                speak_answer: speak_answer
+                speak_answer: speak_answer,
+                spinner: true
               )
             when :openai
               response = PWN::Plugins::OpenAI.chat(
@@ -613,7 +614,8 @@ module PWN
                 model: model,
                 request: request.chomp,
                 response_history: response_history,
-                speak_answer: speak_answer
+                speak_answer: speak_answer,
+                spinner: true
               )
             else
               raise "ERROR: Unsupported AI Engine: #{ai_engine}"

data/lib/pwn/plugins/transparent_browser.rb

@@ -42,7 +42,6 @@ module PWN
       #   browser_type: 'optional - :firefox|:chrome|:headless|:rest|:websocket (defaults to :chrome)',
       #   proxy: 'optional - scheme://proxy_host:port || tor (defaults to nil)',
       #   devtools: 'optional - boolean (defaults to true)',
-      #   url: 'optional - URL to navigate to after opening browser (Defaults to about:about#RANDID)'
       # )
 
       public_class_method def self.open(opts = {})
@@ -63,8 +62,6 @@ module PWN
         devtools = opts[:devtools] ||= false
         devtools = true if devtools_supported.include?(browser_type) && devtools
 
-        url = opts[:url] ||= "about:about##{SecureRandom.hex(8)}"
-
         # Let's crank up the default timeout from 30 seconds to 15 min for slow sites
         Watir.default_timeout = 900
 
@@ -130,7 +127,7 @@ module PWN
             end
           end
 
-          args.push('--devtools') if devtools
+          # args.push('--devtools') if devtools
           options = Selenium::WebDriver::Firefox::Options.new(
             args: args,
             accept_insecure_certs: true
@@ -161,7 +158,8 @@ module PWN
             accept_insecure_certs: true
           )
 
-          options.web_socket_url = true
+          # This is for bidi, once it's ready
+          # options.web_socket_url = true
           options.profile = this_profile
           driver = Selenium::WebDriver.for(:chrome, options: options)
           browser_obj[:browser] = Watir::Browser.new(driver)
@@ -221,7 +219,8 @@ module PWN
             accept_insecure_certs: true
           )
 
-          options.web_socket_url = true
+          # This is for bidi, once it's ready
+          # options.web_socket_url = true
           options.profile = this_profile
           driver = Selenium::WebDriver.for(:firefox, options: options)
           browser_obj[:browser] = Watir::Browser.new(driver)
@@ -243,7 +242,8 @@ module PWN
             accept_insecure_certs: true
           )
 
-          options.web_socket_url = true
+          # This is for bidi, once it's ready
+          # options.web_socket_url = true
           options.profile = this_profile
           driver = Selenium::WebDriver.for(:chrome, options: options)
           browser_obj[:browser] = Watir::Browser.new(driver)
@@ -258,7 +258,6 @@ module PWN
               browser_obj[:browser].proxy = proxy
             end
           end
-          puts browser_obj[:browser].get(url).body if url
 
         when :websocket
           if proxy
@@ -285,10 +284,6 @@ module PWN
         end
 
         if devtools_supported.include?(browser_type)
-          rand_tab = SecureRandom.hex(8)
-          browser_obj[:browser].goto(url)
-          browser_obj[:browser].execute_script("document.title = '#{rand_tab}'")
-
           if devtools
             driver = browser_obj[:browser].driver
             browser_obj[:devtools] = driver.devtools
@@ -307,11 +302,13 @@ module PWN
               browser_obj[:devtools].send_cmd('DOMSnapshot.enable')
             end
 
-            browser_obj[:bidi] = driver.bidi
+            # Future BiDi API that's more universally supported across browsers
+            # browser_obj[:bidi] = driver.bidi
 
             jmp_devtools_panel(browser_obj: browser_obj, panel: :elements)
-            browser_obj[:browser].send_keys(:escape)
           end
+
+          new_tab(browser_obj: browser_obj, first_tab: true)
         end
 
         browser_obj
@@ -458,7 +455,8 @@ module PWN
       # Supported Method Parameters::
       # tab = PWN::Plugins::TransparentBrowser.jmp_tab(
       #   browser_obj: 'required - browser_obj returned from #open method)',
-      #   keyword: 'required - keyword in title or url used to switch tabs'
+      #   keyword: 'required - keyword in title or url used to switch tabs',
+      #   explicit: 'optional - boolean to indicate if the keyword is an exact match (Defaults to false)'
       # )
 
       public_class_method def self.jmp_tab(opts = {})
@@ -468,9 +466,16 @@ module PWN
         keyword = opts[:keyword]
         raise 'ERROR: keyword parameter is required' if keyword.nil?
 
+        explicit = opts[:explicit] ||= false
+
         browser = browser_obj[:browser]
         all_tabs = browser.windows
-        tab_sel = all_tabs.select { |tab| tab.use if tab.title.include?(keyword) || tab.url.include?(keyword) }
+        if explicit
+          tab_sel = all_tabs.select { |tab| tab.use if tab.title == keyword || tab.url == keyword }
+        else
+          tab_sel = all_tabs.select { |tab| tab.use if tab.title.include?(keyword) || tab.url.include?(keyword) }
+        end
+
         { title: tab_sel.last.title, url: tab_sel.last.url, state: :active } if tab_sel.any?
       rescue StandardError => e
         raise e
@@ -479,31 +484,33 @@ module PWN
       # Supported Method Parameters::
       # tab = PWN::Plugins::TransparentBrowser.new_tab(
       #   browser_obj: 'required - browser_obj returned from #open method)',
-      #   url: 'optional - URL to navigate to after opening new tab (Defaults to nil)'
+      #   first_tab: 'optional - boolean to indicate if this is the first tab (Defaults to false)'
       # )
 
       public_class_method def self.new_tab(opts = {})
         browser_obj = opts[:browser_obj]
         verify_devtools_browser(browser_obj: browser_obj)
 
-        url = opts[:url]
+        chrome_types = %i[chrome headless_chrome]
+
+        first_tab = opts[:first_tab] ||= false
 
-        firefox_types = %i[firefox headless_firefox]
         browser = browser_obj[:browser]
         browser_type = browser_obj[:type]
         devtools = browser_obj[:devtools]
-        browser.execute_script('window.open()')
-        jmp_tab(browser_obj: browser_obj, keyword: 'about:blank')
-        rand_tab = SecureRandom.hex(8)
-        if url.nil?
-          browser.goto("about:about##{rand_tab}")
-          browser.execute_script("document.title = '#{rand_tab}'")
+        unless first_tab
+          browser.execute_script('window.open()')
+          jmp_tab(browser_obj: browser_obj, keyword: 'about:blank')
         end
-        # Open the DevTools for Firefox, Chrome opens them automatically
-        browser.send_keys(:f12) if firefox_types.include?(browser_type)
-        # Open Console drawer if DevTools are open
-        browser.send_keys(:escape) unless devtools.nil?
-        browser.goto(url) unless url.nil?
+
+        rand_tab = SecureRandom.hex(8)
+        url = 'about:about'
+        url = 'chrome://chrome-urls/' if chrome_types.include?(browser_type)
+        browser.goto(url)
+        # TODO: replace sleep with something more reliable like an event listener
+        sleep 1
+        browser.execute_script("document.title = 'about:about-#{rand_tab}'")
+        toggle_devtools(browser_obj: browser_obj, first_tab: first_tab) if devtools
 
         { title: browser.title, url: browser.url, state: :active }
       rescue StandardError => e
@@ -653,15 +660,29 @@ module PWN
 
       # Supported Method Parameters::
       # PWN::Plugins::TransparentBrowser.toggle_devtools(
-      #   browser_obj: 'required - browser_obj returned from #open method)'
+      #   browser_obj: 'required - browser_obj returned from #open method)',
+      #   first_tab: 'optional - boolean to indicate if this is the first tab (Defaults to false)',
       # )
 
       public_class_method def self.toggle_devtools(opts = {})
         browser_obj = opts[:browser_obj]
         verify_devtools_browser(browser_obj: browser_obj)
 
+        first_tab = opts[:first_tab] ||= false
+
         browser = browser_obj[:browser]
+        tab_id = browser.title.split('-').last.strip
+        devtools_tab_title = "DevTools-#{tab_id}"
+        jmp_tab(browser_obj: browser_obj, keyword: 'DevTools', explicit: true)
+        browser.execute_script("document.title = '#{devtools_tab_title}'")
         browser.send_keys(:f12)
+        if first_tab
+          # TODO: replace sleep with something more reliable like an event listener
+          sleep 1
+          browser.send_keys(:escape)
+        end
+        tab_tied_to_devtools = "about:about-#{devtools_tab_title.split('-').last.strip}"
+        jmp_tab(browser_obj: browser_obj, keyword: tab_tied_to_devtools, explicit: true)
       rescue StandardError => e
         raise e
       end
@@ -697,7 +718,12 @@ module PWN
           hotkey.push('j') if chrome_types.include?(browser_type)
           hotkey.push('k') if firefox_types.include?(browser_type)
         when :debugger, :sources
-          hotkey.push('z') if firefox_types.include?(browser_type)
+          if firefox_types.include?(browser_type)
+            # If we're in the console, we need to switch to the inspector first
+            jmp_devtools_panel(browser_obj: browser_obj, panel: :inspector)
+            sleep 1
+            hotkey.push('z') if firefox_types.include?(browser_type)
+          end
         when :network
           hotkey.push('e') if firefox_types.include?(browser_type)
         else
@@ -705,9 +731,11 @@ module PWN
         end
 
         # Have to call twice for Chrome, otherwise devtools stays closed
-        browser.body.click
+        browser_obj[:browser].send_keys(:escape)
+        # browser.body.click!
         browser.send_keys(hotkey)
         browser.send_keys(hotkey) if chrome_types.include?(browser_type)
+        browser.send_keys(:escape)
       rescue StandardError => e
         raise e
       end
@@ -867,7 +895,7 @@ module PWN
 
           tab = #{self}.new_tab(
             browser_obj: 'required - browser_obj returned from #open method)',
-            url: 'optional - URL to navigate to after opening new tab (Defaults to nil)'
+            first_tab: 'optional - boolean to indicate if this is the first tab (Defaults to false)'
           )
 
           tab = #{self}.close_tab(

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.192
+  version: 0.5.194
 platform: ruby
 authors:
 - 0day Inc.