Skip to content

Commit

Permalink
Revert "libbeat/common/transport: fix log message about TLS (#30063)" (
Browse files Browse the repository at this point in the history
…#30320)

This reverts commit e208c22.

This commit caused the agent to crash on startup on Windows with a nil
pointer dereference.
  • Loading branch information
cmacknz authored Feb 10, 2022
1 parent 4b480bd commit 7ccb649
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...main[Check the HEAD dif

*Affecting all Beats*

- Fix a logging bug when `ssl.verification_mode` was set to `full` or `certificate`, the command `test output` incorrectly logged that TLS was disabled.
- Fix field names with `add_network_direction` processor. {issue}29747[29747] {pull}29751[29751]

*Auditbeat*
Expand Down
9 changes: 1 addition & 8 deletions libbeat/common/transport/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,7 @@ func tlsDialWith(
}
}

// We only check the status of config.Verification (`ssl.verification_mode`
// in the configuration file) because we have a custom verification logic
// implemented by setting tlsConfig.VerifyConnection that runs regardless of
// the status of tlsConfig.InsecureSkipVerify.
// For verification modes VerifyFull and VerifyCeritifcate we set
// tlsConfig.InsecureSkipVerify to true, hence it's not an indicator of
// whether TLS verification is enabled or not.
if config.Verification == tlscommon.VerifyNone {
if tlsConfig.InsecureSkipVerify {
d.Warn("security", "server's certificate chain verification is disabled")
} else {
d.Info("security", "server's certificate chain verification is enabled")
Expand Down

0 comments on commit 7ccb649

Please sign in to comment.