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.

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

Add validation for twin relays #935

Merged
merged 1 commit into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions tools/relay-cache-warmer/graphql.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"encoding/json"
"fmt"
"io"
"net"
"net/http"
"strconv"
"strings"
Expand Down Expand Up @@ -82,6 +83,7 @@ func warmTwins(pool *redis.Pool, graphql string) error {
if err != nil {
return err
}
invalidateTwins(gtwins)
twins, err := graphqlTwinsToRelayTwins(gtwins)
if err != nil {
return err
Expand All @@ -101,6 +103,40 @@ func warmTwins(pool *redis.Pool, graphql string) error {
return nil
}

func invalidateTwins(twins []graphqlTwin) {
for i, twin := range twins {
if twin.Relay == nil {
continue
}
if !validRelay(*twin.Relay) {
twins[i].Relay = nil
}
}
}

func validRelay(relay string) bool {
if len(relay) == 0 {
return false
}
relays := strings.Split(relay, "_")
for _, relay := range relays {
// it can't be an ip
if ip := net.ParseIP(relay); ip != nil {
return false
}
if !strings.Contains(relay, ".") {
return false
}
parts := strings.Split(relay, ".")
for _, part := range parts {
if len(part) == 0 {
return false
}
}
}
return true
}

func queryGraphql(graphql, body string) (paginationData, []graphqlTwin, error) {
bodyBytes, err := json.Marshal(map[string]interface{}{"query": body})
if err != nil {
Expand Down
56 changes: 56 additions & 0 deletions tools/relay-cache-warmer/graphql_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package main

import (
"reflect"
"testing"
)

func TestInvalidateTwins(t *testing.T) {
twins := []graphqlTwin{
{
Relay: nil,
},
{
Relay: strPointer("192.168.1.1"),
},
{
Relay: strPointer("invalid"),
},
{
Relay: strPointer(".."),
},
{
Relay: strPointer("::1_302:9e63:7d43:b742:2442:f506:5aa4:d5c5"),
},
{
Relay: strPointer("example.com_relay.grid.tf_relay.bknd1.ninja.com_relay.02.grid.tf"),
},
}
expected := []graphqlTwin{
{
Relay: nil,
},
{
Relay: nil,
},
{
Relay: nil,
},
{
Relay: nil,
},
{
Relay: nil,
},
{
Relay: strPointer("example.com_relay.grid.tf_relay.bknd1.ninja.com_relay.02.grid.tf"),
},
}
invalidateTwins(twins)
if !reflect.DeepEqual(twins, expected) {
t.Fatalf("expected %+v got %+v", expected, twins)
}
}
func strPointer(s string) *string {
return &s
}
Loading