Skip to content

Shirey/update globus url endpoint #959

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

Merged
yuanzhou merged 2 commits into from
Nov 5, 2025
Merged

Shirey/update globus url endpoint #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adc8d3f
Handle globus urls for new public versions of protected data
shirey Nov 4, 2025
98d885c
bump VERSION
shirey Nov 4, 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
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.7
2.6.8
7 changes: 6 additions & 1 deletion src/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2841,7 +2841,8 @@ def get_globus_url(id):

# The user is in the Globus group with full access to thie dataset,
# so they have protected level access to it
if ('hmgroupids' in user_info) and (group_uuid in user_info['hmgroupids']):
protected_group_uuid = auth_helper_instance.get_protected_data_group_uuid()
if 'hmgroupids' in user_info and (group_uuid in user_info['hmgroupids'] or (not protected_group_uuid is None and protected_group_uuid in user_info['hmgroupids'])):
user_data_access_level = ACCESS_LEVEL_PROTECTED
else:
if not 'data_access_level' in user_info:
Expand Down Expand Up @@ -2875,6 +2876,10 @@ def get_globus_url(id):
globus_server_uuid = app.config['GLOBUS_PROTECTED_ENDPOINT_UUID']
access_dir = access_level_prefix_dir(app.config['PROTECTED_DATA_SUBDIR'])
dir_path = dir_path + access_dir + group_name + "/"
elif (entity_data_access_level == ACCESS_LEVEL_PROTECTED) and (entity_dict['status'] == 'Published'):
globus_server_uuid = app.config['GLOBUS_PUBLIC_ENDPOINT_UUID']
access_dir = access_level_prefix_dir(app.config['PUBLIC_DATA_SUBDIR'])
dir_path = dir_path + access_dir + "/"

if globus_server_uuid is None:
forbidden_error("Access not granted")
Expand Down