cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 05:56:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191 from Cyberboss/RemoveCertificateBS

Browse Source 
Various fixes
This commit is contained in:
Jordan Brown
2017-09-19 17:04:08 -04:00
committed by GitHub
parent 24e1bfbba4 fd89027260
commit 2869bcba19
6 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DMAPI/st_interface.dm
+2 -3
View File
@@ -57,12 +57,11 @@ SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE)
ExportService(SERVICE_REQUEST_WORLD_REBOOT) //just let em know
/world/proc/ServiceCommand(list/params)
var/sCK = RunningService()
var/their_sCK = params[SERVICE_CMD_PARAM_KEY]
if(!their_sCK)
if(!their_sCK || !RunningService(TRUE))
return FALSE //continue world/Topic
var/sCK = world.params[SERVICE_WORLD_PARAM]
if(their_sCK != sCK)
return "Invalid comms key!";
TGServerService/App.config
+4 -1
View File
@@ -56,7 +56,7 @@
<value>0</value>
</setting>
<setting name="SettingsVersion" serializeAs="String">
<value>3</value>
<value>4</value>
</setting>
<setting name="ReattachCommsKey" serializeAs="String">
<value />
@@ -70,6 +70,9 @@
<setting name="RemoteAccessPort" serializeAs="String">
<value>38607</value>
</setting>
<setting name="ReattachAPIVersion" serializeAs="String">
<value />
</setting>
</TGServerService.Properties.Settings>
</userSettings>
</configuration>
TGServerService/DreamDaemon.cs
+9 -1
View File
@@ -53,10 +53,14 @@ namespace TGServerService
RestartInProgress = true;
currentPort = Properties.Settings.Default.ReattachPort;
serviceCommsKey = Properties.Settings.Default.ReattachCommsKey;
try
{
GameAPIVersion = new Version(Properties.Settings.Default.ReattachAPIVersion);
}
catch { }
currentStatus = TGDreamDaemonStatus.Online;
DDWatchdog = new Thread(new ThreadStart(Watchdog));
DDWatchdog.Start();
RequestRestart(); //TODO: Remove this when DD -> Service communication is more
}
catch (Exception e)
{
@@ -391,6 +395,10 @@ namespace TGServerService
StartingSecurity = (TGDreamDaemonSecurity)Config.ServerSecurity;
Proc.StartInfo.Arguments = String.Format("{0} -port {1} {5}-close -verbose -params \"server_service={3}&server_service_version={4}\" -{2} -public", DMB, Config.ServerPort, SecurityWord(), serviceCommsKey, Version(), Config.Webclient ? "-webclient" : "");
UpdateInterfaceDll(true);
lock (topicLock)
{
GameAPIVersion = null; //needs updating
}
Proc.Start();
if (!Proc.WaitForInputIdle(DDHangStartTime * 1000))
TGServerService/Interop.cs
+40 -13
View File
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Text;
using System.Threading;
using System.Web.Script.Serialization;
using System.Web.Security;
using TGServiceInterface;
@@ -18,8 +19,9 @@ namespace TGServerService
string serviceCommsKey; //regenerated every DD restart
//range of supported api versions
const string MinAPIVersion = "3.1.0.0";
const string MaxAPIVersion = "3.1.0.99";
readonly Version MinAPIVersion = new Version("3.1.0.0");
readonly Version MaxAPIVersion = new Version("3.1.0.99");
Version GameAPIVersion;
//See code/modules/server_tools/server_tools.dm for command switch
const string SCHardReboot = "hard_reboot"; //requests that dreamdaemon restarts when the round ends
@@ -64,6 +66,15 @@ namespace TGServerService
cmd = splits[0];
splits.RemoveAt(0);
bool APIValid;
lock (topicLock)
{
APIValid = CheckAPIVersionConstraints();
}
if (!APIValid && cmd != SRAPIVersion)
return; //SPEAK THE LANGUAGE!!!
switch (cmd)
{
case SRIRCBroadcast:
@@ -84,24 +95,32 @@ namespace TGServerService
if (UpdateStaged)
{
UpdateStaged = false;
lock (topicLock)
{
GameAPIVersion = null; //needs updating
}
TGServerService.WriteInfo("Staged update applied", TGServerService.EventID.ServerUpdateApplied);
}
}
break;
case SRAPIVersion:
try
lock (topicLock)
{
var theirs = new Version(splits[1]);
var minimum = new Version(MinAPIVersion);
var maximum = new Version(MaxAPIVersion);
if (theirs < minimum || theirs > maximum)
throw new Exception();
SendCommand(SCAPICompat);
}
catch
{
TGServerService.WriteWarning("API version of the game ({0}) is incompatible with the current supported API versions (Min: {1}. Max: {2})", TGServerService.EventID.APIVersionMismatch);
try
{
GameAPIVersion = new Version(splits[0]);
if (!CheckAPIVersionConstraints())
throw new Exception();
}
catch
{
TGServerService.WriteWarning(String.Format("API version of the game ({0}) is incompatible with the current supported API versions (Min: {1}. Max: {2}). Interop disabled.", splits.Count > 1 ? splits[1] : "NULL", MinAPIVersion, MaxAPIVersion), TGServerService.EventID.APIVersionMismatch);
GameAPIVersion = null;
break;
}
}
//This needs to be done asyncronously otherwise DD won't be able to process it, because it's waiting for THIS THREAD to return
ThreadPool.QueueUserWorkItem(_ => SendCommand(SCAPICompat));
break;
}
}
@@ -116,10 +135,18 @@ namespace TGServerService
}
}
//requires topiclock
bool CheckAPIVersionConstraints()
{
return !(GameAPIVersion == null || GameAPIVersion < MinAPIVersion || GameAPIVersion > MaxAPIVersion);
}
//Fuckery to diddle byond with the right packet to accept our girth
string SendTopic(string topicdata, ushort port)
{
lock (topicLock) {
if (!CheckAPIVersionConstraints())
return "Incompatible API!";
using (var topicSender = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { SendTimeout = 5000, ReceiveTimeout = 5000 })
{
try
TGServerService/Properties/Settings.Designer.cs
Generated
+13 -1
View File
@@ -205,7 +205,7 @@ namespace TGServerService.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("3")]
[global::System.Configuration.DefaultSettingValueAttribute("4")]
public int SettingsVersion {
get {
return ((int)(this["SettingsVersion"]));
@@ -262,5 +262,17 @@ namespace TGServerService.Properties {
this["RemoteAccessPort"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ReattachAPIVersion {
get {
return ((string)(this["ReattachAPIVersion"]));
}
set {
this["ReattachAPIVersion"] = value;
}
}
}
}
TGServerService/Properties/Settings.settings
+4 -1
View File
@@ -48,7 +48,7 @@
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="SettingsVersion" Type="System.Int32" Scope="User">
<Value Profile="(Default)">3</Value>
<Value Profile="(Default)">4</Value>
</Setting>
<Setting Name="ReattachCommsKey" Type="System.String" Scope="User">
<Value Profile="(Default)" />
@@ -62,5 +62,8 @@
<Setting Name="RemoteAccessPort" Type="System.UInt16" Scope="User">
<Value Profile="(Default)">38607</Value>
</Setting>
<Setting Name="ReattachAPIVersion" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>