pwn 0.4.636 → 0.4.638

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a53e0d51559f7f2ef0d158dad69d01317a5b3d1effc551bdc2864296472ce1ca
-  data.tar.gz: b3c9a88c2fae88c35bc97d6461107482bc33565d60d2c8acaa714debcc400999
+  metadata.gz: e3997d085d7b525c646e2899c95468a734df8021f722717c1453c52cf3d6c208
+  data.tar.gz: 5490d6e641a80efa324b8b12184f8d368012c3a7fd7a137c0d5171efd77f6a45
 SHA512:
-  metadata.gz: 0e03ec1ebe7a078a6c2872172d28e7af661905e0612b5768ddec77621a86635a79a2c6a3f3b2fe1e9a00d1bbad0802dbf08b8ee5095d9387eeb557aa0e603c2c
-  data.tar.gz: 3dcd87ad285151b44c6f3d1d6bb4d8944b668db44b836d46a956470040fe5ab3cca9d665802420bf9da6602bdebd4474cbefafb09d05ddfd0cb169c3dc43d61b
+  metadata.gz: 72c2121bfc843d071e745e53452a77523e996d18b88e2e1fd93184048e3154151a5348fa86fbdbc669d33af01c028483d1cbf19278eb721b5aa34aab2abd2029
+  data.tar.gz: 894d262d198208c8c585594edb0fa36805b32bf465abcf4ac61fc4e4609021f6a6845ab776b91139c5b4a257a2bfb209c3b7c08cdf9470404719f0a885cf7862

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.636]:001 >>> PWN.help
+pwn[v0.4.638]: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.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.636]:001 >>> PWN.help
+pwn[v0.4.638]:001 >>> PWN.help
 ```
 
 

data/lib/pwn/plugins/baresip.rb

@@ -84,12 +84,13 @@ module PWN
         raise "no http_listen value found in #{config}." if http_list_entry.empty?
 
         # Update http_listen value in respective config with random available port
-        random_port = -1
-        port_in_use = true
-        while port_in_use
-          random_port = Random.rand(1024..65_535)
-          port_in_use = PWN::Plugins::Sock.check_port_in_use(port: random_port)
-        end
+        # random_port = -1
+        # port_in_use = true
+        # while port_in_use
+        #   random_port = Random.rand(1024..65_535)
+        #   port_in_use = PWN::Plugins::Sock.check_port_in_use(port: random_port)
+        # end
+        random_port = PWN::Plugins::Sock.get_random_unused_port
         http_listen_ip_port = "127.0.0.1:#{random_port}"
 
         updated_config_content = ''

data/lib/pwn/plugins/burp_suite.rb

@@ -40,6 +40,9 @@ module PWN
         burp_obj = {}
         burp_obj[:pid] = Process.spawn(burp_cmd_string)
         rest_browser = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+        # random_mitm_port = PWN::Plugins::Sock.get_random_unused_port
+        # random_bb_port = random_mitm_port
+        # random_bb_port = PWN::Plugins::Sock.get_random_unused_port while random_bb_port == random_mitm_port
         burp_obj[:mitm_proxy] = '127.0.0.1:8080'
         burp_obj[:burpbuddy_api] = '127.0.0.1:8001'
         burp_obj[:rest_browser] = rest_browser

data/lib/pwn/plugins/owasp_zap.rb

@@ -75,7 +75,7 @@ module PWN
       #   api_key: 'required - api key for API authorization',
       #   zap_bin_path: 'optional - path to zap.sh file'
       #   headless: 'optional - run zap headless if set to true',
-      #   proxy: 'optional - change local zap proxy listener (defaults to http://127.0.0.1:8080)',
+      #   proxy: 'optional - change local zap proxy listener (defaults to http://127.0.0.1:<Random 1024-65535>)',
       # )
 
       public_class_method def self.start(opts = {})
@@ -116,11 +116,12 @@ module PWN
         if opts[:proxy]
           proxy = opts[:proxy].to_s.scrub.strip.chomp
           proxy_uri = URI.parse(proxy)
-          owasp_zap_cmd = "#{owasp_zap_cmd} -host #{proxy_uri.host} -port #{proxy_uri.port}"
         else
-          proxy = 'http://127.0.0.1:8080'
+          random_port = PWN::Plugins::Sock.get_random_unused_port
+          proxy = "http://127.0.0.1:#{random_port}"
           proxy_uri = URI.parse(proxy)
         end
+        owasp_zap_cmd = "#{owasp_zap_cmd} -host #{proxy_uri.host} -port #{proxy_uri.port}"
         zap_obj[:host] = proxy_uri.host.to_s.scrub
         zap_obj[:port] = proxy_uri.port.to_i
 
@@ -499,7 +500,7 @@ module PWN
             api_key: 'required - api key for API authorization',
             zap_bin_path: 'optional - path to zap.sh file',
             headless: 'optional - run zap headless if set to true',
-            proxy: 'optional - change local zap proxy listener (defaults to http://127.0.0.1:8080)'
+            proxy: 'optional - change local zap proxy listener (defaults to http://127.0.0.1:<Random 1024-65535>)'
           )
           puts zap_obj.public_methods
 

data/lib/pwn/plugins/sock.rb

@@ -47,10 +47,40 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # PWN::Plugins::Sock.get_random_unused_port(
+      #   server_ip: 'optional - target host or ip to check (Defaults to 127.0.0.1)',
+      #   protocol: 'optional - :tcp || :udp (defaults to tcp)'
+      # )
+
+      public_class_method def self.get_random_unused_port(opts = {})
+        server_ip = opts[:server_ip]
+        server_ip ||= '127.0.0.1'
+        port = -1
+        protocol = opts[:protocol]
+        protocol ||= :tcp
+
+        port_in_use = true
+        while port_in_use
+          port = Random.rand(1024..65_535)
+          port_in_use = check_port_in_use(
+            server_ip: server_ip,
+            port: port,
+            protocol: protocol
+          )
+        end
+
+        port
+      rescue Errno::ECONNREFUSED,
+             Errno::EHOSTUNREACH,
+             Errno::ETIMEDOUT
+        false
+      end
+
       # Supported Method Parameters::
       # PWN::Plugins::Sock.check_port_in_use(
-      #   port: 'required - target port',
       #   server_ip: 'optional - target host or ip to check (Defaults to 127.0.0.1)',
+      #   port: 'required - target port',
       #   protocol: 'optional - :tcp || :udp (defaults to tcp)'
       # )
 
@@ -163,9 +193,14 @@ module PWN
             tls: 'optional - boolean connect to target socket using TLS (defaults to false)'
           )
 
-          #{self}.check_port_availability(
-            port: 'required - target port',
+          port = #{self}.get_random_unused_port(
+            server_ip: 'optional - target host or ip to check (Defaults to 127.0.0.1)',
+            protocol: 'optional - :tcp || :udp (defaults to tcp)'
+          )
+
+          #{self}.check_port_in_use(
             server_ip: 'optional - target host or ip to check (Defaults to 127.0.0.1)',
+            port: 'required - target port',
             protocol: 'optional - :tcp || :udp (defaults to tcp)'
           )
 

data/lib/pwn/version.rb

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

metadata

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