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.

Sign up for GitHub

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

Cherry-pick #3671 to 5.x: Fix elasticsearch url parsing #3849

Merged
merged 2 commits into from
Mar 31, 2017
Merged

Cherry-pick #3671 to 5.x: Fix elasticsearch url parsing #3849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8361e3e
Fix elasticsearch url parsing (#3671)
Feb 24, 2017
248103f
remove extra changelog
monicasarbu Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ https://github.com/elastic/beats/compare/v5.3.0...master[Check the HEAD diff]
*Affecting all Beats*

- Update index mappings to support future Elasticsearch 6.X. {pull}3778[3778]
- Add `_id`, `_type`, `_index` and `_score` fields in the generated index pattern. {pull}3282[3282]
Copy link
Member

Choose a reason for hiding this comment

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

Does this line belong here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! It wasn't in the initial one. I will delete it manually.

- Fix potential elasticsearch output URL parsing error if protocol scheme is missing. {pull}3671[3671]

*Filebeat*

Expand Down
23 changes: 7 additions & 16 deletions libbeat/outputs/elasticsearch/url.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import (
"fmt"
"net"
"net/url"
"regexp"
"strings"
)

var hasScheme = regexp.MustCompile(`^([a-z][a-z0-9+\-.]*)://`)

// Creates the url based on the url configuration.
// Adds missing parts with defaults (scheme, host, port)
func getURL(defaultScheme string, defaultPath string, rawURL string) (string, error) {
Expand All @@ -15,6 +18,10 @@ func getURL(defaultScheme string, defaultPath string, rawURL string) (string, er
defaultScheme = "http"
}

if !hasScheme.MatchString(rawURL) {
rawURL = fmt.Sprintf("%v://%v", defaultScheme, rawURL)
}

addr, err := url.Parse(rawURL)
if err != nil {
return "", err
Expand All @@ -24,22 +31,6 @@ func getURL(defaultScheme string, defaultPath string, rawURL string) (string, er
host := addr.Host
port := "9200"

// sanitize parse errors if url does not contain scheme
// if parse url looks funny, prepend schema and try again:
if addr.Scheme == "" || (addr.Host == "" && addr.Path == "" && addr.Opaque != "") {
rawURL = fmt.Sprintf("%v://%v", defaultScheme, rawURL)
if tmpAddr, err := url.Parse(rawURL); err == nil {
addr = tmpAddr
scheme = addr.Scheme
host = addr.Host
} else {
// If url doesn't have a scheme, host is written into path. For example: 192.168.3.7
scheme = defaultScheme
host = addr.Path
addr.Path = ""
}
}

if host == "" {
host = "localhost"
} else {
Expand Down
2 changes: 2 additions & 0 deletions libbeat/outputs/elasticsearch/url_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ func TestGetUrl(t *testing.T) {
"http://localhost/": "http://localhost:9200/",

// no schema + hostname
"33f3600fd5c1bb599af557c36a4efb08.host": "http://33f3600fd5c1bb599af557c36a4efb08.host:9200",
"33f3600fd5c1bb599af557c36a4efb08.host:12345": "http://33f3600fd5c1bb599af557c36a4efb08.host:12345",
"localhost": "http://localhost:9200",
"localhost:80": "http://localhost:80",
"localhost:80/": "http://localhost:80/",
Expand Down