summaryrefslogtreecommitdiffstats
path: root/src/mimeparser.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mimeparser.h')
-rw-r--r--src/mimeparser.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/mimeparser.h b/src/mimeparser.h
index 27a239f..891478a 100644
--- a/src/mimeparser.h
+++ b/src/mimeparser.h
@@ -27,6 +27,24 @@ struct Attachment
/// Writes the attachment into directory. Returns the full path written, or
/// an empty string on failure with *error set.
QString saveTo(const QString &directory, QString *error) const;
+
+ /// True if candidatePath (need not exist) is directory itself or strictly
+ /// beneath it, by path-boundary comparison after QDir::cleanPath on both
+ /// sides (so ".." segments are resolved rather than compared textually).
+ /// A bare QString::startsWith() is NOT sufficient here: it would let
+ /// "/tmp/safe-evil" pass against "/tmp/safe" since one string is a
+ /// textual prefix of the other despite being sibling directories.
+ ///
+ /// This is defence-in-depth, not currently load-bearing: saveTo() always
+ /// sanitises the name with safeFilename() first, which reduces it to a
+ /// plain basename, so no path reaching this check via saveTo()'s public
+ /// interface can actually fail it today. It exists for a future change
+ /// that stops sanitising, or that accepts a caller-supplied subpath.
+ /// Exposed as its own function so that guarantee can be tested directly,
+ /// independent of safeFilename() — a test driven purely through saveTo()
+ /// cannot exercise this comparison at all, since safeFilename() always
+ /// runs first and never produces a path that could fail it.
+ static bool isPathInsideDirectory(const QString &directory, const QString &candidatePath);
};
struct ParsedMessage