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

[x509] Fix comparison of certificate values #58296

Merged
merged 5 commits into from
Nov 13, 2020

Conversation

alxwr
Copy link
Contributor

@alxwr alxwr commented Aug 26, 2020

What does this PR do?

What issues does this PR fix or reference?

Fixes an aspect of #56556

Previous Behavior

Freshly created certificates are overwritten during the next run because the comparison of the certificate's values didn't work.

i.e.:

              Status:                                                                                                 
                  ----------                                                                                          
                  New:                                                                                                
                      Certificate is valid and up to date                                                             
                  Old:                                                                                                
                      Certificate properties are different: Public Key

Acutally, the public key did not change!

New Behavior

The certificate is not changed any more at very run of salt.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

No


@glynnforrest @s0undt3ch This may interest you.

Copy link
Contributor

@Ch3LL Ch3LL left a comment

Choose a reason for hiding this comment

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

looks like there is a failing test that needs to be investigated

CHANGELOG.md Outdated Show resolved Hide resolved
@Ch3LL Ch3LL requested a review from s0undt3ch August 31, 2020 21:12
salt/states/x509.py Outdated Show resolved Hide resolved
@alxwr
Copy link
Contributor Author

alxwr commented Sep 9, 2020

@Ch3LL @s0undt3ch I added your requested changes. Please review! Thanks! :-)

Ch3LL
Ch3LL previously approved these changes Sep 9, 2020
@Ch3LL
Copy link
Contributor

Ch3LL commented Sep 9, 2020

looks like you have a merge conflict that needs to be cleaned up

@alxwr
Copy link
Contributor Author

alxwr commented Sep 20, 2020

@Ch3LL Please review again! :-)

@dwoz dwoz added the v3002.2 vulnerable version label Nov 13, 2020
@dwoz dwoz merged commit ea409f0 into saltstack:master Nov 13, 2020
@alxwr alxwr deleted the fix-cert-comparison branch November 21, 2020 20:44
@alxwr
Copy link
Contributor Author

alxwr commented Nov 21, 2020

@dwoz Thanks! 🎊

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v3002.2 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants