From 1ec302039dec6eebd1348ff9d78ce8f24207a1be Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Tue, 31 Oct 2017 19:38:55 -0400
Subject: [PATCH] Makes authentication work with Windows domains

---
 .../ServerInstance/Administration.cs           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/TGServerService/ServerInstance/Administration.cs b/TGServerService/ServerInstance/Administration.cs
index edd69e730c..50e42e7f5f 100644
--- a/TGServerService/ServerInstance/Administration.cs
+++ b/TGServerService/ServerInstance/Administration.cs
@@ -38,9 +38,14 @@ namespace TGServerService
 			{
 				if (TheDroidsWereLookingFor == null)
 					return "ADMIN";
-
-				var pc = new PrincipalContext(ContextType.Machine);
-				return GroupPrincipal.FindByIdentity(pc, IdentityType.Sid, TheDroidsWereLookingFor.Value).Name;
+				
+				string res = null;
+				try
+				{
+					res = GroupPrincipal.FindByIdentity(new PrincipalContext(ContextType.Machine), IdentityType.Sid, TheDroidsWereLookingFor.Value).Name;
+				}
+				catch { }
+				return res ?? GroupPrincipal.FindByIdentity(new PrincipalContext(ContextType.Domain), IdentityType.Sid, TheDroidsWereLookingFor.Value).Name;
 			}
 			catch
 			{
@@ -66,11 +71,12 @@ namespace TGServerService
 		/// Set <see cref="TheDroidsWereLookingFor"/> based off either an <paramref name="search"/>ed name or a string <see cref="SecurityIdentifier"/> from the config
 		/// </summary>
 		/// <param name="search">The name of the group to search for</param>
+		/// <param name="useDomain">Recursive parameter used to check for the group using <see cref="ContextType.Domain"/> instead of <see cref="ContextType.Machine"/></param>
 		/// <returns>The name of the group allowed to access the <see cref="ServerInstance"/> if it could be found, <see langword="null"/> otherwise</returns>
-		string FindTheDroidsWereLookingFor(string search = null)
+		string FindTheDroidsWereLookingFor(string search = null, bool useDomain = false)
 		{
 			//find the group that is authorized to use the tools
-			var pc = new PrincipalContext(ContextType.Machine);
+			var pc = new PrincipalContext(useDomain ? ContextType.Domain : ContextType.Machine);
 			var config = Properties.Settings.Default;
 			var groupName = search ?? config.AuthorizedGroupSID;
 			if (String.IsNullOrWhiteSpace(groupName))
@@ -82,7 +88,7 @@ namespace TGServerService
 					//try again with all types
 					gp = GroupPrincipal.FindByIdentity(pc, search);
 				if (gp == null)
-					return null;
+					return useDomain ? null : FindTheDroidsWereLookingFor(search, true);
 			}
 			TheDroidsWereLookingFor = gp.Sid;
 			if (search != null)