Page MenuHomeSoftware Heritage
Differential D3622

storage*: origin_visit_find_by_date -> Optional[OriginVisit]
ClosedPublic
Actions

Authored by ardumont on Jul 27 2020, 12:49 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T645: Type swh-storage endpoints with swh.model objects
Commits
rDSTO57e305e03b66: storage*: origin_visit_find_by_date -> Optional[OriginVisit]
Summary

No impact as it's apparently unused.

$ grep -r 'origin_visit_find_by_date(' */swh/** | grep -v "swh-storage"

Related to T645

Test Plan

tox is still happy

Diff Detail

Repository
rDSTO Storage manager
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Jul 27 2020, 12:49 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 27 2020, 12:49 PM
vlorentz accepted this revision.Jul 27 2020, 12:52 PM
This revision is now accepted and ready to land.Jul 27 2020, 12:52 PM
swh-public-ci added a comment.Jul 27 2020, 12:57 PM

Build is green

Patch application report for D3622 (id=12752)

Rebasing onto b31c30491e...

Current branch diff-target is up to date.
Changes applied before test
commit 57e305e03b66508a702f5e177b84e84640ef855e
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 27 12:44:37 2020 +0200

    storage*: origin_visit_find_by_date -> Optional[OriginVisit]
    
    Related to T645

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/567/ for more details.

Harbormaster completed remote builds in B13982: Diff 12752.Jul 27 2020, 12:57 PM
Closed by commit rDSTO57e305e03b66: storage*: origin_visit_find_by_date -> Optional[OriginVisit] (authored by ardumont). · Explain WhyJul 27 2020, 1:13 PM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDSTO57e305e03b66: storage*: origin_visit_find_by_date -> Optional[OriginVisit].

Revision Contents
Changeset List

PathSize
swh/
storage/
cassandra/
6 lines
6 lines
4 lines
12 lines
tests/
13 lines

Diff 12753

View Options

swh/storage/cassandra/storage.py

# Copyright (C) 2020 The Software Heritage developers # Copyright (C) 2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version # License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.contrib.auth import authenticate, get_backends from django.contrib.auth import authenticate, get_backends
import pytest import pytest
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import AuthenticationFailed
from swh.web.auth.backends import OIDCBearerTokenAuthentication
from swh.web.auth.models import OIDCUser from swh.web.auth.models import OIDCUser
from swh.web.common.utils import reverse from swh.web.common.utils import reverse
from . import sample_data from . import sample_data
from .keycloak_mock import mock_keycloak from .keycloak_mock import mock_keycloak
def _authenticate_user(request_factory): def _authenticate_user(request_factory):
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
@pytest.mark.django_db @pytest.mark.django_db
def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory): def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory):
mock_keycloak(mocker, auth_success=False) mock_keycloak(mocker, auth_success=False)
user = _authenticate_user(request_factory) user = _authenticate_user(request_factory)
assert user is None assert user is None
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_success(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
kc_oidc_mock = mock_keycloak(mocker)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
# first authentication
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
# oidc_profile is not filled when authenticating through bearer token
assert hasattr(user, 'access_token') and user.access_token is None
# second authentication, should fetch userinfo from cache
# until token expires
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
assert hasattr(user, 'access_token') and user.access_token is None
# check user request to keycloak has been sent only once
kc_oidc_mock.userinfo.assert_called_once_with(access_token)
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_failure(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
# simulate a failed authentication with a bearer token in expected format
mock_keycloak(mocker, auth_success=False)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# simulate a failed authentication with an invalid bearer token format
mock_keycloak(mocker)
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer invalid-token-format")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
def test_drf_oidc_auth_invalid_or_missing_auth_type(api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
access_token = sample_data.oidc_profile['access_token']
# Invalid authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Foo token")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# Missing authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"{access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
View Options

swh/storage/in_memory.py

# Copyright (C) 2020 The Software Heritage developers # Copyright (C) 2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version # License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.contrib.auth import authenticate, get_backends from django.contrib.auth import authenticate, get_backends
import pytest import pytest
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import AuthenticationFailed
from swh.web.auth.backends import OIDCBearerTokenAuthentication
from swh.web.auth.models import OIDCUser from swh.web.auth.models import OIDCUser
from swh.web.common.utils import reverse from swh.web.common.utils import reverse
from . import sample_data from . import sample_data
from .keycloak_mock import mock_keycloak from .keycloak_mock import mock_keycloak
def _authenticate_user(request_factory): def _authenticate_user(request_factory):
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
@pytest.mark.django_db @pytest.mark.django_db
def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory): def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory):
mock_keycloak(mocker, auth_success=False) mock_keycloak(mocker, auth_success=False)
user = _authenticate_user(request_factory) user = _authenticate_user(request_factory)
assert user is None assert user is None
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_success(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
kc_oidc_mock = mock_keycloak(mocker)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
# first authentication
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
# oidc_profile is not filled when authenticating through bearer token
assert hasattr(user, 'access_token') and user.access_token is None
# second authentication, should fetch userinfo from cache
# until token expires
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
assert hasattr(user, 'access_token') and user.access_token is None
# check user request to keycloak has been sent only once
kc_oidc_mock.userinfo.assert_called_once_with(access_token)
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_failure(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
# simulate a failed authentication with a bearer token in expected format
mock_keycloak(mocker, auth_success=False)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# simulate a failed authentication with an invalid bearer token format
mock_keycloak(mocker)
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer invalid-token-format")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
def test_drf_oidc_auth_invalid_or_missing_auth_type(api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
access_token = sample_data.oidc_profile['access_token']
# Invalid authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Foo token")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# Missing authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"{access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
View Options

swh/storage/interface.py

# Copyright (C) 2020 The Software Heritage developers # Copyright (C) 2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version # License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.contrib.auth import authenticate, get_backends from django.contrib.auth import authenticate, get_backends
import pytest import pytest
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import AuthenticationFailed
from swh.web.auth.backends import OIDCBearerTokenAuthentication
from swh.web.auth.models import OIDCUser from swh.web.auth.models import OIDCUser
from swh.web.common.utils import reverse from swh.web.common.utils import reverse
from . import sample_data from . import sample_data
from .keycloak_mock import mock_keycloak from .keycloak_mock import mock_keycloak
def _authenticate_user(request_factory): def _authenticate_user(request_factory):
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
@pytest.mark.django_db @pytest.mark.django_db
def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory): def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory):
mock_keycloak(mocker, auth_success=False) mock_keycloak(mocker, auth_success=False)
user = _authenticate_user(request_factory) user = _authenticate_user(request_factory)
assert user is None assert user is None
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_success(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
kc_oidc_mock = mock_keycloak(mocker)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
# first authentication
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
# oidc_profile is not filled when authenticating through bearer token
assert hasattr(user, 'access_token') and user.access_token is None
# second authentication, should fetch userinfo from cache
# until token expires
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
assert hasattr(user, 'access_token') and user.access_token is None
# check user request to keycloak has been sent only once
kc_oidc_mock.userinfo.assert_called_once_with(access_token)
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_failure(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
# simulate a failed authentication with a bearer token in expected format
mock_keycloak(mocker, auth_success=False)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# simulate a failed authentication with an invalid bearer token format
mock_keycloak(mocker)
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer invalid-token-format")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
def test_drf_oidc_auth_invalid_or_missing_auth_type(api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
access_token = sample_data.oidc_profile['access_token']
# Invalid authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Foo token")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# Missing authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"{access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
View Options

swh/storage/storage.py

# Copyright (C) 2020 The Software Heritage developers # Copyright (C) 2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version # License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.contrib.auth import authenticate, get_backends from django.contrib.auth import authenticate, get_backends
import pytest import pytest
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import AuthenticationFailed
from swh.web.auth.backends import OIDCBearerTokenAuthentication
from swh.web.auth.models import OIDCUser from swh.web.auth.models import OIDCUser
from swh.web.common.utils import reverse from swh.web.common.utils import reverse
from . import sample_data from . import sample_data
from .keycloak_mock import mock_keycloak from .keycloak_mock import mock_keycloak
def _authenticate_user(request_factory): def _authenticate_user(request_factory):
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
@pytest.mark.django_db @pytest.mark.django_db
def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory): def test_oidc_code_pkce_auth_backend_failure(mocker, request_factory):
mock_keycloak(mocker, auth_success=False) mock_keycloak(mocker, auth_success=False)
user = _authenticate_user(request_factory) user = _authenticate_user(request_factory)
assert user is None assert user is None
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_success(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
kc_oidc_mock = mock_keycloak(mocker)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
# first authentication
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
# oidc_profile is not filled when authenticating through bearer token
assert hasattr(user, 'access_token') and user.access_token is None
# second authentication, should fetch userinfo from cache
# until token expires
user, _ = drf_auth_backend.authenticate(request)
_check_authenticated_user(user)
assert hasattr(user, 'access_token') and user.access_token is None
# check user request to keycloak has been sent only once
kc_oidc_mock.userinfo.assert_called_once_with(access_token)
@pytest.mark.django_db
def test_drf_oidc_bearer_token_auth_backend_failure(mocker,
api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
# simulate a failed authentication with a bearer token in expected format
mock_keycloak(mocker, auth_success=False)
access_token = sample_data.oidc_profile['access_token']
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer {access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# simulate a failed authentication with an invalid bearer token format
mock_keycloak(mocker)
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Bearer invalid-token-format")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
def test_drf_oidc_auth_invalid_or_missing_auth_type(api_request_factory):
url = reverse('api-1-stat-counters')
drf_auth_backend = OIDCBearerTokenAuthentication()
access_token = sample_data.oidc_profile['access_token']
# Invalid authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"Foo token")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
# Missing authorization type
request = api_request_factory.get(
url, HTTP_AUTHORIZATION=f"{access_token}")
with pytest.raises(AuthenticationFailed):
drf_auth_backend.authenticate(request)
View Options

swh/storage/tests/test_storage.py

Loading...
About · Developer information · Legal