Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
b11f1542
Unverified
Commit
b11f1542
authored
Jul 16, 2019
by
honfika
Committed by
GitHub
Jul 16, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #607 from justcoding121/master
Merge to beta
parents
d476e945
27660cca
Hide whitespace changes
Inline
Side-by-side
Showing
50 changed files
with
70 additions
and
157 deletions
+70
-157
Titanium.Web.Proxy.Examples.Wpf.csproj
...Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj
+0
-4
AssemblyInfo.cs
src/StreamExtended/Properties/AssemblyInfo.cs
+0
-38
StreamExtended.csproj
src/StreamExtended/StreamExtended.csproj
+0
-21
StrongKey.snk
src/StreamExtended/StrongKey.snk
+0
-0
Titanium.Web.Proxy.sln
src/Titanium.Web.Proxy.sln
+3
-13
LimitedStream.cs
src/Titanium.Web.Proxy/EventArguments/LimitedStream.cs
+2
-2
SessionEventArgs.cs
src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
+1
-1
SessionEventArgsBase.cs
...Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs
+2
-2
ExplicitClientHandler.cs
src/Titanium.Web.Proxy/ExplicitClientHandler.cs
+3
-2
SslExtensions.cs
src/Titanium.Web.Proxy/Extensions/SslExtensions.cs
+1
-1
StreamExtensions.cs
src/Titanium.Web.Proxy/Extensions/StreamExtensions.cs
+1
-1
HttpHelper.cs
src/Titanium.Web.Proxy/Helpers/HttpHelper.cs
+2
-2
HttpRequestWriter.cs
src/Titanium.Web.Proxy/Helpers/HttpRequestWriter.cs
+1
-1
HttpResponseWriter.cs
src/Titanium.Web.Proxy/Helpers/HttpResponseWriter.cs
+1
-1
HttpWriter.cs
src/Titanium.Web.Proxy/Helpers/HttpWriter.cs
+2
-2
TcpHelper.cs
src/Titanium.Web.Proxy/Helpers/TcpHelper.cs
+1
-1
ConnectRequest.cs
src/Titanium.Web.Proxy/Http/ConnectRequest.cs
+1
-1
ConnectResponse.cs
src/Titanium.Web.Proxy/Http/ConnectResponse.cs
+1
-1
HeaderParser.cs
src/Titanium.Web.Proxy/Http/HeaderParser.cs
+1
-1
DebugCustomBufferedStream.cs
src/Titanium.Web.Proxy/Network/DebugCustomBufferedStream.cs
+4
-3
ProxyClient.cs
src/Titanium.Web.Proxy/Network/ProxyClient.cs
+2
-2
TcpConnectionFactory.cs
src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
+1
-1
TcpServerConnection.cs
src/Titanium.Web.Proxy/Network/Tcp/TcpServerConnection.cs
+1
-1
ProxyServer.cs
src/Titanium.Web.Proxy/ProxyServer.cs
+2
-2
RequestHandler.cs
src/Titanium.Web.Proxy/RequestHandler.cs
+1
-1
DefaultBufferPool.cs
....Web.Proxy/StreamExtended/BufferPool/DefaultBufferPool.cs
+1
-1
IBufferPool.cs
...tanium.Web.Proxy/StreamExtended/BufferPool/IBufferPool.cs
+1
-1
ClientHelloInfo.cs
src/Titanium.Web.Proxy/StreamExtended/ClientHelloInfo.cs
+2
-2
SslCiphers.cs
src/Titanium.Web.Proxy/StreamExtended/Models/SslCiphers.cs
+1
-1
SslExtension.cs
src/Titanium.Web.Proxy/StreamExtended/Models/SslExtension.cs
+1
-1
ClientHelloAlpnAdderStream.cs
...roxy/StreamExtended/Network/ClientHelloAlpnAdderStream.cs
+2
-1
CopyStream.cs
src/Titanium.Web.Proxy/StreamExtended/Network/CopyStream.cs
+2
-1
CustomBufferedPeekStream.cs
....Proxy/StreamExtended/Network/CustomBufferedPeekStream.cs
+2
-1
CustomBufferedStream.cs
....Web.Proxy/StreamExtended/Network/CustomBufferedStream.cs
+2
-1
DataEventArgs.cs
...itanium.Web.Proxy/StreamExtended/Network/DataEventArgs.cs
+1
-1
ICustomStreamReader.cs
...m.Web.Proxy/StreamExtended/Network/ICustomStreamReader.cs
+1
-1
ICustomStreamWriter.cs
...m.Web.Proxy/StreamExtended/Network/ICustomStreamWriter.cs
+1
-1
ServerHelloAlpnAdderStream.cs
...roxy/StreamExtended/Network/ServerHelloAlpnAdderStream.cs
+2
-1
ServerHelloInfo.cs
src/Titanium.Web.Proxy/StreamExtended/ServerHelloInfo.cs
+2
-2
SslExtensions.cs
src/Titanium.Web.Proxy/StreamExtended/SslExtensions.cs
+3
-3
SslTools.cs
src/Titanium.Web.Proxy/StreamExtended/SslTools.cs
+5
-5
TaskExtended.cs
src/Titanium.Web.Proxy/StreamExtended/TaskExtended.cs
+1
-4
Titanium.Web.Proxy.Mono.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
+0
-4
Titanium.Web.Proxy.NetCore.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
+0
-4
Titanium.Web.Proxy.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
+0
-4
TransparentClientHandler.cs
src/Titanium.Web.Proxy/TransparentClientHandler.cs
+2
-2
WebSocketHandler.cs
src/Titanium.Web.Proxy/WebSocketHandler.cs
+2
-2
packages.config
src/Titanium.Web.Proxy/packages.config
+0
-6
Titanium.Web.Proxy.IntegrationTests.csproj
...tegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
+1
-1
Titanium.Web.Proxy.UnitTests.csproj
...m.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj
+1
-1
No files found.
examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj
View file @
b11f1542
...
...
@@ -142,10 +142,6 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference
Include=
"..\..\src\StreamExtended\StreamExtended.csproj"
>
<Project>
{61539dc1-ce80-41e6-a696-8f455ace8d15}
</Project>
<Name>
StreamExtended
</Name>
</ProjectReference>
<ProjectReference
Include=
"..\..\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj"
>
<Project>
{91018b6d-a7a9-45be-9cb3-79cbb8b169a6}
</Project>
<Name>
Titanium.Web.Proxy
</Name>
...
...
src/StreamExtended/Properties/AssemblyInfo.cs
deleted
100644 → 0
View file @
d476e945
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("StreamExtended.Properties")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("StreamExtended.Properties")]
[assembly: AssemblyCopyright("Copyright © Titanium 2015-2017")]
[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("5036e0b7-a0d0-4070-8eb0-72c129dee9a3")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.0.1")]
src/StreamExtended/StreamExtended.csproj
deleted
100644 → 0
View file @
d476e945
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>StrongKey.snk</AssemblyOriginatorKeyFile>
<Version>1.0.0</Version>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Description>Package Description</Description>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Network\ClientHelloAlpnAdderStream.cs" />
<Compile Remove="Network\ServerHelloAlpnAdderStream.cs" />
</ItemGroup>
<ItemGroup>
<None Remove="StreamExtended.nuspec" />
</ItemGroup>
</Project>
\ No newline at end of file
src/StreamExtended/StrongKey.snk
deleted
100644 → 0
View file @
d476e945
File deleted
src/Titanium.Web.Proxy.sln
View file @
b11f1542
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio
15
VisualStudioVersion = 1
5.0.26906.1
# Visual Studio
Version 16
VisualStudioVersion = 1
6.0.29102.190
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{B6DBABDC-C985-4872-9C38-B4E5079CBC4B}"
EndProject
...
...
@@ -31,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Titanium.Web.Proxy.Examples
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy.IntegrationTests", "..\tests\Titanium.Web.Proxy.IntegrationTests\Titanium.Web.Proxy.IntegrationTests.csproj", "{1D053D72-DCB4-4517-ACDD-D35ADC186950}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamExtended", "StreamExtended\StreamExtended.csproj", "{61539DC1-CE80-41E6-A696-8F455ACE8D15}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
...
...
@@ -81,14 +79,6 @@ Global
{1D053D72-DCB4-4517-ACDD-D35ADC186950}.Release|Any CPU.Build.0 = Release|Any CPU
{1D053D72-DCB4-4517-ACDD-D35ADC186950}.Release|x64.ActiveCfg = Release|Any CPU
{1D053D72-DCB4-4517-ACDD-D35ADC186950}.Release|x64.Build.0 = Release|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|x64.ActiveCfg = Debug|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|x64.Build.0 = Debug|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|Any CPU.Build.0 = Release|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|x64.ActiveCfg = Release|Any CPU
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
...
...
@@ -100,7 +90,7 @@ Global
{1D053D72-DCB4-4517-ACDD-D35ADC186950} = {BC1E0789-D348-49CF-8B67-5E99D50EDF64}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EnterpriseLibraryConfigurationToolBinariesPath = .1.505.2\lib\NET35
SolutionGuid = {625C1EB5-44CF-47DE-A85A-B4C8C40ED90A}
EnterpriseLibraryConfigurationToolBinariesPath = .1.505.2\lib\NET35
EndGlobalSection
EndGlobal
src/Titanium.Web.Proxy/EventArguments/LimitedStream.cs
View file @
b11f1542
...
...
@@ -2,9 +2,9 @@
using
System.Globalization
;
using
System.IO
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Exceptions
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.EventArguments
{
...
...
src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
View file @
b11f1542
...
...
@@ -4,12 +4,12 @@ using System.IO;
using
System.Net
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Compression
;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.Http.Responses
;
using
Titanium.Web.Proxy.Models
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.EventArguments
{
...
...
src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs
View file @
b11f1542
...
...
@@ -2,13 +2,13 @@
using
System.Collections.Generic
;
using
System.Net
;
using
System.Threading
;
using
StreamExtended
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.Models
;
using
Titanium.Web.Proxy.Network
;
using
Titanium.Web.Proxy.Network.Tcp
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.EventArguments
{
...
...
src/Titanium.Web.Proxy/ExplicitClientHandler.cs
View file @
b11f1542
...
...
@@ -7,8 +7,6 @@ using System.Net.Sockets;
using
System.Security.Cryptography.X509Certificates
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.EventArguments
;
using
Titanium.Web.Proxy.Exceptions
;
using
Titanium.Web.Proxy.Extensions
;
...
...
@@ -17,6 +15,9 @@ using Titanium.Web.Proxy.Http;
using
Titanium.Web.Proxy.Http2
;
using
Titanium.Web.Proxy.Models
;
using
Titanium.Web.Proxy.Network.Tcp
;
using
Titanium.Web.Proxy.StreamExtended
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
using
SslExtensions
=
Titanium
.
Web
.
Proxy
.
Extensions
.
SslExtensions
;
namespace
Titanium.Web.Proxy
{
...
...
src/Titanium.Web.Proxy/Extensions/SslExtensions.cs
View file @
b11f1542
...
...
@@ -5,7 +5,7 @@ using System.Security.Authentication;
using
System.Security.Cryptography.X509Certificates
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
Titanium.Web.Proxy.
StreamExtended
;
namespace
Titanium.Web.Proxy.Extensions
{
...
...
src/Titanium.Web.Proxy/Extensions/StreamExtensions.cs
View file @
b11f1542
...
...
@@ -2,7 +2,7 @@
using
System.IO
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
Titanium.Web.Proxy.Extensions
{
...
...
src/Titanium.Web.Proxy/Helpers/HttpHelper.cs
View file @
b11f1542
...
...
@@ -3,11 +3,11 @@ using System.Text;
using
System.Text.RegularExpressions
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Extensions
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.Shared
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.Helpers
{
...
...
src/Titanium.Web.Proxy/Helpers/HttpRequestWriter.cs
View file @
b11f1542
using
System.IO
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
Titanium.Web.Proxy.Helpers
{
...
...
src/Titanium.Web.Proxy/Helpers/HttpResponseWriter.cs
View file @
b11f1542
...
...
@@ -2,8 +2,8 @@
using
System.IO
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
Titanium.Web.Proxy.Helpers
{
...
...
src/Titanium.Web.Proxy/Helpers/HttpWriter.cs
View file @
b11f1542
...
...
@@ -4,10 +4,10 @@ using System.IO;
using
System.Text
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.Shared
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.Helpers
{
...
...
src/Titanium.Web.Proxy/Helpers/TcpHelper.cs
View file @
b11f1542
...
...
@@ -3,8 +3,8 @@ using System.IO;
using
System.Runtime.InteropServices
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
Titanium.Web.Proxy.Extensions
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
Titanium.Web.Proxy.Helpers
{
...
...
src/Titanium.Web.Proxy/Http/ConnectRequest.cs
View file @
b11f1542
using
StreamExtended
;
using
Titanium.Web.Proxy.
StreamExtended
;
namespace
Titanium.Web.Proxy.Http
{
...
...
src/Titanium.Web.Proxy/Http/ConnectResponse.cs
View file @
b11f1542
using
System
;
using
System.Net
;
using
StreamExtended
;
using
Titanium.Web.Proxy.
StreamExtended
;
namespace
Titanium.Web.Proxy.Http
{
...
...
src/Titanium.Web.Proxy/Http/HeaderParser.cs
View file @
b11f1542
using
System
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Shared
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.Http
{
...
...
src/Titanium.Web.Proxy/Network/DebugCustomBufferedStream.cs
View file @
b11f1542
#
if
DEBUG
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
#if DEBUG
using
System
;
using
System.IO
;
using
System.Text
;
using
System.Threading
;
using
StreamExtended
;
using
StreamExtended.Network
;
namespace
Titanium.Web.Proxy.Network
{
...
...
src/Titanium.Web.Proxy/Network/ProxyClient.cs
View file @
b11f1542
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Network.Tcp
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.Network
{
...
...
src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
View file @
b11f1542
...
...
@@ -8,12 +8,12 @@ using System.Net.Sockets;
using
System.Text
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.EventArguments
;
using
Titanium.Web.Proxy.Extensions
;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.Models
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.Network.Tcp
{
...
...
src/Titanium.Web.Proxy/Network/Tcp/TcpServerConnection.cs
View file @
b11f1542
...
...
@@ -5,10 +5,10 @@ using System.Net.Security;
#endif
using
System.Net.Sockets
;
using
System.Threading.Tasks
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.Extensions
;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Models
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy.Network.Tcp
{
...
...
src/Titanium.Web.Proxy/ProxyServer.cs
View file @
b11f1542
...
...
@@ -7,8 +7,6 @@ using System.Security.Authentication;
using
System.Security.Cryptography.X509Certificates
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.EventArguments
;
using
Titanium.Web.Proxy.Extensions
;
using
Titanium.Web.Proxy.Helpers
;
...
...
@@ -16,6 +14,8 @@ using Titanium.Web.Proxy.Helpers.WinHttp;
using
Titanium.Web.Proxy.Models
;
using
Titanium.Web.Proxy.Network
;
using
Titanium.Web.Proxy.Network.Tcp
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy
{
...
...
src/Titanium.Web.Proxy/RequestHandler.cs
View file @
b11f1542
...
...
@@ -9,7 +9,6 @@ using System.Net.Security;
using
System.Text.RegularExpressions
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.EventArguments
;
using
Titanium.Web.Proxy.Exceptions
;
using
Titanium.Web.Proxy.Extensions
;
...
...
@@ -19,6 +18,7 @@ using Titanium.Web.Proxy.Models;
using
Titanium.Web.Proxy.Network
;
using
Titanium.Web.Proxy.Network.Tcp
;
using
Titanium.Web.Proxy.Shared
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy
{
...
...
src/StreamExtended/BufferPool/DefaultBufferPool.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/BufferPool/DefaultBufferPool.cs
View file @
b11f1542
using
System.Collections.Concurrent
;
namespace
StreamExtended
namespace
Titanium.Web.Proxy.StreamExtended.BufferPool
{
/// <summary>
...
...
src/StreamExtended/BufferPool/IBufferPool.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/BufferPool/IBufferPool.cs
View file @
b11f1542
using
System
;
namespace
StreamExtended
namespace
Titanium.Web.Proxy.StreamExtended.BufferPool
{
/// <summary>
/// Use this interface to implement custom buffer pool.
...
...
src/StreamExtended/ClientHelloInfo.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/ClientHelloInfo.cs
View file @
b11f1542
using
StreamExtended.Models
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
Titanium.Web.Proxy.StreamExtended.Models
;
namespace
StreamExtended
namespace
Titanium.Web.Proxy.
StreamExtended
{
/// <summary>
/// Wraps up the client SSL hello information.
...
...
src/StreamExtended/Models/SslCiphers.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Models/SslCiphers.cs
View file @
b11f1542
using
System.Collections.Generic
;
namespace
StreamExtended.Models
namespace
Titanium.Web.Proxy.
StreamExtended.Models
{
internal
static
class
SslCiphers
{
...
...
src/StreamExtended/Models/SslExtension.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Models/SslExtension.cs
View file @
b11f1542
namespace
StreamExtended.Models
namespace
Titanium.Web.Proxy.
StreamExtended.Models
{
/// <summary>
/// The SSL extension information.
...
...
src/StreamExtended/Network/ClientHelloAlpnAdderStream.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/ClientHelloAlpnAdderStream.cs
View file @
b11f1542
using
System.Diagnostics
;
using
System.IO
;
using
System.Threading
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
public
class
ClientHelloAlpnAdderStream
:
Stream
{
...
...
src/StreamExtended/Network/CopyStream.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/CopyStream.cs
View file @
b11f1542
using
System
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
/// <summary>
/// Copies the source stream to destination stream.
...
...
src/StreamExtended/Network/CustomBufferedPeekStream.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/CustomBufferedPeekStream.cs
View file @
b11f1542
using
System.Threading
;
using
System.Threading.Tasks
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
internal
class
CustomBufferedPeekStream
:
ICustomStreamReader
{
...
...
src/StreamExtended/Network/CustomBufferedStream.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/CustomBufferedStream.cs
View file @
b11f1542
...
...
@@ -4,8 +4,9 @@ using System.IO;
using
System.Text
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
/// <summary>
/// A custom network stream inherited from stream
...
...
src/StreamExtended/Network/DataEventArgs.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/DataEventArgs.cs
View file @
b11f1542
using
System
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
/// <summary>
/// Wraps the data sent/received event argument.
...
...
src/StreamExtended/Network/ICustomStreamReader.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/ICustomStreamReader.cs
View file @
b11f1542
...
...
@@ -2,7 +2,7 @@
using
System.Threading
;
using
System.Threading.Tasks
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
/// <summary>
/// This concrete implemetation of interface acts as the source stream for CopyStream class.
...
...
src/StreamExtended/Network/ICustomStreamWriter.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/ICustomStreamWriter.cs
View file @
b11f1542
using
System.Threading
;
using
System.Threading.Tasks
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
/// <summary>
/// A concrete implementation of this interface is required when calling CopyStream.
...
...
src/StreamExtended/Network/ServerHelloAlpnAdderStream.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/Network/ServerHelloAlpnAdderStream.cs
View file @
b11f1542
using
System.Diagnostics
;
using
System.IO
;
using
System.Threading
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
namespace
StreamExtended.Network
namespace
Titanium.Web.Proxy.
StreamExtended.Network
{
public
class
ServerHelloAlpnAdderStream
:
Stream
{
...
...
src/StreamExtended/ServerHelloInfo.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/ServerHelloInfo.cs
View file @
b11f1542
using
StreamExtended.Models
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
Titanium.Web.Proxy.StreamExtended.Models
;
namespace
StreamExtended
namespace
Titanium.Web.Proxy.
StreamExtended
{
/// <summary>
/// Wraps up the server SSL hello information.
...
...
src/StreamExtended/SslExtensions.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/SslExtensions.cs
View file @
b11f1542
using
StreamExtended.Models
;
using
System.Collections.Generic
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
Titanium.Web.Proxy.StreamExtended.Models
;
namespace
StreamExtended
namespace
Titanium.Web.Proxy.
StreamExtended
{
internal
class
SslExtensions
{
...
...
src/StreamExtended/SslTools.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/SslTools.cs
View file @
b11f1542
using
StreamExtended.Models
;
using
StreamExtended.Network
;
using
System.Collections.Generic
;
using
System.IO
;
using
System.Collections.Generic
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Titanium.Web.Proxy.StreamExtended.BufferPool
;
using
Titanium.Web.Proxy.StreamExtended.Models
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
StreamExtended
namespace
Titanium.Web.Proxy.
StreamExtended
{
/// <summary>
/// Use this class to peek SSL client/server hello information.
...
...
src/StreamExtended/TaskExtended.cs
→
src/
Titanium.Web.Proxy/
StreamExtended/TaskExtended.cs
View file @
b11f1542
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading
;
using
System.Threading.Tasks
;
namespace
StreamExtended
namespace
Titanium.Web.Proxy.
StreamExtended
{
/// <summary>
/// Mimic a Task but you can set AsyncState
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
View file @
b11f1542
...
...
@@ -16,10 +16,6 @@
<PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\StreamExtended\StreamExtended.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="System.Web" />
</ItemGroup>
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
View file @
b11f1542
...
...
@@ -34,10 +34,6 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\StreamExtended\StreamExtended.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="System.Web" />
</ItemGroup>
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
View file @
b11f1542
...
...
@@ -39,10 +39,6 @@
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\StreamExtended\StreamExtended.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Network\WinAuth\Security\Common.cs">
<ExcludeFromSourceAnalysis>True</ExcludeFromSourceAnalysis>
...
...
src/Titanium.Web.Proxy/TransparentClientHandler.cs
View file @
b11f1542
...
...
@@ -7,14 +7,14 @@ using System.Security.Authentication;
using
System.Security.Cryptography.X509Certificates
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
StreamExtended
;
using
StreamExtended.Network
;
using
Titanium.Web.Proxy.EventArguments
;
using
Titanium.Web.Proxy.Exceptions
;
using
Titanium.Web.Proxy.Extensions
;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Models
;
using
Titanium.Web.Proxy.Network.Tcp
;
using
Titanium.Web.Proxy.StreamExtended
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy
{
...
...
src/Titanium.Web.Proxy/WebSocketHandler.cs
View file @
b11f1542
using
StreamExtended.Network
;
using
System
;
using
System
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Titanium.Web.Proxy.EventArguments
;
...
...
@@ -7,6 +6,7 @@ using Titanium.Web.Proxy.Exceptions;
using
Titanium.Web.Proxy.Helpers
;
using
Titanium.Web.Proxy.Http
;
using
Titanium.Web.Proxy.Network.Tcp
;
using
Titanium.Web.Proxy.StreamExtended.Network
;
namespace
Titanium.Web.Proxy
{
...
...
src/Titanium.Web.Proxy/packages.config
deleted
100644 → 0
View file @
d476e945
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<
packages
>
<
package
id
=
"BouncyCastle"
version
=
"1.8.3.1"
targetFramework
=
"net45"
/>
<
package
id
=
"BrotliSharpLib"
version
=
"0.3.1"
targetFramework
=
"net45"
/>
<
package
id
=
"StreamExtended"
version
=
"1.0.190"
targetFramework
=
"net45"
/>
</
packages
>
\ No newline at end of file
tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
View file @
b11f1542
...
...
@@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.
0.1
" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.
2.0
" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>
...
...
tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj
View file @
b11f1542
...
...
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.
0.1
" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.
2.0
" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment