From adc8d3f0f172e93114ca6ceb76cbab27fdaab25f Mon Sep 17 00:00:00 2001 From: shirey Date: Tue, 4 Nov 2025 15:49:46 -0500 Subject: [PATCH 1/2] Handle globus urls for new public versions of protected data --- src/app.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app.py b/src/app.py index 87c65fd4..0322b702 100644 --- a/src/app.py +++ b/src/app.py @@ -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: @@ -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") From 98d885c3d9fe6269ae09f287183067bece39df1b Mon Sep 17 00:00:00 2001 From: shirey Date: Tue, 4 Nov 2025 15:50:20 -0500 Subject: [PATCH 2/2] bump VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e261122d..743af5e1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.7 +2.6.8