[build] New staging version

openbullet · openbullet · commit cd07dad2f5d6 · 2024-08-12T23:17:54.000+02:00
- Fixed auto word selection in native winforms RTB
- Removed label from auto block bool params
- Fixed hardcoded timeout when connecting with RL HTTP without a proxy
- Removed CapSolver support
- Upgraded CaptchaSharp to 2.1.0
- Added AYCD AutoSolve support
- Added block to Solves a Cloudflare Challenge page
diff --git a/OpenBullet2.Native/ViewModels/RLSettingsViewModel.cs b/OpenBullet2.Native/ViewModels/RLSettingsViewModel.cs
@@ -554,6 +554,16 @@ public string CapGuruApiKey
             OnPropertyChanged();
         }
     }
+    
+    public string AycdApiKey
+    {
+        get => Captcha.AycdApiKey;
+        set
+        {
+            Captcha.AycdApiKey = value;
+            OnPropertyChanged();
+        }
+    }
 
     public string PuppeteerChromeBinaryLocation
     {
diff --git a/OpenBullet2.Native/Views/Pages/RLSettings.xaml b/OpenBullet2.Native/Views/Pages/RLSettings.xaml
@@ -487,6 +487,17 @@
                             </StackPanel>
                         </StackPanel>
                     </TabItem>
+                    
+                    <!-- AYCD -->
+                    <TabItem>
+                        <StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
+                                <Label>Api Key</Label>
+                                <TextBox Text="{Binding AycdApiKey}"
+                                         Width="400"></TextBox>
+                            </StackPanel>
+                        </StackPanel>
+                    </TabItem>
                 </TabControl>
                 <Button x:Name="checkBalanceButton" 
                         Click="CheckCaptchaBalance" 
diff --git a/RuriLib/Blocks/Captchas/Methods.cs b/RuriLib/Blocks/Captchas/Methods.cs
@@ -414,14 +414,14 @@ public static async Task<string> SolveRecaptchaMobile(BotData data, string appPa
         extraInfo =
             "The response will be a list and its elements are (in order) captcha id, lot number, pass token, gen time, captcha output")]
     public static async Task<List<string>> SolveGeeTestV4Captcha(BotData data, string captchaId,
-        string siteUrl, string userAgent =
+        string siteUrl, bool useProxy = false, string userAgent =
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36")
     {
         data.Logger.LogHeader();
         await CheckBalanceAsync(data).ConfigureAwait(false);
         
         var response = await data.Providers.Captcha.SolveGeeTestV4Async(captchaId, siteUrl,
-            CreateSessionParams(data, useProxy: false, userAgent), data.CancellationToken).ConfigureAwait(false);
+            CreateSessionParams(data, useProxy, userAgent), data.CancellationToken).ConfigureAwait(false);
         
         AddCaptchaId(data, response.Id, CaptchaType.GeeTestV4);
         data.Logger.Log("Got solution!", LogColors.ElectricBlue);
@@ -433,6 +433,24 @@ public static async Task<List<string>> SolveGeeTestV4Captcha(BotData data, strin
         return [response.CaptchaId, response.LotNumber, response.PassToken, response.GenTime, response.CaptchaOutput];
     }
 
+    [Block("Solves a Cloudflare Challenge page",
+        extraInfo = "The response will contain the value of the cf_clearance cookie")]
+    public static async Task<string> SolveCloudflareChallengePage(BotData data,
+        string siteUrl, string pageHtml, bool useProxy = false, string userAgent =
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36")
+    {
+        data.Logger.LogHeader();
+        await CheckBalanceAsync(data).ConfigureAwait(false);
+        
+        var response = await data.Providers.Captcha.SolveCloudflareChallengePageAsync(
+            siteUrl, pageHtml,
+            CreateSessionParams(data, useProxy, userAgent), data.CancellationToken).ConfigureAwait(false);
+        
+        AddCaptchaId(data, response.Id, CaptchaType.CloudflareChallengePage);
+        data.Logger.Log($"Got solution: {response.Response}", LogColors.ElectricBlue);
+        return response.Response;
+    }
+
     [Block("Reports an incorrectly solved captcha to the service in order to get funds back")]
     public static async Task ReportLastSolution(BotData data)
     {
diff --git a/RuriLib/Functions/Captchas/CaptchaServiceFactory.cs b/RuriLib/Functions/Captchas/CaptchaServiceFactory.cs
@@ -45,6 +45,7 @@ public static CaptchaService GetService(CaptchaSettings settings)
             CaptchaServiceType.EndCaptcha => new EndCaptchaService(settings.EndCaptchaUsername, settings.EndCaptchaPassword),
             CaptchaServiceType.BestCaptchaSolver => new BestCaptchaSolverService(settings.BestCaptchaSolverApiKey),
             CaptchaServiceType.CapGuru => new CapGuruService(settings.CapGuruApiKey),
+            CaptchaServiceType.Aycd => new AycdService(settings.AycdApiKey),
             _ => throw new NotSupportedException(),
         };
 
diff --git a/RuriLib/Functions/Captchas/CaptchaServiceType.cs b/RuriLib/Functions/Captchas/CaptchaServiceType.cs
@@ -85,4 +85,7 @@ public enum CaptchaServiceType
         
     /// <summary>The service provided by https://cap.guru/</summary>
     CapGuru = 27,
+    
+    /// <summary>The service provided by https://aycd.io/</summary>
+    Aycd = 28,
 }
diff --git a/RuriLib/Models/Settings/CaptchaSettings.cs b/RuriLib/Models/Settings/CaptchaSettings.cs
@@ -46,4 +46,5 @@ public class CaptchaSettings
     public string EndCaptchaUsername { get; set; } = "";
     public string EndCaptchaPassword { get; set; } = "";
     public string CapGuruApiKey { get; set; } = "";
+    public string AycdApiKey { get; set; } = "";
 }
diff --git a/RuriLib/Providers/Captchas/CaptchaSharpProvider.cs b/RuriLib/Providers/Captchas/CaptchaSharpProvider.cs
@@ -130,6 +130,10 @@ public Task<GeeTestV4Response> SolveGeeTestV4Async(
         string captchaId, string siteUrl, SessionParams? sessionParams = null, CancellationToken cancellationToken = default)
         => _service.SolveGeeTestV4Async(captchaId, siteUrl, sessionParams, cancellationToken);
     
+    public Task<StringResponse> SolveCloudflareChallengePageAsync(
+        string siteUrl, string pageHtml, SessionParams? sessionParams = null, CancellationToken cancellationToken = default)
+        => _service.SolveCloudflareChallengePageAsync(siteUrl, pageHtml, sessionParams, cancellationToken);
+    
     public Task ReportSolutionAsync(string captchaId, CaptchaType type, bool correct,
         CancellationToken cancellationToken = default)
         => _service.ReportSolutionAsync(captchaId, type, correct, cancellationToken);
diff --git a/RuriLib/Providers/Captchas/ICaptchaProvider.cs b/RuriLib/Providers/Captchas/ICaptchaProvider.cs
@@ -113,6 +113,10 @@ Task<GeeTestV4Response> SolveGeeTestV4Async(
         string captchaId, string siteUrl,
         SessionParams? sessionParams = null, CancellationToken cancellationToken = default);
 
+    Task<StringResponse> SolveCloudflareChallengePageAsync(
+        string siteUrl, string pageHtml,
+        SessionParams? sessionParams = null, CancellationToken cancellationToken = default);
+
     Task ReportSolutionAsync(
         string id, CaptchaType type, bool correct = false, CancellationToken cancellationToken = default);
 }
diff --git a/RuriLib/RuriLib.csproj b/RuriLib/RuriLib.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="1.1.2" />
 	<PackageReference Include="BCrypt.Net-Core" Version="1.6.0" />
-    <PackageReference Include="CaptchaSharp" Version="2.0.0" />
+    <PackageReference Include="CaptchaSharp" Version="2.1.0" />
     <PackageReference Include="DeviceId" Version="5.2.0" />
     <PackageReference Include="FluentFTP" Version="50.0.1" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
diff --git a/openbullet2-web-client/src/app/main/components/rl-settings/rl-settings.component.html b/openbullet2-web-client/src/app/main/components/rl-settings/rl-settings.component.html
@@ -565,6 +565,17 @@ <h3>Captchas</h3>
                 placeholder="API_KEY" />
         </div>
     </div>
+    <div class="row my-3" *ngIf="settings.captchaSettings.currentService === CaptchaServiceType.Aycd">
+        <div class="col-12">
+            <span class="mr-2">AYCD API Key</span>
+            <app-input-text key="aycdApiKey"
+                class="input-small" [style]="{ width: '600px' }"
+                (touched)="touched = true" ngDefaultControl
+                (validityChange)="onValidityChange($event)"
+                [(ngModel)]="settings.captchaSettings.aycdApiKey"
+                placeholder="API_KEY" />
+        </div>
+    </div>
     <div class="row my-3">
         <div class="col-12">
             <button class="button button-secondary"
diff --git a/openbullet2-web-client/src/app/main/components/rl-settings/rl-settings.component.ts b/openbullet2-web-client/src/app/main/components/rl-settings/rl-settings.component.ts
@@ -74,6 +74,7 @@ export class RlSettingsComponent implements OnInit, DeactivatableComponent {
     CaptchaServiceType.EndCaptcha,
     CaptchaServiceType.BestCaptchaSolver,
     CaptchaServiceType.CapGuru,
+    CaptchaServiceType.Aycd,
   ];
   CaptchaServiceType = CaptchaServiceType;
 
diff --git a/openbullet2-web-client/src/app/main/dtos/settings/rl-settings.dto.ts b/openbullet2-web-client/src/app/main/dtos/settings/rl-settings.dto.ts
@@ -31,6 +31,7 @@ export enum CaptchaServiceType {
   EndCaptcha = 'endCaptcha',
   BestCaptchaSolver = 'bestCaptchaSolver',
   CapGuru = 'capGuru',
+  Aycd = 'aycd',
 }
 
 export enum BrowserType {
@@ -99,6 +100,7 @@ export interface CaptchaRLSettings {
   endCaptchaUsername: string;
   endCaptchaPassword: string;
   capGuruApiKey: string;
+  aycdApiKey: string;
 }
 
 export interface ProxyRLSettings {

Original file line number	Diff line number	Diff line change
`@@ -554,6 +554,16 @@ public string CapGuruApiKey`
`554`	`554`	`OnPropertyChanged();`
`555`	`555`	`}`
`556`	`556`	`}`
	`557`	`+`
	`558`	`+ public string AycdApiKey`
	`559`	`+ {`
	`560`	`+ get => Captcha.AycdApiKey;`
	`561`	`+ set`
	`562`	`+ {`
	`563`	`+ Captcha.AycdApiKey = value;`
	`564`	`+ OnPropertyChanged();`
	`565`	`+ }`
	`566`	`+ }`
`557`	`567`
`558`	`568`	`public string PuppeteerChromeBinaryLocation`
`559`	`569`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,7 @@ public enum CaptchaServiceType`
`85`	`85`
`86`	`86`	`/// <summary>The service provided by https://cap.guru/</summary>`
`87`	`87`	`CapGuru = 27,`
	`88`	`+`
	`89`	`+ /// <summary>The service provided by https://aycd.io/</summary>`
	`90`	`+ Aycd = 28,`
`88`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,5 @@ public class CaptchaSettings`
`46`	`46`	`public string EndCaptchaUsername { get; set; } = "";`
`47`	`47`	`public string EndCaptchaPassword { get; set; } = "";`
`48`	`48`	`public string CapGuruApiKey { get; set; } = "";`
	`49`	`+ public string AycdApiKey { get; set; } = "";`
`49`	`50`	`}`