19afb3209c
Update the LibHac dependency to version 0.13.1. This brings a ton of improvements and changes such as: - Refactor `FsSrv` to match the official refactoring done in FS. - Change how the `Horizon` and `HorizonClient` classes are handled. Each client created represents a different process with its own process ID and client state. - Add FS access control to handle permissions for FS service method calls. - Add FS program registry to keep track of the program ID, location and permissions of each process. - Add FS program index map info manager to track the program IDs and indexes of multi-application programs. - Add all FS IPC interfaces. - Rewrite `Fs.Fsa` code to be more accurate. - Rewrite a lot of `FsSrv` code to be more accurate. - Extend directory save data to store `SaveDataExtraData` - Extend directory save data to lock the save directory to allow only one accessor at a time. - Improve waiting and retrying when encountering access issues in `LocalFileSystem` and `DirectorySaveDataFileSystem`. - More `IFileSystemProxy` methods should work now. - Probably a bunch more stuff. On the Ryujinx side: - Forward most `IFileSystemProxy` methods to LibHac. - Register programs and program index map info when launching an application. - Remove hacks and workarounds for missing LibHac functionality. - Recreate missing save data extra data found on emulator startup. - Create system save data that wasn't indexed correctly on an older LibHac version. `FsSrv` now enforces access control for each process. When a process tries to open a save data file system, FS reads the save's extra data to determine who the save owner is and if the caller has permission to open the save data. Previously-created save data did not have extra data created when the save was created. With access control checks in place, this means that processes with no permissions (most games) wouldn't be able to access their own save data. The extra data can be partially created from data in the save data indexer, which should be enough for access control purposes.
216 lines
7.7 KiB
C#
216 lines
7.7 KiB
C#
using LibHac;
|
|
using LibHac.Fs;
|
|
using LibHac.FsSrv.Sf;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
|
|
{
|
|
class IFileSystem : DisposableIpcService
|
|
{
|
|
private ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFileSystem> _fileSystem;
|
|
|
|
public IFileSystem(ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFileSystem> provider)
|
|
{
|
|
_fileSystem = provider;
|
|
}
|
|
|
|
public ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFileSystem> GetBaseFileSystem()
|
|
{
|
|
return _fileSystem;
|
|
}
|
|
|
|
[CommandHipc(0)]
|
|
// CreateFile(u32 createOption, u64 size, buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
public ResultCode CreateFile(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
int createOption = context.RequestData.ReadInt32();
|
|
context.RequestData.BaseStream.Position += 4;
|
|
|
|
long size = context.RequestData.ReadInt64();
|
|
|
|
return (ResultCode)_fileSystem.Target.CreateFile(in name, size, createOption).Value;
|
|
}
|
|
|
|
[CommandHipc(1)]
|
|
// DeleteFile(buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
public ResultCode DeleteFile(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
return (ResultCode)_fileSystem.Target.DeleteFile(in name).Value;
|
|
}
|
|
|
|
[CommandHipc(2)]
|
|
// CreateDirectory(buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
public ResultCode CreateDirectory(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
return (ResultCode)_fileSystem.Target.CreateDirectory(in name).Value;
|
|
}
|
|
|
|
[CommandHipc(3)]
|
|
// DeleteDirectory(buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
public ResultCode DeleteDirectory(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
return (ResultCode)_fileSystem.Target.DeleteDirectory(in name).Value;
|
|
}
|
|
|
|
[CommandHipc(4)]
|
|
// DeleteDirectoryRecursively(buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
public ResultCode DeleteDirectoryRecursively(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
return (ResultCode)_fileSystem.Target.DeleteDirectoryRecursively(in name).Value;
|
|
}
|
|
|
|
[CommandHipc(5)]
|
|
// RenameFile(buffer<bytes<0x301>, 0x19, 0x301> oldPath, buffer<bytes<0x301>, 0x19, 0x301> newPath)
|
|
public ResultCode RenameFile(ServiceCtx context)
|
|
{
|
|
ref readonly Path currentName = ref FileSystemProxyHelper.GetSfPath(context, index: 0);
|
|
ref readonly Path newName = ref FileSystemProxyHelper.GetSfPath(context, index: 1);
|
|
|
|
return (ResultCode)_fileSystem.Target.RenameFile(in currentName, in newName).Value;
|
|
}
|
|
|
|
[CommandHipc(6)]
|
|
// RenameDirectory(buffer<bytes<0x301>, 0x19, 0x301> oldPath, buffer<bytes<0x301>, 0x19, 0x301> newPath)
|
|
public ResultCode RenameDirectory(ServiceCtx context)
|
|
{
|
|
ref readonly Path currentName = ref FileSystemProxyHelper.GetSfPath(context, index: 0);
|
|
ref readonly Path newName = ref FileSystemProxyHelper.GetSfPath(context, index: 1);
|
|
|
|
return (ResultCode)_fileSystem.Target.RenameDirectory(in currentName, in newName).Value;
|
|
}
|
|
|
|
[CommandHipc(7)]
|
|
// GetEntryType(buffer<bytes<0x301>, 0x19, 0x301> path) -> nn::fssrv::sf::DirectoryEntryType
|
|
public ResultCode GetEntryType(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
Result result = _fileSystem.Target.GetEntryType(out uint entryType, in name);
|
|
|
|
context.ResponseData.Write((int)entryType);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[CommandHipc(8)]
|
|
// OpenFile(u32 mode, buffer<bytes<0x301>, 0x19, 0x301> path) -> object<nn::fssrv::sf::IFile> file
|
|
public ResultCode OpenFile(ServiceCtx context)
|
|
{
|
|
uint mode = context.RequestData.ReadUInt32();
|
|
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
Result result = _fileSystem.Target.OpenFile(out ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFile> file, in name, mode);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
IFile fileInterface = new IFile(file);
|
|
|
|
MakeObject(context, fileInterface);
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[CommandHipc(9)]
|
|
// OpenDirectory(u32 filter_flags, buffer<bytes<0x301>, 0x19, 0x301> path) -> object<nn::fssrv::sf::IDirectory> directory
|
|
public ResultCode OpenDirectory(ServiceCtx context)
|
|
{
|
|
uint mode = context.RequestData.ReadUInt32();
|
|
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
Result result = _fileSystem.Target.OpenDirectory(out ReferenceCountedDisposable<LibHac.FsSrv.Sf.IDirectory> dir, name, mode);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
IDirectory dirInterface = new IDirectory(dir);
|
|
|
|
MakeObject(context, dirInterface);
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[CommandHipc(10)]
|
|
// Commit()
|
|
public ResultCode Commit(ServiceCtx context)
|
|
{
|
|
return (ResultCode)_fileSystem.Target.Commit().Value;
|
|
}
|
|
|
|
[CommandHipc(11)]
|
|
// GetFreeSpaceSize(buffer<bytes<0x301>, 0x19, 0x301> path) -> u64 totalFreeSpace
|
|
public ResultCode GetFreeSpaceSize(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
Result result = _fileSystem.Target.GetFreeSpaceSize(out long size, in name);
|
|
|
|
context.ResponseData.Write(size);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[CommandHipc(12)]
|
|
// GetTotalSpaceSize(buffer<bytes<0x301>, 0x19, 0x301> path) -> u64 totalSize
|
|
public ResultCode GetTotalSpaceSize(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
Result result = _fileSystem.Target.GetTotalSpaceSize(out long size, in name);
|
|
|
|
context.ResponseData.Write(size);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[CommandHipc(13)]
|
|
// CleanDirectoryRecursively(buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
public ResultCode CleanDirectoryRecursively(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
return (ResultCode)_fileSystem.Target.CleanDirectoryRecursively(in name).Value;
|
|
}
|
|
|
|
[CommandHipc(14)]
|
|
// GetFileTimeStampRaw(buffer<bytes<0x301>, 0x19, 0x301> path) -> bytes<0x20> timestamp
|
|
public ResultCode GetFileTimeStampRaw(ServiceCtx context)
|
|
{
|
|
ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
|
|
|
|
Result result = _fileSystem.Target.GetFileTimeStampRaw(out FileTimeStampRaw timestamp, in name);
|
|
|
|
context.ResponseData.Write(timestamp.Created);
|
|
context.ResponseData.Write(timestamp.Modified);
|
|
context.ResponseData.Write(timestamp.Accessed);
|
|
|
|
byte[] data = new byte[8];
|
|
|
|
// is valid?
|
|
data[0] = 1;
|
|
|
|
context.ResponseData.Write(data);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
protected override void Dispose(bool isDisposing)
|
|
{
|
|
if (isDisposing)
|
|
{
|
|
_fileSystem?.Dispose();
|
|
}
|
|
}
|
|
}
|
|
} |