Merge branch 'master' into Cyberboss-patch-2

.github/CONTRIBUTING.md

@@ -162,3 +162,7 @@ Just becuase something isn't on this list doesn't mean that it's acceptable. Use
 Yes, we know that the files have a tonne of mixed Windows and Linux line endings. Attempts to fix this have been met with less than stellar success, and as such we have decided to give up caring until there comes a time when it matters.
 
 Therefore, EOF settings of main repo are forbidden territory one must avoid wandering into, at risk of losing body and/or mind to the Git gods.
+
+## Other Notes
+
+* Feel free to add your nuget account to TGServiceInterface/Packages.nuspec authors list if you modify the interface

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)

TGServiceInterface/TGServiceInterface.csproj

@@ -72,6 +72,7 @@
     <Content Include="tgs.ico" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="TGServiceInterface.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

TGServiceInterface/TGServiceInterface.nuspec

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>Cyberboss</authors>
+    <licenseUrl>https://github.com/tgstation/tgstation-server/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/tgstation/tgstation-server</projectUrl>
+    <iconUrl>https://tgstation.github.io/tgstation-server/tgs.ico</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Interface for managing /tg/station server</description>
+    <copyright>Copyright 2017</copyright>
+    <releaseNotes>https://github.com/tgstation/tgstation-server/releases/tag/tgstation-server-v$version$</releaseNotes>
+    <tags>tgstation game-server byond service toolset wcf ss13 client-lib tgstation-server api wcf-service soap</tags>
+    <dependencies>
+      <group targetFramework="net452">
+        <dependency id="UnmanagedExports" version="1.2.7" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="bin\x86\Release\TGServiceInterface.xml" target="lib\net452" />
+  </files>
+</package>

Version.cs

@@ -12,6 +12,6 @@ using System.Reflection;
 // [assembly: AssemblyVersion("1.0.*")]
 
 //It's impossible to make these a define, don't say I didn't warn you 
-[assembly: AssemblyVersion("3.1.6.1")]
-[assembly: AssemblyFileVersion("3.1.6.1")]
-[assembly: AssemblyInformationalVersion("3.1.6.1")]
+[assembly: AssemblyVersion("3.1.6.3")]
+[assembly: AssemblyFileVersion("3.1.6.3")]
+[assembly: AssemblyInformationalVersion("3.1.6.3")]

appveyor.yml

@@ -16,6 +16,8 @@ artifacts:
   name: TGS3Client
 - path: MD5-SHA1-Client-v*.txt
   name: MD5SHA1Client
+cache:
+  - packages -> **\packages.config
 install:
   - choco install fciv doxygen.portable graphviz.portable
 before_build:
@@ -24,17 +26,25 @@ build:
   project: TGStationServer3.sln
   parallel: true
   verbosity: minimal
+  publish_nuget: true
 after_build:
   - ps: .\Tools\TGS3Build.ps1
   - ps: if($env:APPVEYOR_REPO_COMMIT_MESSAGE -match "\[TGSDeploy\]"){$env:TGSDeploy = "Do it."}
   - ps: $env:TGSVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$env:APPVEYOR_BUILD_FOLDER/TGServerService/bin/x86/Release/TGServerService.exe").FileVersion
 deploy:
-  release: "tgstation-server-v$(TGSVersion)"
-  description: 'The /tg/station server suite'
-  provider: GitHub
-  auth_token:
-    secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK
-  artifact: TGS3Server,MD5SHA1Server,TGS3Client,MD5SHA1Client
-  draft: false
-  on:
-    TGSDeploy: "Do it."
+  - provider: GitHub
+    release: "tgstation-server-v$(TGSVersion)"
+    description: 'The /tg/station server suite'
+    auth_token:
+      secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK
+    artifact: TGS3Server,MD5SHA1Server,TGS3Client,MD5SHA1Client
+    draft: false
+    on:
+      TGSDeploy: "Do it."
+  - provider: NuGet
+    api_key:
+      secure: bedsYuLMqGREzkVkJqRx+BTMgOvDO76tgaNc8sW5E3Ao6iw8oGHdJ/BZov8y0iKa
+    skip_symbols: true
+    artifact: /.*\.nupkg/
+    on:
+      TGSDeploy: "Do it."