Allow slashes in filenames #925
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mjgiarlo
force-pushed
the
allow-slashes-in-filenames
branch
from
0811b5e
to
9d878d5
Compare
mjgiarlo
added a commit
to sul-dlss/argo
that referenced
this pull request
Oct 18, 2022
This is the behavior added to Stacks in sul-dlss/stacks#925
mjgiarlo
force-pushed
the
allow-slashes-in-filenames
branch
from
9d878d5
to
694f375
Compare
justinlittman
pushed a commit
to sul-dlss/argo
that referenced
this pull request
Oct 26, 2022
This is the behavior added to Stacks in sul-dlss/stacks#925
mjgiarlo
added a commit
to sul-dlss/sul-embed
that referenced
this pull request
Oct 28, 2022
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
mjgiarlo
added a commit
to sul-dlss/sul-embed
that referenced
this pull request
Oct 28, 2022
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
mjgiarlo
added a commit
to sul-dlss/sul-embed
that referenced
this pull request
Oct 28, 2022
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
mjgiarlo
added a commit
to sul-dlss/sul-embed
that referenced
this pull request
Oct 28, 2022
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
mjgiarlo
added a commit
to sul-dlss/sul-embed
that referenced
this pull request
Oct 28, 2022
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
mjgiarlo
added a commit
to sul-dlss/sul-embed
that referenced
this pull request
Oct 31, 2022
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
mjgiarlo
force-pushed
the
allow-slashes-in-filenames
branch
from
694f375
to
4c71589
Compare
jcoyne
requested changes
Oct 31, 2022
config/routes.rb
Outdated
| get '/file/app/:id/:file_name' => 'webauth#login_file' | ||
| get '/file/auth/:id/:file_name' => 'webauth#login_file', as: :auth_file | ||
| constraints id: druid_regex do | ||
| if Settings.features.allow_slashes_in_filenames |
There was a problem hiding this comment.
why do we need this conditional? can we just set these routes as required?
There was a problem hiding this comment.
@jcoyne I'd be fine with that. Initially, one of the Access devs (maybe Chris?) asked if the feature could be behind a feature flag. LMK how you'd like to proceed.
There was a problem hiding this comment.
@cbeer why do you want a feature flag here? Can't we just revert if it doesn't work? Otherwise we need additional testing so that we hit both paths, right?
There was a problem hiding this comment.
@cbeer say something if you think this is required. Otherwise I think we should remove it to minimize complexity and avoid having to clean this up in the future.
There was a problem hiding this comment.
@jcoyne Removed in a follow-up commit.
justinlittman
pushed a commit
to sul-dlss/sul-embed
that referenced
this pull request
Jan 17, 2023
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work.
mjgiarlo
force-pushed
the
allow-slashes-in-filenames
branch
from
4c71589
to
32fd9f5
Compare
mjgiarlo
added a commit
to sul-dlss/sul-embed
that referenced
this pull request
Jan 18, 2023
Connects to sul-dlss/dor-services-app#4256 This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work. Depends on sul-dlss/stacks#925
jcoyne
approved these changes
Jan 18, 2023
jcoyne
requested changes
Jan 18, 2023
mjgiarlo
commented
Jan 18, 2023
spec/requests/file_spec.rb
Outdated
Comment on lines
19
to
44
| describe 'GET file with slashes in filename' do | ||
| let(:stacks_file) { StacksFile.new(id: 'xf680rd3068', file_name: 'path/to/xf680rd3068_1.jp2') } | ||
| let(:world_rights) do | ||
| <<-EOF | ||
| <publicObject> | ||
| <rightsMetadata> | ||
| <access type="read"> | ||
| <machine> | ||
| <world/> | ||
| </machine> | ||
| </access> | ||
| </rightsMetadata> | ||
| </publicObject> | ||
| EOF | ||
| end | ||
|
|
||
| before do | ||
| allow(File).to receive(:world_readable?).and_return(nil) | ||
| allow_any_instance_of(FileController).to receive(:send_file).with(stacks_file.path, disposition: :inline) | ||
| allow(Purl).to receive(:public_xml).and_return(world_rights) | ||
| end | ||
|
|
||
| it 'succeeds' do | ||
| get '/file/xf680rd3068/path/to/xf680rd3068_1.jp2' | ||
| expect(response).to be_successful | ||
| end | ||
| end |
There was a problem hiding this comment.
Cribbed authZ code from spec/requests/file_auth_request_spec.rb.
|
@jcoyne 💬
Added a request test. |
mjgiarlo
force-pushed
the
allow-slashes-in-filenames
branch
from
92ae1d1
to
f31d86b
Compare
jcoyne
reviewed
Jan 18, 2023
spec/requests/file_spec.rb
Outdated
| end | ||
|
|
||
| before do | ||
| allow(File).to receive(:world_readable?).and_return(nil) |
There was a problem hiding this comment.
Why are we returning files that aren't readable? Is this stub necessary?
There was a problem hiding this comment.
@jcoyne Good eye! It was copypasta from the file auth request spec. Removed it and all is well.
mjgiarlo
force-pushed
the
allow-slashes-in-filenames
branch
from
f31d86b
to
97b6c0e
Compare
jcoyne
approved these changes
Jan 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connects to sul-dlss/dor-services-app#4256
This commit supports work to support hierarchy in filenames throughout SDR. Doing this to support analysis work.