active_encode 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5072c5649f874b8c8c99bd14560479b662a9b0c6cee42d02769f41ac0da1cde
-  data.tar.gz: cccb1ee9a220eade7333a523564bb621120154eb4b591c0fa0ba406c712530d8
+  metadata.gz: aae1d452186e5101e0e42b4211fd25da561b068caee41d8839f019067309048a
+  data.tar.gz: d54cc90a08b0907885281ada0ad0c8a62aae0806213b36010282e279f85803bc
 SHA512:
-  metadata.gz: 9d99535227987a68561b3bf14ee8703cae691baa438d1f37a2cc2f72c31389b59ed2bec7f8136ee99d472e645b906fa48e31fad3ea23ea3942e09b9b6f1d5910
-  data.tar.gz: 3e02c5b00f1cf201dcefb913203d3649385cb250b77424d030fb1692bfbe7943fe7ff6f1f289a57a076dd10f965ebd918183788efccf0ea199520320a614df60
+  metadata.gz: c1080a31e991e8784dcbf9a8b1f7740fedf299a3eb5075d3ff9f665589fe0f73560679f592f3e97925a9424277a6e12a845187501858d520e2564f3e2a078302
+  data.tar.gz: 77f94da2c42eeaff56e9298138b1c04a5a79a7fc7b256bd6fa65ba691cb25b3b216dd1cfbad414ad22f3180aceb934a07518a0a2fb062ce63dc8c6f37a3ab6e1

data/.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
         type: string
       bundler_version:
         type: string
-        default: 2.0.2
+        default: 2.4.5
       ffmpeg_version:
         type: string
         default: 4.1.4
@@ -63,27 +63,31 @@ jobs:
 workflows:
   ci:
     jobs:
+      - bundle_and_test:
+          name: "ruby3-2_rails7-0"
+          ruby_version: "3.2.0"
+          rails_version: "7.0.4.2"
+      - bundle_and_test:
+          name: "ruby3-1_rails7-0"
+          ruby_version: "3.1.3"
+          rails_version: "7.0.4.2"
       - bundle_and_test:
           name: "ruby3-0_rails7-0"
-          ruby_version: "3.0.3"
-          rails_version: "7.0.1"
+          ruby_version: "3.0.5"
+          rails_version: "7.0.4.2"
       - bundle_and_test:
           name: "ruby3-0_rails6-1"
-          ruby_version: "3.0.3"
-          rails_version: "6.1.4.4"
+          ruby_version: "3.0.5"
+          rails_version: "6.1.7.2"
       - bundle_and_test:
           name: "ruby3-0_rails6-0"
-          ruby_version: "3.0.3"
-          rails_version: "6.0.4.4"
+          ruby_version: "3.0.5"
+          rails_version: "6.0.6.1"
       - bundle_and_test:
           name: "ruby2-7_rails6-0"
-          ruby_version: "2.7.5"
-          rails_version: "6.0.4.4"
+          ruby_version: "2.7.7"
+          rails_version: "6.0.6.1"
       - bundle_and_test:
           name: "ruby2-7_rails5-2"
-          ruby_version: "2.7.5"
-          rails_version: "5.2.6"
-      - bundle_and_test:
-          name: "ruby2-6_rails5-2"
-          ruby_version: "2.6.9"
-          rails_version: "5.2.6"
+          ruby_version: "2.7.7"
+          rails_version: "5.2.8.1"

data/active_encode.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.metadata      = { "rubygems_mfa_required" => "true" }
 
   spec.add_dependency "rails"
   spec.add_dependency "addressable", "~> 2.8"

data/lib/active_encode/engine_adapters/ffmpeg_adapter.rb

@@ -44,7 +44,11 @@ module ActiveEncode
                       else
                         ""
                       end
-        `#{MEDIAINFO_PATH} #{curl_option} --Output=XML --LogFile=#{working_path("input_metadata", new_encode.id)} "#{input_url}"`
+
+        clean_url = input_url.is_a?(String) ? ActiveEncode.sanitize_uri(input_url) : input_url
+
+        `#{MEDIAINFO_PATH} #{curl_option} --Output=XML --LogFile=#{working_path("input_metadata", new_encode.id)} "#{clean_url}"`
+
         new_encode.input = build_input new_encode
 
         if new_encode.input.duration.blank?

data/lib/active_encode/engine_adapters/pass_through_adapter.rb

@@ -19,6 +19,7 @@ module ActiveEncode
       def create(input_url, options = {})
         # Decode file uris for ffmpeg (mediainfo works either way)
         input_url = Addressable::URI.unencode(input_url) if input_url.starts_with? "file:///"
+        input_url = ActiveEncode.sanitize_input(input_url)
 
         new_encode = ActiveEncode::Base.new(input_url, options)
         new_encode.id = SecureRandom.uuid
@@ -30,7 +31,7 @@ module ActiveEncode
         FileUtils.mkdir_p working_path("outputs", new_encode.id)
 
         # Extract technical metadata from input file
-        `#{MEDIAINFO_PATH} --Output=XML --LogFile=#{working_path("input_metadata", new_encode.id)} #{input_url.shellescape}`
+        `#{MEDIAINFO_PATH} --Output=XML --LogFile=#{working_path("input_metadata", new_encode.id)} "#{ActiveEncode.sanitize_uri(input_url)}"`
         new_encode.input = build_input new_encode
         new_encode.input.id = new_encode.id
         new_encode.created_at, new_encode.updated_at = get_times new_encode.id
@@ -196,7 +197,7 @@ module ActiveEncode
 
           # Extract technical metadata from output file
           metadata_path = working_path("output_metadata-#{output.label}", id)
-          `#{MEDIAINFO_PATH} --Output=XML --LogFile=#{metadata_path} #{output.url}` unless File.file? metadata_path
+          `#{MEDIAINFO_PATH} --Output=XML --LogFile=#{metadata_path} #{ActiveEncode.sanitize_uri(output.url)}` unless File.file? metadata_path
           output.assign_tech_metadata(get_tech_metadata(metadata_path))
 
           outputs << output

data/lib/active_encode/filename_sanitizer.rb

@@ -18,5 +18,14 @@ module ActiveEncode
       # Replace special characters with underscores and remove excess periods.
       File.basename(filepath).gsub(/[^0-9A-Za-z.\-\/]/, '_').gsub(/\.(?=.*\.)/, '')
     end
+
+    def sanitize_uri(input_url)
+      case input_url
+      when /^file\:\/\/\//
+        input_url.to_s.gsub(/file:\/\//, '')
+      when /^s3\:\/\//
+        input_url.to_s.gsub(/#{input_url.normalized_site}/, '')
+      end
+    end
   end
 end

data/lib/active_encode/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveEncode
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/file_locator.rb

@@ -11,7 +11,7 @@ class FileLocator
     def initialize(uri)
       uri = Addressable::URI.parse(uri)
       @bucket = Addressable::URI.unencode(uri.host)
-      @key = Addressable::URI.unencode(uri.path).sub(%r{^/*(.+)/*$}, '\1')
+      @key = Addressable::URI.unencode(ActiveEncode.sanitize_uri(uri)).sub(%r{^/*(.+)/*$}, '\1')
     end
 
     def object
@@ -51,7 +51,7 @@ class FileLocator
     when 's3'
       S3File.new(uri).object.presigned_url(:get)
     when 'file'
-      Addressable::URI.unencode(uri.path)
+      Addressable::URI.unencode(ActiveEncode.sanitize_uri(uri))
     else
       @uri.to_s
     end

data/spec/integration/elastic_transcoder_adapter_spec.rb

@@ -159,8 +159,8 @@ describe ActiveEncode::EngineAdapters::ElasticTranscoderAdapter do
     end
     context "when filename has special characters" do
       context "non-s3 file" do
-        let(:input) { ["'file_with_single_quote'.mp4", '"file_with_double_quote".mp4', "file with space.mp4", "file.with...periods.mp4", "file.with :=+%sp3c!l-ch4cts().mp4"] }
-        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4"] }
+        let(:input) { ["'file_with_single_quote'.mp4", '"file_with_double_quote".mp4', "file with space.mp4", "file.with...periods.mp4", "file.with :=+%sp3c!l-ch4cts().mp4", '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov'] }
+        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4", '__________________________________.mov'] }
         let(:source_bucket) { "bucket1" }
 
         it "calls the #upload_to_s3 method" do
@@ -171,8 +171,8 @@ describe ActiveEncode::EngineAdapters::ElasticTranscoderAdapter do
         end
       end
       context "s3 file" do
-        let(:input_urls) { ["s3://bucket1/'file_with_single_quote'.mp4", 's3://bucket1/"file_with_double_quote".mp4', "s3://bucket1/file with space.mp4", "s3://bucket1/file.with...periods.mp4", "s3://bucket1/file.with :=+%sp3c!l-ch4cts().mp4"] }
-        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4"] }
+        let(:input_urls) { ["s3://bucket1/'file_with_single_quote'.mp4", 's3://bucket1/"file_with_double_quote".mp4', "s3://bucket1/file with space.mp4", "s3://bucket1/file.with...periods.mp4", "s3://bucket1/file.with :=+%sp3c!l-ch4cts().mp4", 's3://bucket1/@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov'] }
+        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4", '__________________________________.mov'] }
         let(:source_bucket) { "bucket2" }
 
         it "calls the #check_s3_bucket method" do

data/spec/integration/ffmpeg_adapter_spec.rb

@@ -224,34 +224,44 @@ describe ActiveEncode::EngineAdapters::FfmpegAdapter do
       let(:file_with_special_characters) { "file://" + Rails.root.join('..', 'spec', 'fixtures', 'file.with :=+%sp3c!l-ch4cts().mp4').to_s }
       let!(:create_special_characters_job) { ActiveEncode::Base.create(file_with_special_characters, outputs: [{ label: "low", ffmpeg_opt: "-s 640x480", extension: 'mp4' }]) }
       let(:find_special_characters_job) { ActiveEncode::Base.find create_special_characters_job.id }
+      let(:file_with_more_special_characters) { "file://" + Rails.root.join('..', 'spec', 'fixtures', '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov').to_s }
+      let!(:create_more_special_characters_job) { ActiveEncode::Base.create(file_with_more_special_characters, outputs: [{ label: "low", ffmpeg_opt: "-s 640x480", extension: 'mp4' }]) }
+      let(:find_more_special_characters_job) { ActiveEncode::Base.find create_more_special_characters_job.id }
 
       it "does not have errors" do
         sleep 2
         expect(find_special_characters_job.errors).to be_empty
+        expect(find_more_special_characters_job.errors).to be_empty
       end
 
       it "has the input technical metadata in a file" do
         expect(File.read("#{work_dir}/#{create_special_characters_job.id}/input_metadata")).not_to be_empty
+        expect(File.read("#{work_dir}/#{create_more_special_characters_job.id}/input_metadata")).not_to be_empty
       end
 
       it "has the pid in a file" do
         expect(File.read("#{work_dir}/#{create_special_characters_job.id}/pid")).not_to be_empty
+        expect(File.read("#{work_dir}/#{create_more_special_characters_job.id}/pid")).not_to be_empty
       end
 
       context 'when uri encoded' do
         let(:file_with_special_characters) { Addressable::URI.encode("file://" + Rails.root.join('..', 'spec', 'fixtures', 'file.with :=+%sp3c!l-ch4cts().mp4').to_s) }
+        let(:file_with_more_special_characters) { Addressable::URI.encode("file://" + Rails.root.join('..', 'spec', 'fixtures', '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov').to_s) }
 
         it "does not have errors" do
           sleep 2
           expect(find_special_characters_job.errors).to be_empty
+          expect(find_more_special_characters_job.errors).to be_empty
         end
 
         it "has the input technical metadata in a file" do
           expect(File.read("#{work_dir}/#{create_special_characters_job.id}/input_metadata")).not_to be_empty
+          expect(File.read("#{work_dir}/#{create_more_special_characters_job.id}/input_metadata")).not_to be_empty
         end
 
         it "has the pid in a file" do
           expect(File.read("#{work_dir}/#{create_special_characters_job.id}/pid")).not_to be_empty
+          expect(File.read("#{work_dir}/#{create_more_special_characters_job.id}/pid")).not_to be_empty
         end
       end
     end

data/spec/integration/media_convert_adapter_spec.rb

@@ -293,8 +293,8 @@ describe ActiveEncode::EngineAdapters::MediaConvertAdapter do
     end
     context "when filename has special characters" do
       context "non-s3 file" do
-        let(:input) { ["'file_with_single_quote'.mp4", '"file_with_double_quote".mp4', "file with space.mp4", "file.with...periods.mp4", "file.with :=+%sp3c!l-ch4cts().mp4"] }
-        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4"] }
+        let(:input) { ["'file_with_single_quote'.mp4", '"file_with_double_quote".mp4', "file with space.mp4", "file.with...periods.mp4", "file.with :=+%sp3c!l-ch4cts().mp4", '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov'] }
+        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4", '__________________________________.mov'] }
         let(:source_bucket) { "bucket1" }
 
         it "calls the #upload_to_s3 method" do
@@ -305,8 +305,8 @@ describe ActiveEncode::EngineAdapters::MediaConvertAdapter do
         end
       end
       context "s3 file" do
-        let(:input_urls) { ["s3://bucket1/'file_with_single_quote'.mp4", 's3://bucket1/"file_with_double_quote".mp4', "s3://bucket1/file with space.mp4", "s3://bucket1/file.with...periods.mp4", "s3://bucket1/file.with :=+%sp3c!l-ch4cts().mp4"] }
-        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4"] }
+        let(:input_urls) { ["s3://bucket1/'file_with_single_quote'.mp4", 's3://bucket1/"file_with_double_quote".mp4', "s3://bucket1/file with space.mp4", "s3://bucket1/file.with...periods.mp4", "s3://bucket1/file.with :=+%sp3c!l-ch4cts().mp4", 's3://bucket1/@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov'] }
+        let(:clean) { ["_file_with_single_quote_.mp4", "_file_with_double_quote_.mp4", "file_with_space.mp4", "filewithperiods.mp4", "filewith_____sp3c_l-ch4cts__.mp4", '__________________________________.mov'] }
         let(:source_bucket) { "bucket2" }
 
         it "calls the #check_s3_bucket method" do

data/spec/integration/pass_through_adapter_spec.rb

@@ -198,25 +198,35 @@ describe ActiveEncode::EngineAdapters::PassThroughAdapter do
       let(:file_with_special_characters_derivative) { "file://" + Rails.root.join('..', 'spec', 'fixtures', 'file.with :=+%sp3c!l-ch4cts().mp4').to_s }
       let!(:create_special_characters_job) { ActiveEncode::Base.create(file_with_special_characters, outputs: [{ label: "low", url: file_with_special_characters_derivative }]) }
       let(:find_special_characters_job) { ActiveEncode::Base.find create_special_characters_job.id }
+      let(:file_with_more_special_characters) { "file://" + Rails.root.join('..', 'spec', 'fixtures', '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov').to_s }
+      let(:file_with_more_special_characters_derivative) { "file://" + Rails.root.join('..', 'spec', 'fixtures', '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov').to_s }
+      let!(:create_more_special_characters_job) { ActiveEncode::Base.create(file_with_more_special_characters, outputs: [{ label: "low", url: file_with_more_special_characters_derivative }]) }
+      let(:find_more_special_characters_job) { ActiveEncode::Base.find create_more_special_characters_job.id }
 
       it "does not have errors" do
         expect(find_special_characters_job.errors).to be_empty
+        expect(find_more_special_characters_job.errors).to be_empty
       end
 
       it "has the input technical metadata in a file" do
         expect(File.read("#{work_dir}/#{create_special_characters_job.id}/input_metadata")).not_to be_empty
+        expect(File.read("#{work_dir}/#{create_more_special_characters_job.id}/input_metadata")).not_to be_empty
       end
 
       context 'when uri encoded' do
         let(:file_with_special_characters) { Addressable::URI.encode("file://" + Rails.root.join('..', 'spec', 'fixtures', 'file.with :=+%sp3c!l-ch4cts().mp4').to_s) }
         let(:file_with_special_characters_derivative) { "file://" + Rails.root.join('..', 'spec', 'fixtures', 'file.with :=+%sp3c!l-ch4cts().mp4').to_s }
+        let(:file_with_more_special_characters) { Addressable::URI.encode("file://" + Rails.root.join('..', 'spec', 'fixtures', '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov').to_s) }
+        let(:file_with_more_special_characters_derivative) { "file://" + Rails.root.join('..', 'spec', 'fixtures', '@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov').to_s }
 
         it "does not have errors" do
           expect(find_special_characters_job.errors).to be_empty
+          expect(find_more_special_characters_job.errors).to be_empty
         end
 
         it "has the input technical metadata in a file" do
           expect(File.read("#{work_dir}/#{create_special_characters_job.id}/input_metadata")).not_to be_empty
+          expect(File.read("#{work_dir}/#{create_more_special_characters_job.id}/input_metadata")).not_to be_empty
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_encode
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Michael Klein, Chris Colvard, Phuong Dinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -302,6 +302,8 @@ files:
 - spec/fixtures/"file_with_double_quote".mp4
 - spec/fixtures/'file_with_single_quote'.low.mp4
 - spec/fixtures/'file_with_single_quote'.mp4
+- spec/fixtures/@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.low.mov
+- spec/fixtures/@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov
 - spec/fixtures/Bars_512kb.mp4
 - spec/fixtures/elastic_transcoder/input_completed.json
 - spec/fixtures/elastic_transcoder/input_generic.json
@@ -429,7 +431,8 @@ files:
 homepage: https://github.com/samvera-labs/active_encode
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -455,6 +458,8 @@ test_files:
 - spec/fixtures/"file_with_double_quote".mp4
 - spec/fixtures/'file_with_single_quote'.low.mp4
 - spec/fixtures/'file_with_single_quote'.mp4
+- spec/fixtures/@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.low.mov
+- spec/fixtures/@ወዳጅህ ማር ቢ. ሆን ጨርስ. ህ አትላሰ!@#$^^&$%&.mov
 - spec/fixtures/Bars_512kb.mp4
 - spec/fixtures/elastic_transcoder/input_completed.json
 - spec/fixtures/elastic_transcoder/input_generic.json