diff options
author | Griffin Smith <grfn@gws.fyi> | 2020-07-18T18·22-0400 |
---|---|---|
committer | glittershark <grfn@gws.fyi> | 2020-07-18T19·52+0000 |
commit | ecf288e70aa32d532bed79f8d940c349419ce0e8 (patch) | |
tree | c4610fcacc7679cfb68764351da2ce2c962b15ec | |
parent | a79df261b498473ae7c6d4a04f32c50d5954124f (diff) |
feat(3p/nix/nix-daemon): Implement Worker::AddSignatures handler r/1383
I got the message proto wrong on this one as well - it needs both a path and a signatures. Change-Id: I9a489b1285bda61c15b2a3b47d9cfc3b50e387da Reviewed-on: https://cl.tvl.fyi/c/depot/+/1270 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
-rw-r--r-- | third_party/nix/src/nix-daemon/nix-daemon-proto.cc | 14 | ||||
-rw-r--r-- | third_party/nix/src/proto/worker.proto | 7 |
2 files changed, 20 insertions, 1 deletions
diff --git a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc index 26ae538f29ad..d94e34cb40cd 100644 --- a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc +++ b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc @@ -227,6 +227,20 @@ class WorkerServiceImpl final : public WorkerService::Service { return Status::OK; } + Status AddSignatures(grpc::ServerContext* context, + const nix::proto::AddSignaturesRequest* request, + google::protobuf::Empty* response) override { + auto path = request->path().path(); + store_->assertStorePath(path); + + StringSet sigs; + sigs.insert(request->sigs().sigs().begin(), request->sigs().sigs().end()); + + store_->addSignatures(path, sigs); + + return Status::OK; + } + Status QueryMissing(grpc::ServerContext* context, const StorePaths* request, nix::proto::QueryMissingResponse* response) override { std::set<Path> targets; diff --git a/third_party/nix/src/proto/worker.proto b/third_party/nix/src/proto/worker.proto index 3dd83d9988f7..d8d2cc8bbd2e 100644 --- a/third_party/nix/src/proto/worker.proto +++ b/third_party/nix/src/proto/worker.proto @@ -92,7 +92,7 @@ service WorkerService { // Add signatures to the specified store path. The signatures are not // verified. - rpc AddSignatures(Signatures) returns (google.protobuf.Empty); + rpc AddSignatures(AddSignaturesRequest) returns (google.protobuf.Empty); // TODO: What does this do? rpc NarFromPath(StorePath) returns (StorePath); @@ -314,6 +314,11 @@ message BuildDerivationResponse { string error_message = 2; } +message AddSignaturesRequest { + StorePath path = 1; + Signatures sigs = 2; +} + message AddToStoreNarRequest { oneof add_oneoff { PathInfo path_info = 1; |