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.

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

Update staging-root.json and test assets #602

Merged
merged 9 commits into from
Apr 5, 2023

Conversation

tnytown
Copy link
Collaborator

@tnytown tnytown commented Apr 5, 2023

See #594.

haydentherapper and others added 3 commits April 3, 2023 14:58
Change hardcoded root to the new root from sigstore/root-signing#756


Signed-off-by: Hayden B <hblauzvern@google.com>
Signed-off-by: Andrew Pan <a@tny.town>
These tests need to be updated for our new trusted root format. Testing
for that is landing in sigstore#591.

Signed-off-by: Andrew Pan <a@tny.town>
@tnytown tnytown requested review from woodruffw and jleightcap and removed request for woodruffw April 5, 2023 13:34
Signed-off-by: Andrew Pan <a@tny.town>
@tnytown tnytown added safe to test component:tuf TUF related components labels Apr 5, 2023
Signed-off-by: Andrew Pan <a@tny.town>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chaff file here!

Copy link
Member

@woodruffw woodruffw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one chaff file needs to be removed.

@@ -113,10 +122,16 @@ def range_from(offset_lower=0, offset_upper=0):
) # Valid: 1 ago, 1 ago


@pytest.mark.skip
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we skipping these?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ends up exercising the TUF codepath, which doesn't return PEM keys. It's a little tricky to handle, I have helpers to make this easier to handle in #591. If we want to port stuff over from there, I can do so, although I thought it might be easier to just fix these tests in that changeset

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hm I guess another option is to stub out _get_trusted_root to force the legacy non-bundled root

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hm I guess another option is to stub out _get_trusted_root to force the legacy non-bundled root

Yeah, let's do that (and document that that's what we're doing, for future software archaeologists).

Signed-off-by: Andrew Pan <a@tny.town>
Signed-off-by: Andrew Pan <a@tny.town>
Signed-off-by: Andrew Pan <a@tny.town>
Copy link
Member

@woodruffw woodruffw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@woodruffw woodruffw merged commit bb70600 into sigstore:main Apr 5, 2023
21 checks passed
@tnytown tnytown deleted the ap/wip-staging-root-update branch April 11, 2023 15:36
emilejbm pushed a commit to emilejbm/sigstore-python that referenced this pull request Apr 21, 2023
* Update staging-root.json

Change hardcoded root to the new root from sigstore/root-signing#756

Signed-off-by: Hayden B <hblauzvern@google.com>

* wip: test: adjust local assets for staging update

Signed-off-by: Andrew Pan <a@tny.town>

* test_tuf: skip failing getter tests

These tests need to be updated for our new trusted root format. Testing
for that is landing in sigstore#591.

Signed-off-by: Andrew Pan <a@tny.town>

* fixup! test_tuf: skip failing getter tests

Signed-off-by: Andrew Pan <a@tny.town>

* fixup! fixup! test_tuf: skip failing getter tests

Signed-off-by: Andrew Pan <a@tny.town>

* fixup! fixup! fixup! test_tuf: skip failing getter tests

Signed-off-by: Andrew Pan <a@tny.town>

* fixup! fixup! fixup! fixup! test_tuf: skip failing getter tests

Signed-off-by: Andrew Pan <a@tny.town>

* test_tuf: doc

Signed-off-by: Andrew Pan <a@tny.town>

* test: add staging-tuf targets

Signed-off-by: Andrew Pan <a@tny.town>

---------

Signed-off-by: Hayden B <hblauzvern@google.com>
Signed-off-by: Andrew Pan <a@tny.town>
Co-authored-by: Hayden B <hblauzvern@google.com>
Signed-off-by: Emile Baez <ebaezmunne@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:tuf TUF related components
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants