pwn 0.4.908 → 0.4.910

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e63eb5c8a0f8b7b01519e0beff8d9e00b0d79b2b95d9e0c3b09bfb64e43714c
-  data.tar.gz: d04c5a1dfbbce051e64a78d1bf7231d27e76b2360b802fb1f7da24b56224fa61
+  metadata.gz: 0e5b5fcff5cfcc3cd255ad4002d83e380cddcbad9a292f6f49f6b661b9c99042
+  data.tar.gz: b2b9f09b64164da56b798af7ab4d11d0fb5874ad35295cf32d5aacbdcd3f683a
 SHA512:
-  metadata.gz: d7a34cb20ada0617c270dff08d9f0f419acb456e61b30c3b2b6da7aa8176b451578271f5268e757099df3316b32517b7b4898cc55e3035e6d07a921bd358a368
-  data.tar.gz: 5617cc8139c7906d897a72a838e8b87499765ebddcc4987e6990618c006fffc559d0b88253ea81002a6a87e7f9e8b201b77b47f3a84bca91e9626034fe4cd1bc
+  metadata.gz: 68afcd359bf5660e29902575849e58239717d4116e2673828592c2b39135a780197e059405effd1b752b52c0f621095a269b413d82f789f8a0d992629f794b70
+  data.tar.gz: 3402edfa4ad389f09753638959884d99055ccb4b0465f09e01684da69185e6125e985aa74c33a1aa7ad28a5d45fe2702d67b1b03e56b8f124143c181277f42ad

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

data/bin/pwn_www_checkip

@@ -14,6 +14,10 @@ OptionParser.new do |options|
     opts[:target] = t
   end
 
+  options.on('-PPORT', '--tls-port=PORT', '<Optional - TLS Port to Check (Default - 443).  Will not execute if --proxy parameter is set.>') do |p|
+    opts[:tls_port] = p
+  end
+
   options.on('-i', '--[no-]ipinfo', '<Optional - Return Details about Public IP Returned from CheckIP>') do |i|
     opts[:ipinfo] = i
   end
@@ -24,40 +28,39 @@ OptionParser.new do |options|
 end.parse!
 
 target = opts[:target]
+tls_port = opts[:tls_port]
 ipinfo = opts[:ipinfo]
 proxy = opts[:proxy].to_s.scrub.strip.chomp unless opts[:proxy].nil?
 
 begin
-  if proxy
+  if proxy && opts[:target].nil?
     browser_obj = PWN::Plugins::TransparentBrowser.open(
       browser_type: :rest,
       proxy: proxy
     )
-  else
-    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
-  end
-  browser = browser_obj[:browser]::Request
-
-  if proxy && opts[:target].nil?
+    browser = browser_obj[:browser]::Request
     target = browser.execute(
       method: :get,
       url: 'https://checkip.amazonaws.com',
       verify_ssl: false
     ).to_s.chomp
   elsif opts[:target].nil?
+    browser_obj = PWN::Plugins::TransparentBrowser.open(browser_type: :rest)
+    browser = browser_obj[:browser]::Request
     target = browser.execute(
       method: :get,
       url: 'https://checkip.amazonaws.com'
     ).to_s.chomp
   end
 
-  puts "[ { \"public_ip\": \"#{target}\" } ]" if ipinfo.nil? && opts[:target].nil?
+  puts "[ { \"query\": \"#{target}\" } ]" if ipinfo.nil? && opts[:target].nil?
 
   ipinfo = true if ipinfo.nil? && opts[:target]
   if ipinfo
     ip_info_obj = PWN::Plugins::IPInfo.get(
       target: target,
-      proxy: proxy
+      proxy: proxy,
+      tls_port: tls_port
     )
     puts JSON.pretty_generate(ip_info_obj)
   end

data/lib/pwn/plugins/ip_info.rb

@@ -81,18 +81,18 @@ module PWN
             )
 
             ip_resp[:tls_avail] = tls_port_avail
-            ip_resp[:ca_issuer_uris] = false
-            ip_resp[:cert_subject] = false
-            ip_resp[:cert_issuer] = false
-            ip_resp[:cert_serial] = false
-            ip_resp[:crl_uris] = false
-            ip_resp[:extensions] = false
-            ip_resp[:not_before] = false
-            ip_resp[:not_after] = false
-            ip_resp[:oscsp_uris] = false
-            ip_resp[:pem] = false
-            ip_resp[:signature_algorithm] = false
-            ip_resp[:version] = false
+            ip_resp[:ca_issuer_uris] = nil
+            ip_resp[:cert_subject] = nil
+            ip_resp[:cert_issuer] = nil
+            ip_resp[:cert_serial] = nil
+            ip_resp[:crl_uris] = nil
+            ip_resp[:extensions] = nil
+            ip_resp[:not_before] = nil
+            ip_resp[:not_after] = nil
+            ip_resp[:oscsp_uris] = nil
+            ip_resp[:pem] = nil
+            ip_resp[:signature_algorithm] = nil
+            ip_resp[:version] = nil
             next unless tls_port_avail
 
             cert_obj = PWN::Plugins::Sock.get_tls_cert(
@@ -102,15 +102,15 @@ module PWN
 
             next unless cert_obj.is_a?(OpenSSL::X509::Certificate)
 
-            ip_resp[:ca_issuer_uris] = cert_obj.ca_issuer_uris.to_s
+            ip_resp[:ca_issuer_uris] = cert_obj.ca_issuer_uris.map(&:to_s) unless cert_obj.ca_issuer_uris.nil?
             ip_resp[:cert_subject] = cert_obj.subject.to_s
             ip_resp[:cert_issuer] = cert_obj.issuer.to_s
             ip_resp[:cert_serial] = cert_obj.serial.to_s
-            ip_resp[:crl_uris] = cert_obj.crl_uris.to_s
-            ip_resp[:extensions] = cert_obj.extensions.map&.to_s
+            ip_resp[:crl_uris] = cert_obj.crl_uris.map(&:to_s) unless cert_obj.crl_uris.nil?
+            ip_resp[:extensions] = cert_obj.extensions.map(&:to_s) unless cert_obj.extensions.nil?
             ip_resp[:not_before] = cert_obj.not_before.to_s
             ip_resp[:not_after] = cert_obj.not_after.to_s
-            ip_resp[:oscsp_uris] = cert_obj.ocsp_uris.to_s
+            ip_resp[:oscsp_uris] = cert_obj.ocsp_uris.map(&:to_s) unless cert_obj.ocsp_uris.nil?
             ip_resp[:pem] = cert_obj.to_pem.to_s
             ip_resp[:signature_algorithm] = cert_obj.signature_algorithm.to_s
             ip_resp[:version] = cert_obj.version.to_s

data/lib/pwn/plugins/sock.rb

@@ -151,7 +151,8 @@ module PWN
         server_ip = opts[:server_ip].to_s.scrub
         port = opts[:port].to_i
         opts[:protocol].nil? ? protocol = :tcp : protocol = opts[:protocol].to_s.downcase.to_sym
-        opts[:tls].nil? ? tls = false : tls = true
+        tls = true if opts[:tls]
+        tls ||= false
 
         case protocol
         when :tcp
@@ -271,7 +272,12 @@ module PWN
             tls: 'optional - boolean listen on TLS-enabled socket (defaults to false)'
           )
 
-          sock_obj = PWN::Plugins::Sock.disconnect(
+          cert_obj = #{self}.get_tls_cert(
+            target: 'required - target host or ip',
+            port: 'optional - target port (defaults to 443)'
+          )
+
+          sock_obj = #{self}.disconnect(
             sock_obj: 'required - sock_obj returned from #connect method'
           )
 

data/lib/pwn/version.rb

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

metadata

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