Skip to content

Guard empty RPC client admin flag #459

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
giwaov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard empty RPC client admin flag #459

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
2 changes: 1 addition & 1 deletion cmd/rpc/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ func (c *Client) heightIdAndPointsRequest(routeName string, height, id uint64, p

func (c *Client) url(routeName, param string, admin ...bool) string {
// if an admin call
if admin != nil && admin[0] {
if len(admin) > 0 && admin[0] {
return c.adminRpcUrl + routePaths[routeName].Path + param
}
// if non admin call
Expand Down
24 changes: 24 additions & 0 deletions cmd/rpc/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package rpc

import "testing"

func TestClientURLEmptyAdminFlag(t *testing.T) {
client := NewClient("http://query", "http://admin")
emptyAdmin := []bool{}

got := client.url(LogsRouteName, "", emptyAdmin...)
want := "http://query" + routePaths[LogsRouteName].Path
if got != want {
t.Fatalf("url with empty admin flag = %q, want %q", got, want)
}
}

func TestClientURLAdminFlag(t *testing.T) {
client := NewClient("http://query", "http://admin")

got := client.url(LogsRouteName, "", true)
want := "http://admin" + routePaths[LogsRouteName].Path
if got != want {
t.Fatalf("url with admin flag = %q, want %q", got, want)
}
}