[HotFix] Temporary limit to ascii only (#10409)

erdembayar · web-flow · commit e36389132530 · 2025-04-17T09:39:26.000-07:00
Temporary allow ascii only
diff --git a/src/AccountDeleter/EmptyFeatureFlagService.cs b/src/AccountDeleter/EmptyFeatureFlagService.cs
@@ -328,5 +328,10 @@ public bool CanUseFederatedCredentials(User user)
         {
             throw new NotImplementedException();
         }
+
+        public bool IsAsciiOnlyPackageIdEnabled()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs b/src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs
@@ -329,5 +329,10 @@ public bool CanUseFederatedCredentials(User user)
         {
             throw new NotImplementedException();
         }
+
+        public bool IsAsciiOnlyPackageIdEnabled()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/src/NuGetGallery.Core/Packaging/ManifestValidator.cs b/src/NuGetGallery.Core/Packaging/ManifestValidator.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -7,14 +7,15 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Net;
 using NuGet.Packaging;
 using NuGet.Versioning;
 
 namespace NuGetGallery.Packaging
 {
     public class ManifestValidator
     {
-        public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, out NuspecReader nuspecReader, out PackageMetadata packageMetadata)
+        public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, bool asciiOnlyPackageIds, out NuspecReader nuspecReader, out PackageMetadata packageMetadata)
         {
             packageMetadata = null;
 
@@ -25,7 +26,7 @@ public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, out Nu
                 if (rawMetadata != null && rawMetadata.Any())
                 {
                     packageMetadata = PackageMetadata.FromNuspecReader(nuspecReader, strict: true);
-                    return ValidateCore(packageMetadata);
+                    return ValidateCore(packageMetadata, asciiOnlyPackageIds);
                 }
             }
             catch (Exception ex)
@@ -38,7 +39,7 @@ public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, out Nu
             return Enumerable.Empty<ValidationResult>();
         }
 
-        private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packageMetadata)
+        private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packageMetadata, bool asciiOnlyPackageIds)
         {
             // Validate the ID
             if (string.IsNullOrEmpty(packageMetadata.Id))
@@ -51,12 +52,21 @@ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packag
                 {
                     yield return new ValidationResult(CoreStrings.Manifest_IdTooLong);
                 }
-                else if (!PackageIdValidator.IsValidPackageId(packageMetadata.Id))
+                else
                 {
-                    yield return new ValidationResult(String.Format(
-                        CultureInfo.CurrentCulture,
-                        CoreStrings.Manifest_InvalidId,
-                        packageMetadata.Id));
+                    if (!PackageIdValidator.IsValidPackageId(packageMetadata.Id))
+                    {
+                        yield return new ValidationResult(string.Format(
+                            CultureInfo.CurrentCulture,
+                            CoreStrings.Manifest_InvalidId,
+                            packageMetadata.Id));
+                    } else if (asciiOnlyPackageIds && !PackageIdValidator.IsAsciiOnlyPackageId(packageMetadata.Id))
+                    {
+                        yield return new ValidationResult(string.Format(
+                            CultureInfo.CurrentCulture,
+                            "Non-ASCII characters in package Id are temporary blocked, please check https://aka.ms/nuget/non-ascii-ids for updates.",
+                            packageMetadata.Id));
+                    }
                 }
             }
 
diff --git a/src/NuGetGallery.Core/Packaging/PackageIdValidator.cs b/src/NuGetGallery.Core/Packaging/PackageIdValidator.cs
@@ -14,21 +14,40 @@ public static class PackageIdValidator
             @"^\w+([.-]\w+)*$",
             RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
 
+        private static readonly Regex AllAsciiRegex = RegexEx.CreateWithTimeout(
+            @"^[A-Za-z0-9\-_\.]+$",
+            RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
+
         public static bool IsValidPackageId(string packageId)
         {
             if (packageId == null)
             {
                 throw new ArgumentNullException(nameof(packageId));
             }
 
-            if (String.Equals(packageId, "$id$", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(packageId, "$id$", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
 
             return IdRegex.IsMatch(packageId);
         }
 
+        public static bool IsAsciiOnlyPackageId(string packageId)
+        {
+            if (packageId == null)
+            {
+                throw new ArgumentNullException(nameof(packageId));
+            }
+
+            if (string.Equals(packageId, "$id$", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            return AllAsciiRegex.IsMatch(packageId);
+        }
+
         public static void ValidatePackageId(string packageId)
         {
             if (packageId == null)
@@ -45,9 +64,9 @@ public static void ValidatePackageId(string packageId)
             {
                 throw new ArgumentException(string.Format(
                     CultureInfo.CurrentCulture,
-                    "The package ID '{0}' contains invalid characters. Examples of valid package IDs include 'MyPackage' and 'MyPackage.Sample'.",
+                    "The package ID '{0}' contains invalid characters. Package ID can only contain alphanumeric characters, hyphens, underscores, and periods.",
                     packageId));
             }
         }
     }
-}
+}
diff --git a/src/NuGetGallery.Services/Configuration/FeatureFlagService.cs b/src/NuGetGallery.Services/Configuration/FeatureFlagService.cs
@@ -64,6 +64,7 @@ public class FeatureFlagService : IFeatureFlagService
         private const string DisplayTfmBadgesFeatureName = GalleryPrefix + "DisplayTfmBadges";
         private const string AdvancedFrameworkFilteringFeatureName = GalleryPrefix + "AdvancedFrameworkFiltering";
         private const string FederatedCredentialsFeatureName = GalleryPrefix + "FederatedCredentials";
+        private const string AsciiOnlyPackageIdFeatureName = GalleryPrefix + "AsciiOnlyPackageId";
 
         private const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllNonHijacked";
         private const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllCountNonHijacked";
@@ -427,5 +428,10 @@ public bool CanUseFederatedCredentials(User user)
         {
             return _client.IsEnabled(FederatedCredentialsFeatureName, user, defaultValue: false);
         }
+
+        public bool IsAsciiOnlyPackageIdEnabled()
+        {
+            return _client.IsEnabled(AsciiOnlyPackageIdFeatureName, defaultValue: false);
+        }
     }
 }
diff --git a/src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs b/src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs
@@ -347,5 +347,10 @@ public interface IFeatureFlagService
         /// Whether or not the user specified in a package owner scope can use federated credentials.
         /// </summary>
         bool CanUseFederatedCredentials(User user);
+
+        /// <summary>
+        /// Whether or not only ASCII characters are allowed in PackageId, used for temporary block unicode.
+        /// </summary>
+        bool IsAsciiOnlyPackageIdEnabled();
     }
 }
diff --git a/src/NuGetGallery/Controllers/ApiController.cs b/src/NuGetGallery/Controllers/ApiController.cs
@@ -617,7 +617,7 @@ private async Task<ActionResult> CreatePackageInternal()
 
                             NuspecReader nuspec;
                             PackageMetadata packageMetadata;
-                            var errors = ManifestValidator.Validate(packageToPush.GetNuspec(), out nuspec, out packageMetadata).ToArray();
+                            var errors = ManifestValidator.Validate(packageToPush.GetNuspec(), FeatureFlagService.IsAsciiOnlyPackageIdEnabled(), out nuspec, out packageMetadata).ToArray();
                             if (errors.Length > 0)
                             {
                                 var errorsString = string.Join("', '", errors.Select(error => error.ErrorMessage));
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -420,7 +420,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                     PackageArchiveReader packageArchiveReader = CreatePackage(uploadStream);
                     NuspecReader nuspec;
                     PackageMetadata packageMetadata;
-                    var errors = ManifestValidator.Validate(packageArchiveReader.GetNuspec(), out nuspec, out packageMetadata).ToArray();
+                    var errors = ManifestValidator.Validate(packageArchiveReader.GetNuspec(), _featureFlagService.IsAsciiOnlyPackageIdEnabled(), out nuspec, out packageMetadata).ToArray();
                     if (errors.Length > 0)
                     {
                         var errorStrings = new List<JsonValidationMessage>();
diff --git a/src/NuGetGallery/Services/SymbolPackageService.cs b/src/NuGetGallery/Services/SymbolPackageService.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -120,7 +120,7 @@ private static void ValidateSymbolPackage(PackageArchiveReader symbolPackage, Pa
             PackageHelper.ValidateNuGetPackageMetadata(metadata);
 
             // Validate nuspec manifest.
-            var errors = ManifestValidator.Validate(symbolPackage.GetNuspec(), out var nuspec, out var packageMetadata).ToArray();
+            var errors = ManifestValidator.Validate(symbolPackage.GetNuspec(), false, out var nuspec, out var packageMetadata).ToArray();
             if (errors.Length > 0)
             {
                 var errorsString = string.Join("', '", errors.Select(error => error.ErrorMessage));
@@ -201,4 +201,4 @@ private static bool IsPortable(string pdbFile)
             return currentPDBStamp.SequenceEqual(portableStamp);
         }
     }
-}
+}
diff --git a/src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs b/src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs
@@ -137,5 +137,7 @@ public class FakeFeatureFlagService : IFeatureFlagService
         public bool IsAdvancedFrameworkFilteringEnabled(User user) => throw new NotImplementedException();
 
         public bool CanUseFederatedCredentials(User user) => throw new NotImplementedException();
+
+        public bool IsAsciiOnlyPackageIdEnabled() => throw new NotImplementedException();
     }
 }
diff --git a/tests/NuGetGallery.Core.Facts/Packaging/ManifestValidatorFacts.cs b/tests/NuGetGallery.Core.Facts/Packaging/ManifestValidatorFacts.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -364,6 +364,22 @@ public class ManifestValidatorFacts
                   </metadata>
                 </package>";
 
+        private const string NuSpecNonAsciiId = @"<?xml version=""1.0""?>
+                <package xmlns=""http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"">
+                    <metadata>
+                    <id>пакет</id>
+                    <version>1.0.1-alpha</version>
+                    <title>Package A</title>
+                    <authors>ownera, ownerb</authors>
+                    <owners>ownera, ownerb</owners>
+                    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+                    <description>package A description.</description>
+                    <language>en-US</language>
+                    <dependencies />
+                    </metadata>
+                </package>";
+
+
         [Fact]
         public void ReturnsErrorIfIdNotPresent()
         {
@@ -561,23 +577,37 @@ public void ReturnsPackageMetadataForValidNuspec()
             var nuspecStream = CreateNuspecStream(NuSpecSemVer200);
 
             // Act
-            ManifestValidator.Validate(nuspecStream, out var reader, out var packageMetadata);
+            ManifestValidator.Validate(nuspecStream, false, out var reader, out var packageMetadata);
 
             // Assert
             Assert.NotNull(packageMetadata);
         }
 
+        [Fact]
+        public void BlocksNonAsciiPackageIdsIfEnabled()
+        {
+            // Arrange
+            var nuspecStream = CreateNuspecStream(NuSpecNonAsciiId);
+
+            // Act
+            var errors = ManifestValidator.Validate(nuspecStream, true, out var reader, out var packageMetadata).ToList();
+
+            // Assert
+            Assert.NotEmpty(errors);
+            Assert.Contains(errors, error => error.ErrorMessage.Contains("ASCII"));
+        }
+
         private static string[] GetErrors(Stream nuspecStream)
         {
             return ManifestValidator
-                .Validate(nuspecStream, out var reader, out var metadata)
+                .Validate(nuspecStream, false, out var reader, out var metadata)
                 .Select(r => r.ErrorMessage)
                 .ToArray();
         }
 
         private static Stream CreateNuspecStream(string nuspec)
         {
-            byte[] byteArray = Encoding.ASCII.GetBytes(nuspec);
+            byte[] byteArray = Encoding.UTF8.GetBytes(nuspec);
             return new MemoryStream(byteArray);
         }
     }
diff --git a/tests/NuGetGallery.Core.Facts/Packaging/PackageIdValidatorTest.cs b/tests/NuGetGallery.Core.Facts/Packaging/PackageIdValidatorTest.cs
@@ -53,7 +53,7 @@ public void ValidatePackageIdInvalidIdReturnsFalse(string packageId)
             Assert.False(isValid);
         }
 
-        [Theory]
+        [Theory()]
         [InlineData("  Invalid  . Woo   .")]
         [InlineData("(/.__.)/ \\(.__.\\)")]
         public void ValidatePackageIdInvalidIdThrows(string packageId)
@@ -70,7 +70,7 @@ public void ValidatePackageIdInvalidIdThrows(string packageId)
             }
 
             Assert.NotNull(thrownException);
-            Assert.Equal("The package ID '" + packageId + "' contains invalid characters. Examples of valid package IDs include 'MyPackage' and 'MyPackage.Sample'.", thrownException.Message);
+            Assert.Equal("The package ID '" + packageId + "' contains invalid characters. Package ID can only contain alphanumeric characters, hyphens, underscores, and periods.", thrownException.Message);
         }
 
         [Theory]
@@ -96,5 +96,60 @@ public void IdExceedingMaxLengthThrows(int idTestLength)
             Assert.NotNull(thrownException);
             Assert.Equal("Id must not exceed " + Constants.MaxPackageIdLength + " characters.", thrownException.Message);
         }
+
+        [Fact]
+        public void IsAsciiPackageId_WithNull_ThrowsArgumentNullException()
+        {
+            // Arrange & Act & Assert
+            var exception = Assert.Throws<ArgumentNullException>(() => PackageIdValidator.IsAsciiOnlyPackageId(null));
+            Assert.Equal("packageId", exception.ParamName);
+        }
+
+        [Fact]
+        public void IsAsciiPackageId_WithTemplateId_ReturnsFalse()
+        {
+            // Arrange & Act
+            var result = PackageIdValidator.IsAsciiOnlyPackageId("$id$");
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("package")]
+        [InlineData("package.id")]
+        [InlineData("package-id")]
+        [InlineData("package_id")]
+        [InlineData("package.id-with_various.symbols")]
+        [InlineData("123456789")]
+        public void IsAsciiPackageId_WithAsciiOnlyCharacters_ReturnsTrue(string packageId)
+        {
+            // Arrange & Act
+            var result = PackageIdValidator.IsAsciiOnlyPackageId(packageId);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("packageá")]
+        [InlineData("包")]
+        [InlineData("пакет")]
+        [InlineData("패키지")]
+        [InlineData("الحزمة")]
+        [InlineData("package™")]
+        [InlineData("package©")]
+        [InlineData("package£")]
+        [InlineData("elsökning")]
+        [InlineData("件")]
+        [InlineData("valoniα")]
+        public void IsAsciiPackageId_WithUnicodeCharacters_ReturnsFalse(string packageId)
+        {
+            // Arrange & Act
+            var result = PackageIdValidator.IsAsciiOnlyPackageId(packageId);
+
+            // Assert
+            Assert.False(result);
+        }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -328,5 +328,10 @@ public bool CanUseFederatedCredentials(User user)`
`328`	`328`	`{`
`329`	`329`	`throw new NotImplementedException();`
`330`	`330`	`}`
	`331`	`+`
	`332`	`+ public bool IsAsciiOnlyPackageIdEnabled()`
	`333`	`+ {`
	`334`	`+ throw new NotImplementedException();`
	`335`	`+ }`
`331`	`336`	`}`
`332`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -329,5 +329,10 @@ public bool CanUseFederatedCredentials(User user)`
`329`	`329`	`{`
`330`	`330`	`throw new NotImplementedException();`
`331`	`331`	`}`
	`332`	`+`
	`333`	`+ public bool IsAsciiOnlyPackageIdEnabled()`
	`334`	`+ {`
	`335`	`+ throw new NotImplementedException();`
	`336`	`+ }`
`332`	`337`	`}`
`333`	`338`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) .NET Foundation. All rights reserved.`
	`1`	`+// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`@@ -7,14 +7,15 @@`
`7`	`7`	`using System.Globalization;`
`8`	`8`	`using System.IO;`
`9`	`9`	`using System.Linq;`
	`10`	`+using System.Net;`
`10`	`11`	`using NuGet.Packaging;`
`11`	`12`	`using NuGet.Versioning;`
`12`	`13`
`13`	`14`	`namespace NuGetGallery.Packaging`
`14`	`15`	`{`
`15`	`16`	`public class ManifestValidator`
`16`	`17`	`{`
`17`		`- public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, out NuspecReader nuspecReader, out PackageMetadata packageMetadata)`
	`18`	`+ public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, bool asciiOnlyPackageIds, out NuspecReader nuspecReader, out PackageMetadata packageMetadata)`
`18`	`19`	`{`
`19`	`20`	`packageMetadata = null;`
`20`	`21`
`@@ -25,7 +26,7 @@ public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, out Nu`
`25`	`26`	`if (rawMetadata != null && rawMetadata.Any())`
`26`	`27`	`{`
`27`	`28`	`packageMetadata = PackageMetadata.FromNuspecReader(nuspecReader, strict: true);`
`28`		`- return ValidateCore(packageMetadata);`
	`29`	`+ return ValidateCore(packageMetadata, asciiOnlyPackageIds);`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`catch (Exception ex)`
`@@ -38,7 +39,7 @@ public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, out Nu`
`38`	`39`	`return Enumerable.Empty<ValidationResult>();`
`39`	`40`	`}`
`40`	`41`
`41`		`- private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packageMetadata)`
	`42`	`+ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packageMetadata, bool asciiOnlyPackageIds)`
`42`	`43`	`{`
`43`	`44`	`// Validate the ID`
`44`	`45`	`if (string.IsNullOrEmpty(packageMetadata.Id))`
`@@ -51,12 +52,21 @@ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packag`
`51`	`52`	`{`
`52`	`53`	`yield return new ValidationResult(CoreStrings.Manifest_IdTooLong);`
`53`	`54`	`}`
`54`		`- else if (!PackageIdValidator.IsValidPackageId(packageMetadata.Id))`
	`55`	`+ else`
`55`	`56`	`{`
`56`		`- yield return new ValidationResult(String.Format(`
`57`		`- CultureInfo.CurrentCulture,`
`58`		`- CoreStrings.Manifest_InvalidId,`
`59`		`- packageMetadata.Id));`
	`57`	`+ if (!PackageIdValidator.IsValidPackageId(packageMetadata.Id))`
	`58`	`+ {`
	`59`	`+ yield return new ValidationResult(string.Format(`
	`60`	`+ CultureInfo.CurrentCulture,`
	`61`	`+ CoreStrings.Manifest_InvalidId,`
	`62`	`+ packageMetadata.Id));`
	`63`	`+ } else if (asciiOnlyPackageIds && !PackageIdValidator.IsAsciiOnlyPackageId(packageMetadata.Id))`
	`64`	`+ {`
	`65`	`+ yield return new ValidationResult(string.Format(`
	`66`	`+ CultureInfo.CurrentCulture,`
	`67`	`+ "Non-ASCII characters in package Id are temporary blocked, please check https://aka.ms/nuget/non-ascii-ids for updates.",`
	`68`	`+ packageMetadata.Id));`
	`69`	`+ }`
`60`	`70`	`}`
`61`	`71`	`}`
`62`	`72`
Original file line number	Diff line number	Diff line change
`@@ -14,21 +14,40 @@ public static class PackageIdValidator`
`14`	`14`	`@"^\w+([.-]\w+)*$",`
`15`	`15`	`RegexOptions.IgnoreCase \| RegexOptions.ExplicitCapture);`
`16`	`16`
	`17`	`+ private static readonly Regex AllAsciiRegex = RegexEx.CreateWithTimeout(`
	`18`	`+ @"^[A-Za-z0-9\-_\.]+$",`
	`19`	`+ RegexOptions.IgnoreCase \| RegexOptions.ExplicitCapture);`
	`20`	`+`
`17`	`21`	`public static bool IsValidPackageId(string packageId)`
`18`	`22`	`{`
`19`	`23`	`if (packageId == null)`
`20`	`24`	`{`
`21`	`25`	`throw new ArgumentNullException(nameof(packageId));`
`22`	`26`	`}`
`23`	`27`
`24`		`- if (String.Equals(packageId, "$id$", StringComparison.OrdinalIgnoreCase))`
	`28`	`+ if (string.Equals(packageId, "$id$", StringComparison.OrdinalIgnoreCase))`
`25`	`29`	`{`
`26`	`30`	`return false;`
`27`	`31`	`}`
`28`	`32`
`29`	`33`	`return IdRegex.IsMatch(packageId);`
`30`	`34`	`}`
`31`	`35`
	`36`	`+ public static bool IsAsciiOnlyPackageId(string packageId)`
	`37`	`+ {`
	`38`	`+ if (packageId == null)`
	`39`	`+ {`
	`40`	`+ throw new ArgumentNullException(nameof(packageId));`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ if (string.Equals(packageId, "$id$", StringComparison.OrdinalIgnoreCase))`
	`44`	`+ {`
	`45`	`+ return false;`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ return AllAsciiRegex.IsMatch(packageId);`
	`49`	`+ }`
	`50`	`+`
`32`	`51`	`public static void ValidatePackageId(string packageId)`
`33`	`52`	`{`
`34`	`53`	`if (packageId == null)`
`@@ -45,9 +64,9 @@ public static void ValidatePackageId(string packageId)`
`45`	`64`	`{`
`46`	`65`	`throw new ArgumentException(string.Format(`
`47`	`66`	`CultureInfo.CurrentCulture,`
`48`		`- "The package ID '{0}' contains invalid characters. Examples of valid package IDs include 'MyPackage' and 'MyPackage.Sample'.",`
	`67`	`+ "The package ID '{0}' contains invalid characters. Package ID can only contain alphanumeric characters, hyphens, underscores, and periods.",`
`49`	`68`	`packageId));`
`50`	`69`	`}`
`51`	`70`	`}`
`52`	`71`	`}`
`53`		`-}`
	`72`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public class FeatureFlagService : IFeatureFlagService`
`64`	`64`	`private const string DisplayTfmBadgesFeatureName = GalleryPrefix + "DisplayTfmBadges";`
`65`	`65`	`private const string AdvancedFrameworkFilteringFeatureName = GalleryPrefix + "AdvancedFrameworkFiltering";`
`66`	`66`	`private const string FederatedCredentialsFeatureName = GalleryPrefix + "FederatedCredentials";`
	`67`	`+ private const string AsciiOnlyPackageIdFeatureName = GalleryPrefix + "AsciiOnlyPackageId";`
`67`	`68`
`68`	`69`	`private const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllNonHijacked";`
`69`	`70`	`private const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllCountNonHijacked";`
`@@ -427,5 +428,10 @@ public bool CanUseFederatedCredentials(User user)`
`427`	`428`	`{`
`428`	`429`	`return _client.IsEnabled(FederatedCredentialsFeatureName, user, defaultValue: false);`
`429`	`430`	`}`
	`431`	`+`
	`432`	`+ public bool IsAsciiOnlyPackageIdEnabled()`
	`433`	`+ {`
	`434`	`+ return _client.IsEnabled(AsciiOnlyPackageIdFeatureName, defaultValue: false);`
	`435`	`+ }`
`430`	`436`	`}`
`431`	`437`	`}`
Original file line number	Diff line number	Diff line change
`@@ -347,5 +347,10 @@ public interface IFeatureFlagService`
`347`	`347`	`/// Whether or not the user specified in a package owner scope can use federated credentials.`
`348`	`348`	`/// </summary>`
`349`	`349`	`bool CanUseFederatedCredentials(User user);`
	`350`	`+`
	`351`	`+ /// <summary>`
	`352`	`+ /// Whether or not only ASCII characters are allowed in PackageId, used for temporary block unicode.`
	`353`	`+ /// </summary>`
	`354`	`+ bool IsAsciiOnlyPackageIdEnabled();`
`350`	`355`	`}`
`351`	`356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ private async Task<ActionResult> CreatePackageInternal()`
`617`	`617`
`618`	`618`	`NuspecReader nuspec;`
`619`	`619`	`PackageMetadata packageMetadata;`
`620`		`- var errors = ManifestValidator.Validate(packageToPush.GetNuspec(), out nuspec, out packageMetadata).ToArray();`
	`620`	`+ var errors = ManifestValidator.Validate(packageToPush.GetNuspec(), FeatureFlagService.IsAsciiOnlyPackageIdEnabled(), out nuspec, out packageMetadata).ToArray();`
`621`	`621`	`if (errors.Length > 0)`
`622`	`622`	`{`
`623`	`623`	`var errorsString = string.Join("', '", errors.Select(error => error.ErrorMessage));`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil`
`420`	`420`	`PackageArchiveReader packageArchiveReader = CreatePackage(uploadStream);`
`421`	`421`	`NuspecReader nuspec;`
`422`	`422`	`PackageMetadata packageMetadata;`
`423`		`- var errors = ManifestValidator.Validate(packageArchiveReader.GetNuspec(), out nuspec, out packageMetadata).ToArray();`
	`423`	`+ var errors = ManifestValidator.Validate(packageArchiveReader.GetNuspec(), _featureFlagService.IsAsciiOnlyPackageIdEnabled(), out nuspec, out packageMetadata).ToArray();`
`424`	`424`	`if (errors.Length > 0)`
`425`	`425`	`{`
`426`	`426`	`var errorStrings = new List<JsonValidationMessage>();`
Original file line number	Diff line number	Diff line change
`@@ -137,5 +137,7 @@ public class FakeFeatureFlagService : IFeatureFlagService`
`137`	`137`	`public bool IsAdvancedFrameworkFilteringEnabled(User user) => throw new NotImplementedException();`
`138`	`138`
`139`	`139`	`public bool CanUseFederatedCredentials(User user) => throw new NotImplementedException();`
	`140`	`+`
	`141`	`+ public bool IsAsciiOnlyPackageIdEnabled() => throw new NotImplementedException();`
`140`	`142`	`}`
`141`	`143`	`}`