opendns-dnsdb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ec5ab3b69662472fe1a8e276083cad001dc2ca
-  data.tar.gz: 3cc6ed001303febda2213640d0c555cf9b0f49c7
+  metadata.gz: b6ffc6fbdbd3300935d4bbedcfa0a9c6fabb2c2d
+  data.tar.gz: 5636e568eee7c925f5b2a2713f5394df5a3a4ce3
 SHA512:
-  metadata.gz: 41c2801130fde839e1b011e140803732b4187f252415981863cca6392742c9cf37ed8f977ce8e7f467b456eaa7c2538dcb33ce8ead38fb020100326cdfb1ebba
-  data.tar.gz: 6b5596e31c8c4493ac953a0c56ca3bc94dba07989fb8e939392c23f5209e077b227e8ecfa1bb09ea22fca81e2561b7a9a2c4a1ff392df9bd464f4747d6b94f1e
+  metadata.gz: 2e0e80f6dba1e3445af8f10d8a8a46c3368a3e015624279d98bdd9902f49bd4c1f210640ec8a91ba384f4b773a9b99c8d378d0ff4a94c10aee355d25c2e0e21a
+  data.tar.gz: 70985d6a478bf5248520c316ec6b51642133fce350f4b51357b9c17804f39fc93a374c3b48d3affed9668fa85fb392c626dda626947b571a5f25593d6fd5ffec

data/README.md

@@ -12,14 +12,15 @@ building classifiers and reputation systems.
 Documentation
 -------------
 
-[Click here to read the full documentation of the OpenDNS DNSDB library](http://opendns-dnsdb-client-for-ruby.readthedocs.org/en/latest/).
+[Click here to read the full documentation of the Security Graph library](http://opendns-dnsdb-client-for-ruby.readthedocs.org/en/latest/).
 
 Example
 -------
 
 ```ruby
 # Setup
-db = OpenDNS::DNSDB.new(sslcert: 'client.p12', sslcertpasswd: 'opendns')
+db = OpenDNS::DNSDB.new(sslcert: 'client.pem',
+                        sslcerttype: 'pem', sslcertpasswd: 'opendns')
 
 # A short list of known spam domains using a fast-flux infrastructure
 spam_names = ['com-garciniac.net', 'bbc-global.co.uk', 'com-october.net']
@@ -62,3 +63,19 @@ traffic = db.high_pass_filter(traffic, cutoff: 10)
 traffic_is_suspicious =
   db.relative_standard_deviation(traffic['www.github.io']) > 90
 ```
+
+Note on certificates format
+---------------------------
+
+The curl library currently has some major issues dealing with
+certificates stored in the PKCS12 format.
+
+If the certificate you have been given is in PKCS12 format (`.p12`
+file extension), just convert it to a `.pem` certificate file:
+
+    openssl pkcs12 -in client.p12 -out client.pem -clcerts
+
+And supply the path to the `.pem` file to the library.
+
+Also make sure that the version of the curl library you are using is
+up-to-date. Old versions had major bugs with concurrent queries.

data/docs/index.rst

@@ -9,7 +9,7 @@ Installation
 
 .. code-block:: bash
 
-  $ bundle && rake install
+  $ gem install opendns-dnsdb
 
 Example
 =======
@@ -78,16 +78,31 @@ Setup
 .. code-block:: ruby
 
   require 'opendns-dnsdb'
-  db = OpenDNS::DNSDB.new(sslcert: 'client.p12', sslcertpasswd: 'opendns')
+  db = OpenDNS::DNSDB.new(sslcert: 'client.pem', sslcertpasswd: 'opendns')
 
 Supported options:
 
 * ``timeout``: timeout for each query, in seconds (default: 15 seconds)
 * ``sslcert``: path to the SSL certificate
-* ``sslcerttype``: SSL certificate type, defaults to ``p12``
+* ``sslcerttype``: SSL certificate type, defaults to ``pem``.
 * ``sslcertpasswd``: SSL certificate password
 * ``maxconnects``: max number of parallel operations (default: 10)
 
+Note on certificates format
+===========================
+
+The curl library currently has some major issues dealing with
+certificates stored in the PKCS12 format.
+
+If the certificate you have been given is in PKCS12 format (`.p12`
+file extension), just convert it to a `.pem` certificate file:
+
+.. code-block:: bash
+
+    openssl pkcs12 -in client.p12 -out client.pem -clcerts
+
+And supply the path to the ``.pem`` file to the library.
+
 Operations
 ==========
 

data/lib/opendns-dnsdb/dnsdb.rb

@@ -37,14 +37,15 @@ module OpenDNS
       @timeout = params[:timeout].to_f if params[:timeout]
       @maxconnects = DEFAULT_MAXCONNECTS
       @maxconnects = params[:maxconnects].to_i if params[:maxconnects]
-      @sslcerttype = params[:sslcerttype] || 'p12'
-      @sslcertpasswd = params[:sslcertpasswd] || ''
+      @sslcerttype = params[:sslcerttype] || 'pem'
+      @sslcertpasswd = params[:sslcertpasswd] || 'opendns'
       @options = {
         followlocation: true,
         timeout: @timeout,
         sslcert: @sslcert,
         sslcerttype: @sslcerttype,
-        sslcertpasswd: @sslcertpasswd
+        sslcertpasswd: @sslcertpasswd,
+        maxconnects: @maxconnects
       }
     end
 

data/lib/opendns-dnsdb/dnsdb/related.rb

@@ -76,13 +76,15 @@ module OpenDNS
       end
       
       def distinct_related_names(names, options = { }, &filter)
-        res = Response::Distinct.new(distinct_rrs(related_names(names, &filter)))
-        res = res[0...options[:max_names]] if options[:max_names]
+        names = [ names ] unless names.kind_of?(Enumerable)
+        res = Response::Distinct.new(distinct_rrs(related_names(names, &filter))) - names
+        return res[0...options[:max_names]] if options[:max_names] && res.length >= options[:max_names]
         if (options[:max_depth] || 1) > 1
           options0 = options.clone
           options0[:max_depth] -= 1
           related = distinct_related_names(res, options0, &filter)
-          res = (res + related).uniq
+          res += related - names
+          res.uniq!
           res = res[0...options[:max_names]] if options[:max_names]          
         end
         res

data/lib/opendns-dnsdb/version.rb

@@ -1,5 +1,5 @@
 module OpenDNS
   class DNSDB
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 
 require 'opendns-dnsdb'
 
-CERT_FILE = '/tmp/client.p12'
+CERT_FILE = '/tmp/client.pem'
 CERT_PASSWD = 'opendns'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opendns-dnsdb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Frank Denis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake