Fix get auth number two #10614
Merged
Fix get auth number two #10614
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
jwalz
commented
May 13, 2024
| version = int(version_string) if version_string else file_node.versions.count() | ||
| try: | ||
| return FileVersion.objects.select_related('region').get( | ||
| basefilenode=file_node, |
There was a problem hiding this comment.
Historically, this was grabbed by basefilenode___id=file_id even though the filenode had already been loaded. I'm hoping that this was just an oversight:
Line 321 in b2916f7
There was a problem hiding this comment.
Likely oversight. It should be slightly more efficient to use foreign relations like this, rather than a JOIN querying on a text field.
jwalz
commented
May 13, 2024
addons/base/views.py
Outdated
Comment on lines
326
to
327
| except OsfStorageFileNode.DoesNotExist: | ||
| raise HTTPError(http_status.HTTP_400_BAD_REQUEST, 'Requested File unavailable') |
There was a problem hiding this comment.
load will return None, not Raise...should we be checking for that?
Suggested change
| except OsfStorageFileNode.DoesNotExist: | |
| raise HTTPError(http_status.HTTP_400_BAD_REQUEST, 'Requested File unavailable') |
Co-authored-by: Jon Walz <jon@cos.io>
mfraezz
reviewed
May 13, 2024
addons/base/views.py
Outdated
| try: | ||
| return FileVersion.objects.select_related('region').get( | ||
| basefilenode=file_node, | ||
| identifier=version |
There was a problem hiding this comment.
Minor: identifier is a CharField, and this is being cast to an int above. It should get cast back to str somewhere in query planning or execution, though, so likely not a concern.
There was a problem hiding this comment.
Actually much nicer to cast an int to a string than a str | None to an int.
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
May 16, 2024
into gv-files-provider-waffle * 'develop' of https://github.com/CenterForOpenScience/osf.io: Fix get auth number two (CenterForOpenScience#10614)
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
May 16, 2024
…rdoff/osf.io into gv-files-provider-waffle * 'gv-files-provider-waffle' of https://github.com/Johnetordoff/osf.io: Fix get auth number two (CenterForOpenScience#10614)
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
May 16, 2024
…rdoff/osf.io into gv-files-provider-waffle * 'gv-files-provider-waffle' of https://github.com/Johnetordoff/osf.io: Fix get auth number two (CenterForOpenScience#10614)
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
May 16, 2024
…rdoff/osf.io into gv-files-provider-waffle * 'gv-files-provider-waffle' of https://github.com/Johnetordoff/osf.io: Fix get auth number two (CenterForOpenScience#10614)
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
May 16, 2024
…rdoff/osf.io into gv-files-provider-waffle * 'gv-files-provider-waffle' of https://github.com/Johnetordoff/osf.io: Fix get auth number two (CenterForOpenScience#10614)
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
May 16, 2024
into gv-files-provider-waffle * 'develop' of https://github.com/CenterForOpenScience/osf.io: Fix get auth number two (CenterForOpenScience#10614)
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
May 16, 2024
into gv-files-provider-waffle * 'develop' of https://github.com/CenterForOpenScience/osf.io: Fix get auth number two (CenterForOpenScience#10614)
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.
Purpose
get_authwas checking forFileVersionson allosfstorageentities -- including folders. This was breaking access toosfstorageon projects. Fix that.Changes
get_file_node_from_wbandget_file_version_from_wbto_get_osfstorage_file_nodeand_get_osfstorage_file_versionand only provide them the information they need fromwaterbutler_data.OsfStorageFileNodebefore grabbing the versionloadusing the file_id to match behavior from original get_auth.QA Notes
Please make verification statements inspired by your code and what your code touches.
What are the areas of risk?
Any concerns/considerations/questions that development raised?
Documentation
Side Effects
Ticket