Skip to content

ActiveState OIDC Token Handler Endpoint #1

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

Closed
th3coop wants to merge 11 commits into from
Closed

ActiveState OIDC Token Handler Endpoint #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5fca44a
OIDC active state form (#15168)
th3coop Feb 9, 2024
c63726a
Add ActiveState OIDC token handler endpoint
th3coop Jan 13, 2024
1f1f17b
feat(admin): add button for dependency confusion (#15357)
miketheman Feb 9, 2024
15714ec
Remove print statement
th3coop Feb 9, 2024
6cd0ecc
Remove redundant token handler route. All token mint requests, for al…
th3coop Feb 9, 2024
4f5cf6e
Add yank reason to release history page (#15115)
cofiem Feb 12, 2024
9461adb
Translations update from Weblate (#15312)
weblate Feb 12, 2024
3c35155
Merge branch 'main' into OIDC-ActiveState-token-handler
th3coop Feb 12, 2024
6d0ae0d
oidc/forms: improve project exists error (#15366)
woodruffw Feb 12, 2024
2e48432
Remove exposure of base OIDCPublisherMixin. Shouldn't be used outsid…
th3coop Feb 12, 2024
7b0397c
Merge branch 'main' into OIDC-ActiveState-token-handler
th3coop Feb 12, 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
68 changes: 60 additions & 8 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import json
import os
import os.path
import re
Expand Down Expand Up @@ -51,7 +50,7 @@
from warehouse.metrics import IMetricsService
from warehouse.oidc import services as oidc_services
from warehouse.oidc.interfaces import IOIDCPublisherService
from warehouse.oidc.utils import GITHUB_OIDC_ISSUER_URL
from warehouse.oidc.utils import ACTIVESTATE_OIDC_ISSUER_URL, GITHUB_OIDC_ISSUER_URL
from warehouse.organizations import services as organization_services
from warehouse.organizations.interfaces import IOrganizationService
from warehouse.packaging import services as packaging_services
Expand Down Expand Up @@ -169,7 +168,8 @@ def pyramid_services(
token_service,
user_service,
project_service,
oidc_service,
github_oidc_service,
activestate_oidc_service,
macaroon_service,
):
services = _Services()
Expand All @@ -184,7 +184,12 @@ def pyramid_services(
services.register_service(token_service, ITokenService, None, name="email")
services.register_service(user_service, IUserService, None, name="")
services.register_service(project_service, IProjectService, None, name="")
services.register_service(oidc_service, IOIDCPublisherService, None, name="github")
services.register_service(
github_oidc_service, IOIDCPublisherService, None, name="github"
)
services.register_service(
activestate_oidc_service, IOIDCPublisherService, None, name="activestate"
)
services.register_service(macaroon_service, IMacaroonService, None, name="")

return services
Expand Down Expand Up @@ -368,7 +373,7 @@ def project_service(db_session, metrics, ratelimiters=None):


@pytest.fixture
def oidc_service(db_session):
def github_oidc_service(db_session):
# We pretend to be a verifier for GitHub OIDC JWTs, for the purposes of testing.
return oidc_services.NullOIDCPublisherService(
db_session,
Expand All @@ -381,7 +386,7 @@ def oidc_service(db_session):


@pytest.fixture
def dummy_oidc_jwt():
def dummy_github_oidc_jwt():
# {
# "jti": "6e67b1cb-2b8d-4be5-91cb-757edb2ec970",
# "sub": "repo:foo/bar",
Expand Down Expand Up @@ -427,8 +432,55 @@ def dummy_oidc_jwt():


@pytest.fixture
def dummy_oidc_payload(dummy_oidc_jwt):
return json.dumps({"token": dummy_oidc_jwt})
def dummy_activestate_oidc_jwt():
# {
# "jti": "6e67b1cb-2b8d-4be5-91cb-757edb2ec970",
# "sub": "org:fakeorg:project:fakeproject",
# "aud": "pypi",
# "actor_id": "fake",
# "actor": "foo",
# "oraganization_id": "7e67b1cb-2b8d-4be5-91cb-757edb2ec970",
# "organization": "fakeorg",
# "project_visibility": "private",
# "project_id": "8e67b1cb-2b8d-4be5-91cb-757edb2ec970",
# "project_path": "fakeorg/fakeproject",
# "project": "fakeproject",
# "builder": "pypi_builder",
# "ingredient_name": "fakeingredient",
# "artifact_id": "9e67b1cb-2b8d-4be5-91cb-757edb2ec970",
# "iss":"https://platform.activestate.com/api/v1/oauth/oidc",
# "nbf": 1650663265,
# "exp": 1650664165,
# "iat": 1650663865
# }
return (
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ZTY3YjFjYi0yYjhkLTRi"
"ZTUtOTFjYi03NTdlZGIyZWM5NzAiLCJzdWIiOiJvcmc6ZmFrZW9yZzpwcm9qZWN0OmZha"
"2Vwcm9qZWN0IiwiYXVkIjoicHlwaSIsImFjdG9yX2lkIjoiZmFrZSIsImFjdG9yIjoiZm"
"9vIiwib3JhZ2FuaXphdGlvbl9pZCI6IjdlNjdiMWNiLTJiOGQtNGJlNS05MWNiLTc1N2V"
"kYjJlYzk3MCIsIm9yZ2FuaXphdGlvbiI6ImZha2VvcmciLCJwcm9qZWN0X3Zpc2liaWxp"
"dHkiOiJwcml2YXRlIiwicHJvamVjdF9pZCI6IjhlNjdiMWNiLTJiOGQtNGJlNS05MWNiL"
"Tc1N2VkYjJlYzk3MCIsInByb2plY3RfcGF0aCI6ImZha2VvcmcvZmFrZXByb2plY3QiLC"
"Jwcm9qZWN0IjoiZmFrZXByb2plY3QiLCJidWlsZGVyIjoicHlwaV9idWlsZGVyIiwiaW5"
"ncmVkaWVudF9uYW1lIjoiZmFrZWluZ3JlZGllbnQiLCJhcnRpZmFjdF9pZCI6IjllNjdi"
"MWNiLTJiOGQtNGJlNS05MWNiLTc1N2VkYjJlYzk3MCIsImlzcyI6Imh0dHBzOi8vcGxhd"
"GZvcm0uYWN0aXZlc3RhdGUuY29tL2FwaS92MS9vYXV0aC9vaWRjIiwibmJmIjoxNjUwNj"
"YzMjY1LCJleHAiOjE2NTA2NjQxNjUsImlhdCI6MTY1MDY2Mzg2NX0.R4q-vWAFXHrBSBK"
"AZuHHIsGOkqlirPxEtLfjLIDiLr0"
)


@pytest.fixture
def activestate_oidc_service(db_session):
# We pretend to be a verifier for GitHub OIDC JWTs, for the purposes of testing.
return oidc_services.NullOIDCPublisherService(
db_session,
pretend.stub(),
ACTIVESTATE_OIDC_ISSUER_URL,
pretend.stub(),
pretend.stub(),
pretend.stub(),
)


@pytest.fixture
Expand Down
Loading