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

TLS cert_info fixes #49126

Merged
merged 6 commits into from Aug 18, 2018

Conversation

Projects
None yet
2 participants
@The-Loeki
Copy link
Contributor

commented Aug 14, 2018

What does this PR do?

Fix multiple small problems with tls.cert_info

  • Fix output of extensions keys being bytes (see also #49123)
  • fix outputting errors for IP Addres subjectAltNames
  • allow cert string as well as file path as input

The-Loeki added some commits Aug 14, 2018

@@ -1575,12 +1575,15 @@ def create_pkcs12(ca_name, CN, passphrase='', cacert_path=None, replace=False):
)


def cert_info(cert_path, digest='sha256'):
def cert_info(cert, digest='sha256'):

This comment has been minimized.

Copy link
@cachedout

cachedout Aug 15, 2018

Collaborator

Why are we changing this?

This comment has been minimized.

Copy link
@The-Loeki

The-Loeki Aug 15, 2018

Author Contributor

cert is string|filepath
cert_path being a string would be rather confusing

Also it's the first arg which is nowhere used in Salt AFAICT, so pplz using tls.get_cert_info(myfile) wont notice a thing.

I can add some deprecation stuff around it if you're bothered by it?

The-Loeki added some commits Aug 15, 2018

Mike Place

@cachedout cachedout merged commit 0d0e11d into saltstack:2018.3 Aug 18, 2018

5 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details

@The-Loeki The-Loeki deleted the The-Loeki:tls-impr branch Aug 18, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.