Skip to content

Add --insecure option to allow forcing unencrypted http #115

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

Open
ljelinek-cznic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add --insecure option to allow forcing unencrypted http #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions defs/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (
OptionUploadSize = "upload-size"
OptionDuration = "duration"
OptionSecure = "secure"
OptionInsecure = "insecure"
OptionCACert = "ca-cert"
OptionSkipCertVerify = "skip-cert-verify"
OptionNoPreAllocate = "no-pre-allocate"
Expand Down
5 changes: 5 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ func main() {
Usage: "Use HTTPS instead of HTTP when communicating with\n" +
"\tLibreSpeed.org operated servers",
},
&cli.BoolFlag{
Name: defs.OptionInsecure,
Usage: "Use HTTP instead of HTTPS when communicating with\n" +
"\tLibreSpeed.org operated servers",
},
&cli.StringFlag{
Name: defs.OptionCACert,
Usage: "Use the specified CA certificate PEM bundle file instead\n" +
Expand Down
45 changes: 31 additions & 14 deletions speedtest/speedtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ const (
defaultTelemetryServer = "https://librespeed.org"
defaultTelemetryPath = "/results/telemetry.php"
defaultTelemetryShare = "/results/"

forceNothing = 0
forceHttps = 1
forceHttp = 2
)

type PingJob struct {
Expand Down Expand Up @@ -229,6 +233,16 @@ func SpeedTest(c *cli.Context) error {
transport.DialContext = dialContext
http.DefaultClient.Transport = transport

// no scheme is forced by default
// force https if --secure is given
// else force http if --insecure is given
var forceScheme int = forceNothing
if c.Bool(defs.OptionSecure) {
forceScheme = forceHttps
} else if c.Bool(defs.OptionInsecure) {
forceScheme = forceHttp
}

// load server list
var servers []defs.Server
var err error
Expand All @@ -237,11 +251,11 @@ func SpeedTest(c *cli.Context) error {
case "-":
// load server list from stdin
log.Info("Using local JSON server list from stdin")
servers, err = getLocalServersReader(c.Bool(defs.OptionSecure), os.Stdin, c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))
servers, err = getLocalServersReader(forceScheme, os.Stdin, c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))
default:
// load server list from local JSON file
log.Infof("Using local JSON server list: %s", str)
servers, err = getLocalServers(c.Bool(defs.OptionSecure), str, c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))
servers, err = getLocalServers(forceScheme, str, c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))
}
} else {
// fetch the server list JSON and parse it into the `servers` array
Expand All @@ -251,11 +265,11 @@ func SpeedTest(c *cli.Context) error {
}
log.Infof("Retrieving server list from %s", serverUrl)

servers, err = getServerList(c.Bool(defs.OptionSecure), serverUrl, c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))
servers, err = getServerList(forceScheme, serverUrl, c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))

if err != nil {
log.Info("Retry with /.well-known/librespeed")
servers, err = getServerList(c.Bool(defs.OptionSecure), serverUrl+"/.well-known/librespeed", c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))
servers, err = getServerList(forceScheme, serverUrl+"/.well-known/librespeed", c.IntSlice(defs.OptionExclude), c.IntSlice(defs.OptionServer), !c.Bool(defs.OptionList))
}
}
if err != nil {
Expand Down Expand Up @@ -373,7 +387,7 @@ func pingWorker(jobs <-chan PingJob, results chan<- PingResult, wg *sync.WaitGro
}

// getServerList fetches the server JSON from a remote server
func getServerList(forceHTTPS bool, serverList string, excludes, specific []int, filter bool) ([]defs.Server, error) {
func getServerList(forceScheme int, serverList string, excludes, specific []int, filter bool) ([]defs.Server, error) {
// --exclude and --server cannot be used at the same time
if len(excludes) > 0 && len(specific) > 0 {
return nil, errors.New("either --exclude or --server can be used")
Expand Down Expand Up @@ -402,11 +416,11 @@ func getServerList(forceHTTPS bool, serverList string, excludes, specific []int,
return nil, err
}

return preprocessServers(servers, forceHTTPS, excludes, specific, filter)
return preprocessServers(servers, forceScheme, excludes, specific, filter)
}

// getLocalServersReader loads the server JSON from an io.Reader
func getLocalServersReader(forceHTTPS bool, reader io.ReadCloser, excludes, specific []int, filter bool) ([]defs.Server, error) {
func getLocalServersReader(forceScheme int, reader io.ReadCloser, excludes, specific []int, filter bool) ([]defs.Server, error) {
defer reader.Close()

var servers []defs.Server
Expand All @@ -420,30 +434,33 @@ func getLocalServersReader(forceHTTPS bool, reader io.ReadCloser, excludes, spec
return nil, err
}

return preprocessServers(servers, forceHTTPS, excludes, specific, filter)
return preprocessServers(servers, forceScheme, excludes, specific, filter)
}

// getLocalServers loads the server JSON from a local file
func getLocalServers(forceHTTPS bool, jsonFile string, excludes, specific []int, filter bool) ([]defs.Server, error) {
func getLocalServers(forceScheme int, jsonFile string, excludes, specific []int, filter bool) ([]defs.Server, error) {
f, err := os.OpenFile(jsonFile, os.O_RDONLY, 0644)
if err != nil {
return nil, err
}
return getLocalServersReader(forceHTTPS, f, excludes, specific, filter)
return getLocalServersReader(forceScheme, f, excludes, specific, filter)
}

// preprocessServers makes some needed modifications to the servers fetched
func preprocessServers(servers []defs.Server, forceHTTPS bool, excludes, specific []int, filter bool) ([]defs.Server, error) {
func preprocessServers(servers []defs.Server, forceScheme int, excludes, specific []int, filter bool) ([]defs.Server, error) {
for i := range servers {
u, err := servers[i].GetURL()
if err != nil {
return nil, err
}

// if no scheme is defined, use http as default, or https when --secure is given in cli options
// if the scheme is predefined and --secure is not given, we will use it as-is
if forceHTTPS {
// if no scheme is defined, use http as default, or https when --secure is given in cli options,
// of http if --insecure is given in cli options
// if the scheme is predefined and neither --secure nor --insecure is not given, we will use it as-is
if forceScheme == forceHttps {
u.Scheme = "https"
} else if forceScheme == forceHttp {
u.Scheme = "http"
} else if u.Scheme == "" {
// if `secure` is not used and no scheme is defined, use http
u.Scheme = "http"
Expand Down