From c3bad1d4c599e43846c8f0e596b370bc082ef5ed Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 21:05:18 -0400
Subject: [PATCH] Rename AdminChecker to ElevatedPrivilegesChecker, refactor
 elevated check

---
 ...hecker.cs => ElevatedPrivilegesChecker.cs} | 30 ++++++++++++++-----
 osu.Desktop/OsuGameDesktop.cs                 |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)
 rename osu.Desktop/Admin/{AdminChecker.cs => ElevatedPrivilegesChecker.cs} (64%)

diff --git a/osu.Desktop/Admin/AdminChecker.cs b/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
similarity index 64%
rename from osu.Desktop/Admin/AdminChecker.cs
rename to osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
index b9f0d68694..ea4aab0f85 100644
--- a/osu.Desktop/Admin/AdminChecker.cs
+++ b/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
@@ -5,7 +5,7 @@ using System;
 using System.Security.Principal;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -16,7 +16,7 @@ namespace osu.Desktop.Admin
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
     /// </summary>
-    public class AdminChecker : CompositeDrawable
+    public class ElevatedPrivilegesChecker : Component
     {
         [Resolved]
         protected NotificationOverlay Notifications { get; private set; }
@@ -24,17 +24,31 @@ namespace osu.Desktop.Admin
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            if (isAdmin())
-                Notifications.Post(new AdminNotification());
+
+            bool elevated = false;
+
+            if (OperatingSystem.IsWindows())
+            {
+                var windowsIdentity = WindowsIdentity.GetCurrent();
+                var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+                elevated = windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            else if (RuntimeInfo.IsUnix)
+            {
+                elevated = Mono.Unix.Native.Syscall.geteuid() == 0;
+            }
+
+            if (!elevated)
+                return;
+
+            Notifications.Post(new ElevatedPrivilegesNotification());
         }
 
-        private bool isAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
-
-        private class AdminNotification : SimpleNotification
+        private class ElevatedPrivilegesNotification : SimpleNotification
         {
             public override bool IsImportant => true;
 
-            public AdminNotification()
+            public ElevatedPrivilegesNotification()
             {
                 Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
             }
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 77f968e1b6..9f7854779e 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -115,7 +115,7 @@ namespace osu.Desktop
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
                 LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
 
-            LoadComponentAsync(new AdminChecker(), Add);
+            LoadComponentAsync(new ElevatedPrivilegesChecker(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)