haiti-hash 1.5.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd592c70589060103cc205f32fadb24e09c5aa21467bc43f37c9ec6c10f543df
-  data.tar.gz: 3062b9c1a82699502a94349404a62af27667f8456c7c6549ac7b2e00f7b5e363
+  metadata.gz: 1fcea45a6ae417a25dbd280f27fcdc55e515a3378486bae9d0092ed24a9efbf4
+  data.tar.gz: e47efec0dfa8a7ab15bada00c5ba4875722923c31d2fedf17bd09edf60e7a646
 SHA512:
-  metadata.gz: f0508b249173ece824297cd7fd89464b94a51d4927121cf46c71c76f5d00af92aacb5ef1dee85e5c6495ed838fb33be6cd58ebc0b6654466dc9974a31e633b47
-  data.tar.gz: abbaab41b018f76f45685f18c7b809c74a1e96c569c46eeccc0ec98c9ad771b7d0128c2566854b7fa51abaacef30ca490e06269553cbe87563c8c30fed9cd2f7
+  metadata.gz: d0f2588f566e48473014c19e90822afb0f4372c45d387bde6480dd1c99226fd35b9b546bfbf9861458763169f9a58e8d9841c9f8589cce96cd40bb6c0edc1c53
+  data.tar.gz: 1fae1ee5d9289ad83914809bdbc68f8531a7f7f99d71a28820edccb6a6c116fd3ee6b2b9ba527c5055efaaf2d4028f7c155daee2330eef96e551cdae490e2571

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2022 Alexandre ZANNI (independent)
+Copyright (c) 2020-2023 Alexandre ZANNI (independent)
 Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/bin/haiti

@@ -8,18 +8,21 @@ require 'haiti'
 require 'docopt'
 require 'paint'
 
+# NOTE: `haiti [options] <hash>` needs to be after `list` and `samples`, else `list` is caught as a hash
 doc = <<~DOCOPT
   #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
 
   #{Paint['Usage:', '#00FFFF']}
-    haiti [options] <hash>
+    haiti [options] list
     haiti samples (<ref> | <name>)
+    haiti [options] <hash>
     haiti --ascii-art
     haiti -h | --help
     haiti --version
 
   #{Paint['Commands:', '#00FFFF']}
     samples         Display hash samples for the given type
+    list            Display a list of all the available hash types
 
   #{Paint['Parameters:', '#00FFFF']}
     <hash>          Hash string to identify, read from STDIN if equal to "-"
@@ -32,7 +35,7 @@ doc = <<~DOCOPT
     --short         Display in a short format: do not display hashcat and john the ripper references
     --hashcat-only  Show only hashcat references
     --john-only     Show only john the ripper references
-    --ascii-art       Display the logo in colored ascii-art
+    --ascii-art     Display the logo in colored ascii-art
     --debug         Display arguments
     -h, --help      Show this screen
     --version       Show version
@@ -49,6 +52,18 @@ doc = <<~DOCOPT
     #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
 DOCOPT
 
+# Shared option management logic for the identify and list command
+def manage_options(args, types)
+  types.each do |type|
+    next if type.extended && !args['--extended']
+
+    print Paint[type.name, :bold]
+    print Paint[" [HC: #{type.hashcat}]", '#00FFFF'] unless type.hashcat.nil? || args['--short'] || args['--john-only']
+    print Paint[" [JtR: #{type.john}]", '#FF69B4'] unless type.john.nil? || args['--short'] || args['--hashcat-only']
+    puts
+  end
+end
+
 begin
   args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
   Paint.mode = 0 if args['--no-color']
@@ -61,22 +76,16 @@ begin
       puts 'Unknown hash type'
       exit(0)
     end
-    hi.type.each do |type|
-      next if type.extended && !args['--extended']
-
-      print Paint[type.name, :bold]
-      unless type.hashcat.nil? || args['--short'] || args['--john-only']
-        print Paint[" [HC: #{type.hashcat}]", '#00FFFF']
-      end
-      print Paint[" [JtR: #{type.john}]", '#FF69B4'] unless type.john.nil? || args['--short'] || args['--hashcat-only']
-      puts
-    end
+    manage_options(args, hi.type)
   elsif args['samples']
     input = args['<ref>'] || args['<name>']
     samples = HashIdentifier.samples(input)
     samples.each do |sample|
       puts sample
     end
+  elsif args['list']
+    types = HashIdentifier.object_list
+    manage_options(args, types)
   elsif args['--ascii-art']
     puts File.read(File.join(__dir__, '../docs/_media/logo.ascii'))
   end

data/bin/haiti-fzf

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    haiti-fzf hc [options] <hash>
+    haiti-fzf jtr [options] <hash>
+    haiti-fzf -h | --help
+    haiti-fzf --version
+
+  #{Paint['Commands:', '#00FFFF']}
+    hc             Select a Hashcat reference with fzf from one of the matching hash types
+    jtr            Select a John the Ripper reference with fzf from one of the matching hash types
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    haiti-fzf hc -e d41d8cd98f00b204e9800998ecf8427e
+    haiti-fzf jtr d41d8cd98f00b204e9800998ecf8427e
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    ext = args['--extended'] ? '-e' : ''
+    system("haiti-parsable hc #{ext} #{args['<hash>']} | fzf | cut -d '|' -f 2") if args['hc']
+    system("haiti-parsable jtr #{ext} #{args['<hash>']} | fzf | cut -d '|' -f 2") if args['jtr']
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/bin/haiti-parsable

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    haiti-parsable hc [options] <hash>
+    haiti-parsable jtr [options] <hash>
+    haiti-parsable -h | --help
+    haiti-parsable --version
+
+  #{Paint['Commands:', '#00FFFF']}
+    hc             Display hash types matching that have a Hashcat reference
+    jtr            Display hash types matching that have a John the Ripper reference
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    haiti-parsable hc -e d41d8cd98f00b204e9800998ecf8427e
+    haiti-parsable jtr d41d8cd98f00b204e9800998ecf8427e
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+def manage_options(args, types)
+  types.each do |type|
+    next if type.extended && !args['--extended']
+
+    puts "#{type.name} |#{type.hashcat}" if args['hc'] && !type.hashcat.nil?
+    puts "#{type.name} |#{type.john}" if args['jtr'] && !type.john.nil?
+  end
+end
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    hi = HashIdentifier.new(args['<hash>'])
+    if hi.type.empty?
+      puts 'Unknown hash type'
+      exit(0)
+    end
+    manage_options(args, hi.type)
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/bin/hashcat-haiti

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    hashcat-haiti [options] <hash> -- <hashcat_options>...
+    hashcat-haiti -h | --help
+    hashcat-haiti --version
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    hashcat-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt /usr/share/wordlists/passwords/rockyou.txt -r /usr/share/doc/hashcat/rules/best64.rule
+    hashcat-haiti d41d8cd98f00b204e9800998ecf8427e -- hashes.txt -a 3
+    head -1 /tmp/hash.txt | hashcat-haiti - -- /tmp/hash.txt
+    hashcat-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt --show
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    ext = args['--extended'] ? '-e' : ''
+    system("hashcat -m $(haiti-fzf hc #{ext} #{args['<hash>']}) #{args['<hashcat_options>'].join(' ')}")
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/bin/john-haiti

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    john-haiti [options] <hash> -- <john_options>...
+    john-haiti -h | --help
+    john-haiti --version
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    john-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt --wordlist=/usr/share/wordlists/passwords/rockyou.txt
+    john-haiti 1f474c6dadb3cb2370f6cb88d4576ede0db9ff43 -- hashes.txt --rules=NT --fork=3
+    head -1 /tmp/hash.txt | john-haiti - -- /tmp/hash.txt
+    john-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt --show
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    ext = args['--extended'] ? '-e' : ''
+    system("john --format=$(haiti-fzf jtr #{ext} #{args['<hash>']}) #{args['<john_options>'].join(' ')}")
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/data/commons.json

@@ -1,30 +1,31 @@
 [
-  "MD5",
-  "SHA-1",
-  "SHA-256",
-  "SHA-512",
-  "bcrypt",
-  "NTLM",
-  "NT",
-  "NetNTLMv2",
-  "NetNTLMv1-VANILLA / NetNTLMv1+ESS",
-  "BLAKE2-512",
-  "SHA3-224",
-  "SHA3-256",
-  "SHA3-512",
-  "Keccak-256",
-  "Keccak-512",
-  "CRC-32B",
-  "CRC-32",
-  "CRC-16",
-  "CRC-64",
-  "GOST R 34.11-94",
-  "Apache MD5",
-  "MD5(APR)",
-  "md5apr1",
-  "Domain Cached Credentials",
-  "Domain Cached Credentials 2",
-  "LM",
-  "RIPEMD-160",
-  "scrypt"
+	"MD5",
+	"SHA-1",
+	"SHA-256",
+	"SHA-512",
+	"bcrypt",
+	"NTLM",
+	"NetNTLMv2 (vanilla)",
+	"NetNTLMv2 (NT)",
+	"NetNTLMv1 / NetNTLMv1+ESS (vanilla)",
+	"NetNTLMv1 / NetNTLMv1+ESS (NT)",
+	"BLAKE2-512 (blake2b)",
+	"SHA3-224",
+	"SHA3-256",
+	"SHA3-512",
+	"Keccak-256",
+	"Keccak-512",
+	"CRC-32B",
+	"CRC-32",
+	"CRC-16",
+	"CRC-64",
+	"GOST R 34.11-94",
+	"Apache MD5",
+	"MD5 (APR)",
+	"md5apr1",
+	"Domain Cached Credentials (DCC), MS Cache",
+	"Domain Cached Credentials 2 (DCC2), MS Cache 2",
+	"LM",
+	"RIPEMD-160",
+	"scrypt"
 ]