snackhack2 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24d3c225a7262763bb360b50b139af3d73222abfa7288d1149f5f47a7c837e4
-  data.tar.gz: 90f9e49687132acd4930f01ce2d03bd98b1911301d81f26130e253461f94d5a5
+  metadata.gz: 23625b0c0b96d9310abb4adcfe327cbf41bfcd0b30a605b420fdaf39b56587c7
+  data.tar.gz: 748b136fb5ec56893c91d2a5e911a642d7f52aebc4b1dd4a3a4372644c107fc6
 SHA512:
-  metadata.gz: 5c535c224366a2ad8a2ebcb047d47c4157d1fad3a3aa30b782decd5b2291823cd1b0b91043bfd60ab21f3d9c40b66c47e4e85957fb784cd6a0209b3117c6cfa5
-  data.tar.gz: 97232dc976b82e3a677d87fda6ea3319fc6ddc09526657d731bf89701b8ccaf70f84b4215977b17cdb7fb2ac05e6143aebf7791ce0488b88e5a0ca5cd7f14e22
+  metadata.gz: 1c5d3a5223ea6b1522b0448d9b1e6e01aa3ef1eece72c81888b3b317792533ddeb3c9ebfe517b6069a096b9f21250ef3b93d00c914602a1d5018fd1d7d012f1b
+  data.tar.gz: 189d3057f610d1a52b51f7e4745082814ab637fb985cc53f93cef48aa654b12c5fc0775309b5c3625d709228c021e43e0918808a5585390b18d81d93f81cbd52

data/lib/snackhack2/SSL.rb

@@ -0,0 +1,34 @@
+require 'net/http'
+require 'openssl'
+module Snackhack2
+	class SSLCert
+		attr_accessor :site, :file_save
+
+	    def initialize
+	    	@site = site
+	    	@file_save = false
+	    end
+		def get_cert(print_status: false)
+			save_txt_file = ''
+			begin
+				if @site.downcase.include?("https://")
+					@site = @site.downcase.gsub("https://", "")
+				end
+				uri = URI::HTTPS.build(host: @site)
+				response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true)
+				cert = response.peer_cert
+				if @file_save
+					save_txt_file += cert.serial
+				else 
+					if print_status
+						puts cert.serial
+					else
+						return cert.serial
+					end
+				end
+			rescue OpenSSL::SSL::SSLError,Net::OpenTimeout, Errno::EHOSTUNREACH
+			end
+		Snackhack2.file_save(@site, 'ssl', save_txt_file) if @file_save
+		end
+	end
+end

data/lib/snackhack2/bannergrabber.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+ # frozen_string_literal: true
 require 'socket'
 module Snackhack2
   class BannerGrabber
@@ -13,23 +13,29 @@ module Snackhack2
     def run
       nginx
       apache2
+      cloudflare
       wordpress
-      get_ssh_info
+      cloudfront
     end
     def headers
       @headers = Snackhack2.get(@site).headers
     end
     def nginx
-      puts "[+] Server is running NGINX... Now checking if #{File.join(@site, 'nginx_status')} is valid..."
-      nginx = Snackhack2.get(File.join(@site, 'nginx_status'))
-      if nginx.code == 200
-        puts "Check #{@site}/nginx_status"
-      else
-        puts "Response code: #{nginx.code}"
+      if headers['server'].include?("nginx")
+        puts "[+] Server is running NGINX... Now checking if #{File.join(@site, 'nginx_status')} is valid..."
+        nginx = Snackhack2.get(File.join(@site, 'nginx_status'))
+        if nginx.code == 200
+          puts "Check #{@site}/nginx_status"
+        else
+          puts "Response code: #{nginx.code}... nginx_status not giving 200"
+        end
+      else 
+        puts "[+] No nginx detected..."
       end
     end
 
     def curl
+      # uses cURL to head a website header
       servers = ''
       # rus the curl command to get the headers of the given site. 
       cmd = `curl -s -I #{@site.gsub('https://', '')}`
@@ -55,16 +61,20 @@ module Snackhack2
         else
           puts "[+] Response Code: #{apache.code}...\n\n"
         end
-      else
-        puts "Apache2 is not found...\n\n"
       end
     end
 
     def wordpress
+      wp_status = false
+      wp_types = ["Yoast SEO plugin", "wp-content", "wp-json"]
       wp = Snackhack2.get(@site).body
-      return unless wp.match(/wp-content/)
+      # return unless wp.match(/wp-content/)
+      wp_types.each do |wp|
+        p wp.match(/#{wp}/)
+      end
+      #puts "[+] Wordpress '/wp-content' found [+]\n\n\n" if wp.match(/wp-content/)
 
-      puts "[+] Wordpress found [+]\n\n\n"
+      
     end
     def types
       {
@@ -116,6 +126,37 @@ module Snackhack2
         end
       end
     end
+    def cloudfront(print_status: true)
+      # the purpose of this method is to 
+      # check to see if a site has 
+      # cloudflare in the headers
+
+      cf_status = false
+      cf_count  = 0
+
+      # access the 'types' hash to get the cloudflare strings. 
+      cf = types[:"aws CloudFront"]
+
+      # make a single get request to the site defined at '@site'
+      find_headers.each do |k,v|
+        # if the key is in the array cf
+        if cf.include?(k)
+          cf_status = true
+          cf_count += 1
+        end
+      end
+      unless print_status
+        # cf_status[0] : the status if cloudfront was found
+        # cf_count[1]  : the number of found elements in the 'cloudfront' hash. 
+        return [cf_status, cf_count]
+      else
+        if cf_status
+          puts "Cloudfront was found. The count is: #{cf_count}"
+        else
+          puts "Cloudfront was NOT found. The count is #{cf_count}"
+        end
+      end
+    end
     def detect_header(return_status: true)
       # stores the data found in 
       # the headers.

data/lib/snackhack2/comments.rb

@@ -12,13 +12,15 @@ module Snackhack2
       c = Snackhack2.get(@site)
 
       if c.code == 200
+        # turns the body of the text into an array
         body = c.body.split("\n")
         body.each_with_index do |l, i|
           line = l.strip
+          # detects if html code is present
           if line.start_with?('<!--')
-            puts body[i].next
+            puts body[i].next.strip
           elsif line.include?('<!')
-            puts body[i].next
+            puts body[i].next.strip
           end
         end
       else

data/lib/snackhack2/dns.rb

@@ -5,8 +5,9 @@ module Snackhack2
   class Dns
     attr_accessor :site
 
-    def initialize()
+    def initialize
       @site = site
+     
     end
 
     def all_dns

data/lib/snackhack2/drupal.rb

@@ -19,22 +19,24 @@ module Snackhack2
       drupal_score = 0
       d = Snackhack2.get(@site)
       if d.code == 200
-        d.headers.each do |k|
-          drupal_score += 10 if k.include?('drupal')
+        d.headers.each do |k,v|
+          drupal_score += 10 if k.downcase.include?('drupal')
+          drupal_score += 10 if v.downcase.include?('drupal')
         end
       end
-      d.headers.each do |v|
-        drupal_score += 10 if v.include?('drupal')
-      end
+      
       doc = Nokogiri::HTML(URI.open(@site))
+      # uses xpath to extra the data stored in the meta tags
       posts = doc.xpath('//meta')
       posts.each do |l|
+        # display the drupal version and other info
         puts "\n\n[+] Drupal Version: #{l.attributes['content']}\n" if l.attributes['content'].to_s.include?('Drupal')
       end
       puts "\nDrupal Score: #{drupal_score}\n"
     end
 
     def user_brute
+      # enumerate the users by looping 0 to 1000
       (1..1000).each do |user|
         u = Snackhack2.get(File.join(@site, 'user', user.to_s)).body
         if u.include?('Page not found')

data/lib/snackhack2/emails.rb

@@ -6,7 +6,7 @@ module Snackhack2
   class Email
     attr_accessor :max_depth
 
-    def initialize(site, save_file: true, max_depth: 4)
+    def initialize(site, save_file: true, max_depth: 2)
       @site = site
       @save_file = save_file
       @max_depth = max_depth
@@ -19,8 +19,11 @@ module Snackhack2
       Spidr.start_at(@site, max_depth: @max_depth) do |agent|
         agent.every_page do |page|
           body = page.to_s
+          # uses a regex to look for email addresses
           if body.scan(/[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}/)
+            # again, uses regex to extract the email addresses and removes duplicates
             email = body.scan(/[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}/).uniq
+            # if emails not found already in the array, it will add the email to the array. 
             found_emails << email if !email.include?(found_emails) && !email.empty?
           end
         end

data/lib/snackhack2/forward_remote.rb

@@ -4,7 +4,7 @@ require 'net/ssh'
 module Snackhack2
   class SSHForwardRemote
     attr_accessor :site, :user, :pass, :key, :lport, :lsite, :rport
-
+    # forwards ssh traffic 
     def initialize
       @site = site
       @user = user

data/lib/snackhack2/google_analytics.rb

@@ -5,26 +5,38 @@ module Snackhack2
   class GoogleAnalytics
     attr_accessor :site
 
-    def initialize
+    def initialize(print_status: false)
       @site = site
     end
 
     def run
+      # uses a handful of different regexs to extract the Google Analytics
+      # code from sites. This is used by the site admin to track and mesaure 
+      # people who visit the site. This could be used to find more sites 
+      # they own where they re-use the code.
+      gas = []
       a = Snackhack2.get(@site).body
       case a
       when /UA-\d{8}-\d/
-        puts a.match(/UA-\d{8}-\d/)
+        gas << a.match(/UA-\d{8}-\d/).to_s
       when /GTM-[A-Z0-9]{7}/
-        puts a.match(/GTM-[A-Z0-9]{7}/)
+        gas <<  a.match(/GTM-[A-Z0-9]{7}/).to_s
       when /G-([0-9]+([A-Za-z]+[0-9]+)+)/
-        puts a.match(/G-([0-9]+([A-Za-z]+[0-9]+)+)/)
+        gas << a.match(/G-([0-9]+([A-Za-z]+[0-9]+)+)/).to_s
       when /G-[A-Za-z0-9]+/
-        puts a.match(/G-[A-Za-z0-9]+/)
+        gas << a.match(/G-[A-Za-z0-9]+/).to_s
       when /GT-[A-Za-z0-9]+/
-        puts a.match(/GT-[A-Za-z0-9]+/)
+        gas << a.match(/GT-[A-Za-z0-9]+/).to_s
       else
         puts '[+] No Google Analytics found :('
       end
+      if @print_status
+        gas.each do |g|
+          puts g
+        end
+      else 
+        return gas
+      end
     end
   end
 end

data/lib/snackhack2/host_injection.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+# Process.spawn("ruby -run -ehttpd . -p8008")
+# sleep 10
+module Snackhack2
+  class HostInjection
+    attr_accessor :site, :new_host_ip, :old_host_ip
+    # old_host_ip: the IP of the host (public IP) that its supposed to be
+    # new_host_ip: the IP of the host to bypass access controls
+    def initialize
+      @site = site
+    end
+    def test_all
+      p @new_host_ip
+      p @old_host_ip
+      [ "Host", "\sHost", "\rHost", "X-Forwarded-Host", "\sX-Forwarded-Host",
+        "X-Host", "\sX-Host", "\rX-Host", "X-Remote-Addr", "\sX-Remote-Addr",
+        "\rX-Remote-Addr", "X-Remote-IP", "\sX-Remote-IP", "\rX-Remote-IP",
+        "X-Forwarded-Server", "\sX-Forwarded-Server", "\rX-Forwarded-Server",
+        "Forwarded", "\sForwarded", "\rForwarded", "\sX-HTTP-Host-Override",
+        "X-HTTP-Host-Override", "\rX-HTTP-Host-Override"].each do |h|
+          head = {"Host" => @old_host_ip}
+          head[h] = @new_host_ip
+          r = HTTParty.get(@site, headers: head)
+          puts r.code
+          puts "\n==========================\n"
+      end
+    end
+
+    def host_ip
+      unless @old_host_ip.nil?
+        response = HTTParty.get(@site, headers: { "Host" => @old_host_ip})
+        puts response.body
+        puts response.code
+      end
+    end
+    def double_host_ip
+      unless @old_host_ip.nil?
+        response = HTTParty.get(@site, headers: { "Host" => @old_host_ip, "Host" => @new_host_ip})
+        puts response.body
+        puts response.code
+      end
+    end
+    def x_forwarded
+      unless @old_host_ip.nil?
+        response = HTTParty.get(@site, headers: { "Host" => @old_host_ip, "X-Forwarded-Host" => @new_host_ip})
+        puts response.body
+        puts response.code
+      end
+    end
+    def double_x_forwarded
+      unless @old_host_ip.nil?
+        response = HTTParty.get(@site, headers: { "X-Forwarded-Host" => @old_host_ip, "X-Forwarded-Host" => @new_host_ip})
+        puts response.body
+        puts response.code
+      end
+    end
+    def x_forwarded_server
+      unless @old_host_ip.nil?
+        r = HTTParty.get(@site, headers: {"Host" => @old_host_ip, "X-Forwarded-Server" => @new_host_ip})
+        puts r.body
+        puts r.code
+        r = HTTParty.get(@site, headers: {"X-Forwarded-Server" => @old_host_ip, "X-Forwarded-Server" => @new_host_ip})
+        puts r.body
+        puts r.code
+      end
+    end
+    def http_host_override
+      unless @old_host_ip.nil?
+        r = HTTParty.get(@site, headers: {"Host" => @old_host_ip, "X-HTTP-Host-Override" => @new_host_ip})
+        puts r.body
+        puts r.code
+        r = HTTParty.get(@site, headers: {"X-HTTP-Host-Override" => @old_host_ip, "X-HTTP-Host-Override" => @new_host_ip}).body
+      end
+    end
+    def extra_return_host
+      unless @new_host_ip.nil?
+        response = HTTParty.get(@site, headers: {"\rHost" => "#{@new_host_ip}"}, "Host" => "#{old_host_ip}").body
+        puts response
+      end
+    end
+    def extra_space_host
+      unless @new_host_ip.nil?
+        response = HTTParty.get(@site, headers: {"\sHost" => "#{@new_host_ip}"}, "Host" => "#{old_host_ip}").body
+        puts response
+      end
+    end
+  end
+end
+
+
+
+

data/lib/snackhack2/iplookup.rb

@@ -2,51 +2,58 @@
 
 require 'socket'
 require 'colorize'
+
 module Snackhack2
   class IpLookup
     attr_accessor :site
 
     def initialize(file_save: false)
       @file_save = file_save
-      @site = site
+      # Clean the URL immediately to avoid repeating .gsub everywhere
+    end
+
+    def site
+      @site = @site.gsub(%r{https?://}, '').split('/').first
     end
 
     def run
-      get_ip
-      nslookup
-      socket
+      # Running all methods and displaying results
+      puts "Methods for: #{@site}".bold.blue
+      puts "Ping:   #{get_ip.join(', ')}"
+      puts "NS:     #{nslookup.is_a?(Array) ? nslookup.join(', ') : 'Saved to file'}"
+      puts "Socket: #{socket_lookup}"
     end
 
     def get_ip
+      # Uses ping command to get IP of the host
       ips = []
-      ip = `ping -c 2 #{@site.gsub('https://', '')}`.lines
-      ip.each do |l|
-        new_ip = l.match(/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/)
-        ips << new_ip.to_s if !new_ip.to_s.empty? && !ips.include?(new_ip)
+      output = `ping -c 2 #{@site}`
+      # Using scan to find all IP-like patterns
+      output.scan(/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/).each do |match|
+        ip = match.first
+        ips << ip unless ips.include?(ip)
       end
       ips
     end
 
     def nslookup
-      ips = []
-      ns = `nslookup #{@site.gsub('https://', '')}`.lines
-      ns.each do |ip|
-        new_ip = ip.gsub('Address: ', '').strip if ip.include?('Address')
-        if !ips.include?(new_ip) && !new_ip.nil?
-          
-          ips << new_ip.split('Addresses:  ')[1].to_s
-        end
-      end
+      # Uses the nslookup command to extract the IP
+      output = `nslookup #{@site}`
+      # Simplified extraction using regex for "Address: [IP]"
+      ips = output.scan(/Address: (\d{1,3}(?:\.\d{1,3}){3})/).flatten.uniq
 
       if @file_save
-        Snackhack2.file_save(@site, 'ip_lookup', ips.to_a.drop(1).join("\n"))
+        # Note: Ensure Snackhack2.file_save is defined in your main module
+        Snackhack2.file_save(@site, 'ip_lookup', ips.join("\n"))
       else
         ips
       end
     end
 
-    def socket
-      puts IPSocket.getaddress(@site.gsub('https://', ''))
+    def socket_lookup
+      IPSocket.getaddress(@site)
+    rescue SocketError
+      "Could not resolve"
     end
   end
-end
+end

data/lib/snackhack2/list_users.rb

@@ -9,6 +9,8 @@ module Snackhack2
     end
 
     def linux
+      # uses the cat file to read the users in /etc/passwd
+      # then displays all the users
       `cat /etc/passwd`.split("\n").each do |l|
         puts l.split(':')[0]
       end

data/lib/snackhack2/phishing_tlds.rb

@@ -167,8 +167,6 @@ class PhishingTlds < PhishingData
           letters_with_more_than_one << key
       end
     end
-    
-    
     ds = remove_tlds
     new_ds = ds.shift
     
@@ -184,15 +182,7 @@ class PhishingTlds < PhishingData
         # removes ALL chracters ( l )
         remove_letters_out <<  new_ds.gsub(l, "")
     end
-    # add tldds to the created list
-    domains_with_tlds = add_tlds(remove_letters_out)
-    if array_out
-        domains_with_tlds
-    else
-       # will print the contents of the array
-       # instead of returning the array
-       domains_with_tlds.each  { |a| puts a }
-    end
+  add_tlds(remove_letters_out)
   end
   def add_tlds(list)
     # takes the newly created domains (list)

data/lib/snackhack2/phone_number.rb

@@ -7,47 +7,88 @@ module Snackhack2
     attr_accessor :save_file, :site
 
     def initialize(save_file: true)
-      @site = site
+      @site = site 
       @save_file = save_file
     end
 
     attr_reader :save_file
 
     def run
-      numbers = []
-      http = Snackhack2.get(@site)
-      if http.code == 200
-        regex = http.body
-        phone = regex.scan(/((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4})/)
-        out = phone.map { |n| n[0] }.compact
-        numbers << out
+      found_numbers = []
+      unless @site.include?("https://")
+        @site = "https://#{@site}"
       else
-        puts "\n\n[+] Status code: #{http.code}"
+        @site = site
       end
-      return if numbers.empty?
-      return unless @save_file
-
-      URI.parse(@site).host
-      Snackhack2.file_save(@site, 'phone_numbers', numbers.join("\n"))
+      http = Snackhack2.get(@site).body
+      case http
+      when (/((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4})/)
+        ph_1 = http.scan(/((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4})/).flatten
+        found_numbers <<  ph_1 
+      when /^(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/
+        ph_2 = http.scan(/^(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/).flatten
+        found_numbers << ph_2 
+      when (/^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/)
+        ph_3 = http.scan(/^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/).flatten
+        found_numbers << ph_3 
+      when (/^\+((?:9[679]|8[035789]|6[789]|5[90]|42|3[578]|2[1-689])|9[0-58]|8[1246]|6[0-6]|5[1-8]|4[013-9]|3[0-469]|2[70]|7|1)(?:\W*\d){0,13}\d$/).flatten
+        ph_4 = http.scan((/^\+((?:9[679]|8[035789]|6[789]|5[90]|42|3[578]|2[1-689])|9[0-58]|8[1246]|6[0-6]|5[1-8]|4[013-9]|3[0-469]|2[70]|7|1)(?:\W*\d){0,13}\d$/))
+        found_numbers << ph_4 
+      when (/^(\+0?1\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/)
+        ph_5 = http.scan(/^(\+0?1\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/)
+        found_numbers << ph_5
+      when (/^\+?[1-9][0-9]{7,14}$/)
+        ph_6 = http.scan(/^\+?[1-9][0-9]{7,14}$/)
+        found_numbers << ph_6
+      when (/^\+?\d{1,4}?[-.\s]?\(?\d{1,3}?\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,9}$/)
+        ph_7 = http.scan(/^\+?\d{1,4}?[-.\s]?\(?\d{1,3}?\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,9}$/)
+        found_numbers << ph_7
+      end
+      numbers = found_numbers.flatten.compact
+      if @save_file
+        Snackhack2.file_save(@site, 'phone_numbers', numbers.join("\n"))
+      else
+        return numbers
+      end 
     end
-
     def spider
-      phone_numbers = []
+      found_numbers = []
       Spidr.start_at(@site, max_depth: 4) do |agent|
         agent.every_page do |page|
           body = page.to_s
-          if body.scan(/((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4})/)
-            pn = body.scan(/((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4})/)[0]
-            unless pn.nil?
-              pn = pn.compact.reject { |i| i.to_s.nil? }.shift
-              phone_numbers << pn unless phone_numbers.include?(pn.to_s)
-            end
+          # regex to extract phone numbers
+          case body
+          when (/((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4})/)
+            ph_1 = http.scan(/((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4})/).flatten
+            found_numbers <<  ph_1 
+          when /^(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/
+            ph_2 = http.scan(/^(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/).flatten
+            found_numbers << ph_2 
+          when (/^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/)
+            ph_3 = http.scan(/^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/).flatten
+            found_numbers << ph_3 
+          when (/^\+((?:9[679]|8[035789]|6[789]|5[90]|42|3[578]|2[1-689])|9[0-58]|8[1246]|6[0-6]|5[1-8]|4[013-9]|3[0-469]|2[70]|7|1)(?:\W*\d){0,13}\d$/).flatten
+            ph_4 = http.scan((/^\+((?:9[679]|8[035789]|6[789]|5[90]|42|3[578]|2[1-689])|9[0-58]|8[1246]|6[0-6]|5[1-8]|4[013-9]|3[0-469]|2[70]|7|1)(?:\W*\d){0,13}\d$/))
+            found_numbers << ph_4 
+          when (/^(\+0?1\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/)
+            ph_5 = http.scan(/^(\+0?1\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}$/)
+            found_numbers << ph_5
+          when (/^\+?[1-9][0-9]{7,14}$/)
+            ph_6 = http.scan(/^\+?[1-9][0-9]{7,14}$/)
+            found_numbers << ph_6
+          when (/^\+?\d{1,4}?[-.\s]?\(?\d{1,3}?\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,9}$/)
+            ph_7 = http.scan(/^\+?\d{1,4}?[-.\s]?\(?\d{1,3}?\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,9}$/)
+            found_numbers << ph_7
           end
         end
       end
-      return if phone_numbers.empty?
-
-      Snackhack2.file_save(@site, 'phonenumbers', phone_numbers.join("\n")) if @save_file
+      unless phone_numbers.empty?
+        if @save_file
+          Snackhack2.file_save(@site, 'phonenumbers', phone_numbers.join("\n"))
+        else
+          return phone_numbers
+        end
+      end
     end
   end
 end

data/lib/snackhack2/portscan.rb

@@ -13,13 +13,17 @@ module Snackhack2
     end
 
     def run
+      # runs `tcp` with threads
       threads = []
+      # creates all the ports between 1 and 1000
       ports = [*1..1000]
       ports.each { |i| threads << Thread.new { tcp(i) } }
       threads.each(&:join)
     end
 
     def mass_scan
+      # uses the `generate_ips` to generate radom 
+      # IPs. then performs the scan
       generate_ips.each do |ips|
         tcp = PortScan.new
         tcp.ip = ips
@@ -28,6 +32,8 @@ module Snackhack2
     end
 
     def generate_ips
+      # generate a bunch of different Ips to an
+      # array named `ips`.
       ips = []
       @count.to_i.times do |_c|
         ips << Array.new(4) { rand(256) }.join('.')
@@ -36,6 +42,10 @@ module Snackhack2
     end
 
     def ports_extractor(port)
+      # Looks through the files in the folder that 
+      # match '_port_scan.txt' which extracts the 
+      # ports
+
       ip = []
       files = Dir['*_port_scan.txt']
       files.each do |f|
@@ -62,7 +72,7 @@ module Snackhack2
       return if open_ports.empty?
 
       return unless @display
-
+      # displays the open ports and IPs
       open_ports.each do |port|
         puts "#{ip} - #{port} is open\n"
       end