adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-14 10:44:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

fileutils: force owner write while copying read-only sources

Browse Source 
Opening the destination at the source's exact mode breaks when the
source lacks owner write (e.g. r-xr-xr-x): the create still works but
the overwrite path can't reopen such a destination for writing. Force
owner read+write while copying and let the trailing Chmod() put the
source mode back, which only ever adds owner bits so the group/other
bits stay as restrictive as the source throughout. Add a regression
test covering the restricted-mode and read-only-source cases.
This commit is contained in:
dxbjavid
2026-06-09 09:53:57 +05:30
parent 1701edca5b
commit 01678166a8
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/UtilsTest.cpp
+55
View File
@@ -18,6 +18,61 @@
#include <znc/FileUtils.h>
#include <znc/Utils.h>
namespace {
CString WriteTempFile(const CString& sContent, mode_t iMode) {
char sName[] = "./copytest-XXXXXX";
int fd = mkstemp(sName);
EXPECT_NE(fd, -1);
close(fd);
CFile File(sName);
EXPECT_TRUE(File.Open(O_WRONLY | O_TRUNC));
File.Write(sContent);
File.Close();
EXPECT_TRUE(CFile::Chmod(sName, iMode));
return sName;
}
unsigned ModeOf(const CString& sFile) {
struct stat st;
EXPECT_EQ(CFile::GetInfo(sFile, st), 0);
return st.st_mode & 07777;
}
} // namespace
// A 0600 source must never widen to the default 0644 during the copy, so the
// destination ends up restricted too.
TEST(FileUtilsTest, CopyKeepsRestrictiveMode) {
CString sSrc = WriteTempFile("secret", 0600);
CString sDst = sSrc + "-copy";
EXPECT_TRUE(CFile::Copy(sSrc, sDst));
EXPECT_EQ(ModeOf(sDst), 0600u);
CFile::Delete(sSrc);
CFile::Delete(sDst);
}
// A source the owner can't write to (r-xr-xr-x) must still copy and keep its
// mode; the copy forces owner write internally and chmods it back afterwards.
TEST(FileUtilsTest, CopyReadOnlySource) {
CString sSrc = WriteTempFile("public", 0555);
CString sDst = sSrc + "-copy";
EXPECT_TRUE(CFile::Copy(sSrc, sDst));
EXPECT_EQ(ModeOf(sDst), 0555u);
CString sContent;
CFile Dst(sDst);
ASSERT_TRUE(Dst.Open());
Dst.ReadFile(sContent);
Dst.Close();
EXPECT_EQ(sContent, "public");
CFile::Delete(sSrc);
CFile::Delete(sDst);
}
TEST(IRC32, GetMessageTags) {
EXPECT_EQ(CUtils::GetMessageTags(""), MCString());
EXPECT_EQ(CUtils::GetMessageTags(