Skip to content

Commit

Permalink
Merge pull request #3180 from samvera/port_of_hyrax_1789
Browse files Browse the repository at this point in the history
Validate local file ingestions against a whitelist of directories
  • Loading branch information
mjgiarlo authored Oct 10, 2017
2 parents e5e1e48 + c55c663 commit ef4aa38
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 0 deletions.
22 changes: 22 additions & 0 deletions app/actors/sufia/create_with_remote_files_actor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ def attach_files(remote_files)
return true unless remote_files
remote_files.each do |file_info|
next if file_info.blank? || file_info[:url].blank?
unless validate_remote_url(file_info[:url])
Rails.logger.error "User #{user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
return false
end
create_file_from_url(file_info[:url], file_info[:file_name])
end
true
Expand All @@ -44,5 +48,23 @@ def log(user)
CurationConcerns::Operation.create!(user: user,
operation_type: "Attach Remote File")
end

def validate_remote_url(url)
uri = URI.parse(URI.encode(url))
if uri.scheme == 'file'
path = File.absolute_path(URI.decode(uri.path))
whitelisted_ingest_dirs.any? do |dir|
path.start_with?(dir) && path.length > dir.length
end
else
# TODO: It might be a good idea to validate other URLs as well.
# The server can probably access URLs the user can't.
true
end
end

def whitelisted_ingest_dirs
Sufia.config.whitelisted_ingest_dirs
end
end
end
16 changes: 16 additions & 0 deletions lib/generators/sufia/templates/config/sufia.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@
# If you use a multi-server architecture, this MUST be a shared volume.
# config.derivatives_path = File.join(Rails.root, 'tmp', 'derivatives')

## Whitelist all directories which can be used to ingest from the local file
# system.
#
# Any file, and only those, that is anywhere under one of the specified
# directories can be used by CreateWithRemoteFilesActor to add local files
# to works. Files uploaded by the user are handled separately and the
# temporary directory for those need not be included here.
#
# Default value includes BrowseEverything.config['file_system'][:home] if it
# is set, otherwise default is an empty list. You should only need to change
# this if you have custom ingestions using CreateWithRemoteFilesActor to
# ingest files from the file system that are not part of the BrowseEverything
# mount point.
#
# config.whitelisted_ingest_dirs = []

# If browse-everything has been configured, load the configs. Otherwise, set to nil.
begin
if defined? BrowseEverything
Expand Down
11 changes: 11 additions & 0 deletions lib/sufia/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,16 @@ def subject_prefix
def model_to_create
@model_to_create ||= ->(_attributes) { Sufia.primary_work_type.model_name.name }
end

attr_writer :whitelisted_ingest_dirs
# List of directories which can be used for local file system ingestion.
def whitelisted_ingest_dirs
@whitelisted_ingest_dirs ||= \
if defined? BrowseEverything
Array.wrap(BrowseEverything.config['file_system'].try(:[], :home)).compact
else
[]
end
end
end
end
38 changes: 38 additions & 0 deletions spec/actors/sufia/create_with_remote_files_actor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,27 @@
file_name: "here.txt" }]
end

before do
allow(Sufia.config).to receive(:whitelisted_ingest_dirs).and_return(["/local/file/"])
end

it "attaches files" do
expect(IngestLocalFileJob).to receive(:perform_later).with(FileSet, "/local/file/here.txt", user)
expect(actor.create(attributes)).to be true
end

context "with files from non-whitelisted directories" do
let(:file) { "file:///local/otherdir/test.txt" }

# rubocop:disable RSpec/AnyInstance
it "doesn't attach files" do
expect_any_instance_of(described_class).to receive(:validate_remote_url).and_call_original
expect(IngestLocalFileJob).not_to receive(:perform_later)
expect(actor.create(attributes)).to be false
end
# rubocop:enable RSpec/AnyInstance
end

context "with spaces" do
let(:file) { "file:///local/file/ pigs .txt" }
it "attaches files" do
Expand All @@ -64,4 +80,26 @@
end
end
end

describe "#validate_remote_url" do
before do
allow(Sufia.config).to receive(:whitelisted_ingest_dirs).and_return(['/test/', '/local/file/'])
end

it "accepts file: urls in whitelisted directories" do
expect(actor.actor.send(:validate_remote_url, "file:///local/file/test.txt")).to be true
expect(actor.actor.send(:validate_remote_url, "file:///local/file/subdirectory/test.txt")).to be true
expect(actor.actor.send(:validate_remote_url, "file:///test/test.txt")).to be true
end

it "rejects file: urls outside whitelisted directories" do
expect(actor.actor.send(:validate_remote_url, "file:///tmp/test.txt")).to be false
expect(actor.actor.send(:validate_remote_url, "file:///test/../tmp/test.txt")).to be false
expect(actor.actor.send(:validate_remote_url, "file:///test/")).to be false
end

it "accepts other types of urls" do
expect(actor.actor.send(:validate_remote_url, "https://example.com/test.txt")).to be true
end
end
end
1 change: 1 addition & 0 deletions spec/lib/sufia/configuration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@
it { is_expected.to respond_to(:contact_email) }
it { is_expected.to respond_to(:subject_prefix) }
it { is_expected.to respond_to(:model_to_create) }
it { is_expected.to respond_to(:whitelisted_ingest_dirs) }
end

0 comments on commit ef4aa38

Please sign in to comment.