IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 05:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix connecting on XMLSocket-

Browse source
This commit is contained in:
Li 2022-11-20 12:47:18 +13:00
parent 44ada661d7
commit f716fedec5
7 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HorseIsleServer/HISPd/Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.48.0")] [assembly: AssemblyVersion("1.8.51.0")]
[assembly: AssemblyFileVersion("1.8.48.0")] [assembly: AssemblyFileVersion("1.8.51.0")]

2
HorseIsleServer/HISPd/Resources/DEBIAN/control
View file

@ -1,5 +1,5 @@
Package: hisp Package: hisp
Version: 1.8.48 Version: 1.8.51
Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
Maintainer: Li Maintainer: Li
Homepage: https://islehorse.com Homepage: https://islehorse.com

4
HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.48.0")] [assembly: AssemblyVersion("1.8.51.0")]
[assembly: AssemblyFileVersion("1.8.48.0")] [assembly: AssemblyFileVersion("1.8.51.0")]

14
HorseIsleServer/LibHISP/Security/CrossDomainPolicy.cs
View file

@ -10,19 +10,9 @@ namespace HISP.Security
if (!File.Exists(ConfigReader.CrossDomainPolicyFile)) { if (!File.Exists(ConfigReader.CrossDomainPolicyFile)) {
Logger.InfoPrint("Cross-Domain-Policy file not found, using default"); Logger.InfoPrint("Cross-Domain-Policy file not found, using default");
File.WriteAllText(ConfigReader.CrossDomainPolicyFile, Resources.DefaultCrossDomain); File.WriteAllText(ConfigReader.CrossDomainPolicyFile, Resources.DefaultCrossDomain);
} }
MemoryStream ms = new MemoryStream();
byte[] policyFileBytes = File.ReadAllBytes(ConfigReader.CrossDomainPolicyFile); byte[] policyFileBytes = File.ReadAllBytes(ConfigReader.CrossDomainPolicyFile);
ms.Write(policyFileBytes, 0x00, policyFileBytes.Length); return policyFileBytes;
ms.WriteByte(0x00);
ms.Seek(0x00, SeekOrigin.Begin);
byte[] policyFileData = ms.ToArray();
ms.Close();
return policyFileData;
} }
} }
} }

6
HorseIsleServer/LibHISP/Server/Network/Hybrid.cs
View file

@ -13,7 +13,7 @@ namespace HISP.Server.Network
get get
{ {
if(actualTransport == null) if(actualTransport == null)
return "TransportDeterminer"; return "Hybrid";
else else
return actualTransport.Name; return actualTransport.Name;
} }
@ -60,7 +60,7 @@ namespace HISP.Server.Network
if (ConfigReader.EnableWebSocket && WebSocket.IsStartOfHandshake(buffer)) if (ConfigReader.EnableWebSocket && WebSocket.IsStartOfHandshake(buffer))
{ {
Logger.InfoPrint(this.Ip + " Switching to WebSocket"); Logger.DebugPrint(this.Ip + " Switching to WebSocket");
actualTransport = new WebSocket(); actualTransport = new WebSocket();
actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback); actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback);
@ -69,7 +69,7 @@ namespace HISP.Server.Network
} }
else else
{ {
Logger.InfoPrint(this.Ip + " Switching to XmlSocket"); Logger.DebugPrint(this.Ip + " Switching to XmlSocket");
actualTransport = new XmlSocket(); actualTransport = new XmlSocket();
actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback); actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback);

13
HorseIsleServer/LibHISP/Server/Network/XmlSocket.cs
View file

@ -10,6 +10,7 @@ namespace HISP.Server.Network
{ {
private List<byte> currentPacket = new List<byte>(); private List<byte> currentPacket = new List<byte>();
private const byte XMLSOCKET_PACKET_TERMINATOR = 0x00; private const byte XMLSOCKET_PACKET_TERMINATOR = 0x00;
private static byte[] XMLSOCKET_POLICY_FILE = Encoding.UTF8.GetBytes("<policy-file-request/>");
public override void ProcessReceivedPackets(int available, byte[] buffer) public override void ProcessReceivedPackets(int available, byte[] buffer)
{ {
// In XmlSocket Packets are terminates by 0x00 so we have to read until we receive that terminator // In XmlSocket Packets are terminates by 0x00 so we have to read until we receive that terminator
@ -18,17 +19,17 @@ namespace HISP.Server.Network
{ {
if (buffer[i] == XMLSOCKET_PACKET_TERMINATOR) // Read until \0... if (buffer[i] == XMLSOCKET_PACKET_TERMINATOR) // Read until \0...
{ {
onReceiveCallback(currentPacket.ToArray()); byte[] packet = currentPacket.ToArray();
if (Helper.ByteArrayStartsWith(packet, XMLSOCKET_POLICY_FILE))
this.Send(CrossDomainPolicy.GetPolicyFile());
onReceiveCallback(packet);
currentPacket.Clear(); currentPacket.Clear();
continue;
} }
currentPacket.Add(buffer[i]); currentPacket.Add(buffer[i]);
} }
// Handle XMLSocket Policy File
if (Helper.ByteArrayStartsWith(buffer, Encoding.UTF8.GetBytes("<policy-file-request/>")))
{
this.Send(CrossDomainPolicy.GetPolicyFile());
}
} }
public override string Name public override string Name

4
HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.48.0")] [assembly: AssemblyVersion("1.8.51.0")]
[assembly: AssemblyFileVersion("1.8.48.0")] [assembly: AssemblyFileVersion("1.8.51.0")]