notaryproject
/
notary
mirror of https://github.com/notaryproject/notary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating imports and paths for new notary location 

Signed-off-by: David Lawrence <dclwrnc@gmail.com> (github: endophage)
This commit is contained in:
David Lawrence 2017-10-26 11:17:37 -07:00
parent 2f476ffd5e
commit 332094e0c1
166 changed files with 577 additions and 577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -17,7 +17,7 @@ RUN useradd -ms /bin/bash notary \
&& pip install codecov \
&& go get github.com/golang/lint/golint github.com/fzipp/gocyclo github.com/client9/misspell/cmd/misspell github.com/gordonklaus/ineffassign github.com/HewlettPackard/gas
ENV NOTARYDIR /go/src/github.com/docker/notary
ENV NOTARYDIR /go/src/github.com/theupdateframework/notary
COPY . ${NOTARYDIR}
RUN chmod -R a+rw /go && chmod 0600 ${NOTARYDIR}/fixtures/database/*

6
Makefile
View File

@ -3,7 +3,7 @@ PREFIX?=$(shell pwd)
# Populate version variables
# Add to compile time flags
NOTARY_PKG := github.com/docker/notary
NOTARY_PKG := github.com/theupdateframework/notary
NOTARY_VERSION := $(shell cat NOTARY_VERSION)
GITCOMMIT := $(shell git rev-parse --short HEAD)
GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no)
@ -15,7 +15,7 @@ GO_LDFLAGS=-ldflags "-w $(CTIMEVAR)"
GO_LDFLAGS_STATIC=-ldflags "-w $(CTIMEVAR) -extldflags -static"
GOOSES = darwin linux windows
NOTARY_BUILDTAGS ?= pkcs11
NOTARYDIR := /go/src/github.com/docker/notary
NOTARYDIR := /go/src/github.com/theupdateframework/notary
GO_VERSION := $(shell go version | grep "1\.[7-9]\(\.[0-9]+\)*\|devel")
# check to make sure we have the right version. development versions of Go are
@ -164,7 +164,7 @@ ci: override TESTOPTS = -race
# Codecov knows how to merge multiple coverage files, so covmerge is not needed
ci: gen-cover
yubikey-tests: override PKGS = github.com/docker/notary/cmd/notary github.com/docker/notary/trustmanager/yubikey
yubikey-tests: override PKGS = github.com/theupdateframework/notary/cmd/notary github.com/theupdateframework/notary/trustmanager/yubikey
yubikey-tests: ci
covmerge:

10
README.md
View File

@ -1,6 +1,6 @@
<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/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/theupdateframework/notary)
# Notice
@ -52,7 +52,7 @@ Any security vulnerabilities can be reported to security@docker.com.
# 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.
To use the Notary CLI with Docker hub images, please have a look at our
@ -64,7 +64,7 @@ For more advanced usage, please see the
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. `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
local notary config directory:
@ -89,8 +89,8 @@ to use `notary` with Docker images.
## Building Notary
Note that our [latest stable release](https://github.com/docker/notary/releases) is at the head of the
[releases branch](https://github.com/docker/notary/tree/releases). The master branch is the development
Note that our [latest stable release](https://github.com/theupdateframework/notary/releases) is at the head of the
[releases branch](https://github.com/theupdateframework/notary/tree/releases). The master branch is the development
branch and contains features for the next release.
Prerequisites:

4
buildscripts/dbtests.sh
View File

@ -16,7 +16,7 @@ case ${db} in
postgresql*)
db="postgresql"
dbContainerOpts="--name postgresql_tests postgresql -l"
DBURL="postgres://server@postgresql_tests:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-server-key.pem"
DBURL="postgres://server@postgresql_tests:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server-key.pem"
;;
*)
echo "Usage: $0 (mysql|rethink)"
@ -57,5 +57,5 @@ trap cleanup SIGINT SIGTERM EXIT
docker-compose -p "${project}_${db}" -f "${composeFile}" run --no-deps -d ${dbContainerOpts}
docker-compose -p "${project}_${db}" -f "${composeFile}" run --no-deps \
-e NOTARY_BUILDTAGS="${db}db" -e DBURL="${DBURL}" \
-e PKGS="github.com/docker/notary/server/storage github.com/docker/notary/signer/keydbstore" \
-e PKGS="github.com/theupdateframework/notary/server/storage github.com/theupdateframework/notary/signer/keydbstore" \
client bash -c "${clientCmd}"

12
buildscripts/docker-integration-test.py
View File

@ -8,7 +8,7 @@ python docker-integration-test.py
This assumes that your docker directory is in $GOPATH/src/github.com/docker/docker
and your notary directory, irrespective of where this script is located, is
at $GOPATH/src/github.com/docker/notary.
at $GOPATH/src/github.com/theupdateframework/notary.
"""
from __future__ import print_function
import os
@ -31,7 +31,7 @@ def from_gopath(gopkg):
DOCKER_DIR = from_gopath("github.com/docker/docker")
NOTARY_DIR = from_gopath("github.com/docker/notary")
NOTARY_DIR = from_gopath("github.com/theupdateframework/notary")
def fake_vendor():
@ -40,7 +40,7 @@ def fake_vendor():
vendor directory - also appending several lines into the Dockerfile because
it pulls down notary from github and builds the binaries
"""
docker_notary_relpath = "vendor/src/github.com/docker/notary"
docker_notary_relpath = "vendor/src/github.com/theupdateframework/notary"
docker_notary_abspath = os.path.join(DOCKER_DIR, docker_notary_relpath)
print("copying notary ({0}) into {1}".format(NOTARY_DIR, docker_notary_abspath))
@ -66,8 +66,8 @@ def fake_vendor():
dockerfile_addition = ("\n"
"RUN set -x && "
"export GO15VENDOREXPERIMENT=1 && "
"go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server &&"
"go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary")
"go build -o /usr/local/bin/notary-server github.com/theupdateframework/notary/cmd/notary-server &&"
"go build -o /usr/local/bin/notary github.com/theupdateframework/notary/cmd/notary")
with open(os.path.join(DOCKER_DIR, "Dockerfile")) as dockerfile:
text = dockerfile.read()
@ -106,7 +106,7 @@ if __name__ == "__main__":
.format(os.getenv("GOPATH")))
sys.exit(1)
if NOTARY_DIR == "":
print("ERROR: Could not find github.com/docker/notary in your GOPATH='{0}'"
print("ERROR: Could not find github.com/theupdateframework/notary in your GOPATH='{0}'"
.format(os.getenv("GOPATH")))
sys.exit(1)
fake_vendor()

10
client/backwards_compatibility_test.go
View File

@ -12,12 +12,12 @@ import (
"testing"
"time"
"github.com/docker/notary"
"github.com/docker/notary/passphrase"
store "github.com/docker/notary/storage"
"github.com/docker/notary/trustpinning"
"github.com/docker/notary/tuf/data"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/passphrase"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustpinning"
"github.com/theupdateframework/notary/tuf/data"
)
// Once a fixture is read in, ensure that it's valid by making sure the expiry

2
client/changelist/change.go
View File

@ -1,7 +1,7 @@
package changelist
import (
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/data"
)
// Scopes for TUFChanges are simply the TUF roles.

4
client/changelist/change_test.go
View File

@ -3,9 +3,9 @@ package changelist
import (
"testing"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
)
func TestTUFDelegation(t *testing.T) {

2
client/changelist/interface.go
View File

@ -1,6 +1,6 @@
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
type Changelist interface {

24
client/client.go
View File

@ -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/challenge"
"github.com/docker/distribution/registry/client/transport"
notary "github.com/docker/notary/client"
"github.com/docker/notary/trustpinning"
"github.com/docker/notary/tuf/data"
notary "github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/trustpinning"
"github.com/theupdateframework/notary/tuf/data"
)
func main() {
@ -98,16 +98,16 @@ import (
"time"
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/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 (

2
client/client_pkcs11_test.go
View File

@ -2,7 +2,7 @@
package client
import "github.com/docker/notary/trustmanager/yubikey"
import "github.com/theupdateframework/notary/trustmanager/yubikey"
// clear out all keys
func init() {

28
client/client_test.go
View File

@ -22,22 +22,22 @@ import (
ctxu "github.com/docker/distribution/context"
"github.com/docker/go/canonical/json"
"github.com/docker/notary"
"github.com/docker/notary/client/changelist"
"github.com/docker/notary/cryptoservice"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/server"
"github.com/docker/notary/server/storage"
store "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"
testutils "github.com/docker/notary/tuf/testutils/keys"
"github.com/docker/notary/tuf/utils"
"github.com/docker/notary/tuf/validation"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/client/changelist"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/server"
"github.com/theupdateframework/notary/server/storage"
store "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"
testutils "github.com/theupdateframework/notary/tuf/testutils/keys"
"github.com/theupdateframework/notary/tuf/utils"
"github.com/theupdateframework/notary/tuf/validation"
)
const password = "passphrase"

14
client/client_update_test.go
View File

@ -15,15 +15,15 @@ import (
"time"
"github.com/docker/go/canonical/json"
"github.com/docker/notary"
"github.com/docker/notary/passphrase"
store "github.com/docker/notary/storage"
"github.com/docker/notary/trustpinning"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/testutils"
"github.com/gorilla/mux"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/passphrase"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustpinning"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/testutils"
)
func newBlankRepo(t *testing.T, url string) *repository {

10
client/delegations.go
View File

@ -4,12 +4,12 @@ import (
"encoding/json"
"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/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.

2
client/errors.go
View File

@ -3,7 +3,7 @@ package client
import (
"fmt"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/data"
)
// ErrRepoNotInitialized is returned when trying to publish an uninitialized

12
client/helpers.go
View File

@ -6,13 +6,13 @@ import (
"net/http"
"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/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

8
client/helpers_test.go
View File

@ -8,12 +8,12 @@ import (
"testing"
"time"
"github.com/docker/notary/client/changelist"
"github.com/docker/notary/storage"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/testutils"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/client/changelist"
"github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/testutils"
)
func TestApplyTargetsChange(t *testing.T) {

6
client/interface.go
View File

@ -1,9 +1,9 @@
package client
import (
"github.com/docker/notary/client/changelist"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/theupdateframework/notary/client/changelist"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
)
// Repository represents the set of options that must be supported over a TUF repo.

4
client/repo.go
View File

@ -5,8 +5,8 @@ package client
import (
"fmt"
"github.com/docker/notary"
"github.com/docker/notary/trustmanager"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/trustmanager"
)
func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {

6
client/repo_pkcs11.go
View File

@ -5,9 +5,9 @@ package client
import (
"fmt"
"github.com/docker/notary"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/trustmanager/yubikey"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/trustmanager/yubikey"
)
func getKeyStores(baseDir string, retriever notary.PassRetriever) ([]trustmanager.KeyStore, error) {

12
client/tufclient.go
View File

@ -4,13 +4,13 @@ import (
"encoding/json"
"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/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

6
client/witness.go
View File

@ -1,9 +1,9 @@
package client
import (
"github.com/docker/notary/client/changelist"
"github.com/docker/notary/tuf"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/client/changelist"
"github.com/theupdateframework/notary/tuf"
"github.com/theupdateframework/notary/tuf/data"
)
// Witness creates change objects to witness (i.e. re-sign) the given

10
cmd/escrow/config.go
View File

@ -8,11 +8,11 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"github.com/docker/notary"
"github.com/docker/notary/storage"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/trustmanager/remoteks"
"github.com/docker/notary/utils"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/trustmanager/remoteks"
"github.com/theupdateframework/notary/utils"
)
func parseConfig(path string) (*viper.Viper, error) {

4
cmd/escrow/config_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"github.com/docker/notary"
"github.com/docker/notary/storage"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/storage"
)
func TestParseConfigError(t *testing.T) {

4
cmd/notary-server/bootstrap.go
View File

@ -5,8 +5,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/storage"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/storage"
)
func bootstrap(ctx context.Context) error {

4
cmd/notary-server/bootstrap_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/tuf/testutils"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/tuf/testutils"
)
func TestBootstrap(t *testing.T) {

16
cmd/notary-server/config.go
View File

@ -12,18 +12,18 @@ import (
_ "github.com/docker/distribution/registry/auth/htpasswd"
_ "github.com/docker/distribution/registry/auth/token"
"github.com/docker/go-connections/tlsconfig"
"github.com/docker/notary"
"github.com/docker/notary/server"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/signer/client"
"github.com/docker/notary/storage/rethinkdb"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/utils"
_ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/signer/client"
"github.com/theupdateframework/notary/storage/rethinkdb"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/utils"
"golang.org/x/net/context"
"gopkg.in/dancannon/gorethink.v3"
)

6
cmd/notary-server/main.go
View File

@ -10,10 +10,10 @@ import (
"os/signal"
"github.com/docker/distribution/health"
"github.com/docker/notary/server"
"github.com/docker/notary/utils"
"github.com/docker/notary/version"
"github.com/sirupsen/logrus"
"github.com/theupdateframework/notary/server"
"github.com/theupdateframework/notary/utils"
"github.com/theupdateframework/notary/version"
)
// DebugAddress is the debug server address to listen on

12
cmd/notary-server/main_test.go
View File

@ -12,15 +12,15 @@ import (
"time"
"github.com/docker/distribution/health"
"github.com/docker/notary"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/signer/client"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/utils"
_ "github.com/mattn/go-sqlite3"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/signer/client"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/utils"
)
const (

28
cmd/notary-signer/config.go
View File

@ -14,22 +14,22 @@ import (
"github.com/docker/distribution/health"
"github.com/docker/go-connections/tlsconfig"
"github.com/docker/notary"
"github.com/docker/notary/cryptoservice"
"github.com/docker/notary/passphrase"
pb "github.com/docker/notary/proto"
"github.com/docker/notary/signer"
"github.com/docker/notary/signer/api"
"github.com/docker/notary/signer/keydbstore"
"github.com/docker/notary/storage"
"github.com/docker/notary/storage/rethinkdb"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
tufutils "github.com/docker/notary/tuf/utils"
"github.com/docker/notary/utils"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/passphrase"
pb "github.com/theupdateframework/notary/proto"
"github.com/theupdateframework/notary/signer"
"github.com/theupdateframework/notary/signer/api"
"github.com/theupdateframework/notary/signer/keydbstore"
"github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/storage/rethinkdb"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
tufutils "github.com/theupdateframework/notary/tuf/utils"
"github.com/theupdateframework/notary/utils"
ghealth "google.golang.org/grpc/health"
healthpb "google.golang.org/grpc/health/grpc_health_v1"
"gopkg.in/dancannon/gorethink.v3"

4
cmd/notary-signer/main.go
View File

@ -8,11 +8,11 @@ import (
"os"
"os/signal"
"github.com/docker/notary/utils"
"github.com/docker/notary/version"
_ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq"
"github.com/sirupsen/logrus"
"github.com/theupdateframework/notary/utils"
"github.com/theupdateframework/notary/version"
)
const (

12
cmd/notary-signer/main_test.go
View File

@ -8,16 +8,16 @@ import (
"os"
"testing"
"github.com/docker/notary"
"github.com/docker/notary/signer"
"github.com/docker/notary/signer/keydbstore"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/testutils"
"github.com/jinzhu/gorm"
_ "github.com/mattn/go-sqlite3"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/signer"
"github.com/theupdateframework/notary/signer/keydbstore"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/testutils"
)
const (

8
cmd/notary/delegations.go
View File

@ -6,12 +6,12 @@ import (
"os"
"strings"
"github.com/docker/notary"
notaryclient "github.com/docker/notary/client"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/utils"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/theupdateframework/notary"
notaryclient "github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/utils"
)
var cmdDelegationTemplate = usageTemplate{

6
cmd/notary/delegations_test.go
View File

@ -8,11 +8,11 @@ import (
"testing"
"time"
"github.com/docker/notary/cryptoservice"
testutils "github.com/docker/notary/tuf/testutils/keys"
"github.com/docker/notary/tuf/utils"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/cryptoservice"
testutils "github.com/theupdateframework/notary/tuf/testutils/keys"
"github.com/theupdateframework/notary/tuf/utils"
)
func setup(trustDir string) *delegationCommander {

4
cmd/notary/integration_nonpkcs11_test.go
View File

@ -5,9 +5,9 @@ package main
import (
"testing"
"github.com/docker/notary"
"github.com/docker/notary/passphrase"
"github.com/spf13/cobra"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/passphrase"
)
func init() {

8
cmd/notary/integration_pkcs11_test.go
View File

@ -5,12 +5,12 @@ package main
import (
"testing"
"github.com/docker/notary"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/trustmanager/yubikey"
"github.com/docker/notary/tuf/data"
"github.com/spf13/cobra"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/trustmanager/yubikey"
"github.com/theupdateframework/notary/tuf/data"
)
var _retriever notary.PassRetriever

22
cmd/notary/integration_test.go
View File

@ -27,20 +27,20 @@ import (
ctxu "github.com/docker/distribution/context"
canonicaljson "github.com/docker/go/canonical/json"
"github.com/docker/notary"
"github.com/docker/notary/client"
"github.com/docker/notary/cryptoservice"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/server"
"github.com/docker/notary/server/storage"
nstorage "github.com/docker/notary/storage"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
testutils "github.com/docker/notary/tuf/testutils/keys"
"github.com/docker/notary/tuf/utils"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/server"
"github.com/theupdateframework/notary/server/storage"
nstorage "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
testutils "github.com/theupdateframework/notary/tuf/testutils/keys"
"github.com/theupdateframework/notary/tuf/utils"
"golang.org/x/net/context"
)

14
cmd/notary/keys.go
View File

@ -14,13 +14,13 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/docker/notary"
notaryclient "github.com/docker/notary/client"
"github.com/docker/notary/cryptoservice"
store "github.com/docker/notary/storage"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
tufutils "github.com/docker/notary/tuf/utils"
"github.com/theupdateframework/notary"
notaryclient "github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/cryptoservice"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
tufutils "github.com/theupdateframework/notary/tuf/utils"
)
var cmdKeyTemplate = usageTemplate{

6
cmd/notary/keys_nonpkcs11.go
View File

@ -5,9 +5,9 @@ package main
import (
"errors"
"github.com/docker/notary"
store "github.com/docker/notary/storage"
"github.com/docker/notary/trustmanager"
"github.com/theupdateframework/notary"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustmanager"
)
func getYubiStore(fileKeyStore trustmanager.KeyStore, ret notary.PassRetriever) (trustmanager.KeyStore, error) {

12
cmd/notary/keys_nonpkcs11_test.go
View File

@ -8,15 +8,15 @@ import (
"os"
"testing"
"github.com/docker/notary"
"github.com/docker/notary/cryptoservice"
"github.com/docker/notary/passphrase"
store "github.com/docker/notary/storage"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/passphrase"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
)
func TestImportKeysNoYubikey(t *testing.T) {

8
cmd/notary/keys_pkcs11.go
View File

@ -3,10 +3,10 @@
package main
import (
"github.com/docker/notary"
store "github.com/docker/notary/storage"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/trustmanager/yubikey"
"github.com/theupdateframework/notary"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/trustmanager/yubikey"
)
func getYubiStore(fileKeyStore trustmanager.KeyStore, ret notary.PassRetriever) (*yubikey.YubiStore, error) {

14
cmd/notary/keys_pkcs11_test.go
View File

@ -12,13 +12,13 @@ import (
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
"github.com/docker/notary"
"github.com/docker/notary/cryptoservice"
"github.com/docker/notary/passphrase"
store "github.com/docker/notary/storage"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/trustmanager/yubikey"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/passphrase"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/trustmanager/yubikey"
"github.com/theupdateframework/notary/tuf/data"
)
func TestImportWithYubikey(t *testing.T) {

22
cmd/notary/keys_test.go
View File

@ -20,17 +20,17 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/client"
"github.com/docker/notary/cryptoservice"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/server"
"github.com/docker/notary/server/storage"
store "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/utils"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/server"
"github.com/theupdateframework/notary/server/storage"
store "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/utils"
)
var ret = passphrase.ConstantRetriever("pass")

8
cmd/notary/main.go
View File

@ -7,14 +7,14 @@ import (
"path/filepath"
"strings"
"github.com/docker/notary"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/version"
homedir "github.com/mitchellh/go-homedir"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/version"
)
const (

8
cmd/notary/main_test.go
View File

@ -14,11 +14,11 @@ import (
"time"
"github.com/docker/go-connections/tlsconfig"
"github.com/docker/notary"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/tuf/data"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/tuf/data"
)
// the default location for the config file is in ~/.notary/config.json - even if it doesn't exist.

6
cmd/notary/prettyprint.go
View File

@ -8,9 +8,9 @@ import (
"strings"
"text/tabwriter"
"github.com/docker/notary/client"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
)
const (

10
cmd/notary/prettyprint_test.go
View File

@ -11,12 +11,12 @@ import (
"strings"
"testing"
"github.com/docker/notary/client"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/utils"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/utils"
)
// --- tests for pretty printing keys ---

6
cmd/notary/repo_factory.go
View File

@ -5,9 +5,9 @@ import (
"net/http"
"github.com/docker/notary"
"github.com/docker/notary/client"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/tuf/data"
)
const remoteConfigField = "api"

20
cmd/notary/tuf.go
View File

@ -22,18 +22,18 @@ import (
"github.com/docker/distribution/registry/client/transport"
"github.com/docker/go-connections/tlsconfig"
canonicaljson "github.com/docker/go/canonical/json"
"github.com/docker/notary"
notaryclient "github.com/docker/notary/client"
"github.com/docker/notary/cryptoservice"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/trustpinning"
"github.com/docker/notary/tuf/data"
tufutils "github.com/docker/notary/tuf/utils"
"github.com/docker/notary/utils"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/theupdateframework/notary"
notaryclient "github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/trustpinning"
"github.com/theupdateframework/notary/tuf/data"
tufutils "github.com/theupdateframework/notary/tuf/utils"
"github.com/theupdateframework/notary/utils"
)
var cmdTUFListTemplate = usageTemplate{
@ -920,7 +920,7 @@ func tokenAuth(trustServerURL string, baseTransport *http.Transport, gun data.GU
}
subPath, err := url.Parse(path.Join(endpoint.Path, "/v2") + "/")
if err != nil {
return nil, fmt.Errorf("Failed to parse v2 subpath. This error should not have been reached. Please report it as an issue at https://github.com/docker/notary/issues: %s", err.Error())
return nil, fmt.Errorf("Failed to parse v2 subpath. This error should not have been reached. Please report it as an issue at https://github.com/theupdateframework/notary/issues: %s", err.Error())
}
endpoint = endpoint.ResolveReference(subPath)
req, err := http.NewRequest("GET", endpoint.String(), nil)

2
cmd/notary/tuf_test.go
View File

@ -12,10 +12,10 @@ import (
"testing"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/notary/tuf/data"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/tuf/data"
)
// TestImportRootCert does the following

2
cross.Dockerfile
View File

@ -28,7 +28,7 @@ RUN set -x \
&& UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh > /dev/null
ENV PATH /osxcross/target/bin:$PATH
ENV NOTARYDIR /go/src/github.com/docker/notary
ENV NOTARYDIR /go/src/github.com/theupdateframework/notary
COPY . ${NOTARYDIR}
RUN chmod -R a+rw /go

4
cryptoservice/certificate.go
View File

@ -7,8 +7,8 @@ import (
"fmt"
"time"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/utils"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/utils"
)
// GenerateCertificate generates an X509 Certificate from a template, given a GUN and validity interval

6
cryptoservice/certificate_test.go
View File

@ -6,10 +6,10 @@ import (
"testing"
"time"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/utils"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/utils"
)
func TestGenerateCertificate(t *testing.T) {

8
cryptoservice/crypto_service.go
View File

@ -6,11 +6,11 @@ import (
"errors"
"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/theupdateframework/notary"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/utils"
)
var (

14
cryptoservice/crypto_service_test.go
View File

@ -10,13 +10,13 @@ import (
"github.com/stretchr/testify/require"
"github.com/docker/notary/passphrase"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/testutils/interfaces"
testutils "github.com/docker/notary/tuf/testutils/keys"
"github.com/docker/notary/tuf/utils"
"github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/testutils/interfaces"
testutils "github.com/theupdateframework/notary/tuf/testutils/keys"
"github.com/theupdateframework/notary/tuf/utils"
)
var algoToSigType = map[string]data.SigAlgorithm{

4
development.postgresql.yml
View File

@ -14,7 +14,7 @@ services:
command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.postgres.json"
environment:
MIGRATIONS_PATH: migrations/server/postgresql
DB_URL: postgres://server@postgresql:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-server-key.pem
DB_URL: postgres://server@postgresql:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server-key.pem
depends_on:
- postgresql
- signer
@ -31,7 +31,7 @@ services:
command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.postgres.json"
environment:
MIGRATIONS_PATH: migrations/signer/postgresql
DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-signer-key.pem
DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer-key.pem
depends_on:
- postgresql
postgresql:

4
docker-compose.postgresql.yml
View File

@ -14,7 +14,7 @@ services:
command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.postgres.json"
environment:
MIGRATIONS_PATH: migrations/server/postgresql
DB_URL: postgres://server@postgresql:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-server-key.pem
DB_URL: postgres://server@postgresql:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server-key.pem
depends_on:
- postgresql
- signer
@ -31,7 +31,7 @@ services:
command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.postgres.json"
environment:
MIGRATIONS_PATH: migrations/signer/postgresql
DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-signer-key.pem
DB_URL: postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer-key.pem
depends_on:
- postgresql
postgresql:

6
docs/changelog.md
View File

@ -17,7 +17,7 @@ Implements root key and certificate rotation, as well as trust pinning configura
Additional improvements and fixes to notary internals, and RethinkDB support.
> Detailed release notes can be found here:
<a href="https://github.com/docker/notary/releases/tag/v0.3.0" target="_blank">v0.3 release notes</a>.
<a href="https://github.com/theupdateframework/notary/releases/tag/v0.3.0" target="_blank">v0.3 release notes</a>.
## v0.2
#### 2/24/2016
@ -29,7 +29,7 @@ This version also supports managing the snapshot key on notary server, which sho
Moreover, this version also adds more key management functionality to the notary CLI, and changes the docker-compose development configuration to use the official MariaDB image.
> Detailed release notes can be found here:
<a href="https://github.com/docker/notary/releases/tag/v0.2.0" target="_blank">v0.2 release notes</a>.
<a href="https://github.com/theupdateframework/notary/releases/tag/v0.2.0" target="_blank">v0.2 release notes</a>.
## v0.1
#### 11/15/2015
@ -37,4 +37,4 @@ Initial notary non-alpha release.
Implements The Update Framework (TUF) with root, targets, snapshot, and timestamp roles to sign and verify content of a trusted collection.
> Detailed release notes can be found here:
<a href="https://github.com/docker/notary/releases/tag/v0.1" target="_blank">v0.1 release notes</a>.
<a href="https://github.com/theupdateframework/notary/releases/tag/v0.1" target="_blank">v0.1 release notes</a>.

4
docs/getting_started.md
View File

@ -33,7 +33,7 @@ freshness of your content.
You can download precompiled notary binary for 64 bit Linux or Mac OS X from the
Notary repository's
<a href="https://github.com/docker/notary/releases" target="_blank">releases page on
<a href="https://github.com/theupdateframework/notary/releases" target="_blank">releases page on
GitHub</a>. Windows is not officially
supported, but if you are a developer and Windows user, we would appreciate any
insight you can provide regarding issues.
@ -65,7 +65,7 @@ tell the client which repository server it should communicate with.
The official Docker Hub Notary servers are located at
`https://notary.docker.io`. If you would like to use your own Notary server,
it is important to use the same or a newer <a href="https://github.com/docker/notary/releases">Notary version</a>
it is important to use the same or a newer <a href="https://github.com/theupdateframework/notary/releases">Notary version</a>
as the client for feature compatibility (ex: client version 0.2, server/signer version >= 0.2).
Additionally, Notary stores your own signing keys,
and a cache of previously downloaded trust metadata in a directory, provided

6
docs/running_a_service.md
View File

@ -21,10 +21,10 @@ and [Docker Compose](https://docs.docker.com/compose/overview/).
The quickest way to spin up a full Notary service for testing and development
purposes is to use the Docker compose file in the
<a href="https://github.com/docker/notary" target="_blank">Notary project</a>.
<a href="https://github.com/theupdateframework/notary" target="_blank">Notary project</a>.
```plain
$ git clone https://github.com/docker/notary.git
$ git clone https://github.com/theupdateframework/notary.git
$ cd notary
$ docker-compose up
```
@ -51,7 +51,7 @@ To connect using the Notary Client CLI, please see [Getting Started](getting_sta
documentation. Please note that the version of Notary server and signer
should be greater than or equal to that of the Notary Client CLI to ensure feature compatibility,
i.e. if you are using Notary Client CLI 0.2, ensure you are using a server and signer tagged with
an equal or higher version than 0.2 from the <a href="https://github.com/docker/notary/releases">releases page</a>.
an equal or higher version than 0.2 from the <a href="https://github.com/theupdateframework/notary/releases">releases page</a>.
The self-signed certificate's subject name and subject alternative names are
`notary-server`, `notaryserver`, and `localhost`, so if your Docker host is not

2
escrow.Dockerfile
View File

@ -1,7 +1,7 @@
FROM golang:1.7.3-alpine
MAINTAINER David Lawrence "david.lawrence@docker.com"
ENV NOTARYPKG github.com/docker/notary
ENV NOTARYPKG github.com/theupdateframework/notary
# Copy the local repo to the expected go path
COPY . /go/src/${NOTARYPKG}

2
fixtures/server-config.postgres.json
View File

@ -18,6 +18,6 @@
},
"storage": {
"backend": "postgres",
"db_url": "postgres://server@postgresql:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-server-key.pem"
"db_url": "postgres://server@postgresql:5432/notaryserver?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-server-key.pem"
}
}

2
fixtures/signer-config.postgres.json
View File

@ -10,6 +10,6 @@
},
"storage": {
"backend": "postgres",
"db_url": "postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/docker/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/docker/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/docker/notary/fixtures/database/notary-signer-key.pem"
"db_url": "postgres://signer@postgresql:5432/notarysigner?sslmode=verify-ca&sslrootcert=/go/src/github.com/theupdateframework/notary/fixtures/database/ca.pem&sslcert=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer.pem&sslkey=/go/src/github.com/theupdateframework/notary/fixtures/database/notary-signer-key.pem"
}
}

2
passphrase/passphrase.go
View File

@ -11,7 +11,7 @@ import (
"path/filepath"
"strings"
"github.com/docker/notary"
"github.com/theupdateframework/notary"
"golang.org/x/crypto/ssh/terminal"
)

4
passphrase/passphrase_test.go
View File

@ -8,9 +8,9 @@ import (
"strings"
"testing"
"github.com/docker/notary"
"github.com/docker/notary/tuf/data"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/tuf/data"
)
func assertAskOnceForKey(t *testing.T, in, out *bytes.Buffer, retriever notary.PassRetriever, password, role string) {

2
server.Dockerfile
View File

@ -6,7 +6,7 @@ RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*
# Pin to the specific v3.0.0 version
RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
ENV NOTARYPKG github.com/docker/notary
ENV NOTARYPKG github.com/theupdateframework/notary
# Copy the local repo to the expected go path
COPY . /go/src/${NOTARYPKG}

6
server/handlers/changefeed.go
View File

@ -10,9 +10,9 @@ import (
"github.com/gorilla/mux"
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/server/errors"
"github.com/docker/notary/server/storage"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/errors"
"github.com/theupdateframework/notary/server/storage"
)
type changefeedResponse struct {

4
server/handlers/changefeed_test.go
View File

@ -5,10 +5,10 @@ import (
"testing"
ctxu "github.com/docker/distribution/context"
"github.com/docker/notary"
"github.com/docker/notary/server/storage"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/storage"
)
type changefeedArgs struct {

18
server/handlers/default.go
View File

@ -13,15 +13,15 @@ import (
"github.com/gorilla/mux"
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/server/errors"
"github.com/docker/notary/server/snapshot"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/server/timestamp"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/validation"
"github.com/docker/notary/utils"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/errors"
"github.com/theupdateframework/notary/server/snapshot"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/server/timestamp"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/validation"
"github.com/theupdateframework/notary/utils"
)
// MainHandler is the default handler for the server

18
server/handlers/default_test.go
View File

@ -15,15 +15,15 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/server/errors"
"github.com/docker/notary/server/storage"
store "github.com/docker/notary/storage"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/testutils"
"github.com/docker/notary/tuf/validation"
"github.com/docker/notary/utils"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/errors"
"github.com/theupdateframework/notary/server/storage"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/testutils"
"github.com/theupdateframework/notary/tuf/validation"
"github.com/theupdateframework/notary/utils"
)
type handlerState struct {

12
server/handlers/roles.go
View File

@ -10,12 +10,12 @@ import (
"encoding/json"
"fmt"
"github.com/docker/notary"
"github.com/docker/notary/server/errors"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/server/timestamp"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/errors"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/server/timestamp"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
)
func getRole(ctx context.Context, store storage.MetaStore, gun data.GUN, role data.RoleName, checksum, version string) (*time.Time, []byte, error) {

10
server/handlers/roles_test.go
View File

@ -7,11 +7,11 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/server/errors"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/errors"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
)
func TestGetMaybeServerSignedNoCrypto(t *testing.T) {

14
server/handlers/validation.go
View File

@ -7,13 +7,13 @@ import (
"github.com/sirupsen/logrus"
"github.com/docker/go/canonical/json"
"github.com/docker/notary/server/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/docker/notary/tuf/validation"
"github.com/theupdateframework/notary/server/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"
"github.com/theupdateframework/notary/tuf/validation"
)
// validateUpload checks that the updates being pushed

14
server/handlers/validation_test.go
View File

@ -8,14 +8,14 @@ import (
"github.com/docker/go/canonical/json"
"github.com/docker/notary/server/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/testutils"
"github.com/docker/notary/tuf/validation"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/server/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/testutils"
"github.com/theupdateframework/notary/tuf/validation"
)
// this is a fake storage that serves errors

14
server/integration_test.go
View File

@ -11,13 +11,13 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"github.com/docker/notary"
"github.com/docker/notary/server/storage"
store "github.com/docker/notary/storage"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/testutils"
"github.com/docker/notary/tuf/validation"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/storage"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/testutils"
"github.com/theupdateframework/notary/tuf/validation"
)
// Ensures that the httpstore can interpret the errors returned from the server

10
server/server.go
View File

@ -10,14 +10,14 @@ import (
"github.com/docker/distribution/health"
"github.com/docker/distribution/registry/api/errcode"
"github.com/docker/distribution/registry/auth"
"github.com/docker/notary/server/errors"
"github.com/docker/notary/server/handlers"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/utils"
"github.com/gorilla/mux"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"github.com/theupdateframework/notary/server/errors"
"github.com/theupdateframework/notary/server/handlers"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/utils"
"golang.org/x/net/context"
)

16
server/server_test.go
View File

@ -14,15 +14,15 @@ import (
"testing"
_ "github.com/docker/distribution/registry/auth/silly"
"github.com/docker/notary"
"github.com/docker/notary/server/storage"
store "github.com/docker/notary/storage"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/testutils"
tufutils "github.com/docker/notary/tuf/utils"
"github.com/docker/notary/utils"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/server/storage"
store "github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/testutils"
tufutils "github.com/theupdateframework/notary/tuf/utils"
"github.com/theupdateframework/notary/utils"
"golang.org/x/net/context"
)

10
server/snapshot/snapshot.go
View File

@ -6,11 +6,11 @@ import (
"github.com/sirupsen/logrus"
"github.com/docker/go/canonical/json"
"github.com/docker/notary/server/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/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/trustpinning"
"github.com/theupdateframework/notary/tuf"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
)
// GetOrCreateSnapshotKey either creates a new snapshot key, or returns

8
server/snapshot/snapshot_test.go
View File

@ -9,11 +9,11 @@ import (
"time"
"github.com/docker/go/canonical/json"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/testutils"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/testutils"
)
func TestSnapshotExpired(t *testing.T) {

2
server/storage/interface.go
View File

@ -3,7 +3,7 @@ package storage
import (
"time"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/data"
)
// KeyStore provides a minimal interface for managing key persistence

2
server/storage/memory.go
View File

@ -10,7 +10,7 @@ import (
"sync"
"time"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/data"
)
type key struct {

2
server/storage/postgresql_test.go
View File

@ -9,11 +9,11 @@ import (
"testing"
"time"
"github.com/docker/notary"
"github.com/jinzhu/gorm"
_ "github.com/lib/pq"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary"
)
func init() {

4
server/storage/rethink_realdb_test.go
View File

@ -9,9 +9,9 @@ import (
"testing"
"github.com/docker/go-connections/tlsconfig"
"github.com/docker/notary/storage/rethinkdb"
"github.com/docker/notary/tuf/data"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/storage/rethinkdb"
"github.com/theupdateframework/notary/tuf/data"
"gopkg.in/dancannon/gorethink.v3"
)

4
server/storage/rethinkdb.go
View File

@ -8,9 +8,9 @@ import (
"sort"
"time"
"github.com/docker/notary/storage/rethinkdb"
"github.com/docker/notary/tuf/data"
"github.com/sirupsen/logrus"
"github.com/theupdateframework/notary/storage/rethinkdb"
"github.com/theupdateframework/notary/tuf/data"
"gopkg.in/dancannon/gorethink.v3"
)

2
server/storage/rethinkdb_models.go
View File

@ -1,7 +1,7 @@
package storage
import (
"github.com/docker/notary/storage/rethinkdb"
"github.com/theupdateframework/notary/storage/rethinkdb"
)
// These consts are the index names we've defined for RethinkDB

2
server/storage/sqldb.go
View File

@ -7,10 +7,10 @@ import (
"strconv"
"time"
"github.com/docker/notary/tuf/data"
"github.com/go-sql-driver/mysql"
"github.com/jinzhu/gorm"
"github.com/sirupsen/logrus"
"github.com/theupdateframework/notary/tuf/data"
)
// SQLStorage implements a versioned store using a relational database.

2
server/storage/sqldb_test.go
View File

@ -9,9 +9,9 @@ import (
"testing"
"time"
"github.com/docker/notary/tuf/data"
"github.com/jinzhu/gorm"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/tuf/data"
)
func SetupSQLDB(t *testing.T, dbtype, dburl string) *SQLStorage {

2
server/storage/storage_test.go
View File

@ -7,8 +7,8 @@ import (
"testing"
"time"
"github.com/docker/notary/tuf/data"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/tuf/data"
)
type StoredTUFMeta struct {

6
server/storage/tuf_store.go
View File

@ -6,9 +6,9 @@ import (
"time"
"github.com/docker/go/canonical/json"
"github.com/docker/notary"
"github.com/docker/notary/storage"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/storage"
"github.com/theupdateframework/notary/tuf/data"
)
// TUFMetaStorage wraps a MetaStore in order to walk the TUF tree for GetCurrent in a consistent manner,

4
server/storage/tuf_store_test.go
View File

@ -3,9 +3,9 @@ package storage
import (
"testing"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/testutils"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/testutils"
)
// Produce a series of tufMeta objects and updates given a TUF repo

2
server/storage/types.go
View File

@ -1,6 +1,6 @@
package storage
import "github.com/docker/notary/tuf/data"
import "github.com/theupdateframework/notary/tuf/data"
// MetaUpdate packages up the fields required to update a TUF record
type MetaUpdate struct {

14
server/timestamp/timestamp.go
View File

@ -5,15 +5,15 @@ import (
"time"
"github.com/docker/go/canonical/json"
"github.com/docker/notary"
"github.com/docker/notary/trustpinning"
"github.com/docker/notary/tuf"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/theupdateframework/notary"
"github.com/theupdateframework/notary/trustpinning"
"github.com/theupdateframework/notary/tuf"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/docker/notary/server/snapshot"
"github.com/docker/notary/server/storage"
"github.com/sirupsen/logrus"
"github.com/theupdateframework/notary/server/snapshot"
"github.com/theupdateframework/notary/server/storage"
)
// GetOrCreateTimestampKey returns the timestamp key for the gun. It uses the store to

8
server/timestamp/timestamp_test.go
View File

@ -7,11 +7,11 @@ import (
"time"
"github.com/docker/go/canonical/json"
"github.com/docker/notary/server/storage"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/testutils"
"github.com/stretchr/testify/require"
"github.com/theupdateframework/notary/server/storage"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/testutils"
)
func TestTimestampExpired(t *testing.T) {

2
signer.Dockerfile
View File

@ -6,7 +6,7 @@ RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*
# Pin to the specific v3.0.0 version
RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
ENV NOTARYPKG github.com/docker/notary
ENV NOTARYPKG github.com/theupdateframework/notary
# Copy the local repo to the expected go path
COPY . /go/src/${NOTARYPKG}

8
signer/api/find_key.go
View File

@ -1,11 +1,11 @@
package api
import (
"github.com/docker/notary/signer"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/signer"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
pb "github.com/docker/notary/proto"
pb "github.com/theupdateframework/notary/proto"
)
// findKeyByID looks for the key with the given ID in each of the

8
signer/api/rpc_api.go
View File

@ -5,15 +5,15 @@ import (
"fmt"
ctxu "github.com/docker/distribution/context"
"github.com/docker/notary/signer"
"github.com/docker/notary/trustmanager"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary/signer"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
pb "github.com/docker/notary/proto"
pb "github.com/theupdateframework/notary/proto"
)
//KeyManagementServer implements the KeyManagementServer grpc interface

6
signer/client/signer_trust.go
View File

@ -12,9 +12,9 @@ import (
"net"
"time"
"github.com/docker/notary"
pb "github.com/docker/notary/proto"
"github.com/docker/notary/tuf/data"
"github.com/theupdateframework/notary"
pb "github.com/theupdateframework/notary/proto"
"github.com/theupdateframework/notary/tuf/data"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

4
signer/keydbstore/cachedcryptoservice.go
View File

@ -3,8 +3,8 @@ package keydbstore
import (
"sync"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
)
type cachedKeyService struct {

10
signer/keydbstore/cachedcryptoservice_test.go
View File

@ -5,12 +5,12 @@ import (
"fmt"
"testing"
"github.com/docker/notary/cryptoservice"
"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/stretchr/testify/require"
"github.com/theupdateframework/notary/cryptoservice"
"github.com/theupdateframework/notary/trustmanager"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/signed"
"github.com/theupdateframework/notary/tuf/utils"
)
// gets a key from the DB store, and asserts that the key is the expected key

4
signer/keydbstore/keydbstore.go
View File

@ -6,9 +6,9 @@ import (
"fmt"
"io"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/utils"
"github.com/sirupsen/logrus"
"github.com/theupdateframework/notary/tuf/data"
"github.com/theupdateframework/notary/tuf/utils"
)
type activatingPrivateKey struct {

Some files were not shown because too many files have changed in this diff Show More