author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
455,754 | 05.08.2020 14:50:45 | 25,200 | a4403ae4ddb146028d159a869cdb57c278587a0f | Unbreak GitHubVulnerabilities2Db dependency injection
unbreak ghv2db dependency injection - use content service fake | [
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/Job.cs",
"new_path": "src/GitHubVulnerabilities2Db/Job.cs",
"diff": "using System.Net.Http;\nusing System.Threading;\nusing System.Threading.Tasks;\n+using System.Web;\nusing Autofac;\nusing GitHubVulnerabilities2Db.Collector;\nusing GitHubVulnerabilities2Db.Configuration;\nusing GitHubVulnerabilities2Db.Gallery;\nusing GitHubVulnerabilities2Db.GraphQL;\nusing GitHubVulnerabilities2Db.Ingest;\n+using Microsoft.ApplicationInsights.Extensibility;\nusing Microsoft.Extensions.Configuration;\nusing Microsoft.Extensions.DependencyInjection;\nusing Microsoft.Extensions.Options;\nusing NuGet.Services.Storage;\nusing NuGetGallery;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Configuration;\n+using NuGetGallery.Diagnostics;\nusing NuGetGallery.Security;\nnamespace GitHubVulnerabilities2Db\n@@ -109,6 +113,19 @@ protected void ConfigureGalleryServices(ContainerBuilder containerBuilder)\ncontainerBuilder\n.RegisterType<PackageUpdateService>()\n.As<IPackageUpdateService>();\n+\n+ containerBuilder.RegisterType<AppConfiguration>()\n+ .As<IAppConfiguration>()\n+ .SingleInstance();\n+\n+ var contentService = new FakeContentService();\n+ containerBuilder.RegisterInstance(contentService)\n+ .As<IContentService>()\n+ .SingleInstance();\n+\n+ containerBuilder.RegisterType<ContentObjectService>()\n+ .As<IContentObjectService>()\n+ .SingleInstance();\n}\nprotected void ConfigureQueryServices(ContainerBuilder containerBuilder)\n@@ -165,4 +182,18 @@ private DurableCursor CreateCursor(IComponentContext ctx, Func<GitHubVulnerabili\nreturn new DurableCursor(storage.ResolveUri(getBlobName(config)), storage, DateTimeOffset.MinValue);\n}\n}\n+\n+ public class FakeContentService : IContentService\n+ {\n+ public void ClearCache()\n+ {\n+ //no-op\n+ }\n+\n+ public Task<IHtmlString> GetContentItemAsync(string name, TimeSpan expiresIn)\n+ {\n+ // no-op\n+ return Task.FromResult((IHtmlString)null);\n+ }\n+ }\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Unbreak GitHubVulnerabilities2Db dependency injection (#8139)
unbreak ghv2db dependency injection - use content service fake |
455,754 | 06.08.2020 14:55:40 | 25,200 | 4c77f9118786d039a8922457ede2e1cb8bacb779 | Update range's vulnerability before entity update to fix index uniqueness error | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageVulnerabilityService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageVulnerabilityService.cs",
"diff": "@@ -231,7 +231,6 @@ private void UpdateRangesOfPackageVulnerability(PackageVulnerability vulnerabili\nvar newRanges = vulnerability.AffectedRanges\n.Except(existingVulnerability.AffectedRanges, rangeComparer)\n.ToList();\n- _entitiesContext.VulnerableRanges.AddRange(newRanges);\nforeach (var newRange in newRanges)\n{\n_logger.LogInformation(\n@@ -240,7 +239,8 @@ private void UpdateRangesOfPackageVulnerability(PackageVulnerability vulnerabili\nnewRange.PackageVersionRange,\nvulnerability.GitHubDatabaseKey);\n- newRange.Vulnerability = existingVulnerability;\n+ newRange.Vulnerability = existingVulnerability; // this needs to happen before we update _entitiesContext, otherwise index uniqueness conflicts occur\n+ _entitiesContext.VulnerableRanges.Add(newRange);\nexistingVulnerability.AffectedRanges.Add(newRange);\nProcessNewVulnerabilityRange(newRange, packagesToUpdate);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update range's vulnerability before entity update to fix index uniqueness error (#8140) |
455,741 | 22.07.2020 06:19:56 | 0 | 6d7bec37dcad88a8065679fc267e1171568c9f35 | add feature to enable embedded file | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"new_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"diff": "@@ -101,6 +101,7 @@ private void SetPropertiesFromMetadata()\nTags = GetValue(PackageMetadataStrings.Tags, (string)null);\nLanguage = GetValue(PackageMetadataStrings.Language, (string)null);\nIconFile = GetValue(PackageMetadataStrings.Icon, (string)null);\n+ ReadmeFile = GetValue(PackageMetadataStrings.Readme, (string)null);\nOwners = GetValue(PackageMetadataStrings.Owners, (string)null);\n@@ -141,6 +142,12 @@ private void SetPropertiesFromMetadata()\n/// </summary>\npublic string IconFile { get; private set; }\n+ /// <summary>\n+ /// Contains the embedded readme filename taken from the 'readme' node of the nuspec file.\n+ /// Null if not specified.\n+ /// </summary>\n+ public string ReadmeFile { get; private set; }\n+\npublic string GetValueFromMetadata(string key)\n{\nreturn GetValue(key, (string)null);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/PackageMetadataStrings.cs",
"new_path": "src/NuGetGallery.Core/Packaging/PackageMetadataStrings.cs",
"diff": "@@ -21,5 +21,6 @@ public static class PackageMetadataStrings\npublic const string Tags = \"tags\";\npublic const string Title = \"title\";\npublic const string Icon = \"icon\";\n+ public const string Readme = \"readme\";\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -38,6 +38,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string Get2FADismissFeedback = GalleryPrefix + \"Get2FADismissFeedback\";\nprivate const string UsabillaOnEveryPageFeatureName = GalleryPrefix + \"UsabillaEveryPage\";\nprivate const string PackageRenamesFeatureName = GalleryPrefix + \"PackageRenames\";\n+ private const string UploadEmbeddedReadmeFeatureName = GalleryPrefix + \"UploadEmbeddedReadmeFeatureName\";\nprivate readonly IFeatureFlagClient _client;\n@@ -191,5 +192,10 @@ public bool IsPackageRenamesEnabled(User user)\n{\nreturn _client.IsEnabled(PackageRenamesFeatureName, user, defaultValue: false);\n}\n+\n+ public bool IsUploadEmbeddedReadmeEnabled(User user)\n+ {\n+ return _client.IsEnabled(UploadEmbeddedReadmeFeatureName, user, defaultValue: false);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -146,5 +146,10 @@ public interface IFeatureFlagService\n/// Whether the user is able to see or manage the package renames information.\n/// </summary>\nbool IsPackageRenamesEnabled(User user);\n+\n+ /// <summary>\n+ /// Whether the user is able to upload package with an embedded readme file.\n+ /// </summary>\n+ bool IsUploadEmbeddedReadmeEnabled(User user);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -690,6 +690,7 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\npackage.EmbeddedLicenseType = GetEmbeddedLicenseType(packageMetadata);\npackage.LicenseExpression = GetLicenseExpression(packageMetadata);\npackage.HasEmbeddedIcon = !string.IsNullOrWhiteSpace(packageMetadata.IconFile);\n+ package.EmbeddedReadmeType = GetEmbeddedReadmeType(packageMetadata);\nreturn package;\n}\n@@ -739,6 +740,24 @@ private static EmbeddedLicenseFileType GetEmbeddedLicenseType(string licenseFile\nthrow new ArgumentException($\"Invalid file name: {licenseFileName}\");\n}\n+ private static EmbeddedReadmeFileType GetEmbeddedReadmeType(PackageMetadata packageMetadata)\n+ {\n+ const string MarkdownFileExtension = \".md\";\n+ if (packageMetadata.ReadmeFile == null)\n+ {\n+ return EmbeddedReadmeFileType.Absent;\n+ }\n+\n+ var extension = Path.GetExtension(packageMetadata.ReadmeFile);\n+\n+ if (MarkdownFileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase))\n+ {\n+ return EmbeddedReadmeFileType.Markdown;\n+ }\n+\n+ throw new ArgumentException($\"Invalid file name: {packageMetadata.ReadmeFile}\");\n+ }\n+\nprivate static void ValidateSupportedFrameworks(string[] supportedFrameworks)\n{\n// Frameworks within the portable profile are not allowed to have profiles themselves.\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | add feature to enable embedded file |
455,741 | 22.07.2020 19:45:13 | 0 | 7ffab41ee78dd03bc722b0dca010700cb081abd9 | add readme validation | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageMetadataValidationService.cs",
"new_path": "src/NuGetGallery/Services/PackageMetadataValidationService.cs",
"diff": "@@ -35,6 +35,11 @@ public class PackageMetadataValidationService : IPackageMetadataValidationServic\n\".png\"\n};\n+ private static readonly IReadOnlyCollection<string> AllowedReadmeFileExtensions = new HashSet<string>\n+ {\n+ \".md\"\n+ };\n+\nprivate static readonly IReadOnlyCollection<string> AllowedLicenseTypes = new HashSet<string>\n{\nLicenseType.File.ToString(),\n@@ -52,9 +57,12 @@ public class PackageMetadataValidationService : IPackageMetadataValidationServic\nprivate const long MaxAllowedLicenseLengthForUploading = 1024 * 1024; // 1 MB\nprivate const long MaxAllowedIconLengthForUploading = 1024 * 1024; // 1 MB\nprivate const int MaxAllowedLicenseNodeValueLength = 500;\n+ // 1 MB Keep consistent with icon, license for now, change value later once we define the size\n+ private const long MaxAllowedReadmeLengthForUploading = 1024 * 1024;\nprivate const string LicenseNodeName = \"license\";\nprivate const string IconNodeName = \"icon\";\nprivate const string AllowedLicenseVersion = \"1.0.0\";\n+ private const string ReadmeNode = \"readme\";\nprivate const string Unlicensed = \"UNLICENSED\";\nprivate readonly IPackageService _packageService;\n@@ -144,6 +152,12 @@ public class PackageMetadataValidationService : IPackageMetadataValidationServic\nreturn result;\n}\n+ result = await CheckReadmeMetadataAsync(nuGetPackage, warnings, currentUser);\n+ if (result != null)\n+ {\n+ return result;\n+ }\n+\nreturn PackageValidationResult.AcceptedWithWarnings(warnings);\n}\n@@ -401,6 +415,76 @@ private async Task<PackageValidationResult> CheckIconMetadataAsync(PackageArchiv\nreturn null;\n}\n+ private async Task<PackageValidationResult> CheckReadmeMetadataAsync(PackageArchiveReader nuGetPackage, List<IValidationMessage> warnings, User user)\n+ {\n+ var nuspecReader = GetNuspecReader(nuGetPackage);\n+ var readmeElement = nuspecReader.ReadmeElement;\n+\n+ if (readmeElement == null)\n+ {\n+ return null;\n+ }\n+\n+ var embeddedReadmeEnabled = _featureFlagService.IsUploadEmbeddedReadmeEnabled(user);\n+ if (!embeddedReadmeEnabled)\n+ {\n+ return PackageValidationResult.Invalid(Strings.UploadPackage_EmbeddedReadmeNotAccepted);\n+ }\n+\n+ if (HasChildElements(readmeElement))\n+ {\n+ return PackageValidationResult.Invalid(string.Format(Strings.UploadPackage_NodeContainsChildren, ReadmeNode));\n+ }\n+\n+ var readmeFilePath = FileNameHelper.GetZipEntryPath(readmeElement.Value);\n+ if (!FileExists(nuGetPackage, readmeFilePath))\n+ {\n+ return PackageValidationResult.Invalid(\n+ string.Format(\n+ Strings.UploadPackage_FileDoesNotExist,\n+ Strings.UploadPackage_ReadmeFileType,\n+ readmeFilePath));\n+ }\n+\n+ var readmeFileExtension = Path.GetExtension(readmeFilePath);\n+ if (!AllowedReadmeFileExtensions.Contains(readmeFileExtension, StringComparer.OrdinalIgnoreCase))\n+ {\n+ var result = PackageValidationResult.Invalid(\n+ string.Format(\n+ Strings.UploadPackage_InvalidReadmeFileExtension,\n+ readmeFileExtension,\n+ string.Join(\", \", AllowedReadmeFileExtensions.Where(x => x != string.Empty).Select(extension => $\"'{extension}'\"))));\n+ return result;\n+ }\n+\n+ var readmeFileEntry = nuGetPackage.GetEntry(readmeFilePath);\n+ if (readmeFileEntry.Length > MaxAllowedReadmeLengthForUploading)\n+ {\n+ return PackageValidationResult.Invalid(\n+ string.Format(\n+ Strings.UploadPackage_FileTooLong,\n+ Strings.UploadPackage_ReadmeFileType,\n+ MaxAllowedReadmeLengthForUploading.ToUserFriendlyBytesLabel()));\n+ }\n+\n+ if (!await IsStreamLengthMatchesReportedAsync(nuGetPackage, readmeFilePath, readmeFileEntry.Length))\n+ {\n+ return PackageValidationResult.Invalid(Strings.UploadPackage_CorruptNupkg);\n+ }\n+\n+ // zip streams do not support seeking, so we'll have to reopen them\n+ using (var readmeFileStream = nuGetPackage.GetStream(readmeFilePath))\n+ {\n+ // check if specified file is a text file\n+ if (!await TextHelper.LooksLikeUtf8TextStreamAsync(readmeFileStream))\n+ {\n+ return PackageValidationResult.Invalid(Strings.UploadPackage_ReadmeMustBePlainText);\n+ }\n+ }\n+\n+ return null;\n+ }\n+\nprivate static async Task<bool> FileMatchesPredicate(PackageArchiveReader nuGetPackage, string filePath, Func<Stream, Task<bool>> predicate)\n{\nusing (var stream = await nuGetPackage.GetStreamAsync(filePath, CancellationToken.None))\n@@ -556,6 +640,7 @@ public UserContentEnabledNuspecReader(Stream stream)\npublic XElement LicenseElement => MetadataNode.Element(MetadataNode.Name.Namespace + LicenseNodeName);\npublic XElement IconElement => MetadataNode.Element(MetadataNode.Name.Namespace + IconNodeName);\n+ public XElement ReadmeElement => MetadataNode.Element(MetadataNode.Name.Namespace + ReadmeNode);\n}\nprivate async Task<PackageValidationResult> CheckPackageEntryCountAsync(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -2426,6 +2426,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The <readme> element is not currently supported..\n+ /// </summary>\n+ public static string UploadPackage_EmbeddedReadmeNotAccepted {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_EmbeddedReadmeNotAccepted\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The {0} file '{1}' does not exist in the package..\n/// </summary>\n@@ -2534,6 +2543,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The readme file has an invalid extension '{0}'. Extension must be one of the following: {1}..\n+ /// </summary>\n+ public static string UploadPackage_InvalidReadmeFileExtension {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_InvalidReadmeFileExtension\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Learn more.\n/// </summary>\n@@ -2715,6 +2733,24 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to readme.\n+ /// </summary>\n+ public static string UploadPackage_ReadmeFileType {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_ReadmeFileType\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to The readme file must be plain text using UTF-8 encoding..\n+ /// </summary>\n+ public static string UploadPackage_ReadmeMustBePlainText {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_ReadmeMustBePlainText\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The previous package version '{0}' is author signed but the uploaded package is unsigned. To avoid this warning, sign the package before uploading..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1162,4 +1162,17 @@ The {1} Team</value>\n<data name=\"PackageUploadCancelled\" xml:space=\"preserve\">\n<value>The package upload failed due to the client disconnecting.</value>\n</data>\n+ <data name=\"UploadPackage_EmbeddedReadmeNotAccepted\" xml:space=\"preserve\">\n+ <value>The <readme> element is not currently supported.</value>\n+ </data>\n+ <data name=\"UploadPackage_InvalidReadmeFileExtension\" xml:space=\"preserve\">\n+ <value>The readme file has an invalid extension '{0}'. Extension must be one of the following: {1}.</value>\n+ <comment>{0} is the readme file extension specified in the .nuspec, {1} is the list of allowed extensions</comment>\n+ </data>\n+ <data name=\"UploadPackage_ReadmeFileType\" xml:space=\"preserve\">\n+ <value>readme</value>\n+ </data>\n+ <data name=\"UploadPackage_ReadmeMustBePlainText\" xml:space=\"preserve\">\n+ <value>The readme file must be plain text using UTF-8 encoding.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | add readme validation |
455,741 | 29.07.2020 00:47:19 | 0 | b9d2054df4f894e65396b2660d6cbd477d8526ce | rename & add more test cases | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -38,7 +38,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string Get2FADismissFeedback = GalleryPrefix + \"Get2FADismissFeedback\";\nprivate const string UsabillaOnEveryPageFeatureName = GalleryPrefix + \"UsabillaEveryPage\";\nprivate const string PackageRenamesFeatureName = GalleryPrefix + \"PackageRenames\";\n- private const string UploadEmbeddedReadmeFeatureName = GalleryPrefix + \"UploadEmbeddedReadmeFeatureName\";\n+ private const string EmbeddedReadmeFlightName = GalleryPrefix + \"EmbeddedReadmes\";\nprivate readonly IFeatureFlagClient _client;\n@@ -193,9 +193,9 @@ public bool IsPackageRenamesEnabled(User user)\nreturn _client.IsEnabled(PackageRenamesFeatureName, user, defaultValue: false);\n}\n- public bool IsUploadEmbeddedReadmeEnabled(User user)\n+ public bool AreEmbeddedReadmesEnabled(User user)\n{\n- return _client.IsEnabled(UploadEmbeddedReadmeFeatureName, user, defaultValue: false);\n+ return _client.IsEnabled(EmbeddedReadmeFlightName, user, defaultValue: false);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -148,8 +148,8 @@ public interface IFeatureFlagService\nbool IsPackageRenamesEnabled(User user);\n/// <summary>\n- /// Whether the user is able to the upload package with an embedded readme file.\n+ /// Whether the user is able to publish the package with an embedded readme file.\n/// </summary>\n- bool IsUploadEmbeddedReadmeEnabled(User user);\n+ bool AreEmbeddedReadmesEnabled(User user);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -21,6 +21,8 @@ namespace NuGetGallery\n{\npublic class PackageService : CorePackageService, IPackageService\n{\n+ private const string MarkdownFileExtension = \".md\";\n+\nprivate readonly IAuditingService _auditingService;\nprivate readonly ITelemetryService _telemetryService;\nprivate readonly ISecurityPolicyService _securityPolicyService;\n@@ -722,7 +724,6 @@ private string GetLicenseExpression(PackageMetadata packageMetadata)\nprivate static EmbeddedLicenseFileType GetEmbeddedLicenseType(string licenseFileName)\n{\n- const string MarkdownFileExtension = \".md\";\nconst string TextFileExtension = \".txt\";\nvar extension = Path.GetExtension(licenseFileName);\n@@ -742,8 +743,6 @@ private static EmbeddedLicenseFileType GetEmbeddedLicenseType(string licenseFile\nprivate static EmbeddedReadmeFileType GetEmbeddedReadmeType(PackageMetadata packageMetadata)\n{\n- const string MarkdownFileExtension = \".md\";\n-\nif (packageMetadata.ReadmeFile == null)\n{\nreturn EmbeddedReadmeFileType.Absent;\n@@ -751,12 +750,12 @@ private static EmbeddedReadmeFileType GetEmbeddedReadmeType(PackageMetadata pack\nvar extension = Path.GetExtension(packageMetadata.ReadmeFile);\n- if (MarkdownFileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase))\n+ if (MarkdownFileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase) || string.Empty == extension)\n{\nreturn EmbeddedReadmeFileType.Markdown;\n}\n- throw new ArgumentException($\"Invalid file name: {packageMetadata.ReadmeFile}\");\n+ throw new ArgumentException($\"The file name for the package readme must have the \\\"md\\\" file extentsion: {packageMetadata.ReadmeFile}\");\n}\nprivate static void ValidateSupportedFrameworks(string[] supportedFrameworks)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -340,7 +340,6 @@ protected override void Load(ContainerBuilder builder)\n.InstancePerLifetimeScope();\nbuilder.RegisterType<PackageMetadataValidationService>()\n- .AsSelf()\n.As<IPackageMetadataValidationService>()\n.InstancePerLifetimeScope();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageMetadataValidationService.cs",
"new_path": "src/NuGetGallery/Services/PackageMetadataValidationService.cs",
"diff": "@@ -62,7 +62,7 @@ public class PackageMetadataValidationService : IPackageMetadataValidationServic\nprivate const string LicenseNodeName = \"license\";\nprivate const string IconNodeName = \"icon\";\nprivate const string AllowedLicenseVersion = \"1.0.0\";\n- private const string ReadmeNode = \"readme\";\n+ private const string ReadmeNodeName = \"readme\";\nprivate const string Unlicensed = \"UNLICENSED\";\nprivate readonly IPackageService _packageService;\n@@ -152,7 +152,7 @@ public class PackageMetadataValidationService : IPackageMetadataValidationServic\nreturn result;\n}\n- result = await CheckReadmeMetadataAsync(nuGetPackage, warnings, currentUser);\n+ result = await CheckReadmeMetadataAsync(nuGetPackage, currentUser);\nif (result != null)\n{\nreturn result;\n@@ -415,7 +415,7 @@ private async Task<PackageValidationResult> CheckIconMetadataAsync(PackageArchiv\nreturn null;\n}\n- private async Task<PackageValidationResult> CheckReadmeMetadataAsync(PackageArchiveReader nuGetPackage, List<IValidationMessage> warnings, User user)\n+ private async Task<PackageValidationResult> CheckReadmeMetadataAsync(PackageArchiveReader nuGetPackage, User user)\n{\nvar nuspecReader = GetNuspecReader(nuGetPackage);\nvar readmeElement = nuspecReader.ReadmeElement;\n@@ -425,7 +425,7 @@ private async Task<PackageValidationResult> CheckReadmeMetadataAsync(PackageArch\nreturn null;\n}\n- var embeddedReadmeEnabled = _featureFlagService.IsUploadEmbeddedReadmeEnabled(user);\n+ var embeddedReadmeEnabled = _featureFlagService.AreEmbeddedReadmesEnabled(user);\nif (!embeddedReadmeEnabled)\n{\nreturn PackageValidationResult.Invalid(Strings.UploadPackage_EmbeddedReadmeNotAccepted);\n@@ -433,7 +433,7 @@ private async Task<PackageValidationResult> CheckReadmeMetadataAsync(PackageArch\nif (HasChildElements(readmeElement))\n{\n- return PackageValidationResult.Invalid(string.Format(Strings.UploadPackage_NodeContainsChildren, ReadmeNode));\n+ return PackageValidationResult.Invalid(string.Format(Strings.UploadPackage_NodeContainsChildren, ReadmeNodeName));\n}\nvar readmeFilePath = FileNameHelper.GetZipEntryPath(readmeElement.Value);\n@@ -640,7 +640,7 @@ public UserContentEnabledNuspecReader(Stream stream)\npublic XElement LicenseElement => MetadataNode.Element(MetadataNode.Name.Namespace + LicenseNodeName);\npublic XElement IconElement => MetadataNode.Element(MetadataNode.Name.Namespace + IconNodeName);\n- public XElement ReadmeElement => MetadataNode.Element(MetadataNode.Name.Namespace + ReadmeNode);\n+ public XElement ReadmeElement => MetadataNode.Element(MetadataNode.Name.Namespace + ReadmeNodeName);\n}\nprivate async Task<PackageValidationResult> CheckPackageEntryCountAsync(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Collections.Generic;\nusing System.Data.Entity.Infrastructure;\nusing System.Data.SqlClient;\nusing System.IO;\n-using System.Linq;\n-using System.Threading;\nusing System.Threading.Tasks;\nusing NuGet.Packaging;\nusing NuGet.Services.Entities;\n-using NuGetGallery.Configuration;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Packaging;\n@@ -19,13 +15,12 @@ namespace NuGetGallery\n{\npublic class PackageUploadService : IPackageUploadService\n{\n+\nprivate readonly IPackageService _packageService;\nprivate readonly IPackageFileService _packageFileService;\nprivate readonly IEntitiesContext _entitiesContext;\nprivate readonly IReservedNamespaceService _reservedNamespaceService;\nprivate readonly IValidationService _validationService;\n- private readonly IAppConfiguration _config;\n- private readonly ITyposquattingService _typosquattingService;\nprivate readonly ICoreLicenseFileService _coreLicenseFileService;\nprivate readonly IPackageVulnerabilityService _vulnerabilityService;\nprivate readonly IPackageMetadataValidationService _metadataValidationService;\n@@ -36,8 +31,6 @@ public class PackageUploadService : IPackageUploadService\nIEntitiesContext entitiesContext,\nIReservedNamespaceService reservedNamespaceService,\nIValidationService validationService,\n- IAppConfiguration config,\n- ITyposquattingService typosquattingService,\nICoreLicenseFileService coreLicenseFileService,\nIDiagnosticsService diagnosticsService,\nIPackageVulnerabilityService vulnerabilityService,\n@@ -48,8 +41,6 @@ public class PackageUploadService : IPackageUploadService\n_entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n_reservedNamespaceService = reservedNamespaceService ?? throw new ArgumentNullException(nameof(reservedNamespaceService));\n_validationService = validationService ?? throw new ArgumentNullException(nameof(validationService));\n- _config = config ?? throw new ArgumentNullException(nameof(config));\n- _typosquattingService = typosquattingService ?? throw new ArgumentNullException(nameof(typosquattingService));\n_coreLicenseFileService = coreLicenseFileService ?? throw new ArgumentNullException(nameof(coreLicenseFileService));\nif (diagnosticsService == null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1030,14 +1030,14 @@ The {1} Team</value>\n</data>\n<data name=\"UploadPackage_FileDoesNotExist\" xml:space=\"preserve\">\n<value>The {0} file '{1}' does not exist in the package.</value>\n- <comment>{0} is the type of file ('license', 'icon', etc.), {1} is the file name specified in the .nuspec</comment>\n+ <comment>{0} is the type of file ('license', 'icon', 'readme', etc.), {1} is the file name specified in the .nuspec</comment>\n</data>\n<data name=\"UploadPackage_LicenseMustBePlainText\" xml:space=\"preserve\">\n<value>The license file must be plain text using UTF-8 encoding.</value>\n</data>\n<data name=\"UploadPackage_FileTooLong\" xml:space=\"preserve\">\n<value>The {0} file cannot be larger than {1}.</value>\n- <comment>{0} is the file type ('license', 'icon', etc.), {1} is the string representation max allowed license file size (in whatever units the caller chooses)</comment>\n+ <comment>{0} is the file type ('license', 'icon', 'readme', etc.), {1} is the string representation max allowed license file size (in whatever units the caller chooses)</comment>\n</data>\n<data name=\"UploadPackage_NodeContainsChildren\" xml:space=\"preserve\">\n<value>The {0} node cannot contain child nodes.</value>\n@@ -1175,4 +1175,7 @@ The {1} Team</value>\n<data name=\"UploadPackage_ReadmeMustBePlainText\" xml:space=\"preserve\">\n<value>The readme file must be plain text using UTF-8 encoding.</value>\n</data>\n+ <data name=\"UploadPackage_InvalidReadmeName\" xml:space=\"preserve\">\n+ <value>the name of <readme> element is case sensitive, must use the <readme></value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageMetadataValidationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageMetadataValidationServiceFacts.cs",
"diff": "@@ -1381,7 +1381,7 @@ public async Task AcceptsPackagesWithEmbeddedReadmeForFlightedUsers()\nlicenseExpression: \"MIT\",\nlicenseUrl: new Uri(\"https://licenses.nuget.org/MIT\"));\n_featureFlagService\n- .Setup(ffs => ffs.IsUploadEmbeddedReadmeEnabled(_currentUser))\n+ .Setup(ffs => ffs.AreEmbeddedReadmesEnabled(_currentUser))\n.Returns(true);\nvar result = await _target.ValidateMetadataBeforeUploadAsync(\n@@ -1395,8 +1395,13 @@ public async Task AcceptsPackagesWithEmbeddedReadmeForFlightedUsers()\n}\n[Theory]\n- [InlineData(\"<readme><something/></readme>\")]\n- [InlineData(\"<readme><something>readme.md</something></readme>\")]\n+ [InlineData(\"<readme><someChildNode/></readme>\")]\n+ [InlineData(\"<readme><someChildNode/> </readme>\")]\n+ [InlineData(\"<readme><someChildNode>readme.md</someChildNode></readme>\")]\n+ [InlineData(\"<readme><someChildNode /></readme>\")]\n+ [InlineData(\"<readme>readme.<someChildNode>md</someChildNode></readme>\")]\n+ [InlineData(\"<readme><M>M</M><I>I</I><T>T</T></readme>\")]\n+ [InlineData(\"<readme>M<I>I</I>T</readme>\")]\npublic async Task RejectsReadmeElementWithChildren(string readmeElement)\n{\n_nuGetPackage = GeneratePackageWithUserContent(\n@@ -1404,7 +1409,7 @@ public async Task RejectsReadmeElementWithChildren(string readmeElement)\nlicenseExpression: \"MIT\",\nlicenseUrl: new Uri(\"https://licenses.nuget.org/MIT\"));\n_featureFlagService\n- .Setup(ffs => ffs.IsUploadEmbeddedReadmeEnabled(_currentUser))\n+ .Setup(ffs => ffs.AreEmbeddedReadmesEnabled(_currentUser))\n.Returns(true);\nvar result = await _target.ValidateMetadataBeforeUploadAsync(\n@@ -1439,7 +1444,7 @@ private async Task<PackageValidationResult> ValidatePackageWithReadme(string rea\nlicenseExpression: \"MIT\",\nlicenseUrl: new Uri(\"https://licenses.nuget.org/MIT\"));\n_featureFlagService\n- .Setup(ffs => ffs.IsUploadEmbeddedReadmeEnabled(_currentUser))\n+ .Setup(ffs => ffs.AreEmbeddedReadmesEnabled(_currentUser))\n.Returns(true);\nreturn await _target.ValidateMetadataBeforeUploadAsync(\n@@ -1479,12 +1484,16 @@ public async Task ChecksReadmeFileExtension(string extension, bool successExpect\nAssert.Empty(result.Warnings);\n}\n- [Fact]\n- public async Task RejectsLongReadme()\n+ [Theory]\n+ [InlineData(42, true)]\n+ [InlineData(1024, true)]\n+ [InlineData(1024 * 1024 - 1, true)]\n+ [InlineData(1024 * 1024, true)]\n+ [InlineData(1024 * 1024 + 1, false)]\n+ public async Task RejectsLongReadme(int fileLength, bool expectedSuccess)\n{\n- const int ExpectedMaxReadmeLength = 1024 * 1024;\n- var readmeText = new String('a', ExpectedMaxReadmeLength + 100);\n+ var readmeText = new String('a', fileLength);\n_nuGetPackage = GeneratePackageWithUserContent(\nreadmeFilename: \"readme.md\",\n@@ -1492,7 +1501,7 @@ public async Task RejectsLongReadme()\nlicenseExpression: \"MIT\",\nlicenseUrl: new Uri(\"https://licenses.nuget.org/MIT\"));\n_featureFlagService\n- .Setup(ffs => ffs.IsUploadEmbeddedReadmeEnabled(_currentUser))\n+ .Setup(ffs => ffs.AreEmbeddedReadmesEnabled(_currentUser))\n.Returns(true);\nvar result = await _target.ValidateMetadataBeforeUploadAsync(\n@@ -1500,8 +1509,15 @@ public async Task RejectsLongReadme()\nGetPackageMetadata(_nuGetPackage),\n_currentUser);\n+ if (expectedSuccess)\n+ {\n+ Assert.Equal(PackageValidationResultType.Accepted, result.Type);\n+ }\n+ else\n+ {\nAssert.Equal(PackageValidationResultType.Invalid, result.Type);\nAssert.Contains(\"The readme file cannot be larger\", result.Message.PlainTextMessage);\n+ }\nAssert.Empty(result.Warnings);\n}\n@@ -1512,7 +1528,7 @@ public async Task RejectsNupkgsReportingIncorrectReadmeFileLengthforReadmeFile()\nconst string readmeFileContents = \"readmedocumentation\";\n_featureFlagService\n- .Setup(ffs => ffs.IsUploadEmbeddedReadmeEnabled(_currentUser))\n+ .Setup(ffs => ffs.AreEmbeddedReadmesEnabled(_currentUser))\n.Returns(true);\n// Arrange\nvar packageStream = GeneratePackageStream(\n@@ -1548,7 +1564,7 @@ public async Task AcceptsReadmeFileInSubdirectories(string readmePath)\nlicenseExpression: \"MIT\",\nlicenseUrl: new Uri(\"https://licenses.nuget.org/MIT\"));\n_featureFlagService\n- .Setup(ffs => ffs.IsUploadEmbeddedReadmeEnabled(_currentUser))\n+ .Setup(ffs => ffs.AreEmbeddedReadmesEnabled(_currentUser))\n.Returns(true);\nvar result = await _target.ValidateMetadataBeforeUploadAsync(\n_nuGetPackage.Object,\n@@ -1570,7 +1586,7 @@ public async Task RejectsBinaryReadmeFiles(byte[] readmeFileContent, bool expect\nlicenseExpression: \"MIT\",\nlicenseUrl: new Uri(\"https://licenses.nuget.org/MIT\"));\n_featureFlagService\n- .Setup(ffs => ffs.IsUploadEmbeddedReadmeEnabled(_currentUser))\n+ .Setup(ffs => ffs.AreEmbeddedReadmesEnabled(_currentUser))\n.Returns(true);\nvar result = await _target.ValidateMetadataBeforeUploadAsync(\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "@@ -33,7 +33,6 @@ public class PackageUploadServiceFacts\nMock<IPackageService> packageService = null,\nMock<IReservedNamespaceService> reservedNamespaceService = null,\nMock<IValidationService> validationService = null,\n- Mock<IAppConfiguration> config = null,\nMock<IPackageVulnerabilityService> vulnerabilityService = null)\n{\npackageService = packageService ?? new Mock<IPackageService>();\n@@ -70,7 +69,6 @@ public class PackageUploadServiceFacts\n}\nvalidationService = validationService ?? new Mock<IValidationService>();\n- config = config ?? new Mock<IAppConfiguration>();\nvar diagnosticsService = new Mock<IDiagnosticsService>();\ndiagnosticsService\n.Setup(ds => ds.GetSource(It.IsAny<string>()))\n@@ -83,8 +81,6 @@ public class PackageUploadServiceFacts\nnew Mock<IEntitiesContext>().Object,\nreservedNamespaceService.Object,\nvalidationService.Object,\n- config.Object,\n- new Mock<ITyposquattingService>().Object,\nMock.Of<ICoreLicenseFileService>(),\ndiagnosticsService.Object,\nvulnerabilityService.Object,\n@@ -690,8 +686,6 @@ public FactsBase()\n_entitiesContext.Object,\n_reservedNamespaceService.Object,\n_validationService.Object,\n- _config.Object,\n- _typosquattingService.Object,\n_licenseFileService.Object,\n_diagnosticsService.Object,\n_vulnerabilityService.Object,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | rename & add more test cases |
455,752 | 19.08.2020 01:50:59 | -36,000 | 9b85f4ca60c92d007e601de7e075b2f1cf78d8f3 | Fixed breadcrumb links for packages with build metadata
* Fixed breadcrumb links for packages with build metadata
* added null reference check
* added unit test
* removed extraneous newlines
* fixed test as links now have normalised version numbers on the end
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"new_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"diff": "@@ -228,6 +228,8 @@ public static string Package(this UrlHelper url, string id, bool relativeUrl = t\nstring version,\nbool relativeUrl = true)\n{\n+ string normalized = (version != null) ? NuGetVersionFormatter.Normalize(version) : version;\n+\nstring result = GetRouteLink(\nurl,\nRouteName.DisplayPackage,\n@@ -235,7 +237,7 @@ public static string Package(this UrlHelper url, string id, bool relativeUrl = t\nrouteValues: new RouteValueDictionary\n{\n{ \"id\", id },\n- { \"version\", version }\n+ { \"version\", normalized }\n});\n// Ensure trailing slashes for versionless package URLs, as a fix for package filenames that look like known file extensions\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -2856,8 +2856,8 @@ public async Task VerifyRecentPopularityStatsDownloads()\nJArray result = JArray.Parse(contentResult.Content);\n- Assert.True((string)result[3][\"Gallery\"] == \"/packages/B/1.1\", \"unexpected content result[3].Gallery\");\n- Assert.True((int)result[2][\"Downloads\"] == 5, \"unexpected content result[2].Downloads\");\n+ Assert.Equal(\"/packages/B/1.1.0\", (string)result[3][\"Gallery\"]);\n+ Assert.Equal(5, (int)result[2][\"Downloads\"]);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/UrlHelperExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/UrlHelperExtensionsFacts.cs",
"diff": "@@ -31,6 +31,29 @@ public void PropagatesNull()\n}\n}\n+ public class ThePackageBaseHelperMethod\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void UsesNormalizedVersionInUrls()\n+ {\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"TestPackageId\"\n+ },\n+ NormalizedVersion = \"1.0.0-alpha.1\",\n+ Version = \"1.0.0-alpha.1+metadata\"\n+ };\n+\n+ string fixedUrl = UrlHelperExtensions.Package(TestUtility.MockUrlHelper(), package.Id, package.Version);\n+\n+ Assert.DoesNotContain(\"metadata\", fixedUrl);\n+ Assert.EndsWith(package.NormalizedVersion, fixedUrl);\n+ }\n+ }\n+\npublic class ThePackageHelperMethod\n: TestContainer\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fixed breadcrumb links for packages with build metadata (#8157)
* Fixed breadcrumb links for packages with build metadata #8136
* added null reference check
* added unit test
* removed extraneous newlines
* fixed test as links now have normalised version numbers on the end
Address https://github.com/NuGet/NuGetGallery/issues/8136 |
455,736 | 18.08.2020 11:09:53 | 25,200 | e92834a0479c5cd9d3d0c4e7df1e3f439d4f9a03 | Add hijack=false parameter to OData get specific package
* Transition OData functional tests to a standard hijack=false pattern
* Only allow hijack=false for simple queries
* Don't cache hijack=false
* hijack=false is a custom query
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"diff": "@@ -175,7 +175,8 @@ public class ODataV2FeedController\npublic async Task<IHttpActionResult> Get(\nODataQueryOptions<V2FeedPackage> options,\nstring id,\n- string version)\n+ string version,\n+ [FromUri] bool hijack = true)\n{\n// We are defaulting to semVerLevel = \"2.0.0\" by design.\n// The client is requesting a specific package version and should support what it requests.\n@@ -185,6 +186,7 @@ public class ODataV2FeedController\nid,\nversion,\nsemVerLevel: SemVerLevelKey.SemVerLevel2,\n+ allowHijack: hijack,\nreturn404NotFoundWhenNoResults: true);\nreturn result.FormattedAsSingleResult<V2FeedPackage>();\n@@ -221,6 +223,7 @@ public class ODataV2FeedController\nid,\nversion: null,\nsemVerLevel: semVerLevel,\n+ allowHijack: true,\nreturn404NotFoundWhenNoResults: false);\n}\n@@ -243,6 +246,7 @@ public class ODataV2FeedController\nstring id,\nstring version,\nstring semVerLevel,\n+ bool allowHijack,\nbool return404NotFoundWhenNoResults)\n{\nvar packages = GetAll()\n@@ -266,6 +270,8 @@ public class ODataV2FeedController\nvar semVerLevelKey = SemVerLevelKey.ForSemVerLevel(semVerLevel);\nbool? customQuery = null;\n+ if (allowHijack)\n+ {\n// try the search service\ntry\n{\n@@ -321,6 +327,32 @@ public class ODataV2FeedController\n// We don't want to break package restores. We do want to know if this happens, so here goes:\nQuietLog.LogHandledException(ex);\n}\n+ }\n+\n+ // When non-hijacked queries are disabled, allow only one non-hijacked pattern: query for a specific ID and\n+ // version without any fancy OData options. This enables some monitoring and testing and is known to produce\n+ // a very fast SQL query based on an optimized index.\n+ var isSimpleLookup = !string.IsNullOrWhiteSpace(id)\n+ && !string.IsNullOrWhiteSpace(version)\n+ && options.RawValues.Expand == null\n+ && options.RawValues.Filter == null\n+ && options.RawValues.Format == null\n+ && options.RawValues.InlineCount == null\n+ && options.RawValues.OrderBy == null\n+ && options.RawValues.Select == null\n+ && options.RawValues.Skip == null\n+ && options.RawValues.SkipToken == null\n+ && options.RawValues.Top == null;\n+\n+ if (!allowHijack)\n+ {\n+ if (!isSimpleLookup)\n+ {\n+ return BadRequest(Strings.ODataParametersDisabled);\n+ }\n+\n+ customQuery = true;\n+ }\nif (return404NotFoundWhenNoResults && !packages.Any())\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/ODataCacheOutputAttribute.cs",
"new_path": "src/NuGetGallery/Infrastructure/ODataCacheOutputAttribute.cs",
"diff": "@@ -40,6 +40,22 @@ public ODataCacheOutputAttribute(ODataCachedEndpoint endpoint, int serverTimeSpa\nServerTimeSpan = serverTimeSpan;\n}\n+ protected override bool IsCachingAllowed(HttpActionContext actionContext, bool anonymousOnly)\n+ {\n+ if (_endpoint == ODataCachedEndpoint.GetSpecificPackage)\n+ {\n+ // Don't cache the non-hijacked ID+version lookup pattern.\n+ if (actionContext.ActionArguments.TryGetValue(\"hijack\", out var hijackObj)\n+ && hijackObj is bool hijack\n+ && !hijack)\n+ {\n+ return false;\n+ }\n+ }\n+\n+ return base.IsCachingAllowed(actionContext, anonymousOnly);\n+ }\n+\n/// <summary>\n/// This setting determines how frequently the cache duration setting should be checked. Since the OData\n/// endpoints get a lot of traffic, we don't want to check every time. The 60 seconds here is picked to mimic\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1291,6 +1291,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The combination of parameters provided to this OData endpoint is not supported..\n+ /// </summary>\n+ public static string ODataParametersDisabled {\n+ get {\n+ return ResourceManager.GetString(\"ODataParametersDisabled\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You have successfully confirmed the organization email address..\n/// </summary>\n@@ -2552,6 +2561,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to the name of <readme> element is case sensitive, must use the <readme>.\n+ /// </summary>\n+ public static string UploadPackage_InvalidReadmeName {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_InvalidReadmeName\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Learn more.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1178,4 +1178,7 @@ The {1} Team</value>\n<data name=\"UploadPackage_InvalidReadmeName\" xml:space=\"preserve\">\n<value>the name of <readme> element is case sensitive, must use the <readme></value>\n</data>\n+ <data name=\"ODataParametersDisabled\" xml:space=\"preserve\">\n+ <value>The combination of parameters provided to this OData endpoint is not supported.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/ODataCacheOutputAttributeFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/ODataCacheOutputAttributeFacts.cs",
"diff": "@@ -26,6 +26,49 @@ public class ODataCacheOutputAttributeFacts\n{\npublic class OnActionExecutedAsync : Facts\n{\n+ [Theory]\n+ [InlineData(ODataCachedEndpoint.GetSpecificPackage, true)]\n+ [InlineData(ODataCachedEndpoint.FindPackagesById, true)]\n+ [InlineData(ODataCachedEndpoint.FindPackagesById, false)]\n+ public async Task CacheHijackFalseOrNonGetSpecificPackage(ODataCachedEndpoint endpoint, bool hijack)\n+ {\n+ ActionContext.ActionArguments[\"hijack\"] = hijack;\n+ var target = new ODataCacheOutputAttribute(endpoint, 100);\n+ target.OnActionExecuting(ActionContext);\n+\n+ var before = DateTimeOffset.Now;\n+ await target.OnActionExecutedAsync(ActionExecutedContext, CancellationToken.None);\n+ var after = DateTimeOffset.Now;\n+\n+ Cache.Verify(\n+ x => x.Add(\n+ It.IsAny<string>(),\n+ It.IsAny<object>(),\n+ It.IsAny<DateTimeOffset>(),\n+ null),\n+ Times.Once);\n+ }\n+\n+ [Fact]\n+ public async Task DoesNotCacheHijackTrueAndGetSpecificPackage()\n+ {\n+ ActionContext.ActionArguments[\"hijack\"] = false;\n+ var target = new ODataCacheOutputAttribute(ODataCachedEndpoint.GetSpecificPackage, 100);\n+ target.OnActionExecuting(ActionContext);\n+\n+ var before = DateTimeOffset.Now;\n+ await target.OnActionExecutedAsync(ActionExecutedContext, CancellationToken.None);\n+ var after = DateTimeOffset.Now;\n+\n+ Cache.Verify(\n+ x => x.Add(\n+ It.IsAny<string>(),\n+ It.IsAny<object>(),\n+ It.IsAny<DateTimeOffset>(),\n+ null),\n+ Times.Never);\n+ }\n+\n[Theory]\n[MemberData(nameof(CacheEndpointTestData))]\npublic async Task ObservesConfiguredValue(ODataCachedEndpoint endpoint)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"diff": "using System.Collections.Generic;\nusing System.IO;\nusing System.Linq;\n+using System.Net;\nusing System.Threading.Tasks;\nusing NuGet;\nusing NuGet.Versioning;\n@@ -67,37 +68,39 @@ public bool CheckIfPackageExistsInSource(string packageId, string sourceUrl)\n}\n/// <summary>\n- /// Checks if the given package version is present in V2 and V3. This method bypasses the hijack.\n+ /// Checks if the given package version is present in V2. This method bypasses the hijack.\n/// </summary>\n- private async Task<bool> CheckIfPackageVersionExistsInV2Async(string packageId, string version, bool? isListed)\n+ private async Task<bool> CheckIfPackageVersionExistsInV2Async(string packageId, string version, bool? shouldBeListed)\n{\nvar sourceUrl = UrlHelper.V2FeedRootUrl;\nvar normalizedVersion = NuGetVersion.Parse(version).ToNormalizedString();\n- var filter = $\"Id eq '{packageId}' and NormalizedVersion eq '{normalizedVersion}' and 1 eq 1\";\n- if (isListed.HasValue)\n- {\n- filter += $\" and Published {(isListed.Value ? \"ne\" : \"eq\")} datetime'1900-01-01T00:00:00'\";\n- }\n- var url = UrlHelper.V2FeedRootUrl + $\"/Packages/$count?$filter={Uri.EscapeDataString(filter)}\";\n+ var url = UrlHelper.V2FeedRootUrl + $\"/Packages(Id='{packageId}',Version='{normalizedVersion}')?hijack=false\";\nusing (var httpClient = new System.Net.Http.HttpClient())\n{\nreturn await VerifyWithRetryAsync(\n$\"Verifying that package {packageId} {version} exists on source {sourceUrl} (non-hijacked).\",\nasync () =>\n{\n- var count = int.Parse(await httpClient.GetStringAsync(url));\n- if (count == 0)\n+ using (var response = await httpClient.GetAsync(url))\n+ {\n+ if (response.StatusCode == HttpStatusCode.NotFound)\n{\nreturn false;\n}\n- else if (count == 1)\n+ else if (response.StatusCode == HttpStatusCode.OK)\n{\n+ if (shouldBeListed.HasValue)\n+ {\n+ var responseString = await response.Content.ReadAsStringAsync();\n+ var isActuallyListed = !responseString.Contains(\"<d:Published m:type=\\\"Edm.DateTime\\\">1900-01-01T00:00:00</d:Published>\");\n+ return shouldBeListed == isActuallyListed;\n+ }\n+\nreturn true;\n}\n- else\n- {\n- Assert.False(true, $\"The count returned by {url} was {count} and it should have been 0 or 1.\");\n+\n+ response.EnsureSuccessStatusCode();\nreturn false;\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ODataHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ODataHelper.cs",
"diff": "@@ -64,7 +64,7 @@ public async Task<string> TryDownloadPackageFromFeed(string packageId, string ve\nstring version,\nstring timestampPropertyName)\n{\n- var url = GetPackagesAppearInFeedInOrderUrl(packageId, version, timestampPropertyName);\n+ var url = $\"{UrlHelper.V2FeedRootUrl}/Packages(Id='{packageId}',Version='{version}')?hijack=false\";\nWriteLine($\"Fetching URL: {url}\");\nvar packageResponse = await GetPackageDataInResponse(url, packageId, version);\n@@ -91,13 +91,6 @@ public async Task<string> TryDownloadPackageFromFeed(string packageId, string ve\nreturn timestamp;\n}\n- private static string GetPackagesAppearInFeedInOrderUrl(string packageId, string version, string timestampPropertyName)\n- {\n- return $\"{UrlHelper.V2FeedRootUrl}/Packages?\" +\n- $\"$filter=Id eq '{packageId}' and NormalizedVersion eq '{version}' and 1 eq 1&\" +\n- $\"$select={timestampPropertyName}\";\n- }\n-\npublic async Task<string> GetPackageDataInResponse(string url, string packageId, string version)\n{\nWriteLine($\"Getting data for package '{packageId}' with version '{version}'.\");\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/CuratedFeedTest.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/CuratedFeedTest.cs",
"diff": "@@ -34,7 +34,7 @@ public CuratedFeedTest(ITestOutputHelper testOutputHelper)\npublic async Task SearchMicrosoftDotNetCuratedFeed()\n{\nvar packageId = \"microsoft.aspnet.webpages\";\n- var requestUrl = UrlHelper.DotnetCuratedFeedUrl + @\"Packages()?$filter=tolower(Id)%20eq%20'\" + packageId + \"'&$orderby=Id&$skip=0&$top=30\";\n+ var requestUrl = UrlHelper.DotnetCuratedFeedUrl + @\"Search()?searchTerm='packageid%3A\" + packageId + \"'\";\nstring responseText;\nusing (var httpClient = new HttpClient())\n@@ -54,7 +54,7 @@ public async Task ValidateMicrosoftDotNetCuratedFeed()\n{\nusing (var httpClient = new HttpClient())\n{\n- var requestUrl = UrlHelper.DotnetCuratedFeedUrl + \"Packages\";\n+ var requestUrl = UrlHelper.DotnetCuratedFeedUrl + \"FindPackagesById()?id='AutoMapper'\";\nstring responseText;\nusing (var response = await httpClient.GetAsync(requestUrl))\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -42,7 +42,7 @@ public async Task FindPackagesByIdTest()\nvar packageId = packageInfo.Id;\nvar packageVersion = packageInfo.Version;\n- string url = UrlHelper.V2FeedRootUrl + @\"/FindPackagesById()?id='\" + packageId + \"'&$orderby=Version\";\n+ string url = UrlHelper.V2FeedRootUrl + $\"/Packages(Id='{packageId}',Version='{packageVersion}')?hijack=false\";\nvar containsResponseText = await _odataHelper.ContainsResponseText(url, @\"<id>\" + UrlHelper.V2FeedRootUrl + \"Packages(Id='\" + packageId + \"',Version='\" + packageVersion + \"')</id>\");\nAssert.True(containsResponseText);\n}\n@@ -93,11 +93,6 @@ public async Task PackagesAppearInFeedInOrderTest()\nawait CheckPackageTimestampsInOrder(unlistedPackageIds, \"LastEdited\", unlistStartTimestamp, version);\n}\n- private static string GetPackagesAppearInFeedInOrderUrl(DateTime time, string timestamp)\n- {\n- return $\"{UrlHelper.V2FeedRootUrl}/Packages?$filter={timestamp} gt DateTime'{time:o}'&$orderby={timestamp} desc&$select={timestamp}\";\n- }\n-\n/// <summary>\n/// Verifies if a set of packages in the feed have timestamps in a particular order.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.LoadTests/LoadTests.cs",
"new_path": "tests/NuGetGallery.LoadTests/LoadTests.cs",
"diff": "@@ -87,8 +87,8 @@ public async Task FindPackagesBySpecificIdAndVersion()\n[TestCategory(\"P0Tests\")]\npublic async Task PackagesApiTest()\n{\n- string packageId = \"newtonsoft.json\";\n- string url = UrlHelper.V2FeedRootUrl + @\"Packages()?$filter=tolower(Id) eq '\" + packageId + \"'&$orderby=Id\";\n+ string packageId = \"Newtonsoft.Json\";\n+ string url = UrlHelper.V2FeedRootUrl + $\"Packages()?$filter=Id eq '{packageId}'\";\nstring expectedText = @\"<id>\" + UrlHelper.V2FeedRootUrl + \"Packages(Id='\" + packageId;\nvar odataHelper = new ODataHelper();\nvar containsResponseText = await odataHelper.ContainsResponseTextIgnoreCase(url, expectedText);\n@@ -168,7 +168,7 @@ public async Task ApiV2BaseUrlTest()\npublic async Task SearchMicrosoftDotNetCuratedFeed()\n{\nvar packageId = \"microsoft.aspnet.webpages\";\n- var requestUrl = UrlHelper.DotnetCuratedFeedUrl + @\"Packages()?$filter=tolower(Id)%20eq%20'\" + packageId + \"'&$orderby=Id&$skip=0&$top=30\";\n+ var requestUrl = UrlHelper.DotnetCuratedFeedUrl + @\"Search()?searchTerm='packageid%3A\" + packageId + \"'\";\nstring responseText;\nusing (var httpClient = new HttpClient())\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add hijack=false parameter to OData get specific package (#8161)
* Transition OData functional tests to a standard hijack=false pattern
* Only allow hijack=false for simple queries
* Don't cache hijack=false
* hijack=false is a custom query
Progress on https://github.com/NuGet/Engineering/issues/2902 |
455,736 | 19.08.2020 15:13:25 | 25,200 | 23a2ea5d482ddd66339039c39820d3a8acf5d618 | Remove unnecessary dependency
This was causing a forced downgrade to 4.6.2. The dependency now come in transitively at a higher version. | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n- <PackageReference Include=\"Autofac\">\n- <Version>4.6.2</Version>\n- </PackageReference>\n<PackageReference Include=\"CsvHelper\">\n<Version>7.1.1</Version>\n</PackageReference>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove unnecessary dependency (#8165)
This was causing a forced downgrade to 4.6.2. The dependency now come in transitively at a higher version. |
455,741 | 19.08.2020 22:40:51 | 0 | 48058f70cbcc27354df2fc81eb8501b02496346c | Preview readme when uploading packages(#8160) | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -648,6 +648,16 @@ img.reserved-indicator-icon {\nmargin-left: 10px;\nwidth: 100%;\n}\n+.readme .readme-container {\n+ display: block;\n+ padding: 10.5px;\n+ background-color: #f5f5f5;\n+ border: 1px solid #ccc;\n+ word-break: normal;\n+ margin-bottom: 24px;\n+ overflow: auto;\n+ max-height: 450px;\n+}\n.user-package-list .manage-package-listing .package-icon {\nmax-height: 2em;\nmin-width: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"common-licenses.less\";\n@import \"common-list-packages.less\";\n@import \"common-multi-select-dropdown.less\";\n+@import \"common-readme.less\";\n@import \"common-user-package-list.less\";\n@import \"page-about.less\";\n@import \"page-account-settings.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/common-readme.less",
"diff": "+.readme {\n+ .readme-container{\n+ display: block;\n+ padding: 10.5px;\n+ background-color: @pre-bg;\n+ border: 1px solid #ccc;\n+ word-break: normal;\n+ margin-bottom: @default-margin-bottom;\n+ overflow: auto;\n+ max-height: 450px;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -692,6 +692,7 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\npackage.EmbeddedLicenseType = GetEmbeddedLicenseType(packageMetadata);\npackage.LicenseExpression = GetLicenseExpression(packageMetadata);\npackage.HasEmbeddedIcon = !string.IsNullOrWhiteSpace(packageMetadata.IconFile);\n+ package.HasReadMe = !string.IsNullOrWhiteSpace(packageMetadata.ReadmeFile);\npackage.EmbeddedReadmeType = GetEmbeddedReadmeType(packageMetadata);\nreturn package;\n@@ -750,7 +751,7 @@ private static EmbeddedReadmeFileType GetEmbeddedReadmeType(PackageMetadata pack\nvar extension = Path.GetExtension(packageMetadata.ReadmeFile);\n- if (MarkdownFileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase) || string.Empty == extension)\n+ if (MarkdownFileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase))\n{\nreturn EmbeddedReadmeFileType.Markdown;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "using System.Web;\nusing System.Web.Caching;\nusing System.Web.Mvc;\n+using System.Windows.Forms;\nusing NuGet.Packaging;\nusing NuGet.Services.Entities;\nusing NuGet.Services.Licenses;\n@@ -343,6 +344,8 @@ public virtual async Task<ActionResult> UploadPackage()\nverifyRequest.IsSymbolsPackage = false;\nverifyRequest.LicenseFileContents = await GetLicenseFileContentsOrNullAsync(packageMetadata, packageArchiveReader);\nverifyRequest.LicenseExpressionSegments = GetLicenseExpressionSegmentsOrNull(packageMetadata.LicenseMetadata);\n+ verifyRequest.ReadmeFileContents = await GetReadmeFileContentsOrNullAsync(packageMetadata, packageArchiveReader);\n+\nmodel.InProgressUpload = verifyRequest;\nreturn View(model);\n}\n@@ -613,6 +616,7 @@ private async Task<JsonResult> UploadPackageInternal(PackageArchiveReader packag\nmodel.Warnings.AddRange(packageContentData.Warnings.Select(w => new JsonValidationMessage(w)));\nmodel.LicenseFileContents = packageContentData.LicenseFileContents;\nmodel.LicenseExpressionSegments = packageContentData.LicenseExpressionSegments;\n+ model.ReadmeFileContents = packageContentData.ReadmeFileContents;\nif (packageContentData.EmbeddedIconInformation != null)\n{\n@@ -635,13 +639,15 @@ private class PackageContentData\nIReadOnlyList<IValidationMessage> warnings,\nstring licenseFileContents,\nIReadOnlyCollection<CompositeLicenseExpressionSegmentViewModel> licenseExpressionSegments,\n- EmbeddedIconInformation embeddedIconInformation)\n+ EmbeddedIconInformation embeddedIconInformation,\n+ string readmeFileContents)\n{\nPackageMetadata = packageMetadata;\nWarnings = warnings;\nLicenseFileContents = licenseFileContents;\nLicenseExpressionSegments = licenseExpressionSegments;\nEmbeddedIconInformation = embeddedIconInformation;\n+ ReadmeFileContents = readmeFileContents;\n}\npublic JsonResult ErrorResult { get; }\n@@ -650,6 +656,7 @@ private class PackageContentData\npublic string LicenseFileContents { get; }\npublic IReadOnlyCollection<CompositeLicenseExpressionSegmentViewModel> LicenseExpressionSegments { get; }\npublic EmbeddedIconInformation EmbeddedIconInformation { get; }\n+ public string ReadmeFileContents { get; }\n}\nprivate class EmbeddedIconInformation\n@@ -673,6 +680,7 @@ private async Task<PackageContentData> ValidateAndProcessPackageContents(User cu\nIReadOnlyCollection<CompositeLicenseExpressionSegmentViewModel> licenseExpressionSegments = null;\nPackageMetadata packageMetadata = null;\nEmbeddedIconInformation embeddedIconInformation = null;\n+ string readmeFileContents = null;\nusing (Stream uploadedFile = await _uploadFileService.GetUploadFileAsync(currentUser.Key))\n{\n@@ -720,6 +728,7 @@ private async Task<PackageContentData> ValidateAndProcessPackageContents(User cu\nlicenseFileContents = await GetLicenseFileContentsOrNullAsync(packageMetadata, packageArchiveReader);\nlicenseExpressionSegments = GetLicenseExpressionSegmentsOrNull(packageMetadata.LicenseMetadata);\nembeddedIconInformation = await GetEmbeddedIconOrNullAsync(packageMetadata, packageArchiveReader);\n+ readmeFileContents = await GetReadmeFileContentsOrNullAsync(packageMetadata, packageArchiveReader);\n}\ncatch (Exception ex)\n{\n@@ -730,7 +739,7 @@ private async Task<PackageContentData> ValidateAndProcessPackageContents(User cu\n}\n}\n- return new PackageContentData(packageMetadata, warnings, licenseFileContents, licenseExpressionSegments, embeddedIconInformation);\n+ return new PackageContentData(packageMetadata, warnings, licenseFileContents, licenseExpressionSegments, embeddedIconInformation, readmeFileContents);\n}\nprivate IReadOnlyCollection<CompositeLicenseExpressionSegmentViewModel> GetLicenseExpressionSegmentsOrNull(LicenseMetadata licenseMetadata)\n@@ -788,6 +797,18 @@ private static async Task<EmbeddedIconInformation> GetEmbeddedIconOrNullAsync(Pa\nreturn new EmbeddedIconInformation(imageContentType, imageData);\n}\n+ private async Task<string> GetReadmeFileContentsOrNullAsync(PackageMetadata packageMetadata, PackageArchiveReader packageArchiveReader)\n+ {\n+ if (string.IsNullOrWhiteSpace(packageMetadata.ReadmeFile))\n+ {\n+ return null;\n+ }\n+\n+ var readmeFilename = FileNameHelper.GetZipEntryPath(packageMetadata.ReadmeFile);\n+ var readmeResult = await _readMeService.GetReadMeHtmlAsync(readmeFilename, packageArchiveReader, Encoding.UTF8);\n+ return readmeResult?.Content;\n+ }\n+\nprivate static async Task<byte[]> ReadPackageFile(PackageArchiveReader packageArchiveReader, string filename)\n{\nusing (var packageFileStream = packageArchiveReader.GetStream(filename))\n@@ -2603,6 +2624,11 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nif (formData.Edit != null)\n{\n+ if (package.HasReadMe && package.EmbeddedReadmeType != EmbeddedReadmeFileType.Absent)\n+ {\n+ return Json(HttpStatusCode.BadRequest, new[] { new JsonValidationMessage(Strings.ReadmeNotEditableWithEmbeddedReadme) });\n+ }\n+\ntry\n{\nif (await _readMeService.SaveReadMeMdIfChanged(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RequestModels/VerifyPackageRequest.cs",
"new_path": "src/NuGetGallery/RequestModels/VerifyPackageRequest.cs",
"diff": "@@ -110,6 +110,7 @@ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> p\npublic string RepositoryUrl { get; set; }\npublic string RepositoryType { get; set; }\npublic string ReleaseNotes { get; set; }\n+ public string ReadmeFileContents { get; set; }\npublic bool RequiresLicenseAcceptance { get; set; }\npublic string Summary { get; set; }\npublic string Tags { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"new_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"diff": "$(reportContainerElement).attr(\"data-bind\", \"template: { name: 'verify-metadata-template', data: data }\");\n$(\"#verify-package-container\").append(reportContainerElement);\nko.applyBindings({ data: model }, reportContainerElement);\n+ if (model.ReadmeFileContents) {\n+ $('#import-readme-container').addClass('hidden');\n+ } else {\n+ $('#import-readme-container').removeClass('hidden');\n+ }\nvar submitContainerElement = document.createElement(\"div\");\n$(submitContainerElement).attr(\"id\", \"submit-block\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IReadMeService.cs",
"new_path": "src/NuGetGallery/Services/IReadMeService.cs",
"diff": "using System.Text;\nusing System.Threading.Tasks;\n+using NuGet.Packaging;\nusing NuGet.Services.Entities;\nnamespace NuGetGallery\n@@ -30,6 +31,16 @@ public interface IReadMeService\n/// <returns>ReadMe converted to HTML.</returns>\nTask<RenderedReadMeResult> GetReadMeHtmlAsync(Package package);\n+ /// <summary>\n+ /// Get the converted HTML from the package with Readme markdown.\n+ /// </summary>\n+ /// <param name=\"readmeFileName\">The path of Readme markdown.</param>\n+ /// <param name=\"packageArchiveReader\">\n+ /// The <see cref=\"PackageArchiveReader\"/> instance providing the package metadata.\n+ /// </param>\n+ /// <returns>ReadMe converted to HTML.</returns>\n+ Task<RenderedReadMeResult> GetReadMeHtmlAsync(string readmeFileName, PackageArchiveReader packageArchiveReader, Encoding encoding);\n+\n/// <summary>\n/// Get package ReadMe markdown from storage.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReadMeService.cs",
"new_path": "src/NuGetGallery/Services/ReadMeService.cs",
"diff": "using System.Web;\nusing CommonMark;\nusing CommonMark.Syntax;\n+using NuGet.Packaging;\nusing NuGet.Services.Entities;\nnamespace NuGetGallery\n@@ -98,6 +99,28 @@ public async Task<RenderedReadMeResult> GetReadMeHtmlAsync(Package package)\nGetReadMeHtml(readMeMd);\n}\n+ /// <summary>\n+ /// Get the converted HTML from the package with Readme markdown.\n+ /// </summary>\n+ /// <param name=\"readmeFileName\">The path of Readme markdown.</param>\n+ /// <param name=\"packageArchiveReader\">\n+ /// The <see cref=\"PackageArchiveReader\"/> instance providing the package metadata.\n+ /// </param>\n+ /// <returns>ReadMe converted to HTML.</returns>\n+ public async Task<RenderedReadMeResult> GetReadMeHtmlAsync(string readmeFileName, PackageArchiveReader packageArchiveReader, Encoding encoding)\n+ {\n+ var readmeMd = await GetReadMeMdAsync(readmeFileName, packageArchiveReader, encoding);\n+ var result = new RenderedReadMeResult\n+ {\n+ Content = readmeMd,\n+ ImagesRewritten = false\n+ };\n+\n+ return string.IsNullOrEmpty(readmeMd) ?\n+ result :\n+ GetReadMeHtml(readmeMd);\n+ }\n+\n/// <summary>\n/// Get package ReadMe markdown from storage.\n/// </summary>\n@@ -113,6 +136,23 @@ public async Task<string> GetReadMeMdAsync(Package package)\nreturn null;\n}\n+ /// <summary>\n+ /// Get content of Readme markdown.\n+ /// </summary>\n+ /// <param name=\"readmeFileName\">Package entity associated with the ReadMe.</param>\n+ /// <param name=\"packageArchiveReader\">\n+ /// The <see cref=\"PackageArchiveReader\"/> instance providing the package metadata.\n+ /// </param>\n+ /// <returns>ReadMe markdown from package metadata.</returns>\n+ private async Task<string> GetReadMeMdAsync(string readmeFileName, PackageArchiveReader packageArchiveReader, Encoding encoding)\n+ {\n+ using (var readmeFileStream = packageArchiveReader.GetStream(readmeFileName))\n+ using (var streamReader = new StreamReader(readmeFileStream, encoding))\n+ {\n+ return await streamReader.ReadToEndAsync();\n+ }\n+ }\n+\n/// <summary>\n/// Save a pending ReadMe if changes are detected.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1570,6 +1570,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The readme is not editable with the package has the embedded readme.\n+ /// </summary>\n+ public static string ReadmeNotEditableWithEmbeddedReadme {\n+ get {\n+ return ResourceManager.GetString(\"ReadmeNotEditableWithEmbeddedReadme\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The Documentation file must end with a Markdown extension '{0}'..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1181,4 +1181,7 @@ The {1} Team</value>\n<data name=\"ODataParametersDisabled\" xml:space=\"preserve\">\n<value>The combination of parameters provided to this OData endpoint is not supported.</value>\n</data>\n+ <data name=\"ReadmeNotEditableWithEmbeddedReadme\" xml:space=\"preserve\">\n+ <value>The readme is not editable with the package has the embedded readme</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"diff": "</div>\n</div>\n<!-- /ko -->\n+ <!-- ko if: $data.ReadmeFileContents -->\n+ <div class=\"verify-package-field readme\">\n+ <label class=\"verify-package-field-heading\">Readme File</label>\n+ <div class=\"readme-container\" data-bind=\"html: $data.ReadmeFileContents\"></div>\n+ </div>\n+ <!-- /ko -->\n<!-- /ko -->\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -297,7 +297,8 @@ public async Task WillReadThePropertiesFromTheNuGetPackageWhenCreatingANewPackag\nlicenseUrl: new Uri(\"http://thelicenseurl/\"),\nprojectUrl: new Uri(\"http://theprojecturl/\"),\niconUrl: new Uri(\"http://theiconurl/\"),\n- licenseFilename: \"license.txt\");\n+ licenseFilename: \"license.txt\",\n+ readmeFilename:\"readme.md\");\nvar currentUser = new User();\nvar package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, currentUser, isVerified: false);\n@@ -321,6 +322,7 @@ public async Task WillReadThePropertiesFromTheNuGetPackageWhenCreatingANewPackag\nAssert.Equal(\"theTitle\", package.Title);\nAssert.Equal(\"theCopyright\", package.Copyright);\nAssert.Equal(EmbeddedLicenseFileType.PlainText, package.EmbeddedLicenseType);\n+ Assert.Equal(EmbeddedReadmeFileType.Markdown, package.EmbeddedReadmeType);\nAssert.Null(package.Language);\nAssert.False(package.IsPrerelease);\n@@ -3176,6 +3178,51 @@ public void SetsEmbeddedIconFlagProperly(string iconFilename, bool expectedFlag)\nAssert.Equal(expectedFlag, package.HasEmbeddedIcon);\n}\n+\n+ [Theory]\n+ [InlineData(\"readme.md\", true)]\n+ [InlineData(null, false)]\n+ public void SetsHasReadmeFlagProperly(string readmeFilename, bool expectedFlag)\n+ {\n+ var service = CreateService();\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"SomePackage\"\n+ },\n+ HasReadMe = false,\n+ };\n+\n+ // the EnrichPackageFromNuGetPackage method does not read readme filename from the PackageArchiveReader\n+ // so we won't bother setting it up here.\n+ var packageStream = PackageServiceUtility.CreateNuGetPackageStream(package.Id);\n+\n+ var packageArchiveReader = new PackageArchiveReader(packageStream);\n+\n+ var metadataDictionary = new Dictionary<string, string>\n+ {\n+ { \"version\", \"1.2.3\" },\n+ };\n+\n+ if (readmeFilename != null)\n+ {\n+ metadataDictionary.Add(\"readme\", readmeFilename);\n+ }\n+\n+ var packageMetadata = new PackageMetadata(\n+ metadataDictionary,\n+ Enumerable.Empty<PackageDependencyGroup>(),\n+ Enumerable.Empty<FrameworkSpecificGroup>(),\n+ Enumerable.Empty<NuGet.Packaging.Core.PackageType>(),\n+ new NuGetVersion(3, 2, 1),\n+ repositoryMetadata: null,\n+ licenseMetadata: null);\n+\n+ service.EnrichPackageFromNuGetPackage(package, packageArchiveReader, packageMetadata, new PackageStreamMetadata(), new User());\n+\n+ Assert.Equal(expectedFlag, package.HasReadMe);\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Preview readme when uploading packages(#8160) (#8160) |
455,754 | 31.08.2020 14:59:58 | 25,200 | 8f51484c40b74ebfa0b9410cbc188fb8faddf6e1 | Add instructions for verifygithubvulnerabilities | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/VerifyGitHubVulnerabilities/README.md",
"diff": "+## Overview\n+\n+This is a run-once job for taking a current snapshot of the whole of GitHub's security advisory collection (pertaining to the `NUGET` ecosystem) and comparing it with the vulnerability records in the gallery database. It's designed to be run on an ad hoc basis (not an ongoing monitoring job), from the command line, with all status message streamed to `stdout` and all vulnerability differences streamed to `stderr`.\n+\n+## Running the job\n+\n+A typical command line will look like this:\n+\n+```\n+verifygithubvulnerabilities.exe -Configuration appsettings.json -InstrumentationKey <key> -HeartbeatIntervalSeconds 60 2>c:\\errors.txt\n+```\n+\n+- the `2>` will direct `stderr` to a text file (a `1>` would similarly direct `stdout` but it's probably useful to have that print to console)\n+- the contents of the `appsettings.json` file will be similar (identical is fine--there are just some extra unneeded settings in them) to the settings files used for `GitHubVulnerabilities2Db`.\n+\n+### Using DEV resources\n+\n+The easiest way to run the tool if you are on the nuget.org team is to use the DEV environment resources:\n+\n+1. Install the certificate used to authenticate as our client AAD app registration into your `CurrentUser` certificate store.\n+1. Clone our internal [`NuGetDeployment`](https://nuget.visualstudio.com/DefaultCollection/NuGetMicrosoft/_git/NuGetDeploymentp) repository.\n+1. Take a copy of the [DEV GitHubVulnerabilities2Db appsettings.json](https://nuget.visualstudio.com/NuGetMicrosoft/_git/NuGetDeployment?path=%2Fsrc%2FJobs%2FNuGet.Jobs.Cloud%2FJobs%2FGitHubVulnerabilities2Db%2FDEV%2Fnorthcentralus%2Fappsettings.json) file and place it in the same directory as the `verifygithubvulnerabilities.exe`. This will use our secrets to authenticate to the SQL server (this file also contains a reference to the secret used for the access token to GitHub).\n+1. Run as per above.\n+\n+## Algorithm\n+\n+This service runs by:\n+1. Egressing all current security advisories pertaining to the `NUGET` ecosystem from GitHub using the same GraphQL query used in `GitHubVulnerabilities2Db`.\n+1. Running `GitHubVulnerabilities2Db` update logic, substituing a verification visitor for the code that ordinarily does the updating\n+1. Checking the presence and accuracy of advisories in the provided SQL server database, reporting missing advisories, incorrect severities and advisory URLs, and incorrect/missing package ranges.\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add instructions for verifygithubvulnerabilities (#8159) |
455,736 | 02.09.2020 13:21:35 | 25,200 | 65185e69ae87366dd1bb104bbed6bc8c7ff6062d | Add feature flags to all OData endpoints
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -40,6 +40,16 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string PackageRenamesFeatureName = GalleryPrefix + \"PackageRenames\";\nprivate const string EmbeddedReadmeFlightName = GalleryPrefix + \"EmbeddedReadmes\";\n+ private const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllNonHijacked\";\n+ private const string ODataV1GetSpecificNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetSpecificNonHijacked\";\n+ private const string ODataV1FindPackagesByIdNonHijackedFeatureName = GalleryPrefix + \"ODataV1FindPackagesByIdNonHijacked\";\n+ private const string ODataV1SearchNonHijackedFeatureName = GalleryPrefix + \"ODataV1SearchNonHijacked\";\n+\n+ private const string ODataV2GetAllNonHijackedFeatureName = GalleryPrefix + \"ODataV2GetAllNonHijacked\";\n+ private const string ODataV2GetSpecificNonHijackedFeatureName = GalleryPrefix + \"ODataV2GetSpecificNonHijacked\";\n+ private const string ODataV2FindPackagesByIdNonHijackedFeatureName = GalleryPrefix + \"ODataV2FindPackagesByIdNonHijacked\";\n+ private const string ODataV2SearchNonHijackedFeatureName = GalleryPrefix + \"ODataV2SearchNonHijacked\";\n+\nprivate readonly IFeatureFlagClient _client;\npublic FeatureFlagService(IFeatureFlagClient client)\n@@ -118,11 +128,6 @@ public bool IsForceFlatContainerIconsEnabled()\nreturn _client.IsEnabled(ForceFlatContainerIconsFeatureName, defaultValue: false);\n}\n- private bool IsEnabled(string flight, User user, bool defaultValue)\n- {\n- return _client.IsEnabled(flight, user, defaultValue);\n- }\n-\npublic bool IsODataDatabaseReadOnlyEnabled()\n{\nreturn _client.IsEnabled(ODataReadOnlyDatabaseFeatureName, defaultValue: false);\n@@ -197,5 +202,45 @@ public bool AreEmbeddedReadmesEnabled(User user)\n{\nreturn _client.IsEnabled(EmbeddedReadmeFlightName, user, defaultValue: false);\n}\n+\n+ public bool IsODataV1GetAllEnabled()\n+ {\n+ return _client.IsEnabled(ODataV1GetAllNonHijackedFeatureName, defaultValue: true);\n+ }\n+\n+ public bool IsODataV1GetSpecificNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV1GetSpecificNonHijackedFeatureName, defaultValue: true);\n+ }\n+\n+ public bool IsODataV1FindPackagesByIdNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV1FindPackagesByIdNonHijackedFeatureName, defaultValue: true);\n+ }\n+\n+ public bool IsODataV1SearchNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV1SearchNonHijackedFeatureName, defaultValue: true);\n+ }\n+\n+ public bool IsODataV2GetAllNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV2GetAllNonHijackedFeatureName, defaultValue: true);\n+ }\n+\n+ public bool IsODataV2GetSpecificNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV2GetSpecificNonHijackedFeatureName, defaultValue: true);\n+ }\n+\n+ public bool IsODataV2FindPackagesByIdNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV2FindPackagesByIdNonHijackedFeatureName, defaultValue: true);\n+ }\n+\n+ public bool IsODataV2SearchNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV2SearchNonHijackedFeatureName, defaultValue: true);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -151,5 +151,45 @@ public interface IFeatureFlagService\n/// Whether the user is able to publish the package with an embedded readme file.\n/// </summary>\nbool AreEmbeddedReadmesEnabled(User user);\n+\n+ /// <summary>\n+ /// Whether the /Packages() endpoint is enabled for the V1 OData API.\n+ /// </summary>\n+ bool IsODataV1GetAllEnabled();\n+\n+ /// <summary>\n+ /// Whether the /Packages(Id=,Version=) endpoint is enabled for non-hijacked queries for the V1 OData API.\n+ /// </summary>\n+ bool IsODataV1GetSpecificNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether the /FindPackagesById() endpoint is enabled for non-hijacked queries for the V1 OData API.\n+ /// </summary>\n+ bool IsODataV1FindPackagesByIdNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether the /Search() endpoint is enabled for non-hijacked queries for the V1 OData API.\n+ /// </summary>\n+ bool IsODataV1SearchNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether the /Packages() endpoint is enabled for non-hijacked queries for the V2 OData API.\n+ /// </summary>\n+ bool IsODataV2GetAllNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether the /Packages(Id=,Version=) endpoint is enabled for non-hijacked queries for the V2 OData API.\n+ /// </summary>\n+ bool IsODataV2GetSpecificNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether the /FindPackagesById() endpoint is enabled for non-hijacked queries for the V2 OData API.\n+ /// </summary>\n+ bool IsODataV2FindPackagesByIdNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether the /Search() endpoint is enabled for non-hijacked queries for the V2 OData API.\n+ /// </summary>\n+ bool IsODataV2SearchNonHijackedEnabled();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"NuGetGallery.ODataCacheDurations\": \"Enabled\",\n\"NuGetGallery.ShowEnable2FADialog\": \"Enabled\",\n\"NuGetGallery.Get2FADismissFeedback\": \"Disabled\",\n- \"NuGetGallery.UsabillaEveryPage\": \"Enabled\"\n+ \"NuGetGallery.UsabillaEveryPage\": \"Enabled\",\n+ \"NuGetGallery.ODataV1GetAllNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV1GetSpecificNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV1FindPackagesByIdNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV1SearchNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV2GetAllNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV2GetSpecificNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV2FindPackagesByIdNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV2SearchNonHijacked\": \"Enabled\"\n},\n\"Flights\": {\n\"NuGetGallery.TyposquattingFlight\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV1FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV1FeedController.cs",
"diff": "@@ -54,6 +54,11 @@ public class ODataV1FeedController\n[CacheOutput(NoCache = true)]\npublic IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options)\n{\n+ if (!_featureFlagService.IsODataV1GetAllEnabled())\n+ {\n+ return BadRequest(Strings.ODataDisabled);\n+ }\n+\nif (!ODataQueryVerifier.AreODataOptionsAllowed(options, ODataQueryVerifier.V1Packages,\n_configurationService.Current.IsODataFilterEnabled, nameof(Get)))\n{\n@@ -94,7 +99,12 @@ public IHttpActionResult GetCount(ODataQueryOptions<V1FeedPackage> options)\nClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]\npublic async Task<IHttpActionResult> Get(ODataQueryOptions<V1FeedPackage> options, string id, string version)\n{\n- var result = await GetCore(options, id, version, return404NotFoundWhenNoResults: true);\n+ var result = await GetCore(\n+ options,\n+ id,\n+ version,\n+ return404NotFoundWhenNoResults: true,\n+ isNonHijackEnabled: _featureFlagService.IsODataV1GetSpecificNonHijackedEnabled());\nreturn result.FormattedAsSingleResult<V1FeedPackage>();\n}\n@@ -108,7 +118,12 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V1FeedPackage> option\nClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]\npublic async Task<IHttpActionResult> FindPackagesById(ODataQueryOptions<V1FeedPackage> options, [FromODataUri]string id)\n{\n- return await GetCore(options, id, version: null, return404NotFoundWhenNoResults: false);\n+ return await GetCore(\n+ options,\n+ id,\n+ version: null,\n+ return404NotFoundWhenNoResults: false,\n+ isNonHijackEnabled: _featureFlagService.IsODataV1FindPackagesByIdNonHijackedEnabled());\n}\n// /api/v1/FindPackagesById()/$count?id=\n@@ -123,7 +138,12 @@ public async Task<IHttpActionResult> FindPackagesByIdCount(ODataQueryOptions<V1F\nreturn result.FormattedAsCountResult<V1FeedPackage>();\n}\n- private async Task<IHttpActionResult> GetCore(ODataQueryOptions<V1FeedPackage> options, string id, string version, bool return404NotFoundWhenNoResults)\n+ private async Task<IHttpActionResult> GetCore(\n+ ODataQueryOptions<V1FeedPackage> options,\n+ string id,\n+ string version,\n+ bool return404NotFoundWhenNoResults,\n+ bool isNonHijackEnabled)\n{\nvar packages = GetAll()\n.Include(p => p.PackageRegistration)\n@@ -185,13 +205,20 @@ private async Task<IHttpActionResult> GetCore(ODataQueryOptions<V1FeedPackage> o\ncustomQuery = true;\n}\n}\n- catch (Exception ex)\n+ catch (Exception ex) when (isNonHijackEnabled)\n{\n- // Swallowing Exception intentionally. If *anything* goes wrong in search, just fall back to the database.\n- // We don't want to break package restores. We do want to know if this happens, so here goes:\n+ // Swallowing exception intentionally if we are allowing a fallback to database. If non-hijacked\n+ // queries are disabled, let the exception bubble out and the client will retry.\nQuietLog.LogHandledException(ex);\n}\n+ // If we've reached this point, the hijack to the search service has failed or is not applicable. If\n+ // non-hijacked queries are disabled, stop here.\n+ if (!isNonHijackEnabled)\n+ {\n+ return BadRequest(Strings.ODataParametersDisabled);\n+ }\n+\nif (return404NotFoundWhenNoResults && !packages.Any())\n{\n_telemetryService.TrackODataCustomQuery(customQuery);\n@@ -292,6 +319,11 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\ncustomQuery = true;\n}\n+ if (!_featureFlagService.IsODataV1SearchNonHijackedEnabled())\n+ {\n+ return BadRequest(Strings.ODataParametersDisabled);\n+ }\n+\nif (!ODataQueryVerifier.AreODataOptionsAllowed(options, ODataQueryVerifier.V1Search,\n_configurationService.Current.IsODataFilterEnabled, nameof(Search)))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"diff": "@@ -79,6 +79,8 @@ public class ODataV2FeedController\nvar semVerLevelKey = SemVerLevelKey.ForSemVerLevel(semVerLevel);\nbool? customQuery = null;\n+ var isNonHijackEnabled = _featureFlagService.IsODataV2GetAllNonHijackedEnabled();\n+\n// Try the search service\ntry\n{\n@@ -129,17 +131,22 @@ public class ODataV2FeedController\ncustomQuery = true;\n}\n}\n- catch (ODataException ex) when (ex.InnerException != null && ex.InnerException is FormatException)\n+ catch (ODataException ex) when (isNonHijackEnabled && ex.InnerException != null && ex.InnerException is FormatException)\n{\n// Sometimes users make invalid requests. It's not exceptional behavior, don't trace.\n}\n- catch (Exception ex)\n+ catch (Exception ex) when (isNonHijackEnabled)\n{\n// Swallowing Exception intentionally. If *anything* goes wrong in search, just fall back to the database.\n// We don't want to break package restores. We do want to know if this happens, so here goes:\nQuietLog.LogHandledException(ex);\n}\n+ if (!isNonHijackEnabled)\n+ {\n+ return BadRequest(Strings.ODataParametersDisabled);\n+ }\n+\n// Reject only when try to reach database.\nif (!ODataQueryVerifier.AreODataOptionsAllowed(options, ODataQueryVerifier.V2Packages,\n_configurationService.Current.IsODataFilterEnabled, nameof(Get)))\n@@ -187,7 +194,8 @@ public class ODataV2FeedController\nversion,\nsemVerLevel: SemVerLevelKey.SemVerLevel2,\nallowHijack: hijack,\n- return404NotFoundWhenNoResults: true);\n+ return404NotFoundWhenNoResults: true,\n+ isNonHijackEnabled: _featureFlagService.IsODataV2GetSpecificNonHijackedEnabled());\nreturn result.FormattedAsSingleResult<V2FeedPackage>();\n}\n@@ -224,7 +232,8 @@ public class ODataV2FeedController\nversion: null,\nsemVerLevel: semVerLevel,\nallowHijack: true,\n- return404NotFoundWhenNoResults: false);\n+ return404NotFoundWhenNoResults: false,\n+ isNonHijackEnabled: _featureFlagService.IsODataV2FindPackagesByIdNonHijackedEnabled());\n}\n// /api/v2/FindPackagesById()/$count?semVerLevel=\n@@ -247,7 +256,8 @@ public class ODataV2FeedController\nstring version,\nstring semVerLevel,\nbool allowHijack,\n- bool return404NotFoundWhenNoResults)\n+ bool return404NotFoundWhenNoResults,\n+ bool isNonHijackEnabled)\n{\nvar packages = GetAll()\n.Include(p => p.PackageRegistration)\n@@ -344,7 +354,7 @@ public class ODataV2FeedController\n&& options.RawValues.SkipToken == null\n&& options.RawValues.Top == null;\n- if (!allowHijack)\n+ if (!allowHijack || !isNonHijackEnabled)\n{\nif (!isSimpleLookup)\n{\n@@ -474,6 +484,11 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\ncustomQuery = true;\n}\n+ if (!_featureFlagService.IsODataV2SearchNonHijackedEnabled())\n+ {\n+ return BadRequest(Strings.ODataParametersDisabled);\n+ }\n+\n//Reject only when try to reach database.\nif (!ODataQueryVerifier.AreODataOptionsAllowed(options, ODataQueryVerifier.V2Search,\n_configurationService.Current.IsODataFilterEnabled, nameof(Search)))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1291,6 +1291,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to This OData endpoint is disabled..\n+ /// </summary>\n+ public static string ODataDisabled {\n+ get {\n+ return ResourceManager.GetString(\"ODataDisabled\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The combination of parameters provided to this OData endpoint is not supported..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1178,6 +1178,9 @@ The {1} Team</value>\n<data name=\"UploadPackage_InvalidReadmeName\" xml:space=\"preserve\">\n<value>the name of <readme> element is case sensitive, must use the <readme></value>\n</data>\n+ <data name=\"ODataDisabled\" xml:space=\"preserve\">\n+ <value>This OData endpoint is disabled.</value>\n+ </data>\n<data name=\"ODataParametersDisabled\" xml:space=\"preserve\">\n<value>The combination of parameters provided to this OData endpoint is not supported.</value>\n</data>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"diff": "@@ -57,14 +57,19 @@ protected ODataFeedControllerFactsBase()\nITelemetryService telemetryService,\nIFeatureFlagService featureFlagService);\n- protected TController CreateTestableODataFeedController(HttpRequestMessage request)\n+ protected TController CreateTestableODataFeedController(\n+ HttpRequestMessage request,\n+ Mock<IFeatureFlagService> featureFlagService)\n{\nvar searchService = new Mock<ISearchService>().Object;\nvar configurationService = new TestGalleryConfigurationService();\nconfigurationService.Current.SiteRoot = _siteRoot;\nvar telemetryService = new Mock<ITelemetryService>();\n- var featureFlagService = new Mock<IFeatureFlagService>();\n- featureFlagService.Setup(ff => ff.IsODataDatabaseReadOnlyEnabled()).Returns(true);\n+ if (featureFlagService == null)\n+ {\n+ featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.SetReturnsDefault(true);\n+ }\nvar readWritePackagesRepositoryMock = new Mock<IEntityRepository<Package>>();\nvar controller = CreateController(\n@@ -146,22 +151,24 @@ protected static ODataQueryContext CreateODataQueryContext<TFeedPackage>()\nprotected IHttpActionResult GetActionResult<TFeedPackage>(\nFunc<TController, ODataQueryOptions<TFeedPackage>, IHttpActionResult> controllerAction,\n- string requestPath)\n+ string requestPath,\n+ Mock<IFeatureFlagService> featureFlagService = null)\nwhere TFeedPackage : class\n{\nvar request = new HttpRequestMessage(HttpMethod.Get, $\"{_siteRoot}{requestPath}\");\n- var controller = CreateTestableODataFeedController(request);\n+ var controller = CreateTestableODataFeedController(request, featureFlagService);\nreturn controllerAction(controller, new ODataQueryOptions<TFeedPackage>(CreateODataQueryContext<TFeedPackage>(), request));\n}\nprotected async Task<IHttpActionResult> GetActionResultAsync<TFeedPackage>(\nFunc<TController, ODataQueryOptions<TFeedPackage>, Task<IHttpActionResult>> asyncControllerAction,\n- string requestPath)\n+ string requestPath,\n+ Mock<IFeatureFlagService> featureFlagService = null)\nwhere TFeedPackage : class\n{\nvar request = new HttpRequestMessage(HttpMethod.Get, $\"{_siteRoot}{requestPath}\");\n- var controller = CreateTestableODataFeedController(request);\n+ var controller = CreateTestableODataFeedController(request, featureFlagService);\nreturn await asyncControllerAction(controller,\nnew ODataQueryOptions<TFeedPackage>(CreateODataQueryContext<TFeedPackage>(), request));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"diff": "@@ -41,6 +41,42 @@ public void Get_ReturnsBadRequestWhenOrderByInvalidColumn()\nAssert.IsType<BadRequestErrorMessageResult>(resultSet);\n}\n+ [Fact]\n+ public void GetAll_ReturnsBadRequestWhenGetAllIsDisabled()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV1GetAllEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = GetActionResult<V1FeedPackage>(\n+ (controller, options) => controller.Get(options),\n+ \"/api/v1/Packages\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV1GetAllEnabled());\n+ }\n+\n+ [Fact]\n+ public async Task GetSpecific_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV1GetSpecificNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V1FeedPackage>(\n+ async (controller, options) => await controller.Get(options, TestPackageId, \"1.0.0\"),\n+ $\"/api/v1/Packages(Id='{TestPackageId}',Version='1.0.0')?$filter=1 eq 1\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV1GetSpecificNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task GetCount_FiltersSemVerV2PackageVersions()\n{\n@@ -66,6 +102,24 @@ public async Task FindPackagesById_FiltersSemVerV2PackageVersions()\nAssert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n}\n+ [Fact]\n+ public async Task FindPackagesById_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV1FindPackagesByIdNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V1FeedPackage>(\n+ async (controller, options) => await controller.FindPackagesById(options, TestPackageId),\n+ $\"/api/v1/FindPackagesById?id='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV1FindPackagesByIdNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task FindPackagesByIdCount_FiltersSemVerV2PackageVersions()\n{\n@@ -91,6 +145,24 @@ public async Task Search_FiltersSemVerV2PackageVersions()\nAssert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n}\n+ [Fact]\n+ public async Task Search_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV1SearchNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V1FeedPackage>(\n+ async (controller, options) => await controller.Search(options, TestPackageId),\n+ $\"/api/v1/Search?searchTerm='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV1SearchNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task SearchCount_FiltersSemVerV2PackageVersions()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"diff": "@@ -59,6 +59,42 @@ public async Task Get_ReturnsBadRequestWhenOrderByInvalidColumn()\nAssert.IsType<BadRequestErrorMessageResult>(resultSet);\n}\n+ [Fact]\n+ public async Task GetAll_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV2GetAllNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V2FeedPackage>(\n+ (controller, options) => controller.Get(options),\n+ \"/api/v2/Packages?$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV2GetAllNonHijackedEnabled());\n+ }\n+\n+ [Fact]\n+ public async Task GetSpecific_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV2GetSpecificNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V2FeedPackage>(\n+ (controller, options) => controller.Get(options, TestPackageId, \"1.0.0\"),\n+ $\"/api/v2/Packages(Id='{TestPackageId}',Version='1.0.0')?$filter=1 eq 1\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV2GetSpecificNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task GetCount_FiltersSemVerV2PackageVersionsByDefault()\n{\n@@ -100,6 +136,24 @@ public async Task FindPackagesById_FiltersSemVerV2PackageVersionsByDefault()\nAssert.Equal(NonSemVer2Packages.Count, resultSet.Count);\n}\n+ [Fact]\n+ public async Task FindPackagesById_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV2FindPackagesByIdNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V2FeedPackage>(\n+ (controller, options) => controller.FindPackagesById(options, TestPackageId),\n+ $\"/api/v2/FindPackagesById?id='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV2FindPackagesByIdNonHijackedEnabled());\n+ }\n+\n[Theory]\n[InlineData(\"2.0.0\")]\n[InlineData(\"2.0.1\")]\n@@ -145,6 +199,24 @@ public async Task FindPackagesByIdCount_IncludesSemVerV2PackageVersionsWhenSemVe\nAssert.Equal(AvailablePackages.Count, count);\n}\n+ [Fact]\n+ public async Task Search_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV2SearchNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V2FeedPackage>(\n+ (controller, options) => controller.Search(options, TestPackageId),\n+ $\"/api/v2/Search?searchTerm='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV2SearchNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task Search_FiltersSemVerV2PackageVersionsByDefault_IncludePrerelease()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/Infrastructure/TestableV1Feed.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/Infrastructure/TestableV1Feed.cs",
"diff": "@@ -15,13 +15,11 @@ public class TestableV1Feed : ODataV1FeedController\nIReadOnlyEntityRepository<Package> repo,\nIGalleryConfigurationService configuration,\nISearchService searchService)\n- : base(\n+ : this(\nrepo,\n- Mock.Of<IEntityRepository<Package>>(),\nconfiguration,\n- GetSearchServiceFactory(searchService),\n- Mock.Of<ITelemetryService>(),\n- GetFeatureFlagService())\n+ searchService,\n+ Mock.Of<ITelemetryService>())\n{\n}\n@@ -30,13 +28,28 @@ public class TestableV1Feed : ODataV1FeedController\nIGalleryConfigurationService configuration,\nISearchService searchService,\nITelemetryService telemetryService)\n+ : this(\n+ repo,\n+ configuration,\n+ searchService,\n+ telemetryService,\n+ GetFeatureFlagService())\n+ {\n+ }\n+\n+ public TestableV1Feed(\n+ IReadOnlyEntityRepository<Package> repo,\n+ IGalleryConfigurationService configuration,\n+ ISearchService searchService,\n+ ITelemetryService telemetryService,\n+ IFeatureFlagService featureFlagService)\n: base(\nrepo,\nMock.Of<IEntityRepository<Package>>(),\nconfiguration,\nGetSearchServiceFactory(searchService),\ntelemetryService,\n- GetFeatureFlagService())\n+ featureFlagService)\n{\n}\n@@ -59,7 +72,7 @@ public string GetSiteRootForTest()\nprivate static IFeatureFlagService GetFeatureFlagService()\n{\nvar featureFlag = new Mock<IFeatureFlagService>();\n- featureFlag.Setup(ff => ff.IsODataDatabaseReadOnlyEnabled()).Returns(true);\n+ featureFlag.SetReturnsDefault(true);\nreturn featureFlag.Object;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/Infrastructure/TestableV2Feed.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/Infrastructure/TestableV2Feed.cs",
"diff": "@@ -15,12 +15,11 @@ public class TestableV2Feed : ODataV2FeedController\nIReadOnlyEntityRepository<Package> repo,\nIGalleryConfigurationService configuration,\nISearchService searchService)\n- : base(\n+ : this(\nrepo,\n- Mock.Of<IEntityRepository<Package>>(),\n- configuration, GetSearchServiceFactory(searchService),\n- Mock.Of<ITelemetryService>(),\n- GetFeatureFlagService())\n+ configuration,\n+ searchService,\n+ Mock.Of<ITelemetryService>())\n{\n}\n@@ -29,13 +28,28 @@ public class TestableV2Feed : ODataV2FeedController\nIGalleryConfigurationService configuration,\nISearchService searchService,\nITelemetryService telemetryService)\n+ : this(\n+ repo,\n+ configuration,\n+ searchService,\n+ telemetryService,\n+ GetFeatureFlagService())\n+ {\n+ }\n+\n+ public TestableV2Feed(\n+ IReadOnlyEntityRepository<Package> repo,\n+ IGalleryConfigurationService configuration,\n+ ISearchService searchService,\n+ ITelemetryService telemetryService,\n+ IFeatureFlagService featureFlagService)\n: base(\nrepo,\nMock.Of<IEntityRepository<Package>>(),\nconfiguration,\nGetSearchServiceFactory(searchService),\ntelemetryService,\n- GetFeatureFlagService())\n+ featureFlagService)\n{\n}\n@@ -58,7 +72,7 @@ public string GetSiteRootForTest()\nprivate static IFeatureFlagService GetFeatureFlagService()\n{\nvar featureFlag = new Mock<IFeatureFlagService>();\n- featureFlag.Setup(ff => ff.IsODataDatabaseReadOnlyEnabled()).Returns(true);\n+ featureFlag.SetReturnsDefault(true);\nreturn featureFlag.Object;\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add feature flags to all OData endpoints (#8178)
Progress on https://github.com/NuGet/Engineering/issues/2902 |
455,752 | 05.09.2020 02:07:18 | -36,000 | 165984b228cbcd04b9aab47fc12276a2ef718256 | Package list can be sorted by ID, owners, downloads and version
Addresses | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -341,6 +341,9 @@ img.reserved-indicator-icon {\nz-index: 99999;\nright: 0;\n}\n+.sortable {\n+ cursor: pointer;\n+}\n.modal-backdrop.in {\nopacity: 0.8 !important;\nposition: fixed;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -425,3 +425,7 @@ img.reserved-indicator-icon {\nz-index: 99999;\nright: 0;\n}\n+\n+.sortable {\n+ cursor: pointer;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "using System.Web.Mvc;\nusing NuGet.Services.Entities;\nusing NuGet.Services.Messaging.Email;\n+using NuGet.Versioning;\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.ViewModels;\nusing NuGetGallery.Authentication;\n@@ -521,16 +522,12 @@ public virtual ActionResult Packages()\nvar wasAADLoginOrMultiFactorAuthenticated = User.WasMultiFactorAuthenticated() || User.WasAzureActiveDirectoryAccountUsedForSignin();\nvar packages = PackageService.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\n- var listedPackages = packages\n- .Where(p => p.Listed && p.PackageStatusKey == PackageStatus.Available)\n- .Select(p => _listPackageItemRequiredSignerViewModelFactory.Create(p, currentUser, wasAADLoginOrMultiFactorAuthenticated))\n- .OrderBy(p => p.Id)\n- .ToList();\n- var unlistedPackages = packages\n- .Where(p => !p.Listed || p.PackageStatusKey != PackageStatus.Available)\n- .Select(p => _listPackageItemRequiredSignerViewModelFactory.Create(p, currentUser, wasAADLoginOrMultiFactorAuthenticated))\n- .OrderBy(p => p.Id)\n- .ToList();\n+\n+ var listedPackages = GetPackages(packages, currentUser, wasAADLoginOrMultiFactorAuthenticated,\n+ p => p.Listed && p.PackageStatusKey == PackageStatus.Available);\n+\n+ var unlistedPackages = GetPackages(packages, currentUser, wasAADLoginOrMultiFactorAuthenticated,\n+ p => !p.Listed || p.PackageStatusKey != PackageStatus.Available);\n// find all received ownership requests\nvar userReceived = _packageOwnerRequestService.GetPackageOwnershipRequests(newOwner: currentUser);\n@@ -567,6 +564,36 @@ public virtual ActionResult Packages()\nreturn View(model);\n}\n+ /// <summary>\n+ /// Returns all packages based on the predicate, with the VersionSortOrder populated\n+ /// </summary>\n+ /// <param name=\"packages\"></param>\n+ /// <param name=\"currentUser\"></param>\n+ /// <param name=\"wasAADLoginOrMultiFactorAuthenticated\"></param>\n+ /// <param name=\"predicate\"></param>\n+ /// <returns></returns>\n+ private List<ListPackageItemRequiredSignerViewModel> GetPackages(\n+ IEnumerable<Package> packages,\n+ User currentUser,\n+ bool wasAADLoginOrMultiFactorAuthenticated,\n+ Func<Package, bool> predicate)\n+ {\n+ var listedPackages = packages\n+ .Where(p => predicate(p))\n+ .Select(p => _listPackageItemRequiredSignerViewModelFactory.Create(p, currentUser, wasAADLoginOrMultiFactorAuthenticated))\n+ .OrderBy(p => NuGetVersion.Parse(p.FullVersion))\n+ .ToList();\n+\n+ for (int i = 0; i < listedPackages.Count; i++)\n+ {\n+ listedPackages[i].VersionSortOrder = i;\n+ }\n+\n+ listedPackages.Sort((x, y) => string.Compare(x.Id, y.Id, StringComparison.OrdinalIgnoreCase));\n+\n+ return listedPackages;\n+ }\n+\n[HttpGet]\n[UIAuthorize]\npublic virtual ActionResult Organizations()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"diff": "@@ -25,6 +25,7 @@ public class ListPackageItemViewModel : PackageViewModel\npublic string ShortDescription { get; private set; }\npublic bool IsDescriptionTruncated { get; set; }\npublic bool? IsVerified { get; set; }\n+ public int VersionSortOrder { get; set; }\npublic string SignatureInformation\n{\nget\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "ViewBag.Title = \"Manage My Package\";\nViewBag.Tab = \"Packages\";\n}\n-\n<section role=\"main\" class=\"container main-container page-manage-packages\">\[email protected](Html)\n<thead>\n<tr class=\"manage-package-headings\">\n<th class=\"hidden-xs\"><span class=\"hidden\">Package Icon</span></th>\n- <th>Package ID</th>\n- <th>Owners</th>\n+ <th class=\"sortable\">Package ID</th>\n+ <th class=\"sortable\">Owners</th>\n@if (Model.IsCertificatesUIEnabled)\n{\n- <th>Signing Owner</th>\n+ <th class=\"sortable\">Signing Owner</th>\n}\n- <th>Downloads</th>\n- <th>Latest Version</th>\n+ <th class=\"sortable\">Downloads</th>\n+ <th class=\"sortable\">Latest Version</th>\n<th><span class=\"hidden\">Icon</span></th>\n</tr>\n</thead>\n<!-- /ko -->\n</td>\n}\n- <td class=\"align-middle text-nowrap\">\n+ <td class=\"align-middle text-nowrap\" data-bind=\"attr: { 'data-sortby': DownloadCount }\">\n<span data-bind=\"text: FormattedDownloadCount\"></span>\n</td>\n- <td class=\"align-middle text-nowrap\">\n+ <td class=\"align-middle text-nowrap\" data-bind=\"attr: { 'data-sortby': VersionSortOrder }\">\n<span data-bind=\"text: LatestVersion\"></span>\n</td>\n<td class=\"text-right align-middle package-controls\">\nCanDelete = p.CanUnlistOrRelist,\np.CanEditRequiredSigner,\np.ShowRequiredSigner,\n- p.ShowTextBox\n+ p.ShowTextBox,\n+ p.VersionSortOrder\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "using System.Threading.Tasks;\nusing System.Web;\nusing System.Web.Mvc;\n+\nusing Moq;\n+\nusing NuGet.Services.Entities;\nusing NuGet.Services.Messaging.Email;\n+\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.Models;\nusing NuGetGallery.Areas.Admin.ViewModels;\nusing NuGetGallery.Infrastructure.Authentication;\nusing NuGetGallery.Infrastructure.Mail.Messages;\nusing NuGetGallery.Security;\n+\nusing Xunit;\nnamespace NuGetGallery\n@@ -3704,43 +3708,115 @@ public void DeleteHappyAccount(bool withPendingIssues)\npublic class ThePackagesAction : TestContainer\n{\n- [Fact]\n- public void UsesProperIconUrl()\n+ private UsersController _testController;\n+ private User _testUser;\n+ private string userName = \"RegularUser\";\n+ private Fakes _fakes;\n+\n+ public ThePackagesAction()\n{\n- string userName = \"RegularUser\";\n- var controller = GetController<UsersController>();\n- var fakes = Get<Fakes>();\n- var testUser = fakes.CreateUser(userName);\n- testUser.IsDeleted = false;\n- testUser.Key = 1;\n- controller.SetCurrentUser(testUser);\n+ _testController = GetController<UsersController>();\n+ _fakes = Get<Fakes>();\n+ _testUser = _fakes.CreateUser(userName);\n+ _testUser.IsDeleted = false;\n+ _testUser.Key = 1;\n+ _testController.SetCurrentUser(_testUser);\n+ }\n+ private PackageRegistration CreatePackageRegistration(string Id, int Key, string Version, string Description)\n+ {\nvar packageRegistration = new PackageRegistration();\n- packageRegistration.Owners.Add(testUser);\n+ packageRegistration.Id = Id;\n+ packageRegistration.Owners.Add(_testUser);\n- var userPackage = new Package()\n+ var userPackage1 = new Package()\n{\n- Description = \"TestPackage\",\n- Key = 1,\n- Version = \"1.0.0\",\n+ Key = Key,\n+ Version = Version,\nPackageRegistration = packageRegistration,\n+ Description = Description\n};\n- packageRegistration.Packages.Add(userPackage);\n+ packageRegistration.Packages.Add(userPackage1);\n+ return packageRegistration;\n+ }\n+\n+ [Fact]\n+ public void PackagesAreSortedById()\n+ {\n+ PackageRegistration packageRegistration1 = CreatePackageRegistration(\"Company.ZebraPackage\", 1, \"1.0.0\", \"last\");\n+ PackageRegistration packageRegistration2 = CreatePackageRegistration(\"Company.AlphaPackage\", 1, \"1.0.0\", \"first\");\n+ PackageRegistration packageRegistration3 = CreatePackageRegistration(\"Company.NormalPackage\", 1, \"1.0.0\", \"middle\");\n+ var userPackages = new List<Package>() {\n+ packageRegistration1.Packages.First() ,\n+ packageRegistration2.Packages.First(),\n+ packageRegistration3.Packages.First()\n+ };\n+\n+ GetMock<IUserService>()\n+ .Setup(stub => stub.FindByUsername(userName, false))\n+ .Returns(_testUser);\n+\n+ GetMock<IPackageService>()\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n+ .Returns(userPackages);\n+\n+ var model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n+\n+ Assert.Equal(\"Company.AlphaPackage\", model.ListedPackages.ToArray()[0].Id);\n+ Assert.Equal(\"Company.NormalPackage\", model.ListedPackages.ToArray()[1].Id);\n+ Assert.Equal(\"Company.ZebraPackage\", model.ListedPackages.ToArray()[2].Id);\n+ }\n+\n+ [Fact]\n+ public void PackagesVersionSortOrderIsSetBySemVer()\n+ {\n+ PackageRegistration packageRegistration1 = CreatePackageRegistration(\"Company.ZebraPackage\", 1, \"1.0.0\", \"middle\");\n+ PackageRegistration packageRegistration2 = CreatePackageRegistration(\"Company.NormalPackage\", 1, \"0.0.1\", \"first\");\n+ PackageRegistration packageRegistration3 = CreatePackageRegistration(\"Company.AlphaPackage\", 1, \"1.1.0\", \"last\");\n+\n+ var userPackages = new List<Package>() {\n+ packageRegistration1.Packages.First() ,\n+ packageRegistration2.Packages.First(),\n+ packageRegistration3.Packages.First()\n+ };\n+\n+ GetMock<IUserService>()\n+ .Setup(stub => stub.FindByUsername(userName, false))\n+ .Returns(_testUser);\n+\n+ GetMock<IPackageService>()\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n+ .Returns(userPackages);\n+\n+ var model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n+\n+ // The \"VersionSortOrder\" should be set according to Semantic Version sort order, not package Id\n+ Assert.Equal(0, model.ListedPackages.First(x => x.Version == \"0.0.1\").VersionSortOrder);\n+ Assert.Equal(1, model.ListedPackages.First(x => x.Version == \"1.0.0\").VersionSortOrder);\n+ Assert.Equal(2, model.ListedPackages.First(x => x.Version == \"1.1.0\").VersionSortOrder);\n+ }\n+\n+ [Fact]\n+ public void UsesProperIconUrl()\n+ {\n+ PackageRegistration packageRegistration1 = CreatePackageRegistration(\"TestPackage\", 1, \"1.0.0\", \"TestPackage\");\n+ Package userPackage = packageRegistration1.Packages.First();\nvar userPackages = new List<Package>() { userPackage };\nconst string iconUrl = \"https://some.test/icon\";\n+\nGetMock<IIconUrlProvider>()\n.Setup(iup => iup.GetIconUrlString(It.IsAny<Package>()))\n.Returns(iconUrl);\nGetMock<IUserService>()\n.Setup(stub => stub.FindByUsername(userName, false))\n- .Returns(testUser);\n+ .Returns(_testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\n- var model = ResultAssert.IsView<ManagePackagesViewModel>(controller.Packages());\n+ var model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\nGetMock<IIconUrlProvider>()\n.Verify(iup => iup.GetIconUrlString(userPackage), Times.AtLeastOnce);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Package list can be sorted by ID, owners, downloads and version (#8158)
Addresses https://github.com/NuGet/NuGetGallery/issues/7806 |
455,736 | 04.09.2020 12:34:30 | 25,200 | 225a0653d8505324e6ec00070b9d5581be5b92fe | Don't show missing version warning for absoluteLatest
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -828,6 +828,10 @@ public HttpStatusCodeResult DisplayPackage()\n[HttpGet]\npublic virtual async Task<ActionResult> DisplayPackage(string id, string version)\n{\n+ // Attempt to normalize the version but allow version strings that are not actually SemVer strings. For\n+ // example, \"absoluteLatest\" is allowed as the version string as a reference to the absolute latest version\n+ // including prerelease versions. In this case, the resulting normalized version will be left as the\n+ // original string.\nstring normalized = NuGetVersionFormatter.Normalize(version);\nif (!string.Equals(version, normalized))\n{\n@@ -890,7 +894,11 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.GitHubDependenciesInformation = _contentObjectService.GitHubUsageConfiguration.GetPackageInformation(id);\n}\n- if (normalized != null && !string.Equals(package.NormalizedVersion, normalized, StringComparison.OrdinalIgnoreCase))\n+ // If the normalized version is actually a SemVer but does not match the resolved package version, show a\n+ // warning. It's possible that the normalized version is not a SemVer string (like \"absoluteLatest\").\n+ if (normalized != null\n+ && !string.Equals(package.NormalizedVersion, normalized, StringComparison.OrdinalIgnoreCase)\n+ && NuGetVersion.TryParse(normalized, out var parsed))\n{\nmodel.VersionRequested = normalized;\nmodel.VersionRequestedWasNotFound = true;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -896,6 +896,7 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()\n// The page should select the first package that is IsLatestSemVer2\nAssert.Equal(latestPackage.NormalizedVersion, model.Version);\nAssert.True(model.LatestVersionSemVer2);\n+ Assert.False(model.VersionRequestedWasNotFound);\ndeprecationService.Verify();\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Don't show missing version warning for absoluteLatest (#8199)
Address https://github.com/NuGet/NuGetGallery/issues/8198 |
455,736 | 14.09.2020 16:25:01 | 25,200 | 7f3e76d66a68bf368826514dce7fa2837fd2d029 | Emit AI event when install command is copied
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -85,6 +85,11 @@ $(function () {\nsetTimeout(function () {\ncopyButton.popover('destroy');\n}, 1000);\n+ window.nuget.sendMetric(\"CopyInstallCommand\", 1, {\n+ ButtonId: id,\n+ PackageId: packageId,\n+ PackageVersion: packageVersion\n+ });\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "</style>\n<script type=\"text/javascript\">\n+ var packageId = @Html.ToJson(Model.Id);\n+ var packageVersion = @Html.ToJson(Model.Version);\nvar packageManagers = @Html.ToJson(packageManagers.Select(pm => pm.Id).ToList());\n</script>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Emit AI event when install command is copied (#8206)
Address https://github.com/NuGet/Engineering/issues/3400 |
455,736 | 14.09.2020 19:46:33 | 25,200 | bc1df543a4959a6b36a344ff9b6940d9e236bdc4 | Focus edit button after form is closed
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"diff": "// Re-attach extensions.\nself.AttachExtensions();\n+\n+ // Focus the edit link so that the next tab key will continue with where it was left off prior to\n+ // opening the edit form. See https://github.com/NuGet/NuGetGallery/issues/8183.\n+ $(\"#\" + self.StartEditId()).focus();\n};\nthis.ShowRemainingPackages = function (_, e) {\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Focus edit button after form is closed (#8205)
Address https://github.com/NuGet/NuGetGallery/issues/8183 |
455,741 | 14.09.2020 14:52:12 | 25,200 | 42292a3cf74f6825b70b61d615739a78eccabd95 | adding an * by required fields in forms | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -797,6 +797,10 @@ img.reserved-indicator-icon {\n.page-api-keys .upsert-api-key .glob-pattern-hint .panel-body {\nheight: 282px;\n}\n+.page-api-keys .upsert-api-key .required:after {\n+ color: red;\n+ content: \" *\";\n+}\n.page-api-keys .add-api-key {\npadding: 20px 0;\nborder-top: 1px solid #dbdbdb;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-api-keys.less",
"new_path": "src/Bootstrap/less/theme/page-api-keys.less",
"diff": "height: 282px;\n}\n}\n+\n+ .required:after {\n+ color: red;\n+ content: \" *\";\n+ }\n}\n.add-api-key {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<!-- ko ifnot: Key -->\n<div class=\"row\">\n<div class=\"col-sm-7 form-group\">\n- <label data-bind=\"attr: { for: DescriptionId,\n+ <label class=\"control-label required\" data-bind=\"attr: { for: DescriptionId,\nid: DescriptionId() + '-label' }\">Key Name</label>\n<input type=\"text\" class=\"form-control\"\ndata-bind=\"attr: { id: DescriptionId,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | adding an * by required fields in forms |
455,736 | 30.09.2020 13:04:48 | 25,200 | b3fc376e7485f76660e949fe66ae94361bec8b6e | Disable flaky test
Fix is tracked by | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1954,7 +1954,7 @@ public async Task CheckThatCacheKeyIsNotCaseSensitive()\nAssert.Same(pd, _cache.Get(cacheKey));\n}\n- [Fact]\n+ [Fact(Skip = \"Flaky test, tracked by issue https://github.com/NuGet/NuGetGallery/issues/8231\")]\npublic async Task OneSecondCacheTime()\n{\nvar id = \"foo\";\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Disable flaky test (#8232)
Fix is tracked by https://github.com/NuGet/NuGetGallery/issues/8231 |
455,741 | 29.09.2020 11:51:26 | 25,200 | 7dc2f7d89dab4ec68dddb60dd1d3e235177c0488 | add more description for learn more | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IconUrlDeprecationValidationMessage.cs",
"new_path": "src/NuGetGallery/Services/IconUrlDeprecationValidationMessage.cs",
"diff": "@@ -9,6 +9,6 @@ public class IconUrlDeprecationValidationMessage : IValidationMessage\npublic bool HasRawHtmlRepresentation => true;\n- public string RawHtmlMessage => $\"{Strings.UploadPackage_IconUrlDeprecated.Replace(\"<\", \"<\").Replace(\">\", \">\")} <a href=\\\"https://aka.ms/deprecateIconUrl\\\">{Strings.UploadPackage_LearnMore}</a>.\";\n+ public string RawHtmlMessage => $\"{Strings.UploadPackage_IconUrlDeprecated.Replace(\"<\", \"<\").Replace(\">\", \">\")} <a href=\\\"https://aka.ms/deprecateIconUrl\\\" aria-label= \\\"{Strings.UploadPackage_LearnMore_IconUrlDeprecation}\\\">{Strings.UploadPackage_LearnMore}</a>.\";\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/InvalidLicenseUrlValidationMessage.cs",
"new_path": "src/NuGetGallery/Services/InvalidLicenseUrlValidationMessage.cs",
"diff": "@@ -11,7 +11,7 @@ namespace NuGetGallery\n/// </summary>\npublic class InvalidLicenseUrlValidationMessage : IValidationMessage\n{\n- private string DetailsLink => $\"<a href=\\\"https://aka.ms/invalidNuGetLicenseUrl\\\">{Strings.UploadPackage_LearnMore}</a>.\";\n+ private string DetailsLink => $\"<a href=\\\"https://aka.ms/invalidNuGetLicenseUrl\\\" aria-label= \\\"{Strings.UploadPackage_LearMore_PackagingLicense}\\\">{Strings.UploadPackage_LearnMore}</a>.\";\nprivate string DetailsPlainText => \"https://aka.ms/invalidNuGetLicenseUrl\";\nprivate readonly string _baseMessage;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/InvalidUrlEncodingForLicenseUrlValidationMessage.cs",
"new_path": "src/NuGetGallery/Services/InvalidUrlEncodingForLicenseUrlValidationMessage.cs",
"diff": "@@ -9,7 +9,7 @@ namespace NuGetGallery\n/// </summary>\npublic class InvalidUrlEncodingForLicenseUrlValidationMessage : IValidationMessage\n{\n- private string DetailsLink => $\"<a href=\\\"https://aka.ms/malformedNuGetLicenseUrl\\\">{Strings.UploadPackage_LearnMore}</a>.\";\n+ private string DetailsLink => $\"<a href=\\\"https://aka.ms/malformedNuGetLicenseUrl\\\" aria-label= \\\"{Strings.UploadPackage_LearnMore_InvalidLicenseUrlEncoding}\\\">{Strings.UploadPackage_LearnMore}</a>.\";\nprivate string DetailsPlainText => \"https://aka.ms/malformedNuGetLicenseUrl\";\nprivate string BaseMessage => Strings.UploadPackage_MalformedLicenseUrl;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LicenseUrlDeprecationValidationMessage.cs",
"new_path": "src/NuGetGallery/Services/LicenseUrlDeprecationValidationMessage.cs",
"diff": "@@ -12,7 +12,7 @@ namespace NuGetGallery\n/// </summary>\npublic class LicenseUrlDeprecationValidationMessage : IValidationMessage\n{\n- private string DeprecationLink => $\"<a href=\\\"{GalleryConstants.LicenseDeprecationUrl}\\\">{Strings.UploadPackage_LearnMore}</a>.\";\n+ private string DeprecationLink => $\"<a href=\\\"{GalleryConstants.LicenseDeprecationUrl}\\\" aria-label= \\\"{Strings.UploadPackage_LearnMore_LicenseUrlDreprecation}\\\">{Strings.UploadPackage_LearnMore}</a>.\";\nprivate readonly string _baseMessage;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -2588,6 +2588,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Learn more about Packaging License within the nupkg.\n+ /// </summary>\n+ public static string UploadPackage_LearMore_PackagingLicense {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_LearMore_PackagingLicense\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Learn more.\n/// </summary>\n@@ -2597,6 +2606,33 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Learn more about Icon Url deprecation.\n+ /// </summary>\n+ public static string UploadPackage_LearnMore_IconUrlDeprecation {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_LearnMore_IconUrlDeprecation\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to Learn more about Invalid License Url encoding.\n+ /// </summary>\n+ public static string UploadPackage_LearnMore_InvalidLicenseUrlEncoding {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_LearnMore_InvalidLicenseUrlEncoding\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to Learn more about License Url deprecation.\n+ /// </summary>\n+ public static string UploadPackage_LearnMore_LicenseUrlDreprecation {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_LearnMore_LicenseUrlDreprecation\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Specifying <licenseUrl> in the package metadata is no longer allowed, please specify the license in the package..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1187,4 +1187,16 @@ The {1} Team</value>\n<data name=\"ReadmeNotEditableWithEmbeddedReadme\" xml:space=\"preserve\">\n<value>The readme is not editable with the package has the embedded readme</value>\n</data>\n+ <data name=\"UploadPackage_LearMore_PackagingLicense\" xml:space=\"preserve\">\n+ <value>Learn more about including a license within the package</value>\n+ </data>\n+ <data name=\"UploadPackage_LearnMore_IconUrlDeprecation\" xml:space=\"preserve\">\n+ <value>Learn more about icon URL deprecation</value>\n+ </data>\n+ <data name=\"UploadPackage_LearnMore_InvalidLicenseUrlEncoding\" xml:space=\"preserve\">\n+ <value>Learn more about invalid license URL encoding</value>\n+ </data>\n+ <data name=\"UploadPackage_LearnMore_LicenseUrlDreprecation\" xml:space=\"preserve\">\n+ <value>Learn more about license URL deprecation</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | add more description for learn more |
455,741 | 05.10.2020 21:19:03 | 25,200 | b4a2488bf06df865240064636207126fae214a20 | add aria-live to read alter | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "individual packages, or both.\n</p>\n<div class=\"has-error\">\n- <span class=\"help-block\" data-bind=\"text: SubjectsError\"></span>\n+ <span class=\"help-block\" data-bind=\"text: SubjectsError\" aria-live=\"polite\" role=\"alert\"></span>\n</div>\n<div class=\"has-error\">\n<span class=\"field-validation-valid help-block\"\ndata-valmsg-replace=\"true\"\ndata-bind=\"attr: { 'data-valmsg-for': GlobPatternId,\n- id: GlobPatternId() + '-validation-message' }\"></span>\n+ id: GlobPatternId() + '-validation-message' }\" aria-live=\"polite\" role=\"alert\"></span>\n</div>\n</div>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | add aria-live to read alter |
455,736 | 07.10.2020 11:37:00 | 25,200 | b554e47f30de8341b18085b2439f6068471d9727 | Add feature flags to OData $count endpoints
* Add feature flags to OData $count endpoints
* Rename private async methods to *Async
Related to
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -41,14 +41,20 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string EmbeddedReadmeFlightName = GalleryPrefix + \"EmbeddedReadmes\";\nprivate const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllNonHijacked\";\n+ private const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllCountNonHijacked\";\nprivate const string ODataV1GetSpecificNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetSpecificNonHijacked\";\nprivate const string ODataV1FindPackagesByIdNonHijackedFeatureName = GalleryPrefix + \"ODataV1FindPackagesByIdNonHijacked\";\n+ private const string ODataV1FindPackagesByIdCountNonHijackedFeatureName = GalleryPrefix + \"ODataV1FindPackagesByIdCountNonHijacked\";\nprivate const string ODataV1SearchNonHijackedFeatureName = GalleryPrefix + \"ODataV1SearchNonHijacked\";\n+ private const string ODataV1SearchCountNonHijackedFeatureName = GalleryPrefix + \"ODataV1SearchCountNonHijacked\";\nprivate const string ODataV2GetAllNonHijackedFeatureName = GalleryPrefix + \"ODataV2GetAllNonHijacked\";\n+ private const string ODataV2GetAllCountNonHijackedFeatureName = GalleryPrefix + \"ODataV2GetAllCountNonHijacked\";\nprivate const string ODataV2GetSpecificNonHijackedFeatureName = GalleryPrefix + \"ODataV2GetSpecificNonHijacked\";\nprivate const string ODataV2FindPackagesByIdNonHijackedFeatureName = GalleryPrefix + \"ODataV2FindPackagesByIdNonHijacked\";\n+ private const string ODataV2FindPackagesByIdCountNonHijackedFeatureName = GalleryPrefix + \"ODataV2FindPackagesByIdCountNonHijacked\";\nprivate const string ODataV2SearchNonHijackedFeatureName = GalleryPrefix + \"ODataV2SearchNonHijacked\";\n+ private const string ODataV2SearchCountNonHijackedFeatureName = GalleryPrefix + \"ODataV2SearchCountNonHijacked\";\nprivate readonly IFeatureFlagClient _client;\n@@ -208,6 +214,11 @@ public bool IsODataV1GetAllEnabled()\nreturn _client.IsEnabled(ODataV1GetAllNonHijackedFeatureName, defaultValue: true);\n}\n+ public bool IsODataV1GetAllCountEnabled()\n+ {\n+ return _client.IsEnabled(ODataV1GetAllCountNonHijackedFeatureName, defaultValue: true);\n+ }\n+\npublic bool IsODataV1GetSpecificNonHijackedEnabled()\n{\nreturn _client.IsEnabled(ODataV1GetSpecificNonHijackedFeatureName, defaultValue: true);\n@@ -218,16 +229,31 @@ public bool IsODataV1FindPackagesByIdNonHijackedEnabled()\nreturn _client.IsEnabled(ODataV1FindPackagesByIdNonHijackedFeatureName, defaultValue: true);\n}\n+ public bool IsODataV1FindPackagesByIdCountNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV1FindPackagesByIdCountNonHijackedFeatureName, defaultValue: true);\n+ }\n+\npublic bool IsODataV1SearchNonHijackedEnabled()\n{\nreturn _client.IsEnabled(ODataV1SearchNonHijackedFeatureName, defaultValue: true);\n}\n+ public bool IsODataV1SearchCountNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV1SearchCountNonHijackedFeatureName, defaultValue: true);\n+ }\n+\npublic bool IsODataV2GetAllNonHijackedEnabled()\n{\nreturn _client.IsEnabled(ODataV2GetAllNonHijackedFeatureName, defaultValue: true);\n}\n+ public bool IsODataV2GetAllCountNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV2GetAllCountNonHijackedFeatureName, defaultValue: true);\n+ }\n+\npublic bool IsODataV2GetSpecificNonHijackedEnabled()\n{\nreturn _client.IsEnabled(ODataV2GetSpecificNonHijackedFeatureName, defaultValue: true);\n@@ -238,9 +264,19 @@ public bool IsODataV2FindPackagesByIdNonHijackedEnabled()\nreturn _client.IsEnabled(ODataV2FindPackagesByIdNonHijackedFeatureName, defaultValue: true);\n}\n+ public bool IsODataV2FindPackagesByIdCountNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV2FindPackagesByIdCountNonHijackedFeatureName, defaultValue: true);\n+ }\n+\npublic bool IsODataV2SearchNonHijackedEnabled()\n{\nreturn _client.IsEnabled(ODataV2SearchNonHijackedFeatureName, defaultValue: true);\n}\n+\n+ public bool IsODataV2SearchCountNonHijackedEnabled()\n+ {\n+ return _client.IsEnabled(ODataV2SearchCountNonHijackedFeatureName, defaultValue: true);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -157,6 +157,11 @@ public interface IFeatureFlagService\n/// </summary>\nbool IsODataV1GetAllEnabled();\n+ /// <summary>\n+ /// Whether the /Packages()/$count endpoint is enabled for the V1 OData API.\n+ /// </summary>\n+ bool IsODataV1GetAllCountEnabled();\n+\n/// <summary>\n/// Whether the /Packages(Id=,Version=) endpoint is enabled for non-hijacked queries for the V1 OData API.\n/// </summary>\n@@ -167,16 +172,31 @@ public interface IFeatureFlagService\n/// </summary>\nbool IsODataV1FindPackagesByIdNonHijackedEnabled();\n+ /// <summary>\n+ /// Whether the /FindPackagesById()/$count endpoint is enabled for non-hijacked queries for the V1 OData API.\n+ /// </summary>\n+ bool IsODataV1FindPackagesByIdCountNonHijackedEnabled();\n+\n/// <summary>\n/// Whether the /Search() endpoint is enabled for non-hijacked queries for the V1 OData API.\n/// </summary>\nbool IsODataV1SearchNonHijackedEnabled();\n+ /// <summary>\n+ /// Whether the /Search()/$count endpoint is enabled for non-hijacked queries for the V1 OData API.\n+ /// </summary>\n+ bool IsODataV1SearchCountNonHijackedEnabled();\n+\n/// <summary>\n/// Whether the /Packages() endpoint is enabled for non-hijacked queries for the V2 OData API.\n/// </summary>\nbool IsODataV2GetAllNonHijackedEnabled();\n+ /// <summary>\n+ /// Whether the /Packages()/$count endpoint is enabled for non-hijacked queries for the V2 OData API.\n+ /// </summary>\n+ bool IsODataV2GetAllCountNonHijackedEnabled();\n+\n/// <summary>\n/// Whether the /Packages(Id=,Version=) endpoint is enabled for non-hijacked queries for the V2 OData API.\n/// </summary>\n@@ -187,9 +207,19 @@ public interface IFeatureFlagService\n/// </summary>\nbool IsODataV2FindPackagesByIdNonHijackedEnabled();\n+ /// <summary>\n+ /// Whether the /FindPackagesById()/$count endpoint is enabled for non-hijacked queries for the V2 OData API.\n+ /// </summary>\n+ bool IsODataV2FindPackagesByIdCountNonHijackedEnabled();\n+\n/// <summary>\n/// Whether the /Search() endpoint is enabled for non-hijacked queries for the V2 OData API.\n/// </summary>\nbool IsODataV2SearchNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether the /Search()/$count endpoint is enabled for non-hijacked queries for the V2 OData API.\n+ /// </summary>\n+ bool IsODataV2SearchCountNonHijackedEnabled();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"NuGetGallery.Get2FADismissFeedback\": \"Disabled\",\n\"NuGetGallery.UsabillaEveryPage\": \"Enabled\",\n\"NuGetGallery.ODataV1GetAllNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV1GetAllCountNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV1GetSpecificNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV1FindPackagesByIdNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV1FindPackagesByIdCountNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV1SearchNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV1SearchCountNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV2GetAllNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV2GetAllCountNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV2GetSpecificNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV2FindPackagesByIdNonHijacked\": \"Enabled\",\n- \"NuGetGallery.ODataV2SearchNonHijacked\": \"Enabled\"\n+ \"NuGetGallery.ODataV2FindPackagesByIdCountNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV2SearchNonHijacked\": \"Enabled\",\n+ \"NuGetGallery.ODataV2SearchCountNonHijacked\": \"Enabled\"\n},\n\"Flights\": {\n\"NuGetGallery.TyposquattingFlight\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV1FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV1FeedController.cs",
"diff": "using System.Web.Http;\nusing System.Web.Http.OData;\nusing System.Web.Http.OData.Query;\n-using Microsoft.Data.OData;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.OData;\n@@ -54,7 +53,21 @@ public class ODataV1FeedController\n[CacheOutput(NoCache = true)]\npublic IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options)\n{\n- if (!_featureFlagService.IsODataV1GetAllEnabled())\n+ return Get(options, _featureFlagService.IsODataV1GetAllEnabled());\n+ }\n+\n+ // /api/v1/Packages/$count\n+ [HttpGet]\n+ [CacheOutput(NoCache = true)]\n+ public IHttpActionResult GetCount(ODataQueryOptions<V1FeedPackage> options)\n+ {\n+ return Get(options, _featureFlagService.IsODataV1GetAllCountEnabled())\n+ .FormattedAsCountResult<V1FeedPackage>();\n+ }\n+\n+ private IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options, bool isNonHijackEnabled)\n+ {\n+ if (!isNonHijackEnabled)\n{\nreturn BadRequest(Strings.ODataDisabled);\n}\n@@ -82,14 +95,6 @@ public IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options)\nreturn TrackedQueryResult(options, queryable, MaxPageSize, customQuery: true);\n}\n- // /api/v1/Packages/$count\n- [HttpGet]\n- [CacheOutput(NoCache = true)]\n- public IHttpActionResult GetCount(ODataQueryOptions<V1FeedPackage> options)\n- {\n- return Get(options).FormattedAsCountResult<V1FeedPackage>();\n- }\n-\n// /api/v1/Packages(Id=,Version=)\n[HttpGet]\n[ODataCacheOutput(\n@@ -99,7 +104,7 @@ public IHttpActionResult GetCount(ODataQueryOptions<V1FeedPackage> options)\nClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]\npublic async Task<IHttpActionResult> Get(ODataQueryOptions<V1FeedPackage> options, string id, string version)\n{\n- var result = await GetCore(\n+ var result = await GetCoreAsync(\noptions,\nid,\nversion,\n@@ -118,12 +123,10 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V1FeedPackage> option\nClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]\npublic async Task<IHttpActionResult> FindPackagesById(ODataQueryOptions<V1FeedPackage> options, [FromODataUri]string id)\n{\n- return await GetCore(\n+ return await FindPackagesByIdAsync(\noptions,\nid,\n- version: null,\n- return404NotFoundWhenNoResults: false,\n- isNonHijackEnabled: _featureFlagService.IsODataV1FindPackagesByIdNonHijackedEnabled());\n+ _featureFlagService.IsODataV1FindPackagesByIdNonHijackedEnabled());\n}\n// /api/v1/FindPackagesById()/$count?id=\n@@ -134,11 +137,27 @@ public async Task<IHttpActionResult> FindPackagesById(ODataQueryOptions<V1FeedPa\nNoCache = true)]\npublic async Task<IHttpActionResult> FindPackagesByIdCount(ODataQueryOptions<V1FeedPackage> options, [FromODataUri] string id)\n{\n- var result = await FindPackagesById(options, id);\n- return result.FormattedAsCountResult<V1FeedPackage>();\n+ return (await FindPackagesByIdAsync(\n+ options,\n+ id,\n+ _featureFlagService.IsODataV1FindPackagesByIdCountNonHijackedEnabled()))\n+ .FormattedAsCountResult<V1FeedPackage>();\n}\n- private async Task<IHttpActionResult> GetCore(\n+ private async Task<IHttpActionResult> FindPackagesByIdAsync(\n+ ODataQueryOptions<V1FeedPackage> options,\n+ string id,\n+ bool isNonHijackEnabled)\n+ {\n+ return await GetCoreAsync(\n+ options,\n+ id,\n+ version: null,\n+ return404NotFoundWhenNoResults: false,\n+ isNonHijackEnabled: isNonHijackEnabled);\n+ }\n+\n+ private async Task<IHttpActionResult> GetCoreAsync(\nODataQueryOptions<V1FeedPackage> options,\nstring id,\nstring version,\n@@ -253,6 +272,38 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nODataQueryOptions<V1FeedPackage> options,\n[FromODataUri]string searchTerm = \"\",\n[FromODataUri]string targetFramework = \"\")\n+ {\n+ return await SearchAsync(\n+ options,\n+ searchTerm,\n+ targetFramework,\n+ _featureFlagService.IsODataV1SearchNonHijackedEnabled());\n+ }\n+\n+ // /api/v1/Search()/$count?searchTerm=&targetFramework=&includePrerelease=\n+ [HttpGet]\n+ [ODataCacheOutput(\n+ ODataCachedEndpoint.Search,\n+ serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,\n+ ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]\n+ public async Task<IHttpActionResult> SearchCount(\n+ ODataQueryOptions<V1FeedPackage> options,\n+ [FromODataUri]string searchTerm = \"\",\n+ [FromODataUri]string targetFramework = \"\")\n+ {\n+ return (await SearchAsync(\n+ options,\n+ searchTerm,\n+ targetFramework,\n+ _featureFlagService.IsODataV1SearchCountNonHijackedEnabled()))\n+ .FormattedAsCountResult<V1FeedPackage>();\n+ }\n+\n+ private async Task<IHttpActionResult> SearchAsync(\n+ ODataQueryOptions<V1FeedPackage> options,\n+ string searchTerm,\n+ string targetFramework,\n+ bool isNonHijackEnabled)\n{\n// Handle OData-style |-separated list of frameworks.\nstring[] targetFrameworkList = (targetFramework ?? \"\").Split(new[] { '\\'', '|' }, StringSplitOptions.RemoveEmptyEntries);\n@@ -319,7 +370,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\ncustomQuery = true;\n}\n- if (!_featureFlagService.IsODataV1SearchNonHijackedEnabled())\n+ if (!isNonHijackEnabled)\n{\nreturn BadRequest(Strings.ODataParametersDisabled);\n}\n@@ -335,21 +386,6 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nreturn TrackedQueryResult(options, queryable, MaxPageSize, customQuery);\n}\n- // /api/v1/Search()/$count?searchTerm=&targetFramework=&includePrerelease=\n- [HttpGet]\n- [ODataCacheOutput(\n- ODataCachedEndpoint.Search,\n- serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,\n- ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]\n- public async Task<IHttpActionResult> SearchCount(\n- ODataQueryOptions<V1FeedPackage> options,\n- [FromODataUri]string searchTerm = \"\",\n- [FromODataUri]string targetFramework = \"\")\n- {\n- var searchResults = await Search(options, searchTerm, targetFramework);\n- return searchResults.FormattedAsCountResult<V1FeedPackage>();\n- }\n-\n[HttpGet]\n[CacheOutput(NoCache = true)]\npublic virtual HttpResponseMessage SimulateError([FromUri] string type = \"Exception\")\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"diff": "@@ -60,6 +60,31 @@ public class ODataV2FeedController\npublic async Task<IHttpActionResult> Get(\nODataQueryOptions<V2FeedPackage> options,\n[FromUri]string semVerLevel = null)\n+ {\n+ return await GetAsync(\n+ options,\n+ semVerLevel,\n+ _featureFlagService.IsODataV2GetAllNonHijackedEnabled());\n+ }\n+\n+ // /api/v2/Packages/$count?semVerLevel=\n+ [HttpGet]\n+ [CacheOutput(NoCache = true)]\n+ public async Task<IHttpActionResult> GetCount(\n+ ODataQueryOptions<V2FeedPackage> options,\n+ [FromUri] string semVerLevel = null)\n+ {\n+ return (await GetAsync(\n+ options,\n+ semVerLevel,\n+ _featureFlagService.IsODataV2GetAllCountNonHijackedEnabled()))\n+ .FormattedAsCountResult<V2FeedPackage>();\n+ }\n+\n+ private async Task<IHttpActionResult> GetAsync(\n+ ODataQueryOptions<V2FeedPackage> options,\n+ string semVerLevel,\n+ bool isNonHijackEnabled)\n{\nbool result = TryShouldIgnoreOrderById(options, out var shouldIgnoreOrderById);\n@@ -79,8 +104,6 @@ public class ODataV2FeedController\nvar semVerLevelKey = SemVerLevelKey.ForSemVerLevel(semVerLevel);\nbool? customQuery = null;\n- var isNonHijackEnabled = _featureFlagService.IsODataV2GetAllNonHijackedEnabled();\n-\n// Try the search service\ntry\n{\n@@ -162,16 +185,6 @@ public class ODataV2FeedController\nreturn TrackedQueryResult(options, queryable, MaxPageSize, customQuery);\n}\n- // /api/v2/Packages/$count?semVerLevel=\n- [HttpGet]\n- [CacheOutput(NoCache = true)]\n- public async Task<IHttpActionResult> GetCount(\n- ODataQueryOptions<V2FeedPackage> options,\n- [FromUri]string semVerLevel = null)\n- {\n- return (await Get(options, semVerLevel)).FormattedAsCountResult<V2FeedPackage>();\n- }\n-\n// /api/v2/Packages(Id=,Version=)\n[HttpGet]\n[ODataCacheOutput(\n@@ -188,7 +201,7 @@ public class ODataV2FeedController\n// We are defaulting to semVerLevel = \"2.0.0\" by design.\n// The client is requesting a specific package version and should support what it requests.\n// If not, too bad :)\n- var result = await GetCore(\n+ var result = await GetCoreAsync(\noptions,\nid,\nversion,\n@@ -212,6 +225,38 @@ public class ODataV2FeedController\nODataQueryOptions<V2FeedPackage> options,\n[FromODataUri]string id,\n[FromUri]string semVerLevel = null)\n+ {\n+ return await FindPackagesByIdAsync(\n+ options,\n+ id,\n+ semVerLevel,\n+ _featureFlagService.IsODataV2FindPackagesByIdNonHijackedEnabled());\n+ }\n+\n+ // /api/v2/FindPackagesById()/$count?semVerLevel=\n+ [HttpGet]\n+ [ODataCacheOutput(\n+ ODataCachedEndpoint.FindPackagesByIdCount,\n+ serverTimeSpan: ODataCacheConfiguration.DefaultFindPackagesByIdCountCacheTimeInSeconds,\n+ NoCache = true)]\n+ public async Task<IHttpActionResult> FindPackagesByIdCount(\n+ ODataQueryOptions<V2FeedPackage> options,\n+ [FromODataUri] string id,\n+ [FromUri] string semVerLevel = null)\n+ {\n+ return (await FindPackagesByIdAsync(\n+ options,\n+ id,\n+ semVerLevel,\n+ _featureFlagService.IsODataV2FindPackagesByIdCountNonHijackedEnabled()))\n+ .FormattedAsCountResult<V2FeedPackage>();\n+ }\n+\n+ private async Task<IHttpActionResult> FindPackagesByIdAsync(\n+ ODataQueryOptions<V2FeedPackage> options,\n+ string id,\n+ string semVerLevel,\n+ bool isNonHijackEnabled)\n{\nif (string.IsNullOrEmpty(id))\n{\n@@ -226,31 +271,17 @@ public class ODataV2FeedController\nreturn TrackedQueryResult(options, emptyResult, MaxPageSize, customQuery: false);\n}\n- return await GetCore(\n+ return await GetCoreAsync(\noptions,\nid,\nversion: null,\nsemVerLevel: semVerLevel,\nallowHijack: true,\nreturn404NotFoundWhenNoResults: false,\n- isNonHijackEnabled: _featureFlagService.IsODataV2FindPackagesByIdNonHijackedEnabled());\n- }\n-\n- // /api/v2/FindPackagesById()/$count?semVerLevel=\n- [HttpGet]\n- [ODataCacheOutput(\n- ODataCachedEndpoint.FindPackagesByIdCount,\n- serverTimeSpan: ODataCacheConfiguration.DefaultFindPackagesByIdCountCacheTimeInSeconds,\n- NoCache = true)]\n- public async Task<IHttpActionResult> FindPackagesByIdCount(\n- ODataQueryOptions<V2FeedPackage> options,\n- [FromODataUri]string id,\n- [FromUri]string semVerLevel = null)\n- {\n- return (await FindPackagesById(options, id, semVerLevel)).FormattedAsCountResult<V2FeedPackage>();\n+ isNonHijackEnabled: isNonHijackEnabled);\n}\n- private async Task<IHttpActionResult> GetCore(\n+ private async Task<IHttpActionResult> GetCoreAsync(\nODataQueryOptions<V2FeedPackage> options,\nstring id,\nstring version,\n@@ -404,6 +435,46 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\n[FromODataUri]string targetFramework = \"\",\n[FromODataUri]bool includePrerelease = false,\n[FromUri]string semVerLevel = null)\n+ {\n+ return await SearchAsync(\n+ options,\n+ searchTerm,\n+ targetFramework,\n+ includePrerelease,\n+ semVerLevel,\n+ _featureFlagService.IsODataV2SearchNonHijackedEnabled());\n+ }\n+\n+ // /api/v2/Search()/$count?searchTerm=&targetFramework=&includePrerelease=&semVerLevel=\n+ [HttpGet]\n+ [ODataCacheOutput(\n+ ODataCachedEndpoint.Search,\n+ serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,\n+ ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]\n+ public async Task<IHttpActionResult> SearchCount(\n+ ODataQueryOptions<V2FeedPackage> options,\n+ [FromODataUri] string searchTerm = \"\",\n+ [FromODataUri] string targetFramework = \"\",\n+ [FromODataUri] bool includePrerelease = false,\n+ [FromUri] string semVerLevel = null)\n+ {\n+ return (await SearchAsync(\n+ options,\n+ searchTerm,\n+ targetFramework,\n+ includePrerelease,\n+ semVerLevel,\n+ _featureFlagService.IsODataV2SearchCountNonHijackedEnabled()))\n+ .FormattedAsCountResult<V2FeedPackage>();\n+ }\n+\n+ private async Task<IHttpActionResult> SearchAsync(\n+ ODataQueryOptions<V2FeedPackage> options,\n+ string searchTerm,\n+ string targetFramework,\n+ bool includePrerelease,\n+ string semVerLevel,\n+ bool isNonHijackEnabled)\n{\n// Handle OData-style |-separated list of frameworks.\nstring[] targetFrameworkList = (targetFramework ?? \"\").Split(new[] { '\\'', '|' }, StringSplitOptions.RemoveEmptyEntries);\n@@ -484,7 +555,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\ncustomQuery = true;\n}\n- if (!_featureFlagService.IsODataV2SearchNonHijackedEnabled())\n+ if (!isNonHijackEnabled)\n{\nreturn BadRequest(Strings.ODataParametersDisabled);\n}\n@@ -505,28 +576,6 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nreturn TrackedQueryResult(options, queryable, MaxPageSize, customQuery);\n}\n- // /api/v2/Search()/$count?searchTerm=&targetFramework=&includePrerelease=&semVerLevel=\n- [HttpGet]\n- [ODataCacheOutput(\n- ODataCachedEndpoint.Search,\n- serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,\n- ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]\n- public async Task<IHttpActionResult> SearchCount(\n- ODataQueryOptions<V2FeedPackage> options,\n- [FromODataUri]string searchTerm = \"\",\n- [FromODataUri]string targetFramework = \"\",\n- [FromODataUri]bool includePrerelease = false,\n- [FromUri]string semVerLevel = null)\n- {\n- var searchResults = await Search(\n- options,\n- searchTerm,\n- targetFramework,\n- includePrerelease,\n- semVerLevel);\n- return searchResults.FormattedAsCountResult<V2FeedPackage>();\n- }\n-\n// /api/v2/GetUpdates()?packageIds=&versions=&includePrerelease=&includeAllVersions=&targetFrameworks=&versionConstraints=&semVerLevel=\n[HttpGet]\n[HttpPost]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"diff": "@@ -59,6 +59,24 @@ public void GetAll_ReturnsBadRequestWhenGetAllIsDisabled()\nfeatureFlagService.Verify(x => x.IsODataV1GetAllEnabled());\n}\n+ [Fact]\n+ public void GetAllCount_ReturnsBadRequestWhenGetAllIsDisabled()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV1GetAllCountEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = GetActionResult<V1FeedPackage>(\n+ (controller, options) => controller.GetCount(options),\n+ \"/api/v1/Packages/$count\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV1GetAllCountEnabled());\n+ }\n+\n[Fact]\npublic async Task GetSpecific_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n{\n@@ -120,6 +138,24 @@ public async Task FindPackagesById_ReturnsBadRequestNonHijackedIsDisabledAndQuer\nfeatureFlagService.Verify(x => x.IsODataV1FindPackagesByIdNonHijackedEnabled());\n}\n+ [Fact]\n+ public async Task FindPackagesByIdCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV1FindPackagesByIdCountNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V1FeedPackage>(\n+ async (controller, options) => await controller.FindPackagesByIdCount(options, TestPackageId),\n+ $\"/api/v1/FindPackagesById/$count?id='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV1FindPackagesByIdCountNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task FindPackagesByIdCount_FiltersSemVerV2PackageVersions()\n{\n@@ -163,6 +199,24 @@ public async Task Search_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeH\nfeatureFlagService.Verify(x => x.IsODataV1SearchNonHijackedEnabled());\n}\n+ [Fact]\n+ public async Task SearchCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV1SearchCountNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V1FeedPackage>(\n+ async (controller, options) => await controller.SearchCount(options, TestPackageId),\n+ $\"/api/v1/Search/$count?searchTerm='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV1SearchCountNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task SearchCount_FiltersSemVerV2PackageVersions()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"diff": "@@ -77,6 +77,24 @@ public async Task GetAll_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeH\nfeatureFlagService.Verify(x => x.IsODataV2GetAllNonHijackedEnabled());\n}\n+ [Fact]\n+ public async Task GetAllCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV2GetAllCountNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V2FeedPackage>(\n+ (controller, options) => controller.GetCount(options),\n+ \"/api/v2/Packages/$count?$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV2GetAllCountNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task GetSpecific_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n{\n@@ -154,6 +172,24 @@ public async Task FindPackagesById_ReturnsBadRequestNonHijackedIsDisabledAndQuer\nfeatureFlagService.Verify(x => x.IsODataV2FindPackagesByIdNonHijackedEnabled());\n}\n+ [Fact]\n+ public async Task FindPackagesByIdCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV2FindPackagesByIdCountNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V2FeedPackage>(\n+ (controller, options) => controller.FindPackagesByIdCount(options, TestPackageId),\n+ $\"/api/v2/FindPackagesById/$count?id='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV2FindPackagesByIdCountNonHijackedEnabled());\n+ }\n+\n[Theory]\n[InlineData(\"2.0.0\")]\n[InlineData(\"2.0.1\")]\n@@ -217,6 +253,24 @@ public async Task Search_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeH\nfeatureFlagService.Verify(x => x.IsODataV2SearchNonHijackedEnabled());\n}\n+ [Fact]\n+ public async Task SearchCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeHijacked()\n+ {\n+ // Arrange\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.IsODataV2SearchCountNonHijackedEnabled()).Returns(false);\n+\n+ // Act\n+ var resultSet = await GetActionResultAsync<V2FeedPackage>(\n+ (controller, options) => controller.SearchCount(options, TestPackageId),\n+ $\"/api/v2/Search/$count?searchTerm='{TestPackageId}'&$orderby=Version\",\n+ featureFlagService);\n+\n+ // Assert\n+ Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ featureFlagService.Verify(x => x.IsODataV2SearchCountNonHijackedEnabled());\n+ }\n+\n[Fact]\npublic async Task Search_FiltersSemVerV2PackageVersionsByDefault_IncludePrerelease()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add feature flags to OData $count endpoints (#8241)
* Add feature flags to OData $count endpoints
* Rename private async methods to *Async
Related to https://github.com/NuGet/Engineering/issues/2902
Address https://github.com/NuGet/Engineering/issues/3442 |
455,736 | 07.10.2020 14:18:46 | 25,200 | 8fede708e2b2aae4a4f2a925bcfb810af0e32230 | Enhance OData deprecation error message
* Enhance OData deprecation error message
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1292,7 +1292,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to This OData endpoint is disabled..\n+ /// Looks up a localized string similar to This OData endpoint has been disabled. Please refer to the following URL for more information about this deprecation: https://aka.ms/nuget/odata-deprecation.\n/// </summary>\npublic static string ODataDisabled {\nget {\n@@ -1301,7 +1301,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to The combination of parameters provided to this OData endpoint is not supported..\n+ /// Looks up a localized string similar to The combination of parameters provided to this OData endpoint is no longer supported. Please refer to the following URL for more information about this deprecation: https://aka.ms/nuget/odata-deprecation.\n/// </summary>\npublic static string ODataParametersDisabled {\nget {\n@@ -2589,7 +2589,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Learn more about Packaging License within the nupkg.\n+ /// Looks up a localized string similar to Learn more about including a license within the package.\n/// </summary>\npublic static string UploadPackage_LearMore_PackagingLicense {\nget {\n@@ -2607,7 +2607,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Learn more about Icon Url deprecation.\n+ /// Looks up a localized string similar to Learn more about icon URL deprecation.\n/// </summary>\npublic static string UploadPackage_LearnMore_IconUrlDeprecation {\nget {\n@@ -2616,7 +2616,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Learn more about Invalid License Url encoding.\n+ /// Looks up a localized string similar to Learn more about invalid license URL encoding.\n/// </summary>\npublic static string UploadPackage_LearnMore_InvalidLicenseUrlEncoding {\nget {\n@@ -2625,7 +2625,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Learn more about License Url deprecation.\n+ /// Looks up a localized string similar to Learn more about license URL deprecation.\n/// </summary>\npublic static string UploadPackage_LearnMore_LicenseUrlDreprecation {\nget {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1179,10 +1179,10 @@ The {1} Team</value>\n<value>the name of <readme> element is case sensitive, must use the <readme></value>\n</data>\n<data name=\"ODataDisabled\" xml:space=\"preserve\">\n- <value>This OData endpoint is disabled.</value>\n+ <value>This OData endpoint has been disabled. Please refer to the following URL for more information about this deprecation: https://aka.ms/nuget/odata-deprecation</value>\n</data>\n<data name=\"ODataParametersDisabled\" xml:space=\"preserve\">\n- <value>The combination of parameters provided to this OData endpoint is not supported.</value>\n+ <value>The combination of parameters provided to this OData endpoint is no longer supported. Please refer to the following URL for more information about this deprecation: https://aka.ms/nuget/odata-deprecation</value>\n</data>\n<data name=\"ReadmeNotEditableWithEmbeddedReadme\" xml:space=\"preserve\">\n<value>The readme is not editable with the package has the embedded readme</value>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Enhance OData deprecation error message (#8242)
* Enhance OData deprecation error message
Progress on https://github.com/NuGet/Engineering/issues/3428 |
455,741 | 07.10.2020 23:55:08 | 0 | 7c14fa22bc3a10665baa84b3e34fa34490ce5312 | path fix in scritp point to vs2019 | [
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/BuildTests.ps1",
"new_path": "tests/Scripts/BuildTests.ps1",
"diff": "@@ -8,7 +8,7 @@ param(\n$rootName = (Get-Item $PSScriptRoot).parent.FullName\n# Required tools\n-$msBuild = \"${Env:ProgramFiles(x86)}\\Microsoft Visual Studio\\2017\\Enterprise\\MSBuild\\15.0\\Bin\\msbuild\"\n+$msBuild = \"${Env:ProgramFiles(x86)}\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\msbuild\"\n$nuget = \"$rootName\\nuget.exe\"\n& \"$rootName\\Scripts\\DownloadLatestNuGetExeRelease.ps1\" $rootName\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | path fix in scritp point to vs2019 (#8244) |
455,741 | 09.10.2020 02:17:16 | 0 | 53729e84f00372d0932e02212fcd98db19c5d500 | survey banner | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "</div>\n}\n+<div class=\"container-fluid banner banner-info text-center\">\n+ <div class=\"row\">\n+ <div class=\"col-sm-12\">\n+ <span>\n+ 👋 What do you think about NuGet.org? We're looking for feedback from developers like you. <a href=\"https://aka.ms/NuGetSurvey\" target=\"_blank\">Take the survey.</a>\n+ </span>\n+ </div>\n+ </div>\n+</div>\n+\n@helper DisplayNavigationItem(string tab, string url, bool bold = false, string title = null)\n{\n<li class=\"@(ViewBag.Tab == tab ? \"active\" : string.Empty)\" role=\"presentation\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | survey banner (#8249) |
455,736 | 09.10.2020 13:55:10 | 25,200 | af7a465454994f23134aa6f3db5c2aa38249f140 | Remove A/B test check for the package dependents feature
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -880,8 +880,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\nmodel.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser, allVersions);\nmodel.IsPackageRenamesEnabled = _featureFlagService.IsPackageRenamesEnabled(currentUser);\n- model.IsPackageDependentsEnabled = _featureFlagService.IsPackageDependentsEnabled(currentUser) &&\n- _abTestService.IsPackageDependendentsABEnabled(currentUser);\n+ model.IsPackageDependentsEnabled = _featureFlagService.IsPackageDependentsEnabled(currentUser);\nif (model.IsPackageDependentsEnabled)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/ABTestEnrollment.cs",
"new_path": "src/NuGetGallery/Infrastructure/ABTestEnrollment.cs",
"diff": "@@ -27,9 +27,21 @@ public ABTestEnrollment(ABTestEnrollmentState state, int schemaVersion, int prev\nPreviewSearchBucket = previewSearchBucket;\nPackageDependentBucket = packageDependentBucket;\n}\n+\npublic ABTestEnrollmentState State { get; }\npublic int SchemaVersion { get; }\n+\n+ /// <summary>\n+ /// Currently usabled and is represented by the \"ps\" property in the \"nugetab\" cookie.\n+ /// </summary>\npublic int PreviewSearchBucket { get; }\n+\n+ /// <summary>\n+ /// Currently unused by the <see cref=\"CookieBasedABTestService\"/> but still set in some user's cookies. See\n+ /// <see cref=\"ABTestEnrollmentFactory\"/> for the A/B test cookie data model. This C# property could be renamed\n+ /// and reused for a future A/B test by leveraging the \"pd\" JSON property in the \"nugetab\" cookie or could be\n+ /// ignored for the rest of time.\n+ /// </summary>\npublic int PackageDependentBucket { get; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/ABTestEnrollmentFactory.cs",
"new_path": "src/NuGetGallery/Infrastructure/ABTestEnrollmentFactory.cs",
"diff": "using System;\nusing System.Security.Cryptography;\nusing System.Threading;\n-using Microsoft.Extensions.Logging;\nusing Newtonsoft.Json;\nnamespace NuGetGallery\n{\n+ /// <summary>\n+ /// This is the implementation that handles all current and past versions of the \"nugetab\" cookie. This, along\n+ /// with <see cref=\"CookieBasedABTestService\"/>, makes the A/B test settings per browsing session \"sticky\" so that\n+ /// an A/B test feature is always on or off for a single user browser.\n+ /// </summary>\npublic class ABTestEnrollmentFactory : IABTestEnrollmentFactory\n{\n- private const int SchemaVersion1 = 1;\n- private const int SchemaVersion2 = 2;\n+ private const int SchemaVersion1 = 1; // PreviewSearch: {\"v\":1,\"ps\":100}\n+ private const int SchemaVersion2 = 2; // PreviewSearch + PackageDependent: {\"v\":2,\"ps\":100,\"pd\":100}\n+\n+ // Note that a new schema version could theoretically reuse any currently unused cookie properties. However\n+ // this does have questionable statistical correctness due treatment assignment of one A/B test being reused\n+ // for another, i.e. each A/B test population is not independent.\nprivate static readonly RNGCryptoServiceProvider _secureRng = new RNGCryptoServiceProvider();\nprivate static readonly ThreadLocal<byte[]> _bytes = new ThreadLocal<byte[]>(() => new byte[sizeof(ulong)]);\nprivate readonly ITelemetryService _telemetryService;\n- private readonly ILogger<ABTestEnrollmentFactory> _logger;\n- public ABTestEnrollmentFactory(\n- ITelemetryService telemetryService,\n- ILogger<ABTestEnrollmentFactory> logger)\n+ public ABTestEnrollmentFactory(ITelemetryService telemetryService)\n{\n_telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n- _logger = logger ?? throw new ArgumentNullException(nameof(logger));\n}\npublic ABTestEnrollment Initialize()\n@@ -85,7 +89,8 @@ public bool TryDeserialize(string serialized, out ABTestEnrollment enrollment)\nreturn false;\n}\n- return TryDeserializeStateVer2(serialized, out enrollment) || TryDeserializeStateVer1(serialized, out enrollment);\n+ return TryDeserializeStateVer2(serialized, out enrollment)\n+ || TryDeserializeStateVer1(serialized, out enrollment);\n}\nprivate bool TryDeserializeStateVer1(string serialized, out ABTestEnrollment enrollment)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/CookieBasedABTestService.cs",
"new_path": "src/NuGetGallery/Infrastructure/CookieBasedABTestService.cs",
"diff": "@@ -47,17 +47,6 @@ public bool IsPreviewSearchEnabled(User user)\nconfig => config.PreviewSearchPercentage);\n}\n- public bool IsPackageDependendentsABEnabled(User user)\n- {\n- var isActive = IsActive(\n- nameof(Enrollment.PackageDependentBucket),\n- user,\n- enrollment => enrollment.PackageDependentBucket,\n- config => config.DependentsPercentage);\n-\n- return isActive;\n- }\n-\nprivate ABTestEnrollment Enrollment => _lazyEnrollment.Value;\nprivate IABTestConfiguration Config => _contentObjectService.ABTestConfiguration;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/IABTestService.cs",
"new_path": "src/NuGetGallery/Infrastructure/IABTestService.cs",
"diff": "@@ -11,10 +11,5 @@ public interface IABTestService\n/// Whether or not the user should see the preview search implementation.\n/// </summary>\nbool IsPreviewSearchEnabled(User user);\n-\n- /// <summary>\n- /// Whether or not the user should see the reverse dependencies implementation.\n- /// </summary>\n- bool IsPackageDependendentsABEnabled(User user);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "using System.Linq.Expressions;\nusing System.Net;\nusing System.Text;\n-using System.Threading;\nusing System.Threading.Tasks;\nusing System.Web;\nusing System.Web.Caching;\nusing NuGetGallery.Services.Helpers;\nusing NuGetGallery.TestUtils;\nusing Xunit;\n-using Xunit.Sdk;\nnamespace NuGetGallery\n{\n@@ -187,6 +185,9 @@ public class PackagesControllerFacts\ncontentObjectService\n.SetupGet(c => c.GitHubUsageConfiguration)\n.Returns(new GitHubUsageConfiguration(Array.Empty<RepositoryInformation>()));\n+ contentObjectService\n+ .SetupGet(c => c.CacheConfiguration)\n+ .Returns(new CacheConfiguration());\n}\nif (symbolPackageUploadService == null)\n@@ -1658,70 +1659,22 @@ public async Task CheckFeatureFlagIsOff()\n}\n[Fact]\n- public async Task CheckABTestIsOff()\n+ public async Task CheckPackageDependentsFeatureFlagIsOff()\n{\nvar id = \"foo\";\nvar cacheKey = \"CacheDependents_\" + id.ToLowerInvariant();\nvar packageService = new Mock<IPackageService>();\n- var abTestService = new Mock<IABTestService>();\n-\n- abTestService\n- .Setup(x => x.IsPackageDependendentsABEnabled(It.IsAny<User>()))\n- .Returns(false);\n+ var featureFlagService = new Mock<IFeatureFlagService>();\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n- abTestService: abTestService);\n-\n- var package = new Package\n- {\n- PackageRegistration = new PackageRegistration()\n- {\n- Id = id,\n- Owners = new List<User>(),\n- },\n- Version = \"2.0.0\",\n- NormalizedVersion = \"2.0.0\",\n- };\n-\n- var packages = new List<Package> { package };\n- packageService\n- .Setup(p => p.FindPackagesById(id, /*includePackageRegistration:*/ true))\n- .Returns(packages);\n- packageService\n- .Setup(p => p.FilterLatestPackage(It.IsAny<IReadOnlyCollection<Package>>(), It.IsAny<int?>(), true))\n- .Returns(package);\n-\n- var result = await controller.DisplayPackage(id, version: null);\n- var model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n-\n- Assert.Null(model.PackageDependents);\n- packageService\n- .Verify(iup => iup.GetPackageDependents(It.IsAny<string>()), Times.Never());\n- Assert.False(model.IsPackageDependentsEnabled);\n- Assert.Empty(_cache);\n- }\n-\n- [Fact]\n- public async Task CheckABTestIsOnAndFeatFlagIsOff()\n- {\n- var id = \"foo\";\n- var cacheKey = \"CacheDependents_\" + id.ToLowerInvariant();\n- var packageService = new Mock<IPackageService>();\n- var abTestService = new Mock<IABTestService>();\n- var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService: featureFlagService);\n- abTestService\n- .Setup(x => x.IsPackageDependendentsABEnabled(It.IsAny<User>()))\n+ featureFlagService\n+ .Setup(x => x.IsPackageDependentsEnabled(It.IsAny<User>()))\n.Returns(false);\n- var controller = CreateController(\n- GetConfigurationService(),\n- packageService: packageService,\n- featureFlagService: featureFlagService,\n- abTestService: abTestService);\n-\nvar package = new Package\n{\nPackageRegistration = new PackageRegistration()\n@@ -1750,8 +1703,6 @@ public async Task CheckABTestIsOnAndFeatFlagIsOff()\nAssert.Null(model.PackageDependents);\npackageService\n.Verify(iup => iup.GetPackageDependents(It.IsAny<string>()), Times.Never());\n- abTestService\n- .Verify(x => x.IsPackageDependendentsABEnabled(It.IsAny<User>()), Times.Never);\nAssert.False(model.IsPackageDependentsEnabled);\nAssert.Empty(_cache);\n}\n@@ -1762,14 +1713,9 @@ public async Task WhenCacheIsOccupiedGetProperPackageDependent()\nvar id = \"foo\";\nvar cacheKey = \"CacheDependents_\" + id.ToLowerInvariant();\nvar packageService = new Mock<IPackageService>();\n- var abTestService = new Mock<IABTestService>();\nvar httpContext = new Mock<HttpContextBase>();\nPackageDependents pd = new PackageDependents();\n- abTestService\n- .Setup(x => x.IsPackageDependendentsABEnabled(It.IsAny<User>()))\n- .Returns(true);\n-\nhttpContext\n.Setup(c => c.Cache)\n.Returns(_cache);\n@@ -1784,7 +1730,6 @@ public async Task WhenCacheIsOccupiedGetProperPackageDependent()\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n- abTestService: abTestService,\nhttpContext: httpContext);\nvar package = new Package\n@@ -1820,7 +1765,6 @@ public async Task OccupyEmptyCache()\nvar id = \"foo\";\nvar cacheKey = \"CacheDependents_\" + id.ToLowerInvariant();\nvar packageService = new Mock<IPackageService>();\n- var abTestService = new Mock<IABTestService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar contentObjectService = new Mock<IContentObjectService>();\n@@ -1830,9 +1774,6 @@ public async Task OccupyEmptyCache()\n};\nPackageDependents pd = new PackageDependents();\n- abTestService\n- .Setup(x => x.IsPackageDependendentsABEnabled(It.IsAny<User>()))\n- .Returns(true);\nhttpContext\n.Setup(c => c.Cache)\n.Returns(_cache);\n@@ -1843,7 +1784,6 @@ public async Task OccupyEmptyCache()\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n- abTestService: abTestService,\ncontentObjectService: contentObjectService,\nhttpContext: httpContext);\n@@ -1889,7 +1829,6 @@ public async Task CheckThatCacheKeyIsNotCaseSensitive()\nvar id2 = \"FOObAr\";\nvar cacheKey = \"CacheDependents_foobar\";\nvar packageService = new Mock<IPackageService>();\n- var abTestService = new Mock<IABTestService>();\nvar contentObjectService = new Mock<IContentObjectService>();\nvar httpContext = new Mock<HttpContextBase>();\n@@ -1902,9 +1841,6 @@ public async Task CheckThatCacheKeyIsNotCaseSensitive()\ncontentObjectService\n.Setup(c => c.CacheConfiguration)\n.Returns(cacheConfiguration);\n- abTestService\n- .Setup(x => x.IsPackageDependendentsABEnabled(It.IsAny<User>()))\n- .Returns(true);\nhttpContext\n.Setup(c => c.Cache)\n.Returns(_cache);\n@@ -1912,7 +1848,6 @@ public async Task CheckThatCacheKeyIsNotCaseSensitive()\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n- abTestService: abTestService,\ncontentObjectService: contentObjectService,\nhttpContext: httpContext);\n@@ -1960,15 +1895,10 @@ public async Task OneSecondCacheTime()\nvar id = \"foo\";\nvar cacheKey = \"CacheDependents_\" + id.ToLowerInvariant();\nvar packageService = new Mock<IPackageService>();\n- var abTestService = new Mock<IABTestService>();\nvar contentObjectService = new Mock<IContentObjectService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar pd = new PackageDependents();\n- abTestService\n- .Setup(x => x.IsPackageDependendentsABEnabled(It.IsAny<User>()))\n- .Returns(true);\n-\nhttpContext\n.Setup(c => c.Cache)\n.Returns(_cache);\n@@ -1985,7 +1915,6 @@ public async Task OneSecondCacheTime()\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n- abTestService: abTestService,\ncontentObjectService: contentObjectService);\nvar package = new Package\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/ABTestEnrollmentFactoryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/ABTestEnrollmentFactoryFacts.cs",
"diff": "@@ -133,9 +133,7 @@ public abstract class Facts\npublic Facts()\n{\nTelemetryService = new Mock<ITelemetryService>();\n- Logger = new Mock<ILogger<ABTestEnrollmentFactory>>();\n-\n- Target = new ABTestEnrollmentFactory(TelemetryService.Object, Logger.Object);\n+ Target = new ABTestEnrollmentFactory(TelemetryService.Object);\n}\npublic Mock<ITelemetryService> TelemetryService { get; }\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove A/B test check for the package dependents feature (#8251)
Address https://github.com/NuGet/NuGetGallery/issues/8250 |
455,772 | 09.10.2020 16:44:01 | 25,200 | 718bd1eae63daee274d1e3d3239ded1450cb1ec8 | Fix accessibility bug in SelectRole, ChangeRole combo boxes labels | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "<input id=\"new-member-textbox\" class=\"form-control\" placeholder=\"Add existing NuGet.org user\" data-bind=\"textInput: NewMemberUsername, submit: AddMember\" aria-label=\"Enter username to add member\" />\n</div>\n<div class=\"col-xs-3\">\n- <select class=\"form-control\" data-bind=\"value: AddMemberRole, options: RoleNames\" aria-label=\"Select new member role\">\n+ <select class=\"form-control\" data-bind=\"value: AddMemberRole, options: RoleNames\" aria-labelledby=\"RoleNames\">\n</select>\n</div>\n<div class=\"text-right col-xs-1\">\n<div class=\"col-xs-3\">\n@if (Model.CanManageMemberships)\n{\n- <select class=\"form-control\" aria-label=\"Change member role\"\n+ <select class=\"form-control\" aria-labelledby=\"OrganizationViewModel.RoleNames\"\ndata-bind=\"value: SelectedRole, options: OrganizationViewModel.RoleNames, event: { change: ToggleIsAdmin }\">\n</select>\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix accessibility bug in SelectRole, ChangeRole combo boxes labels (#8253) |
455,736 | 15.10.2020 15:44:01 | 25,200 | f8ac3470a664f4fb7d21242f2568b8206d903def | Make the ESLint ignore pattern more generic
VS2019 seems to put temporary files in one more place that ESLint now catches | [
{
"change_type": "MODIFY",
"old_path": ".eslintignore",
"new_path": ".eslintignore",
"diff": "#\n# Prepend each file with a globbing '**/' because our official builds run in a complex way that makes it hard to depend\n# on specific relative paths.\n-**/src/NuGetGallery/Scripts/gallery/jquery-3.4.1.js\n-**/src/NuGetGallery/Scripts/gallery/knockout-3.5.1.js\n-**/src/NuGetGallery/Scripts/gallery/moment-2.18.1.js\n+**/Scripts/gallery/jquery-3.4.1.js\n+**/Scripts/gallery/knockout-3.5.1.js\n+**/Scripts/gallery/moment-2.18.1.js\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make the ESLint ignore pattern more generic (#8267)
VS2019 seems to put temporary files in one more place that ESLint now catches |
455,741 | 16.10.2020 22:39:07 | 0 | 6c5db62eaef7a19892b02e9b05795babf1adeaa9 | add underline for banner | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -163,6 +163,7 @@ body h3 {\n}\n.banner a {\ncolor: #23527c;\n+ text-decoration: underline;\n}\n.banner a:hover,\n.banner a:focus {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -213,6 +213,7 @@ body {\na {\ncolor: @link-hover-color;\n+ text-decoration: underline;\n}\na:hover, a:focus {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "<div class=\"row\">\n<div class=\"col-sm-12\">\n<span>\n- 👋 What do you think about NuGet.org? We're looking for feedback from developers like you. <a href=\"https://aka.ms/NuGetSurvey\" target=\"_blank\">Take the survey.</a>\n+ 👋 What do you think about NuGet.org? We're looking for feedback from developers like you. <a href=\"https://aka.ms/NuGetSurvey\" target=\"_blank\">Take the survey.</a>\n</span>\n</div>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | add underline for banner (#8261) |
455,741 | 16.10.2020 23:05:07 | 0 | e56ad756829bfdbfcb194e0c7f4cffe23387053a | Change httpPost to httpGet | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/SupportRequestController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/SupportRequestController.cs",
"diff": "@@ -133,8 +133,7 @@ public async Task<ActionResult> Save(int issueKey, int? assignedToId, int issueS\n}\n}\n- [HttpPost]\n- [ValidateAntiForgeryToken]\n+ [HttpGet]\npublic async Task<ActionResult> Filter(int pageNumber = 1, int take = _defaultTakeCount, int? assignedToId = null, int? issueStatusId = null, string reason = null)\n{\nif (pageNumber <= 0)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -227,9 +227,8 @@ public virtual JsonResult UploadPackageProgress()\nreturn Json(progress, JsonRequestBehavior.AllowGet);\n}\n- [HttpPost]\n+ [HttpGet]\n[UIAuthorize]\n- [ValidateAntiForgeryToken]\n[RequiresAccountConfirmation(\"upload a package\")]\npublic virtual async Task<ActionResult> UploadPackage()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Change httpPost to httpGet (#8269) |
455,741 | 22.10.2020 18:23:38 | 0 | a93c6ba1cb8b8c671ae4602df14d36a73ba55742 | Read status message when command been copied | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<div class=\"copy-button\">\n<button id=\"@packageManager.Id-button\" class=\"btn btn-default btn-warning\" type=\"button\"\ndata-toggle=\"popover\" data-placement=\"bottom\" data-content=\"Copied.\"\n- aria-label=\"@packageManager.CopyLabel\">\n+ aria-label=\"@packageManager.CopyLabel\" aria-live=\"polite\" role=\"status\">\n<span class=\"ms-Icon ms-Icon--Copy\" aria-hidden=\"true\"></span>\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Read status message when command been copied (#8289) |
455,736 | 22.10.2020 17:18:43 | 25,200 | 82de1df904b03a25d849d5fa867c49c29008c404 | Display net5.0 using ToString instead of custom logic
Address
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -243,6 +243,15 @@ public static string ToFriendlyName(this NuGetFramework frameworkName, bool allo\nthrow new ArgumentNullException(nameof(frameworkName));\n}\n+ // Defer to the NuGet client logic for displaying .NET 5 frameworks. This aligns with Visual Studio package\n+ // management UI.\n+ var isNet5Era = frameworkName.Version.Major >= 5\n+ && StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, frameworkName.Framework);\n+ if (isNet5Era)\n+ {\n+ return frameworkName.ToString();\n+ }\n+\nvar sb = new StringBuilder();\nif (String.Equals(frameworkName.Framework, \".NETPortable\", StringComparison.OrdinalIgnoreCase))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ExtensionMethodsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ExtensionMethodsFacts.cs",
"diff": "@@ -14,6 +14,19 @@ public class ExtensionMethodsFacts\npublic class TheToFriendlyNameMethod\n{\n[Theory]\n+ [InlineData(\"net5.0\", \"net5.0\")]\n+ [InlineData(\"net5.0\", \"NET5.0\")]\n+ [InlineData(\"net5.0\", \"net5\")]\n+ [InlineData(\"net5.0\", \"net50\")]\n+ [InlineData(\"net5.0\", \"netcoreapp5.0\")]\n+ [InlineData(\"net5.0\", \"netcoreapp50\")]\n+ [InlineData(\"net5.0-windows\", \"net5.0-windows\")]\n+ [InlineData(\"net5.0-windows9.0\", \"net5.0-windows9\")]\n+ [InlineData(\"net5.0-ios14.0\", \"net5.0-ios14.0\")]\n+ [InlineData(\"net5.0\", \"netcoreapp5.0-windows\")] // See: https://github.com/NuGet/Home/issues/10177\n+ [InlineData(\"net5.0\", \"netcoreapp5.0-windows9\")] // See: https://github.com/NuGet/Home/issues/10177\n+ [InlineData(\"net6.0\", \"net6.0\")]\n+ [InlineData(\"net10.0\", \"net10.0\")]\n[InlineData(\".NETFramework 4.0\", \"net40\")]\n[InlineData(\"Silverlight 4.0\", \"sl40\")]\n[InlineData(\"WindowsPhone 8.0\", \"wp8\")]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Display net5.0 using ToString instead of custom logic (#8291)
Address https://github.com/NuGet/NuGetGallery/issues/8235
Address https://github.com/NuGet/NuGetGallery/issues/8268 |
455,741 | 23.10.2020 21:28:25 | 0 | c6bc4cdf1ae8897e90de04ad5d27779a20ff9136 | update readme to VS2019 | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -9,7 +9,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope\n## Build and Run the Gallery in (arbitrary number) easy steps\n1. Prerequisites:\n- 1. Visual Studio 2017 - Install the following `Workloads`:\n+ 1. Visual Studio 2019 - Install the following `Workloads`:\n* ASP.NET and web development\n* Azure development\n2. PowerShell 4.0\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | update readme to VS2019 (#8293) |
455,741 | 27.10.2020 22:43:08 | 0 | 4ed47e79ddc39adc1583337df875d78fa3ad2790 | rm survey banner | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "</div>\n}\n-<div class=\"container-fluid banner banner-info text-center\">\n- <div class=\"row\">\n- <div class=\"col-sm-12\">\n- <span>\n- 👋 What do you think about NuGet.org? We're looking for feedback from developers like you. <a href=\"https://aka.ms/NuGetSurvey\" target=\"_blank\">Take the survey.</a>\n- </span>\n- </div>\n- </div>\n-</div>\n-\n@helper DisplayNavigationItem(string tab, string url, bool bold = false, string title = null)\n{\n<li class=\"@(ViewBag.Tab == tab ? \"active\" : string.Empty)\" role=\"presentation\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | rm survey banner (#8298) |
455,744 | 28.10.2020 08:46:52 | 25,200 | bfd25d52f245271a32e3bc669f123cd07048fe82 | Enabling word wrapping for tags in all layouts
* Removed dividers between items in ul for package details in search results.
Word wrap for details in search results.
* Word wrap for tags everywhere.
* Blue "more tags" link.
* "More tags" instead of chevron. | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -248,12 +248,11 @@ img.reserved-indicator-icon {\n.package-list {\nmargin-top: 8px;\nmargin-bottom: 8px;\n- margin-left: -5px;\npadding-left: 0;\nline-height: 20px;\ncolor: #666666;\n}\n-.package-list a {\n+.package-list a:not(.more-tags) {\ncolor: #666666;\n}\n.package-list li {\n@@ -263,13 +262,10 @@ img.reserved-indicator-icon {\n@media (min-width: 768px) {\n.package-list li {\ndisplay: inline-block;\n- }\n- .package-list li + li {\n- margin-left: 10px;\n- padding-left: 10px;\n- border-left-style: solid;\n- border-width: 1px;\n- border-color: #dbdbdb;\n+ line-height: 20px;\n+ max-height: 101px;\n+ overflow-y: hidden;\n+ padding-right: 10px;\n}\n}\n.package-title-text {\n@@ -587,16 +583,6 @@ img.reserved-indicator-icon {\ncolor: #000;\nline-height: 20px;\n}\n-@media (min-width: 768px) {\n- .list-packages .package .package-list {\n- white-space: nowrap;\n- overflow: hidden;\n- text-overflow: ellipsis;\n- }\n- .list-packages .package .package-list li {\n- display: inline;\n- }\n-}\n.pager {\nmargin-top: 75px;\nmargin-bottom: 0px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "//== Theme Variables\n@panel-footer-color: @navbar-inverse-color;\n@default-margin-bottom: 24px;\n+@package-list-line-height: 20px;\n//== Theme Definition\nhtml, body {\n@@ -321,12 +322,11 @@ img.reserved-indicator-icon {\n.package-list {\nmargin-top: 8px;\nmargin-bottom: 8px;\n- margin-left: -5px;\npadding-left: 0;\n- line-height: 20px;\n+ line-height: @package-list-line-height;\ncolor: @gray-light;\n- a {\n+ a:not(.more-tags) {\ncolor: @gray-light;\n}\n@@ -338,14 +338,10 @@ img.reserved-indicator-icon {\n@media (min-width: @screen-sm-min) {\nli {\ndisplay: inline-block;\n- }\n-\n- li + li {\n- margin-left: @padding-small-horizontal;\n- padding-left: @padding-small-horizontal;\n- border-left-style: solid;\n- border-width: 1px;\n- border-color: @gray-lighter;\n+ line-height: @package-list-line-height;\n+ max-height: (@package-list-line-height * 5 + 1px);\n+ overflow-y: hidden;\n+ padding-right: @padding-small-horizontal;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-list-packages.less",
"new_path": "src/Bootstrap/less/theme/common-list-packages.less",
"diff": "color: @text-color;\nline-height: 20px;\n}\n-\n-\n- .package-list {\n- @media (min-width: @screen-sm-min) {\n- white-space: nowrap;\n- overflow: hidden;\n- text-overflow: ellipsis;\n-\n- li {\n- display: inline;\n- }\n- }\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "<li class=\"package-tags\">\n<span class=\"icon-text\">\n<i class=\"ms-Icon ms-Icon--Tag\" aria-hidden=\"true\"></i>\n- @foreach (var tag in Model.Tags)\n+ @{\n+ const int firstN = 10;\n+ var tags = Model.Tags.Take(firstN + 1).ToList();\n+ string lastTag = null;\n+ if (tags.Count > firstN)\n+ {\n+ lastTag = tags[firstN - 1];\n+ tags.RemoveRange(firstN - 1, 2);\n+ }\n+ }\n+ @foreach (var tag in tags)\n{\n<a href=\"@Url.Search(\"Tags:\\\"\" + tag + \"\\\"\")\" title=\"Search for @tag\">@tag</a>\n}\n+ @if (lastTag != null)\n+ {\n+ <span class=\"text-nowrap\">\n+ <a href=\"@Url.Search(\"Tags:\\\"\" + lastTag + \"\\\"\")\" title=\"Search for @lastTag\">@lastTag</a>\n+ <a href=\"@Url.Package(Model.Id, Model.UseVersion ? Model.Version : null)\" title=\"View more tags\" class=\"more-tags\">More tags</a>\n+ </span>\n+ }\n</span>\n</li>\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Enabling word wrapping for tags in all layouts (#8274)
* Removed dividers between items in ul for package details in search results.
Word wrap for details in search results.
* Word wrap for tags everywhere.
* Blue "more tags" link.
* "More tags" instead of chevron. |
455,736 | 28.10.2020 09:13:54 | 25,200 | e719a4115ce63be13dce508820d8c0c024c29f7a | Add OData error code for deprecate response messages
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV1FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV1FeedController.cs",
"diff": "using System;\nusing System.Data.Entity;\nusing System.Linq;\n+using System.Net;\nusing System.Net.Http;\nusing System.Threading.Tasks;\nusing System.Web.Http;\nusing System.Web.Http.OData;\n+using System.Web.Http.OData.Extensions;\nusing System.Web.Http.OData.Query;\n+using Microsoft.Data.OData;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.OData;\n@@ -69,7 +72,7 @@ private IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options, bool isN\n{\nif (!isNonHijackEnabled)\n{\n- return BadRequest(Strings.ODataDisabled);\n+ return DeprecatedRequest(Strings.ODataDisabled);\n}\nif (!ODataQueryVerifier.AreODataOptionsAllowed(options, ODataQueryVerifier.V1Packages,\n@@ -235,7 +238,7 @@ public async Task<IHttpActionResult> FindPackagesByIdCount(ODataQueryOptions<V1F\n// non-hijacked queries are disabled, stop here.\nif (!isNonHijackEnabled)\n{\n- return BadRequest(Strings.ODataParametersDisabled);\n+ return DeprecatedRequest(Strings.ODataParametersDisabled);\n}\nif (return404NotFoundWhenNoResults && !packages.Any())\n@@ -372,7 +375,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nif (!isNonHijackEnabled)\n{\n- return BadRequest(Strings.ODataParametersDisabled);\n+ return DeprecatedRequest(Strings.ODataParametersDisabled);\n}\nif (!ODataQueryVerifier.AreODataOptionsAllowed(options, ODataQueryVerifier.V1Search,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"diff": "@@ -167,7 +167,7 @@ public class ODataV2FeedController\nif (!isNonHijackEnabled)\n{\n- return BadRequest(Strings.ODataParametersDisabled);\n+ return DeprecatedRequest(Strings.ODataParametersDisabled);\n}\n// Reject only when try to reach database.\n@@ -389,7 +389,7 @@ public class ODataV2FeedController\n{\nif (!isSimpleLookup)\n{\n- return BadRequest(Strings.ODataParametersDisabled);\n+ return DeprecatedRequest(Strings.ODataParametersDisabled);\n}\ncustomQuery = true;\n@@ -557,7 +557,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nif (!isNonHijackEnabled)\n{\n- return BadRequest(Strings.ODataParametersDisabled);\n+ return DeprecatedRequest(Strings.ODataParametersDisabled);\n}\n//Reject only when try to reach database.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/NuGetODataController.cs",
"new_path": "src/NuGetGallery/OData/NuGetODataController.cs",
"diff": "using System;\nusing System.Linq;\n+using System.Net;\nusing System.Web;\nusing System.Web.Http;\nusing System.Web.Http.OData;\n+using System.Web.Http.OData.Extensions;\nusing System.Web.Http.OData.Query;\n+using System.Web.Http.Results;\nusing Microsoft.Data.OData;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.OData.QueryFilter;\n@@ -63,6 +66,17 @@ protected virtual string GetSiteRoot()\nreturn _configurationService.GetSiteRoot(UseHttps()).TrimEnd('/') + '/';\n}\n+ protected ResponseMessageResult DeprecatedRequest(string message)\n+ {\n+ return ResponseMessage(Request.CreateErrorResponse(\n+ HttpStatusCode.BadRequest,\n+ new ODataError\n+ {\n+ ErrorCode = \"NuGet.V2.Deprecated\",\n+ Message = message,\n+ }));\n+ }\n+\n/// <summary>\n/// Generates a QueryResult.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"diff": "using System.Collections.Generic;\nusing System.IO;\nusing System.Linq;\n+using System.Net;\nusing System.Net.Http;\nusing System.Threading;\nusing System.Threading.Tasks;\nusing System.Web.Http.OData;\nusing System.Web.Http.OData.Builder;\nusing System.Web.Http.OData.Query;\n+using System.Web.Http.Results;\nusing Moq;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Framework;\nusing NuGetGallery.OData;\nusing NuGetGallery.WebApi;\n+using Xunit;\nnamespace NuGetGallery.Controllers\n{\n@@ -49,6 +52,15 @@ protected ODataFeedControllerFactsBase()\nPackagesRepository = packagesRepositoryMock.Object;\n}\n+ protected static async Task VerifyODataDeprecation(IHttpActionResult resultSet, string message)\n+ {\n+ var result = Assert.IsType<ResponseMessageResult>(resultSet);\n+ Assert.Equal(HttpStatusCode.BadRequest, result.Response.StatusCode);\n+ var content = await result.Response.Content.ReadAsStringAsync();\n+ Assert.Contains(\"NuGet.V2.Deprecated\", content);\n+ Assert.Contains(message, content);\n+ }\n+\nprotected abstract TController CreateController(\nIReadOnlyEntityRepository<Package> packagesRepository,\nIEntityRepository<Package> readWritePackagesRepository,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"diff": "using NuGetGallery.OData;\nusing Moq;\nusing Xunit;\n+using System.Net;\n+using System.Web.Http;\nnamespace NuGetGallery.Controllers\n{\n@@ -42,7 +44,7 @@ public void Get_ReturnsBadRequestWhenOrderByInvalidColumn()\n}\n[Fact]\n- public void GetAll_ReturnsBadRequestWhenGetAllIsDisabled()\n+ public async Task GetAll_ReturnsBadRequestWhenGetAllIsDisabled()\n{\n// Arrange\nvar featureFlagService = new Mock<IFeatureFlagService>();\n@@ -55,12 +57,12 @@ public void GetAll_ReturnsBadRequestWhenGetAllIsDisabled()\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataDisabled);\nfeatureFlagService.Verify(x => x.IsODataV1GetAllEnabled());\n}\n[Fact]\n- public void GetAllCount_ReturnsBadRequestWhenGetAllIsDisabled()\n+ public async Task GetAllCount_ReturnsBadRequestWhenGetAllIsDisabled()\n{\n// Arrange\nvar featureFlagService = new Mock<IFeatureFlagService>();\n@@ -73,7 +75,7 @@ public void GetAllCount_ReturnsBadRequestWhenGetAllIsDisabled()\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataDisabled);\nfeatureFlagService.Verify(x => x.IsODataV1GetAllCountEnabled());\n}\n@@ -91,7 +93,7 @@ public async Task GetSpecific_ReturnsBadRequestNonHijackedIsDisabledAndQueryCann\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV1GetSpecificNonHijackedEnabled());\n}\n@@ -134,7 +136,7 @@ public async Task FindPackagesById_ReturnsBadRequestNonHijackedIsDisabledAndQuer\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV1FindPackagesByIdNonHijackedEnabled());\n}\n@@ -152,7 +154,7 @@ public async Task FindPackagesByIdCount_ReturnsBadRequestNonHijackedIsDisabledAn\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV1FindPackagesByIdCountNonHijackedEnabled());\n}\n@@ -195,7 +197,7 @@ public async Task Search_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeH\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV1SearchNonHijackedEnabled());\n}\n@@ -213,7 +215,7 @@ public async Task SearchCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCann\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV1SearchCountNonHijackedEnabled());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"diff": "@@ -73,7 +73,7 @@ public async Task GetAll_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeH\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV2GetAllNonHijackedEnabled());\n}\n@@ -91,7 +91,7 @@ public async Task GetAllCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCann\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV2GetAllCountNonHijackedEnabled());\n}\n@@ -109,7 +109,7 @@ public async Task GetSpecific_ReturnsBadRequestNonHijackedIsDisabledAndQueryCann\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV2GetSpecificNonHijackedEnabled());\n}\n@@ -168,7 +168,7 @@ public async Task FindPackagesById_ReturnsBadRequestNonHijackedIsDisabledAndQuer\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV2FindPackagesByIdNonHijackedEnabled());\n}\n@@ -186,7 +186,7 @@ public async Task FindPackagesByIdCount_ReturnsBadRequestNonHijackedIsDisabledAn\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV2FindPackagesByIdCountNonHijackedEnabled());\n}\n@@ -249,7 +249,7 @@ public async Task Search_ReturnsBadRequestNonHijackedIsDisabledAndQueryCannotBeH\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV2SearchNonHijackedEnabled());\n}\n@@ -267,7 +267,7 @@ public async Task SearchCount_ReturnsBadRequestNonHijackedIsDisabledAndQueryCann\nfeatureFlagService);\n// Assert\n- Assert.IsType<BadRequestErrorMessageResult>(resultSet);\n+ await VerifyODataDeprecation(resultSet, Strings.ODataParametersDisabled);\nfeatureFlagService.Verify(x => x.IsODataV2SearchCountNonHijackedEnabled());\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add OData error code for deprecate response messages (#8297)
Address https://github.com/NuGet/NuGetGallery/issues/8296 |
455,744 | 29.10.2020 16:05:52 | 25,200 | 44838059dd51a0badcbf59ce8586a0d53619e500 | Adding AF token to account management page. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"diff": "ViewBag.MdPageColumns = GalleryConstants.ColumnsFormMd;\nTempData[\"Parent\"] = this;\n}\[email protected](Html)\n<section role=\"main\" class=\"container main-container page-account-settings\">\n<div class=\"row\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Adding AF token to account management page. (#8303) |
455,737 | 02.11.2020 15:03:59 | 28,800 | 96ee321f95144eb1f0b72a8d4733f07299f9c828 | Narrow smallest width by a small amount globally | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -221,8 +221,8 @@ h3 a:active {\n}\n@media screen and (max-width: 768px) {\n.container {\n- width: -webkit-calc(100vw - 15px);\n- width: calc(100vw - 15px);\n+ width: -webkit-calc(100vw - 20px);\n+ width: calc(100vw - 20px);\n}\n.navbar-toggle {\nmargin-right: 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -290,7 +290,8 @@ h2, h3 {\n// their overflow properties will not work properly because they are not bound by the size of the container.\n// To fix this, we need to set the container width to be the width of the viewport minus the row margin on xs screens.\n// This way, those elements that are larger than the viewport are properly bound by the size of the container and overflow properly.\n- width: calc(100vw - 15px);\n+ // 2020.10.27: We actually need to set it slightly smaller than the row margin as a horizontal scrollbar appears at xs when exactly matched.\n+ width: calc(100vw - 20px);\n}\n.navbar-toggle {\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Narrow smallest width by a small amount globally (#8300) |
455,744 | 02.11.2020 15:43:19 | 28,800 | 151e1071fb2021af5154c3dab91d4cd469e62b99 | Not using Task.Result in async context. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"new_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"diff": "@@ -26,9 +26,9 @@ public SqlAggregateStatsService(IAppConfiguration configuration, ISqlConnectionF\n_connectionFactory = galleryDbConnectionFactory;\n}\n- public Task<AggregateStats> GetAggregateStats()\n+ public async Task<AggregateStats> GetAggregateStats()\n{\n- var connection = Task.Run(() => _connectionFactory.CreateAsync()).Result;\n+ var connection = await _connectionFactory.CreateAsync();\nusing (var dbContext = new EntitiesContext(connection, readOnly: true)) // true - set readonly but it is ignored anyway, as this class doesn't call EntitiesContext.SaveChanges()\n{\nvar database = dbContext.Database;\n@@ -41,15 +41,15 @@ public Task<AggregateStats> GetAggregateStats()\nbool hasData = reader.Read();\nif (!hasData)\n{\n- return Task.FromResult(new AggregateStats());\n+ return new AggregateStats();\n}\n- return Task.FromResult(new AggregateStats\n+ return new AggregateStats\n{\nDownloads = reader.IsDBNull(0) ? 0 : reader.GetInt32(0),\nUniquePackages = reader.IsDBNull(1) ? 0 : reader.GetInt32(1),\nTotalPackages = reader.IsDBNull(2) ? 0 : reader.GetInt32(2)\n- });\n+ };\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Not using Task.Result in async context. (#8307) |
455,744 | 09.11.2020 10:08:17 | 28,800 | ed4fa1407f53e12ced045fd4aa46191faceb3ffb | Dropping the narration completely for absent signature and deprecation columns. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n@if (Model.IsCertificatesUIEnabled)\n{\n- <th aria-label=\"Signature Information\" abbr=\"Signature Information\"></th>\n+ <th aria-hidden=\"true\" abbr=\"Signature Information\"></th>\n}\n@if (Model.IsPackageDeprecationEnabled)\n{\n- <th aria-label=\"Deprecation Information\" abbr=\"Deprecation Information\"></th>\n+ <th aria-hidden=\"true\" abbr=\"Deprecation Information\"></th>\n}\n</tr>\n</thead>\n{\nif (string.IsNullOrEmpty(packageVersion.SignatureInformation))\n{\n- <td class=\"package-icon-cell\" aria-label=\"No signature\"></td>\n+ <td class=\"package-icon-cell\" aria-hidden=\"true\"></td>\n}\nelse\n{\n{\nif (packageVersion.DeprecationStatus == PackageDeprecationStatus.NotDeprecated)\n{\n- <td class=\"package-icon-cell\" aria-label=\"Not deprecated\"></td>\n+ <td class=\"package-icon-cell\" aria-hidden=\"true\"></td>\n}\nelse\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Dropping the narration completely for absent signature and deprecation columns. (#8309) |
455,744 | 09.11.2020 10:09:14 | 28,800 | f28a1ebd88b3cfc9bec37cffcebd55fff851b049 | Removed unused localIP member of CloudAuditingService. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"diff": "@@ -22,19 +22,15 @@ public class CloudAuditingService : AuditingService, ICloudStorageStatusDependen\npublic static readonly string DefaultContainerName = \"auditing\";\nprivate CloudBlobContainer _auditContainer;\n- private string _instanceId;\n- private string _localIP;\nprivate Func<Task<AuditActor>> _getOnBehalfOf;\n- public CloudAuditingService(string instanceId, string localIP, string storageConnectionString, bool readAccessGeoRedundant, Func<Task<AuditActor>> getOnBehalfOf)\n- : this(instanceId, localIP, GetContainer(storageConnectionString, readAccessGeoRedundant), getOnBehalfOf)\n+ public CloudAuditingService(string storageConnectionString, bool readAccessGeoRedundant, Func<Task<AuditActor>> getOnBehalfOf)\n+ : this(GetContainer(storageConnectionString, readAccessGeoRedundant), getOnBehalfOf)\n{\n}\n- public CloudAuditingService(string instanceId, string localIP, CloudBlobContainer auditContainer, Func<Task<AuditActor>> getOnBehalfOf)\n+ public CloudAuditingService(CloudBlobContainer auditContainer, Func<Task<AuditActor>> getOnBehalfOf)\n{\n- _instanceId = instanceId;\n- _localIP = localIP;\n_auditContainer = auditContainer;\n_getOnBehalfOf = getOnBehalfOf;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -1404,11 +1404,7 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC\nprivate static IAuditingService GetAuditingServiceForAzureStorage(ContainerBuilder builder, IGalleryConfigurationService configuration)\n{\n- string instanceId = HostMachine.Name;\n-\n- var localIp = AuditActor.GetLocalIpAddressAsync().Result;\n-\n- var service = new CloudAuditingService(instanceId, localIp, configuration.Current.AzureStorage_Auditing_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant, AuditActor.GetAspNetOnBehalfOfAsync);\n+ var service = new CloudAuditingService(configuration.Current.AzureStorage_Auditing_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant, AuditActor.GetAspNetOnBehalfOfAsync);\nbuilder.RegisterInstance(service)\n.As<ICloudStorageStatusDependency>()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/CloudAuditingServiceTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/CloudAuditingServiceTests.cs",
"diff": "@@ -18,7 +18,7 @@ public void CloudAuditServiceObfuscateAuditRecord()\n{\n// Arrange\nCloudBlobContainer nullBlobContainer = null;\n- var service = new CloudAuditingService(\"id\", \"1.1.1.1\", nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);\n+ var service = new CloudAuditingService(nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);\nAuditActor onBehalfOf = new AuditActor(\"machineName\", \"3.3.3.3\", \"userName1\", \"NoAuthentication\", \"someKey\", DateTime.Now, null);\nAuditActor auditActor = new AuditActor(\"machineName\", \"2.2.2.2\", \"userName1\", \"NoAuthentication\", \"someKey\", DateTime.Now, onBehalfOf);\n@@ -57,7 +57,7 @@ public void OnlyPackageAuditRecordsWillBeSaved(AuditRecord record, bool expected\n{\n// Arrange\nCloudBlobContainer nullBlobContainer = null;\n- var service = new CloudAuditingService(\"id\", \"1.1.1.1\", nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);\n+ var service = new CloudAuditingService(nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);\n// Act + Assert\nAssert.Equal<bool>(expectedResult, service.RecordWillBePersisted(record));\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Removed unused localIP member of CloudAuditingService. (#8306) |
455,756 | 10.11.2020 14:44:22 | 28,800 | 400781f115a7e3d041e78d5e2778c6fa686a065e | Just break word | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "</thead>\n<tbody data-bind=\"foreach: $data.certificates\">\n<tr class=\"manage-certificate-listing\" role=\"listitem\">\n- <td><samp class=\"small-fingerprint\" data-bind=\"text: Thumbprint\"></samp></td>\n+ <td><samp class=\"small-fingerprint break-word\" data-bind=\"text: Thumbprint\"></samp></td>\n<td data-bind=\"text: ShortSubject, attr: { title: Subject }\"></td>\n<td data-bind=\"text: ExpirationDisplay, attr: {\ntitle: IsExpired ? 'This certificate\\'s expiration date is in the past. Future packages signed with this certificate will fail validation. Upload a renewed certificate to enable signed package uploads.' : ExpirationIso,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Just break word (#8310) |
455,736 | 13.11.2020 12:13:51 | 28,800 | fd7fe136828f2e3b6e0b756f08d1c260cd729dc1 | Add restricted API for soft deleting packages
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -40,6 +40,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string PackageRenamesFeatureName = GalleryPrefix + \"PackageRenames\";\nprivate const string EmbeddedReadmeFlightName = GalleryPrefix + \"EmbeddedReadmes\";\nprivate const string LicenseMdRenderingFlightName = GalleryPrefix + \"LicenseMdRendering\";\n+ private const string DeletePackageApiFlightName = GalleryPrefix + \"DeletePackageApi\";\nprivate const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllNonHijacked\";\nprivate const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllCountNonHijacked\";\n@@ -284,5 +285,10 @@ public bool IsODataV2SearchCountNonHijackedEnabled()\n{\nreturn _client.IsEnabled(ODataV2SearchCountNonHijackedFeatureName, defaultValue: true);\n}\n+\n+ public bool IsDeletePackageApiEnabled(User user)\n+ {\n+ return _client.IsEnabled(DeletePackageApiFlightName, user, defaultValue: false);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -225,5 +225,10 @@ public interface IFeatureFlagService\n/// Whether the /Search()/$count endpoint is enabled for non-hijacked queries for the V2 OData API.\n/// </summary>\nbool IsODataV2SearchCountNonHijackedEnabled();\n+\n+ /// <summary>\n+ /// Whether or not the user can delete a package through the API.\n+ /// </summary>\n+ bool IsDeletePackageApiEnabled(User user);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"SiteAdmins\": false,\n\"Accounts\": [],\n\"Domains\": []\n+ },\n+ \"NuGetGallery.DeletePackageApi\": {\n+ \"All\": false,\n+ \"SiteAdmins\": false,\n+ \"Accounts\": [],\n+ \"Domains\": []\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "using NuGetGallery.Authentication;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Filters;\n+using NuGetGallery.Helpers;\nusing NuGetGallery.Infrastructure.Authentication;\nusing NuGetGallery.Infrastructure.Mail.Messages;\nusing NuGetGallery.Packaging;\n@@ -37,6 +38,7 @@ public partial class ApiController\n: AppController\n{\nprivate const string NuGetExeUrl = \"https://dist.nuget.org/win-x86-commandline/v2.8.6/nuget.exe\";\n+ private const string PackageDeleteApiReason = \"Deleted via API\";\nprivate readonly IAutocompletePackageIdsQuery _autocompletePackageIdsQuery;\nprivate readonly IAutocompletePackageVersionsQuery _autocompletePackageVersionsQuery;\n@@ -861,7 +863,7 @@ private static ActionResult BadRequestForExceptionMessage(Exception ex)\n[ApiAuthorize]\n[ApiScopeRequired(NuGetScopes.PackageUnlist)]\n[ActionName(\"DeletePackageApi\")]\n- public virtual async Task<ActionResult> DeletePackage(string id, string version)\n+ public virtual async Task<ActionResult> DeletePackage(string id, string version, DeletePackageApiRequest request = null)\n{\nvar package = PackageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null)\n@@ -870,7 +872,8 @@ public virtual async Task<ActionResult> DeletePackage(string id, string version)\nHttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n}\n- // Check if the current user's scopes allow listing/unlisting the current package ID\n+ // Check if the current user's scopes allow listing/unlisting the current package ID. This scope is used for\n+ // both unlisting and soft deletion.\nvar apiScopeEvaluationResult = EvaluateApiScope(ActionsRequiringPermissions.UnlistOrRelistPackage, package.PackageRegistration, NuGetScopes.PackageUnlist);\nif (!apiScopeEvaluationResult.IsSuccessful())\n{\n@@ -884,7 +887,55 @@ public virtual async Task<ActionResult> DeletePackage(string id, string version)\nstring.Format(CultureInfo.CurrentCulture, Strings.PackageIsLocked, package.PackageRegistration.Id));\n}\n+ var currentUser = GetCurrentUser();\n+ DeletePackageAction action;\n+ if (request?.Type == null)\n+ {\n+ action = DeletePackageAction.Unlist;\n+ }\n+ else if (!request.TryParseAction(out action))\n+ {\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.BadRequest, Strings.DeletePackage_InvalidDeleteType);\n+ }\n+\n+ switch (action)\n+ {\n+ case DeletePackageAction.Unlist:\nawait PackageUpdateService.MarkPackageUnlistedAsync(package);\n+ break;\n+\n+ case DeletePackageAction.SoftDelete:\n+ // A user can only delete packages if there are enabled in the flight and are NOT an admin. The\n+ // admin restriction is for safety reasons. This endpoint is currently intended just for test data\n+ // clean-up which can be done with a very limited, non-admin API key.\n+ if (!FeatureFlagService.IsDeletePackageApiEnabled(currentUser)\n+ || currentUser.IsAdministrator)\n+ {\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.Forbidden, Strings.DeletePackage_NotAllowed);\n+ }\n+\n+ // Apply a hard stop on the deletion if there are too many downloads on this package version. We\n+ // using configuration here and use a constant to mimize the risk of misconfiguration allowing too\n+ // many deletes.\n+ const int downloadCountLimit = 1000;\n+ if (package.DownloadCount >= downloadCountLimit)\n+ {\n+ return new HttpStatusCodeWithBodyResult(\n+ HttpStatusCode.Forbidden,\n+ string.Format(CultureInfo.CurrentCulture, Strings.DeletePackage_TooManyDownloads, downloadCountLimit));\n+ }\n+\n+ await PackageDeleteService.SoftDeletePackagesAsync(\n+ new[] { package },\n+ currentUser,\n+ PackageDeleteApiReason,\n+ Strings.AutomatedPackageDeleteSignature);\n+ break;\n+\n+ default:\n+ throw new NotSupportedException($\"The delete package action '{action}' is not supported.\");\n+ }\n+\nreturn new EmptyResult();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<DependentUpon>202007220027197_AddEmbeddedReadmeTypeColumn.cs</DependentUpon>\n</Compile>\n<Compile Include=\"Modules\\CookieComplianceHttpModule.cs\" />\n+ <Compile Include=\"RequestModels\\DeletePackagesApiRequest.cs\" />\n<Compile Include=\"Services\\IMarkdownService.cs\" />\n<Compile Include=\"Services\\IPackageMetadataValidationService.cs\" />\n<Compile Include=\"Services\\MarkdownService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -775,6 +775,33 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The provided Type in the delete request is not valid..\n+ /// </summary>\n+ public static string DeletePackage_InvalidDeleteType {\n+ get {\n+ return ResourceManager.GetString(\"DeletePackage_InvalidDeleteType\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to Deleting a package through the API is not enabled for your user account..\n+ /// </summary>\n+ public static string DeletePackage_NotAllowed {\n+ get {\n+ return ResourceManager.GetString(\"DeletePackage_NotAllowed\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to The provided package has more than {0} downloads and therefore cannot be deleted via API..\n+ /// </summary>\n+ public static string DeletePackage_TooManyDownloads {\n+ get {\n+ return ResourceManager.GetString(\"DeletePackage_TooManyDownloads\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to A package cannot be the alternate package of itself..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1199,4 +1199,14 @@ The {1} Team</value>\n<data name=\"UploadPackage_LearnMore_LicenseUrlDreprecation\" xml:space=\"preserve\">\n<value>Learn more about license URL deprecation</value>\n</data>\n+ <data name=\"DeletePackage_NotAllowed\" xml:space=\"preserve\">\n+ <value>Deleting a package through the API is not enabled for your user account.</value>\n+ </data>\n+ <data name=\"DeletePackage_InvalidDeleteType\" xml:space=\"preserve\">\n+ <value>The provided Type in the delete request is not valid.</value>\n+ </data>\n+ <data name=\"DeletePackage_TooManyDownloads\" xml:space=\"preserve\">\n+ <value>The provided package has more than {0} downloads and therefore cannot be deleted via API.</value>\n+ <comment>{0} is the download count limit.</comment>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -58,6 +58,7 @@ internal class TestableApiController\npublic Mock<IPackageDeleteService> MockPackageDeleteService { get; set; }\npublic Mock<ISymbolPackageFileService> MockSymbolPackageFileService { get; set; }\npublic Mock<ISymbolPackageUploadService> MockSymbolPackageUploadService { get; set; }\n+ public Mock<IFeatureFlagService> MockFeatureFlagService { get; set; }\nprivate Stream PackageFromInputStream { get; set; }\n@@ -85,6 +86,7 @@ internal class TestableApiController\nPackageUploadService = (MockPackageUploadService = new Mock<IPackageUploadService>()).Object;\nPackageDeleteService = (MockPackageDeleteService = new Mock<IPackageDeleteService>()).Object;\nSymbolPackageUploadService = (MockSymbolPackageUploadService = new Mock<ISymbolPackageUploadService>()).Object;\n+ FeatureFlagService = (MockFeatureFlagService = new Mock<IFeatureFlagService>()).Object;\nSetupApiScopeEvaluatorOnAllInputs();\n@@ -1692,6 +1694,23 @@ public async Task WillNotUnlistThePackageIfScopesInvalid(ApiScopeEvaluationResul\n[Fact]\npublic async Task WillUnlistThePackage()\n+ {\n+ await VerifyUnlist(request: null);\n+ }\n+\n+ [Fact]\n+ public async Task WillUnlistThePackageWithExplicitRequestModel()\n+ {\n+ await VerifyUnlist(new DeletePackageApiRequest { Type = \"Unlist\" });\n+ }\n+\n+ [Fact]\n+ public async Task WillUnlistThePackageWithDefaultAction()\n+ {\n+ await VerifyUnlist(new DeletePackageApiRequest());\n+ }\n+\n+ private async Task VerifyUnlist(DeletePackageApiRequest request)\n{\nvar fakes = Get<Fakes>();\nvar currentUser = fakes.User;\n@@ -1707,7 +1726,7 @@ public async Task WillUnlistThePackage()\ncontroller.SetCurrentUser(currentUser);\n- ResultAssert.IsEmpty(await controller.DeletePackage(id, \"1.0.42\"));\n+ ResultAssert.IsEmpty(await controller.DeletePackage(id, \"1.0.42\", request));\ncontroller.MockPackageUpdateService.Verify(x => x.MarkPackageUnlistedAsync(package, true, true));\n@@ -1720,6 +1739,168 @@ public async Task WillUnlistThePackage()\nNuGetScopes.PackageUnlist));\n}\n+ [Fact]\n+ public async Task WillSoftDeleteThePackageWithSoftDeleteAction()\n+ {\n+ var fakes = Get<Fakes>();\n+ var currentUser = fakes.User;\n+\n+ var id = \"theId\";\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration { Id = id }\n+ };\n+\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(package);\n+ controller.SetCurrentUser(currentUser);\n+ controller.MockFeatureFlagService\n+ .Setup(x => x.IsDeletePackageApiEnabled(currentUser))\n+ .Returns(true)\n+ .Verifiable();\n+\n+ ResultAssert.IsEmpty(await controller.DeletePackage(\n+ id,\n+ \"1.0.42\",\n+ new DeletePackageApiRequest { Type = \"SoftDelete\" }));\n+\n+ controller.MockPackageDeleteService.Verify(x => x.SoftDeletePackagesAsync(\n+ It.Is<IEnumerable<Package>>(p => p.Single() == package),\n+ currentUser,\n+ \"Deleted via API\",\n+ \"(automated)\"));\n+\n+ controller.MockApiScopeEvaluator\n+ .Verify(x => x.Evaluate(\n+ currentUser,\n+ It.IsAny<IEnumerable<Scope>>(),\n+ ActionsRequiringPermissions.UnlistOrRelistPackage,\n+ package.PackageRegistration,\n+ NuGetScopes.PackageUnlist));\n+ }\n+\n+ [Fact]\n+ public async Task WillRejectSoftDeleteWhenTheFlightIsDisabledForTheUser()\n+ {\n+ var fakes = Get<Fakes>();\n+ var currentUser = fakes.User;\n+\n+ var id = \"theId\";\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration { Id = id }\n+ };\n+\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(package);\n+ controller.SetCurrentUser(currentUser);\n+ controller.MockFeatureFlagService\n+ .Setup(x => x.IsDeletePackageApiEnabled(currentUser))\n+ .Returns(false)\n+ .Verifiable();\n+\n+ var result = await controller.DeletePackage(\n+ id,\n+ \"1.0.42\",\n+ new DeletePackageApiRequest { Type = \"SoftDelete\" });\n+\n+ var statusCodeResult = result as HttpStatusCodeWithBodyResult;\n+\n+ Assert.NotNull(statusCodeResult);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, statusCodeResult.StatusCode);\n+ Assert.Contains(Strings.DeletePackage_NotAllowed, statusCodeResult.StatusDescription);\n+\n+ controller.MockPackageDeleteService.Verify(\n+ x => x.SoftDeletePackagesAsync(\n+ It.IsAny<IEnumerable<Package>>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>()),\n+ Times.Never);\n+ }\n+\n+ [Fact]\n+ public async Task WillRejectSoftDeleteWhenTheUserIsAnAdmin()\n+ {\n+ var fakes = Get<Fakes>();\n+ var currentUser = fakes.User;\n+ currentUser.Roles.Add(new Role { Name = Constants.AdminRoleName });\n+\n+ var id = \"theId\";\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration { Id = id }\n+ };\n+\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(package);\n+ controller.SetCurrentUser(currentUser);\n+ controller.MockFeatureFlagService\n+ .Setup(x => x.IsDeletePackageApiEnabled(currentUser))\n+ .Returns(true)\n+ .Verifiable();\n+\n+ var result = await controller.DeletePackage(\n+ id,\n+ \"1.0.42\",\n+ new DeletePackageApiRequest { Type = \"SoftDelete\" });\n+\n+ var statusCodeResult = result as HttpStatusCodeWithBodyResult;\n+\n+ Assert.NotNull(statusCodeResult);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, statusCodeResult.StatusCode);\n+ Assert.Contains(Strings.DeletePackage_NotAllowed, statusCodeResult.StatusDescription);\n+\n+ controller.MockPackageDeleteService.Verify(\n+ x => x.SoftDeletePackagesAsync(\n+ It.IsAny<IEnumerable<Package>>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>()),\n+ Times.Never);\n+ }\n+\n+ [Fact]\n+ public async Task WillRejectSoftDeleteIfThePackageHasTooManyDownloads()\n+ {\n+ var fakes = Get<Fakes>();\n+ var currentUser = fakes.User;\n+\n+ var id = \"theId\";\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration { Id = id },\n+ DownloadCount = 1001,\n+ };\n+\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(package);\n+ controller.SetCurrentUser(currentUser);\n+ controller.MockFeatureFlagService\n+ .Setup(x => x.IsDeletePackageApiEnabled(currentUser))\n+ .Returns(true)\n+ .Verifiable();\n+\n+ var result = await controller.DeletePackage(\n+ id,\n+ \"1.0.42\",\n+ new DeletePackageApiRequest { Type = \"SoftDelete\" });\n+\n+ var statusCodeResult = result as HttpStatusCodeWithBodyResult;\n+\n+ Assert.NotNull(statusCodeResult);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, statusCodeResult.StatusCode);\n+ Assert.Contains(string.Format(CultureInfo.CurrentCulture, Strings.DeletePackage_TooManyDownloads, 1000), statusCodeResult.StatusDescription);\n+\n+ controller.MockPackageDeleteService.Verify(\n+ x => x.SoftDeletePackagesAsync(\n+ It.IsAny<IEnumerable<Package>>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>()),\n+ Times.Never);\n+ }\n+\n[Fact]\npublic async Task WillNotUnlistThePackageIfItIsLocked()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add restricted API for soft deleting packages (#8290)
Address https://github.com/NuGet/Engineering/issues/3512 |
455,736 | 13.11.2020 17:30:53 | 28,800 | cf7178e2f94523c3c436efa019f34beafc059832 | Switch to NuGetTestData for static test packages
Progress on | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Constants.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Constants.cs",
"diff": "@@ -32,14 +32,13 @@ public static class Constants\npublic const string StatsPageDefaultText = \"Statistics last updated\";\npublic const string ContactOwnersText = \"Your message has been sent to the owners of\";\npublic const string UnListedPackageText = \"This package is unlisted and hidden from package listings\";\n- public const string TestAccount = \"NugetTestAccount\";\n+ public const string TestDataAccount = \"NuGetTestData\";\npublic const string TestPackageId = \"BaseTestPackage\";\npublic const string TestPackageIdDotNetTool = \"BaseTestPackage.DotnetTool\";\npublic const string TestPackageIdARandomType = \"BaseTestPackage.ARandomType\";\npublic const string TestPackageIdTemplate = \"BaseTestPackage.Template\";\npublic const string TestPackageIdWithPrereleases = \"BaseTestPackage.SearchFilters\";\npublic const string TestPackageIdNoStable = \"BaseTestPackage.NoStable\";\n- public const string TestOrganizationCollaboratorPackageId = \"BaseTestOrganizationCollaboratorPackage\";\npublic const string ReadOnlyModeError = \"Error 503 - Read-only Mode\";\npublic const string UploadFailureMessage = \"The package upload via Nuget.exe didnt succeed properly. Check the logs to see the process error and output stream\";\npublic const string PackageInstallFailureMessage = \"Package install failed. Either the file is not present on disk or it is corrupted. Check logs for details\";\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageRetrieval/PackageListTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageRetrieval/PackageListTests.cs",
"diff": "@@ -38,7 +38,7 @@ public PackageListTests(ITestOutputHelper testOutputHelper) : base(testOutputHel\nvar sortByParam = string.IsNullOrEmpty(sortBy) ? string.Empty : $\"&sortBy={sortBy}\";\nvar feedUrl = new Uri(\nnew Uri(UrlHelper.BaseUrl),\n- $\"/packages?testData=true&q=owner%3A{Constants.TestAccount}{sortByParam}\");\n+ $\"/packages?testData=true&q=owner%3A{Constants.TestDataAccount}{sortByParam}\");\n// Act\nusing (var httpClient = new HttpClient())\n@@ -65,7 +65,7 @@ public async Task MakeSureLastUpdatedSortingWorks(string sortBy)\nvar sortByParam = string.IsNullOrEmpty(sortBy) ? string.Empty : $\"&sortBy={sortBy}\";\nvar feedUrl = new Uri(\nnew Uri(UrlHelper.BaseUrl),\n- $\"/packages?testData=true&q=owner%3A{Constants.TestAccount}{sortByParam}\");\n+ $\"/packages?testData=true&q=owner%3A{Constants.TestDataAccount}{sortByParam}\");\n// Act\nusing (var httpClient = new HttpClient())\n@@ -97,7 +97,7 @@ public async Task MakeSureLastUpdatedSortingWorks(string sortBy)\nvar packageTypeParam = string.IsNullOrEmpty(packageType) ? string.Empty : $\"&packageType={packageType}\";\nvar feedUrl = new Uri(\nnew Uri(UrlHelper.BaseUrl),\n- $\"/packages?testData=true&q=packageid%3A{Uri.EscapeUriString(id)}+owner%3A{Constants.TestAccount}{packageTypeParam}\");\n+ $\"/packages?testData=true&q=packageid%3A{Uri.EscapeUriString(id)}+owner%3A{Constants.TestDataAccount}{packageTypeParam}\");\n// Act\nusing (var httpClient = new HttpClient())\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Switch to NuGetTestData for static test packages (#8324)
Progress on https://github.com/NuGet/Engineering/issues/3513 |
455,736 | 23.11.2020 11:20:23 | 28,800 | efc81b03eb676da4d1ec27dca8ef4ab2106a3d16 | Move to new build tools | [
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -10,7 +10,7 @@ param (\n[string]$PackageSuffix,\n[string]$Branch,\n[string]$CommitSHA,\n- [string]$BuildBranch = '2b78092c53527212b9cef813ef248e14ec11079d',\n+ [string]$BuildBranch = '948e06b7e5dc320eccd1f44a15a5faeb60384ed6',\n[string]$VerifyMicrosoftPackageVersion = $null\n)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Move to new build tools (#8331) |
455,741 | 23.11.2020 14:56:41 | 28,800 | 72b70b518fbc895583df5754943229a4c29d6fce | Only allowed one scroll bar when zooming in | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1950,6 +1950,9 @@ img.reserved-indicator-icon {\n.page-status .ms-Icon--Cancel {\ncolor: red;\n}\n+.page-status .table {\n+ word-break: break-word;\n+}\n.page-status .table thead th:nth-child(1) {\nwidth: 50%;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap.css",
"new_path": "src/Bootstrap/dist/css/bootstrap.css",
"diff": "@@ -1584,6 +1584,7 @@ th {\n.table {\nwidth: 100%;\nmax-width: 100%;\n+ min-width: 290px;\nmargin-bottom: 22px;\n}\n.table > thead > tr > th,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/tables.less",
"new_path": "src/Bootstrap/less/tables.less",
"diff": "@@ -45,6 +45,7 @@ th {\n.table {\nwidth: 100%;\nmax-width: 100%;\n+ min-width: 290px;\nmargin-bottom: @line-height-computed;\n// Cells\n> thead,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-status.less",
"new_path": "src/Bootstrap/less/theme/page-status.less",
"diff": "}\n.table {\n+ word-break: break-word;\n+\nthead {\nth:nth-child(1) {\nwidth: 50%;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Only allowed one scroll bar when zooming in (#8330) |
455,737 | 01.12.2020 19:23:16 | 28,800 | a70b396a3f488f72901c30882dbaa031e9940ee2 | Enable scrollbar on cert table only. | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -245,6 +245,9 @@ img.reserved-indicator-icon {\nmargin-left: auto;\nmargin-right: auto;\n}\n+.table-container {\n+ overflow-x: auto;\n+}\n.package-list {\nmargin-top: 8px;\nmargin-bottom: 8px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -320,6 +320,10 @@ img.reserved-indicator-icon {\nmargin-right: auto;\n}\n+.table-container {\n+ overflow-x: auto;\n+}\n+\n.package-list {\nmargin-top: 8px;\nmargin-bottom: 8px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "<div data-bind=\"if: $data && $data.hasCertificates && $data.hasCertificates()\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n+ <div class=\"table-container\">\n<table class=\"table\" role=\"list\">\n<thead>\n<tr class=\"manage-certificate-headings\">\n</tr>\n</tbody>\n</table>\n-\n+ </div>\n<p>\nThe SHA-256 fingerprint can be found by calculating the SHA-256 hash of the DER encoded\ncertificate file (.cer). The fingerprint should be hex-encoded. This can be done with a variety\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Enable scrollbar on cert table only. (#8340) |
455,736 | 08.12.2020 18:46:36 | 28,800 | e724d7fbb9ca507066bc972e1c2f199a4ff45c56 | Update minClientVersion to 5.9.0 to support new client version
Related to | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/GalleryConstants.cs",
"new_path": "src/NuGetGallery/GalleryConstants.cs",
"diff": "@@ -27,7 +27,7 @@ public static class GalleryConstants\npublic const int GravatarCacheDurationSeconds = 300;\npublic const int MaxEmailSubjectLength = 255;\n- internal static readonly NuGetVersion MaxSupportedMinClientVersion = new NuGetVersion(\"5.8.0.0\");\n+ internal static readonly NuGetVersion MaxSupportedMinClientVersion = new NuGetVersion(\"5.9.0.0\");\npublic const string PackageFileDownloadUriTemplate = \"packages/{0}/{1}/download\";\npublic const string ReadMeFileSavePathTemplateActive = \"active/{0}/{1}{2}\";\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update minClientVersion to 5.9.0 to support new client version (#8348)
Related to https://github.com/NuGet/NuGet.Services.Index/pull/178 |
455,736 | 10.12.2020 09:54:54 | 28,800 | e53e62343775db2bb65bc8b14d6488d870a576c5 | [Hotfix] Add missing resource
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Remove=\"Services\\CorePackageFileService.cs\" />\n</ItemGroup>\n+ <ItemGroup>\n+ <None Remove=\"Infrastructure\\MigrateUserToOrganization.sql\" />\n+ </ItemGroup>\n+\n+ <ItemGroup>\n+ <EmbeddedResource Include=\"Infrastructure\\MigrateUserToOrganization.sql\" />\n+ </ItemGroup>\n+\n<ItemGroup>\n<PackageReference Include=\"NuGet.Packaging\">\n<Version>5.8.0</Version>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [Hotfix] Add missing resource (#8350)
Address https://github.com/NuGet/NuGetGallery/issues/8344 |
455,741 | 20.01.2021 22:34:48 | 28,800 | 320e81fb2f5a1cf1b3870466891c158759b5a6b3 | read out warning message | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"diff": "@ViewHelpers.AlertDanger(@<text>At least one version must be selected.</text>)\n</div>\n<div data-bind=\"visible: chosenItemsConflictWarning\">\n- @ViewHelpers.AlertWarning(@<text><span data-bind=\"text: chosenItemsConflictWarning\"></span></text>)\n+ @ViewHelpers.AlertWarning(@<text><span data-bind=\"text: chosenItemsConflictWarning\"></span></text>, true)\n</div>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | read out warning message (#8382) |
455,754 | 22.01.2021 12:51:17 | -36,000 | 35ca7d764a8f72c2478992901b092444c13b7941 | Add icons to project to ensure bundling | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Content\\gallery\\img\\facebook.svg\" />\n<Content Include=\"Content\\gallery\\img\\git-32x32.png\" />\n<Content Include=\"Content\\gallery\\img\\git.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\fuget-32x32.png\" />\n+ <Content Include=\"Content\\gallery\\img\\fuget.svg\" />\n<Content Include=\"Content\\gallery\\img\\github-32x32.png\" />\n<Content Include=\"Content\\gallery\\img\\github.svg\" />\n<Content Include=\"Content\\gallery\\img\\logo-footer-184x57.png\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@ViewHelpers.ImageFallback(Url.Absolute(\"~/Content/gallery/img/fuget-32x32.png\")) />\n<a href=\"@Model.FuGetUrl\" data-track=\"outbound-repository-url\"\naria-label=\"open in fuget.org explorer\"\n- title=\"Explore additional package info on fuget.org\" rel=\"nofollow\" target=\"_blank\">\n+ title=\"Explore additional package info on fuget.org\" rel=\"nofollow\">\nOpen in FuGet Package Explorer\n</a>\n</li>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add icons to project to ensure bundling (#8385) |
455,736 | 26.01.2021 16:03:37 | 28,800 | 60349e70ad637e5d830360efb586f09285175d65 | Add build extensions to GalleryTools | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "</PropertyGroup>\n<Import Project=\"$(SignPath)\\sign.targets\" Condition=\"Exists('$(SignPath)\\sign.targets')\" />\n<Import Project=\"$(SignPath)\\sign.microbuild.targets\" Condition=\"Exists('$(SignPath)\\sign.microbuild.targets')\" />\n+ <Import Project=\"$(NuGetBuildExtensions)\" Condition=\"'$(NuGetBuildExtensions)' != '' And Exists('$(NuGetBuildExtensions)')\" />\n</Project>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add build extensions to GalleryTools (#8399) |
455,744 | 26.01.2021 16:25:04 | 28,800 | 105573148aa23f8471fe59ff41be65ff78855661 | Removing Cristina from CODEOWNERS | [
{
"change_type": "MODIFY",
"old_path": ".github/CODEOWNERS",
"new_path": ".github/CODEOWNERS",
"diff": "# the repo. Unless a later match takes precedence,\n# review when someone opens a pull request.\n# For more on how to customize the CODEOWNERS file - https://help.github.com/en/articles/about-code-owners\n-* @agr @cristinamanum @dannyjdev @drewgillies @joelverhagen @loic-sharma @lyndaidaii @ryuyu @skofman1 @shishirx34 @xavierdecoster @zhhyu\n+* @agr @dannyjdev @drewgillies @joelverhagen @loic-sharma @lyndaidaii @ryuyu @skofman1 @shishirx34 @xavierdecoster @zhhyu\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Removing Cristina from CODEOWNERS (#8398) |
455,736 | 03.02.2021 11:55:13 | 28,800 | b53e19646f9c112f62945c0d6057f5e479c9474b | Use throw instead of throw ex to preserve call stack | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -528,7 +528,7 @@ public virtual async Task<ActionResult> CreateSymbolPackagePutAsync()\n{\nex.Log();\nTelemetryService.TrackSymbolPackagePushFailureEvent(id, normalizedVersion);\n- throw ex;\n+ throw;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -2426,8 +2426,9 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n}\ncatch (Exception ex)\n{\n+ ex.Log();\n_telemetryService.TrackPackagePushFailureEvent(id: null, version: null);\n- throw ex;\n+ throw;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "@@ -264,17 +264,24 @@ public async Task<PackageCommitResult> CommitPackageAsync(Package package, Strea\npackage.NormalizedVersion);\n}\n- return ReturnConflictOrThrow(ex);\n+ if (IsConflict(ex))\n+ {\n+ return PackageCommitResult.Conflict;\n+ }\n+ else\n+ {\n+ throw;\n+ }\n}\nreturn PackageCommitResult.Success;\n}\n- private PackageCommitResult ReturnConflictOrThrow(Exception ex)\n+ private bool IsConflict(Exception ex)\n{\nif (ex is DbUpdateConcurrencyException concurrencyEx)\n{\n- return PackageCommitResult.Conflict;\n+ return true;\n}\nelse if (ex is DbUpdateException dbUpdateEx)\n{\n@@ -287,13 +294,13 @@ private PackageCommitResult ReturnConflictOrThrow(Exception ex)\ncase 547: // Constraint check violation\ncase 2601: // Duplicated key row error\ncase 2627: // Unique constraint error\n- return PackageCommitResult.Conflict;\n+ return true;\n}\n}\n}\n}\n- throw ex;\n+ return false;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/SymbolPackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/SymbolPackageUploadService.cs",
"diff": "@@ -241,7 +241,7 @@ public async Task<PackageCommitResult> CreateAndUploadSymbolsPackage(Package pac\npackage.Version);\n}\n- throw ex;\n+ throw;\n}\n}\ncatch (FileAlreadyExistsException ex)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/SearchPolicyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/SearchPolicyFacts.cs",
"diff": "@@ -479,7 +479,7 @@ public async Task<HttpResponseMessage> GetAsync(Uri uri)\ncatch (Exception ex)\n{\n_logger.LogError(0, ex, \"[{Type}] EXCEPTION\", nameof(TestSearchHttpClient));\n- throw ex;\n+ throw;\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Use throw instead of throw ex to preserve call stack (#8410) |
455,736 | 26.01.2021 23:23:39 | 0 | 990e0feeecd873f577f2baeb8b98542d9b85124e | Add a command to GalleryTools for batch reserving namespaces | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "<Compile Include=\"Commands\\BackfillRepositoryMetadataCommand.cs\" />\n<Compile Include=\"Commands\\HashCommand.cs\" />\n<Compile Include=\"Commands\\ApplyTenantPolicyCommand.cs\" />\n+ <Compile Include=\"Commands\\ReserveNamespacesCommand.cs\" />\n<Compile Include=\"Commands\\ReflowCommand.cs\" />\n<Compile Include=\"Commands\\UpdateIsLatestCommand.cs\" />\n<Compile Include=\"Commands\\VerifyApiKeyCommand.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Program.cs",
"new_path": "src/GalleryTools/Program.cs",
"diff": "@@ -21,6 +21,7 @@ public static int Main(params string[] args)\ncommandLineApplication.Command(\"filldevdeps\", BackfillDevelopmentDependencyCommand.Configure);\ncommandLineApplication.Command(\"verifyapikey\", VerifyApiKeyCommand.Configure);\ncommandLineApplication.Command(\"updateIsLatest\", UpdateIsLatestCommand.Configure);\n+ commandLineApplication.Command(\"reservenamespaces\", ReserveNamespacesCommand.Configure);\ntry\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add a command to GalleryTools for batch reserving namespaces |
455,736 | 26.01.2021 14:18:00 | 28,800 | daf4172808271743864dfc698d17237a6f9374ff | Add specific error message for reservations with no owner | [
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/Gallery/ThrowingTelemetryService.cs",
"new_path": "src/GitHubVulnerabilities2Db/Gallery/ThrowingTelemetryService.cs",
"diff": "@@ -256,6 +256,11 @@ public void TrackPackagePushNamespaceConflictEvent(string packageId, string pack\nthrow new NotImplementedException();\n}\n+ public void TrackPackagePushOwnerlessNamespaceConflictEvent(string packageId, string packageVersion, User user, IIdentity identity)\n+ {\n+ throw new NotImplementedException();\n+ }\n+\npublic void TrackPackageReadMeChangeEvent(Package package, string readMeSourceType, PackageEditReadMeState readMeState)\n{\nthrow new NotImplementedException();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Permissions/ActionRequiringReservedNamespacePermissions.cs",
"new_path": "src/NuGetGallery.Services/Permissions/ActionRequiringReservedNamespacePermissions.cs",
"diff": "@@ -57,9 +57,21 @@ protected override PermissionsCheckResult CheckPermissionsForEntity(User account\nreturn PermissionsCheckResult.Allowed;\n}\n+ var hasAnyOwners = reservedNamespaces.Any(rn => rn.Owners.Any());\n+\n// Permissions on only a single namespace are required to perform the action.\n- return reservedNamespaces.Any(rn => PermissionsHelpers.IsRequirementSatisfied(ReservedNamespacePermissionsRequirement, account, rn)) ?\n- PermissionsCheckResult.Allowed : PermissionsCheckResult.ReservedNamespaceFailure;\n+ if (reservedNamespaces.Any(rn => PermissionsHelpers.IsRequirementSatisfied(ReservedNamespacePermissionsRequirement, account, rn)))\n+ {\n+ return PermissionsCheckResult.Allowed;\n+ }\n+ else if (hasAnyOwners)\n+ {\n+ return PermissionsCheckResult.ReservedNamespaceFailure;\n+ }\n+ else\n+ {\n+ return PermissionsCheckResult.OwnerlessReservedNamespaceFailure;\n+ }\n}\npublic PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, ActionOnNewPackageContext newPackageContext)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Permissions/PermissionsCheckResult.cs",
"new_path": "src/NuGetGallery.Services/Permissions/PermissionsCheckResult.cs",
"diff": "@@ -31,6 +31,12 @@ public enum PermissionsCheckResult\n/// <summary>\n/// The current user does not have permissions to perform the action on the <see cref=\"ReservedNamespace\"/> on behalf of another <see cref=\"User\"/>.\n/// </summary>\n- ReservedNamespaceFailure\n+ ReservedNamespaceFailure,\n+\n+ /// <summary>\n+ /// The current user does not have permissions to perform the action on the <see cref=\"ReservedNamespace\"/> on behalf of another <see cref=\"User\"/>\n+ /// but none of the namespaces currently have owners.\n+ /// </summary>\n+ OwnerlessReservedNamespaceFailure,\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Telemetry/ITelemetryService.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/ITelemetryService.cs",
"diff": "@@ -61,6 +61,8 @@ public interface ITelemetryService\nvoid TrackPackagePushNamespaceConflictEvent(string packageId, string packageVersion, User user, IIdentity identity);\n+ void TrackPackagePushOwnerlessNamespaceConflictEvent(string packageId, string packageVersion, User user, IIdentity identity);\n+\nvoid TrackVerifyPackageKeyEvent(string packageId, string packageVersion, User user, IIdentity identity, int statusCode);\nvoid TrackNewUserRegistrationEvent(User user, Credential identity);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Telemetry/TelemetryService.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/TelemetryService.cs",
"diff": "@@ -28,6 +28,7 @@ public class Events\npublic const string VerifyPackageKey = \"VerifyPackageKey\";\npublic const string PackageReadMeChanged = \"PackageReadMeChanged\";\npublic const string PackagePushNamespaceConflict = \"PackagePushNamespaceConflict\";\n+ public const string PackagePushOwnerlessNamespaceConflict = \"PackagePushOwnerlessNamespaceConflict\";\npublic const string NewUserRegistration = \"NewUserRegistration\";\npublic const string CredentialAdded = \"CredentialAdded\";\npublic const string CredentialUsed = \"CredentialUsed\";\n@@ -364,6 +365,11 @@ public void TrackPackagePushNamespaceConflictEvent(string packageId, string pack\nTrackMetricForPackage(Events.PackagePushNamespaceConflict, packageId, packageVersion, user, identity);\n}\n+ public void TrackPackagePushOwnerlessNamespaceConflictEvent(string packageId, string packageVersion, User user, IIdentity identity)\n+ {\n+ TrackMetricForPackage(Events.PackagePushOwnerlessNamespaceConflict, packageId, packageVersion, user, identity);\n+ }\n+\npublic void TrackCreatePackageVerificationKeyEvent(string packageId, string packageVersion, User user, IIdentity identity)\n{\nTrackMetricForPackage(Events.CreatePackageVerificationKey, packageId, packageVersion, user, identity);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -1195,6 +1195,11 @@ private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluationHe\nTelemetryService.TrackPackagePushNamespaceConflictEvent(id, versionString, GetCurrentUser(), User.Identity);\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.Conflict, Strings.UploadPackage_IdNamespaceConflict);\n}\n+ else if (result.PermissionsCheckResult == PermissionsCheckResult.OwnerlessReservedNamespaceFailure)\n+ {\n+ TelemetryService.TrackPackagePushOwnerlessNamespaceConflictEvent(id, versionString, GetCurrentUser(), User.Identity);\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.Conflict, Strings.UploadPackage_OwnerlessIdNamespaceConflict);\n+ }\nvar message = result.PermissionsCheckResult == PermissionsCheckResult.Allowed && !result.IsOwnerConfirmed ?\nStrings.ApiKeyOwnerUnconfirmed : Strings.ApiKeyNotAuthorized;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -507,15 +507,29 @@ private async Task<JsonResult> UploadPackageInternal(PackageArchiveReader packag\nvar id = nuspec.GetId();\nexistingPackageRegistration = _packageService.FindPackageRegistrationById(id);\n// For a new package id verify if the user is allowed to use it.\n- if (existingPackageRegistration == null &&\n- ActionsRequiringPermissions.UploadNewPackageId.CheckPermissionsOnBehalfOfAnyAccount(\n- currentUser, new ActionOnNewPackageContext(id, _reservedNamespaceService), out accountsAllowedOnBehalfOf) != PermissionsCheckResult.Allowed)\n+ if (existingPackageRegistration == null)\n+ {\n+ var result = ActionsRequiringPermissions.UploadNewPackageId.CheckPermissionsOnBehalfOfAnyAccount(\n+ currentUser,\n+ new ActionOnNewPackageContext(id, _reservedNamespaceService),\n+ out accountsAllowedOnBehalfOf);\n+\n+ if (result == PermissionsCheckResult.ReservedNamespaceFailure)\n{\nvar version = nuspec.GetVersion().ToNormalizedString();\n_telemetryService.TrackPackagePushNamespaceConflictEvent(id, version, currentUser, User.Identity);\n-\n- return Json(HttpStatusCode.Conflict, new[] {\n- new JsonValidationMessage(string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict)) });\n+ return Json(HttpStatusCode.Conflict, new[] { new JsonValidationMessage(Strings.UploadPackage_IdNamespaceConflict) });\n+ }\n+ else if (result == PermissionsCheckResult.OwnerlessReservedNamespaceFailure)\n+ {\n+ var version = nuspec.GetVersion().ToNormalizedString();\n+ _telemetryService.TrackPackagePushOwnerlessNamespaceConflictEvent(id, version, currentUser, User.Identity);\n+ return Json(HttpStatusCode.Conflict, new[] { new JsonValidationMessage(new OwnerlessNamespaceIdConflictMessage()) });\n+ }\n+ else if (result != PermissionsCheckResult.Allowed)\n+ {\n+ throw new InvalidOperationException($\"When checking if a new package ID can be created, result '{result}' is not expected.\");\n+ }\n}\n// For existing package id verify if it is owned by the current user\n@@ -2577,9 +2591,13 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n// The owner specified in the form is not allowed to push to a reserved namespace matching the new ID\nvar version = packageVersion.ToNormalizedString();\n_telemetryService.TrackPackagePushNamespaceConflictEvent(packageId, version, currentUser, User.Identity);\n-\n- var message = string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict);\n- return Json(HttpStatusCode.Conflict, new[] { new JsonValidationMessage(message) });\n+ return Json(HttpStatusCode.Conflict, new[] { new JsonValidationMessage(Strings.UploadPackage_IdNamespaceConflict) });\n+ }\n+ else if (checkPermissionsOfUploadNewId == PermissionsCheckResult.OwnerlessReservedNamespaceFailure)\n+ {\n+ var version = packageVersion.ToNormalizedString();\n+ _telemetryService.TrackPackagePushOwnerlessNamespaceConflictEvent(packageId, version, currentUser, User.Identity);\n+ return Json(HttpStatusCode.Conflict, new[] { new JsonValidationMessage(new OwnerlessNamespaceIdConflictMessage()) });\n}\n// An unknown error occurred.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\IPackageVulnerabilitiesService.cs\" />\n<Compile Include=\"Services\\IPackageMetadataValidationService.cs\" />\n<Compile Include=\"Services\\MarkdownService.cs\" />\n+ <Compile Include=\"Services\\OwnerlessNamespaceIdConflictMessage.cs\" />\n<Compile Include=\"Services\\PackageVulnerabilitiesService.cs\" />\n<Compile Include=\"Services\\PackageMetadataValidationService.cs\" />\n<Compile Include=\"Services\\ConfigurationIconFileProvider.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -2777,6 +2777,24 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package ID is reserved. You can upload your package with a different package ID. Reach out to [email protected] if you have questions..\n+ /// </summary>\n+ public static string UploadPackage_OwnerlessIdNamespaceConflict {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_OwnerlessIdNamespaceConflict\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to The package ID is reserved. You can upload your package with a different package ID. Reach out to <a href="mailto:[email protected]">[email protected]</a> if you have questions..\n+ /// </summary>\n+ public static string UploadPackage_OwnerlessIdNamespaceConflictHtml {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_OwnerlessIdNamespaceConflictHtml\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The package contains one or more duplicated files in the same folder..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1209,4 +1209,10 @@ The {1} Team</value>\n<value>The provided package has more than {0} downloads and therefore cannot be deleted via API.</value>\n<comment>{0} is the download count limit.</comment>\n</data>\n+ <data name=\"UploadPackage_OwnerlessIdNamespaceConflict\" xml:space=\"preserve\">\n+ <value>The package ID is reserved. You can upload your package with a different package ID. Reach out to [email protected] if you have questions.</value>\n+ </data>\n+ <data name=\"UploadPackage_OwnerlessIdNamespaceConflictHtml\" xml:space=\"preserve\">\n+ <value>The package ID is reserved. You can upload your package with a different package ID. Reach out to <a href=\"mailto:[email protected]\">[email protected]</a> if you have questions.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyMicrosoftPackage/Fakes/FakeTelemetryService.cs",
"new_path": "src/VerifyMicrosoftPackage/Fakes/FakeTelemetryService.cs",
"diff": "@@ -253,6 +253,11 @@ public void TrackPackagePushNamespaceConflictEvent(string packageId, string pack\nthrow new NotImplementedException();\n}\n+ public void TrackPackagePushOwnerlessNamespaceConflictEvent(string packageId, string packageVersion, User user, IIdentity identity)\n+ {\n+ throw new NotImplementedException();\n+ }\n+\npublic void TrackPackageReadMeChangeEvent(Package package, string readMeSourceType, PackageEditReadMeState readMeState)\n{\nthrow new NotImplementedException();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -222,9 +222,24 @@ public static IEnumerable<object[]> InvalidScopes_Data\ncontinue;\n}\n- var isReservedNamespaceConflict = result == PermissionsCheckResult.ReservedNamespaceFailure;\n- var statusCode = isReservedNamespaceConflict ? HttpStatusCode.Conflict : HttpStatusCode.Forbidden;\n- var description = isReservedNamespaceConflict ? Strings.UploadPackage_IdNamespaceConflict : Strings.ApiKeyNotAuthorized;\n+ HttpStatusCode statusCode;\n+ string description;\n+ if (result == PermissionsCheckResult.ReservedNamespaceFailure)\n+ {\n+ statusCode = HttpStatusCode.Conflict;\n+ description = Strings.UploadPackage_IdNamespaceConflict;\n+ }\n+ else if (result == PermissionsCheckResult.OwnerlessReservedNamespaceFailure)\n+ {\n+ statusCode = HttpStatusCode.Conflict;\n+ description = Strings.UploadPackage_OwnerlessIdNamespaceConflict;\n+ }\n+ else\n+ {\n+ statusCode = HttpStatusCode.Forbidden;\n+ description = Strings.ApiKeyNotAuthorized;\n+ }\n+\nyield return MemberDataHelper.AsData(new ApiScopeEvaluationResult(null, result, scopesAreValid: true), statusCode, description);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -6505,7 +6505,7 @@ public async Task WillShowTheViewWithErrorsWhenThePackageIdIsAlreadyBeingUsed(Us\nAssert.Equal(String.Format(Strings.PackageIdNotAvailable, \"theId\"), (result.Data as JsonValidationMessage[])[0].PlainTextMessage);\n}\n- public static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageIdMatchesUnownedNamespace_Data\n+ public static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageIdIsBlockedByReservedNamespace_Data\n{\nget\n{\n@@ -6516,8 +6516,8 @@ public static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageIdMat\n}\n[Theory]\n- [MemberData(nameof(WillShowTheViewWithErrorsWhenThePackageIdMatchesUnownedNamespace_Data))]\n- public async Task WillShowTheViewWithErrorsWhenThePackageIdMatchesUnownedNamespace(User currentUser, User reservedNamespaceOwner)\n+ [MemberData(nameof(WillShowTheViewWithErrorsWhenThePackageIdIsBlockedByReservedNamespace_Data))]\n+ public async Task WillShowTheViewWithErrorsWhenThePackageIdMatchesOwnedByOtherUserNamespace(User currentUser, User reservedNamespaceOwner)\n{\nvar fakeUploadedFile = new Mock<HttpPostedFileBase>();\nfakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n@@ -6552,7 +6552,8 @@ public async Task WillShowTheViewWithErrorsWhenThePackageIdMatchesUnownedNamespa\nvar result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;\nAssert.NotNull(result);\n- Assert.Equal(String.Format(Strings.UploadPackage_IdNamespaceConflict), (result.Data as JsonValidationMessage[])[0].PlainTextMessage);\n+ Assert.Equal(Strings.UploadPackage_IdNamespaceConflict, (result.Data as JsonValidationMessage[])[0].PlainTextMessage);\n+ Assert.Null((result.Data as JsonValidationMessage[])[0].RawHtmlMessage);\nfakeTelemetryService.Verify(\nx => x.TrackPackagePushNamespaceConflictEvent(\nIt.IsAny<string>(),\n@@ -6562,6 +6563,54 @@ public async Task WillShowTheViewWithErrorsWhenThePackageIdMatchesUnownedNamespa\nTimes.Once);\n}\n+ [Theory]\n+ [MemberData(nameof(WillShowTheViewWithErrorsWhenThePackageIdIsBlockedByReservedNamespace_Data))]\n+ public async Task WillShowTheViewWithErrorsWhenThePackageIdMatchesUnownedNamespace(User currentUser, User reservedNamespaceOwner)\n+ {\n+ var fakeUploadedFile = new Mock<HttpPostedFileBase>();\n+ fakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n+ Stream fakeFileStream = TestPackage.CreateTestPackageStream(\"Random.Package1\", \"1.0.0\");\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(currentUser.Key)).Returns(Task.FromResult(0));\n+ fakeUploadFileService.SetupSequence(x => x.GetUploadFileAsync(currentUser.Key))\n+ .Returns(Task.FromResult<Stream>(null))\n+ .Returns(Task.FromResult(fakeFileStream));\n+\n+ var fakePackageService = new Mock<IPackageService>();\n+ fakePackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(() => null);\n+\n+ var fakeReservedNamespaceService = new Mock<IReservedNamespaceService>();\n+ fakeReservedNamespaceService\n+ .Setup(r => r.GetReservedNamespacesForId(It.IsAny<string>()))\n+ .Returns(new[] { new ReservedNamespace() });\n+\n+ var fakeTelemetryService = new Mock<ITelemetryService>();\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ uploadFileService: fakeUploadFileService,\n+ packageService: fakePackageService,\n+ fakeNuGetPackage: fakeFileStream,\n+ reservedNamespaceService: fakeReservedNamespaceService,\n+ telemetryService: fakeTelemetryService);\n+ controller.SetCurrentUser(currentUser);\n+\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;\n+\n+ Assert.NotNull(result);\n+ Assert.Null((result.Data as JsonValidationMessage[])[0].PlainTextMessage);\n+ Assert.Equal(Strings.UploadPackage_OwnerlessIdNamespaceConflictHtml, (result.Data as JsonValidationMessage[])[0].RawHtmlMessage);\n+ fakeTelemetryService.Verify(\n+ x => x.TrackPackagePushOwnerlessNamespaceConflictEvent(\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ currentUser,\n+ controller.OwinContext.Request.User.Identity),\n+ Times.Once);\n+ }\n+\npublic static IEnumerable<object[]> WillUploadThePackageWhenIdMatchesOwnedNamespace_Data\n{\nget\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"diff": "@@ -803,13 +803,13 @@ public async Task DeletingOwnerFromMultipleOwnedNamespaceDoesNotMarkPackagesUnVe\npublic class TheShouldMarkNewPackageVerifiedMethod\n{\n[Theory]\n- [InlineData(\"Microsoft.Aspnet\")]\n- [InlineData(\"microsoft.aspnet\")]\n- [InlineData(\"Microsoft.Aspnet.Newpackage\")]\n- [InlineData(\"microsoft.aspnet.newpackage\")]\n- [InlineData(\"jquery\")]\n- [InlineData(\"jQuery\")]\n- public void NonOwnedNamespacesRejectPush(string id)\n+ [InlineData(\"Microsoft.Aspnet\", PermissionsCheckResult.ReservedNamespaceFailure)]\n+ [InlineData(\"microsoft.aspnet\", PermissionsCheckResult.ReservedNamespaceFailure)]\n+ [InlineData(\"Microsoft.Aspnet.Newpackage\", PermissionsCheckResult.ReservedNamespaceFailure)]\n+ [InlineData(\"microsoft.aspnet.newpackage\", PermissionsCheckResult.ReservedNamespaceFailure)]\n+ [InlineData(\"jquery\", PermissionsCheckResult.OwnerlessReservedNamespaceFailure)]\n+ [InlineData(\"jQuery\", PermissionsCheckResult.OwnerlessReservedNamespaceFailure)]\n+ public void NonOwnedNamespacesRejectPush(string id, PermissionsCheckResult expected)\n{\nvar testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();\nvar prefix = \"microsoft.\";\n@@ -823,7 +823,24 @@ public void NonOwnedNamespacesRejectPush(string id)\nvar isPushAllowed = ActionsRequiringPermissions.UploadNewPackageId.CheckPermissions(lastUser, lastUser, new ActionOnNewPackageContext(id, service));\nvar shouldMarkNewPackageVerified = service.ShouldMarkNewPackageIdVerified(lastUser, id, out var matchingNamespaces);\nAssert.Empty(matchingNamespaces);\n- Assert.Equal(PermissionsCheckResult.ReservedNamespaceFailure, isPushAllowed);\n+ Assert.Equal(expected, isPushAllowed);\n+ }\n+\n+ [Fact]\n+ public void OwnerlessNamespacesRejectPush()\n+ {\n+ var id = \"microsoft.myown\";\n+ var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();\n+ var prefix = \"microsoft.\";\n+ var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));\n+ var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();\n+ var user = testUsers.Last();\n+ var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);\n+\n+ var isPushAllowed = ActionsRequiringPermissions.UploadNewPackageId.CheckPermissions(user, user, new ActionOnNewPackageContext(id, service));\n+ var shouldMarkNewPackageVerified = service.ShouldMarkNewPackageIdVerified(user, id, out var matchingNamespaces);\n+ Assert.Empty(matchingNamespaces);\n+ Assert.Equal(PermissionsCheckResult.OwnerlessReservedNamespaceFailure, isPushAllowed);\n}\n[Theory]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -152,6 +152,10 @@ public static IEnumerable<object[]> TrackMetricNames_Data\n(TrackAction)(s => s.TrackPackagePushNamespaceConflictEvent(fakes.Package.Id, package.Version, fakes.User, identity))\n};\n+ yield return new object[] { \"PackagePushOwnerlessNamespaceConflict\",\n+ (TrackAction)(s => s.TrackPackagePushOwnerlessNamespaceConflictEvent(fakes.Package.Id, package.Version, fakes.User, identity))\n+ };\n+\nyield return new object[] { \"NewUserRegistration\",\n(TrackAction)(s => s.TrackNewUserRegistrationEvent(fakes.User, fakes.User.Credentials.First()))\n};\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add specific error message for reservations with no owner |
455,736 | 05.02.2021 02:22:37 | 0 | 2b105ec47c88a9b9546df9abe965a301c7868313 | Add --unreserve option for rollback
If something goes wrong, this will allow us to rollback the bulk reservations. | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/ReserveNamespacesCommand.cs",
"new_path": "src/GalleryTools/Commands/ReserveNamespacesCommand.cs",
"diff": "@@ -36,15 +36,21 @@ public static void Configure(CommandLineApplication config)\n$\"The duration in seconds to sleep between each reservation (default: 0).\",\nCommandOptionType.SingleValue);\n+ var unreserveOption = config.Option(\n+ \"-u | --unreserve\",\n+ $\"Unreserve namespaces, instead of reserving them. Meant for a rollback of bulk reserving. Note that you must clear the progress file to reuse the same input file.\",\n+ CommandOptionType.NoValue);\n+\nconfig.OnExecute(() =>\n{\n- return ExecuteAsync(pathOptions, sleepDurationOption).GetAwaiter().GetResult();\n+ return ExecuteAsync(pathOptions, sleepDurationOption, unreserveOption).GetAwaiter().GetResult();\n});\n}\nprivate static async Task<int> ExecuteAsync(\nCommandOption pathOption,\n- CommandOption sleepDurationOption)\n+ CommandOption sleepDurationOption,\n+ CommandOption unreserveOption)\n{\nif (!pathOption.HasValue())\n{\n@@ -64,9 +70,12 @@ public static void Configure(CommandLineApplication config)\n}\n}\n+ var unreserve = unreserveOption.HasValue();\n+\nvar path = pathOption.Value();\nvar completedPath = path + \".progress\";\nvar remainingList = GetRemainingList(path, completedPath);\n+ Console.WriteLine($\"{remainingList.Count} reserved namespaces(s) to {(unreserve ? \"remove\" : \"add\")}.\");\nif (!remainingList.Any())\n{\nConsole.WriteLine(\"No namespaces were found to reserve.\");\n@@ -82,12 +91,26 @@ public static void Configure(CommandLineApplication config)\nvar totalCounter = 0;\nforeach (var reservedNamespace in remainingList)\n{\n- Console.Write($\"Reserving '{reservedNamespace.Value}' IsPrefix = {reservedNamespace.IsPrefix}...\");\n+ Console.Write($\"{(unreserve ? \"Removing\" : \"Adding\")} '{reservedNamespace.Value}' IsPrefix = {reservedNamespace.IsPrefix}...\");\ntry\n{\nvar matching = service\n.FindReservedNamespacesForPrefixList(new[] { reservedNamespace.Value })\n.SingleOrDefault(x => ReservedNamespaceComparer.Instance.Equals(x, reservedNamespace));\n+\n+ if (unreserve)\n+ {\n+ if (matching == null)\n+ {\n+ Console.WriteLine(\" does not exist.\");\n+ AppendReservedNamespace(completedPath, reservedNamespace);\n+ continue;\n+ }\n+\n+ await service.DeleteReservedNamespaceAsync(reservedNamespace.Value);\n+ }\n+ else\n+ {\nif (matching != null)\n{\nConsole.WriteLine(\" already exists.\");\n@@ -96,6 +119,8 @@ public static void Configure(CommandLineApplication config)\n}\nawait service.AddReservedNamespaceAsync(reservedNamespace);\n+ }\n+\nAppendReservedNamespace(completedPath, reservedNamespace);\ntotalCounter++;\nConsole.WriteLine(\" done.\");\n@@ -113,7 +138,7 @@ public static void Configure(CommandLineApplication config)\n}\n}\n- Console.WriteLine($\"All done. Added {totalCounter} reserved namespace(s).\");\n+ Console.WriteLine($\"All done. {(unreserve ? \"Removed\" : \"Added\")} {totalCounter} reserved namespace(s).\");\nreturn 0;\n}\n@@ -135,7 +160,6 @@ private static List<ReservedNamespace> GetRemainingList(string path, string comp\n{\nConsole.WriteLine($\"{all.Count - remaining.Count} reserved namespaces(s) are already done.\");\n}\n- Console.WriteLine($\"{remaining.Count} reserved namespaces(s) to add.\");\nreturn remaining;\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add --unreserve option for rollback
If something goes wrong, this will allow us to rollback the bulk reservations. |
455,736 | 09.02.2021 14:54:33 | 28,800 | 25713159a61d63fa3f14ef95d01d0fc36d44e7be | Address PR comments in ReserveNamespacesCommand | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/ReserveNamespacesCommand.cs",
"new_path": "src/GalleryTools/Commands/ReserveNamespacesCommand.cs",
"diff": "@@ -18,7 +18,7 @@ namespace GalleryTools.Commands\n{\npublic static class ReserveNamespacesCommand\n{\n- private const int DefaultSleep = 0;\n+ private const int DefaultSleepSeconds = 0;\nprivate const string PathOption = \"--path\";\npublic static void Configure(CommandLineApplication config)\n@@ -33,7 +33,7 @@ public static void Configure(CommandLineApplication config)\nvar sleepDurationOption = config.Option(\n\"-s | --sleep\",\n- $\"The duration in seconds to sleep between each reservation (default: 0).\",\n+ $\"The duration in seconds to sleep between each reservation (default: {DefaultSleepSeconds}).\",\nCommandOptionType.SingleValue);\nvar unreserveOption = config.Option(\n@@ -58,7 +58,7 @@ public static void Configure(CommandLineApplication config)\nreturn 1;\n}\n- var sleepDuration = TimeSpan.FromSeconds(DefaultSleep);\n+ var sleepDuration = TimeSpan.FromSeconds(DefaultSleepSeconds);\nif (sleepDurationOption.HasValue())\n{\nsleepDuration = TimeSpan.FromSeconds(int.Parse(sleepDurationOption.Value()));\n@@ -75,7 +75,7 @@ public static void Configure(CommandLineApplication config)\nvar path = pathOption.Value();\nvar completedPath = path + \".progress\";\nvar remainingList = GetRemainingList(path, completedPath);\n- Console.WriteLine($\"{remainingList.Count} reserved namespaces(s) to {(unreserve ? \"remove\" : \"add\")}.\");\n+ Console.WriteLine($\"{remainingList.Count} reserved namespace(s) to {(unreserve ? \"remove\" : \"add\")}.\");\nif (!remainingList.Any())\n{\nConsole.WriteLine(\"No namespaces were found to reserve.\");\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Address PR comments in ReserveNamespacesCommand (#8415) |
455,741 | 05.02.2021 11:06:07 | 28,800 | b399a4ec355604627f7babe8a47c5d0ddbccfe7c | workaround for narrator announce the status changes of copy button | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -96,9 +96,23 @@ $(function () {\nvar text = $('#' + id + '-text').text().trim();\nwindow.nuget.copyTextToClipboard(text, copyButton);\ncopyButton.popover('show');\n+ //This is workaround for Narrator announce the status changes of copy button to achieve accessibility.\n+ switch (copyButton.attr('aria-pressed')) {\n+ case 'false':\n+ copyButton.attr('aria-pressed', 'true');\n+ break;\n+ case 'true':\n+ copyButton.attr('aria-pressed', 'true');\n+ break;\n+ default:\n+ copyButton.attr('aria-pressed', 'false');\n+ }\nsetTimeout(function () {\ncopyButton.popover('destroy');\n}, 1000);\n+ setTimeout(function () {\n+ copyButton.attr('aria-pressed', 'false');\n+ }, 1500);\nwindow.nuget.sendMetric(\"CopyInstallCommand\", 1, {\nButtonId: id,\nPackageId: packageId,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<div class=\"install-script-row\">\n<pre class=\"install-script\" id=\"@packageManager.Id-text\">@packageManager.InstallPackageCommand</pre>\n<div class=\"copy-button\">\n+ <!--In order to statisfy the requirement to announce button status both on NVDA/Narrator, other screen reader like NVDA will\n+ announce the data-content \"Copied\" everytime when we press button, however, it won't work with Narrator when we use bootstrap popover\n+ because of known issue(https://github.com/twbs/bootstrap/issues/18618).\n+ We add aria-pressed to indicate the whether button is pressed or not, which is workaround only for Narrator announce the status change of button\n+ -->\n<button id=\"@packageManager.Id-button\" class=\"btn btn-default btn-warning\" type=\"button\"\ndata-toggle=\"popover\" data-placement=\"bottom\" data-content=\"Copied.\"\n- aria-label=\"@packageManager.CopyLabel\" aria-live=\"polite\" role=\"status\">\n+ aria-label=\"@packageManager.CopyLabel\" aria-pressed=\"false\" aria-live=\"polite\" role=\"button\">\n<span class=\"ms-Icon ms-Icon--Copy\" aria-hidden=\"true\"></span>\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | workaround for narrator announce the status changes of copy button |
455,754 | 08.03.2021 14:15:37 | -36,000 | 5d8076cee32b929cd38064e8d2c0ec5fa558ea87 | New TFM logic for package ingestion
Improve supported TFM determination for packages | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "using System.Linq;\nusing System.Threading;\nusing System.Threading.Tasks;\n+using NuGet.Client;\n+using NuGet.ContentModel;\nusing NuGet.Frameworks;\nusing NuGet.Packaging;\nusing NuGet.Packaging.Core;\n+using NuGet.RuntimeModel;\nusing NuGet.Services.Entities;\nusing NuGet.Versioning;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Packaging;\nusing NuGetGallery.Security;\n+using PackageType = NuGet.Packaging.Core.PackageType;\nnamespace NuGetGallery\n{\n@@ -698,9 +702,107 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\nreturn package;\n}\n- public virtual IEnumerable<NuGetFramework> GetSupportedFrameworks(PackageArchiveReader package)\n+ public virtual IEnumerable<NuGetFramework> GetSupportedFrameworks(PackageArchiveReader package) =>\n+ GetSupportedFrameworks(package.NuspecReader, package.GetFiles().ToList());\n+\n+ /// <summary>\n+ /// This method combines the logic used in restore operations to make a determination about the TFM supported by the package.\n+ /// We have curated a set of compatibility requirements for our needs in NuGet.org. The client logic can be found here:\n+ /// https://github.com/NuGet/NuGet.Client/blob/63255047fe7052cc33b763356ff995d9166f719e/src/NuGet.Core/NuGet.Commands/RestoreCommand/CompatibilityChecker.cs#L252-L294\n+ /// https://github.com/NuGet/NuGet.Client/blob/63255047fe7052cc33b763356ff995d9166f719e/src/NuGet.Core/NuGet.Commands/RestoreCommand/CompatibilityChecker.cs#L439-L442\n+ /// ...and our combination of these elements is below.\n+ /// The logic is essentially this:\n+ /// - Determine whether we're looking at a tools package. In this case we will use tools \"pattern sets\" (collections of file patterns\n+ /// defined in <see cref=\"ManagedCodeConventions\" />) to assess which frameworks are targeted by the package.\n+ /// - If this isn't a tools package, we look for build-time, runtime, content and resource file patterns\n+ /// For added details on the various cases, see unit tests targeting this method.\n+ /// </summary>\n+ public virtual IEnumerable<NuGetFramework> GetSupportedFrameworks(NuspecReader nuspecReader, IList<string> packageFiles)\n+ {\n+ var supportedTFMs = Enumerable.Empty<NuGetFramework>();\n+ if (packageFiles != null && packageFiles.Any() && nuspecReader != null)\n+ {\n+ // Setup content items for analysis\n+ var items = new ContentItemCollection();\n+ items.Load(packageFiles);\n+ var runtimeGraph = new RuntimeGraph();\n+ var conventions = new ManagedCodeConventions(runtimeGraph);\n+\n+ // Let's test for tools packages first--they're a special case\n+ var groups = Enumerable.Empty<ContentItemGroup>();\n+ var packageTypes = nuspecReader.GetPackageTypes();\n+ if (packageTypes.Count == 1 && (packageTypes[0] == PackageType.DotnetTool ||\n+ packageTypes[0] == PackageType.DotnetCliTool))\n+ {\n+ // Only a package that is a tool package (and nothing else) will be matched against tools pattern set\n+ groups = items.FindItemGroups(conventions.Patterns.ToolsAssemblies);\n+ }\n+ else\n+ {\n+ // Gather together a list of pattern sets indicating the kinds of packages we wish to evaluate\n+ var patterns = new[]\n+ {\n+ conventions.Patterns.CompileRefAssemblies,\n+ conventions.Patterns.CompileLibAssemblies,\n+ conventions.Patterns.RuntimeAssemblies,\n+ conventions.Patterns.ContentFiles,\n+ conventions.Patterns.ResourceAssemblies,\n+ };\n+\n+ // Add MSBuild to this list, but we need to ensure we have package assets before they make the cut.\n+ // A series of files in the right places won't matter if there's no {id}.props|targets.\n+ var msbuildPatterns = new[]\n+ {\n+ conventions.Patterns.MSBuildFiles,\n+ conventions.Patterns.MSBuildMultiTargetingFiles,\n+ };\n+\n+ // We'll create a set of \"groups\" --these are content items which satisfy file pattern sets\n+ var standardGroups = patterns\n+ .SelectMany(p => items.FindItemGroups(p));\n+\n+ // Filter out MSBuild assets that don't match the package ID and append to groups we already have\n+ var packageId = nuspecReader.GetId();\n+ var msbuildGroups = msbuildPatterns\n+ .SelectMany(p => items.FindItemGroups(p))\n+ .Where(g => HasBuildItemsForPackageId(g.Items, packageId));\n+ groups = standardGroups.Concat(msbuildGroups);\n+ }\n+\n+ // Now that we have a collection of groups which have made it through the pattern set filter, let's transform them into TFMs\n+ supportedTFMs = groups\n+ .SelectMany(p => p.Properties)\n+ .Where(pair => pair.Key == ManagedCodeConventions.PropertyNames.TargetFrameworkMoniker)\n+ .Select(pair => pair.Value)\n+ .Cast<NuGetFramework>()\n+ .Distinct();\n+ }\n+\n+ return supportedTFMs;\n+ }\n+\n+ private static bool HasBuildItemsForPackageId(IEnumerable<ContentItem> items, string packageId)\n+ {\n+ foreach (var item in items)\n+ {\n+ var fileName = Path.GetFileName(item.Path);\n+ if (fileName == PackagingCoreConstants.EmptyFolder)\n+ {\n+ return true;\n+ }\n+\n+ if ($\"{packageId}.props\".Equals(fileName, StringComparison.OrdinalIgnoreCase))\n{\n- return package.GetSupportedFrameworks();\n+ return true;\n+ }\n+\n+ if ($\"{packageId}.targets\".Equals(fileName, StringComparison.OrdinalIgnoreCase))\n+ {\n+ return true;\n+ }\n+ }\n+\n+ return false;\n}\nprivate static EmbeddedLicenseFileType GetEmbeddedLicenseType(PackageMetadata packageMetadata)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Data.Entity;\nusing System.Linq;\nusing System.Text.RegularExpressions;\nusing System.Threading.Tasks;\n+using System.Xml.Linq;\nusing Moq;\nusing NuGet.Frameworks;\nusing NuGet.Packaging;\n@@ -970,6 +970,207 @@ private async Task WillNotSaveAnySupportedFrameworksWhenThereIsAnAnyTargetFramew\nAssert.Empty(package.SupportedFrameworks);\n}\n+ [Theory]\n+ [MemberData(nameof(TargetFrameworkCases))]\n+ private void DeterminesCorrectSupportedFrameworksFromFileList(bool isTools, List<string> files, List<string> expectedSupportedFrameworks)\n+ {\n+ // arrange\n+ var nuspec = isTools\n+ ? @\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns = \"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>Foo</id>\n+ <packageTypes>\n+ <packageType name=\"\"DotnetTool\"\"/>\n+ </packageTypes>\n+ </metadata>\n+ </package>\"\n+ : @\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns = \"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>Foo</id>\n+ </metadata>\n+ </package>\";\n+ var xml = XDocument.Parse(nuspec);\n+\n+ var nuspecReader = new NuspecReader(xml);\n+\n+ // act\n+ var supportedFrameworks = CreateService().GetSupportedFrameworks(nuspecReader, files)\n+ .Select(f => f.GetShortFolderName())\n+ .OrderBy(f => f)\n+ .ToList();\n+\n+ // assert\n+ Assert.Equal<string>(expectedSupportedFrameworks, supportedFrameworks);\n+ }\n+\n+ /// <summary>\n+ /// These cases use the guidance laid out here:\n+ /// https://docs.microsoft.com/en-us/nuget/create-packages/creating-a-package\n+ /// https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks\n+ /// https://docs.microsoft.com/en-us/nuget/reference/target-frameworks\n+ /// https://docs.microsoft.com/en-us/dotnet/standard/frameworks\n+ /// </summary>\n+ public static IEnumerable<object[]> TargetFrameworkCases =>\n+ new List<object[]>\n+ {\n+ // Runtimes\n+ // - note that without \"runtimes/\" we don't use runtime ids (RIDs).\n+ new object[] {false, new List<string> {\"lib/net40/_._\", \"lib/net45/_._\"}, new List<string> {\"net40\", \"net45\"}},\n+ new object[] {false, new List<string> {\"lib/net40/_._\", \"lib/net471/_._\"}, new List<string> {\"net40\", \"net471\"}},\n+ new object[] {false, new List<string> {\"lib/net40/_._\", \"lib/net4.7.1/_._\"}, new List<string> {\"net40\", \"net471\"}},\n+ new object[] {false, new List<string> {\"lib/netcoreapp31/_._\", \"lib/netstandard20/_._\"}, new List<string> {\"netcoreapp3.1\", \"netstandard2.0\"}},\n+ new object[] {false, new List<string> {\"lib/_._\"}, new List<string> {\"net\"}}, // no version\n+ new object[] {false, new List<string> {\"lib/win/_._\"}, new List<string> {\"win\"}}, // note that this is \"win\" the TFM (i.e. dep'd/replaced by netcore45), not \"win\" the RID.\n+ new object[] {false, new List<string> {\"lib/foo/_._\"}, new List<string> {\"foo\"}}, // this will be generated as a TFM if users use it, but it's meaningless to us\n+ new object[] {false, new List<string> {\"lib/any/_._\"}, new List<string> {\"dotnet\"}}, // \"dotnet\" is deprecated but is still discernable through this pattern\n+ // - resources\n+ new object[] {false, new List<string> {\"lib/netcoreapp31/zh-hant/_._\", \"lib/netstandard20/zh_hant_._\"}, new List<string> {\"netcoreapp3.1\", \"netstandard2.0\"}},\n+ new object[] {false, new List<string> {\"lib/netcoreapp31/fr-fr/_._\", \"lib/netstandard20/zh_hans_._\"}, new List<string> {\"netcoreapp3.1\", \"netstandard2.0\"}},\n+ // - portables\n+ new object[] {false, new List<string> {\"lib/portable-net45+sl40+win+wp71/_._\", \"lib/portable-net45+sl50+win+wp71+wp80/_._\"},\n+ new List<string> {\"portable-net45+sl4+win+wp71\", \"portable-net45+sl5+win+wp71+wp8\"}},\n+ new object[] {false, new List<string> {\"lib/portable-profile14/_._\", \"lib/portable-profile154/_._\", \"lib/portable-profile7/_._\"},\n+ new List<string> {\"portable-net40+sl5\", \"portable-net45+sl4+win8+wp8\", \"portable-net45+win8\"}},\n+ new object[] {false, new List<string> {\"lib/portable-net45+sl50+foo50+wp71+wp80/_._\", \"lib/portable-net45+foo40+win+wp71/_._\"},\n+ new List<string> {\"portable-net45+sl5+unsupported+wp71+wp8\", \"portable-net45+unsupported+win+wp71\"}},\n+ new object[] {false, new List<string> {\"lib/portable-net45+monotouch+monoandroid10+xamarintvos/_._\"}, new List<string> { \"portable-monoandroid10+monotouch+net45+xamarintvos\"}},\n+ // - including \"runtimes/\" gives us the option of runtime ids (RIDs) but these won't affect TFM determination\n+ new object[] {false, new List<string> {\"runtimes/win/net40/_._\", \"runtimes/win/net471/_._\"}, new List<string>()}, // no \"lib\" dir\n+ new object[] {false, new List<string> {\"runtimes/win/foostuff/net40/_._\", \"runtimes/win/foostuff/net471/_._\"}, new List<string>()}, // no \"lib\" dir\n+ new object[] {false, new List<string> {\"runtimes/win/lib/net40/_._\", \"runtimes/win/lib/net471/_._\"}, new List<string> {\"net40\", \"net471\"}},\n+ new object[] {false, new List<string> {\"runtimes/win/lib/net40/\", \"runtimes/win/lib/net471/_._\"}, new List<string> {\"net471\"}}, // no file in \"net40\" dir\n+ // - resources\n+ new object[] {false, new List<string> {\"runtimes/win/lib/net471/_._\", \"runtimes/win/lib/net472/fr-fr/_._\"}, new List<string> {\"net471\", \"net472\"}},\n+ // - supporting different TFMs for different RIDs won't be exposed here--we just want the union set of all supported TFMs\n+ new object[] {false, new List<string> {\"runtimes/win10-x64/lib/net40/_._\", \"runtimes/win10-arm/lib/net471/_._\"}, new List<string> {\"net40\", \"net471\"}},\n+ // - net5.0+ runtimes\n+ new object[] {false, new List<string> {\"lib/net5.0/_._\", \"lib/net5.0/_._\"}, new List<string> {\"net5.0\"}},\n+ new object[] {false, new List<string> {\"lib/net5.0-tvos/_._\", \"lib/net5.0-ios/_._\"}, new List<string> {\"net5.0-ios\", \"net5.0-tvos\"}},\n+ new object[] {false, new List<string> {\"lib/net5.0-tvos/_._\", \"lib/net5.0-ios13.0/_._\"}, new List<string> {\"net5.0-ios13.0\", \"net5.0-tvos\"}},\n+ new object[] {false, new List<string> {\"lib/net5.1-tvos/_._\", \"lib/net5.1/_._\", \"lib/net5.0-tvos/_._\"}, new List<string> {\"net5.0-tvos\", \"net5.1\", \"net5.1-tvos\"}},\n+ new object[] {false, new List<string> {\"lib/net5.0/_1._\", \"lib/net5.0/_2._\", \"lib/native/_._\"}, new List<string> {\"native\", \"net5.0\" }},\n+\n+ // Compile time refs\n+ new object[] {false, new List<string> {\"ref/_._\"}, new List<string>()},\n+ new object[] {false, new List<string> {\"ref/net40/_._\", \"ref/net451/_._\"}, new List<string> {\"net40\", \"net451\"}},\n+ new object[] {false, new List<string> {\"ref/net5.0-watchos/_1._\", \"ref/net5.0-watchos/_2._\" }, new List<string> {\"net5.0-watchos\"}},\n+ new object[] {false, new List<string> {\"ref/net5.0-macos/_1._\", \"ref/net5.0-windows/_2._\" }, new List<string> {\"net5.0-macos\", \"net5.0-windows\"}},\n+\n+ // Build props/targets\n+ // - only if a props or target file is present of the name {id}.props|targets ({id} is \"Foo\" in our case) will the TFM be supported\n+ new object[] {false, new List<string> {\"build/net40/Foo.props\", \"build/net42/Foo.targets\"}, new List<string> {\"net40\", \"net42\"}},\n+ new object[] {false, new List<string> {\"build/net40/Bar.props\", \"build/net42/Foo.targets\"}, new List<string> {\"net42\"}},\n+ new object[] {false, new List<string> {\"build/net40/Bar.props\", \"build/net42/Bar.targets\"}, new List<string>()},\n+ new object[] {false, new List<string> {\"build/net5.0/Foo.props\", \"build/net42/Foo.targets\"}, new List<string> {\"net42\", \"net5.0\"}},\n+ // - \"any\" is a special case for build, where having no specific TFM is valid\n+ new object[] {false, new List<string> {\"build/Foo.props\", \"build/Foo.targets\"}, new List<string> {\"any\"}},\n+ new object[] {false, new List<string> {\"build/Bar.props\", \"build/Foo.targets\"}, new List<string> {\"any\"}},\n+ new object[] {false, new List<string> {\"build/Bar.props\", \"build/Bar.targets\"}, new List<string>()},\n+\n+ // Tools\n+ // - a special case where we will only assess tools TFMs when the nuspec indicates it is a tools (and only a tools) package - hence the true bool\n+ // - also, a file in the TFM root doesn't qualify a TFM-supported tool - an RID or \"any\" must be provided\n+ // - see this: https://github.com/NuGet/Home/issues/6197#issuecomment-349495271 - \"any\" covers portables.\n+ new object[] {true, new List<string> {\"tools/netcoreapp3.1/_._\"}, new List<string>()},\n+ new object[] {true, new List<string> {\"tools/netcoreapp3.1/win10-x86/_._\"}, new List<string> {\"netcoreapp3.1\"}},\n+ new object[] {true, new List<string> {\"tools/netcoreapp3.1/win10-x86/tool1/_._\", \"tools/netcoreapp3.1/win10-x86/tool2/_._\" },\n+ new List<string> {\"netcoreapp3.1\"}},\n+ new object[] {true, new List<string> {\"tools/netcoreapp3.1/any/_._\"}, new List<string> {\"netcoreapp3.1\"}},\n+ new object[] {true, new List<string> {\"tools/netcoreapp3.1/win/tool1/_._\"}, new List<string> {\"netcoreapp3.1\"}},\n+ new object[] {true, new List<string> {\"tools/netcoreapp3.1/win/any/_._\"}, new List<string> {\"netcoreapp3.1\"}},\n+ new object[] {false, new List<string> {\"tools/netcoreapp3.1/any/_._\"}, new List<string>()}, // not a tools package, no supported TFMs\n+\n+ // Content\n+ new object[] {false, new List<string> {\"contentFiles/css/_._\"}, new List<string>()},\n+ new object[] {false, new List<string> {\"contentFiles/any/_._\"}, new List<string>()},\n+ new object[] {false, new List<string> {\"contentFiles/cs/netstandard2.0/_._\"}, new List<string>{\"netstandard2.0\"}},\n+ new object[] {false, new List<string> {\"contentFiles/any/netstandard2.0/_._\"}, new List<string>{\"netstandard2.0\"}},\n+ new object[] {false, new List<string> {\"contentFiles/cs/any/_._\"}, new List<string>{\"any\"}},\n+ new object[] {false, new List<string> {\"contentFiles/vb/net45/_._\", \"contentFiles/cs/netcoreapp3.1/_._\"},\n+ new List<string>{\"net45\", \"netcoreapp3.1\"}},\n+\n+ // Combinations\n+ new object[]\n+ {\n+ false,\n+ new List<string>\n+ {\n+ \"Foo.nuspec\",\n+ \"runtimes/win10-x86/lib/net40/_._\",\n+ \"runtimes/win10-x86/lib/net471/_._\",\n+ \"ref/net5.0-watchos/_1._\",\n+ \"ref/net5.0-watchos/_2._\",\n+ \"build/netstandard21/Foo.props\",\n+ \"build/netstandard20/Foo.targets\",\n+ \"tools/netcoreapp3.1/win10-x86/tool1/_._\",\n+ \"tools/netcoreapp3.1/win10-x86/tool2/_._\"\n+ },\n+ new List<string>{\"net40\", \"net471\", \"net5.0-watchos\", \"netstandard2.0\", \"netstandard2.1\"}\n+ },\n+ // - note that a tools package (true below) is *only* a tools package when evaluating TFM support\n+ new object[]\n+ {\n+ true, // tools package\n+ new List<string>\n+ {\n+ \"Foo.nuspec\",\n+ \"runtimes/win10-x86/lib/net40/_._\",\n+ \"runtimes/win10-x86/lib/net471/_._\",\n+ \"ref/net5.0-watchos/_1._\",\n+ \"ref/net5.0-watchos/_2._\",\n+ \"build/netstandard21/Foo.props\",\n+ \"build/netstandard20/Foo.targets\",\n+ \"tools/netcoreapp3.1/win10-x86/tool1/_._\",\n+ \"tools/netcoreapp3.1/win10-x86/tool2/_._\"\n+ },\n+ new List<string> {\"netcoreapp3.1\"}\n+ },\n+ new object[]\n+ {\n+ false,\n+ new List<string>\n+ {\n+ \"Foo.nuspec\",\n+ \"runtimes/win10-x86/lib/xamarinios/_._\",\n+ \"runtimes/win10-x64/lib/xamarinios/_._\",\n+ \"ref/xamarinios/_1._\",\n+ \"ref/xamarinios/_2._\",\n+ \"build/netstandard21/Foo.props\",\n+ \"build/netstandard21/Foo.targets\",\n+ \"contentFiles/vb/net45/_._\",\n+ \"contentFiles/cs/netstandard2.1/_._\"\n+ },\n+ new List<string>{\"net45\", \"netstandard2.1\", \"xamarinios\"}\n+ },\n+ new object[]\n+ {\n+ false,\n+ new List<string>\n+ {\n+ \".signature.p7s\",\n+ \"LICENSE.md\",\n+ \"Foo.nuspec\",\n+ \"fooIcon.png\",\n+ \"[Content_Types].xml\",\n+ \"_rels/.rels\",\n+ \"package/service/metadata/core-properties/foo1234.psmdcp\",\n+ \"lib/net20/Foo.dll\",\n+ \"lib/net35/Foo.dll\",\n+ \"lib/net40/Foo.dll\",\n+ \"lib/net45/Foo.dll\",\n+ \"lib/netstandard1.0/Foo.dll\",\n+ \"lib/netstandard1.3/Foo.dll\",\n+ \"lib/netstandard2.0/Foo.dll\",\n+ \"lib/portable-net40+sl5+win8+wp8+wpa81/Foo.dll\",\n+ \"lib/portable-net45+win8+wp8+wpa81/Foo.dll\"\n+ },\n+ new List<string> {\"net20\", \"net35\", \"net40\", \"net45\", \"netstandard1.0\", \"netstandard1.3\", \"netstandard2.0\",\n+ \"portable-net40+sl5+win8+wp8+wpa81\", \"portable-net45+win8+wp8+wpa81\"}\n+ }\n+ };\n+\n[Fact]\nprivate async Task WillThrowIfTheRepositoryTypeIsLongerThan100()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | New TFM logic for package ingestion (#8432)
Improve supported TFM determination for packages |
455,754 | 11.03.2021 12:56:25 | -36,000 | 21348d69e3460de124fb560999972319a7172a13 | Add feature flag for new TFM heuristics
Add feature flag for new TFM heuristics | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -40,6 +40,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string ShowEnable2FADialog = GalleryPrefix + \"ShowEnable2FADialog\";\nprivate const string Get2FADismissFeedback = GalleryPrefix + \"Get2FADismissFeedback\";\nprivate const string PackageRenamesFeatureName = GalleryPrefix + \"PackageRenames\";\n+ private const string PatternSetTfmHeuristicsFeatureName = GalleryPrefix + \"PatternSetTfmHeuristics\";\nprivate const string EmbeddedReadmeFlightName = GalleryPrefix + \"EmbeddedReadmes\";\nprivate const string LicenseMdRenderingFlightName = GalleryPrefix + \"LicenseMdRendering\";\nprivate const string MarkdigMdRenderingFlightName = GalleryPrefix + \"MarkdigMdRendering\";\n@@ -220,6 +221,11 @@ public bool IsPackageRenamesEnabled(User user)\nreturn _client.IsEnabled(PackageRenamesFeatureName, user, defaultValue: false);\n}\n+ public bool ArePatternSetTfmHeuristicsEnabled()\n+ {\n+ return _client.IsEnabled(PatternSetTfmHeuristicsFeatureName, defaultValue: false);\n+ }\n+\npublic bool AreEmbeddedReadmesEnabled(User user)\n{\nreturn _client.IsEnabled(EmbeddedReadmeFlightName, user, defaultValue: false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -158,6 +158,11 @@ public interface IFeatureFlagService\n/// </summary>\nbool IsPackageRenamesEnabled(User user);\n+ /// <summary>\n+ /// Whether we're using pattern set based TFM determination on ingested packages\n+ /// </summary>\n+ bool ArePatternSetTfmHeuristicsEnabled();\n+\n/// <summary>\n/// Whether the user is able to publish the package with an embedded readme file.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/IPackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/IPackageService.cs",
"diff": "@@ -114,6 +114,8 @@ public interface IPackageService : ICorePackageService\nPackage EnrichPackageFromNuGetPackage(Package package, PackageArchiveReader packageArchive, PackageMetadata packageMetadata, PackageStreamMetadata packageStreamMetadata, User user);\n+ IEnumerable<NuGetFramework> GetSupportedFrameworks(PackageArchiveReader package);\n+\nIEnumerable<NuGetFramework> GetSupportedFrameworks(NuspecReader nuspecReader, IList<string> packageFiles);\nTask PublishPackageAsync(string id, string version, bool commitChanges = true);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -32,6 +32,7 @@ public class PackageService : CorePackageService, IPackageService\nprivate readonly ISecurityPolicyService _securityPolicyService;\nprivate readonly IEntitiesContext _entitiesContext;\nprivate readonly IContentObjectService _contentObjectService;\n+ private readonly IFeatureFlagService _featureFlagService;\nprivate const int packagesDisplayed = 5;\npublic PackageService(\n@@ -42,7 +43,8 @@ public class PackageService : CorePackageService, IPackageService\nITelemetryService telemetryService,\nISecurityPolicyService securityPolicyService,\nIEntitiesContext entitiesContext,\n- IContentObjectService contentObjectService)\n+ IContentObjectService contentObjectService,\n+ IFeatureFlagService featureFlagService)\n: base(packageRepository, packageRegistrationRepository, certificateRepository)\n{\n_auditingService = auditingService ?? throw new ArgumentNullException(nameof(auditingService));\n@@ -50,6 +52,7 @@ public class PackageService : CorePackageService, IPackageService\n_securityPolicyService = securityPolicyService ?? throw new ArgumentNullException(nameof(securityPolicyService));\n_entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n_contentObjectService = contentObjectService ?? throw new ArgumentNullException(nameof(contentObjectService));\n+ _featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));\n}\n/// <summary>\n@@ -702,8 +705,15 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\nreturn package;\n}\n- public virtual IEnumerable<NuGetFramework> GetSupportedFrameworks(PackageArchiveReader package) =>\n- GetSupportedFrameworks(package.NuspecReader, package.GetFiles().ToList());\n+ public virtual IEnumerable<NuGetFramework> GetSupportedFrameworks(PackageArchiveReader package)\n+ {\n+ if (_featureFlagService.ArePatternSetTfmHeuristicsEnabled())\n+ {\n+ return GetSupportedFrameworks(package.NuspecReader, package.GetFiles().ToList());\n+ }\n+\n+ return package.GetSupportedFrameworks();\n+ }\n/// <summary>\n/// This method combines the logic used in restore operations to make a determination about the TFM supported by the package.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"NuGetGallery.ODataV2SearchNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV2SearchCountNonHijacked\": \"Enabled\",\n\"NuGetGallery.DisplayVulnerabilities\": \"Enabled\",\n- \"NuGetGallery.DisplayFuGetLinks\": \"Enabled\"\n+ \"NuGetGallery.DisplayFuGetLinks\": \"Enabled\",\n+ \"NuGetGallery.PatternSetTfmHeuristics\": \"Enabled\"\n},\n\"Flights\": {\n\"NuGetGallery.TyposquattingFlight\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyMicrosoftPackage/Application.cs",
"new_path": "src/VerifyMicrosoftPackage/Application.cs",
"diff": "@@ -266,6 +266,7 @@ private static PackageService GetPackageService()\nvar securityPolicyService = new FakeSecurityPolicyService();\nvar contextFake = new FakeEntitiesContext();\nvar contentObjectService = new FakeContentObjectService();\n+ var featureFlagService = new FakeFeatureFlagService();\nvar packageService = new PackageService(\npackageRegistrationRepository,\n@@ -275,7 +276,8 @@ private static PackageService GetPackageService()\ntelemetryService,\nsecurityPolicyService,\ncontextFake,\n- contentObjectService);\n+ contentObjectService,\n+ featureFlagService);\nreturn packageService;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyMicrosoftPackage/VerifyMicrosoftPackage.csproj",
"new_path": "src/VerifyMicrosoftPackage/VerifyMicrosoftPackage.csproj",
"diff": "<Compile Include=\"Fakes\\FakeEntitiesContext.cs\" />\n<Compile Include=\"Fakes\\FakeEntityRepository.cs\" />\n<Compile Include=\"Fakes\\FakeSecurityPolicyService.cs\" />\n+ <Compile Include=\"Fakes\\FakeFeatureFlagService.cs\" />\n<Compile Include=\"Fakes\\FakeTelemetryService.cs\" />\n<Compile Include=\"Program.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\StatusServiceFacts.cs\" />\n<Compile Include=\"Telemetry\\CustomerResourceIdEnricherFacts.cs\" />\n<Compile Include=\"TestData\\TestDataResourceUtility.cs\" />\n+ <Compile Include=\"TestUtils\\MockPackageArchiveReader.cs\" />\n<Compile Include=\"UsernameValidationRegex.cs\" />\n<Compile Include=\"Extensions\\NumberExtensionsFacts.cs\" />\n<Compile Include=\"Extensions\\RouteExtensionsFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -33,7 +33,8 @@ public class PackageServiceFacts\nMock<ISecurityPolicyService> securityPolicyService = null,\nAction<Mock<PackageService>> setup = null,\nMock<IEntitiesContext> context = null,\n- Mock<IContentObjectService> contentObjectService = null)\n+ Mock<IContentObjectService> contentObjectService = null,\n+ Mock<IFeatureFlagService> featureFlagService = null)\n{\npackageRegistrationRepository = packageRegistrationRepository ?? new Mock<IEntityRepository<PackageRegistration>>();\npackageRepository = packageRepository ?? new Mock<IEntityRepository<Package>>();\n@@ -49,6 +50,12 @@ public class PackageServiceFacts\ncontentObjectService.Setup(x => x.QueryHintConfiguration).Returns(Mock.Of<IQueryHintConfiguration>());\n}\n+ if (featureFlagService == null)\n+ {\n+ featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.ArePatternSetTfmHeuristicsEnabled()).Returns(true);\n+ }\n+\nvar packageService = new Mock<PackageService>(\npackageRegistrationRepository.Object,\npackageRepository.Object,\n@@ -57,7 +64,8 @@ public class PackageServiceFacts\ntelemetryService.Object,\nsecurityPolicyService.Object,\ncontext.Object,\n- contentObjectService.Object);\n+ contentObjectService.Object,\n+ featureFlagService.Object);\npackageService.CallBase = true;\n@@ -970,6 +978,41 @@ private async Task WillNotSaveAnySupportedFrameworksWhenThereIsAnAnyTargetFramew\nAssert.Empty(package.SupportedFrameworks);\n}\n+ [Theory]\n+ [InlineData(false, new[] { \"net40\", \"net5.0\", \"netcore21\" })]\n+ [InlineData(true, new[] { \"net5.0\", \"netcore21\" })]\n+ private void UsesTfmHeuristicsBasedOnFeatureFlag(bool useNewTfmHeuristics, IEnumerable<string> expectedSupportedTfms)\n+ {\n+ // arrange\n+ // - create a package that responds differently to each set of heuristics\n+ var nuspec =\n+ $@\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns = \"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>Foo</id>\n+ <frameworkAssemblies>\n+ <frameworkAssembly assemblyName=\"\"System\"\" targetFramework=\"\".NETFramework4.0\"\" />\n+ </frameworkAssemblies>\n+ </metadata>\n+ </package>\";\n+ var nuspecReader = new NuspecReader(XDocument.Parse(nuspec));\n+ var files = new List<string> { \"lib/netcore2.1/_._\", \"lib/net5.0/_._\" };\n+ var package = new MockPackageArchiveReader(nuspecReader, files);\n+\n+ // - create feature flag services and package services for both scenarios\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.ArePatternSetTfmHeuristicsEnabled()).Returns(useNewTfmHeuristics);\n+\n+ // act\n+ var supportedFrameworks = CreateService(featureFlagService: featureFlagService).GetSupportedFrameworks(package)\n+ .Select(f => f.GetShortFolderName())\n+ .OrderBy(f => f)\n+ .ToList();\n+\n+ // assert\n+ Assert.Equal<string>(expectedSupportedTfms, supportedFrameworks);\n+ }\n+\n[Theory]\n[MemberData(nameof(TargetFrameworkCases))]\nprivate void DeterminesCorrectSupportedFrameworksFromFileList(bool isTools, List<string> files, List<string> expectedSupportedFrameworks)\n@@ -991,9 +1034,7 @@ private void DeterminesCorrectSupportedFrameworksFromFileList(bool isTools, List\n<id>Foo</id>\n</metadata>\n</package>\";\n- var xml = XDocument.Parse(nuspec);\n-\n- var nuspecReader = new NuspecReader(xml);\n+ var nuspecReader = new NuspecReader(XDocument.Parse(nuspec));\n// act\nvar supportedFrameworks = CreateService().GetSupportedFrameworks(nuspecReader, files)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"diff": "@@ -345,6 +345,9 @@ private static Mock<PackageService> SetupPackageService(Package package)\nvar securityPolicyService = new Mock<ISecurityPolicyService>();\nvar entitiesContext = new Mock<IEntitiesContext>();\nvar contentObjectService = new Mock<IContentObjectService>();\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.ArePatternSetTfmHeuristicsEnabled()).Returns(true);\n+\nvar packageService = new Mock<PackageService>(\npackageRegistrationRepository.Object,\n@@ -354,7 +357,8 @@ private static Mock<PackageService> SetupPackageService(Package package)\ntelemetryService.Object,\nsecurityPolicyService.Object,\nentitiesContext.Object,\n- contentObjectService.Object);\n+ contentObjectService.Object,\n+ featureFlagService.Object);\npackageService.CallBase = true;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/NuGetGallery.Facts/TestUtils/MockPackageArchiveReader.cs",
"diff": "+// Copyright (c) .NET Foundation. All rights reserved.\n+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n+\n+using System.Collections.Generic;\n+using System.IO;\n+using System.IO.Compression;\n+using NuGet.Packaging;\n+\n+namespace NuGetGallery.TestUtils\n+{\n+ class MockPackageArchiveReader : PackageArchiveReader\n+ {\n+ private NuspecReader _nuspecReader;\n+ private IEnumerable<string> _files;\n+\n+ public MockPackageArchiveReader(NuspecReader nuspecReader, IEnumerable<string> files)\n+ : base(new ZipArchive(new MemoryStream(), ZipArchiveMode.Create, true))\n+ {\n+ _nuspecReader = nuspecReader;\n+ _files = files;\n+ }\n+\n+ public override NuspecReader NuspecReader => _nuspecReader;\n+ public override IEnumerable<string> GetFiles() => _files;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"diff": "@@ -197,6 +197,8 @@ private Mock<PackageService> SetupPackageService()\nvar securityPolicyService = new Mock<ISecurityPolicyService>();\nvar entitiesContext = new Mock<IEntitiesContext>();\nvar contentObjectService = new Mock<IContentObjectService>();\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.Setup(x => x.ArePatternSetTfmHeuristicsEnabled()).Returns(true);\nvar packageService = new Mock<PackageService>(\npackageRegistrationRepository.Object,\n@@ -206,7 +208,8 @@ private Mock<PackageService> SetupPackageService()\ntelemetryService.Object,\nsecurityPolicyService.Object,\nentitiesContext.Object,\n- contentObjectService.Object);\n+ contentObjectService.Object,\n+ featureFlagService.Object);\npackageService.CallBase = true;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add feature flag for new TFM heuristics (#8448)
Add feature flag for new TFM heuristics |
455,754 | 12.03.2021 09:32:26 | -36,000 | 5882f3e041891179c89d16bb863a073dbe4c007f | Use new TFM logic for package ingestion in backfill command
New TFM logic for package ingestion and backfill command | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"diff": "using CsvHelper;\nusing CsvHelper.Configuration;\nusing CsvHelper.TypeConversion;\n+using Knapcode.MiniZip;\nusing Microsoft.Extensions.CommandLineUtils;\nusing NuGet.Packaging;\nusing NuGet.Services.Entities;\nusing NuGetGallery;\n-using NuGetGallery.Configuration;\nusing System;\n+using System.Collections.Generic;\nusing System.Data.Entity;\n+using System.Data.SqlClient;\nusing System.IO;\nusing System.Linq;\n+using System.Linq.Expressions;\nusing System.Net.Http;\nusing System.Text;\nusing System.Threading.Tasks;\nusing System.Xml;\nusing System.Xml.Linq;\nusing GalleryTools.Utils;\n+using NuGet.Services.Sql;\nnamespace GalleryTools.Commands\n{\n@@ -35,6 +39,15 @@ public abstract class BackfillCommand<TMetadata>\nprotected virtual int UpdateBatchSize => 100;\n+ protected virtual int LimitTo => 0;\n+\n+ protected virtual MetadataSourceType SourceType => MetadataSourceType.NuspecOnly;\n+\n+ protected virtual Expression<Func<Package, object>> QueryIncludes => null;\n+\n+\n+ protected IPackageService _packageService;\n+\npublic static void Configure<TCommand>(CommandLineApplication config) where TCommand : BackfillCommand<TMetadata>, new()\n{\nconfig.Description = \"Backfill metadata for packages in the gallery\";\n@@ -53,10 +66,12 @@ public static void Configure<TCommand>(CommandLineApplication config) where TCom\nbuilder.RegisterAssemblyModules(typeof(DefaultDependenciesModule).Assembly);\nvar container = builder.Build();\n- var connectionString = container.Resolve<IAppConfiguration>().SqlConnectionString;\n+ var sqlConnectionFactory = container.Resolve<ISqlConnectionFactory>();\n+ var sqlConnection = await sqlConnectionFactory.CreateAsync();\nvar serviceDiscoveryUriValue = new Uri(serviceDiscoveryUri.Value());\nvar command = new TCommand();\n+ command._packageService = container.Resolve<IPackageService>();\nvar metadataFileName = fileName.HasValue() ? fileName.Value() : command.MetadataFileName;\n@@ -75,24 +90,26 @@ public static void Configure<TCommand>(CommandLineApplication config) where TCom\n}\n}\n- await command.Collect(connectionString, serviceDiscoveryUriValue, lastCreateTime, metadataFileName);\n+ await command.Collect(sqlConnection, serviceDiscoveryUriValue, lastCreateTime, metadataFileName);\n}\nif (updateDB.HasValue())\n{\n- await command.Update(connectionString, metadataFileName);\n+ await command.Update(sqlConnection, metadataFileName);\n}\nreturn 0;\n});\n}\n- public async Task Collect(string connectionString, Uri serviceDiscoveryUri, DateTime? lastCreateTime, string fileName)\n+ public async Task Collect(SqlConnection connection, Uri serviceDiscoveryUri, DateTime? lastCreateTime, string fileName)\n{\n- using (var context = new EntitiesContext(connectionString, readOnly: true))\n+ using (var context = new EntitiesContext(connection, readOnly: true))\nusing (var cursor = new FileCursor(CursorFileName))\nusing (var logger = new Logger(ErrorsFileName))\n{\n+ context.SetCommandTimeout(300); // large query\n+\nvar startTime = await cursor.Read();\nlogger.Log($\"Starting metadata collection - Cursor time: {startTime:u}\");\n@@ -100,16 +117,30 @@ public async Task Collect(string connectionString, Uri serviceDiscoveryUri, Date\nvar repository = new EntityRepository<Package>(context);\nvar packages = repository.GetAll()\n- .Include(p => p.PackageRegistration)\n+ .Include(p => p.PackageRegistration);\n+ if (QueryIncludes != null)\n+ {\n+ packages = packages.Include(QueryIncludes);\n+ }\n+\n+ packages = packages\n.Where(p => p.Created < lastCreateTime && p.Created > startTime)\n- .Where(p => p.PackageStatusKey == PackageStatus.Available || p.PackageStatusKey == PackageStatus.Validating)\n- .OrderBy(p => p.Created);\n+ .OrderBy(p => p.PackageRegistration.Id);\n+ if (LimitTo > 0)\n+ {\n+ packages = packages.Take(LimitTo);\n+ }\nvar flatContainerUri = await GetFlatContainerUri(serviceDiscoveryUri);\nusing (var csv = CreateCsvWriter(fileName))\nusing (var http = new HttpClient())\n{\n+ // We want these downloads ignored by stats pipelines - this user agent is automatically skipped.\n+ // See https://github.com/NuGet/NuGet.Jobs/blob/262da48ed05d0366613bbf1c54f47879aad96dcd/src/Stats.ImportAzureCdnStatistics/StatisticsParser.cs#L41\n+ http.DefaultRequestHeaders.TryAddWithoutValidation(\"User-Agent\",\n+ \"Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; AppInsights) Backfill Job: NuGet.Gallery GalleryTools\");\n+\nvar counter = 0;\nvar lastCreatedDate = default(DateTime?);\n@@ -117,12 +148,32 @@ public async Task Collect(string connectionString, Uri serviceDiscoveryUri, Date\n{\nvar id = package.PackageRegistration.Id;\nvar version = package.NormalizedVersion;\n-\n- var nuspecUri = $\"{flatContainerUri}/{id.ToLowerInvariant()}/{version.ToLowerInvariant()}/{id.ToLowerInvariant()}.nuspec\";\n+ var idLowered = id.ToLowerInvariant();\n+ var versionLowered = version.ToLowerInvariant();\ntry\n{\n- var metadata = await FetchMetadata(http, nuspecUri);\n+ var metadata = default(TMetadata);\n+\n+ var nuspecUri =\n+ $\"{flatContainerUri}/{idLowered}/{versionLowered}/{idLowered}.nuspec\";\n+ using (var nuspecStream = await http.GetStreamAsync(nuspecUri))\n+ {\n+ var document = LoadDocument(nuspecStream);\n+\n+ var nuspecReader = new NuspecReader(document);\n+\n+ if (SourceType == MetadataSourceType.NuspecOnly)\n+ {\n+ metadata = ReadMetadata(nuspecReader);\n+ }\n+ else if (SourceType == MetadataSourceType.Nupkg)\n+ {\n+ var nupkgUri =\n+ $\"{flatContainerUri}/{idLowered}/{versionLowered}/{idLowered}.{versionLowered}.nupkg\";\n+ metadata = await FetchMetadataAsync(http, nupkgUri, nuspecReader, id, version, logger);\n+ }\n+ }\nif (ShouldWriteMetadata(metadata))\n{\n@@ -132,7 +183,7 @@ public async Task Collect(string connectionString, Uri serviceDiscoveryUri, Date\nawait csv.NextRecordAsync();\n- logger.LogPackage(id, version, \"Metadata saved.\");\n+ logger.LogPackage(id, version, $\"Metadata saved\");\n}\n}\ncatch (Exception e)\n@@ -163,14 +214,14 @@ public async Task Collect(string connectionString, Uri serviceDiscoveryUri, Date\n}\n}\n- public async Task Update(string connectionString, string fileName)\n+ public async Task Update(SqlConnection connection, string fileName)\n{\nif (!File.Exists(fileName))\n{\nthrow new ArgumentException($\"File '{fileName}' doesn't exist\");\n}\n- using (var context = new EntitiesContext(connectionString, readOnly: false))\n+ using (var context = new EntitiesContext(connection, readOnly: false))\nusing (var cursor = new FileCursor(CursorFileName))\nusing (var logger = new Logger(ErrorsFileName))\n{\n@@ -199,9 +250,7 @@ public async Task Update(string connectionString, string fileName)\nif (package != null)\n{\n-\n- UpdatePackage(package, metadata.Metadata);\n-\n+ UpdatePackage(package, metadata.Metadata, context);\nlogger.LogPackage(metadata.Id, metadata.Version, \"Metadata updated.\");\ncounter++;\n@@ -234,13 +283,15 @@ public async Task Update(string connectionString, string fileName)\n}\n}\n- protected abstract TMetadata ReadMetadata(NuspecReader reader);\n+ protected virtual TMetadata ReadMetadata(NuspecReader reader) => default;\n+\n+ protected virtual TMetadata ReadMetadata(IList<string> files, NuspecReader nuspecReader) => default;\nprotected abstract bool ShouldWriteMetadata(TMetadata metadata);\nprotected abstract void ConfigureClassMap(PackageMetadataClassMap map);\n- protected abstract void UpdatePackage(Package package, TMetadata metadata);\n+ protected abstract void UpdatePackage(Package package, TMetadata metadata, EntitiesContext context);\nprivate static async Task<string> GetFlatContainerUri(Uri serviceDiscoveryUri)\n{\n@@ -251,15 +302,26 @@ private static async Task<string> GetFlatContainerUri(Uri serviceDiscoveryUri)\nreturn result.First().AbsoluteUri.TrimEnd('/');\n}\n- private async Task<TMetadata> FetchMetadata(HttpClient httpClient, string nuspecUri)\n+ private async Task<TMetadata> FetchMetadataAsync(\n+ HttpClient httpClient, string nupkgUri, NuspecReader nuspecReader, string id, string version, Logger logger)\n{\n- using (var nuspecStream = await httpClient.GetStreamAsync(nuspecUri))\n- {\n- var document = LoadDocument(nuspecStream);\n+ var httpZipProvider = new HttpZipProvider(httpClient);\n- var reader = new NuspecReader(document);\n+ try\n+ {\n+ var zipDirectoryReader = await httpZipProvider.GetReaderAsync(new Uri(nupkgUri));\n+ var zipDirectory = await zipDirectoryReader.ReadAsync();\n+ var files = zipDirectory\n+ .Entries\n+ .Select(x => x.GetName())\n+ .ToList();\n- return ReadMetadata(reader);\n+ return ReadMetadata(files, nuspecReader);\n+ }\n+ catch (Exception e)\n+ {\n+ await logger.LogPackageError(id, version, e);\n+ return default;\n}\n}\n@@ -460,5 +522,21 @@ public void Dispose()\nWriter.Dispose();\n}\n}\n+\n+ /// <summary>\n+ /// This enum allows our logic to respond to a package's need for only a nupsec to determine metadata, or whether\n+ /// it needs access to the .nupkg for analysis of the package\n+ /// </summary>\n+ public enum MetadataSourceType\n+ {\n+ /// <summary>\n+ /// Just the nuspec will suffice for metadata extraction\n+ /// </summary>\n+ NuspecOnly,\n+ /// <summary>\n+ /// We need to dig deeper into the bupkg for the metadata\n+ /// </summary>\n+ Nupkg\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillDevelopmentDependencyMetadataCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillDevelopmentDependencyMetadataCommand.cs",
"diff": "using Microsoft.Extensions.CommandLineUtils;\nusing NuGet.Packaging;\nusing NuGet.Services.Entities;\n+using NuGetGallery;\nnamespace GalleryTools.Commands\n{\n@@ -32,7 +33,7 @@ protected override void ConfigureClassMap(PackageMetadataClassMap map)\nmap.Map(x => x.Metadata).Index(3);\n}\n- protected override void UpdatePackage(Package package, bool metadata)\n+ protected override void UpdatePackage(Package package, bool metadata, EntitiesContext context)\n{\npackage.DevelopmentDependency = metadata;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillRepositoryMetadataCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillRepositoryMetadataCommand.cs",
"diff": "using NuGet.Packaging;\nusing NuGet.Packaging.Core;\nusing NuGet.Services.Entities;\n+using NuGetGallery;\nnamespace GalleryTools.Commands\n{\n@@ -38,7 +39,7 @@ protected override void ConfigureClassMap(PackageMetadataClassMap map)\nmap.Map(x => x.Metadata.Commit).Index(6);\n}\n- protected override void UpdatePackage(Package package, RepositoryMetadata metadata)\n+ protected override void UpdatePackage(Package package, RepositoryMetadata metadata, EntitiesContext context)\n{\npackage.RepositoryUrl = metadata.Url;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<Compile Include=\"Commands\\BackfillCommand.cs\" />\n+ <Compile Include=\"Commands\\BackfillTfmMetadataCommand.cs\" />\n<Compile Include=\"Commands\\BackfillDevelopmentDependencyMetadataCommand.cs\" />\n<Compile Include=\"Commands\\BackfillRepositoryMetadataCommand.cs\" />\n<Compile Include=\"Commands\\HashCommand.cs\" />\n</ProjectReference>\n</ItemGroup>\n<ItemGroup>\n+ <PackageReference Include=\"Knapcode.MiniZip\">\n+ <Version>0.16.0</Version>\n+ </PackageReference>\n<PackageReference Include=\"MicroBuild.Core\">\n<Version>0.3.0</Version>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Program.cs",
"new_path": "src/GalleryTools/Program.cs",
"diff": "@@ -19,6 +19,7 @@ public static int Main(params string[] args)\ncommandLineApplication.Command(\"applyTenantPolicy\", ApplyTenantPolicyCommand.Configure);\ncommandLineApplication.Command(\"fillrepodata\", BackfillRepositoryMetadataCommand.Configure);\ncommandLineApplication.Command(\"filldevdeps\", BackfillDevelopmentDependencyCommand.Configure);\n+ commandLineApplication.Command(\"filltfms\", BackfillTfmMetadataCommand.Configure);\ncommandLineApplication.Command(\"verifyapikey\", VerifyApiKeyCommand.Configure);\ncommandLineApplication.Command(\"updateIsLatest\", UpdateIsLatestCommand.Configure);\ncommandLineApplication.Command(\"reservenamespaces\", ReserveNamespacesCommand.Configure);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -72,6 +72,7 @@ public IDisposable WithQueryHint(string queryHint)\npublic DbSet<PackageDeprecation> Deprecations { get; set; }\npublic DbSet<PackageRegistration> PackageRegistrations { get; set; }\npublic DbSet<PackageDependency> PackageDependencies { get; set; }\n+ public DbSet<PackageFramework> PackageFrameworks { get; set; }\npublic DbSet<Credential> Credentials { get; set; }\npublic DbSet<Scope> Scopes { get; set; }\npublic DbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"diff": "@@ -13,6 +13,7 @@ public interface IEntitiesContext : IReadOnlyEntitiesContext\nDbSet<PackageDeprecation> Deprecations { get; set; }\nDbSet<PackageRegistration> PackageRegistrations { get; set; }\nDbSet<PackageDependency> PackageDependencies { get; set; }\n+ DbSet<PackageFramework> PackageFrameworks { get; set; }\nDbSet<Credential> Credentials { get; set; }\nDbSet<Scope> Scopes { get; set; }\nDbSet<User> Users { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyMicrosoftPackage/Fakes/FakeEntitiesContext.cs",
"new_path": "src/VerifyMicrosoftPackage/Fakes/FakeEntitiesContext.cs",
"diff": "@@ -15,6 +15,7 @@ class FakeEntitiesContext : IEntitiesContext\npublic DbSet<PackageDeprecation> Deprecations { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic DbSet<PackageRegistration> PackageRegistrations { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic DbSet<PackageDependency> PackageDependencies { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n+ public DbSet<PackageFramework> PackageFrameworks { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic DbSet<Credential> Credentials { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic DbSet<Scope> Scopes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic DbSet<User> Users { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"diff": "@@ -20,193 +20,104 @@ public class FakeEntitiesContext : IEntitiesContext\npublic DbSet<PackageRegistration> PackageRegistrations\n{\n- get\n- {\n- return Set<PackageRegistration>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<PackageRegistration>();\n+ set => throw new NotSupportedException();\n}\n+\npublic DbSet<PackageDependency> PackageDependencies\n{\n- get\n- {\n- return Set<PackageDependency>();\n+ get => Set<PackageDependency>();\n+ set => throw new NotSupportedException();\n}\n- set\n+\n+ public DbSet<PackageFramework> PackageFrameworks\n{\n- throw new NotSupportedException();\n- }\n+ get => Set<PackageFramework>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<Package> Packages\n{\n- get\n- {\n- return Set<Package>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<Package>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<PackageDeprecation> Deprecations\n{\n- get\n- {\n- return Set<PackageDeprecation>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<PackageDeprecation>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<Credential> Credentials\n{\n- get\n- {\n- return Set<Credential>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<Credential>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<Scope> Scopes\n{\n- get\n- {\n- return Set<Scope>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<Scope>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<User> Users\n{\n- get\n- {\n- return Set<User>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<User>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<Organization> Organizations\n{\n- get\n- {\n- return Set<Organization>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<Organization>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<UserSecurityPolicy> UserSecurityPolicies\n{\n- get\n- {\n- return Set<UserSecurityPolicy>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<UserSecurityPolicy>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<ReservedNamespace> ReservedNamespaces\n{\n- get\n- {\n- return Set<ReservedNamespace>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<ReservedNamespace>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<Certificate> Certificates\n{\n- get\n- {\n- return Set<Certificate>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<Certificate>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<UserCertificate> UserCertificates\n{\n- get\n- {\n- return Set<UserCertificate>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<UserCertificate>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<SymbolPackage> SymbolPackages\n{\n- get\n- {\n- return Set<SymbolPackage>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<SymbolPackage>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<PackageVulnerability> Vulnerabilities\n{\n- get\n- {\n- return Set<PackageVulnerability>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<PackageVulnerability>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<VulnerablePackageVersionRange> VulnerableRanges\n{\n- get\n- {\n- return Set<VulnerablePackageVersionRange>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<VulnerablePackageVersionRange>();\n+ set => throw new NotSupportedException();\n}\npublic DbSet<PackageRename> PackageRenames\n{\n- get\n- {\n- return Set<PackageRename>();\n- }\n- set\n- {\n- throw new NotSupportedException();\n- }\n+ get => Set<PackageRename>();\n+ set => throw new NotSupportedException();\n}\npublic virtual string QueryHint => throw new NotImplementedException();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Use new TFM logic for package ingestion in backfill command (#8431)
New TFM logic for package ingestion and backfill command |
455,754 | 12.03.2021 11:50:42 | -36,000 | 5871c77a1111bfa40696e4e821450149da639817 | Add IsVulnerable to Manage Packages view model
Expand view models for vulnerabilities in manage packages page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/IPackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/IPackageService.cs",
"diff": "@@ -87,9 +87,9 @@ public interface IPackageService : ICorePackageService\nPackage FilterLatestPackageBySuffix(IReadOnlyCollection<Package> packages,\nstring version, bool prerelease);\n- IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false);\n+ IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false, bool includeVulnerabilities = false);\n- IEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted, bool includeVersions = false);\n+ IEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted, bool includeVersions = false, bool includeVulnerabilities = false);\nIQueryable<PackageRegistration> FindPackageRegistrationsByOwner(User user);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -406,9 +406,12 @@ Package GetLatestStable()\nreturn package;\n}\n- public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false)\n+ public IEnumerable<Package> FindPackagesByOwner(User user,\n+ bool includeUnlisted,\n+ bool includeVersions = false,\n+ bool includeVulnerabilities = false)\n{\n- return GetPackagesForOwners(new[] { user.Key }, includeUnlisted, includeVersions);\n+ return GetPackagesForOwners(new[] { user.Key }, includeUnlisted, includeVersions, includeVulnerabilities);\n}\n/// <summary>\n@@ -417,15 +420,17 @@ public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted,\npublic IEnumerable<Package> FindPackagesByAnyMatchingOwner(\nUser user,\nbool includeUnlisted,\n- bool includeVersions = false)\n+ bool includeVersions = false,\n+ bool includeVulnerabilities = false)\n{\nvar ownerKeys = user.Organizations.Select(org => org.OrganizationKey).ToList();\nownerKeys.Insert(0, user.Key);\n- return GetPackagesForOwners(ownerKeys, includeUnlisted, includeVersions);\n+ return GetPackagesForOwners(ownerKeys, includeUnlisted, includeVersions, includeVulnerabilities);\n}\n- private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bool includeUnlisted, bool includeVersions)\n+ private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bool includeUnlisted,\n+ bool includeVersions, bool includeVulnerabilities)\n{\nIQueryable<Package> packages = _packageRepository.GetAll()\n.Where(p => p.PackageRegistration.Owners.Any(o => ownerKeys.Contains(o.Key)));\n@@ -437,7 +442,7 @@ private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bo\nif (!includeVersions)\n{\n- // Do a best effort of retrieving the latest version. Note that UpdateIsLatest has had concurrency issues\n+ // Do a best effort of retrieving the latest versions. Note that UpdateIsLatest has had concurrency issues\n// where sometimes packages no rows with IsLatest set. In this case, we'll just select the last inserted\n// row (descending [Key]) as opposed to reading all rows into memory and sorting on NuGetVersion.\npackages = packages\n@@ -453,11 +458,17 @@ private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bo\n.FirstOrDefault());\n}\n- return packages\n+ var result = packages\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners)\n- .Include(p => p.PackageRegistration.RequiredSigners)\n- .ToList();\n+ .Include(p => p.PackageRegistration.RequiredSigners);\n+\n+ if (includeVulnerabilities)\n+ {\n+ result = result.Include($\"{nameof(Package.VulnerablePackageRanges)}.{nameof(VulnerablePackageVersionRange.Vulnerability)}\");\n+ }\n+\n+ return result.ToList();\n}\npublic IQueryable<PackageRegistration> FindPackageRegistrationsByOwner(User user)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -35,6 +35,7 @@ public partial class UsersController\nprivate readonly ListPackageItemViewModelFactory _listPackageItemViewModelFactory;\nprivate readonly ISupportRequestService _supportRequestService;\nprivate readonly IFeatureFlagService _featureFlagService;\n+ private readonly IPackageVulnerabilitiesService _packageVulnerabilitiesService;\npublic UsersController(\nIUserService userService,\n@@ -51,6 +52,7 @@ public partial class UsersController\nICertificateService certificateService,\nIContentObjectService contentObjectService,\nIFeatureFlagService featureFlagService,\n+ IPackageVulnerabilitiesService packageVulnerabilitiesService,\nIMessageServiceConfiguration messageServiceConfiguration,\nIIconUrlProvider iconUrlProvider,\nIGravatarProxyService gravatarProxy)\n@@ -73,8 +75,10 @@ public partial class UsersController\n_credentialBuilder = credentialBuilder ?? throw new ArgumentNullException(nameof(credentialBuilder));\n_supportRequestService = supportRequestService ?? throw new ArgumentNullException(nameof(supportRequestService));\n_featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));\n+ _packageVulnerabilitiesService = packageVulnerabilitiesService ?? throw new ArgumentNullException(nameof(packageVulnerabilitiesService));\n- _listPackageItemRequiredSignerViewModelFactory = new ListPackageItemRequiredSignerViewModelFactory(securityPolicyService, iconUrlProvider);\n+ _listPackageItemRequiredSignerViewModelFactory = new ListPackageItemRequiredSignerViewModelFactory(\n+ securityPolicyService, iconUrlProvider, packageVulnerabilitiesService);\n_listPackageItemViewModelFactory = new ListPackageItemViewModelFactory(iconUrlProvider);\n}\n@@ -521,7 +525,8 @@ public virtual ActionResult Packages()\nvar wasAADLoginOrMultiFactorAuthenticated = User.WasMultiFactorAuthenticated() || User.WasAzureActiveDirectoryAccountUsedForSignin();\n- var packages = PackageService.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\n+ var packages = PackageService.FindPackagesByAnyMatchingOwner(\n+ currentUser, includeUnlisted: true, includeVulnerabilities: true);\nvar listedPackages = GetPackages(packages, currentUser, wasAADLoginOrMultiFactorAuthenticated,\np => p.Listed && p.PackageStatusKey == PackageStatus.Available);\n@@ -559,8 +564,10 @@ public virtual ActionResult Packages()\nOwnerRequests = ownerRequests,\nReservedNamespaces = reservedPrefixes,\nWasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated(),\n- IsCertificatesUIEnabled = ContentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false\n+ IsCertificatesUIEnabled = ContentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false,\n+ IsPackageVulnerabilitiesEnabled = _featureFlagService.IsDisplayVulnerabilitiesEnabled()\n};\n+\nreturn View(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/ViewModelExtensions/ListPackageItemRequiredSignerViewModelFactory.cs",
"new_path": "src/NuGetGallery/Helpers/ViewModelExtensions/ListPackageItemRequiredSignerViewModelFactory.cs",
"diff": "@@ -13,11 +13,16 @@ public class ListPackageItemRequiredSignerViewModelFactory\n{\nprivate readonly ListPackageItemViewModelFactory _listPackageItemViewModelFactory;\nprivate readonly ISecurityPolicyService _securityPolicyService;\n+ private readonly IPackageVulnerabilitiesService _packageVulnerabilitiesService;\n- public ListPackageItemRequiredSignerViewModelFactory(ISecurityPolicyService securityPolicyService, IIconUrlProvider iconUrlProvider)\n+ public ListPackageItemRequiredSignerViewModelFactory(\n+ ISecurityPolicyService securityPolicyService,\n+ IIconUrlProvider iconUrlProvider,\n+ IPackageVulnerabilitiesService packageVulnerabilitiesService)\n{\n_listPackageItemViewModelFactory = new ListPackageItemViewModelFactory(iconUrlProvider);\n_securityPolicyService = securityPolicyService ?? throw new ArgumentNullException(nameof(securityPolicyService));\n+ _packageVulnerabilitiesService = packageVulnerabilitiesService ?? throw new ArgumentNullException(nameof(packageVulnerabilitiesService));\n}\n// username must be an empty string because <select /> option values are based on username\n@@ -125,6 +130,8 @@ public ListPackageItemRequiredSignerViewModelFactory(ISecurityPolicyService secu\nviewModel.CanEditRequiredSigner &= wasAADLoginOrMultiFactorAuthenticated;\n}\n+ viewModel.IsVulnerable = _packageVulnerabilitiesService.IsPackageVulnerable(package);\n+\nreturn viewModel;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageVulnerabilitiesService.cs",
"new_path": "src/NuGetGallery/Services/IPackageVulnerabilitiesService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Collections.Generic;\n-using System.Threading.Tasks;\nusing NuGet.Services.Entities;\nnamespace NuGetGallery\n@@ -14,5 +13,11 @@ public interface IPackageVulnerabilitiesService\n/// </summary>\n/// <param name=\"id\">id of the package for this query</param>\nIReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id);\n+\n+ /// <summary>\n+ /// Returns true if the package has a vulnerability\n+ /// </summary>\n+ /// <param name=\"package\">package to examine</param>\n+ bool IsPackageVulnerable(Package package);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"new_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Data.Entity;\n+using System.IO;\nusing System.Linq;\nusing NuGet.Services.Entities;\n@@ -41,5 +42,20 @@ public PackageVulnerabilitiesService(IEntitiesContext entitiesContext)\nreturn !result.Any() ? null :\nresult.ToDictionary(kv => kv.Key, kv => kv.Value as IReadOnlyList<PackageVulnerability>);\n}\n+\n+ public bool IsPackageVulnerable(Package package)\n+ {\n+ if (package == null)\n+ {\n+ throw new ArgumentNullException(nameof(package));\n+ }\n+\n+ if (package.VulnerablePackageRanges == null)\n+ {\n+ throw new ArgumentException($\"{nameof(package.VulnerablePackageRanges)} should be included in package query\");\n+ }\n+\n+ return package.VulnerablePackageRanges.FirstOrDefault(vpr => vpr.Vulnerability != null) != null;\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"diff": "@@ -23,5 +23,7 @@ public class ManagePackagesViewModel\npublic bool WasMultiFactorAuthenticated { get; set; }\npublic bool IsCertificatesUIEnabled { get; set; }\n+\n+ public bool IsPackageVulnerabilitiesEnabled { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "@@ -28,6 +28,7 @@ public class PackageViewModel : IPackageVersionModel\npublic string Version { get; set; }\npublic string FullVersion { get; set; }\npublic PackageStatusSummary PackageStatusSummary { get; set; }\n+ public bool IsVulnerable { get; set; }\npublic bool IsCurrent(IPackageVersionModel current)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/AccountDeleter.Facts/EvaluatorFacts.cs",
"new_path": "tests/AccountDeleter.Facts/EvaluatorFacts.cs",
"diff": "@@ -31,7 +31,7 @@ public EvaluatorFacts(ITestOutputHelper output)\npublic void NuGetDeleteevaluatorReturnsCorrectValueForUnconfirmed()\n{\n// Setup\n- _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>()))\n.Returns(() =>\n{\nreturn new List<Package>();\n@@ -58,7 +58,7 @@ public void NuGetDeleteevaluatorReturnsCorrectValueForUnconfirmed()\npublic void NuGetDeleteevaluatorReturnsCorrectValueForPackages(bool userHasPackages, bool expectedResult)\n{\n// Setup\n- _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>()))\n.Returns(() =>\n{\nif (userHasPackages)\n@@ -94,7 +94,7 @@ public void NuGetDeleteevaluatorReturnsCorrectValueForPackages(bool userHasPacka\npublic void NuGetDeleteevaluatorReturnsCorrectValueForOrganizations(bool userHasOrgs, bool userIsAdmin, bool expectedResult)\n{\n// Setup\n- _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>()))\n.Returns(() =>\n{\nreturn new List<Package>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -1665,7 +1665,7 @@ public async Task IfAdministrator_ShowsViewWithCorrectData(bool isPackageOrphane\n.Setup(stub => stub.FindByUsername(testOrganization.Username, false))\n.Returns(testOrganization);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testOrganization, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testOrganization, It.IsAny<bool>(), false, false))\n.Returns(userPackages);\nGetMock<IPackageService>()\n.Setup(stub => stub.WillPackageBeOrphanedIfOwnerRemoved(packageRegistration, testOrganization))\n@@ -1700,7 +1700,7 @@ public async Task IfOrphanedPackages_RedirectsToDeleteRequest()\ncontroller.SetCurrentUser(fakes.OrganizationOwnerAdmin);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByAnyMatchingOwner(testOrganization, true, false))\n+ .Setup(x => x.FindPackagesByAnyMatchingOwner(testOrganization, true, false, false))\n.Returns(new[] { new Package { Version = \"1.0.0\", PackageRegistration = new PackageRegistration { Owners = new[] { testOrganization } } } });\nGetMock<IPackageService>()\n.Setup(x => x.WillPackageBeOrphanedIfOwnerRemoved(It.IsAny<PackageRegistration>(), testOrganization))\n@@ -2484,7 +2484,7 @@ public void DeleteHappyAccount(bool withPendingIssues)\n.Setup(stub => stub.FindByUsername(username, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, false))\n.Returns(userPackages);\nconst string iconUrl = \"https://icon.test/url\";\nGetMock<IIconUrlProvider>()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1099,7 +1099,7 @@ public void ReturnsSinglePackageAsExpected(User currentUser, User owner)\n.Returns(owner);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByOwner(owner, false, false))\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false, false))\n.Returns(new[] { package, invalidatedPackage, validatingPackage, deletedPackage });\nvar controller = GetController<UsersController>();\n@@ -1153,7 +1153,7 @@ public void SortsPackagesByDownloadCount(User currentUser, User owner)\n.Returns(owner);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByOwner(owner, false, false))\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false, false))\n.Returns(new[] { package1, package2 });\nvar controller = GetController<UsersController>();\n@@ -1195,7 +1195,7 @@ public void UsesProperIconUrl(User currentUser, User owner)\n.Setup(x => x.FindByUsername(username, false))\n.Returns(owner);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByOwner(owner, false, false))\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false, false))\n.Returns(new[] { userPackage });\nvar controller = GetController<UsersController>();\n@@ -2273,7 +2273,7 @@ public void ShowsViewWithCorrectData(bool isPackageOrphaned, bool withPendingIss\n.Setup(stub => stub.FindByUsername(testUser.Username, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n.Returns(userPackages);\nGetMock<IPackageService>()\n.Setup(stub => stub.WillPackageBeOrphanedIfOwnerRemoved(packageRegistration, testUser))\n@@ -2356,7 +2356,7 @@ public async Task SucceedsIfSupportRequestIsAdded(bool successOnSentRequest)\n.Setup(stub => stub.FindByUsername(userName, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n.Returns(userPackages);\nGetMock<ISupportRequestService>()\n.Setup(stub => stub.GetIssues(null, null, null, userName))\n@@ -3690,7 +3690,7 @@ public void DeleteHappyAccount(bool withPendingIssues)\n.Setup(stub => stub.FindByUsername(userName, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n.Returns(userPackages);\nGetMock<ISupportRequestService>()\n.Setup(stub => stub.GetIssues(null, null, null, null))\n@@ -3729,7 +3729,7 @@ private PackageRegistration CreatePackageRegistration(string Id, int Key, string\npackageRegistration.Id = Id;\npackageRegistration.Owners.Add(_testUser);\n- var userPackage1 = new Package()\n+ var userPackage1 = new Package\n{\nKey = Key,\nVersion = Version,\n@@ -3747,7 +3747,7 @@ public void PackagesAreSortedById()\nPackageRegistration packageRegistration2 = CreatePackageRegistration(\"Company.AlphaPackage\", 1, \"1.0.0\", \"first\");\nPackageRegistration packageRegistration3 = CreatePackageRegistration(\"Company.NormalPackage\", 1, \"1.0.0\", \"middle\");\n- var userPackages = new List<Package>() {\n+ var userPackages = new List<Package> {\npackageRegistration1.Packages.First(),\npackageRegistration2.Packages.First(),\npackageRegistration3.Packages.First()\n@@ -3758,7 +3758,7 @@ public void PackagesAreSortedById()\n.Returns(_testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n.Returns(userPackages);\nvar model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n@@ -3775,7 +3775,7 @@ public void PackagesVersionSortOrderIsSetBySemVer()\nPackageRegistration packageRegistration2 = CreatePackageRegistration(\"Company.NormalPackage\", 1, \"0.0.1\", \"first\");\nPackageRegistration packageRegistration3 = CreatePackageRegistration(\"Company.AlphaPackage\", 1, \"1.1.0\", \"last\");\n- var userPackages = new List<Package>() {\n+ var userPackages = new List<Package> {\npackageRegistration1.Packages.First(),\npackageRegistration2.Packages.First(),\npackageRegistration3.Packages.First()\n@@ -3786,7 +3786,7 @@ public void PackagesVersionSortOrderIsSetBySemVer()\n.Returns(_testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n.Returns(userPackages);\nvar model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n@@ -3813,7 +3813,7 @@ public void UsesProperIconUrl()\n.Setup(stub => stub.FindByUsername(userName, false))\n.Returns(_testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n.Returns(userPackages);\nvar model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n@@ -3822,6 +3822,37 @@ public void UsesProperIconUrl()\n.Verify(iup => iup.GetIconUrlString(userPackage), Times.AtLeastOnce);\nAssert.Equal(iconUrl, model.ListedPackages.Single().IconUrl);\n}\n+\n+ [Fact]\n+ public void AssessesVulnerabilities()\n+ {\n+ PackageRegistration zebraRegistration = CreatePackageRegistration(\"Company.ZebraPackage\", 1, \"1.0.0\", \"test zebra vulnerable\");\n+ PackageRegistration alphaRegistration = CreatePackageRegistration(\"Company.AlphaPackage\", 1, \"1.1.1\", \"test alpha clean\");\n+ var versionRange = new VulnerablePackageVersionRange\n+ {\n+ PackageVersionRange = \"1.0.0\"\n+ };\n+ var zebraPackage = zebraRegistration.Packages.First();\n+ var alphaPackage = alphaRegistration.Packages.First();\n+ zebraPackage.VulnerablePackageRanges = new List<VulnerablePackageVersionRange> { versionRange };\n+ versionRange.Vulnerability = new PackageVulnerability();\n+ var latestPackages = new List<Package> { zebraPackage, alphaPackage };\n+\n+ GetMock<IUserService>()\n+ .Setup(stub => stub.FindByUsername(userName, false))\n+ .Returns(_testUser);\n+ GetMock<IPackageVulnerabilitiesService>()\n+ .Setup(stub => stub.IsPackageVulnerable(It.IsAny<Package>()))\n+ .Returns<Package>(package => (package?.Id ?? \"\") == \"Company.ZebraPackage\"); // this is the vulnerable package - true if this\n+ GetMock<IPackageService>()\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Returns(latestPackages);\n+\n+ var model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n+\n+ Assert.False(model.ListedPackages.ToArray()[0].IsVulnerable); // alpha\n+ Assert.True(model.ListedPackages.ToArray()[1].IsVulnerable); // zebra\n+ }\n}\npublic class TheGetAvatarAction : TestContainer\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -805,7 +805,8 @@ private Mock<IPackageService> SetupPackageService(bool isPackageOrphaned)\nvar packageService = new Mock<IPackageService>();\nif (_user != null)\n{\n- packageService.Setup(m => m.FindPackagesByAnyMatchingOwner(_user, true, It.IsAny<bool>())).Returns(_userPackages);\n+ packageService.Setup(m => m.FindPackagesByAnyMatchingOwner(\n+ _user, true, It.IsAny<bool>(), It.IsAny<bool>())).Returns(_userPackages);\nvar packageRegistraionList = new List<PackageRegistration>();\nif(_userPackagesRegistration != null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"diff": "@@ -37,7 +37,8 @@ public ListPackageItemRequiredSignerViewModelFactoryFacts()\n[Fact]\npublic void WhenPackageIsNull_Throws()\n{\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\nvar exception = Assert.Throws<ArgumentNullException>(() => target.Create(\npackage: null,\ncurrentUser: _currentUser,\n@@ -54,7 +55,8 @@ public void WhenCurrentUserIsNull_Throws()\nPackageRegistration = new PackageRegistration(),\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\nvar exception = Assert.Throws<ArgumentNullException>(\n() => target.Create(\n@@ -74,7 +76,8 @@ public void WhenSecurityPolicyServiceIsNull_Throws()\nVersion = \"1.0.0\"\n};\n- var exception = Assert.Throws<ArgumentNullException>(() => new ListPackageItemRequiredSignerViewModelFactory(null, Mock.Of<IIconUrlProvider>()));\n+ var exception = Assert.Throws<ArgumentNullException>(() => new ListPackageItemRequiredSignerViewModelFactory(\n+ null, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>()));\nAssert.Equal(\"securityPolicyService\", exception.ParamName);\n}\n@@ -95,7 +98,8 @@ public void WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequiredSignerIsNull\nIt.Is<User>(user => user == _currentUser),\nIt.Is<string>(policyName => policyName == ControlRequiredSignerPolicy.PolicyName)))\n.Returns(false);\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\nvar viewModel = target.Create(\npackage,\n@@ -125,7 +129,8 @@ public void WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequiredSignerIsCurr\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(x => x.IsSubscribed(\nIt.Is<User>(user => user == _currentUser),\n@@ -160,7 +165,8 @@ public void WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequiredSignerIsAnot\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(x => x.IsSubscribed(\nIt.Is<User>(user => user == _currentUser),\n@@ -194,7 +200,8 @@ public void WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRequiredSigner\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -229,7 +236,8 @@ public void WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwnerAndNotMultiFactorAu\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -279,7 +287,8 @@ public void WhenPackageHasOneOwnerAndTheCurrentUserIsACollaborator_WhenRequiredS\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -315,7 +324,8 @@ public void WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRequiredSigner\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -351,7 +361,8 @@ public void WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRequiredSigner\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -414,7 +425,8 @@ public void WhenPackageHasMultipleOwners_WhenOwnersHaveVaryingCertificateCounts(\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -450,7 +462,8 @@ public void WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenCurrentUserHas\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -486,7 +499,8 @@ public void WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenCurrentUserDoe\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -533,7 +547,8 @@ public void WhenPackageHasThreeOwnersAndTheCurrentUserIsAnOwner_WhenTwoOtherOwne\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n@@ -591,7 +606,8 @@ public void WhenPackageHasFourOwnersAndTheCurrentUserIsAnOwner_WhenThreeOtherOwn\n},\nVersion = \"1.0.0\"\n};\n- var target = new ListPackageItemRequiredSignerViewModelFactory(_securityPolicyService.Object, Mock.Of<IIconUrlProvider>());\n+ var target = new ListPackageItemRequiredSignerViewModelFactory(\n+ _securityPolicyService.Object, Mock.Of<IIconUrlProvider>(), Mock.Of<IPackageVulnerabilitiesService>());\n_securityPolicyService.Setup(\nx => x.IsSubscribed(\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add IsVulnerable to Manage Packages view model (#8435)
Expand view models for vulnerabilities in manage packages page |
455,754 | 12.03.2021 11:51:28 | -36,000 | 62bd2c3880869be8cc3a26b2155aa2afe7532ab5 | Extend vulnerabilities verification to metadata
Extend vulnerabilities verification to metadata | [
{
"change_type": "MODIFY",
"old_path": "src/VerifyGitHubVulnerabilities/Configuration/VerifyGitHubVulnerabilitiesConfiguration.cs",
"new_path": "src/VerifyGitHubVulnerabilities/Configuration/VerifyGitHubVulnerabilitiesConfiguration.cs",
"diff": "@@ -16,5 +16,20 @@ public class VerifyGitHubVulnerabilitiesConfiguration\n/// The personal access token to use to authenticate with GitHub.\n/// </summary>\npublic string GitHubPersonalAccessToken { get; set; }\n+\n+ /// <summary>\n+ /// The v3 index URI string for fetching registration metadata\n+ /// </summary>\n+ public string NuGetV3Index { get; set; }\n+\n+ /// <summary>\n+ /// Whether to verify GitHubVulnerabilities in the gallery database\n+ /// </summary>\n+ public bool VerifyDatabase { get; set; } = true;\n+\n+ /// <summary>\n+ /// Whether to verify GitHubVulnerabilities in the registration blobs\n+ /// </summary>\n+ public bool VerifyRegistrationMetadata { get; set; } = true;\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyGitHubVulnerabilities/Job.cs",
"new_path": "src/VerifyGitHubVulnerabilities/Job.cs",
"diff": "@@ -34,13 +34,13 @@ public override async Task Run()\nConsole.WriteLine($\" FOUND {advisories.Count} advisories.\");\nConsole.WriteLine(\"Fetching vulnerabilities from DB...\");\n- var verifier = new PackageVulnerabilitiesVerifier(_serviceProvider.GetRequiredService<IEntitiesContext>());\n- var ingestor = new AdvisoryIngestor(verifier, new GitHubVersionRangeParser());\n+ var ingestor = _serviceProvider.GetRequiredService<IAdvisoryIngestor>();\nawait ingestor.IngestAsync(advisories);\n+ var verifier = _serviceProvider.GetRequiredService<IPackageVulnerabilitiesVerifier>();\nConsole.WriteLine(verifier.HasErrors ?\n\"DB does not match GitHub API - see stderr output for details\" :\n- \"DB matches GitHub API!\");\n+ \"DB/metadata matches GitHub API!\");\n}\nprotected override void ConfigureJobServices(IServiceCollection services, IConfigurationRoot configurationRoot)\n@@ -68,6 +68,12 @@ protected void ConfigureIngestionServices(ContainerBuilder containerBuilder)\ncontainerBuilder\n.RegisterType<AdvisoryIngestor>()\n.As<IAdvisoryIngestor>();\n+\n+ containerBuilder\n+ .RegisterType<PackageVulnerabilitiesVerifier>()\n+ .As<IPackageVulnerabilitiesManagementService>()\n+ .As<IPackageVulnerabilitiesVerifier>()\n+ .SingleInstance();\n}\nprotected void ConfigureGalleryServices(ContainerBuilder containerBuilder)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyGitHubVulnerabilities/Verify/PackageVulnerabilitiesVerifier.cs",
"new_path": "src/VerifyGitHubVulnerabilities/Verify/PackageVulnerabilitiesVerifier.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections.Generic;\nusing System.Data.Entity;\nusing System.Linq;\n+using System.Threading;\nusing System.Threading.Tasks;\n+using NuGet.Configuration;\n+using NuGet.Protocol;\n+using NuGet.Protocol.Core.Types;\nusing NuGet.Services.Entities;\nusing NuGet.Versioning;\nusing NuGetGallery;\n+using VerifyGitHubVulnerabilities.Configuration;\nnamespace VerifyGitHubVulnerabilities.Verify\n{\n- public class PackageVulnerabilitiesVerifier : IPackageVulnerabilitiesManagementService\n+ public class PackageVulnerabilitiesVerifier : IPackageVulnerabilitiesVerifier\n{\n+ private readonly VerifyGitHubVulnerabilitiesConfiguration _configuration;\nprivate readonly IEntitiesContext _entitiesContext;\n- public PackageVulnerabilitiesVerifier(\n+ private Lazy<Task<PackageMetadataResource>> _packageMetadataResource;\n+ private Dictionary<string, IEnumerable<IPackageSearchMetadata>> _packageMetadata;\n+\n+ private static readonly SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1);\n+\n+ public PackageVulnerabilitiesVerifier(VerifyGitHubVulnerabilitiesConfiguration configuration,\nIEntitiesContext entitiesContext)\n{\n- _entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n+ _configuration = configuration;\n+ if (_configuration.VerifyDatabase)\n+ {\n+ _entitiesContext = entitiesContext;\n+ }\n+\n+ _packageMetadata = new Dictionary<string, IEnumerable<IPackageSearchMetadata>>();\n+ _packageMetadataResource = new Lazy<Task<PackageMetadataResource>>(InitializeMetadataResourceAsync);\n}\npublic bool HasErrors { get; private set; }\n@@ -36,7 +55,26 @@ public Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, bool wi\nreturn Task.CompletedTask;\n}\n- Console.WriteLine($\"Verifying vulnerability {vulnerability.GitHubDatabaseKey}.\");\n+ if (_configuration.VerifyDatabase)\n+ {\n+ VerifyVulnerabilityInDatabase(vulnerability, withdrawn);\n+ }\n+\n+ // Note: testing a withdrawn advisory isn't practical in registration metadata. We can only download\n+ // metadata for a package, and would need to download all package/version blobs to determine an advisory\n+ // is no longer present. Covering withdrawn advisory processing in the database will be adequate.\n+ if (_configuration.VerifyRegistrationMetadata && !withdrawn)\n+ {\n+ return VerifyVulnerabilityInMetadataAsync(vulnerability);\n+ }\n+\n+ return Task.CompletedTask;\n+ }\n+\n+ private void VerifyVulnerabilityInDatabase(PackageVulnerability vulnerability, bool withdrawn)\n+ {\n+ Console.WriteLine($\"[Database] Verifying vulnerability {vulnerability.GitHubDatabaseKey}.\");\n+\nvar existingVulnerability = _entitiesContext.Vulnerabilities\n.Include(v => v.AffectedRanges)\n.SingleOrDefault(v => v.GitHubDatabaseKey == vulnerability.GitHubDatabaseKey);\n@@ -46,25 +84,25 @@ public Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, bool wi\nif (existingVulnerability != null)\n{\nConsole.Error.WriteLine(withdrawn ?\n- $@\"Vulnerability advisory {vulnerability.GitHubDatabaseKey} was withdrawn and should not be in DB!\" :\n- $@\"Vulnerability advisory {vulnerability.GitHubDatabaseKey} affects no packages and should not be in DB!\");\n+ $@\"[Database] Vulnerability advisory {vulnerability.GitHubDatabaseKey} was withdrawn and should not be in DB!\" :\n+ $@\"[Database] Vulnerability advisory {vulnerability.GitHubDatabaseKey} affects no packages and should not be in DB!\");\nHasErrors = true;\n}\n- return Task.CompletedTask;\n+ return;\n}\nif (existingVulnerability == null)\n{\n- Console.Error.WriteLine($\"Cannot find vulnerability {vulnerability.GitHubDatabaseKey} in DB!\");\n+ Console.Error.WriteLine($\"[Database] Cannot find vulnerability {vulnerability.GitHubDatabaseKey} in DB!\");\nHasErrors = true;\n- return Task.CompletedTask;\n+ return;\n}\nif (existingVulnerability.Severity != vulnerability.Severity)\n{\nConsole.Error.WriteLine(\n- $@\"Vulnerability advisory {vulnerability.GitHubDatabaseKey\n+ $@\"[Database] Vulnerability advisory {vulnerability.GitHubDatabaseKey\n}, severity does not match! GitHub: {vulnerability.Severity}, DB: {existingVulnerability.Severity}\");\nHasErrors = true;\n}\n@@ -72,21 +110,21 @@ public Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, bool wi\nif (existingVulnerability.AdvisoryUrl != vulnerability.AdvisoryUrl)\n{\nConsole.Error.WriteLine(\n- $@\"Vulnerability advisory {vulnerability.GitHubDatabaseKey\n+ $@\"[Database] Vulnerability advisory {vulnerability.GitHubDatabaseKey\n}, advisory URL does not match! GitHub: {vulnerability.AdvisoryUrl}, DB: { existingVulnerability.AdvisoryUrl}\");\nHasErrors = true;\n}\nforeach (var range in vulnerability.AffectedRanges)\n{\n- Console.WriteLine($\"Verifying range affecting {range.PackageId} {range.PackageVersionRange}.\");\n+ Console.WriteLine($\"[Database] Verifying range affecting {range.PackageId} {range.PackageVersionRange}.\");\nvar existingRange = existingVulnerability.AffectedRanges\n.SingleOrDefault(r => r.PackageId == range.PackageId && r.PackageVersionRange == range.PackageVersionRange);\nif (existingRange == null)\n{\nConsole.Error.WriteLine(\n- $@\"Vulnerability advisory {vulnerability.GitHubDatabaseKey\n+ $@\"[Database] Vulnerability advisory {vulnerability.GitHubDatabaseKey\n}, cannot find range {range.PackageId} {range.PackageVersionRange} in DB!\");\nHasErrors = true;\ncontinue;\n@@ -95,7 +133,7 @@ public Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, bool wi\nif (existingRange.FirstPatchedPackageVersion != range.FirstPatchedPackageVersion)\n{\nConsole.Error.WriteLine(\n- $@\"Vulnerability advisory {vulnerability.GitHubDatabaseKey\n+ $@\"[Database] Vulnerability advisory {vulnerability.GitHubDatabaseKey\n}, range {range.PackageId} {range.PackageVersionRange}, first patched version does not match! GitHub: {\nrange.FirstPatchedPackageVersion}, DB: {range.FirstPatchedPackageVersion}\");\nHasErrors = true;\n@@ -113,15 +151,153 @@ public Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, bool wi\nif (versionRange.Satisfies(version) != package.VulnerablePackageRanges.Contains(existingRange))\n{\nConsole.Error.WriteLine(\n- $@\"Vulnerability advisory {vulnerability.GitHubDatabaseKey\n+ $@\"[Database] Vulnerability advisory {vulnerability.GitHubDatabaseKey\n}, range {range.PackageId} {range.PackageVersionRange}, package {package.NormalizedVersion\n} is not properly marked vulnerable to vulnerability!\");\nHasErrors = true;\n}\n}\n}\n+ }\n+\n+ private Task VerifyVulnerabilityInMetadataAsync(PackageVulnerability gitHubAdvisory)\n+ {\n+ Console.WriteLine($\"[Metadata] Verifying vulnerability {gitHubAdvisory.GitHubDatabaseKey}.\");\n+ if (gitHubAdvisory.AffectedRanges == null || !gitHubAdvisory.AffectedRanges.Any())\n+ {\nreturn Task.CompletedTask;\n}\n+\n+ // Group ranges by id -- this makes testing metadata collections cleaner\n+ var rangesById = new Dictionary<string, IList<string>>();\n+ foreach (var range in gitHubAdvisory.AffectedRanges)\n+ {\n+ var id = range.PackageId.Trim(' '); // some incoming data needs cleaning\n+ if (rangesById.TryGetValue(id, out var packageVersionRangeForId))\n+ {\n+ packageVersionRangeForId.Add(range.PackageVersionRange);\n+ }\n+ else\n+ {\n+ rangesById[id] = new List<string> {range.PackageVersionRange};\n+ }\n+ }\n+\n+ var verificationJobsForAdvisory = new List<Task>();\n+ foreach (var rangeById in rangesById)\n+ {\n+ verificationJobsForAdvisory.Add(\n+ VerifyVulnerabilityForRangeAsync(\n+ rangeById.Key,\n+ ranges: rangeById.Value,\n+ gitHubAdvisory.AdvisoryUrl,\n+ gitHubAdvisory.GitHubDatabaseKey,\n+ gitHubAdvisory.Severity)\n+ );\n+ }\n+\n+ return Task.WhenAll(verificationJobsForAdvisory);\n+ }\n+\n+ private async Task VerifyVulnerabilityForRangeAsync(\n+ string packageId,\n+ IList<string> ranges,\n+ string advisoryUrl,\n+ int advisoryDatabaseKey,\n+ PackageVulnerabilitySeverity advisorySeverity)\n+ {\n+ // Fetch metadata from registration blobs for verification--a collection of all versions of the package Id\n+ var metadata = await GetPackageMetadataAsync(packageId);\n+ foreach (var versionMetadata in metadata)\n+ {\n+ var matchingVulnerabilities = Enumerable.Empty<PackageVulnerabilityMetadata>();\n+ if (versionMetadata.Vulnerabilities != null)\n+ {\n+ matchingVulnerabilities = versionMetadata.Vulnerabilities.Where(v => v.AdvisoryUrl.ToString() == advisoryUrl);\n+ }\n+\n+ var hasTheVulnerability = matchingVulnerabilities.Any();\n+\n+ // Check whether a version range pertaining to this id in the github advisory is satisfied by this metadata version\n+ var versionisInGitHubRange = false;\n+ foreach (var range in ranges)\n+ {\n+ var gitHubVersionRange = VersionRange.Parse(range);\n+ if (gitHubVersionRange.Satisfies(versionMetadata.Identity.Version, new VersionComparer()))\n+ {\n+ versionisInGitHubRange = true;\n+ break;\n+ }\n+ }\n+\n+ if (versionisInGitHubRange)\n+ {\n+ if (!hasTheVulnerability)\n+ {\n+ Console.Error.WriteLine(\n+ $@\"[Metadata] Vulnerability advisory {advisoryDatabaseKey\n+ }, version {versionMetadata.Identity.Version} of package {packageId} is not marked vulnerable and is in a vulnerable range!\");\n+ HasErrors = true;\n+ }\n+\n+ // Test whether we have any severity mismatches\n+ var firstSeverityMismatch = matchingVulnerabilities\n+ .FirstOrDefault(v => v.Severity != (int)advisorySeverity);\n+ if (firstSeverityMismatch != null)\n+ {\n+ Console.Error.WriteLine(\n+ $@\"[Metadata] Vulnerability advisory {advisoryDatabaseKey\n+ }, severities has at least one mismatch! GitHub: {advisorySeverity}, Metadata: {firstSeverityMismatch.Severity}\");\n+ HasErrors = true;\n+ }\n+ }\n+ else\n+ {\n+ if (hasTheVulnerability)\n+ {\n+ Console.Error.WriteLine(\n+ $@\"[Metadata] Vulnerability advisory {advisoryDatabaseKey\n+ }, version {versionMetadata} of package {packageId} is marked vulnerable and is not in a vulnerable range!\");\n+ HasErrors = true;\n+ }\n+ }\n+ }\n+ }\n+\n+ private async Task<IEnumerable<IPackageSearchMetadata>> GetPackageMetadataAsync(string packageId)\n+ {\n+ // We need this to be thread-safe as it's called by multiple tasks concurrently\n+ await semaphoreSlim.WaitAsync();\n+\n+ try\n+ {\n+ if (!_packageMetadata.TryGetValue(packageId, out IEnumerable<IPackageSearchMetadata> metadata))\n+ {\n+ metadata = (await (await _packageMetadataResource.Value).GetMetadataAsync(\n+ packageId,\n+ includePrerelease: true,\n+ includeUnlisted: false,\n+ sourceCacheContext: new SourceCacheContext(),\n+ log: NuGet.Common.NullLogger.Instance,\n+ token: CancellationToken.None)).ToList();\n+ _packageMetadata[packageId] = metadata;\n+ }\n+\n+ return metadata;\n+ }\n+ finally\n+ {\n+ semaphoreSlim.Release();\n+ }\n+ }\n+\n+ private async Task<PackageMetadataResource> InitializeMetadataResourceAsync()\n+ {\n+ var providers = Repository.Provider.GetCoreV3();\n+ var packageSource = new PackageSource(_configuration.NuGetV3Index, \"NuGet Source\", isEnabled: true);\n+ var sourceRepository = Repository.CreateSource(providers, packageSource, FeedType.Undefined);\n+ return await sourceRepository.GetResourceAsync<PackageMetadataResource>(CancellationToken.None);\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyGitHubVulnerabilities/VerifyGitHubVulnerabilities.csproj",
"new_path": "src/VerifyGitHubVulnerabilities/VerifyGitHubVulnerabilities.csproj",
"diff": "<Compile Include=\"Job.cs\" />\n<Compile Include=\"Program.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n+ <Compile Include=\"Verify\\IPackageVulnerabilitiesVerifier.cs\" />\n<Compile Include=\"Verify\\PackageVulnerabilitiesVerifier.cs\" />\n</ItemGroup>\n<ItemGroup>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Extend vulnerabilities verification to metadata (#8412)
Extend vulnerabilities verification to metadata |
455,754 | 12.03.2021 12:13:41 | -36,000 | b5783d2969837221bab05ad9e463c77a7d9efe02 | Add vulnerable warnings to Manage Packages page
Show vulnerability alerts on manage packages page | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1605,6 +1605,17 @@ img.reserved-indicator-icon {\n.page-manage-packages .inner-table {\nmargin-bottom: 0px;\n}\n+.page-manage-packages .inner-table .package-icon-cell {\n+ cursor: default;\n+ padding-left: 0;\n+ padding-right: 0;\n+ text-align: right;\n+}\n+.page-manage-packages .inner-table .package-icon-cell .package-icon {\n+ padding-left: 6px;\n+ padding-right: 6px;\n+ padding-top: 6px;\n+}\n.page-manage-packages .required-signer {\nwidth: 100%;\nmax-width: 90%;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"new_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"diff": ".inner-table {\nmargin-bottom: 0px;\n+\n+ .package-icon-cell {\n+ cursor: default;\n+ padding-left: 0;\n+ padding-right: 0;\n+ text-align: right;\n+\n+ .package-icon {\n+ padding-left: 6px;\n+ padding-right: 6px;\n+ padding-top: 6px;\n+ }\n+ }\n}\n.required-signer {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Telemetry/TelemetryService.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/TelemetryService.cs",
"diff": "using System.Net.Http;\nusing System.Security.Principal;\nusing System.Web;\n+using Microsoft.Owin.Security.MicrosoftAccount;\nusing Newtonsoft.Json;\nusing NuGet.Services.Entities;\nusing NuGet.Services.FeatureFlags;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Diagnostics;\nusing System.Globalization;\nusing System.Linq;\nusing System.Net;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"diff": "this.ShowRequiredSigner = packageItem.ShowRequiredSigner;\nthis.ShowTextBox = packageItem.ShowTextBox;\nthis.CanEditRequiredSigner = packageItem.CanEditRequiredSigner;\n+ this.IsVulnerable = packageItem.IsVulnerable;\nthis.CanEdit = packageItem.CanEdit;\nthis.CanManageOwners = packageItem.CanManageOwners;\nthis.CanDelete = packageItem.CanDelete;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "}\n<th class=\"sortable\">Downloads</th>\n<th class=\"sortable\">Latest Version</th>\n+ @if (Model.IsPackageVulnerabilitiesEnabled)\n+ {\n+ <th><span class=\"hidden\">Package warnings</span></th>\n+ }\n<th><span class=\"hidden\">Icon</span></th>\n</tr>\n</thead>\n<td class=\"align-middle text-nowrap\" data-bind=\"attr: { 'data-sortby': VersionSortOrder }\">\n<span data-bind=\"text: LatestVersion\"></span>\n</td>\n+ @if (Model.IsPackageVulnerabilitiesEnabled)\n+ {\n+ <td class=\"package-icon-cell\">\n+ <i class=\"ms-Icon ms-Icon--Warning package-icon\" data-bind=\"visible: IsVulnerable\" title=\"This version has at least one known vulnerability. Click on the package name for details.\"></i>\n+ </td>\n+ }\n<td class=\"text-right align-middle package-controls\">\n<span data-bind=\"visible: CanEdit || CanManageOwners || CanDelete\">\n<a class=\"btn\" title=\"Manage Package\" data-bind=\"attr: { href: ManageUrl,\np.CanEditRequiredSigner,\np.ShowRequiredSigner,\np.ShowTextBox,\n- p.VersionSortOrder\n+ p.VersionSortOrder,\n+ p.IsVulnerable\n};\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add vulnerable warnings to Manage Packages page (#8436)
Show vulnerability alerts on manage packages page |
455,754 | 12.03.2021 13:41:30 | -36,000 | 97b1a560eb2f262d7defa1f7e294fb95a10b8755 | Add Knapcode.MiniZip to 3rd party signing | [
{
"change_type": "MODIFY",
"old_path": "sign.thirdparty.props",
"new_path": "sign.thirdparty.props",
"diff": "<ThirdPartyBinaries Include=\"DynamicData.EFCodeFirstProvider.dll\" />\n<ThirdPartyBinaries Include=\"Elmah.dll\" />\n<ThirdPartyBinaries Include=\"ICSharpCode.SharpZipLib.dll\" />\n+ <ThirdPartyBinaries Include=\"Knapcode.MiniZip.dll\" />\n<ThirdPartyBinaries Include=\"Lucene.Net.Contrib.Analyzers.dll\" />\n<ThirdPartyBinaries Include=\"Lucene.Net.Contrib.Core.dll\" />\n<ThirdPartyBinaries Include=\"Lucene.Net.Contrib.FastVectorHighlighter.dll\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add Knapcode.MiniZip to 3rd party signing (#8450) |
455,754 | 12.03.2021 16:12:27 | -36,000 | 933fe456a4c9c27ac141d439bb257f9de756f71b | Give the manage packages page its own pva flag (perf concerns) | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -27,6 +27,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string ManageDeprecationForManyVersionsFeatureName = GalleryPrefix + \"ManageDeprecationMany\";\nprivate const string ManageDeprecationApiFeatureName = GalleryPrefix + \"ManageDeprecationApi\";\nprivate const string DisplayVulnerabilitiesFeatureName = GalleryPrefix + \"DisplayVulnerabilities\";\n+ private const string ManagePackagesVulnerabilitiesFeatureName = GalleryPrefix + \"ManagePackagesVulnerabilities\";\nprivate const string DisplayFuGetLinksFeatureName = GalleryPrefix + \"DisplayFuGetLinks\";\nprivate const string ODataReadOnlyDatabaseFeatureName = GalleryPrefix + \"ODataReadOnlyDatabase\";\nprivate const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\n@@ -141,6 +142,11 @@ public bool IsDisplayVulnerabilitiesEnabled()\nreturn _client.IsEnabled(DisplayVulnerabilitiesFeatureName, defaultValue: false);\n}\n+ public bool IsManagePackagesVulnerabilitiesEnabled()\n+ {\n+ return _client.IsEnabled(ManagePackagesVulnerabilitiesFeatureName, defaultValue: false);\n+ }\n+\npublic bool IsDisplayFuGetLinksEnabled()\n{\nreturn _client.IsEnabled(DisplayFuGetLinksFeatureName, defaultValue: false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -67,6 +67,11 @@ public interface IFeatureFlagService\n/// </summary>\nbool IsDisplayVulnerabilitiesEnabled();\n+ /// <summary>\n+ /// Whether or not a package owner can view vulnerability advisory information on the Manage Packages page.\n+ /// </summary>\n+ bool IsManagePackagesVulnerabilitiesEnabled();\n+\n/// <summary>\n/// Whether or not a fuget.org link is visible on a package's details page.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -463,7 +463,7 @@ Package GetLatestStable()\n.Include(p => p.PackageRegistration.Owners)\n.Include(p => p.PackageRegistration.RequiredSigners);\n- if (includeVulnerabilities)\n+ if (includeVulnerabilities && _featureFlagService.IsManagePackagesVulnerabilitiesEnabled())\n{\nresult = result.Include($\"{nameof(Package.VulnerablePackageRanges)}.{nameof(VulnerablePackageVersionRange.Vulnerability)}\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"NuGetGallery.ODataV2SearchNonHijacked\": \"Enabled\",\n\"NuGetGallery.ODataV2SearchCountNonHijacked\": \"Enabled\",\n\"NuGetGallery.DisplayVulnerabilities\": \"Enabled\",\n+ \"NuGetGallery.ManagePackagesVulnerabilities\": \"Enabled\",\n\"NuGetGallery.DisplayFuGetLinks\": \"Enabled\",\n\"NuGetGallery.PatternSetTfmHeuristics\": \"Enabled\"\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -566,7 +566,7 @@ public virtual ActionResult Packages()\nReservedNamespaces = reservedPrefixes,\nWasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated(),\nIsCertificatesUIEnabled = ContentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false,\n- IsPackageVulnerabilitiesEnabled = _featureFlagService.IsDisplayVulnerabilitiesEnabled()\n+ IsManagePackagesVulnerabilitiesEnabled = _featureFlagService.IsManagePackagesVulnerabilitiesEnabled()\n};\nreturn View(model);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"diff": "@@ -24,6 +24,6 @@ public class ManagePackagesViewModel\npublic bool IsCertificatesUIEnabled { get; set; }\n- public bool IsPackageVulnerabilitiesEnabled { get; set; }\n+ public bool IsManagePackagesVulnerabilitiesEnabled { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "}\n<th class=\"sortable\">Downloads</th>\n<th class=\"sortable\">Latest Version</th>\n- @if (Model.IsPackageVulnerabilitiesEnabled)\n+ @if (Model.IsManagePackagesVulnerabilitiesEnabled)\n{\n<th><span class=\"hidden\">Package warnings</span></th>\n}\n<td class=\"align-middle text-nowrap\" data-bind=\"attr: { 'data-sortby': VersionSortOrder }\">\n<span data-bind=\"text: LatestVersion\"></span>\n</td>\n- @if (Model.IsPackageVulnerabilitiesEnabled)\n+ @if (Model.IsManagePackagesVulnerabilitiesEnabled)\n{\n<td class=\"package-icon-cell\">\n<i class=\"ms-Icon ms-Icon--Warning package-icon\" data-bind=\"visible: IsVulnerable\" title=\"This version has at least one known vulnerability. Click on the package name for details.\"></i>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs",
"new_path": "src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs",
"diff": "@@ -33,6 +33,8 @@ public class FakeFeatureFlagService : IFeatureFlagService\npublic bool IsDisplayVulnerabilitiesEnabled() => throw new NotImplementedException();\n+ public bool IsManagePackagesVulnerabilitiesEnabled() => throw new NotImplementedException();\n+\npublic bool IsDisplayFuGetLinksEnabled() => throw new NotImplementedException();\npublic bool AreEmbeddedIconsEnabled(User user) => throw new NotImplementedException();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Give the manage packages page its own pva flag (perf concerns) (#8451) |
455,737 | 01.04.2021 03:31:08 | 0 | 91c68fe42b7e93b25973b78ac8a98b6e360e74c4 | Update DI for alt stats container | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -707,27 +707,41 @@ private static void RegisterDeleteAccountService(ContainerBuilder builder, Confi\nprivate static void RegisterStatisticsServices(ContainerBuilder builder, IGalleryConfigurationService configuration, ITelemetryService telemetryService)\n{\n+ // when running on Windows Azure, download counts come from the downloads.v1.json blob\n+ builder.Register(c => new SimpleBlobStorageConfiguration(configuration.Current.AzureStorage_Statistics_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))\n+ .SingleInstance()\n+ .Keyed<IBlobStorageConfiguration>(BindingKeys.PrimaryStatisticsKey);\n+\n+ builder.Register(c => new SimpleBlobStorageConfiguration(configuration.Current.AzureStorage_Statistics_ConnectionString_Alternate, configuration.Current.AzureStorageReadAccessGeoRedundant))\n+ .SingleInstance()\n+ .Keyed<IBlobStorageConfiguration>(BindingKeys.AlternateStatisticsKey);\n+\n// when running on Windows Azure, we use a back-end job to calculate stats totals and store in the blobs\n- builder.RegisterInstance(new JsonAggregateStatsService(configuration.Current.AzureStorage_Statistics_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))\n+ builder.Register(c =>\n+ {\n+ var primaryConfiguration = c.ResolveKeyed<IBlobStorageConfiguration>(BindingKeys.PrimaryStatisticsKey);\n+ var alternateConfiguration = c.ResolveKeyed<IBlobStorageConfiguration>(BindingKeys.AlternateStatisticsKey);\n+ var featureFlagService = c.Resolve<IFeatureFlagService>();\n+ var jsonAggregateStatsService = new JsonAggregateStatsService(featureFlagService, primaryConfiguration, alternateConfiguration);\n+ return jsonAggregateStatsService;\n+ })\n.AsSelf()\n.As<IAggregateStatsService>()\n.SingleInstance();\n// when running on Windows Azure, pull the statistics from the warehouse via storage\n- builder.RegisterInstance(new CloudReportService(configuration.Current.AzureStorage_Statistics_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))\n+ builder.Register(c =>\n+ {\n+ var primaryConfiguration = c.ResolveKeyed<IBlobStorageConfiguration>(BindingKeys.PrimaryStatisticsKey);\n+ var alternateConfiguration = c.ResolveKeyed<IBlobStorageConfiguration>(BindingKeys.AlternateStatisticsKey);\n+ var featureFlagService = c.Resolve<IFeatureFlagService>();\n+ var cloudReportService = new CloudReportService(featureFlagService, primaryConfiguration, alternateConfiguration);\n+ return cloudReportService;\n+ })\n.AsSelf()\n.As<IReportService>()\n.SingleInstance();\n- // when running on Windows Azure, download counts come from the downloads.v1.json blob\n- builder.Register(c => new SimpleBlobStorageConfiguration(configuration.Current.AzureStorage_Statistics_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))\n- .SingleInstance()\n- .Keyed<IBlobStorageConfiguration>(BindingKeys.PrimaryStatisticsKey);\n-\n- builder.Register(c => new SimpleBlobStorageConfiguration(configuration.Current.AzureStorage_Statistics_ConnectionString_Alternate, configuration.Current.AzureStorageReadAccessGeoRedundant))\n- .SingleInstance()\n- .Keyed<IBlobStorageConfiguration>(BindingKeys.AlternateStatisticsKey);\n-\nbuilder.Register(c =>\n{\nvar primaryConfiguration = c.ResolveKeyed<IBlobStorageConfiguration>(BindingKeys.PrimaryStatisticsKey);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update DI for alt stats container (#8472) |
455,741 | 01.04.2021 12:28:21 | 25,200 | b72d197315957ce47642d7de86026797f6958ef9 | reject empty readme file & fix error message for invalid extension | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageMetadataValidationService.cs",
"new_path": "src/NuGetGallery/Services/PackageMetadataValidationService.cs",
"diff": "@@ -458,6 +458,16 @@ private async Task<PackageValidationResult> CheckReadmeMetadataAsync(PackageArch\n}\nvar readmeFileEntry = nuGetPackage.GetEntry(readmeFilePath);\n+\n+ if (readmeFileEntry.Length == 0)\n+ {\n+ return PackageValidationResult.Invalid(\n+ string.Format(\n+ Strings.ReadmeErrorEmpty,\n+ Strings.UploadPackage_ReadmeFileType,\n+ readmeFilePath));\n+ }\n+\nif (readmeFileEntry.Length > MaxAllowedReadmeLengthForUploading)\n{\nreturn PackageValidationResult.Invalid(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1588,6 +1588,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The readme file '{0}' cannot be empty..\n+ /// </summary>\n+ public static string ReadmeErrorEmpty {\n+ get {\n+ return ResourceManager.GetString(\"ReadmeErrorEmpty\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to '{0}' is not a valid Markdown Documentation source type..\n/// </summary>\n@@ -2598,7 +2607,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to The readme file has an invalid extension '{0}'. Extension must be one of the following: {1}..\n+ /// Looks up a localized string similar to The readme file has an invalid extension '{0}'. The extension must be: '{1}'..\n/// </summary>\npublic static string UploadPackage_InvalidReadmeFileExtension {\nget {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1166,7 +1166,7 @@ The {1} Team</value>\n<value>The <readme> element is not currently supported.</value>\n</data>\n<data name=\"UploadPackage_InvalidReadmeFileExtension\" xml:space=\"preserve\">\n- <value>The readme file has an invalid extension '{0}'. Extension must be one of the following: {1}.</value>\n+ <value>The readme file has an invalid extension '{0}'. The extension must be: '{1}'.</value>\n<comment>{0} is the readme file extension specified in the .nuspec, {1} is the list of allowed extensions</comment>\n</data>\n<data name=\"UploadPackage_ReadmeFileType\" xml:space=\"preserve\">\n@@ -1215,4 +1215,7 @@ The {1} Team</value>\n<data name=\"UploadPackage_OwnerlessIdNamespaceConflictHtml\" xml:space=\"preserve\">\n<value>The package ID is reserved. You can upload your package with a different package ID. Reach out to <a href=\"mailto:[email protected]\">[email protected]</a> if you have questions.</value>\n</data>\n+ <data name=\"ReadmeErrorEmpty\" xml:space=\"preserve\">\n+ <value>The readme file '{0}' cannot be empty.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | reject empty readme file & fix error message for invalid extension (#8473) |
455,754 | 06.04.2021 17:29:00 | -36,000 | 6b07d7593ec6ba67da8e75fa76aa9ac75f1e76c5 | a11y fix - remove horizontal scrollbar from page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"diff": "<div>\n<p>You have @(orgCountString).</p>\n</div>\n+ <div class=\"table-container\">\n<table class=\"table user-package-list\">\n<thead>\n<tr class=\"manage-package-headings\">\n</tbody>\n}\n</table>\n+ </div>\n}\nelse\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | a11y fix - remove horizontal scrollbar from page (#8499) |
455,754 | 06.04.2021 18:25:41 | -36,000 | 1e6caa9ec2090e3d2694e0451269a6a383048fbb | Added mandatory styles to add organizations page | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -732,6 +732,10 @@ img.reserved-indicator-icon {\nmargin-top: 6px;\nmargin-bottom: 6px;\n}\n+.page-add-organization .required:after {\n+ color: red;\n+ content: \" *\";\n+}\n.page-admin-index h2 {\nmargin-bottom: 8px;\nmargin-top: 32px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-add-organization.less",
"new_path": "src/Bootstrap/less/theme/page-add-organization.less",
"diff": "margin-top: 6px;\nmargin-bottom: 6px;\n}\n+\n+ .required:after {\n+ color: red;\n+ content: \" *\";\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"diff": "@Html.AntiForgeryToken()\n<div class=\"form-group @Html.HasErrorFor(m => m.OrganizationName)\" id=\"@organizationNameTextGroupId\">\n- @Html.ShowLabelFor(m => m.OrganizationName)\n+ <span class=\"required\">@Html.ShowLabelFor(m => m.OrganizationName)</span>\[email protected](m => m.OrganizationName)\n<span class=\"ms-font-s\">This will be your organization account on <i id=\"@organizationNameTextId\">@Url.User(\"{username}\", relativeUrl: false)</i>.</span>\[email protected](m => m.OrganizationName)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.OrganizationEmailAddress)\" id=\"@emailBoxGroupId\">\n- @Html.ShowLabelFor(m => m.OrganizationEmailAddress)\n+ <span class=\"required\">@Html.ShowLabelFor(m => m.OrganizationEmailAddress)</span>\[email protected](m => m.OrganizationEmailAddress)\n<span class=\"ms-font-s\">Users can contact your organization at this email address.</span>\[email protected](m => m.OrganizationEmailAddress)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Added mandatory styles to add organizations page (#8500) |
455,744 | 06.04.2021 16:19:47 | 25,200 | 54b7ae6109957071725d74710d3ade0fa2e7b8cd | Preparing ErrorLog for secret refresh. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/AzureEntityList.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/AzureEntityList.cs",
"diff": "@@ -22,25 +22,25 @@ public class AzureEntityList<T> : IEnumerable<T> where T : ITableEntity, new()\nprivate const string IndexPartitionKey = \"INDEX\";\nprivate const string IndexRowKey = \"0\";\n- private CloudTable _tableRef;\n+ private readonly string _tableName;\n+ private readonly bool _readAccessGeoRedundant;\n+ private readonly Func<string> _connectionStringFactory;\n- public AzureEntityList(string connStr, string tableName, bool readAccessGeoRedundant)\n+ public AzureEntityList(Func<string> connectionStringFactory, string tableName, bool readAccessGeoRedundant)\n{\n- var tableClient = CloudStorageAccount.Parse(connStr).CreateCloudTableClient();\n- if (readAccessGeoRedundant)\n- {\n- tableClient.DefaultRequestOptions.LocationMode = LocationMode.PrimaryThenSecondary;\n- }\n- _tableRef = tableClient.GetTableReference(tableName);\n+ _tableName = tableName ?? throw new ArgumentNullException(nameof(tableName));\n+ _readAccessGeoRedundant = readAccessGeoRedundant;\n+ _connectionStringFactory = connectionStringFactory ?? throw new ArgumentNullException(nameof(connectionStringFactory));\n+ var tableRef = GetTableReference();\n// Create the actual Azure Table, if it doesn't yet exist.\n- bool newTable = _tableRef.CreateIfNotExists();\n+ bool newTable = tableRef.CreateIfNotExists();\n// Create the Index if it doesn't yet exist.\nbool needsIndex = newTable;\nif (!newTable)\n{\n- var indexResult = _tableRef.Execute(\n+ var indexResult = tableRef.Execute(\nTableOperation.Retrieve<Index>(IndexPartitionKey, IndexRowKey));\nneedsIndex = (indexResult.HttpStatusCode == 404);\n@@ -49,7 +49,7 @@ public AzureEntityList(string connStr, string tableName, bool readAccessGeoRedun\nif (needsIndex)\n{\n// Create the index\n- var result = _tableRef.Execute(\n+ var result = tableRef.Execute(\nTableOperation.Insert(new Index\n{\nCount = 0,\n@@ -102,7 +102,8 @@ public long LongCount\nstring partitionKey = FormatPartitionKey(page);\nstring rowKey = FormatRowKey(row);\n- var response = _tableRef.Execute(TableOperation.Retrieve<T>(partitionKey, rowKey));\n+ var tableRef = GetTableReference();\n+ var response = tableRef.Execute(TableOperation.Retrieve<T>(partitionKey, rowKey));\nif (response.HttpStatusCode == 404)\n{\nthrow new ArgumentOutOfRangeException(nameof(index), index, CoreStrings.Http404NotFound);\n@@ -129,8 +130,10 @@ public long LongCount\nvalue.PartitionKey = FormatPartitionKey(page);\nvalue.RowKey = FormatRowKey(row);\n+ var tableRef = GetTableReference();\n+\n// Just do an unconditional update - if you wanted any *real* benefit of atomic update then you would need a more complex method signature that calls you back when optimistic updates fail ETAG checks!\n- _tableRef.Execute(TableOperation.Replace(value));\n+ tableRef.Execute(TableOperation.Replace(value));\n}\n}\n@@ -161,13 +164,14 @@ public long Add(T entity)\n/// </summary>\npublic IEnumerator<T> GetEnumerator()\n{\n+ var tableRef = GetTableReference();\nfor (long page = 0;; page++)\n{\nstring partitionKey = FormatPartitionKey(page);\nvar chunkQuery = new TableQuery<T>().Where(\nTableQuery.GenerateFilterCondition(\"PartitionKey\", QueryComparisons.Equal, partitionKey));\n- var chunk = _tableRef.ExecuteQuery(chunkQuery).ToArray();\n+ var chunk = tableRef.ExecuteQuery(chunkQuery).ToArray();\nforeach (var item in chunk)\n{\n@@ -191,6 +195,7 @@ public IEnumerable<T> GetRange(long pos, int n)\nint done = 0;\nlong page = pos / 1000;\nlong offset = pos % 1000;\n+ var tableRef = GetTableReference();\nwhile (done < n)\n{\nstring partitionKey = FormatPartitionKey(page);\n@@ -201,7 +206,7 @@ public IEnumerable<T> GetRange(long pos, int n)\nTableOperators.And,\nTableQuery.GenerateFilterCondition(\"RowKey\", QueryComparisons.GreaterThanOrEqual, rowKey)));\n- var chunk = _tableRef.ExecuteQuery(chunkQuery).ToArray();\n+ var chunk = tableRef.ExecuteQuery(chunkQuery).ToArray();\nif (chunk.Length == 0)\n{\nbreak; // Reached the end of the list\n@@ -235,9 +240,10 @@ private long AtomicIncrementCount()\n// 2) use ETAG to do a conditional +1 update\n// 3) retry if that optimistic concurrency attempt failed\nlong pos = -1; // To avoid compiler warnings, grr - should never be returned\n+ var tableRef = GetTableReference();\nDoReplaceWithRetry(() =>\n{\n- var result1 = _tableRef.Execute(\n+ var result1 = tableRef.Execute(\nTableOperation.Retrieve<Index>(IndexPartitionKey, IndexRowKey));\nThrowIfErrorStatus(result1);\n@@ -260,6 +266,7 @@ private long AtomicIncrementCount()\nprivate void InsertIfNotExistsWithRetry<T2>(Func<T2> valueGenerator) where T2 : ITableEntity\n{\nTableResult storeResult;\n+ var tableRef = GetTableReference();\ndo\n{\nvar entity = valueGenerator();\n@@ -268,7 +275,7 @@ private long AtomicIncrementCount()\n// - the dummy MERGES with existing data instead of overwriting it, so no data loss.\n// 2) Use its ETAG to conditionally replace the item\n// 3) return true if success, false to allow retry on failure\n- var dummyResult = _tableRef.Execute(\n+ var dummyResult = tableRef.Execute(\nTableOperation.InsertOrMerge(new HazardEntry\n{\nPartitionKey = entity.PartitionKey,\n@@ -281,7 +288,7 @@ private long AtomicIncrementCount()\n}\nentity.ETag = dummyResult.Etag;\n- storeResult = _tableRef.Execute(TableOperation.Replace(entity));\n+ storeResult = tableRef.Execute(TableOperation.Replace(entity));\n}\nwhile (storeResult.HttpStatusCode == 412);\nThrowIfErrorStatus(storeResult);\n@@ -290,9 +297,10 @@ private long AtomicIncrementCount()\nprivate void DoReplaceWithRetry<T2>(Func<T2> valueGenerator) where T2 : ITableEntity\n{\nTableResult storeResult;\n+ var tableRef = GetTableReference();\ndo\n{\n- storeResult = _tableRef.Execute(TableOperation.Replace(valueGenerator.Invoke()));\n+ storeResult = tableRef.Execute(TableOperation.Replace(valueGenerator.Invoke()));\n}\nwhile (storeResult.HttpStatusCode == 412);\nThrowIfErrorStatus(storeResult);\n@@ -300,7 +308,8 @@ private long AtomicIncrementCount()\nprivate Index ReadIndex()\n{\n- var response = _tableRef.Execute(TableOperation.Retrieve<Index>(IndexPartitionKey, IndexRowKey));\n+ var tableRef = GetTableReference();\n+ var response = tableRef.Execute(TableOperation.Retrieve<Index>(IndexPartitionKey, IndexRowKey));\nreturn (Index)response.Result;\n}\n@@ -333,6 +342,16 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()\nreturn GetEnumerator();\n}\n+ private CloudTable GetTableReference()\n+ {\n+ var tableClient = CloudStorageAccount.Parse(_connectionStringFactory()).CreateCloudTableClient();\n+ if (_readAccessGeoRedundant)\n+ {\n+ tableClient.DefaultRequestOptions.LocationMode = LocationMode.PrimaryThenSecondary;\n+ }\n+ return tableClient.GetTableReference(_tableName);\n+ }\n+\nclass HazardEntry : ITableEntity\n{\nprivate const string PlaceHolderPropertyName = \"Place_Held\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"diff": "@@ -141,13 +141,11 @@ public class TableErrorLog : ErrorLog\n{\npublic const string TableName = \"ElmahErrors\";\n- private readonly string _connectionString;\nprivate readonly AzureEntityList<ErrorEntity> _entityList;\n- public TableErrorLog(string connectionString, bool readAccessGeoRedundant)\n+ public TableErrorLog(Func<string> connectionStringFactory, bool readAccessGeoRedundant)\n{\n- _connectionString = connectionString;\n- _entityList = new AzureEntityList<ErrorEntity>(connectionString, TableName, readAccessGeoRedundant);\n+ _entityList = new AzureEntityList<ErrorEntity>(connectionStringFactory, TableName, readAccessGeoRedundant);\n}\npublic override ErrorLogEntry GetError(string id)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -1436,7 +1436,11 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC\nRegisterStatisticsServices(builder, configuration, telemetryService);\n- builder.RegisterInstance(new TableErrorLog(configuration.Current.AzureStorage_Errors_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))\n+ builder.Register(c =>\n+ {\n+ var configurationFactory = c.Resolve<Func<IAppConfiguration>>();\n+ return new TableErrorLog(() => configurationFactory().AzureStorage_Errors_ConnectionString, configurationFactory().AzureStorageReadAccessGeoRedundant);\n+ })\n.As<ErrorLog>()\n.SingleInstance();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Preparing ErrorLog for secret refresh. (#8485) |
455,754 | 13.04.2021 14:02:44 | -36,000 | dab79bba62b327124ebca5810d10fa895482a1f6 | Fix break in githubvulnerabilities2db dependency injection | [
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj",
"new_path": "src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj",
"diff": "<Compile Include=\"Collector\\IAdvisoryQueryBuilder.cs\" />\n<Compile Include=\"Collector\\IAdvisoryQueryService.cs\" />\n<Compile Include=\"Configuration\\GitHubVulnerabilities2DbConfiguration.cs\" />\n+ <Compile Include=\"Fakes\\FakeContentService.cs\" />\n+ <Compile Include=\"Fakes\\FakeFeatureFlagService.cs\" />\n<Compile Include=\"Gallery\\ThrowingAuditingService.cs\" />\n<Compile Include=\"Gallery\\ThrowingIndexingService.cs\" />\n<Compile Include=\"Gallery\\ThrowingSecurityPolicyService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/Job.cs",
"new_path": "src/GitHubVulnerabilities2Db/Job.cs",
"diff": "using System.Net.Http;\nusing System.Threading;\nusing System.Threading.Tasks;\n-using System.Web;\nusing Autofac;\nusing GitHubVulnerabilities2Db.Collector;\nusing GitHubVulnerabilities2Db.Configuration;\n+using GitHubVulnerabilities2Db.Fakes;\nusing GitHubVulnerabilities2Db.Gallery;\nusing GitHubVulnerabilities2Db.GraphQL;\nusing GitHubVulnerabilities2Db.Ingest;\n-using Microsoft.ApplicationInsights.Extensibility;\nusing Microsoft.Extensions.Configuration;\nusing Microsoft.Extensions.DependencyInjection;\nusing Microsoft.Extensions.Options;\nusing NuGetGallery;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\n-using NuGetGallery.Diagnostics;\nusing NuGetGallery.Security;\nnamespace GitHubVulnerabilities2Db\n@@ -102,6 +100,10 @@ protected void ConfigureGalleryServices(ContainerBuilder containerBuilder)\n.RegisterType<ThrowingSecurityPolicyService>()\n.As<ISecurityPolicyService>();\n+ containerBuilder\n+ .RegisterType<FakeFeatureFlagService>()\n+ .As<IFeatureFlagService>();\n+\ncontainerBuilder\n.RegisterType<PackageService>()\n.As<IPackageService>();\n@@ -182,18 +184,4 @@ private DurableCursor CreateCursor(IComponentContext ctx, Func<GitHubVulnerabili\nreturn new DurableCursor(storage.ResolveUri(getBlobName(config)), storage, DateTimeOffset.MinValue);\n}\n}\n-\n- public class FakeContentService : IContentService\n- {\n- public void ClearCache()\n- {\n- //no-op\n- }\n-\n- public Task<IHtmlString> GetContentItemAsync(string name, TimeSpan expiresIn)\n- {\n- // no-op\n- return Task.FromResult((IHtmlString)null);\n- }\n- }\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix break in githubvulnerabilities2db dependency injection (#8516) |
455,754 | 14.04.2021 11:03:42 | -36,000 | 3acff90c46a4349791f28b00f0c9ecc55be94da1 | return backfill to order by date, batch size 1000
return backfill to order by date, batch size 1000, other tweaks | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"diff": "@@ -125,7 +125,8 @@ public async Task Collect(SqlConnection connection, Uri serviceDiscoveryUri, Dat\npackages = packages\n.Where(p => p.Created < lastCreateTime && p.Created > startTime)\n- .OrderBy(p => p.PackageRegistration.Id);\n+ .Where(p => p.PackageStatusKey == PackageStatus.Available)\n+ .OrderBy(p => p.Created);\nif (LimitTo > 0)\n{\npackages = packages.Take(LimitTo);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillTfmMetadataCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillTfmMetadataCommand.cs",
"diff": "using System.Linq;\nusing System.Linq.Expressions;\nusing Microsoft.Extensions.CommandLineUtils;\n+using NuGet.Frameworks;\nusing NuGet.Packaging;\nusing NuGet.Services.Entities;\nusing NuGetGallery;\n@@ -20,6 +21,8 @@ public sealed class BackfillTfmMetadataCommand : BackfillCommand<List<string>>\nprotected override Expression<Func<Package, object>> QueryIncludes => p => p.SupportedFrameworks;\n+ protected override int CollectBatchSize => 1000;\n+\npublic static void Configure(CommandLineApplication config)\n{\nConfigure<BackfillTfmMetadataCommand>(config);\n@@ -28,10 +31,34 @@ public static void Configure(CommandLineApplication config)\nprotected override List<string> ReadMetadata(IList<string> files, NuspecReader nuspecReader)\n{\nvar supportedTFMs = new List<string>();\n- var supportedFrameworks = _packageService.GetSupportedFrameworks(nuspecReader, files);\n+\n+ // We wrap this int a try catch because fetching supported frameworks on existing packages can sometimes throw\n+ // ArgumentExceptions due to format errors (usually portable TFM formatting). In this case we'll clear the TFMs.\n+ var supportedFrameworks = Enumerable.Empty<NuGetFramework>();\n+ try\n+ {\n+ supportedFrameworks = _packageService.GetSupportedFrameworks(nuspecReader, files);\n+ }\n+ catch (ArgumentException)\n+ {\n+ // do nothing--this is a known scenario and we'll skip this package quietly, which will give us a more useful error log file\n+ }\n+\nforeach (var tfm in supportedFrameworks)\n{\n- supportedTFMs.Add(tfm.GetShortFolderName());\n+ // We wrap this in a try-catch because some poorly-crafted portable TFMs will make it through GetSupportedFrameworks and fail here, e.g. for a\n+ // non-existent profile name like \"Profile1\", which will cause GetShortFolderName to throw. We want to fail silently for these as this is a known\n+ // scenario (more useful error log) and not failing will allow us to still capture all of the valid TFMs.\n+ // See https://github.com/NuGet/NuGet.Client/blob/ba008e14611f4fa518c2d02ed78dfe5969e4a003/src/NuGet.Core/NuGet.Frameworks/NuGetFramework.cs#L297\n+ // See https://github.com/NuGet/NuGet.Client/blob/ba008e14611f4fa518c2d02ed78dfe5969e4a003/src/NuGet.Core/NuGet.Frameworks/FrameworkNameProvider.cs#L487 }\n+ try\n+ {\n+ supportedTFMs.Add(tfm.ToShortNameOrNull());\n+ }\n+ catch\n+ {\n+ // skip this TFM and only collect well-formatted ones\n+ }\n}\nreturn supportedTFMs;\n@@ -46,9 +73,19 @@ protected override void ConfigureClassMap(PackageMetadataClassMap map)\nprotected override void UpdatePackage(Package package, List<string> metadata, EntitiesContext context)\n{\n- var existingTFMs = package.SupportedFrameworks == null\n- ? Enumerable.Empty<string>()\n- : package.SupportedFrameworks.Select(f => f.FrameworkName.GetShortFolderName()).OrderBy(f => f);\n+ // Note that extracting old TFMs may throw for formatting reasons. In this case we'll force a full replacement by leaving the collection empty.\n+ var existingTFMs = Enumerable.Empty<string>();\n+ if (package.SupportedFrameworks != null)\n+ {\n+ try\n+ {\n+ existingTFMs = package.SupportedFrameworks.Select(f => f.FrameworkName.GetShortFolderName()).OrderBy(f => f);\n+ }\n+ catch\n+ {\n+ // do nothing and replace in full\n+ }\n+ }\nvar newTFMs = metadata == null || metadata.Count == 0\n? Enumerable.Empty<string>()\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | return backfill to order by date, batch size 1000 (#8510)
return backfill to order by date, batch size 1000, other tweaks |
455,741 | 15.04.2021 00:22:42 | 25,200 | 337ff6ad740315a012b0be6c7291df19cb94fddb | add feature flag for banner | [
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs",
"new_path": "src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs",
"diff": "@@ -55,6 +55,11 @@ public bool IsDeletePackageApiEnabled(User user)\nthrow new NotImplementedException();\n}\n+ public bool IsDisplayBannerEnabled()\n+ {\n+ throw new NotImplementedException();\n+ }\n+\npublic bool IsDisplayFuGetLinksEnabled()\n{\nthrow new NotImplementedException();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -47,6 +47,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string MarkdigMdRenderingFlightName = GalleryPrefix + \"MarkdigMdRendering\";\nprivate const string DeletePackageApiFlightName = GalleryPrefix + \"DeletePackageApi\";\nprivate const string ImageAllowlistFlightName = GalleryPrefix + \"ImageAllowlist\";\n+ private const string DisplayBannerFlightName = GalleryPrefix + \"Banner\";\nprivate const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllNonHijacked\";\nprivate const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllCountNonHijacked\";\n@@ -326,5 +327,10 @@ public bool IsImageAllowlistEnabled()\n{\nreturn _client.IsEnabled(ImageAllowlistFlightName, defaultValue: false);\n}\n+\n+ public bool IsDisplayBannerEnabled()\n+ {\n+ return _client.IsEnabled(DisplayBannerFlightName, defaultValue: false);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -260,5 +260,10 @@ public interface IFeatureFlagService\n/// Whether the allowlist is enabled for checking the image sources\n/// </summary>\nbool IsImageAllowlistEnabled();\n+\n+ /// <summary>\n+ /// Whether or not display the banner on nuget.org\n+ /// </summary>\n+ bool IsDisplayBannerEnabled();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PagesController.cs",
"diff": "@@ -122,8 +122,9 @@ public virtual ActionResult Home()\nvar externalIdentityList = ClaimsExtensions.GetExternalCredentialIdentityList(identity);\nvar showEnable2FAModal = _featureFlagService.IsShowEnable2FADialogEnabled();\nvar getFeedbackOnModalDismiss = _featureFlagService.IsGet2FADismissFeedbackEnabled();\n+ var displayBanner = _featureFlagService.IsDisplayBannerEnabled();\n- return View(new GalleryHomeViewModel(showTransformModal, transformIntoOrganization, showEnable2FAModal, getFeedbackOnModalDismiss, externalIdentityList));\n+ return View(new GalleryHomeViewModel(showTransformModal, transformIntoOrganization, showEnable2FAModal, getFeedbackOnModalDismiss, displayBanner, externalIdentityList));\n}\n[HttpGet]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/GalleryHomeViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/GalleryHomeViewModel.cs",
"diff": "@@ -15,11 +15,14 @@ public class GalleryHomeViewModel\npublic bool GetFeedbackOnModalDismissFeatureEnabled { get; set; }\n+ public bool DisplayBannerFeatureEnabled { get; set; }\n+\npublic GalleryHomeViewModel() : this(\nshowTransformModal: false,\ntransformIntoOrganization: false,\nshowEnable2FAModalFeatureEnabled: false,\ngetFeedbackOnModalDismiss: false,\n+ displayBanner: false,\nidentity: null)\n{ }\n@@ -28,12 +31,14 @@ public class GalleryHomeViewModel\nbool transformIntoOrganization,\nbool showEnable2FAModalFeatureEnabled,\nbool getFeedbackOnModalDismiss,\n+ bool displayBanner,\nstring identity = null)\n{\nShowTransformModal = showTransformModal;\nTransformIntoOrganization = transformIntoOrganization;\nShowEnable2FAModalFeatureEnabled = showEnable2FAModalFeatureEnabled;\nGetFeedbackOnModalDismissFeatureEnabled = getFeedbackOnModalDismiss;\n+ DisplayBannerFeatureEnabled = displayBanner;\nIdentity = identity;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"diff": "ViewBag.ShowSearchInNavbar = false;\nViewBag.AutofocusSearch = true;\nViewBag.HasJumbotron = true;\n+ ViewBag.DisplayBanner = Model.DisplayBannerFeatureEnabled;\nvar AskUserToEnable2FA = TempData.ContainsKey(\"AskUserToEnable2FA\")\n&& Convert.ToBoolean(TempData[\"AskUserToEnable2FA\"].ToString())\n&& Model.ShowEnable2FAModalFeatureEnabled;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "</div>\n}\n+@if (ViewBag.DisplayBanner == true)\n+{\n<div class=\"container-fluid banner banner-info text-center\">\n<div class=\"row\">\n<div class=\"col-sm-12\">\n</div>\n</div>\n</div>\n+}\n@helper DisplayNavigationItem(string tab, string url, bool bold = false, string title = null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs",
"new_path": "src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs",
"diff": "@@ -106,5 +106,7 @@ public class FakeFeatureFlagService : IFeatureFlagService\npublic bool IsDeletePackageApiEnabled(User user) => throw new NotImplementedException();\npublic bool IsImageAllowlistEnabled() => throw new NotImplementedException();\n+\n+ public bool IsDisplayBannerEnabled() => throw new NotImplementedException();\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | add feature flag for banner (#8527) |
455,754 | 16.04.2021 08:07:11 | -36,000 | ddfb02da9c1edd3fbc908153f877a97dd90e3fda | adjust backfill logic - remove redundant catch, process null TFMs | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"diff": "@@ -308,8 +308,6 @@ private static async Task<string> GetFlatContainerUri(Uri serviceDiscoveryUri)\n{\nvar httpZipProvider = new HttpZipProvider(httpClient);\n- try\n- {\nvar zipDirectoryReader = await httpZipProvider.GetReaderAsync(new Uri(nupkgUri));\nvar zipDirectory = await zipDirectoryReader.ReadAsync();\nvar files = zipDirectory\n@@ -319,12 +317,6 @@ private static async Task<string> GetFlatContainerUri(Uri serviceDiscoveryUri)\nreturn ReadMetadata(files, nuspecReader);\n}\n- catch (Exception e)\n- {\n- await logger.LogPackageError(id, version, e);\n- return default;\n- }\n- }\nprivate static XDocument LoadDocument(Stream stream)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillTfmMetadataCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillTfmMetadataCommand.cs",
"diff": "@@ -53,7 +53,11 @@ protected override List<string> ReadMetadata(IList<string> files, NuspecReader n\n// See https://github.com/NuGet/NuGet.Client/blob/ba008e14611f4fa518c2d02ed78dfe5969e4a003/src/NuGet.Core/NuGet.Frameworks/FrameworkNameProvider.cs#L487 }\ntry\n{\n- supportedTFMs.Add(tfm.ToShortNameOrNull());\n+ var tfmToAdd = tfm.ToShortNameOrNull();\n+ if (!string.IsNullOrEmpty(tfmToAdd))\n+ {\n+ supportedTFMs.Add(tfmToAdd);\n+ }\n}\ncatch\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | adjust backfill logic - remove redundant catch, process null TFMs (#8528) |
455,754 | 16.04.2021 18:13:52 | -36,000 | 5cf5b9be1b52f17d8bb65cb1c97e1dad2c07a1eb | [a11y] Add popovers to verification checkmarks
Add popovers to verification checkmarks | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"new_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"diff": "@@ -170,6 +170,10 @@ private static void BundlingPostStart()\n.Include(\"~/Scripts/gallery/clamp.js\");\nBundleTable.Bundles.Add(displayPackageScriptBundle);\n+ var listPackagesScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-list-packages.min.js\")\n+ .Include(\"~/Scripts/gallery/page-list-packages.js\");\n+ BundleTable.Bundles.Add(listPackagesScriptBundle);\n+\nvar managePackagesScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-manage-packages.min.js\")\n.Include(\"~/Scripts/gallery/page-manage-packages.js\");\nBundleTable.Bundles.Add(managePackagesScriptBundle);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"App_Data\\Files\\Content\\Symbols-Configuration.json\" />\n<Content Include=\"Scripts\\gallery\\instrumentation.js\" />\n<Content Include=\"Scripts\\gallery\\knockout-3.5.1.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-list-packages.js\" />\n<Content Include=\"Views\\Shared\\SiteMenu.cshtml\">\n<SubType>Code</SubType>\n</Content>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Scripts/gallery/page-list-packages.js",
"diff": "+$(function() {\n+ 'use strict';\n+\n+ $(\".reserved-indicator\").each(\n+ function() {\n+ var checkmarkImage = $(this);\n+ checkmarkImage.popover({ trigger: 'hover focus' });\n+ checkmarkImage.click(function() {\n+ checkmarkImage.popover('show');\n+ setTimeout(function() {\n+ checkmarkImage.popover('destroy');\n+ },\n+ 1000);\n+ });\n+ }\n+ );\n+});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"diff": "location.href = '[email protected](Model.SearchTerm)';\n});\n</script>\n+\n+ @Scripts.Render(\"~/Scripts/gallery/page-list-packages.min.js\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "<img class=\"reserved-indicator\"\nsrc=\"~/Content/gallery/img/reserved-indicator.svg\"\[email protected](Url.Absolute(\"~/Content/gallery/img/reserved-indicator-20x20.png\"))\n- title=\"@Strings.ReservedNamespace_ReservedIndicatorTooltip\" />\n+ data-content=\"@Strings.ReservedNamespace_ReservedIndicatorTooltip\" tabindex=\"0\" />\n}\n@if (showEditButton && (Model.CanEdit || Model.CanManageOwners || Model.CanUnlistOrRelist))\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [a11y] Add popovers to verification checkmarks (#8521)
Add popovers to verification checkmarks |
455,781 | 16.04.2021 11:36:41 | 25,200 | c0580f6357c920adb305347e8ee52a05e17f840f | [A11y] Add tabindex to make every td reacheable. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<table aria-label=\"Version History of @Model.Id\" class=\"table borderless\">\n<thead>\n<tr>\n- <th>Version</th>\n- <th>Downloads</th>\n- <th>Last updated</th>\n+ <th scope=\"col\">Version</th>\n+ <th scope=\"col\">Downloads</th>\n+ <th scope=\"col\">Last updated</th>\n@if (Model.CanDisplayPrivateMetadata)\n{\n- <th>Status</th>\n+ <th scope=\"col\">Status</th>\n}\n@if (Model.IsCertificatesUIEnabled)\n{\n- <th aria-hidden=\"true\" abbr=\"Signature Information\"></th>\n+ <th scope=\"col\" aria-hidden=\"true\" abbr=\"Signature Information\"></th>\n}\n@if (Model.IsPackageDeprecationEnabled || Model.IsPackageVulnerabilitiesEnabled)\n{\n- <th aria-hidden=\"true\" abbr=\"Package Warnings\"></th>\n+ <th scope=\"col\" aria-hidden=\"true\" abbr=\"Package Warnings\"></th>\n}\n</tr>\n</thead>\nrowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"@(packageVersion.IsCurrent(Model) ? \"bg-info\" : null)\">\n- <td>\n+ <td tabindex=\"0\">\n<a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.FullVersion\">\[email protected](30)\n</a>\n</td>\n- <td>\n+ <td tabindex=\"0\">\[email protected]()\n</td>\n- <td>\n+ <td tabindex=\"0\">\n<span data-datetime=\"@packageVersion.LastUpdated.ToString(\"O\")\">@packageVersion.LastUpdated.ToNuGetShortDateString()</span>\n@if (packageVersion.PushedBy != null)\n{\n{\nvar packageStatusSummary = packageVersion.PackageStatusSummary;\n- <td>\n+ <td tabindex=\"0\">\n@if (packageStatusSummary == PackageStatusSummary.Listed ||\npackageStatusSummary == PackageStatusSummary.Unlisted)\n{\n}\nelse\n{\n- <td class=\"package-icon-cell\">\n+ <td tabindex=\"0\" class=\"package-icon-cell\">\n<i class=\"ms-Icon ms-Icon--Ribbon package-icon\" title=\"@packageVersion.SignatureInformation\"></i>\n</td>\n}\n}\nelse\n{\n- <td class=\"package-icon-cell\">\n+ <td tabindex=\"0\" class=\"package-icon-cell\">\n<i class=\"ms-Icon ms-Icon--Warning package-icon\" title=\"@packageVersion.PackageWarningIconTitle\"></i>\n</td>\n}\nrowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"deleted\">\n- <td class=\"version\">\n+ <td tabindex=\"0\" class=\"version\">\[email protected]\n</td>\n- <td>\n+ <td tabindex=\"0\">\[email protected]\n</td>\n- <td>\n+ <td tabindex=\"0\">\n<span data-datetime=\"@packageVersion.LastUpdated.ToString(\"O\")\">@packageVersion.LastUpdated.ToNuGetShortDateString()</span>\n</td>\n- <td>\n+ <td tabindex=\"0\">\nDeleted\n</td>\n<td colspan=\"2\"></td>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [A11y] Add tabindex to make every td reacheable. (#8529) |
455,781 | 20.04.2021 11:22:34 | 25,200 | 65c01094510dc3f7d715151dd39d0894601e1d46 | aria-required true added to announce a required input. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<label class=\"required\" data-bind=\"attr: { for: PackageOwnerId,\nid: PackageOwnerId() + '-label' }\">Package Owner</label>\n<select class=\"form-control\"\n+ aria-required=\"true\"\ndata-bind=\"attr: { id: PackageOwnerId,\nname: PackageOwnerId,\n'aria-labelledby': PackageOwnerId() + '-label' },\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | aria-required true added to announce a required input. (#8537) |
455,754 | 21.04.2021 10:51:39 | -36,000 | 387bf543d93c376694e4eebd578325fccab9c0a6 | adjust try blocks in TFM backfill job, repair empty TFM metadata case | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"diff": "using System.Xml;\nusing System.Xml.Linq;\nusing GalleryTools.Utils;\n+using Microsoft.IdentityModel.JsonWebTokens;\nusing NuGet.Services.Sql;\nnamespace GalleryTools.Commands\n@@ -116,8 +117,7 @@ public async Task Collect(SqlConnection connection, Uri serviceDiscoveryUri, Dat\nvar repository = new EntityRepository<Package>(context);\n- var packages = repository.GetAll()\n- .Include(p => p.PackageRegistration);\n+ var packages = repository.GetAll().Include(p => p.PackageRegistration);\nif (QueryIncludes != null)\n{\npackages = packages.Include(QueryIncludes);\n@@ -233,6 +233,10 @@ public async Task Update(SqlConnection connection, string fileName)\nvar repository = new EntityRepository<Package>(context);\nvar packages = repository.GetAll().Include(p => p.PackageRegistration);\n+ if (QueryIncludes != null)\n+ {\n+ packages = packages.Include(QueryIncludes);\n+ }\nusing (var csv = CreateCsvReader(fileName))\n{\n@@ -355,7 +359,9 @@ private CsvReader CreateCsvReader(string fileName)\nvar reader = new StreamReader(fileName);\n- return new CsvReader(reader, configuration);\n+ var csvReader = new CsvReader(reader, configuration);\n+ csvReader.Configuration.MissingFieldFound = null;\n+ return csvReader;\n}\nprivate Configuration CreateCsvConfiguration()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillTfmMetadataCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillTfmMetadataCommand.cs",
"diff": "@@ -38,12 +38,6 @@ protected override List<string> ReadMetadata(IList<string> files, NuspecReader n\ntry\n{\nsupportedFrameworks = _packageService.GetSupportedFrameworks(nuspecReader, files);\n- }\n- catch (ArgumentException)\n- {\n- // do nothing--this is a known scenario and we'll skip this package quietly, which will give us a more useful error log file\n- }\n-\nforeach (var tfm in supportedFrameworks)\n{\n// We wrap this in a try-catch because some poorly-crafted portable TFMs will make it through GetSupportedFrameworks and fail here, e.g. for a\n@@ -64,6 +58,11 @@ protected override List<string> ReadMetadata(IList<string> files, NuspecReader n\n// skip this TFM and only collect well-formatted ones\n}\n}\n+ }\n+ catch (ArgumentException)\n+ {\n+ // do nothing--this is a known scenario and we'll skip this package quietly, which will give us a more useful error log file\n+ }\nreturn supportedTFMs;\n}\n@@ -79,17 +78,18 @@ protected override void UpdatePackage(Package package, List<string> metadata, En\n{\n// Note that extracting old TFMs may throw for formatting reasons. In this case we'll force a full replacement by leaving the collection empty.\nvar existingTFMs = Enumerable.Empty<string>();\n- if (package.SupportedFrameworks != null)\n- {\ntry\n{\n- existingTFMs = package.SupportedFrameworks.Select(f => f.FrameworkName.GetShortFolderName()).OrderBy(f => f);\n+ if (package.SupportedFrameworks != null)\n+ {\n+ // We'll force this enumerable to a list to force all potential throws\n+ existingTFMs = package.SupportedFrameworks.Select(f => f.FrameworkName.GetShortFolderName()).OrderBy(f => f).ToList();\n+ }\n}\ncatch\n{\n// do nothing and replace in full\n}\n- }\nvar newTFMs = metadata == null || metadata.Count == 0\n? Enumerable.Empty<string>()\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | adjust try blocks in TFM backfill job, repair empty TFM metadata case |
455,754 | 21.04.2021 10:54:23 | -36,000 | f627d77304366478c7783ebb023f4b6026f9ec31 | Add prompt for DMCA data collection to support request edit dialog | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/SupportRequest/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/SupportRequest/Index.cshtml",
"diff": "<div class=\"form-field\">\n<label for=\"editIssueComment\">Add comment</label>\n<textarea id=\"editIssueComment\" name=\"editIssueComment\" data-bind=\"value: editIssueComment\" rows=\"10\"\n- placeholder=\"Add a comment...\" autocomplete=\"off\" autofocus></textarea>\n+ placeholder=\"Add a comment. If resolving a DMCA request add offender account names (in single quotes, comma-delimited), offending package id, and resolution (no action, withdrawn, upheld). Example: accounts:'foo1','foo2' id:BarPkg resolution: upheld\"\n+ autocomplete=\"off\" autofocus></textarea>\n</div>\n</fieldset>\n</form>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add prompt for DMCA data collection to support request edit dialog (#8536) |
455,767 | 23.04.2021 16:44:45 | 25,200 | 2e49db62585e14eb2fe65164f88e7f26109077cb | Added links to best practices page on package upload page
Added links to best practices page in upload package page
Addresses | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"diff": "@ViewHelpers.AjaxAntiForgeryToken(Html)\[email protected](Url, CurrentUser, true, @<text>Upload</text>)\n<div class=\"text-left\">\n- <p class=\"message\">Your package file will be uploaded and hosted on the @(Config.Current.Brand) server (@(Config.Current.SiteRoot)).</p>\n+ <p class=\"message\">Your package file will be uploaded and on the @(Config.Current.Brand) server (@(Config.Current.SiteRoot)).</p>\n+ <p class=\"message\">\n+ To learn more about authoring great packages, view our\n+ <a href=\"https://docs.microsoft.com/nuget/create-packages/package-authoring-best-practices\" alt=\"Best Practices\" aria-label=\"Read here about publishing packages\">Best Practices</a> page.\n+ </p>\n</div>\n<div id=\"upload-package-container\">\n<h2>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"diff": "<!-- /ko -->\n<!-- /ko -->\n</ul>\n- We recommend that you fix these issues and upload a new package.\n- <a href=\"https://docs.microsoft.com/en-us/nuget/policies/nuget-faq#managing-packages-on-nugetorg\" alt=\"Read more\" aria-label=\"Read more about managing packages on nuget.org\">Read more</a><br />\n+ We recommend that you fix these issues and upload a new package. To learn more about authoring great packages, view our\n+ <a href=\"https://docs.microsoft.com/nuget/create-packages/package-authoring-best-practices\" alt=\"Best Practices\" aria-label=\"Read here about managing packages on nuget.org\">Best Practices</a> page.<br />\n</span>)\n<!-- /ko -->\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Added links to best practices page on package upload page (#8542)
Added links to best practices page in upload package page
Addresses #8411 |
455,781 | 26.04.2021 10:14:13 | 25,200 | 5a4b471bbe3bd5b0feaa423ff8f3ab27403f5789 | removed collapse from cancel button. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "id: CancelEditId },\nenable: SelectPackagesEnabled() && !PendingCreateOrEdit(),\nclick: CancelEdit\"\n- class=\"btn btn-default btn-block\" data-toggle=\"collapse\">\n+ class=\"btn btn-default btn-block\">\nCancel\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | removed collapse from cancel button. (#8539) |
455,781 | 26.04.2021 10:15:23 | 25,200 | 69898de3083335cd098bcf26208a947b2e5591c2 | Moved aria-labelledby so that announcer says correctly radio button groups. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<div class=\"radio\">\n<div class=\"label-sibling\">\n<input name=\"PushScope\" type=\"radio\" value=\"@NuGetScopes.PackagePush\"\n- aria-labelledby=\"select-scopes-push-package select-scopes\"\ndata-bind=\"checked: PushScope, enable: PushNewEnabled,\nattr: { id: PackagePushId }\" />\n</div>\n- <label id=\"select-scopes-push-package\" data-bind=\"attr: { for: PackagePushId }\">\n+ <label id=\"select-scopes-push-package\" data-bind=\"attr: { for: PackagePushId }\"\n+ aria-labelledby=\"select-scopes-push-package select-scopes\">\[email protected](NuGetScopes.PackagePush)\n</label>\n</div>\n<div class=\"radio\">\n<div class=\"label-sibling\">\n<input name=\"PushScope\" type=\"radio\" value=\"@NuGetScopes.PackagePushVersion\"\n- aria-labelledby=\"select-scopes-push-package-version select-scopes\"\ndata-bind=\"checked: PushScope, enable: PushExistingEnabled,\nattr: { id: PackagePushVersionId }\" />\n</div>\n- <label id=\"select-scopes-push-package-version\" data-bind=\"attr: { for: PackagePushVersionId }\">\n+ <label id=\"select-scopes-push-package-version\" data-bind=\"attr: { for: PackagePushVersionId }\"\n+ aria-labelledby=\"select-scopes-push-package-version select-scopes\">\[email protected](NuGetScopes.PackagePushVersion)\n</label>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Moved aria-labelledby so that announcer says correctly radio button groups. (#8538) |
455,767 | 03.05.2021 10:31:49 | 25,200 | 534245d0af7f4f380ebd92d03d5d4bba89d93a60 | fixed missing flights for icons and readMes | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"SiteAdmins\": false,\n\"Accounts\": [],\n\"Domains\": []\n+ },\n+ \"NuGetGallery.EmbeddedIcons\": {\n+ \"All\": true,\n+ \"SiteAdmins\": false,\n+ \"Accounts\": [],\n+ \"Domains\": []\n+ },\n+ \"NuGetGallery.EmbeddedReadmes\": {\n+ \"All\": true,\n+ \"SiteAdmins\": false,\n+ \"Accounts\": [],\n+ \"Domains\": []\n}\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | fixed missing flights for icons and readMes (#8558) |
455,741 | 10.05.2021 12:12:00 | 25,200 | 20509964e546007d2acb95909e46e6774fc057b7 | style image | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -641,6 +641,12 @@ img.reserved-indicator-icon {\noverflow: auto;\nmax-height: 450px;\n}\n+#readme-less img {\n+ max-width: 100%;\n+}\n+#readme-more img {\n+ max-width: 100%;\n+}\n.user-package-list .manage-package-listing .package-icon {\nmax-height: 2em;\nmin-width: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-readme.less",
"new_path": "src/Bootstrap/less/theme/common-readme.less",
"diff": "max-height: 450px;\n}\n}\n+\n+#readme-less {\n+ img {\n+ max-width: 100%;\n+ }\n+}\n+\n+#readme-more {\n+ img {\n+ max-width: 100%;\n+ }\n+}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | style image (#8568) |
455,741 | 10.05.2021 12:12:57 | 25,200 | dc68b6069a3fcd437ba4c92435482eb82b303afd | change the link of trusted domains | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-edit-readme.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-edit-readme.js",
"diff": "@@ -338,7 +338,7 @@ var BindReadMeDataManager = (function () {\n}\nif (response.ImageSourceDisallowed) {\n- displayReadMeWarning(\"Some images are not displayed as they are not from <a href='https://aka.ms/nuget-org-readme'>trusted domains</a>.\");\n+ displayReadMeWarning(\"Some images are not displayed as they are not from <a href='https://aka.ms/nuget-org-readme#allowed-domains-for-images-and-badges'>trusted domains</a>.\");\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@if (Model.ReadmeImageSourceDisallowed && Model.CanDisplayPrivateMetadata)\n{\n- @ViewHelpers.AlertWarning(@<text>Some images are not displayed as they are not from <a href='https://aka.ms/nuget-org-readme'>trusted domains</a>.</text>);\n+ @ViewHelpers.AlertWarning(@<text>Some images are not displayed as they are not from <a href='https://aka.ms/nuget-org-readme#allowed-domains-for-images-and-badges'>trusted domains</a>.</text>);\n}\n<div id=\"readme-less\" class=\"collapse in\">\[email protected](Model.ReadMeHtml)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"diff": "<div class=\"verify-package-field readme\">\n<label class=\"verify-package-field-heading\">Readme File</label>\n<!-- ko if: $data.ReadmeFileContents.ImageSourceDisallowed -->\n- @ViewHelpers.AlertWarning(@<text>Some images are not displayed as they are not from <a href='https://aka.ms/nuget-org-readme'>trusted domains</a>.</text>)\n+ @ViewHelpers.AlertWarning(@<text>Some images are not displayed as they are not from <a href='https://aka.ms/nuget-org-readme#allowed-domains-for-images-and-badges'>trusted domains</a>.</text>)\n<!-- /ko -->\n<div class=\"readme-container\" data-bind=\"html: $data.ReadmeFileContents.Content\"></div>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | change the link of trusted domains (#8571) |
455,752 | 11.05.2021 05:44:17 | -36,000 | e826603c06faca81804be6be7a48f518fdb659a8 | Hide Licence file section on package upload if empty | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"diff": "</div>\n<!-- /ko -->\n+ <!-- ko if: $data.LicenseFileContentsHtml || $data.LicenseFileContents -->\n<div class=\"verify-package-field common-licenses\">\n<label class=\"verify-package-field-heading\">License file</label>\n<!-- ko if: $data.LicenseFileContentsHtml -->\n<pre class=\"license-file-contents custom-license-container\" data-bind=\"text: $data.LicenseFileContents\"></pre>\n<!-- /ko -->\n</div>\n+ <!-- /ko -->\n<!-- ko if: !$data.LicenseExpression && !$data.LicenseFileContents && !$data.LicenseExpressionSegments -->\n<div class=\"verify-package-field\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Hide Licence file section on package upload if empty (#8550) |
455,752 | 14.05.2021 08:41:47 | -36,000 | 36852536e67fc948c0954ce80c1019122124f864 | Display version metadata only in an info box
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/ViewModelExtensions/PackageViewModelFactory.cs",
"new_path": "src/NuGetGallery/Helpers/ViewModelExtensions/PackageViewModelFactory.cs",
"diff": "@@ -34,7 +34,6 @@ public PackageViewModel Setup(PackageViewModel viewModel, Package package)\n}\nviewModel.FullVersion = NuGetVersionFormatter.ToFullString(package.Version);\n-\nviewModel.Id = package.Id;\nviewModel.Version = String.IsNullOrEmpty(package.NormalizedVersion) ?\nNuGetVersionFormatter.Normalize(package.Version) :\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<div class=\"package-title\">\n<h1>\[email protected](Model.Id)\n- <small class=\"text-nowrap\">@Model.FullVersion</small>\n+ <small class=\"text-nowrap\">@Model.Version</small>\n@if (Model.IsVerified.HasValue && Model.IsVerified.Value)\n{\n</text>\n)\n}\n+ @if (Model.NuGetVersion.HasMetadata)\n+ {\n+ @ViewHelpers.AlertInfo(\n+ @<text>\n+ This package has a SemVer 2.0.0 package version: @(Model.FullVersion).\n+ </text>\n+ )\n+ }\n@if (Model.VersionRequestedWasNotFound)\n{\[email protected](\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"@(packageVersion.IsCurrent(Model) ? \"bg-info\" : null)\">\n<td tabindex=\"0\">\n- <a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.FullVersion\">\n+ <a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.Version\">\[email protected](30)\n</a>\n</td>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "<li>\n<span class=\"icon-text\">\n<i class=\"ms-Icon ms-Icon--Flag\" aria-hidden=\"true\"></i>\n- Latest version: <span class=\"text-nowrap\">@Model.FullVersion @(Model.Prerelease ? \"(prerelease)\" : \"\")</span>\n+ Latest version: <span class=\"text-nowrap\">@Model.Version @(Model.Prerelease ? \"(prerelease)\" : \"\")</span>\n</span>\n</li>\n@if (Model.Tags.AnySafe())\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Display version metadata only in an info box (#8554)
Address https://github.com/NuGet/NuGetGallery/issues/7662 |
455,754 | 10.05.2021 08:54:42 | -36,000 | 88306515cbc698ee2299e3d2e994e0355757d321 | Add a non-locked monitoring cursor for inspection during job | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"new_path": "src/GalleryTools/Commands/BackfillCommand.cs",
"diff": "@@ -36,6 +36,8 @@ public abstract class BackfillCommand<TMetadata>\nprotected virtual string CursorFileName => \"cursor.txt\";\n+ protected virtual string MonitoringCursorFileName => \"monitoring_cursor.txt\";\n+\nprotected virtual int CollectBatchSize => 10;\nprotected virtual int UpdateBatchSize => 100;\n@@ -204,6 +206,12 @@ public async Task Collect(SqlConnection connection, Uri serviceDiscoveryUri, Dat\nlogger.Log($\"Writing {package.Created:u} to cursor...\");\nawait cursor.Write(package.Created);\ncounter = 0;\n+\n+ // Write a monitoring cursor (not locked) so for a large job we can inspect progress\n+ if (!string.IsNullOrEmpty(MonitoringCursorFileName))\n+ {\n+ File.WriteAllText(MonitoringCursorFileName, package.Created.ToString(\"G\"));\n+ }\n}\n}\n@@ -399,6 +407,12 @@ private async Task CommitBatch(EntitiesContext context, FileCursor cursor, Logge\nif (cursorTime.HasValue)\n{\nawait cursor.Write(cursorTime.Value);\n+\n+ // Write a monitoring cursor (not locked) so for a large job we can inspect progress\n+ if (!string.IsNullOrEmpty(MonitoringCursorFileName))\n+ {\n+ File.WriteAllText(MonitoringCursorFileName, cursorTime.Value.ToString(\"G\"));\n+ }\n}\nlogger.Log($\"{count} packages saved.\");\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add a non-locked monitoring cursor for inspection during job |
455,754 | 13.05.2021 13:58:07 | -36,000 | c0a6f85583de25c5913ed37f9a6b5784ffa49119 | Add caching to package details page vulnerabilities query | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/IPackageVulnerabilitiesManagementService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/IPackageVulnerabilitiesManagementService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Threading.Tasks;\n+using System.Linq;\nusing NuGet.Services.Entities;\nnamespace NuGetGallery\n@@ -22,5 +23,12 @@ public interface IPackageVulnerabilitiesManagementService\n/// </summary>\n/// <param name=\"withdrawn\">Whether or not the vulnerability was withdrawn.</param>\nTask UpdateVulnerabilityAsync(PackageVulnerability vulnerability, bool withdrawn);\n+\n+ /// <summary>\n+ /// Get a package's collection of vulnerable ranges.\n+ /// </summary>\n+ /// <param name=\"packageId\">The package's Id</param>\n+ /// <returns>The package's vulnerable ranges, connecting it to <see cref=\"PackageVulnerability\" /> instances</returns>\n+ IQueryable<VulnerablePackageVersionRange> GetVulnerableRangesById(string packageId);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageVulnerabilitiesManagementService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageVulnerabilitiesManagementService.cs",
"diff": "@@ -73,6 +73,9 @@ public async Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, b\n}\n}\n+ public IQueryable<VulnerablePackageVersionRange> GetVulnerableRangesById(string packageId) =>\n+ _entitiesContext.VulnerableRanges.Where(x => x.PackageId == packageId);\n+\n/// <summary>\n/// Updates the database with <paramref name=\"vulnerability\"/>.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -460,6 +460,11 @@ protected override void Load(ContainerBuilder builder)\n.As<IPackageVulnerabilitiesManagementService>()\n.InstancePerLifetimeScope();\n+ builder.RegisterType<PackageVulnerabilitiesCacheService>()\n+ .AsSelf()\n+ .As<IPackageVulnerabilitiesCacheService>()\n+ .SingleInstance();\n+\nservices.AddHttpClient();\nservices.AddScoped<IGravatarProxyService, GravatarProxyService>();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\IImageDomainValidator.cs\" />\n<Compile Include=\"Services\\IPackageVulnerabilitiesService.cs\" />\n<Compile Include=\"Services\\IPackageMetadataValidationService.cs\" />\n+ <Compile Include=\"Services\\IPackageVulnerabilitiesCacheService.cs\" />\n<Compile Include=\"Services\\MarkdownService.cs\" />\n<Compile Include=\"Services\\OwnerlessNamespaceIdConflictMessage.cs\" />\n+ <Compile Include=\"Services\\PackageVulnerabilitiesCacheService.cs\" />\n<Compile Include=\"Services\\PackageVulnerabilitiesService.cs\" />\n<Compile Include=\"Services\\PackageMetadataValidationService.cs\" />\n<Compile Include=\"Services\\ConfigurationIconFileProvider.cs\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Services/PackageVulnerabilitiesCacheService.cs",
"diff": "+// Copyright (c) .NET Foundation. All rights reserved.\n+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n+\n+using System;\n+using System.Collections.Generic;\n+using System.Collections.ObjectModel;\n+using System.Data.Entity;\n+using System.Linq;\n+using NuGet.Services.Entities;\n+\n+namespace NuGetGallery\n+{\n+ public class PackageVulnerabilitiesCacheService : IPackageVulnerabilitiesCacheService\n+ {\n+ private const int CachingLimitMinutes = 30;\n+ private readonly object Locker = new object();\n+ private readonly IDictionary<string,\n+ (DateTime cachedAt, IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> vulnerabilitiesById)> vulnerabilitiesByIdCache\n+ = new Dictionary<string, (DateTime, IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>>)>();\n+\n+ public IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id,\n+ IPackageVulnerabilitiesManagementService packageVulnerabilitiesManagementService)\n+ {\n+ if (string.IsNullOrEmpty(id))\n+ {\n+ throw new ArgumentException(\"Must have a value.\", nameof(id));\n+ }\n+ if (packageVulnerabilitiesManagementService == null)\n+ {\n+ throw new ArgumentNullException(nameof(packageVulnerabilitiesManagementService));\n+ }\n+\n+ if (ShouldCachedValueBeUpdated(id))\n+ {\n+ lock (Locker)\n+ {\n+ if (ShouldCachedValueBeUpdated(id))\n+ {\n+ var packageKeyAndVulnerability = packageVulnerabilitiesManagementService\n+ .GetVulnerableRangesById(id)\n+ .Include(x => x.Vulnerability)\n+ .Where(x => x.PackageId == id)\n+ .SelectMany(x => x.Packages.Select(p => new {PackageKey = p.Key, x.Vulnerability}))\n+ .GroupBy(pv => pv.PackageKey, pv => pv.Vulnerability)\n+ .ToDictionary(pv => pv.Key,\n+ pv => pv.ToList().AsReadOnly() as IReadOnlyList<PackageVulnerability>);\n+\n+ var result = !packageKeyAndVulnerability.Any()\n+ ? null\n+ : new ReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>>(\n+ packageKeyAndVulnerability);\n+\n+ vulnerabilitiesByIdCache[id] = (cachedAt: DateTime.Now, vulnerabilitiesById: result);\n+ }\n+ }\n+ }\n+\n+ return vulnerabilitiesByIdCache[id].vulnerabilitiesById;\n+ }\n+\n+ private bool ShouldCachedValueBeUpdated(string id) => !vulnerabilitiesByIdCache.ContainsKey(id) ||\n+ vulnerabilitiesByIdCache[id].cachedAt\n+ .AddMinutes(CachingLimitMinutes) < DateTime.Now;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"new_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"diff": "@@ -12,36 +12,23 @@ namespace NuGetGallery\n{\npublic class PackageVulnerabilitiesService : IPackageVulnerabilitiesService\n{\n- private readonly IEntitiesContext _entitiesContext;\n+ private readonly IPackageVulnerabilitiesManagementService _packageVulnerabilitiesManagementService;\n+ private readonly IPackageVulnerabilitiesCacheService _packageVulnerabilitiesCacheService;\n- public PackageVulnerabilitiesService(IEntitiesContext entitiesContext)\n+ public PackageVulnerabilitiesService(\n+ IPackageVulnerabilitiesManagementService packageVulnerabilitiesManagementService,\n+ IPackageVulnerabilitiesCacheService packageVulnerabilitiesCacheService)\n{\n- _entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n+ _packageVulnerabilitiesManagementService = packageVulnerabilitiesManagementService ??\n+ throw new ArgumentNullException(\n+ nameof(packageVulnerabilitiesManagementService));\n+ _packageVulnerabilitiesCacheService = packageVulnerabilitiesCacheService ??\n+ throw new ArgumentNullException(\n+ nameof(packageVulnerabilitiesCacheService));\n}\n- public IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id)\n- {\n- var result = new Dictionary<int, List<PackageVulnerability>>();\n- var packagesMatchingId = _entitiesContext.Packages\n- .Where(p => p.PackageRegistration != null && p.PackageRegistration.Id == id)\n- .Include($\"{nameof(Package.VulnerablePackageRanges)}.{nameof(VulnerablePackageVersionRange.Vulnerability)}\");\n- foreach (var package in packagesMatchingId)\n- {\n- if (package.VulnerablePackageRanges == null)\n- {\n- continue;\n- }\n-\n- if (package.VulnerablePackageRanges.Any())\n- {\n- result.Add(package.Key,\n- package.VulnerablePackageRanges.Select(vr => vr.Vulnerability).ToList());\n- }\n- }\n-\n- return !result.Any() ? null :\n- result.ToDictionary(kv => kv.Key, kv => kv.Value as IReadOnlyList<PackageVulnerability>);\n- }\n+ public IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id) =>\n+ _packageVulnerabilitiesCacheService.GetVulnerabilitiesById(id, _packageVulnerabilitiesManagementService);\npublic bool IsPackageVulnerable(Package package)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyGitHubVulnerabilities/Verify/PackageVulnerabilitiesVerifier.cs",
"new_path": "src/VerifyGitHubVulnerabilities/Verify/PackageVulnerabilitiesVerifier.cs",
"diff": "@@ -71,6 +71,8 @@ public Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, bool wi\nreturn Task.CompletedTask;\n}\n+ public IQueryable<VulnerablePackageVersionRange> GetVulnerableRangesById(string packageId) => throw new NotImplementedException();\n+\nprivate void VerifyVulnerabilityInDatabase(PackageVulnerability vulnerability, bool withdrawn)\n{\nConsole.WriteLine($\"[Database] Verifying vulnerability {vulnerability.GitHubDatabaseKey}.\");\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add caching to package details page vulnerabilities query |
455,754 | 17.05.2021 11:31:46 | -36,000 | 2e4e8733aed19cc899adf210dd4c142afd08ea99 | Addressed feedback - loading cache on startup | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/IPackageVulnerabilitiesManagementService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/IPackageVulnerabilitiesManagementService.cs",
"diff": "@@ -30,5 +30,12 @@ public interface IPackageVulnerabilitiesManagementService\n/// <param name=\"packageId\">The package's Id</param>\n/// <returns>The package's vulnerable ranges, connecting it to <see cref=\"PackageVulnerability\" /> instances</returns>\nIQueryable<VulnerablePackageVersionRange> GetVulnerableRangesById(string packageId);\n+\n+ /// <summary>\n+ /// Get the full set of vulnerable package entities\n+ /// </summary>\n+ /// <returns>Vulnerable package version ranges</returns>\n+ IQueryable<VulnerablePackageVersionRange> GetAllVulnerableRanges();\n+\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageVulnerabilitiesManagementService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageVulnerabilitiesManagementService.cs",
"diff": "@@ -76,6 +76,9 @@ public async Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, b\npublic IQueryable<VulnerablePackageVersionRange> GetVulnerableRangesById(string packageId) =>\n_entitiesContext.VulnerableRanges.Where(x => x.PackageId == packageId);\n+ public IQueryable<VulnerablePackageVersionRange> GetAllVulnerableRanges() =>\n+ _entitiesContext.Set<VulnerablePackageVersionRange>();\n+\n/// <summary>\n/// Updates the database with <paramref name=\"vulnerability\"/>.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -460,7 +460,7 @@ protected override void Load(ContainerBuilder builder)\n.As<IPackageVulnerabilitiesManagementService>()\n.InstancePerLifetimeScope();\n- builder.RegisterType<PackageVulnerabilitiesCacheService>()\n+ builder.Register(c => new PackageVulnerabilitiesCacheService(c.Resolve<IPackageVulnerabilitiesManagementService>()))\n.AsSelf()\n.As<IPackageVulnerabilitiesCacheService>()\n.SingleInstance();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageVulnerabilitiesCacheService.cs",
"new_path": "src/NuGetGallery/Services/IPackageVulnerabilitiesCacheService.cs",
"diff": "@@ -15,7 +15,6 @@ public interface IPackageVulnerabilitiesCacheService\n/// <summary>\n/// This function is used to get the packages by id dictionary from the cache\n/// </summary>\n- IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id,\n- IPackageVulnerabilitiesManagementService packageVulnerabilitiesManagementService);\n+ IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageVulnerabilitiesCacheService.cs",
"new_path": "src/NuGetGallery/Services/PackageVulnerabilitiesCacheService.cs",
"diff": "@@ -12,23 +12,25 @@ namespace NuGetGallery\n{\npublic class PackageVulnerabilitiesCacheService : IPackageVulnerabilitiesCacheService\n{\n- private const int CachingLimitMinutes = 30;\n+ private const int CachingLimitMinutes = 1440; // We could make this 1 day instead (same value) but this is easier for spot testing the cache\nprivate readonly object Locker = new object();\n- private readonly IDictionary<string,\n- (DateTime cachedAt, IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> vulnerabilitiesById)> vulnerabilitiesByIdCache\n- = new Dictionary<string, (DateTime, IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>>)>();\n+ private IDictionary<string,\n+ (DateTime cachedAt, Dictionary<int, IReadOnlyList<PackageVulnerability>> vulnerabilitiesById)> vulnerabilitiesByIdCache\n+ = new Dictionary<string, (DateTime, Dictionary<int, IReadOnlyList<PackageVulnerability>>)>();\n- public IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id,\n- IPackageVulnerabilitiesManagementService packageVulnerabilitiesManagementService)\n+ private readonly IPackageVulnerabilitiesManagementService _packageVulnerabilitiesManagementService;\n+ public PackageVulnerabilitiesCacheService(IPackageVulnerabilitiesManagementService packageVulnerabilitiesManagementService)\n+ {\n+ _packageVulnerabilitiesManagementService = packageVulnerabilitiesManagementService;\n+ Initialize();\n+ }\n+\n+ public IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id)\n{\nif (string.IsNullOrEmpty(id))\n{\nthrow new ArgumentException(\"Must have a value.\", nameof(id));\n}\n- if (packageVulnerabilitiesManagementService == null)\n- {\n- throw new ArgumentNullException(nameof(packageVulnerabilitiesManagementService));\n- }\nif (ShouldCachedValueBeUpdated(id))\n{\n@@ -36,26 +38,42 @@ public class PackageVulnerabilitiesCacheService : IPackageVulnerabilitiesCacheSe\n{\nif (ShouldCachedValueBeUpdated(id))\n{\n- var packageKeyAndVulnerability = packageVulnerabilitiesManagementService\n+ var packageKeyAndVulnerability = _packageVulnerabilitiesManagementService\n.GetVulnerableRangesById(id)\n.Include(x => x.Vulnerability)\n- .Where(x => x.PackageId == id)\n.SelectMany(x => x.Packages.Select(p => new {PackageKey = p.Key, x.Vulnerability}))\n.GroupBy(pv => pv.PackageKey, pv => pv.Vulnerability)\n.ToDictionary(pv => pv.Key,\npv => pv.ToList().AsReadOnly() as IReadOnlyList<PackageVulnerability>);\n- var result = !packageKeyAndVulnerability.Any()\n- ? null\n- : new ReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>>(\n- packageKeyAndVulnerability);\n-\n- vulnerabilitiesByIdCache[id] = (cachedAt: DateTime.Now, vulnerabilitiesById: result);\n+ vulnerabilitiesByIdCache[id] = (cachedAt: DateTime.Now, vulnerabilitiesById: packageKeyAndVulnerability);\n+ }\n}\n}\n+\n+ return vulnerabilitiesByIdCache[id].vulnerabilitiesById.Any()\n+ ? new ReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>>(vulnerabilitiesByIdCache[id].vulnerabilitiesById)\n+ : null;\n}\n- return vulnerabilitiesByIdCache[id].vulnerabilitiesById;\n+ private void Initialize()\n+ {\n+ // We need to build a dictionary of dictionaries. Breaking it down:\n+ // - this give us a list of all vulnerable package version ranges\n+ vulnerabilitiesByIdCache = _packageVulnerabilitiesManagementService.GetAllVulnerableRanges()\n+ .Include(x => x.Vulnerability)\n+ // - from these we want a list in this format: (<id>, (<package key>, <vulnerability>))\n+ // which will allow us to look up the dictionary by id, and return a dictionary of version -> vulnerability\n+ .SelectMany(x => x.Packages.Select(p => new\n+ {PackageId = x.PackageId ?? string.Empty, KeyVulnerability = new {PackageKey = p.Key, x.Vulnerability}}))\n+ .GroupBy(ikv => ikv.PackageId, ikv => ikv.KeyVulnerability)\n+ // - build the outer dictionary, keyed by <id> - each inner dictionary is paired with a time of creation (for cache invalidation)\n+ .ToDictionary(ikv => ikv.Key,\n+ ikv => (cachedAt: DateTime.Now,\n+ vulnerabilitiesById: ikv.GroupBy(kv => kv.PackageKey, kv => kv.Vulnerability)\n+ // - build the inner dictionaries, all under the same <id>, each keyed by <package key>\n+ .ToDictionary(kv => kv.Key,\n+ kv => kv.ToList().AsReadOnly() as IReadOnlyList<PackageVulnerability>)));\n}\nprivate bool ShouldCachedValueBeUpdated(string id) => !vulnerabilitiesByIdCache.ContainsKey(id) ||\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"new_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"diff": "@@ -12,23 +12,17 @@ namespace NuGetGallery\n{\npublic class PackageVulnerabilitiesService : IPackageVulnerabilitiesService\n{\n- private readonly IPackageVulnerabilitiesManagementService _packageVulnerabilitiesManagementService;\nprivate readonly IPackageVulnerabilitiesCacheService _packageVulnerabilitiesCacheService;\n- public PackageVulnerabilitiesService(\n- IPackageVulnerabilitiesManagementService packageVulnerabilitiesManagementService,\n- IPackageVulnerabilitiesCacheService packageVulnerabilitiesCacheService)\n+ public PackageVulnerabilitiesService(IPackageVulnerabilitiesCacheService packageVulnerabilitiesCacheService)\n{\n- _packageVulnerabilitiesManagementService = packageVulnerabilitiesManagementService ??\n- throw new ArgumentNullException(\n- nameof(packageVulnerabilitiesManagementService));\n_packageVulnerabilitiesCacheService = packageVulnerabilitiesCacheService ??\nthrow new ArgumentNullException(\nnameof(packageVulnerabilitiesCacheService));\n}\npublic IReadOnlyDictionary<int, IReadOnlyList<PackageVulnerability>> GetVulnerabilitiesById(string id) =>\n- _packageVulnerabilitiesCacheService.GetVulnerabilitiesById(id, _packageVulnerabilitiesManagementService);\n+ _packageVulnerabilitiesCacheService.GetVulnerabilitiesById(id);\npublic bool IsPackageVulnerable(Package package)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Infrastructure\\SearchServiceFactoryFacts.cs\" />\n<Compile Include=\"Services\\ImageDomainValidatorFacts.cs\" />\n<Compile Include=\"Services\\MarkdownServiceFacts.cs\" />\n+ <Compile Include=\"Services\\PackageVulnerabilitiesCacheServiceFacts.cs\" />\n<Compile Include=\"Services\\PackageVulnerabilitiesServiceFacts.cs\" />\n<Compile Include=\"Services\\PackageMetadataValidationServiceFacts.cs\" />\n<Compile Include=\"Services\\ConfigurationIconFileProviderFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Addressed feedback - loading cache on startup |
455,754 | 07.06.2021 16:06:46 | -36,000 | bd259cd1a79fd71594fad72503d81c3e3b4c3fe2 | Add accessible popovers to reserved checkmarks | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -170,4 +170,19 @@ $(function () {\n}\n});\n}\n+\n+ // Add popover to reserved check mark\n+ $(\".reserved-indicator\").each(\n+ function () {\n+ var checkmarkImage = $(this);\n+ checkmarkImage.popover({ trigger: 'hover focus' });\n+ checkmarkImage.click(function () {\n+ checkmarkImage.popover('show');\n+ setTimeout(function () {\n+ checkmarkImage.popover('destroy');\n+ },\n+ 1000);\n+ });\n+ }\n+ );\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<img class=\"reserved-indicator\"\nsrc=\"~/Content/gallery/img/reserved-indicator.svg\"\[email protected](Url.Absolute(\"~/Content/gallery/img/reserved-indicator-25x25.png\"))\n- title=\"@Strings.ReservedNamespace_ReservedIndicatorTooltip\" />\n+ data-content=\"@Strings.ReservedNamespace_ReservedIndicatorTooltip\" tabindex=\"0\"/>\n}\n</h1>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "</article>\n</div>\n</section>\n+\n+@section BottomScripts {\n+ @Scripts.Render(\"~/Scripts/gallery/page-list-packages.min.js\")\n+}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add accessible popovers to reserved checkmarks |
455,741 | 07.06.2021 11:30:20 | 25,200 | c159a02e19bcc8dcd6826fd7bbb20ceeee18c5c2 | Add link for reserved namespace error during package upload | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -518,7 +518,7 @@ private async Task<JsonResult> UploadPackageInternal(PackageArchiveReader packag\n{\nvar version = nuspec.GetVersion().ToNormalizedString();\n_telemetryService.TrackPackagePushNamespaceConflictEvent(id, version, currentUser, User.Identity);\n- return Json(HttpStatusCode.Conflict, new[] { new JsonValidationMessage(Strings.UploadPackage_IdNamespaceConflict) });\n+ return Json(HttpStatusCode.Conflict, new[] { new JsonValidationMessage(new UploadPackageIdNamespaceConflict()) });\n}\nelse if (result == PermissionsCheckResult.OwnerlessReservedNamespaceFailure)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "</Compile>\n<Compile Include=\"Modules\\CookieComplianceHttpModule.cs\" />\n<Compile Include=\"RequestModels\\DeletePackagesApiRequest.cs\" />\n+ <Compile Include=\"Services\\UploadPackageIdNamespaceConflict.cs\" />\n<Compile Include=\"Services\\ImageDomainValidator.cs\" />\n<Compile Include=\"Services\\IMarkdownService.cs\" />\n<Compile Include=\"Services\\IImageDomainValidator.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -2535,7 +2535,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID..\n+ /// Looks up a localized string similar to This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. Go to https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation learn more about Package ID prefix reservation..\n/// </summary>\npublic static string UploadPackage_IdNamespaceConflict {\nget {\n@@ -2543,6 +2543,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. <a href="https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation">Learn more about Package ID prefix reservation</a>..\n+ /// </summary>\n+ public static string UploadPackage_IdNamespaceConflictHtml {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_IdNamespaceConflictHtml\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to There is a conflict with the ID and version of your package and another package. Please change your package's ID or version and try again..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -515,7 +515,10 @@ For more information, please contact '{2}'.</value>\n<value>The ID prefix of this package has been reserved for one of the owners of this package by NuGet.org.</value>\n</data>\n<data name=\"UploadPackage_IdNamespaceConflict\" xml:space=\"preserve\">\n- <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID.</value>\n+ <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. Go to https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation learn more about Package ID prefix reservation.</value>\n+ </data>\n+ <data name=\"UploadPackage_IdNamespaceConflictHtml\" xml:space=\"preserve\">\n+ <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. <a href=\"https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation\">Learn more about Package ID prefix reservation</a>.</value>\n</data>\n<data name=\"PreviewReadMe_ConversionFailed\" xml:space=\"preserve\">\n<value>Conversion of Markdown to HTML failed with '{0}'.</value>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -6606,8 +6606,8 @@ public async Task WillShowTheViewWithErrorsWhenThePackageIdMatchesOwnedByOtherUs\nvar result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;\nAssert.NotNull(result);\n- Assert.Equal(Strings.UploadPackage_IdNamespaceConflict, (result.Data as JsonValidationMessage[])[0].PlainTextMessage);\n- Assert.Null((result.Data as JsonValidationMessage[])[0].RawHtmlMessage);\n+ Assert.Equal(Strings.UploadPackage_IdNamespaceConflictHtml, (result.Data as JsonValidationMessage[])[0].RawHtmlMessage);\n+ Assert.Null((result.Data as JsonValidationMessage[])[0].PlainTextMessage);\nfakeTelemetryService.Verify(\nx => x.TrackPackagePushNamespaceConflictEvent(\nIt.IsAny<string>(),\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add link for reserved namespace error during package upload (#8610) |
455,754 | 08.06.2021 15:13:03 | -36,000 | 820656c725cd41559fe5cc2887d41132302effb3 | Add accessible popovers to vulnerability alerts
Add accessible popovers to vulnerability alerts | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "}\n};\n+ nuget.setPopovers = function () {\n+ var popoverElement = $(this);\n+ popoverElement.popover({ trigger: 'hover focus' });\n+ popoverElement.click(function () {\n+ popoverElement.popover('show');\n+ setTimeout(function () {\n+ popoverElement.popover('destroy');\n+ },\n+ 1000);\n+ });\n+ };\n+\nwindow.nuget = nuget;\njQuery.extend(jQuery.expr.pseudos, {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -171,18 +171,6 @@ $(function () {\n});\n}\n- // Add popover to reserved check mark\n- $(\".reserved-indicator\").each(\n- function () {\n- var checkmarkImage = $(this);\n- checkmarkImage.popover({ trigger: 'hover focus' });\n- checkmarkImage.click(function () {\n- checkmarkImage.popover('show');\n- setTimeout(function () {\n- checkmarkImage.popover('destroy');\n- },\n- 1000);\n- });\n- }\n- );\n+ $(\".reserved-indicator\").each(window.nuget.setPopovers);\n+ $(\".package-warning-icon\").each(window.nuget.setPopovers);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-list-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-list-packages.js",
"diff": "$(function() {\n'use strict';\n- $(\".reserved-indicator\").each(\n- function() {\n- var checkmarkImage = $(this);\n- checkmarkImage.popover({ trigger: 'hover focus' });\n- checkmarkImage.click(function() {\n- checkmarkImage.popover('show');\n- setTimeout(function() {\n- checkmarkImage.popover('destroy');\n- },\n- 1000);\n- });\n- }\n- );\n+ $(\".reserved-indicator\").each(window.nuget.setPopovers);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"diff": "setupColumnSorting();\n+ $(\".package-warning-icon\").each(window.nuget.setPopovers);\n});\n})();\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "rowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"@(packageVersion.IsCurrent(Model) ? \"bg-info\" : null)\">\n- <td tabindex=\"0\">\n+ <td>\n<a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.Version\">\[email protected](30)\n</a>\n{\nvar packageStatusSummary = packageVersion.PackageStatusSummary;\n- <td tabindex=\"0\">\n+ <td>\n@if (packageStatusSummary == PackageStatusSummary.Listed ||\npackageStatusSummary == PackageStatusSummary.Unlisted)\n{\n}\nelse\n{\n- <td tabindex=\"0\" class=\"package-icon-cell\">\n- <i class=\"ms-Icon ms-Icon--Warning package-icon\" title=\"@packageVersion.PackageWarningIconTitle\"></i>\n+ <td class=\"package-icon-cell\">\n+ <span class=\"package-warning-icon\" aria-label=\"@packageVersion.PackageWarningIconTitle\"\n+ data-content=\"@packageVersion.PackageWarningIconTitle\" tabindex=\"0\">\n+ <i class=\"ms-Icon ms-Icon--Warning package-icon\"></i>\n+ </span>\n</td>\n}\n</tr>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "</td>\n}\n<td class=\"align-middle text-nowrap\" data-bind=\"attr: { 'data-sortby': DownloadCount }\">\n- <span data-bind=\"text: FormattedDownloadCount\"></span>\n+ <span data-bind=\"text: FormattedDownloadCount\" tabindex=\"0\"></span>\n</td>\n<td class=\"align-middle text-nowrap\" data-bind=\"attr: { 'data-sortby': VersionSortOrder }\">\n- <span data-bind=\"text: LatestVersion\"></span>\n+ <span data-bind=\"text: LatestVersion\" tabindex=\"0\"></span>\n</td>\n@if (Model.IsManagePackagesVulnerabilitiesEnabled)\n{\n+ var title = \"This version has at least one known vulnerability. Click on the package name for details.\";\n<td class=\"package-icon-cell\">\n- <i class=\"ms-Icon ms-Icon--Warning package-icon\" data-bind=\"visible: IsVulnerable\" title=\"This version has at least one known vulnerability. Click on the package name for details.\"></i>\n+ <span class=\"package-warning-icon\" aria-label=\"@title\" data-content=\"@title\" data-bind=\"visible: IsVulnerable\" tabindex=\"0\">\n+ <i class=\"ms-Icon ms-Icon--Warning package-icon\"></i>\n+ </span>\n</td>\n}\n<td class=\"text-right align-middle package-controls\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add accessible popovers to vulnerability alerts (#8624)
Add accessible popovers to vulnerability alerts |
455,754 | 10.06.2021 19:13:12 | -36,000 | cfa8a1351c7dc894d6f1176064be421a4169ca7c | ingest withdrawn status of advisories from GitHub | [
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/Collector/AdvisoryQueryBuilder.cs",
"new_path": "src/GitHubVulnerabilities2Db/Collector/AdvisoryQueryBuilder.cs",
"diff": "@@ -23,6 +23,7 @@ public string CreateSecurityAdvisoriesQuery(DateTimeOffset? updatedSince = null,\ndatabaseId\npermalink\nseverity\n+ withdrawnAt\nupdatedAt\n\" + CreateVulnerabilitiesConnectionQuery() + @\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/GraphQL/SecurityVulnerability.cs",
"new_path": "src/GitHubVulnerabilities2Db/GraphQL/SecurityVulnerability.cs",
"diff": "@@ -13,6 +13,7 @@ public class SecurityVulnerability : INode\npublic SecurityVulnerabilityPackage Package { get; set; }\npublic string VulnerableVersionRange { get; set; }\npublic SecurityVulnerabilityPackageVersion FirstPatchedVersion { get; set; }\n+ public DateTimeOffset? WithdrawnAt { get; set; }\npublic DateTimeOffset UpdatedAt { get; set; }\npublic SecurityAdvisory Advisory { get; set; }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/GitHubVulnerabilities2Db.Facts/AdvisoryIngestorFacts.cs",
"new_path": "tests/GitHubVulnerabilities2Db.Facts/AdvisoryIngestorFacts.cs",
"diff": "@@ -52,6 +52,7 @@ public async Task IngestsAdvisoryWithoutVulnerability(bool withdrawn)\nAssert.Equal(advisory.DatabaseId, vulnerability.GitHubDatabaseKey);\nAssert.Equal(PackageVulnerabilitySeverity.Moderate, vulnerability.Severity);\nAssert.Equal(advisory.Permalink, vulnerability.AdvisoryUrl);\n+ Assert.Equal(withdrawn, advisory.WithdrawnAt != null);\n})\n.Returns(Task.CompletedTask)\n.Verifiable();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | ingest withdrawn status of advisories from GitHub (#8544) |
455,741 | 10.06.2021 11:57:44 | 25,200 | b11eceffcfcb99fc61853282ed33a84686514db5 | set flags | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"NuGetGallery.ManagePackagesVulnerabilities\": \"Enabled\",\n\"NuGetGallery.DisplayFuGetLinks\": \"Enabled\",\n\"NuGetGallery.PatternSetTfmHeuristics\": \"Enabled\",\n- \"NuGetGallery.EmbeddedIcons\": \"Enabled\"\n+ \"NuGetGallery.EmbeddedIcons\": \"Enabled\",\n+ \"NuGetGallery.MarkdigMdRendering\": \"Enabled\",\n+ \"NuGetGallery.ImageAllowlist\": \"Enabled\"\n},\n\"Flights\": {\n\"NuGetGallery.TyposquattingFlight\": {\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | set flags (#8630) |
455,754 | 16.06.2021 11:01:41 | -36,000 | 322318523399497e190b2db844722f1a8109d6fa | Utilize vulnerabilities caching service for in manage packages page
Utilize vulnerabilities caching service for in manage packages page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/IPackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/IPackageService.cs",
"diff": "@@ -87,9 +87,9 @@ public interface IPackageService : ICorePackageService\nPackage FilterLatestPackageBySuffix(IReadOnlyCollection<Package> packages,\nstring version, bool prerelease);\n- IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false, bool includeVulnerabilities = false);\n+ IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false);\n- IEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted, bool includeVersions = false, bool includeVulnerabilities = false);\n+ IEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted, bool includeVersions = false);\nIQueryable<PackageRegistration> FindPackageRegistrationsByOwner(User user);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -406,12 +406,9 @@ Package GetLatestStable()\nreturn package;\n}\n- public IEnumerable<Package> FindPackagesByOwner(User user,\n- bool includeUnlisted,\n- bool includeVersions = false,\n- bool includeVulnerabilities = false)\n+ public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false)\n{\n- return GetPackagesForOwners(new[] { user.Key }, includeUnlisted, includeVersions, includeVulnerabilities);\n+ return GetPackagesForOwners(new[] { user.Key }, includeUnlisted, includeVersions);\n}\n/// <summary>\n@@ -420,17 +417,15 @@ Package GetLatestStable()\npublic IEnumerable<Package> FindPackagesByAnyMatchingOwner(\nUser user,\nbool includeUnlisted,\n- bool includeVersions = false,\n- bool includeVulnerabilities = false)\n+ bool includeVersions = false)\n{\nvar ownerKeys = user.Organizations.Select(org => org.OrganizationKey).ToList();\nownerKeys.Insert(0, user.Key);\n- return GetPackagesForOwners(ownerKeys, includeUnlisted, includeVersions, includeVulnerabilities);\n+ return GetPackagesForOwners(ownerKeys, includeUnlisted, includeVersions);\n}\n- private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bool includeUnlisted,\n- bool includeVersions, bool includeVulnerabilities)\n+ private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bool includeUnlisted, bool includeVersions)\n{\nIQueryable<Package> packages = _packageRepository.GetAll()\n.Where(p => p.PackageRegistration.Owners.Any(o => ownerKeys.Contains(o.Key)));\n@@ -458,17 +453,11 @@ Package GetLatestStable()\n.FirstOrDefault());\n}\n- var result = packages\n+ return packages\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners)\n- .Include(p => p.PackageRegistration.RequiredSigners);\n-\n- if (includeVulnerabilities && _featureFlagService.IsManagePackagesVulnerabilitiesEnabled())\n- {\n- result = result.Include($\"{nameof(Package.VulnerablePackageRanges)}.{nameof(VulnerablePackageVersionRange.Vulnerability)}\");\n- }\n-\n- return result.ToList();\n+ .Include(p => p.PackageRegistration.RequiredSigners)\n+ .ToList();\n}\npublic IQueryable<PackageRegistration> FindPackageRegistrationsByOwner(User user)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -526,8 +526,7 @@ public virtual ActionResult Packages()\nvar wasAADLoginOrMultiFactorAuthenticated = User.WasMultiFactorAuthenticated() || User.WasAzureActiveDirectoryAccountUsedForSignin();\n- var packages = PackageService.FindPackagesByAnyMatchingOwner(\n- currentUser, includeUnlisted: true, includeVulnerabilities: true);\n+ var packages = PackageService.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\nvar listedPackages = GetPackages(packages, currentUser, wasAADLoginOrMultiFactorAuthenticated,\np => p.Listed && p.PackageStatusKey == PackageStatus.Available);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"new_path": "src/NuGetGallery/Services/PackageVulnerabilitiesService.cs",
"diff": "@@ -31,12 +31,7 @@ public bool IsPackageVulnerable(Package package)\nthrow new ArgumentNullException(nameof(package));\n}\n- if (package.VulnerablePackageRanges == null)\n- {\n- throw new ArgumentException($\"{nameof(package.VulnerablePackageRanges)} should be included in package query\");\n- }\n-\n- return package.VulnerablePackageRanges.FirstOrDefault(vpr => vpr.Vulnerability != null) != null;\n+ return GetVulnerabilitiesById(package.PackageRegistration.Id)?.Where(p => p.Key == package.Key).Any() ?? false;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/AccountDeleter.Facts/EvaluatorFacts.cs",
"new_path": "tests/AccountDeleter.Facts/EvaluatorFacts.cs",
"diff": "@@ -31,7 +31,7 @@ public EvaluatorFacts(ITestOutputHelper output)\npublic void NuGetDeleteevaluatorReturnsCorrectValueForUnconfirmed()\n{\n// Setup\n- _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))\n.Returns(() =>\n{\nreturn new List<Package>();\n@@ -58,7 +58,7 @@ public void NuGetDeleteevaluatorReturnsCorrectValueForUnconfirmed()\npublic void NuGetDeleteevaluatorReturnsCorrectValueForPackages(bool userHasPackages, bool expectedResult)\n{\n// Setup\n- _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))\n.Returns(() =>\n{\nif (userHasPackages)\n@@ -94,7 +94,7 @@ public void NuGetDeleteevaluatorReturnsCorrectValueForPackages(bool userHasPacka\npublic void NuGetDeleteevaluatorReturnsCorrectValueForOrganizations(bool userHasOrgs, bool userIsAdmin, bool expectedResult)\n{\n// Setup\n- _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ _packageService.Setup(ps => ps.FindPackagesByOwner(It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))\n.Returns(() =>\n{\nreturn new List<Package>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -1665,7 +1665,7 @@ public async Task IfAdministrator_ShowsViewWithCorrectData(bool isPackageOrphane\n.Setup(stub => stub.FindByUsername(testOrganization.Username, false))\n.Returns(testOrganization);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testOrganization, It.IsAny<bool>(), false, false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testOrganization, It.IsAny<bool>(), false))\n.Returns(userPackages);\nGetMock<IPackageService>()\n.Setup(stub => stub.WillPackageBeOrphanedIfOwnerRemoved(packageRegistration, testOrganization))\n@@ -1700,7 +1700,7 @@ public async Task IfOrphanedPackages_RedirectsToDeleteRequest()\ncontroller.SetCurrentUser(fakes.OrganizationOwnerAdmin);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByAnyMatchingOwner(testOrganization, true, false, false))\n+ .Setup(x => x.FindPackagesByAnyMatchingOwner(testOrganization, true, false))\n.Returns(new[] { new Package { Version = \"1.0.0\", PackageRegistration = new PackageRegistration { Owners = new[] { testOrganization } } } });\nGetMock<IPackageService>()\n.Setup(x => x.WillPackageBeOrphanedIfOwnerRemoved(It.IsAny<PackageRegistration>(), testOrganization))\n@@ -2484,7 +2484,7 @@ public void DeleteHappyAccount(bool withPendingIssues)\n.Setup(stub => stub.FindByUsername(username, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, false))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\nconst string iconUrl = \"https://icon.test/url\";\nGetMock<IIconUrlProvider>()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1099,7 +1099,7 @@ public void ReturnsSinglePackageAsExpected(User currentUser, User owner)\n.Returns(owner);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByOwner(owner, false, false, false))\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false))\n.Returns(new[] { package, invalidatedPackage, validatingPackage, deletedPackage });\nvar controller = GetController<UsersController>();\n@@ -1153,7 +1153,7 @@ public void SortsPackagesByDownloadCount(User currentUser, User owner)\n.Returns(owner);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByOwner(owner, false, false, false))\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false))\n.Returns(new[] { package1, package2 });\nvar controller = GetController<UsersController>();\n@@ -1195,7 +1195,7 @@ public void UsesProperIconUrl(User currentUser, User owner)\n.Setup(x => x.FindByUsername(username, false))\n.Returns(owner);\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesByOwner(owner, false, false, false))\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false))\n.Returns(new[] { userPackage });\nvar controller = GetController<UsersController>();\n@@ -2273,7 +2273,7 @@ public void ShowsViewWithCorrectData(bool isPackageOrphaned, bool withPendingIss\n.Setup(stub => stub.FindByUsername(testUser.Username, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\nGetMock<IPackageService>()\n.Setup(stub => stub.WillPackageBeOrphanedIfOwnerRemoved(packageRegistration, testUser))\n@@ -2356,7 +2356,7 @@ public async Task SucceedsIfSupportRequestIsAdded(bool successOnSentRequest)\n.Setup(stub => stub.FindByUsername(userName, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\nGetMock<ISupportRequestService>()\n.Setup(stub => stub.GetIssues(null, null, null, userName))\n@@ -3690,7 +3690,7 @@ public void DeleteHappyAccount(bool withPendingIssues)\n.Setup(stub => stub.FindByUsername(userName, false))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\nGetMock<ISupportRequestService>()\n.Setup(stub => stub.GetIssues(null, null, null, null))\n@@ -3758,7 +3758,7 @@ public void PackagesAreSortedById()\n.Returns(_testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\nvar model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n@@ -3786,7 +3786,7 @@ public void PackagesVersionSortOrderIsSetBySemVer()\n.Returns(_testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\nvar model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n@@ -3813,7 +3813,7 @@ public void UsesProperIconUrl()\n.Setup(stub => stub.FindByUsername(userName, false))\n.Returns(_testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n.Returns(userPackages);\nvar model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n@@ -3845,7 +3845,7 @@ public void AssessesVulnerabilities()\n.Setup(stub => stub.IsPackageVulnerable(It.IsAny<Package>()))\n.Returns<Package>(package => (package?.Id ?? \"\") == \"Company.ZebraPackage\"); // this is the vulnerable package - true if this\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(_testUser, It.IsAny<bool>(), false))\n.Returns(latestPackages);\nvar model = ResultAssert.IsView<ManagePackagesViewModel>(_testController.Packages());\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -806,7 +806,7 @@ private Mock<IPackageService> SetupPackageService(bool isPackageOrphaned)\nif (_user != null)\n{\npackageService.Setup(m => m.FindPackagesByAnyMatchingOwner(\n- _user, true, It.IsAny<bool>(), It.IsAny<bool>())).Returns(_userPackages);\n+ _user, true, It.IsAny<bool>())).Returns(_userPackages);\nvar packageRegistraionList = new List<PackageRegistration>();\nif(_userPackagesRegistration != null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageVulnerabilitiesCacheServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageVulnerabilitiesCacheServiceFacts.cs",
"diff": "namespace NuGetGallery.Services\n{\n- public class PackageVulnerabilitiesCacheServiceFacts : TestContainer\n+ public class PackageVulnerabilitiesCacheServiceFacts\n{\n[Fact]\npublic void RefreshesVulnerabilitiesCache()\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Utilize vulnerabilities caching service for in manage packages page (#8620)
Utilize vulnerabilities caching service for in manage packages page |
455,754 | 18.06.2021 14:15:38 | -36,000 | 908da7fb5c1ae6768fd04e5ee093bab6ef5c1dba | Add safety categories to report abuse form | [
{
"change_type": "MODIFY",
"old_path": "src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs",
"new_path": "src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs",
"diff": "@@ -205,6 +205,11 @@ public bool IsODataV2SearchNonHijackedEnabled()\nthrow new NotImplementedException();\n}\n+ public bool IsShowReportAbuseSafetyChangesEnabled()\n+ {\n+ throw new NotImplementedException();\n+ }\n+\npublic bool IsPackageDependentsEnabled(User user)\n{\nthrow new NotImplementedException();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/FeatureFlagService.cs",
"diff": "@@ -49,6 +49,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string ImageAllowlistFlightName = GalleryPrefix + \"ImageAllowlist\";\nprivate const string DisplayBannerFlightName = GalleryPrefix + \"Banner\";\nprivate const string DisplayPackagePageV2FeatureName = GalleryPrefix + \"DisplayPackagePageV2\";\n+ private const string ShowReportAbuseSafetyChanges = GalleryPrefix + \"ShowReportAbuseSafetyChanges\";\nprivate const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllNonHijacked\";\nprivate const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + \"ODataV1GetAllCountNonHijacked\";\n@@ -319,6 +320,11 @@ public bool IsODataV2SearchCountNonHijackedEnabled()\nreturn _client.IsEnabled(ODataV2SearchCountNonHijackedFeatureName, defaultValue: true);\n}\n+ public bool IsShowReportAbuseSafetyChangesEnabled()\n+ {\n+ return _client.IsEnabled(ShowReportAbuseSafetyChanges, defaultValue: false);\n+ }\n+\npublic bool IsMarkdigMdRenderingEnabled()\n{\nreturn _client.IsEnabled(MarkdigMdRenderingFlightName, defaultValue: false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs",
"diff": "@@ -248,10 +248,16 @@ public interface IFeatureFlagService\n/// </summary>\nbool IsLicenseMdRenderingEnabled(User user);\n+ /// <summary>\n/// Whether the /Search()/$count endpoint is enabled for non-hijacked queries for the V2 OData API.\n/// </summary>\nbool IsODataV2SearchCountNonHijackedEnabled();\n+ /// <summary>\n+ /// Whether the online safety changes to the report abuse form have been enabled\n+ /// </summary>\n+ bool IsShowReportAbuseSafetyChangesEnabled();\n+\n/// <summary>\n/// Whether rendering Markdown content to HTML using Markdig is enabled\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Models/ReportPackageReason.cs",
"new_path": "src/NuGetGallery.Services/Models/ReportPackageReason.cs",
"diff": "@@ -24,5 +24,23 @@ public enum ReportPackageReason\n[Description(\"The package was not intended to be published publicly on nuget.org\")]\nReleasedInPublicByAccident,\n+\n+ [Description(\"Child sexual exploitation or abuse\")]\n+ ChildSexualExploitationOrAbuse,\n+\n+ [Description(\"Terrorism or violent extremism\")]\n+ TerrorismOrViolentExtremism,\n+\n+ [Description(\"The package contains hate speech\")]\n+ HateSpeech,\n+\n+ [Description(\"The package contains content related to imminent harm\")]\n+ ImminentHarm,\n+\n+ [Description(\"The package contains non-consensual intimate imagery (i.e. \\\"revenge porn\\\")\")]\n+ RevengePorn,\n+\n+ [Description(\"Other nudity or pornography (not \\\"revenge porn\\\")\")]\n+ OtherNudityOrPornography,\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -67,6 +67,20 @@ public partial class PackagesController\nReportPackageReason.Other\n};\n+ private static readonly IReadOnlyList<ReportPackageReason> ReportAbuseWithSafetyReasons = new[]\n+ {\n+ ReportPackageReason.ViolatesALicenseIOwn,\n+ ReportPackageReason.ContainsMaliciousCode,\n+ ReportPackageReason.HasABugOrFailedToInstall,\n+ ReportPackageReason.ChildSexualExploitationOrAbuse,\n+ ReportPackageReason.TerrorismOrViolentExtremism,\n+ ReportPackageReason.HateSpeech,\n+ ReportPackageReason.ImminentHarm,\n+ ReportPackageReason.RevengePorn,\n+ ReportPackageReason.OtherNudityOrPornography,\n+ ReportPackageReason.Other\n+ };\n+\nprivate static readonly IReadOnlyList<ReportPackageReason> ReportMyPackageReasons = new[]\n{\nReportPackageReason.ContainsPrivateAndConfidentialData,\n@@ -1336,7 +1350,9 @@ public virtual ActionResult ReportAbuse(string id, string version)\nvar model = new ReportAbuseViewModel\n{\n- ReasonChoices = ReportAbuseReasons,\n+ ReasonChoices = _featureFlagService.IsShowReportAbuseSafetyChangesEnabled()\n+ ? ReportAbuseWithSafetyReasons\n+ : ReportAbuseReasons,\nPackageId = id,\nPackageVersion = package.Version,\nCopySender = true,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "</text>\n)\n- <p>\n+ <p tabindex=\"0\">\nPlease provide a detailed abuse report with evidence to support your claim! We cannot delete packages without evidence that they exhibit malicious behavior.\n</p>\n@if (!Model.ConfirmedUser)\n{\n- <p>\n+ <p tabindex=\"0\">\nNote: If this is your package and you would like to contact support, please\n<a href=\"@Url.LogOn(returnUrl)\">sign in.</a>\n</p>\n<div id=\"form-field-reason\" class=\"form-group @Html.HasErrorFor(m => m.Reason)\">\[email protected](m => m.Reason)\n- <p>Please select the reason for contacting support about this package.</p>\n+ <p tabindex=\"0\">Please select the reason for contacting support about this package.</p>\[email protected](m => m.Reason, Model.ReasonChoices, \"<Choose a Reason>\")\[email protected](m => m.Reason)\n</div>\[email protected](m => m.Email)\[email protected](m => m.Email)\n</div>\n- <div class=\"form-group @Html.HasErrorFor(m => m.AlreadyContactedOwner)\">\n+ <div class=\"form-group already-contacted-owner @Html.HasErrorFor(m => m.AlreadyContactedOwner)\">\[email protected](m => m.AlreadyContactedOwner)\[email protected](m => m.AlreadyContactedOwner)\[email protected](m => m.AlreadyContactedOwner)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.Message)\">\[email protected](m => m.Message)\n- <p>Please provide a detailed description of the problem.<span class=\"infringement-claim-requirements\"> If you are reporting copyright infringement, please describe the copyrighted material with particularity and provide us with information about your copyright (i.e. title of copyrighted work, URL where to view your copyrighted work, description of your copyrighted work, and any copyright registrations you may have, etc.). For trademark infringement, include the name of your trademark, registration number, and country where registered.</span></p>\n+ <p tabindex=\"0\">\n+ Please provide a detailed description of the problem.\n+ <p>\n+ <div class=\"infringement-claim-requirements\" tabindex=\"0\">\n+ <p>\n+ If you are reporting copyright infringement, please describe the copyrighted material with particularity and provide us with information about your copyright (i.e. title of copyrighted work, URL where to view your copyrighted work, description of your copyrighted work, and any copyright registrations you may have, etc.). For trademark infringement, include the name of your trademark, registration number, and country where registered.\n+ </p>\n+ </div>\n+ <div class=\"child-sexual-exploitation\" tabindex=\"0\">\n+ <p>\n+ Note: Please complete this form and submit it so we can proceed with an appropriate response regarding the NuGet package (e.g. removing it). In addition, please proceed to <a href=\"https://report.cybertip.org\">https://report.cybertip.org</a> to report the matter in more detail.\n+ </p>\n+ </div>\n+ <div class=\"terrorism-or-violent-extremism\" tabindex=\"0\">\n+ <p>\n+ Note: Please complete this form and submit it so we can proceed with an appropriate response regarding the NuGet package (e.g. removing it). In addition, please proceed to <a href=\"https://www.microsoft.com/en-au/concern/terroristcontent\">https://www.microsoft.com/en-au/concern/terroristcontent</a> to report the matter in more detail.\n+ </p>\n+ </div>\n+ <div class=\"imminent-harm\" tabindex=\"0\">\n+ <p>\n+ Note: please ensure when reporting this type of abuse that you've considered whether the following are present:\n+ <ul>\n+ <li>A targeted person or group (including self)</li>\n+ <li>An identified actor--i.e. person intending to commit the offense</li>\n+ <li>Details of the threat</li>\n+ <li>Time and/or place where the act will be carried out</li>\n+ </ul>\n+ </p>\n+ </div>\n+ <div class=\"revenge-porn\" tabindex=\"0\">\n+ <p>\n+ Note: Please complete this form and submit it so we can proceed with an appropriate response regarding the NuGet package (e.g. removing it). In addition, please proceed to <a href=\"https://www.microsoft.com/en-us/concern/revengeporn\">https://www.microsoft.com/en-us/concern/revengeporn</a> to report the matter in more detail.\n+ </p>\n+ </div>\[email protected](m => m.Message, 10, 50)\[email protected](m => m.Message)\n</div>\n$('#report-abuse-form').show();\n}\n+ // We don't suggest the customer contact the owner in the case of safety violations\n+ if (val === 'ChildSexualExploitationOrAbuse'\n+ || val === 'TerrorismOrViolentExtremism'\n+ || val === 'HateSpeech'\n+ || val === 'ImminentHarm'\n+ || val === 'RevengePorn'\n+ || val === 'OtherNudityOrPornography') {\n+ $form.find('.already-contacted-owner').hide();\n+ } else {\n+ $form.find('.already-contacted-owner').show();\n+ }\n+\n+ if (val === 'ChildSexualExploitationOrAbuse') {\n+ $form.find('.child-sexual-exploitation').show();\n+ } else {\n+ $form.find('.child-sexual-exploitation').hide();\n+ }\n+\n+ if (val === 'TerrorismOrViolentExtremism') {\n+ $form.find('.terrorism-or-violent-extremism').show();\n+ } else {\n+ $form.find('.terrorism-or-violent-extremism').hide();\n+ }\n+\n+ if (val === 'ImminentHarm') {\n+ $form.find('.imminent-harm').show();\n+ } else {\n+ $form.find('.imminent-harm').hide();\n+ }\n+\n+ if (val === 'RevengePorn') {\n+ $form.find('.revenge-porn').show();\n+ } else {\n+ $form.find('.revenge-porn').hide();\n+ }\n+\nif (val == 'ViolatesALicenseIOwn') {\n$form.find('.infringement-claim-requirements').show();\n$('#Signature').rules(\"add\", {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs",
"new_path": "src/VerifyMicrosoftPackage/Fakes/FakeFeatureFlagService.cs",
"diff": "@@ -103,6 +103,8 @@ public class FakeFeatureFlagService : IFeatureFlagService\npublic bool IsODataV2SearchCountNonHijackedEnabled() => throw new NotImplementedException();\n+ public bool IsShowReportAbuseSafetyChangesEnabled() => throw new NotImplementedException();\n+\npublic bool IsMarkdigMdRenderingEnabled() => throw new NotImplementedException();\npublic bool IsDeletePackageApiEnabled(User user) => throw new NotImplementedException();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add safety categories to report abuse form (#8635) |
455,741 | 21.06.2021 13:31:32 | 25,200 | abd29b38b68ad5f43445d31b517cac16b58bd945 | remove bullet point for tasklist | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -649,9 +649,21 @@ img.reserved-indicator-icon {\n#readme-less img {\nmax-width: 100%;\n}\n+#readme-less ul.contains-task-list,\n+#readme-less li.task-list-item {\n+ list-style-type: none;\n+}\n#readme-more img {\nmax-width: 100%;\n}\n+#readme-more ul.contains-task-list,\n+#readme-more li.task-list-item {\n+ list-style-type: none;\n+}\n+#readme-preview ul.contains-task-list,\n+#readme-preview li.task-list-item {\n+ list-style-type: none;\n+}\n.user-package-list .manage-package-listing .package-icon {\nmax-height: 2em;\nmin-width: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-readme.less",
"new_path": "src/Bootstrap/less/theme/common-readme.less",
"diff": "img {\nmax-width: 100%;\n}\n+\n+ ul.contains-task-list, li.task-list-item {\n+ list-style-type: none;\n+ }\n}\n#readme-more {\nimg {\nmax-width: 100%;\n}\n+\n+ ul.contains-task-list, li.task-list-item {\n+ list-style-type: none;\n+ }\n+}\n+\n+#readme-preview {\n+ ul.contains-task-list, li.task-list-item {\n+ list-style-type: none;\n+ }\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | remove bullet point for tasklist (#8629) |
455,741 | 24.06.2021 11:46:33 | 25,200 | 3c134a876ba0810d2bb9f31b506ada3702dbebed | [Readme]Reduce space when display content in readme container | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -660,10 +660,21 @@ img.reserved-indicator-icon {\n#readme-more li.task-list-item {\nlist-style-type: none;\n}\n+#readme-preview {\n+ padding-top: 0.25em;\n+}\n#readme-preview ul.contains-task-list,\n#readme-preview li.task-list-item {\nlist-style-type: none;\n}\n+#edit-markdown {\n+ padding-top: 3em;\n+ padding-bottom: 3em;\n+}\n+#preview-html {\n+ padding-top: 3em;\n+ padding-bottom: 3em;\n+}\n.user-package-list .manage-package-listing .package-icon {\nmax-height: 2em;\nmin-width: 20px;\n@@ -1613,7 +1624,7 @@ img.reserved-indicator-icon {\nmargin-top: 20px;\n}\n.page-edit-package .readme-tabs {\n- margin-top: 40px;\n+ margin-top: 0.5em;\n}\n.page-edit-package .readonly {\ndisplay: none;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-readme.less",
"new_path": "src/Bootstrap/less/theme/common-readme.less",
"diff": "}\n#readme-preview {\n+ padding-top: 0.25em;\n+\nul.contains-task-list, li.task-list-item {\nlist-style-type: none;\n}\n}\n+\n+#edit-markdown {\n+ padding-top: 3em;\n+ padding-bottom: 3em;\n+}\n+\n+#preview-html {\n+ padding-top: 3em;\n+ padding-bottom: 3em;\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-edit-package.less",
"new_path": "src/Bootstrap/less/theme/page-edit-package.less",
"diff": ".page-edit-package {\n.readme-tabs {\n- margin-top: 40px;\n+ margin-top: 0.5em;\n}\n.readonly {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ImportReadMe.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ImportReadMe.cshtml",
"diff": "</div>\n</div>\n- <div class=\"hidden\" id=\"readme-preview\" style=\"padding-top:3em;\">\n+ <div class=\"hidden\" id=\"readme-preview\">\n<div class=\"row\">\n<div class=\"col-xs-12\" id=\"readme-preview-contents\"></div>\n</div>\n</div>\n- <div class=\"text-center hidden\" id=\"edit-markdown\" style=\"padding-top:3em; padding-bottom:3em\">\n+ <div class=\"text-center hidden\" id=\"edit-markdown\">\n<div class=\"row\">\n<input type=\"button\" value=\"Edit Documentation\" id=\"edit-markdown-button\" class=\"btn btn-primary col-xs-10 col-xs-offset-1 col-lg-2 col-lg-offset-5\" />\n</div>\n</div>\n- <div class=\"text-center\" id=\"preview-html\" style=\"padding-top:3em; padding-bottom:3em\">\n+ <div class=\"text-center\" id=\"preview-html\">\n<div class=\"row\">\n<input type=\"button\" value=\"Preview\" id=\"preview-readme-button\" class=\"btn btn-primary col-xs-10 col-xs-offset-1 col-lg-2 col-lg-offset-5\" />\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [Readme]Reduce space when display content in readme container (#8609)
Co-authored-by: Joel Verhagen <[email protected]> |
455,736 | 12.07.2021 17:17:30 | 25,200 | 15ddef8bd968e97421a3cf1f53746ba19927f838 | Make the package downloads box a bit bigger for macOS
Address | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1764,7 +1764,7 @@ img.reserved-indicator-icon {\nleft: 377px;\ntop: 10px;\nfloat: left;\n- width: 200px;\n+ width: 230px;\n}\n.page-home .circuit-board .circuit-board-pd.triangle:after {\nleft: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-home.less",
"new_path": "src/Bootstrap/less/theme/page-home.less",
"diff": "left: 377px;\ntop: 10px;\nfloat: left;\n- width: 200px;\n+ width: 230px;\n&.triangle:after {\nleft: 20px;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make the package downloads box a bit bigger for macOS (#8682)
Address https://github.com/NuGet/NuGetGallery/issues/8671 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.