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

Commit 7945d6a

Browse files
committed
Fix some proxy-related stuff
1 parent 4cee2d6 commit 7945d6a

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

src/Milky/CheckerBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public CheckerBuilder WithProxiesFromUrl(string url, ProxySettings settings)
7272
{
7373
var responseString = _lazyWebClient.Value.DownloadString(url);
7474

75-
string[] proxies = responseString.Split(new[] { @"\n", @"\r" }, StringSplitOptions.RemoveEmptyEntries);
75+
string[] proxies = responseString.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
7676

7777
WithProxies(proxies, settings);
7878

src/Milky/Models/Proxy.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public Proxy(string proxy, ProxySettings settings)
4646

4747
internal NetworkCredential Credentials { get; }
4848

49-
internal HttpClient GetHttpClient()
49+
public HttpClient GetHttpClient(CookieContainer cookieContainer = null)
5050
{
51-
var httpMessageHandler = GetHttpMessageHandler();
51+
var httpMessageHandler = GetHttpMessageHandler(cookieContainer);
5252

5353
var httpClient = new HttpClient(httpMessageHandler)
5454
{
@@ -63,7 +63,7 @@ internal HttpClient GetHttpClient()
6363
return httpClient;
6464
}
6565

66-
private HttpMessageHandler GetHttpMessageHandler()
66+
public HttpMessageHandler GetHttpMessageHandler(CookieContainer cookieContainer = null)
6767
{
6868
if (Settings.Protocol == ProxyProtocol.HTTP)
6969
{
@@ -72,7 +72,7 @@ private HttpMessageHandler GetHttpMessageHandler()
7272
Proxy = new WebProxy(Host, Port) { Credentials = Credentials },
7373
AllowAutoRedirect = Settings.AllowAutoRedirect,
7474
UseCookies = Settings.UseCookies,
75-
CookieContainer = Settings.CookieContainer ?? new CookieContainer()
75+
CookieContainer = cookieContainer ?? new CookieContainer()
7676
};
7777
}
7878

@@ -92,19 +92,19 @@ private HttpMessageHandler GetHttpMessageHandler()
9292
{
9393
AllowAutoRedirect = Settings.AllowAutoRedirect,
9494
UseCookies = Settings.UseCookies,
95-
CookieContainer = Settings.CookieContainer
95+
CookieContainer = cookieContainer
9696
},
9797
ProxyProtocol.SOCKS4A => new ProxyClientHandler<Socks4a>(proxySettings)
9898
{
9999
AllowAutoRedirect = Settings.AllowAutoRedirect,
100100
UseCookies = Settings.UseCookies,
101-
CookieContainer = Settings.CookieContainer
101+
CookieContainer = cookieContainer
102102
},
103103
ProxyProtocol.SOCKS5 => new ProxyClientHandler<Socks5>(proxySettings)
104104
{
105105
AllowAutoRedirect = Settings.AllowAutoRedirect,
106106
UseCookies = Settings.UseCookies,
107-
CookieContainer = Settings.CookieContainer
107+
CookieContainer = cookieContainer
108108
}
109109
};
110110
}

src/Milky/Models/ProxySettings.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,5 @@ public ProxySettings(ProxyProtocol protocol)
2929
/// Whether or not to use/save/keep cookies, usually not recommended for credential stuffing but who knows
3030
/// </summary>
3131
public bool UseCookies { get; set; } = false;
32-
33-
/// <summary>
34-
/// Default <see cref="System.Net.CookieContainer"/>, I see no use case for it for credential stuffing but who knows
35-
/// </summary>
36-
public CookieContainer CookieContainer { get; set; } = null;
3732
}
3833
}

0 commit comments

Comments
 (0)