Merge pull request #110 from bbockelm/posc_enoent

Return an ENOENT if the parent directory does not exist.

Author: bbockelm

src/Posc.cc

@@ -743,6 +743,27 @@ int PoscFile::Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &env) {
 		return wrapDF.Open(path, Oflag, Mode, env);
 	}
 
+	// Ensure the parent directory exists and is a directory; this is needed
+	// because the underlying open() takes care of it in the non-POSC case.
+	std::filesystem::path path_fs(path);
+	auto parent_path = path_fs.parent_path();
+	if (!parent_path.empty()) {
+		struct stat sb;
+		auto rv = m_oss.Stat(parent_path.c_str(), &sb, 0, &env);
+		if (rv != 0) {
+			m_log.Log(LogMask::Debug, "POSC",
+					  "Failing file open as parent path does not exist",
+					  parent_path.c_str());
+			return -ENOENT;
+		}
+		if (!S_ISDIR(sb.st_mode)) {
+			m_log.Log(LogMask::Debug, "POSC",
+					  "Failing file open as parent path is not a directory",
+					  parent_path.c_str());
+			return -ENOENT;
+		}
+	}
+
 	if (env.secEnv()) {
 		CopySecEntity(*env.secEnv());
 	}

test/posc_tests.cc

@@ -294,3 +294,41 @@ TEST_F(TestPosc, TempfileUpdate) {
 	ASSERT_EQ(rv, -ENOENT) << "Unexpected error when stating POSC file: "
 						   << strerror(errno);
 }
+
+TEST_F(TestPosc, CreateENOENT) {
+	XrdSysLogger logger(2, 0);
+	XrdOucEnv env;
+
+	XrdVERSIONINFODEF(XrdOssDefault, Oss, XrdVNUMBER, XrdVERSION);
+
+	XrdOss *default_oss =
+		XrdOssDefaultSS(&logger, GetConfigFile().c_str(), XrdOssDefault);
+
+	ASSERT_NE(default_oss, nullptr) << "Failed to get Posc OSS instance";
+
+	std::unique_ptr<XrdSysError> log(new XrdSysError(&logger, "posc_"));
+	PoscFileSystem *posc_fs_raw;
+	try {
+		posc_fs_raw = new PoscFileSystem(default_oss, std::move(log),
+										 GetConfigFile().c_str(), &env);
+	} catch (const std::exception &e) {
+		FAIL() << "Failed to create PoscFileSystem: " << e.what();
+	}
+	std::unique_ptr<PoscFileSystem> posc_fs(posc_fs_raw);
+
+	std::unique_ptr<XrdOssDF> fp(posc_fs->newFile());
+	ASSERT_NE(fp, nullptr) << "Failed to create new file object";
+
+	auto rv = fp->Open("/subdir/testfile.txt", O_CREAT | O_RDWR, 0644, env);
+	ASSERT_NE(rv, 0) << "Open should have failed";
+	ASSERT_EQ(rv, -ENOENT)
+		<< "Open on non-existent path should have resulted in ENOENT: "
+		<< strerror(-rv);
+
+	posc_fs->Mkdir("/subdir", 0755, 1, &env);
+
+	rv = fp->Open("/subdir/testfile.txt", O_CREAT | O_RDWR, 0644, env);
+	ASSERT_EQ(rv, 0) << "Open on newly created directory failed: "
+					 << strerror(-rv);
+	ASSERT_EQ(fp->Close(), 0) << "Failed to close file";
+}