ssl_labs 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7eb84ab8a2af805d670dc1dabc82ffd511c889
-  data.tar.gz: 25699a813d19b158d8438e0ce635e42818ad7c52
+  metadata.gz: 4e911536b26b35a5b2cef5dceee239996f207bbe
+  data.tar.gz: 5f6e2a04d72df5e0af1b5d01db7f469b6cdf5975
 SHA512:
-  metadata.gz: 8691a86faa72742401114c35e0ab27fe1e18fc807a9cfbfab1e6404155bd908466cb9011029b7935168ca53e840e620b04c2681b571bfb9023ed04d86b5aad76
-  data.tar.gz: a8498e9f3b63e761a9c674e9a1b67941b82a1b6a09951839c5ae72a356ec0acbc395c4bfc5d05cb603ac7d5cf444b2e2e3614b7df39cddba08ffb4cf902c95ae
+  metadata.gz: fa5492ebcde004e09a293fc31b352d6eb8c600c2dbe93cf176ed12774566bd68a429ae32ca3090d6fa99fd0bdb5348f1543b2c40024803ad1aa2199b76f0a47b
+  data.tar.gz: 97582172d80044be14898499d18f0d1c264ca11bef355a9abd1b0a7b3cdec1b6e0422c8f10def9f1380555b179593d6bb0adac2af5de7fa0d95db01a101a0a0f

data/README.md

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

data/Rakefile

@@ -4,6 +4,8 @@ require 'rake/testtask'
 require 'rdoc/task'
 require 'rubygems/package_task'
 
+load File.join(File.dirname(__FILE__), 'lib', 'ssl_labs', 'version.rb')
+
 desc 'Default task (package)'
 task :default => [:package]
 

data/lib/ssl_labs.rb

@@ -5,12 +5,10 @@ require 'ssl_labs/api'
 require 'ssl_labs/endpoint_data'
 require 'ssl_labs/host'
 require 'ssl_labs/info'
+require 'ssl_labs/version'
 
 class SslLabs
 
-  # Gem version.
-  VERSION = '0.0.2'
-
   # User agent for client.
   USER_AGENT = "ssl_labs.rb #{VERSION}"
 

data/lib/ssl_labs/endpoint.rb

@@ -34,7 +34,7 @@ class SslLabs
         when *ATTRS
           endpoint.send("#{sym}=", v)
         else
-          raise ArgumentError, "Unknown key #{k.inspect} (#{sym})"
+          raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"
         end
       end
       endpoint

data/lib/ssl_labs/endpoint_data.rb

@@ -36,7 +36,7 @@ class SslLabs
         when *ATTRS
           endpoint.send("#{sym}=", v)
         else
-          raise ArgumentError, "Unknown key #{k.inspect} (#{sym})"
+          raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"
         end
       end
       endpoint

data/lib/ssl_labs/endpoint_data/details.rb

@@ -1,8 +1,9 @@
 require 'ssl_labs/endpoint_data/details/cert'
 require 'ssl_labs/endpoint_data/details/chain'
+require 'ssl_labs/endpoint_data/details/chain_cert'
 require 'ssl_labs/endpoint_data/details/key'
 require 'ssl_labs/endpoint_data/details/protocol'
-require 'ssl_labs/endpoint_data/details/suite'
+require 'ssl_labs/endpoint_data/details/suites'
 require 'ssl_labs/endpoint_data/details/sim'
 require 'ssl_labs/util'
 
@@ -39,7 +40,7 @@ class SslLabs
         :sni_required,
         :sts_response_header,
         :sts_max_age,
-        :sts_sub_domains,
+        :sts_subdomains,
         :suites,
         :supports_npn,
         :supports_rc4,
@@ -60,12 +61,14 @@ class SslLabs
             details.host_start_time = Time.at(v / 1000.0)
           when :key
             details.key = Key.from_hash(v)
+          when :npn_protocols
+            details.npn_protocols = v.split
           when :protocols
             details.protocols = v['list'].map { |hash| Protocol.from_hash(hash) }
           when :sims
             details.sims = v['results'].map { |hash| Sim.from_hash(hash) }
           when :suites
-            details.suites = v['list'].map { |hash| Suite.from_hash(hash) }
+            details.suites = Suites.from_hash(v)
           when *ATTRS
             details.send("#{sym}=", v)
           else

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

@@ -15,11 +15,9 @@ class SslLabs
           :issuer_label,
           :issuer_subject,
           :issues,
-          :label,
           :not_after,
           :not_before,
           :ocsp_uris,
-          :raw,
           :revocation_info,
           :revocation_status,
           :scg,

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

@@ -1,4 +1,4 @@
-require 'ssl_labs/endpoint_data/details/cert'
+require 'ssl_labs/endpoint_data/details/chain_cert'
 
 class SslLabs
 
@@ -20,7 +20,7 @@ class SslLabs
           hash.each do |k, v|
             case sym = Util.underscore(k).to_sym
             when :certs
-              chain.certs = v.map { |cert| Cert.from_hash(cert) }
+              chain.certs = v.map { |cert| ChainCert.from_hash(cert) }
             when *ATTRS
               chain.send("#{sym}=", v)
             else

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

@@ -0,0 +1,41 @@
+require 'ssl_labs/util'
+
+class SslLabs
+
+  class EndpointData
+
+    class Details
+
+      class ChainCert
+
+        ATTRS = [
+          :issuer_label,
+          :issuer_subject,
+          :issues,
+          :label,
+          :raw,
+          :subject
+        ]
+
+        attr_accessor(*ATTRS)
+
+        def self.from_hash(hash)
+          chain_cert = self.new
+          hash.each do |k, v|
+            case sym = Util.underscore(k).to_sym
+            when *ATTRS
+              chain_cert.send("#{sym}=", v)
+            else
+              raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"
+            end
+          end
+          chain_cert
+        end
+
+      end # ChainCert
+
+    end # Details
+
+  end # EndpointData
+
+end # SslLabs

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

@@ -9,13 +9,15 @@ class SslLabs
       class Suite
 
         ATTRS = [
-          :id,
-          :name,
           :cipher_strength,
-          :dh_strength,
-          :dh_p,
           :dh_g,
+          :dh_p,
+          :dh_strength,
           :dh_ys,
+          :ecdh_bits,
+          :ecdh_strength,
+          :id,
+          :name,
           :q
         ]
 

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

@@ -0,0 +1,55 @@
+require 'ssl_labs/endpoint_data/details/suite'
+require 'ssl_labs/util'
+
+class SslLabs
+
+  class EndpointData
+
+    class Details
+
+      # Implements a list of ciphersuites. The list is directly accessible
+      # via #list but otherwise Array instance methods called on Suites
+      # are delegated to the list automatically.
+      class Suites
+
+        ATTRS = [
+          :list,
+          :preference
+        ]
+
+        attr_accessor(*ATTRS)
+
+        def initialize
+          @list = []
+        end
+
+        def method_missing(method, *args, &blk)
+          [].respond_to?(method) ? @list.send(method, *args, &blk) : super
+        end
+
+        def respond_to?(method)
+          super || [].respond_to?(method)
+        end
+
+        def self.from_hash(hash)
+          suites = self.new
+          hash.each do |k, v|
+            case sym = Util.underscore(k).to_sym
+            when :list
+              suites.list = v.map { |hash| Suite.from_hash(hash) }
+            when *ATTRS
+              suites.send("#{sym}=", v)
+            else
+              raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"
+            end
+          end
+          suites
+        end
+
+      end # Suites
+
+    end # Details
+
+  end # EndpointData
+
+end # SslLabs

data/lib/ssl_labs/info.rb

@@ -26,7 +26,7 @@ class SslLabs
         when *ATTRS
           info.send("#{sym}=", v)
         else
-          raise ArgumentError, "Unknown key #{k.inspect}"
+          raise ArgumentError, "Unknown key #{k.inspect} (#{sym.inspect})"
         end
         info
       end

data/lib/ssl_labs/version.rb

@@ -0,0 +1,6 @@
+class SslLabs
+
+  # Gem version.
+  VERSION = '0.0.3'
+
+end # SslLabs

data/test/test_endpoint_data.rb

@@ -8,8 +8,7 @@ class TestEndpointData < Test::Unit::TestCase
 
   def test_constructor
     json = File.read(File.join(File.dirname(__FILE__), 'endpoint_data.json'))
-    hash = JSON.parse(json)
-    epd = SslLabs::EndpointData.from_hash(hash)
+    epd = SslLabs::EndpointData.from_json(json)
     # XXX insert tests here
     #binding.pry
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssl_labs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Martin Carpenter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,14 +67,17 @@ files:
 - lib/ssl_labs/endpoint_data/details.rb
 - lib/ssl_labs/endpoint_data/details/cert.rb
 - lib/ssl_labs/endpoint_data/details/chain.rb
+- lib/ssl_labs/endpoint_data/details/chain_cert.rb
 - lib/ssl_labs/endpoint_data/details/key.rb
 - lib/ssl_labs/endpoint_data/details/protocol.rb
 - lib/ssl_labs/endpoint_data/details/sim.rb
 - lib/ssl_labs/endpoint_data/details/sim/client.rb
 - lib/ssl_labs/endpoint_data/details/suite.rb
+- lib/ssl_labs/endpoint_data/details/suites.rb
 - lib/ssl_labs/host.rb
 - lib/ssl_labs/info.rb
 - lib/ssl_labs/util.rb
+- lib/ssl_labs/version.rb
 - test/endpoint_data.json
 - test/test_endpoint_data.rb
 - Rakefile