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

Auth: Remove support for wildcard audiences #6524 #6525

Merged
merged 1 commit into from Mar 8, 2024
Merged

Auth: Remove support for wildcard audiences #6524 #6525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/rucio/daemons/reaper/reaper.py
View file
Open in desktop
Expand Up @@ -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,
Expand Down Expand Up @@ -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'])
Expand Down
4 changes: 2 additions & 2 deletions lib/rucio/transfertool/fts3.py
View file
Open in desktop
Expand Up @@ -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'])
Expand Down