Skip to content
This repository was archived by the owner on Jul 9, 2023. It is now read-only.

Beta #518

Merged
merged 41 commits into from
Nov 4, 2018
Merged

Beta #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
5759c93
Merge pull request #1 from justcoding121/master
antrv Oct 11, 2018
c963bc5
use .net core 2.1 in example proj
justcoding121 Oct 11, 2018
8b0e1e7
Do not call SetInternetOption when restoring proxy state at the syste…
antrv-verto Oct 17, 2018
5e2fdbb
Fixes #509 (BCCertificateMaker issue on Mono)
kfreezen Oct 18, 2018
1e982c6
Merge pull request #508 from antrv/feature/sysproxy-win7
justcoding121 Oct 18, 2018
fc03aff
Merge pull request #510 from kfreezen/fix-bccertificatemaker-on-mono
justcoding121 Oct 18, 2018
e765f16
API documentation update by build server
Oct 18, 2018
4848e5d
Add failing interception test that reads the request body and also ca…
Oct 24, 2018
9c56e63
This allows server to read body, and to cancel request to the server …
Oct 24, 2018
f3e64cd
Merge pull request #517 from roblascelles/read-body-and-cancel-reques…
justcoding121 Oct 31, 2018
487ecbd
API documentation update by build server
Oct 31, 2018
e4f3e7d
setup integration tests for continous integration
justcoding121 Nov 2, 2018
8ef4bee
add integration test root certificate to use
justcoding121 Nov 2, 2018
0f74953
assert test
justcoding121 Nov 2, 2018
2e0864c
use fixed version to prevent buildbot version change comments
justcoding121 Nov 2, 2018
6e9016c
cleanup integration tests
justcoding121 Nov 2, 2018
87d2894
update nuget packages
justcoding121 Nov 2, 2018
d5a79a4
try clear appveyor repo cache
justcoding121 Nov 2, 2018
bd6d41c
try clear repo build cache
justcoding121 Nov 2, 2018
f99b9a2
setup rdp
justcoding121 Nov 2, 2018
b2486d8
API documentation update by build server
Nov 2, 2018
7dc276b
install cert elevated
justcoding121 Nov 2, 2018
1ba9c94
Merge branch 'master' of https://github.com/justcoding121/Titanium-We…
justcoding121 Nov 2, 2018
7dd2fd8
fix docs proj
justcoding121 Nov 2, 2018
3febfb1
try remove cache
justcoding121 Nov 2, 2018
81a35ea
delete repo cache in build
justcoding121 Nov 2, 2018
e2b706e
try skip restore
justcoding121 Nov 2, 2018
cb9a25f
skip cache restore
justcoding121 Nov 2, 2018
de6daa7
fix yml
justcoding121 Nov 2, 2018
cd55e75
disable shallow clone
justcoding121 Nov 2, 2018
d7cb3b3
API documentation update by build server
Nov 2, 2018
d413f1a
enable build rdp for debugging
justcoding121 Nov 2, 2018
c2462ce
Merge branch 'master' of https://github.com/justcoding121/Titanium-We…
justcoding121 Nov 2, 2018
6204032
cleanup
justcoding121 Nov 2, 2018
987df82
API documentation update by build server
Nov 2, 2018
20420aa
fix certificate
justcoding121 Nov 2, 2018
89ceb5d
add dev test root
justcoding121 Nov 2, 2018
a8a969f
rdp onfinish
justcoding121 Nov 2, 2018
3f70964
Revert "rdp onfinish"
justcoding121 Nov 2, 2018
5036d9d
remove rdp debug
justcoding121 Nov 2, 2018
536dd6d
update build badge
justcoding121 Nov 3, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .build/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,27 @@ $MSBuild -replace ' ', '` '
FormatTaskName (("-"*25) + "[{0}]" + ("-"*25))

#default task
Task default -depends Clean, Build, Document, Package
Task default -depends Package

#cleans obj, b
Task Clean {
Get-ChildItem .\ -include bin,obj -Recurse | foreach ($_) { Remove-Item $_.fullname -Force -Recurse }
exec { . $MSBuild $SolutionFile /t:Clean /v:quiet }
}

#install root cetificate needed for integration tests
Task Setup-Integration-Test-Tools -depends Clean {

$startInfo = new-object System.Diagnostics.ProcessStartInfo "PowerShell";
$startInfo.Arguments = "$Here\install-certificate.ps1";
$startInfo.Verb = "runas";
$process = [System.Diagnostics.Process]::Start($startInfo);
$process.WaitForExit()

}

#install build tools
Task Install-BuildTools -depends Clean {
Task Install-BuildTools -depends Setup-Integration-Test-Tools {
if(!(Test-Path $MSBuild))
{
cinst microsoft-build-tools -y
Expand Down
1 change: 1 addition & 0 deletions .build/cleanup-cache.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Modify this text to trigger appveyor build cache
10 changes: 10 additions & 0 deletions .build/install-certificate.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
$Here = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"

$pfx = new-object System.Security.Cryptography.X509Certificates.X509Certificate2
$certPath = "$Here\lib\rootCert.pfx"
$pfxPass = ""
$pfx.import($certPath,$pfxPass,"Exportable,PersistKeySet")
$store = new-object System.Security.Cryptography.X509Certificates.X509Store([System.Security.Cryptography.X509Certificates.StoreName]::Root, "localmachine")
$store.open("MaxAllowed")
$store.add($pfx)
$store.close()
Binary file added .build/lib/rootCert.pfx
Binary file not shown.
2 changes: 1 addition & 1 deletion .build/setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function Install-DocFx()
{
if(!(Test-Path $env:ChocolateyInstall\lib\docfx\tools*))
{
choco install docfx
choco install docfx --version 2.40.1
}
$env:Path += ";$env:ChocolateyInstall\lib\docfx\tools"
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A light weight HTTP(S) proxy server written in C#

<a href="https://ci.appveyor.com/project/justcoding121/titanium-web-proxy">![Build Status](https://ci.appveyor.com/api/projects/status/rvlxv8xgj0m7lkr4?svg=true)</a> [![Join the chat at https://gitter.im/Titanium-Web-Proxy/Lobby](https://badges.gitter.im/Titanium-Web-Proxy/Lobby.svg)](https://gitter.im/Titanium-Web-Proxy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
<a href="https://ci.appveyor.com/project/justcoding121/titanium-web-proxy">![Build Status](https://ci.appveyor.com/api/projects/status/p5vvtbpx9yp250ol?svg=true)</a> [![Join the chat at https://gitter.im/Titanium-Web-Proxy/Lobby](https://badges.gitter.im/Titanium-Web-Proxy/Lobby.svg)](https://gitter.im/Titanium-Web-Proxy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Kindly report only issues/bugs here . For programming help or questions use [StackOverflow](http://stackoverflow.com/questions/tagged/titanium-web-proxy) with the tag Titanium-Web-Proxy.

Expand Down
7 changes: 5 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
version: 3.0.{build}
image: Visual Studio 2017

shallow_clone: true
shallow_clone: false

#---------------------------------#
# build configuration #
Expand All @@ -22,10 +22,13 @@ platform: Any CPU
# build Configuration, i.e. Debug, Release, etc.
configuration: Release

#set file change to watch so that cache can be invalidated on demand.
cache: .build\cleanup-cache.txt

# to run your custom scripts instead of automatic MSBuild
build_script:
- cmd: build.bat Package

assembly_info:
patch: true
file: AssemblyInfo.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width">
<meta name="title" content="Delegate AsyncEventHandler&lt;TEventArgs&gt;
| Titanium Web Proxy ">
<meta name="generator" content="docfx 2.39.2.0">
<meta name="generator" content="docfx 2.40.1.0">

<link rel="shortcut icon" href="../favicon.ico">
<link rel="stylesheet" href="../styles/docfx.vendor.css">
Expand Down Expand Up @@ -154,6 +154,12 @@ <h5 class="typeParameters">Type Parameters</h5>
<div class="sideaffix">
<div class="contribution">
<ul class="nav">
<li>
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_AsyncEventHandler_1.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.AsyncEventHandler%601%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
</li>
<li>
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/EventArguments/AsyncEventHandler.cs/#L12" class="contribution-link">View Source</a>
</li>
</ul>
</div>
<nav class="bs-docs-sidebar hidden-print hidden-xs hidden-sm affix" id="affix">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width">
<meta name="title" content="Class BeforeSslAuthenticateEventArgs
| Titanium Web Proxy ">
<meta name="generator" content="docfx 2.39.2.0">
<meta name="generator" content="docfx 2.40.1.0">

<link rel="shortcut icon" href="../favicon.ico">
<link rel="stylesheet" href="../styles/docfx.vendor.css">
Expand Down Expand Up @@ -127,8 +127,13 @@ <h5 id="Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_syntax"
</div>
<h3 id="properties">Properties
</h3>


<span class="small pull-right mobile-hide">
<span class="divider">|</span>
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_DecryptSsl.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.DecryptSsl%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/EventArguments/BeforeSslAuthenticateEventArgs.cs/#L29">View Source</a>
</span>
<a id="Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_DecryptSsl_" data-uid="Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.DecryptSsl*"></a>
<h4 id="Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_DecryptSsl" data-uid="Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.DecryptSsl">DecryptSsl</h4>
<div class="markdown level1 summary"><p>Should we decrypt the SSL request?
Expand All @@ -155,8 +160,13 @@ <h5 class="propertyValue">Property Value</h5>
</tr>
</tbody>
</table>


<span class="small pull-right mobile-hide">
<span class="divider">|</span>
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_SniHostName.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.SniHostName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/EventArguments/BeforeSslAuthenticateEventArgs.cs/#L22">View Source</a>
</span>
<a id="Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_SniHostName_" data-uid="Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.SniHostName*"></a>
<h4 id="Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_SniHostName" data-uid="Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.SniHostName">SniHostName</h4>
<div class="markdown level1 summary"><p>The server name indication hostname if available. Otherwise the generic certificate hostname of
Expand Down Expand Up @@ -184,8 +194,13 @@ <h5 class="propertyValue">Property Value</h5>
</table>
<h3 id="methods">Methods
</h3>


<span class="small pull-right mobile-hide">
<span class="divider">|</span>
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_TerminateSession.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.TerminateSession%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/EventArguments/BeforeSslAuthenticateEventArgs.cs/#L34">View Source</a>
</span>
<a id="Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_TerminateSession_" data-uid="Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.TerminateSession*"></a>
<h4 id="Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs_TerminateSession" data-uid="Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.TerminateSession">TerminateSession()</h4>
<div class="markdown level1 summary"><p>Terminate the request abruptly by closing client/server connections.</p>
Expand All @@ -202,6 +217,12 @@ <h5 class="decalaration">Declaration</h5>
<div class="sideaffix">
<div class="contribution">
<ul class="nav">
<li>
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_BeforeSslAuthenticateEventArgs.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
</li>
<li>
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/EventArguments/BeforeSslAuthenticateEventArgs.cs/#L9" class="contribution-link">View Source</a>
</li>
</ul>
</div>
<nav class="bs-docs-sidebar hidden-print hidden-xs hidden-sm affix" id="affix">
Expand Down
Loading