diff --git a/lib/rucio/daemons/reaper/reaper.py b/lib/rucio/daemons/reaper/reaper.py index 9272ba5ffd..5528354724 100644 --- a/lib/rucio/daemons/reaper/reaper.py +++ b/lib/rucio/daemons/reaper/reaper.py @@ -33,7 +33,7 @@ import rucio.db.sqla.util from rucio.common.cache import make_region_memcached -from rucio.common.config import config_get, config_get_bool, config_get_int +from rucio.common.config import config_get_bool, config_get_int from rucio.common.exception import (DatabaseException, RSENotFound, ReplicaUnAvailable, ReplicaNotFound, ServiceUnavailable, RSEAccessDenied, ResourceTemporaryUnavailable, SourceNotFound, @@ -581,7 +581,7 @@ def _run_once(rses_to_process, chunk_size, greedy, scheme, rse.ensure_loaded(load_info=True, load_attributes=True) prot = rsemgr.create_protocol(rse.info, 'delete', scheme=scheme, logger=logger) if rse.attributes.get('oidc_support') is True and prot.attributes['scheme'] == 'davs': - audience = config_get('reaper', 'oidc_audience', False) or determine_audience_for_rse(rse.id) + audience = determine_audience_for_rse(rse.id) # FIXME: At the time of writing, StoRM requires `storage.read` # in order to perform a stat operation. scope = determine_scope_for_rse(rse.id, scopes=['storage.modify', 'storage.read']) diff --git a/lib/rucio/transfertool/fts3.py b/lib/rucio/transfertool/fts3.py index 093d57ff8b..9194f0f00e 100644 --- a/lib/rucio/transfertool/fts3.py +++ b/lib/rucio/transfertool/fts3.py @@ -936,11 +936,11 @@ def _file_from_transfer(self, transfer, job_params): if self.token: t_file['source_tokens'] = [] for source in transfer.sources: - src_audience = config_get('conveyor', 'request_oidc_audience', False) or determine_audience_for_rse(rse_id=source.rse.id) + src_audience = determine_audience_for_rse(rse_id=source.rse.id) src_scope = determine_scope_for_rse(rse_id=source.rse.id, scopes=['storage.read'], extra_scopes=['offline_access']) t_file['source_tokens'].append(request_token(src_audience, src_scope)) - dst_audience = config_get('conveyor', 'request_oidc_audience', False) or determine_audience_for_rse(transfer.dst.rse.id) + dst_audience = determine_audience_for_rse(transfer.dst.rse.id) # FIXME: At the time of writing, StoRM requires `storage.read` in # order to perform a stat operation. dst_scope = determine_scope_for_rse(transfer.dst.rse.id, scopes=['storage.modify', 'storage.read'], extra_scopes=['offline_access'])