mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-01-06 07:06:00 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fs: Fix wrong mounts being matched by partial guest path. (#1809)

Browse source
This commit is contained in:
squidbus 2024-12-17 02:34:43 -08:00 committed by GitHub
parent 05a1523f0e
commit c1d6a93246
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/file_sys/fs.cpp
View file

@ -10,16 +10,28 @@
namespace Core::FileSys { namespace Core::FileSys {
std::string RemoveTrailingSlashes(const std::string& path) {
// Remove trailing slashes to make comparisons simpler.
std::string path_sanitized = path;
while (path_sanitized.ends_with("/")) {
path_sanitized.pop_back();
}
return path_sanitized;
}
void MntPoints::Mount(const std::filesystem::path& host_folder, const std::string& guest_folder, void MntPoints::Mount(const std::filesystem::path& host_folder, const std::string& guest_folder,
bool read_only) { bool read_only) {
std::scoped_lock lock{m_mutex}; std::scoped_lock lock{m_mutex};
m_mnt_pairs.emplace_back(host_folder, guest_folder, read_only); const auto guest_folder_sanitized = RemoveTrailingSlashes(guest_folder);
m_mnt_pairs.emplace_back(host_folder, guest_folder_sanitized, read_only);
} }
void MntPoints::Unmount(const std::filesystem::path& host_folder, const std::string& guest_folder) { void MntPoints::Unmount(const std::filesystem::path& host_folder, const std::string& guest_folder) {
std::scoped_lock lock{m_mutex}; std::scoped_lock lock{m_mutex};
auto it = std::remove_if(m_mnt_pairs.begin(), m_mnt_pairs.end(), const auto guest_folder_sanitized = RemoveTrailingSlashes(guest_folder);
[&](const MntPair& pair) { return pair.mount == guest_folder; }); auto it = std::remove_if(m_mnt_pairs.begin(), m_mnt_pairs.end(), [&](const MntPair& pair) {
return pair.mount == guest_folder_sanitized;
});
m_mnt_pairs.erase(it, m_mnt_pairs.end()); m_mnt_pairs.erase(it, m_mnt_pairs.end());
} }
@ -47,7 +59,8 @@ std::filesystem::path MntPoints::GetHostPath(std::string_view path, bool* is_rea
} }
// Nothing to do if getting the mount itself. // Nothing to do if getting the mount itself.
if (corrected_path == mount->mount) { const auto corrected_path_sanitized = RemoveTrailingSlashes(corrected_path);
if (corrected_path_sanitized == mount->mount) {
return mount->host_path; return mount->host_path;
} }

9
src/core/file_sys/fs.h
View file

@ -22,7 +22,7 @@ class MntPoints {
public: public:
struct MntPair { struct MntPair {
std::filesystem::path host_path; std::filesystem::path host_path;
std::string mount; // e.g /app0/ std::string mount; // e.g /app0
bool read_only; bool read_only;
}; };
@ -39,8 +39,11 @@ public:
const MntPair* GetMount(const std::string& guest_path) { const MntPair* GetMount(const std::string& guest_path) {
std::scoped_lock lock{m_mutex}; std::scoped_lock lock{m_mutex};
const auto it = std::ranges::find_if( const auto it = std::ranges::find_if(m_mnt_pairs, [&](const auto& mount) {
m_mnt_pairs, [&](const auto& mount) { return guest_path.starts_with(mount.mount); }); // When doing starts-with check, add a trailing slash to make sure we don't match
// against only part of the mount path.
return guest_path == mount.mount || guest_path.starts_with(mount.mount + "/");
});
return it == m_mnt_pairs.end() ? nullptr : &*it; return it == m_mnt_pairs.end() ? nullptr : &*it;
} }