* Subflag in --verify': nix-store --verify --check-contents' checks

that the contents of store paths has not changed by comparing hashes
  of their current contents to the hashes stored in the database.
This commit is contained in:
Eelco Dolstra 2005-02-08 13:48:53 +00:00
parent 3d74274b37
commit c547439843
3 changed files with 47 additions and 11 deletions

View file

@ -623,7 +623,23 @@ void deleteFromStore(const Path & _path)
}
void verifyStore()
static Hash queryHash(const Transaction & txn, const Path & storePath)
{
string s;
nixDB.queryString(txn, dbValidPaths, storePath, s);
unsigned int colon = s.find(':');
if (colon == string::npos)
throw Error(format("corrupt hash `%1%' in valid-path entry for `%2%'")
% s % storePath);
HashType ht = parseHashType(string(s, 0, colon));
if (ht == htUnknown)
throw Error(format("unknown hash type `%1%' in valid-path entry for `%2%'")
% string(0, colon) % storePath);
return parseHash(ht, string(s, colon + 1));
}
void verifyStore(bool checkContents)
{
Transaction txn(nixDB);
@ -633,14 +649,24 @@ void verifyStore()
for (Paths::iterator i = paths.begin(); i != paths.end(); ++i) {
Path path = *i;
if (!pathExists(path)) {
printMsg(lvlError, format("path `%1%' disappeared") % path);
invalidatePath(path, txn);
} else if (!isStorePath(path)) {
printMsg(lvlError, format("path `%1%' is not in the Nix store") % path);
invalidatePath(path, txn);
} else
validPaths.insert(path);
if (!pathExists(*i)) {
printMsg(lvlError, format("path `%1%' disappeared") % *i);
invalidatePath(*i, txn);
} else if (!isStorePath(*i)) {
printMsg(lvlError, format("path `%1%' is not in the Nix store") % *i);
invalidatePath(*i, txn);
} else {
if (checkContents) {
Hash expected = queryHash(txn, *i);
Hash current = hashPath(expected.type, *i);
if (current != expected) {
printMsg(lvlError, format("path `%1%' was modified! "
"expected hash `%2%', got `%3%'")
% *i % printHash(expected) % printHash(current));
}
}
validPaths.insert(*i);
}
}
/* "Usable" paths are those that are valid or have a

View file

@ -122,7 +122,7 @@ Path addTextToStore(const string & suffix, const string & s,
/* Delete a value from the nixStore directory. */
void deleteFromStore(const Path & path);
void verifyStore();
void verifyStore(bool checkContents);
#endif /* !__STORE_H */

View file

@ -420,7 +420,17 @@ static void opInit(Strings opFlags, Strings opArgs)
/* Verify the consistency of the Nix environment. */
static void opVerify(Strings opFlags, Strings opArgs)
{
verifyStore();
if (!opArgs.empty())
throw UsageError("no arguments expected");
bool checkContents = false;
for (Strings::iterator i = opFlags.begin();
i != opFlags.end(); ++i)
if (*i == "--check-contents") checkContents = true;
else throw UsageError(format("unknown flag `%1%'") % *i);
verifyStore(checkContents);
}