diff options
| -rw-r--r-- | cmd/sigsum_log_go/main.go | 2 | ||||
| -rw-r--r-- | internal/mocks/dns/dns.go (renamed from pkg/dns/mocks/dns.go) | 6 | ||||
| -rw-r--r-- | pkg/dns/dns.go | 39 | ||||
| -rw-r--r-- | pkg/instance/handler_test.go | 2 | ||||
| -rw-r--r-- | pkg/instance/instance.go | 2 |
5 files changed, 6 insertions, 45 deletions
diff --git a/cmd/sigsum_log_go/main.go b/cmd/sigsum_log_go/main.go index 042c2df..356726a 100644 --- a/cmd/sigsum_log_go/main.go +++ b/cmd/sigsum_log_go/main.go @@ -22,8 +22,8 @@ import ( "google.golang.org/grpc" "git.sigsum.org/sigsum-go/pkg/types" + "git.sigsum.org/sigsum-go/pkg/dns" "git.sigsum.org/log-go/pkg/db" - "git.sigsum.org/log-go/pkg/dns" "git.sigsum.org/log-go/pkg/instance" "git.sigsum.org/log-go/pkg/state" ) diff --git a/pkg/dns/mocks/dns.go b/internal/mocks/dns/dns.go index 27a32cf..0cc45fc 100644 --- a/pkg/dns/mocks/dns.go +++ b/internal/mocks/dns/dns.go @@ -1,8 +1,8 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.sigsum.org/sigsum-log-go/pkg/dns (interfaces: Verifier) +// Source: git.sigsum.org/sigsum-go/pkg/dns (interfaces: Verifier) -// Package mocks is a generated GoMock package. -package mocks +// Package dns is a generated GoMock package. +package dns import ( context "context" diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go deleted file mode 100644 index 5baccc3..0000000 --- a/pkg/dns/dns.go +++ /dev/null @@ -1,39 +0,0 @@ -package dns - -import ( - "context" - "fmt" - "net" - - "git.sigsum.org/sigsum-go/pkg/hex" - "git.sigsum.org/sigsum-go/pkg/types" -) - -// Verifier can verify that a domain name is aware of a public key -type Verifier interface { - Verify(ctx context.Context, name string, key *types.PublicKey) error -} - -// DefaultResolver implements the Verifier interface with Go's default resolver -type DefaultResolver struct { - resolver net.Resolver -} - -func NewDefaultResolver() Verifier { - return &DefaultResolver{} -} - -func (dr *DefaultResolver) Verify(ctx context.Context, name string, key *types.PublicKey) error { - rsp, err := dr.resolver.LookupTXT(ctx, name) - if err != nil { - return fmt.Errorf("domain name look-up failed: %v", err) - } - - want := hex.Serialize(types.HashFn(key[:])[:]) - for _, got := range rsp { - if got == want { - return nil - } - } - return fmt.Errorf("%q is not aware of key hash %q", name, want) -} diff --git a/pkg/instance/handler_test.go b/pkg/instance/handler_test.go index ab429ae..c7539b7 100644 --- a/pkg/instance/handler_test.go +++ b/pkg/instance/handler_test.go @@ -13,7 +13,7 @@ import ( "time" mocksDB "git.sigsum.org/log-go/pkg/db/mocks" - mocksDNS "git.sigsum.org/log-go/pkg/dns/mocks" + mocksDNS "git.sigsum.org/log-go/internal/mocks/dns" mocksState "git.sigsum.org/log-go/pkg/state/mocks" "git.sigsum.org/sigsum-go/pkg/types" "github.com/golang/mock/gomock" diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index 4d7582a..7f84bbb 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -8,8 +8,8 @@ import ( "time" "git.sigsum.org/log-go/pkg/db" - "git.sigsum.org/log-go/pkg/dns" "git.sigsum.org/log-go/pkg/state" + "git.sigsum.org/sigsum-go/pkg/dns" "git.sigsum.org/sigsum-go/pkg/requests" "git.sigsum.org/sigsum-go/pkg/types" ) |