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

Sort certificates in bundles to ensure deterministic behaviour #380

Merged
merged 1 commit into from
Jul 15, 2024

Conversation

jabdoa2
Copy link
Contributor

@jabdoa2 jabdoa2 commented Jul 9, 2024

fix #310

@cert-manager-prow cert-manager-prow bot added the dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. label Jul 9, 2024
@cert-manager-prow
Copy link
Contributor

Hi @jabdoa2. Thanks for your PR.

I'm waiting for a cert-manager member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@cert-manager-prow cert-manager-prow bot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 9, 2024
@erikgb
Copy link
Contributor

erikgb commented Jul 10, 2024

/ok-to-test

@cert-manager-prow cert-manager-prow bot added ok-to-test dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 10, 2024
@cert-manager-prow cert-manager-prow bot added dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. and removed dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. labels Jul 10, 2024
@jabdoa2
Copy link
Contributor Author

jabdoa2 commented Jul 10, 2024

Should be good to go now. I adjusted the certificate order in smoke and integration test.

@jabdoa2
Copy link
Contributor Author

jabdoa2 commented Jul 11, 2024

@erikgb is there a chance to get this merged & released soonith? we would prefer to forward fix our issue instead of rolling everything back.

@erikgb
Copy link
Contributor

erikgb commented Jul 12, 2024

@erikgb is there a chance to get this merged & released soonith? we would prefer to forward fix our issue instead of rolling everything back.

@jabdoa2 Yes, it should be possible to merge and release this improvement soonish. I am going to review it today, but I think we should get #375 merged first. The other PR changes overlapping area of code to this PR, and has been open for a while. So you'd have to be prepared for a rebase. 😉

Copy link
Contributor

@erikgb erikgb left a comment

Choose a reason for hiding this comment

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

Thanks for looking into this, @jabdoa2! Looks (almost) good to me. 😉 As already commented, we should probably wait for #375 to get merged.

pkg/bundle/source.go Outdated Show resolved Hide resolved
@arsenalzp
Copy link
Contributor

arsenalzp commented Jul 12, 2024

Thanks for looking into this, @jabdoa2! Looks (almost) good to me. 😉 As already commented, we should probably wait for #375 to get merged.

You can merge it as it is then I can re-write code to remediate all remarks as well as introducing crypto/x509 CertPool I'm on vacation right now, thus no chance to get laptop until Tuesday. I would like to stay the course.

@erikgb
Copy link
Contributor

erikgb commented Jul 12, 2024

You can merge it as it is then I can re-write code to remediate all remarks as well as introducing crypto/x509 CertPool I'm on vacation right now, thus no chance to get laptop until Tuesday. I would like to stay the course.

Thanks @arsenalzp!

@arsenalzp
Copy link
Contributor

arsenalzp commented Jul 12, 2024

You can merge it as it is then I can re-write code to remediate all remarks as well as introducing crypto/x509 CertPool I'm on vacation right now, thus no chance to get laptop until Tuesday. I would like to stay the course.

Thanks @arsenalzp!

How it will look like: my PR is the first one then #380 is the second one?
Or just merge #380 then I will re-write my PR?

@erikgb
Copy link
Contributor

erikgb commented Jul 12, 2024

How it will look like: my PR is the first one then #380 is the second one? Or just merge #380 then I will re-write me PR?

I think #380 (this PR) can be merged first, and it also fixes a serious issue. It looks almost GTM to me.

test/env/data.go Outdated Show resolved Hide resolved
@cert-manager-prow cert-manager-prow bot added dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. and removed dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. labels Jul 12, 2024
@cert-manager-prow cert-manager-prow bot removed the dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. label Jul 12, 2024
@cert-manager-prow cert-manager-prow bot added the dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. label Jul 12, 2024
pkg/bundle/source.go Outdated Show resolved Hide resolved
@erikgb
Copy link
Contributor

erikgb commented Jul 14, 2024

/lgtm

We should maybe squash commits before/on merge?

@cert-manager-prow cert-manager-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jul 14, 2024
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
Signed-off-by: Jan Kantert <jan-mpf@kantert.net>
@cert-manager-prow cert-manager-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2024
@jabdoa2
Copy link
Contributor Author

jabdoa2 commented Jul 15, 2024

/lgtm

We should maybe squash commits before/on merge?

I squashed everything into one commit

@inteon inteon changed the title sort certificates in bundles to ensure deterministic behaviour Sort certificates in bundles to ensure deterministic behaviour Jul 15, 2024
Copy link
Contributor

@erikgb erikgb left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this serious issue, @jabdoa2! 🚀

/lgtm
/approve

@cert-manager-prow cert-manager-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2024
@cert-manager-prow
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: erikgb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@cert-manager-prow cert-manager-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 15, 2024
@cert-manager-prow cert-manager-prow bot merged commit 8fec2fb into cert-manager:main Jul 15, 2024
6 checks passed
@maelvls
Copy link
Member

maelvls commented Jul 15, 2024

I spent Friday afternoon manually testing the bug with label selectors. I was able to reproduce it, and I was able to test that your PR fixes the issue. I have documented the testing I did in the Hackmd page PR 380: Manually Testing that ConfigMaps are No Longer Unexpectedly Updated By The ConfigMap Label Selector Bug.

By the way, would there be by any chance someone relying the fact that the ordering in sources is identical in targets?

@erikgb
Copy link
Contributor

erikgb commented Jul 15, 2024

By the way, would there be by any chance someone relying the fact that the ordering in sources is identical in targets?

Order doesn't matter here IMO. The order must be consistent, but I don't think a particular order is required.

@jabdoa2
Copy link
Contributor Author

jabdoa2 commented Jul 15, 2024

By the way, would there be by any chance someone relying the fact that the ordering in sources is identical in targets?

Order doesn't matter here IMO. The order must be consistent, but I don't think a particular order is required.

This should be very unlikely for trust bundles. Those are not usually ordered and order should not matter.

The story would be different for PEMs containing a certificate chain. For instance, OpenSSL is well known for behaving badly if the first cert is not the leaf cert. Most other libraries will behave well though. Also that is not the usecase for trust-manager.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. lgtm Indicates that a PR is ready to be merged. ok-to-test size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provide deterministic bundle
5 participants