Skip to content

Upload dp err2 #1554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MontrealSergiy wants to merge 4 commits into
base: master
Choose a base branch
from
+11 −7
Open

Upload dp err2 #1554

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0647975
fix upload to bad dp #1544
MontrealSergiy Sep 23, 2025
b7fc5f3
fix upload to bad dp test #1544
MontrealSergiy Sep 23, 2025
f7d7b72
add a comment explaining dp access check in file upload
MontrealSergiy Sep 30, 2025
c3dfd10
simpler stub finder for file upload tests
MontrealSergiy Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion BrainPortal/app/controllers/userfiles_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,9 @@ def create #:nodoc:
rack_tempfile_size = upload_stream.tempfile.size

# Get the data provider for the destination files.
data_provider_id = params[:data_provider_id]
data_provider_id = params[:data_provider_id]

DataProvider.find_accessible_by_user(data_provider_id, current_user)
Copy link
Copy Markdown
Member

@prioux prioux Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment line just above this new line, something like:

# Verify that the DP is accessible to the user; this will raise an exception otherwise


# Where we'll keep a copy in the spawn() below
tmpcontentfile = "/tmp/#{Process.pid}-#{rand(10000).to_s}-#{basename}" # basename's extension is used later on
Expand Down
13 changes: 7 additions & 6 deletions BrainPortal/spec/controllers/userfiles_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,11 @@ class << file; attr_reader :tempfile; end

before(:each) do
session[:session_id] = 'session_id'
allow(controller).to receive(:current_user).and_return(admin)
allow(Message).to receive(:send_message)
allow(File).to receive(:delete)
allow(controller).to receive(:system)
allow(controller).to receive(:current_user).and_return(admin)
allow(Message).to receive(:send_message)
allow(File).to receive(:delete)
allow(controller).to receive(:system)
allow(DataProvider).to receive(:find_accessible_by_user).and_return([data_provider])
Copy link
Copy Markdown
Member

@prioux prioux Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be:

and_return(data_provider)

(Not an array with the DP, a single DP object)

end

it "should redirect to index if the upload file is blank" do
Expand Down Expand Up @@ -300,7 +301,7 @@ class << file; attr_reader :tempfile; end
end

it "should display an error message" do
post :create, params: { :upload_file => mock_upload_stream, :archive => "save", userfile: userfile}
post :create, params: { :upload_file => mock_upload_stream, :archive => "save", userfile: userfile, :data_provider_id => data_provider.id}
expect(flash[:error]).to match(/File .+ could not be added./)
end
end
Expand All @@ -327,7 +328,7 @@ class << file; attr_reader :tempfile; end

it "should copy the file to the local cache" do
expect(mock_userfile).to receive(:cache_copy_from_local_file)
post :create, params: {:upload_file => mock_upload_stream, :archive => "save", userfile: userfile}
post :create, params: {:upload_file => mock_upload_stream, :archive => "save", userfile: userfile, :data_provider_id => data_provider.id}
end
end

Expand Down