ssl_labs 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757eafa88db5476feb6a61d68a5cf7fe7ca31433
-  data.tar.gz: 367750793ad3ed2d792145c511b536a81144388c
+  metadata.gz: cf7eb84ab8a2af805d670dc1dabc82ffd511c889
+  data.tar.gz: 25699a813d19b158d8438e0ce635e42818ad7c52
 SHA512:
-  metadata.gz: da209d49df109bbf639114dbaaa396eb2ad51d538655b77119c7e3361281924d90e807c06679d91b388803a1aeae8b373ce8330b63937bd6aa791a9b127ca0eb
-  data.tar.gz: 1cc4c8e4429aff72b64e1c65276e370db2db5026cbf33cbe671e869e046de81c2ee1d092cfb80f137a700d81aeed9da162830d04eafb085ef28ea3ab5d64b769
+  metadata.gz: 8691a86faa72742401114c35e0ab27fe1e18fc807a9cfbfab1e6404155bd908466cb9011029b7935168ca53e840e620b04c2681b571bfb9023ed04d86b5aad76
+  data.tar.gz: a8498e9f3b63e761a9c674e9a1b67941b82a1b6a09951839c5ae72a356ec0acbc395c4bfc5d05cb603ac7d5cf444b2e2e3614b7df39cddba08ffb4cf902c95ae

data/README.md

@@ -11,3 +11,18 @@ The reference client is at https://github.com/ssllabs/ssllabs-scan
 
 * Tests
 
+* Weirdness: #analyze and #analyze! return different things
+
+* Helper #methods? for boolean attributes
+
+* SslLabs constructor must take a URI string _with a scheme_
+
+* Gem version is hardcoded twice
+
+* `endpoint_data.details.foo` is annoying; remove `details`
+
+* Configurable poll delay
+
+* Cert and ChainCert are melded
+
+* Suites.preference is MIA

data/lib/ssl_labs/endpoint.rb

@@ -28,12 +28,11 @@ class SslLabs
       endpoint = self.new
       hash.each do |k, v|
         sym = Util.underscore(k).to_sym
-        if ATTRS.include?(sym)
-          if sym == :ip_address
-            endpoint.ip_address = IPAddr.new(v)
-          else
-            endpoint.send("#{sym}=", v)
-          end
+        case sym
+        when :ip_address
+          endpoint.ip_address = IPAddr.new(v)
+        when *ATTRS
+          endpoint.send("#{sym}=", v)
         else
           raise ArgumentError, "Unknown key #{k.inspect} (#{sym})"
         end

data/lib/ssl_labs/endpoint_data/details/cert.rb

@@ -22,7 +22,7 @@ class SslLabs
           :raw,
           :revocation_info,
           :revocation_status,
-          :sgc,
+          :scg,
           :sig_alg,
           :subject,
           :validation_type
@@ -33,8 +33,7 @@ class SslLabs
         def self.from_hash(hash)
           cert = self.new
           hash.each do |k, v|
-            sym = Util.underscore(k).to_sym
-            case sym
+            case sym = Util.underscore(k).to_sym
             when :crl_ur_is
               cert.crl_uris = v
             when :not_after
@@ -43,8 +42,6 @@ class SslLabs
               cert.not_before = Time.at(v / 1000.0)
             when :ocsp_ur_is
               cert.ocsp_uris = v
-            when :scg
-              cert.sgc = v
             when *ATTRS
               cert.send("#{sym}=", v)
             else

data/lib/ssl_labs/endpoint_data/details/chain.rb

@@ -18,8 +18,7 @@ class SslLabs
         def self.from_hash(hash)
           chain = self.new
           hash.each do |k, v|
-            sym = Util.underscore(k).to_sym
-            case sym
+            case sym = Util.underscore(k).to_sym
             when :certs
               chain.certs = v.map { |cert| Cert.from_hash(cert) }
             when *ATTRS

data/lib/ssl_labs/endpoint_data/details/key.rb

@@ -21,8 +21,8 @@ class SslLabs
         def self.from_hash(hash)
           key = self.new
           hash.each do |k, v|
-            sym = Util.underscore(k).to_sym
-            if ATTRS.include?(sym)
+            case sym = Util.underscore(k).to_sym
+            when *ATTRS
               key.send("#{sym}=", v)
             else
               raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"

data/lib/ssl_labs/endpoint_data/details/protocol.rb

@@ -11,6 +11,8 @@ class SslLabs
         ATTRS = [
           :id,
           :name,
+          :q,
+          :v2_suites_disabled,
           :version
         ]
 
@@ -19,8 +21,8 @@ class SslLabs
         def self.from_hash(hash)
           protocol = self.new
           hash.each do |k, v|
-            sym = Util.underscore(k).to_sym
-            if ATTRS.include?(sym)
+            case sym = Util.underscore(k).to_sym
+            when *ATTRS
               protocol.send("#{sym}=", v)
             else
               raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"

data/lib/ssl_labs/endpoint_data/details/sim/client.rb

@@ -22,8 +22,8 @@ class SslLabs
           def self.from_hash(hash)
             client = self.new
             hash.each do |k, v|
-              sym = Util.underscore(k).to_sym
-              if ATTRS.include?(sym)
+              case sym = Util.underscore(k).to_sym
+              when *ATTRS
                 client.send("#{sym}=", v)
               else
                 raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"

data/lib/ssl_labs/endpoint_data/details/sim.rb

@@ -22,10 +22,10 @@ class SslLabs
         def self.from_hash(hash)
           sim = self.new
           hash.each do |k, v|
-            sym = Util.underscore(k).to_sym
-            if sym == :client
+            case sym = Util.underscore(k).to_sym
+            when :client
               sim.client = Sim::Client.from_hash(v)
-            elsif ATTRS.include?(sym)
+            when *ATTRS
               sim.send("#{sym}=", v)
             else
               raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"

data/lib/ssl_labs/endpoint_data/details/suite.rb

@@ -24,8 +24,8 @@ class SslLabs
         def self.from_hash(hash)
           suite = self.new
           hash.each do |k, v|
-            sym = Util.underscore(k).to_sym
-            if ATTRS.include?(sym)
+            case sym = Util.underscore(k).to_sym
+            when *ATTRS
               suite.send("#{sym}=", v)
             else
               raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"

data/lib/ssl_labs/endpoint_data/details.rb

@@ -16,28 +16,34 @@ class SslLabs
         :cert,
         :chain,
         :compression_methods,
+        :forward_secrecy,
+        :heartbeat,
+        :heartbleed,
         :host_start_time,
+        :http_forwarding,
+        :http_status_code,
         :key,
         :non_prefix_delegation,
+        :npn_protocols,
+        :ocsp_stapling,
+        :open_ssl_ccs,
+        :pkp_response_header,
         :prefix_delegation,
         :protocols,
+        :rc4_with_modern,
         :reneg_support,
         :server_signature,
         :session_resumption,
-        :suites,
-        :vuln_beast,
-        :heartbleed,
-        :heartbeat,
-        :open_ssl_ccs,
         :session_tickets,
+        :sims,
         :sni_required,
-        :ocsp_stapling,
+        :sts_response_header,
+        :sts_max_age,
+        :sts_sub_domains,
+        :suites,
         :supports_npn,
         :supports_rc4,
-        :forward_secrecy,
-        :rc4_with_modern,
-        :http_status_code,
-        :sims
+        :vuln_beast,
       ]
 
       attr_accessor(*ATTRS)
@@ -45,8 +51,7 @@ class SslLabs
       def self.from_hash(hash)
         details = self.new
         hash.each do |k, v|
-          sym = Util.underscore(k).to_sym
-          case sym
+          case sym = Util.underscore(k).to_sym
           when :cert
             details.cert = Cert.from_hash(v)
           when :chain

data/lib/ssl_labs/endpoint_data.rb

@@ -24,19 +24,17 @@ class SslLabs
 
     attr_accessor(*ATTRS)
 
-    def self.from_hash(hash)
+    def self.from_json(str)
+      json = JSON.parse(str)
       endpoint = self.new
-      hash.each do |k, v|
-        sym = Util.underscore(k).to_sym
-        if ATTRS.include?(sym)
-          case sym
-          when :ip_address
-            endpoint.ip_address = IPAddr.new(v)
-          when :details
-            endpoint.details = EndpointData::Details.from_hash(v)
-          else
-            endpoint.send("#{sym}=", v)
-          end
+      json.each do |k, v|
+        case sym = Util.underscore(k).to_sym
+        when :ip_address
+          endpoint.ip_address = IPAddr.new(v)
+        when :details
+          endpoint.details = EndpointData::Details.from_hash(v)
+        when *ATTRS
+          endpoint.send("#{sym}=", v)
         else
           raise ArgumentError, "Unknown key #{k.inspect} (#{sym})"
         end

data/lib/ssl_labs/host.rb

@@ -6,6 +6,7 @@ class SslLabs
   class Host
 
     ATTRS = [
+      :cache_expiry_time,
       :criteria_version,
       :delegation,
       :duration,
@@ -36,16 +37,17 @@ class SslLabs
       json = JSON.parse(str)
       host = self.new
       json.each do |k, v|
-        sym = Util.underscore(k).to_sym
-        if ATTRS.include?(sym)
-          case sym
-          when :start_time
-            host.start_time = Time.at(v / 1000.0)
-          when :endpoints
-            host.endpoints += v.map { |ep| Endpoint.from_hash(ep) }
-          else
-            host.send("#{sym}=", v)
-          end
+        case sym = Util.underscore(k).to_sym
+        when :cache_expiry_time
+          host.cache_expiry_time = Time.at(v / 1000.0)
+        when :start_time
+          host.start_time = Time.at(v / 1000.0)
+        when :test_time
+          host.test_time = Time.at(v / 1000.0)
+        when :endpoints
+          host.endpoints = v.map { |ep| Endpoint.from_hash(ep) }
+        when *ATTRS
+          host.send("#{sym}=", v)
         else
           raise ArgumentError, "Unknown JSON key #{k.inspect} (#{sym.inspect})"
         end

data/lib/ssl_labs/info.rb

@@ -1,5 +1,7 @@
 require 'json'
 
+require 'ssl_labs/util'
+
 class SslLabs
 
   class Info
@@ -7,7 +9,8 @@ class SslLabs
     ATTRS = [
       :engine_version,
       :criteria_version,
-      :client_max_assessments
+      :client_max_assessments,
+      :notice
     ]
 
     attr_accessor(*ATTRS)
@@ -17,13 +20,11 @@ class SslLabs
       json = JSON.parse(str)
       info = self.new
       json.each do |k, v|
-        case k
-        when 'engineVersion'
-          info.engine_version = v
-        when 'criteriaVersion'
-          info.criteria_version = v
-        when 'clientMaxAssessments'
+        case sym = Util.underscore(k).to_sym
+        when :client_max_assessments
           info.client_max_assessments = v.to_i
+        when *ATTRS
+          info.send("#{sym}=", v)
         else
           raise ArgumentError, "Unknown key #{k.inspect}"
         end

data/lib/ssl_labs.rb

@@ -9,7 +9,7 @@ require 'ssl_labs/info'
 class SslLabs
 
   # Gem version.
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   # User agent for client.
   USER_AGENT = "ssl_labs.rb #{VERSION}"
@@ -33,14 +33,15 @@ class SslLabs
     opts_a = opts.flat_map do |k, v|
       case k
       when :publish, :clear_cache, :from_cache
-        [k, v ? 'on' : 'off']
+        [k, v ? :on : :off]
       when :all
-        if v == true
-          [k, 'on']
-        elsif v == :done
+        case v
+        when true
+          [k, :on]
+        when :done
           [k, v]
         else
-          raise ArgumentError, "Invalid value for option #{k.inspect}"
+          raise ArgumentError, "Invalid value #{v.inspect} for option #{k.inspect}"
         end
       else
         raise ArgumentError, "Invalid option #{k.inspect}"
@@ -67,7 +68,7 @@ class SslLabs
     body = invoke(:get_endpoint_data,
                   :host => uri.host,
                   :s => ep.ip_address,
-                  :from_cache => from_cache ? 'on' : 'off')
+                  :from_cache => from_cache ? :on : :off)
     EndpointData.from_json(body)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssl_labs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Martin Carpenter
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement