Merge pull request #8050 from NuGet/master

[ReleasePrep][2020.06.15]FI of master into dev

Author: loic-sharma

src/Bootstrap/dist/css/bootstrap-theme.css

@@ -230,6 +230,11 @@ body {
   &.banner-info {
     background: @info-bg;
   }
+  
+  &.banner-blm {
+    background-color: #000;
+    color: #fff;
+  }
 }
 
 .alert {

src/Bootstrap/less/theme/base.less

@@ -9,6 +9,7 @@
 using System.Net.Mail;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using System.Web;
 using System.Web.Mvc;
 using NuGet.Services.Entities;
 using NuGet.Services.Messaging.Email;
@@ -527,7 +528,7 @@ public virtual async Task<ActionResult> LinkOrChangeExternalCredential(string re
                 // The identity value contains cookie non-compliant characters like `<, >`(eg: John Doe <[email protected]>), 
                 // These need to be replaced so that they are not treated as HTML tags
                 TempData["RawErrorMessage"] = string.Format(Strings.ChangeCredential_Failed,
-                    newCredential.Identity.Replace("<", "&lt;").Replace(">", "&gt;"),
+                    HttpUtility.HtmlEncode(newCredential.Identity),
                     UriExtensions.GetExternalUrlAnchorTag("FAQs page", GalleryConstants.FAQLinks.MSALinkedToAnotherAccount));
             }
 

src/NuGetGallery/Controllers/AuthenticationController.cs

@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Mvc;
@@ -60,21 +61,34 @@ public static IHtmlString BreakWord(this HtmlHelper self, string text)
 
         public static IHtmlString PreFormattedText(this HtmlHelper self, string text, IGalleryConfigurationService configurationService)
         {
-            // Encode HTML entities. Important! Security!
-            var encodedText = HttpUtility.HtmlEncode(text);
-            // Turn HTTP and HTTPS URLs into links.
-            // Source: https://stackoverflow.com/a/4750468
-            string anchorEvaluator(Match match)
+            void appendText(StringBuilder builder, string inputText)
+            {
+                var encodedText = HttpUtility.HtmlEncode(inputText);
+
+                // Replace new lines with the <br /> tag.
+                encodedText = encodedText.Replace("\n", "<br />");
+
+                // Replace more than one space in a row with a space then &nbsp;.
+                encodedText = RegexEx.TryReplaceWithTimeout(
+                    encodedText,
+                    "  +",
+                    match => " " + string.Join(string.Empty, Enumerable.Repeat("&nbsp;", match.Value.Length - 1)),
+                    RegexOptions.None);
+
+                builder.Append(encodedText);
+            }
+
+            void appendUrl(StringBuilder builder, string inputText)
             {
                 string trimmedEntityValue = string.Empty;
-                string trimmedAnchorValue = match.Value;
+                string trimmedAnchorValue = inputText;
 
                 foreach (var trimmedEntity in _trimmedHtmlEntities)
                 {
-                    if (match.Value.EndsWith(trimmedEntity))
+                    if (inputText.EndsWith(trimmedEntity))
                     {
                         // Remove trailing html entity from anchor URL
-                        trimmedAnchorValue = match.Value.Substring(0, match.Value.Length - trimmedEntity.Length);
+                        trimmedAnchorValue = inputText.Substring(0, inputText.Length - trimmedEntity.Length);
                         trimmedEntityValue = trimmedEntity;
 
                         break;
@@ -85,36 +99,67 @@ string anchorEvaluator(Match match)
                 {
                     string anchorText = formattedUri;
                     string siteRoot = configurationService.GetSiteRoot(useHttps: true);
+
                     // Format links to NuGet packages
-                    Match packageMatch = RegexEx.MatchWithTimeout(formattedUri, $@"({Regex.Escape(siteRoot)}\/packages\/(?<name>\w+([_.-]\w+)*(\/[0-9a-zA-Z-.]+)?)\/?$)", RegexOptions.IgnoreCase);
+                    Match packageMatch = RegexEx.MatchWithTimeout(
+                        formattedUri,
+                        $@"({Regex.Escape(siteRoot)}\/packages\/(?<name>\w+([_.-]\w+)*(\/[0-9a-zA-Z-.]+)?)\/?$)",
+                        RegexOptions.IgnoreCase);
                     if (packageMatch != null && packageMatch.Groups["name"].Success)
                     {
                         anchorText = packageMatch.Groups["name"].Value;
                     }
 
-                    return $"<a href=\"{formattedUri}\" rel=\"nofollow\">{anchorText}</a>" + trimmedEntityValue;
+                    builder.AppendFormat(
+                        "<a href=\"{0}\" rel=\"nofollow\">{1}</a>{2}",
+                        HttpUtility.HtmlEncode(formattedUri),
+                        HttpUtility.HtmlEncode(anchorText),
+                        HttpUtility.HtmlEncode(trimmedEntityValue));
+                }
+                else
+                {
+                    builder.Append(HttpUtility.HtmlEncode(inputText));
                 }
-
-                return match.Value;
             }
 
-            encodedText = RegexEx.TryReplaceWithTimeout(
-                encodedText,
+            // Turn HTTP and HTTPS URLs into links.
+            // Source: https://stackoverflow.com/a/4750468
+            var matches = RegexEx.MatchesWithTimeout(
+                text,
                 @"((http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:/~\+#]*[\w\-\@?^=%&amp;/~\+#])?)",
-                anchorEvaluator,
                 RegexOptions.IgnoreCase);
 
-            // Replace new lines with the <br /> tag.
-            encodedText = encodedText.Replace("\n", "<br />");
+            var output = new StringBuilder(text.Length);
+            var currentIndex = 0;
+
+            if (matches != null && matches.Count > 0)
+            {
+                foreach (Match match in matches)
+                {
+                    // Encode the text literal before the URL, if any.
+                    var literalLength = match.Index - currentIndex;
+                    if (literalLength > 0)
+                    {
+                        var literal = text.Substring(currentIndex, literalLength);
+                        appendText(output, literal);
+                    }
+
+                    // Encode the URL.
+                    var url = match.Value;
+                    appendUrl(output, url);
+
+                    currentIndex = match.Index + match.Length;
+                }
+            }
 
-            // Replace more than one space in a row with a space then &nbsp;.
-            encodedText = RegexEx.TryReplaceWithTimeout(
-                encodedText,
-                "  +",
-                match => " " + string.Join(string.Empty, Enumerable.Repeat("&nbsp;", match.Value.Length - 1)),
-                RegexOptions.None);
+            // Encode the text literal appearing after the last URL, if any.
+            if (currentIndex < text.Length)
+            {
+                var literal = text.Substring(currentIndex, text.Length - currentIndex);
+                appendText(output, literal);
+            }
 
-            return self.Raw(encodedText);
+            return self.Raw(output.ToString());
         }
 
         public static IHtmlString ValidationSummaryFor(this HtmlHelper html, string key)

src/NuGetGallery/Helpers/HtmlExtensions.cs

@@ -40,5 +40,20 @@ public static Match MatchWithTimeout(
                 return null;
             }
         }
+
+        public static MatchCollection MatchesWithTimeout(
+            string input,
+            string pattern,
+            RegexOptions options)
+        {
+            try
+            {
+                return Regex.Matches(input, pattern, options, Timeout);
+            }
+            catch (RegexMatchTimeoutException)
+            {
+                return null;
+            }
+        }
     }
 }

src/NuGetGallery/Helpers/RegexEx.cs

@@ -101,7 +101,7 @@
 
 @section BottomScripts {
     <script type="text/javascript">
-    var initialData = @Html.Raw(JsonConvert.SerializeObject(new
+    var initialData = @Html.ToJson(new
         {
             AccountName = Model.AccountName,
             Members = Model.Members.Select(m => new
@@ -117,7 +117,7 @@
             UpdateMemberUrl = Url.UpdateOrganizationMember(Model.AccountName),
             DeleteMemberUrl = Url.DeleteOrganizationMember(Model.AccountName),
             ProfileUrlTemplate = Url.UserTemplate().LinkTemplate
-        }));
+        });
     </script>
     @ViewHelpers.SectionsScript(this)
     @Scripts.Render("~/Scripts/gallery/page-manage-organization.min.js")

src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml

@@ -1139,7 +1139,7 @@
     </style>
 
     <script type="text/javascript">
-        var packageManagers = [@Html.Raw(string.Join(",", packageManagers.Select(pm => "\"" + pm.Id + "\"")))];
+        var packageManagers = @Html.ToJson(packageManagers.Select(pm => pm.Id).ToList());
     </script>
 
     @Scripts.Render("~/Scripts/gallery/page-display-package.min.js")

src/NuGetGallery/Views/Packages/DisplayPackage.cshtml

@@ -80,19 +80,20 @@
         var strings_RemovingOrganization = "@Html.Raw(Strings.ManagePackageOwners_RemovingOrganization)";
         var strings_RemovingSelf = "@Html.Raw(Strings.ManagePackageOwners_RemovingSelf)";
 
-        // We are using JsonConvert instead of Json to serialize JSON in this CSHTML file because otherwise, with a large number of versions, this will overflow the maximum output JSON length limit for Json.
+        // We are using ToJson (which uses Newtonsoft.Json) instead of Json.Encode to serialize JSON in this CSHTML
+        // file because otherwise, with a large number of versions, this will overflow the maximum output JSON length limit for Json.
 
         // Set up delete section
-        var versionListedState = @Html.Raw(JsonConvert.SerializeObject(Model.VersionListedStateDictionary));
+        var versionListedState = @Html.ToJson(Model.VersionListedStateDictionary);
 
         // Set up deprecation section
         var strings_SelectAlternateVersionOption = "Latest";
-        var versionDeprecationState = @Html.Raw(JsonConvert.SerializeObject(Model.VersionDeprecationStateDictionary));
+        var versionDeprecationState = @Html.ToJson(Model.VersionDeprecationStateDictionary);
 
         $(function () {
             // Set up documentation section
             var readMeModel = {
-                "Versions": @Html.Raw(JsonConvert.SerializeObject(Model.VersionReadMeStateDictionary)),
+                "Versions": @Html.ToJson(Model.VersionReadMeStateDictionary),
                 "Edit": @Html.Raw(Json.Encode(Model.ReadMe))
             };
 

src/NuGetGallery/Views/Packages/Manage.cshtml

@@ -8,13 +8,22 @@
     var rawErrorMessage = TempData.ContainsKey("RawErrorMessage") ? TempData["RawErrorMessage"].ToString() : null;
 }
 
+<div class="container-fluid banner banner-blm text-center">
+    <div class="row">
+        <div class="col-sm-12">
+            <span>
+                Black Lives Matter.
+            </span>
+        </div>
+    </div>
+</div>
+
 <div class="container-fluid banner banner-info text-center">
     <div class="row">
         <div class="col-sm-12">
             <i class="ms-Icon ms-Icon--Warning" aria-hidden="true"></i>
             <span>
-                NuGet.org will permanently <a href="https://devblogs.microsoft.com/nuget/nuget-org-will-permanently-remove-support-for-tls-1-0-and-1-1-on-june-15th/">
-                remove support</a> for TLS 1.0 and 1.1 on June 15th. Please ensure that your systems use TLS 1.2.
+                NuGet.org had TLS 1.0 and 1.1 disabled. Please refer to our <a href="https://devblogs.microsoft.com/nuget/deprecating-tls-1-0-and-1-1-on-nuget-org/">blog post</a> if you are having connection issues.
             </span>
         </div>
     </div>
@@ -266,4 +275,4 @@
             </div>
         </div>
     </div>
-}
+}

src/NuGetGallery/Views/Shared/Gallery/Header.cshtml

@@ -503,7 +503,7 @@
 
 @section bottomScripts {
     <script type="text/javascript">
-        var initialData = @Html.Raw(JsonConvert.SerializeObject(new
+        var initialData = @Html.ToJson(new
                      {
                          ApiKeys = Model.ApiKeys,
                          PackageOwners = Model.PackageOwners,
@@ -524,7 +524,7 @@
                              ApiKeyNew = Url.Absolute("~/Content/gallery/img/api-key-new.svg"),
                              ApiKeyNewFallback = Url.Absolute("~/Content/gallery/img/api-key-new-256x256.png"),
                          }
-                     }));
+                     });
     </script>
     @Scripts.Render("~/Scripts/gallery/page-api-keys.min.js")
 }