curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: rename hostnameFromURI to hostFromURI 

since host=hostname+port

reuse the url variable
This commit is contained in:
nomyfan 2020-08-08 22:01:57 +08:00
parent 8daf1e882f
commit d07980b147
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cloudflared/tunnel/cmd.go
View File

@ -422,7 +422,7 @@ func StartServer(c *cli.Context, version string, shutdownC, graceShutdownC chan
return fmt.Errorf(errText) return fmt.Errorf(errText)
} }
if staticHost := hostnameFromURI(c.String("url")); isProxyDestinationConfigured(staticHost, c) { if staticHost := hostFromURI(url); isProxyDestinationConfigured(staticHost, c) {
listener, err := net.Listen("tcp", "127.0.0.1:") listener, err := net.Listen("tcp", "127.0.0.1:")
if err != nil { if err != nil {
logger.Errorf("Cannot start Websocket Proxy Server: %s", err) logger.Errorf("Cannot start Websocket Proxy Server: %s", err)
@ -570,7 +570,7 @@ func writePidFile(waitForSignal *signal.Signal, pidFile string, logger logger.Se
fmt.Fprintf(file, "%d", os.Getpid()) fmt.Fprintf(file, "%d", os.Getpid())
} }
func hostnameFromURI(uri string) string { func hostFromURI(uri string) string {
u, err := url.Parse(uri) u, err := url.Parse(uri)
if err != nil { if err != nil {
return "" return ""

16
cmd/cloudflared/tunnel/cmd_test.go
View File

@ -6,12 +6,12 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func TestHostnameFromURI(t *testing.T) { func TestHostFromURI(t *testing.T) {
assert.Equal(t, "awesome.warptunnels.horse:22", hostnameFromURI("ssh://awesome.warptunnels.horse:22")) assert.Equal(t, "awesome.warptunnels.horse:22", hostFromURI("ssh://awesome.warptunnels.horse:22"))
assert.Equal(t, "awesome.warptunnels.horse:22", hostnameFromURI("ssh://awesome.warptunnels.horse")) assert.Equal(t, "awesome.warptunnels.horse:22", hostFromURI("ssh://awesome.warptunnels.horse"))
assert.Equal(t, "awesome.warptunnels.horse:2222", hostnameFromURI("ssh://awesome.warptunnels.horse:2222")) assert.Equal(t, "awesome.warptunnels.horse:2222", hostFromURI("ssh://awesome.warptunnels.horse:2222"))
assert.Equal(t, "localhost:3389", hostnameFromURI("rdp://localhost")) assert.Equal(t, "localhost:3389", hostFromURI("rdp://localhost"))
assert.Equal(t, "localhost:3390", hostnameFromURI("rdp://localhost:3390")) assert.Equal(t, "localhost:3390", hostFromURI("rdp://localhost:3390"))
assert.Equal(t, "", hostnameFromURI("trash")) assert.Equal(t, "", hostFromURI("trash"))
assert.Equal(t, "", hostnameFromURI("https://awesomesauce.com")) assert.Equal(t, "", hostFromURI("https://awesomesauce.com"))
} }