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

only prepend http:// to endpoint if no protocol was provided #191

Merged
merged 2 commits into from
Oct 13, 2017
Merged

only prepend http:// to endpoint if no protocol was provided #191

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87c2ca2
only prepend `http://` to endpoint if no protocol was provided
Crunch09 Oct 10, 2017
b432780
fail if protocol is `https://`
Crunch09 Oct 12, 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
5 changes: 3 additions & 2 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"io"
"io/ioutil"
"net/http"
"strings"
"regexp"
)

// Client holds information about where to connect to Toxiproxy.
Expand Down Expand Up @@ -47,7 +47,8 @@ type Proxy struct {
// with Toxiproxy. Endpoint is the address to the proxy (e.g. localhost:8474 if
// not overriden)
func NewClient(endpoint string) *Client {
if !strings.HasPrefix(endpoint, "http://") {
protocolProvided, _ := regexp.MatchString(`^https?://`, endpoint)
Copy link
Contributor

Choose a reason for hiding this comment

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

Generally it's better to create a regex via regexp.MustCompile() and then calling the MatchString method. This ensures we don't ignore a possible error in the regex.

if !protocolProvided {
endpoint = "http://" + endpoint
}
return &Client{endpoint: endpoint}
Expand Down