|
|
|
@ -5,6 +5,7 @@ using System.IO;
|
|
|
|
|
using System.Linq;
|
|
|
|
|
using System.Net;
|
|
|
|
|
using System.Reflection;
|
|
|
|
|
using System.Runtime.InteropServices;
|
|
|
|
|
using System.Text;
|
|
|
|
|
using System.Threading;
|
|
|
|
|
using System.Threading.Tasks;
|
|
|
|
@ -198,6 +199,13 @@ namespace Jellyfin.Server
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
await webHost.StartAsync(_tokenSource.Token).ConfigureAwait(false);
|
|
|
|
|
|
|
|
|
|
if (startupConfig.UseUnixSocket() && Environment.OSVersion.Platform == PlatformID.Unix)
|
|
|
|
|
{
|
|
|
|
|
var socketPath = GetUnixSocketPath(startupConfig, appPaths);
|
|
|
|
|
|
|
|
|
|
SetUnixSocketPermissions(startupConfig, socketPath);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex) when (ex is not TaskCanceledException)
|
|
|
|
|
{
|
|
|
|
@ -327,20 +335,7 @@ namespace Jellyfin.Server
|
|
|
|
|
// Bind to unix socket (only on unix systems)
|
|
|
|
|
if (startupConfig.UseUnixSocket() && Environment.OSVersion.Platform == PlatformID.Unix)
|
|
|
|
|
{
|
|
|
|
|
var socketPath = startupConfig.GetUnixSocketPath();
|
|
|
|
|
if (string.IsNullOrEmpty(socketPath))
|
|
|
|
|
{
|
|
|
|
|
var xdgRuntimeDir = Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR");
|
|
|
|
|
if (xdgRuntimeDir == null)
|
|
|
|
|
{
|
|
|
|
|
// Fall back to config dir
|
|
|
|
|
socketPath = Path.Join(appPaths.ConfigurationDirectoryPath, "socket.sock");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
socketPath = Path.Join(xdgRuntimeDir, "jellyfin-socket");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
var socketPath = GetUnixSocketPath(startupConfig, appPaths);
|
|
|
|
|
|
|
|
|
|
// Workaround for https://github.com/aspnet/AspNetCore/issues/14134
|
|
|
|
|
if (File.Exists(socketPath))
|
|
|
|
@ -664,5 +659,49 @@ namespace Jellyfin.Server
|
|
|
|
|
|
|
|
|
|
return "\"" + arg + "\"";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static string GetUnixSocketPath(IConfiguration startupConfig, IApplicationPaths appPaths)
|
|
|
|
|
{
|
|
|
|
|
var socketPath = startupConfig.GetUnixSocketPath();
|
|
|
|
|
|
|
|
|
|
if (string.IsNullOrEmpty(socketPath))
|
|
|
|
|
{
|
|
|
|
|
var xdgRuntimeDir = Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR");
|
|
|
|
|
var socketFile = "jellyfin.sock";
|
|
|
|
|
if (xdgRuntimeDir == null)
|
|
|
|
|
{
|
|
|
|
|
// Fall back to config dir
|
|
|
|
|
socketPath = Path.Join(appPaths.ConfigurationDirectoryPath, socketFile);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
socketPath = Path.Join(xdgRuntimeDir, socketFile);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return socketPath;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static void SetUnixSocketPermissions(IConfiguration startupConfig, string socketPath)
|
|
|
|
|
{
|
|
|
|
|
var socketPerms = startupConfig.GetUnixSocketPermissions();
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(socketPerms))
|
|
|
|
|
{
|
|
|
|
|
[DllImport("libc")]
|
|
|
|
|
static extern int chmod(string pathname, int mode);
|
|
|
|
|
|
|
|
|
|
var exitCode = chmod(socketPath, Convert.ToInt32(socketPerms, 8));
|
|
|
|
|
|
|
|
|
|
if (exitCode < 0)
|
|
|
|
|
{
|
|
|
|
|
_logger.LogError("Failed to set Kestrel unix socket permissions to {SocketPerms}, return code: {ExitCode}", socketPerms, exitCode);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
_logger.LogInformation("Kestrel unix socket permissions set to {SocketPerms}", socketPerms);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|