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

remove security handling in WCMP2 links #812

Merged
merged 3 commits into from
Dec 16, 2024
Merged

remove security handling in WCMP2 links #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebc0d84
do not apply security to WCMP2 records on API (#775)
tomkralidis Nov 30, 2024
97593a6
do not apply security to WCMP2 records on API (#775)
tomkralidis Nov 30, 2024
a9c00a2
always remove links added by API
tomkralidis Dec 16, 2024
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
5 changes: 0 additions & 5 deletions tests/integration/test_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,6 @@ def test_metadata_discovery_publish():
assert 'has_auth' in r['wis2box']
assert r['wis2box']['has_auth']

for link in r['links']:
if link['rel'] == 'collection' and link['title'] == id_:
assert link['security']['default']['type'] == 'http'
assert link['security']['default']['scheme'] == 'bearer'


def test_data_ingest():
"""Test data ingest/process publish"""
Expand Down
16 changes: 3 additions & 13 deletions wis2box-management/wis2box/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,7 @@ def add_token(ctx, metadata_id, path, yes, token):
record = oar.collection_item('discovery-metadata', metadata_id)
record['wis2box']['has_auth'] = True

for link in record['links']:
if link['rel'] == 'collection' and link['title'] == metadata_id:
LOGGER.debug('Adding security object to link')
link['security'] = {
'default': {
'type': 'http',
'scheme': 'bearer',
'description': 'Please contact the data provider for access' # noqa
}
}
del record['links'][-6:]

upsert_collection_item('discovery-metadata', record)

Expand Down Expand Up @@ -223,9 +214,8 @@ def remove_token(ctx, metadata_id, path, token):

record = oar.collection_item('discovery-metadata', metadata_id)
record['wis2box'].pop('has_auth', None)
for link in record['links']:
if 'security' in link:
link.pop('security', None)

del record['links'][-6:]

upsert_collection_item('discovery-metadata', record)

Expand Down
Loading