heitt 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09a5102cf903ce6b0064303daa378ba34d5ab5835ec90be737cef63325e48872'
-  data.tar.gz: d6a882c5ae2f4b33390ee4c4a5ca03ffdb3032832333c0a8f355c126a7223841
+  metadata.gz: 0beed2894ada25d59c6c1d9267fee2e0753dbfbcb89b81156a748cbee6171402
+  data.tar.gz: 58209cc283a7c4864904e44280395a163da79b8144f36d33617fe9336038962d
 SHA512:
-  metadata.gz: 0da456e13048b5687e010ccc6361179f51a781d97880d22306a5a90eda9bb48ca5f596f196d4cbee7d0fdb10e58cac24674cc5a15efe366811a81745d6d90f48
-  data.tar.gz: 4c65b51cda918629388e41ecde058909ba475fafcdeb1640b02b0c68609b29bcc804e9b24512de7d67f502a26a6bd0923688d3dec9de274e7ce118df4c5e0a9e
+  metadata.gz: 93cb5c2a948fc18961f02a082ff72ee7bef0a3d2bb6304da64f3839d0d90c147f9652a4c9a24208f17626d66be5321177ad42e03758c8ccce5b8ed240bdc8d32
+  data.tar.gz: e0ebeb29a0cd51ab44ce9364a043d2840cdb8f312fe5a1399d82a96a089b72bf0377f3fea06948e4e7964f6063f45ee196e1eb4a5f7f47a540ffa70096a8809a

data/bin/heitt

@@ -4,6 +4,7 @@ require 'io/console'
 require 'heitt'
 
 
+
 module HEITT
   class CLI
     attr_accessor :inputs, :extended, :verbose, :output, :json, :database, :show_regex_match, :min_entropy

data/lib/heitt/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module HEITT
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
   GITHUB = "https://github.com/jobotow/heitt"
 end

data/lib/heitt.rb

@@ -69,7 +69,6 @@ module HEITT
           prefix_matched_mode = mode[:name]
           score += 20
         end
-        #puts "MODENAME: #{mode[:name]}"
         {
           name: mode[:name],
           hashcat: mode[:hashcat],
@@ -95,7 +94,7 @@ module HEITT
       entry[:candidates] || entry[:types] || entry[:hashtypes]
     end
 
-    #this  code is a copy or inspiration of "https://github.com/chrisjchandler/entropy/blob/main/entropy.go"
+    #this  code is an inspiration of "https://github.com/chrisjchandler/entropy/blob/main/entropy.go"
     def self.entropy(text)
       frequency = Hash.new(0)
       text.each_char { |ch| frequency[ch] += 1 }
@@ -211,11 +210,22 @@ module HEITT
 
           candidates = HEITT::Analyzer.score_candidates(modes, delim_prefix, context_scores)
           score = candidates.first[:score]
-          if score > (seen[matched] || -1)
-            seen[matched] = score
-            found[matched] = {hash: matched, candidates: candidates}
+
+          found[matched] ||= {hash: matched, candidates: []}
+          found[matched][:candidates].concat(candidates)
           end
         end
+
+          found.each_value do |result|
+           result[:candidates] = result[:candidates]
+            .group_by {|c| c[:name]}
+            .map {|name, dupes| dupes.max_by {|c| c[:score]}}
+            .sort_by {|c| -c[:score]}
+
+            # Re-assign confidence based on final merged scores
+            scores_hash = result[:candidates].map {|c| [c[:name], c[:score]]}.to_h
+            confidences = Analyzer.assign_confidence(scores_hash)
+            result[:candidates] = result[:candidates].map {|c| c.merge(confidence: confidences[c[:name]])}
       end
       found.values
     end
@@ -305,7 +315,7 @@ module HEITT
       JSON.pretty_generate(
         renumbered_groups.map do |group|
           visible_candidates = group[:candidates].select do |c|
-            (!c[:extended] || extended) && (c[:confidence] != "regex-match" || show_regex_match)
+            (!c[:extended] || extended)  && (c[:confidence] != "regex-match" || show_regex_match)
           end
           {
            cluster_id: group[:cluster_id],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heitt
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jonathan Botchway Owusu