From c5026b98b6aded4ec869658d44986f3ccaff28de Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 10 Nov 2022 06:59:27 +0000 Subject: [PATCH] Update interop tests for new python-tuf release 2.0.0 Simply re-ran the generation scripts with the newest python-tuf release, renamed the directory to reflect the updated version and updated any references to the directory. Fixes #367 Signed-off-by: Joshua Lock --- client/python_interop/python_interop_test.go | 6 +- client/python_interop/testdata/Makefile | 2 +- .../repository/metadata/1.root.json | 71 ------------------- .../repository/metadata/1.snapshot.json | 19 ----- .../repository/metadata/timestamp.json | 23 ------ .../repository/metadata/1.root.json | 71 ------------------- .../repository/metadata/snapshot.json | 19 ----- .../repository/metadata/timestamp.json | 23 ------ .../Dockerfile | 2 +- .../client.py | 0 .../generate.py | 0 .../generate.sh | 0 .../repository/metadata/1.root.json | 71 +++++++++++++++++++ .../repository/metadata/1.snapshot.json | 19 +++++ .../repository/metadata/1.targets.json | 4 +- .../repository/metadata/timestamp.json | 19 +++++ ...ce9c420da5db6203afab700b27e10cf9.file1.txt | 0 ...7d7615dc3e9515c782c49d2075658701.file2.txt | 0 .../repository/metadata/1.root.json | 71 +++++++++++++++++++ .../repository/metadata/snapshot.json | 19 +++++ .../repository/metadata/targets.json | 4 +- .../repository/metadata/timestamp.json | 19 +++++ .../repository/targets/dir/file2.txt | 0 .../repository/targets/file1.txt | 0 requirements-test.txt | 4 +- 25 files changed, 229 insertions(+), 237 deletions(-) delete mode 100644 client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.root.json delete mode 100644 client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json delete mode 100644 client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/timestamp.json delete mode 100644 client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/1.root.json delete mode 100644 client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/snapshot.json delete mode 100644 client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/timestamp.json rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/Dockerfile (57%) rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/client.py (100%) rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/generate.py (100%) rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/generate.sh (100%) create mode 100755 client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.root.json create mode 100755 client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/with-consistent-snapshot/repository/metadata/1.targets.json (67%) mode change 100644 => 100755 create mode 100755 client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/timestamp.json rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/with-consistent-snapshot/repository/targets/55ae75d991c770d8f3ef07cbfde124ffce9c420da5db6203afab700b27e10cf9.file1.txt (100%) rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/with-consistent-snapshot/repository/targets/dir/04e2f59431a9d219321baf7d21b8cc797d7615dc3e9515c782c49d2075658701.file2.txt (100%) create mode 100755 client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/1.root.json create mode 100755 client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/snapshot.json rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/without-consistent-snapshot/repository/metadata/targets.json (67%) mode change 100644 => 100755 create mode 100755 client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/timestamp.json rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/without-consistent-snapshot/repository/targets/dir/file2.txt (100%) rename client/python_interop/testdata/{python-tuf-v1.0.0 => python-tuf-v2.0.0}/without-consistent-snapshot/repository/targets/file1.txt (100%) diff --git a/client/python_interop/python_interop_test.go b/client/python_interop/python_interop_test.go index 9017ed65..b906e230 100644 --- a/client/python_interop/python_interop_test.go +++ b/client/python_interop/python_interop_test.go @@ -43,7 +43,7 @@ func (InteropSuite) TestGoClientPythonGenerated(c *C) { // start file server cwd, err := os.Getwd() c.Assert(err, IsNil) - testDataDir := filepath.Join(cwd, "testdata", "python-tuf-v1.0.0") + testDataDir := filepath.Join(cwd, "testdata", "python-tuf-v2.0.0") addr, cleanup := startFileServer(c, testDataDir) defer cleanup() @@ -145,7 +145,7 @@ func (InteropSuite) TestPythonClientGoGenerated(c *C) { c.Assert(os.WriteFile(filepath.Join(currDir, "root.json"), rootJSON, 0644), IsNil) args := []string{ - filepath.Join(cwd, "testdata", "python-tuf-v1.0.0", "client.py"), + filepath.Join(cwd, "testdata", "python-tuf-v2.0.0", "client.py"), "--repo=http://" + addr + "/" + name, } for path := range files { @@ -204,7 +204,7 @@ func (InteropSuite) TestPythonClientGoGeneratedNullDelegations(c *C) { c.Assert(os.WriteFile(filepath.Join(currDir, "root.json"), rootJSON, 0644), IsNil) args := []string{ - filepath.Join(cwd, "testdata", "python-tuf-v1.0.0", "client.py"), + filepath.Join(cwd, "testdata", "python-tuf-v2.0.0", "client.py"), "--repo=http://" + addr + "/" + name, } for path := range files { diff --git a/client/python_interop/testdata/Makefile b/client/python_interop/testdata/Makefile index f5ef1630..3b84759a 100644 --- a/client/python_interop/testdata/Makefile +++ b/client/python_interop/testdata/Makefile @@ -1,4 +1,4 @@ -PYTHON_TUF=python-tuf-v1.0.0 +PYTHON_TUF=python-tuf-v2.0.0 all: docker build -t tuf-gen ./$(PYTHON_TUF) diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.root.json b/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.root.json deleted file mode 100644 index 13ccb178..00000000 --- a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.root.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "signatures": [ - { - "keyid": "e26489b1801b03e9e770b18f34c337cc29c1b02c4a4385ac698dfe879753e6b3", - "sig": "6385f433122fbe8760030371c0e6768cecff0df2fb22fdf04618da9f09b230070e3ef23f4d13978993466f2f1f983e4d712443c23bde08a5be77df6e6832be0e" - } - ], - "signed": { - "_type": "root", - "consistent_snapshot": true, - "expires": "2030-01-01T00:00:00Z", - "keys": { - "7b1aa7dbc1b24fb44d0146b0fe726d92f9640e26dc197d50345f9b00e0c98c4a": { - "keytype": "ed25519", - "keyval": { - "public": "98b7918168c7adfe0cdc26bd332baf67335ac4e8be350ddc3d27e54b93ae8b41" - }, - "scheme": "ed25519" - }, - "7fe79f52b6ab730028c299b82e4c45c828b3a47fea06f9e4582597a62c4e2f9a": { - "keytype": "ed25519", - "keyval": { - "public": "baa12f5d0f6d053c27625240b021286c9d8939ae62ec6143ee9ef1ada31fc0d9" - }, - "scheme": "ed25519" - }, - "d72e12473433414326514f50289712cb2a4fd8b518b70fcea077018d50a702f2": { - "keytype": "ed25519", - "keyval": { - "public": "ab5ae139b430f0210e4b3ae024882e9bf8c7d31e6ae958061da8ab51ce162c3c" - }, - "scheme": "ed25519" - }, - "e26489b1801b03e9e770b18f34c337cc29c1b02c4a4385ac698dfe879753e6b3": { - "keytype": "ed25519", - "keyval": { - "public": "aef72f53b1aeed769cc5678dbdc8a104d562c87e8201278156f84bab2c0c0a30" - }, - "scheme": "ed25519" - } - }, - "roles": { - "root": { - "keyids": [ - "e26489b1801b03e9e770b18f34c337cc29c1b02c4a4385ac698dfe879753e6b3" - ], - "threshold": 1 - }, - "snapshot": { - "keyids": [ - "d72e12473433414326514f50289712cb2a4fd8b518b70fcea077018d50a702f2" - ], - "threshold": 1 - }, - "targets": { - "keyids": [ - "7b1aa7dbc1b24fb44d0146b0fe726d92f9640e26dc197d50345f9b00e0c98c4a" - ], - "threshold": 1 - }, - "timestamp": { - "keyids": [ - "7fe79f52b6ab730028c299b82e4c45c828b3a47fea06f9e4582597a62c4e2f9a" - ], - "threshold": 1 - } - }, - "spec_version": "1.0.19", - "version": 1 - } -} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json b/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json deleted file mode 100644 index 4a792fe1..00000000 --- a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "signatures": [ - { - "keyid": "d72e12473433414326514f50289712cb2a4fd8b518b70fcea077018d50a702f2", - "sig": "da8a6d4ec27acf62c23d16b51430456d12a20b3373ae52ecf3461ae52f7643dafcc51ca76f5080e9441c055e6a888323fb41e40427df4fc16fea5f35b358db04" - } - ], - "signed": { - "_type": "snapshot", - "expires": "2030-01-01T00:00:00Z", - "meta": { - "targets.json": { - "version": 1 - } - }, - "spec_version": "1.0.19", - "version": 1 - } -} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/timestamp.json b/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/timestamp.json deleted file mode 100644 index c86ca151..00000000 --- a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/timestamp.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "signatures": [ - { - "keyid": "7fe79f52b6ab730028c299b82e4c45c828b3a47fea06f9e4582597a62c4e2f9a", - "sig": "a10f63e6ce554a259ed8e49afbfc6dc358fad05a377ed9f237ba0d81a058fb995be6ab2a4d67166532203fc68239bd8eaf1ebbbe9730c88773b27479d7395a0a" - } - ], - "signed": { - "_type": "timestamp", - "expires": "2030-01-01T00:00:00Z", - "meta": { - "snapshot.json": { - "hashes": { - "sha256": "e92738a47826131048e88e6850dab1667c2e4934514c294a478670e5ec230514" - }, - "length": 432, - "version": 1 - } - }, - "spec_version": "1.0.19", - "version": 1 - } -} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/1.root.json b/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/1.root.json deleted file mode 100644 index a278bf24..00000000 --- a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/1.root.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "signatures": [ - { - "keyid": "cbc434dd8f82c00935912ae123555c8f1d8e202ee74ed3511474a511fbd2bc3b", - "sig": "fb9652e344f028d864391f3bd897cc9e2e8c7a2bd7498cdf11816e517f7eedcf5b79a39757d4891e20d8c4917f6b1ef2d6fe729feb54bda771432f8664a48500" - } - ], - "signed": { - "_type": "root", - "consistent_snapshot": false, - "expires": "2030-01-01T00:00:00Z", - "keys": { - "6694e8c2a2d3cf98ebe41d2442235c46c7caaa4bd8908036d45ac5b046b08dde": { - "keytype": "ed25519", - "keyval": { - "public": "ce1de9af6e9f0599ade37d947e4fd19bc4d89da7ab3f335055196b42f6fa1704" - }, - "scheme": "ed25519" - }, - "ae6fcd48721c779d066643ed9d895feb48a86039732e93b58895d99bbbd0c0ae": { - "keytype": "ed25519", - "keyval": { - "public": "bb7e06355dee36ba33aa70780f82477724a78d69b9d7de3ebd647ff0d648516f" - }, - "scheme": "ed25519" - }, - "cbc434dd8f82c00935912ae123555c8f1d8e202ee74ed3511474a511fbd2bc3b": { - "keytype": "ed25519", - "keyval": { - "public": "e88e416ada03c8ef6b825aa43ff2c608683c51efa752234a454f9b1f9c5a2a39" - }, - "scheme": "ed25519" - }, - "e03d20021373f9de91fccedeb6572438b6803f2d3ab37adf51b72dc4aa527655": { - "keytype": "ed25519", - "keyval": { - "public": "95c4cabf0783bf904943179f5db97b8210d745b0dd4bfa4659f0c172b80d6e08" - }, - "scheme": "ed25519" - } - }, - "roles": { - "root": { - "keyids": [ - "cbc434dd8f82c00935912ae123555c8f1d8e202ee74ed3511474a511fbd2bc3b" - ], - "threshold": 1 - }, - "snapshot": { - "keyids": [ - "6694e8c2a2d3cf98ebe41d2442235c46c7caaa4bd8908036d45ac5b046b08dde" - ], - "threshold": 1 - }, - "targets": { - "keyids": [ - "ae6fcd48721c779d066643ed9d895feb48a86039732e93b58895d99bbbd0c0ae" - ], - "threshold": 1 - }, - "timestamp": { - "keyids": [ - "e03d20021373f9de91fccedeb6572438b6803f2d3ab37adf51b72dc4aa527655" - ], - "threshold": 1 - } - }, - "spec_version": "1.0.19", - "version": 1 - } -} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/snapshot.json b/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/snapshot.json deleted file mode 100644 index 30668fb5..00000000 --- a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/snapshot.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "signatures": [ - { - "keyid": "6694e8c2a2d3cf98ebe41d2442235c46c7caaa4bd8908036d45ac5b046b08dde", - "sig": "6c06bd2dc1f9b9991ff68fa3edb9b3b6becee25f638b4187e161ac65cadcbb59d320196bb0fb72cf08734b75531f3ceddefdc56424ec8a8c8fee068b2584450d" - } - ], - "signed": { - "_type": "snapshot", - "expires": "2030-01-01T00:00:00Z", - "meta": { - "targets.json": { - "version": 1 - } - }, - "spec_version": "1.0.19", - "version": 1 - } -} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/timestamp.json b/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/timestamp.json deleted file mode 100644 index 5a9d3c31..00000000 --- a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/timestamp.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "signatures": [ - { - "keyid": "e03d20021373f9de91fccedeb6572438b6803f2d3ab37adf51b72dc4aa527655", - "sig": "50315d16c729d2068586776285f6282c87cd722e052acf293166ca1cf7313bdc1a673d02309f9be2d710d82c239ce349f3bffbcb76fbebb655bea2199db92503" - } - ], - "signed": { - "_type": "timestamp", - "expires": "2030-01-01T00:00:00Z", - "meta": { - "snapshot.json": { - "hashes": { - "sha256": "4471c47119f7b16307f9955e7fa0fdcaf53c82f7a857ea2b2f46fd6fe9bc53e9" - }, - "length": 432, - "version": 1 - } - }, - "spec_version": "1.0.19", - "version": 1 - } -} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/Dockerfile b/client/python_interop/testdata/python-tuf-v2.0.0/Dockerfile similarity index 57% rename from client/python_interop/testdata/python-tuf-v1.0.0/Dockerfile rename to client/python_interop/testdata/python-tuf-v2.0.0/Dockerfile index 3987fe06..10b4f445 100644 --- a/client/python_interop/testdata/python-tuf-v1.0.0/Dockerfile +++ b/client/python_interop/testdata/python-tuf-v2.0.0/Dockerfile @@ -1,7 +1,7 @@ FROM python:3.10 RUN apt-get update && apt-get install -y libsodium-dev tree -RUN pip install 'securesystemslib[crypto,pynacl]==0.22.0' 'tuf==v1.0.0' +RUN pip install -U pip && pip install 'securesystemslib[crypto,pynacl]==0.25.0' 'tuf==v2.0.0' ADD generate.py generate.sh / CMD /generate.sh diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/client.py b/client/python_interop/testdata/python-tuf-v2.0.0/client.py similarity index 100% rename from client/python_interop/testdata/python-tuf-v1.0.0/client.py rename to client/python_interop/testdata/python-tuf-v2.0.0/client.py diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/generate.py b/client/python_interop/testdata/python-tuf-v2.0.0/generate.py similarity index 100% rename from client/python_interop/testdata/python-tuf-v1.0.0/generate.py rename to client/python_interop/testdata/python-tuf-v2.0.0/generate.py diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/generate.sh b/client/python_interop/testdata/python-tuf-v2.0.0/generate.sh similarity index 100% rename from client/python_interop/testdata/python-tuf-v1.0.0/generate.sh rename to client/python_interop/testdata/python-tuf-v2.0.0/generate.sh diff --git a/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.root.json b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.root.json new file mode 100755 index 00000000..1d7d8394 --- /dev/null +++ b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.root.json @@ -0,0 +1,71 @@ +{ + "signatures": [ + { + "keyid": "7e576308aa26b10a124e13fd6bc4d63977d1904db6823c2862636d2b330fd669", + "sig": "c50fb9e20819b06d8dbebc748a269f1b9e089a2d8a81f64f7e889c054e619ec22c98e4ae24cb868b7c7757f62853cb0cd5dd658dad5ba94286a34255f5f7a100" + } + ], + "signed": { + "_type": "root", + "consistent_snapshot": true, + "expires": "2030-01-01T00:00:00Z", + "keys": { + "7e576308aa26b10a124e13fd6bc4d63977d1904db6823c2862636d2b330fd669": { + "keytype": "ed25519", + "keyval": { + "public": "018908d2190610e54be1f6af0c77a7f59efc5b42971575a06e66018ae36bf15c" + }, + "scheme": "ed25519" + }, + "e76b314161b74584dbda0b3e46eaf1b9feea6f85abc0d9c8432e7fe3752d4f0f": { + "keytype": "ed25519", + "keyval": { + "public": "ecfe22e7fb9c2d867bad321ce90f297d5747efce8d96af171b5d5801b13a1c72" + }, + "scheme": "ed25519" + }, + "fa5b604a0ee5980e5f8a2398729e03c539fa68123cd3eb2e99f70d3504a71704": { + "keytype": "ed25519", + "keyval": { + "public": "128d5aba7c967e6e87c4e06b852282c91dd90c9ac9dec3adc9e6a237d4530752" + }, + "scheme": "ed25519" + }, + "faf425a6c41e594be56b35ab08c0dfe486ab6e14a25308bbfa990e050cdf0aef": { + "keytype": "ed25519", + "keyval": { + "public": "2a70c65b98f325026225b568af3587e993a0a5ab96671469e4ecfbb386412063" + }, + "scheme": "ed25519" + } + }, + "roles": { + "root": { + "keyids": [ + "7e576308aa26b10a124e13fd6bc4d63977d1904db6823c2862636d2b330fd669" + ], + "threshold": 1 + }, + "snapshot": { + "keyids": [ + "fa5b604a0ee5980e5f8a2398729e03c539fa68123cd3eb2e99f70d3504a71704" + ], + "threshold": 1 + }, + "targets": { + "keyids": [ + "faf425a6c41e594be56b35ab08c0dfe486ab6e14a25308bbfa990e050cdf0aef" + ], + "threshold": 1 + }, + "timestamp": { + "keyids": [ + "e76b314161b74584dbda0b3e46eaf1b9feea6f85abc0d9c8432e7fe3752d4f0f" + ], + "threshold": 1 + } + }, + "spec_version": "1.0.19", + "version": 1 + } +} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json new file mode 100755 index 00000000..fbf2d1cb --- /dev/null +++ b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.snapshot.json @@ -0,0 +1,19 @@ +{ + "signatures": [ + { + "keyid": "fa5b604a0ee5980e5f8a2398729e03c539fa68123cd3eb2e99f70d3504a71704", + "sig": "1c09c1ca4c38e68f4ba9ac48c6ed6fcee13e5a071dcfeb51e7b5cf1a823bcc16b26528f67efaa59383a4a765cdd5fd81d67f74a5c09789673cab164a7251b20d" + } + ], + "signed": { + "_type": "snapshot", + "expires": "2030-01-01T00:00:00Z", + "meta": { + "targets.json": { + "version": 1 + } + }, + "spec_version": "1.0.19", + "version": 1 + } +} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.targets.json b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.targets.json old mode 100644 new mode 100755 similarity index 67% rename from client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.targets.json rename to client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.targets.json index 402978bb..5acb7c64 --- a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/metadata/1.targets.json +++ b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/1.targets.json @@ -1,8 +1,8 @@ { "signatures": [ { - "keyid": "7b1aa7dbc1b24fb44d0146b0fe726d92f9640e26dc197d50345f9b00e0c98c4a", - "sig": "012a5a56af043b44fb913d859b61f85800c72fd93b5b3a04ac20f988c29114c643e933f427ff4d38b29b5b2340fe76cfa05704e075d799431fbafe80f9733500" + "keyid": "faf425a6c41e594be56b35ab08c0dfe486ab6e14a25308bbfa990e050cdf0aef", + "sig": "42e49b11e043fa847b0f82786d5fb44988ab0281bda02553e54eb95d7fdbeea25b95c81b824c900cf6132d4714d3ad4d88786155d915603859d27c7934d5650f" } ], "signed": { diff --git a/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/timestamp.json b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/timestamp.json new file mode 100755 index 00000000..23ab4e54 --- /dev/null +++ b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/metadata/timestamp.json @@ -0,0 +1,19 @@ +{ + "signatures": [ + { + "keyid": "e76b314161b74584dbda0b3e46eaf1b9feea6f85abc0d9c8432e7fe3752d4f0f", + "sig": "9c734040db3786f9b8f44db282f53f054fca99654ea393601430adb0d1204c44ab534568b4412b52a8578f35306720903117758abb4534dc8c15ad5a9ebe7e09" + } + ], + "signed": { + "_type": "timestamp", + "expires": "2030-01-01T00:00:00Z", + "meta": { + "snapshot.json": { + "version": 1 + } + }, + "spec_version": "1.0.19", + "version": 1 + } +} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/targets/55ae75d991c770d8f3ef07cbfde124ffce9c420da5db6203afab700b27e10cf9.file1.txt b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/targets/55ae75d991c770d8f3ef07cbfde124ffce9c420da5db6203afab700b27e10cf9.file1.txt similarity index 100% rename from client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/targets/55ae75d991c770d8f3ef07cbfde124ffce9c420da5db6203afab700b27e10cf9.file1.txt rename to client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/targets/55ae75d991c770d8f3ef07cbfde124ffce9c420da5db6203afab700b27e10cf9.file1.txt diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/targets/dir/04e2f59431a9d219321baf7d21b8cc797d7615dc3e9515c782c49d2075658701.file2.txt b/client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/targets/dir/04e2f59431a9d219321baf7d21b8cc797d7615dc3e9515c782c49d2075658701.file2.txt similarity index 100% rename from client/python_interop/testdata/python-tuf-v1.0.0/with-consistent-snapshot/repository/targets/dir/04e2f59431a9d219321baf7d21b8cc797d7615dc3e9515c782c49d2075658701.file2.txt rename to client/python_interop/testdata/python-tuf-v2.0.0/with-consistent-snapshot/repository/targets/dir/04e2f59431a9d219321baf7d21b8cc797d7615dc3e9515c782c49d2075658701.file2.txt diff --git a/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/1.root.json b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/1.root.json new file mode 100755 index 00000000..cf2d4494 --- /dev/null +++ b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/1.root.json @@ -0,0 +1,71 @@ +{ + "signatures": [ + { + "keyid": "3838ee205d1906276ddb1df0803192f95753104e4dd828b70f17e3b3aa90de75", + "sig": "fb2b85aea59950fb7ca3012fd93d252ba7c1cec30c2afae0f1b4fb0146158e0800ad0e99221123b396e0a1a487b5cafdfe50d94a893e7dd5ede2891341a31f00" + } + ], + "signed": { + "_type": "root", + "consistent_snapshot": false, + "expires": "2030-01-01T00:00:00Z", + "keys": { + "3838ee205d1906276ddb1df0803192f95753104e4dd828b70f17e3b3aa90de75": { + "keytype": "ed25519", + "keyval": { + "public": "4203975790ecf4aba558cb7ab3f9430c51b4c3553117d09949f3123fb49d4961" + }, + "scheme": "ed25519" + }, + "4908b7ba44138d79f05f3d211cb5f4bf9e73a71a7bc4ecd1b263accff7632445": { + "keytype": "ed25519", + "keyval": { + "public": "9dc9bf2210f5b743e3b094eae198c1bb2633966d6c10ac2a6d54b782623b8b89" + }, + "scheme": "ed25519" + }, + "8c0291ae0d3c260405e6683cd2260ee6fbb5676deb57541acbe5b94ca4089a50": { + "keytype": "ed25519", + "keyval": { + "public": "ca9a2dfe087762bea03a556ddc01c9ed113f5651ca1546804dae39441099fca3" + }, + "scheme": "ed25519" + }, + "c0ef91ecbb8a59bffc5642ba01129d64059b076b946d120733ea949e2c7786a2": { + "keytype": "ed25519", + "keyval": { + "public": "fcd7c34b20c3b8093b6b21b6a505f715e3d0645c1d9e05ee14d29f045e0b41d8" + }, + "scheme": "ed25519" + } + }, + "roles": { + "root": { + "keyids": [ + "3838ee205d1906276ddb1df0803192f95753104e4dd828b70f17e3b3aa90de75" + ], + "threshold": 1 + }, + "snapshot": { + "keyids": [ + "c0ef91ecbb8a59bffc5642ba01129d64059b076b946d120733ea949e2c7786a2" + ], + "threshold": 1 + }, + "targets": { + "keyids": [ + "4908b7ba44138d79f05f3d211cb5f4bf9e73a71a7bc4ecd1b263accff7632445" + ], + "threshold": 1 + }, + "timestamp": { + "keyids": [ + "8c0291ae0d3c260405e6683cd2260ee6fbb5676deb57541acbe5b94ca4089a50" + ], + "threshold": 1 + } + }, + "spec_version": "1.0.19", + "version": 1 + } +} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/snapshot.json b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/snapshot.json new file mode 100755 index 00000000..333bc5dd --- /dev/null +++ b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/snapshot.json @@ -0,0 +1,19 @@ +{ + "signatures": [ + { + "keyid": "c0ef91ecbb8a59bffc5642ba01129d64059b076b946d120733ea949e2c7786a2", + "sig": "44b9651d75522ac5bdb13e23706f37ade578c59355525ac473d14de4f3cb5c5ace9c2d32b552754305f665e4e91c6773c6876e704939200bb71ab0e03a59ce03" + } + ], + "signed": { + "_type": "snapshot", + "expires": "2030-01-01T00:00:00Z", + "meta": { + "targets.json": { + "version": 1 + } + }, + "spec_version": "1.0.19", + "version": 1 + } +} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/targets.json b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/targets.json old mode 100644 new mode 100755 similarity index 67% rename from client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/targets.json rename to client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/targets.json index ed805ca8..e224e70b --- a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/metadata/targets.json +++ b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/targets.json @@ -1,8 +1,8 @@ { "signatures": [ { - "keyid": "ae6fcd48721c779d066643ed9d895feb48a86039732e93b58895d99bbbd0c0ae", - "sig": "50eec0672e2861e3b73a8a4a15cc60113dc5b478d1431a55d90f8ab65a1954acbbc860f586f3a331144e41a56c54e54c49d9d9eba6ace2c553ec542aafcf4c04" + "keyid": "4908b7ba44138d79f05f3d211cb5f4bf9e73a71a7bc4ecd1b263accff7632445", + "sig": "faf60abd2a725d5962c8a708d9d298d25accbe379b01dc9a5516161b702287b57d425d927942c1a5ddf462be1f8c12718575de5c29994bbff7d83c6218fbc00b" } ], "signed": { diff --git a/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/timestamp.json b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/timestamp.json new file mode 100755 index 00000000..915f07af --- /dev/null +++ b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/metadata/timestamp.json @@ -0,0 +1,19 @@ +{ + "signatures": [ + { + "keyid": "8c0291ae0d3c260405e6683cd2260ee6fbb5676deb57541acbe5b94ca4089a50", + "sig": "933aba2b1f567c8fc6c8b08850330449be6c83a30a75f4d978600b5470f69416bbd0f6cb6cf2c088a0bc2d948290123a2e6419908c58b1b32772aa8f2f94490e" + } + ], + "signed": { + "_type": "timestamp", + "expires": "2030-01-01T00:00:00Z", + "meta": { + "snapshot.json": { + "version": 1 + } + }, + "spec_version": "1.0.19", + "version": 1 + } +} \ No newline at end of file diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/targets/dir/file2.txt b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/targets/dir/file2.txt similarity index 100% rename from client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/targets/dir/file2.txt rename to client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/targets/dir/file2.txt diff --git a/client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/targets/file1.txt b/client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/targets/file1.txt similarity index 100% rename from client/python_interop/testdata/python-tuf-v1.0.0/without-consistent-snapshot/repository/targets/file1.txt rename to client/python_interop/testdata/python-tuf-v2.0.0/without-consistent-snapshot/repository/targets/file1.txt diff --git a/requirements-test.txt b/requirements-test.txt index 05fae07d..59333532 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ iso8601==1.1.0 requests==2.28.1 -securesystemslib==0.24.0 +securesystemslib==0.25.0 six==1.16.0 -tuf==1.0.0 \ No newline at end of file +tuf==2.0.0