summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorIevgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>2021-10-22 13:52:27 +0200
committerIevgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>2021-12-04 01:27:11 +0100
commit83f2f27bb6cac0b85cdb47365347493d8dc5feb2 (patch)
tree2201536d1321bd036b1fae878a02a46853c54b0d /tests
parent56e13acf4eaaaff69156faa21d0a560fb93091d5 (diff)
QFile: Add open() overload that accepts permissions argument
The new overload allows creation of files with non-default permissions. This is useful when files need to be created with more restrictive permissions than the default ones, and removes the time window when such files are available with less restrictive permissions. [ChangeLog][QtCore][QFile] Added QDir::open() overload that accepts permissions argument. Fixes: QTBUG-79750 Change-Id: Iddfced3c324e03f2c53f421c9b31c76dee82df58 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/io/qfile/tst_qfile.cpp52
1 files changed, 52 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index afcd2c2a7e..8ea01b4680 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -183,6 +183,8 @@ private slots:
void ungetChar();
void createFile();
void createFileNewOnly();
+ void createFilePermissions_data();
+ void createFilePermissions();
void openFileExistingOnly();
void append();
void permissions_data();
@@ -1268,6 +1270,56 @@ void tst_QFile::createFileNewOnly()
QFile::remove("createme.txt");
}
+void tst_QFile::createFilePermissions_data()
+{
+ QTest::addColumn<QFile::Permissions>("permissions");
+
+ for (int u = 0; u < 8; ++u) {
+ for (int g = 0; g < 8; ++g) {
+ for (int o = 0; o < 8; ++o) {
+ auto permissions = QFileDevice::Permissions::fromInt((u << 12) | (g << 4) | o);
+ QTest::addRow("%04x", permissions.toInt()) << permissions;
+ }
+ }
+ }
+}
+
+void tst_QFile::createFilePermissions()
+{
+ QFETCH(QFile::Permissions, permissions);
+
+#ifdef Q_OS_WIN
+ QScopedValueRollback<int> ntfsMode(qt_ntfs_permission_lookup);
+ ++qt_ntfs_permission_lookup;
+#endif
+#ifdef Q_OS_UNIX
+ auto restoreMask = qScopeGuard([oldMask = umask(0)] { umask(oldMask); });
+#endif
+
+ const QFile::Permissions setPermissions = {
+ QFile::ReadOther, QFile::WriteOther, QFile::ExeOther,
+ QFile::ReadGroup, QFile::WriteGroup, QFile::ExeGroup,
+ QFile::ReadOwner, QFile::WriteOwner, QFile::ExeOwner
+ };
+
+ const QString fileName = u"createme.txt"_qs;
+
+ QFile::remove(fileName);
+ QVERIFY(!QFile::exists(fileName));
+
+ QFile f(fileName);
+ auto removeFile = qScopeGuard([&f] {
+ f.close();
+ f.remove();
+ });
+ QVERIFY2(f.open(QIODevice::WriteOnly, permissions), msgOpenFailed(f).constData());
+
+ QVERIFY(QFile::exists(fileName));
+
+ auto actualPermissions = QFileInfo(fileName).permissions();
+ QCOMPARE(actualPermissions & setPermissions, permissions);
+}
+
void tst_QFile::openFileExistingOnly()
{
QFile::remove("dontcreateme.txt");