Revert "Fix reachable and IP leak test (#44)" (#46)

This reverts commit 3f5d7bb.

Author: PCJones

UmlautAdaptarr/Program.cs

@@ -8,12 +8,10 @@
 
 internal class Program
 {
-    private static void Main(string[] args) {
-        MainAsync(args).Wait();
-    }
-
-    private static async Task MainAsync(string[] args)
+    private static void Main(string[] args)
     {
+        Helper.ShowLogo();
+        Helper.ShowInformation();
         // TODO:
         // add option to sort by nzb age
         var builder = WebApplication.CreateBuilder(args);
@@ -45,9 +43,9 @@ private static async Task MainAsync(string[] args)
         builder.AddTitleLookupService();
         builder.Services.AddSingleton<SearchItemLookupService>();
         builder.Services.AddSingleton<TitleMatchingService>();
-        await builder.AddSonarrSupport();
-        await builder.AddLidarrSupport();
-        await builder.AddReadarrSupport();
+        builder.AddSonarrSupport();
+        builder.AddLidarrSupport();
+        builder.AddReadarrSupport();
         builder.Services.AddSingleton<CacheService>();
         builder.Services.AddSingleton<ProxyRequestService>();
         builder.Services.AddSingleton<ArrApplicationFactory>();
@@ -56,13 +54,6 @@ private static async Task MainAsync(string[] args)
 
         var app = builder.Build();
 
-        Helper.ShowLogo();
-
-        if (app.Configuration.GetValue<bool>("IpLeakTest:Enabled"))
-        {
-            await Helper.ShowInformation();
-        }
-
         GlobalStaticLogger.Initialize(app.Services.GetService<ILoggerFactory>()!);
         app.UseHttpsRedirection();
         app.UseAuthorization();
@@ -118,4 +109,4 @@ private static void ConfigureLogger(ConfigurationManager configuration)
             //.Enrich.With(new ApiKeyMaskingEnricher("appsettings.json")) // TODO - Not working currently
             .CreateLogger();
     }
-}
+}

UmlautAdaptarr/Utilities/Helper.cs

@@ -11,10 +11,10 @@ public static void ShowLogo()
             "\r\n _   _           _             _    ___      _             _                  \r\n| | | |         | |           | |  / _ \\    | |           | |                 \r\n| | | |_ __ ___ | | __ _ _   _| |_/ /_\\ \\ __| | __ _ _ __ | |_ __ _ _ __ _ __ \r\n| | | | '_ ` _ \\| |/ _` | | | | __|  _  |/ _` |/ _` | '_ \\| __/ _` | '__| '__|\r\n| |_| | | | | | | | (_| | |_| | |_| | | | (_| | (_| | |_) | || (_| | |  | |   \r\n \\___/|_| |_| |_|_|\\__,_|\\__,_|\\__\\_| |_/\\__,_|\\__,_| .__/ \\__\\__,_|_|  |_|   \r\n                                                    | |                       \r\n                                                    |_|                       \r\n");
     }
 
-    public static async Task ShowInformation()
+    public static void ShowInformation()
     {
         Console.WriteLine("--------------------------[IP Leak Test]-----------------------------");
-        var ipInfo = await GetPublicIpAddressInfoAsync();
+        var ipInfo = GetPublicIpAddressInfoAsync().GetAwaiter().GetResult();
 
         if (ipInfo != null)
         {

UmlautAdaptarr/Utilities/ServicesExtensions.cs

@@ -29,7 +29,7 @@ public static class ServicesExtensions
     /// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
     /// <param name="sectionName">The name of the configuration section containing service options.</param>
     /// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
-    private static async Task<WebApplicationBuilder> AddServicesWithOptions<TOptions, TService, TInterface>(
+    private static WebApplicationBuilder AddServicesWithOptions<TOptions, TService, TInterface>(
         this WebApplicationBuilder builder, string sectionName)
         where TOptions : class, new()
         where TService : class, TInterface
@@ -57,9 +57,9 @@ private static async Task<WebApplicationBuilder> AddServicesWithOptions<TOptions
 
             foreach (var option in optionsArray)
             {
-              GlobalInstanceOptionsValidator validator = new();
+              GlobalInstanceOptionsValidator validator = new GlobalInstanceOptionsValidator();
 
-              var results = await validator.ValidateAsync(option as GlobalInstanceOptions);
+              var results =  validator.Validate(option as GlobalInstanceOptions);
 
                 if (!results.IsValid)
                 {
@@ -143,7 +143,7 @@ private static WebApplicationBuilder AddServiceWithOptions<TOptions, TService>(t
     /// </summary>
     /// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
     /// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
-    public static Task<WebApplicationBuilder> AddSonarrSupport(this WebApplicationBuilder builder)
+    public static WebApplicationBuilder AddSonarrSupport(this WebApplicationBuilder builder)
     {
         //  builder.Serviceses.AddSingleton<IOptionsMonitoSonarrInstanceOptionsns>, OptionsMonitoSonarrInstanceOptionsns>>();
         return builder.AddServicesWithOptions<SonarrInstanceOptions, SonarrClient, IArrApplication>("Sonarr");
@@ -154,7 +154,7 @@ public static Task<WebApplicationBuilder> AddSonarrSupport(this WebApplicationBu
     /// </summary>
     /// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
     /// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
-    public static Task<WebApplicationBuilder> AddLidarrSupport(this WebApplicationBuilder builder)
+    public static WebApplicationBuilder AddLidarrSupport(this WebApplicationBuilder builder)
     {
         return builder.AddServicesWithOptions<LidarrInstanceOptions, LidarrClient, IArrApplication>("Lidarr");
     }
@@ -164,7 +164,7 @@ public static Task<WebApplicationBuilder> AddLidarrSupport(this WebApplicationBu
     /// </summary>
     /// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
     /// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
-    public static Task<WebApplicationBuilder> AddReadarrSupport(this WebApplicationBuilder builder)
+    public static WebApplicationBuilder AddReadarrSupport(this WebApplicationBuilder builder)
     {
         return builder.AddServicesWithOptions<ReadarrInstanceOptions, ReadarrClient, IArrApplication>("Readarr");
     }

UmlautAdaptarr/Validator/GlobalInstanceOptionsValidator.cs

@@ -6,10 +6,6 @@ namespace UmlautAdaptarr.Validator;
 
 public class GlobalInstanceOptionsValidator : AbstractValidator<GlobalInstanceOptions>
 {
-    private readonly static HttpClient httpClient = new() {
-        Timeout = TimeSpan.FromSeconds(3)
-    };
-
     public GlobalInstanceOptionsValidator()
     {
         RuleFor(x => x.Enabled).NotNull();
@@ -18,14 +14,12 @@ public GlobalInstanceOptionsValidator()
         {
             RuleFor(x => x.Host)
                 .NotEmpty().WithMessage("Host is required when Enabled is true.")
-                .Must(BeAValidUrl).WithMessage("Host/Url must start with http:// or https:// and be a valid address.");
+                .Must(BeAValidUrl).WithMessage("Host/Url must start with http:// or https:// and be a valid address.")
+                .Must(BeReachable)
+                .WithMessage("Host/Url is not reachable. Please check your Host or your UmlautAdaptrr Settings");
 
             RuleFor(x => x.ApiKey)
                 .NotEmpty().WithMessage("ApiKey is required when Enabled is true.");
-                
-            RuleFor(x => x)
-                .MustAsync(BeReachable)
-                .WithMessage("Host/Url is not reachable. Please check your Host or your UmlautAdaptrr Settings");
         });
     }
 
@@ -35,30 +29,50 @@ private bool BeAValidUrl(string url)
                && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
     }
 
-    private static async Task<bool> BeReachable(GlobalInstanceOptions opts, CancellationToken cancellationToken)
+    private static bool BeReachable(string url)
     {
         var endTime = DateTime.Now.AddMinutes(3);
         var reachable = false;
-        var url = $"{opts.Host}/api?apikey={opts.ApiKey}";
 
         while (DateTime.Now < endTime)
         {
             try
             {
-                using var response = await httpClient.GetAsync(url, cancellationToken);
+                // TODO use HttpClient here
+                var request = (HttpWebRequest)WebRequest.Create(url);
+                request.AllowAutoRedirect = false;
+                request.Timeout = 3000;
+                using var response = (HttpWebResponse)request.GetResponse();
                 reachable = response.StatusCode == HttpStatusCode.OK;
-                if (response.IsSuccessStatusCode)
+                if (reachable)
                 {
                     break;
                 }
+                // If status is 301/302 (Found), follow the redirect manually
+                else if (response.StatusCode == HttpStatusCode.MovedPermanently || response.StatusCode == HttpStatusCode.Found)
+                {
+                    var redirectUrl = response.Headers["Location"];  // Get the redirect URL
+                    if (!string.IsNullOrEmpty(redirectUrl))
+                    {
+                        // Create a new request for the redirected URL
+                        var redirectRequest = (HttpWebRequest)WebRequest.Create(redirectUrl);
+                        redirectRequest.Timeout = 3000;
+                        using var redirectResponse = (HttpWebResponse)redirectRequest.GetResponse();
+                        reachable = redirectResponse.StatusCode == HttpStatusCode.OK;
+                        if (reachable)
+                        {
+                            break;
+                        }
+                    }
+                }
             }
             catch
             {
 
             }
 
             // Wait for 15 seconds for next try
-            Console.WriteLine($"The URL \"{opts.Host}\" is not reachable. Next attempt in 15 seconds...");
+            Console.WriteLine($"The URL \"{url}\" is not reachable. Next attempt in 15 seconds...");
             Thread.Sleep(15000);
         }
 

UmlautAdaptarr/appsettings.json

@@ -64,8 +64,5 @@
     "Enabled": false,
     "Host": "your_readarr_host_url",
     "ApiKey": "your_readarr_api_key"
-  },
-  "IpLeakTest": {
-    "Enabled": false
   }
 }