add support for SMTP server certificates over STARTTLS #7680
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danielnelson
suggested changes
Jun 18, 2020
| @@ -10,7 +10,7 @@ file or network connection. | |||
| # Reads metrics from a SSL certificate | |||
| [[inputs.x509_cert]] | |||
| ## List certificate sources | |||
| sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "https://example.org:443"] | |||
| sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "https://example.org:443", "smtp+starttls://smtp.example.org:587"] | |||
There was a problem hiding this comment.
Rename to smtp per #7679 (comment)
| @@ -21,7 +22,7 @@ import ( | |||
|
|
|||
| const sampleConfig = ` | |||
| ## List certificate sources | |||
| sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "tcp://example.org:443"] | |||
| sources = ["/etc/ssl/certs/ssl-cert-snakeoil.pem", "https://example.org:443", "smtp+starttls://smtp.example.org:587"] | |||
| @@ -100,6 +101,58 @@ func (c *X509Cert) getCert(u *url.URL, timeout time.Duration) ([]*x509.Certifica | |||
|
|
|||
| certs := conn.ConnectionState().PeerCertificates | |||
|
|
|||
| return certs, nil | |||
| case "smtp+starttls": | |||
| u.Scheme = "smtp+starttls" | |||
There was a problem hiding this comment.
Make a function for the body of the case statement, since now this function is becoming very large.
| defer sclient.Text.EndResponse(id) | ||
| _, _, err = sclient.Text.ReadResponse(220) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("did not get 220 after STARTTLS: %s", err.Error()) |
There was a problem hiding this comment.
Nit: switch over to the new %w format for wrapping errors
"did not get 220 after STARTTLS: %w", err)
|
@tryfail any chance you can work on the comments? |
|
@tryfail any update on this PR? |
|
Hi, This PR has not been touched in a while and as a result I am going to close it. We are happy to review again once someone picks this back up with the suggested changes and rebased on master. Thanks! |
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Required for all PRs:
closes #7679 .
I am not too familiar with the unit test structure for golang and telegraf. Additionally, I did not find a way to create an analogous test to that of the local TLS server.
Currently known limitations: