Skip to content

CCL-5676 Proxy refactoring #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azeriker merged 6 commits into from
Feb 11, 2025
Merged

CCL-5676 Proxy refactoring #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f187718
Merge branch 'task/CCL-5527'
andreiprokoshev Jan 28, 2025
0af97d9
Proxy refactoring
andreiprokoshev Feb 6, 2025
95482b4
Documentation fixes
andreiprokoshev Feb 6, 2025
94e078d
Up version
andreiprokoshev Feb 6, 2025
89b5e58
Generic refactoring
andreiprokoshev Feb 11, 2025
88b4920
Renamed proxy test method
andreiprokoshev Feb 11, 2025
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
499 changes: 7 additions & 492 deletions CapMonsterCloud.Client.IntegrationTests/IntegrationTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

227 changes: 15 additions & 212 deletions CapMonsterCloud.Client.IntegrationTests/ObjectGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,7 @@ public static RecaptchaV2Request CreateTask(
UserAgent = Gen.UserAgent(),
Cookies = Gen.ListOfValues(Gen.RandomString).ToDictionary(_ => Gen.RandomString(), value => value),
NoCache = Gen.RandomBool(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = proxyPort ?? Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static RecaptchaV2ProxylessRequest CreateProxylessTask()
{
return new RecaptchaV2ProxylessRequest
{
WebsiteUrl = Gen.RandomUri().ToString(),
WebsiteKey = Gen.RandomGuid(),
DataSValue = Gen.RandomString(),
UserAgent = Gen.UserAgent(),
Cookies = Gen.ListOfValues(Gen.RandomString).ToDictionary(_ => Gen.RandomString(), value => value),
NoCache = Gen.RandomBool()
Proxy = new ProxyContainer(Gen.RandomString(), proxyPort ?? Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -125,23 +108,7 @@ public static FunCaptchaRequest CreateTask()
Subdomain = Gen.RandomString(),
Data = Gen.RandomString(),
NoCache = Gen.RandomBool(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static FunCaptchaProxylessRequest CreateProxylessTask()
{
return new FunCaptchaProxylessRequest
{
WebsiteUrl = Gen.RandomUri().ToString(),
WebsiteKey = Gen.RandomGuid(),
Subdomain = Gen.RandomString(),
Data = Gen.RandomString(),
NoCache = Gen.RandomBool()
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -174,28 +141,7 @@ public static HCaptchaRequest CreateHCaptchaTask()
FallbackToActualUA = Gen.RandomBool(),
Cookies = Gen.ListOfValues(Gen.RandomString).ToDictionary(_ => Gen.RandomString(), value => value),
NoCache = Gen.RandomBool(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static HCaptchaProxylessRequest CreateHCaptchaProxylessTask()
{
return new HCaptchaProxylessRequest
{
WebsiteUrl = Gen.RandomUri().ToString(),
WebsiteKey = Gen.RandomGuid(),
Invisible = Gen.RandomBool(),
Data = Gen.RandomString(),
#pragma warning disable CS0618
UserAgent = Gen.UserAgent(),
#pragma warning restore CS0618
FallbackToActualUA = Gen.RandomBool(),
Cookies = Gen.ListOfValues(Gen.RandomString).ToDictionary(_ => Gen.RandomString(), value => value),
NoCache = Gen.RandomBool()
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -229,26 +175,7 @@ public static GeeTestRequest CreateTask(
Subdomain = Gen.RandomString(),
GetLib = Gen.RandomString(),
UserAgent = Gen.UserAgent(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static GeeTestProxylessRequest CreateProxylessTask()
{
return new GeeTestProxylessRequest()
{
WebsiteUrl = Gen.RandomUri().ToString(),
Gt = Gen.RandomString(),
Version = Gen.RandomInt(3, 4),
InitParameters = new { riskType = "slide" },
Challenge = Gen.RandomString(),
Subdomain = Gen.RandomString(),
GetLib = Gen.RandomString(),
UserAgent = Gen.UserAgent()
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -282,22 +209,7 @@ public static RecaptchaV2EnterpriseRequest CreateTask()
WebsiteKey = Gen.RandomString(),
EnterprisePayload = Gen.RandomString(),
DataSValue = Gen.RandomString(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static RecaptchaV2EnterpriseProxylessRequest CreateProxylessTask()
{
return new RecaptchaV2EnterpriseProxylessRequest()
{
WebsiteUrl = Gen.RandomUri().ToString(),
WebsiteKey = Gen.RandomString(),
EnterprisePayload = Gen.RandomString(),
DataSValue = Gen.RandomString()
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand All @@ -314,11 +226,11 @@ public static CaptchaResult<RecaptchaV2EnterpriseResponse> CreateSolution()
}
}

public static class TurnstileProxyless
public static class Turnstile
{
public static TurnstileProxylessRequest CreateTask()
public static TurnstileRequest CreateTask()
{
return new TurnstileProxylessRequest
return new TurnstileRequest
{
WebsiteUrl = Gen.RandomUri().ToString(),
WebsiteKey = Gen.RandomGuid(),
Expand All @@ -329,7 +241,8 @@ public static TurnstileProxylessRequest CreateTask()
HtmlPageBase64 = Gen.RandomString(),
UserAgent = Gen.UserAgent(),
ApiJsUrl = Gen.RandomUri().ToString(),
NoCache = Gen.RandomBool()
NoCache = Gen.RandomBool(),
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -420,21 +333,7 @@ public static DataDomeCustomTaskRequest CreateDataDomeTask()
WebsiteUrl = Gen.RandomUri().ToString(),
UserAgent = Gen.UserAgent(),
Domains = Gen.ListOfValues(Gen.RandomString),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static DataDomeCustomTaskProxylessRequest CreateDataDomeProxylessTask()
{
return new DataDomeCustomTaskProxylessRequest(Gen.RandomString(), Gen.RandomUri().ToString(), Gen.RandomString())
{
WebsiteUrl = Gen.RandomUri().ToString(),
UserAgent = Gen.UserAgent(),
Domains = Gen.ListOfValues(Gen.RandomString)
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -470,21 +369,7 @@ public static TenDiCustomTaskRequest CreateTenDiTask()
WebsiteKey = Gen.RandomGuid(),
WebsiteUrl = Gen.RandomUri().ToString(),
UserAgent = Gen.UserAgent(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static TenDiCustomTaskProxylessRequest CreateTenDiProxylessTask()
{
return new TenDiCustomTaskProxylessRequest
{
WebsiteKey = Gen.RandomGuid(),
WebsiteUrl = Gen.RandomUri().ToString(),
UserAgent = Gen.UserAgent(),
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand All @@ -508,21 +393,7 @@ public static BasiliskCustomTaskRequest CreateBasiliskTask()
WebsiteKey = Gen.RandomGuid(),
WebsiteUrl = Gen.RandomUri().ToString(),
UserAgent = Gen.UserAgent(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static BasiliskCustomTaskProxylessRequest CreateBasiliskProxylessTask()
{
return new BasiliskCustomTaskProxylessRequest()
{
WebsiteKey = Gen.RandomGuid(),
WebsiteUrl = Gen.RandomUri().ToString(),
UserAgent = Gen.UserAgent(),
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -553,43 +424,7 @@ public static AmazonWafRequest CreateTask()
Context = Gen.RandomString(),
Iv = Gen.RandomString(),
CookieSolution = Gen.RandomBool(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static CaptchaResult<AmazonWafResponse> CreateSolution()
{
return new CaptchaResult<AmazonWafResponse>
{
Error = null,
Solution = new AmazonWafResponse
{
CaptchaVoucher = Gen.RandomString(),
ExistingToken = Gen.RandomString(),
UserAgent = Gen.UserAgent(),
Cookies = new Dictionary<string, string> { { Gen.RandomString(), Gen.RandomString() } }
}
};
}
}

public static class AmazonWafProxyless
{
public static AmazonWafProxylessRequest CreateTask()
{
return new AmazonWafProxylessRequest()
{
WebsiteUrl = Gen.RandomUri().ToString(),
WebsiteKey = Gen.RandomGuid(),
CaptchaScript = Gen.RandomString(),
ChallengeScript = Gen.RandomString(),
Context = Gen.RandomString(),
Iv = Gen.RandomString(),
CookieSolution = Gen.RandomBool()
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down Expand Up @@ -619,39 +454,7 @@ public static BinanceTaskRequest CreateTask()
WebsiteKey = Gen.RandomGuid(),
ValidateId = Gen.RandomString(),
UserAgent = Gen.UserAgent(),
ProxyType = Gen.RandomEnum<ProxyType>(),
ProxyAddress = Gen.RandomString(),
ProxyPort = Gen.RandomInt(0, 65535),
ProxyLogin = Gen.RandomString(),
ProxyPassword = Gen.RandomString()
};
}

public static CaptchaResult<BinanceTaskResponse> CreateSolution()
{
return new CaptchaResult<BinanceTaskResponse>
{
Error = null,
Solution = new BinanceTaskResponse
{
Value = Gen.RandomString(),
UserAgent = Gen.UserAgent(),
Cookies = new Dictionary<string, string> { { Gen.RandomString(), Gen.RandomString() } }
}
};
}
}

public static class BinanceTaskProxyless
{
public static BinanceTaskProxylessRequest CreateTask()
{
return new BinanceTaskProxylessRequest()
{
WebsiteUrl = Gen.RandomUri().ToString(),
WebsiteKey = Gen.RandomGuid(),
ValidateId = Gen.RandomString(),
UserAgent = Gen.UserAgent()
Proxy = new ProxyContainer(Gen.RandomString(), Gen.RandomInt(0, 65535), Gen.RandomEnum<ProxyType>(), Gen.RandomString(), Gen.RandomString())
};
}

Expand Down
Loading
Loading