Skip to content
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

Jump to bottom

Fixed bug w/ not checking permissions in copy #174

Merged
merged 10 commits into from
Dec 21, 2023
Merged

Fixed bug w/ not checking permissions in copy #174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c4e22f6
Fixed bug w/ not checking permissions in copy
kelockhart Dec 5, 2023
585af53
Check read access for secondary libraries
kelockhart Dec 5, 2023
dbf1327
added access check for public libraries and fixed unittests
femalves Dec 5, 2023
8b75c7a
adding a not
femalves Dec 5, 2023
accbeeb
fixing tests
femalves Dec 6, 2023
135f3e8
changed it to stop using merge
femalves Dec 7, 2023
f89a312
created variables and changed logic
femalves Dec 8, 2023
b0b855c
added tests and removed write access check
femalves Dec 11, 2023
77e7d79
fixed bug
femalves Dec 14, 2023
030e424
changing accesses hoping it's final
femalves Dec 21, 2023
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
2 changes: 1 addition & 1 deletion biblib/tests/unit_tests/test_webservices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ def test_operations_view_post_types(self):
self.assertEqual(response.json['error'], NO_LIBRARY_SPECIFIED_ERROR['body'])

post_data['action'] = 'copy'
post_data['libraries'] = ['lib1', 'lib2']
post_data['libraries'] = [library_id_2, library_id_2]
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think it matters for the test, but did you mean for these to both be the same library?

Copy link
Contributor

@femalves femalves Dec 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yeah, it wasn't relevant so I added lib2. But I changed it now to lib1, just because that's more consistent with how it was before.

response = self.client.post(
url,
data=json.dumps(post_data),
Expand Down
52 changes: 28 additions & 24 deletions biblib/views/operations_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def post(self, library):
- admin
- write
"""

# Get the user requesting this from the header
try:
user_editing = self.helper_get_user_id()
Expand Down Expand Up @@ -203,30 +203,8 @@ def post(self, library):
current_app.logger.error('Wrong type passed for POST: {0} [{1}]'
.format(request.data, error))
return err(WRONG_TYPE_ERROR)

if data['action'] in ['union', 'intersection', 'difference']:
if 'libraries' not in data:
return err(NO_LIBRARY_SPECIFIED_ERROR)
for lib in data['libraries']:
if not self.read_access(service_uid=user_editing_uid,
library_id=lib):
return err(NO_PERMISSION_ERROR)
if 'name' not in data:
data['name'] = 'Untitled {0}.'.format(get_date().isoformat())
if 'public' not in data:
data['public'] = False

if data['action'] == 'copy':
if 'libraries' not in data:
return err(NO_LIBRARY_SPECIFIED_ERROR)
if len(data['libraries']) > 1:
return err(TOO_MANY_LIBRARIES_SPECIFIED_ERROR)
# Check the permissions of the user
if not self.write_access(service_uid=user_editing_uid,
library_id=data['libraries'][0]):
return err(NO_PERMISSION_ERROR)

lib_names = []
check_access = []
with current_app.session_scope() as session:
primary = session.query(Library).filter_by(id=library_uuid).one()
lib_names.append(primary.name)
Expand All @@ -238,6 +216,32 @@ def post(self, library):
return err(BAD_LIBRARY_ID_ERROR)
secondary = session.query(Library).filter_by(id=secondary_uuid).one()
lib_names.append(secondary.name)
check_access.append(secondary)

if data['action'] in ['union', 'intersection', 'difference']:
if 'libraries' not in data:
return err(NO_LIBRARY_SPECIFIED_ERROR)
for lib in check_access:
lib = session.merge(lib)
Copy link
Member Author

Choose a reason for hiding this comment

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

I haven't used merge before - lib is the same as secondary, as returned by the query in line 217. Do you need to do the merge into the session, even though this should already be a sqlalchemy object?

Copy link
Contributor

Choose a reason for hiding this comment

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

Totally get it! The reason I used merge was because the libraries were getting detached from the session. I'm sure there's some other way around it, but I couldn't think of any off the top of my head. If you're okay with holding off on this until tomorrow, I can try to come up with something else.

if lib.public or not self.read_access(service_uid=user_editing_uid,
Copy link
Member Author

Choose a reason for hiding this comment

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

Whoops my comment wasn't very clear - this should be if not lib.public or not self.read_access...

library_id=lib.id):
return err(NO_PERMISSION_ERROR)
if 'name' not in data:
data['name'] = 'Untitled {0}.'.format(get_date().isoformat())
if 'public' not in data:
data['public'] = False

if data['action'] == 'copy':
if 'libraries' not in data:
return err(NO_LIBRARY_SPECIFIED_ERROR)
if len(data['libraries']) > 1:
return err(TOO_MANY_LIBRARIES_SPECIFIED_ERROR)
# Check the permissions of the user
if not self.write_access(service_uid=user_editing_uid,
library_id=check_access[0].id):
return err(NO_PERMISSION_ERROR)



if data['action'] == 'union':
bib_union = self.setops_libraries(
Expand Down
Loading