Commit Graph

790 Commits

Author SHA1 Message Date
Jessica Frazelle 74b4ef064c change canonical json package
update godeps for gotuf and canonical json

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-03 20:11:49 -07:00
David Williamson 910e0e7686 Merge pull request #191 from davidwilliamson/File-Changelist-Iterator
Add ChangeIterator interface for Changelists
2015-08-31 13:37:56 -07:00
David Williamson 83d0d8657f Add ChangeIterator interface for Changelists
+ Ref https://github.com/docker/notary/issues/144
    + Create ChangeIterator interface
    + Implement ChangeIterator interface for memChangeList
    + Implement ChangeIterator interface for fileChangeList
    + Add iterator test case to changelist_test
    + Add iterator test case to file_changelist_test
    + Change func applyChangelist to use iterator per PR comment
    + Remove redundant defer statement in file_changelist_test.go (PR comment)
    + Change Next error check to simple array bounds check (PR comment)
    + Add negative unit test cases to increase code coverage

Signed-off-by: David Williamson <david.williamson@docker.com>
2015-08-30 14:19:00 -07:00
David Lawrence 1592ff3527 Merge pull request #188 from endophage/notary-cli-auth
Notary cli auth
2015-08-28 14:21:29 -07:00
David Lawrence 2532363fa3 wrapping up token authentication
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-08-19 14:36:30 -07:00
Derek McGowan a5aea53ef5 Add username and password prompt
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-08-19 13:48:16 -07:00
Derek McGowan 16ff63599d Updated notary cli to use authenticated transport
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-08-19 13:48:16 -07:00
Derek McGowan e50e750fb0 Update vendor to add distribution client authentication
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-08-19 13:48:16 -07:00
David Lawrence 1c4d5a65ff Merge pull request #189 from docker/auth-context
Don't blindly overwrite ctx with result of Authorized
2015-08-19 13:48:02 -07:00
Aaron Lehmann 234c510096 Don't blindly overwrite ctx with result of Authorized
If Authorized returns an error, it returns nil for ctx. This means the
deferred function will dereference a nil pointer.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-08-17 15:42:32 -07:00
Nathan McCauley df079a3e27 Merge pull request #184 from docker/mccauley/update-readme
Update README
2015-08-11 23:28:08 -07:00
Nathan McCauley bbe780fba1 Update README
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
2015-08-11 23:26:49 -07:00
David Lawrence e7853ea008 Merge pull request #183 from tonistiigi/passphrase-msg
Update passphrase error message
2015-08-11 14:20:16 -07:00
Tonis Tiigi 59c063b8fe Update passphrase error message
Let the user know why passphrase wasn’t accepted.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-10 12:44:30 -07:00
Diogo Mónica 52b064b6a6 Merge pull request #174 from docker/logging
Change logging to use contexts effectively
2015-08-10 10:31:21 -07:00
Diogo Mónica 33b77ea733 Merge pull request #175 from endophage/get_remote_err
check error in initializing remote store
2015-08-10 10:30:08 -07:00
Diogo Mónica aad4a2b5ff Merge pull request #177 from docker/import-export-symlinks
Import and export symlinks in keystore
2015-08-10 10:29:47 -07:00
Diogo Mónica f8bf396991 Merge pull request #179 from jfrazelle/fix-the-freaking-makefile
fix makefile
2015-08-10 10:13:40 -07:00
Nathan McCauley bf2831f3a5 Merge pull request #178 from endophage/server_validation
server side validation during updates
2015-08-07 10:49:23 -07:00
Nathan McCauley 710f7a6560 Merge pull request #166 from jfrazelle/static-binaries-for-the-static-binaries-gods
compile the notary server binary statically
2015-08-07 00:27:16 -07:00
David Lawrence 6616bed616 validation tests
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-08-06 17:38:37 -07:00
Jessica Frazelle f5df60b280 fix makefile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-05 17:54:11 -07:00
David Lawrence 0ece438313 server side validation during updates
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-08-05 14:00:07 -07:00
Aaron Lehmann ec3167eedb Import and export symlinks in keystore
- Export symlinks by encoding them in the zip file.

- Detect symlinks in a zip file on import and create them on the local
  filesystem.

- Add test coverage.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-08-03 15:03:31 -07:00
David Lawrence 8e8122eb55 Merge pull request #176 from dmcgowan/update-copyright
Update license to set copyright holder
2015-07-31 17:22:21 -07:00
Derek McGowan 3b7d420f98 Update license to set copyright holder
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-31 16:27:40 -07:00
David Lawrence 3794dbf28e check error in initializing remote store
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-07-31 16:20:17 -07:00
Aaron Lehmann a833f055e2 Change logging to use contexts effectively
Use the github.com/docker/distribution/context package to get a logger
that adds a unique ID and useful information about each HTTP request.

Use this logger in HTTP handlers instead of using logrus or the log
package directly.

Remove [Notary Server] and [Notary Signer] prefixes from log messages.

The distribution/context package was already vendored, so there are no
Godeps changes necessary.

Sample output:

    notaryserver_1 | time="2015-07-31T23:02:01Z" level=debug msg="retrieving timestamp key for docker.com/docker"
    notarysigner_1 | time="2015-07-31T23:02:01Z" level=debug msg="generated ECDSA key with keyID: ea89e7dc49a13feab1e5ed349760b148c3c6ebd86968b2bc6cb0d003a8b79f78"
    notarysigner_1 | time="2015-07-31T23:02:01Z" level=debug msg="generated new ecdsa key for role:  and keyID: ea89e7dc49a13feab1e5ed349760b148c3c6ebd86968b2bc6cb0d003a8b79f78"
    notarysigner_1 | time="2015-07-31T23:02:01Z" level=info msg="CreateKey: Created KeyID ea89e7dc49a13feab1e5ed349760b148c3c6ebd86968b2bc6cb0d003a8b79f78"
    notaryserver_1 | time="2015-07-31T23:02:01Z" level=debug msg="Creating new timestamp key for docker.com/docker. With algo: ecdsa"
    notaryserver_1 | time="2015-07-31T23:02:01Z" level=debug msg="Inserting timestamp key for docker.com/docker"
    notaryserver_1 | time="2015-07-31T23:02:01Z" level=debug msg="200 GET timestamp key" docker.com/docker=gun http.request.host="192.168.99.100:4443" http.request.id=a720da02-4312-48ae-b122-6d4bce9d3b20 http.request.method=GET http.request.remoteaddr="192.168.99.1:58178" http.request.uri="/v2/docker.com/docker/_trust/tuf/timestamp.key" http.request.useragent="Go 1.1 package http"
    notaryserver_1 | time="2015-07-31T23:02:01Z" level=info msg="response completed" http.request.host="192.168.99.100:4443" http.request.id=a720da02-4312-48ae-b122-6d4bce9d3b20 http.request.method=GET http.request.remoteaddr="192.168.99.1:58178" http.request.uri="/v2/docker.com/docker/_trust/tuf/timestamp.key" http.request.useragent="Go 1.1 package http" http.response.duration=29.703624ms http.response.status=200 http.response.written=181

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-31 16:06:56 -07:00
Diogo Mónica 864c3f05c9 Merge pull request #168 from jfrazelle/add-version-to-server-and-signer
add version to signer and server logs for debugging and issues
2015-07-31 15:45:05 -07:00
Jessica Frazelle 95cdfbeb58 add version to signer and server logs for debugging and issues
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-31 15:17:42 -07:00
Aaron Lehmann 1c4d74e746 Merge pull request #171 from endophage/url_matching
can't be so restrictive on notary's GUN matching in URLs
2015-07-31 14:53:41 -07:00
David Lawrence efda5034d9 can't be so restrictive on notary's GUN matching in URLs
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-07-31 14:38:24 -07:00
Diogo Mónica ed14cf2001 Merge pull request #173 from dmcgowan/fix-notary-godep
Update notary godeps
2015-07-31 14:32:00 -07:00
Derek McGowan 4adcfa2b2f Update notary godeps
Updated to master of gotuf
Fix awkward docker/docker dependency

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-31 14:08:59 -07:00
Diogo Mónica 68eed466ff Merge pull request #167 from jfrazelle/updates-to-makefile
Updates to Makefile
2015-07-31 14:07:26 -07:00
Diogo Mónica 09f5b1b38b Merge pull request #172 from docker/safer-aliasmapping
Safer, cleaner use of aliasMap
2015-07-31 13:52:29 -07:00
Nathan McCauley 20e560db3f Safer, cleaner use of aliasMap
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
2015-07-31 13:45:43 -07:00
Diogo Mónica e01218c962 Merge pull request #165 from docker/environment-config-keys
Accept configuration parameters from environment variables
2015-07-31 13:20:13 -07:00
Diogo Mónica 91c0edf410 Merge pull request #170 from docker/passphrase-improvements
Support aliasMap for pretty printing on PhraseRetrieval. Better keyID…
2015-07-31 13:19:20 -07:00
Aaron Lehmann d7f11844c8 Accept configuration parameters from environment variables
For example, trust_service.type becomes
NOTARY_SERVER_TRUST_SERVICE_TYPE.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-31 13:05:34 -07:00
Nathan McCauley bbacddb539 Support aliasMap for pretty printing on PhraseRetrieval. Better keyID printing
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
2015-07-31 12:32:44 -07:00
David Lawrence a4459dfc66 Merge pull request #169 from docker/tls_fail
hard fail if TLS is only partially configured
2015-07-31 11:41:05 -07:00
David Lawrence e7fa1951ab hard fail if TLS is only partially configured
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-07-31 10:49:42 -07:00
Jessica Frazelle 9f2e3e3d0f pass ldflags to the notary-signer and notary-server builds
in the dockerfiles

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-31 09:57:07 -07:00
David Lawrence 056622d801 Merge pull request #163 from dmcgowan/refactor-keydbstore
Move key database to signer package
2015-07-30 21:13:32 -07:00
Jessica Frazelle 4f94d34a9a Updates to Makefile
not everyone has godeps and all that crap on their host, namely me, i do not so
yeah.... this is better

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-30 20:18:05 -07:00
Aaron Lehmann d5b03dc2ec Merge pull request #164 from endophage/remove_bugsnag_config
don't want bugsnag config template in config.json
2015-07-30 17:12:49 -07:00
David Lawrence 58187d97d1 don't want bugsnag config template in config.json
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-07-30 16:39:08 -07:00
Derek McGowan bd9d7c9c74 Move key database to signer package
The key database is not generally used but only used by the signing service.
Move the implementation to the signer package to be imported by the signer.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-30 16:22:47 -07:00
Diogo Monica b04ed5042b Added -y no confirmation and more integration tests
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-07-30 16:22:14 -07:00