diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-07-25T22·44-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-08-01T14·11+0000 |
| commit | 05e44c121d25575e17ded0f6b407347e4b987d0d (patch) | |
| tree | 9a245375a0b3c059da64c00674596e835cd3b26e /third_party/nix/src/libutil | |
| parent | 1fe4a47aa29e3d522160b34aa60d5458ad54916b (diff) | |
feat(3p/nix): Implement AddToStore proto handler r/1519
Implement the proto handler for AddToStore, which adds a nix path to the store. This is implemented by adding a new (probably soon-to-be-generalized) Source concretion that wraps a grpc ServerReader for the stream of data we're receiving from the client - this is less than ideal, as it's perpetuating the source/sink thing that's going on and storing entire nars in memory, but is at the very worst an incremental step towards a functioning nix that we can refactor in the future. Paired-With: Perry Lorier <isomer@tvl.fyi> Paired-With: Vincent Ambo <mail@tazj.in> Change-Id: I48db734e7460a47aee4a85dd5137b690980859e3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1441 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party/nix/src/libutil')
| -rw-r--r-- | third_party/nix/src/libutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/hash.cc | 17 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/hash.hh | 5 |
3 files changed, 23 insertions, 0 deletions
diff --git a/third_party/nix/src/libutil/CMakeLists.txt b/third_party/nix/src/libutil/CMakeLists.txt index db504940a0..ca60dd7a6e 100644 --- a/third_party/nix/src/libutil/CMakeLists.txt +++ b/third_party/nix/src/libutil/CMakeLists.txt @@ -47,6 +47,7 @@ target_sources(nixutil ) target_link_libraries(nixutil + nixproto absl::strings absl::statusor glog diff --git a/third_party/nix/src/libutil/hash.cc b/third_party/nix/src/libutil/hash.cc index 0d5a1de07c..4a8904b4e0 100644 --- a/third_party/nix/src/libutil/hash.cc +++ b/third_party/nix/src/libutil/hash.cc @@ -18,6 +18,23 @@ namespace nix { +std::optional<HashType> hash_type_from(nix::proto::HashType hash_type) { + switch (hash_type) { + case nix::proto::HashType::UNKNOWN: + return HashType::htUnknown; + case nix::proto::HashType::MD5: + return HashType::htMD5; + case nix::proto::HashType::SHA1: + return HashType::htSHA1; + case nix::proto::HashType::SHA256: + return HashType::htSHA256; + case nix::proto::HashType::SHA512: + return HashType::htSHA512; + default: + return {}; + } +} + void Hash::init() { if (type == htMD5) { hashSize = md5HashSize; diff --git a/third_party/nix/src/libutil/hash.hh b/third_party/nix/src/libutil/hash.hh index 4ad4ef6ada..56845e7154 100644 --- a/third_party/nix/src/libutil/hash.hh +++ b/third_party/nix/src/libutil/hash.hh @@ -2,6 +2,7 @@ #include <absl/status/statusor.h> +#include "libproto/worker.grpc.pb.h" #include "libutil/serialise.hh" #include "libutil/types.hh" @@ -9,8 +10,12 @@ namespace nix { MakeError(BadHash, Error); +// TODO(grfn): Replace this with the hash type enum from the daemon proto so we +// don't have to juggle two different types enum HashType : char { htUnknown, htMD5, htSHA1, htSHA256, htSHA512 }; +std::optional<HashType> hash_type_from(nix::proto::HashType hash_type); + const int md5HashSize = 16; const int sha1HashSize = 20; const int sha256HashSize = 32; |