Fix parsing of empty content-disposition filename subfield

samvera · Mar 14, 2018 · 897207f · 897207f
1 parent 5329b99
commit 897207f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/ldp/response.rb b/lib/ldp/response.rb
@@ -208,7 +208,7 @@ def content_disposition_filename
     def content_disposition_attributes
       parts = headers['Content-Disposition'].split(/;\s*/).collect { |entry| entry.split(/\s*=\s*/) }
       entries = parts.collect do |part|
-        value = part[1].respond_to?(:sub) ? part[1].sub(%r{^"(.+)"$}, '\1') : part[1]
+        value = part[1].respond_to?(:sub) ? part[1].sub(%r{^"(.*)"$}, '\1') : part[1]
         [part[0], value]
       end
       Hash[entries]

diff --git a/spec/lib/ldp/response_spec.rb b/spec/lib/ldp/response_spec.rb
@@ -202,11 +202,13 @@
         { 'Content-Disposition' => 'filename="xyz.txt";' },
         { 'Content-Disposition' => 'attachment; filename=xyz.txt' },
         { 'Content-Disposition' => 'attachment; filename="xyz.txt"; size="12345"' },
+        { 'Content-Disposition' => 'attachment; filename=""; size="12345"' },
       )
     end
 
     it 'provides the filename from the content disposition header' do
       3.times { expect(subject.content_disposition_filename).to eq 'xyz.txt' }
+      expect(subject.content_disposition_filename).to eq ''
     end
   end
 end