Detect redirects without DownloadText

Author: HebaruSan

Netkan/Processors/Inflator.cs

@@ -42,7 +42,7 @@ internal Inflator(bool         overwriteCache,
                           IGame        game,
                           NetFileCache cache)
             : this(githubToken, gitlabToken,
-                   userAgent, prerelease, game,
+                   prerelease, game,
                    cache,
                    new CachingHttpService(cache, overwriteCache, userAgent),
                    new ModuleService(game),
@@ -52,7 +52,6 @@ internal Inflator(bool         overwriteCache,
 
         internal Inflator(string?        githubToken,
                           string?        gitlabToken,
-                          string?        userAgent,
                           bool?          prerelease,
                           IGame          game,
                           NetFileCache   cache,
@@ -65,7 +64,7 @@ internal Inflator(string?        githubToken,
             this.http     = http;
             ckanValidator = new CkanValidator(http, moduleService, game, githubToken);
             transformer   = new NetkanTransformer(http, fileService, moduleService,
-                                                  githubToken, gitlabToken, userAgent,
+                                                  githubToken, gitlabToken,
                                                   prerelease, game, netkanValidator);
         }
 

Netkan/Services/CachingHttpService.cs

@@ -149,8 +149,11 @@ public void ClearRequestedURLs()
             _requestedURLs.Clear();
         }
 
-        public Uri? ResolveRedirect(Uri url, string? userAgent)
-            => Net.ResolveRedirect(url, userAgent);
+        public Uri? ResolveRedirect(Uri url)
+            => Net.ResolveRedirect(url, _userAgent);
+
+        public bool HasRedirect(Uri url)
+            => ResolveRedirect(url) != url;
 
         private readonly NetFileCache                    _cache;
         private readonly string?                         _userAgent;

Netkan/Services/IHttpService.cs

@@ -9,7 +9,8 @@ internal interface IHttpService
         string? DownloadModule(Metadata metadata);
         string? DownloadText(Uri url, string? authToken = null, string? mimeType = null);
 
-        Uri? ResolveRedirect(Uri url, string? userAgent);
+        Uri? ResolveRedirect(Uri url);
+        bool HasRedirect(Uri url);
 
         IEnumerable<Uri> RequestedURLs { get; }
         void ClearRequestedURLs();

Netkan/Sources/Github/GithubApi.cs

@@ -108,8 +108,8 @@ public List<GithubUser> getOrgMembers(GithubUser organization)
         }
 
         private bool ActuallyHasWiki(GithubRef reference)
-            // If no wiki pages have been created, the /wiki route redirects and this is null
-            => _http.DownloadText(new Uri($"https://github.com/{reference.Account}/{reference.Project}/wiki")) != null;
+            // If no wiki pages have been created, the /wiki route redirects
+            => !_http.HasRedirect(new Uri($"https://github.com/{reference.Account}/{reference.Project}/wiki"));
 
         /// <summary>
         /// Download a URL via the GitHubAPI.

Netkan/Transformers/HttpTransformer.cs

@@ -13,9 +13,8 @@ namespace CKAN.NetKAN.Transformers
     /// </summary>
     internal sealed class HttpTransformer : ITransformer
     {
-        public HttpTransformer(IHttpService httpSvc, string? userAgent = null)
+        public HttpTransformer(IHttpService httpSvc)
         {
-            this.userAgent = userAgent;
             http           = httpSvc;
         }
 
@@ -30,7 +29,7 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions opts)
 
                 if (Uri.IsWellFormedUriString(metadata.Kref.Id, UriKind.Absolute))
                 {
-                    var resolvedUri = http.ResolveRedirect(new Uri(metadata.Kref.Id), userAgent);
+                    var resolvedUri = http.ResolveRedirect(new Uri(metadata.Kref.Id));
 
                     Log.InfoFormat("URL {0} resolved to {1}", metadata.Kref.Id, resolvedUri);
 
@@ -58,7 +57,6 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions opts)
             yield return metadata;
         }
 
-        private readonly string?      userAgent;
         private readonly IHttpService http;
 
         private static readonly ILog Log = LogManager.GetLogger(typeof(HttpTransformer));

Netkan/Transformers/NetkanTransformer.cs

@@ -25,7 +25,6 @@ public NetkanTransformer(IHttpService   http,
                                  IModuleService moduleService,
                                  string?        githubToken,
                                  string?        gitlabToken,
-                                 string?        userAgent,
                                  bool?          prerelease,
                                  IGame          game,
                                  IValidator     validator)
@@ -45,7 +44,7 @@ public NetkanTransformer(IHttpService   http,
                 new GitlabTransformer(glApi),
                 new GiteaTransformer(giteaAPi),
                 new SourceForgeTransformer(sfApi),
-                new HttpTransformer(http, userAgent),
+                new HttpTransformer(http),
                 new JenkinsTransformer(new JenkinsApi(http)),
                 new AvcKrefTransformer(http, ghApi),
                 new InternalCkanTransformer(http, moduleService),

Tests/NetKAN/Processors/InflatorTests.cs

@@ -29,7 +29,7 @@ public void Inflate_WithTestNetkan_Inflates()
                 var game     = new KerbalSpaceProgram();
                 var modSvc   = new ModuleService(game);
                 var fileSvc  = new FileService(cache);
-                var sut      = new Inflator(null, null, null, null,
+                var sut      = new Inflator(null, null, null,
                                             game, cache, http.Object, modSvc, fileSvc);
                 var filename = TestData.TestNetkanPath();
                 var netkans  = YamlExtensions.Parse(TestData.TestNetkanContents())
@@ -91,7 +91,7 @@ public void ValidateCkan_ValidModule_DoesNotThrow()
                 var http    = new Mock<IHttpService>();
                 var modSvc  = new ModuleService(game);
                 var fileSvc = new FileService(cache);
-                var sut     = new Inflator(null, null, null, null,
+                var sut     = new Inflator(null, null, null,
                                            game, cache, http.Object, modSvc, fileSvc);
                 var ckans   = YamlExtensions.Parse(TestData.DogeCoinPlugin())
                                             .Select(yaml => new Metadata(yaml))

Tests/NetKAN/Transformers/HttpTransformerTests.cs

@@ -45,7 +45,7 @@ public void Transform_HttpKref_ResolvesRedirect()
         {
             // Arrange
             var http = new Mock<IHttpService>();
-            http.Setup(h => h.ResolveRedirect(It.IsAny<Uri>(), It.IsAny<string?>()))
+            http.Setup(h => h.ResolveRedirect(It.IsAny<Uri>()))
                 .Returns(new Uri("https://fake-web-site.com/redirected"));
             var sut      = new HttpTransformer(http.Object);
             var opts     = new TransformOptions(1, null, null, null, false, null);