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.
124 lines
6 KiB
C#
124 lines
6 KiB
C#
using LibHac;
|
|
using LibHac.Bcat;
|
|
using LibHac.FsSrv.Impl;
|
|
using LibHac.Loader;
|
|
using LibHac.Ncm;
|
|
using Ryujinx.HLE.FileSystem;
|
|
using Ryujinx.HLE.HOS.Services.Arp;
|
|
using System;
|
|
using StorageId = LibHac.Ncm.StorageId;
|
|
|
|
namespace Ryujinx.HLE.HOS
|
|
{
|
|
public class LibHacHorizonManager
|
|
{
|
|
private LibHac.Horizon Server { get; set; }
|
|
public HorizonClient RyujinxClient { get; private set; }
|
|
|
|
public HorizonClient ApplicationClient { get; private set; }
|
|
|
|
public HorizonClient AccountClient { get; private set; }
|
|
public HorizonClient AmClient { get; private set; }
|
|
public HorizonClient BcatClient { get; private set; }
|
|
public HorizonClient FsClient { get; private set; }
|
|
public HorizonClient NsClient { get; private set; }
|
|
public HorizonClient SdbClient { get; private set; }
|
|
|
|
internal LibHacIReader ArpIReader { get; private set; }
|
|
|
|
public LibHacHorizonManager()
|
|
{
|
|
InitializeServer();
|
|
}
|
|
|
|
private void InitializeServer()
|
|
{
|
|
Server = new LibHac.Horizon(new HorizonConfiguration());
|
|
|
|
RyujinxClient = Server.CreatePrivilegedHorizonClient();
|
|
}
|
|
|
|
public void InitializeArpServer()
|
|
{
|
|
ArpIReader = new LibHacIReader();
|
|
RyujinxClient.Sm.RegisterService(new LibHacArpServiceObject(ArpIReader), "arp:r").ThrowIfFailure();
|
|
}
|
|
|
|
public void InitializeBcatServer()
|
|
{
|
|
BcatClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Bcat, StorageId.BuiltInSystem),
|
|
BcatFsPermissions);
|
|
|
|
_ = new BcatServer(BcatClient);
|
|
}
|
|
|
|
public void InitializeFsServer(VirtualFileSystem virtualFileSystem)
|
|
{
|
|
virtualFileSystem.InitializeFsServer(Server, out var fsClient);
|
|
|
|
FsClient = fsClient;
|
|
}
|
|
|
|
public void InitializeSystemClients()
|
|
{
|
|
AccountClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Account, StorageId.BuiltInSystem),
|
|
AccountFsPermissions);
|
|
|
|
AmClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Am, StorageId.BuiltInSystem),
|
|
AmFsPermissions);
|
|
|
|
NsClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Ns, StorageId.BuiltInSystem),
|
|
NsFsPermissions);
|
|
|
|
SdbClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Sdb, StorageId.BuiltInSystem),
|
|
SdbFacData, SdbFacDescriptor);
|
|
}
|
|
|
|
public void InitializeApplicationClient(ProgramId programId, in Npdm npdm)
|
|
{
|
|
ApplicationClient = Server.CreateHorizonClient(new ProgramLocation(programId, StorageId.BuiltInUser),
|
|
npdm.FsAccessControlData, npdm.FsAccessControlDescriptor);
|
|
}
|
|
|
|
private static AccessControlBits.Bits AccountFsPermissions => AccessControlBits.Bits.SystemSaveData |
|
|
AccessControlBits.Bits.GameCard |
|
|
AccessControlBits.Bits.SaveDataMeta |
|
|
AccessControlBits.Bits.GetRightsId;
|
|
|
|
private static AccessControlBits.Bits AmFsPermissions => AccessControlBits.Bits.SaveDataManagement |
|
|
AccessControlBits.Bits.CreateSaveData |
|
|
AccessControlBits.Bits.SystemData;
|
|
private static AccessControlBits.Bits BcatFsPermissions => AccessControlBits.Bits.SystemSaveData;
|
|
|
|
private static AccessControlBits.Bits NsFsPermissions => AccessControlBits.Bits.ApplicationInfo |
|
|
AccessControlBits.Bits.SystemSaveData |
|
|
AccessControlBits.Bits.GameCard |
|
|
AccessControlBits.Bits.SaveDataManagement |
|
|
AccessControlBits.Bits.ContentManager |
|
|
AccessControlBits.Bits.ImageManager |
|
|
AccessControlBits.Bits.SystemSaveDataManagement |
|
|
AccessControlBits.Bits.SystemUpdate |
|
|
AccessControlBits.Bits.SdCard |
|
|
AccessControlBits.Bits.FormatSdCard |
|
|
AccessControlBits.Bits.GetRightsId |
|
|
AccessControlBits.Bits.RegisterProgramIndexMapInfo |
|
|
AccessControlBits.Bits.MoveCacheStorage;
|
|
|
|
// Sdb has save data access control info so we can't store just its access control bits
|
|
private static ReadOnlySpan<byte> SdbFacData => new byte[]
|
|
{
|
|
0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
|
|
0x03, 0x03, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x10, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x01
|
|
};
|
|
|
|
private static ReadOnlySpan<byte> SdbFacDescriptor => new byte[]
|
|
{
|
|
0x01, 0x00, 0x02, 0x00, 0x08, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
0x01, 0x09, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
|
|
};
|
|
}
|
|
}
|