IJHack / QtPass / 35471518671

93%

Build Type

push

github

Committed by web-flow

Commit Message

Store walks visit real directories only; junctions and links are not entries (#1851)

* Store walks visit real directories only; junctions and links are not entries

Qt does not report an NTFS junction as a symlink: QFileInfo::isSymLink()
is false for one, QDir::NoSymLinks lets it through, and QDirIterator's
recursion (and QDir::removeRecursively) walks into it as if it were an
ordinary directory. So the symlink exclusion from #1848 did not hold on
Windows: a junction planted in the store made the re-encryption run read
and rewrite .gpg files outside it, and deleting a folder without git
emptied whatever a junction inside it pointed to.

Util::regularFilesUnder() and Util::directoriesUnder() walk the tree
themselves, over one core: an entry is looked at before anything recurses,
a symlink or junction is never entered or listed, a hidden directory
(.git, a sync tool's version folder) is not entered either, as with
QDirIterator without QDir::Hidden, and siblings come in name order. What
was left out although it is in the way is handed back: every linked
folder, and every link or special file (FIFO, socket, device) under a name
the caller asked for. Every recursive listing of the store uses the walk
now: re-encryption and its leftover recovery, the native search, the
first-run entry count, the files a fresh git init stages (hidden files
included there, .gpg-id is one), the folder list offered for a new entry
and the check before a folder is deleted.

Util::removeTree() removes a folder the way rm -rf does: a link inside goes
as an entry, its target is never touched, and a folder that is itself a
link is unlinked, not emptied. That includes the path with a trailing
separator the tree hands to Remove(): lstat("link/") looks at the target,
so QDir::removeRecursively() on a symlinked store folder deleted the
target's files on every platform. Recovery of an interrupted run refuses a
link or special file under a backup's name as before, and removes one
under a... (continued)

Coverage Stats

92 of 137 new or added lines in 6 files covered. (67.15%)

10 existing lines in 4 files now uncovered.

6891 of 8827 relevant lines covered (78.07%)

74.77 hits per line