extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-29 11:34:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved url parsing; prefer http instead of https for local urls (#211)

Browse Source
This commit is contained in:
Michael Quigley 2023-02-08 11:21:24 -05:00
parent 3963259540
commit 5c58cc3240
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/zrok/reserve.go
View File

@ -10,7 +10,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"net/url"
"strings" "strings"
) )
@ -48,17 +47,14 @@ func (cmd *reserveCommand) run(_ *cobra.Command, args []string) {
var target string var target string
switch cmd.backendMode { switch cmd.backendMode {
case "proxy": case "proxy":
targetEndpoint, err := url.Parse(args[1]) v, err := parseUrl(args[1])
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("invalid target endpoint URL", err) tui.Error("invalid target endpoint URL", err)
} }
panic(err) panic(err)
} }
if targetEndpoint.Scheme == "" { target = v
targetEndpoint.Scheme = "https"
}
target = targetEndpoint.String()
case "web": case "web":
target = args[1] target = args[1]

8
cmd/zrok/sharePrivate.go
View File

@ -17,7 +17,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"net/url"
"os" "os"
"os/signal" "os/signal"
"strings" "strings"
@ -56,17 +55,14 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
switch cmd.backendMode { switch cmd.backendMode {
case "proxy": case "proxy":
targetEndpoint, err := url.Parse(args[0]) v, err := parseUrl(args[0])
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("invalid target endpoint URL", err) tui.Error("invalid target endpoint URL", err)
} }
panic(err) panic(err)
} }
if targetEndpoint.Scheme == "" { target = v
targetEndpoint.Scheme = "https"
}
target = targetEndpoint.String()
case "web": case "web":
target = args[0] target = args[0]

8
cmd/zrok/sharePublic.go
View File

@ -17,7 +17,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"net/url"
"os" "os"
"os/signal" "os/signal"
"strings" "strings"
@ -58,17 +57,14 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
switch cmd.backendMode { switch cmd.backendMode {
case "proxy": case "proxy":
targetEndpoint, err := url.Parse(args[0]) v, err := parseUrl(args[0])
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("invalid target endpoint URL", err) tui.Error("invalid target endpoint URL", err)
} }
panic(err) panic(err)
} }
if targetEndpoint.Scheme == "" { target = v
targetEndpoint.Scheme = "https"
}
target = targetEndpoint.String()
case "web": case "web":
target = args[0] target = args[0]

24
cmd/zrok/util.go
View File

@ -1,9 +1,13 @@
package main package main
import ( import (
"fmt"
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"net/url"
"os" "os"
"strconv"
"strings"
) )
func mustGetAdminAuth() runtime.ClientAuthInfoWriter { func mustGetAdminAuth() runtime.ClientAuthInfoWriter {
@ -13,3 +17,23 @@ func mustGetAdminAuth() runtime.ClientAuthInfoWriter {
} }
return httptransport.APIKeyAuth("X-TOKEN", "header", adminToken) return httptransport.APIKeyAuth("X-TOKEN", "header", adminToken)
} }
func parseUrl(in string) (string, error) {
// parse port-only urls
if iv, err := strconv.ParseInt(in, 10, 0); err == nil {
return fmt.Sprintf("http://127.0.0.1:%d", iv), nil
}
// make sure either https:// or http:// was specified
if !strings.HasPrefix(in, "https://") && !strings.HasPrefix(in, "http://") {
in = "http://" + in
}
// parse the url
targetEndpoint, err := url.Parse(in)
if err != nil {
return "", err
}
return targetEndpoint.String(), nil
}