onebox 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01da233142275cb809b6294116b09c1b98066c39
-  data.tar.gz: 00e07dcdf031dc0b096d63d0d13a56a1e9769d92
+  metadata.gz: f4aaa05355640126f6ad6ad266ec44e444f23427
+  data.tar.gz: 1b3e3acc8b0d5a99fe99d5e09488cee2d2f98f7a
 SHA512:
-  metadata.gz: 3170eb48911907b19d9c50692eb72bfd7eb4b7d9cc488e60d29dbf9ee86bcaca88daff818b45346545293ee23b880f6775b18866b19d45af828eae77fda66196
-  data.tar.gz: 994a35dc02b560d1af3360c8965600251795569019d95956e5c62f10f747d993e94ec972146d71d71151469d22a7f7d1d07ccde67be95a6f1c0fb77317b8868f
+  metadata.gz: f287783f7c37eb59b2809170467f52e3104db29afed8e329ac16a60cf73acb1787aafa0dbfee15004b9f4dbca4dca02469d8efda740c8804964c3165f22b7a39
+  data.tar.gz: df5f79f7d6089ac381c50ca7ea6b39364066f85998c4a8b3dc70a0c61f5e35d162dd0d3ac41f768d8c50f5f9f5b9464383a926bae75fd49ff89e90b90961d059

data/lib/onebox.rb

@@ -15,8 +15,10 @@ module Onebox
     cache: Moneta.new(:Memory, expires: true, serializer: :json),
     connect_timeout: 5,
     timeout: 10,
-    max_download_kb: (10 * 1024),  # 10MB
-    load_paths: [File.join(Gem::Specification.find_by_name("onebox").gem_dir, "templates")]
+    max_download_kb: (10 * 1024), # 10MB
+    load_paths: [File.join(Gem::Specification.find_by_name("onebox").gem_dir, "templates")],
+    allowed_ports: [80, 443],
+    allowed_schemes: ["http", "https"],
   }
 
   @@options = DEFAULTS

data/lib/onebox/matcher.rb

@@ -12,6 +12,8 @@ module Onebox
 
     def oneboxed
       uri = URI(@url)
+      return unless uri.port.nil? || Onebox.options.allowed_ports.include?(uri.port)
+      return unless uri.scheme.nil? || Onebox.options.allowed_schemes.include?(uri.scheme)
       ordered_engines.find { |engine| engine === uri }
     rescue URI::InvalidURIError
       nil

data/lib/onebox/preview.rb

@@ -5,6 +5,8 @@ module Onebox
   class Preview
     attr_reader :cache
 
+    WEB_EXCEPTIONS ||= [Net::HTTPServerException, OpenURI::HTTPError, Timeout::Error, Net::HTTPError, Errno::ECONNREFUSED]
+
     def initialize(link, parameters = Onebox.options)
       @url = link
       @options = parameters
@@ -15,14 +17,14 @@ module Onebox
     def to_s
       return "" unless engine
       sanitize process_html engine_html
-    rescue *Onebox::Preview.web_exceptions
+    rescue *WEB_EXCEPTIONS
       ""
     end
 
     def placeholder_html
       return "" unless engine
       sanitize process_html engine.placeholder_html
-    rescue *Onebox::Preview.web_exceptions
+    rescue *WEB_EXCEPTIONS
       ""
     end
 
@@ -30,51 +32,46 @@ module Onebox
       OpenStruct.new(@options)
     end
 
-    def self.web_exceptions
-     [Net::HTTPServerException, OpenURI::HTTPError, Timeout::Error, Net::HTTPError, Errno::ECONNREFUSED]
-    end
-
     private
 
-    def engine_html
-      engine.to_html
-    end
+      def engine_html
+        engine.to_html
+      end
 
-    def process_html(html)
-      return "" unless html
+      def process_html(html)
+        return "" unless html
 
-      if @options[:max_width]
-        doc = Nokogiri::HTML::fragment(html)
-        if doc
-          doc.css('[width]').each do |e|
-            width = e['width'].to_i
+        if @options[:max_width]
+          doc = Nokogiri::HTML::fragment(html)
+          if doc
+            doc.css('[width]').each do |e|
+              width = e['width'].to_i
 
-            if width > @options[:max_width]
-              height = e['height'].to_i
-              if (height > 0)
-                ratio = (height.to_f / width.to_f)
-                e['height'] = (@options[:max_width] * ratio).floor
+              if width > @options[:max_width]
+                height = e['height'].to_i
+                if (height > 0)
+                  ratio = (height.to_f / width.to_f)
+                  e['height'] = (@options[:max_width] * ratio).floor
+                end
+                e['width'] = @options[:max_width]
               end
-              e['width'] = @options[:max_width]
             end
+            return doc.to_html
           end
-          return doc.to_html
         end
-      end
 
-      html
-    end
+        html
+      end
 
-    def sanitize(html)
-      Sanitize.fragment(html, Sanitize::Config::ONEBOX)
-    end
+      def sanitize(html)
+        Sanitize.fragment(html, Sanitize::Config::ONEBOX)
+      end
 
-    def engine
-      return nil unless @engine_class
-      @engine ||= @engine_class.new(@url, cache)
-    end
+      def engine
+        return nil unless @engine_class
+        @engine ||= @engine_class.new(@url, cache)
+      end
 
-    class InvalidURI < StandardError
-    end
+      class InvalidURI < StandardError; end
   end
 end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.7.7"
+  VERSION = "1.7.8"
 end

data/spec/lib/onebox/matcher_spec.rb

@@ -34,7 +34,7 @@ describe Onebox::Matcher do
       let(:url) { "http://party.time.made.up-url.com/?article_id=1234" }
       let(:matcher) { Onebox::Matcher.new(url) }
 
-      it "it finds an engine" do
+      it "finds an engine" do
         matcher.stubs(:ordered_engines).returns([TestEngine])
         expect(matcher.oneboxed).not_to be_nil
       end
@@ -44,11 +44,31 @@ describe Onebox::Matcher do
       let(:url) { "http://party.time.made.up-url.com/#article_id=1234" }
       let(:matcher) { Onebox::Matcher.new(url) }
 
-      it "it finds an engine" do
+      it "finds an engine" do
         matcher.stubs(:ordered_engines).returns([TestEngine])
         expect(matcher.oneboxed).not_to be_nil
       end
     end
 
+    describe "with a whitelisted port/scheme" do
+      %w{http://example.com https://example.com http://example.com:80 //example.com}.each do |url|
+        it "finds an engine for '#{url}'" do
+          matcher = Onebox::Matcher.new(url)
+          matcher.stubs(:ordered_engines).returns([TestEngine])
+          expect(matcher.oneboxed).not_to be_nil
+        end
+      end
+    end
+
+    describe "without a whitelisted port/scheme" do
+      %w{http://example.com:21 ftp://example.com}.each do |url|
+        it "doesn't find an engine for '#{url}'" do
+          matcher = Onebox::Matcher.new(url)
+          matcher.stubs(:ordered_engines).returns([TestEngine])
+          expect(matcher.oneboxed).to be_nil
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -486,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.
@@ -550,4 +550,3 @@ test_files:
 - spec/lib/onebox_spec.rb
 - spec/spec_helper.rb
 - spec/support/html_spec_helper.rb
-has_rdoc: