mirror of https://github.com/docker/cli.git
Move notary to its new location
The https://github.com/docker/notary repository has moved to https://github.com/theupdateframework/notary Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
0c4fa699eb
commit
6cd58063fa
|
@ -18,11 +18,11 @@ import (
|
||||||
"github.com/docker/docker/client"
|
"github.com/docker/docker/client"
|
||||||
"github.com/docker/go-connections/sockets"
|
"github.com/docker/go-connections/sockets"
|
||||||
"github.com/docker/go-connections/tlsconfig"
|
"github.com/docker/go-connections/tlsconfig"
|
||||||
"github.com/docker/notary"
|
|
||||||
notaryclient "github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
notaryclient "github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -14,11 +14,11 @@ import (
|
||||||
registrytypes "github.com/docker/docker/api/types/registry"
|
registrytypes "github.com/docker/docker/api/types/registry"
|
||||||
"github.com/docker/docker/pkg/jsonmessage"
|
"github.com/docker/docker/pkg/jsonmessage"
|
||||||
"github.com/docker/docker/registry"
|
"github.com/docker/docker/registry"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -8,11 +8,11 @@ import (
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
registrytypes "github.com/docker/docker/api/types/registry"
|
registrytypes "github.com/docker/docker/api/types/registry"
|
||||||
"github.com/docker/docker/registry"
|
"github.com/docker/docker/registry"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/docker/notary/trustpinning"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
)
|
)
|
||||||
|
|
||||||
func unsetENV() {
|
func unsetENV() {
|
||||||
|
|
|
@ -8,10 +8,10 @@ import (
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/docker/docker/api/types/swarm"
|
"github.com/docker/docker/api/types/swarm"
|
||||||
"github.com/docker/docker/registry"
|
"github.com/docker/docker/registry"
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/opencontainers/go-digest"
|
"github.com/opencontainers/go-digest"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -2,14 +2,14 @@ package trust
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary/client"
|
"github.com/theupdateframework/notary/client"
|
||||||
"github.com/docker/notary/client/changelist"
|
"github.com/theupdateframework/notary/client/changelist"
|
||||||
"github.com/docker/notary/cryptoservice"
|
"github.com/theupdateframework/notary/cryptoservice"
|
||||||
"github.com/docker/notary/passphrase"
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
"github.com/docker/notary/storage"
|
"github.com/theupdateframework/notary/storage"
|
||||||
"github.com/docker/notary/trustmanager"
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"github.com/docker/notary/tuf/signed"
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Sample mock CLI interfaces
|
// Sample mock CLI interfaces
|
||||||
|
|
|
@ -4,8 +4,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary/client"
|
"github.com/theupdateframework/notary/client"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
const releasedRoleName = "Repo Admin"
|
const releasedRoleName = "Repo Admin"
|
||||||
|
|
|
@ -5,9 +5,9 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/docker/notary/client"
|
"github.com/theupdateframework/notary/client"
|
||||||
"github.com/docker/notary/passphrase"
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
"github.com/docker/notary/trustpinning"
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
|
@ -12,12 +12,12 @@ import (
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
tufutils "github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
tufutils "github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type keyGenerateOptions struct {
|
type keyGenerateOptions struct {
|
||||||
|
|
|
@ -11,11 +11,11 @@ import (
|
||||||
"github.com/docker/cli/cli/config"
|
"github.com/docker/cli/cli/config"
|
||||||
"github.com/docker/cli/internal/test"
|
"github.com/docker/cli/internal/test"
|
||||||
"github.com/docker/cli/internal/test/testutil"
|
"github.com/docker/cli/internal/test/testutil"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
tufutils "github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
tufutils "github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTrustKeyGenerateErrors(t *testing.T) {
|
func TestTrustKeyGenerateErrors(t *testing.T) {
|
||||||
|
|
|
@ -10,12 +10,12 @@ import (
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
tufutils "github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
tufutils "github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
|
@ -11,12 +11,12 @@ import (
|
||||||
"github.com/docker/cli/cli/config"
|
"github.com/docker/cli/cli/config"
|
||||||
"github.com/docker/cli/internal/test"
|
"github.com/docker/cli/internal/test"
|
||||||
"github.com/docker/cli/internal/test/testutil"
|
"github.com/docker/cli/internal/test/testutil"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
tufutils "github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
|
"github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
tufutils "github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTrustKeyLoadErrors(t *testing.T) {
|
func TestTrustKeyLoadErrors(t *testing.T) {
|
||||||
|
|
|
@ -9,10 +9,10 @@ import (
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/command/image"
|
"github.com/docker/cli/cli/command/image"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
type revokeOptions struct {
|
type revokeOptions struct {
|
||||||
|
|
|
@ -7,11 +7,11 @@ import (
|
||||||
|
|
||||||
"github.com/docker/cli/internal/test"
|
"github.com/docker/cli/internal/test"
|
||||||
"github.com/docker/cli/internal/test/testutil"
|
"github.com/docker/cli/internal/test/testutil"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/docker/notary/trustpinning"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTrustRevokeCommandErrors(t *testing.T) {
|
func TestTrustRevokeCommandErrors(t *testing.T) {
|
||||||
|
|
|
@ -12,10 +12,10 @@ import (
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/command/image"
|
"github.com/docker/cli/cli/command/image"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newSignCommand(dockerCli command.Cli) *cobra.Command {
|
func newSignCommand(dockerCli command.Cli) *cobra.Command {
|
||||||
|
|
|
@ -12,14 +12,14 @@ import (
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/cli/internal/test"
|
"github.com/docker/cli/internal/test"
|
||||||
"github.com/docker/cli/internal/test/testutil"
|
"github.com/docker/cli/internal/test/testutil"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/client/changelist"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/docker/notary/trustpinning"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/client/changelist"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
const passwd = "password"
|
const passwd = "password"
|
||||||
|
|
|
@ -15,11 +15,11 @@ import (
|
||||||
"github.com/docker/cli/cli/command/image"
|
"github.com/docker/cli/cli/command/image"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/cli/opts"
|
"github.com/docker/cli/opts"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
tufutils "github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
tufutils "github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type signerAddOptions struct {
|
type signerAddOptions struct {
|
||||||
|
|
|
@ -10,8 +10,8 @@ import (
|
||||||
"github.com/docker/cli/cli/config"
|
"github.com/docker/cli/cli/config"
|
||||||
"github.com/docker/cli/internal/test"
|
"github.com/docker/cli/internal/test"
|
||||||
"github.com/docker/cli/internal/test/testutil"
|
"github.com/docker/cli/internal/test/testutil"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTrustSignerAddErrors(t *testing.T) {
|
func TestTrustSignerAddErrors(t *testing.T) {
|
||||||
|
|
|
@ -10,10 +10,10 @@ import (
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/command/image"
|
"github.com/docker/cli/cli/command/image"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
type signerRemoveOptions struct {
|
type signerRemoveOptions struct {
|
||||||
|
|
|
@ -6,9 +6,9 @@ import (
|
||||||
|
|
||||||
"github.com/docker/cli/internal/test"
|
"github.com/docker/cli/internal/test"
|
||||||
"github.com/docker/cli/internal/test/testutil"
|
"github.com/docker/cli/internal/test/testutil"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTrustSignerRemoveErrors(t *testing.T) {
|
func TestTrustSignerRemoveErrors(t *testing.T) {
|
||||||
|
|
|
@ -13,11 +13,11 @@ import (
|
||||||
"github.com/docker/cli/cli/command/formatter"
|
"github.com/docker/cli/cli/command/formatter"
|
||||||
"github.com/docker/cli/cli/command/image"
|
"github.com/docker/cli/cli/command/image"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// trustTagKey represents a unique signed tag and hex-encoded hash pair
|
// trustTagKey represents a unique signed tag and hex-encoded hash pair
|
||||||
|
|
|
@ -9,11 +9,11 @@ import (
|
||||||
"github.com/docker/cli/internal/test"
|
"github.com/docker/cli/internal/test"
|
||||||
"github.com/docker/cli/internal/test/testutil"
|
"github.com/docker/cli/internal/test/testutil"
|
||||||
dockerClient "github.com/docker/docker/client"
|
dockerClient "github.com/docker/docker/client"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/gotestyourself/gotestyourself/golden"
|
"github.com/gotestyourself/gotestyourself/golden"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
type fakeClient struct {
|
type fakeClient struct {
|
||||||
|
|
|
@ -20,17 +20,17 @@ import (
|
||||||
registrytypes "github.com/docker/docker/api/types/registry"
|
registrytypes "github.com/docker/docker/api/types/registry"
|
||||||
"github.com/docker/docker/registry"
|
"github.com/docker/docker/registry"
|
||||||
"github.com/docker/go-connections/tlsconfig"
|
"github.com/docker/go-connections/tlsconfig"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
"github.com/docker/notary/trustpinning"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/signed"
|
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
|
"github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -6,12 +6,12 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/docker/notary/client"
|
|
||||||
"github.com/docker/notary/passphrase"
|
|
||||||
"github.com/docker/notary/trustpinning"
|
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
"github.com/theupdateframework/notary/client"
|
||||||
|
"github.com/theupdateframework/notary/passphrase"
|
||||||
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGetTag(t *testing.T) {
|
func TestGetTag(t *testing.T) {
|
||||||
|
|
|
@ -11,7 +11,7 @@ import (
|
||||||
"github.com/docker/cli/cli/config/configfile"
|
"github.com/docker/cli/cli/config/configfile"
|
||||||
"github.com/docker/cli/cli/trust"
|
"github.com/docker/cli/cli/trust"
|
||||||
"github.com/docker/docker/client"
|
"github.com/docker/docker/client"
|
||||||
notaryclient "github.com/docker/notary/client"
|
notaryclient "github.com/theupdateframework/notary/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
type notaryClientFuncType func(imgRefAndAuth trust.ImageRefAndAuth, actions []string) (notaryclient.Repository, error)
|
type notaryClientFuncType func(imgRefAndAuth trust.ImageRefAndAuth, actions []string) (notaryclient.Repository, error)
|
||||||
|
|
|
@ -14,7 +14,6 @@ github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06
|
||||||
github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d
|
github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d
|
||||||
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
|
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
|
||||||
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
|
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
|
||||||
github.com/docker/notary 5d55a30c1bec010a8c6df4c09889acfb4e0a7942
|
|
||||||
github.com/docker/swarmkit 872861d2ae46958af7ead1d5fffb092c73afbaf0
|
github.com/docker/swarmkit 872861d2ae46958af7ead1d5fffb092c73afbaf0
|
||||||
github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
|
github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
|
||||||
github.com/gogo/protobuf v0.4
|
github.com/gogo/protobuf v0.4
|
||||||
|
@ -40,6 +39,7 @@ github.com/sirupsen/logrus v1.0.3
|
||||||
github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
|
github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
|
||||||
github.com/spf13/pflag 97afa5e7ca8a08a383cb259e06636b5e2cc7897f
|
github.com/spf13/pflag 97afa5e7ca8a08a383cb259e06636b5e2cc7897f
|
||||||
github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
|
github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
|
||||||
|
github.com/theupdateframework/notary 05985dc5d1c71ee6c387e9cd276a00b9d424af53
|
||||||
github.com/tonistiigi/fsutil dea3a0da73aee887fc02142d995be764106ac5e2
|
github.com/tonistiigi/fsutil dea3a0da73aee887fc02142d995be764106ac5e2
|
||||||
github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
|
github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
|
||||||
github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45
|
github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45
|
||||||
|
|
|
@ -1,11 +1,22 @@
|
||||||
# Notary
|
<img src="docs/images/notary-blk.svg" alt="Notary" width="400px"/>
|
||||||
[![Circle CI](https://circleci.com/gh/docker/notary/tree/master.svg?style=shield)](https://circleci.com/gh/docker/notary/tree/master) [![CodeCov](https://codecov.io/github/docker/notary/coverage.svg?branch=master)](https://codecov.io/github/docker/notary) [![GoReportCard](https://goreportcard.com/badge/docker/notary)](https://goreportcard.com/report/github.com/docker/notary)
|
|
||||||
|
[![Circle CI](https://circleci.com/gh/theupdateframework/notary/tree/master.svg?style=shield)](https://circleci.com/gh/theupdateframework/notary/tree/master) [![CodeCov](https://codecov.io/github/theupdateframework/notary/coverage.svg?branch=master)](https://codecov.io/github/theupdateframework/notary) [![GoReportCard](https://goreportcard.com/badge/theupdateframework/notary)](https://goreportcard.com/report/github.com/theupdateframework/notary)
|
||||||
|
|
||||||
|
# Notice
|
||||||
|
|
||||||
|
The Notary project has officially been accepted in to the Cloud Native Computing Foundation (CNCF).
|
||||||
|
It has moved to https://github.com/theupdateframework/notary. Any downstream consumers should update
|
||||||
|
their Go imports to use this new location, which will be the canonical location going forward.
|
||||||
|
|
||||||
|
We have moved the repo in GitHub, which will allow existing importers to continue using the old
|
||||||
|
location via GitHub's redirect.
|
||||||
|
|
||||||
|
# Overview
|
||||||
|
|
||||||
The Notary project comprises a [server](cmd/notary-server) and a [client](cmd/notary) for running and interacting
|
The Notary project comprises a [server](cmd/notary-server) and a [client](cmd/notary) for running and interacting
|
||||||
with trusted collections. Please see the [service architecture](docs/service_architecture.md) documentation
|
with trusted collections. Please see the [service architecture](docs/service_architecture.md) documentation
|
||||||
for more information.
|
for more information.
|
||||||
|
|
||||||
|
|
||||||
Notary aims to make the internet more secure by making it easy for people to
|
Notary aims to make the internet more secure by making it easy for people to
|
||||||
publish and verify content. We often rely on TLS to secure our communications
|
publish and verify content. We often rely on TLS to secure our communications
|
||||||
with a web server which is inherently flawed, as any compromise of the server
|
with a web server which is inherently flawed, as any compromise of the server
|
||||||
|
@ -41,7 +52,7 @@ Any security vulnerabilities can be reported to security@docker.com.
|
||||||
|
|
||||||
# Getting started with the Notary CLI
|
# Getting started with the Notary CLI
|
||||||
|
|
||||||
Please get the Notary Client CLI binary from [the official releases page](https://github.com/docker/notary/releases) or you can [build one yourself](#building-notary).
|
Please get the Notary Client CLI binary from [the official releases page](https://github.com/theupdateframework/notary/releases) or you can [build one yourself](#building-notary).
|
||||||
The version of Notary server and signer should be greater than or equal to Notary CLI's version to ensure feature compatibility (ex: CLI version 0.2, server/signer version >= 0.2), and all official releases are associated with GitHub tags.
|
The version of Notary server and signer should be greater than or equal to Notary CLI's version to ensure feature compatibility (ex: CLI version 0.2, server/signer version >= 0.2), and all official releases are associated with GitHub tags.
|
||||||
|
|
||||||
To use the Notary CLI with Docker hub images, please have a look at our
|
To use the Notary CLI with Docker hub images, please have a look at our
|
||||||
|
@ -53,7 +64,7 @@ For more advanced usage, please see the
|
||||||
To use the CLI against a local Notary server rather than against Docker Hub:
|
To use the CLI against a local Notary server rather than against Docker Hub:
|
||||||
|
|
||||||
1. Please ensure that you have [docker and docker-compose](http://docs.docker.com/compose/install/) installed.
|
1. Please ensure that you have [docker and docker-compose](http://docs.docker.com/compose/install/) installed.
|
||||||
1. `git clone https://github.com/docker/notary.git` and from the cloned repository path,
|
1. `git clone https://github.com/theupdateframework/notary.git` and from the cloned repository path,
|
||||||
start up a local Notary server and signer and copy the config file and testing certs to your
|
start up a local Notary server and signer and copy the config file and testing certs to your
|
||||||
local notary config directory:
|
local notary config directory:
|
||||||
|
|
||||||
|
@ -78,8 +89,8 @@ to use `notary` with Docker images.
|
||||||
|
|
||||||
## Building Notary
|
## Building Notary
|
||||||
|
|
||||||
Note that our [latest stable release](https://github.com/docker/notary/releases) is at the head of the
|
Note that our [latest stable release](https://github.com/theupdateframework/notary/releases) is at the head of the
|
||||||
[releases branch](https://github.com/docker/notary/tree/releases). The master branch is the development
|
[releases branch](https://github.com/theupdateframework/notary/tree/releases). The master branch is the development
|
||||||
branch and contains features for the next release.
|
branch and contains features for the next release.
|
||||||
|
|
||||||
Prerequisites:
|
Prerequisites:
|
||||||
|
@ -102,4 +113,4 @@ $GOPATH/
|
||||||
notary/
|
notary/
|
||||||
```
|
```
|
||||||
|
|
||||||
To build the server and signer, please run `docker-compose build`.
|
To build the server and signer, please run `docker-compose build`.
|
|
@ -1,7 +1,7 @@
|
||||||
package changelist
|
package changelist
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Scopes for TUFChanges are simply the TUF roles.
|
// Scopes for TUFChanges are simply the TUF roles.
|
|
@ -1,6 +1,6 @@
|
||||||
package changelist
|
package changelist
|
||||||
|
|
||||||
import "github.com/docker/notary/tuf/data"
|
import "github.com/theupdateframework/notary/tuf/data"
|
||||||
|
|
||||||
// Changelist is the interface for all TUF change lists
|
// Changelist is the interface for all TUF change lists
|
||||||
type Changelist interface {
|
type Changelist interface {
|
|
@ -17,9 +17,9 @@ Use this package by creating a new repository object and calling methods on it.
|
||||||
"github.com/docker/distribution/registry/client/auth"
|
"github.com/docker/distribution/registry/client/auth"
|
||||||
"github.com/docker/distribution/registry/client/auth/challenge"
|
"github.com/docker/distribution/registry/client/auth/challenge"
|
||||||
"github.com/docker/distribution/registry/client/transport"
|
"github.com/docker/distribution/registry/client/transport"
|
||||||
notary "github.com/docker/notary/client"
|
notary "github.com/theupdateframework/notary/client"
|
||||||
"github.com/docker/notary/trustpinning"
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
@ -98,16 +98,16 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
canonicaljson "github.com/docker/go/canonical/json"
|
canonicaljson "github.com/docker/go/canonical/json"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/client/changelist"
|
|
||||||
"github.com/docker/notary/cryptoservice"
|
|
||||||
store "github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/trustpinning"
|
|
||||||
"github.com/docker/notary/tuf"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/signed"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/client/changelist"
|
||||||
|
"github.com/theupdateframework/notary/cryptoservice"
|
||||||
|
store "github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
|
"github.com/theupdateframework/notary/tuf"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
|
@ -4,12 +4,12 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/client/changelist"
|
|
||||||
store "github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/client/changelist"
|
||||||
|
store "github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// AddDelegation creates changelist entries to add provided delegation public keys and paths.
|
// AddDelegation creates changelist entries to add provided delegation public keys and paths.
|
|
@ -3,7 +3,7 @@ package client
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrRepoNotInitialized is returned when trying to publish an uninitialized
|
// ErrRepoNotInitialized is returned when trying to publish an uninitialized
|
|
@ -6,13 +6,13 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/notary/client/changelist"
|
|
||||||
store "github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/tuf"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/signed"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/client/changelist"
|
||||||
|
store "github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/tuf"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Use this to initialize remote HTTPStores from the config settings
|
// Use this to initialize remote HTTPStores from the config settings
|
|
@ -1,9 +1,9 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/notary/client/changelist"
|
"github.com/theupdateframework/notary/client/changelist"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"github.com/docker/notary/tuf/signed"
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Repository represents the set of options that must be supported over a TUF repo.
|
// Repository represents the set of options that must be supported over a TUF repo.
|
|
@ -5,8 +5,8 @@ package client
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
"github.com/theupdateframework/notary"
|
||||||
"github.com/docker/notary/trustmanager"
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
)
|
)
|
||||||
|
|
||||||
func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {
|
func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {
|
|
@ -5,9 +5,9 @@ package client
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
"github.com/theupdateframework/notary"
|
||||||
"github.com/docker/notary/trustmanager"
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
"github.com/docker/notary/trustmanager/yubikey"
|
"github.com/theupdateframework/notary/trustmanager/yubikey"
|
||||||
)
|
)
|
||||||
|
|
||||||
func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {
|
func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {
|
|
@ -4,13 +4,13 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
store "github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/trustpinning"
|
|
||||||
"github.com/docker/notary/tuf"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/signed"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
store "github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
|
"github.com/theupdateframework/notary/tuf"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
)
|
)
|
||||||
|
|
||||||
// tufClient is a usability wrapper around a raw TUF repo
|
// tufClient is a usability wrapper around a raw TUF repo
|
|
@ -1,9 +1,9 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/notary/client/changelist"
|
"github.com/theupdateframework/notary/client/changelist"
|
||||||
"github.com/docker/notary/tuf"
|
"github.com/theupdateframework/notary/tuf"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Witness creates change objects to witness (i.e. re-sign) the given
|
// Witness creates change objects to witness (i.e. re-sign) the given
|
|
@ -7,8 +7,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"github.com/docker/notary/tuf/utils"
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GenerateCertificate generates an X509 Certificate from a template, given a GUN and validity interval
|
// GenerateCertificate generates an X509 Certificate from a template, given a GUN and validity interval
|
|
@ -6,11 +6,11 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
|
@ -11,7 +11,7 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
"github.com/theupdateframework/notary"
|
||||||
"golang.org/x/crypto/ssh/terminal"
|
"golang.org/x/crypto/ssh/terminal"
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,8 +10,8 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewFileStore creates a fully configurable file store
|
// NewFileStore creates a fully configurable file store
|
|
@ -3,7 +3,7 @@
|
||||||
// - Response bodies for error codes should be unmarshallable as:
|
// - Response bodies for error codes should be unmarshallable as:
|
||||||
// {"errors": [{..., "detail": <serialized validation error>}]}
|
// {"errors": [{..., "detail": <serialized validation error>}]}
|
||||||
// else validation error details, etc. will be unparsable. The errors
|
// else validation error details, etc. will be unparsable. The errors
|
||||||
// should have a github.com/docker/notary/tuf/validation/SerializableError
|
// should have a github.com/theupdateframework/notary/tuf/validation/SerializableError
|
||||||
// in the Details field.
|
// in the Details field.
|
||||||
// If writing your own server, please have a look at
|
// If writing your own server, please have a look at
|
||||||
// github.com/docker/distribution/registry/api/errcode
|
// github.com/docker/distribution/registry/api/errcode
|
||||||
|
@ -22,10 +22,10 @@ import (
|
||||||
"net/url"
|
"net/url"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/validation"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/validation"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
|
@ -1,7 +1,7 @@
|
||||||
package storage
|
package storage
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NoSizeLimit is represented as -1 for arguments to GetMeta
|
// NoSizeLimit is represented as -1 for arguments to GetMeta
|
|
@ -5,9 +5,9 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
"github.com/theupdateframework/notary"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"github.com/docker/notary/tuf/utils"
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewMemoryStore returns a MetadataStore that operates entirely in memory.
|
// NewMemoryStore returns a MetadataStore that operates entirely in memory.
|
|
@ -1,7 +1,7 @@
|
||||||
package storage
|
package storage
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrOffline is used to indicate we are operating offline
|
// ErrOffline is used to indicate we are operating offline
|
|
@ -1,7 +1,7 @@
|
||||||
package trustmanager
|
package trustmanager
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Storage implements the bare bones primitives (no hierarchy)
|
// Storage implements the bare bones primitives (no hierarchy)
|
|
@ -9,10 +9,10 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
tufdata "github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
tufdata "github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Exporter is a simple interface for the two functions we need from the Storage interface
|
// Exporter is a simple interface for the two functions we need from the Storage interface
|
|
@ -6,11 +6,11 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
store "github.com/docker/notary/storage"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
store "github.com/theupdateframework/notary/storage"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type keyInfoMap map[string]KeyInfo
|
type keyInfoMap map[string]KeyInfo
|
|
@ -6,10 +6,10 @@ import (
|
||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
"github.com/theupdateframework/notary"
|
||||||
"github.com/docker/notary/trustmanager"
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"github.com/docker/notary/tuf/utils"
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// YubiImport is a wrapper around the YubiStore that allows us to import private
|
// YubiImport is a wrapper around the YubiStore that allows us to import private
|
|
@ -16,13 +16,13 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/signed"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/miekg/pkcs11"
|
"github.com/miekg/pkcs11"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
|
@ -6,10 +6,10 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/signed"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
const wildcard = "*"
|
const wildcard = "*"
|
|
@ -5,9 +5,9 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TrustPinConfig represents the configuration under the trust_pinning section of the config file
|
// TrustPinConfig represents the configuration under the trust_pinning section of the config file
|
|
@ -4,12 +4,12 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/go/canonical/json"
|
"github.com/docker/go/canonical/json"
|
||||||
"github.com/docker/notary"
|
"github.com/theupdateframework/notary"
|
||||||
|
|
||||||
"github.com/docker/notary/trustpinning"
|
"github.com/theupdateframework/notary/trustpinning"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"github.com/docker/notary/tuf/signed"
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
"github.com/docker/notary/tuf/utils"
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrBuildDone is returned when any functions are called on RepoBuilder, and it
|
// ErrBuildDone is returned when any functions are called on RepoBuilder, and it
|
|
@ -5,8 +5,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/go/canonical/json"
|
"github.com/docker/go/canonical/json"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SignedSnapshot is a fully unpacked snapshot.json
|
// SignedSnapshot is a fully unpacked snapshot.json
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/go/canonical/json"
|
"github.com/docker/go/canonical/json"
|
||||||
"github.com/docker/notary"
|
"github.com/theupdateframework/notary"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SignedTimestamp is a fully unpacked timestamp.json
|
// SignedTimestamp is a fully unpacked timestamp.json
|
|
@ -15,8 +15,8 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/go/canonical/json"
|
"github.com/docker/go/canonical/json"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GUN is a Globally Unique Name. It is used to identify trust collections.
|
// GUN is a Globally Unique Name. It is used to identify trust collections.
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/docker/notary/trustmanager"
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
"github.com/docker/notary/tuf/utils"
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type edCryptoKey struct {
|
type edCryptoKey struct {
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrInsufficientSignatures - can not create enough signatures on a piece of
|
// ErrInsufficientSignatures - can not create enough signatures on a piece of
|
|
@ -1,6 +1,6 @@
|
||||||
package signed
|
package signed
|
||||||
|
|
||||||
import "github.com/docker/notary/tuf/data"
|
import "github.com/theupdateframework/notary/tuf/data"
|
||||||
|
|
||||||
// KeyService provides management of keys locally. It will never
|
// KeyService provides management of keys locally. It will never
|
||||||
// accept or provide private keys. Communication between the KeyService
|
// accept or provide private keys. Communication between the KeyService
|
|
@ -14,10 +14,10 @@ package signed
|
||||||
import (
|
import (
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
|
|
||||||
"github.com/docker/notary/trustmanager"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/trustmanager"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Sign takes a data.Signed and a cryptoservice containing private keys,
|
// Sign takes a data.Signed and a cryptoservice containing private keys,
|
|
@ -11,8 +11,8 @@ import (
|
||||||
"math/big"
|
"math/big"
|
||||||
|
|
||||||
"github.com/agl/ed25519"
|
"github.com/agl/ed25519"
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
|
@ -7,9 +7,9 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/go/canonical/json"
|
"github.com/docker/go/canonical/json"
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Various basic signing errors
|
// Various basic signing errors
|
|
@ -8,11 +8,11 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/docker/notary/tuf/signed"
|
|
||||||
"github.com/docker/notary/tuf/utils"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
|
"github.com/theupdateframework/notary/tuf/signed"
|
||||||
|
"github.com/theupdateframework/notary/tuf/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrSigVerifyFail - signature verification failed
|
// ErrSigVerifyFail - signature verification failed
|
|
@ -48,7 +48,7 @@ import (
|
||||||
|
|
||||||
"golang.org/x/crypto/pbkdf2"
|
"golang.org/x/crypto/pbkdf2"
|
||||||
|
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Copy from crypto/x509
|
// Copy from crypto/x509
|
|
@ -7,7 +7,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"github.com/docker/notary/tuf/data"
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// StrSliceContains checks if the given string appears in the slice
|
// StrSliceContains checks if the given string appears in the slice
|
|
@ -17,9 +17,9 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/agl/ed25519"
|
"github.com/agl/ed25519"
|
||||||
"github.com/docker/notary"
|
|
||||||
"github.com/docker/notary/tuf/data"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/theupdateframework/notary"
|
||||||
|
"github.com/theupdateframework/notary/tuf/data"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CanonicalKeyID returns the ID of the public bytes version of a TUF key.
|
// CanonicalKeyID returns the ID of the public bytes version of a TUF key.
|
Loading…
Reference in New Issue