-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support dig format for resolver (#47)
* support dig format for resolver * fix comment
- Loading branch information
Showing
12 changed files
with
198 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package lib | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "golang.org/x/exp/slices" | ||
| ) | ||
|
|
||
| type TargetQuery struct { | ||
| Target string | ||
| From string | ||
| Resolver string | ||
| } | ||
|
|
||
| var commandsWithResolver = []string{ | ||
| "dns", | ||
| "http", | ||
| } | ||
|
|
||
| func ParseTargetQuery(cmd string, args []string) (*TargetQuery, error) { | ||
| targetQuery := &TargetQuery{} | ||
| if len(args) == 0 { | ||
| return nil, errors.New("provided target is empty") | ||
| } | ||
|
|
||
| resolver, argsWithoutResolver := findAndRemoveResolver(args) | ||
| if resolver != "" { | ||
| // resolver was found | ||
| if !slices.Contains(commandsWithResolver, cmd) { | ||
| return nil, fmt.Errorf("command %s does not accept a resolver argument. @%s was provided", cmd, resolver) | ||
| } | ||
|
|
||
| targetQuery.Resolver = resolver | ||
| } | ||
|
|
||
| targetQuery.Target = argsWithoutResolver[0] | ||
|
|
||
| if len(argsWithoutResolver) > 1 { | ||
| if argsWithoutResolver[1] == "from" { | ||
| targetQuery.From = strings.TrimSpace(strings.Join(argsWithoutResolver[2:], " ")) | ||
| } else { | ||
| return nil, errors.New("invalid command format") | ||
| } | ||
| } | ||
|
|
||
| return targetQuery, nil | ||
| } | ||
|
|
||
| func findAndRemoveResolver(args []string) (string, []string) { | ||
| var resolver string | ||
| resolverIndex := -1 | ||
| for i := 0; i < len(args); i++ { | ||
| if len(args[i]) > 0 && args[i][0] == '@' { | ||
| resolver = args[i][1:] | ||
| resolverIndex = i | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if resolverIndex == -1 { | ||
| // resolver was not found | ||
| return "", args | ||
| } | ||
|
|
||
| argsClone := slices.Clone(args) | ||
| argsWithoutResolver := slices.Delete(argsClone, resolverIndex, resolverIndex+1) | ||
|
|
||
| return resolver, argsWithoutResolver | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package lib | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestParseTargetQuery_Simple(t *testing.T) { | ||
| cmd := "ping" | ||
| args := []string{"example.com"} | ||
|
|
||
| q, err := ParseTargetQuery(cmd, args) | ||
| assert.NoError(t, err) | ||
|
|
||
| assert.Equal(t, TargetQuery{Target: "example.com", From: ""}, *q) | ||
| } | ||
|
|
||
| func TestParseTargetQuery_SimpleWithResolver(t *testing.T) { | ||
| cmd := "dns" | ||
| args := []string{"example.com", "@1.1.1.1"} | ||
|
|
||
| q, err := ParseTargetQuery(cmd, args) | ||
| assert.NoError(t, err) | ||
|
|
||
| assert.Equal(t, TargetQuery{Target: "example.com", From: "", Resolver: "1.1.1.1"}, *q) | ||
| } | ||
|
|
||
| func TestParseTargetQuery_ResolverNotAllowed(t *testing.T) { | ||
| cmd := "ping" | ||
| args := []string{"example.com", "@1.1.1.1"} | ||
|
|
||
| _, err := ParseTargetQuery(cmd, args) | ||
| assert.ErrorContains(t, err, "does not accept a resolver argument") | ||
| } | ||
|
|
||
| func TestParseTargetQuery_TargetFromX(t *testing.T) { | ||
| cmd := "ping" | ||
| args := []string{"example.com", "from", "London"} | ||
|
|
||
| q, err := ParseTargetQuery(cmd, args) | ||
| assert.NoError(t, err) | ||
|
|
||
| assert.Equal(t, TargetQuery{Target: "example.com", From: "London"}, *q) | ||
| } | ||
|
|
||
| func TestParseTargetQuery_TargetFromXWithResolver(t *testing.T) { | ||
| cmd := "http" | ||
| args := []string{"example.com", "from", "London", "@1.1.1.1"} | ||
|
|
||
| q, err := ParseTargetQuery(cmd, args) | ||
| assert.NoError(t, err) | ||
|
|
||
| assert.Equal(t, TargetQuery{Target: "example.com", From: "London", Resolver: "1.1.1.1"}, *q) | ||
| } | ||
|
|
||
| func TestFindAndRemoveResolver_SimpleNoResolver(t *testing.T) { | ||
| args := []string{"example.com"} | ||
|
|
||
| resolver, argsWithoutResolver := findAndRemoveResolver(args) | ||
|
|
||
| assert.Equal(t, "", resolver) | ||
| assert.Equal(t, args, argsWithoutResolver) | ||
| } | ||
|
|
||
| func TestFindAndRemoveResolver_NoResolver(t *testing.T) { | ||
| args := []string{"example.com", "from", "London"} | ||
|
|
||
| resolver, argsWithoutResolver := findAndRemoveResolver(args) | ||
|
|
||
| assert.Equal(t, "", resolver) | ||
| assert.Equal(t, args, argsWithoutResolver) | ||
| } | ||
|
|
||
| func TestFindAndRemoveResolver_ResolverAndFrom(t *testing.T) { | ||
| args := []string{"example.com", "@1.1.1.1", "from", "London"} | ||
|
|
||
| resolver, argsWithoutResolver := findAndRemoveResolver(args) | ||
|
|
||
| assert.Equal(t, "1.1.1.1", resolver) | ||
| assert.Equal(t, []string{"example.com", "from", "London"}, argsWithoutResolver) | ||
| } | ||
|
|
||
| func TestFindAndRemoveResolver_ResolverOnly(t *testing.T) { | ||
| args := []string{"example.com", "@1.1.1.1"} | ||
|
|
||
| resolver, argsWithoutResolver := findAndRemoveResolver(args) | ||
|
|
||
| assert.Equal(t, "1.1.1.1", resolver) | ||
| assert.Equal(t, []string{"example.com"}, argsWithoutResolver) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters