Convert protocol relative urls that start with // to the protocol spe…

…cific version using rack.url_scheme
nicpillinger · Sep 15, 2014 · 001e5e4 · 001e5e4
1 parent 2b75aa6
commit 001e5e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/pdfkit/middleware.rb b/lib/pdfkit/middleware.rb
@@ -43,12 +43,14 @@ def call(env)
 
     private
 
-    # Change relative paths to absolute
+    # Change relative paths to absolute, and relative protocols to absolute protocols
     def translate_paths(body, env)
       # Host with protocol
       root = PDFKit.configuration.root_url || "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}/"
+      body =  body.gsub(/(href|src)=(['"])\/([^\/]([^\"']*|[^"']*))['"]/, '\1=\2' + root + '\3\2')
 
-      body.gsub(/(href|src)=(['"])\/([^\/]([^\"']*|[^"']*))['"]/, '\1=\2' + root + '\3\2')
+      protocol = "#{env['rack.url_scheme']}://"
+      body.gsub(/(href|src)=(['"])\/\/([^\"']*|[^"']*)['"]/,'\1=\2' + protocol + '\3\2')
     end
 
     def rendering_pdf?

diff --git a/spec/middleware_spec.rb b/spec/middleware_spec.rb
@@ -340,7 +340,7 @@ def mock_app(options = {}, conditions = {}, custom_headers = {})
     it "should correctly parse relative url with double quotes" do
       @body = %{<link href='//fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>}
       body = @pdf.send :translate_paths, @body, @env
-      expect(body).to eq("<link href='//fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>")
+      expect(body).to eq("<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>")
     end
 
     it "should return the body even if there are no valid substitutions found" do