html2odt 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7e81713f41dce40fa45764753a39d223a553fd9
-  data.tar.gz: e87f898ad29e339a024ea0820d794ac0ee5b98b0
+  metadata.gz: 4faafbc073e768bc0f1752ffe28e9227bb2a0ff7
+  data.tar.gz: fba8f90511c1205ec52d7cd466f3573ab2627f9e
 SHA512:
-  metadata.gz: 5fd546c9b347ec908fe1412ca3239065a0c1e988b8f07ce4ef1f1985e38e1e08f230f90b7c67afb08af303e426c81babd94d5800c5ca5b3865814e9144c83651
-  data.tar.gz: b1f8f277a58aae0b132fac04a43a6189db977440b5200f6e49a4ba63f87a1c400ef6e26c46a7d9e34733c45a469f0c5427683b252e710f8eac1a0d24ce2abdd7
+  metadata.gz: 70d0313da825e9fc5e426716d570891f675e1c3ab772149d64c8668011eefd60de1915e2e736f2650726567f11c8eebbe97b48c6e698bfd314df6076611b166a
+  data.tar.gz: d2830075e1fe36f1be2e78056d3f582396c77b40e7282c503e7cfd899e8571967fef6f75fededef12f6744200ae050a8277e9a7d794c3c6be2c6f0ddbf4d8bd5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.3.2 - 2016-06-07
+
+Properly handle errors on remote image handling, bump nokogiri dependency to
+address security related bugs
+
 # v0.3.1 - 2016-06-06
 
 Improved support for Ruby 2.0.0, improved handling of invalid URIs

data/html2odt.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   << "html2odt.rb"
 
   spec.add_dependency "dimensions", "~> 1.3.0"
-  spec.add_dependency "nokogiri", "~> 1.6.7.2"
+  spec.add_dependency "nokogiri", "~> 1.6.8"
   spec.add_dependency "rubyzip", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.12"

data/lib/html2odt/document.rb

@@ -307,18 +307,7 @@ class Html2Odt::Document
         uri = URI.parse(src)
       end
 
-      file = Tempfile.new("html2odt")
-      file.binmode
-
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-        resp = http.get(uri.path)
-
-        file.write(resp.body)
-        file.flush
-        file
-      end
-
-      return file
+      return uri_to_file(uri)
     end
 
     # cannot handle image properly, return nil
@@ -373,4 +362,28 @@ class Html2Odt::Document
     entry.content = content unless content.nil?
     entry
   end
+
+  def uri_to_file(uri)
+    file = Tempfile.new("html2odt")
+    file.binmode
+
+    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+      resp = http.get(uri.path)
+
+      file.write(resp.body)
+      file.flush
+      file
+    end
+
+    file
+  rescue
+    # Could not fetch remote image
+    #
+    # I feel bad for capturing all exceptions here, but there are so many
+    # libraries involved when fetching a resource over HTTP, that I am not sure
+    # how to create a proper white list. Some of the errors involved may be
+    #
+    # SocketError, OpenSSL::SSL::SSLError
+    nil
+  end
 end

data/lib/html2odt/version.rb

@@ -1,3 +1,3 @@
 module Html2Odt
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2odt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Gregor Schmidt (Planio)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dimensions
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement