tls-map 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac0d9c7dbfc9715ca7387df65617f1202a06ab70b72f764356e6bdb3cbeda3d
-  data.tar.gz: 37f02d9953363e4fb90e940d894b1ecdafe9bba9ae1636540f9593ee3c37b808
+  metadata.gz: 96e73fb397b1d13049c3da41be80eb8187846bebb2c49bb307e99a825e1bb9ab
+  data.tar.gz: 4798e654bc27a9c5ef01722cc81ebdf5113119e8d46bc7434256ecd7974547ea
 SHA512:
-  metadata.gz: 8a514c524c42e6765e55817dea46b905fdf717e6609e0f1efc2f2555249938b750ae79325b5c2ba3cc58b645f0b378f0f3f13d877a9be37a74dff033b420edbd
-  data.tar.gz: 8691bfcdb56bbfe8daa408b290f06f1eb2e9dd2f564a9c86e59b2c64e077b037b45b27e4d4e1000fab7b6fc418064b0d4d1b66e1eb174b221b0fe8c022b72b1c
+  metadata.gz: '0675008a588def8477d32a3afef6c88dafd4bff9dccaf0885ec012259524e436014abf88aea0da881e1794f7e6be6b3290737aba0d07cd78df25254009d38cbb'
+  data.tar.gz: 3c4c8fc5710d153f43f5c82e9b7f44f8e047e0b23ec82f9bd574f933a2759d7f4004abfeb7e7f8c29c3d0bd8237690b9e32a9547848c1e8c327db4e3303652d8

data/lib/tls_map.rb

@@ -19,11 +19,11 @@ module TLSmap
   class App
     # Will automatically fetch source files and parse them.
     def initialize
-      @iana_file = tmpfile('iana', IANA_URL)
-      @openssl_file = tmpfile('openssl', OPENSSL_URL)
-      @openssl_file2 = tmpfile('openssl', OPENSSL_URL2)
-      @gnutls_file = tmpfile('gnutls', GNUTLS_URL)
-      @nss_file = tmpfile('nss', NSS_URL)
+      @iana_file = Utils.tmpfile('iana', IANA_URL)
+      @openssl_file = Utils.tmpfile('openssl', OPENSSL_URL)
+      @openssl_file2 = Utils.tmpfile('openssl', OPENSSL_URL2)
+      @gnutls_file = Utils.tmpfile('gnutls', GNUTLS_URL)
+      @nss_file = Utils.tmpfile('nss', NSS_URL)
 
       @tls_map = []
       parse

data/lib/tls_map/ciphersuiteinfo.rb

@@ -45,13 +45,10 @@ module TLSmap
         2 => { title: 'High', color: :red }
       }.freeze
 
-      include Utils
-      protected :tmpfile
-
       # Will automatically fetch source files and parse them.
       def initialize
-        @tech_file = tmpfile('tech', TECH_DATA)
-        @vuln_file = tmpfile('vuln', VULN_DATA)
+        @tech_file = Utils.tmpfile('tech', TECH_DATA)
+        @vuln_file = Utils.tmpfile('vuln', VULN_DATA)
         @tech = parse_tech
         @vuln = parse_vuln
       end

data/lib/tls_map/extractor.rb

@@ -97,7 +97,7 @@ module TLSmap
           #   See {TLSmap::App::Extractor}
           # @return [Array<String>] Cipher array (IANA names)
           def parse(file)
-            data = JSON.load_file(file)
+            data = Utils.json_load_file(file)
             extract_cipher(data)
           end
 
@@ -164,7 +164,7 @@ module TLSmap
           #   See {TLSmap::App::Extractor}
           # @return [Array<String>] Cipher array (IANA names)
           def parse(file)
-            data = JSON.load_file(file)
+            data = Utils.json_load_file(file)
             extract_cipher(data)
           end
 
@@ -214,7 +214,7 @@ module TLSmap
           #   See {TLSmap::App::Extractor}
           # @return [Array<String>] Cipher array (IANA names)
           def parse(file)
-            data = JSON.load_file(file)
+            data = Utils.json_load_file(file)
             extract_cipher(data)
           end
 

data/lib/tls_map/utils.rb

@@ -3,22 +3,27 @@
 # Ruby internal
 require 'net/http'
 require 'tempfile'
+require 'json'
 
 # TLS map module
 module TLSmap
   # Generic utilities
   module Utils
-    def tmpfile(name, url)
+    def self.tmpfile(name, url)
       tmp = Tempfile.new(name)
       tmp.write(Net::HTTP.get(URI(url)))
       tmp.close
       tmp
     end
-  end
 
-  # TLS mapping
-  class App
-    include Utils
-    protected :tmpfile
+    # bring JSON.load_file before ruby 3.0.0
+    # https://ruby-doc.org/stdlib-3.0.0/libdoc/json/rdoc/JSON.html#method-i-load_file
+    def self.json_load_file(filespec, opts = {})
+      if RUBY_VERSION < '3.0.0'
+        JSON.parse(File.read(filespec), opts)
+      else
+        JSON.load_file(filespec, opts)
+      end
+    end
   end
 end

data/lib/tls_map/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TLSmap
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tls-map
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Alexandre ZANNI