diff --git a/warehouse/tuf/__init__.py b/warehouse/tuf/__init__.py index 61537c6cc6a8..4a8af8937d8a 100644 --- a/warehouse/tuf/__init__.py +++ b/warehouse/tuf/__init__.py @@ -21,6 +21,7 @@ def includeme(config): config.add_settings( { + "tuf.repository": "TODO", "tuf.keytype": "ed25519", "tuf.keyid_hash_algorithm": "sha512", "tuf.consistent_snapshot": True, diff --git a/warehouse/tuf/tasks.py b/warehouse/tuf/tasks.py index f8b5dbc14d90..bd72c1c3c054 100644 --- a/warehouse/tuf/tasks.py +++ b/warehouse/tuf/tasks.py @@ -22,7 +22,7 @@ def add_target(task, request, file): with utils.RepoLock(r): fileinfo = utils.make_fileinfo(file) - repository = utils.open_repository(request) + repository = utils.load_repository(request) repository.add_target_to_bin(file.path, fileinfo=fileinfo) diff --git a/warehouse/tuf/utils.py b/warehouse/tuf/utils.py index 0f32dd08b31d..9534c18dab38 100644 --- a/warehouse/tuf/utils.py +++ b/warehouse/tuf/utils.py @@ -11,6 +11,7 @@ # limitations under the License. import tuf.formats +import tuf.repository_tool def make_fileinfo(file, custom=None): @@ -27,8 +28,10 @@ def make_fileinfo(file, custom=None): return fileinfo -def open_repository(request): - pass +def load_repository(request): + return tuf.repository_tool.load_repository( + request.registry.settings["tuf.repository"] + ) class RepoLock: