Merge branch 'edance-master'

thoop · thoop · commit 09e5e02f8352 · 2017-04-13T15:58:37.000-05:00
diff --git a/lib/prerender_rails.rb b/lib/prerender_rails.rb
@@ -157,7 +157,9 @@ def get_prerendered_page_response(env)
         headers['X-Prerender-Token'] = @options[:prerender_token] if @options[:prerender_token]
         req = Net::HTTP::Get.new(url.request_uri, headers)
         req.basic_auth(ENV['PRERENDER_USERNAME'], ENV['PRERENDER_PASSWORD']) if @options[:basic_auth]
-        response = Net::HTTP.start(url.host, url.port) { |http| http.request(req) }
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true if url.scheme == 'https'
+        response = http.request(req)
         if response['Content-Encoding'] == 'gzip'
           response.body = ActiveSupport::Gzip.decompress(response.body)
           response['Content-Length'] = response.body.length
diff --git a/test/lib/prerender_rails.rb b/test/lib/prerender_rails.rb
@@ -74,6 +74,17 @@
   end
 
 
+  it "should set use_ssl to true for https prerender_service_url" do
+		@prerender = Rack::Prerender.new(@app, prerender_service_url: 'https://service.prerender.io/')
+
+		request = Rack::MockRequest.env_for "/search/things/123/page?_escaped_fragment_=", "HTTP_USER_AGENT" => bot
+		stub_request(:get, @prerender.build_api_url(request)).to_return(:body => "<html></html>")
+		response = @prerender.call(request)
+
+		assert_equal ["<html></html>"], response[2].body
+  end
+
+
   it "should return a prerendered response if the url is part of the regex specific whitelist" do
     request = Rack::MockRequest.env_for "/search/things/123/page?_escaped_fragment_=", "HTTP_USER_AGENT" => bot
     stub_request(:get, @prerender.build_api_url(request)).to_return(:body => "<html></html>")
@@ -164,6 +175,13 @@
     end
 
 
+    it "should build the correct https api url with an initialization variable url" do
+      @prerender = Rack::Prerender.new(@app, prerender_service_url: 'https://prerenderurl.com')
+      request = Rack::MockRequest.env_for "https://google.com/search?q=javascript"
+      assert_equal 'https://prerenderurl.com/https://google.com/search?q=javascript', @prerender.build_api_url(request)
+    end
+
+
     # Check CF-Visitor header in order to Work behind CloudFlare with Flexible SSL (https://support.cloudflare.com/hc/en-us/articles/200170536)
     it "should build the correct api url for the Cloudflare Flexible SSL support" do
       request = Rack::MockRequest.env_for "http://google.com/search?q=javascript", { 'CF-VISITOR' => '"scheme":"https"'}
