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

node: Fix url verification bug where <ip>:<port> is not supported #3719

Merged
merged 9 commits into from
Jan 18, 2024
Merged

node: Fix url verification bug where <ip>:<port> is not supported #3719

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
63cf7b9
node: update url verification logic to support ip:port format
bingyuyap Jan 18, 2024
15ec0a2
node: add test case for ip:port
bingyuyap Jan 18, 2024
b1d4d19
node: change neon rpc scheme from websocket to HTTP
bingyuyap Jan 18, 2024
b28281e
node: update comment to be more accurate
bingyuyap Jan 18, 2024
8a7a1bc
node: remove neon from devmode
bingyuyap Jan 18, 2024
de09d1a
node: ignore internal xlabs testing file
bingyuyap Jan 18, 2024
5d4ff6e
node: add ws:// prefix to Sui
bingyuyap Jan 18, 2024
07b18ef
node: add ws:// and wss:// prefixes to Sui schemes
bingyuyap Jan 18, 2024
a7483d7
node: update testnet yaml naming
bingyuyap Jan 18, 2024
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: 1 addition & 1 deletion node/cmd/guardiand/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ func init() {
moonbeamRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "moonbeamRPC", "Moonbeam RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
moonbeamContract = NodeCmd.Flags().String("moonbeamContract", "", "Moonbeam contract address")

neonRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "neonRPC", "Neon RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
neonRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "neonRPC", "Neon RPC URL", "http://eth-devnet:8545", []string{"http", "https"})
neonContract = NodeCmd.Flags().String("neonContract", "", "Neon contract address")

terraWS = node.RegisterFlagWithValidationOrFail(NodeCmd, "terraWS", "Path to terrad root for websocket connection", "ws://terra-terrad:26657/websocket", []string{"ws", "wss"})
Expand Down
11 changes: 6 additions & 5 deletions node/pkg/node/url_verification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@ func hasKnownSchemePrefix(urlStr string) bool {
}

func validateURL(urlStr string, validSchemes []string) bool {
parsedURL, err := url.Parse(urlStr)
if err != nil {
return false
}

// If no scheme is required, validate host:port format
if len(validSchemes) == 1 && validSchemes[0] == "" {
host, port, err := net.SplitHostPort(urlStr)
return err == nil && host != "" && port != "" && !hasKnownSchemePrefix(urlStr)
}

// url.Parse() has to come later because it will fail if the scheme is empty
parsedURL, err := url.Parse(urlStr)
if err != nil {
return false
}

for _, scheme := range validSchemes {
if parsedURL.Scheme == scheme {
return true
Expand Down
1 change: 1 addition & 0 deletions node/pkg/node/url_verification_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestValidateURL(t *testing.T) {
{[]string{""}, "example.com:8080", true},
{[]string{""}, "http://invalid-scheme:8080", false},
{[]string{""}, "ws://invalid-scheme:8080", false},
{[]string{""}, "170.0.0.1:8080", true},
}

for _, test := range tests {
Expand Down
Loading