-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #167 from ivanbiljan/connectionloop
Add ConnectionLoop Modification
- Loading branch information
Showing
5 changed files
with
184 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using Mono.Cecil; | ||
| using Mono.Cecil.Cil; | ||
| using OTAPI.Patcher.Engine; | ||
| using OTAPI.Patcher.Engine.Extensions.ILProcessor; | ||
| using OTAPI.Patcher.Engine.Modification; | ||
| using Terraria; | ||
|
|
||
| namespace TShock.Modifications.ConnectionLoop | ||
| { | ||
| /// <summary> | ||
| /// This modification is used to inject a network check which ensures that the sever does not enter an infinite loop | ||
| /// when clients repeatedly connect and disconnect. | ||
| /// </summary> | ||
| public sealed class ConnectionLoop : ModificationBase | ||
| { | ||
| /// <inheritdoc /> | ||
| public override IEnumerable<string> AssemblyTargets => | ||
| new[] {"OTAPI, Version=1.3.5.3, Culture=neutral, PublicKeyToken=null"}; | ||
|
|
||
| /// <inheritdoc /> | ||
| public override string Description => "Patching connection loop exploit..."; | ||
|
|
||
| /// <inheritdoc /> | ||
| public override void Run() | ||
| { | ||
| var checkBytes = Method(() => Terraria.NetMessage.CheckBytesDirect(0)); | ||
|
|
||
| // Find the proper instruction range => if (i < num2) | ||
| var targetInstruction = checkBytes.Body.Instructions.Single(i => | ||
| i.OpCode == OpCodes.Blt_S && i.Previous.OpCode == OpCodes.Ldloc_S && | ||
| i.Previous.Previous.OpCode == OpCodes.Ldloc_3); | ||
| checkBytes.Body.GetILProcessor().InsertAfter(targetInstruction, | ||
| new[] | ||
| { | ||
| Instruction.Create(OpCodes.Ldloc_S, checkBytes.Body.Variables[4]), | ||
| Instruction.Create(OpCodes.Ldc_I4_0), | ||
| Instruction.Create(OpCodes.Beq_S, targetInstruction.Operand as Instruction) | ||
| }.AsEnumerable()); | ||
| } | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
TShock.Modifications.ConnectionLoop/Properties/AssemblyInfo.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| // General Information about an assembly is controlled through the following | ||
| // set of attributes. Change these attribute values to modify the information | ||
| // associated with an assembly. | ||
| [assembly: AssemblyTitle("TShock.Modifications.ConnectionLoop")] | ||
| [assembly: AssemblyDescription("")] | ||
| [assembly: AssemblyConfiguration("")] | ||
| [assembly: AssemblyCompany("")] | ||
| [assembly: AssemblyProduct("TShock.Modifications.ConnectionLoop")] | ||
| [assembly: AssemblyCopyright("Copyright © 2019")] | ||
| [assembly: AssemblyTrademark("")] | ||
| [assembly: AssemblyCulture("")] | ||
|
|
||
| // Setting ComVisible to false makes the types in this assembly not visible | ||
| // to COM components. If you need to access a type in this assembly from | ||
| // COM, set the ComVisible attribute to true on that type. | ||
| [assembly: ComVisible(false)] | ||
|
|
||
| // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
| [assembly: Guid("b466e59a-8a07-46b1-b7c7-33dbc3a0c375")] | ||
|
|
||
| // Version information for an assembly consists of the following four values: | ||
| // | ||
| // Major Version | ||
| // Minor Version | ||
| // Build Number | ||
| // Revision | ||
| // | ||
| // You can specify all the values or you can default the Build and Revision Numbers | ||
| // by using the '*' as shown below: | ||
| // [assembly: AssemblyVersion("1.0.*")] | ||
| [assembly: AssemblyVersion("1.0.0.0")] | ||
| [assembly: AssemblyFileVersion("1.0.0.0")] |
72 changes: 72 additions & 0 deletions
72
TShock.Modifications.ConnectionLoop/TShock.Modifications.ConnectionLoop.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{B466E59A-8A07-46B1-B7C7-33DBC3A0C375}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>TShock.Modifications.ConnectionLoop</RootNamespace> | ||
| <AssemblyName>TShock.Modifications.ConnectionLoop</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <Deterministic>true</Deterministic> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="OTAPI, Version=1.3.5.3, Culture=neutral, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\OTAPI.2.0.0.32\lib\net451\OTAPI.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="OTAPI.Patcher.Engine"> | ||
| <HintPath>..\prebuilt\OTAPI.Patcher.Engine.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Net.Http" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="ConnectionLoop.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" /> | ||
| <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" /> | ||
| <package id="OTAPI" version="2.0.0.32" targetFramework="net452" /> | ||
| </packages> |