streamio-ffmpeg 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,20 +1,24 @@
-== 0.4.1 2009-02-10
+== 0.4.2 20010-04-06
+
+* Escape the path to handle spaces in filenames and avoid CLI injection attacks (thanks J. Weir!)
+
+== 0.4.1 2010-02-10
 
 * Forgot to change the transcoding shortcut from Movie
 
-== 0.4.0 2009-02-10
+== 0.4.0 2010-02-10
 
 * Transcoding API changed to make use of more humanly readable options (see README for examples)
 * Fixed frame rate parsing for integer frame rates
 
-== 0.3.0 2009-02-07
+== 0.3.0 2010-02-07
 
 * Simple transcoding
 
-== 0.2.0 2009-02-06
+== 0.2.0 2010-02-06
 
 * Some more metadata parsing
 
-== 0.1.0 2009-02-05
+== 0.1.0 2010-02-05
 
 * Some basic parsing of metadata added

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/ffmpeg/movie.rb

@@ -7,9 +7,9 @@ module FFMPEG
     def initialize(path)
       raise Errno::ENOENT, "the file '#{path}' does not exist" unless File.exists?(path)
       
-      @path = path
-      
-      stdin, stdout, stderr = Open3.popen3("ffmpeg -i #{path}") # Output will land in stderr
+      @path = escape(path)
+
+      stdin, stdout, stderr = Open3.popen3("ffmpeg -i '#{path}'") # Output will land in stderr
       output = stderr.read
       
       @valid = output[/Unknown format/].nil?
@@ -62,5 +62,11 @@ module FFMPEG
     def transcode(output_file, options, &block)
       Transcoder.new(self, output_file, options).run &block
     end
+    
+    protected
+    def escape(path)
+      map  =  { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
+      path.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { map[$1] }
+    end
   end
 end

data/lib/streamio-ffmpeg.rb

@@ -5,5 +5,5 @@ require 'ffmpeg/transcoder'
 require 'ffmpeg/encoding_options'
  
 module FFMPEG
-  VERSION = '0.1.0'
+  VERSION = '0.4.2'
 end

data/spec/ffmpeg/movie_spec.rb

@@ -20,13 +20,13 @@ module FFMPEG
         end
       end
 
-      describe "given awesome.mov file" do
+      describe "given an awesome movie file" do
         before(:all) do
-          @movie = Movie.new("#{fixture_path}/movies/awesome.mov")
+          @movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
         end
 
         it "should remember the movie path" do
-          @movie.path.should == "#{fixture_path}/movies/awesome.mov"
+          @movie.path.should == "#{fixture_path}/movies/awesome movie.mov"
         end
 
         it "should parse duration to number of seconds" do
@@ -86,7 +86,7 @@ module FFMPEG
     
     describe "transcode" do
       it "should run the transcoder" do
-        movie = Movie.new("#{fixture_path}/movies/awesome.mov")
+        movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
 
         mockery = mock(Transcoder)
         Transcoder.should_receive(:new).with(movie, "#{tmp_path}/awesome.flv", :custom => "-vcodec libx264").and_return(mockery)

data/spec/ffmpeg/transcoder_spec.rb

@@ -4,7 +4,7 @@ module FFMPEG
   describe Transcoder do
     describe "initialization" do
       before(:each) do
-        @movie = Movie.new("#{fixture_path}/movies/awesome.mov")
+        @movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
         @output_path = "#{tmp_path}/awesome.flv"
       end
       
@@ -29,7 +29,7 @@ module FFMPEG
       it "should transcode the movie with progress given an awesome movie" do
         FileUtils.rm_f "#{tmp_path}/awesome.flv"
         
-        movie = Movie.new("#{fixture_path}/movies/awesome.mov")
+        movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
         
         transcoder = Transcoder.new(movie, "#{tmp_path}/awesome.flv")
         stored_progress = 0
@@ -42,7 +42,7 @@ module FFMPEG
       it "should transcode the movie with EncodingOptions" do
         FileUtils.rm_f "#{tmp_path}/optionalized.mp4"
         
-        movie = Movie.new("#{fixture_path}/movies/awesome.mov")
+        movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
         options = {:video_codec => "libx264", :frame_rate => 10, :resolution => "320x240", :video_bitrate => 300, 
                    :audio_codec => "libfaac", :audio_bitrate => 32, :audio_sample_rate => 22050, :audio_channels => 1,
                    :custom => "-flags +loop -cmp +chroma -partitions +parti4x4+partp8x8 -flags2 +mixed_refs -me_method umh -subq 6 -refs 6 -rc_eq 'blurCplx^(1-qComp)' -coder 0 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qcomp 0.6 -qmin 10 -qmax 51 -qdiff 4 -level 21"}
@@ -59,7 +59,7 @@ module FFMPEG
       it "should transcode the movie with String options" do
         FileUtils.rm_f "#{tmp_path}/string_optionalized.flv"
         
-        movie = Movie.new("#{fixture_path}/movies/awesome.mov")
+        movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
         
         encoded = Transcoder.new(movie, "#{tmp_path}/string_optionalized.flv", "-s 300x200 -ac 2").run
         encoded.resolution.should == "300x200"

data/streamio-ffmpeg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamio-ffmpeg}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-04-06}
   s.description = %q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
   s.email = %q{duztdruid@gmail.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
      "spec/ffmpeg/encoding_options_spec.rb",
      "spec/ffmpeg/movie_spec.rb",
      "spec/ffmpeg/transcoder_spec.rb",
-     "spec/fixtures/movies/awesome.mov",
+     "spec/fixtures/movies/awesome movie.mov",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "streamio-ffmpeg.gemspec"
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dbackeus/streamio-ffmpeg}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
   s.test_files = [
     "spec/ffmpeg/encoding_options_spec.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - David Backeus
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Simple wrapper around ffmpeg to get metadata from movies and do transcoding
 email: duztdruid@gmail.com
 executables: []
@@ -46,7 +55,7 @@ files:
 - spec/ffmpeg/encoding_options_spec.rb
 - spec/ffmpeg/movie_spec.rb
 - spec/ffmpeg/transcoder_spec.rb
-- spec/fixtures/movies/awesome.mov
+- spec/fixtures/movies/awesome movie.mov
 - spec/spec.opts
 - spec/spec_helper.rb
 - streamio-ffmpeg.gemspec
@@ -63,18 +72,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple wrapper around ffmpeg to get metadata from movies and do transcoding