Skip to content

Commit 663cd34

Browse files
authored
Http to https translation for GitHub pages urls (#6626)
1 parent 56126b1 commit 663cd34

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

src/NuGetGallery/Helpers/UriExtensions.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static bool IsGitProtocol(this Uri uri)
2626

2727
public static bool IsDomainWithHttpsSupport(this Uri uri)
2828
{
29-
return IsGitHubUri(uri) || IsCodeplexUri(uri) || IsMicrosoftUri(uri);
29+
return IsGitHubUri(uri) || IsGitHubPagerUri(uri) || IsCodeplexUri(uri) || IsMicrosoftUri(uri);
3030
}
3131

3232
public static bool IsGitHubUri(this Uri uri)
@@ -35,6 +35,12 @@ public static bool IsGitHubUri(this Uri uri)
3535
string.Equals(uri.Host, "github.com", StringComparison.OrdinalIgnoreCase);
3636
}
3737

38+
public static bool IsGitHubPagerUri(this Uri uri)
39+
{
40+
return uri.Authority.EndsWith(".github.com", StringComparison.OrdinalIgnoreCase) ||
41+
uri.Authority.EndsWith(".github.io", StringComparison.OrdinalIgnoreCase);
42+
}
43+
3844
private static bool IsCodeplexUri(this Uri uri)
3945
{
4046
return uri.Authority.EndsWith(".codeplex.com", StringComparison.OrdinalIgnoreCase) ||

tests/NuGetGallery.Facts/Helpers/HtmlExtensionsFacts.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public void EncodesHtml()
7878
[InlineData("http://www.github.com/nuget is my site.", "<a href=\"https://www.github.com/nuget\" rel=\"nofollow\">https://www.github.com/nuget</a> is my site.")]
7979
[InlineData("My site is http://www.asp.net best site ever!", "My site is <a href=\"https://www.asp.net/\" rel=\"nofollow\">https://www.asp.net/</a> best site ever!")]
8080
[InlineData("My site is http:////github.com bad url", "My site is http:////github.com bad url")]
81+
[InlineData("Im using github pages! http://mypage.github.com/stuff.", "Im using github pages! <a href=\"https://mypage.github.com/stuff\" rel=\"nofollow\">https://mypage.github.com/stuff</a>.")]
8182
public void ConvertsUrlsToLinks(string input, string expected)
8283
{
8384
// Arrange

tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ public void ItDeterminesRepositoryKind(string repoUrl, string repoType, Reposito
7878
[InlineData("http://msdn.microsoft.com/en-us/library/vstudio/hh191443.aspx", "https://msdn.microsoft.com/en-us/library/vstudio/hh191443.aspx")]
7979
[InlineData("http://microsoft.com/iconurl/9594202", "https://microsoft.com/iconurl/9594202")]
8080
[InlineData("http://microsoft.com:80/", "https://microsoft.com/")]
81+
[InlineData("http://githubpages.github.io/my.page", "https://githubpages.github.io/my.page")]
82+
[InlineData("http://githubpages.github.com", "https://githubpages.github.com/")]
8183
public void ItInitializesProjectUrl(string projectUrl, string expected)
8284
{
8385
var package = new Package
@@ -99,6 +101,8 @@ public void ItInitializesProjectUrl(string projectUrl, string expected)
99101
[InlineData("http://aspnetwebstack.codeplex.com/license", "https://aspnetwebstack.codeplex.com/license")]
100102
[InlineData("http://go.microsoft.com/?linkid=9809688", "https://go.microsoft.com/?linkid=9809688")]
101103
[InlineData("http://github.com/url", "https://github.com/url")]
104+
[InlineData("http://githubpages.github.io/my.page/license.html", "https://githubpages.github.io/my.page/license.html")]
105+
[InlineData("http://githubpages.github.com", "https://githubpages.github.com/")]
102106
public void ItInitializesLicenseUrl(string licenseUrl, string expected)
103107
{
104108
var package = new Package

0 commit comments

Comments
 (0)