Use hostname check from verify.go to handle patterns in TLS certs#23661
Merged
kvch merged 2 commits intoelastic:masterfrom Jan 25, 2021
Merged
Use hostname check from verify.go to handle patterns in TLS certs#23661kvch merged 2 commits intoelastic:masterfrom
kvch merged 2 commits intoelastic:masterfrom
Conversation
Contributor
|
Pinging @elastic/agent (Team:Agent) |
Contributor
|
testing |
mdelapenya
reviewed
Jan 25, 2021
Comment on lines
+55
to
+85
| func matchHostnames(pattern, host string) bool { | ||
| pattern = toLowerCaseASCII(pattern) | ||
| host = toLowerCaseASCII(strings.TrimSuffix(host, ".")) | ||
|
|
||
| if len(pattern) == 0 || len(host) == 0 { | ||
| return false | ||
| } | ||
|
|
||
| patternParts := strings.Split(pattern, ".") | ||
| hostParts := strings.Split(host, ".") | ||
|
|
||
| if len(patternParts) != len(hostParts) { | ||
| return false | ||
| } | ||
|
|
||
| for i, patternPart := range patternParts { | ||
| if i == 0 && patternPart == "*" { | ||
| continue | ||
| } | ||
| if patternPart != hostParts[i] { | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| // toLowerCaseASCII returns a lower-case version of in. See RFC 6125 6.4.1. We use | ||
| // an explicitly ASCII function to avoid any sharp corners resulting from | ||
| // performing Unicode operations on DNS labels. | ||
| func toLowerCaseASCII(in string) string { |
Contributor
There was a problem hiding this comment.
It seems fairly easy to add unit tests for for these two methods. Could we add them too?
Contributor
Author
There was a problem hiding this comment.
I am adding tests ATM, but not for these specific function, but for the whole VerifyConnection callback.
Contributor
There was a problem hiding this comment.
Great, thanks! If possible, I'd add unit tests for the calculation and verification of the lowerCaseASCII hostname, just in case we missed any edge case for the conditional branches inside both methods.
michalpristas
approved these changes
Jan 25, 2021
Contributor
michalpristas
left a comment
There was a problem hiding this comment.
worked for agent enroll
Contributor
💔 Build Failed
Expand to view the summary
Build stats
Test stats 🧪
Steps errors
Expand to view the steps failures
`x-pack/packetbeat-Lint - mage check;mage update;`
|
| Test | Results |
|---|---|
| Failed | 0 |
| Passed | 17362 |
| Skipped | 1346 |
| Total | 18708 |
Contributor
Author
|
jenkins run tests |
Contributor
Author
|
Failing test are unrelated. |
Contributor
💔 Build Failed
Expand to view the summary
Build stats
Test stats 🧪
Steps errors
Expand to view the steps failures
`x-pack/packetbeat-Lint - mage check;mage update;`
|
| Test | Results |
|---|---|
| Failed | 0 |
| Passed | 17362 |
| Skipped | 1346 |
| Total | 18708 |
Contributor
|
/packaging |
Merged
3 tasks
kvch
added a commit
to kvch/beats
that referenced
this pull request
Jan 26, 2021
…astic#23661) Previously, DNSNames in x509 certs with wildcards were not accepted. The function from Golang's `verify.go` is taken, so the check remains the same between Golang versions. (cherry picked from commit 6291419)
v1v
added a commit
to v1v/beats
that referenced
this pull request
Jan 26, 2021
…pack-when-oss-changes * upstream/master: [DOCS] Add setup content to Kubernetes and Cloud Foundry docs (elastic#23580) [CI] Mandatory windows support for all the versions (elastic#23615) Add check when retrieving the worker process id using performance counters (elastic#23647) Remove 4912 evtx from testing (elastic#23669) Add missing SSL settings (elastic#23632) Update X-Pack Packetbeat config (elastic#23666) Use hostname check from verify.go to handle patterns in TLS certs (elastic#23661) Fix: Dissect Cisco ASA 302013 message usernames (elastic#21196) Add FAQ entry for MADV settings in older versions (elastic#23429) Sync fixes from Integration Package Testing (elastic#23424) [Filebeat] Add Cisco ASA message '302023' parsing (elastic#23092) [Elastic Log Driver] Change hosts config flag (elastic#23628) Audit and Authentication Policy Change Events (elastic#20684)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What does this PR do?
Previously, DNSNames in x509 certs with wildcards were not accepted. The function from Golang's
verify.gois taken, so the check remains the same between Golang versions.Why is it important?
Wildcards in DNSNames were not accepted. Now the are.
Checklist
- [ ] I have made corresponding changes to the documentation- [ ] I have made corresponding change to the default configuration files- [ ] I have added an entry inCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.