fingerprinter 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d85553bfd3f1487b0185188933d1e409f12cc8e8a96762e5f2e8e5a2ab7f7d1
-  data.tar.gz: bd5fc3fd49ceac7667bcaca1eaf4cb3e0fb7be4dc68d62bc58bbf15f6ff8751d
+  metadata.gz: 3b224d61b1b79fce378d1b8ad8ac84ac4f1de81cd37195281aee7e0051c684d6
+  data.tar.gz: df4ba4f706f8a5de13b778f050ee1568a5f9bdbf6cabaa7732ec5fcb745b0f39
 SHA512:
-  metadata.gz: e598f2f6025e1db35ca2089aace62176b048cc6e432868086199d5af999138257dcd6a3f8134c6b9c303c189e565d15ffb8e0e1e6736eae8b3be9f45c16f360b
-  data.tar.gz: c9829ca7d4288d7f096b4c3dd7dea07369bebbee12e9b308c743bd749176f03c9898a3de1b937bf30f1ea33b5ef675d317ccf1546aeb3feba22a57f0909fdf91
+  metadata.gz: cc74aa0e8bf750f3a9d8a727a958e23d3a285491c0501763238cd5493e865bebe9590c42090b7bbf1f1cdea2ba9ac56824784eb3079b7fafeb9923deed1eae07
+  data.tar.gz: 7e70c7c5e3fabafd2c73dd53a1a41b1a05769044978005f0a521646b30a78ba5bc1b3a701ccd9d0b05a2cd5d6266fa35bf5075bf7f908f6babe0ff2ada89541f

data/lib/fingerprinter/configs/scan_options.rb

@@ -34,7 +34,7 @@ class ScanOptions
   end
 
   def self.user_agent
-    @user_agent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36'
+    @user_agent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36'
   end
 
   def self.timeout

data/lib/fingerprinter/core/detector.rb

@@ -8,14 +8,14 @@ module Fingerprinter
       response.headers&.each do |header, value|
         regex = regexes[header.downcase]
         next unless regex
-    
+
         if value.is_a?(Array)
           return true if value.any? { |v| regex.match?(v) }
-        else
-          return true if regex.match?(value)
+        elsif regex.match?(value)
+          return true
         end
       end
-    
+
       false
     end
 

data/lib/fingerprinter/core/http_client.rb

@@ -22,9 +22,10 @@ class HttpClient
     }
 
     req_options[:headers].merge!({
-      'Priority' => 'u=0, i',
-      'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8'
-    })
+                                   'Priority' => 'u=0, i',
+                                   'Accept-Encoding' => 'gzip, deflate, br',
+                                   'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8'
+                                 })
 
     req_options[:params] = options[:params] if options[:params]
 

data/lib/fingerprinter/technologies/cms/magento.rb

@@ -15,15 +15,16 @@ class Magento < Fingerprinter::Technologies
     /Magento_PageCache/,
     /Mage\.Cookies\.path/,
     /data-requiremodule="(mage|Magento_)/,
-    /mage\/cookies/,
+    %r{mage/cookies},
     /MAGENTO_/,
     /Magento Security Scan/,
-    /js\/mage\//,
+    %r{js/mage/},
     /x-magento-init/
   ].freeze
 
   def self.get_graphql(url)
-    url = File.join(Utilities::Urls.up_to_port(url), '/graphql?query=+{customerDownloadableProducts+{+items+{+date+download_url}}+}')
+    url = File.join(Utilities::Urls.up_to_port(url),
+                    '/graphql?query=+{customerDownloadableProducts+{+items+{+date+download_url}}+}')
     return if Utilities::Kb.inspected?(self, url)
 
     Utilities::Kb.inspected(self, url)
@@ -31,16 +32,17 @@ class Magento < Fingerprinter::Technologies
   end
 
   def self.run(data)
-    detected = meta_detection(data[:doc], META_CONTENT_REGEX) || 
-                whole_body_check(data[:response], BODY_CONTENT_REGEX)
+    detected = meta_detection(data[:doc], META_CONTENT_REGEX) ||
+               whole_body_check(data[:response], BODY_CONTENT_REGEX)
 
-    if detected
-      'Magento'
-    else
+    unless detected
       response = get_graphql(data[:url])
-      return unless response&.code == 200 && ['The current customer', 'graphql-authorization'].all? { |pattern| response.body.include?(pattern) }
+      return unless response&.code == 200 && ['The current customer', 'graphql-authorization'].all? do |pattern|
+                      response.body.include?(pattern)
+                    end
 
-      'Magento'
     end
+
+    'Magento'
   end
 end

data/lib/fingerprinter/technologies/softwares/apache_ofbiz.rb

@@ -28,13 +28,13 @@ class ApacheOfbiz < Fingerprinter::Technologies
       response = get_xmlrpc(data[:url])
       return unless response&.code == 200
 
-      doc = Utilities::Parser.doc(response.body)
+      data[:doc] = Utilities::Parser.doc(response.body)
     end
 
     return unless response_headers_check(response, HEADERS_REGEX) ||
                   meta_detection(data[:doc], META_CONTENT_REGEX) ||
                   whole_body_check(response, BODY_CONTENT_REGEX)
 
-    'Apache Ofbiz'
+    'Apache OFBiz'
   end
 end

data/lib/fingerprinter/technologies/softwares/nexus_repository.rb

@@ -15,13 +15,16 @@ class NexusRepository < Fingerprinter::Technologies
   end
 
   def self.run(data)
-    detected = title_detection(data[:doc], 'Sonatype Nexus Repository') || meta_detection(data[:doc], META_CONTENT_REGEX, 'description')
+    detected = title_detection(data[:doc],
+                               'Sonatype Nexus Repository') || meta_detection(data[:doc], META_CONTENT_REGEX,
+                                                                              'description')
     unless detected
       response = check_path(data[:url])
       return unless response&.code == 200
 
       doc = Utilities::Parser.doc(response.body)
-      detected = title_detection(doc, 'Sonatype Nexus Repository') || meta_detection(doc, META_CONTENT_REGEX, 'description')
+      detected = title_detection(doc,
+                                 'Sonatype Nexus Repository') || meta_detection(doc, META_CONTENT_REGEX, 'description')
     end
     return unless detected
 

data/lib/fingerprinter/utilities/kb.rb

@@ -2,7 +2,7 @@
 
 class Utilities
   # Files : Utilities related to files
-  class Kb 
+  class Kb
     def self.coverage_id(plugin, url)
       "#{plugin}:#{url}"
     end
@@ -15,4 +15,4 @@ class Utilities
       Fingerprinter::Technologies.kb[:inspected].include?(coverage_id(plugin, url))
     end
   end
-end
+end

data/lib/fingerprinter/utilities/parser.rb

@@ -9,4 +9,4 @@ class Utilities
       Nokogiri::HTML(body)
     end
   end
-end
+end

data/lib/fingerprinter/utilities/urls.rb

@@ -28,4 +28,4 @@ class Utilities
       uri.to_s.split('?', 2).first.to_s
     end
   end
-end
+end

data/lib/fingerprinter.rb

@@ -44,7 +44,7 @@ module Fingerprinter
           doc = Utilities::Parser.doc(response.body)
 
           results[url] = Concurrent::Array.new
-          data = { response:, doc:, url: }
+          data = { response: response, doc: doc, url: url }
           Technologies.subclasses.each { |technology| results[url] << technology.run(data) }
         end
       end
@@ -56,11 +56,16 @@ module Fingerprinter
     private
 
     def get_response(url)
-      response = Fingerprinter.http_client.get(url, { follow_location: true })[url]
-      return if response&.code&.zero?
-      return response if same_scope?(url, response)
+      response = nil
+      3.times do
+        response = Fingerprinter.http_client.get(url, { follow_location: true })[url]
+        break if response&.code != 0 && !response.return_message.include?('Stream error')
 
-      Fingerprinter.http_client.get(url, { follow_location: false })[url]
+        sleep(1)
+      end
+      return response if response&.code&.zero? || same_scope?(url, response)
+
+      response.redirections.first
     end
 
     def same_scope?(url, response)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fingerprinter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Joshua MARTINELLE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="