maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix/hash): provide a Status-returning constructor

Browse source 
Additionally, add IsValidBase16() to restore the behavior of rejecting invalid base16, which absl's HexStringToBytes does not do.

Change-Id: I777a36f5dc787aa54a2aa316d6728f68da129768
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1484
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-07-27 16:50:56 -07:00 • committed by kanepyork
parent 976a36c2e4
commit 31f9ee58d0
5 changed files with 123 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

42
third_party/nix/src/tests/hash_test.cc vendored
View file

@ -1,12 +1,16 @@
#include "libutil/hash.hh"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
class HashTest : public ::testing::Test {};
using testing::EndsWith;
using testing::HasSubstr;
namespace nix {
TEST(HASH_TEST, SHA256) {
TEST(HashTest, SHA256) {
auto hash = hashString(HashType::htSHA256, "foo");
ASSERT_EQ(hash.base64Len(), 44);
ASSERT_EQ(hash.base32Len(), 52);
@ -40,4 +44,40 @@ TEST(HashTest, SHA256Decode) {
ASSERT_EQ(hash, *base64);
}
TEST(HashTest, SHA256DecodeFail) {
EXPECT_THAT(
Hash::deserialize("sha256:LCa0a2j/xo/5m0U8HTBBNBNCLXBkg7+g+YpeiGJm56==",
HashType::htSHA256)
.status()
.message(),
HasSubstr("wrong length"));
EXPECT_THAT(
Hash::deserialize("sha256:LCa0a2j/xo/5m0U8HTBBNBNCLXBkg7+g+YpeiGJm56,=",
HashType::htSHA256)
.status()
.message(),
HasSubstr("invalid base-64"));
EXPECT_THAT(Hash::deserialize(
"sha256:1bp7cri8hplaz6hbz0v4f0nl44rl84q1sg25kgwqzipzd1mv89i",
HashType::htSHA256)
.status()
.message(),
HasSubstr("wrong length"));
absl::StatusOr<Hash> badB32Char = Hash::deserialize(
"sha256:1bp7cri8hplaz6hbz0v4f0nl44rl84q1sg25kgwqzipzd1mv89i,",
HashType::htSHA256);
EXPECT_THAT(badB32Char.status().message(), HasSubstr("invalid base-32"));
EXPECT_THAT(badB32Char.status().message(), EndsWith(","));
EXPECT_THAT(
Hash::deserialize(
"sha256:"
"2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7 ",
HashType::htSHA256)
.status()
.message(),
HasSubstr("invalid base-16"));
}
} // namespace nix