Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-06 17:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closes #3424

Browse Source
This commit is contained in:
Łukasz Domeradzki
2025-05-05 00:48:48 +02:00
parent 735982ce4e
commit 66774631e7
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ArchiSteamFarm/Helpers/CrossProcessFileBasedSemaphore.cs
View File

@@ -185,17 +185,15 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
if (!Directory.Exists(directoryPath)) { if (!Directory.Exists(directoryPath)) {
if (OperatingSystem.IsWindows()) { if (OperatingSystem.IsWindows()) {
DirectoryInfo directoryInfo = new(directoryPath); DirectoryInfo directoryInfo = Directory.CreateDirectory(directoryPath);
try { try {
DirectorySecurity directorySecurity = new(directoryPath, AccessControlSections.All); DirectorySecurity directorySecurity = new(directoryPath, AccessControlSections.All);
directoryInfo.Create(directorySecurity); directoryInfo.SetAccessControl(directorySecurity);
} catch (UnauthorizedAccessException e) { } catch (PrivilegeNotHeldException e) {
// Non-critical, user might have no rights to manage the resource // Non-critical, user might have no rights to manage the resource
ASF.ArchiLogger.LogGenericDebuggingException(e); ASF.ArchiLogger.LogGenericDebuggingException(e);
directoryInfo.Create();
} }
} else if (OperatingSystem.IsFreeBSD() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { } else if (OperatingSystem.IsFreeBSD() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) {
// We require global access from all users, as other ASFs might need to put additional files in there // We require global access from all users, as other ASFs might need to put additional files in there
@@ -203,29 +201,29 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
} }
} }
FileStreamOptions fileStreamOptions = new() {
Mode = FileMode.CreateNew,
Access = FileAccess.Write,
Share = FileShare.None
};
try { try {
if (OperatingSystem.IsWindows()) { if (OperatingSystem.IsWindows()) {
await new FileStream(FilePath, fileStreamOptions).DisposeAsync().ConfigureAwait(false);
FileInfo fileInfo = new(FilePath);
try { try {
FileSecurity fileSecurity = new(FilePath, AccessControlSections.All); FileSecurity fileSecurity = new(FilePath, AccessControlSections.All);
FileInfo fileInfo = new(FilePath); fileInfo.SetAccessControl(fileSecurity);
} catch (PrivilegeNotHeldException e) {
await fileInfo.Create(FileMode.CreateNew, FileSystemRights.Write, FileShare.None, 4096, FileOptions.None, fileSecurity).DisposeAsync().ConfigureAwait(false);
} catch (UnauthorizedAccessException e) {
// Non-critical, user might have no rights to manage the resource // Non-critical, user might have no rights to manage the resource
ASF.ArchiLogger.LogGenericDebuggingException(e); ASF.ArchiLogger.LogGenericDebuggingException(e);
await new FileStream(FilePath, FileMode.CreateNew, FileAccess.Write, FileShare.None).DisposeAsync().ConfigureAwait(false);
} }
} else if (OperatingSystem.IsFreeBSD() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { } else if (OperatingSystem.IsFreeBSD() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) {
FileStreamOptions fileStreamOptions = new() { // Since we only create and read the files, we don't need write/execute permissions on them from other instances
Mode = FileMode.CreateNew, fileStreamOptions.UnixCreateMode = UnixFileMode.UserRead | UnixFileMode.GroupRead | UnixFileMode.OtherRead;
Access = FileAccess.Write,
Share = FileShare.None,
// Since we only create and read the files, we don't need write/execute permissions on them from other instances
UnixCreateMode = UnixFileMode.UserRead | UnixFileMode.GroupRead | UnixFileMode.OtherRead
};
await new FileStream(FilePath, fileStreamOptions).DisposeAsync().ConfigureAwait(false); await new FileStream(FilePath, fileStreamOptions).DisposeAsync().ConfigureAwait(false);
} }