From c248569d6b42083cf39618adf5d38ad772a216e9 Mon Sep 17 00:00:00 2001
From: Lucas CHOLLET <lucas.chollet@free.fr>
Date: Sun, 24 Jul 2022 15:32:41 +0200
Subject: [PATCH] Base: Launch InspectorServer at session start-up

---
 Base/etc/SystemServer.ini                           | 6 ------
 Base/home/anon/.config/SystemServer.ini             | 5 +++++
 Userland/DevTools/Inspector/InspectorServerClient.h | 2 +-
 Userland/Libraries/LibCore/EventLoop.cpp            | 2 +-
 Userland/Services/InspectorServer/main.cpp          | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index 5910b8717fe..7cf6d0f4a01 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -19,12 +19,6 @@ User=window
 # Ensure windowserver has a controlling TTY.
 StdIO=/dev/tty0
 
-[InspectorServer]
-Socket=/tmp/portal/inspector,/tmp/portal/inspectables
-SocketPermissions=600,666
-KeepAlive=true
-User=anon
-
 [Clipboard]
 Socket=/tmp/portal/clipboard
 SocketPermissions=600
diff --git a/Base/home/anon/.config/SystemServer.ini b/Base/home/anon/.config/SystemServer.ini
index 2e36ee16fa3..58ecb001434 100644
--- a/Base/home/anon/.config/SystemServer.ini
+++ b/Base/home/anon/.config/SystemServer.ini
@@ -52,6 +52,11 @@ Lazy=true
 Priority=low
 KeepAlive=true
 
+[InspectorServer]
+Socket=/tmp/user/%uid/portal/inspector,/tmp/user/%uid/portal/inspectables
+SocketPermissions=600,666
+KeepAlive=true
+
 [LaunchServer]
 Socket=/tmp/user/%uid/portal/launch
 SocketPermissions=600
diff --git a/Userland/DevTools/Inspector/InspectorServerClient.h b/Userland/DevTools/Inspector/InspectorServerClient.h
index caff6df1e28..db2e9d994b7 100644
--- a/Userland/DevTools/Inspector/InspectorServerClient.h
+++ b/Userland/DevTools/Inspector/InspectorServerClient.h
@@ -15,7 +15,7 @@ namespace Inspector {
 class InspectorServerClient final
     : public IPC::ConnectionToServer<InspectorClientEndpoint, InspectorServerEndpoint>
     , public InspectorClientEndpoint {
-    IPC_CLIENT_CONNECTION(InspectorServerClient, "/tmp/portal/inspector"sv)
+    IPC_CLIENT_CONNECTION(InspectorServerClient, "/tmp/user/%uid/portal/inspector"sv)
 
 public:
     virtual ~InspectorServerClient() override = default;
diff --git a/Userland/Libraries/LibCore/EventLoop.cpp b/Userland/Libraries/LibCore/EventLoop.cpp
index 6c76c45f950..3e8a4a392ad 100644
--- a/Userland/Libraries/LibCore/EventLoop.cpp
+++ b/Userland/Libraries/LibCore/EventLoop.cpp
@@ -359,7 +359,7 @@ EventLoop::~EventLoop()
 bool connect_to_inspector_server()
 {
 #ifdef __serenity__
-    auto maybe_socket = Core::Stream::LocalSocket::connect("/tmp/portal/inspectables");
+    auto maybe_socket = Core::Stream::LocalSocket::connect("/tmp/user/%uid/portal/inspectables");
     if (maybe_socket.is_error()) {
         dbgln("connect_to_inspector_server: Failed to connect: {}", maybe_socket.error());
         return false;
diff --git a/Userland/Services/InspectorServer/main.cpp b/Userland/Services/InspectorServer/main.cpp
index e5055777a08..72e7c6ecb9a 100644
--- a/Userland/Services/InspectorServer/main.cpp
+++ b/Userland/Services/InspectorServer/main.cpp
@@ -19,10 +19,10 @@ ErrorOr<int> serenity_main(Main::Arguments)
 
     TRY(Core::System::pledge("stdio unix accept"));
 
-    auto server = TRY(IPC::MultiServer<InspectorServer::ConnectionFromClient>::try_create("/tmp/portal/inspector"));
+    auto server = TRY(IPC::MultiServer<InspectorServer::ConnectionFromClient>::try_create("/tmp/user/%uid/portal/inspector"));
 
     auto inspectables_server = TRY(Core::LocalServer::try_create());
-    TRY(inspectables_server->take_over_from_system_server("/tmp/portal/inspectables"));
+    TRY(inspectables_server->take_over_from_system_server("/tmp/user/%uid/portal/inspectables"));
 
     inspectables_server->on_accept = [&](auto client_socket) {
         auto pid = client_socket->peer_pid().release_value_but_fixme_should_propagate_errors();