Fix remove record from cloudflare (#6)

* Fix remove dns record from cloudflare

* allow push images from PR

* Update selenium

* Use normalized dns name

* uncomment docker push rule

Co-authored-by: Клабуков Эрик Константинович <klabukov@skbkontur.ru>

Author: AMEST

Dockerfile

@@ -6,7 +6,7 @@ RUN dotnet publish ./DotNetCertBot.Host/DotNetCertBot.Host.csproj -c Release --s
     dotnet nuget locals http-cache --clear;\
     dotnet nuget locals temp --clear
 
-FROM selenium/standalone-chrome:96.0.4664.110 as certbot
+FROM selenium/standalone-chrome:97.0 as certbot
 COPY --from=build /app /certbot
 WORKDIR /certbot
 USER root

DotNetCertBot.CloudFlareUserApi/CloudFlareServiceSelenium.cs

@@ -41,7 +41,7 @@ public CloudFlareServiceSelenium(IConfiguration configuration, ILogger<CloudFlar
                 {"userAgent", RandomUserAgent.Generate()}
             });
             _driver.Navigate().GoToUrl(CloudFlareLoginUrl);
-            _waiter = new WebDriverWait(_driver, TimeSpan.FromSeconds(25));
+            _waiter = new WebDriverWait(_driver, TimeSpan.FromSeconds(40));
         }
 
         public async Task<bool> CheckAuth()
@@ -82,11 +82,13 @@ public Task ClearChallenge(string zoneName, string name)
         {
             return Task.Run(async () =>
             {
-                var normalizedName = NormalizeDnsName(name, zoneName);
-                _logger.LogInformation("Remove {txtName} form zone {zoneName}", normalizedName, zoneName);
-                var dnsRecord = _waiter.Until(d =>
-                    d.FindElement(By.XPath($"//div[contains(text(),'{normalizedName}')]")));
-                await MouseClick(dnsRecord);
+                var normalizedDnsName = NormalizeDnsName(name, zoneName);
+                _logger.LogInformation("Remove {txtName} from zone {zoneName}", normalizedDnsName, zoneName);
+                var dnsRecordCell = _waiter.Until(d =>
+                    d.FindElement(By.XPath($"//div[contains(text(),'{normalizedDnsName}')]")));
+                var dnsRecordRow = dnsRecordCell.GetParent().GetParent();
+                var editButton = dnsRecordRow.FindElements(By.TagName("button")).Last();
+                await MouseClick(editButton);
                 var deleteButton = _waiter.Until(d => d.FindElement(By.XPath("//button[contains(text(),'Delete')]")));
                 await MouseClick(deleteButton);
                 var iSureDeleteButton =

DotNetCertBot.CloudFlareUserApi/DotNetCertBot.CloudFlareUserApi.csproj

@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.13" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.13" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="96.0.4664.4500" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="97.0.4692.7100" />
     <PackageReference Include="Skidbladnir.Modules" Version="1.3.3-unstalable.0.2" />
   </ItemGroup>
 

DotNetCertBot.CloudFlareUserApi/SeleniumExtensions.cs

@@ -0,0 +1,12 @@
+using OpenQA.Selenium;
+
+namespace DotNetCertBot.CloudFlareUserApi
+{
+    internal static class SeleniumExtensions
+    {
+        public static IWebElement GetParent(this IWebElement node)
+        {
+            return node.FindElement(By.XPath(".."));
+        }
+    }
+}

DotNetCertBot.Host/DotNetCertBot.Host.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.13" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.13" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.13" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="96.0.4664.4500" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="97.0.4692.7100" />
     <PackageReference Include="Skidbladnir.Modules" Version="1.3.3-unstalable.0.2" />
   </ItemGroup>