From 61c7e3f1ee52f9bea4eb66b5683e2e07786247de Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Fri, 8 Dec 2017 12:05:51 -0500
Subject: [PATCH] More security improvements to the wrappers

---
 TGS.Interface/Wrappers/IInstance.cs |  7 +++-
 TGS.Interface/Wrappers/IServer.cs   | 11 +++--
 TGS.Interface/Wrappers/Instance.cs  | 26 +++++++++++-
 TGS.Interface/Wrappers/Server.cs    | 63 +++++++++++++----------------
 4 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/TGS.Interface/Wrappers/IInstance.cs b/TGS.Interface/Wrappers/IInstance.cs
index a6895998d9..81db529014 100644
--- a/TGS.Interface/Wrappers/IInstance.cs
+++ b/TGS.Interface/Wrappers/IInstance.cs
@@ -13,7 +13,12 @@ namespace TGS.Interface.Wrappers
 		InstanceMetadata Metadata { get; }
 
 		/// <summary>
-		/// The <see cref="ITGAdministration"/> component
+		/// Check if the connected user is an administrator of the <see cref="IInstance"/>
+		/// </summary>
+		bool UserIsAdministrator { get; }
+
+		/// <summary>
+		/// The <see cref="ITGAdministration"/> component. Will be <see langword="null"/> if <see cref="UserIsAdministrator"/> is <see langword="false"/>
 		/// </summary>
 		ITGAdministration Administration { get; }
 
diff --git a/TGS.Interface/Wrappers/IServer.cs b/TGS.Interface/Wrappers/IServer.cs
index e06e7cb624..48ffc3d6cf 100644
--- a/TGS.Interface/Wrappers/IServer.cs
+++ b/TGS.Interface/Wrappers/IServer.cs
@@ -7,12 +7,12 @@ namespace TGS.Interface.Wrappers
 	/// <summary>
 	/// Wrapper representing a <see cref="ITGSService"/>
 	/// </summary>
-	public interface IServer : ITGSService
+	public interface IServer
 	{
 		/// <summary>
 		/// The <see cref="System.Version"/> of the <see cref="IServer"/>
 		/// </summary>
-		new Version Version { get; }
+		Version Version { get; }
 		
 		/// <summary>
 		/// Get the <see cref="IInstance"/>s the <see cref="IServer"/> contains that the current user can access and connect to
@@ -20,10 +20,15 @@ namespace TGS.Interface.Wrappers
 		IEnumerable<IInstance> Instances { get; }
 
 		/// <summary>
-		/// The <see cref="ITGInstanceManager"/> component
+		/// The <see cref="ITGInstanceManager"/> component. Will be <see langword="null"/> if the connected user is not an administrator of the <see cref="IServer"/>
 		/// </summary>
 		ITGInstanceManager InstanceManager { get; }
 
+		/// <summary>
+		/// The <see cref="ITGSService"/> component. Will be <see langword="null"/> if the connected user is not an administrator of the <see cref="IServer"/>
+		/// </summary>
+		ITGSService Management { get; }
+
 		/// <summary>
 		/// Gets the specified <see cref="IInstance"/> without connectivity checks
 		/// </summary>
diff --git a/TGS.Interface/Wrappers/Instance.cs b/TGS.Interface/Wrappers/Instance.cs
index 72d9e364b4..f90d2202c8 100644
--- a/TGS.Interface/Wrappers/Instance.cs
+++ b/TGS.Interface/Wrappers/Instance.cs
@@ -14,6 +14,10 @@ namespace TGS.Interface.Wrappers
 		/// The name of the <see cref="IInstance"/>
 		/// </summary>
 		InstanceMetadata metadata;
+		/// <summary>
+		/// Whether or not the current user is known to be an administrator of the <see cref="IInstance"/>
+		/// </summary>
+		bool isAdministrator;
 
 		/// <summary>
 		/// Construct an <see cref="Instance"/>
@@ -41,8 +45,28 @@ namespace TGS.Interface.Wrappers
 			}
 		}
 
+		public bool UserIsAdministrator { get
+			{
+				lock (this)
+				{
+					if (isAdministrator)
+						return true;
+					try
+					{
+						Administration.GetCurrentAuthorizedGroup();
+						isAdministrator = true;
+						return true;
+					}
+					catch
+					{
+						return false;
+					}
+				}
+			}
+		}
+
 		/// <inheritdoc />
-		public ITGAdministration Administration => serverInterface.GetComponent<ITGAdministration>(metadata.Name);
+		public ITGAdministration Administration => UserIsAdministrator ? serverInterface.GetComponent<ITGAdministration>(metadata.Name) : null;
 
 		/// <inheritdoc />
 		public ITGByond Byond => serverInterface.GetComponent<ITGByond>(metadata.Name);
diff --git a/TGS.Interface/Wrappers/Server.cs b/TGS.Interface/Wrappers/Server.cs
index 71b918ffe2..a826b623f4 100644
--- a/TGS.Interface/Wrappers/Server.cs
+++ b/TGS.Interface/Wrappers/Server.cs
@@ -35,10 +35,37 @@ namespace TGS.Interface.Wrappers
 		/// <inheritdoc />
 		public ITGInstanceManager InstanceManager => serverInterface.GetComponent<ITGInstanceManager>(null);
 
+		/// <inheritdoc />
+		public ITGSService Management
+		{
+			get
+			{
+				var component = serverInterface.GetComponent<ITGSService>(null);
+				lock (this)
+				{
+					if (!userIsAdministrator)
+						try
+						{
+							var test = component.Version();
+							userIsAdministrator = true;
+						}
+						catch
+						{
+							return null;
+						}
+				}
+				return component;
+			}
+		}
+
 		/// <summary>
 		/// The backing <see cref="ServerInterface"/>
 		/// </summary>
 		readonly ServerInterface serverInterface;
+		/// <summary>
+		/// If the connected user is an administrator of the <see cref="IServer"/>
+		/// </summary>
+		bool userIsAdministrator;
 
 		/// <summary>
 		/// Result of a call to <see cref="ITGLanding.ListInstances"/>
@@ -59,41 +86,5 @@ namespace TGS.Interface.Wrappers
 		{
 			return new Instance(serverInterface, new InstanceMetadata { Name = name, Enabled = false });
 		}
-
-		/// <inheritdoc />
-		public void PrepareForUpdate()
-		{
-			serverInterface.GetComponent<ITGSService>(null).PrepareForUpdate();
-		}
-
-		/// <inheritdoc />
-		public string PythonPath()
-		{
-			return serverInterface.GetComponent<ITGSService>(null).PythonPath();
-		}
-
-		/// <inheritdoc />
-		public ushort RemoteAccessPort()
-		{
-			return serverInterface.GetComponent<ITGSService>(null).RemoteAccessPort();
-		}
-
-		/// <inheritdoc />
-		public bool SetPythonPath(string path)
-		{
-			return serverInterface.GetComponent<ITGSService>(null).SetPythonPath(path);
-		}
-
-		/// <inheritdoc />
-		public string SetRemoteAccessPort(ushort port)
-		{
-			return serverInterface.GetComponent<ITGSService>(null).SetRemoteAccessPort(port);
-		}
-
-		/// <inheritdoc />
-		string ITGSService.Version()
-		{
-			return serverInterface.GetComponent<ITGSService>(null).Version();
-		}
 	}
 }