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 #211 from Cyberboss/31Release [TGSDeploy]

Browse Source 
Fixes transport level security blocking remote access
This commit is contained in:
Jordan Brown
2017-09-24 12:35:46 -04:00
committed by GitHub
parent e8bea08e5f 9b09421533
commit 52b6decb9c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/ServerService.cs
+1
View File
@@ -215,6 +215,7 @@ namespace TGServerService
MaxReceivedMessageSize = Server.TransferLimitRemote
};
var requireAuth = typetype.Name != typeof(ITGConnectivity).Name;
httpsBinding.Security.Transport.ClientCredentialType = HttpClientCredentialType.None;
httpsBinding.Security.Mode = requireAuth ? SecurityMode.TransportWithMessageCredential : SecurityMode.Transport; //do not require auth for a connectivity check
httpsBinding.Security.Message.ClientCredentialType = requireAuth ? MessageCredentialType.UserName : MessageCredentialType.None;
host.AddServiceEndpoint(typetype, httpsBinding, bindingName);
TGServiceInterface/Server.cs
+1
View File
@@ -130,6 +130,7 @@ namespace TGServiceInterface
MaxReceivedMessageSize = TransferLimitRemote
};
var requireAuth = InterfaceName != typeof(ITGConnectivity).Name;
binding.Security.Transport.ClientCredentialType = HttpClientCredentialType.None;
binding.Security.Mode = requireAuth ? SecurityMode.TransportWithMessageCredential : SecurityMode.Transport; //do not require auth for a connectivity check
binding.Security.Message.ClientCredentialType = requireAuth ? MessageCredentialType.UserName : MessageCredentialType.None;
var address = new EndpointAddress(String.Format("https://{0}:{1}/{2}/{3}", HTTPSURL, HTTPSPort, MasterInterfaceName, InterfaceName));
Version.cs
+3 -3
View File
@@ -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.0.1")]
[assembly: AssemblyFileVersion("3.1.0.1")]
[assembly: AssemblyInformationalVersion("3.1.0.1")]
[assembly: AssemblyVersion("3.1.0.2")]
[assembly: AssemblyFileVersion("3.1.0.2")]
[assembly: AssemblyInformationalVersion("3.1.0.2")]