threatinator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49782ab8639faa3f2f202e056f780b6fdeff09df
-  data.tar.gz: d2f4fb0ed1056f32f6509a9b8f1a9740170cc2c1
+  metadata.gz: c81010e688cdc072a3e286d26351ba6fbd072c27
+  data.tar.gz: 71e81855bf912c6f4a00d41132f8c2d4519595b2
 SHA512:
-  metadata.gz: 4e4b0f2c3686572067acee715834addb78cd66fc7d718a5208506fc9ae9b676037ae13d18b9bf2e33d4a9230a345aab00ad50ba1841b92f1d154be5f3800fd01
-  data.tar.gz: c3b15041ad98b6da912de32b90e540a9634572222158d62503734c324d0eec3870b763d371b16abf88d413b74c6d412899bf4e4d3dd8e006a5d32eaa6d593f40
+  metadata.gz: 57dfb246807ee9e41f26ca523776fa153aab31d691020735cbd6541d201438c61c451686e8f8482e537853c5984690822ee4f8b90ce53f6c79c31b4f6582e34f
+  data.tar.gz: 3ec22b736c98134ffdd835e446c906f51106b954af4062d8626c2dca3229de8d7fa2cf4eeb0c73fe001ac3db67ad854302e0067d78e2f1453defa6af5859c4d3

data/CHANGELOG.md

@@ -3,6 +3,13 @@ Next
 
 * Your contribution here.
 
+0.2.1
+====
+* Ensure that FeedRunner calls output formatters #finish method (allows for 
+  closing of any file handles) - [@justfalter](https://github.com/justfalter)
+* Ensure that HTTP fetcher does not reuse sockets (and thus leave them open) - [@justfalter](https://github.com/justfalter)
+
+
 0.2.0
 ====
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/threatinator/feed_runner.rb

@@ -109,11 +109,14 @@ module Threatinator
           begin
             some_io.close
           rescue => e
+            #:nocov:
             logger.warn("Failed to close IO: #{e} #{e.message}")
+            #:nocov:
           end
         end
       end
 
+      @output_formatter.finish
     end
 
     def create_event

data/lib/threatinator/fetchers/http.rb

@@ -24,7 +24,10 @@ module Threatinator
       # @raise [Threatinator::Exceptions::FetchFailed] if the fetch fails
       def fetch
         tempfile = Tempfile.new("threatinator_http")
-        request = Typhoeus::Request.new(@url, ssl_verifypeer: false)
+        request = Typhoeus::Request.new(@url, 
+                                        ssl_verifypeer: false, 
+                                        forbid_reuse: true
+                                       )
         request.on_headers do |response|
           if response.response_code != 200
 

data/spec/threatinator/feed_runner_spec.rb

@@ -133,12 +133,6 @@ describe Threatinator::FeedRunner do
         expect(observer.updates.first).to eq([:start])
       end
 
-      it "closes the last IO instance" do
-        allow(fetcher).to receive(:fetch).and_return(io)
-        expect(io).to receive(:close)
-        feed_runner.run()
-      end
-
       it "fetches, decodes, and then parses records" do
         expect(observer).to receive(:update).with(:start).ordered
         expect(observer).to receive(:update).with(:start_fetch).ordered
@@ -297,6 +291,45 @@ describe Threatinator::FeedRunner do
         end
       end
 
+      context "cleanup" do
+        it "closes the IO provided via :io" do
+          expect(io).to receive(:closed?).and_return(false)
+          expect(io).to receive(:close)
+          feed_runner.run(:io => io)
+        end
+
+        it "closes the IO returned by the fetcher" do
+          allow(fetcher).to receive(:fetch).and_return(io)
+          expect(io).to receive(:closed?).and_return(false)
+          expect(io).to receive(:close)
+          feed_runner.run
+        end
+
+        it "calls output_formatter.finish" do
+          expect(output_formatter).to receive(:finish)
+          feed_runner.run
+        end
+
+        context "when handling a chain of IOs created by decoders" do
+          let(:decoded_io1) { create_mock_io('decoded_io1') }
+          let(:decoded_io2) { create_mock_io('decoded_io2') }
+          let(:decoded_io3) { create_mock_io('decoded_io3') }
+          let(:decoder1) { DummyDecoder.new(decoded_io1) }
+          let(:decoder2) { DummyDecoder.new(decoded_io2) }
+          let(:decoder3) { DummyDecoder.new(decoded_io3) }
+          let(:decoders) { [ decoder1, decoder2, decoder3 ] }
+          it "closes each decoded IO at the end" do
+            expect(decoded_io1).to receive(:closed?).and_return(false)
+            expect(decoded_io1).to receive(:close)
+            expect(decoded_io2).to receive(:closed?).and_return(false)
+            expect(decoded_io2).to receive(:close)
+            expect(decoded_io3).to receive(:closed?).and_return(false)
+            expect(decoded_io3).to receive(:close)
+            feed_runner.run
+          end
+        end
+      end
+
       context "decoding" do
         let(:decoded_io1) { create_mock_io('decoded_io1') }
         let(:decoded_io2) { create_mock_io('decoded_io2') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: threatinator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mike Ryan