haiti-hash 0.0.1 → 1.1.2

data/lib/haiti.rb

@@ -10,7 +10,8 @@ require 'haiti/hash'
 class HashIdentifier
   # Constants
   include Version
-  PROTOTYPES = JSON.parse(File.read('data/prototypes.json'))
+  PROTOTYPES = JSON.parse(File.read(File.join(__dir__, '../data/prototypes.json')))
+  COMMONS = JSON.parse(File.read(File.join(__dir__, '../data/commons.json')))
 
   # @return [String] the hash (as provided)
   # @example
@@ -26,6 +27,7 @@ class HashIdentifier
   def initialize(hash)
     @hash = hash
     @type = identify(hash)
+    sort_commons
   end
 
   private
@@ -46,4 +48,9 @@ class HashIdentifier
     end
     return res
   end
+
+  # Sort common hash types first
+  def sort_commons
+    @type.sort_by! { |e| COMMONS.include?(e.name) ? 0 : 1 }
+  end
 end

data/lib/haiti/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Version
-  VERSION = '0.0.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haiti-hash
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Alexandre ZANNI
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.75'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.75'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -155,95 +155,47 @@ email: alexandre.zanni@engineer.com
 executables:
 - haiti
 - haiti_console
-- haiti_setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rubocop.yml"
-- ".yardopts"
-- ".yardopts-dev"
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
-- README.md
-- Rakefile
 - bin/haiti
 - bin/haiti_console
-- bin/haiti_setup
+- data/commons.json
 - data/prototypes.json
-- docs/.nojekyll
-- docs/CHANGELOG.md
-- docs/README.md
-- docs/_coverpage.md
-- docs/_media/logo.png
-- docs/_navbar.md
-- docs/_sidebar.md
-- docs/about.md
-- docs/index.html
-- docs/pages/demo.md
-- docs/pages/documentation.md
-- docs/pages/install.md
-- docs/pages/publishing.md
-- docs/pages/quick-start.md
-- docs/pages/usage.md
-- docs/vendor/docsify.js
-- docs/vendor/plugins/emoji.min.js
-- docs/vendor/plugins/search.min.js
-- docs/vendor/prismjs/components/prism-ruby.min.js
-- docs/vendor/themes/vue.css
-- docs/why.md
-- docs/yard/HashIdentifier.html
-- docs/yard/HashIdentifier/Chf.html
-- docs/yard/Version.html
-- docs/yard/_index.html
-- docs/yard/class_list.html
-- docs/yard/css/common.css
-- docs/yard/css/full_list.css
-- docs/yard/css/style.css
-- docs/yard/file.LICENSE.html
-- docs/yard/file.README.html
-- docs/yard/file_list.html
-- docs/yard/frames.html
-- docs/yard/index.html
-- docs/yard/js/app.js
-- docs/yard/js/full_list.js
-- docs/yard/js/jquery.js
-- docs/yard/method_list.html
-- docs/yard/top-level-namespace.html
 - lib/haiti.rb
 - lib/haiti/hash.rb
 - lib/haiti/version.rb
-- test/test_haiti.rb
-homepage: https://orange-cyberdefense.github.io/haiti/
+homepage: https://noraj.github.io/haiti/
 licenses:
 - MIT
 metadata:
   yard.run: yard
-  bug_tracker_uri: https://github.com/Orange-Cyberdefense/haiti/issues
-  changelog_uri: https://github.com/Orange-Cyberdefense/haiti/blob/master/docs/CHANGELOG.md
-  documentation_uri: https://orange-cyberdefense.github.io/haiti/
-  homepage_uri: https://orange-cyberdefense.github.io/haiti/
-  source_code_uri: https://github.com/Orange-Cyberdefense/haiti/
-post_install_message: 
+  bug_tracker_uri: https://github.com/noraj/haiti/issues
+  changelog_uri: https://github.com/noraj/haiti/blob/master/docs/CHANGELOG.md
+  documentation_uri: https://noraj.github.io/haiti/
+  homepage_uri: https://noraj.github.io/haiti/
+  source_code_uri: https://github.com/noraj/haiti/
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.4.0
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: HAsh IdenTifIer
-test_files:
-- test/test_haiti.rb
+test_files: []

data/.editorconfig

@@ -1,21 +0,0 @@
-# EditorConfig: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-# ruby
-[*.rb]
-charset = utf-8
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-# keep source format
-[data/prototypes.json]
-indent_style = space
-indent_size = 4

data/.gitignore

@@ -1,8 +0,0 @@
-.yardoc
-*.gem
-/pkg
-/doc
-/vendor
-.bundle/
-/node_modules
-.git

data/.rubocop.yml

@@ -1,25 +0,0 @@
-# Metrics
-AllCops:
-  TargetRubyVersion: 2.4
-
-Layout/AlignHash:
-  Include:
-    - 'lib/**/*.rb'
-Metrics/AbcSize:
-  Enabled: false
-Metrics/ClassLength:
-  Max: 200
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/LineLength:
-  Include:
-    - 'lib/**/*.rb'
-Metrics/BlockNesting:
-  Exclude:
-    - 'bin/*'
-Metrics/MethodLength:
-  Max: 25
-Metrics/PerceivedComplexity:
-  Max: 10
-Style/RedundantReturn:
-  Enabled: false

data/.yardopts

@@ -1,4 +0,0 @@
---output-dir docs/yard
--
---main README.md
-LICENSE.txt

data/.yardopts-dev

@@ -1,6 +0,0 @@
---output-dir docs/yard
---protected
---private
--
---main README.md
-LICENSE.txt

data/Gemfile

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in .gemspec
-gemspec

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    haiti-hash (0.0.1)
-      docopt (~> 0.6)
-      paint (~> 2.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    commonmarker (0.20.1)
-      ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.5)
-    docopt (0.6.1)
-    github-markup (3.0.4)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    minitest (5.12.2)
-    paint (2.1.1)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (13.0.0)
-    redcarpet (3.5.0)
-    rubocop (0.75.1)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-enum (0.7.2)
-      i18n
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
-    yard (0.9.20)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  commonmarker (~> 0.20)
-  github-markup (~> 3.0)
-  haiti-hash!
-  minitest (~> 5.12)
-  rake (~> 13.0)
-  redcarpet (~> 3.5)
-  rubocop (~> 0.75)
-  yard (~> 0.9)
-
-BUNDLED WITH
-   2.0.2

data/README.md

@@ -1,32 +0,0 @@
-# HAITI
-
-[![Gem Version](https://badge.fury.io/rb/haiti.svg)](https://badge.fury.io/rb/haiti-hash)
-![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/Orange-Cyberdefense/haiti)
-[![GitHub forks](https://img.shields.io/github/forks/Orange-Cyberdefense/haiti)](https://github.com/Orange-Cyberdefense/haiti/network)
-[![GitHub stars](https://img.shields.io/github/stars/Orange-Cyberdefense/haiti)](https://github.com/Orange-Cyberdefense/haiti/stargazers)
-[![GitHub license](https://img.shields.io/github/license/Orange-Cyberdefense/haiti)](https://github.com/Orange-Cyberdefense/haiti/blob/master/LICENSE.txt)
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/haiti.svg)](https://repology.org/project/haiti/versions)
-
-![](https://orange-cyberdefense.github.io/haiti/_media/logo.png)
-
-> _**HA**sh **I**den**T**if**I**er_
-
-## What is it?
-
-A CLI tool to identify the hash type of a given hash.
-
-## Features
-
-- 270+ hash types detected
-- Hashcat and John the Ripper references
-- CLI tool & library
-- Hackable
-
-## References
-
-Homepage / Documentation: https://orange-cyberdefense.github.io/haiti/
-
-## Author
-
-Made by Alexandre ZANNI ([@noraj](https://github.com/noraj)), pentester from Orange Cyberdefense.

data/Rakefile

@@ -1,10 +0,0 @@
-require 'rake/testtask'
-require 'bundler/gem_tasks'
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-end
-
-desc 'Run tests'
-task default: :test
-

data/bin/haiti_setup

@@ -1,7 +0,0 @@
-
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install

data/docs/CHANGELOG.md

@@ -1,3 +0,0 @@
-## [0.0.1]
-
-- Initial version