haiti-hash 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8666ca33015b9d177521ed2dbf2c57cf4d5d368916448acae67b0709b08e54d
-  data.tar.gz: 6c623a158e316ecdb438d8e470614dbd152e59620954ca697d8e74681095b0e5
+  metadata.gz: f7b5955de5a61d1e1ab59d2d6e09ca4c4be5f55b945cbf5cf587a8cfa3667d51
+  data.tar.gz: 033f766ccc4d8d1795176e55994472ce965bb4360382f8f3decd93d8044a8c43
 SHA512:
-  metadata.gz: e668334fd140646b1a64df1ecec7353a5111d8fa9873888bbad88f8420fbeda50b08abb97ef53ac901c6bf3c0d6a87d1171df32d12b1b4869e20c5a94d9a92fc
-  data.tar.gz: 36eba5ecad7673002acc91d1c3230ecca973bf1257a1aa3e2932433fd1cc83ac7fc574bc132e6818c7c6e2ca84069fee03b6fae22d59d84b120e2cc712f86aeb
+  metadata.gz: c96dd859d8a3d256891002bdfce1903978da263bc1405e18f07b4fc9ee42c2c3163cdc3783593d20e2a5f5a5798b79c425341a0ffd99910d75a5217c6e3a08ee
+  data.tar.gz: a1346e64b98974aa355efe105f1225d0f993f3c515ff5c65ab3e404ce24b7d0f39b98c0b32d322ca2e76240c0c460db64feace71714c8ad12c3d982737a574d4

data/bin/haiti

@@ -2,51 +2,72 @@
 # frozen_string_literal: true
 
 # Ruby internal
-require 'pp'
 # Project internal
 require 'haiti'
 # External
 require 'docopt'
 require 'paint'
 
+# NOTE: `haiti [options] <hash>` needs to be after `list` and `samples`, else `list` is caught as a hash
 doc = <<~DOCOPT
-  HAITI (HAsh IdenTifIer) v#{HashIdentifier::VERSION}
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
 
-  Usage:
-    haiti [options] <hash>
+  #{Paint['Usage:', '#00FFFF']}
+    haiti [options] list
     haiti samples (<ref> | <name>)
+    haiti [options] <hash>
+    haiti --ascii-art
     haiti -h | --help
     haiti --version
 
-  Commands:
+  #{Paint['Commands:', '#00FFFF']}
     samples         Display hash samples for the given type
+    list            Display a list of all the available hash types
 
-  Parameters:
+  #{Paint['Parameters:', '#00FFFF']}
     <hash>          Hash string to identify, read from STDIN if equal to "-"
     <ref>           hashcat or john the ripper reference
     <name>          Hash type name
 
-  Options:
-    --no-color      Disable colorized output
+  #{Paint['Options:', '#00FFFF']}
+    --no-color      Disable colorized output (NO_COLOR environment variable is respected too)
     -e, --extended  List all possible hash algorithms including ones using salt
     --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
     --debug         Display arguments
     -h, --help      Show this screen
     --version       Show version
 
-  Examples:
+  #{Paint['Examples:', '#00FFFF']}
     haiti -e d41d8cd98f00b204e9800998ecf8427e
     haiti --no-color --short d41d8cd98f00b204e9800998ecf8427e
     b2sum /etc/os-release | awk '{print $1}' | haiti -
     haiti samples crc32
+
+  #{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
 
+# 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']
-  pp args if args['--debug']
+  puts args if args['--debug']
   # use case 1, using the tool
   if args['<hash>']
     args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
@@ -55,20 +76,18 @@ begin
       puts 'Unknown hash type'
       exit(0)
     end
-    hi.type.each do |type|
-      next if type.extended && !args['--extended']
-
-      print Paint[type.name, :bold]
-      print Paint[" [HC: #{type.hashcat}]", :blue] unless type.hashcat.nil? || args['--short'] || args['--john-only']
-      print Paint[" [JtR: #{type.john}]", :green] 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
   # use case 2, help: already handled by docopt
   # use case 3, version: already handled by docopt

data/data/commons.json

@@ -1,29 +1,31 @@
 [
-  "MD5",
-  "SHA-1",
-  "SHA-256",
-  "SHA-512",
-  "bcrypt",
-  "NTLM",
-  "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"
 ]