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,776 | 13.08.2018 15:49:10 | 25,200 | a9379ee4b48d0b97d9dc094ec4bd0051b6afcbaf | Add ViewBase field to hide opensearch.xml link | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"new_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"diff": "@@ -93,6 +93,8 @@ public CookieConsentMessage CookieConsentMessage\npublic bool ShowAuthInHeader => true;\n+ public bool LinkOpenSearchXml => true;\n+\nprotected NuGetViewBase()\n{\n_nugetContext = new Lazy<NuGetContext>(NuGetViewBase.GetNuGetContextThunk(this));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Layout.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Layout.cshtml",
"diff": "</title>\n<link href=\"@Url.Content(\"~/favicon.ico\")\" rel=\"shortcut icon\" type=\"image/x-icon\" />\n+ @if (LinkOpenSearchXml)\n+ {\n<link title=\"NuGet.org\" type=\"application/opensearchdescription+xml\" href=\"@Url.Content(\"~/opensearch.xml\")\" rel=\"search\">\n+ }\[email protected](\"~/Content/gallery/css/site.min.css\")\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add ViewBase field to hide opensearch.xml link (#6304) |
455,776 | 16.08.2018 11:49:43 | 25,200 | 8ac0bcbcb9ad05cbe860bb09f12891bf06417a06 | If ConfirmEmailAddresses config is false, users should not be required to confirm changing their email | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/User.cs",
"new_path": "src/NuGetGallery.Core/Entities/User.cs",
"diff": "@@ -154,7 +154,7 @@ public void CancelChangeEmailAddress()\nUnconfirmedEmailAddress = null;\n}\n- public void UpdateEmailAddress(string newEmailAddress, Func<string> generateToken)\n+ public void UpdateUnconfirmedEmailAddress(string newEmailAddress, Func<string> generateToken)\n{\nif (!string.IsNullOrEmpty(UnconfirmedEmailAddress))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"new_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"diff": "@@ -252,7 +252,7 @@ public virtual async Task<ActionResult> ChangeEmail(TAccountViewModel model)\nreturn AccountView(account, model);\n}\n- if (account.Confirmed)\n+ if (account.Confirmed && !string.IsNullOrEmpty(account.UnconfirmedEmailAddress))\n{\nSendEmailChangedConfirmationNotice(account);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -386,7 +386,13 @@ public async Task ChangeEmailAddress(User user, string newEmailAddress)\nawait Auditing.SaveAuditRecordAsync(new UserAuditRecord(user, AuditedUserAction.ChangeEmail, newEmailAddress));\n- user.UpdateEmailAddress(newEmailAddress, Crypto.GenerateToken);\n+ user.UpdateUnconfirmedEmailAddress(newEmailAddress, Crypto.GenerateToken);\n+\n+ if (!Config.ConfirmEmailAddresses)\n+ {\n+ user.ConfirmEmailAddress();\n+ }\n+\nawait UserRepository.CommitChangesAsync();\n}\n@@ -555,6 +561,11 @@ public async Task<Organization> AddOrganizationAsync(string username, string ema\nMembers = new List<Membership>()\n};\n+ if (!Config.ConfirmEmailAddresses)\n+ {\n+ organization.ConfirmEmailAddress();\n+ }\n+\nvar membership = new Membership { Organization = organization, Member = adminUser, IsAdmin = true };\norganization.Members.Add(membership);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AccountsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AccountsControllerFacts.cs",
"diff": "@@ -227,7 +227,23 @@ public virtual async Task WhenNewEmailIsSame_RedirectsWithoutChange(Func<Fakes,\n[Theory]\n[MemberData(AllowedCurrentUsersDataName)]\n- public virtual async Task WhenNewEmailIsDifferentAndWasConfirmed_SavesChanges(Func<Fakes, User> getCurrentUser)\n+ public virtual Task WhenNewEmailIsUnconfirmedAndDifferentAndWasConfirmed_SavesChanges(Func<Fakes, User> getCurrentUser)\n+ {\n+ return WhenNewEmailIsDifferentAndWasConfirmedHelper(getCurrentUser, newEmailIsConfirmed: false);\n+ }\n+\n+ [Theory]\n+ [MemberData(AllowedCurrentUsersDataName)]\n+ public virtual Task WhenNewEmailIsConfirmedAndDifferentAndWasConfirmed_SavesChanges(Func<Fakes, User> getCurrentUser)\n+ {\n+ return WhenNewEmailIsDifferentAndWasConfirmedHelper(getCurrentUser, newEmailIsConfirmed: true);\n+ }\n+\n+ /// <remarks>\n+ /// Normally, you should use a single <see cref=\"TheoryAttribute\"/> that enumerates through the possible values of <paramref name=\"getCurrentUser\"/> and <paramref name=\"newEmailIsConfirmed\"/>,\n+ /// but because we are using test case \"inheritance\" (search for properties with the same name as <see cref=\"AllowedCurrentUsersDataName\"/>), this is not possible.\n+ /// </remarks>\n+ private async Task WhenNewEmailIsDifferentAndWasConfirmedHelper(Func<Fakes, User> getCurrentUser, bool newEmailIsConfirmed)\n{\n// Arrange\nvar controller = GetController();\n@@ -236,7 +252,7 @@ public virtual async Task WhenNewEmailIsDifferentAndWasConfirmed_SavesChanges(Fu\nmodel.ChangeEmail.NewEmail = \"[email protected]\";\n// Act\n- var result = await InvokeChangeEmail(controller, account, getCurrentUser, model);\n+ var result = await InvokeChangeEmail(controller, account, getCurrentUser, model, newEmailIsConfirmed);\n// Assert\nGetMock<IUserService>().Verify(u => u.ChangeEmailAddress(It.IsAny<User>(), It.IsAny<string>()), Times.Once);\n@@ -244,7 +260,7 @@ public virtual async Task WhenNewEmailIsDifferentAndWasConfirmed_SavesChanges(Fu\nGetMock<IMessageService>()\n.Verify(m => m.SendEmailChangeConfirmationNotice(It.IsAny<User>(), It.IsAny<string>()),\n- Times.Once);\n+ newEmailIsConfirmed ? Times.Never() : Times.Once());\n}\n[Theory]\n@@ -285,6 +301,7 @@ protected virtual TAccountViewModel CreateViewModel(TUser account)\nTUser account,\nFunc<Fakes, User> getCurrentUser,\nTAccountViewModel model = null,\n+ bool newEmailIsConfirmed = false,\nEntityException exception = null)\n{\n// Arrange\n@@ -299,7 +316,17 @@ protected virtual TAccountViewModel CreateViewModel(TUser account)\n.Returns(account as User);\nvar setup = userService.Setup(u => u.ChangeEmailAddress(It.IsAny<User>(), It.IsAny<string>()))\n- .Callback<User, string>((acct, newEmail) => { acct.UnconfirmedEmailAddress = newEmail; });\n+ .Callback<User, string>((acct, newEmail) =>\n+ {\n+ if (newEmailIsConfirmed)\n+ {\n+ acct.EmailAddress = newEmail;\n+ }\n+ else\n+ {\n+ acct.UnconfirmedEmailAddress = newEmail;\n+ }\n+ });\nif (exception != null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -1156,6 +1156,10 @@ public async Task SetsUnconfirmedEmailWhenEmailIsChanged()\nUsers = new[] { user }\n};\n+ service.MockConfig\n+ .Setup(x => x.ConfirmEmailAddresses)\n+ .Returns(true);\n+\nawait service.ChangeEmailAddress(user, \"[email protected]\");\nAssert.Equal(\"[email protected]\", user.EmailAddress);\n@@ -1163,6 +1167,27 @@ public async Task SetsUnconfirmedEmailWhenEmailIsChanged()\nservice.FakeEntitiesContext.VerifyCommitChanges();\n}\n+ [Fact]\n+ public async Task AutomaticallyConfirmsWhenConfirmEmailAddressesConfigurationIsFalse()\n+ {\n+ var user = new User { Username = \"Bob\", EmailAddress = \"[email protected]\" };\n+ var service = new TestableUserServiceWithDBFaking\n+ {\n+ Users = new[] { user }\n+ };\n+\n+ service.MockConfig\n+ .Setup(x => x.ConfirmEmailAddresses)\n+ .Returns(false);\n+\n+ await service.ChangeEmailAddress(user, \"[email protected]\");\n+\n+ Assert.Equal(\"[email protected]\", user.EmailAddress);\n+ Assert.Null(user.UnconfirmedEmailAddress);\n+ Assert.Null(user.EmailConfirmationToken);\n+ service.FakeEntitiesContext.VerifyCommitChanges();\n+ }\n+\n/// <summary>\n/// It has to change the pending confirmation token whenever address changes because otherwise you can do\n/// 1. change address, get confirmation email\n@@ -1178,6 +1203,10 @@ public async Task ModifiesConfirmationTokenWhenEmailAddressChanged()\nUsers = new User[] { user },\n};\n+ service.MockConfig\n+ .Setup(x => x.ConfirmEmailAddresses)\n+ .Returns(true);\n+\nawait service.ChangeEmailAddress(user, \"[email protected]\");\nAssert.NotNull(user.EmailConfirmationToken);\nAssert.NotEmpty(user.EmailConfirmationToken);\n@@ -1197,6 +1226,10 @@ public async Task DoesNotModifyAnythingWhenConfirmedEmailAddressNotChanged()\nUsers = new User[] { user },\n};\n+ service.MockConfig\n+ .Setup(x => x.ConfirmEmailAddresses)\n+ .Returns(true);\n+\nawait service.ChangeEmailAddress(user, \"[email protected]\");\nAssert.True(user.Confirmed);\nAssert.Equal(\"[email protected]\", user.EmailAddress);\n@@ -1221,6 +1254,10 @@ public async Task DoesNotModifyConfirmationTokenWhenUnconfirmedEmailAddressNotCh\nUsers = new User[] { user },\n};\n+ service.MockConfig\n+ .Setup(x => x.ConfirmEmailAddresses)\n+ .Returns(true);\n+\nawait service.ChangeEmailAddress(user, \"[email protected]\");\nAssert.Equal(\"pending-token\", user.EmailConfirmationToken);\n}\n@@ -1784,11 +1821,16 @@ public class TheAddOrganizationAccountMethod\nprivate TestableUserService _service = new TestableUserService();\n- [Fact]\n- public async Task WithUsernameConflict_ThrowsEntityException()\n+ public static IEnumerable<object[]> ConfirmEmailAddresses_Config => MemberDataHelper.AsDataSet(false, true);\n+\n+ [Theory]\n+ [MemberData(nameof(ConfirmEmailAddresses_Config))]\n+ public async Task WithUsernameConflict_ThrowsEntityException(bool confirmEmailAddresses)\n{\nvar conflictUsername = \"ialreadyexist\";\n+ SetUpConfirmEmailAddressesConfig(confirmEmailAddresses);\n+\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(new[] { new User(conflictUsername) }.MockDbSet().Object);\n@@ -1802,11 +1844,14 @@ public async Task WithUsernameConflict_ThrowsEntityException()\nAssert.False(_service.Auditing.WroteRecord<UserAuditRecord>());\n}\n- [Fact]\n- public async Task WithEmailConflict_ThrowsEntityException()\n+ [Theory]\n+ [MemberData(nameof(ConfirmEmailAddresses_Config))]\n+ public async Task WithEmailConflict_ThrowsEntityException(bool confirmEmailAddresses)\n{\nvar conflictEmail = \"[email protected]\";\n+ SetUpConfirmEmailAddressesConfig(confirmEmailAddresses);\n+\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(new[] { new User(\"user\") { EmailAddress = conflictEmail } }.MockDbSet().Object);\n@@ -1820,25 +1865,31 @@ public async Task WithEmailConflict_ThrowsEntityException()\nAssert.False(_service.Auditing.WroteRecord<UserAuditRecord>());\n}\n- [Fact]\n- public async Task WhenAdminHasNoTenant_ReturnsNewOrgWithoutPolicy()\n+ [Theory]\n+ [MemberData(nameof(ConfirmEmailAddresses_Config))]\n+ public async Task WhenAdminHasNoTenant_ReturnsNewOrgWithoutPolicy(bool confirmEmailAddresses)\n{\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+ SetUpConfirmEmailAddressesConfig(confirmEmailAddresses);\n+\nvar org = await InvokeAddOrganization(admin: new User(AdminName) { Credentials = new Credential[0] });\n- AssertNewOrganizationReturned(org, subscribedToPolicy: false);\n+ AssertNewOrganizationReturned(org, subscribedToPolicy: false, confirmEmailAddresses: confirmEmailAddresses);\n}\n- [Fact]\n- public async Task WhenAdminHasUnsupportedTenant_ReturnsNewOrgWithoutPolicy()\n+ [Theory]\n+ [MemberData(nameof(ConfirmEmailAddresses_Config))]\n+ public async Task WhenAdminHasUnsupportedTenant_ReturnsNewOrgWithoutPolicy(bool confirmEmailAddresses)\n{\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+ SetUpConfirmEmailAddressesConfig(confirmEmailAddresses);\n+\nvar mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\nmockLoginDiscontinuationConfiguration\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n@@ -1850,16 +1901,19 @@ public async Task WhenAdminHasUnsupportedTenant_ReturnsNewOrgWithoutPolicy()\nvar org = await InvokeAddOrganization();\n- AssertNewOrganizationReturned(org, subscribedToPolicy: false);\n+ AssertNewOrganizationReturned(org, subscribedToPolicy: false, confirmEmailAddresses: confirmEmailAddresses);\n}\n- [Fact]\n- public async Task WhenSubscribingToPolicyFails_ReturnsNewOrgWithoutPolicy()\n+ [Theory]\n+ [MemberData(nameof(ConfirmEmailAddresses_Config))]\n+ public async Task WhenSubscribingToPolicyFails_ReturnsNewOrgWithoutPolicy(bool confirmEmailAddresses)\n{\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+ SetUpConfirmEmailAddressesConfig(confirmEmailAddresses);\n+\nvar mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\nmockLoginDiscontinuationConfiguration\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n@@ -1875,16 +1929,19 @@ public async Task WhenSubscribingToPolicyFails_ReturnsNewOrgWithoutPolicy()\nvar org = await InvokeAddOrganization();\n- AssertNewOrganizationReturned(org, subscribedToPolicy: true);\n+ AssertNewOrganizationReturned(org, subscribedToPolicy: true, confirmEmailAddresses: confirmEmailAddresses);\n}\n- [Fact]\n- public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\n+ [Theory]\n+ [MemberData(nameof(ConfirmEmailAddresses_Config))]\n+ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg(bool confirmEmailAddresses)\n{\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+ SetUpConfirmEmailAddressesConfig(confirmEmailAddresses);\n+\nvar mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\nmockLoginDiscontinuationConfiguration\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n@@ -1900,7 +1957,7 @@ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\nvar org = await InvokeAddOrganization();\n- AssertNewOrganizationReturned(org, subscribedToPolicy: true);\n+ AssertNewOrganizationReturned(org, subscribedToPolicy: true, confirmEmailAddresses: confirmEmailAddresses);\n}\nprivate Task<Organization> InvokeAddOrganization(string orgName = OrgName, string orgEmail = OrgEmail, User admin = null)\n@@ -1925,14 +1982,26 @@ private Task<Organization> InvokeAddOrganization(string orgName = OrgName, strin\nreturn _service.AddOrganizationAsync(orgName, orgEmail, admin);\n}\n- private void AssertNewOrganizationReturned(Organization org, bool subscribedToPolicy)\n+ private void AssertNewOrganizationReturned(Organization org, bool subscribedToPolicy, bool confirmEmailAddresses)\n{\nAssert.Equal(OrgName, org.Username);\n+\n+ if (confirmEmailAddresses)\n+ {\n+ Assert.Null(org.EmailAddress);\nAssert.Equal(OrgEmail, org.UnconfirmedEmailAddress);\n+ Assert.NotNull(org.EmailConfirmationToken);\n+ }\n+ else\n+ {\n+ Assert.Null(org.UnconfirmedEmailAddress);\n+ Assert.Equal(OrgEmail, org.EmailAddress);\n+ Assert.Null(org.EmailConfirmationToken);\n+ }\n+\nAssert.Equal(OrgCreatedUtc, org.CreatedUtc);\nAssert.True(org.EmailAllowed);\nAssert.True(org.NotifyPackagePushed);\n- Assert.True(!string.IsNullOrEmpty(org.EmailConfirmationToken));\n// Both the organization and the admin must have a membership to each other.\nFunc<Membership, bool> hasMembership = m => m.Member.Username == AdminName && m.Organization.Username == OrgName && m.IsAdmin;\n@@ -1949,6 +2018,13 @@ private void AssertNewOrganizationReturned(Organization org, bool subscribedToPo\nar.AffectedMemberIsAdmin == true));\n_service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Once());\n}\n+\n+ private void SetUpConfirmEmailAddressesConfig(bool confirmEmailAddresses)\n+ {\n+ _service.MockConfig\n+ .Setup(x => x.ConfirmEmailAddresses)\n+ .Returns(confirmEmailAddresses);\n+ }\n}\npublic class TheRejectTransformUserToOrganizationRequestMethod\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | If ConfirmEmailAddresses config is false, users should not be required to confirm changing their email (#6314) |
455,747 | 16.08.2018 16:25:48 | 25,200 | bc0954b5ca8c4068affcfd08be3dd1a3c596f07b | [NuGet Symbol Server] Add download symbols support to Package details page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -656,6 +656,12 @@ public static void RegisterApiV2Routes(RouteCollection routes)\ndefaults: new { controller = \"Api\", action = \"GetPackageApi\", version = UrlParameter.Optional },\nconstraints: new { httpMethod = new HttpMethodConstraint(\"GET\") });\n+ routes.MapRoute(\n+ \"v2\" + RouteName.DownloadSymbolsPackage,\n+ \"api/v2/symbolpackage/{id}/{version}\",\n+ defaults: new { controller = \"Api\", action = \"GetSymbolPackageApi\", version = UrlParameter.Optional },\n+ constraints: new { httpMethod = new HttpMethodConstraint(\"GET\") });\n+\nroutes.MapRoute(\n\"v2\" + RouteName.PushPackageApi,\n\"api/v2/package\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -55,6 +55,7 @@ public partial class ApiController\npublic IReservedNamespaceService ReservedNamespaceService { get; set; }\npublic IPackageUploadService PackageUploadService { get; set; }\npublic IPackageDeleteService PackageDeleteService { get; set; }\n+ public ISymbolPackageFileService SymbolPackageFileService { get; set; }\npublic ISymbolPackageService SymbolPackageService { get; set; }\npublic ISymbolPackageUploadService SymbolPackageUploadService { get; set; }\npublic IContentObjectService ContentObjectService { get; set; }\n@@ -85,6 +86,7 @@ protected ApiController()\nIReservedNamespaceService reservedNamespaceService,\nIPackageUploadService packageUploadService,\nIPackageDeleteService packageDeleteService,\n+ ISymbolPackageFileService symbolPackageFileService,\nISymbolPackageService symbolPackageService,\nISymbolPackageUploadService symbolPackageUploadService,\nIContentObjectService contentObjectService)\n@@ -109,6 +111,7 @@ protected ApiController()\nReservedNamespaceService = reservedNamespaceService;\nPackageUploadService = packageUploadService;\nStatisticsService = null;\n+ SymbolPackageFileService = symbolPackageFileService;\nSymbolPackageService = symbolPackageService;\nSymbolPackageUploadService = symbolPackageUploadService;\nContentObjectService = contentObjectService;\n@@ -136,21 +139,35 @@ protected ApiController()\nIReservedNamespaceService reservedNamespaceService,\nIPackageUploadService packageUploadService,\nIPackageDeleteService packageDeleteService,\n+ ISymbolPackageFileService symbolPackageFileService,\nISymbolPackageService symbolPackageService,\nISymbolPackageUploadService symbolPackageUploadServivce,\nIContentObjectService contentObjectService)\n: this(apiScopeEvaluator, entitiesContext, packageService, packageFileService, userService, contentService,\nindexingService, searchService, autoCuratePackage, statusService, messageService, auditingService,\nconfigurationService, telemetryService, authenticationService, credentialBuilder, securityPolicies,\n- reservedNamespaceService, packageUploadService, packageDeleteService, symbolPackageService, symbolPackageUploadServivce,\n- contentObjectService)\n+ reservedNamespaceService, packageUploadService, packageDeleteService, symbolPackageFileService,\n+ symbolPackageService, symbolPackageUploadServivce, contentObjectService)\n{\nStatisticsService = statisticsService;\n}\n+\n+ [HttpGet]\n+ [ActionName(\"GetSymbolPackageApi\")]\n+ public virtual async Task<ActionResult> GetSymbolPackage(string id, string version)\n+ {\n+ return await GetPackageInternal(id, version, isSymbolPackage: true);\n+ }\n+\n[HttpGet]\n[ActionName(\"GetPackageApi\")]\npublic virtual async Task<ActionResult> GetPackage(string id, string version)\n+ {\n+ return await GetPackageInternal(id, version, isSymbolPackage: false);\n+ }\n+\n+ protected internal async Task<ActionResult> GetPackageInternal(string id, string version, bool isSymbolPackage = false)\n{\n// some security paranoia about URL hacking somehow creating e.g. open redirects\n// validate user input: explicit calls to the same validators used during Package Registrations\n@@ -160,9 +177,12 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.BadRequest, \"The format of the package id is invalid\");\n}\n- // if version is non-null, check if it's semantically correct and normalize it.\n- if (!String.IsNullOrEmpty(version))\n+ Package package = null;\n+ try\n{\n+ if (!string.IsNullOrEmpty(version))\n+ {\n+ // if version is non-null, check if it's semantically correct and normalize it.\nNuGetVersion dummy;\nif (!NuGetVersion.TryParse(version, out dummy))\n{\n@@ -171,14 +191,17 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)\n// Normalize the version\nversion = NuGetVersionFormatter.Normalize(version);\n+\n+ if (isSymbolPackage)\n+ {\n+ package = PackageService.FindPackageByIdAndVersionStrict(id, version);\n+ }\n}\nelse\n{\n// If version is null, get the latest version from the database.\n// This ensures that on package restore scenario where version will be non null, we don't hit the database.\n- try\n- {\n- var package = PackageService.FindPackageByIdAndVersion(\n+ package = PackageService.FindPackageByIdAndVersion(\nid,\nversion,\nSemVerLevelKey.SemVer2,\n@@ -186,10 +209,11 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)\nif (package == null)\n{\n- return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, String.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n}\n- version = package.NormalizedVersion;\n+ version = package.NormalizedVersion;\n+ }\n}\ncatch (SqlException e)\n{\n@@ -205,8 +229,25 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)\n// Database was unavailable and we don't have a version, return a 503\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.ServiceUnavailable, Strings.DatabaseUnavailable_TrySpecificVersion);\n}\n+\n+ if (isSymbolPackage)\n+ {\n+ var latestSymbolPackage = package?\n+ .SymbolPackages\n+ .OrderByDescending(sp => sp.Created)\n+ .FirstOrDefault();\n+\n+ if (latestSymbolPackage == null || latestSymbolPackage.StatusKey != PackageStatus.Available)\n+ {\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.SymbolsPackage_PackageNotAvailable, id, version));\n}\n+ return await SymbolPackageFileService.CreateDownloadSymbolPackageActionResultAsync(\n+ HttpContext.Request.Url,\n+ id, version);\n+ }\n+ else\n+ {\nif (ConfigurationService.Features.TrackPackageDownloadCountInLocalDatabase)\n{\nawait PackageService.IncrementDownloadCountAsync(id, version);\n@@ -216,6 +257,7 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)\nHttpContext.Request.Url,\nid, version);\n}\n+ }\n[HttpGet]\n[ActionName(\"GetNuGetExeApi\")]\n@@ -303,7 +345,7 @@ private async Task<HttpStatusCodeWithBodyResult> VerifyPackageKeyInternalAsync(U\nif (package == null)\n{\nreturn new HttpStatusCodeWithBodyResult(\n- HttpStatusCode.NotFound, String.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n+ HttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n}\n// Write an audit record\n@@ -806,7 +848,7 @@ public virtual async Task<ActionResult> DeletePackage(string id, string version)\nif (package == null)\n{\nreturn new HttpStatusCodeWithBodyResult(\n- HttpStatusCode.NotFound, String.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n+ HttpStatusCode.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@@ -838,7 +880,7 @@ public virtual async Task<ActionResult> PublishPackage(string id, string version\nif (package == null)\n{\nreturn new HttpStatusCodeWithBodyResult(\n- HttpStatusCode.NotFound, String.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n+ HttpStatusCode.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"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RouteName.cs",
"new_path": "src/NuGetGallery/RouteName.cs",
"diff": "@@ -27,6 +27,7 @@ public static class RouteName\npublic const string Profile = \"Profile\";\npublic const string DisplayPackage = \"package-route\";\npublic const string DownloadPackage = \"DownloadPackage\";\n+ public const string DownloadSymbolsPackage = \"DownloadSymbolsPackage\";\npublic const string DownloadNuGetExe = \"DownloadNuGetExe\";\npublic const string Home = \"Home\";\npublic const string Stats = \"Stats\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"diff": "@@ -278,6 +278,7 @@ private static string GetContentType(string folderName)\nswitch (folderName)\n{\ncase CoreConstants.PackagesFolderName:\n+ case CoreConstants.SymbolPackagesFolderName:\nreturn CoreConstants.PackageContentType;\ncase CoreConstants.DownloadsFolderName:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1886,6 +1886,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to No available symbols package found for ID {0} and version {1}..\n+ /// </summary>\n+ public static string SymbolsPackage_PackageNotAvailable {\n+ get {\n+ return ResourceManager.GetString(\"SymbolsPackage_PackageNotAvailable\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You do not have the permissions to upload symbol packages..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -968,4 +968,7 @@ Policy violations: {0}</value>\n<value>The previous package version '{0}' is author signed but the uploaded package is unsigned. To avoid this warning, sign the package before uploading.</value>\n<comment>{0} is the previous package's normalized version.</comment>\n</data>\n+ <data name=\"SymbolsPackage_PackageNotAvailable\" xml:space=\"preserve\">\n+ <value>No available symbols package found for ID {0} and version {1}.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -307,6 +307,26 @@ public static string PackageDefaultIcon(this UrlHelper url)\nreturn version == null ? EnsureTrailingSlash(result) : result;\n}\n+ public static string SymbolPackageDownload(\n+ this UrlHelper url,\n+ int feedVersion,\n+ string id,\n+ string version,\n+ bool relativeUrl = true)\n+ {\n+ string result = GetRouteLink(\n+ url,\n+ routeName: $\"v{feedVersion}{RouteName.DownloadSymbolsPackage}\",\n+ relativeUrl: false,\n+ routeValues: new RouteValueDictionary\n+ {\n+ { \"Id\", id },\n+ { \"Version\", version }\n+ });\n+\n+ // Ensure trailing slashes for versionless package URLs, as a fix for package filenames that look like known file extensions\n+ return version == null ? EnsureTrailingSlash(result) : result;\n+ }\npublic static string ExplorerDeepLink(\nthis UrlHelper url,\nint feedVersion,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -26,6 +26,11 @@ public DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumer\nPushedBy = GetPushedBy(package, currentUser);\nPackageFileSize = package.PackageFileSize;\n+ LatestSymbolPackage = package\n+ .SymbolPackages\n+ .OrderByDescending(sp => sp.Created)\n+ .FirstOrDefault();\n+\nif (packageHistory.Any())\n{\n// calculate the number of days since the package registration was created\n@@ -62,6 +67,7 @@ public DisplayPackageViewModel(Package package, User currentUser, string pushedB\npublic int DownloadsPerDay { get; private set; }\npublic int TotalDaysSinceCreated { get; private set; }\npublic long PackageFileSize { get; private set; }\n+ public SymbolPackage LatestSymbolPackage { get; private set; }\npublic bool HasSemVer2Version { get; }\npublic bool HasSemVer2Dependency { get; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "var absolutePackageUrl = Url.Absolute(Url.Package(Model.Id));\n+ var hasSymbolPackageAvailable = Model.LatestSymbolPackage != null && Model.LatestSymbolPackage.StatusKey == PackageStatus.Available;\n+\nPackageManagerViewModel[] packageManagers;\nif (Model.IsDotnetToolPackageType)\n{\n<li>\n<i class=\"ms-Icon ms-Icon--CloudDownload\" aria-hidden=\"true\"></i>\n- <a href=\"@Url.PackageDownload(2, Model.Id, Model.Version)\" data-track=\"outbound-manual-download\" title=\"Download the raw nupkg file.\" rel=\"nofollow\">Download</a>\n+ <a href=\"@Url.PackageDownload(2, Model.Id, Model.Version)\" data-track=\"outbound-manual-download\" title=\"Download the raw nupkg file.\" rel=\"nofollow\">Download Package</a>\n (@Model.PackageFileSize.ToUserFriendlyBytesLabel())\n</li>\n+ if (hasSymbolPackageAvailable)\n+ {\n+ <li>\n+ <i class=\"ms-Icon ms-Icon--CloudDownload\" aria-hidden=\"true\"></i>\n+ <a href=\"@Url.SymbolPackageDownload(2, Model.Id, Model.Version)\" data-track=\"outbound-manual-download\" title=\"Download the raw snupkg file.\" rel=\"nofollow\">Download Symbols</a>\n+ (@Model.LatestSymbolPackage.FileSize.ToUserFriendlyBytesLabel())\n+ </li>\n+ }\n<li class=\"no-clickonce\">\n<i class=\"ms-Icon ms-Icon--OpenInNewWindow\" aria-hidden=\"true\"></i>\n<a href=\"@Url.ExplorerDeepLink(2, Model.Id, Model.Version)\" title=\"Explore the nupkg with the NuGet Package Explorer (IE only)\" rel=\"nofollow\">Open in Package Explorer</a>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -51,6 +51,7 @@ internal class TestableApiController\npublic Mock<IReservedNamespaceService> MockReservedNamespaceService { get; private set; }\npublic Mock<IPackageUploadService> MockPackageUploadService { get; private set; }\npublic Mock<IPackageDeleteService> MockPackageDeleteService { get; set; }\n+ public Mock<ISymbolPackageFileService> MockSymbolPackageFileService { get; set; }\npublic Mock<ISymbolPackageService> MockSymbolPackageService { get; set; }\npublic Mock<IContentObjectService> MockContentObjectService { get; set; }\npublic Mock<ISymbolPackageUploadService> MockSymbolPackageUploadService { get; set; }\n@@ -75,6 +76,7 @@ internal class TestableApiController\nAuthenticationService = (MockAuthenticationService = new Mock<AuthenticationService>()).Object;\nSecurityPolicyService = securityPolicyService ?? (MockSecurityPolicyService = new Mock<ISecurityPolicyService>()).Object;\nReservedNamespaceService = (MockReservedNamespaceService = new Mock<IReservedNamespaceService>()).Object;\n+ SymbolPackageFileService = (MockSymbolPackageFileService = new Mock<ISymbolPackageFileService>()).Object;\nPackageUploadService = (MockPackageUploadService = new Mock<IPackageUploadService>()).Object;\nPackageDeleteService = (MockPackageDeleteService = new Mock<IPackageDeleteService>()).Object;\nSymbolPackageService = (MockSymbolPackageService = new Mock<ISymbolPackageService>()).Object;\n@@ -244,7 +246,7 @@ public async Task CreateSymbolPackage_ReturnsUnauthorizedForAnyUser()\n}\n[Fact]\n- public async Task CreateSymbolPackage_WillReturn400IfFileIsNotANuGetPackage()\n+ public async Task CreateSymbolPackage_WillReturn400IfFileIsNotANuGetPackageInternal()\n{\n// Arrange\nvar user = new User() { EmailAddress = \"[email protected]\" };\n@@ -695,7 +697,7 @@ public async Task CreatePackageWillSendPackageAddedNotice(bool asyncValidationEn\n}\n[Fact]\n- public async Task CreatePackageWillReturn400IfFileIsNotANuGetPackage()\n+ public async Task CreatePackageWillReturn400IfFileIsNotANuGetPackageInternal()\n{\n// Arrange\nvar user = new User() { EmailAddress = \"[email protected]\" };\n@@ -1688,20 +1690,24 @@ public async Task WillNotUnlistThePackageIfItIsLocked()\npublic class TheGetPackageAction\n: TestContainer\n{\n- [Fact]\n- public async Task GetPackageReturns400ForEvilPackageName()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task GetPackageReturns400ForEvilPackageName(bool isSymbolPackage)\n{\nvar controller = new TestableApiController(GetConfigurationService());\n- var result = await controller.GetPackage(\"../..\", \"1.0.0.0\");\n+ var result = await controller.GetPackageInternal(\"../..\", \"1.0.0.0\", isSymbolPackage);\nvar badRequestResult = (HttpStatusCodeWithBodyResult)result;\nAssert.Equal(400, badRequestResult.StatusCode);\n}\n- [Fact]\n- public async Task GetPackageReturns400ForEvilPackageVersion()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task GetPackageReturns400ForEvilPackageVersion(bool isSymbolPackage)\n{\nvar controller = new TestableApiController(GetConfigurationService());\n- var result2 = await controller.GetPackage(\"Foo\", \"10../..1.0\");\n+ var result2 = await controller.GetPackageInternal(\"Foo\", \"10../..1.0\", isSymbolPackage);\nvar badRequestResult2 = (HttpStatusCodeWithBodyResult)result2;\nAssert.Equal(400, badRequestResult2.StatusCode);\n}\n@@ -1716,33 +1722,108 @@ public async Task GetPackageReturns404IfPackageIsNotFound()\nvar controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);\ncontroller.MockPackageService\n- .Setup(x => x.FindPackageByIdAndVersion(packageId, packageVersion, SemVerLevelKey.SemVer2, false))\n+ .Setup(x => x.FindPackageByIdAndVersionStrict(packageId, packageVersion))\n.Returns((Package)null).Verifiable();\ncontroller.MockPackageFileService.Setup(s => s.CreateDownloadPackageActionResultAsync(It.IsAny<Uri>(), packageId, packageVersion))\n.Returns(Task.FromResult<ActionResult>(actionResult))\n.Verifiable();\n// Act\n- var result = await controller.GetPackage(packageId, packageVersion);\n+ var result = await controller.GetPackageInternal(packageId, packageVersion);\n// Assert\n- Assert.IsType<RedirectResult>(result); // all we want to check is that we're redirecting to storage\n- //var httpNotFoundResult = (RedirectResult)result;\n- //Assert.Equal(String.Format(Strings.PackageWithIdAndVersionNotFound, packageId, packageVersion), httpNotFoundResult.StatusDescription);\n- //controller.MockPackageService.Verify();\n+ Assert.IsType<RedirectResult>(result);\n}\n[Fact]\n- public async Task GetPackageReturnsPackageIfItExists()\n+ public async Task GetPackageReturns404ForSymbolPackageIfPackageIsNotFound()\n+ {\n+ // Arrange\n+ const string packageId = \"Baz\";\n+ const string packageVersion = \"1.0.1\";\n+\n+ var controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);\n+ controller.MockPackageService\n+ .Setup(x => x.FindPackageByIdAndVersionStrict(packageId, packageVersion))\n+ .Returns((Package)null).Verifiable();\n+\n+ // Act\n+ var result = (HttpStatusCodeWithBodyResult) await controller.GetPackageInternal(packageId, packageVersion, isSymbolPackage: true);\n+\n+ // Assert\n+ Assert.Equal((int)HttpStatusCode.NotFound, result.StatusCode);\n+ }\n+\n+ [Theory]\n+ [InlineData(PackageStatus.Deleted)]\n+ [InlineData(PackageStatus.FailedValidation)]\n+ [InlineData(PackageStatus.Validating)]\n+ public async Task GetPackageReturns404ForNotAvailableLatestSymbolPackage(PackageStatus status)\n+ {\n+ // Arrange\n+ const string packageId = \"Baz\";\n+ const string packageVersion = \"1.0.1\";\n+ var package = new Package() { PackageRegistration = new PackageRegistration() { Id = packageId }, Version = packageVersion };\n+ var latestSymbolPackage = new SymbolPackage()\n+ {\n+ Key = 1,\n+ Package = package,\n+ StatusKey = status,\n+ Created = DateTime.Today.AddDays(-1)\n+ };\n+ var oldAvailableSymbolPackage = new SymbolPackage()\n+ {\n+ Key = 2,\n+ Package = package,\n+ StatusKey = PackageStatus.Available,\n+ Created = DateTime.Today.AddDays(-2)\n+ };\n+ package.SymbolPackages.Add(oldAvailableSymbolPackage);\n+ package.SymbolPackages.Add(latestSymbolPackage);\n+\n+ var controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);\n+ controller.MockPackageService\n+ .Setup(x => x.FindPackageByIdAndVersionStrict(packageId, packageVersion))\n+ .Returns(package).Verifiable();\n+\n+ // Act\n+ var result = (HttpStatusCodeWithBodyResult)await controller.GetPackageInternal(packageId, packageVersion, isSymbolPackage: true);\n+\n+ // Assert\n+ Assert.Equal((int)HttpStatusCode.NotFound, result.StatusCode);\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task GetPackageReturnsPackageIfItExists(bool isSymbolPackage)\n{\n// Arrange\nconst string packageId = \"Baz\";\nvar package = new Package() { Version = \"1.0.01\", NormalizedVersion = \"1.0.1\" };\nvar actionResult = new EmptyResult();\n+ var availableSymbolPackage = new SymbolPackage()\n+ {\n+ Key = 2,\n+ Package = package,\n+ StatusKey = PackageStatus.Available,\n+ Created = DateTime.Today.AddDays(-1)\n+ };\n+ package.SymbolPackages.Add(availableSymbolPackage);\n+\nvar controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);\n- // controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersion(PackageId, \"1.0.1\", false)).Returns(package);\n- // controller.MockPackageService.Setup(x => x.AddDownloadStatistics(It.IsAny<PackageStatistics>())).Verifiable();\n- controller.MockPackageFileService.Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, packageId, package.NormalizedVersion))\n+ controller\n+ .MockPackageService\n+ .Setup(x => x.FindPackageByIdAndVersionStrict(packageId, \"1.0.1\"))\n+ .Returns(package);\n+ controller\n+ .MockPackageFileService\n+ .Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, packageId, package.NormalizedVersion))\n+ .Returns(Task.FromResult<ActionResult>(actionResult))\n+ .Verifiable();\n+ controller\n+ .MockSymbolPackageFileService\n+ .Setup(s => s.CreateDownloadSymbolPackageActionResultAsync(HttpRequestUrl, packageId, package.NormalizedVersion))\n.Returns(Task.FromResult<ActionResult>(actionResult))\n.Verifiable();\n@@ -1761,11 +1842,19 @@ public async Task GetPackageReturnsPackageIfItExists()\ncontroller.ControllerContext = controllerContext;\n// Act\n- var result = await controller.GetPackage(packageId, \"1.0.01\");\n+ var result = await controller.GetPackageInternal(packageId, \"1.0.01\", isSymbolPackage);\n// Assert\nAssert.Same(actionResult, result);\n+ if (isSymbolPackage)\n+ {\n+ controller.MockSymbolPackageFileService.Verify();\n+ }\n+ else\n+ {\ncontroller.MockPackageFileService.Verify();\n+ }\n+\ncontroller.MockPackageService.Verify();\ncontroller.MockUserService.Verify();\n}\n@@ -1777,8 +1866,9 @@ public async Task GetPackageReturnsSpecificPackageEvenIfDatabaseIsOffline()\nvar actionResult = new EmptyResult();\nvar controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);\n- //controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersion(\"Baz\", \"1.0.0\", false)).Throws(new DataException(\"Can't find the database\")).Verifiable();\n- controller.MockPackageFileService.Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, \"Baz\", \"1.0.0\"))\n+ controller\n+ .MockPackageFileService\n+ .Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, \"Baz\", \"1.0.0\"))\n.Returns(Task.FromResult<ActionResult>(actionResult))\n.Verifiable();\n@@ -1797,7 +1887,7 @@ public async Task GetPackageReturnsSpecificPackageEvenIfDatabaseIsOffline()\ncontroller.ControllerContext = controllerContext;\n// Act\n- var result = await controller.GetPackage(\"Baz\", \"1.0.0\");\n+ var result = await controller.GetPackageInternal(\"Baz\", \"1.0.0\");\n// Assert\nAssert.Same(actionResult, result);\n@@ -1837,7 +1927,7 @@ public async Task GetPackageReturnsLatestPackageIfNoVersionIsProvided()\ncontroller.ControllerContext = controllerContext;\n// Act\n- var result = await controller.GetPackage(packageId, \"\");\n+ var result = await controller.GetPackageInternal(packageId, \"\");\n// Assert\nAssert.Same(actionResult, result);\n@@ -1876,7 +1966,7 @@ public async Task GetPackageReturns503IfNoVersionIsProvidedAndDatabaseUnavailabl\ncontroller.ControllerContext = controllerContext;\n// Act\n- var result = await controller.GetPackage(\"Baz\", \"\");\n+ var result = await controller.GetPackageInternal(\"Baz\", \"\");\n// Assert\nResultAssert.IsStatusCode(result, HttpStatusCode.ServiceUnavailable, Strings.DatabaseUnavailable_TrySpecificVersion);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"diff": "@@ -118,6 +118,17 @@ public async Task WillSetTheResultContentTypeForThePackagesFolder()\nAssert.Equal(CoreConstants.PackageContentType, result.ContentType);\n}\n+ [Fact]\n+ public async Task WillSetTheResultContentTypeForTheSymbolPackagesFolder()\n+ {\n+ var service = CreateService();\n+\n+ var result = await service.CreateDownloadFileActionResultAsync(HttpRequestUrl, CoreConstants.SymbolPackagesFolderName, \"theFileName\") as FilePathResult;\n+\n+ Assert.NotNull(result);\n+ Assert.Equal(CoreConstants.PackageContentType, result.ContentType);\n+ }\n+\n[Fact]\npublic async Task WillSetTheResultDownloadFilePath()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -13,6 +13,14 @@ namespace NuGetGallery.ViewModels\n{\npublic class DisplayPackageViewModelFacts\n{\n+ private Random gen = new Random();\n+ DateTime RandomDay()\n+ {\n+ DateTime start = new DateTime(1995, 1, 1);\n+ int range = (DateTime.Today - start).Days;\n+ return start.AddDays(gen.Next(range));\n+ }\n+\n[Theory]\n[InlineData(\"https://www.github.com/NuGet/Home\", \"git\", RepositoryKind.GitHub)]\n[InlineData(\"https://github.com/NuGet/Home\", \"git\", RepositoryKind.GitHub)]\n@@ -76,6 +84,39 @@ public void TheCtorSortsPackageVersionsProperly()\nAssert.Equal(\"1.0.10\", packageVersions[0].Version);\n}\n+ [Fact]\n+ public void TheCtorReturnsLatestSymbolPackageByDateCreated()\n+ {\n+ var package = new Package\n+ {\n+ Version = \"1.0.0\",\n+ Dependencies = Enumerable.Empty<PackageDependency>().ToList(),\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ }\n+ };\n+\n+ var symbolPackageList = new List<SymbolPackage>();\n+ for (var i = 0; i < 5; i++)\n+ {\n+ symbolPackageList.Add(\n+ new SymbolPackage()\n+ {\n+ Key = i,\n+ Package = package,\n+ StatusKey = PackageStatus.Available,\n+ Created = (i == 0) ? DateTime.Today : RandomDay()\n+ });\n+ }\n+\n+ package.SymbolPackages = symbolPackageList;\n+\n+ var viewModel = new DisplayPackageViewModel(package, null, packageHistory: Enumerable.Empty<Package>().OrderBy(x => 1));\n+\n+ Assert.Equal(symbolPackageList[0], viewModel.LatestSymbolPackage);\n+ }\n+\n[Fact]\npublic void AvgDownloadsPerDayConsidersOldestPackageVersionInHistory()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [NuGet Symbol Server] Add download symbols support to Package details page (#6320) |
455,782 | 20.08.2018 10:41:19 | 25,200 | 0ac2f91860bb6ee2aac4c0cfdc2338aef18843cc | Improve manage certificates message | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "@helper InformAboutOrgSettingsPage()\n{\n- @ViewHelpers.AlertInfo(@<text>To manage certificates for an organization, you would need to go to the <a href=\"@Url.ManageMyOrganizations()\">organization's settings page</a>.</text>)\n+ if (Model.IsOrganization)\n+ {\n+ @ViewHelpers.AlertInfo(@<text>To manage certificates for your individual account, go to <a href=\"@Url.AccountSettings()\">your account's settings page</a>.</text>)\n+ }\n+ else\n+ {\n+ @ViewHelpers.AlertInfo(@<text>To manage certificates for an organization, go to the <a href=\"@Url.ManageMyOrganizations()\">organization's settings page</a>.</text>)\n+ }\n}\[email protected](\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Improve manage certificates message (#6324) |
455,772 | 21.08.2018 15:59:16 | 25,200 | 24cb122dc396073918c66852901d3a7f5a812b75 | Simplify the security policy service to have 1 handler list for all accounts | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/SecurityPolicyController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/SecurityPolicyController.cs",
"diff": "@@ -37,7 +37,7 @@ public virtual ActionResult Index()\n{\nvar model = new SecurityPolicyViewModel()\n{\n- SubscriptionNames = PolicyService.UserSubscriptions.Select(s => s.SubscriptionName)\n+ SubscriptionNames = PolicyService.Subscriptions.Select(s => s.SubscriptionName)\n};\nreturn View(model);\n@@ -59,7 +59,7 @@ public virtual JsonResult Search(string query)\nUsers = users.Select(u => new UserSecurityPolicySubscriptions()\n{\nUsername = u.Username,\n- Subscriptions = PolicyService.UserSubscriptions.ToDictionary(\n+ Subscriptions = PolicyService.Subscriptions.ToDictionary(\ns => s.SubscriptionName,\ns => PolicyService.IsSubscribed(u, s))\n}),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/ISecurityPolicyService.cs",
"new_path": "src/NuGetGallery/Security/ISecurityPolicyService.cs",
"diff": "@@ -13,14 +13,9 @@ namespace NuGetGallery.Security\npublic interface ISecurityPolicyService\n{\n/// <summary>\n- /// Available user security policy subscriptions.\n+ /// Available security policy subscriptions.\n/// </summary>\n- IEnumerable<IUserSecurityPolicySubscription> UserSubscriptions { get; }\n-\n- /// <summary>\n- /// Available organization security policy subscriptions.\n- /// </summary>\n- IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscriptions { get; }\n+ IEnumerable<IUserSecurityPolicySubscription> Subscriptions { get; }\n/// <summary>\n/// Check if a user is subscribed to one or more security policies.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"new_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"diff": "@@ -97,22 +97,9 @@ protected virtual IEnumerable<PackageSecurityPolicyHandler> PackageHandlers\n}\n/// <summary>\n- /// Available user security policy subscriptions.\n+ /// Available policy subscriptions.\n/// </summary>\n- public virtual IEnumerable<IUserSecurityPolicySubscription> UserSubscriptions\n- {\n- get\n- {\n- yield return _controlRequiredSignerPolicy;\n- yield return _automaticallyOverwriteRequiredSignerPolicy;\n- yield return MicrosoftTeamSubscription;\n- }\n- }\n-\n- /// <summary>\n- /// Available organization security policy subscriptions.\n- /// </summary>\n- public virtual IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscriptions\n+ public virtual IEnumerable<IUserSecurityPolicySubscription> Subscriptions\n{\nget\n{\n@@ -125,9 +112,7 @@ public virtual IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscrip\nprivate IUserSecurityPolicySubscription GetSubscription(User user, string subscriptionName)\n{\n- return (user is Organization)\n- ? OrganizationSubscriptions.FirstOrDefault(s => s.SubscriptionName.Equals(subscriptionName, StringComparison.OrdinalIgnoreCase))\n- : UserSubscriptions.FirstOrDefault(s => s.SubscriptionName.Equals(subscriptionName, StringComparison.OrdinalIgnoreCase));\n+ return Subscriptions.FirstOrDefault(s => s.SubscriptionName.Equals(subscriptionName, StringComparison.OrdinalIgnoreCase));\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "</system.webServer>\n<runtime>\n<assemblyBinding xmlns=\"urn:schemas-microsoft-com:asm.v1\">\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"MonAgentListener\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-33.1.0.0\" newVersion=\"33.1.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"NuGet.Versioning\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.8.0.4\" newVersion=\"4.8.0.4\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/DefaultSubscriptionFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/DefaultSubscriptionFacts.cs",
"diff": "@@ -15,7 +15,7 @@ public class DefaultSubscriptionFacts\npublic void Policies_ReturnsMinClientAndPackageVerifyScopePolicies()\n{\n// Arrange.\n- var subscription = CreateSecurityPolicyService().UserSubscriptions.Single();\n+ var subscription = CreateSecurityPolicyService().Subscriptions.Single();\nvar policy1 = subscription.Policies.FirstOrDefault(p => p.Name.Equals(RequireMinProtocolVersionForPushPolicy.PolicyName));\nvar policy2 = subscription.Policies.FirstOrDefault(p => p.Name.Equals(RequirePackageVerifyScopePolicy.PolicyName));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/MicrosoftTeamSubscriptionFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/MicrosoftTeamSubscriptionFacts.cs",
"diff": "@@ -15,7 +15,7 @@ public class MicrosoftTeamSubscriptionFacts\npublic void Policies_ReturnsMicrosoftTeamSubscriptionPolicies()\n{\n// Arrange.\n- var subscription = CreateSecurityPolicyService().UserSubscriptions.Single();\n+ var subscription = CreateSecurityPolicyService().Subscriptions.Single();\nvar policy = subscription.Policies.FirstOrDefault(p => p.Name.Equals(RequirePackageMetadataCompliancePolicy.PolicyName));\n// Act & Assert.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/SecurityPolicyServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/SecurityPolicyServiceFacts.cs",
"diff": "@@ -318,7 +318,7 @@ public void IsSubscribed_ReturnsTrueIfUserHasSubscriptionPolicies()\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act & Assert.\n- Assert.True(service.IsSubscribed(user, service.UserSubscriptions.Single()));\n+ Assert.True(service.IsSubscribed(user, service.Subscriptions.Single()));\n}\n[Fact]\n@@ -335,7 +335,7 @@ public void IsSubscribed_ReturnsTrueIfUserHasSubscriptionAndOtherPolicies()\n}\n// Act & Assert.\n- Assert.True(service.IsSubscribed(user, service.UserSubscriptions.First()));\n+ Assert.True(service.IsSubscribed(user, service.Subscriptions.First()));\n}\n[Fact]\n@@ -348,7 +348,7 @@ public void IsSubscribed_ReturnsFalseIfUserDoesNotHaveAllSubscriptionPolicies()\nuser.SecurityPolicies.Add(subscription.Policies.First());\n// Act & Assert.\n- Assert.False(service.IsSubscribed(user, service.UserSubscriptions.First()));\n+ Assert.False(service.IsSubscribed(user, service.Subscriptions.First()));\n}\n[Fact]\n@@ -382,7 +382,7 @@ public async Task SubscribeAsync_AddsAllSubscriptionPoliciesWhenHasNoneToStart()\nvar user = new User(\"testUser\");\n// Act.\n- var subscribed = await service.SubscribeAsync(user, service.UserSubscriptions.First());\n+ var subscribed = await service.SubscribeAsync(user, service.Subscriptions.First());\n// Act & Assert.\nAssert.True(subscribed);\n@@ -407,7 +407,7 @@ public async Task SubscribeAsync_AddsAllSubscriptionPoliciesWhenHasSameAsDiffere\n}\n// Act.\n- var subscribed = await service.SubscribeAsync(user, service.UserSubscriptions.First());\n+ var subscribed = await service.SubscribeAsync(user, service.Subscriptions.First());\n// Act & Assert.\nAssert.True(subscribed);\n@@ -436,7 +436,7 @@ public async Task SubscribeAsync_DoesNotAddSubscriptionPoliciesIfAlreadySubscrib\nAssert.Equal(2, user.SecurityPolicies.Count);\n// Act.\n- var subscribed = await service.SubscribeAsync(user, service.UserSubscriptions.First());\n+ var subscribed = await service.SubscribeAsync(user, service.Subscriptions.First());\n// Act & Assert.\nAssert.False(subscribed);\n@@ -453,7 +453,7 @@ public async Task SubscribeAsync_SavesAuditRecordIfWasNotSubscribed()\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.UserSubscriptions.First();\n+ var subscription = service.Subscriptions.First();\n// Act.\nawait service.SubscribeAsync(user, subscription);\n@@ -468,7 +468,7 @@ public async Task SubscribeAsync_DoesNotSaveAuditRecordIfWasAlreadySubscribed()\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.UserSubscriptions.First();\n+ var subscription = service.Subscriptions.First();\nawait service.SubscribeAsync(user, subscription);\nservice.MockAuditingService.ResetCalls();\n@@ -516,7 +516,7 @@ public async Task UnsubscribeAsync_RemovesAllSubscriptionPolicies()\nAssert.Equal(2, user.SecurityPolicies.Count);\n// Act.\n- await service.UnsubscribeAsync(user, service.UserSubscriptions.First());\n+ await service.UnsubscribeAsync(user, service.Subscriptions.First());\n// Act & Assert.\nAssert.Equal(0, user.SecurityPolicies.Count);\n@@ -542,7 +542,7 @@ public async Task UnsubscribeAsync_DoesNotRemoveOtherSubscriptionPolicies()\nAssert.Equal(4, user.SecurityPolicies.Count);\n// Act.\n- await service.UnsubscribeAsync(user, service.UserSubscriptions.First());\n+ await service.UnsubscribeAsync(user, service.Subscriptions.First());\n// Act & Assert.\nvar policies = user.SecurityPolicies.ToList();\n@@ -570,7 +570,7 @@ public async Task UnsubscribeAsync_RemovesNoPoliciesIfNotSubscribed()\nAssert.Equal(2, user.SecurityPolicies.Count);\n// Act.\n- await service.UnsubscribeAsync(user, service.UserSubscriptions.First());\n+ await service.UnsubscribeAsync(user, service.Subscriptions.First());\n// Act & Assert.\nAssert.Equal(2, user.SecurityPolicies.Count);\n@@ -586,7 +586,7 @@ public async Task UnsubscribeAsync_SavesAuditRecordIfWasSubscribed()\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.UserSubscriptions.First();\n+ var subscription = service.Subscriptions.First();\nawait service.SubscribeAsync(user, subscription);\nservice.MockAuditingService.ResetCalls();\n@@ -603,7 +603,7 @@ public async Task UnsubscribeAsync_DoesNotSaveAuditRecordIfWasNotSubscribed()\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.UserSubscriptions.First();\n+ var subscription = service.Subscriptions.First();\n// Act.\nawait service.UnsubscribeAsync(user, subscription);\n@@ -611,31 +611,6 @@ public async Task UnsubscribeAsync_DoesNotSaveAuditRecordIfWasNotSubscribed()\n// Act & Assert.\nservice.MockAuditingService.Verify(s => s.SaveAuditRecordAsync(It.IsAny<AuditRecord>()), Times.Never);\n}\n-\n- [Fact]\n- public async Task UnsubscribeAsync_RemovesAllOrganizationSubscriptionPolicies()\n- {\n- // Arrange.\n- var service = new TestSecurityPolicyService();\n- var organization = new Organization(\"testOrganization\");\n- var subscription = service.Mocks.OrganizationPoliciesSubscription.Object;\n- foreach (var policy in subscription.Policies)\n- {\n- organization.SecurityPolicies.Add(new UserSecurityPolicy(policy));\n- }\n- Assert.Equal(2, organization.SecurityPolicies.Count);\n-\n- // Act.\n- await service.UnsubscribeAsync(organization, service.OrganizationSubscriptions.First());\n-\n- // Act & Assert.\n- Assert.Equal(0, organization.SecurityPolicies.Count);\n-\n- service.Mocks.OrganizationPoliciesSubscription.Verify(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\n- service.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n- service.MockUserSecurityPolicies.Verify(p => p.Remove(It.IsAny<UserSecurityPolicy>()), Times.Exactly(2));\n- }\n-\nprivate HttpContextBase CreateHttpContext(User user)\n{\nvar httpContext = new Mock<HttpContextBase>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/TestSecurityPolicyService.cs",
"new_path": "tests/NuGetGallery.Facts/Security/TestSecurityPolicyService.cs",
"diff": "@@ -24,9 +24,7 @@ public class TestSecurityPolicyService : SecurityPolicyService\npublic TestUserSecurityPolicyData Mocks { get; }\n- public override IEnumerable<IUserSecurityPolicySubscription> UserSubscriptions { get; }\n-\n- public override IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscriptions { get; }\n+ public override IEnumerable<IUserSecurityPolicySubscription> Subscriptions { get; }\nprotected override IEnumerable<UserSecurityPolicyHandler> UserHandlers { get; }\n@@ -43,8 +41,7 @@ public class TestSecurityPolicyService : SecurityPolicyService\nMocks = mocks ?? new TestUserSecurityPolicyData();\nUserHandlers = userHandlers ?? Mocks.Handlers.Select(m => m.Object);\n- UserSubscriptions = userSubscriptions ?? new [] { Mocks.UserPoliciesSubscription.Object };\n- OrganizationSubscriptions = organizationSubscriptions ?? new[] { Mocks.OrganizationPoliciesSubscription.Object };\n+ Subscriptions = userSubscriptions ?? new [] { Mocks.UserPoliciesSubscription.Object };\nDefaultSubscription = Mocks.DefaultSubscription.Object;\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Simplify the security policy service to have 1 handler list for all accounts (#6330) |
455,776 | 22.08.2018 14:46:46 | 25,200 | 75f997e4d457a278cf7685ba07402eb07267e7cf | Set-StrictMode in build script | [
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -10,9 +10,11 @@ param (\n[string]$PackageSuffix,\n[string]$Branch,\n[string]$CommitSHA,\n- [string]$BuildBranch = '37ff6e758c38b3f513af39f881399ce85f4ff20b'\n+ [string]$BuildBranch = '9f570166c49e93a911e54505a8041f3a123e69b1'\n)\n+Set-StrictMode -Version 1.0\n+\n# This script should fail the build if any issue occurs.\ntrap {\nWrite-Host \"BUILD FAILED: $_\" -ForegroundColor Red\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Set-StrictMode in build script (#6338) |
455,776 | 22.08.2018 15:31:17 | 25,200 | d7894bf520e109775b66298237e78b2a0a76a8e7 | Add member/add owner/transform to org fails with specific message if email is input instead of username | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing NuGet.Versioning;\n+using System;\nnamespace NuGetGallery\n{\n@@ -69,6 +70,7 @@ public static class Constants\ninternal const string EmailValidationRegexFirstPart = @\"[-A-Za-z0-9!#$%&'*+\\/=?^_`{|}~\\.]+\";\ninternal const string EmailValidationRegexSecondPart = @\"[A-Za-z0-9]+[\\w\\.-]*[A-Za-z0-9]*\\.[A-Za-z0-9][A-Za-z\\.]*[A-Za-z]\";\npublic const string EmailValidationRegex = \"^\" + EmailValidationRegexFirstPart + \"@\" + EmailValidationRegexSecondPart + \"$\";\n+ public static TimeSpan EmailValidationRegexTimeout = TimeSpan.FromSeconds(5);\npublic const string EmailValidationErrorMessage = \"This doesn't appear to be a valid email address.\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "using System.Collections.Generic;\nusing System.Globalization;\nusing System.Linq;\n+using System.Text.RegularExpressions;\nusing System.Threading.Tasks;\nusing System.Web;\nusing System.Web.Mvc;\n@@ -108,8 +109,12 @@ public virtual ActionResult GetPackageOwners(string id, string version)\n[ValidateAntiForgeryToken]\npublic async Task<JsonResult> AddPackageOwner(string id, string username, string message)\n{\n- ManagePackageOwnerModel model;\n- if (TryGetManagePackageOwnerModel(id, username, isAddOwner: true, model: out model))\n+ if (Regex.IsMatch(username, Constants.EmailValidationRegex, RegexOptions.None, Constants.EmailValidationRegexTimeout))\n+ {\n+ return Json(new { success = false, message = Strings.AddOwner_NameIsEmail }, JsonRequestBehavior.AllowGet);\n+ }\n+\n+ if (TryGetManagePackageOwnerModel(id, username, isAddOwner: true, model: out var model))\n{\nvar packageUrl = Url.Package(model.Package.Id, version: null, relativeUrl: false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "using System.Globalization;\nusing System.Linq;\nusing System.Net;\n+using System.Text.RegularExpressions;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\nusing NuGetGallery.Areas.Admin;\n@@ -137,11 +138,18 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\n{\nvar accountToTransform = GetCurrentUser();\n- var adminUser = UserService.FindByUsername(transformViewModel.AdminUsername);\n+ var adminUsername = transformViewModel.AdminUsername;\n+ if (Regex.IsMatch(adminUsername, Constants.EmailValidationRegex, RegexOptions.None, Constants.EmailValidationRegexTimeout))\n+ {\n+ ModelState.AddModelError(string.Empty, Strings.TransformAccount_AdminNameIsEmail);\n+ return View(transformViewModel);\n+ }\n+\n+ var adminUser = UserService.FindByUsername(adminUsername);\nif (adminUser == null)\n{\n- ModelState.AddModelError(string.Empty, String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_AdminAccountDoesNotExist, transformViewModel.AdminUsername));\n+ ModelState.AddModelError(string.Empty, string.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_AdminAccountDoesNotExist, adminUsername));\nreturn View(transformViewModel);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "using System.Data.Entity;\nusing System.Globalization;\nusing System.Linq;\n+using System.Text.RegularExpressions;\nusing System.Threading.Tasks;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\n@@ -87,6 +88,11 @@ public async Task<MembershipRequest> AddMembershipRequestAsync(Organization orga\nreturn request;\n}\n+ if (Regex.IsMatch(memberName, Constants.EmailValidationRegex, RegexOptions.None, Constants.EmailValidationRegexTimeout))\n+ {\n+ throw new EntityException(Strings.AddMember_NameIsEmail);\n+ }\n+\nvar member = FindByUsername(memberName);\nif (member == null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -151,6 +151,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to You must add a member by username, not an email address..\n+ /// </summary>\n+ public static string AddMember_NameIsEmail {\n+ get {\n+ return ResourceManager.GetString(\"AddMember_NameIsEmail\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You cannot accept this request because you no longer meet the requirements of this organization. {0} Please contact support for more details..\n/// </summary>\n@@ -223,6 +232,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to You must add an owner by username, not an email address..\n+ /// </summary>\n+ public static string AddOwner_NameIsEmail {\n+ get {\n+ return ResourceManager.GetString(\"AddOwner_NameIsEmail\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You are not the package owner..\n/// </summary>\n@@ -1985,6 +2003,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to You must choose an administrator by username, not an email address..\n+ /// </summary>\n+ public static string TransformAccount_AdminNameIsEmail {\n+ get {\n+ return ResourceManager.GetString(\"TransformAccount_AdminNameIsEmail\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The transform request for your account has been successfully cancelled..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -971,4 +971,13 @@ Policy violations: {0}</value>\n<data name=\"SymbolsPackage_PackageNotAvailable\" xml:space=\"preserve\">\n<value>No available symbols package found for ID {0} and version {1}.</value>\n</data>\n+ <data name=\"AddMember_NameIsEmail\" xml:space=\"preserve\">\n+ <value>You must add a member by username, not an email address.</value>\n+ </data>\n+ <data name=\"AddOwner_NameIsEmail\" xml:space=\"preserve\">\n+ <value>You must add an owner by username, not an email address.</value>\n+ </data>\n+ <data name=\"TransformAccount_AdminNameIsEmail\" xml:space=\"preserve\">\n+ <value>You must choose an administrator by username, not an email address.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"diff": "@@ -337,9 +337,31 @@ public async Task ReturnsFailureIfNewOwnerIsAlreadyPending(InvokePackageOwnerMod\npublic class TheAddPackageOwnerMethod : TestContainer\n{\n+ public static IEnumerable<object[]> AllCanManagePackageOwners_Data => ThePackageOwnerMethods.AllCanManagePackageOwners_Data;\npublic static IEnumerable<object[]> AllCanManagePackageOwnersPairedWithCanBeAdded_Data = TheAddPackageOwnerMethods.AllCanManagePackageOwnersPairedWithCanBeAdded_Data;\npublic static IEnumerable<object[]> PendingOwnerPropagatesPolicy_Data => TheAddPackageOwnerMethods.PendingOwnerPropagatesPolicy_Data;\n+ [Theory]\n+ [MemberData(nameof(AllCanManagePackageOwners_Data))]\n+ public async Task FailsIfUserInputIsEmailAddress(Func<Fakes,User> getCurrentUser)\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var currentUser = getCurrentUser(fakes);\n+ var usernameToAdd = \"[email protected]\";\n+ var package = fakes.Package;\n+ var controller = GetController<JsonApiController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ // Act\n+ var result = await controller.AddPackageOwner(package.Id, usernameToAdd, \"a message\");\n+ dynamic data = result.Data;\n+\n+ // Assert\n+ Assert.False(data.success);\n+ Assert.Equal(Strings.AddOwner_NameIsEmail, data.message);\n+ }\n+\n[Theory]\n[MemberData(nameof(AllCanManagePackageOwnersPairedWithCanBeAdded_Data))]\npublic async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState(Func<Fakes, User> getCurrentUser, Func<Fakes, User> getUserToAdd)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -2462,6 +2462,50 @@ public async Task WhenCanTransformReturnsFalse_ShowsError()\nTimes.Never());\n}\n+ [Fact]\n+ public async Task WhenAdminUsernameIsEmail_ShowsError()\n+ {\n+ // Arrange\n+ var accountToTransform = \"account\";\n+ var controller = CreateController(accountToTransform);\n+\n+ // Act\n+ var result = await controller.TransformToOrganization(new TransformAccountViewModel()\n+ {\n+ AdminUsername = \"[email protected]\"\n+ });\n+\n+ // Assert\n+ Assert.NotNull(result);\n+ Assert.Single(controller.ModelState[string.Empty].Errors);\n+ Assert.Equal(\n+ Strings.TransformAccount_AdminNameIsEmail,\n+ controller.ModelState[string.Empty].Errors.First().ErrorMessage);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestAsync(\n+ It.IsAny<User>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>()),\n+ Times.Never());\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformInitiatedNoticeAsync(\n+ It.IsAny<User>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>()),\n+ Times.Never());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformInitiated(It.IsAny<User>()),\n+ Times.Never());\n+ }\n+\n[Fact]\npublic async Task WhenAdminIsNotFound_ShowsError()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -193,6 +193,30 @@ public async Task WhenExistingRequest_ReturnsExistingRequest(bool existingReques\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n}\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public async Task WhenMemberNameIsEmail_ThrowEntityException(bool isAdmin)\n+ {\n+ // Arrange\n+ var fakes = new Fakes();\n+ var service = new TestableUserService();\n+ service.MockUserRepository.Setup(r => r.GetAll())\n+ .Returns(new[] {\n+ fakes.Organization\n+ }.AsQueryable());\n+\n+ // Act\n+ var e = await Assert.ThrowsAsync<EntityException>(async () =>\n+ {\n+ await service.AddMembershipRequestAsync(fakes.Organization, \"[email protected]\", isAdmin);\n+ });\n+\n+ Assert.Equal(Strings.AddMember_NameIsEmail, e.Message);\n+\n+ service.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n+ }\n+\n[Theory]\n[InlineData(false)]\n[InlineData(true)]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add member/add owner/transform to org fails with specific message if email is input instead of username (#6329) |
455,736 | 22.08.2018 12:11:59 | 25,200 | 6c3041c1a225caa2dad9b69c5737ad6140bc1105 | Use strong name version of third party dependencies
Progress on
Address
Copy in ServiceResponse from NuGet.Services.Platform to eliminate a dependency | [
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/Client/SearchClient.cs",
"new_path": "src/NuGet.Services.Search.Client/Client/SearchClient.cs",
"diff": "using System.Net.Http;\nusing System.Threading.Tasks;\nusing Newtonsoft.Json.Linq;\n-using NuGet.Services.Client;\nusing NuGet.Services.Search.Models;\nnamespace NuGet.Services.Search.Client\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"new_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"diff": "<Compile Include=\"Client\\SearchClient.cs\" />\n<Compile Include=\"Client\\ServiceDiscovery.cs\" />\n<Compile Include=\"Client\\ServiceDiscoveryClient.cs\" />\n+ <Compile Include=\"Client\\ServiceResponse.cs\" />\n<Compile Include=\"Client\\ThreadSafeRandom.cs\" />\n<Compile Include=\"Correlation\\CorrelatingHttpClientHandler.cs\" />\n<Compile Include=\"Correlation\\WebApiCorrelationHandler.cs\" />\n<PackageReference Include=\"Newtonsoft.Json\">\n<Version>9.0.1</Version>\n</PackageReference>\n- <PackageReference Include=\"NuGet.Services.Platform.Client\">\n- <Version>3.0.29-r-master</Version>\n- </PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<PackageReference Include=\"d3\">\n<Version>5.4.0</Version>\n</PackageReference>\n- <PackageReference Include=\"DynamicData.EFCodeFirstProvider\">\n+ <PackageReference Include=\"DynamicData.EFCodeFirstProvider.StrongName\">\n<Version>0.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"elmah.corelibrary.strongname\">\n<PackageReference Include=\"Microsoft.AspNet.WebApi.Core\">\n<Version>5.2.3</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.AspNet.WebApi.MessageHandlers.Compression\">\n+ <PackageReference Include=\"Microsoft.AspNet.WebApi.MessageHandlers.Compression.StrongName\">\n<Version>1.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.WebApi.OData\">\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n</PackageReference>\n- <PackageReference Include=\"QueryInterceptor\">\n+ <PackageReference Include=\"QueryInterceptor.StrongName\">\n<Version>0.1.4237.2400</Version>\n</PackageReference>\n<PackageReference Include=\"RouteMagic\">\n<Version>1.1.3</Version>\n</PackageReference>\n- <PackageReference Include=\"Strathweb.CacheOutput.WebApi2\">\n+ <PackageReference Include=\"Strathweb.CacheOutput.WebApi2.StrongName\">\n<Version>0.9.0</Version>\n</PackageReference>\n<PackageReference Include=\"System.Diagnostics.Debug\">\n<PackageReference Include=\"System.Net.Http\">\n<Version>4.3.1</Version>\n</PackageReference>\n+ <PackageReference Include=\"WebActivator.StrongName\">\n+ <Version>1.4.4</Version>\n+ </PackageReference>\n<PackageReference Include=\"WebActivatorEx\">\n<Version>2.0.6</Version>\n</PackageReference>\n- <PackageReference Include=\"WebBackgrounder\">\n- <Version>0.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"WebBackgrounder.EntityFramework\">\n+ <PackageReference Include=\"WebBackgrounder.EntityFramework.StrongName\">\n<Version>0.1.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"WebBackgrounder.StrongName\">\n+ <Version>0.2.0</Version>\n+ </PackageReference>\n<PackageReference Include=\"WindowsAzure.Caching\">\n<Version>1.7.0</Version>\n</PackageReference>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Use strong name version of third party dependencies (#6337)
Progress on https://github.com/NuGet/Engineering/issues/1577
Address https://github.com/NuGet/NuGetGallery/issues/3849
Copy in ServiceResponse from NuGet.Services.Platform to eliminate a dependency |
455,736 | 23.08.2018 16:12:23 | 25,200 | 42dd5a93b81f5ae8c9abe7d454f6687ea0a59b63 | Add MicroBuild dependency and signing of output DLLs
Progress on | [
{
"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 = '9f570166c49e93a911e54505a8041f3a123e69b1'\n+ [string]$BuildBranch = '306fec22edac68336d7e32124d51248734c3a395'\n)\nSet-StrictMode -Version 1.0\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"new_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"diff": "</None>\n</ItemGroup>\n<ItemGroup>\n+ <PackageReference Include=\"MicroBuild.Core\">\n+ <Version>0.3.0</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.WebApi.Client\">\n<Version>5.2.3</Version>\n</PackageReference>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n+ <PropertyGroup>\n+ <SignPath>..\\..\\build</SignPath>\n+ <SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n+ <SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ </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</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<PackageReference Include=\"EntityFramework\">\n<Version>6.1.3</Version>\n</PackageReference>\n+ <PackageReference Include=\"MicroBuild.Core\">\n+ <Version>0.3.0</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.Azure.KeyVault.Core\">\n<Version>1.0.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n<PropertyGroup>\n- <NuGetBuildPath Condition=\"'$(NuGetBuildPath)' == ''\">..\\..\\build</NuGetBuildPath>\n+ <SignPath>..\\..\\build</SignPath>\n+ <SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n+ <SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n</PropertyGroup>\n- <Import Project=\"$(NuGetBuildPath)\\sign.targets\" Condition=\"Exists('$(NuGetBuildPath)\\sign.targets')\" />\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</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<PackageReference Include=\"Lucene.Net.Contrib\">\n<Version>3.0.3</Version>\n</PackageReference>\n+ <PackageReference Include=\"MicroBuild.Core\">\n+ <Version>0.3.0</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights\">\n<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n<Version>2.2.3</Version>\n</PackageReference>\n- <PackageReference Include=\"NuGet.Services.Platform.Client\">\n- <Version>3.0.29-r-master</Version>\n- </PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n<Version>2.27.0</Version>\n</PackageReference>\n<VSToolsPath Condition=\"'$(VSToolsPath)' == ''\">$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v$(VisualStudioVersion)</VSToolsPath>\n</PropertyGroup>\n<Import Project=\"$(MSBuildBinPath)\\Microsoft.CSharp.targets\" />\n+ <PropertyGroup>\n+ <SignPath>..\\..\\build</SignPath>\n+ <SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n+ <SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ </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=\"$(VSToolsPath)\\WebApplications\\Microsoft.WebApplication.targets\" Condition=\"'$(VSToolsPath)' != ''\" />\n<Import Project=\"$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v10.0\\WebApplications\\Microsoft.WebApplication.targets\" Condition=\"false\" />\n<Target Name=\"MvcBuildViews\" AfterTargets=\"AfterBuild\" Condition=\"'$(MvcBuildViews)'=='true'\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Properties/AssemblyInfo.cs",
"new_path": "src/NuGetGallery/Properties/AssemblyInfo.cs",
"diff": "[assembly: AssemblyTrademark(\"\")]\n[assembly: AssemblyCulture(\"\")]\n+#if SIGNED_BUILD\n+[assembly: InternalsVisibleTo(\"NuGetGallery.Facts, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9\")]\n+#else\n[assembly: InternalsVisibleTo(\"NuGetGallery.Facts\")]\n+#endif\n#if !PORTABLE\n[assembly: ComVisible(false)]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n+ <PropertyGroup>\n+ <SignPath>..\\..\\build</SignPath>\n+ <SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n+ <SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ </PropertyGroup>\n+ <Import Project=\"$(SignPath)\\sign.targets\" Condition=\"Exists('$(SignPath)\\sign.targets')\" />\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n+ <PropertyGroup>\n+ <SignPath>..\\..\\build</SignPath>\n+ <SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n+ <SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ </PropertyGroup>\n+ <Import Project=\"$(SignPath)\\sign.targets\" Condition=\"Exists('$(SignPath)\\sign.targets')\" />\n</Project>\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add MicroBuild dependency and signing of output DLLs (#6344)
Progress on https://github.com/NuGet/Engineering/issues/1577 |
455,731 | 29.08.2018 13:34:41 | 25,200 | 25337032ee0b61844d3bef7d5489a3f65703e456 | Gallery: enable blocking packages with too many package entries
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -313,8 +313,10 @@ public class AppConfiguration : IAppConfiguration\n/// Gets/sets a string that is brand string to display in the footer, this also\n/// accepts a single {0} string format token which is replaced by the UTC year\n/// </summary>\n- public string ExternalBrandingMessage {\n- get {\n+ public string ExternalBrandingMessage\n+ {\n+ get\n+ {\nreturn _ExternalBrandingMessage;\n}\n@@ -338,5 +340,7 @@ public class AppConfiguration : IAppConfiguration\npublic bool IsHosted { get; set; }\npublic bool RejectSignedPackagesWithNoRegisteredCertificate { get; set; }\n+\n+ public bool RejectPackagesWithTooManyPackageEntries { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -339,5 +339,10 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// by the owner.\n/// </summary>\nbool RejectSignedPackagesWithNoRegisteredCertificate { get; set; }\n+\n+ /// <summary>\n+ /// Whether or not to synchronously reject packages on push/upload that have too many package entries.\n+ /// </summary>\n+ bool RejectPackagesWithTooManyPackageEntries { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "@@ -44,7 +44,14 @@ public async Task<PackageValidationResult> ValidateBeforeGeneratePackageAsync(Pa\n{\nvar warnings = new List<string>();\n- var result = await CheckForUnsignedPushAfterAuthorSignedAsync(\n+ var result = await CheckPackageEntryCountAsync(nuGetPackage, warnings);\n+\n+ if (result != null)\n+ {\n+ return result;\n+ }\n+\n+ result = await CheckForUnsignedPushAfterAuthorSignedAsync(\nnuGetPackage,\nwarnings);\n@@ -63,6 +70,34 @@ public async Task<PackageValidationResult> ValidateBeforeGeneratePackageAsync(Pa\nreturn PackageValidationResult.AcceptedWithWarnings(warnings);\n}\n+ private async Task<PackageValidationResult> CheckPackageEntryCountAsync(\n+ PackageArchiveReader nuGetPackage,\n+ List<string> warnings)\n+ {\n+ if (!_config.RejectPackagesWithTooManyPackageEntries)\n+ {\n+ return null;\n+ }\n+\n+ const ushort maxPackageEntryCount = ushort.MaxValue - 1;\n+\n+ var packageEntryCount = nuGetPackage.GetFiles().Count();\n+\n+ if (await nuGetPackage.IsSignedAsync(CancellationToken.None))\n+ {\n+ if (packageEntryCount > maxPackageEntryCount)\n+ {\n+ return PackageValidationResult.Invalid(Strings.UploadPackage_PackageContainsTooManyEntries);\n+ }\n+ }\n+ else if (packageEntryCount >= maxPackageEntryCount)\n+ {\n+ return PackageValidationResult.Invalid(Strings.UploadPackage_PackageContainsTooManyEntries);\n+ }\n+\n+ return null;\n+ }\n+\n/// <summary>\n/// Validate repository metadata:\n/// 1. If the type is \"git\" - allow the URL scheme \"git://\" or \"https://\". We will translate \"git://\" to \"https://\" at display time for known domains.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -2219,6 +2219,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package contains too many files and/or folders..\n+ /// </summary>\n+ public static string UploadPackage_PackageContainsTooManyEntries {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_PackageContainsTooManyEntries\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to This package must be signed with a registered certificate..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -986,4 +986,7 @@ Policy violations: {0}</value>\n<data name=\"WarningNotHttpsRepositoryUrlScheme\" xml:space=\"preserve\">\n<value>Repository URL scheme should be 'https'. The provided URL will not be displayed.</value>\n</data>\n+ <data name=\"UploadPackage_PackageContainsTooManyEntries\" xml:space=\"preserve\">\n+ <value>The package contains too many files and/or folders.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Gallery.TrademarksUrl\" value=\"\"/>\n<add key=\"Gallery.EnforceDefaultSecurityPolicies\" value=\"false\"/>\n<add key=\"Gallery.RejectSignedPackagesWithNoRegisteredCertificate\" value=\"false\"/>\n+ <add key=\"Gallery.RejectPackagesWithTooManyPackageEntries\" value=\"false\"/>\n<!-- This is also the default so you can remove this setting if you really want. -->\n<!-- Set this to false if you want to disable search indexing in the background. -->\n<add key=\"Gallery.AutoUpdateSearchIndex\" value=\"true\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.IO;\n+using System.IO.Compression;\nusing System.Linq;\nusing System.Threading;\nusing System.Threading.Tasks;\n@@ -376,6 +377,69 @@ public async Task AggregatesWarnings()\nAssert.Equal(2, result.Warnings.Count());\n}\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task WithTooManyPackageEntries_WhenRejectPackagesWithTooManyPackageEntriesIsFalse_AcceptsPackage(bool isSigned)\n+ {\n+ var desiredTotalEntryCount = isSigned ? ushort.MaxValue : ushort.MaxValue - 1;\n+\n+ _nuGetPackage = GeneratePackage(isSigned: isSigned, desiredTotalEntryCount: desiredTotalEntryCount);\n+ _config\n+ .Setup(x => x.RejectPackagesWithTooManyPackageEntries)\n+ .Returns(false);\n+\n+ var result = await _target.ValidateBeforeGeneratePackageAsync(\n+ _nuGetPackage.Object,\n+ GetPackageMetadata(_nuGetPackage));\n+\n+ Assert.Equal(PackageValidationResultType.Accepted, result.Type);\n+ Assert.Null(result.Message);\n+ Assert.Empty(result.Warnings);\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task WithTooManyPackageEntries_WhenRejectPackagesWithTooManyPackageEntriesIsTrue_RejectsPackage(bool isSigned)\n+ {\n+ var desiredTotalEntryCount = isSigned ? ushort.MaxValue : ushort.MaxValue - 1;\n+\n+ _nuGetPackage = GeneratePackage(isSigned: isSigned, desiredTotalEntryCount: desiredTotalEntryCount);\n+ _config\n+ .Setup(x => x.RejectPackagesWithTooManyPackageEntries)\n+ .Returns(true);\n+\n+ var result = await _target.ValidateBeforeGeneratePackageAsync(\n+ _nuGetPackage.Object,\n+ GetPackageMetadata(_nuGetPackage));\n+\n+ Assert.Equal(PackageValidationResultType.Invalid, result.Type);\n+ Assert.Equal(\"The package contains too many files and/or folders.\", result.Message);\n+ Assert.Empty(result.Warnings);\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task WithNotTooManyPackageEntries_WhenRejectPackagesWithTooManyPackageEntriesIsTrue_AcceptsPackage(bool isSigned)\n+ {\n+ var desiredTotalEntryCount = (isSigned ? ushort.MaxValue : ushort.MaxValue - 1) - 1;\n+\n+ _nuGetPackage = GeneratePackage(isSigned: isSigned, desiredTotalEntryCount: desiredTotalEntryCount);\n+ _config\n+ .Setup(x => x.RejectPackagesWithTooManyPackageEntries)\n+ .Returns(true);\n+\n+ var result = await _target.ValidateBeforeGeneratePackageAsync(\n+ _nuGetPackage.Object,\n+ GetPackageMetadata(_nuGetPackage));\n+\n+ Assert.Equal(PackageValidationResultType.Accepted, result.Type);\n+ Assert.Null(result.Message);\n+ Assert.Empty(result.Warnings);\n+ }\n+\nprivate PackageMetadata GetPackageMetadata(Mock<TestPackageReader> mockPackage)\n{\nreturn PackageMetadata.FromNuspecReader(mockPackage.Object.GetNuspecReader(), strict: true);\n@@ -934,13 +998,18 @@ public FactsBase()\n_config.Object);\n}\n- protected static Mock<TestPackageReader> GeneratePackage(string version = \"1.2.3-alpha.0\", RepositoryMetadata repositoryMetadata = null, bool isSigned = true)\n+ protected static Mock<TestPackageReader> GeneratePackage(\n+ string version = \"1.2.3-alpha.0\",\n+ RepositoryMetadata repositoryMetadata = null,\n+ bool isSigned = true,\n+ int? desiredTotalEntryCount = null)\n{\nreturn PackageServiceUtility.CreateNuGetPackage(\nid: \"theId\",\nversion: version,\nrepositoryMetadata: repositoryMetadata,\n- isSigned: isSigned);\n+ isSigned: isSigned,\n+ desiredTotalEntryCount: desiredTotalEntryCount);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestPackage.cs",
"new_path": "tests/NuGetGallery.Facts/TestPackage.cs",
"diff": "@@ -171,7 +171,8 @@ private static string WriteDependencies(IEnumerable<PackageDependencyGroup> pack\nIEnumerable<ClientPackageType> packageTypes = null,\nRepositoryMetadata repositoryMetadata = null,\nAction<ZipArchive> populatePackage = null,\n- bool isSymbolPackage = false)\n+ bool isSymbolPackage = false,\n+ int? desiredTotalEntryCount = null)\n{\nreturn CreateTestPackageStream(packageArchive =>\n{\n@@ -187,7 +188,7 @@ private static string WriteDependencies(IEnumerable<PackageDependencyGroup> pack\n{\npopulatePackage(packageArchive);\n}\n- });\n+ }, desiredTotalEntryCount);\n}\npublic static Stream CreateTestSymbolPackageStream(string id, string version, Action<ZipArchive> populatePackage = null)\n@@ -218,10 +219,10 @@ public static Stream CreateTestPackageStreamFromNuspec(string id, string nuspec,\n});\n}\n- public static Stream CreateTestPackageStream(Action<ZipArchive> populatePackage)\n+ public static Stream CreateTestPackageStream(Action<ZipArchive> populatePackage, int? desiredTotalEntryCount = null)\n{\nvar packageStream = new MemoryStream();\n- using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Create, true))\n+ using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Create, leaveOpen: true))\n{\nif (populatePackage != null)\n{\n@@ -229,6 +230,33 @@ public static Stream CreateTestPackageStream(Action<ZipArchive> populatePackage)\n}\n}\n+ if (desiredTotalEntryCount.HasValue)\n+ {\n+ int packageEntryCount;\n+\n+ using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Read, leaveOpen: true))\n+ {\n+ packageEntryCount = packageArchive.Entries.Count;\n+ }\n+\n+ if (desiredTotalEntryCount.Value < packageEntryCount)\n+ {\n+ throw new ArgumentException(\n+ $\"The desired count ({desiredTotalEntryCount.Value}) of package entries is less than the actual count ({packageEntryCount}) of package entries.\",\n+ nameof(desiredTotalEntryCount));\n+ }\n+\n+ using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Update, leaveOpen: true))\n+ {\n+ while (packageEntryCount < desiredTotalEntryCount.Value)\n+ {\n+ packageArchive.CreateEntry(Guid.NewGuid().ToString());\n+\n+ ++packageEntryCount;\n+ }\n+ }\n+ }\n+\npackageStream.Position = 0;\nreturn packageStream;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Gallery: enable blocking packages with too many package entries (#6358)
Progress on https://github.com/NuGet/NuGetGallery/issues/6357. |
455,794 | 29.08.2018 09:34:50 | 25,200 | 6739323df543a4b4ff1a50b9a259cf545f9fba30 | Fix PackageRef dependencies | [
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -94,7 +94,7 @@ Invoke-BuildStep 'Building solution' {\nInvoke-BuildStep 'Creating artifacts' {\n$packageId = 'NuGetGallery.Core'+$PackageSuffix\n- New-Package (Join-Path $PSScriptRoot \"src\\NuGetGallery.Core\\NuGetGallery.Core.csproj\") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId $packageId `\n+ New-ProjectPackage (Join-Path $PSScriptRoot \"src\\NuGetGallery.Core\\NuGetGallery.Core.csproj\") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId $packageId `\n-ev +BuildErrors\n}\n"
},
{
"change_type": "DELETE",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.nuspec",
"new_path": null,
"diff": "-<?xml version=\"1.0\"?>\n-<package >\n- <metadata>\n- <id>$PackageId$</id>\n- <version>$version$</version>\n- <title>$title$</title>\n- <authors>$author$</authors>\n- <owners>$author$</owners>\n- <licenseUrl>https://github.com/NuGet/NuGetGallery/blob/master/LICENSE.txt</licenseUrl>\n- <projectUrl>https://github.com/NuGet/NuGetGallery</projectUrl>\n- <requireLicenseAcceptance>false</requireLicenseAcceptance>\n- <description>$description$</description>\n- </metadata>\n-</package>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Reference Include=\"System.IO.Compression\" />\n<Reference Include=\"System.Net\" />\n<Reference Include=\"System.Net.Http\" />\n- <Reference Include=\"System.IO.Compression\" />\n- <Reference Include=\"System.Net\" />\n- <Reference Include=\"System.Net.Http\" />\n<Reference Include=\"System.Net.Http.WebRequest\" />\n<Reference Include=\"System.Runtime.Serialization\" />\n<Reference Include=\"System.ServiceModel\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix PackageRef dependencies |
455,751 | 30.08.2018 13:02:24 | 25,200 | 153feff81b6622fc366336f36e74eb02ea919ccd | Add max-age for the symbol packages | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -569,12 +569,12 @@ private static string GetCacheControl(string folderName)\nswitch (folderName)\n{\ncase CoreConstants.PackagesFolderName:\n+ case CoreConstants.SymbolPackagesFolderName:\nreturn CoreConstants.DefaultCacheControl;\ncase CoreConstants.PackageBackupsFolderName:\ncase CoreConstants.UploadsFolderName:\ncase CoreConstants.ValidationFolderName:\n- case CoreConstants.SymbolPackagesFolderName:\ncase CoreConstants.SymbolPackageBackupsFolderName:\ncase CoreConstants.DownloadsFolderName:\ncase CoreConstants.PackageReadMesFolderName:\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -53,6 +53,7 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)\nnew object[] { CoreConstants.PackageBackupsFolderName, true, CoreConstants.PackageContentType },\nnew object[] { CoreConstants.PackageReadMesFolderName, false, CoreConstants.TextContentType },\nnew object[] { CoreConstants.PackagesFolderName, true, CoreConstants.PackageContentType },\n+ new object[] { CoreConstants.SymbolPackagesFolderName, true, CoreConstants.PackageContentType },\nnew object[] { CoreConstants.UploadsFolderName, false, CoreConstants.PackageContentType },\nnew object[] { CoreConstants.UserCertificatesFolderName, false, CoreConstants.CertificateContentType },\nnew object[] { CoreConstants.ValidationFolderName, false, CoreConstants.PackageContentType }\n@@ -535,7 +536,7 @@ public async Task WillSetTheBlobControlCacheOnPackagesFolder(string folderName)\nfakeBlob.Verify();\n- if (folderName == CoreConstants.PackagesFolderName)\n+ if (folderName == CoreConstants.PackagesFolderName || folderName == CoreConstants.SymbolPackagesFolderName)\n{\nAssert.Equal(CoreConstants.DefaultCacheControl, fakeBlob.Object.Properties.CacheControl);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add max-age for the symbol packages (#6343) |
455,772 | 30.08.2018 15:59:48 | 25,200 | 251eda43b76bf69ba212c9ff03f86106ba9cfe91 | Fix repo url validation message UI | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"diff": "<script type=\"text/html\" id=\"verify-metadata-template\">\n<div class=\"collapse in\" id=\"verify-package-section\">\n<div data-bind=\"if: $data\">\n- <!-- ko if: $data.Warnings -->\n+ <!-- ko if: $data.Warnings && $data.Warnings.length > 0 -->\[email protected](\n@<span>\nWe found the following issue(s):\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix repo url validation message UI (#6366) |
455,776 | 30.08.2018 16:03:11 | 25,200 | 418bb650e90d1d1b3f82403e182bb67591f4d594 | tablist is not under a menubar | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "@ViewHelpers.ImageFallback(Url.Absolute(\"~/Content/gallery/img/logo-header-94x29.png\")) />\n</a>\n</div>\n- <div id=\"navbar\" class=\"navbar-collapse collapse\" role=\"menubar\">\n+ <div id=\"navbar\" class=\"navbar-collapse collapse\">\n<ul class=\"nav navbar-nav\" role=\"tablist\">\n@DisplayNavigationItem(\"Packages\", Url.PackageList())\n@DisplayNavigationItem(\"Upload\", Url.UploadPackage())\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | tablist is not under a menubar (#6345) |
455,776 | 30.08.2018 17:01:14 | 25,200 | f938ec741caf20d1e56c5091b1bbfc552a59b40e | Log search service exceptions encountered during retry | [
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/Client/RetryingHttpClientWrapper.cs",
"new_path": "src/NuGet.Services.Search.Client/Client/RetryingHttpClientWrapper.cs",
"diff": "@@ -15,6 +15,7 @@ public sealed class RetryingHttpClientWrapper\n{\nprivate readonly HttpClient _httpClient;\nprivate readonly IEndpointHealthIndicatorStore _endpointHealthIndicatorStore;\n+ private readonly Action<Exception> _onException;\nprivate static readonly int PeriodToDelayAlternateRequest = 3000;\nprivate static readonly IComparer<int> HealthComparer;\n@@ -24,16 +25,16 @@ static RetryingHttpClientWrapper()\nHealthComparer = new WeightedRandomComparer();\n}\n- public RetryingHttpClientWrapper(HttpClient httpClient)\n- : this (httpClient, new BaseUrlHealthIndicatorStore(new NullHealthIndicatorLogger()))\n+ public RetryingHttpClientWrapper(HttpClient httpClient, Action<Exception> onException)\n+ : this (httpClient, new BaseUrlHealthIndicatorStore(new NullHealthIndicatorLogger()), onException)\n{\n- _httpClient = httpClient;\n}\n- public RetryingHttpClientWrapper(HttpClient httpClient, IEndpointHealthIndicatorStore endpointHealthIndicatorStore)\n+ public RetryingHttpClientWrapper(HttpClient httpClient, IEndpointHealthIndicatorStore endpointHealthIndicatorStore, Action<Exception> onException)\n{\n- _httpClient = httpClient;\n- _endpointHealthIndicatorStore = endpointHealthIndicatorStore;\n+ _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));\n+ _endpointHealthIndicatorStore = endpointHealthIndicatorStore ?? throw new ArgumentNullException(nameof(endpointHealthIndicatorStore));\n+ _onException = onException ?? throw new ArgumentNullException(nameof(onException));\n}\npublic async Task<string> GetStringAsync(IEnumerable<Uri> endpoints)\n@@ -91,6 +92,11 @@ private async Task<HttpResponseMessage> GetWithRetry(IEnumerable<Uri> endpoints,\ncancellationTokenSource.Cancel(false);\n}\n+ foreach (var exception in exceptions)\n+ {\n+ _onException(exception);\n+ }\n+\nif (completedTask.IsFaulted || completedTask.IsCanceled)\n{\nvar exceptionsToThrow = exceptions.Where(e => !(e is TaskCanceledException || e.InnerException is TaskCanceledException)).ToList();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/Client/SearchClient.cs",
"new_path": "src/NuGet.Services.Search.Client/Client/SearchClient.cs",
"diff": "@@ -24,8 +24,8 @@ public class SearchClient\n/// </summary>\n/// <param name=\"baseUri\">The URL to the root of the service</param>\n/// <param name=\"handlers\">Handlers to apply to the request in order from first to last</param>\n- public SearchClient(Uri baseUri, params DelegatingHandler[] handlers)\n- : this(baseUri, \"SearchGalleryQueryService/3.0.0-rc\", null, new BaseUrlHealthIndicatorStore(new NullHealthIndicatorLogger()), handlers)\n+ public SearchClient(Uri baseUri, Action<Exception> onException, params DelegatingHandler[] handlers)\n+ : this(baseUri, \"SearchGalleryQueryService/3.0.0-rc\", null, new BaseUrlHealthIndicatorStore(new NullHealthIndicatorLogger()), onException, handlers)\n{\n}\n@@ -37,7 +37,7 @@ public SearchClient(Uri baseUri, params DelegatingHandler[] handlers)\n/// <param name=\"credentials\">The credentials to connect to the service with</param>\n/// <param name=\"healthIndicatorStore\">Health indicator store</param>\n/// <param name=\"handlers\">Handlers to apply to the request in order from first to last</param>\n- public SearchClient(Uri baseUri, string resourceType, ICredentials credentials, IEndpointHealthIndicatorStore healthIndicatorStore, params DelegatingHandler[] handlers)\n+ public SearchClient(Uri baseUri, string resourceType, ICredentials credentials, IEndpointHealthIndicatorStore healthIndicatorStore, Action<Exception> onException, params DelegatingHandler[] handlers)\n{\n_resourceType = resourceType;\n@@ -57,7 +57,7 @@ public SearchClient(Uri baseUri, string resourceType, ICredentials credentials,\n_httpClient = new HttpClient(handler, disposeHandler: true);\n- _retryingHttpClientWrapper = new RetryingHttpClientWrapper(_httpClient, healthIndicatorStore);\n+ _retryingHttpClientWrapper = new RetryingHttpClientWrapper(_httpClient, healthIndicatorStore, onException);\n_discoveryClient = new ServiceDiscoveryClient(_httpClient, baseUri);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"diff": "@@ -52,7 +52,14 @@ public ExternalSearchService()\nif (_client == null)\n{\n- _client = new SearchClient(ServiceUri, \"SearchGalleryQueryService/3.0.0-rc\", null, _healthIndicatorStore, new TracingHttpHandler(Trace), new CorrelatingHttpClientHandler());\n+ _client = new SearchClient(\n+ ServiceUri,\n+ \"SearchGalleryQueryService/3.0.0-rc\",\n+ null,\n+ _healthIndicatorStore,\n+ QuietLog.LogHandledException,\n+ new TracingHttpHandler(Trace),\n+ new CorrelatingHttpClientHandler());\n}\n}\n@@ -90,7 +97,14 @@ public ExternalSearchService(IAppConfiguration config, IDiagnosticsService diagn\nif (_client == null)\n{\n- _client = new SearchClient(ServiceUri, config.SearchServiceResourceType, credentials, _healthIndicatorStore, new TracingHttpHandler(Trace), new CorrelatingHttpClientHandler());\n+ _client = new SearchClient(\n+ ServiceUri,\n+ config.SearchServiceResourceType,\n+ credentials,\n+ _healthIndicatorStore,\n+ QuietLog.LogHandledException,\n+ new TracingHttpHandler(Trace),\n+ new CorrelatingHttpClientHandler());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Queries/AutoCompleteServiceQuery.cs",
"new_path": "src/NuGetGallery/Queries/AutoCompleteServiceQuery.cs",
"diff": "@@ -28,7 +28,7 @@ public AutoCompleteServiceQuery(IAppConfiguration configuration)\n_serviceDiscoveryClient = new ServiceDiscoveryClient(configuration.ServiceDiscoveryUri);\n_autocompleteServiceResourceType = configuration.AutocompleteServiceResourceType;\n- _httpClient = new RetryingHttpClientWrapper(new HttpClient());\n+ _httpClient = new RetryingHttpClientWrapper(new HttpClient(), QuietLog.LogHandledException);\n}\npublic async Task<IEnumerable<string>> RunServiceQuery(\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/SearchClient/RetryingHttpClientWrapperFacts.cs",
"new_path": "tests/NuGetGallery.Facts/SearchClient/RetryingHttpClientWrapperFacts.cs",
"diff": "@@ -23,12 +23,12 @@ public class RetryingHttpClientWrapperFacts\nprivate RetryingHttpClientWrapper CreateWrapperClient(HttpMessageHandler handler)\n{\n- return new RetryingHttpClientWrapper(new HttpClient(handler));\n+ return new RetryingHttpClientWrapper(new HttpClient(handler), (exception) => { });\n}\nprivate RetryingHttpClientWrapper CreateWrapperClient()\n{\n- return new RetryingHttpClientWrapper(new HttpClient());\n+ return new RetryingHttpClientWrapper(new HttpClient(), (exception) => { });\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Log search service exceptions encountered during retry (#6232) |
455,736 | 04.09.2018 16:26:27 | 25,200 | 649303f65b80aae4d9c77dce15954a4b90fe10fa | Add tool to verify the clear-text of an API key | [
{
"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\\ReflowCommand.cs\" />\n+ <Compile Include=\"Commands\\VerifyApiKeyCommand.cs\" />\n<Compile Include=\"Program.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n</ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Program.cs",
"new_path": "src/GalleryTools/Program.cs",
"diff": "@@ -17,6 +17,7 @@ public static int Main(params string[] args)\ncommandLineApplication.Command(\"hash\", HashCommand.Configure);\ncommandLineApplication.Command(\"reflow\", ReflowCommand.Configure);\ncommandLineApplication.Command(\"fillrepodata\", BackfillRepositoryMetadataCommand.Configure);\n+ commandLineApplication.Command(\"verifyapikey\", VerifyApiKeyCommand.Configure);\ntry\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add tool to verify the clear-text of an API key (#6383) |
455,736 | 05.09.2018 10:29:56 | 25,200 | a2e50dbb7b410fe7ef10e882c7674e1fa90b4d4a | Fix inconsistent messaging around expired legacy API key
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ImportReadMe.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ImportReadMe.cshtml",
"diff": "@ReadMePanel(\n@<div class=\"form-group editable\">\n<input type=\"url\" data-bind=\"value: Edit.ReadMe.SourceUrl\" name=\"Edit.ReadMe.SourceUrl\" class=\"form-control\" id=\"ReadMeUrlInput\"\n- placeholder=\"https://raw.githubusercontent.com/*.md\" aria-label=\"Enter documentation.md url\" />\n+ placeholder=\"https://raw.githubusercontent.com/*.md\" aria-label=\"Enter documentation.md URL\" />\n<label id=\"ReadMeURLLabel\" class=\"input-group-btn\"></label>\n</div>,\n\"readme-url\", active: false)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<ul class=\"list-inline icon-details\" role=\"presentation\">\n<li>\n<i class=\"ms-Icon ms-Icon--Stopwatch\" aria-hidden=\"true\"></i>\n- <!-- ko if: Expires -->\n<!-- ko if: HasExpired -->\nExpired\n<!-- /ko -->\n<!-- ko ifnot: HasExpired -->\n+ <!-- ko if: Expires -->\nExpires <span data-bind=\"text: moment(Expires()).fromNow()\"></span>\n<!-- /ko -->\n- <!-- /ko -->\n<!-- ko ifnot: Expires -->\nNever expires\n+ @if (Config.Current.ExpirationInDaysForApiKeyV1 > 0)\n+ {\n+ <text>\n+ (<a href=\"https://aka.ms/nugetlegacyapikeys\">if used every\n+ @Config.Current.ExpirationInDaysForApiKeyV1\n+ day@(Config.Current.ExpirationInDaysForApiKeyV1 != 1 ? \"s\" : string.Empty)</a>)\n+ </text>\n+ }\n+ <!-- /ko -->\n<!-- /ko -->\n</li>\n<li>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/PasswordSent.cshtml",
"new_path": "src/NuGetGallery/Views/Users/PasswordSent.cshtml",
"diff": "<h1>Password Reset Sent</h1>\n<p>\n- We've sent you an email containing a temporary url that will allow you to reset your NuGet.org\n+ We've sent you an email containing a temporary URL that will allow you to reset your NuGet.org\naccount password for the next @if (@ViewBag.Expiration == 1)\n{\n<text>hour.</text>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix inconsistent messaging around expired legacy API key (#6384)
Address https://github.com/NuGet/NuGetGallery/issues/6318 |
455,736 | 05.09.2018 11:16:14 | 25,200 | 2665e7ffdc3d28981d891cef030688d8716dbcc6 | Add BlockSearchEngineIndexing to allow site-wide search engine blocking
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -342,5 +342,7 @@ public string ExternalBrandingMessage\npublic bool RejectSignedPackagesWithNoRegisteredCertificate { get; set; }\npublic bool RejectPackagesWithTooManyPackageEntries { get; set; }\n+\n+ public bool BlockSearchEngineIndexing { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -344,5 +344,10 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// Whether or not to synchronously reject packages on push/upload that have too many package entries.\n/// </summary>\nbool RejectPackagesWithTooManyPackageEntries { get; set; }\n+\n+ /// <summary>\n+ /// Whether or not to block search engines from indexing the web pages using the \"noindex\" meta tag.\n+ /// </summary>\n+ bool BlockSearchEngineIndexing { get; set; }\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": "@{\nViewBag.Title = Model.Id + \" \" + Model.Version;\nViewBag.Tab = \"Packages\";\n+ ViewBag.BlockSearchEngineIndexing = !Model.Listed || !Model.Available;\nvar absolutePackageUrl = Url.Absolute(Url.Package(Model.Id));\n<meta property=\"og:determiner\" content=\"a\" />\n<meta property=\"og:image\" content=\"@(PackageHelper.ShouldRenderUrl(Model.IconUrl) ? Model.IconUrl : Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\"))\" />\n}\n-@section Meta {\n- @if (!Model.Listed || !Model.Available)\n- {\n- <meta name=\"robots\" content=\"noindex\">\n- }\n-}\n@helper VersionListDivider(int rowCount, bool versionsExpanded)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Layout.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Layout.cshtml",
"diff": "<meta charset=\"utf-8\" />\n<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n+ @if (Config.Current.BlockSearchEngineIndexing || ViewBag.BlockSearchEngineIndexing == true)\n+ {\n+ <meta name=\"robots\" content=\"noindex\">\n+ }\n@RenderSection(\"SocialMeta\", required: false)\n@RenderSection(\"Meta\", required: false)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Gallery.EnforceDefaultSecurityPolicies\" value=\"false\"/>\n<add key=\"Gallery.RejectSignedPackagesWithNoRegisteredCertificate\" value=\"false\"/>\n<add key=\"Gallery.RejectPackagesWithTooManyPackageEntries\" value=\"false\"/>\n+ <add key=\"Gallery.BlockSearchEngineIndexing\" value=\"false\"/>\n<!-- This is also the default so you can remove this setting if you really want. -->\n<!-- Set this to false if you want to disable search indexing in the background. -->\n<add key=\"Gallery.AutoUpdateSearchIndex\" value=\"true\"/>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add BlockSearchEngineIndexing to allow site-wide search engine blocking (#6385)
Progress on https://github.com/NuGet/NuGetGallery/issues/6381 |
455,776 | 06.09.2018 16:08:59 | 25,200 | 77c0b164f4eaea66e796888286bb00e81e55eaae | ApiController actions should not throw exceptions when called with an unparseable version | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -1039,14 +1039,9 @@ public virtual async Task<ActionResult> GetStatsDownloads(int? count)\nreturn new HttpStatusCodeResult(HttpStatusCode.NotFound);\n}\n- private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluation(ApiScopeEvaluationResult evaluationResult, string id, string version)\n+ private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluation(ApiScopeEvaluationResult evaluationResult, string id, string versionString)\n{\n- return GetHttpResultFromFailedApiScopeEvaluation(evaluationResult, id, NuGetVersion.Parse(version));\n- }\n-\n- private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluation(ApiScopeEvaluationResult result, string id, NuGetVersion version)\n- {\n- return GetHttpResultFromFailedApiScopeEvaluationHelper(result, id, version, HttpStatusCode.Forbidden);\n+ return GetHttpResultFromFailedApiScopeEvaluationHelper(evaluationResult, id, versionString, HttpStatusCode.Forbidden);\n}\n/// <remarks>\n@@ -1055,10 +1050,10 @@ private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluation(A\n/// </remarks>\nprivate HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluationForPush(ApiScopeEvaluationResult result, string id, NuGetVersion version)\n{\n- return GetHttpResultFromFailedApiScopeEvaluationHelper(result, id, version, HttpStatusCode.Unauthorized);\n+ return GetHttpResultFromFailedApiScopeEvaluationHelper(result, id, version.ToNormalizedString(), HttpStatusCode.Unauthorized);\n}\n- private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluationHelper(ApiScopeEvaluationResult result, string id, NuGetVersion version, HttpStatusCode statusCodeOnFailure)\n+ private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluationHelper(ApiScopeEvaluationResult result, string id, string versionString, HttpStatusCode statusCodeOnFailure)\n{\nif (result.IsSuccessful())\n{\n@@ -1068,7 +1063,7 @@ private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluationHe\nif (result.PermissionsCheckResult == PermissionsCheckResult.ReservedNamespaceFailure)\n{\n// We return a special error code for reserved namespace failures.\n- TelemetryService.TrackPackagePushNamespaceConflictEvent(id, version.ToNormalizedString(), GetCurrentUser(), User.Identity);\n+ TelemetryService.TrackPackagePushNamespaceConflictEvent(id, versionString, GetCurrentUser(), User.Identity);\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.Conflict, Strings.UploadPackage_IdNamespaceConflict);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -1235,12 +1235,13 @@ public async Task WillNotCreateAPackageIfScopesInvalidWithExistingRegistration(A\n{\n// Arrange\nvar packageId = \"theId\";\n+ var packageVersion = \"1.0.42\";\nvar packageRegistration = new PackageRegistration { Id = packageId };\npackageRegistration.Id = packageId;\nvar package = new Package\n{\nPackageRegistration = packageRegistration,\n- Version = \"1.0.42\"\n+ Version = packageVersion\n};\npackageRegistration.Packages.Add(package);\n@@ -1252,7 +1253,7 @@ public async Task WillNotCreateAPackageIfScopesInvalidWithExistingRegistration(A\nvar currentUser = fakes.User;\ncontroller.SetCurrentUser(currentUser);\n- var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, \"1.0.42\");\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, packageVersion);\ncontroller.SetupPackageFromInputStream(nuGetPackage);\ncontroller.MockApiScopeEvaluator\n@@ -1627,11 +1628,13 @@ public async Task WillThrowIfAPackageWithTheIdAndNuGetVersionDoesNotExist()\ncontroller.MockPackageService.Verify(x => x.MarkPackageUnlistedAsync(It.IsAny<Package>(), true), Times.Never());\n}\n- public static IEnumerable<object[]> WillNotUnlistThePackageIfScopesInvalid_Data => InvalidScopes_Data;\n+ public static IEnumerable<object[]> WillNotUnlistThePackageIfScopesInvalid_Data => MemberDataHelper.Combine(\n+ InvalidScopes_Data,\n+ MemberDataHelper.AsDataSet(\"1.0.42\", \"invalidPackageVersion\"));\n[Theory]\n[MemberData(nameof(WillNotUnlistThePackageIfScopesInvalid_Data))]\n- public async Task WillNotUnlistThePackageIfScopesInvalid(ApiScopeEvaluationResult evaluationResult, HttpStatusCode expectedStatusCode, string description)\n+ public async Task WillNotUnlistThePackageIfScopesInvalid(ApiScopeEvaluationResult evaluationResult, HttpStatusCode expectedStatusCode, string description, string version)\n{\nvar fakes = Get<Fakes>();\nvar currentUser = fakes.User;\n@@ -1639,7 +1642,8 @@ public async Task WillNotUnlistThePackageIfScopesInvalid(ApiScopeEvaluationResul\nvar id = \"theId\";\nvar package = new Package\n{\n- PackageRegistration = new PackageRegistration { Id = id }\n+ PackageRegistration = new PackageRegistration { Id = id },\n+ Version = version\n};\nvar controller = new TestableApiController(GetConfigurationService());\n@@ -1656,7 +1660,7 @@ public async Task WillNotUnlistThePackageIfScopesInvalid(ApiScopeEvaluationResul\nNuGetScopes.PackageUnlist))\n.Returns(evaluationResult);\n- var result = await controller.DeletePackage(\"theId\", \"1.0.42\");\n+ var result = await controller.DeletePackage(id, version);\nResultAssert.IsStatusCode(\nresult,\n@@ -2046,11 +2050,13 @@ public async Task WillThrowIfAPackageWithTheIdAndNuGetVersionDoesNotExist()\ncontroller.MockPackageService.Verify(x => x.MarkPackageListedAsync(It.IsAny<Package>(), It.IsAny<bool>()), Times.Never());\n}\n- public static IEnumerable<object[]> WillListThePackageIfScopesInvalid_Data => InvalidScopes_Data;\n+ public static IEnumerable<object[]> WillNotListThePackageIfScopesInvalid_Data => MemberDataHelper.Combine(\n+ InvalidScopes_Data,\n+ MemberDataHelper.AsDataSet(\"1.0.42\", \"invalidPackageVersion\"));\n[Theory]\n- [MemberData(nameof(WillListThePackageIfScopesInvalid_Data))]\n- public async Task WillListThePackageIfScopesInvalid(ApiScopeEvaluationResult evaluationResult, HttpStatusCode expectedStatusCode, string description)\n+ [MemberData(nameof(WillNotListThePackageIfScopesInvalid_Data))]\n+ public async Task WillNotListThePackageIfScopesInvalid(ApiScopeEvaluationResult evaluationResult, HttpStatusCode expectedStatusCode, string description, string version)\n{\nvar fakes = Get<Fakes>();\nvar currentUser = fakes.User;\n@@ -2058,7 +2064,8 @@ public async Task WillListThePackageIfScopesInvalid(ApiScopeEvaluationResult eva\nvar id = \"theId\";\nvar package = new Package\n{\n- PackageRegistration = new PackageRegistration { Id = id }\n+ PackageRegistration = new PackageRegistration { Id = id },\n+ Version = version\n};\nvar controller = new TestableApiController(GetConfigurationService());\n@@ -2075,7 +2082,7 @@ public async Task WillListThePackageIfScopesInvalid(ApiScopeEvaluationResult eva\nNuGetScopes.PackageUnlist))\n.Returns(evaluationResult);\n- var result = await controller.PublishPackage(\"theId\", \"1.0.42\");\n+ var result = await controller.PublishPackage(id, version);\nResultAssert.IsStatusCode(\nresult,\n@@ -2352,14 +2359,21 @@ public async Task Returns404IfPackageDoesNotExist(string credentialType)\nIt.IsAny<User>(), controller.OwinContext.Request.User.Identity, 404), Times.Once);\n}\n+ public static IEnumerable<object[]> Returns403IfScopeDoesNotMatch_PackageVersion_Data =>\n+ MemberDataHelper.AsDataSet(\"1.0.42\", \"invalidVersionString\");\n+\npublic static IEnumerable<object[]> Returns403IfScopeDoesNotMatch_Data => InvalidScopes_Data;\npublic static IEnumerable<object[]> Returns403IfScopeDoesNotMatch_NotVerify_Data\n{\nget\n{\n- var notVerifyData = CredentialTypesExceptVerifyV1.Select(t => new object[] { t, new[] { NuGetScopes.PackagePush, NuGetScopes.PackagePushVersion } });\n- return MemberDataHelper.Combine(notVerifyData, Returns403IfScopeDoesNotMatch_Data);\n+ var notVerifyData = CredentialTypesExceptVerifyV1.Select(\n+ t => MemberDataHelper.AsData(t, new[] { NuGetScopes.PackagePush, NuGetScopes.PackagePushVersion }));\n+ return MemberDataHelper.Combine(\n+ notVerifyData,\n+ Returns403IfScopeDoesNotMatch_Data,\n+ Returns403IfScopeDoesNotMatch_PackageVersion_Data);\n}\n}\n@@ -2367,16 +2381,20 @@ public static IEnumerable<object[]> Returns403IfScopeDoesNotMatch_Verify_Data\n{\nget\n{\n- return MemberDataHelper.Combine(new[] { new object[] { CredentialTypes.ApiKey.VerifyV1, new[] { NuGetScopes.PackageVerify } } }, Returns403IfScopeDoesNotMatch_Data);\n+ return MemberDataHelper.Combine(\n+ new[] { new object[] { CredentialTypes.ApiKey.VerifyV1, new[] { NuGetScopes.PackageVerify } } },\n+ Returns403IfScopeDoesNotMatch_Data,\n+ Returns403IfScopeDoesNotMatch_PackageVersion_Data);\n}\n}\n[Theory]\n[MemberData(nameof(Returns403IfScopeDoesNotMatch_NotVerify_Data))]\n[MemberData(nameof(Returns403IfScopeDoesNotMatch_Verify_Data))]\n- public async Task Returns403IfScopeDoesNotMatch(string credentialType, string[] expectedRequestedActions, ApiScopeEvaluationResult apiScopeEvaluationResult, HttpStatusCode expectedStatusCode, string description)\n+ public async Task Returns403IfScopeDoesNotMatch(string credentialType, string[] expectedRequestedActions, ApiScopeEvaluationResult apiScopeEvaluationResult, HttpStatusCode expectedStatusCode, string description, string packageVersion)\n{\n// Arrange\n+ PackageVersion = packageVersion;\nvar package = new Package\n{\nPackageRegistration = new PackageRegistration() { Id = PackageId },\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/MemberDataHelper.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/MemberDataHelper.cs",
"diff": "@@ -18,13 +18,25 @@ public static IEnumerable<object[]> AsDataSet(params object[] dataSet)\nreturn dataSet.Select(d => new[] { d });\n}\n- public static IEnumerable<object[]> Combine(IEnumerable<object[]> firstDataSet, IEnumerable<object[]> secondDataSet)\n+ public static IEnumerable<object[]> Combine(params IEnumerable<object[]>[] dataSets)\n{\n+ if (!dataSets.Any())\n+ {\n+ yield break;\n+ }\n+\n+ var firstDataSet = dataSets.First();\n+ var lastDataSet = Combine(dataSets.Skip(1).ToArray()).ToArray();\nforeach (var firstData in firstDataSet)\n{\n- foreach (var secondData in secondDataSet)\n+ foreach (var lastData in lastDataSet)\n+ {\n+ yield return firstData.Concat(lastData).ToArray();\n+ }\n+\n+ if (!lastDataSet.Any())\n{\n- yield return firstData.Concat(secondData).ToArray();\n+ yield return firstData;\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | ApiController actions should not throw exceptions when called with an unparseable version (#6089) |
455,737 | 06.09.2018 17:09:13 | 25,200 | 5fd0ffdda2a554907d1728b34b58737d76277ef3 | update strongname package references. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<EmbeddedResource Include=\"Infrastructure\\MigrateUserToOrganization.sql\" />\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"AnglicanGeek.MarkdownMailer.StrongName\">\n+ <PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n</PackageReference>\n- <PackageReference Include=\"elmah.corelibrary.strongname\">\n+ <PackageReference Include=\"NuGet.StrongName.elmah.corelibrary\">\n<Version>1.2.2</Version>\n</PackageReference>\n<PackageReference Include=\"EntityFramework\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "</ProjectReference>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"AnglicanGeek.MarkdownMailer.StrongName\">\n+ <PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"Autofac\">\n<PackageReference Include=\"d3\">\n<Version>5.4.0</Version>\n</PackageReference>\n- <PackageReference Include=\"DynamicData.EFCodeFirstProvider.StrongName\">\n+ <PackageReference Include=\"NuGet.StrongName.DynamicData.EFCodeFirstProvider\">\n<Version>0.3.0</Version>\n</PackageReference>\n- <PackageReference Include=\"elmah.corelibrary.strongname\">\n+ <PackageReference Include=\"NuGet.StrongName.elmah.corelibrary\">\n<Version>1.2.2</Version>\n</PackageReference>\n- <PackageReference Include=\"elmah.sqlserver.strongname\">\n+ <PackageReference Include=\"NuGet.StrongName.elmah.sqlserver\">\n<Version>1.2.2</Version>\n</PackageReference>\n- <PackageReference Include=\"elmah.strongname\">\n+ <PackageReference Include=\"NuGet.StrongName.elmah\">\n<Version>1.2.2</Version>\n</PackageReference>\n<PackageReference Include=\"EntityFramework\">\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n</PackageReference>\n- <PackageReference Include=\"QueryInterceptor.StrongName\">\n+ <PackageReference Include=\"NuGet.StrongName.QueryInterceptor\">\n<Version>0.1.4237.2400</Version>\n</PackageReference>\n<PackageReference Include=\"RouteMagic\">\n<PackageReference Include=\"System.Net.Http\">\n<Version>4.3.1</Version>\n</PackageReference>\n- <PackageReference Include=\"WebActivator.StrongName\">\n+ <PackageReference Include=\"NuGet.StrongName.WebActivator\">\n<Version>1.4.4</Version>\n</PackageReference>\n<PackageReference Include=\"WebActivatorEx\">\n<Version>2.0.6</Version>\n</PackageReference>\n- <PackageReference Include=\"WebBackgrounder.EntityFramework.StrongName\">\n+ <PackageReference Include=\"NuGet.StrongName.WebBackgrounder.EntityFramework\">\n<Version>0.1.0</Version>\n</PackageReference>\n- <PackageReference Include=\"WebBackgrounder.StrongName\">\n+ <PackageReference Include=\"NuGet.StrongName.WebBackgrounder\">\n<Version>0.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"WindowsAzure.Caching\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | update strongname package references. |
455,759 | 07.09.2018 19:20:40 | -7,200 | c4ad812356ab283655015db19f14e3494d5cefa8 | Add telemetry for auto-add package owner feature | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/PackageSecurityPolicyEvaluationContext.cs",
"new_path": "src/NuGetGallery/Security/PackageSecurityPolicyEvaluationContext.cs",
"diff": "@@ -12,6 +12,7 @@ public class PackageSecurityPolicyEvaluationContext : UserSecurityPolicyEvaluati\npublic PackageSecurityPolicyEvaluationContext(\nIUserService userService,\nIPackageOwnershipManagementService packageOwnershipManagementService,\n+ ITelemetryService telemetryService,\nIEnumerable<UserSecurityPolicy> policies,\nPackage package,\nHttpContextBase httpContext)\n@@ -19,12 +20,14 @@ public class PackageSecurityPolicyEvaluationContext : UserSecurityPolicyEvaluati\n{\nPackage = package ?? throw new ArgumentNullException(nameof(package));\nUserService = userService ?? throw new ArgumentNullException(nameof(userService));\n+ TelemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\nPackageOwnershipManagementService = packageOwnershipManagementService ?? throw new ArgumentNullException(nameof(packageOwnershipManagementService));\n}\npublic PackageSecurityPolicyEvaluationContext(\nIUserService userService,\nIPackageOwnershipManagementService packageOwnershipManagementService,\n+ ITelemetryService telemetryService,\nIEnumerable<UserSecurityPolicy> policies,\nPackage package,\nUser sourceAccount,\n@@ -34,6 +37,7 @@ public class PackageSecurityPolicyEvaluationContext : UserSecurityPolicyEvaluati\n{\nPackage = package ?? throw new ArgumentNullException(nameof(package));\nUserService = userService ?? throw new ArgumentNullException(nameof(userService));\n+ TelemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\nPackageOwnershipManagementService = packageOwnershipManagementService ?? throw new ArgumentNullException(nameof(packageOwnershipManagementService));\n}\n@@ -44,6 +48,8 @@ public class PackageSecurityPolicyEvaluationContext : UserSecurityPolicyEvaluati\npublic IUserService UserService { get; }\n+ public ITelemetryService TelemetryService { get; }\n+\npublic IPackageOwnershipManagementService PackageOwnershipManagementService { get; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/RequirePackageMetadataCompliancePolicy.cs",
"new_path": "src/NuGetGallery/Security/RequirePackageMetadataCompliancePolicy.cs",
"diff": "@@ -49,6 +49,11 @@ public override async Task<SecurityPolicyResult> EvaluateAsync(PackageSecurityPo\n// Evaluate package metadata validations\nif (!IsPackageMetadataCompliant(context.Package, state, out var complianceFailures))\n{\n+ context.TelemetryService.TrackPackageMetadataComplianceError(\n+ context.Package.Id,\n+ context.Package.NormalizedVersion,\n+ complianceFailures);\n+\n// Package policy not met.\nreturn SecurityPolicyResult.CreateErrorResult(\nstring.Format(\n@@ -63,12 +68,21 @@ public override async Task<SecurityPolicyResult> EvaluateAsync(PackageSecurityPo\n// This will also mark the package as verified if the prefix has been reserved by the co-owner.\n// The entities context is committed later as a single atomic transaction (see PackageUploadService).\nawait context.PackageOwnershipManagementService.AddPackageOwnerAsync(context.Package.PackageRegistration, requiredCoOwner, commitChanges: false);\n+\n+ context.TelemetryService.TrackPackageOwnershipAutomaticallyAdded(\n+ context.Package.Id,\n+ context.Package.NormalizedVersion);\n}\n// If the PackageRegistration is not marked as verified,\n// the account pushing the package has not registered the prefix yet.\nif (!context.Package.PackageRegistration.IsVerified)\n{\n+ context.TelemetryService.TrackPackageMetadataComplianceWarning(\n+ context.Package.Id,\n+ context.Package.NormalizedVersion,\n+ complianceWarnings: new[] { Strings.SecurityPolicy_RequirePackagePrefixReserved });\n+\nreturn SecurityPolicyResult.CreateWarningResult(Strings.SecurityPolicy_RequirePackagePrefixReserved);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"new_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"diff": "@@ -32,6 +32,7 @@ private static Lazy<IEnumerable<PackageSecurityPolicyHandler>> _packageHandlers\nprivate readonly Lazy<IUserService> _userService;\nprivate readonly Lazy<IPackageOwnershipManagementService> _packageOwnershipManagementService;\n+ private readonly ITelemetryService _telemetryService;\nprotected IEntitiesContext EntitiesContext { get; set; }\n@@ -56,6 +57,7 @@ protected SecurityPolicyService()\nIAppConfiguration configuration,\nLazy<IUserService> userService,\nLazy<IPackageOwnershipManagementService> packageOwnershipManagementService,\n+ ITelemetryService telemetryService,\nMicrosoftTeamSubscription microsoftTeamSubscription = null)\n{\nEntitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n@@ -72,6 +74,7 @@ protected SecurityPolicyService()\nMicrosoftTeamSubscription = microsoftTeamSubscription;\n_packageOwnershipManagementService = packageOwnershipManagementService ?? throw new ArgumentNullException(nameof(packageOwnershipManagementService));\n_userService = userService ?? throw new ArgumentNullException(nameof(userService));\n+ _telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n}\n/// <summary>\n@@ -204,6 +207,7 @@ private IUserSecurityPolicySubscription GetSubscription(User user, string subscr\nvar context = new PackageSecurityPolicyEvaluationContext(\n_userService.Value,\n_packageOwnershipManagementService.Value,\n+ _telemetryService,\nfoundPolicies,\npackage,\nsourceAccount,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -51,6 +51,10 @@ public interface ITelemetryService\n/// </summary>\nvoid TrackUserPackageDeleteChecked(UserPackageDeleteEvent details, UserPackageDeleteOutcome outcome);\n+ void TrackPackageMetadataComplianceError(string packageId, string packageVersion, IEnumerable<string> complianceFailures);\n+\n+ void TrackPackageMetadataComplianceWarning(string packageId, string packageVersion, IEnumerable<string> complianceWarnings);\n+\n/// <summary>\n/// A telemetry event emitted when a user package delete is executed.\n/// </summary>\n@@ -64,6 +68,13 @@ public interface ITelemetryService\n/// or empty.</exception>\nvoid TrackCertificateAdded(string thumbprint);\n+ /// <summary>\n+ /// A telemetry event emitted when a package owner was automatically added to a package registration.\n+ /// </summary>\n+ /// <param name=\"packageId\">The package registration id.</param>\n+ /// <param name=\"packageVersion\">The normalized package version.</param>\n+ void TrackPackageOwnershipAutomaticallyAdded(string packageId, string packageVersion);\n+\n/// <summary>\n/// A telemetry event emitted when a certificate is activated for an account.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "using System.Linq;\nusing System.Security.Principal;\nusing System.Web;\n+using Newtonsoft.Json;\nusing NuGet.Versioning;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Diagnostics;\n@@ -51,11 +52,20 @@ internal class Events\npublic const string SymbolPackagePush = \"SymbolPackagePush\";\npublic const string SymbolPackagePushFailure = \"SymbolPackagePushFailure\";\npublic const string SymbolPackageGalleryValidation = \"SymbolPackageGalleryValidation\";\n+ public const string PackageMetadataComplianceError = \"PackageMetadataComplianceError\";\n+ public const string PackageMetadataComplianceWarning = \"PackageMetadataComplianceWarning\";\n+ public const string PackageOwnershipAutomaticallyAdded = \"PackageOwnershipAutomaticallyAdded\";\n}\nprivate IDiagnosticsSource _diagnosticsSource;\nprivate ITelemetryClient _telemetryClient;\n+ private readonly JsonSerializerSettings _defaultJsonSerializerSettings = new JsonSerializerSettings\n+ {\n+ ReferenceLoopHandling = ReferenceLoopHandling.Ignore,\n+ Formatting = Formatting.None\n+ };\n+\n// ODataQueryFilter properties\npublic const string CallContext = \"CallContext\";\npublic const string IsEnabled = \"IsEnabled\";\n@@ -116,6 +126,10 @@ internal class Events\npublic const string CreatedDateForAccountToBeDeleted = \"CreatedDateForAccountToBeDeleted\";\npublic const string AccountDeleteSucceeded = \"AccountDeleteSucceeded\";\n+ // Package metadata compliance properties\n+ public const string ComplianceFailures = \"ComplianceFailures\";\n+ public const string ComplianceWarnings = \"ComplianceWarnings\";\n+\npublic const string ValueUnknown = \"Unknown\";\npublic TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n@@ -313,6 +327,36 @@ public void TrackPackageRevalidate(Package package)\nTrackMetricForPackage(Events.PackageRevalidate, package);\n}\n+ public void TrackPackageMetadataComplianceError(string packageId, string packageVersion, IEnumerable<string> complianceFailures)\n+ {\n+ TrackMetricForPackage(\n+ Events.PackageMetadataComplianceError,\n+ packageId,\n+ packageVersion,\n+ properties => {\n+ properties.Add(ComplianceFailures, JsonConvert.SerializeObject(complianceFailures, _defaultJsonSerializerSettings));\n+ });\n+ }\n+\n+ public void TrackPackageMetadataComplianceWarning(string packageId, string packageVersion, IEnumerable<string> complianceWarnings)\n+ {\n+ TrackMetricForPackage(\n+ Events.PackageMetadataComplianceWarning,\n+ packageId,\n+ packageVersion,\n+ properties => {\n+ properties.Add(ComplianceWarnings, JsonConvert.SerializeObject(complianceWarnings, _defaultJsonSerializerSettings));\n+ });\n+ }\n+\n+ public void TrackPackageOwnershipAutomaticallyAdded(string packageId, string packageVersion)\n+ {\n+ TrackMetricForPackage(\n+ Events.PackageOwnershipAutomaticallyAdded,\n+ packageId,\n+ packageVersion);\n+ }\n+\npublic void TrackCertificateAdded(string thumbprint)\n{\nTrackMetricForCertificateActivity(Events.CertificateAdded, thumbprint);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -1580,13 +1580,16 @@ public async Task DoesNotAddRequiredCoOwnerWhenPackageIsNotCompliant(TestPackage\nvar configurationMock = new Mock<IAppConfiguration>(MockBehavior.Strict);\nconfigurationMock.SetupGet(m => m.EnforceDefaultSecurityPolicies).Returns(false);\n+ var telemetryServiceMock = new Mock<ITelemetryService>();\n+\nreturn new SecurityPolicyService(\nentitiesContext,\nauditing,\ndiagnostics,\nconfigurationMock.Object,\nuserServiceFactory,\n- packageOwnershipManagementServiceFactory);\n+ packageOwnershipManagementServiceFactory,\n+ telemetryServiceMock.Object);\n}\nprivate static Mock<TestPackageReader> CreatePackage(\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/RequirePackageMetadataCompliancePolicyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/RequirePackageMetadataCompliancePolicyFacts.cs",
"diff": "@@ -67,13 +67,17 @@ public async Task Evaluate_DoesNotCommitChangesToEntityContext()\n.Returns(Fakes.RequiredCoOwner)\n.Verifiable();\n+ var telemetryService = new Mock<ITelemetryService>().Object;\nvar context = new PackageSecurityPolicyEvaluationContext(\nuserService.Object,\npackageOwnershipManagementService.Object,\n+ telemetryService,\nsubscription.Policies,\nnewMicrosoftCompliantPackage,\n- It.IsAny<HttpContextBase>());\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser,\n+ httpContext: It.IsAny<HttpContextBase>());\n// Act\nvar result = await policyHandler.EvaluateAsync(context);\n@@ -87,10 +91,17 @@ public async Task Evaluate_DoesNotCommitChangesToEntityContext()\npublic async Task Evaluate_SilentlySucceedsWhenRequiredCoOwnerDoesNotExist()\n{\n// Arrange\n+ var nugetUser = new User(\"NuGet\");\nvar subscription = new MicrosoftTeamSubscription();\nvar policyHandler = new RequirePackageMetadataCompliancePolicy();\nvar fakes = new Fakes();\n- var context = CreateTestContext(false, subscription.Policies, fakes.NewPackageVersion, packageRegistrationAlreadyExists: false);\n+ var context = CreateTestContext(\n+ false,\n+ subscription.Policies,\n+ fakes.NewPackageVersion,\n+ packageRegistrationAlreadyExists: false,\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser);\n// Act\nvar result = await policyHandler.EvaluateAsync(context);\n@@ -118,7 +129,9 @@ public async Task Evaluate_CompliantPackage_CreatesWarningResultWhenPrefixReserv\nsubscription.Policies,\nnewMicrosoftCompliantPackage,\npackageRegistrationAlreadyExists: false,\n- packageOwnershipManagementService: packageOwnershipManagementService.Object);\n+ packageOwnershipManagementService: packageOwnershipManagementService.Object,\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser);\n// Act\nvar result = await policyHandler.EvaluateAsync(context);\n@@ -152,7 +165,9 @@ public async Task Evaluate_CompliantPackage_AddsRequiredCoOwner()\nsubscription.Policies,\nnewMicrosoftCompliantPackage,\npackageRegistrationAlreadyExists: false,\n- packageOwnershipManagementService: packageOwnershipManagementService.Object);\n+ packageOwnershipManagementService: packageOwnershipManagementService.Object,\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser);\n// Act\nvar result = await policyHandler.EvaluateAsync(context);\n@@ -177,7 +192,9 @@ public async Task Evaluate_NonCompliantPackage_CreatesErrorResult(Package nonCom\ntrue,\nsubscription.Policies,\nnonCompliantPackage,\n- packageRegistrationAlreadyExists: false);\n+ packageRegistrationAlreadyExists: false,\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser);\n// Act\nvar result = await policyHandler.EvaluateAsync(context);\n@@ -193,6 +210,8 @@ public async Task Evaluate_NonCompliantPackage_CreatesErrorResult(Package nonCom\nIEnumerable<UserSecurityPolicy> policies,\nPackage package,\nbool packageRegistrationAlreadyExists,\n+ User sourceAccount,\n+ User targetAccount,\nIPackageOwnershipManagementService packageOwnershipManagementService = null,\nIReservedNamespaceService reservedNamespaceService = null)\n{\n@@ -210,13 +229,18 @@ public async Task Evaluate_NonCompliantPackage_CreatesErrorResult(Package nonCom\n.Returns((User)null);\n}\n+ var telemetryServiceMock = new Mock<ITelemetryService>();\n+\npackageOwnershipManagementService = packageOwnershipManagementService ?? new Mock<IPackageOwnershipManagementService>(MockBehavior.Strict).Object;\nvar context = new PackageSecurityPolicyEvaluationContext(\nuserService.Object,\npackageOwnershipManagementService,\n+ telemetryServiceMock.Object,\npolicies,\npackage,\n+ sourceAccount,\n+ targetAccount,\nIt.IsAny<HttpContextBase>());\nreturn context;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/SecurityPolicyServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/SecurityPolicyServiceFacts.cs",
"diff": "using System.Reflection;\nusing System.Threading.Tasks;\nusing System.Web;\n-using Autofac;\nusing Moq;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\n@@ -27,17 +26,19 @@ public class SecurityPolicyServiceFacts\nnew Lazy<IUserService>(() => new Mock<IUserService>().Object);\nprivate static readonly Lazy<IPackageOwnershipManagementService> _packageOwnershipManagementServiceFactory =\nnew Lazy<IPackageOwnershipManagementService>(() => new Mock<IPackageOwnershipManagementService>().Object);\n+ private static readonly ITelemetryService _telemetryService = new Mock<ITelemetryService>().Object;\npublic static IEnumerable<object[]> CtorThrowNullReference_Data\n{\nget\n{\n- yield return new object[] { null, _auditing, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory };\n- yield return new object[] { _entities, null, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory };\n- yield return new object[] { _entities, _auditing, null, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory };\n- yield return new object[] { _entities, _auditing, _diagnostics, null, _userServiceFactory, _packageOwnershipManagementServiceFactory };\n- yield return new object[] { _entities, _auditing, _diagnostics, _configuration, null, _packageOwnershipManagementServiceFactory };\n- yield return new object[] { _entities, _auditing, _diagnostics, _configuration, _userServiceFactory, null };\n+ yield return new object[] { null, _auditing, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory, _telemetryService };\n+ yield return new object[] { _entities, null, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory, _telemetryService };\n+ yield return new object[] { _entities, _auditing, null, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory, _telemetryService };\n+ yield return new object[] { _entities, _auditing, _diagnostics, null, _userServiceFactory, _packageOwnershipManagementServiceFactory, _telemetryService };\n+ yield return new object[] { _entities, _auditing, _diagnostics, _configuration, null, _packageOwnershipManagementServiceFactory, _telemetryService };\n+ yield return new object[] { _entities, _auditing, _diagnostics, _configuration, _userServiceFactory, null, _telemetryService };\n+ yield return new object[] { _entities, _auditing, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory, null };\n}\n}\n@@ -49,16 +50,17 @@ public static IEnumerable<object[]> CtorThrowNullReference_Data\nIDiagnosticsService diagnostics,\nIAppConfiguration configuration,\nLazy<IUserService> userServiceFactory,\n- Lazy<IPackageOwnershipManagementService> packageOwnershipManagementServiceFactory)\n+ Lazy<IPackageOwnershipManagementService> packageOwnershipManagementServiceFactory,\n+ ITelemetryService telemetryService)\n{\n- Assert.Throws<ArgumentNullException>(() => new SecurityPolicyService(entities, auditing, diagnostics, configuration, userServiceFactory, packageOwnershipManagementServiceFactory));\n+ Assert.Throws<ArgumentNullException>(() => new SecurityPolicyService(entities, auditing, diagnostics, configuration, userServiceFactory, packageOwnershipManagementServiceFactory, telemetryService));\n}\n[Fact]\npublic void UserHandlers_ReturnsRegisteredUserSecurityPolicyHandlers()\n{\n// Arrange.\n- var service = new SecurityPolicyService(_entities, _auditing, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory);\n+ var service = new SecurityPolicyService(_entities, _auditing, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory, _telemetryService);\n// Act.\nvar handlers = ((IEnumerable<UserSecurityPolicyHandler>)service.GetType()\n@@ -79,7 +81,7 @@ public void UserHandlers_ReturnsRegisteredUserSecurityPolicyHandlers()\npublic void PackageHandlers_ReturnsRegisteredPackageSecurityPolicyHandlers()\n{\n// Arrange.\n- var service = new SecurityPolicyService(_entities, _auditing, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory);\n+ var service = new SecurityPolicyService(_entities, _auditing, _diagnostics, _configuration, _userServiceFactory, _packageOwnershipManagementServiceFactory, _telemetryService);\n// Act.\nvar handlers = ((IEnumerable<PackageSecurityPolicyHandler>)service.GetType()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -191,6 +191,18 @@ public static IEnumerable<object[]> TrackMetricNames_Data\nyield return new object[] { \"SymbolPackageGalleryValidation\",\n(TrackAction)(s => s.TrackSymbolPackageFailedGalleryValidationEvent(\"id\", \"version\"))\n};\n+\n+ yield return new object[] { \"PackageMetadataComplianceError\",\n+ (TrackAction)(s => s.TrackPackageMetadataComplianceError(fakes.Package.Id, package.NormalizedVersion, new[] { \"Failure reason\" }))\n+ };\n+\n+ yield return new object[] { \"PackageMetadataComplianceWarning\",\n+ (TrackAction)(s => s.TrackPackageMetadataComplianceWarning(fakes.Package.Id, package.NormalizedVersion, new[] { \"Warning message\" }))\n+ };\n+\n+ yield return new object[] { \"PackageOwnershipAutomaticallyAdded\",\n+ (TrackAction)(s => s.TrackPackageOwnershipAutomaticallyAdded(fakes.Package.Id, package.NormalizedVersion))\n+ };\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add telemetry for auto-add package owner feature (#6374) |
455,747 | 07.09.2018 12:27:18 | 25,200 | c174c8e4616d7a03530c1d7eb51ad9c4b06d9a20 | Fix msa login account selection | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"diff": "@@ -47,6 +47,7 @@ public static class AuthenticationType\nprivate static string _callbackPath = \"users/account/authenticate/return\";\nprivate static HashSet<string> _errorMessageList = new HashSet<string> { \"access_denied\", \"consent_required\" };\nprivate static HashSet<string> _alternateSiteRootList;\n+ private const string SELECT_ACCOUNT = \"select_account\";\n/// <summary>\n/// The possible values returned by <see cref=\"V2Claims.ACR\"/> claim, and also the possible token values to be sent\n@@ -214,7 +215,8 @@ private Task AuthenticationFailed(AuthenticationFailedNotification<OpenIdConnect\n}\n/// <summary>\n- /// Before redirecting for authentication to the provider, append the properties for Multi-Factor Authentication.\n+ /// Before redirecting for authentication to the provider, append the properties for Multi-Factor Authentication\n+ /// and configuration settings.\n/// </summary>\n/// <param name=\"notification\">The properties used for authentication</param>\n/// <returns>awaitable Task</returns>\n@@ -242,6 +244,9 @@ private Task RedirectToIdentityProvider(RedirectToIdentityProviderNotification<O\nnotification.ProtocolMessage.RedirectUri = \"https://\" + notification.Request.Uri.Host + \"/\" + _callbackPath ;\n}\n+ // We always want to show the options to select account when signing in and while changing account.\n+ notification.ProtocolMessage.Prompt = SELECT_ACCOUNT;\n+\nreturn Task.FromResult(0);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix msa login account selection (#6400) |
455,747 | 10.09.2018 12:48:47 | 25,200 | ddc0512c8da53b5fa4783a3e70d4468bd8ec629e | [NuGet Symbol Server]Symbols validation status view | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -467,7 +467,8 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nvar model = new DisplayPackageViewModel(package, currentUser, packageHistory);\nmodel.ValidatingTooLong = _validationService.IsValidatingTooLong(package);\n- model.ValidationIssues = _validationService.GetLatestValidationIssues(package);\n+ model.PackageValidationIssues = _validationService.GetLatestPackageValidationIssues(package);\n+ model.SymbolsPackageValidationIssues = _validationService.GetLatestPackageValidationIssues(model.LatestSymbolsPackage);\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IValidationService.cs",
"new_path": "src/NuGetGallery/Services/IValidationService.cs",
"diff": "@@ -45,6 +45,13 @@ public interface IValidationService\n/// </summary>\n/// <param name=\"package\">The package whose validation issues should be fetched.</param>\n/// <returns>The validation issues encountered in the latest validation.</returns>\n- IReadOnlyList<ValidationIssue> GetLatestValidationIssues(Package package);\n+ IReadOnlyList<ValidationIssue> GetLatestPackageValidationIssues(Package package);\n+\n+ /// <summary>\n+ /// Get the symbol package's validation issues from the latest validation.\n+ /// </summary>\n+ /// <param name=\"symbolPackage\">The symbol package whose validation issues should be fetched.</param>\n+ /// <returns>The validation issues encountered in the latest validation.</returns>\n+ IReadOnlyList<ValidationIssue> GetLatestPackageValidationIssues(SymbolPackage symbolPackage);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ValidationService.cs",
"new_path": "src/NuGetGallery/Services/ValidationService.cs",
"diff": "@@ -75,18 +75,33 @@ public bool IsValidatingTooLong(Package package)\nreturn false;\n}\n- public IReadOnlyList<ValidationIssue> GetLatestValidationIssues(Package package)\n+ public IReadOnlyList<ValidationIssue> GetLatestPackageValidationIssues(Package package)\n+ {\n+ return GetValidationIssues(package.Key, package.PackageStatusKey, ValidatingType.Package);\n+ }\n+\n+ public IReadOnlyList<ValidationIssue> GetLatestPackageValidationIssues(SymbolPackage symbolPackage)\n+ {\n+ if (symbolPackage == null)\n+ {\n+ return new List<ValidationIssue>();\n+ }\n+\n+ return GetValidationIssues(symbolPackage.Key, symbolPackage.StatusKey, ValidatingType.SymbolPackage);\n+ }\n+\n+ private IReadOnlyList<ValidationIssue> GetValidationIssues(int entityKey, PackageStatus status, ValidatingType validatingType)\n{\nIReadOnlyList<ValidationIssue> issues = new ValidationIssue[0];\n// Only query the database for validation issues if the package has failed validation.\n- if (package.PackageStatusKey == PackageStatus.FailedValidation)\n+ if (status == PackageStatus.FailedValidation)\n{\n// Grab the most recently completed validation set for this package. Note that the orchestrator will stop\n// processing a validation set if all validation succeed, OR, one or more validation fails.\n- var validationSet = _validationSets\n+ var validationSet = _validationSets?\n.GetAll()\n- .Where(s => s.PackageKey == package.Key)\n+ .Where(s => s.PackageKey == entityKey && s.ValidatingType == validatingType)\n.Where(s => s.PackageValidations.All(v => v.ValidationStatus == ValidationStatus.Succeeded) ||\ns.PackageValidations.Any(v => v.ValidationStatus == ValidationStatus.Failed))\n.Include(s => s.PackageValidations.Select(v => v.PackageValidationIssues))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -26,7 +26,7 @@ public DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumer\nPushedBy = GetPushedBy(package, currentUser);\nPackageFileSize = package.PackageFileSize;\n- LatestSymbolPackage = package\n+ LatestSymbolsPackage = package\n.SymbolPackages\n.OrderByDescending(sp => sp.Created)\n.FirstOrDefault();\n@@ -61,7 +61,8 @@ public DisplayPackageViewModel(Package package, User currentUser, string pushedB\n}\npublic bool ValidatingTooLong { get; set; }\n- public IReadOnlyList<ValidationIssue> ValidationIssues { get; set; }\n+ public IReadOnlyList<ValidationIssue> PackageValidationIssues { get; set; }\n+ public IReadOnlyList<ValidationIssue> SymbolsPackageValidationIssues { get; set; }\npublic DependencySetsViewModel Dependencies { get; set; }\npublic IEnumerable<DisplayPackageViewModel> PackageVersions { get; set; }\npublic string Copyright { get; set; }\n@@ -70,7 +71,7 @@ public DisplayPackageViewModel(Package package, User currentUser, string pushedB\npublic int DownloadsPerDay { get; private set; }\npublic int TotalDaysSinceCreated { get; private set; }\npublic long PackageFileSize { get; private set; }\n- public SymbolPackage LatestSymbolPackage { get; private set; }\n+ public SymbolPackage LatestSymbolsPackage { get; private set; }\npublic bool HasSemVer2Version { get; }\npublic bool HasSemVer2Dependency { get; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "var absolutePackageUrl = Url.Absolute(Url.Package(Model.Id));\n- var hasSymbolPackageAvailable = Model.LatestSymbolPackage != null && Model.LatestSymbolPackage.StatusKey == PackageStatus.Available;\n+ var hasSymbolsPackageAvailable = Model.LatestSymbolsPackage != null && Model.LatestSymbolsPackage.StatusKey == PackageStatus.Available;\n+ var showSymbolsPackageStatus = Model.LatestSymbolsPackage != null && Model.LatestSymbolsPackage.StatusKey != PackageStatus.Available;\nPackageManagerViewModel[] packageManagers;\n@<text>\n<strong>Package publishing failed.</strong> This package could not be published due to the following reason(s):\n<ul class=\"failed-validation-alert-list\">\n- @foreach (var issue in Model.ValidationIssues)\n+ @foreach (var issue in Model.PackageValidationIssues)\n{\n<li>@Html.Partial(\"_ValidationIssue\", issue)</li>\n}\n</ul>\n- @if (!Model.ValidationIssues.Any(i => i.IssueCode == ValidationIssueCode.Unknown))\n+ @if (!Model.PackageValidationIssues.Any(i => i.IssueCode == ValidationIssueCode.Unknown))\n{\n- var issuePluralString = Model.ValidationIssues.Count() > 1 ? \"all the issues\" : \"the issue\";\n+ var issuePluralString = Model.PackageValidationIssues.Count() > 1 ? \"all the issues\" : \"the issue\";\n<text>Once you've fixed @issuePluralString with your package, you can reupload it with the same ID and version.</text>\n}\nelse\[email protected](Model.HasSemVer2Version, Model.HasSemVer2Dependency)\n}\n+ @if (showSymbolsPackageStatus)\n+ {\n+ if (Model.LatestSymbolsPackage.StatusKey == PackageStatus.Validating)\n+ {\n+ @ViewHelpers.AlertWarning(\n+ @<text>\n+ The symbols for this package have not been indexed yet. They are not available\n+ for download from the NuGet.org symbol server. Symbols will be indexed and will\n+ be available for download after both validation and indexing are complete.\n+ Symbols validation and indexing may take up to an hour. <a href=\"https://aka.ms/NuGetSymbolsPackageValidation\">Read more</a>.\n+ </text>\n+ )\n+ }\n+ else if (Model.LatestSymbolsPackage.StatusKey == PackageStatus.FailedValidation)\n+ {\n+ @ViewHelpers.AlertDanger(\n+ @<text>\n+ <strong>Symbols package publishing failed.</strong> The associated symbols package could not be published due to the following reason(s):\n+ <ul class=\"failed-validation-alert-list\">\n+ @foreach (var issue in Model.SymbolsPackageValidationIssues)\n+ {\n+ <li>@Html.Partial(\"_ValidationIssue\", issue)</li>\n+ }\n+ </ul>\n+ @if (!Model.SymbolsPackageValidationIssues.Any(i => i.IssueCode == ValidationIssueCode.Unknown))\n+ {\n+ var issuePluralString = Model.SymbolsPackageValidationIssues.Count() > 1 ? \"all the issues\" : \"the issue\";\n+ <text>Once you've fixed @issuePluralString with your symbols package, you can re-upload it.</text>\n+ }\n+ else\n+ {\n+ <text>Please contact <a href=\"mailto:[email protected]\">[email protected]</a> to help fix your symbols package.</text>\n+ }\n+ </text>)\n+ }\n+ }\n+\n@if (!Model.Listed && Model.Available)\n{\nif (Model.CanDisplayPrivateMetadata)\n<a href=\"@Url.PackageDownload(2, Model.Id, Model.Version)\" data-track=\"outbound-manual-download\" title=\"Download the raw nupkg file.\" rel=\"nofollow\">Download Package</a>\n (@Model.PackageFileSize.ToUserFriendlyBytesLabel())\n</li>\n- if (hasSymbolPackageAvailable)\n+ if (hasSymbolsPackageAvailable)\n{\n<li>\n<i class=\"ms-Icon ms-Icon--CloudDownload\" aria-hidden=\"true\"></i>\n<a href=\"@Url.SymbolPackageDownload(2, Model.Id, Model.Version)\" data-track=\"outbound-manual-download\" title=\"Download the raw snupkg file.\" rel=\"nofollow\">Download Symbols</a>\n- (@Model.LatestSymbolPackage.FileSize.ToUserFriendlyBytesLabel())\n+ (@Model.LatestSymbolsPackage.FileSize.ToUserFriendlyBytesLabel())\n</li>\n}\n<li class=\"no-clickonce\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"diff": "</text>\nbreak;\n}\n+ case ValidationIssueCode.SymbolErrorCode_ChecksumDoesNotMatch:\n+ <text>\n+ The checksum does not match for the dll(s) and corresponding pdb(s).\n+ </text>\n+ break;\n+ case ValidationIssueCode.SymbolErrorCode_MatchingPortablePDBNotFound:\n+ <text>\n+ The uploaded symbols package contains pdb(s) for a corresponding dll(s) not found in the nuget package.\n+ </text>\n+ break;\ndefault:\n<text>\nThere was an unknown failure when validating your package.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -744,7 +744,7 @@ public async Task GetsValidationIssues()\nnew TestIssue(\"This should not be deduplicated by the controller layer\"),\n};\n- validationService.Setup(v => v.GetLatestValidationIssues(It.IsAny<Package>()))\n+ validationService.Setup(v => v.GetLatestPackageValidationIssues(It.IsAny<Package>()))\n.Returns(expectedIssues);\n// Act\n@@ -752,7 +752,7 @@ public async Task GetsValidationIssues()\n// Assert\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n- Assert.Equal(model.ValidationIssues, expectedIssues);\n+ Assert.Equal(model.PackageValidationIssues, expectedIssues);\n}\nprivate class TestIssue : ValidationIssue\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"diff": "@@ -206,12 +206,22 @@ public void IgnoresPackagesThatHaventFailedValidations(PackageStatus status)\n_package.PackageStatusKey = status;\n// Act\n- var issues = _target.GetLatestValidationIssues(_package);\n+ var issues = _target.GetLatestPackageValidationIssues(_package);\n// Assert\n_validationSets.Verify(x => x.GetAll(), Times.Never());\n}\n+ [Fact]\n+ public void ReturnsEmptyListForNullSymbolsPackage()\n+ {\n+ // Arrange and act\n+ var issues = _target.GetLatestPackageValidationIssues(symbolPackage: null);\n+\n+ Assert.NotNull(issues);\n+ Assert.Empty(issues);\n+ }\n+\n[Fact]\npublic void DeduplicatesValidationIssuesByCodeAndData()\n{\n@@ -281,7 +291,7 @@ public void DeduplicatesValidationIssuesByCodeAndData()\n.Returns(new[] { packageValidationSet }.AsQueryable());\n// Act\n- var issues = _target.GetLatestValidationIssues(_package);\n+ var issues = _target.GetLatestPackageValidationIssues(_package);\n// Assert\n_validationSets.Verify(x => x.GetAll(), Times.Once);\n@@ -326,7 +336,7 @@ public void ReturnsSingleUnknownIssueIfNoneArePersisted()\n.Returns(new[] { packageValidationSet }.AsQueryable());\n// Act\n- var issues = _target.GetLatestValidationIssues(_package);\n+ var issues = _target.GetLatestPackageValidationIssues(_package);\n// Assert\n_validationSets.Verify(x => x.GetAll(), Times.Once);\n@@ -397,7 +407,7 @@ public void FetchesValidationIssues()\n.Returns(new[] { packageValidationSet1, packageValidationSet2, packageValidationSet3 }.AsQueryable());\n// Act\n- var issues = _target.GetLatestValidationIssues(_package);\n+ var issues = _target.GetLatestPackageValidationIssues(_package);\n// Assert\n_validationSets.Verify(x => x.GetAll(), Times.Once());\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -155,7 +155,7 @@ public void TheCtorReturnsLatestSymbolPackageByDateCreated()\nvar viewModel = new DisplayPackageViewModel(package, null, packageHistory: Enumerable.Empty<Package>().OrderBy(x => 1));\n- Assert.Equal(symbolPackageList[0], viewModel.LatestSymbolPackage);\n+ Assert.Equal(symbolPackageList[0], viewModel.LatestSymbolsPackage);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"diff": "@@ -24,7 +24,6 @@ public ValidationIssueFacts(ITestOutputHelper output)\n_output = output;\n}\n- [Theory (Skip = \"Symbol validations generates new issues which can't yet be shown in the view/not applicable for package upload, skip this test for now.\")]\n[MemberData(nameof(HasACaseForAllIssueTypesTestData))]\npublic void HasACaseForAllIssueTypes(ValidationIssue issue)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [NuGet Symbol Server]Symbols validation status view (#6407) |
455,751 | 10.09.2018 16:57:52 | 25,200 | 56513175e8ab1ea7fdd1144898875e9749ee5b36 | Obfuscate secret tokens in logging
Issue 1670 fix - obfuscate secret tokens. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -149,25 +149,37 @@ public static void RegisterUIRoutes(RouteCollection routes)\n\"packages/{id}/required-signer/{username}\",\nnew { controller = \"Packages\", action = RouteName.SetRequiredSigner, username = UrlParameter.Optional },\nconstraints: new { httpMethod = new HttpMethodConstraint(\"POST\") },\n- obfuscationMetadata: new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName) );\n+ obfuscationMetadata: new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName) );\nroutes.MapRoute(\nRouteName.PackageOwnerConfirmation,\n\"packages/{id}/owners/{username}/confirm/{token}\",\nnew { controller = \"Packages\", action = \"ConfirmPendingOwnershipRequest\" },\n- new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(5, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.PackageOwnerRejection,\n\"packages/{id}/owners/{username}/reject/{token}\",\nnew { controller = \"Packages\", action = \"RejectPendingOwnershipRequest\" },\n- new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(5, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.PackageOwnerCancellation,\n\"packages/{id}/owners/{username}/cancel/{token}\",\nnew { controller = \"Packages\", action = \"CancelPendingOwnershipRequest\" },\n- new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(5, Obfuscator.DefaultTelemetryToken)\n+ });\n// We need the following two routes (rather than just one) due to Routing's\n// Consecutive Optional Parameter bug. :(\n@@ -264,7 +276,7 @@ public static void RegisterUIRoutes(RouteCollection routes)\nRouteName.Profile,\n\"profiles/{username}\",\nnew { controller = \"Users\", action = \"Profiles\" },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.GetUserCertificate,\n@@ -304,19 +316,31 @@ public static void RegisterUIRoutes(RouteCollection routes)\nRouteName.PasswordReset,\n\"account/forgotpassword/{username}/{token}\",\nnew { controller = \"Users\", action = \"ResetPassword\", forgot = true },\n- new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(2, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.PasswordSet,\n\"account/setpassword/{username}/{token}\",\nnew { controller = \"Users\", action = \"ResetPassword\", forgot = false },\n- new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(2, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.ConfirmAccount,\n\"account/confirm/{accountName}/{token}\",\nnew { controller = \"Users\", action = \"Confirm\" },\n- new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(2, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.ChangeEmailSubscription,\n@@ -332,7 +356,7 @@ public static void RegisterUIRoutes(RouteCollection routes)\nRouteName.AdminDeleteAccount,\n\"account/delete/{accountName}\",\nnew { controller = \"Users\", action = \"Delete\" },\n- new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(2, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.UserDeleteAccount,\n@@ -348,18 +372,27 @@ public static void RegisterUIRoutes(RouteCollection routes)\nRouteName.TransformToOrganizationConfirmation,\n\"account/transform/confirm/{accountNameToTransform}/{token}\",\nnew { controller = \"Users\", action = RouteName.TransformToOrganizationConfirmation },\n- new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.TransformToOrganizationRejection,\n\"account/transform/reject/{accountNameToTransform}/{token}\",\nnew { controller = \"Users\", action = RouteName.TransformToOrganizationRejection },\n- new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.TransformToOrganizationCancellation,\n\"account/transform/cancel/{token}\",\n- new { controller = \"Users\", action = RouteName.TransformToOrganizationCancellation });\n+ new { controller = \"Users\", action = RouteName.TransformToOrganizationCancellation },\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryToken));\nroutes.MapRoute(\nRouteName.ApiKeys,\n@@ -381,34 +414,34 @@ public static void RegisterUIRoutes(RouteCollection routes)\n\"organization/{accountName}/certificates/{thumbprint}\",\nnew { controller = \"Organizations\", action = \"GetCertificate\" },\nconstraints: new { httpMethod = new HttpMethodConstraint(\"GET\") },\n- obfuscationMetadata: new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ obfuscationMetadata: new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.DeleteOrganizationCertificate,\n\"organization/{accountName}/certificates/{thumbprint}\",\nnew { controller = \"Organizations\", action = \"DeleteCertificate\" },\nconstraints: new { httpMethod = new HttpMethodConstraint(\"DELETE\") },\n- obfuscationMetadata: new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ obfuscationMetadata: new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.GetOrganizationCertificates,\n\"organization/{accountName}/certificates\",\nnew { controller = \"Organizations\", action = \"GetCertificates\" },\nconstraints: new { httpMethod = new HttpMethodConstraint(\"GET\") },\n- obfuscationMetadata: new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ obfuscationMetadata: new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.AddOrganizationCertificate,\n\"organization/{accountName}/certificates\",\nnew { controller = \"Organizations\", action = \"AddCertificate\" },\nconstraints: new { httpMethod = new HttpMethodConstraint(\"POST\") },\n- obfuscationMetadata: new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ obfuscationMetadata: new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.OrganizationMemberAddAjax,\n\"organization/{accountName}/members/add\",\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberAddAjax },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.OrganizationMemberAdd,\n@@ -416,27 +449,35 @@ public static void RegisterUIRoutes(RouteCollection routes)\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberAddAjax },\nnew[]\n{\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n- new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryUserName)\n});\nroutes.MapRoute(\nRouteName.OrganizationMemberConfirm,\n\"organization/{accountName}/members/confirm/{confirmationToken}\",\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberConfirm },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.OrganizationMemberReject,\n\"organization/{accountName}/members/reject/{confirmationToken}\",\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberReject },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryToken)\n+ });\nroutes.MapRoute(\nRouteName.OrganizationMemberCancelAjax,\n\"organization/{accountName}/members/cancel\",\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberCancelAjax },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.OrganizationMemberCancel,\n@@ -444,15 +485,15 @@ public static void RegisterUIRoutes(RouteCollection routes)\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberCancelAjax },\nnew[]\n{\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n- new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryUserName)\n});\nroutes.MapRoute(\nRouteName.OrganizationMemberUpdateAjax,\n\"organization/{accountName}/members/update\",\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberUpdateAjax },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.OrganizationMemberUpdate,\n@@ -460,15 +501,15 @@ public static void RegisterUIRoutes(RouteCollection routes)\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberUpdateAjax },\nnew[]\n{\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n- new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryUserName)\n});\nroutes.MapRoute(\nRouteName.OrganizationMemberDeleteAjax,\n\"organization/{accountName}/members/delete\",\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberDeleteAjax },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.OrganizationMemberDelete,\n@@ -476,21 +517,21 @@ public static void RegisterUIRoutes(RouteCollection routes)\nnew { controller = \"Organizations\", action = RouteName.OrganizationMemberDeleteAjax },\nnew[]\n{\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n- new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(4, Obfuscator.DefaultTelemetryUserName)\n});\nroutes.MapRoute(\nRouteName.OrganizationAccount,\n\"organization/{accountName}/{action}\",\nnew { controller = \"Organizations\", action = \"ManageOrganization\" },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.ChangeOrganizationEmailSubscription,\n\"organization/{accountName}/subscription/change\",\nnew { controller = \"Organizations\", action = \"ChangeEmailSubscription\" },\n- new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+ new RouteExtensions.ObfuscatedPathMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.CuratedFeed,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"diff": "@@ -35,6 +35,7 @@ private void ModifyItem(ITelemetry item)\n{\nreturn;\n}\n+ requestTelemetryItem.Url = RouteExtensions.ObfuscateUrlQuery(requestTelemetryItem.Url, RouteExtensions.ObfuscatedReturnUrlMetadata);\n// Removes the first /\nvar requestPath = requestTelemetryItem.Url.AbsolutePath.TrimStart('/');\nvar obfuscatedPath = route.ObfuscateUrlPath(requestPath);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/Obfuscator.cs",
"new_path": "src/NuGetGallery/Telemetry/Obfuscator.cs",
"diff": "@@ -13,6 +13,8 @@ internal static class Obfuscator\n/// This value will be saved in AI instead of the real value.\n/// </summary>\ninternal const string DefaultTelemetryUserName = \"ObfuscatedUserName\";\n+ internal const string DefaultTelemetryReturnUrl = \"ObfuscatedReturnUrl\";\n+ internal const string DefaultTelemetryToken = \"ObfuscatedToken\";\ninternal static readonly HashSet<string> ObfuscatedActions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"new_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"diff": "@@ -143,16 +143,16 @@ public static IEnumerable<object[]> PIIUrlDataGenerator()\n{\nforeach (var user in GenerateUserNames())\n{\n- yield return new string[] { \"packages/{id}/owners/{username}/confirm/{token}\", $\"https://localhost/packages/pack1/owners/user1/confirm/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/confirm/sometoken\" };\n- yield return new string[] { \"packages/{id}/owners/{username}/reject/{token}\", $\"https://localhost/packages/pack1/owners/user1/reject/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/reject/sometoken\" };\n- yield return new string[] { \"packages/{id}/owners/{username}/cancel/{token}\", $\"https://localhost/packages/pack1/owners/user1/cancel/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/cancel/sometoken\" };\n+ yield return new string[] { \"packages/{id}/owners/{username}/confirm/{token}\", $\"https://localhost/packages/pack1/owners/user1/confirm/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/confirm/ObfuscatedToken\" };\n+ yield return new string[] { \"packages/{id}/owners/{username}/reject/{token}\", $\"https://localhost/packages/pack1/owners/user1/reject/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/reject/ObfuscatedToken\" };\n+ yield return new string[] { \"packages/{id}/owners/{username}/cancel/{token}\", $\"https://localhost/packages/pack1/owners/user1/cancel/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/cancel/ObfuscatedToken\" };\n- yield return new string[] { \"account/confirm/{accountName}/{token}\", $\"https://localhost/account/confirm/user1/sometoken\", $\"https://localhost/account/confirm/ObfuscatedUserName/sometoken\" };\n+ yield return new string[] { \"account/confirm/{accountName}/{token}\", $\"https://localhost/account/confirm/user1/sometoken\", $\"https://localhost/account/confirm/ObfuscatedUserName/ObfuscatedToken\" };\nyield return new string[] { \"account/delete/{accountName}\", \"https://localhost/account/delete/user1\", $\"https://localhost/account/delete/ObfuscatedUserName\" };\nyield return new string[] { \"profiles/{username}\", $\"https://localhost/profiles/user1\", $\"https://localhost/profiles/ObfuscatedUserName\" };\n- yield return new string[] { \"account/setpassword/{username}/{token}\", $\"https://localhost/account/setpassword/user1/sometoken\", $\"https://localhost/account/setpassword/ObfuscatedUserName/sometoken\" };\n- yield return new string[] { \"account/forgotpassword/{username}/{token}\", $\"https://localhost/account/forgotpassword/user1/sometoken\", $\"https://localhost/account/forgotpassword/ObfuscatedUserName/sometoken\" };\n+ yield return new string[] { \"account/setpassword/{username}/{token}\", $\"https://localhost/account/setpassword/user1/sometoken\", $\"https://localhost/account/setpassword/ObfuscatedUserName/ObfuscatedToken\" };\n+ yield return new string[] { \"account/forgotpassword/{username}/{token}\", $\"https://localhost/account/forgotpassword/user1/sometoken\", $\"https://localhost/account/forgotpassword/ObfuscatedUserName/ObfuscatedToken\" };\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Obfuscate secret tokens in logging (#6399)
Issue 1670 fix - obfuscate secret tokens. |
455,772 | 12.09.2018 09:26:06 | 25,200 | 6aa02bcc053aa42dbd6affce0149d220fb786cd5 | Transform to https license URLs for known domains | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -62,6 +62,17 @@ public DisplayPackageViewModel(Package package, User currentUser, string pushedB\n{\nProjectUrl = projectUrl;\n}\n+\n+ if (PackageHelper.TryPrepareUrlForRendering(package.LicenseUrl, out string licenseUrl))\n+ {\n+ LicenseUrl = licenseUrl;\n+\n+ var licenseNames = package.LicenseNames;\n+ if (!string.IsNullOrEmpty(licenseNames))\n+ {\n+ LicenseNames = licenseNames.Split(',').Select(l => l.Trim());\n+ }\n+ }\n}\npublic bool ValidatingTooLong { get; set; }\n@@ -115,6 +126,8 @@ public bool HasNewerRelease\npublic string RepositoryUrl { get; private set; }\npublic RepositoryKind RepositoryType { get; private set; }\npublic string ProjectUrl { get; set; }\n+ public string LicenseUrl { get; set; }\n+ public IEnumerable<string> LicenseNames { get; set; }\nprivate IDictionary<User, string> _pushedByCache = new Dictionary<User, string>();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.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;\n-using System.Linq;\nusing NuGet.Versioning;\nnamespace NuGetGallery\n@@ -32,8 +30,6 @@ public PackageViewModel(Package package)\nDescription = package.Description;\nReleaseNotes = package.ReleaseNotes;\nIconUrl = package.IconUrl;\n- LicenseUrl = package.LicenseUrl;\n- HideLicenseReport = package.HideLicenseReport;\nLatestVersion = package.IsLatest;\nLatestVersionSemVer2 = package.IsLatestSemVer2;\nLatestStableVersion = package.IsLatestStable;\n@@ -43,22 +39,11 @@ public PackageViewModel(Package package)\n_packageStatus = package.PackageStatusKey;\nDownloadCount = package.DownloadCount;\nPrerelease = package.IsPrerelease;\n- LicenseReportUrl = package.LicenseReportUrl;\n-\n- var licenseNames = package.LicenseNames;\n- if (!string.IsNullOrEmpty(licenseNames))\n- {\n- LicenseNames = licenseNames.Split(',').Select(l => l.Trim());\n- }\n}\npublic string Description { get; set; }\npublic string ReleaseNotes { get; set; }\npublic string IconUrl { get; set; }\n- public string LicenseUrl { get; set; }\n- public Boolean HideLicenseReport { get; set; }\n- public IEnumerable<string> LicenseNames { get; set; }\n- public string LicenseReportUrl { get; set; }\npublic DateTime LastUpdated { get; set; }\npublic bool LatestVersion { get; set; }\npublic bool LatestStableVersion { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "</a>\n</li>\n}\n- @if (!Model.Deleted && PackageHelper.ShouldRenderUrl(Model.LicenseUrl))\n+ @if (!Model.Deleted && Model.LicenseUrl != null)\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Certificate\" aria-hidden=\"true\"></i>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -88,6 +88,42 @@ public void ItInitializesProjectUrl(string projectUrl, string expected)\nAssert.Equal(expected, model.ProjectUrl);\n}\n+\n+ [Theory]\n+ [InlineData(null, null)]\n+ [InlineData(\"not a url\", null)]\n+ [InlineData(\"git://github.com/notavalidscheme\", null)]\n+ [InlineData(\"http://www.microsoft.com/web/webpi/eula/webpages_2_eula_enu.htm\", \"https://www.microsoft.com/web/webpi/eula/webpages_2_eula_enu.htm\")]\n+ [InlineData(\"http://aspnetwebstack.codeplex.com/license\", \"https://aspnetwebstack.codeplex.com/license\")]\n+ [InlineData(\"http://go.microsoft.com/?linkid=9809688\", \"https://go.microsoft.com/?linkid=9809688\")]\n+ [InlineData(\"http://github.com/url\", \"https://github.com/url\")]\n+ public void ItInitializesLicenseUrl(string licenseUrl, string expected)\n+ {\n+ var package = new Package\n+ {\n+ Version = \"1.0.0\",\n+ LicenseUrl = licenseUrl\n+ };\n+\n+ var model = new DisplayPackageViewModel(package, null, \"test\");\n+ Assert.Equal(expected, model.LicenseUrl);\n+ }\n+\n+ [Fact]\n+ public void LicenseNamesAreParsedByCommas()\n+ {\n+ var package = new Package\n+ {\n+ LicenseUrl = \"https://mylicense.com\",\n+ Version = \"1.0.0\",\n+ LicenseNames = \"l1,l2, l3 ,l4 , l5 \",\n+ };\n+\n+ var packageViewModel = new DisplayPackageViewModel(package, currentUser: null, pushedBy: \"test\");\n+ Assert.Equal(new string[] { \"l1\", \"l2\", \"l3\", \"l4\", \"l5\" }, packageViewModel.LicenseNames);\n+ }\n+\n+\n[Fact]\npublic void TheCtorSortsPackageVersionsProperly()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs",
"diff": "@@ -37,71 +37,6 @@ public void UsesNormalizedPackageVersionIfNormalizedVersionMissing()\nAssert.Equal(\"1.2.0\", packageViewModel.Version);\n}\n- [Fact]\n- public void LicenseNamesAreParsedByCommas()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- LicenseNames = \"l1,l2, l3 ,l4 , l5 \",\n- };\n- var packageViewModel = new ListPackageItemViewModel(package, currentUser: null);\n- Assert.Equal(new string[] { \"l1\", \"l2\", \"l3\", \"l4\", \"l5\" }, packageViewModel.LicenseNames);\n- }\n-\n- [Fact]\n- public void LicenseReportFieldsKeptWhenLicenseReportDisabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = true,\n- LicenseNames = \"l1\",\n- LicenseReportUrl = \"url\"\n- };\n- var packageViewModel = new ListPackageItemViewModel(package, currentUser: null);\n- Assert.NotNull(packageViewModel.LicenseNames);\n- Assert.NotNull(packageViewModel.LicenseReportUrl);\n- }\n-\n- [Fact]\n- public void LicenseReportUrlKeptWhenLicenseReportEnabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = false,\n- LicenseReportUrl = \"url\"\n- };\n- var packageViewModel = new ListPackageItemViewModel(package, currentUser: null);\n- Assert.NotNull(packageViewModel.LicenseReportUrl);\n- }\n-\n- [Fact]\n- public void LicenseNamesKeptWhenLicenseReportEnabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = false,\n- LicenseNames = \"l1\"\n- };\n- var packageViewModel = new ListPackageItemViewModel(package, currentUser: null);\n- Assert.NotNull(packageViewModel.LicenseNames);\n- }\n-\n- [Fact]\n- public void LicenseUrlKeptWhenLicenseReportDisabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = true,\n- LicenseUrl = \"url\"\n- };\n- var packageViewModel = new ListPackageItemViewModel(package, currentUser: null);\n- Assert.NotNull(packageViewModel.LicenseUrl);\n- }\n#endregion\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs",
"diff": "@@ -31,72 +31,6 @@ public void UsesNormalizedPackageVersionIfNormalizedVersionMissing()\nAssert.Equal(\"1.2.0\", packageViewModel.Version);\n}\n- [Fact]\n- public void LicenseNamesAreParsedByCommas()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- LicenseNames = \"l1,l2, l3 ,l4 , l5 \",\n- };\n- var packageViewModel = new PackageViewModel(package);\n- Assert.Equal(new string[] { \"l1\", \"l2\", \"l3\", \"l4\", \"l5\" }, packageViewModel.LicenseNames);\n- }\n-\n- [Fact]\n- public void LicenseReportFieldsKeptWhenLicenseReportDisabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = true,\n- LicenseNames = \"l1\",\n- LicenseReportUrl = \"url\"\n- };\n- var packageViewModel = new PackageViewModel(package);\n- Assert.NotNull(packageViewModel.LicenseNames);\n- Assert.NotNull(packageViewModel.LicenseReportUrl);\n- }\n-\n- [Fact]\n- public void LicenseReportUrlKeptWhenLicenseReportEnabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = false,\n- LicenseReportUrl = \"url\"\n- };\n- var packageViewModel = new PackageViewModel(package);\n- Assert.NotNull(packageViewModel.LicenseReportUrl);\n- }\n-\n- [Fact]\n- public void LicenseNamesKeptWhenLicenseReportEnabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = false,\n- LicenseNames = \"l1\"\n- };\n- var packageViewModel = new PackageViewModel(package);\n- Assert.NotNull(packageViewModel.LicenseNames);\n- }\n-\n- [Fact]\n- public void LicenseUrlKeptWhenLicenseReportDisabled()\n- {\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- HideLicenseReport = true,\n- LicenseUrl = \"url\"\n- };\n- var packageViewModel = new PackageViewModel(package);\n- Assert.NotNull(packageViewModel.LicenseUrl);\n- }\n-\n[Theory]\n[InlineData(PackageStatus.Available, true, PackageStatusSummary.Listed)]\n[InlineData(PackageStatus.Available, false, PackageStatusSummary.Unlisted)]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Transform to https license URLs for known domains (#6418) |
455,776 | 13.09.2018 09:43:46 | 25,200 | 4cb44ae0776252e6750ac7ecbf190e75ec1f97b1 | Hotfix: fix package delete through package details page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"diff": "{\nforeach (var p in Model.DeletePackagesRequest.Packages)\n{\n- <input type=\"hidden\" name=\"DeletePackagesRequest.Packages[]\" value=\"@p\" />\n+ <input type=\"hidden\" name=\"Packages[]\" value=\"@p\" />\n}\[email protected](\"_DeletePackage\", Model.DeletePackagesRequest)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Hotfix: fix package delete through package details page (#6424) |
455,747 | 13.09.2018 15:25:48 | 25,200 | 6c94791e8e773e2436c755642c1929c89bc0f79a | [NuGet symbol server]Delete snupkg with Package Hard/soft delete | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -431,7 +431,7 @@ public virtual async Task<ActionResult> CreateSymbolPackagePutAsync()\n// Ensure the corresponding package exists before pushing a snupkg.\nvar package = PackageService.FindPackageByIdAndVersionStrict(id, version.ToStringSafe());\n- if (package == null)\n+ if (package == null || package.PackageStatusKey == PackageStatus.Deleted)\n{\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(\nCultureInfo.CurrentCulture,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"diff": "@@ -43,6 +43,9 @@ public class PackageDeleteService\nprivate readonly IPackageDeleteConfiguration _config;\nprivate readonly IStatisticsService _statisticsService;\nprivate readonly ITelemetryService _telemetryService;\n+ private readonly ISymbolPackageFileService _symbolPackageFileService;\n+ private readonly ISymbolPackageService _symbolPackageService;\n+ private readonly IEntityRepository<SymbolPackage> _symbolPackageRepository;\npublic PackageDeleteService(\nIEntityRepository<Package> packageRepository,\n@@ -55,7 +58,10 @@ public class PackageDeleteService\nIAuditingService auditingService,\nIPackageDeleteConfiguration config,\nIStatisticsService statisticsService,\n- ITelemetryService telemetryService)\n+ ITelemetryService telemetryService,\n+ ISymbolPackageFileService symbolPackageFileService,\n+ ISymbolPackageService symbolPackageService,\n+ IEntityRepository<SymbolPackage> symbolPackageRepository)\n{\n_packageRepository = packageRepository ?? throw new ArgumentNullException(nameof(packageRepository));\n_packageRegistrationRepository = packageRegistrationRepository ?? throw new ArgumentNullException(nameof(packageRegistrationRepository));\n@@ -68,6 +74,9 @@ public class PackageDeleteService\n_config = config ?? throw new ArgumentNullException(nameof(config));\n_statisticsService = statisticsService ?? throw new ArgumentNullException(nameof(statisticsService));\n_telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n+ _symbolPackageFileService = symbolPackageFileService ?? throw new ArgumentNullException(nameof(symbolPackageFileService));\n+ _symbolPackageService = symbolPackageService ?? throw new ArgumentNullException(nameof(symbolPackageService));\n+ _symbolPackageRepository = symbolPackageRepository ?? throw new ArgumentNullException(nameof(symbolPackageRepository));\nif (config.HourLimitWithMaximumDownloads.HasValue\n&& config.StatisticsUpdateFrequencyInHours.HasValue\n@@ -267,6 +276,15 @@ public async Task SoftDeletePackagesAsync(IEnumerable<Package> packages, User de\nPackageStatus.Deleted,\ncommitChanges: false);\n+ // Mark all associated symbol packages for deletion.\n+ foreach (var symbolPackage in package.SymbolPackages)\n+ {\n+ await _symbolPackageService.UpdateStatusAsync(\n+ symbolPackage,\n+ PackageStatus.Deleted,\n+ commitChanges: false);\n+ }\n+\npackageDelete.Packages.Add(package);\nawait _auditingService.SaveAuditRecordAsync(CreateAuditRecord(package, package.PackageRegistration, AuditedPackageAction.SoftDelete, reason));\n@@ -278,6 +296,7 @@ public async Task SoftDeletePackagesAsync(IEnumerable<Package> packages, User de\n// Commit changes\nawait _packageRepository.CommitChangesAsync();\n+ await _symbolPackageRepository.CommitChangesAsync();\nawait _packageDeletesRepository.CommitChangesAsync();\ntransaction.Commit();\n}\n@@ -427,23 +446,13 @@ private async Task BackupPackageBinaries(IEnumerable<Package> packages)\n// Backup the package binaries and remove from main storage\nforeach (var package in packages)\n{\n- // Backup the package from the \"validating\" container.\n- using (var packageStream = await _packageFileService.DownloadValidationPackageFileAsync(package))\n- {\n- if (packageStream != null)\n- {\n- await _packageFileService.StorePackageFileInBackupLocationAsync(package, packageStream);\n- }\n- }\n+ // Backup the package and symbols package from the \"validating\" container.\n+ await BackupFromValidationsContainerAsync(_packageFileService, package);\n+ await BackupFromValidationsContainerAsync(_symbolPackageFileService, package);\n- // Backup the package from the \"packages\" container.\n- using (var packageStream = await _packageFileService.DownloadPackageFileAsync(package))\n- {\n- if (packageStream != null)\n- {\n- await _packageFileService.StorePackageFileInBackupLocationAsync(package, packageStream);\n- }\n- }\n+ // Backup the package and symbols package from the \"packages\"/\"symbol-packages\" containers, respectively.\n+ await BackupFromPackagesContainerAsync(_packageFileService, package);\n+ await BackupFromPackagesContainerAsync(_symbolPackageFileService, package);\nvar id = package.PackageRegistration.Id;\nvar version = string.IsNullOrEmpty(package.NormalizedVersion)\n@@ -451,13 +460,38 @@ private async Task BackupPackageBinaries(IEnumerable<Package> packages)\n: package.NormalizedVersion;\nawait _packageFileService.DeletePackageFileAsync(id, version);\n+ await _symbolPackageFileService.DeletePackageFileAsync(id, version);\n+\nawait _packageFileService.DeleteValidationPackageFileAsync(id, version);\n+ await _symbolPackageFileService.DeleteValidationPackageFileAsync(id, version);\n// Delete readme file for this package.\nawait TryDeleteReadMeMdFile(package);\n}\n}\n+ private async Task BackupFromValidationsContainerAsync(ICorePackageFileService fileService, Package package)\n+ {\n+ using (var packageStream = await fileService.DownloadValidationPackageFileAsync(package))\n+ {\n+ if (packageStream != null)\n+ {\n+ await fileService.StorePackageFileInBackupLocationAsync(package, packageStream);\n+ }\n+ }\n+ }\n+\n+ private async Task BackupFromPackagesContainerAsync(ICorePackageFileService fileService, Package package)\n+ {\n+ using (var packageStream = await fileService.DownloadPackageFileAsync(package))\n+ {\n+ if (packageStream != null)\n+ {\n+ await fileService.StorePackageFileInBackupLocationAsync(package, packageStream);\n+ }\n+ }\n+ }\n+\n/// <summary>\n/// Delete package readme.md file, if it exists.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -265,7 +265,7 @@ public async Task CreateSymbolPackage_WillReturn400IfFileIsNotANuGetPackageInter\n}\n[Fact]\n- public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageDoesnNotExist()\n+ public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageDoesNotExist()\n{\n// Arrange\nvar user = new User() { EmailAddress = \"[email protected]\" };\n@@ -287,6 +287,31 @@ public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageDoesnNo\nResultAssert.IsStatusCode(result, HttpStatusCode.NotFound);\n}\n+ [Fact]\n+ public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageIsDeleted()\n+ {\n+ // Arrange\n+ var user = new User() { EmailAddress = \"[email protected]\" };\n+\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.SetCurrentUser(user);\n+\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n+ controller.SetupPackageFromInputStream(nuGetPackage);\n+\n+ controller.MockPackageService\n+ .Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(new Package() {\n+ PackageStatusKey = PackageStatus.Deleted\n+ });\n+\n+ // Act\n+ ActionResult result = await controller.CreateSymbolPackagePutAsync();\n+\n+ // Assert\n+ ResultAssert.IsStatusCode(result, HttpStatusCode.NotFound);\n+ }\n+\n[Fact]\npublic async Task CreateSymbolPackage_UnauthorizedUserWillGet403()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"diff": "@@ -31,6 +31,9 @@ public class PackageDeleteServiceFacts\nMock<IPackageDeleteConfiguration> config = null,\nMock<IStatisticsService> statisticsService = null,\nMock<ITelemetryService> telemetryService = null,\n+ Mock<ISymbolPackageFileService> symbolPackageFileService = null,\n+ Mock<ISymbolPackageService> symbolPackageService = null,\n+ Mock<IEntityRepository<SymbolPackage>> symbolPackageRepository = null,\nAction<Mock<TestPackageDeleteService>> setup = null,\nbool useRealConstructor = false)\n{\n@@ -54,6 +57,10 @@ public class PackageDeleteServiceFacts\ntelemetryService = telemetryService ?? new Mock<ITelemetryService>();\n+ symbolPackageFileService = symbolPackageFileService ?? new Mock<ISymbolPackageFileService>();\n+ symbolPackageService = symbolPackageService ?? new Mock<ISymbolPackageService>();\n+ symbolPackageRepository = symbolPackageRepository ?? new Mock<IEntityRepository<SymbolPackage>>();\n+\nif (useRealConstructor)\n{\nreturn new PackageDeleteService(\n@@ -67,7 +74,10 @@ public class PackageDeleteServiceFacts\nauditingService.Object,\nconfig.Object,\nstatisticsService.Object,\n- telemetryService.Object);\n+ telemetryService.Object,\n+ symbolPackageFileService.Object,\n+ symbolPackageService.Object,\n+ symbolPackageRepository.Object);\n}\nelse\n{\n@@ -82,7 +92,10 @@ public class PackageDeleteServiceFacts\nauditingService.Object,\nconfig.Object,\nstatisticsService.Object,\n- telemetryService.Object);\n+ telemetryService.Object,\n+ symbolPackageFileService.Object,\n+ symbolPackageService.Object,\n+ symbolPackageRepository.Object);\npackageDeleteService.CallBase = true;\n@@ -111,7 +124,10 @@ public class TestPackageDeleteService\nIAuditingService auditingService,\nIPackageDeleteConfiguration config,\nIStatisticsService statisticsService,\n- ITelemetryService telemetryService) : base(\n+ ITelemetryService telemetryService,\n+ ISymbolPackageFileService symbolPackageFileService,\n+ ISymbolPackageService symbolPackageService,\n+ IEntityRepository<SymbolPackage> symbolPackageRepository) : base(\npackageRepository,\npackageRegistrationRepository,\npackageDeletesRepository,\n@@ -122,7 +138,10 @@ public class TestPackageDeleteService\nauditingService,\nconfig,\nstatisticsService,\n- telemetryService)\n+ telemetryService,\n+ symbolPackageFileService,\n+ symbolPackageService,\n+ symbolPackageRepository)\n{\n}\n@@ -539,11 +558,12 @@ public async Task WillInsertNewRecordIntoThePackageDeletesRepository()\n}\n[Fact]\n- public async Task WillUpdateThePackageRepository()\n+ public async Task WillUpdateAllRepositories()\n{\nvar packageRepository = new Mock<IEntityRepository<Package>>();\nvar packageDeleteRepository = new Mock<IEntityRepository<PackageDelete>>();\n- var service = CreateService(packageRepository: packageRepository, packageDeletesRepository: packageDeleteRepository);\n+ var symbolPackageRepository = new Mock<IEntityRepository<SymbolPackage>>();\n+ var service = CreateService(packageRepository: packageRepository, packageDeletesRepository: packageDeleteRepository, symbolPackageRepository: symbolPackageRepository);\nvar packageRegistration = new PackageRegistration();\nvar package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\npackageRegistration.Packages.Add(package);\n@@ -552,6 +572,7 @@ public async Task WillUpdateThePackageRepository()\nawait service.SoftDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty);\npackageRepository.Verify(x => x.CommitChangesAsync());\n+ symbolPackageRepository.Verify(x => x.CommitChangesAsync());\npackageDeleteRepository.Verify(x => x.InsertOnCommit(It.IsAny<PackageDelete>()));\npackageDeleteRepository.Verify(x => x.CommitChangesAsync());\n}\n@@ -571,6 +592,27 @@ public async Task WillUpdatePackageStatusToDeleted()\npackageService.Verify(x => x.UpdatePackageStatusAsync(package, PackageStatus.Deleted, false));\n}\n+ [Fact]\n+ public async Task WillUpdateSymbolPackageStatusToDeleted()\n+ {\n+ var symbolPackageService = new Mock<ISymbolPackageService>();\n+ var service = CreateService(symbolPackageService: symbolPackageService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ var symbolPackage = new SymbolPackage()\n+ {\n+ Package = package,\n+ StatusKey = PackageStatus.Available\n+ };\n+ package.SymbolPackages.Add(symbolPackage);\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+\n+ await service.SoftDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty);\n+\n+ symbolPackageService.Verify(x => x.UpdateStatusAsync(symbolPackage, PackageStatus.Deleted, false));\n+ }\n+\n[Fact]\npublic async Task WillUpdateTheIndexingService()\n{\n@@ -609,6 +651,29 @@ public async Task WillBackupAndDeleteJustThePublicPackageFile()\nTimes.Once);\n}\n+ [Fact]\n+ public async Task WillBackupAndDeleteJustThePublicSymbolPackageFile()\n+ {\n+ var symbolPackageFileService = new Mock<ISymbolPackageFileService>();\n+ symbolPackageFileService.Setup(x => x.DownloadPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+\n+ var service = CreateService(symbolPackageFileService: symbolPackageFileService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+\n+ await service.SoftDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty);\n+\n+ symbolPackageFileService.Verify(\n+ x => x.StorePackageFileInBackupLocationAsync(package, It.IsAny<Stream>()),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeletePackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillBackupAndDeleteJustTheValidationPackageFile()\n{\n@@ -635,6 +700,32 @@ public async Task WillBackupAndDeleteJustTheValidationPackageFile()\nTimes.Once);\n}\n+ [Fact]\n+ public async Task WillBackupAndDeleteJustTheValidationSymbolPackageFile()\n+ {\n+ var symbolPackageFileService = new Mock<ISymbolPackageFileService>();\n+ symbolPackageFileService.Setup(x => x.DownloadValidationPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+\n+ var service = CreateService(symbolPackageFileService: symbolPackageFileService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+\n+ await service.SoftDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty);\n+\n+ symbolPackageFileService.Verify(\n+ x => x.StorePackageFileInBackupLocationAsync(package, It.IsAny<Stream>()),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeletePackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeleteValidationPackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillBackupAndDeleteBothThePublicAndValidationPackageFile()\n{\n@@ -663,6 +754,34 @@ public async Task WillBackupAndDeleteBothThePublicAndValidationPackageFile()\nTimes.Once);\n}\n+ [Fact]\n+ public async Task WillBackupAndDeleteBothThePublicAndValidationSymbolPackageFile()\n+ {\n+ var symbolPackageFileService = new Mock<ISymbolPackageFileService>();\n+ symbolPackageFileService.Setup(x => x.DownloadPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+ symbolPackageFileService.Setup(x => x.DownloadValidationPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+\n+ var service = CreateService(symbolPackageFileService: symbolPackageFileService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+\n+ await service.SoftDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty);\n+\n+ symbolPackageFileService.Verify(\n+ x => x.StorePackageFileInBackupLocationAsync(package, It.IsAny<Stream>()),\n+ Times.Exactly(2));\n+ symbolPackageFileService.Verify(\n+ x => x.DeletePackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeleteValidationPackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillDeleteReadMeFiles()\n{\n@@ -881,6 +1000,32 @@ public async Task WillBackupAndDeleteJustThePublicPackageFile()\nTimes.Once);\n}\n+ [Fact]\n+ public async Task WillBackupAndDeleteJustThePublicSymbolPackageFile()\n+ {\n+ var symbolPackageFileService = new Mock<ISymbolPackageFileService>();\n+ symbolPackageFileService.Setup(x => x.DownloadPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+\n+ var service = CreateService(symbolPackageFileService: symbolPackageFileService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+\n+ await service.HardDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty, false);\n+\n+ symbolPackageFileService.Verify(\n+ x => x.StorePackageFileInBackupLocationAsync(package, It.IsAny<Stream>()),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeletePackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeleteValidationPackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillBackupAndDeleteJustTheValidationPackageFile()\n{\n@@ -907,6 +1052,32 @@ public async Task WillBackupAndDeleteJustTheValidationPackageFile()\nTimes.Once);\n}\n+ [Fact]\n+ public async Task WillBackupAndDeleteJustTheValidationSymbolPackageFile()\n+ {\n+ var symbolPackageFileService = new Mock<ISymbolPackageFileService>();\n+ symbolPackageFileService.Setup(x => x.DownloadValidationPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+\n+ var service = CreateService(symbolPackageFileService: symbolPackageFileService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { Key = 123, PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+\n+ await service.HardDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty, false);\n+\n+ symbolPackageFileService.Verify(\n+ x => x.StorePackageFileInBackupLocationAsync(package, It.IsAny<Stream>()),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeletePackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeleteValidationPackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillBackupAndDeleteBothThePublicAndValidationPackageFile()\n{\n@@ -935,6 +1106,34 @@ public async Task WillBackupAndDeleteBothThePublicAndValidationPackageFile()\nTimes.Once);\n}\n+ [Fact]\n+ public async Task WillBackupAndDeleteBothThePublicAndValidationSymbolPackageFile()\n+ {\n+ var symbolPackageFileService = new Mock<ISymbolPackageFileService>();\n+ symbolPackageFileService.Setup(x => x.DownloadPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+ symbolPackageFileService.Setup(x => x.DownloadValidationPackageFileAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(Stream.Null);\n+\n+ var service = CreateService(symbolPackageFileService: symbolPackageFileService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { Key = 123, PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+\n+ await service.HardDeletePackagesAsync(new[] { package }, user, string.Empty, string.Empty, false);\n+\n+ symbolPackageFileService.Verify(\n+ x => x.StorePackageFileInBackupLocationAsync(package, It.IsAny<Stream>()),\n+ Times.Exactly(2));\n+ symbolPackageFileService.Verify(\n+ x => x.DeletePackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ symbolPackageFileService.Verify(\n+ x => x.DeleteValidationPackageFileAsync(package.PackageRegistration.Id, package.Version),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillDeleteReadMeFile()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [NuGet symbol server]Delete snupkg with Package Hard/soft delete (#6423) |
455,751 | 13.09.2018 16:41:20 | 25,200 | 98213005122f86b40134171a9997c465eecf2788 | Update the validation admin to consider symbol packages.
Update the validation admin to consider symbol packages | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/ValidationController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/ValidationController.cs",
"diff": "using System.Collections.Generic;\nusing System.Linq;\nusing System.Web.Mvc;\n+using NuGet.Services.Validation;\nusing NuGet.Versioning;\nusing NuGetGallery.Areas.Admin.Services;\nusing NuGetGallery.Areas.Admin.ViewModels;\n@@ -30,9 +31,17 @@ public virtual ActionResult Index()\npublic virtual ActionResult Search(string q)\n{\nvar packageValidationSets = _validationAdminService.Search(q ?? string.Empty);\n+ var validatedPackages = new List<ValidatedPackageViewModel>();\n+ AppendValidatedPackages(validatedPackages, packageValidationSets, ValidatingType.Package);\n+ AppendValidatedPackages(validatedPackages, packageValidationSets, ValidatingType.SymbolPackage);\n- // Sort by lexigraphically package ID then put newer stuff on top.\n- var groups = packageValidationSets\n+ return View(nameof(Index), new ValidationPageViewModel(q, validatedPackages));\n+ }\n+\n+ private void AppendValidatedPackages(List<ValidatedPackageViewModel> validatedPackages, IEnumerable<PackageValidationSet> validationSets, ValidatingType validatingType)\n+ {\n+ var groups = validationSets\n+ .Where(x => x.ValidatingType == validatingType)\n.OrderBy(x => x.PackageId)\n.ThenByDescending(x => NuGetVersion.Parse(x.PackageNormalizedVersion))\n.ThenByDescending(x => x.PackageKey)\n@@ -40,7 +49,6 @@ public virtual ActionResult Search(string q)\n.ThenByDescending(x => x.Key)\n.GroupBy(x => x.PackageKey);\n- var validatedPackages = new List<ValidatedPackageViewModel>();\nforeach (var group in groups)\n{\nforeach (var set in group)\n@@ -51,13 +59,10 @@ public virtual ActionResult Search(string q)\n.ThenByDescending(x => x.ValidationStatusTimestamp)\n.ToList();\n}\n-\n- var deletedStatus = _validationAdminService.GetPackageDeletedStatus(group.Key);\n- var validatedPackage = new ValidatedPackageViewModel(group.ToList(), deletedStatus);\n+ var deletedStatus = _validationAdminService.GetDeletedStatus(group.Key, validatingType);\n+ var validatedPackage = new ValidatedPackageViewModel(group.ToList(), deletedStatus, validatingType);\nvalidatedPackages.Add(validatedPackage);\n}\n-\n- return View(nameof(Index), new ValidationPageViewModel(q, validatedPackages));\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Services/ValidationAdminService.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Services/ValidationAdminService.cs",
"diff": "@@ -16,15 +16,18 @@ public class ValidationAdminService\nprivate readonly IEntityRepository<PackageValidationSet> _validationSets;\nprivate readonly IEntityRepository<PackageValidation> _validations;\nprivate readonly IEntityRepository<Package> _packages;\n+ private readonly IEntityRepository<SymbolPackage> _symbolPackages;\npublic ValidationAdminService(\nIEntityRepository<PackageValidationSet> validationSets,\nIEntityRepository<PackageValidation> validations,\n- IEntityRepository<Package> packages)\n+ IEntityRepository<Package> packages,\n+ IEntityRepository<SymbolPackage> symbolPackages)\n{\n_validationSets = validationSets ?? throw new ArgumentNullException(nameof(validationSets));\n_validations = validations ?? throw new ArgumentNullException(nameof(validations));\n_packages = packages ?? throw new ArgumentNullException(nameof(packages));\n+ _symbolPackages = symbolPackages ?? throw new ArgumentNullException(nameof(symbolPackages));\n}\n/// <summary>\n@@ -52,6 +55,19 @@ public IReadOnlyList<PackageValidationSet> Search(string query)\n.ToList();\n}\n+ public PackageDeletedStatus GetDeletedStatus(int key, ValidatingType validatingType)\n+ {\n+ switch (validatingType)\n+ {\n+ case ValidatingType.Package:\n+ return GetPackageDeletedStatus(key);\n+ case ValidatingType.SymbolPackage:\n+ return GetSymbolPackageDeletedStatus(key);\n+ default:\n+ return PackageDeletedStatus.Unknown;\n+ }\n+ }\n+\n/// <summary>\n/// Determines if deleted status of the provided package key. This method is unable to differentiate between\n/// a hard deleted package and a package that never existed in the first place. Therefore,\n@@ -76,6 +92,25 @@ public PackageDeletedStatus GetPackageDeletedStatus(int packageKey)\nreturn PackageDeletedStatus.NotDeleted;\n}\n+ public PackageDeletedStatus GetSymbolPackageDeletedStatus(int symbolPackageKey)\n+ {\n+ var symbolPackage = _symbolPackages\n+ .GetAll()\n+ .Where(x => x.Key == symbolPackageKey)\n+ .FirstOrDefault();\n+\n+ if (symbolPackage == null)\n+ {\n+ return PackageDeletedStatus.Unknown;\n+ }\n+ else if (symbolPackage.StatusKey == PackageStatus.Deleted)\n+ {\n+ return PackageDeletedStatus.SoftDeleted;\n+ }\n+\n+ return PackageDeletedStatus.NotDeleted;\n+ }\n+\nprivate void SearchByValidationSetTrackingId(Dictionary<long, PackageValidationSet> validationSets, string line)\n{\nif (Guid.TryParse(line, out Guid guid))\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Areas/Admin/ViewModels/PackageValidationViewModel.cs",
"new_path": "src/NuGetGallery/Areas/Admin/ViewModels/ValidatedPackageViewModel.cs",
"diff": "@@ -10,7 +10,7 @@ namespace NuGetGallery.Areas.Admin.ViewModels\n{\npublic class ValidatedPackageViewModel\n{\n- public ValidatedPackageViewModel(IReadOnlyList<PackageValidationSet> validationSets, PackageDeletedStatus deletedStatus)\n+ public ValidatedPackageViewModel(IReadOnlyList<PackageValidationSet> validationSets, PackageDeletedStatus deletedStatus, ValidatingType validatingType)\n{\nvar first = validationSets.First();\nPackageKey = first.PackageKey;\n@@ -18,6 +18,7 @@ public ValidatedPackageViewModel(IReadOnlyList<PackageValidationSet> validationS\nNormalizedVersion = first.PackageNormalizedVersion;\nDeletedStatus = deletedStatus;\nValidationSets = validationSets;\n+ ValidatingType = validatingType;\n}\npublic int PackageKey { get; }\n@@ -25,5 +26,7 @@ public ValidatedPackageViewModel(IReadOnlyList<PackageValidationSet> validationS\npublic string NormalizedVersion { get; }\npublic PackageDeletedStatus DeletedStatus { get; }\npublic IReadOnlyList<PackageValidationSet> ValidationSets { get; }\n+\n+ public ValidatingType ValidatingType { get; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml",
"diff": "@switch (package.DeletedStatus)\n{\ncase PackageDeletedStatus.Unknown:\n- <i>This package was hard deleted.</i><br />\n+ <i>This @package.ValidatingType.ToString().ToLower() was hard deleted.</i><br />\nbreak;\ncase PackageDeletedStatus.SoftDeleted:\n- <i>This package was soft deleted.</i><br />\n+ <i>This @package.ValidatingType.ToString().ToLower() was soft deleted.</i><br />\nbreak;\n}\n- <b>Package Key:</b> @package.PackageKey<br />\n- @if (package.DeletedStatus == PackageDeletedStatus.NotDeleted)\n+ <b>@package.ValidatingType Key:</b> @package.PackageKey<br />\n+ @if (package.DeletedStatus == PackageDeletedStatus.NotDeleted && package.ValidatingType == ValidatingType.Package )\n{\n<a href=\"@Url.RevalidatePackage(package.Id, package.NormalizedVersion)\">Revalidate</a><br />\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Areas\\Admin\\ViewModels\\HardDeleteReflowBulkRequest.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\HardDeleteReflowRequest.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\LockPackageViewModel.cs\" />\n- <Compile Include=\"Areas\\Admin\\ViewModels\\PackageValidationViewModel.cs\" />\n+ <Compile Include=\"Areas\\Admin\\ViewModels\\ValidatedPackageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\RevalidationPageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\ValidationPageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\ISupportRequestService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Areas/Admin/Services/ValidationAdminServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Areas/Admin/Services/ValidationAdminServiceFacts.cs",
"diff": "@@ -73,10 +73,56 @@ public void ReturnsSoftDeletedForDeletedPackage()\n}\n}\n+ public class TheGetSymbolsPackageDeletedStatusMethod : FactsBase\n+ {\n+ [Fact]\n+ public void ReturnsUnknownForMissingPackage()\n+ {\n+ // Arrange\n+ _symbolPackages\n+ .Setup(x => x.GetAll())\n+ .Returns(() => Enumerable.Empty < SymbolPackage>().AsQueryable());\n+\n+ // Act\n+ var status = _target.GetSymbolPackageDeletedStatus(_symbolPackageKey);\n+\n+ // Assert\n+ Assert.Equal(PackageDeletedStatus.Unknown, status);\n+ }\n+\n+ [Fact]\n+ public void ReturnsNotDeletedForNonDeletedPackage()\n+ {\n+ // Arrange\n+ _symbolPackage.StatusKey = PackageStatus.Available;\n+\n+ // Act\n+ var status = _target.GetSymbolPackageDeletedStatus(_symbolPackageKey);\n+\n+ // Assert\n+ Assert.Equal(PackageDeletedStatus.NotDeleted, status);\n+ }\n+\n+ [Fact]\n+ public void ReturnsSoftDeletedForDeletedPackage()\n+ {\n+ // Arrange\n+ _symbolPackage.StatusKey = PackageStatus.Deleted;\n+\n+ // Act\n+ var status = _target.GetSymbolPackageDeletedStatus(_symbolPackageKey);\n+\n+ // Assert\n+ Assert.Equal(PackageDeletedStatus.SoftDeleted, status);\n+ }\n+ }\n+\npublic abstract class FactsBase\n{\nprotected readonly int _packageKey;\nprotected readonly Package _package;\n+ protected readonly int _symbolPackageKey;\n+ protected readonly SymbolPackage _symbolPackage;\nprotected readonly Guid _validationKey;\nprotected readonly PackageValidation _validation;\nprotected readonly int _validationSetKey;\n@@ -85,12 +131,15 @@ public abstract class FactsBase\nprotected readonly Mock<IEntityRepository<PackageValidationSet>> _validationSets;\nprotected readonly Mock<IEntityRepository<PackageValidation>> _validations;\nprotected readonly Mock<IEntityRepository<Package>> _packages;\n+ protected readonly Mock<IEntityRepository<SymbolPackage>> _symbolPackages;\nprotected readonly ValidationAdminService _target;\npublic FactsBase()\n{\n_packageKey = 42;\n+ _symbolPackageKey = 420;\n_package = new Package { Key = _packageKey };\n+ _symbolPackage = new SymbolPackage() { Key = _symbolPackageKey };\n_validationKey = new Guid(\"ae05c5f9-eb2a-415b-ae42-92829bf201a7\");\n_validation = new PackageValidation\n{\n@@ -109,10 +158,14 @@ public FactsBase()\n_validationSets = new Mock<IEntityRepository<PackageValidationSet>>();\n_validations = new Mock<IEntityRepository<PackageValidation>>();\n_packages = new Mock<IEntityRepository<Package>>();\n+ _symbolPackages = new Mock<IEntityRepository<SymbolPackage>>();\n_packages\n.Setup(x => x.GetAll())\n.Returns(() => new[] { _package }.AsQueryable());\n+ _symbolPackages\n+ .Setup(x => x.GetAll())\n+ .Returns(() => new[] { _symbolPackage }.AsQueryable());\n_validations\n.Setup(x => x.GetAll())\n.Returns(() => new[] { _validation }.AsQueryable());\n@@ -123,7 +176,8 @@ public FactsBase()\n_target = new ValidationAdminService(\n_validationSets.Object,\n_validations.Object,\n- _packages.Object);\n+ _packages.Object,\n+ _symbolPackages.Object);\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update the validation admin to consider symbol packages. (#6393)
Update the validation admin to consider symbol packages |
455,747 | 18.09.2018 13:21:30 | 25,200 | ea8c2902f56950faf4ac482b602d2b42d340efad | [NuGet Symbol Server] Auditing - Gallery core changes | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditedAuthenticatedOperationAction.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditedAuthenticatedOperationAction.cs",
"diff": "@@ -23,6 +23,11 @@ public enum AuditedAuthenticatedOperationAction\n/// <summary>\n/// Login failed, user is an organization and should not have credentials.\n/// </summary>\n- FailedLoginUserIsOrganization\n+ FailedLoginUserIsOrganization,\n+\n+ /// <summary>\n+ /// Symbol package push was attempted by a non-owner of the package\n+ /// </summary>\n+ SymbolsPackagePushAttemptByNonOwner\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditedPackageAction.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditedPackageAction.cs",
"diff": "@@ -15,6 +15,8 @@ public enum AuditedPackageAction\nEdit,\n[Obsolete(\"Undo package edit functionality is being retired.\")]\nUndoEdit,\n- Verify\n+ Verify,\n+ SymbolsCreate,\n+ SymbolsDelete\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedAuthenticatedOperationActionTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedAuthenticatedOperationActionTests.cs",
"diff": "@@ -15,7 +15,8 @@ public void Definition_HasNotChanged()\n\"FailedLoginInvalidPassword\",\n\"FailedLoginNoSuchUser\",\n\"FailedLoginUserIsOrganization\",\n- \"PackagePushAttemptByNonOwner\"\n+ \"PackagePushAttemptByNonOwner\",\n+ \"SymbolsPackagePushAttemptByNonOwner\"\n};\nVerify(typeof(AuditedAuthenticatedOperationAction), expectedNames);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedPackageActionTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedPackageActionTests.cs",
"diff": "@@ -19,7 +19,9 @@ public void Definition_HasNotChanged()\n\"SoftDelete\",\n\"Unlist\",\n\"UndoEdit\",\n- \"Verify\"\n+ \"Verify\",\n+ \"SymbolsCreate\",\n+ \"SymbolsDelete\"\n};\nVerify(typeof(AuditedPackageAction), expectedNames);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [NuGet Symbol Server] Auditing - Gallery core changes (#6427) |
455,751 | 18.09.2018 15:55:14 | 25,200 | 5e04233723f6de1b7f6062a595e7b6ab955507e2 | More cleanup of Elmah
Clean Elmah | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"diff": "@@ -190,6 +190,12 @@ public override string Log(Error error)\nprivate void Obfuscate(Error error)\n{\n+ error.User = string.Empty;\n+ if (error.Form != null)\n+ {\n+ error.Form.Clear();\n+ }\n+\n//ServerVariables overrides requiring context from the http request should be handled in NuGetGallery.QuietLog\nvar elmahException = error.Exception as ElmahException;\nif (elmahException != null)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | More cleanup of Elmah (#6429)
Clean Elmah |
455,747 | 18.09.2018 16:16:22 | 25,200 | ab486a0508583d0e9e73efd1af427ff096abc689 | [NuGet Symbol Server] Auditing | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -444,6 +444,13 @@ public virtual async Task<ActionResult> CreateSymbolPackagePutAsync()\nvar apiScopeEvaluationResult = EvaluateApiScope(ActionsRequiringPermissions.UploadSymbolPackage, package.PackageRegistration, NuGetScopes.PackagePushVersion, NuGetScopes.PackagePush);\nif (!apiScopeEvaluationResult.IsSuccessful())\n{\n+ await AuditingService.SaveAuditRecordAsync(\n+ new FailedAuthenticatedOperationAuditRecord(\n+ currentUser.Username,\n+ AuditedAuthenticatedOperationAction.SymbolsPackagePushAttemptByNonOwner,\n+ attemptedPackage: new AuditedPackageIdentifier(\n+ id, version.ToNormalizedStringSafe())));\n+\n// User cannot push a symbol package as the current user's scopes does not allow it to push for the corresponding package.\nreturn GetHttpResultFromFailedApiScopeEvaluationForPush(apiScopeEvaluationResult, id, version);\n}\n@@ -467,6 +474,7 @@ public virtual async Task<ActionResult> CreateSymbolPackagePutAsync()\n{\nmessage = ex.Message;\n}\n+\nTelemetryService.TrackSymbolPackageFailedGalleryValidationEvent(id, normalizedVersion);\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.BadRequest, message);\n}\n@@ -497,6 +505,9 @@ public virtual async Task<ActionResult> CreateSymbolPackagePutAsync()\nthrow new NotImplementedException($\"The symbol package commit result {commitResult} is not supported.\");\n}\n+ await AuditingService.SaveAuditRecordAsync(\n+ new PackageAuditRecord(package, AuditedPackageAction.SymbolsCreate, PackageCreatedVia.Api));\n+\nTelemetryService.TrackSymbolPackagePushEvent(id, normalizedVersion);\nreturn new HttpStatusCodeResult(HttpStatusCode.Created);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -321,8 +321,9 @@ public async Task CreateSymbolPackage_UnauthorizedUserWillGet403()\nvar controller = new TestableApiController(GetConfigurationService());\ncontroller.SetCurrentUser(user);\n-\n- var nuGetPackage = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n+ var packageId = \"theId\";\n+ var version = \"1.0.42\";\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, version);\ncontroller.SetupPackageFromInputStream(nuGetPackage);\nvar package = new Package()\n@@ -357,6 +358,16 @@ public async Task CreateSymbolPackage_UnauthorizedUserWillGet403()\n// Assert\nResultAssert.IsStatusCode(result, HttpStatusCode.Unauthorized);\n+\n+ controller.AuditingService.WroteRecord<FailedAuthenticatedOperationAuditRecord>(\n+ (record) =>\n+ {\n+ return\n+ record.UsernameOrEmail == user.Username &&\n+ record.Action == AuditedAuthenticatedOperationAction.SymbolsPackagePushAttemptByNonOwner &&\n+ record.AttemptedPackage.Id == packageId &&\n+ record.AttemptedPackage.Version == version;\n+ });\n}\n[Fact]\n@@ -520,7 +531,13 @@ public async Task CreateSymbolPackage_WillCreateSymbolPackageSuccessfully()\ncontroller.MockTelemetryService.Verify(\nx => x.TrackSymbolPackagePushEvent(It.IsAny<string>(), It.IsAny<string>()),\nTimes.Once());\n+\nResultAssert.IsStatusCode(result, HttpStatusCode.Created);\n+\n+ Assert.True(controller.AuditingService.WroteRecord<PackageAuditRecord>(ar =>\n+ ar.Action == AuditedPackageAction.SymbolsCreate\n+ && ar.Id == package.PackageRegistration.Id\n+ && ar.Version == package.Version));\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [NuGet Symbol Server] Auditing (#6431) |
455,751 | 19.09.2018 14:32:44 | 25,200 | 2563c63154e86c8693f649787cbd7ecbea8678c9 | Add the Send email for symbol apis.
Add support for symbols in ICoreMessageService. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreMessageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreMessageService.cs",
"diff": "@@ -13,5 +13,8 @@ public interface ICoreMessageService\nTask SendPackageAddedWithWarningsNoticeAsync(Package package, string packageUrl, string packageSupportUrl, IEnumerable<string> warningMessages);\nTask SendPackageValidationFailedNoticeAsync(Package package, PackageValidationSet validationSet, string packageUrl, string packageSupportUrl, string announcementsUrl, string twitterUrl);\nTask SendValidationTakingTooLongNoticeAsync(Package package, string packageUrl);\n+ Task SendValidationTakingTooLongNoticeAsync(SymbolPackage symbolPackage, string packageUrl);\n+ Task SendSymbolPackageAddedNoticeAsync(SymbolPackage symbolPackage, string packageUrl, string packageSupportUrl, string emailSettingsUrl, IEnumerable<string> warningMessages = null);\n+ Task SendSymbolPackageValidationFailedNoticeAsync(SymbolPackage symbolPackage, PackageValidationSet validationSet, string packageUrl, string packageSupportUrl, string announcementsUrl, string twitterUrl);\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add the Send email for symbol apis. (#6415)
Add support for symbols in ICoreMessageService. |
455,759 | 20.09.2018 20:42:06 | -7,200 | 4fafe75108dfc16661dc1f5cc2cd58a4f34792aa | Non compliant package didn't fail validation | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/RequirePackageMetadataCompliancePolicy.cs",
"new_path": "src/NuGetGallery/Security/RequirePackageMetadataCompliancePolicy.cs",
"diff": "@@ -116,7 +116,8 @@ private bool IsPackageMetadataCompliant(Package package, State state, out IList<\n// Author validation\nif (!package.FlattenedAuthors\n- .Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)\n+ .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)\n+ .Select(s => s.Trim())\n.Contains(state.RequiredCoOwnerUsername, StringComparer.InvariantCultureIgnoreCase))\n{\ncomplianceFailures.Add(string.Format(CultureInfo.CurrentCulture, Strings.SecurityPolicy_RequiredAuthorMissing, state.RequiredCoOwnerUsername));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/RequirePackageMetadataCompliancePolicyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/RequirePackageMetadataCompliancePolicyFacts.cs",
"diff": "@@ -335,7 +335,7 @@ public static IReadOnlyCollection<Package> CreateNonCompliantPackages()\n// Ensure authors is non-compliant.\nvar nonCompliantPackage4 = CreateCompliantPackage(version, newPackageRegistration);\n- nonCompliantPackage4.FlattenedAuthors = \"NuGet\";\n+ nonCompliantPackage4.FlattenedAuthors = \"Microsoft Communications Platform\";\nnonCompliantPackages.Add(nonCompliantPackage4);\nreturn nonCompliantPackages;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Non compliant package didn't fail validation (#6436) |
455,737 | 26.09.2018 14:45:11 | 25,200 | 2107f03a0b2878b42898579b21dc70fc76db91e1 | Correct default aria-expanded states. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Edit.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Edit.cshtml",
"diff": "<div id=\"select-package-version-container\">\n<h2>\n<a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#select-package-version-form\"\n- aria-expanded=\"false\" aria-controls=\"select-package-version-form\" id=\"show-select-package-version-form\">\n+ aria-expanded=\"true\" aria-controls=\"select-package-version-form\" id=\"show-select-package-version-form\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>Select Version</span>\n</a>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"diff": "<div id=\"upload-package-container\">\n<h2>\n<a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#upload-package-form\"\n- aria-expanded=\"false\" aria-controls=\"upload-package-form\" id=\"show-upload-package-form\">\n+ aria-expanded=\"true\" aria-controls=\"upload-package-form\" id=\"show-upload-package-form\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>Upload</span>\n</a>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_EditForm.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_EditForm.cshtml",
"diff": "<div id=\"readme-collapser-container\" class=\"hidden\">\n<h2>\n<a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#readme-package-form\"\n- aria-expanded=\"false\" aria-controls=\"readme-package-form\" id=\"show-readme-package-form\">\n+ aria-expanded=\"true\" aria-controls=\"readme-package-form\" id=\"show-readme-package-form\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>Import Documentation</span>\n</a>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyForm.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyForm.cshtml",
"diff": "<div id=\"readme-collapser-container\" class=\"hidden\">\n<h2>\n<a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#readme-package-form\"\n- aria-expanded=\"false\" aria-controls=\"readme-package-form\" id=\"show-readme-package-form\">\n+ aria-expanded=\"true\" aria-controls=\"readme-package-form\" id=\"show-readme-package-form\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>Import Documentation</span>\n</a>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Correct default aria-expanded states. (#6484) |
455,736 | 27.09.2018 14:41:16 | 25,200 | 5f3979aaf9b0250edbe2afe2504c181cbe5bb4fa | Fix handling of missing header case in UploadHelper
Also, clean up the parsed GUID to avoid weird casing or leading space issues
Fix | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/UploadHelper.cs",
"new_path": "src/NuGetGallery/Helpers/UploadHelper.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.Collections.Specialized;\nnamespace NuGetGallery.Helpers\n@@ -20,9 +19,9 @@ public static string GetUploadTracingKey(NameValueCollection headers)\ntry\n{\nuploadTracingKey = headers[CoreConstants.UploadTracingKeyHeaderName];\n- Guid.Parse(uploadTracingKey);\n+ uploadTracingKey = Guid.Parse(uploadTracingKey).ToString();\n}\n- catch (Exception ex) when (ex is FormatException || ex is KeyNotFoundException)\n+ catch (Exception ex) when (ex is FormatException || ex is ArgumentNullException)\n{\n// An upload tracing key was not found\n// Simultaneous UI uploads might have strange behaviour.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Framework\\MemberDataHelper.cs\" />\n<Compile Include=\"Helpers\\ObfuscationHelperFacts.cs\" />\n<Compile Include=\"Helpers\\PackageHelperTests.cs\" />\n+ <Compile Include=\"Helpers\\UploadHelperFacts.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\ApiKeyV3Facts.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\ApiKeyV4Facts.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\V3HasherTests.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix handling of missing header case in UploadHelper (#6491)
Also, clean up the parsed GUID to avoid weird casing or leading space issues
Fix https://github.com/NuGet/NuGetGallery/issues/6490 |
455,736 | 27.09.2018 16:14:46 | 25,200 | 3364ff692b86149c275f45da3572b5b44b9c9717 | Remove functional tests depending on auto-curation of packages
Progress on | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/PackageCreationHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/PackageCreationHelper.cs",
"diff": "@@ -39,35 +39,6 @@ public async Task<string> CreatePackage(string packageName, string version = \"1.\nreturn path;\n}\n- /// <summary>\n- /// Creates a windows 8 curated package given the package name and version.\n- /// </summary>\n- /// <param name=\"packageName\"></param>\n- /// <param name=\"version\"></param>\n- /// <returns></returns>\n- public async Task<string> CreateWindows8CuratedPackage(string packageName, string version = \"1.0.0\")\n- {\n- var nuspecHelper = new NuspecHelper(TestOutputHelper);\n- string nuspecFileFullPath = await nuspecHelper.CreateDefaultNuspecFile(packageName, version);\n- NuspecHelper.AddWindows8Tag(nuspecFileFullPath);\n- return await CreatePackageInternal(nuspecFileFullPath);\n- }\n-\n- /// <summary>\n- /// Creates a windows 8 curated package given the package name and version.\n- /// </summary>\n- /// <param name=\"packageName\"></param>\n- /// <param name=\"version\"></param>\n- /// <returns></returns>\n- public async Task<string> CreateWebMatrixCuratedPackage(string packageName, string version = \"1.0.0\")\n- {\n- var nuspecHelper = new NuspecHelper(TestOutputHelper);\n- string nuspecFileFullPath = await nuspecHelper.CreateDefaultNuspecFile(packageName, version);\n- NuspecHelper.AddWebMatrixTag(nuspecFileFullPath);\n- return await CreatePackageInternal(nuspecFileFullPath);\n- }\n-\n-\n/// <summary>\n/// Creates a package with the specified minclient version.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/UrlHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/UrlHelper.cs",
"diff": "@@ -24,8 +24,6 @@ public class UrlHelper\nprivate const string _uploadPageUrlSuffix = \"packages/manage/Upload\";\nprivate const string _cancelUploadPageUrlSuffix = \"packages/manage/cancel-upload\";\nprivate const string _verifyUploadPageUrlSuffix = \"/packages/manage/verify-upload\";\n- private const string _windows8CuratedFeedUrlSuffix = \"curated-feeds/windows8-packages/\";\n- private const string _webMatrixCuratedFeedUrlSuffix = \"curated-feeds/webmatrix/\";\nprivate const string _dotnetCuratedFeedUrlSuffix = \"curated-feeds/microsoftdotnet/\";\nprivate const string _accountPageUrlSuffix = \"/account\";\nprivate const string _accountUnscribeUrlSuffix = \"account/subscription/change\";\n@@ -146,16 +144,6 @@ public static string LogonPageUrlOnPackageUpload\nget { return BaseUrl + _logonPageUrlOnPackageUploadSuffix; }\n}\n- public static string Windows8CuratedFeedUrl\n- {\n- get { return V2FeedRootUrl + _windows8CuratedFeedUrlSuffix; }\n- }\n-\n- public static string WebMatrixCuratedFeedUrl\n- {\n- get { return V2FeedRootUrl + _webMatrixCuratedFeedUrlSuffix; }\n- }\n-\npublic static string DotnetCuratedFeedUrl\n{\nget { return V2FeedRootUrl + _dotnetCuratedFeedUrlSuffix; }\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"diff": "<Compile Include=\"Commandline\\NuGetCommandLineTests.cs\" />\n<Compile Include=\"Commandline\\NuGetCoreTests.cs\" />\n<Compile Include=\"ODataFeeds\\CuratedFeedTest.cs\" />\n- <Compile Include=\"ODataFeeds\\FeedType.cs\" />\n<Compile Include=\"ODataFeeds\\SearchTest.cs\" />\n<Compile Include=\"ODataFeeds\\V2FeedExtendedTests.cs\" />\n<Compile Include=\"PackageCreation\\ApiPushTests.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/CuratedFeedTest.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/CuratedFeedTest.cs",
"diff": "using System.ComponentModel;\nusing System.IO;\nusing System.Net;\n-using System.Threading;\nusing System.Threading.Tasks;\nusing Xunit;\nusing Xunit.Abstractions;\n@@ -47,49 +46,13 @@ public async Task SearchMicrosoftDotNetCuratedFeed()\nAssert.Contains(packageUrl.ToLowerInvariant(), responseText.ToLowerInvariant());\n}\n- [Fact]\n- [Description(\"Performs a querystring-based search of the Windows 8 curated feed. Confirms expected packages are returned.\")]\n- [Priority(0)]\n- [Category(\"P0Tests\")]\n- public async Task SearchWindows8CuratedFeed()\n- {\n- string packageName = \"NuGetGallery.FunctionalTests.SearchWindows8CuratedFeed\";\n- string ticks = DateTime.Now.Ticks.ToString();\n- string version = new Version(ticks.Substring(0, 6) + \".\" + ticks.Substring(6, 6) + \".\" + ticks.Substring(12, 6)).ToString();\n-\n- int exitCode = await UploadPackageToCuratedFeed(packageName, version, FeedType.Windows8CuratedFeed);\n- Assert.True((exitCode == 0), Constants.UploadFailureMessage);\n-\n- bool applied = CheckPackageExistInCuratedFeed(packageName, FeedType.Windows8CuratedFeed);\n- var userMessage = string.Format(Constants.PackageNotFoundAfterUpload, packageName, UrlHelper.Windows8CuratedFeedUrl);\n- Assert.True(applied, userMessage);\n- }\n-\n- [Fact]\n- [Description(\"Performs a querystring-based search of the WebMatrix curated feed. Confirms expected packages are returned.\")]\n- [Priority(0)]\n- [Category(\"P0Tests\")]\n- public async Task SearchWebMatrixCuratedFeed()\n- {\n- string packageName = \"NuGetGallery.FunctionalTests.SearchWebMatrixCuratedFeed\";\n- string ticks = DateTime.Now.Ticks.ToString();\n- string version = new Version(ticks.Substring(0, 6) + \".\" + ticks.Substring(6, 6) + \".\" + ticks.Substring(12, 6)).ToString();\n-\n- int exitCode = await UploadPackageToCuratedFeed(packageName, version, FeedType.WebMatrixCuratedFeed);\n- Assert.True((exitCode == 0), Constants.UploadFailureMessage);\n-\n- bool applied = CheckPackageExistInCuratedFeed(packageName, FeedType.WebMatrixCuratedFeed);\n- var userMessage = string.Format(Constants.PackageNotFoundAfterUpload, packageName, UrlHelper.WebMatrixCuratedFeedUrl);\n- Assert.True(applied, userMessage);\n- }\n-\n[Fact]\n[Description(\"Validates the microsoftdotnet feed, including the next page link\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\npublic async Task ValidateMicrosoftDotNetCuratedFeed()\n{\n- var request = WebRequest.Create(GetCuratedFeedUrl(FeedType.DotnetCuratedFeed) + \"Packages\");\n+ var request = WebRequest.Create(UrlHelper.DotnetCuratedFeedUrl + \"Packages\");\nvar response = await request.GetResponseAsync();\nstring responseText;\n@@ -121,68 +84,5 @@ public async Task ValidateMicrosoftDotNetCuratedFeed()\n}\n}\n}\n-\n- private async Task<int> UploadPackageToCuratedFeed(string packageName, string version, FeedType feedType)\n- {\n- string packageFullPath = string.Empty;\n- switch (feedType)\n- {\n- case FeedType.Windows8CuratedFeed:\n- packageFullPath = await _packageCreationHelper.CreateWindows8CuratedPackage(packageName, version);\n- break;\n- case FeedType.WebMatrixCuratedFeed:\n- packageFullPath = await _packageCreationHelper.CreateWindows8CuratedPackage(packageName, version);\n- break;\n- }\n- var processResult = await _commandlineHelper.UploadPackageAsync(packageFullPath, UrlHelper.V2FeedPushSourceUrl);\n- return processResult.ExitCode;\n- }\n-\n- private string GetCuratedFeedUrl(FeedType type)\n- {\n- string url = string.Empty;\n- switch (type)\n- {\n- case FeedType.Windows8CuratedFeed:\n- url = UrlHelper.Windows8CuratedFeedUrl;\n- break;\n- case FeedType.WebMatrixCuratedFeed:\n- url = UrlHelper.WebMatrixCuratedFeedUrl;\n- break;\n- case FeedType.DotnetCuratedFeed:\n- url = UrlHelper.DotnetCuratedFeedUrl;\n- break;\n- }\n- return url;\n- }\n-\n- private bool CheckPackageExistInCuratedFeed(string packageName, FeedType feedType)\n- {\n- string curatedFeedUrl = GetCuratedFeedUrl(feedType);\n- var maxAttempts = 10;\n- var interval = 30;\n- bool applied = false;\n-\n- TestOutputHelper.WriteLine(\"Starting package verification checks ({0} attempts, interval {1} seconds).\", maxAttempts, interval);\n-\n- for (int i = 0; i < maxAttempts && applied == false; i++)\n- {\n- TestOutputHelper.WriteLine(\"[verification attempt {0}]: Waiting {1} seconds before next check...\", i, interval);\n- if (i != 0)\n- {\n- Thread.Sleep(interval * 1000);\n- }\n- else\n- {\n- Thread.Sleep(5000);\n- }\n-\n- if (_clientSdkHelper.CheckIfPackageExistsInSource(packageName, curatedFeedUrl))\n- {\n- applied = true;\n- }\n- }\n- return applied;\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/SearchTest.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/SearchTest.cs",
"diff": "@@ -28,7 +28,7 @@ public async Task SearchV1Feed()\n}\n[Fact]\n- [Description(\"Performs a querystring-based search of the default (non-curated) v2 feed. Confirms expected packages are returned.\")]\n+ [Description(\"Performs a querystring-based search of the v2 feed. Confirms expected packages are returned.\")]\n[Priority(0)]\n[Category(\"P0Tests\")]\npublic async Task SearchV2Feed()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Security/HttpToHttpsRedirectTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Security/HttpToHttpsRedirectTests.cs",
"diff": "@@ -22,8 +22,6 @@ public class HttpToHttpsRedirectTests\nnew object[] { UrlHelper.AggregateStatsPageUrl },\nnew object[] { UrlHelper.UploadPageUrl },\nnew object[] { UrlHelper.VerifyUploadPageUrl },\n- new object[] { UrlHelper.Windows8CuratedFeedUrl },\n- new object[] { UrlHelper.WebMatrixCuratedFeedUrl },\n};\npublic static IEnumerable<object[]> UrlsExcludedFromRedirect => new[]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove functional tests depending on auto-curation of packages (#6493)
Progress on https://github.com/NuGet/NuGetGallery/issues/6469 |
455,736 | 27.09.2018 17:49:36 | 25,200 | db22bca31d5619fd22d5d2056489d3dc002bc164 | Use mock IDbContextTransaction instead of concrete transaction object
Fix | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/DatabaseWrapper.cs",
"new_path": "src/NuGetGallery.Core/Entities/DatabaseWrapper.cs",
"diff": "@@ -23,9 +23,9 @@ public Task<int> ExecuteSqlCommandAsync(string sql, params object[] parameters)\nreturn _database.ExecuteSqlCommandAsync(sql, parameters);\n}\n- public DbContextTransaction BeginTransaction()\n+ public IDbContextTransaction BeginTransaction()\n{\n- return _database.BeginTransaction();\n+ return new DbContextTransactionWrapper(_database.BeginTransaction());\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/IDatabase.cs",
"new_path": "src/NuGetGallery.Core/Entities/IDatabase.cs",
"diff": "@@ -8,7 +8,7 @@ namespace NuGetGallery\n{\npublic interface IDatabase\n{\n- DbContextTransaction BeginTransaction();\n+ IDbContextTransaction BeginTransaction();\nTask<int> ExecuteSqlCommandAsync(string sql, params object[] parameters);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\CuratedFeed.cs\" />\n<Compile Include=\"Entities\\CuratedPackage.cs\" />\n<Compile Include=\"Entities\\DatabaseWrapper.cs\" />\n+ <Compile Include=\"Entities\\DbContextTransactionWrapper.cs\" />\n<Compile Include=\"Entities\\IDatabase.cs\" />\n+ <Compile Include=\"Entities\\IDbContextTransaction.cs\" />\n<Compile Include=\"Entities\\Membership.cs\" />\n<Compile Include=\"Entities\\Organization.cs\" />\n<Compile Include=\"Entities\\AccountDelete.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Data.Entity;\nusing System.Linq;\nusing System.Threading.Tasks;\n+using Moq;\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.Models;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Security;\nusing Xunit;\n-using Moq;\nnamespace NuGetGallery.Services\n{\n@@ -466,8 +465,9 @@ public User User\nprivate Mock<IEntitiesContext> SetupEntitiesContext()\n{\nvar mockContext = new Mock<IEntitiesContext>();\n- var dbContext = new Mock<DbContext>();\n- mockContext.Setup(m => m.GetDatabase()).Returns(new DatabaseWrapper(dbContext.Object.Database));\n+ var database = new Mock<IDatabase>();\n+ database.Setup(x => x.BeginTransaction()).Returns(() => new Mock<IDbContextTransaction>().Object);\n+ mockContext.Setup(m => m.GetDatabase()).Returns(database.Object);\nreturn mockContext;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Data.Entity;\nusing System.Data.SqlClient;\nusing System.IO;\nusing System.Linq;\n@@ -41,9 +40,10 @@ public class PackageDeleteServiceFacts\npackageRegistrationRepository = packageRegistrationRepository ?? new Mock<IEntityRepository<PackageRegistration>>();\npackageDeletesRepository = packageDeletesRepository ?? new Mock<IEntityRepository<PackageDelete>>();\n- var dbContext = new Mock<DbContext>();\nentitiesContext = entitiesContext ?? new Mock<IEntitiesContext>();\n- entitiesContext.Setup(m => m.GetDatabase()).Returns(new DatabaseWrapper(dbContext.Object.Database));\n+ var database = new Mock<IDatabase>();\n+ database.Setup(x => x.BeginTransaction()).Returns(() => new Mock<IDbContextTransaction>().Object);\n+ entitiesContext.Setup(m => m.GetDatabase()).Returns(database.Object);\npackageService = packageService ?? new Mock<IPackageService>();\nindexingService = indexingService ?? new Mock<IIndexingService>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageOwnershipManagementServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageOwnershipManagementServiceFacts.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-using Moq;\n-using Xunit;\nusing System;\n+using System.Collections.Generic;\nusing System.Linq;\n-using System.Data.Entity;\nusing System.Threading.Tasks;\n-using System.Collections.Generic;\n+using Moq;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Framework;\nusing NuGetGallery.TestUtils;\n+using Xunit;\nnamespace NuGetGallery\n{\n@@ -24,9 +23,10 @@ public class PackageOwnershipManagementServiceFacts\nIAuditingService auditingService = null,\nbool useDefaultSetup = true)\n{\n- var dbContext = new Mock<DbContext>();\nentitiesContext = entitiesContext ?? new Mock<IEntitiesContext>();\n- entitiesContext.Setup(m => m.GetDatabase()).Returns(new DatabaseWrapper(dbContext.Object.Database));\n+ var database = new Mock<IDatabase>();\n+ database.Setup(x => x.BeginTransaction()).Returns(() => new Mock<IDbContextTransaction>().Object);\n+ entitiesContext.Setup(m => m.GetDatabase()).Returns(database.Object);\npackageService = packageService ?? new Mock<IPackageService>();\nreservedNamespaceService = reservedNamespaceService ?? new Mock<IReservedNamespaceService>();\npackageOwnerRequestService = packageOwnerRequestService ?? new Mock<IPackageOwnerRequestService>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.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;\n-using System.Data.Entity;\nusing System.IO;\nusing System.IO.Compression;\n-using System.Linq;\nusing System.Threading.Tasks;\nusing Moq;\nusing NuGet.Packaging;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Packaging;\n-using Xunit;\n-using NuGetGallery.TestUtils;\nusing NuGetGallery.Security;\n+using NuGetGallery.TestUtils;\n+using Xunit;\nnamespace NuGetGallery\n{\n@@ -27,9 +24,10 @@ public class ReflowPackageServiceFacts\nMock<ITelemetryService> telemetryService = null,\nAction<Mock<ReflowPackageService>> setup = null)\n{\n- var dbContext = new Mock<DbContext>();\nentitiesContext = entitiesContext ?? new Mock<IEntitiesContext>();\n- entitiesContext.Setup(m => m.GetDatabase()).Returns(new DatabaseWrapper(dbContext.Object.Database));\n+ var database = new Mock<IDatabase>();\n+ database.Setup(x => x.BeginTransaction()).Returns(() => new Mock<IDbContextTransaction>().Object);\n+ entitiesContext.Setup(m => m.GetDatabase()).Returns(database.Object);\npackageService = packageService ?? new Mock<PackageService>();\npackageFileService = packageFileService ?? new Mock<IPackageFileService>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Data.Entity;\nusing System.IO;\nusing System.Linq;\nusing System.Linq.Expressions;\n@@ -290,9 +289,13 @@ private Mock<IEntityRepository<ReservedNamespace>> SetupReservedNamespaceReposit\nprivate Mock<IEntitiesContext> SetupEntitiesContext()\n{\nvar mockContext = new Mock<IEntitiesContext>();\n- var dbContext = new Mock<DbContext>();\n- mockContext.Setup(m => m.GetDatabase())\n- .Returns(new DatabaseWrapper(dbContext.Object.Database));\n+ var database = new Mock<IDatabase>();\n+ database\n+ .Setup(x => x.BeginTransaction())\n+ .Returns(() => new Mock<IDbContextTransaction>().Object);\n+ mockContext\n+ .Setup(m => m.GetDatabase())\n+ .Returns(database.Object);\nreturn mockContext;\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Use mock IDbContextTransaction instead of concrete transaction object (#6494)
Fix https://github.com/NuGet/Engineering/issues/1745 |
455,736 | 26.09.2018 15:33:04 | 25,200 | 23659449742edacbebc6514fdfffa11af86ee987 | Add configuration value to disable specific curated feeds
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -344,5 +344,9 @@ public string ExternalBrandingMessage\npublic bool RejectPackagesWithTooManyPackageEntries { get; set; }\npublic bool BlockSearchEngineIndexing { get; set; }\n+\n+ [DefaultValue(null)]\n+ [TypeConverter(typeof(StringArrayConverter))]\n+ public string[] DisabledCuratedFeeds { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -349,5 +349,11 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// Whether or not to block search engines from indexing the web pages using the \"noindex\" meta tag.\n/// </summary>\nbool BlockSearchEngineIndexing { get; set; }\n+\n+ /// <summary>\n+ /// The name of zero or more curated feeds that are disabled. If a curated feed is disabled, it appears as if\n+ /// it doesn't exist.\n+ /// </summary>\n+ string[] DisabledCuratedFeeds { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"diff": "@@ -22,19 +22,16 @@ public class ODataV2CuratedFeedController\n{\nprivate const int MaxPageSize = 40;\n- private readonly IEntitiesContext _entities;\nprivate readonly IGalleryConfigurationService _configurationService;\nprivate readonly ISearchService _searchService;\nprivate readonly ICuratedFeedService _curatedFeedService;\npublic ODataV2CuratedFeedController(\n- IEntitiesContext entities,\nIGalleryConfigurationService configurationService,\nISearchService searchService,\nICuratedFeedService curatedFeedService)\n: base(configurationService)\n{\n- _entities = entities;\n_configurationService = configurationService;\n_searchService = searchService;\n_curatedFeedService = curatedFeedService;\n@@ -49,7 +46,7 @@ public class ODataV2CuratedFeedController\nstring curatedFeedName,\n[FromUri] string semVerLevel = null)\n{\n- if (!_entities.CuratedFeeds.Any(cf => cf.Name == curatedFeedName))\n+ if (_curatedFeedService.GetFeedByName(curatedFeedName) == null)\n{\nreturn NotFound();\n}\n@@ -133,7 +130,7 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> option\nbool return404NotFoundWhenNoResults,\nstring semVerLevel)\n{\n- var curatedFeed = _entities.CuratedFeeds.FirstOrDefault(cf => cf.Name == curatedFeedName);\n+ var curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);\nif (curatedFeed == null)\n{\nreturn NotFound();\n@@ -231,7 +228,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\n[FromODataUri]bool includePrerelease = false,\n[FromUri]string semVerLevel = null)\n{\n- if (!_entities.CuratedFeeds.Any(cf => cf.Name == curatedFeedName))\n+ if (_curatedFeedService.GetFeedByName(curatedFeedName) == null)\n{\nreturn NotFound();\n}\n@@ -254,7 +251,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\n}\n// Perform actual search\n- var curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName, includePackages: false);\n+ var curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);\nvar packages = _curatedFeedService.GetPackages(curatedFeedName)\n.Where(p => p.PackageStatusKey == PackageStatus.Available)\n.Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevelPredicate(semVerLevel))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/CuratedFeedService.cs",
"new_path": "src/NuGetGallery/Services/CuratedFeedService.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-using System.Collections.Generic;\n-using System.Data.Entity;\n+using System;\nusing System.Linq;\n+using NuGetGallery.Configuration;\nnamespace NuGetGallery\n{\npublic class CuratedFeedService : ICuratedFeedService\n{\nprotected IEntityRepository<CuratedFeed> CuratedFeedRepository { get; set; }\n- protected IEntityRepository<CuratedPackage> CuratedPackageRepository { get; set; }\n+ protected IAppConfiguration AppConfiguration { get; set; }\nprotected CuratedFeedService()\n{\n}\npublic CuratedFeedService(\n- IEntityRepository<CuratedFeed> curatedFeedRepository)\n+ IEntityRepository<CuratedFeed> curatedFeedRepository,\n+ IAppConfiguration appConfiguration)\n{\nCuratedFeedRepository = curatedFeedRepository;\n+ AppConfiguration = appConfiguration;\n}\n- public CuratedFeed GetFeedByName(string name, bool includePackages)\n+ public CuratedFeed GetFeedByName(string name)\n{\n- IQueryable<CuratedFeed> query = CuratedFeedRepository.GetAll();\n-\n- if (includePackages)\n+ if (IsCuratedFeedDisabled(name))\n{\n- query = query\n- .Include(cf => cf.Packages)\n- .Include(cf => cf.Packages.Select(cp => cp.PackageRegistration));\n+ return null;\n}\n- return query\n+ return CuratedFeedRepository\n+ .GetAll()\n.SingleOrDefault(cf => cf.Name == name);\n}\n- public CuratedFeed GetFeedByKey(int key, bool includePackages)\n+ public IQueryable<Package> GetPackages(string curatedFeedName)\n{\n- IQueryable<CuratedFeed> query = CuratedFeedRepository.GetAll();\n-\n- if (includePackages)\n+ if (IsCuratedFeedDisabled(curatedFeedName))\n{\n- query = query\n- .Include(cf => cf.Packages)\n- .Include(cf => cf.Packages.Select(cp => cp.PackageRegistration));\n+ return Enumerable.Empty<Package>().AsQueryable();\n}\n- return query\n- .SingleOrDefault(cf => cf.Key == key);\n- }\n-\n- public IQueryable<Package> GetPackages(string curatedFeedName)\n- {\nvar packages = CuratedFeedRepository.GetAll()\n.Where(cf => cf.Name == curatedFeedName)\n.SelectMany(cf => cf.Packages.SelectMany(cp => cp.PackageRegistration.Packages));\n@@ -61,22 +50,16 @@ public IQueryable<Package> GetPackages(string curatedFeedName)\nreturn packages;\n}\n- public IQueryable<PackageRegistration> GetPackageRegistrations(string curatedFeedName)\n+ private bool IsCuratedFeedDisabled(string name)\n{\n- var packageRegistrations = CuratedFeedRepository.GetAll()\n- .Where(cf => cf.Name == curatedFeedName)\n- .SelectMany(cf => cf.Packages.Select(cp => cp.PackageRegistration));\n-\n- return packageRegistrations;\n- }\n-\n- public int? GetKey(string curatedFeedName)\n+ if (AppConfiguration.DisabledCuratedFeeds == null)\n{\n- var results = CuratedFeedRepository.GetAll()\n- .Where(cf => cf.Name == curatedFeedName)\n- .Select(cf => cf.Key).Take(1).ToArray();\n+ return false;\n+ }\n- return results.Length > 0 ? (int?)results[0] : null;\n+ return AppConfiguration\n+ .DisabledCuratedFeeds\n+ .Contains(name, StringComparer.OrdinalIgnoreCase);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ICuratedFeedService.cs",
"new_path": "src/NuGetGallery/Services/ICuratedFeedService.cs",
"diff": "@@ -7,10 +7,7 @@ namespace NuGetGallery\n{\npublic interface ICuratedFeedService\n{\n- CuratedFeed GetFeedByName(string name, bool includePackages);\n- CuratedFeed GetFeedByKey(int key, bool includePackages);\n+ CuratedFeed GetFeedByName(string name);\nIQueryable<Package> GetPackages(string curatedFeedName);\n- IQueryable<PackageRegistration> GetPackageRegistrations(string curatedFeedName);\n- int? GetKey(string curatedFeedName);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"diff": "@@ -330,14 +330,9 @@ public async Task SearchCount_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrH\nvar curatedFeedServiceMock = new Mock<ICuratedFeedService>(MockBehavior.Strict);\ncuratedFeedServiceMock.Setup(m => m.GetPackages(_curatedFeedName)).Returns(AllPackages);\n- curatedFeedServiceMock.Setup(m => m.GetFeedByName(_curatedFeedName, false)).Returns(curatedFeed);\n-\n- var entitiesContextMock = new Mock<IEntitiesContext>(MockBehavior.Strict);\n- var curatedFeedDbSet = GetQueryableMockDbSet(curatedFeed);\n- entitiesContextMock.SetupGet(m => m.CuratedFeeds).Returns(curatedFeedDbSet);\n+ curatedFeedServiceMock.Setup(m => m.GetFeedByName(_curatedFeedName)).Returns(curatedFeed);\nreturn new ODataV2CuratedFeedController(\n- entitiesContextMock.Object,\nconfigurationService,\nsearchService,\ncuratedFeedServiceMock.Object);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Security\\RequirePackageMetadataCompliancePolicyFacts.cs\" />\n<Compile Include=\"Services\\ActionRequiringEntityPermissionsFacts.cs\" />\n<Compile Include=\"Services\\CertificatesConfigurationFacts.cs\" />\n+ <Compile Include=\"Services\\CuratedFeedServiceFacts.cs\" />\n<Compile Include=\"Services\\TyposquattingServiceFacts.cs\" />\n<Compile Include=\"Services\\CloudDownloadCountServiceFacts.cs\" />\n<Compile Include=\"Services\\CertificateServiceFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add configuration value to disable specific curated feeds (#6486)
Address https://github.com/NuGet/NuGetGallery/issues/6470 |
455,736 | 26.09.2018 18:03:23 | 25,200 | 0c7b21ae56bd077f228ee9595b3aef93e8048ee7 | Add configuration value to redirect specific curated feeds to main feed
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -348,5 +348,9 @@ public string ExternalBrandingMessage\n[DefaultValue(null)]\n[TypeConverter(typeof(StringArrayConverter))]\npublic string[] DisabledCuratedFeeds { get; set; }\n+\n+ [DefaultValue(null)]\n+ [TypeConverter(typeof(StringArrayConverter))]\n+ public string[] RedirectedCuratedFeeds { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -355,5 +355,10 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// it doesn't exist.\n/// </summary>\nstring[] DisabledCuratedFeeds { get; set; }\n+\n+ /// <summary>\n+ /// The name of zero or more curated feeds that are redirected to the main feed.\n+ /// </summary>\n+ string[] RedirectedCuratedFeeds { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"diff": "@@ -25,16 +25,19 @@ public class ODataV2CuratedFeedController\nprivate readonly IGalleryConfigurationService _configurationService;\nprivate readonly ISearchService _searchService;\nprivate readonly ICuratedFeedService _curatedFeedService;\n+ private readonly IEntityRepository<Package> _packagesRepository;\npublic ODataV2CuratedFeedController(\nIGalleryConfigurationService configurationService,\nISearchService searchService,\n- ICuratedFeedService curatedFeedService)\n+ ICuratedFeedService curatedFeedService,\n+ IEntityRepository<Package> packagesRepository)\n: base(configurationService)\n{\n_configurationService = configurationService;\n_searchService = searchService;\n_curatedFeedService = curatedFeedService;\n+ _packagesRepository = packagesRepository;\n}\n// /api/v2/curated-feed/curatedFeedName/Packages?semVerLevel=\n@@ -46,15 +49,16 @@ public class ODataV2CuratedFeedController\nstring curatedFeedName,\n[FromUri] string semVerLevel = null)\n{\n- if (_curatedFeedService.GetFeedByName(curatedFeedName) == null)\n+ var result = GetCuratedFeedResult(curatedFeedName);\n+ if (result.ActionResult != null)\n{\n- return NotFound();\n+ return result.ActionResult;\n}\nvar semVerLevelKey = SemVerLevelKey.ForSemVerLevel(semVerLevel);\n- var queryable = _curatedFeedService\n- .GetPackages(curatedFeedName)\n+ var queryable = result\n+ .Packages\n.Where(p => p.PackageStatusKey == PackageStatus.Available)\n.Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevelPredicate(semVerLevel))\n.ToV2FeedPackageQuery(\n@@ -130,14 +134,14 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> option\nbool return404NotFoundWhenNoResults,\nstring semVerLevel)\n{\n- var curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);\n- if (curatedFeed == null)\n+ var result = GetCuratedFeedResult(curatedFeedName);\n+ if (result.ActionResult != null)\n{\n- return NotFound();\n+ return result.ActionResult;\n}\n- var packages = _curatedFeedService\n- .GetPackages(curatedFeedName)\n+ var packages = result\n+ .Packages\n.Where(p => p.PackageStatusKey == PackageStatus.Available)\n.Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevelPredicate(semVerLevel))\n.Where(p => p.PackageRegistration.Id.Equals(id, StringComparison.OrdinalIgnoreCase));\n@@ -158,7 +162,7 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> option\npackages,\nid,\nnormalizedVersion,\n- curatedFeed: curatedFeed,\n+ curatedFeed: result.CuratedFeed,\nsemVerLevel: semVerLevel);\n// If intercepted, create a paged queryresult\n@@ -228,9 +232,10 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\n[FromODataUri]bool includePrerelease = false,\n[FromUri]string semVerLevel = null)\n{\n- if (_curatedFeedService.GetFeedByName(curatedFeedName) == null)\n+ var result = GetCuratedFeedResult(curatedFeedName);\n+ if (result.ActionResult != null)\n{\n- return NotFound();\n+ return result.ActionResult;\n}\n// Handle OData-style |-separated list of frameworks.\n@@ -251,8 +256,8 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\n}\n// Perform actual search\n- var curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);\n- var packages = _curatedFeedService.GetPackages(curatedFeedName)\n+ var packages = result\n+ .Packages\n.Where(p => p.PackageStatusKey == PackageStatus.Available)\n.Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevelPredicate(semVerLevel))\n.OrderBy(p => p.PackageRegistration.Id).ThenBy(p => p.Version);\n@@ -265,7 +270,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nsearchTerm,\ntargetFramework,\nincludePrerelease,\n- curatedFeed: curatedFeed,\n+ curatedFeed: result.CuratedFeed,\nsemVerLevel: semVerLevel);\n// Packages provided by search service (even when not hijacked)\n@@ -326,5 +331,59 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nvar searchResults = await Search(options, curatedFeedName, searchTerm, targetFramework, includePrerelease, semVerLevel);\nreturn searchResults.FormattedAsCountResult<V2FeedPackage>();\n}\n+\n+ private bool IsCuratedFeedRedirected(string name)\n+ {\n+ if (_configurationService.Current.RedirectedCuratedFeeds == null)\n+ {\n+ return false;\n+ }\n+\n+ return _configurationService\n+ .Current\n+ .RedirectedCuratedFeeds\n+ .Contains(name, StringComparer.OrdinalIgnoreCase);\n+ }\n+\n+ private CuratedFeedResult GetCuratedFeedResult(string curatedFeedName)\n+ {\n+ IQueryable<Package> packages;\n+ CuratedFeed curatedFeed;\n+ if (IsCuratedFeedRedirected(curatedFeedName))\n+ {\n+ curatedFeed = null;\n+ packages = _packagesRepository.GetAll();\n+ }\n+ else\n+ {\n+ curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);\n+ if (curatedFeed == null)\n+ {\n+ return new CuratedFeedResult(NotFound());\n+ }\n+\n+ packages = _curatedFeedService.GetPackages(curatedFeedName);\n+ }\n+\n+ return new CuratedFeedResult(packages, curatedFeed);\n+ }\n+\n+ private class CuratedFeedResult\n+ {\n+ public CuratedFeedResult(IHttpActionResult actionResult)\n+ {\n+ ActionResult = actionResult ?? throw new ArgumentNullException(nameof(actionResult));\n+ }\n+\n+ public CuratedFeedResult(IQueryable<Package> packages, CuratedFeed curatedFeed)\n+ {\n+ Packages = packages ?? throw new ArgumentNullException(nameof(packages));\n+ CuratedFeed = curatedFeed;\n+ }\n+\n+ public IQueryable<Package> Packages { get; }\n+ public CuratedFeed CuratedFeed { get; }\n+ public IHttpActionResult ActionResult { get; }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"diff": "@@ -24,7 +24,7 @@ namespace NuGetGallery.Controllers\npublic abstract class ODataFeedControllerFactsBase<TController>\nwhere TController : NuGetODataController\n{\n- private const string _siteRoot = \"https://nuget.localtest.me\";\n+ protected const string _siteRoot = \"https://nuget.localtest.me\";\nprotected const string TestPackageId = \"Some.Awesome.Package\";\nprotected readonly IReadOnlyCollection<Package> AvailablePackages;\n@@ -61,6 +61,13 @@ protected TController CreateTestableODataFeedController(HttpRequestMessage reque\nvar controller = CreateController(PackagesRepository, configurationService, searchService);\n+ AddRequestToController(request, controller);\n+\n+ return controller;\n+ }\n+\n+ protected static void AddRequestToController(HttpRequestMessage request, TController controller)\n+ {\nvar httpRequest = new HttpRequest(string.Empty, request.RequestUri.AbsoluteUri, request.RequestUri.Query);\nvar httpResponse = new HttpResponse(new StringWriter());\nvar httpContext = new HttpContext(httpRequest, httpResponse);\n@@ -72,8 +79,6 @@ protected TController CreateTestableODataFeedController(HttpRequestMessage reque\ncontroller.ControllerContext.Controller = controller;\ncontroller.ControllerContext.Configuration = new HttpConfiguration();\n-\n- return controller;\n}\nprotected async Task<IReadOnlyCollection<TFeedPackage>> GetCollection<TFeedPackage>(\n@@ -208,7 +213,7 @@ private static IQueryable<Package> CreatePackagesQueryable()\nreturn list.AsQueryable();\n}\n- private static ODataQueryContext CreateODataQueryContext<TFeedPackage>()\n+ protected static ODataQueryContext CreateODataQueryContext<TFeedPackage>()\nwhere TFeedPackage : class\n{\nvar oDataModelBuilder = new ODataConventionModelBuilder();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"diff": "using System.Collections.Generic;\nusing System.Data.Entity;\nusing System.Linq;\n+using System.Net.Http;\n+using System.Threading;\nusing System.Threading.Tasks;\n+using System.Web.Http;\n+using System.Web.Http.OData.Query;\n+using System.Web.Http.Results;\nusing Moq;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.OData;\n+using NuGetGallery.WebApi;\nusing Xunit;\nnamespace NuGetGallery.Controllers\n@@ -17,6 +23,150 @@ public class ODataV2CuratedFeedControllerFacts\n{\nprivate const string _curatedFeedName = \"dummy\";\n+ public class TheGetMethod\n+ {\n+ private readonly CuratedFeed _curatedFeed;\n+ private readonly Package _curatedFeedPackage;\n+ private readonly Package _mainFeedPackage;\n+ private readonly FeatureConfiguration _featureConfiguration;\n+ private readonly Mock<IGalleryConfigurationService> _config;\n+ private readonly Mock<IAppConfiguration> _appConfig;\n+ private readonly Mock<ISearchService> _searchService;\n+ private readonly Mock<ICuratedFeedService> _curatedFeedService;\n+ private readonly Mock<IEntityRepository<Package>> _packages;\n+ private readonly ODataV2CuratedFeedController _target;\n+ private readonly HttpRequestMessage _request;\n+ private readonly ODataQueryOptions<V2FeedPackage> _options;\n+\n+ public TheGetMethod()\n+ {\n+ _curatedFeed = new CuratedFeed { Name = _curatedFeedName };\n+ _curatedFeedPackage = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"NuGet.Core\",\n+ },\n+ };\n+ _mainFeedPackage = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"NuGet.Versioning\",\n+ },\n+ };\n+ _featureConfiguration = new FeatureConfiguration();\n+ _appConfig = new Mock<IAppConfiguration>();\n+\n+ _config = new Mock<IGalleryConfigurationService>();\n+ _searchService = new Mock<ISearchService>();\n+ _curatedFeedService = new Mock<ICuratedFeedService>();\n+ _packages = new Mock<IEntityRepository<Package>>();\n+\n+ _config\n+ .Setup(x => x.Current)\n+ .Returns(() => _appConfig.Object);\n+ _config\n+ .Setup(x => x.Features)\n+ .Returns(() => _featureConfiguration);\n+ _config\n+ .Setup(x => x.GetSiteRoot(It.IsAny<bool>()))\n+ .Returns(() => _siteRoot);\n+ _curatedFeedService\n+ .Setup(x => x.GetFeedByName(_curatedFeedName))\n+ .Returns(() => _curatedFeed);\n+ _curatedFeedService\n+ .Setup(x => x.GetPackages(_curatedFeedName))\n+ .Returns(() => new[] { _curatedFeedPackage }.AsQueryable());\n+ _packages\n+ .Setup(x => x.GetAll())\n+ .Returns(() => new[] { _mainFeedPackage }.AsQueryable());\n+\n+ _target = new ODataV2CuratedFeedController(\n+ _config.Object,\n+ _searchService.Object,\n+ _curatedFeedService.Object,\n+ _packages.Object);\n+\n+ _request = new HttpRequestMessage(HttpMethod.Get, $\"{_siteRoot}/api/v2/curated-feed/{_curatedFeedName}/Packages\");\n+ _options = new ODataQueryOptions<V2FeedPackage>(CreateODataQueryContext<V2FeedPackage>(), _request);\n+ AddRequestToController(_request, _target);\n+ }\n+\n+ [Fact]\n+ public async Task RedirectedCuratedFeedQueriesMainFeed()\n+ {\n+ _appConfig\n+ .Setup(x => x.RedirectedCuratedFeeds)\n+ .Returns(() => new[] { _curatedFeedName });\n+\n+ var actionResult = _target.Get(_options, _curatedFeedName);\n+\n+ var list = await GetPackageListAsync(actionResult);\n+ var package = Assert.Single(list);\n+ Assert.Equal(_mainFeedPackage.PackageRegistration.Id, package.Id);\n+ _curatedFeedService.Verify(x => x.GetFeedByName(_curatedFeedName), Times.Never);\n+ _curatedFeedService.Verify(x => x.GetPackages(It.IsAny<string>()), Times.Never);\n+ _packages.Verify(x => x.GetAll(), Times.Once);\n+ }\n+\n+ [Fact]\n+ public async Task MissingAndRedirectedCuratedFeedQueriesMainFeed()\n+ {\n+ _appConfig\n+ .Setup(x => x.RedirectedCuratedFeeds)\n+ .Returns(() => new[] { _curatedFeedName });\n+ _curatedFeedService\n+ .Setup(x => x.GetFeedByName(It.IsAny<string>()))\n+ .Returns<CuratedFeed>(null);\n+\n+ var actionResult = _target.Get(_options, _curatedFeedName);\n+\n+ var list = await GetPackageListAsync(actionResult);\n+ var package = Assert.Single(list);\n+ Assert.Equal(_mainFeedPackage.PackageRegistration.Id, package.Id);\n+ _curatedFeedService.Verify(x => x.GetFeedByName(_curatedFeedName), Times.Never);\n+ _curatedFeedService.Verify(x => x.GetPackages(It.IsAny<string>()), Times.Never);\n+ _packages.Verify(x => x.GetAll(), Times.Once);\n+ }\n+\n+ [Fact]\n+ public void MissingCuratedFeedReturnsNotFound()\n+ {\n+ _curatedFeedService\n+ .Setup(x => x.GetFeedByName(It.IsAny<string>()))\n+ .Returns<CuratedFeed>(null);\n+\n+ var actionResult = _target.Get(_options, _curatedFeedName);\n+\n+ Assert.IsType<NotFoundResult>(actionResult);\n+ _curatedFeedService.Verify(x => x.GetFeedByName(_curatedFeedName), Times.Once);\n+ _curatedFeedService.Verify(x => x.GetPackages(It.IsAny<string>()), Times.Never);\n+ _packages.Verify(x => x.GetAll(), Times.Never);\n+ }\n+\n+ [Fact]\n+ public async Task NonRedirectCuratedFeedQueriesCuratedPackages()\n+ {\n+ var actionResult = _target.Get(_options, _curatedFeedName);\n+\n+ var list = await GetPackageListAsync(actionResult);\n+ var package = Assert.Single(list);\n+ Assert.Equal(_curatedFeedPackage.PackageRegistration.Id, package.Id);\n+ _curatedFeedService.Verify(x => x.GetFeedByName(_curatedFeedName), Times.Once);\n+ _curatedFeedService.Verify(x => x.GetPackages(It.IsAny<string>()), Times.Once);\n+ _packages.Verify(x => x.GetAll(), Times.Never);\n+ }\n+\n+ private static async Task<List<V2FeedPackage>> GetPackageListAsync(IHttpActionResult actionResult)\n+ {\n+ var queryResult = (QueryResult<V2FeedPackage>)actionResult;\n+ var httpResponseMessage = await queryResult.ExecuteAsync(CancellationToken.None);\n+ var objectContent = (ObjectContent<IQueryable<V2FeedPackage>>)httpResponseMessage.Content;\n+ return ((IQueryable<V2FeedPackage>)objectContent.Value).ToList();\n+ }\n+ }\n+\n[Fact]\npublic async Task Get_FiltersSemVerV2PackageVersions()\n{\n@@ -335,7 +485,8 @@ public async Task SearchCount_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrH\nreturn new ODataV2CuratedFeedController(\nconfigurationService,\nsearchService,\n- curatedFeedServiceMock.Object);\n+ curatedFeedServiceMock.Object,\n+ packagesRepository);\n}\nprivate static IDbSet<T> GetQueryableMockDbSet<T>(params T[] sourceList) where T : class\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add configuration value to redirect specific curated feeds to main feed (#6489)
Address https://github.com/NuGet/NuGetGallery/issues/6472 |
455,736 | 28.09.2018 14:12:08 | 25,200 | e9483be9295cfc0ec5837bca98fe875f3ec3ebed | Fix delete registration checkbox on delete page
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Delete/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Delete/Index.cshtml",
"diff": "};\nko.applyBindings(new viewModel(), $('#stage').get(0));\n-\n- $('#SoftDelete').change(function(e) {\n- if (!this.checked) {\n- $('#DeleteEmptyPackageRegistrationContainer').show();\n- } else {\n- $('#DeleteEmptyPackageRegistrationContainer').hide();\n- }\n- });\n-\n- $('#delete-form').submit(function(e) {\n- if (!confirm('Deleting these packages will make them unavailable for download and package restore. Are you sure you want to continue with the delete?')) {\n- e.preventDefault();\n- }\n- });\n});\n</script>\n+ @Scripts.Render(\"~/Scripts/gallery/page-delete-package.js\")\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"diff": "$('#input-select-version').change(function () {\nwindow.location.href = this.value;\n});\n-\n- $('#DeletePackagesRequest_SoftDelete').change(function(e) {\n- if (!this.checked) {\n- $('#DeleteEmptyPackageRegistrationContainer').show();\n- } else {\n- $('#DeleteEmptyPackageRegistrationContainer').hide();\n- }\n- });\n- $('#delete-form').submit(function(e) {\n- if (!confirm('Deleting this package will make it unavailable for download and package restore. Are you sure you want to continue with the delete?')) {\n- e.preventDefault();\n- }\n- });\n});\n</script>\n+ @Scripts.Render(\"~/Scripts/gallery/page-delete-package.js\")\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix delete registration checkbox on delete page (#6498)
Address https://github.com/NuGet/NuGetGallery/issues/6501 |
455,794 | 01.10.2018 09:52:41 | 25,200 | 3b552d90d37f6be3f20feb8fe12da6f8ccf7ae42 | FxCop tools update | [
{
"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 = 'cb604c2cd1b2f7f71fb574cdda4c83ddb1464cc7'\n+ [string]$BuildBranch = 'c35bbc228717720bdbc610f3285259391635e90e'\n)\nSet-StrictMode -Version 1.0\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | FxCop tools update (#6499) |
455,736 | 28.09.2018 15:54:16 | 25,200 | dd91e10bef1876213af8c5506b0c2b09cfef57af | Fix potential race condition with etags returned by GetFileReferenceAsync
Progress on
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -105,11 +105,7 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\n}\nelse if (result.StatusCode == HttpStatusCode.OK)\n{\n- if (await blob.ExistsAsync())\n- {\n- await blob.FetchAttributesAsync();\n- }\n- return CloudFileReference.Modified(blob, result.Data);\n+ return CloudFileReference.Modified(result.Data, result.ETag);\n}\nelse\n{\n@@ -505,11 +501,11 @@ private async Task<StorageResult> GetBlobContentAsync(string folderName, string\nif (ex.RequestInformation.HttpStatusCode == (int)HttpStatusCode.NotModified)\n{\n- return new StorageResult(HttpStatusCode.NotModified, null);\n+ return new StorageResult(HttpStatusCode.NotModified, null, blob.ETag);\n}\nelse if (ex.RequestInformation.ExtendedErrorInformation?.ErrorCode == BlobErrorCodeStrings.BlobNotFound)\n{\n- return new StorageResult(HttpStatusCode.NotFound, null);\n+ return new StorageResult(HttpStatusCode.NotFound, null, blob.ETag);\n}\nthrow;\n@@ -522,14 +518,14 @@ private async Task<StorageResult> GetBlobContentAsync(string folderName, string\nif (ex.ErrorCode == BlobErrorCodeStrings.BlobNotFound)\n{\n- return new StorageResult(HttpStatusCode.NotFound, null);\n+ return new StorageResult(HttpStatusCode.NotFound, null, blob.ETag);\n}\nthrow;\n}\nstream.Position = 0;\n- return new StorageResult(HttpStatusCode.OK, stream);\n+ return new StorageResult(HttpStatusCode.OK, stream, blob.ETag);\n}\nprivate static string GetContentType(string folderName)\n@@ -607,11 +603,13 @@ private struct StorageResult\n{\npublic HttpStatusCode StatusCode { get; }\npublic Stream Data { get; }\n+ public string ETag { get; }\n- public StorageResult(HttpStatusCode statusCode, Stream data)\n+ public StorageResult(HttpStatusCode statusCode, Stream data, string etag)\n{\nStatusCode = statusCode;\nData = data;\n+ ETag = etag;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudFileReference.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudFileReference.cs",
"diff": "@@ -26,9 +26,9 @@ public static CloudFileReference NotModified(string contentId)\nreturn new CloudFileReference(null, contentId);\n}\n- public static CloudFileReference Modified(ISimpleCloudBlob blob, Stream data)\n+ public static CloudFileReference Modified(Stream data, string contentId)\n{\n- return new CloudFileReference(data, blob.ETag);\n+ return new CloudFileReference(data, contentId);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.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.Concurrent;\nusing System.IO;\nusing System.Text;\n+using System.Threading;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Auth;\nusing Moq;\nusing NuGetGallery.Diagnostics;\nusing Xunit;\n+using Xunit.Abstractions;\nnamespace NuGetGallery\n{\n@@ -26,6 +29,7 @@ public class CloudBlobCoreFileStorageServiceIntegrationTests\nstring destFileName);\nprivate readonly BlobStorageFixture _fixture;\n+ private readonly ITestOutputHelper _output;\nprivate readonly string _testId;\nprivate readonly string _prefixA;\nprivate readonly string _prefixB;\n@@ -36,9 +40,10 @@ public class CloudBlobCoreFileStorageServiceIntegrationTests\nprivate readonly CloudBlobCoreFileStorageService _targetA;\nprivate readonly CloudBlobCoreFileStorageService _targetB;\n- public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixture)\n+ public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixture, ITestOutputHelper output)\n{\n_fixture = fixture ?? throw new ArgumentNullException(nameof(fixture));\n+ _output = output ?? throw new ArgumentNullException(nameof(output));\n_testId = Guid.NewGuid().ToString();\n_prefixA = $\"{_fixture.PrefixA}/{_testId}\";\n_prefixB = $\"{_fixture.PrefixB}/{_testId}\";\n@@ -53,6 +58,98 @@ public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixtur\n_targetB = new CloudBlobCoreFileStorageService(_clientB, Mock.Of<IDiagnosticsService>());\n}\n+ [BlobStorageFact]\n+ public async Task ReturnsCurrentETagForIfMatch()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.ValidationFolderName;\n+ var fileName = _prefixA;\n+ await _targetA.SaveFileAsync(folderName, fileName, new MemoryStream(new byte[0]));\n+ var initialReference = await _targetA.GetFileReferenceAsync(folderName, fileName);\n+ initialReference.OpenRead().Dispose();\n+\n+ // Act\n+ var reference = await _targetA.GetFileReferenceAsync(folderName, fileName, initialReference.ContentId);\n+\n+ // Assert\n+ Assert.NotNull(reference);\n+ Assert.Null(reference.OpenRead());\n+ Assert.Equal(initialReference.ContentId, reference.ContentId);\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task ReturnsNullForMissingBlob()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.ValidationFolderName;\n+ var fileName = _prefixA;\n+\n+ // Act\n+ var reference = await _targetA.GetFileReferenceAsync(folderName, fileName);\n+\n+ // Assert\n+ Assert.Null(reference);\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task ReturnsTheETagMatchingTheContent()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var contentToETag = new ConcurrentDictionary<string, string>();\n+ var iterations = 20;\n+ var cts = new CancellationTokenSource();\n+\n+ Func<Task> update = async () =>\n+ {\n+ var container = _blobClientA.GetContainerReference(folderName);\n+ for (var i = 1; i <= iterations && !cts.IsCancellationRequested; i++)\n+ {\n+ var blob = container.GetBlockBlobReference(fileName);\n+ var content = i.ToString();\n+ await blob.UploadTextAsync(content);\n+ contentToETag[content] = blob.Properties.ETag;\n+ _output.WriteLine($\"Content '{content}' should have etag '{blob.Properties.ETag}'.\");\n+ }\n+ };\n+\n+ Func<Task> check = async () =>\n+ {\n+ string content = null;\n+ while (content != iterations.ToString())\n+ {\n+ var fileReference = await _targetA.GetFileReferenceAsync(folderName, fileName);\n+ if (fileReference == null)\n+ {\n+ continue;\n+ }\n+\n+ using (var stream = fileReference.OpenRead())\n+ using (var streamReader = new StreamReader(stream))\n+ {\n+ content = await streamReader.ReadToEndAsync();\n+ if (contentToETag.TryGetValue(content, out var expectedETag))\n+ {\n+ _output.WriteLine($\"Content '{content}' has etag '{fileReference.ContentId}'.\");\n+ if (expectedETag != fileReference.ContentId)\n+ {\n+ cts.Cancel();\n+ }\n+\n+ Assert.Equal(expectedETag, fileReference.ContentId);\n+ }\n+ }\n+ }\n+ };\n+\n+ // Act & Assert\n+ var updateTask = update();\n+ var checkTask = check();\n+ await checkTask;\n+ await updateTask;\n+ }\n+\n[BlobStorageFact]\npublic async Task CanReadAndDeleteBlobUsingPrivilegedFileUri()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix potential race condition with etags returned by GetFileReferenceAsync (#6500)
Progress on https://github.com/NuGet/NuGetGallery/issues/6442
Address https://github.com/NuGet/NuGetGallery/issues/6502 |
455,776 | 04.10.2018 13:55:30 | 25,200 | 260a5b8806605e7a146e65a44c6674bb159a7d16 | Remove Admin Config page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"diff": "Handle support requests\n</p>\n</li>\n- <li>\n- <h2>\n- <a href=\"@Url.Action(actionName: \"Index\", controllerName: \"Config\")\">\n- <i class=\"ms-Icon ms-Icon--Settings\"></i>\n- <span>Configuration</span>\n- </a>\n- </h2>\n- <p>\n- View Application Configuration\n- </p>\n- </li>\n<li>\n<h2>\n<a href=\"@Url.Action(actionName: \"ClearContentCache\", controllerName: \"Home\")\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Areas\\Admin\\DynamicData\\OrderedFieldGenerator.cs\" />\n<Compile Include=\"Areas\\Admin\\Controllers\\LuceneController.cs\" />\n<Compile Include=\"Areas\\Admin\\Models\\LuceneInfoModel.cs\" />\n- <Compile Include=\"Areas\\Admin\\Controllers\\ConfigController.cs\" />\n- <Compile Include=\"Areas\\Admin\\ViewModels\\ConfigViewModel.cs\" />\n<Compile Include=\"Authentication\\Providers\\ApiKey\\ApiKeyAuthenticationExtensions.cs\" />\n<Compile Include=\"Authentication\\Providers\\ApiKey\\ApiKeyAuthenticationHandler.cs\" />\n<Compile Include=\"Authentication\\Providers\\ApiKey\\ApiKeyAuthenticationMiddleware.cs\" />\n<Content Include=\"Areas\\Admin\\Views\\Lucene\\Index.cshtml\">\n<SubType>Code</SubType>\n</Content>\n- <Content Include=\"Areas\\Admin\\Views\\Config\\Index.cshtml\" />\n<Content Include=\"Views\\Errors\\BadRequest.cshtml\" />\n<Content Include=\"Views\\Packages\\_PackageDependencies.cshtml\" />\n<Content Include=\"Views\\Statistics\\Index.cshtml\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove Admin Config page (#6511) |
455,794 | 09.10.2018 09:26:33 | 25,200 | ff4e85c8651d717005f8f0f9971bf709e34c924f | Support requests: KeyNotFound fix | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/SupportRequestController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/SupportRequestController.cs",
"diff": "@@ -252,7 +252,16 @@ private async Task<List<SupportRequestViewModel>> GetSupportRequestsAsync(int pa\nvar viewModel = new SupportRequestViewModel(issue);\nviewModel.AssignedToGalleryUsername = issue.AssignedTo?.GalleryUsername;\nviewModel.IssueStatusName = issue.IssueStatus.Name;\n- viewModel.UserEmail = issue.UserKey.HasValue ? userEmails[issue.UserKey.Value] : string.Empty;\n+\n+ // Email may not be available, because the delete workflow hard deletes unconfirmed users.\n+ if (issue.UserKey.HasValue && userEmails.ContainsKey(issue.UserKey.Value))\n+ {\n+ viewModel.UserEmail = userEmails[issue.UserKey.Value];\n+ }\n+ else\n+ {\n+ viewModel.UserEmail = string.Empty;\n+ }\nresults.Add(viewModel);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Support requests: KeyNotFound fix (#6541) |
455,759 | 15.10.2018 10:24:34 | -7,200 | 211cfbaac0ca068572cc85429b92ded1e04cb8ea | Fix IMessageServiceConfiguration DI config | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -84,7 +84,7 @@ protected override void Load(ContainerBuilder builder)\nbuilder.Register(c => configuration.Current)\n.AsSelf()\n- .As<IAppConfiguration>();\n+ .AsImplementedInterfaces();\n// Force the read of this configuration, so it will be initialized on startup\nbuilder.Register(c => configuration.Features)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix IMessageServiceConfiguration DI config (#6563) |
455,747 | 16.10.2018 13:01:55 | 25,200 | f45e233a346ce3caffb1b032f21296a73218fd5b | UI symbol server changes behind the flag | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -169,6 +169,7 @@ public virtual async Task<ActionResult> UploadPackage()\n{\nvar currentUser = GetCurrentUser();\nvar model = new SubmitPackageRequest();\n+ model.IsSymbolsUploadEnabled = _contentObjectService.SymbolsConfiguration.IsSymbolsUploadEnabledForUser(currentUser);\nPackageMetadata packageMetadata;\nusing (var uploadedFile = await _uploadFileService.GetUploadFileAsync(currentUser.Key))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RequestModels/SubmitPackageRequest.cs",
"new_path": "src/NuGetGallery/RequestModels/SubmitPackageRequest.cs",
"diff": "@@ -8,5 +8,7 @@ public class SubmitPackageRequest\npublic bool IsUploadInProgress => InProgressUpload != null;\npublic VerifyPackageRequest InProgressUpload { get; set; }\n+\n+ public bool IsSymbolsUploadEnabled { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"diff": "@{\nViewBag.Title = \"Upload Package\";\nViewBag.Tab = \"Upload\";\n+ var placeholder = Model.IsSymbolsUploadEnabled\n+ ? \"Browse or Drop files to select a package or symbols package...\"\n+ : \"Browse or Drop files to select a package\";\n+ var acceptExtensions = Model.IsSymbolsUploadEnabled\n+ ? \".nupkg,.snupkg\"\n+ : \".nupkg\";\n}\n<section role=\"main\" class=\"container main-container page-upload\">\[email protected]()\n<div class=\"input-group\">\n- <input type=\"text\" class=\"form-control\" id=\"file-select-feedback\" value=\"Browse or Drop files to select a package or symbols package...\" aria-label=\"Upload Your Package\" readonly />\n+ <input type=\"text\" class=\"form-control\" id=\"file-select-feedback\" value=\"@placeholder\" aria-label=\"Upload Your Package\" readonly />\n<label for=\"input-select-file\" id=\"PackageFileLabel\" class=\"input-group-btn\">\n<span id=\"browse-for-package-button\" class=\"btn btn-primary form-control\" tabindex=\"0\" aria-label=\"Browse for package\" role=\"button\">\n- Browse…<input type=\"file\" name=\"UploadFile\" accept=\".nupkg,.snupkg\" aria-labelledby=\"PackageFileLabel\" id=\"input-select-file\" style=\"display:none;\" />\n+ Browse…<input type=\"file\" name=\"UploadFile\" accept=\"@acceptExtensions\" aria-labelledby=\"PackageFileLabel\" id=\"input-select-file\" style=\"display:none;\" />\n</span>\n</label>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -142,7 +142,13 @@ public class PackagesControllerFacts\nreadMeService = readMeService ?? new ReadMeService(packageFileService.Object, entitiesContext.Object);\n- contentObjectService = contentObjectService ?? new Mock<IContentObjectService>();\n+ if (contentObjectService == null)\n+ {\n+ contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .Setup(x => x.SymbolsConfiguration.IsSymbolsUploadEnabledForUser(It.IsAny<User>()))\n+ .Returns(false);\n+ }\nif (symbolPackageUploadService == null)\n{\n@@ -4016,9 +4022,10 @@ public async Task WillShowTheViewWhenThereIsNoUploadInProgress()\nuploadFileService: fakeUploadFileService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\n- var result = await controller.UploadPackage() as ViewResult;\n+ var result = (await controller.UploadPackage() as ViewResult).Model as SubmitPackageRequest;\nAssert.NotNull(result);\n+ Assert.False(result.IsSymbolsUploadEnabled);\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | UI symbol server changes behind the flag (#6571) |
455,747 | 18.10.2018 12:12:18 | 25,200 | cdbfae0ea7c09cc873297bc3d009edb3183f847a | Symbols UI Fixes | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Extensions/PackageExtensions.cs",
"new_path": "src/NuGetGallery.Core/Extensions/PackageExtensions.cs",
"diff": "@@ -19,5 +19,16 @@ public static SymbolPackage LatestSymbolPackage(this Package package)\n.OrderByDescending(sp => sp.Created)\n.FirstOrDefault();\n}\n+\n+ /// <summary>\n+ /// Returns true if there exists a symbol package which is latest and is in\n+ /// available state, false otherwise.\n+ /// </summary>\n+ public static bool IsLatestSymbolPackageAvailable(this Package package)\n+ {\n+ var latestSymbolPackage = package.LatestSymbolPackage();\n+ return latestSymbolPackage != null\n+ && latestSymbolPackage.StatusKey == PackageStatus.Available;\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -237,6 +237,8 @@ public virtual async Task<ActionResult> UploadPackage()\nvar verifyRequest = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration);\nverifyRequest.IsSymbolsPackage = true;\n+ verifyRequest.HasExistingAvailableSymbols = packageForUploadingSymbols.IsLatestSymbolPackageAvailable();\n+\nmodel.InProgressUpload = verifyRequest;\nreturn View(model);\n@@ -386,7 +388,12 @@ private async Task<JsonResult> UploadSymbolsPackageInternal(PackageArchiveReader\n// Save the uploaded file\nawait _uploadFileService.SaveUploadFileAsync(currentUser.Key, uploadStream);\n- return await GetVerifyPackageView(currentUser, packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration, isSymbolsPackageUpload: true);\n+ return await GetVerifyPackageView(currentUser,\n+ packageMetadata,\n+ accountsAllowedOnBehalfOf,\n+ existingPackageRegistration,\n+ isSymbolsPackageUpload: true,\n+ hasExistingSymbolsPackageAvailable: packageForUploadingSymbols.IsLatestSymbolPackageAvailable());\n}\nprivate async Task<JsonResult> UploadPackageInternal(PackageArchiveReader packageArchiveReader, Stream uploadStream, NuspecReader nuspec, PackageMetadata packageMetadata)\n@@ -495,14 +502,22 @@ private async Task<JsonResult> UploadPackageInternal(PackageArchiveReader packag\nawait _uploadFileService.SaveUploadFileAsync(currentUser.Key, uploadStream);\n- return await GetVerifyPackageView(currentUser, packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration, isSymbolsPackageUpload: false);\n+ var hasExistingSymbolsPackageAvailable = existingPackage != null && existingPackage.IsLatestSymbolPackageAvailable();\n+\n+ return await GetVerifyPackageView(currentUser,\n+ packageMetadata,\n+ accountsAllowedOnBehalfOf,\n+ existingPackageRegistration,\n+ isSymbolsPackageUpload: false,\n+ hasExistingSymbolsPackageAvailable: hasExistingSymbolsPackageAvailable);\n}\nprivate async Task<JsonResult> GetVerifyPackageView(User currentUser,\nPackageMetadata packageMetadata,\nIEnumerable<User> accountsAllowedOnBehalfOf,\nPackageRegistration existingPackageRegistration,\n- bool isSymbolsPackageUpload)\n+ bool isSymbolsPackageUpload,\n+ bool hasExistingSymbolsPackageAvailable)\n{\nIReadOnlyList<string> warnings = new List<string>();\nusing (Stream uploadedFile = await _uploadFileService.GetUploadFileAsync(currentUser.Key))\n@@ -546,8 +561,8 @@ private async Task<JsonResult> UploadPackageInternal(PackageArchiveReader packag\nvar model = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration);\nmodel.IsSymbolsPackage = isSymbolsPackageUpload;\n+ model.HasExistingAvailableSymbols = hasExistingSymbolsPackageAvailable;\nmodel.Warnings.AddRange(warnings);\n-\nreturn Json(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RequestModels/VerifyPackageRequest.cs",
"new_path": "src/NuGetGallery/RequestModels/VerifyPackageRequest.cs",
"diff": "@@ -117,6 +117,7 @@ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> p\npublic string Tags { get; set; }\npublic string Title { get; set; }\npublic bool IsSymbolsPackage { get; set; }\n+ public bool HasExistingAvailableSymbols { get; set; }\npublic List<string> Warnings { get; set; } = new List<string>();\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": "};\nfunction resetFileSelectFeedback() {\n- $('#file-select-feedback').attr('value', 'Browse or Drop files to select a package or symbols package...');\n+ $('#file-select-feedback').attr('value', 'Browse or Drop files to select a package (.nupkg) or symbols package (.snupkg)...');\n}\nfunction prepareUploadFormData() {\nfunction clearErrors() {\n$(\"#validation-failure-container\").addClass(\"hidden\");\n$(\"#validation-failure-list\").remove();\n+ $('#symbols-replace-warning-container').addClass('hidden');\nvar warnings = $('#warning-container');\nwarnings.addClass(\"hidden\");\ncancelUploadAsync();\n});\n+ if (model.IsSymbolsPackage && model.HasExistingAvailableSymbols) {\n+ $('#symbols-replace-warning-container').removeClass('hidden');\n+ } else {\n+ $('#symbols-replace-warning-container').addClass('hidden');\n+ }\n+\n$('#verify-submit-button').on('click', function () {\n$('#verify-cancel-button').attr('disabled', 'disabled');\n$('#verify-submit-button').attr('disabled', 'disabled');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DeleteSymbols.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DeleteSymbols.cshtml",
"diff": "</div>\n<h2>\n- <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#delete-package\"\n- aria-expanded=\"false\" aria-controls=\"delete-package\" id=\"show-delete-package\">\n- <i class=\"ms-Icon ms-Icon--ChevronRight\" aria-hidden=\"true\"></i>\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#delete-package\" aria-expanded=\"true\" aria-controls=\"delete-package\" id=\"show-delete-package\">\n+ <i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>Delete Symbols Package Version</span>\n</a>\n</h2>\n- <div class=\"list-unstyled panel-collapse collapse\" id=\"delete-package\">\n+ <div class=\"list-unstyled panel-collapse collapse in\" id=\"delete-package\">\[email protected](\n@<text>\n- <strong>Deleting this symbols package will remove all the symbols from the symbol server and make them unavailable.</strong><br />\n+ <strong>Deleting this symbols package will remove all symbols in this package from the symbol server and make them unavailable.</strong><br />\n</text>)\n@using (Html.BeginForm(\"DeleteSymbolsPackage\", \"Packages\", FormMethod.Post, new { id = \"delete-symbols-form\" }))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"diff": "ViewBag.Title = \"Upload Package\";\nViewBag.Tab = \"Upload\";\nvar placeholder = Model.IsSymbolsUploadEnabled\n- ? \"Browse or Drop files to select a package or symbols package...\"\n- : \"Browse or Drop files to select a package\";\n+ ? \"Browse or Drop files to select a package (.nupkg) or symbols package (.snupkg)...\"\n+ : \"Browse or Drop files to select a package (.nupkg)\";\nvar acceptExtensions = Model.IsSymbolsUploadEnabled\n? \".nupkg,.snupkg\"\n: \".nupkg\";\n</div>\n}\n+ <div id=\"symbols-replace-warning-container\" class=\"hidden\">\n+ @ViewHelpers.AlertWarning(@<text>There is an existing symbols package (.snupkg) for the below package ID and version.\n+ Submitting this request will replace the previously uploaded symbols package as well as the corresponding symbol files from the symbol server.</text>)\n+ </div>\n+\[email protected](\"_VerifyForm\")\n</div>\n</div>\n"
},
{
"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 ifnot: $data.IsSymbolsPackage -->\n<div class=\"verify-package-field\">\n<label class=\"verify-package-field-heading\">Title</label>\n<div data-bind=\"template: { name: 'display-data-or-default', data: { DisplayText: $data.Title }}\"></div>\n<div data-bind=\"template: { name: 'display-data-or-default', data: { DisplayText: $data.Summary }}\"></div>\n</div>\n- <!-- ko ifnot: $data.IsSymbolsPackage -->\n<div class=\"verify-package-field\">\n<div class=\"verify-package-field-heading\"><label>Release Notes</label> (for this version)</div>\n<div data-bind=\"template: { name: 'display-data-or-default', data: { DisplayText: $data.ReleaseNotes }}\"></div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Symbols UI Fixes (#6576) |
455,751 | 18.10.2018 13:08:57 | 25,200 | fa40f54d2ce81d582bc5bbbee50bba0fc00a9745 | GetEtagAsync
Add GetEtagAsync. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -426,6 +426,27 @@ public async Task<Uri> GetFileReadUriAsync(string folderName, string fileName, D\n}\n}\n+ public async Task<string> GetETagOrNullAsync(\n+ string folderName,\n+ string fileName)\n+ {\n+ folderName = folderName ?? throw new ArgumentNullException(nameof(folderName));\n+ fileName = fileName ?? throw new ArgumentNullException(nameof(fileName));\n+\n+ var container = await GetContainerAsync(folderName);\n+ var blob = container.GetBlobReference(fileName);\n+ try\n+ {\n+ await blob.FetchAttributesAsync();\n+ return blob.ETag;\n+ }\n+ // In case that the blob does not exist return null.\n+ catch (StorageException)\n+ {\n+ return null;\n+ }\n+ }\n+\nprivate static SharedAccessBlobPermissions MapFileUriPermissions(FileUriPermissions permissions)\n{\nreturn (SharedAccessBlobPermissions)permissions;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"diff": "@@ -120,5 +120,15 @@ public interface ICoreFileStorageService\nstring folderName,\nstring fileName,\nFunc<Lazy<Task<Stream>>, IDictionary<string, string>, Task<bool>> updateMetadataAsync);\n+\n+ /// <summary>\n+ /// Returns the etag value for the specified blob. If the blob does not exists it will return null.\n+ /// </summary>\n+ /// <param name=\"folderName\">The folder name.</param>\n+ /// <param name=\"fileName\">The file name.</param>\n+ /// <returns>The etag of the specified file.</returns>\n+ Task<string> GetETagOrNullAsync(\n+ string folderName,\n+ string fileName);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"diff": "@@ -273,6 +273,13 @@ public static string ResolvePath(string fileStorageDirectory)\nreturn fileStorageDirectory;\n}\n+ public Task<string> GetETagOrNullAsync(\n+ string folderName,\n+ string fileName)\n+ {\n+ throw new NotImplementedException(nameof(GetETagOrNullAsync));\n+ }\n+\nprivate static string GetContentType(string folderName)\n{\nswitch (folderName)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -1410,5 +1410,61 @@ public async Task WhenReturnValueIsTrue_MetadataChangesAreNotPersisted()\n_blobClient.VerifyAll();\n}\n}\n+\n+ public class TheGetETagMethod\n+ {\n+ private const string _etag = \"dummy_etag\";\n+\n+ private readonly Mock<ICloudBlobClient> _blobClient;\n+ private readonly Mock<ICloudBlobContainer> _blobContainer;\n+ private readonly Mock<ISimpleCloudBlob> _blob;\n+ private readonly CloudBlobCoreFileStorageService _service;\n+\n+ public TheGetETagMethod()\n+ {\n+ _blobClient = new Mock<ICloudBlobClient>();\n+ _blobContainer = new Mock<ICloudBlobContainer>();\n+ _blob = new Mock<ISimpleCloudBlob>();\n+\n+ _blobClient.Setup(x => x.GetContainerReference(It.IsAny<string>()))\n+ .Returns(_blobContainer.Object);\n+ _blobContainer.Setup(x => x.CreateIfNotExistAsync())\n+ .Returns(Task.FromResult(0));\n+ _blobContainer.Setup(x => x.SetPermissionsAsync(It.IsAny<BlobContainerPermissions>()))\n+ .Returns(Task.FromResult(0));\n+ _blobContainer.Setup(x => x.GetBlobReference(It.IsAny<string>()))\n+ .Returns(_blob.Object);\n+\n+ _service = CreateService(fakeBlobClient: _blobClient);\n+ }\n+\n+ [Fact]\n+ public async Task VerifyTheETagValue()\n+ {\n+ // Arrange\n+ _blob.SetupGet(x => x.ETag).Returns(_etag);\n+\n+ // Act\n+ var etagValue = await _service.GetETagOrNullAsync(folderName: CoreConstants.PackagesFolderName, fileName: \"a\");\n+\n+ // Assert\n+ Assert.Equal(_etag, etagValue);\n+ }\n+\n+\n+ [Fact]\n+ public async Task VerifyETagIsNullWhenBlobDoesNotExist()\n+ {\n+ // Arrange\n+ _blob.Setup(x => x.FetchAttributesAsync()).ThrowsAsync(new StorageException(\"Boo\"));\n+\n+ // Act\n+ var etagValue = await _service.GetETagOrNullAsync(folderName: CoreConstants.PackagesFolderName, fileName: \"a\");\n+\n+ // Assert\n+ Assert.Null(etagValue);\n+ }\n+ }\n+\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | GetEtagAsync (#6577)
Add GetEtagAsync. |
455,747 | 19.10.2018 15:57:44 | 25,200 | 88588f88def779f34ffb5b939a78aacfb10d8246 | [MSA] Pass the error messages from AADv2 to gallery | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"diff": "@@ -45,10 +45,15 @@ public static class AuthenticationType\npublic static readonly string Authority = \"https://login.microsoftonline.com/{0}/v2.0\";\nprivate static string _callbackPath = \"users/account/authenticate/return\";\n- private static HashSet<string> _errorMessageList = new HashSet<string> { \"access_denied\", \"consent_required\" };\nprivate static HashSet<string> _alternateSiteRootList;\nprivate const string SELECT_ACCOUNT = \"select_account\";\n+ private static class ErrorQueryKeys\n+ {\n+ public const string Error = \"error\";\n+ public const string ErrorDescription = \"errorDescription\";\n+ }\n+\n/// <summary>\n/// The possible values returned by <see cref=\"V2Claims.ACR\"/> claim, and also the possible token values to be sent\n/// for authentication to the common endpoint.\n@@ -200,16 +205,23 @@ public override bool SupportsMultiFactorAuthentication()\n// error handling is done.\nprivate Task AuthenticationFailed(AuthenticationFailedNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> notification)\n{\n- if (_errorMessageList.Contains(notification.Exception.Message))\n- {\n- // For every 'Challenge' sent to the external providers, we store the 'State'\n+ // For every 'Challenge' sent to the external providers, we pass the 'State'\n// with the redirect uri where we intend to return after successful authentication.\n// Extract this \"RedirectUri\" property from this \"State\" object for redirecting on failed authentication as well.\nvar authenticationProperties = GetAuthenticationPropertiesFromProtocolMessage(notification.ProtocolMessage, notification.Options);\n+ // All authentication related exceptions will be handled.\nnotification.HandleResponse();\n- notification.Response.Redirect(authenticationProperties.RedirectUri);\n- }\n+\n+ // Pass the errors as the query string to show appropriate message to the user.\n+ var queryString = new List<KeyValuePair<string, string>>()\n+ {\n+ new KeyValuePair<string, string>(ErrorQueryKeys.Error, notification.ProtocolMessage.Error),\n+ new KeyValuePair<string, string>(ErrorQueryKeys.ErrorDescription, notification.ProtocolMessage.ErrorDescription)\n+ };\n+\n+ var redirectUri = UriExtensions.AppendQueryStringToRelativeUri(authenticationProperties.RedirectUri, queryString);\n+ notification.Response.Redirect(redirectUri);\nreturn Task.FromResult(0);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "namespace NuGetGallery\n{\n+ public static class AuthenticationFailureErrors\n+ {\n+ public const string ACCESSS_DENIED = \"access_denied\";\n+ public const string CONSENT_REQUIRED = \"consent_required\";\n+ }\n+\npublic partial class AuthenticationController\n: AppController\n{\n@@ -172,7 +178,7 @@ public virtual async Task<ActionResult> SignIn(LogOnViewModel model, string retu\nauthenticatedUser = loginUserDetails?.AuthenticatedUser;\nif (authenticatedUser == null)\n{\n- return ExternalLinkExpired();\n+ return AuthenticationFailureOrExternalLinkExpired();\n}\nusedMultiFactorAuthentication = loginUserDetails.UsedMultiFactorAuthentication;\n@@ -264,7 +270,7 @@ public virtual async Task<ActionResult> Register(LogOnViewModel model, string re\nvar result = await _authService.ReadExternalLoginCredential(OwinContext);\nif (result.ExternalIdentity == null)\n{\n- return ExternalLinkExpired();\n+ return AuthenticationFailureOrExternalLinkExpired();\n}\nusedMultiFactorAuthentication = result.LoginDetails?.WasMultiFactorAuthenticated ?? false;\n@@ -497,7 +503,7 @@ public virtual async Task<ActionResult> LinkOrChangeExternalCredential(string re\nreturn SafeRedirect(returnUrl);\n}\n- public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl)\n+ public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl, string error = null, string errorDescription = null)\n{\n// Extract the external login info\nvar result = await _authService.AuthenticateExternalLogin(OwinContext);\n@@ -505,7 +511,8 @@ public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl)\n{\n// User got here without an external login cookie (or an expired one)\n// Send them to the logon action\n- return ExternalLinkExpired();\n+ string errorMessage = GetAuthenticationFailureMessage(error, errorDescription);\n+ return AuthenticationFailureOrExternalLinkExpired(errorMessage);\n}\nif (result.Authentication != null)\n@@ -749,11 +756,11 @@ private string GetEmailAddressFromExternalLoginResult(AuthenticateExternalLoginR\n}\n}\n- private ActionResult ExternalLinkExpired()\n+ private ActionResult AuthenticationFailureOrExternalLinkExpired(string errorMessage = null)\n{\n// User got here without an external login cookie (or an expired one)\n// Send them to the logon action with a message\n- TempData[\"Message\"] = Strings.ExternalAccountLinkExpired;\n+ TempData[\"Message\"] = string.IsNullOrEmpty(errorMessage) ? Strings.ExternalAccountLinkExpired : errorMessage;\nreturn Redirect(Url.LogOn(null, relativeUrl: false));\n}\n@@ -815,5 +822,24 @@ private ActionResult AuthenticationView(string viewName, LogOnViewModel existing\nreturn View(viewName, existingModel);\n}\n+\n+ private string GetAuthenticationFailureMessage(string error, string errorDescription)\n+ {\n+ if (string.IsNullOrEmpty(error))\n+ {\n+ return Strings.AuthenticationFailure_UnkownError;\n+ }\n+\n+ switch (error)\n+ {\n+ case AuthenticationFailureErrors.ACCESSS_DENIED:\n+ case AuthenticationFailureErrors.CONSENT_REQUIRED:\n+ return Strings.ExternalAccountLinkExpired;\n+ default:\n+ return string.IsNullOrEmpty(errorDescription)\n+ ? error\n+ : errorDescription;\n+ }\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/UriExtensions.cs",
"new_path": "src/NuGetGallery/Helpers/UriExtensions.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;\n+using System.Web;\nnamespace NuGetGallery\n{\n@@ -57,5 +59,19 @@ public static Uri ToHttps(this Uri uri)\nreturn uriBuilder.Uri;\n}\n+\n+ public static string AppendQueryStringToRelativeUri(string relativeUrl, IReadOnlyCollection<KeyValuePair<string, string>> queryStringCollection)\n+ {\n+ var tempUri = new Uri(\"http://www.nuget.org/\");\n+ var builder = new UriBuilder(new Uri(tempUri, relativeUrl));\n+ var query = HttpUtility.ParseQueryString(builder.Query);\n+ foreach (var pair in queryStringCollection)\n+ {\n+ query[pair.Key] = pair.Value;\n+ }\n+\n+ builder.Query = query.ToString();\n+ return builder.Uri.PathAndQuery;\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -486,6 +486,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Unknown error!.\n+ /// </summary>\n+ public static string AuthenticationFailure_UnkownError {\n+ get {\n+ return ResourceManager.GetString(\"AuthenticationFailure_UnkownError\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The '{0}' authentication provider is disabled and cannot be used to authenticate\n///.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1002,4 +1002,7 @@ The {1} Team</value>\n<data name=\"UploadPackage_NotAcceptingPackagesWithLicense\" xml:space=\"preserve\">\n<value>This package contains a <license> metadata which is currently not supported.</value>\n</data>\n+ <data name=\"AuthenticationFailure_UnkownError\" xml:space=\"preserve\">\n+ <value>Unknown error!</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -1457,8 +1457,10 @@ public void WillCallChallengeAuthenticationForAADv2Provider()\npublic class TheLinkExternalAccountAction : TestContainer\n{\n- [Fact]\n- public async Task GivenExpiredExternalAuth_ItRedirectsBackToLogOnWithExternalAuthExpiredMessage()\n+ [Theory]\n+ [InlineData(\"access_denied\")]\n+ [InlineData(\"consent_required\")]\n+ public async Task GivenExpiredExternalAuth_ItRedirectsBackToLogOnWithExternalAuthExpiredMessage(string error)\n{\n// Arrange\nGetMock<AuthenticationService>(); // Force a mock to be created\n@@ -1468,12 +1470,33 @@ public async Task GivenExpiredExternalAuth_ItRedirectsBackToLogOnWithExternalAut\n.CompletesWith(new AuthenticateExternalLoginResult());\n// Act\n- var result = await controller.LinkExternalAccount(\"theReturnUrl\");\n+ var result = await controller.LinkExternalAccount(\"theReturnUrl\", error);\n// Assert\nVerifyExternalLinkExpiredResult(controller, result);\n}\n+ [Theory]\n+ [InlineData(\"server_error\", \"The server encountered an unexpected error.\")]\n+ [InlineData(\"temporarily_unavailable\", \"The server is temporarily too busy to handle the request.\")]\n+ [InlineData(\"invalid_resource\", \"The target resource is invalid because either it does not exist, Azure AD cannot find it, or it is not correctly configured.\")]\n+ [InlineData(\"invalid_request\", \"Protocol error, such as a missing, required parameter.\")]\n+ public async Task GivenExpiredExternalAuth_ItRedirectsBackToLogOnWithPassedErrorMessage(string error, string errorDescription)\n+ {\n+ // Arrange\n+ GetMock<AuthenticationService>(); // Force a mock to be created\n+ var controller = GetController<AuthenticationController>();\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.AuthenticateExternalLogin(controller.OwinContext))\n+ .CompletesWith(new AuthenticateExternalLoginResult());\n+\n+ // Act\n+ var result = await controller.LinkExternalAccount(\"theReturnUrl\", error, errorDescription);\n+\n+ // Assert\n+ VerifyExternalLinkExpiredResult(controller, result, errorDescription);\n+ }\n+\n[Fact]\npublic async Task GivenAssociatedLocalUser_ItCreatesASessionAndSafeRedirectsToReturnUrl()\n{\n@@ -2213,10 +2236,11 @@ public void VerifyShouldChallenge(string providerUsedForLogin, bool shouldChalle\n}\n}\n- public static void VerifyExternalLinkExpiredResult(AuthenticationController controller, ActionResult result)\n+ public static void VerifyExternalLinkExpiredResult(AuthenticationController controller, ActionResult result, string expectedMessage = null)\n{\n+ expectedMessage = expectedMessage ?? Strings.ExternalAccountLinkExpired;\nResultAssert.IsRedirect(result, permanent: false, url: controller.Url.LogOn(relativeUrl: false));\n- Assert.Equal(Strings.ExternalAccountLinkExpired, controller.TempData[\"Message\"]);\n+ Assert.Equal(expectedMessage, controller.TempData[\"Message\"]);\n}\nprivate static void EnableAllAuthenticators(AuthenticationService authService)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"TestUtils\\TestServiceUtility.cs\" />\n<Compile Include=\"TestUtils\\TestDataUtility.cs\" />\n<Compile Include=\"TestUtils\\TestUtility.cs\" />\n+ <Compile Include=\"UriExtensionsFacts.cs\" />\n<Compile Include=\"UrlHelperExtensionsFacts.cs\" />\n<Compile Include=\"ViewModels\\DependencySetsViewModelFacts.cs\" />\n<Compile Include=\"ViewModels\\DisplayPackageViewModelFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [MSA] Pass the error messages from AADv2 to gallery (#6581) |
455,756 | 22.10.2018 14:33:09 | 25,200 | e1ac2b597207287cfc499b0b8882a0b93cf74f4d | Delete confirmation button in UI for MSA-AAD registration | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Thanks.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Thanks.cshtml",
"diff": "<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n<p class=\"ms-fontSize-xl\">Welcome @CurrentUser.Username! Now that you have a NuGet.org account, let's get you started!</p>\n+ @if (!CurrentUser.Confirmed)\n+ {\n<p>Make sure your email is verified. <a href=\"@Url.ConfirmationRequired()\">Confirm your account</a></p>\n+ }\n<p>Want to update your account? <a href=\"@Url.AccountSettings()\">View Account Settings</a></p>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Delete confirmation button in UI for MSA-AAD registration (#6586) |
455,759 | 24.10.2018 20:12:12 | -7,200 | 75d53d361a9a4677d87a1b8a9101b85e2291db69 | Aligning all ServerCommon dependencies to the same version to fix assembly version loading issues | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Version>4.8.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.30.0-master-42538</Version>\n+ <Version>2.30.0-master-42731</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.30.0-master-42538</Version>\n+ <Version>2.30.0-master-42731</Version>\n</PackageReference>\n<PackageReference Include=\"WindowsAzure.Storage\">\n<Version>7.1.2</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>4.8.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.27.0</Version>\n+ <Version>2.30.0-master-42731</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.2.3</Version>\n+ <Version>2.30.0-master-42731</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.2.3</Version>\n+ <Version>2.30.0-master-42731</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.27.0</Version>\n+ <Version>2.30.0-master-42731</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Aligning all ServerCommon dependencies to the same version to fix assembly version loading issues (#6589) |
455,747 | 25.10.2018 11:14:47 | 25,200 | 166be050eae38e264c056328436e7d788b374e3f | Fix versioning issue | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"NuGet.Versioning\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.8.0.4\" newVersion=\"4.8.0.4\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.8.0.6\" newVersion=\"4.8.0.6\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Autofac.Integration.Owin\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix versioning issue (#6595) |
455,776 | 25.10.2018 11:50:08 | 25,200 | e582941f6b4cfce14ef1d032f95c1d107dd0e130 | Configure MicroBuild to sign NuGetGallery | [
{
"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 = '80b8f1b4a1cfe57367881e59fca063866dcaaa42'\n+ [string]$BuildBranch = '795fed66b8bae2d248237ee5ec82e688e7174a42'\n)\nSet-StrictMode -Version 1.0\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"new_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"diff": "<SignPath>..\\..\\build</SignPath>\n<SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n<SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ <SignType Condition=\"'$(SignType)' == ''\">none</SignType>\n</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"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<SignPath>..\\..\\build</SignPath>\n<SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n<SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ <SignType Condition=\"'$(SignType)' == ''\">none</SignType>\n</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"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<SignPath>..\\..\\build</SignPath>\n<SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n<SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ <SignType Condition=\"'$(SignType)' == ''\">none</SignType>\n</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"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Configure MicroBuild to sign NuGetGallery (#6582) |
455,759 | 25.10.2018 23:00:50 | -7,200 | b0a1c72bb0b2ca58d5486b3051094278f8b55ce9 | Upgrade to stable v2.30 ServerCommon dependencies | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>4.8.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"WindowsAzure.Storage\">\n<Version>7.1.2</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>0.15.4</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>4.8.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.30.0-master-42731</Version>\n+ <Version>2.30.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Upgrade to stable v2.30 ServerCommon dependencies (#6596) |
455,776 | 26.10.2018 15:20:00 | 25,200 | 9070951769c2a57f7d56746bdec48938df80bf94 | Hotfix: Do not CC sender for Contact Owners emails | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/mail/CoreMarkdownMessageService.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/mail/CoreMarkdownMessageService.cs",
"diff": "@@ -39,11 +39,16 @@ public async Task SendMessageAsync(IEmailBuilder emailBuilder, bool copySender =\nusing (var email = CreateMailMessage(emailBuilder))\n{\n- await SendMessageInternalAsync(email, copySender, discloseSenderAddress);\n+ await SendMessageInternalAsync(email);\n+\n+ if (copySender && !discloseSenderAddress)\n+ {\n+ await SendMessageToSenderAsync(email);\n+ }\n}\n}\n- protected virtual async Task SendMessageInternalAsync(MailMessage mailMessage, bool copySender = false, bool discloseSenderAddress = false)\n+ protected virtual async Task SendMessageInternalAsync(MailMessage mailMessage)\n{\nif (!mailMessage.To.Any())\n{\n@@ -72,11 +77,6 @@ protected virtual async Task SendMessageInternalAsync(MailMessage mailMessage, b\n}\n}\n}\n-\n- if (copySender && !discloseSenderAddress)\n- {\n- await SendMessageToSenderAsync(mailMessage);\n- }\n}\nprotected virtual Task AttemptSendMessageAsync(MailMessage mailMessage, int attemptNumber)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1115,8 +1115,7 @@ public virtual async Task<ActionResult> ContactOwners(string id, string version,\npackage,\nUrl.Package(package, false),\nHttpUtility.HtmlEncode(contactForm.Message),\n- Url.AccountSettings(relativeUrl: false),\n- contactForm.CopySender);\n+ Url.AccountSettings(relativeUrl: false));\nawait _messageService.SendMessageAsync(contactOwnersMessage, contactForm.CopySender, discloseSenderAddress: false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Mail/BackgroundMarkdownMessageService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Mail/BackgroundMarkdownMessageService.cs",
"diff": "@@ -30,7 +30,7 @@ public class BackgroundMarkdownMessageService : MarkdownMessageService\nprivate Func<BackgroundMarkdownMessageService> _messageServiceFactory;\nprivate bool _sentMessage;\n- protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool copySender = false, bool discloseSenderAddress = false)\n+ protected override Task SendMessageInternalAsync(MailMessage mailMessage)\n{\n// Some MVC controller actions send more than one message. Since this method sends\n// the message async, we need a new IMessageService per email, to avoid calling\n@@ -39,7 +39,7 @@ protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool c\nif (_sentMessage)\n{\nvar newMessageService = _messageServiceFactory.Invoke();\n- return newMessageService.SendMessageInternalAsync(mailMessage, copySender, discloseSenderAddress);\n+ return newMessageService.SendMessageInternalAsync(mailMessage);\n}\nelse\n{\n@@ -55,7 +55,7 @@ protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool c\n{\ntry\n{\n- await base.SendMessageInternalAsync(messageCopy, copySender, discloseSenderAddress);\n+ await base.SendMessageInternalAsync(messageCopy);\n}\ncatch (Exception ex)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Mail/Messages/ContactOwnersMessage.cs",
"new_path": "src/NuGetGallery/Infrastructure/Mail/Messages/ContactOwnersMessage.cs",
"diff": "@@ -17,8 +17,7 @@ public class ContactOwnersMessage : MarkdownEmailBuilder\nPackage package,\nstring packageUrl,\nstring htmlEncodedMessage,\n- string emailSettingsUrl,\n- bool copySender)\n+ string emailSettingsUrl)\n{\n_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));\nFromAddress = fromAddress ?? throw new ArgumentNullException(nameof(fromAddress));\n@@ -26,7 +25,6 @@ public class ContactOwnersMessage : MarkdownEmailBuilder\nPackageUrl = packageUrl ?? throw new ArgumentNullException(nameof(packageUrl));\nHtmlEncodedMessage = htmlEncodedMessage ?? throw new ArgumentNullException(nameof(htmlEncodedMessage));\nEmailSettingsUrl = emailSettingsUrl ?? throw new ArgumentNullException(nameof(emailSettingsUrl));\n- CopySender = copySender;\n}\npublic MailAddress FromAddress { get; }\n@@ -34,7 +32,6 @@ public class ContactOwnersMessage : MarkdownEmailBuilder\npublic string PackageUrl { get; }\npublic string HtmlEncodedMessage { get; }\npublic string EmailSettingsUrl { get; }\n- public bool CopySender { get; }\npublic override MailAddress Sender => _configuration.GalleryOwner;\n@@ -46,7 +43,6 @@ public override IEmailRecipients GetRecipients()\nreturn new EmailRecipients(\nto,\n- cc: CopySender ? new[] { FromAddress } : null,\nreplyTo: new[] { FromAddress });\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/Messages/ContactOwnersMessageFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/Messages/ContactOwnersMessageFacts.cs",
"diff": "@@ -43,8 +43,7 @@ public static IEnumerable<object[]> ConstructorArguments\npackage,\npackageUrl,\nmessage,\n- emailSettingsUrl,\n- copySender));\n+ emailSettingsUrl));\n}\n}\n@@ -72,19 +71,9 @@ public void AddsFromAddressToReplyToList()\n}\n[Fact]\n- public void AddsFromAddressToCCListWhenCopyingSender()\n+ public void DoesNotAddFromAddressToCCList()\n{\n- var message = CreateMessage(copySender: true);\n- var recipients = message.GetRecipients();\n-\n- Assert.Equal(1, recipients.CC.Count);\n- Assert.Contains(Fakes.FromAddress, recipients.CC);\n- }\n-\n- [Fact]\n- public void DoesNotAddFromAddressToCCListWhenNotCopyingSender()\n- {\n- var message = CreateMessage(copySender: false);\n+ var message = CreateMessage();\nvar recipients = message.GetRecipients();\nAssert.Empty(recipients.CC);\n@@ -122,7 +111,7 @@ public void SetsGalleryOwnerAsSender()\nAssert.Equal(Configuration.GalleryOwner, message.Sender);\n}\n- private static ContactOwnersMessage CreateMessage(bool copySender = false)\n+ private static ContactOwnersMessage CreateMessage()\n{\nreturn new ContactOwnersMessage(\nConfiguration,\n@@ -130,8 +119,7 @@ private static ContactOwnersMessage CreateMessage(bool copySender = false)\nFakes.Package,\nFakes.PackageUrl,\n\"user input\",\n- Fakes.EmailSettingsUrl,\n- copySender);\n+ Fakes.EmailSettingsUrl);\n}\nprivate const string _expectedMarkdownBody =\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -233,7 +233,7 @@ public class TheSendContactOwnersMessageMethod\n: TestContainer\n{\n[Fact]\n- public async Task WillCopySenderIfAsked()\n+ public async Task WillSendCopyToSenderIfAsked()\n{\n// arrange\nvar packageId = \"smangit\";\n@@ -267,8 +267,7 @@ public async Task WillCopySenderIfAsked()\npackage,\n\"http://someurl/\",\n\"Test message\",\n- \"http://someotherurl/\",\n- copySender: true);\n+ \"http://someotherurl/\");\n// act\nawait messageService.SendMessageAsync(contactOwnersMessage, copySender: true, discloseSenderAddress: false);\n@@ -285,6 +284,8 @@ public async Task WillCopySenderIfAsked()\nAssert.Equal(TestGalleryOwner, messages[1].From);\nAssert.Equal(fromAddress, messages[0].ReplyToList.Single().Address);\nAssert.Equal(fromAddress, messages[1].ReplyToList.Single().Address);\n+ Assert.Empty(messages[0].CC);\n+ Assert.Empty(messages[1].CC);\n}\n[Fact]\n@@ -320,11 +321,10 @@ public async Task WillSendEmailToAllOwners()\npackage,\n\"http://packageUrl/\",\n\"Test message\",\n- \"http://emailSettingsUrl/\",\n- copySender: false);\n+ \"http://emailSettingsUrl/\");\nawait messageService.SendMessageAsync(contactOwnersMessage);\n- var message = messageService.MockMailSender.Sent.Last();\n+ var message = messageService.MockMailSender.Sent.Single();\nAssert.Equal(owner1Email, message.To[0].Address);\nAssert.Equal(owner2Email, message.To[1].Address);\n@@ -372,11 +372,10 @@ public async Task WillNotSendEmailToOwnerThatOptsOut()\npackage,\n\"http://someurl/\",\n\"Test message\",\n- \"http://someotherurl/\",\n- copySender: false);\n+ \"http://someotherurl/\");\nawait messageService.SendMessageAsync(contactOwnersMessage);\n- var message = messageService.MockMailSender.Sent.Last();\n+ var message = messageService.MockMailSender.Sent.Single();\n// assert\nAssert.Equal(ownerAddress, message.To[0].Address);\n@@ -418,8 +417,7 @@ public async Task WillNotAttemptToSendIfNoOwnersAllow()\npackage,\n\"http://someurl/\",\n\"Test message\",\n- \"http://someotherurl/\",\n- copySender: false);\n+ \"http://someotherurl/\");\nawait messageService.SendMessageAsync(contactOwnersMessage);\n@@ -428,7 +426,7 @@ public async Task WillNotAttemptToSendIfNoOwnersAllow()\n}\n[Fact]\n- public async Task WillNotCopySenderIfNoOwnersAllow()\n+ public async Task WillNotSendCopyToSenderIfNoOwnersAllow()\n{\n// arrange\nvar packageId = \"smangit\";\n@@ -461,8 +459,7 @@ public async Task WillNotCopySenderIfNoOwnersAllow()\npackage,\n\"http://someurl/\",\n\"Test message\",\n- \"http://someotherurl/\",\n- copySender: false);\n+ \"http://someotherurl/\");\nawait messageService.SendMessageAsync(contactOwnersMessage);\n// assert\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Hotfix: Do not CC sender for Contact Owners emails (#6602) |
455,794 | 26.10.2018 16:42:36 | 25,200 | a4dd371d50d3c8217acd66a5d0a82cc4326ad112 | Integrate FxCop exclusions | [
{
"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 = '80b8f1b4a1cfe57367881e59fca063866dcaaa42'\n+ [string]$BuildBranch = '5fd8377a9abf3ff411918dbb973948a6677432db'\n)\nSet-StrictMode -Version 1.0\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Integrate FxCop exclusions (#6603) |
455,736 | 29.10.2018 09:16:02 | 25,200 | 64f5a36609de9efb53cb6aaea079169af43fc159 | Redirect HTTP 400 to a specific error page instead of default for 500
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<customErrors mode=\"RemoteOnly\" defaultRedirect=\"~/Errors/500\" redirectMode=\"ResponseRedirect\">\n<!-- Adding ? at the end of the redirect URL prevents the illegal request to be passed\nas a query parameter to the redirect URL and causing additional failures -->\n+ <error statusCode=\"400\" redirect=\"~/Errors/400\"/>\n<error statusCode=\"404\" redirect=\"~/Errors/404\"/>\n<error statusCode=\"500\" redirect=\"~/Errors/500\"/>\n</customErrors>\n</modules>\n<validation validateIntegratedModeConfiguration=\"false\"/>\n<httpErrors errorMode=\"DetailedLocalOnly\">\n+ <remove statusCode=\"400\"/>\n<remove statusCode=\"404\"/>\n<remove statusCode=\"500\"/>\n+ <error statusCode=\"400\" path=\"/Errors/400\" responseMode=\"ExecuteURL\"/>\n<error statusCode=\"404\" path=\"/Errors/404\" responseMode=\"ExecuteURL\"/>\n<error statusCode=\"500\" path=\"/Errors/500\" responseMode=\"ExecuteURL\"/>\n</httpErrors>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Redirect HTTP 400 to a specific error page instead of default for 500 (#6604)
Address https://github.com/NuGet/NuGetGallery/issues/6601 |
455,747 | 30.10.2018 14:09:51 | 25,200 | 6ebb7a2666b76a992de1927a0e5910fb99e06815 | Fix concurrency/consistency issues in Gallery API push | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Services\\CoreSymbolPackageService.cs\" />\n<Compile Include=\"Services\\CorePackageService.cs\" />\n<Compile Include=\"Services\\CryptographyService.cs\" />\n+ <Compile Include=\"Services\\PackageAlreadyExistsException.cs\" />\n<Compile Include=\"Services\\FileAlreadyExistsException.cs\" />\n<Compile Include=\"Services\\FileUriPermissions.cs\" />\n<Compile Include=\"Services\\IAccessCondition.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "using NuGetGallery.Configuration;\nusing NuGetGallery.Filters;\nusing NuGetGallery.Infrastructure.Authentication;\n-using NuGetGallery.Infrastructure.Mail;\n-using NuGetGallery.Infrastructure.Mail.Messages;\nusing NuGetGallery.Packaging;\nusing NuGetGallery.Security;\nusing PackageIdValidator = NuGetGallery.Packaging.PackageIdValidator;\n@@ -731,6 +729,10 @@ private async Task<ActionResult> CreatePackageInternal()\n{\nreturn BadRequestForExceptionMessage(ex);\n}\n+ catch (PackageAlreadyExistsException ex)\n+ {\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.Conflict, ex.Message);\n+ }\ncatch (EntityException ex)\n{\nreturn BadRequestForExceptionMessage(ex);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -479,8 +479,8 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\nif (package != null)\n{\n- throw new EntityException(\n- \"A package with identifier '{0}' and version '{1}' already exists.\", packageRegistration.Id, package.Version);\n+ throw new PackageAlreadyExistsException(\n+ string.Format(Strings.PackageExistsAndCannotBeModified, packageRegistration.Id, package.Version));\n}\npackage = new Package();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Data.Entity.Infrastructure;\n+using System.Data.SqlClient;\nusing System.IO;\nusing System.Linq;\nusing System.Threading;\n@@ -427,7 +429,7 @@ public async Task<PackageCommitResult> CommitPackageAsync(Package package, Strea\n// commit all changes to database as an atomic transaction\nawait _entitiesContext.SaveChangesAsync();\n}\n- catch\n+ catch (Exception ex)\n{\n// If saving to the DB fails for any reason we need to delete the package we just saved.\nif (package.PackageStatusKey == PackageStatus.Validating)\n@@ -443,10 +445,36 @@ public async Task<PackageCommitResult> CommitPackageAsync(Package package, Strea\npackage.Version);\n}\n- throw;\n+ return ReturnConflictOrThrow(ex);\n}\nreturn PackageCommitResult.Success;\n}\n+\n+ private PackageCommitResult ReturnConflictOrThrow(Exception ex)\n+ {\n+ if (ex is DbUpdateConcurrencyException concurrencyEx)\n+ {\n+ return PackageCommitResult.Conflict;\n+ }\n+ else if (ex is DbUpdateException dbUpdateEx)\n+ {\n+ if (dbUpdateEx.InnerException?.InnerException != null)\n+ {\n+ if (dbUpdateEx.InnerException.InnerException is SqlException sqlException)\n+ {\n+ switch (sqlException.Number)\n+ {\n+ case 547: // Constraint check violation\n+ case 2601: // Duplicated key row error\n+ case 2627: // Unique constraint error\n+ return PackageCommitResult.Conflict;\n+ }\n+ }\n+ }\n+ }\n+\n+ throw ex;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -843,6 +843,52 @@ public async Task WillReturnConflictIfCommittingPackageReturnsConflict()\ncontroller.MockEntitiesContext.VerifyCommitted(Times.Never());\n}\n+ [Fact]\n+ public async Task WillReturnConflictIfGeneratePackageThrowsPackageAlreadyExistsException()\n+ {\n+ // Arrange\n+ var packageId = \"theId\";\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, \"1.0.42\");\n+\n+ var currentUser = new User(\"currentUser\") { Key = 1, EmailAddress = \"[email protected]\" };\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.SetCurrentUser(currentUser);\n+ controller.SetupPackageFromInputStream(nuGetPackage);\n+\n+ var owner = new User(\"owner\") { Key = 2, EmailAddress = \"[email protected]\" };\n+\n+ Expression<Func<IApiScopeEvaluator, ApiScopeEvaluationResult>> evaluateApiScope =\n+ x => x.Evaluate(\n+ currentUser,\n+ It.IsAny<IEnumerable<Scope>>(),\n+ ActionsRequiringPermissions.UploadNewPackageId,\n+ It.Is<ActionOnNewPackageContext>((context) => context.PackageId == packageId),\n+ NuGetScopes.PackagePush);\n+\n+ controller.MockApiScopeEvaluator\n+ .Setup(evaluateApiScope)\n+ .Returns(new ApiScopeEvaluationResult(owner, PermissionsCheckResult.Allowed, scopesAreValid: true));\n+ controller\n+ .MockPackageUploadService\n+ .Setup(x => x.GeneratePackageAsync(It.IsAny<string>(),\n+ It.IsAny<PackageArchiveReader>(),\n+ It.IsAny<PackageStreamMetadata>(),\n+ It.IsAny<User>(),\n+ It.IsAny<User>()))\n+ .Throws(new PackageAlreadyExistsException(\"Package exists\"));\n+\n+ // Act\n+ var result = await controller.CreatePackagePut();\n+\n+ // Assert\n+ ResultAssert.IsStatusCode(result, HttpStatusCode.Conflict);\n+ controller.MockPackageUploadService.Verify(x => x.GeneratePackageAsync(It.IsAny<string>(),\n+ It.IsAny<PackageArchiveReader>(),\n+ It.IsAny<PackageStreamMetadata>(),\n+ It.IsAny<User>(),\n+ It.IsAny<User>()), Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillReturnValidationWarnings()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -423,6 +423,26 @@ private async Task WillSaveTheCreatedPackageWhenThePackageRegistrationAlreadyExi\nAssert.Same(packageRegistration.Packages.ElementAt(0), package);\n}\n+ [Fact]\n+ private async Task WillThrowWhenThePackageRegistrationAndVersionAlreadyExists()\n+ {\n+ var currentUser = new User();\n+ var packageId = \"theId\";\n+ var packageVersion = \"1.0.32\";\n+ var nugetPackage = PackageServiceUtility.CreateNuGetPackage(packageId, packageVersion);\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = packageId,\n+ Owners = new HashSet<User> { currentUser },\n+ };\n+ packageRegistration.Packages.Add(new Package() { Version = packageVersion });\n+ var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n+ var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:\n+ mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(packageRegistration); });\n+\n+ await Assert.ThrowsAsync<PackageAlreadyExistsException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, currentUser, isVerified: false));\n+ }\n+\n[Fact]\nprivate async Task WillThrowIfTheNuGetPackageIdIsLongerThanMaxPackageIdLength()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Data.Entity.Infrastructure;\nusing System.IO;\nusing System.Linq;\nusing System.Threading;\n@@ -1037,6 +1038,27 @@ public async Task DeletesPackageIfDatabaseCommitFailsWhenAvailable()\nAssert.Same(_unexpectedException, exception);\n}\n+ [Fact]\n+ public async Task ReturnsConflictWhenDBCommitThrowsConcurrencyViolations()\n+ {\n+ _package.PackageStatusKey = PackageStatus.Available;\n+ var ex = new DbUpdateConcurrencyException(\"whoops!\");\n+ _entitiesContext\n+ .Setup(x => x.SaveChangesAsync())\n+ .Throws(ex);\n+\n+ var result = await _target.CommitPackageAsync(_package, _packageFile);\n+\n+ _packageFileService.Verify(\n+ x => x.DeletePackageFileAsync(Id, Version),\n+ Times.Once);\n+ _packageFileService.Verify(\n+ x => x.DeletePackageFileAsync(It.IsAny<string>(), It.IsAny<string>()),\n+ Times.Once);\n+\n+ Assert.Equal(PackageCommitResult.Conflict, result);\n+ }\n+\n[Fact]\npublic async Task DeletesPackageIfDatabaseCommitFailsWhenValidating()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix concurrency/consistency issues in Gallery API push (#6600) |
455,776 | 30.10.2018 16:00:28 | 25,200 | c6e3c4729eec3aa764e1f6bc086673cacb47a570 | Do not CC sender for Contact Owners emails | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>4.8.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"WindowsAzure.Storage\">\n<Version>7.1.2</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Mail/BackgroundMarkdownMessageService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Mail/BackgroundMarkdownMessageService.cs",
"diff": "@@ -30,7 +30,7 @@ public class BackgroundMarkdownMessageService : MarkdownMessageService\nprivate Func<BackgroundMarkdownMessageService> _messageServiceFactory;\nprivate bool _sentMessage;\n- protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool copySender = false, bool discloseSenderAddress = false)\n+ protected override Task SendMessageInternalAsync(MailMessage mailMessage)\n{\n// Some MVC controller actions send more than one message. Since this method sends\n// the message async, we need a new IMessageService per email, to avoid calling\n@@ -39,7 +39,7 @@ protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool c\nif (_sentMessage)\n{\nvar newMessageService = _messageServiceFactory.Invoke();\n- return newMessageService.SendMessageInternalAsync(mailMessage, copySender, discloseSenderAddress);\n+ return newMessageService.SendMessageInternalAsync(mailMessage);\n}\nelse\n{\n@@ -55,7 +55,7 @@ protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool c\n{\ntry\n{\n- await base.SendMessageInternalAsync(messageCopy, copySender, discloseSenderAddress);\n+ await base.SendMessageInternalAsync(messageCopy);\n}\ncatch (Exception ex)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>0.15.4</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>4.8.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.30.0</Version>\n+ <Version>2.31.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Do not CC sender for Contact Owners emails |
455,747 | 05.11.2018 17:11:00 | 28,800 | 2cf936fe74ccf11f10c404d8609b90a03f7d869b | [Symbol server]Address UI fixes and fix re-upload on failed validation issues for Symbol Server | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/SymbolPackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/SymbolPackageUploadService.cs",
"diff": "@@ -146,6 +146,7 @@ public async Task<PackageCommitResult> CreateAndUploadSymbolsPackage(Package pac\nStream symbolPackageFile = symbolPackageStream.AsSeekableStream();\n+ var previousSymbolsPackage = package.LatestSymbolPackage();\nvar symbolPackage = _symbolPackageService.CreateSymbolPackage(package, packageStreamMetadata);\nawait _validationService.StartValidationAsync(symbolPackage);\n@@ -161,6 +162,16 @@ public async Task<PackageCommitResult> CreateAndUploadSymbolsPackage(Package pac\n{\nif (symbolPackage.StatusKey == PackageStatus.Validating)\n{\n+ // If the last uploaded symbol package has failed validation, it will leave the snupkg in the\n+ // validations container. We could possibly overwrite it, but that might introduce a concurrency\n+ // issue on multiple snupkg uploads with a prior failed validation. The best thing to do would be\n+ // to delete the failed validation snupkg from validations container and then proceed with normal\n+ // upload.\n+ if (previousSymbolsPackage != null && previousSymbolsPackage.StatusKey == PackageStatus.FailedValidation)\n+ {\n+ await DeleteSymbolsPackageAsync(previousSymbolsPackage);\n+ }\n+\nawait _symbolPackageFileService.SaveValidationPackageFileAsync(symbolPackage.Package, symbolPackageFile);\n}\nelse if (symbolPackage.StatusKey == PackageStatus.Available)\n@@ -239,7 +250,13 @@ public async Task DeleteSymbolsPackageAsync(SymbolPackage symbolPackage)\nthrow new ArgumentNullException(nameof(symbolPackage));\n}\n- if (await _symbolPackageFileService.DoesPackageFileExistAsync(symbolPackage.Package))\n+ if (symbolPackage.StatusKey == PackageStatus.FailedValidation\n+ && await _symbolPackageFileService.DoesValidationPackageFileExistAsync(symbolPackage.Package))\n+ {\n+ await _symbolPackageFileService.DeleteValidationPackageFileAsync(symbolPackage.Id, symbolPackage.Version);\n+ }\n+ else if (symbolPackage.StatusKey == PackageStatus.Available\n+ && await _symbolPackageFileService.DoesPackageFileExistAsync(symbolPackage.Package))\n{\nawait _symbolPackageFileService.DeletePackageFileAsync(symbolPackage.Id, symbolPackage.Version);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "{\[email protected](\n@<text>\n- The symbols for this package have not been indexed yet. They are not available\n- for download from the NuGet.org symbol server. Symbols will be indexed and will\n- be available for download after both validation and indexing are complete.\n+ <strong>The symbols for this package have not been indexed yet.</strong> They are not available\n+ for download from the NuGet.org symbol server. Symbols will be available for download after both validation and indexing are complete.\nSymbols validation and indexing may take up to an hour. <a href=\"https://aka.ms/NuGetSymbolsPackageValidation\">Read more</a>.\n</text>\n)\n<a href=\"@Url.RevalidatePackage(Model)\">Revalidate package</a>\n</li>\n+ if (Model.LatestSymbolsPackage != null)\n+ {\n<li>\n<i class=\"ms-Icon ms-Icon--Refresh\" aria-hidden=\"true\"></i>\n<a href=\"@Url.RevalidateSymbolsPackage(Model)\">Revalidate symbols</a>\n</li>\n}\n+ }\n@if (User.IsAdministrator() && Config.Current.AsynchronousPackageValidationEnabled)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SymbolPackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SymbolPackageUploadServiceFacts.cs",
"diff": "@@ -264,6 +264,59 @@ public async Task WillReturnConflictIfFileExistsInContainer()\nsymbolPackageFileService.Verify(x => x.SavePackageFileAsync(package, It.IsAny<Stream>(), It.IsAny<bool>()), Times.Once);\n}\n+ [Fact]\n+ public async Task WillDeleteFailedValidationSnupkg()\n+ {\n+ // Arrange\n+ var symbolPackageService = new Mock<ISymbolPackageService>();\n+ symbolPackageService\n+ .Setup(x => x.CreateSymbolPackage(It.IsAny<Package>(), It.IsAny<PackageStreamMetadata>()))\n+ .Returns((Package package1, PackageStreamMetadata streamMetadata) =>\n+ {\n+ var symbolPackage = new SymbolPackage()\n+ {\n+ Package = package1,\n+ PackageKey = package1.Key,\n+ Created = DateTime.UtcNow,\n+ StatusKey = PackageStatus.Validating\n+ };\n+\n+ return symbolPackage;\n+ })\n+ .Verifiable();\n+\n+ var symbolPackageFileService = new Mock<ISymbolPackageFileService>();\n+ symbolPackageFileService\n+ .Setup(x => x.DoesValidationPackageFileExistAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(true)\n+ .Verifiable();\n+ symbolPackageFileService\n+ .Setup(x => x.DeleteValidationPackageFileAsync(It.IsAny<string>(), It.IsAny<string>()))\n+ .Completes()\n+ .Verifiable();\n+ symbolPackageFileService\n+ .Setup(x => x.SaveValidationPackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))\n+ .Completes()\n+ .Verifiable();\n+\n+ var service = CreateService(symbolPackageService: symbolPackageService, symbolPackageFileService: symbolPackageFileService);\n+ var package = new Package() { PackageRegistration = new PackageRegistration() { Id = \"theId\" }, Version = \"1.0.23\" };\n+ package.SymbolPackages.Add(new SymbolPackage()\n+ {\n+ StatusKey = PackageStatus.FailedValidation,\n+ Key = 1232,\n+ Package = package\n+ });\n+\n+ // Act\n+ var result = await service.CreateAndUploadSymbolsPackage(package, new MemoryStream());\n+\n+ // Assert\n+ Assert.NotNull(result);\n+ Assert.Equal(PackageCommitResult.Success, result);\n+ symbolPackageFileService.VerifyAll();\n+ }\n+\n[Fact]\npublic async Task WillDeleteSavedFileAndThrowWhenDBWriteFails()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [Symbol server]Address UI fixes and fix re-upload on failed validation issues for Symbol Server (#6627) |
455,756 | 06.11.2018 14:06:01 | 28,800 | 56126b148da9954dfbc559c7d0d9d8e591d785ac | Fix default value bug and add tests | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TyposquattingConfiguration.cs",
"new_path": "src/NuGetGallery/Services/TyposquattingConfiguration.cs",
"diff": "@@ -7,8 +7,8 @@ namespace NuGetGallery.Services\n{\npublic sealed class TyposquattingConfiguration : ITyposquattingConfiguration\n{\n- private const int DefaultPackageIdCheckListLength = 20000;\n- private const double DefaultPackageIdChecklistCacheExpireTimeInHours = 24;\n+ public const int DefaultPackageIdCheckListLength = 10000;\n+ public const double DefaultPackageIdChecklistCacheExpireTimeInHours = 24.0;\npublic int PackageIdChecklistLength { get; }\npublic bool IsCheckEnabled { get; }\npublic bool IsBlockUsersEnabled { get; }\n@@ -29,10 +29,10 @@ public TyposquattingConfiguration()\nbool isBlockUsersEnabled,\ndouble packageIdChecklistCacheExpireTimeInHours)\n{\n- PackageIdChecklistLength = packageIdChecklistLength;\n+ PackageIdChecklistLength = packageIdChecklistLength == default(int) ? DefaultPackageIdCheckListLength : packageIdChecklistLength;\nIsCheckEnabled = isCheckEnabled;\nIsBlockUsersEnabled = isBlockUsersEnabled;\n- PackageIdChecklistCacheExpireTimeInHours = packageIdChecklistCacheExpireTimeInHours;\n+ PackageIdChecklistCacheExpireTimeInHours = packageIdChecklistCacheExpireTimeInHours == default(double) ? DefaultPackageIdChecklistCacheExpireTimeInHours : packageIdChecklistCacheExpireTimeInHours;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -36,6 +36,13 @@ public void ObjectsHaveDefaultStateIfNotRefreshed()\nAssert.False(symbolsConfiguration.IsSymbolsUploadEnabledForAll);\nAssert.Empty(symbolsConfiguration.AlwaysEnabledForDomains);\nAssert.Empty(symbolsConfiguration.AlwaysEnabledForEmailAddresses);\n+\n+ var typosquattingConfiguration = service.TyposquattingConfiguration as TyposquattingConfiguration;\n+\n+ Assert.Equal(TyposquattingConfiguration.DefaultPackageIdCheckListLength, typosquattingConfiguration.PackageIdChecklistLength);\n+ Assert.False(typosquattingConfiguration.IsCheckEnabled);\n+ Assert.False(typosquattingConfiguration.IsBlockUsersEnabled);\n+ Assert.Equal(TyposquattingConfiguration.DefaultPackageIdChecklistCacheExpireTimeInHours, typosquattingConfiguration.PackageIdChecklistCacheExpireTimeInHours);\n}\n[Fact]\n@@ -55,6 +62,9 @@ public async Task RefreshRefreshesObject()\nvar alwaysEnabledForDomains = new[] { \"a\" };\nvar alwaysEnabledForEmailAddresses = new[] { \"b\" };\n+ var packageIdChecklistLength = 20000;\n+ var packageIdChecklistCacheExpireTimeInHours = 12.0;\n+\nvar certificatesConfiguration = new CertificatesConfiguration(\nisUIEnabledByDefault,\nalwaysEnabledForDomains,\n@@ -67,6 +77,13 @@ public async Task RefreshRefreshesObject()\nalwaysEnabledForEmailAddresses: alwaysEnabledForEmailAddresses);\nvar symbolsJson = JsonConvert.SerializeObject(symbolsConfiguration);\n+ var typosquattingConfiguration = new TyposquattingConfiguration(\n+ packageIdChecklistLength: packageIdChecklistLength,\n+ isCheckEnabled: true,\n+ isBlockUsersEnabled: true,\n+ packageIdChecklistCacheExpireTimeInHours: packageIdChecklistCacheExpireTimeInHours);\n+ var typosquattingJson = JsonConvert.SerializeObject(typosquattingConfiguration);\n+\nvar contentService = GetMock<IContentService>();\ncontentService\n@@ -81,6 +98,10 @@ public async Task RefreshRefreshesObject()\n.Setup(x => x.GetContentItemAsync(GalleryConstants.ContentNames.SymbolsConfiguration, It.IsAny<TimeSpan>()))\n.Returns(Task.FromResult<IHtmlString>(new HtmlString(symbolsJson)));\n+ contentService\n+ .Setup(x => x.GetContentItemAsync(GalleryConstants.ContentNames.TyposquattingConfiguration, It.IsAny<TimeSpan>()))\n+ .Returns(Task.FromResult<IHtmlString>(new HtmlString(typosquattingJson)));\n+\nvar service = GetService<ContentObjectService>();\n// Act\n@@ -89,6 +110,7 @@ public async Task RefreshRefreshesObject()\nloginDiscontinuationConfiguration = service.LoginDiscontinuationConfiguration as LoginDiscontinuationConfiguration;\ncertificatesConfiguration = service.CertificatesConfiguration as CertificatesConfiguration;\nsymbolsConfiguration = service.SymbolsConfiguration as SymbolsConfiguration;\n+ typosquattingConfiguration = service.TyposquattingConfiguration as TyposquattingConfiguration;\n// Assert\nAssert.True(loginDiscontinuationConfiguration.DiscontinuedForEmailAddresses.SequenceEqual(emails));\n@@ -103,6 +125,11 @@ public async Task RefreshRefreshesObject()\nAssert.True(symbolsConfiguration.IsSymbolsUploadEnabledForAll);\nAssert.Equal(alwaysEnabledForDomains, symbolsConfiguration.AlwaysEnabledForDomains);\nAssert.Equal(alwaysEnabledForEmailAddresses, symbolsConfiguration.AlwaysEnabledForEmailAddresses);\n+\n+ Assert.Equal(packageIdChecklistLength, typosquattingConfiguration.PackageIdChecklistLength);\n+ Assert.True(typosquattingConfiguration.IsCheckEnabled);\n+ Assert.True(typosquattingConfiguration.IsBlockUsersEnabled);\n+ Assert.Equal(packageIdChecklistCacheExpireTimeInHours, typosquattingConfiguration.PackageIdChecklistCacheExpireTimeInHours);\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix default value bug and add tests (#6630) |
455,772 | 06.11.2018 14:15:14 | 28,800 | 663cd345d93b57b9b7801a1fd99e38d2a1edbe47 | Http to https translation for GitHub pages urls | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/UriExtensions.cs",
"new_path": "src/NuGetGallery/Helpers/UriExtensions.cs",
"diff": "@@ -26,7 +26,7 @@ public static bool IsGitProtocol(this Uri uri)\npublic static bool IsDomainWithHttpsSupport(this Uri uri)\n{\n- return IsGitHubUri(uri) || IsCodeplexUri(uri) || IsMicrosoftUri(uri);\n+ return IsGitHubUri(uri) || IsGitHubPagerUri(uri) || IsCodeplexUri(uri) || IsMicrosoftUri(uri);\n}\npublic static bool IsGitHubUri(this Uri uri)\n@@ -35,6 +35,12 @@ public static bool IsGitHubUri(this Uri uri)\nstring.Equals(uri.Host, \"github.com\", StringComparison.OrdinalIgnoreCase);\n}\n+ public static bool IsGitHubPagerUri(this Uri uri)\n+ {\n+ return uri.Authority.EndsWith(\".github.com\", StringComparison.OrdinalIgnoreCase) ||\n+ uri.Authority.EndsWith(\".github.io\", StringComparison.OrdinalIgnoreCase);\n+ }\n+\nprivate static bool IsCodeplexUri(this Uri uri)\n{\nreturn uri.Authority.EndsWith(\".codeplex.com\", StringComparison.OrdinalIgnoreCase) ||\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Helpers/HtmlExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Helpers/HtmlExtensionsFacts.cs",
"diff": "@@ -78,6 +78,7 @@ public void EncodesHtml()\n[InlineData(\"http://www.github.com/nuget is my site.\", \"<a href=\\\"https://www.github.com/nuget\\\" rel=\\\"nofollow\\\">https://www.github.com/nuget</a> is my site.\")]\n[InlineData(\"My site is http://www.asp.net best site ever!\", \"My site is <a href=\\\"https://www.asp.net/\\\" rel=\\\"nofollow\\\">https://www.asp.net/</a> best site ever!\")]\n[InlineData(\"My site is http:////github.com bad url\", \"My site is http:////github.com bad url\")]\n+ [InlineData(\"Im using github pages! http://mypage.github.com/stuff.\", \"Im using github pages! <a href=\\\"https://mypage.github.com/stuff\\\" rel=\\\"nofollow\\\">https://mypage.github.com/stuff</a>.\")]\npublic void ConvertsUrlsToLinks(string input, string expected)\n{\n// Arrange\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -78,6 +78,8 @@ public void ItDeterminesRepositoryKind(string repoUrl, string repoType, Reposito\n[InlineData(\"http://msdn.microsoft.com/en-us/library/vstudio/hh191443.aspx\", \"https://msdn.microsoft.com/en-us/library/vstudio/hh191443.aspx\")]\n[InlineData(\"http://microsoft.com/iconurl/9594202\", \"https://microsoft.com/iconurl/9594202\")]\n[InlineData(\"http://microsoft.com:80/\", \"https://microsoft.com/\")]\n+ [InlineData(\"http://githubpages.github.io/my.page\", \"https://githubpages.github.io/my.page\")]\n+ [InlineData(\"http://githubpages.github.com\", \"https://githubpages.github.com/\")]\npublic void ItInitializesProjectUrl(string projectUrl, string expected)\n{\nvar package = new Package\n@@ -99,6 +101,8 @@ public void ItInitializesProjectUrl(string projectUrl, string expected)\n[InlineData(\"http://aspnetwebstack.codeplex.com/license\", \"https://aspnetwebstack.codeplex.com/license\")]\n[InlineData(\"http://go.microsoft.com/?linkid=9809688\", \"https://go.microsoft.com/?linkid=9809688\")]\n[InlineData(\"http://github.com/url\", \"https://github.com/url\")]\n+ [InlineData(\"http://githubpages.github.io/my.page/license.html\", \"https://githubpages.github.io/my.page/license.html\")]\n+ [InlineData(\"http://githubpages.github.com\", \"https://githubpages.github.com/\")]\npublic void ItInitializesLicenseUrl(string licenseUrl, string expected)\n{\nvar package = new Package\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Http to https translation for GitHub pages urls (#6626) |
455,776 | 07.11.2018 17:42:39 | 28,800 | 51f4085ae434b59f082e127cfb821951bd6fedee | Hotfix: Don't attempt to send emails if they have no recipients | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<EmbeddedResource Include=\"Infrastructure\\MigrateUserToOrganization.sql\" />\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.31.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"NuGet.Services.Messaging\">\n- <Version>2.31.0</Version>\n+ <PackageReference Include=\"NuGet.Services.Messaging.Email\">\n+ <Version>2.36.0-master-2190850</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<PackageReference Include=\"NuGet.Packaging\">\n<Version>4.8.0</Version>\n</PackageReference>\n- <PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.31.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.31.0</Version>\n- </PackageReference>\n<PackageReference Include=\"WindowsAzure.Storage\">\n<Version>7.1.2</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<PackageReference Include=\"Markdig.Signed\">\n<Version>0.15.4</Version>\n</PackageReference>\n- <PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.31.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"NuGet.Services.Messaging\">\n- <Version>2.31.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.31.0</Version>\n- </PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n</PackageReference>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Hotfix: Don't attempt to send emails if they have no recipients (#6638) |
455,747 | 08.11.2018 10:26:43 | 28,800 | 556e9154a8c28ab742d8c0dc7024336ff60ef41f | Add cache control for nupkgs/snupks in public containers | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -71,12 +71,12 @@ public async Task<bool> FileExistsAsync(string folderName, string fileName)\npublic async Task<Stream> GetFileAsync(string folderName, string fileName)\n{\n- if (String.IsNullOrWhiteSpace(folderName))\n+ if (string.IsNullOrWhiteSpace(folderName))\n{\nthrow new ArgumentNullException(nameof(folderName));\n}\n- if (String.IsNullOrWhiteSpace(fileName))\n+ if (string.IsNullOrWhiteSpace(fileName))\n{\nthrow new ArgumentNullException(nameof(fileName));\n}\n@@ -86,12 +86,12 @@ public async Task<Stream> GetFileAsync(string folderName, string fileName)\npublic async Task<IFileReference> GetFileReferenceAsync(string folderName, string fileName, string ifNoneMatch = null)\n{\n- if (String.IsNullOrWhiteSpace(folderName))\n+ if (string.IsNullOrWhiteSpace(folderName))\n{\nthrow new ArgumentNullException(nameof(folderName));\n}\n- if (String.IsNullOrWhiteSpace(fileName))\n+ if (string.IsNullOrWhiteSpace(fileName))\n{\nthrow new ArgumentNullException(nameof(fileName));\n}\n@@ -243,7 +243,7 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\ncatch (StorageException ex) when (ex.IsFileAlreadyExistsException())\n{\nthrow new FileAlreadyExistsException(\n- String.Format(\n+ string.Format(\nCultureInfo.CurrentCulture,\n\"There is already a blob with name {0} in container {1}.\",\ndestFileName,\n@@ -276,6 +276,17 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\nthrow new StorageException($\"The blob copy operation had copy status {destBlob.CopyState.Status} ({destBlob.CopyState.StatusDescription}).\");\n}\n+ var cacheControl = GetCacheControlForCopy(destFolderName);\n+ if (!string.IsNullOrEmpty(cacheControl))\n+ {\n+ await destBlob.FetchAttributesAsync();\n+ if (string.IsNullOrEmpty(destBlob.Properties.CacheControl))\n+ {\n+ destBlob.Properties.CacheControl = cacheControl;\n+ await destBlob.SetPropertiesAsync();\n+ }\n+ }\n+\nreturn srcBlob.ETag;\n}\n@@ -316,7 +327,7 @@ public async Task SaveFileAsync(string folderName, string fileName, string conte\ncatch (StorageException ex) when (ex.IsFileAlreadyExistsException())\n{\nthrow new FileAlreadyExistsException(\n- String.Format(\n+ string.Format(\nCultureInfo.CurrentCulture,\n\"There is already a blob with name {0} in container {1}.\",\nfileName,\n@@ -349,7 +360,7 @@ public async Task SaveFileAsync(string folderName, string fileName, Stream file,\ncatch (StorageException ex) when (ex.IsFileAlreadyExistsException())\n{\nthrow new FileAlreadyExistsException(\n- String.Format(\n+ string.Format(\nCultureInfo.CurrentCulture,\n\"There is already a blob with name {0} in container {1}.\",\nfileName,\n@@ -508,7 +519,7 @@ private bool IsPublicContainer(string folderName)\n}\nthrow new InvalidOperationException(\n- String.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n+ string.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n}\nprivate async Task<StorageResult> GetBlobContentAsync(string folderName, string fileName, string ifNoneMatch = null)\n@@ -591,7 +602,20 @@ private static string GetContentType(string folderName)\ndefault:\nthrow new InvalidOperationException(\n- String.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n+ string.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n+ }\n+ }\n+\n+ private static string GetCacheControlForCopy(string folderName)\n+ {\n+ switch (folderName)\n+ {\n+ case CoreConstants.PackagesFolderName:\n+ case CoreConstants.SymbolPackagesFolderName:\n+ return CoreConstants.DefaultCacheControl;\n+\n+ default:\n+ return null;\n}\n}\n@@ -602,11 +626,11 @@ private static string GetCacheControl(string folderName)\ncase CoreConstants.PackagesFolderName:\ncase CoreConstants.SymbolPackagesFolderName:\ncase CoreConstants.PackagesContentFolderName:\n+ case CoreConstants.ValidationFolderName:\nreturn CoreConstants.DefaultCacheControl;\ncase CoreConstants.PackageBackupsFolderName:\ncase CoreConstants.UploadsFolderName:\n- case CoreConstants.ValidationFolderName:\ncase CoreConstants.SymbolPackageBackupsFolderName:\ncase CoreConstants.DownloadsFolderName:\ncase CoreConstants.PackageReadMesFolderName:\n@@ -618,7 +642,7 @@ private static string GetCacheControl(string folderName)\ndefault:\nthrow new InvalidOperationException(\n- String.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n+ string.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -536,7 +536,9 @@ public async Task WillSetTheBlobControlCacheOnPackagesFolder(string folderName)\nfakeBlob.Verify();\n- if (folderName == CoreConstants.PackagesFolderName || folderName == CoreConstants.SymbolPackagesFolderName)\n+ if (folderName == CoreConstants.PackagesFolderName\n+ || folderName == CoreConstants.SymbolPackagesFolderName\n+ || folderName == CoreConstants.ValidationFolderName)\n{\nAssert.Equal(CoreConstants.DefaultCacheControl, fakeBlob.Object.Properties.CacheControl);\n}\n@@ -1065,6 +1067,54 @@ public async Task WillCopyBlobFromSourceUri()\nTimes.Once);\n}\n+ [Theory]\n+ [InlineData(CoreConstants.PackagesFolderName)]\n+ [InlineData(CoreConstants.SymbolPackagesFolderName)]\n+ public async Task WillCopyAndSetCacheControlOnCopyForFolder(string folderName)\n+ {\n+ // Arrange\n+ var instance = new TheCopyFileAsyncMethod();\n+ instance._blobClient\n+ .Setup(x => x.GetBlobFromUri(It.IsAny<Uri>()))\n+ .Returns(instance._srcBlobMock.Object);\n+ instance._blobClient\n+ .Setup(x => x.GetContainerReference(folderName))\n+ .Returns(() => instance._destContainer.Object);\n+\n+ instance._destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Returns(Task.FromResult(0))\n+ .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((_, __, ___) =>\n+ {\n+ SetDestCopyStatus(CopyStatus.Success);\n+ });\n+\n+ // Act\n+ await instance._target.CopyFileAsync(\n+ instance._srcUri,\n+ folderName,\n+ instance._destFileName,\n+ AccessConditionWrapper.GenerateIfNotExistsCondition());\n+\n+ // Assert\n+ instance._destBlobMock.Verify(\n+ x => x.StartCopyAsync(instance._srcBlobMock.Object, It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ instance._destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ instance._destBlobMock.Verify(\n+ x => x.SetPropertiesAsync(),\n+ Times.Once);\n+ instance._destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ Assert.NotNull(instance._destProperties.CacheControl);\n+ instance._blobClient.Verify(\n+ x => x.GetBlobFromUri(instance._srcUri),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillCopyTheFileIfDestinationDoesNotExist()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add cache control for nupkgs/snupks in public containers (#6634) |
455,747 | 08.11.2018 14:22:37 | 28,800 | 36acf28902baad199cb255df616e078ba60c3758 | Add update blob properties support to cloud storage | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -276,17 +276,6 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\nthrow new StorageException($\"The blob copy operation had copy status {destBlob.CopyState.Status} ({destBlob.CopyState.StatusDescription}).\");\n}\n- var cacheControl = GetCacheControlForCopy(destFolderName);\n- if (!string.IsNullOrEmpty(cacheControl))\n- {\n- await destBlob.FetchAttributesAsync();\n- if (string.IsNullOrEmpty(destBlob.Properties.CacheControl))\n- {\n- destBlob.Properties.CacheControl = cacheControl;\n- await destBlob.SetPropertiesAsync();\n- }\n- }\n-\nreturn srcBlob.ETag;\n}\n@@ -448,6 +437,55 @@ public async Task<Uri> GetFileReadUriAsync(string folderName, string fileName, D\n}\n}\n+ /// <summary>\n+ /// Asynchronously sets blob properties.\n+ /// </summary>\n+ /// <param name=\"folderName\">The folder (container) name.</param>\n+ /// <param name=\"fileName\">The blob file name.</param>\n+ /// <param name=\"updatePropertiesAsync\">A function which updates blob properties and returns <c>true</c>\n+ /// for changes to be persisted or <c>false</c> for changes to be discarded.</param>\n+ /// <returns>A task that represents the asynchronous operation.</returns>\n+ public async Task SetPropertiesAsync(\n+ string folderName,\n+ string fileName,\n+ Func<Lazy<Task<Stream>>, BlobProperties, Task<bool>> updatePropertiesAsync)\n+ {\n+ if (folderName == null)\n+ {\n+ throw new ArgumentNullException(nameof(folderName));\n+ }\n+\n+ if (fileName == null)\n+ {\n+ throw new ArgumentNullException(nameof(fileName));\n+ }\n+\n+ if (updatePropertiesAsync == null)\n+ {\n+ throw new ArgumentNullException(nameof(updatePropertiesAsync));\n+ }\n+\n+ var container = await GetContainerAsync(folderName);\n+ var blob = container.GetBlobReference(fileName);\n+\n+ await blob.FetchAttributesAsync();\n+\n+ var lazyStream = new Lazy<Task<Stream>>(() => GetFileAsync(folderName, fileName));\n+ var wasUpdated = await updatePropertiesAsync(lazyStream, blob.Properties);\n+\n+ if (wasUpdated)\n+ {\n+ var accessCondition = AccessConditionWrapper.GenerateIfMatchCondition(blob.ETag);\n+ var mappedAccessCondition = new AccessCondition\n+ {\n+ IfNoneMatchETag = accessCondition.IfNoneMatchETag,\n+ IfMatchETag = accessCondition.IfMatchETag\n+ };\n+\n+ await blob.SetPropertiesAsync(mappedAccessCondition);\n+ }\n+ }\n+\npublic async Task<string> GetETagOrNullAsync(\nstring folderName,\nstring fileName)\n@@ -606,19 +644,6 @@ private static string GetContentType(string folderName)\n}\n}\n- private static string GetCacheControlForCopy(string folderName)\n- {\n- switch (folderName)\n- {\n- case CoreConstants.PackagesFolderName:\n- case CoreConstants.SymbolPackagesFolderName:\n- return CoreConstants.DefaultCacheControl;\n-\n- default:\n- return null;\n- }\n- }\n-\nprivate static string GetCacheControl(string folderName)\n{\nswitch (folderName)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"diff": "@@ -66,6 +66,11 @@ public async Task SetPropertiesAsync()\nawait _blob.SetPropertiesAsync();\n}\n+ public async Task SetPropertiesAsync(AccessCondition accessCondition)\n+ {\n+ await _blob.SetPropertiesAsync(accessCondition, options: null, operationContext: null);\n+ }\n+\npublic async Task SetMetadataAsync(AccessCondition accessCondition)\n{\nawait _blob.SetMetadataAsync(accessCondition, options: null, operationContext: null);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"diff": "using System.Collections.Generic;\nusing System.IO;\nusing System.Threading.Tasks;\n+using Microsoft.WindowsAzure.Storage.Blob;\nnamespace NuGetGallery\n{\n@@ -136,6 +137,18 @@ public interface ICoreFileStorageService\nstring fileName,\nFunc<Lazy<Task<Stream>>, IDictionary<string, string>, Task<bool>> updateMetadataAsync);\n+ /// <summary>\n+ /// Updates properties on the file.\n+ /// </summary>\n+ /// <param name=\"folderName\">The folder name.</param>\n+ /// <param name=\"fileName\">The file name.</param>\n+ /// <param name=\"updatePropertiesAsync\">A function that will update file properties.</param>\n+ /// <returns>A task that represents the asynchronous operation.</returns>\n+ Task SetPropertiesAsync(\n+ string folderName,\n+ string fileName,\n+ Func<Lazy<Task<Stream>>, BlobProperties, Task<bool>> updatePropertiesAsync);\n+\n/// <summary>\n/// Returns the etag value for the specified blob. If the blob does not exists it will return null.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"new_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"diff": "@@ -26,6 +26,7 @@ public interface ISimpleCloudBlob\nTask<bool> ExistsAsync();\nTask SetPropertiesAsync();\n+ Task SetPropertiesAsync(AccessCondition accessCondition);\nTask SetMetadataAsync(AccessCondition accessCondition);\nTask UploadFromStreamAsync(Stream source, bool overwrite);\nTask UploadFromStreamAsync(Stream source, AccessCondition accessCondition);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"diff": "using System.Threading.Tasks;\nusing System.Web.Hosting;\nusing System.Web.Mvc;\n+using Microsoft.WindowsAzure.Storage.Blob;\nusing NuGetGallery.Configuration;\nnamespace NuGetGallery\n@@ -262,6 +263,14 @@ public Task<Uri> GetPriviledgedFileUriAsync(string folderName, string fileName,\nreturn Task.CompletedTask;\n}\n+ public Task SetPropertiesAsync(\n+ string folderName,\n+ string fileName,\n+ Func<Lazy<Task<Stream>>, BlobProperties, Task<bool>> updatePropertiesAsync)\n+ {\n+ return Task.CompletedTask;\n+ }\n+\nprivate static string BuildPath(string fileStorageDirectory, string folderName, string fileName)\n{\n// Resolve the file storage directory\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -1067,54 +1067,6 @@ public async Task WillCopyBlobFromSourceUri()\nTimes.Once);\n}\n- [Theory]\n- [InlineData(CoreConstants.PackagesFolderName)]\n- [InlineData(CoreConstants.SymbolPackagesFolderName)]\n- public async Task WillCopyAndSetCacheControlOnCopyForFolder(string folderName)\n- {\n- // Arrange\n- var instance = new TheCopyFileAsyncMethod();\n- instance._blobClient\n- .Setup(x => x.GetBlobFromUri(It.IsAny<Uri>()))\n- .Returns(instance._srcBlobMock.Object);\n- instance._blobClient\n- .Setup(x => x.GetContainerReference(folderName))\n- .Returns(() => instance._destContainer.Object);\n-\n- instance._destBlobMock\n- .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n- .Returns(Task.FromResult(0))\n- .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((_, __, ___) =>\n- {\n- SetDestCopyStatus(CopyStatus.Success);\n- });\n-\n- // Act\n- await instance._target.CopyFileAsync(\n- instance._srcUri,\n- folderName,\n- instance._destFileName,\n- AccessConditionWrapper.GenerateIfNotExistsCondition());\n-\n- // Assert\n- instance._destBlobMock.Verify(\n- x => x.StartCopyAsync(instance._srcBlobMock.Object, It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n- Times.Once);\n- instance._destBlobMock.Verify(\n- x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n- Times.Once);\n- instance._destBlobMock.Verify(\n- x => x.SetPropertiesAsync(),\n- Times.Once);\n- instance._destBlobMock.Verify(\n- x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n- Times.Once);\n- Assert.NotNull(instance._destProperties.CacheControl);\n- instance._blobClient.Verify(\n- x => x.GetBlobFromUri(instance._srcUri),\n- Times.Once);\n- }\n-\n[Fact]\npublic async Task WillCopyTheFileIfDestinationDoesNotExist()\n{\n@@ -1461,6 +1413,110 @@ public async Task WhenReturnValueIsTrue_MetadataChangesAreNotPersisted()\n}\n}\n+ public class TheSetPropertiesAsyncMethod\n+ {\n+ private const string _content = \"peach\";\n+\n+ private readonly Mock<ICloudBlobClient> _blobClient;\n+ private readonly Mock<ICloudBlobContainer> _blobContainer;\n+ private readonly Mock<ISimpleCloudBlob> _blob;\n+ private readonly CloudBlobCoreFileStorageService _service;\n+\n+ public TheSetPropertiesAsyncMethod()\n+ {\n+ _blobClient = new Mock<ICloudBlobClient>();\n+ _blobContainer = new Mock<ICloudBlobContainer>();\n+ _blob = new Mock<ISimpleCloudBlob>();\n+\n+ _blobClient.Setup(x => x.GetContainerReference(It.IsAny<string>()))\n+ .Returns(_blobContainer.Object);\n+ _blobContainer.Setup(x => x.CreateIfNotExistAsync())\n+ .Returns(Task.FromResult(0));\n+ _blobContainer.Setup(x => x.SetPermissionsAsync(It.IsAny<BlobContainerPermissions>()))\n+ .Returns(Task.FromResult(0));\n+ _blobContainer.Setup(x => x.GetBlobReference(It.IsAny<string>()))\n+ .Returns(_blob.Object);\n+\n+ _service = CreateService(fakeBlobClient: _blobClient);\n+ }\n+\n+ [Fact]\n+ public async Task WhenLazyStreamRead_ReturnsContent()\n+ {\n+ _blob.Setup(x => x.DownloadToStreamAsync(It.IsAny<Stream>(), It.IsAny<AccessCondition>()))\n+ .Callback<Stream, AccessCondition>((stream, _) =>\n+ {\n+ using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 4096, leaveOpen: true))\n+ {\n+ writer.Write(_content);\n+ }\n+ })\n+ .Returns(Task.FromResult(0));\n+\n+ await _service.SetPropertiesAsync(\n+ folderName: CoreConstants.PackagesFolderName,\n+ fileName: \"a\",\n+ updatePropertiesAsync: async (lazyStream, properties) =>\n+ {\n+ using (var stream = await lazyStream.Value)\n+ using (var reader = new StreamReader(stream))\n+ {\n+ Assert.Equal(_content, reader.ReadToEnd());\n+ }\n+\n+ return false;\n+ });\n+\n+ _blob.VerifyAll();\n+ _blobContainer.VerifyAll();\n+ _blobClient.VerifyAll();\n+ }\n+\n+ [Fact]\n+ public async Task WhenReturnValueIsFalse_PropertyChangesAreNotPersisted()\n+ {\n+ _blob.SetupGet(x => x.Properties)\n+ .Returns(new BlobProperties());\n+\n+ await _service.SetPropertiesAsync(\n+ folderName: CoreConstants.PackagesFolderName,\n+ fileName: \"a\",\n+ updatePropertiesAsync: (lazyStream, properties) =>\n+ {\n+ Assert.NotNull(properties);\n+\n+ return Task.FromResult(false);\n+ });\n+\n+ _blob.VerifyAll();\n+ _blobContainer.VerifyAll();\n+ _blobClient.VerifyAll();\n+ }\n+\n+ [Fact]\n+ public async Task WhenReturnValueIsTrue_PropertiesChangesArePersisted()\n+ {\n+ _blob.SetupGet(x => x.Properties)\n+ .Returns(new BlobProperties());\n+ _blob.Setup(x => x.SetPropertiesAsync(It.IsNotNull<AccessCondition>()))\n+ .Returns(Task.FromResult(0));\n+\n+ await _service.SetPropertiesAsync(\n+ folderName: CoreConstants.PackagesFolderName,\n+ fileName: \"a\",\n+ updatePropertiesAsync: (lazyStream, properties) =>\n+ {\n+ Assert.NotNull(properties);\n+\n+ return Task.FromResult(true);\n+ });\n+\n+ _blob.VerifyAll();\n+ _blobContainer.VerifyAll();\n+ _blobClient.VerifyAll();\n+ }\n+ }\n+\npublic class TheGetETagMethod\n{\nprivate const string _etag = \"dummy_etag\";\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"diff": "@@ -733,5 +733,16 @@ public async Task NoOps()\nawait service.SetMetadataAsync(folderName: null, fileName: null, updateMetadataAsync: null);\n}\n}\n+\n+ public class TheSetPropertiesAsyncMethod\n+ {\n+ [Fact]\n+ public async Task NoOps()\n+ {\n+ var service = CreateService();\n+\n+ await service.SetPropertiesAsync(folderName: null, fileName: null, updatePropertiesAsync: null);\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add update blob properties support to cloud storage (#6640) |
455,751 | 09.11.2018 11:27:50 | 28,800 | 5091aa437de205de4ba96627182e2e12ba7acd05 | ServerComon 2.36 to NuGetGalleryCore
Take new version of ServerCommon to GalleryCore. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.31.0</Version>\n+ <Version>2.36.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.31.0</Version>\n+ <Version>2.36.0</Version>\n</PackageReference>\n<PackageReference Include=\"WindowsAzure.Storage\">\n<Version>7.1.2</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"diff": "The checksum does not match for the dll(s) and corresponding pdb(s).\n</text>\nbreak;\n- case ValidationIssueCode.SymbolErrorCode_MatchingPortablePDBNotFound:\n+ case ValidationIssueCode.SymbolErrorCode_MatchingAssemblyNotFound:\n<text>\nThe uploaded symbols package contains pdb(s) for a corresponding dll(s) not found in the nuget package.\n</text>\nbreak;\n+ case ValidationIssueCode.SymbolErrorCode_PdbIsNotPortable:\n+ <text>\n+ The uploaded symbols package contains one or more pdbs that are not portable.\n+ </text>\n+ break;\ndefault:\n<text>\nThere was an unknown failure when validating your package.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -2453,7 +2453,7 @@ public static IEnumerable<object[]> WillSendEmailToAllOwners_Data\n{\nforeach (var validationIssue in new[] {\nValidationIssue.SymbolErrorCode_ChecksumDoesNotMatch,\n- ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound,\n+ ValidationIssue.SymbolErrorCode_MatchingAssemblyNotFound,\nValidationIssue.Unknown\n})\n{\n@@ -2579,8 +2579,10 @@ private static string ParseValidationIssue(ValidationIssue validationIssue, stri\nreturn $\"The package was signed, but the signing certificate (SHA-1 thumbprint {certIssue.Sha1Thumbprint}) is not associated with your account. You must register this certificate to publish signed packages. [Read more...](https://aka.ms/nuget-signed-ref)\";\ncase ValidationIssueCode.SymbolErrorCode_ChecksumDoesNotMatch:\nreturn \"The checksum does not match for the dll(s) and corresponding pdb(s).\";\n- case ValidationIssueCode.SymbolErrorCode_MatchingPortablePDBNotFound:\n+ case ValidationIssueCode.SymbolErrorCode_MatchingAssemblyNotFound:\nreturn \"The uploaded symbols package contains pdb(s) for a corresponding dll(s) not found in the nuget package.\";\n+ case ValidationIssueCode.SymbolErrorCode_PdbIsNotPortable:\n+ return \"The uploaded symbols package contains one or more pdbs that are not portable.\";\ndefault:\nreturn \"There was an unknown failure when validating your package.\";\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"diff": "@@ -100,7 +100,8 @@ public static IEnumerable<ValidationIssue> KnownValidationIssues\nyield return ValidationIssue.AuthorCounterSignaturesNotSupported;\nyield return ValidationIssue.PackageIsNotSigned;\nyield return ValidationIssue.SymbolErrorCode_ChecksumDoesNotMatch;\n- yield return ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound;\n+ yield return ValidationIssue.SymbolErrorCode_MatchingAssemblyNotFound;\n+ yield return ValidationIssue.SymbolErrorCode_PdbIsNotPortable;\nyield return new UnauthorizedCertificateFailure(\"thumbprint\");\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | ServerComon 2.36 to NuGetGalleryCore (#6643)
Take new version of ServerCommon to GalleryCore. |
455,744 | 09.11.2018 18:39:09 | 28,800 | 85eeaddec9ade74e217aaeabc39b64b48fde99f2 | Added alternative license expression URLs to be allowed in without warning into Gallery. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/LicenseExpressionRedirectUrlHelper.cs",
"new_path": "src/NuGetGallery/Helpers/LicenseExpressionRedirectUrlHelper.cs",
"diff": "@@ -7,7 +7,7 @@ namespace NuGetGallery.Helpers\n{\npublic static class LicenseExpressionRedirectUrlHelper\n{\n- private const string LicenseExpressionDeprecationUrlFormat = \"https://licenses.nuget.org/{0}\";\n+ public const string LicenseExpressionDeprecationUrlFormat = \"https://licenses.nuget.org/{0}\";\npublic static string GetLicenseExpressionRedirectUrl(string licenseExpression)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "using System.Data.SqlClient;\nusing System.IO;\nusing System.Linq;\n+using System.Net;\nusing System.Threading;\nusing System.Threading.Tasks;\nusing System.Xml.Linq;\n@@ -170,6 +171,7 @@ private async Task<PackageValidationResult> CheckLicenseMetadataAsync(PackageArc\nvar licenseUrl = nuspecReader.GetLicenseUrl();\nvar licenseMetadata = nuspecReader.GetLicenseMetadata();\nvar licenseDeprecationUrl = GetExpectedLicenseUrl(licenseMetadata);\n+ var alternativeDeprecationUrl = GetExpectedAlternativeUrl(licenseMetadata);\nif (licenseMetadata == null)\n{\n@@ -217,7 +219,7 @@ private async Task<PackageValidationResult> CheckLicenseMetadataAsync(PackageArc\nstring.Join(\" \", licenseMetadata.WarningsAndErrors)));\n}\n- if (licenseDeprecationUrl != licenseUrl)\n+ if (licenseDeprecationUrl != licenseUrl && (alternativeDeprecationUrl == null || alternativeDeprecationUrl != licenseUrl))\n{\nif (licenseMetadata.Type == LicenseType.File)\n{\n@@ -378,6 +380,25 @@ private static string GetExpectedLicenseUrl(LicenseMetadata licenseMetadata)\nthrow new InvalidOperationException($\"Unsupported license metadata type: {licenseMetadata.Type}\");\n}\n+ /// <summary>\n+ /// 15.9 client does url encoding with <see cref=\"WebUtility.UrlEncode(string)\"/> which\n+ /// replaces spaces with \"+\". We shouldn't work about it, but we should fix the client,\n+ /// too.\n+ /// </summary>\n+ private static string GetExpectedAlternativeUrl(LicenseMetadata licenseMetadata)\n+ {\n+ if (licenseMetadata != null && licenseMetadata.Type == LicenseType.Expression)\n+ {\n+ return new Uri(\n+ string.Format(\n+ LicenseExpressionRedirectUrlHelper.LicenseExpressionDeprecationUrlFormat,\n+ WebUtility.UrlEncode(licenseMetadata.License)))\n+ .AbsoluteUri;\n+ }\n+\n+ return null;\n+ }\n+\nprivate static bool HasChildElements(XElement xElement)\n=> xElement.Elements().Any();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "@@ -567,6 +567,24 @@ public async Task WarnsWhenInvalidLicenseUrlSpecifiedWithLicenseFile(string lice\nAssert.Equal(\"To provide better experience for older clients when a license file is packaged, <licenseUrl> should be set to 'https://aka.ms/deprecateLicenseUrl'.\", result.Warnings[0].PlainTextMessage);\n}\n+ [Fact]\n+ public async Task AcceptsAlternativeLicenseUrl()\n+ {\n+ _nuGetPackage = GeneratePackageWithLicense(\n+ licenseUrl: new Uri(\"https://licenses.nuget.org/Apache-1.0%2B+OR+MIT\"),\n+ licenseExpression: \"Apache-1.0+ OR MIT\",\n+ licenseFilename: null,\n+ licenseFileContents: null);\n+\n+ var result = await _target.ValidateBeforeGeneratePackageAsync(\n+ _nuGetPackage.Object,\n+ GetPackageMetadata(_nuGetPackage));\n+\n+ Assert.Equal(PackageValidationResultType.Accepted, result.Type);\n+ Assert.Null(result.Message);\n+ Assert.Empty(result.Warnings);\n+ }\n+\n[Theory]\n[InlineData(null)]\n[InlineData(RegularLicenseUrl)]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Added alternative license expression URLs to be allowed in without warning into Gallery. (#6649) |
455,744 | 16.11.2018 12:58:42 | 28,800 | bb75cce20e0d8745ae19fad98fe799b9617a8118 | Targeted block for invalidly URL encoded license URLs for license expressions
* Targeted block for invalidly URL encoded license URLs for license expressions.
* Updated error message for the malformed URL case.
Changed invalid URL from warning to error. Updated tests. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/LicenseExpressionRedirectUrlHelper.cs",
"new_path": "src/NuGetGallery/Helpers/LicenseExpressionRedirectUrlHelper.cs",
"diff": "@@ -7,7 +7,8 @@ namespace NuGetGallery.Helpers\n{\npublic static class LicenseExpressionRedirectUrlHelper\n{\n- public const string LicenseExpressionDeprecationUrlFormat = \"https://licenses.nuget.org/{0}\";\n+ public const string LicenseExpressionHostname = \"licenses.nuget.org\";\n+ public const string LicenseExpressionDeprecationUrlFormat = \"https://\" + LicenseExpressionHostname + \"/{0}\";\npublic static string GetLicenseExpressionRedirectUrl(string licenseExpression)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\ActionsRequiringPermissions.cs\" />\n<Compile Include=\"Services\\AsynchronousPackageValidationInitiator.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\BackgroundMarkdownMessageService.cs\" />\n+ <Compile Include=\"Services\\InvalidLicenseUrlValidationMessage.cs\" />\n+ <Compile Include=\"Services\\InvalidUrlEncodingForLicenseUrlValidationMessage.cs\" />\n<Compile Include=\"Services\\ISymbolPackageUploadService.cs\" />\n<Compile Include=\"Services\\ISymbolPackageFileService.cs\" />\n<Compile Include=\"Services\\ITyposquattingCheckListCacheService.cs\" />\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}\\\">{Strings.UploadPackage_LearnMore}</a>.\";\nprivate readonly string _baseMessage;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "@@ -171,7 +171,6 @@ private async Task<PackageValidationResult> CheckLicenseMetadataAsync(PackageArc\nvar licenseUrl = nuspecReader.GetLicenseUrl();\nvar licenseMetadata = nuspecReader.GetLicenseMetadata();\nvar licenseDeprecationUrl = GetExpectedLicenseUrl(licenseMetadata);\n- var alternativeDeprecationUrl = GetExpectedAlternativeUrl(licenseMetadata);\nif (licenseMetadata == null)\n{\n@@ -219,19 +218,24 @@ private async Task<PackageValidationResult> CheckLicenseMetadataAsync(PackageArc\nstring.Join(\" \", licenseMetadata.WarningsAndErrors)));\n}\n- if (licenseDeprecationUrl != licenseUrl && (alternativeDeprecationUrl == null || alternativeDeprecationUrl != licenseUrl))\n+ if (licenseDeprecationUrl != licenseUrl)\n{\n+ if (IsMalformedDeprecationUrl(licenseUrl))\n+ {\n+ return PackageValidationResult.Invalid(new InvalidUrlEncodingForLicenseUrlValidationMessage());\n+ }\n+\nif (licenseMetadata.Type == LicenseType.File)\n{\n- warnings.Add(\n- new PlainTextOnlyValidationMessage(\n- string.Format(Strings.UploadPackage_DeprecationUrlSuggestedForLicenseFiles, licenseDeprecationUrl)));\n+ return PackageValidationResult.Invalid(\n+ new InvalidLicenseUrlValidationMessage(\n+ string.Format(Strings.UploadPackage_DeprecationUrlRequiredForLicenseFiles, licenseDeprecationUrl)));\n}\nelse if (licenseMetadata.Type == LicenseType.Expression)\n{\n- warnings.Add(\n- new PlainTextOnlyValidationMessage(\n- string.Format(Strings.UploadPackage_DeprecationUrlSuggestedForLicenseExpressions, licenseDeprecationUrl)));\n+ return PackageValidationResult.Invalid(\n+ new InvalidLicenseUrlValidationMessage(\n+ string.Format(Strings.UploadPackage_DeprecationUrlRequiredForLicenseExpressions, licenseDeprecationUrl)));\n}\n}\n@@ -307,6 +311,28 @@ private async Task<PackageValidationResult> CheckLicenseMetadataAsync(PackageArc\nreturn null;\n}\n+ private bool IsMalformedDeprecationUrl(string licenseUrl)\n+ {\n+ // nuget.exe 4.9.0 and its dotnet and msbuild counterparts encode spaces as \"+\"\n+ // when generating legacy license URL, which is bad. We explicitly forbid such\n+ // URLs. On the other hand, if license expression does not contain spaces they\n+ // generate good URLs which we don't want to reject. This method detects the\n+ // case when spaces are in the expression in a meaningful way.\n+\n+ if (Uri.TryCreate(licenseUrl, UriKind.Absolute, out var url))\n+ {\n+ if (url.Host != LicenseExpressionRedirectUrlHelper.LicenseExpressionHostname)\n+ {\n+ return false;\n+ }\n+\n+ var invalidUrlBits = new string[] { \"+OR+\", \"+AND+\", \"+WITH+\" };\n+ return invalidUrlBits.Any(invalidBit => licenseUrl.IndexOf(invalidBit, StringComparison.OrdinalIgnoreCase) >= 0);\n+ }\n+\n+ return false;\n+ }\n+\nprivate List<LicenseData> GetLicenseList(NuGetLicenseExpression licenseExpression)\n{\nvar licenseList = new List<LicenseData>();\n@@ -380,25 +406,6 @@ private static string GetExpectedLicenseUrl(LicenseMetadata licenseMetadata)\nthrow new InvalidOperationException($\"Unsupported license metadata type: {licenseMetadata.Type}\");\n}\n- /// <summary>\n- /// 15.9 client does url encoding with <see cref=\"WebUtility.UrlEncode(string)\"/> which\n- /// replaces spaces with \"+\". We shouldn't work about it, but we should fix the client,\n- /// too.\n- /// </summary>\n- private static string GetExpectedAlternativeUrl(LicenseMetadata licenseMetadata)\n- {\n- if (licenseMetadata != null && licenseMetadata.Type == LicenseType.Expression)\n- {\n- return new Uri(\n- string.Format(\n- LicenseExpressionRedirectUrlHelper.LicenseExpressionDeprecationUrlFormat,\n- WebUtility.UrlEncode(licenseMetadata.License)))\n- .AbsoluteUri;\n- }\n-\n- return null;\n- }\n-\nprivate static bool HasChildElements(XElement xElement)\n=> xElement.Elements().Any();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace NuGetGallery {\n// class via a tool like ResGen or Visual Studio.\n// To add or remove a member, edit your .ResX file then rerun ResGen\n// with the /str option, or rebuild your VS project.\n- [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"15.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"16.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\npublic class Strings {\n@@ -2202,20 +2202,20 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to To provide better experience for older clients when a license expression is specified, <licenseUrl> should be set to '{0}'..\n+ /// Looks up a localized string similar to To provide a better experience for older clients when a license expression is specified, <licenseUrl> must be set to '{0}'..\n/// </summary>\n- public static string UploadPackage_DeprecationUrlSuggestedForLicenseExpressions {\n+ public static string UploadPackage_DeprecationUrlRequiredForLicenseExpressions {\nget {\n- return ResourceManager.GetString(\"UploadPackage_DeprecationUrlSuggestedForLicenseExpressions\", resourceCulture);\n+ return ResourceManager.GetString(\"UploadPackage_DeprecationUrlRequiredForLicenseExpressions\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to To provide better experience for older clients when a license file is packaged, <licenseUrl> should be set to '{0}'..\n+ /// Looks up a localized string similar to To provide a better experience for older clients when a license file is packaged, <licenseUrl> must be set to '{0}'..\n/// </summary>\n- public static string UploadPackage_DeprecationUrlSuggestedForLicenseFiles {\n+ public static string UploadPackage_DeprecationUrlRequiredForLicenseFiles {\nget {\n- return ResourceManager.GetString(\"UploadPackage_DeprecationUrlSuggestedForLicenseFiles\", resourceCulture);\n+ return ResourceManager.GetString(\"UploadPackage_DeprecationUrlRequiredForLicenseFiles\", resourceCulture);\n}\n}\n@@ -2372,6 +2372,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package contains a malformed license URL..\n+ /// </summary>\n+ public static string UploadPackage_MalformedLicenseUrl {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_MalformedLicenseUrl\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to This package requires version '{0}' of NuGet, which this gallery does not currently support. Please contact us if you have questions..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1056,12 +1056,12 @@ The {1} Team</value>\n<data name=\"UploadPackage_LicenseFilesAreNotAllowed\" xml:space=\"preserve\">\n<value>License files are not yet supported.</value>\n</data>\n- <data name=\"UploadPackage_DeprecationUrlSuggestedForLicenseExpressions\" xml:space=\"preserve\">\n- <value>To provide better experience for older clients when a license expression is specified, <licenseUrl> should be set to '{0}'.</value>\n+ <data name=\"UploadPackage_DeprecationUrlRequiredForLicenseExpressions\" xml:space=\"preserve\">\n+ <value>To provide a better experience for older clients when a license expression is specified, <licenseUrl> must be set to '{0}'.</value>\n<comment>{0} is the licenses.nuget.org link with license expression</comment>\n</data>\n- <data name=\"UploadPackage_DeprecationUrlSuggestedForLicenseFiles\" xml:space=\"preserve\">\n- <value>To provide better experience for older clients when a license file is packaged, <licenseUrl> should be set to '{0}'.</value>\n+ <data name=\"UploadPackage_DeprecationUrlRequiredForLicenseFiles\" xml:space=\"preserve\">\n+ <value>To provide a better experience for older clients when a license file is packaged, <licenseUrl> must be set to '{0}'.</value>\n<comment>{0} is the deprecation page URL</comment>\n</data>\n<data name=\"UploadPackage_LearnMore\" xml:space=\"preserve\">\n@@ -1074,4 +1074,7 @@ The {1} Team</value>\n<value>License expression must only contain licenses that are approved by Open Source Initiative or Free Software Foundation. Unsupported licenses: {0}.</value>\n<comment>{0} is list of the package license ids that are neither OSI nor FSF approved</comment>\n</data>\n+ <data name=\"UploadPackage_MalformedLicenseUrl\" xml:space=\"preserve\">\n+ <value>The package contains a malformed license URL.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "@@ -567,12 +567,17 @@ public async Task WarnsWhenInvalidLicenseUrlSpecifiedWithLicenseFile(string lice\nAssert.Equal(\"To provide better experience for older clients when a license file is packaged, <licenseUrl> should be set to 'https://aka.ms/deprecateLicenseUrl'.\", result.Warnings[0].PlainTextMessage);\n}\n- [Fact]\n- public async Task AcceptsAlternativeLicenseUrl()\n+ [Theory]\n+ [InlineData(\"Apache-1.0+ OR MIT\", \"Apache-1.0%2B+OR+MIT\")]\n+ [InlineData(\"Apache-1.0+ AND MIT\", \"Apache-1.0%2B+AND+MIT\")]\n+ [InlineData(\"Apache-1.0+ AND MIT WITH Classpath-exception-2.0\", \"Apache-1.0%2B+AND+MIT+WITH+Classpath-exception-2.0\")]\n+ [InlineData(\"MIT WITH Classpath-exception-2.0\", \"MIT+WITH+Classpath-exception-2.0\")]\n+ [InlineData(\"MIT\", \"Apache-1.0%2B+OR+MIT\")]\n+ public async Task RejectsAlternativeLicenseUrl(string licenseExpression, string licenseUrlPostfix)\n{\n_nuGetPackage = GeneratePackageWithLicense(\n- licenseUrl: new Uri(\"https://licenses.nuget.org/Apache-1.0%2B+OR+MIT\"),\n- licenseExpression: \"Apache-1.0+ OR MIT\",\n+ licenseUrl: new Uri($\"https://licenses.nuget.org/{licenseUrlPostfix}\"),\n+ licenseExpression: licenseExpression,\nlicenseFilename: null,\nlicenseFileContents: null);\n@@ -580,15 +585,15 @@ public async Task AcceptsAlternativeLicenseUrl()\n_nuGetPackage.Object,\nGetPackageMetadata(_nuGetPackage));\n- Assert.Equal(PackageValidationResultType.Accepted, result.Type);\n- Assert.Null(result.Message);\n+ Assert.Equal(PackageValidationResultType.Invalid, result.Type);\n+ Assert.Contains(\"malformed license URL\", result.Message.PlainTextMessage);\nAssert.Empty(result.Warnings);\n}\n[Theory]\n[InlineData(null)]\n[InlineData(RegularLicenseUrl)]\n- public async Task WarnsWhenInvalidLicenseUrlSpecifiedWithLicenseExpression(string licenseUrl)\n+ public async Task ErrorsWhenInvalidLicenseUrlSpecifiedWithLicenseExpression(string licenseUrl)\n{\n_nuGetPackage = GeneratePackageWithLicense(\nlicenseUrl: licenseUrl == null ? null : new Uri(licenseUrl),\n@@ -599,10 +604,10 @@ public async Task WarnsWhenInvalidLicenseUrlSpecifiedWithLicenseExpression(strin\n_nuGetPackage.Object,\nGetPackageMetadata(_nuGetPackage));\n- Assert.Equal(PackageValidationResultType.Accepted, result.Type);\n- Assert.Null(result.Message);\n- Assert.Single(result.Warnings);\n- Assert.Equal(\"To provide better experience for older clients when a license expression is specified, <licenseUrl> should be set to 'https://licenses.nuget.org/MIT'.\", result.Warnings[0].PlainTextMessage);\n+ Assert.Equal(PackageValidationResultType.Invalid, result.Type);\n+ Assert.IsType<InvalidLicenseUrlValidationMessage>(result.Message);\n+ Assert.StartsWith(\"To provide a better experience for older clients when a license expression is specified, <licenseUrl> must be set to 'https://licenses.nuget.org/MIT'.\", result.Message.PlainTextMessage);\n+ Assert.Empty(result.Warnings);\n}\n[Fact]\n@@ -687,7 +692,8 @@ public async Task RejectsUnknownLicense(string licenseExpression)\n[InlineData(\"Saxpath OR GPL-1.0-only WITH Classpath-exception-2.0\", new[] { \"Saxpath\", \"GPL-1.0-only\" })]\npublic async Task RejectsNonOsiFsfLicenses(string licenseExpression, string[] unapprovedLicenses)\n{\n- _nuGetPackage = GeneratePackageWithLicense(licenseUrl: new Uri(LicenseDeprecationUrl), licenseExpression: licenseExpression, licenseFilename: null);\n+ var licenseUri = new Uri($\"https://licenses.nuget.org/{licenseExpression}\");\n+ _nuGetPackage = GeneratePackageWithLicense(licenseUrl: licenseUri, licenseExpression: licenseExpression, licenseFilename: null);\nvar result = await _target.ValidateBeforeGeneratePackageAsync(\n_nuGetPackage.Object,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Targeted block for invalidly URL encoded license URLs for license expressions (#6673)
* Targeted block for invalidly URL encoded license URLs for license expressions.
* Updated error message for the malformed URL case.
Changed invalid URL from warning to error. Updated tests. |
455,744 | 16.11.2018 15:37:45 | 28,800 | abacf652921ce2187f2a0d4a09ba114fcc103e86 | Undoing a bit too overzealous change application. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -2319,18 +2319,18 @@ public virtual async Task<JsonResult> PreviewReadMe(ReadMeRequest formData)\n{\nif (formData == null || !_readMeService.HasReadMeSource(formData))\n{\n- return Json(HttpStatusCode.BadRequest, new[] { new JsonValidationMessage(Strings.PreviewReadMe_ReadMeMissing) });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.PreviewReadMe_ReadMeMissing });\n}\ntry\n{\nvar readMeHtml = await _readMeService.GetReadMeHtmlAsync(formData, Request.ContentEncoding);\n- return Json(new[] { new JsonValidationMessage(readMeHtml) });\n+ return Json(new[] { readMeHtml });\n}\ncatch (Exception ex)\n{\nreturn Json(HttpStatusCode.BadRequest, new[] {\n- new JsonValidationMessage(string.Format(CultureInfo.CurrentCulture, Strings.PreviewReadMe_ConversionFailed, ex.Message)) });\n+ string.Format(CultureInfo.CurrentCulture, Strings.PreviewReadMe_ConversionFailed, ex.Message) });\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Undoing a bit too overzealous change application. (#6680) |
455,744 | 21.11.2018 17:13:53 | 28,800 | 64a491df302a27e096a9e689ebbff0e8954604d6 | Tests for PackagesController.PreviewReadMe to produce proper JSON responses. | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -7009,5 +7009,79 @@ public async Task WhenCurrentUserIsAuthenticatedOwner_ReturnsOK(bool multiFactor\nAssert.Equal((int)HttpStatusCode.OK, controller.Response.StatusCode);\n}\n}\n+\n+ public class ThePreviewReadMeMethod : TestContainer\n+ {\n+ [Fact]\n+ public async Task ReturnsProperResponseModelWhenSucceeds()\n+ {\n+ var readmeService = new Mock<IReadMeService>();\n+ var controller = CreateController(GetConfigurationService(),\n+ readMeService: readmeService.Object);\n+\n+ var request = new ReadMeRequest();\n+\n+ readmeService\n+ .Setup(rs => rs.HasReadMeSource(request))\n+ .Returns(true);\n+\n+ const string html = \"some HTML\";\n+\n+ readmeService\n+ .Setup(rs => rs.GetReadMeHtmlAsync(request, It.IsAny<Encoding>()))\n+ .ReturnsAsync(html);\n+\n+ var result = await controller.PreviewReadMe(request);\n+\n+ var stringArray = Assert.IsType<string[]>(result.Data);\n+ Assert.Single(stringArray);\n+ Assert.Equal(html, stringArray[0]);\n+ }\n+\n+ [Fact]\n+ public async Task ReturnsProperResponseModelWhenNoReadme()\n+ {\n+ var readmeService = new Mock<IReadMeService>();\n+ var controller = CreateController(GetConfigurationService(),\n+ readMeService: readmeService.Object);\n+\n+ var request = new ReadMeRequest();\n+\n+ readmeService\n+ .Setup(rs => rs.HasReadMeSource(request))\n+ .Returns(false);\n+\n+ var result = await controller.PreviewReadMe(request);\n+\n+ var stringArray = Assert.IsType<string[]>(result.Data);\n+ Assert.Single(stringArray);\n+ Assert.Equal(\"There is no Markdown Documentation available to preview.\", stringArray[0]);\n+ }\n+\n+ [Fact]\n+ public async Task ReturnsProperResponseModelWhenConversionFails()\n+ {\n+ var readmeService = new Mock<IReadMeService>();\n+ var controller = CreateController(GetConfigurationService(),\n+ readMeService: readmeService.Object);\n+\n+ var request = new ReadMeRequest();\n+\n+ readmeService\n+ .Setup(rs => rs.HasReadMeSource(request))\n+ .Returns(true);\n+\n+ const string exceptionMessage = \"failure\";\n+ readmeService\n+ .Setup(rs => rs.GetReadMeHtmlAsync(request, It.IsAny<Encoding>()))\n+ .ThrowsAsync(new Exception(exceptionMessage));\n+\n+ var result = await controller.PreviewReadMe(request);\n+\n+ var stringArray = Assert.IsType<string[]>(result.Data);\n+ Assert.Single(stringArray);\n+ Assert.Contains(exceptionMessage, stringArray[0]);\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Tests for PackagesController.PreviewReadMe to produce proper JSON responses. (#6682) |
455,735 | 26.11.2018 16:09:36 | 28,800 | 40e9e62732f8a8bb4f7f10099f769bbb7c52fb5f | Update DisplayPackage.cshtml
The second word should start with lowercase. See other texts on a package's page. `Source Code` renamed to `Source repository`. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n<a href=\"@Model.RepositoryUrl\" data-track=\"outbound-repository-url\" title=\"View the source code for this package\" rel=\"nofollow\">\n- Source Code\n+ Source repository\n</a>\n</li>\n}\n{\n<li>\n<i class=\"ms-Icon ms-Icon--CloudDownload\" aria-hidden=\"true\"></i>\n- <a href=\"@Url.PackageDownload(2, Model.Id, Model.Version)\" data-track=\"outbound-manual-download\" title=\"Download the raw nupkg file.\" rel=\"nofollow\">Download Package</a>\n+ <a href=\"@Url.PackageDownload(2, Model.Id, Model.Version)\" data-track=\"outbound-manual-download\" title=\"Download the raw nupkg file.\" rel=\"nofollow\">Download package</a>\n (@Model.PackageFileSize.ToUserFriendlyBytesLabel())\n</li>\nif (hasSymbolsPackageAvailable)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update DisplayPackage.cshtml
The second word should start with lowercase. See other texts on a package's page. `Source Code` renamed to `Source repository`. |
455,772 | 28.11.2018 13:54:51 | 28,800 | 7a938416d9e0a135c72719f50d7cac5826a37116 | Transform HTTP to HTTPS for known domains in readme.md | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReadMeService.cs",
"new_path": "src/NuGetGallery/Services/ReadMeService.cs",
"diff": "@@ -212,13 +212,15 @@ internal static string GetReadMeHtml(string readMeMd)\nvar inline = node.Inline;\nif (inline != null && inline.Tag == InlineTag.Link)\n{\n- // Allow only http or https links in markdown.\n- Uri targetUri;\n- if (!(Uri.TryCreate(inline.TargetUrl, UriKind.Absolute, out targetUri)\n- && (targetUri.Scheme == Uri.UriSchemeHttp || targetUri.Scheme == Uri.UriSchemeHttps)))\n+ // Allow only http or https links in markdown. Transform link to https for known domains.\n+ if (!PackageHelper.TryPrepareUrlForRendering(inline.TargetUrl, out string readyUriString))\n{\ninline.TargetUrl = string.Empty;\n}\n+ else\n+ {\n+ inline.TargetUrl = readyUriString;\n+ }\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"diff": "@@ -264,9 +264,11 @@ public void EncodesHtmlInMarkdown(string originalMd, string expectedHtml)\n[Theory]\n[InlineData(\"# Heading\", \"<h2>Heading</h2>\")]\n[InlineData(\"- List\", \"<ul><li>List</li></ul>\")]\n- [InlineData(\"[text](http://www.test.com)\", \"<p><a href=\\\"http://www.test.com\\\" rel=\\\"nofollow\\\">text</a></p>\")]\n+ [InlineData(\"[text](http://www.test.com)\", \"<p><a href=\\\"http://www.test.com/\\\" rel=\\\"nofollow\\\">text</a></p>\")]\n[InlineData(\"[text](javascript:alert('hi'))\", \"<p><a href=\\\"\\\" rel=\\\"nofollow\\\">text</a></p>\")]\n[InlineData(\"> <text>Blockquote</text>\", \"<blockquote><p><text>Blockquote</text></p></blockquote>\")]\n+ [InlineData(\"[text](http://www.asp.net)\", \"<p><a href=\\\"https://www.asp.net/\\\" rel=\\\"nofollow\\\">text</a></p>\")]\n+ [InlineData(\"[text](badurl://www.asp.net)\", \"<p><a href=\\\"\\\" rel=\\\"nofollow\\\">text</a></p>\")]\npublic void ConvertsMarkdownToHtml(string originalMd, string expectedHtml)\n{\nAssert.Equal(expectedHtml, StripNewLines(ReadMeService.GetReadMeHtml(originalMd)));\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Transform HTTP to HTTPS for known domains in readme.md (#6710) |
455,759 | 29.11.2018 18:14:09 | -3,600 | e9759a910c31b0e490a1daa3a877694d6cfda29b | Add tool to upgrade gallery deployments to support SemVer2 feature | [
{
"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\\ReflowCommand.cs\" />\n+ <Compile Include=\"Commands\\UpdateIsLatestCommand.cs\" />\n<Compile Include=\"Commands\\VerifyApiKeyCommand.cs\" />\n<Compile Include=\"Program.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Program.cs",
"new_path": "src/GalleryTools/Program.cs",
"diff": "@@ -18,6 +18,7 @@ public static int Main(params string[] args)\ncommandLineApplication.Command(\"reflow\", ReflowCommand.Configure);\ncommandLineApplication.Command(\"fillrepodata\", BackfillRepositoryMetadataCommand.Configure);\ncommandLineApplication.Command(\"verifyapikey\", VerifyApiKeyCommand.Configure);\n+ commandLineApplication.Command(\"updateIsLatest\", UpdateIsLatestCommand.Configure);\ntry\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add tool to upgrade gallery deployments to support SemVer2 feature (#6711) |
455,736 | 27.11.2018 16:24:53 | 28,800 | 2a7c2ce21116b81dfa1841af6989b271463dfd09 | Add Open Graph metadata for the front page
Address | [
{
"change_type": "ADD",
"old_path": "src/NuGetGallery/Content/gallery/img/logo-og-600x600.png",
"new_path": "src/NuGetGallery/Content/gallery/img/logo-og-600x600.png",
"diff": "Binary files /dev/null and b/src/NuGetGallery/Content/gallery/img/logo-og-600x600.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Areas\\Admin\\DynamicData\\PageTemplates\\ListDetails.aspx\" />\n<Content Include=\"Content\\admin\\SupportRequestStyles.css\" />\n<Content Include=\"Content\\fabric.css\" />\n+ <Content Include=\"Content\\gallery\\img\\logo-og-600x600.png\" />\n<Content Include=\"Content\\Images\\icons\\apiKey.png\" />\n<Content Include=\"Content\\Images\\icons\\apiKeyExpired.png\" />\n<Content Include=\"Content\\Images\\icons\\apiKeyLegacy.png\" />\n<Content Include=\"Content\\Images\\icons\\edit.png\" />\n<Content Include=\"Content\\Images\\icons\\expire.png\" />\n<Content Include=\"Content\\Images\\icons\\regenerate.png\" />\n- <Content Include=\"Content\\gallery\\**\\*\" />\n+ <Content Include=\"Content\\gallery\\css\\bootstrap-theme.css\" />\n+ <Content Include=\"Content\\gallery\\css\\bootstrap.css\" />\n+ <Content Include=\"Content\\gallery\\css\\fabric.css\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key-256x256.png\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key-expired-256x256.png\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key-expired.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key-legacy-256x256.png\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key-legacy.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key-new-256x256.png\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key-new.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\api-key.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\blue-circle-225x225.png\" />\n+ <Content Include=\"Content\\gallery\\img\\blue-circle.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\circuit-board.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\default-package-icon-256x256.png\" />\n+ <Content Include=\"Content\\gallery\\img\\default-package-icon.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\dotnet-foundation-42x42.png\" />\n+ <Content Include=\"Content\\gallery\\img\\dotnet-foundation.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\facebook-24x24.png\" />\n+ <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\\github-32x32.png\" />\n+ <Content Include=\"Content\\gallery\\img\\github.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\logo-footer-184x57.png\" />\n+ <Content Include=\"Content\\gallery\\img\\logo-footer.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\logo-header-94x29.png\" />\n+ <Content Include=\"Content\\gallery\\img\\logo-header.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\manage-organizations-260x150.png\" />\n+ <Content Include=\"Content\\gallery\\img\\manage-organizations.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\microsoft-account-24x24.png\" />\n+ <Content Include=\"Content\\gallery\\img\\microsoft-account.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\orange-circle-225x225.png\" />\n+ <Content Include=\"Content\\gallery\\img\\orange-circle.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\purple-circle-225x225.png\" />\n+ <Content Include=\"Content\\gallery\\img\\purple-circle.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\reserved-indicator-20x20.png\" />\n+ <Content Include=\"Content\\gallery\\img\\reserved-indicator-256x256.png\" />\n+ <Content Include=\"Content\\gallery\\img\\reserved-indicator-25x25.png\" />\n+ <Content Include=\"Content\\gallery\\img\\reserved-indicator.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\rss-36x36.png\" />\n+ <Content Include=\"Content\\gallery\\img\\rss.svg\" />\n+ <Content Include=\"Content\\gallery\\img\\twitter-24x24.png\" />\n+ <Content Include=\"Content\\gallery\\img\\twitter-36x36.png\" />\n+ <Content Include=\"Content\\gallery\\img\\twitter.svg\" />\n<Content Include=\"Content\\themes\\base\\images\\animated-overlay.gif\" />\n<Content Include=\"Content\\themes\\base\\images\\ui-bg_flat_0_aaaaaa_40x100.png\" />\n<Content Include=\"Content\\themes\\base\\images\\ui-bg_flat_75_ffffff_40x100.png\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"diff": "ViewBag.HasJumbotron = true;\n}\n+@section SocialMeta {\n+ <meta name=\"twitter:card\" content=\"summary\">\n+ <meta name=\"twitter:site\" content=\"@(\"@nuget\")\">\n+\n+ <meta property=\"og:title\" content=\"@(Config.Current.Brand) @(String.IsNullOrWhiteSpace(ViewBag.Title) ? \"\" : \"| \" + ViewBag.Title)\" />\n+ <meta property=\"og:url\" content=\"@(Url.Home(relativeUrl: false))\" />\n+ <meta property=\"og:description\" content=\"The NuGet Gallery is the central package repository for NuGet, the package manager for .NET.\" />\n+ <meta property=\"og:image\" content=\"@(Url.Absolute(\"~/Content/gallery/img/logo-og-600x600.png\"))\" />\n+}\n+\n@if (Model.ShowTransformModal)\n{\n<script type=\"text/javascript\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add Open Graph metadata for the front page (#6708)
Address https://github.com/NuGet/NuGetGallery/issues/6678 |
455,736 | 03.12.2018 15:44:46 | 28,800 | e42da10e98dc6eb9a8ed84d5cbb2f873ba537e7b | Limit release notes to 35000 characters
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/PackageHelper.cs",
"new_path": "src/NuGetGallery/Helpers/PackageHelper.cs",
"diff": "@@ -109,6 +109,10 @@ public static void ValidateNuGetPackageMetadata(PackageMetadata packageMetadata)\n{\nthrow new EntityException(Strings.NuGetPackagePropertyTooLong, \"Summary\", \"4000\");\n}\n+ if (packageMetadata.ReleaseNotes != null && packageMetadata.ReleaseNotes.Length > 35000)\n+ {\n+ throw new EntityException(Strings.NuGetPackagePropertyTooLong, \"ReleaseNotes\", \"35000\");\n+ }\nif (packageMetadata.Tags != null && packageMetadata.Tags.Length > 4000)\n{\nthrow new EntityException(Strings.NuGetPackagePropertyTooLong, \"Tags\", \"4000\");\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -543,6 +543,17 @@ private async Task WillThrowIfTheNuGetPackageCopyrightIsLongerThan4000()\nAssert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, \"Copyright\", \"4000\"), ex.Message);\n}\n+ [Fact]\n+ private async Task WillThrowIfTheNuGetPackageReleaseNotesIsLongerThan35000()\n+ {\n+ var service = CreateService();\n+ var nugetPackage = PackageServiceUtility.CreateNuGetPackage(releaseNotes: \"theReleaseNotes\".PadRight(35001, '_'));\n+\n+ var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), owner: null, currentUser: null, isVerified: false));\n+\n+ Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, \"ReleaseNotes\", \"35000\"), ex.Message);\n+ }\n+\n[Fact]\nprivate async Task WillThrowIfTheVersionIsLongerThan64Characters()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Limit release notes to 35000 characters (#6720)
Address https://github.com/NuGet/Engineering/issues/1953 |
455,776 | 04.12.2018 11:04:28 | 28,800 | 4a46fa0bd657ab483d819fbc1333470047193e9b | Properly return a 400 JSON result instead of 500 when trying to remove the last owner of a package | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "@@ -206,7 +206,7 @@ public async Task<JsonResult> RemovePackageOwner(string id, string username)\n{\nif (model.Package.Owners.Count == 1 && model.User == model.Package.Owners.Single())\n{\n- throw new InvalidOperationException(\"You can't remove the only owner from a package.\");\n+ return Json(new { success = false, message = \"You can't remove the only owner from a package.\" }, JsonRequestBehavior.AllowGet);\n}\nawait _packageOwnershipManagementService.RemovePackageOwnerAsync(model.Package, model.CurrentUser, model.User, commitAsTransaction: true);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"diff": "@@ -588,6 +588,54 @@ public async Task RemovesPackageOwnerRequest(Func<Fakes, User> getCurrentUser, F\nfalse));\n}\n+ [Theory]\n+ [MemberData(nameof(AllCanManagePackageOwnersPairedWithCanBeRemoved_Data))]\n+ public async Task FailsIfAttemptingToRemoveLastOwner(Func<Fakes, User> getCurrentUser, Func<Fakes, User> getUserToRemove)\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var currentUser = getCurrentUser(fakes);\n+ var userToRemove = getUserToRemove(fakes);\n+ var package = fakes.Package;\n+ var controller = GetController<JsonApiController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ foreach (var owner in package.Owners.Where(o => !o.MatchesUser(userToRemove)).ToList())\n+ {\n+ package.Owners.Remove(owner);\n+ }\n+\n+ var packageOwnershipManagementService = GetMock<IPackageOwnershipManagementService>();\n+\n+ packageOwnershipManagementService\n+ .Setup(x => x.GetPackageOwnershipRequests(package, null, userToRemove))\n+ .Returns(Enumerable.Empty<PackageOwnerRequest>());\n+\n+ // Act\n+ var result = await controller.RemovePackageOwner(package.Id, userToRemove.Username);\n+ dynamic data = result.Data;\n+\n+ // Assert\n+ Assert.False(data.success);\n+\n+ packageOwnershipManagementService\n+ .Verify(\n+ x => x.RemovePackageOwnerAsync(package, currentUser, userToRemove, It.IsAny<bool>()),\n+ Times.Never());\n+\n+ GetMock<IMessageService>()\n+ .Verify(\n+ x => x.SendMessageAsync(\n+ It.Is<PackageOwnerRemovedMessage>(\n+ msg =>\n+ msg.FromUser == currentUser\n+ && msg.ToUser == userToRemove\n+ && msg.PackageRegistration == package),\n+ false,\n+ false),\n+ Times.Never());\n+ }\n+\n[Theory]\n[MemberData(nameof(AllCanManagePackageOwnersPairedWithCanBeRemoved_Data))]\npublic async Task RemovesExistingOwner(Func<Fakes, User> getCurrentUser, Func<Fakes, User> getUserToRemove)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Properly return a 400 JSON result instead of 500 when trying to remove the last owner of a package (#6715) |
455,756 | 06.12.2018 10:06:24 | 28,800 | fe6fd300cb98bfb980d9529eebaf0bcc0f692f0e | controller redirects to licenses.nuget.org with license expression | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -677,6 +677,11 @@ public virtual async Task<ActionResult> License(string id, string version)\nreturn HttpNotFound();\n}\n+ if (!string.IsNullOrWhiteSpace(package.LicenseExpression))\n+ {\n+ return Redirect(LicenseExpressionRedirectUrlHelper.GetLicenseExpressionRedirectUrl(package.LicenseExpression));\n+ }\n+\nif (package.EmbeddedLicenseType == EmbeddedLicenseFileType.Absent)\n{\nreturn HttpNotFound();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -7138,6 +7138,31 @@ public async Task GivenInvalidPackageReturns404()\nAssert.IsType<HttpNotFoundResult>(result);\n}\n+ [Theory]\n+ [InlineData(\"MIT\", \"https://licenses.nuget.org/MIT\")]\n+ [InlineData(\"TestLicenseExpression\", \"https://licenses.nuget.org/TestLicenseExpression\")]\n+ public async Task GivenValidPackageWithLicenseExpressionRedirectToLicenseUrl(string licenseExpression, string expectedRedirectUrl)\n+ {\n+ // arrange\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration { Id = _packageId },\n+ Version = _packageVersion,\n+ LicenseExpression = licenseExpression\n+ };\n+\n+ _packageService.Setup(p => p.FindPackageByIdAndVersionStrict(_packageId, _packageVersion)).Returns(package);\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: _packageService);\n+\n+ // act\n+ var result = await controller.License(_packageId, _packageVersion);\n+\n+ // assert\n+ ResultAssert.IsRedirectTo(result, expectedRedirectUrl);\n+ }\n+\n[Fact]\npublic async Task GivenPackageWithoutLicenseFileReturns404()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | controller redirects to licenses.nuget.org with license expression (#6726) |
455,759 | 10.12.2018 09:46:55 | -3,600 | 53e1f7efec8b60a731f94ff2bc409555919679dc | RequirePackageMetadataCompliancePolicy: allow exceptions for authors | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/MicrosoftTeamSubscription.cs",
"new_path": "src/NuGetGallery/Security/MicrosoftTeamSubscription.cs",
"diff": "@@ -61,6 +61,7 @@ private static List<UserSecurityPolicy> InitializePoliciesList()\nName,\nMicrosoftUsername,\nallowedCopyrightNotices: AllowedCopyrightNotices,\n+ allowedAuthors: new[] { MicrosoftUsername },\nisLicenseUrlRequired: true,\nisProjectUrlRequired: true,\nerrorMessageFormat: Strings.SecurityPolicy_RequireMicrosoftPackageMetadataComplianceForPush)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/RequirePackageMetadataCompliancePolicy.cs",
"new_path": "src/NuGetGallery/Security/RequirePackageMetadataCompliancePolicy.cs",
"diff": "@@ -95,6 +95,7 @@ public override async Task<SecurityPolicyResult> EvaluateAsync(PackageSecurityPo\nstring subscription,\nstring requiredCoOwnerUsername,\nstring[] allowedCopyrightNotices,\n+ string[] allowedAuthors,\nbool isLicenseUrlRequired,\nbool isProjectUrlRequired,\nstring errorMessageFormat)\n@@ -103,6 +104,7 @@ public override async Task<SecurityPolicyResult> EvaluateAsync(PackageSecurityPo\n{\nRequiredCoOwnerUsername = requiredCoOwnerUsername,\nAllowedCopyrightNotices = allowedCopyrightNotices,\n+ AllowedAuthors = allowedAuthors,\nIsLicenseUrlRequired = isLicenseUrlRequired,\nIsProjectUrlRequired = isProjectUrlRequired,\nErrorMessageFormat = errorMessageFormat\n@@ -116,13 +118,7 @@ private bool IsPackageMetadataCompliant(Package package, State state, out IList<\ncomplianceFailures = new List<string>();\n// Author validation\n- if (!package.FlattenedAuthors\n- .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)\n- .Select(s => s.Trim())\n- .Contains(state.RequiredCoOwnerUsername, StringComparer.InvariantCultureIgnoreCase))\n- {\n- complianceFailures.Add(string.Format(CultureInfo.CurrentCulture, Strings.SecurityPolicy_RequiredAuthorMissing, state.RequiredCoOwnerUsername));\n- }\n+ ValidatePackageAuthors(package, state, complianceFailures);\n// Copyright validation\nif (!state.AllowedCopyrightNotices.Contains(package.Copyright))\n@@ -145,6 +141,47 @@ private bool IsPackageMetadataCompliant(Package package, State state, out IList<\nreturn !complianceFailures.Any();\n}\n+ private static void ValidatePackageAuthors(Package package, State state, IList<string> complianceFailures)\n+ {\n+ var packageAuthors = package.FlattenedAuthors\n+ .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)\n+ .Select(s => s.Trim())\n+ .ToList();\n+\n+ // Check for duplicate entries\n+ var duplicateAuthors = packageAuthors\n+ .GroupBy(x => x)\n+ .Where(group => group.Count() > 1)\n+ .Select(group => group.Key)\n+ .ToList();\n+\n+ if (duplicateAuthors.Any())\n+ {\n+ complianceFailures.Add(string.Format(CultureInfo.CurrentCulture, Strings.SecurityPolicy_PackageAuthorDuplicatesNotAllowed, string.Join(\",\", duplicateAuthors)));\n+ }\n+ else\n+ {\n+ if (state.AllowedAuthors?.Length > 0)\n+ {\n+ foreach (var packageAuthor in packageAuthors)\n+ {\n+ if (!state.AllowedAuthors.Contains(packageAuthor))\n+ {\n+ complianceFailures.Add(string.Format(CultureInfo.CurrentCulture, Strings.SecurityPolicy_PackageAuthorNotAllowed, packageAuthor));\n+ }\n+ }\n+ }\n+ else\n+ {\n+ // No list of allowed authors is defined for this policy.\n+ // We require the required co-owner to be defined as the only package author.\n+ if (packageAuthors.Count() > 1 || packageAuthors.Single() != state.RequiredCoOwnerUsername)\n+ {\n+ complianceFailures.Add(string.Format(CultureInfo.CurrentCulture, Strings.SecurityPolicy_RequiredAuthorMissing, state.RequiredCoOwnerUsername));\n+ }\n+ }\n+ }\n+ }\n/// <summary>\n/// Retrieve the policy state.\n@@ -167,6 +204,9 @@ public class State\n[JsonProperty(\"copy\")]\npublic string[] AllowedCopyrightNotices { get; set; }\n+ [JsonProperty(\"authors\")]\n+ public string[] AllowedAuthors { get; set; }\n+\n[JsonProperty(\"licUrlReq\")]\npublic bool IsLicenseUrlRequired { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1732,6 +1732,24 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package metadata defines '{0}' as author more than once, which is not allowed by policy..\n+ /// </summary>\n+ public static string SecurityPolicy_PackageAuthorDuplicatesNotAllowed {\n+ get {\n+ return ResourceManager.GetString(\"SecurityPolicy_PackageAuthorDuplicatesNotAllowed\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to The package metadata defines '{0}' as one of the authors which is not allowed by policy..\n+ /// </summary>\n+ public static string SecurityPolicy_PackageAuthorNotAllowed {\n+ get {\n+ return ResourceManager.GetString(\"SecurityPolicy_PackageAuthorNotAllowed\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to A package verification key is required to push symbols. Please contact [email protected] to get more details..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1077,4 +1077,12 @@ The {1} Team</value>\n<data name=\"UploadPackage_MalformedLicenseUrl\" xml:space=\"preserve\">\n<value>The package contains a malformed license URL.</value>\n</data>\n+ <data name=\"SecurityPolicy_PackageAuthorNotAllowed\" xml:space=\"preserve\">\n+ <value>The package metadata defines '{0}' as one of the authors which is not allowed by policy.</value>\n+ <comment>{0} is the author that is not in the list of allowed authors for this policy.</comment>\n+ </data>\n+ <data name=\"SecurityPolicy_PackageAuthorDuplicatesNotAllowed\" xml:space=\"preserve\">\n+ <value>The package metadata defines '{0}' as author more than once, which is not allowed by policy.</value>\n+ <comment>{0} is the list of duplicate package authors</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": "@@ -1391,7 +1391,7 @@ public async Task AddsRequiredCoOwnerWhenPackageWithNewRegistrationIdIsCompliant\n_packageId,\n\"1.0.0\",\nisSigned: true,\n- authors: $\"{_user.Username},{_requiredCoOwner.Username}\",\n+ authors: $\"{_requiredCoOwner.Username}\",\nlicenseUrl: new Uri(\"https://github.com/NuGet/NuGetGallery/blob/master/LICENSE.txt\"),\nprojectUrl: new Uri(\"https://www.nuget.org\"));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/RequirePackageMetadataCompliancePolicyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/RequirePackageMetadataCompliancePolicyFacts.cs",
"diff": "@@ -44,7 +44,6 @@ public void Evaluate_ThrowsForNullArgument()\nAssert.ThrowsAsync<ArgumentNullException>(() => policyHandler.EvaluateAsync(null));\n}\n-\n[Fact]\npublic async Task Evaluate_DoesNotCommitChangesToEntityContext()\n{\n@@ -206,6 +205,120 @@ public async Task Evaluate_NonCompliantPackage_CreatesErrorResult(Package nonCom\nAssert.False(newPackageRegistration.IsVerified);\n}\n+ [Fact]\n+ public async Task Evaluate_NonCompliantPackageAuthor_CreatesErrorResult()\n+ {\n+ // Arrange\n+ var nugetUser = new User(\"NuGet\");\n+ var newPackageRegistration = new PackageRegistration { Id = \"NewPackageId\", Owners = new List<User> { nugetUser } };\n+ var packageAuthors = new[] { MicrosoftTeamSubscription.MicrosoftUsername, \"The Not-Allowed Package Authors\" };\n+ var nonCompliantPackage = Fakes.CreateCompliantPackage(\"1.0.0\", newPackageRegistration, packageAuthors);\n+\n+ var policy = RequirePackageMetadataCompliancePolicy.CreatePolicy(\n+ MicrosoftTeamSubscription.Name,\n+ MicrosoftTeamSubscription.MicrosoftUsername,\n+ allowedCopyrightNotices: MicrosoftTeamSubscription.AllowedCopyrightNotices,\n+ allowedAuthors: new[] { MicrosoftTeamSubscription.MicrosoftUsername },\n+ isLicenseUrlRequired: true,\n+ isProjectUrlRequired: true,\n+ errorMessageFormat: Strings.SecurityPolicy_RequireMicrosoftPackageMetadataComplianceForPush);\n+\n+ var policyHandler = new RequirePackageMetadataCompliancePolicy();\n+\n+ var context = CreateTestContext(\n+ true,\n+ new[] { policy },\n+ nonCompliantPackage,\n+ packageRegistrationAlreadyExists: false,\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser);\n+\n+ // Act\n+ var result = await policyHandler.EvaluateAsync(context);\n+\n+ // Assert\n+ Assert.False(result.Success);\n+ Assert.Null(newPackageRegistration.Owners.SingleOrDefault(u => u.Username == MicrosoftTeamSubscription.MicrosoftUsername));\n+ Assert.False(newPackageRegistration.IsVerified);\n+ }\n+\n+ [Fact]\n+ public async Task Evaluate_DuplicatePackageAuthor_CreatesErrorResult()\n+ {\n+ // Arrange\n+ var nugetUser = new User(\"NuGet\");\n+ var newPackageRegistration = new PackageRegistration { Id = \"NewPackageId\", Owners = new List<User> { nugetUser } };\n+ var packageAuthors = new[] { MicrosoftTeamSubscription.MicrosoftUsername, MicrosoftTeamSubscription.MicrosoftUsername };\n+ var nonCompliantPackage = Fakes.CreateCompliantPackage(\"1.0.0\", newPackageRegistration, packageAuthors);\n+\n+ var policy = RequirePackageMetadataCompliancePolicy.CreatePolicy(\n+ MicrosoftTeamSubscription.Name,\n+ MicrosoftTeamSubscription.MicrosoftUsername,\n+ allowedCopyrightNotices: MicrosoftTeamSubscription.AllowedCopyrightNotices,\n+ allowedAuthors: new[] { MicrosoftTeamSubscription.MicrosoftUsername },\n+ isLicenseUrlRequired: true,\n+ isProjectUrlRequired: true,\n+ errorMessageFormat: Strings.SecurityPolicy_RequireMicrosoftPackageMetadataComplianceForPush);\n+\n+ var policyHandler = new RequirePackageMetadataCompliancePolicy();\n+\n+ var context = CreateTestContext(\n+ true,\n+ new[] { policy },\n+ nonCompliantPackage,\n+ packageRegistrationAlreadyExists: false,\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser);\n+\n+ // Act\n+ var result = await policyHandler.EvaluateAsync(context);\n+\n+ // Assert\n+ Assert.False(result.Success);\n+ Assert.Null(newPackageRegistration.Owners.SingleOrDefault(u => u.Username == MicrosoftTeamSubscription.MicrosoftUsername));\n+ Assert.False(newPackageRegistration.IsVerified);\n+ }\n+\n+ [Fact]\n+ public async Task Evaluate_CompliantPackageAuthors_CreatesSuccessResult()\n+ {\n+ // Arrange\n+ var nugetUser = new User(\"NuGet\");\n+ var newPackageRegistration = new PackageRegistration { Id = \"NewPackageId\", Owners = new List<User> { nugetUser } };\n+ var packageAuthors = new[] { MicrosoftTeamSubscription.MicrosoftUsername, \"The Most-Awesome Package Authors\" };\n+ var compliantPackage = Fakes.CreateCompliantPackage(\"1.0.0\", newPackageRegistration, packageAuthors);\n+\n+ var policy = RequirePackageMetadataCompliancePolicy.CreatePolicy(\n+ MicrosoftTeamSubscription.Name,\n+ MicrosoftTeamSubscription.MicrosoftUsername,\n+ allowedCopyrightNotices: MicrosoftTeamSubscription.AllowedCopyrightNotices,\n+ allowedAuthors: packageAuthors,\n+ isLicenseUrlRequired: true,\n+ isProjectUrlRequired: true,\n+ errorMessageFormat: Strings.SecurityPolicy_RequireMicrosoftPackageMetadataComplianceForPush);\n+\n+ var policyHandler = new RequirePackageMetadataCompliancePolicy();\n+\n+ var packageOwnershipManagementService = new Mock<IPackageOwnershipManagementService>();\n+ packageOwnershipManagementService.Setup(m => m.AddPackageOwnerAsync(newPackageRegistration, It.IsAny<User>(), false)).Returns(Task.CompletedTask);\n+\n+ var context = CreateTestContext(\n+ true,\n+ new[] { policy },\n+ compliantPackage,\n+ packageRegistrationAlreadyExists: false,\n+ sourceAccount: nugetUser,\n+ targetAccount: nugetUser,\n+ packageOwnershipManagementService: packageOwnershipManagementService.Object);\n+\n+ // Act\n+ var result = await policyHandler.EvaluateAsync(context);\n+\n+ // Assert\n+ Assert.True(result.Success);\n+ packageOwnershipManagementService.Verify(s => s.AddPackageOwnerAsync(newPackageRegistration, Fakes.RequiredCoOwner, false), Times.Once);\n+ }\n+\nprivate static PackageSecurityPolicyEvaluationContext CreateTestContext(\nbool microsoftUserExists,\nIEnumerable<UserSecurityPolicy> policies,\n@@ -298,7 +411,7 @@ static Fakes()\n};\n}\n- public static Package CreateCompliantPackage(string version, PackageRegistration packageRegistration)\n+ public static Package CreateCompliantPackage(string version, PackageRegistration packageRegistration, string[] allowedAuthors = null)\n{\nreturn new Package\n{\n@@ -307,7 +420,7 @@ public static Package CreateCompliantPackage(string version, PackageRegistration\nCopyright = \"(c) Microsoft Corporation. All rights reserved.\",\nProjectUrl = \"https://github.com/NuGet/NuGetGallery\",\nLicenseUrl = \"https://github.com/NuGet/NuGetGallery/blob/master/LICENSE.txt\",\n- FlattenedAuthors = \"NuGet, Microsoft\"\n+ FlattenedAuthors = allowedAuthors == null ? \"Microsoft\" : string.Join(\",\", allowedAuthors)\n};\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | RequirePackageMetadataCompliancePolicy: allow exceptions for authors (#6728) |
455,776 | 12.12.2018 13:57:21 | 28,800 | f14275fd45d5f82575760d3d1d72f38224415f75 | Server-side performance fixes for Manage Packages page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionRequiringEntityPermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionRequiringEntityPermissions.cs",
"diff": "@@ -55,35 +55,43 @@ public PermissionsCheckResult CheckPermissions(IPrincipal currentPrincipal, User\npublic PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity)\n{\n- return CheckPermissionsOnBehalfOfAnyAccount(currentUser, entity, out var accountsAllowedOnBehalfOf);\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, entity, exitEarly: true, accountsAllowedOnBehalfOf: out var _);\n}\npublic PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity, out IEnumerable<User> accountsAllowedOnBehalfOf)\n+ {\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, entity, exitEarly: false, accountsAllowedOnBehalfOf: out accountsAllowedOnBehalfOf);\n+ }\n+\n+ private PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity, bool exitEarly, out IEnumerable<User> accountsAllowedOnBehalfOf)\n{\naccountsAllowedOnBehalfOf = new List<User>();\n- var possibleAccountsOnBehalfOf =\n- new[] { currentUser }\n- .Concat(GetOwners(entity));\n+ var possibleAccountsOnBehalfOf = new List<User>\n+ {\n+ currentUser\n+ };\n+\n+ possibleAccountsOnBehalfOf.AddRange(GetOwners(entity));\nif (currentUser != null)\n{\n- possibleAccountsOnBehalfOf =\n- possibleAccountsOnBehalfOf\n- .Concat(currentUser.Organizations.Select(o => o.Organization));\n+ possibleAccountsOnBehalfOf.AddRange(currentUser.Organizations.Select(o => o.Organization));\n}\n- possibleAccountsOnBehalfOf = possibleAccountsOnBehalfOf.Distinct(new UserEqualityComparer());\n-\nvar aggregateResult = PermissionsCheckResult.Unknown;\n- foreach (var accountOnBehalfOf in possibleAccountsOnBehalfOf)\n+ foreach (var accountOnBehalfOf in possibleAccountsOnBehalfOf.Distinct(new UserEqualityComparer()))\n{\nvar result = CheckPermissions(currentUser, accountOnBehalfOf, entity);\naggregateResult = ChoosePermissionsCheckResult(aggregateResult, result);\nif (result == PermissionsCheckResult.Allowed)\n{\n(accountsAllowedOnBehalfOf as List<User>).Add(accountOnBehalfOf);\n+ if (exitEarly)\n+ {\n+ break;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -255,18 +255,12 @@ private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bo\npackages = packages.Where(p => p.Listed);\n}\n- if (includeVersions)\n+ if (!includeVersions)\n{\n- return packages\n- .Include(p => p.PackageRegistration)\n- .Include(p => p.PackageRegistration.Owners)\n- .ToList();\n- }\n-\n// Do a best effort of retrieving the latest version. 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.\n- return packages\n+ packages = packages\n.GroupBy(p => p.PackageRegistrationKey)\n.Select(g => g\n// order booleans desc so that true (1) comes first\n@@ -276,9 +270,13 @@ private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bo\n.ThenByDescending(p => p.IsLatest)\n.ThenByDescending(p => p.Listed)\n.ThenByDescending(p => p.Key)\n- .FirstOrDefault())\n+ .FirstOrDefault());\n+ }\n+\n+ return packages\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners)\n+ .Include(p => p.PackageRegistration.RequiredSigners)\n.ToList();\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Server-side performance fixes for Manage Packages page (#6752) |
455,744 | 13.12.2018 18:00:46 | 28,800 | a49d5ec3fb57e17623cebf9dae974b5206c56e04 | Not saving markdown files with "text/markdown" anymore. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CoreLicenseFileService.cs",
"new_path": "src/NuGetGallery.Core/Services/CoreLicenseFileService.cs",
"diff": "@@ -42,13 +42,7 @@ public Task SaveLicenseFileAsync(Package package, Stream licenseFile)\nvar fileName = BuildLicenseFileName(package);\n- // Gallery will generally ignore the content type on license files and will use the value from the DB,\n- // but we'll be nice and try to specify correct content type for them.\n- var contentType = package.EmbeddedLicenseType == EmbeddedLicenseFileType.Markdown\n- ? CoreConstants.MarkdownContentType\n- : CoreConstants.TextContentType;\n-\n- return _fileStorageService.SaveFileAsync(_metadata.PackageContentFolderName, fileName, contentType, licenseFile, overwrite: true);\n+ return _fileStorageService.SaveFileAsync(_metadata.PackageContentFolderName, fileName, CoreConstants.TextContentType, licenseFile, overwrite: true);\n}\npublic async Task ExtractAndSaveLicenseFileAsync(Package package, Stream packageStream)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CoreLicenseFileServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CoreLicenseFileServiceFacts.cs",
"diff": "@@ -93,7 +93,7 @@ public async Task WillThrowIfPackageIsMissingNormalizedVersionAndVersion(Embedde\n[Theory]\n[InlineData(EmbeddedLicenseFileType.PlainText, \"text/plain\")]\n- [InlineData(EmbeddedLicenseFileType.Markdown, \"text/markdown\")]\n+ [InlineData(EmbeddedLicenseFileType.Markdown, \"text/plain\")]\npublic async Task WillUseNormalizedRegularVersionIfNormalizedVersionMissing(EmbeddedLicenseFileType licenseFileType, string expectedContentType)\n{\nvar fileStorageSvc = new Mock<ICoreFileStorageService>();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Not saving markdown files with "text/markdown" anymore. (#6756) |
455,736 | 14.12.2018 10:34:27 | 28,800 | 776d4e0f57a20e2a14df1f13ce1d2cae15185c90 | Add OpenReadAsync to ISimpleCloudBlob wrapper
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"diff": "@@ -29,6 +29,14 @@ public CloudBlobWrapper(CloudBlockBlob blob)\n_blob = blob;\n}\n+ public async Task<Stream> OpenReadAsync(AccessCondition accessCondition)\n+ {\n+ return await _blob.OpenReadAsync(\n+ accessCondition: accessCondition,\n+ options: null,\n+ operationContext: null);\n+ }\n+\npublic async Task DeleteIfExistsAsync()\n{\nawait _blob.DeleteIfExistsAsync(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"new_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"diff": "@@ -20,6 +20,8 @@ public interface ISimpleCloudBlob\nDateTime LastModifiedUtc { get; }\nstring ETag { get; }\n+ Task<Stream> OpenReadAsync(AccessCondition accessCondition);\n+\nTask DeleteIfExistsAsync();\nTask DownloadToStreamAsync(Stream target);\nTask DownloadToStreamAsync(Stream target, AccessCondition accessCondition);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"diff": "using System;\nusing System.Collections.Concurrent;\nusing System.IO;\n+using System.Net;\nusing System.Text;\nusing System.Threading;\nusing System.Threading.Tasks;\n@@ -58,6 +59,129 @@ public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixtur\n_targetB = new CloudBlobCoreFileStorageService(_clientB, Mock.Of<IDiagnosticsService>());\n}\n+ [BlobStorageFact]\n+ public async Task OpenReadAsyncReturnsReadableStreamWhenBlobExistsAndPopulatesProperties()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var expectedContent = \"Hello, world.\";\n+\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(expectedContent)),\n+ overwrite: false);\n+\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+\n+ // Act\n+ using (var stream = await file.OpenReadAsync(accessCondition: null))\n+ using (var streamReader = new StreamReader(stream))\n+ {\n+ var actualContent = await streamReader.ReadToEndAsync();\n+\n+ // Assert\n+ Assert.Equal(expectedContent, actualContent);\n+ Assert.Equal(expectedContent.Length, file.Properties.Length);\n+ Assert.NotNull(file.ETag);\n+ }\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task OpenReadAsyncThrowsNotFoundWhenBlobDoesNotExist()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var exists = await _targetA.FileExistsAsync(folderName, fileName);\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+\n+ // Act & Assert\n+ Assert.False(exists);\n+ var ex = await Assert.ThrowsAsync<StorageException>(\n+ () => file.OpenReadAsync(accessCondition: null));\n+ Assert.Equal(HttpStatusCode.NotFound, (HttpStatusCode)ex.RequestInformation.HttpStatusCode);\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task OpenReadAsyncThrowsPreconditionFailedWhenIfMatchFails()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(\"Hello, world.\")),\n+ overwrite: false);\n+\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+ await file.FetchAttributesAsync();\n+\n+ // Act & Assert\n+ var ex = await Assert.ThrowsAsync<StorageException>(\n+ () => file.OpenReadAsync(accessCondition: AccessCondition.GenerateIfMatchCondition(\"WON'T MATCH\")));\n+ Assert.Equal(HttpStatusCode.PreconditionFailed, (HttpStatusCode)ex.RequestInformation.HttpStatusCode);\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task OpenReadAsyncThrowsNotModifiedWhenIfNoneMatchFails()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(\"Hello, world.\")),\n+ overwrite: false);\n+\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+ await file.FetchAttributesAsync();\n+\n+ // Act & Assert\n+ var ex = await Assert.ThrowsAsync<StorageException>(\n+ () => file.OpenReadAsync(accessCondition: AccessCondition.GenerateIfNoneMatchCondition(file.ETag)));\n+ Assert.Equal(HttpStatusCode.NotModified, (HttpStatusCode)ex.RequestInformation.HttpStatusCode);\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task OpenReadAsyncReturnsContentWhenIfNoneMatchSucceeds()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var expectedContent = \"Hello, world.\";\n+\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(expectedContent)),\n+ overwrite: false);\n+\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+\n+ // Act\n+ using (var stream = await file.OpenReadAsync(accessCondition: AccessCondition.GenerateIfNoneMatchCondition(\"WON'T MATCH\")))\n+ using (var streamReader = new StreamReader(stream))\n+ {\n+ var actualContent = await streamReader.ReadToEndAsync();\n+\n+ // Assert\n+ Assert.Equal(expectedContent, actualContent);\n+ Assert.Equal(expectedContent.Length, file.Properties.Length);\n+ Assert.NotNull(file.ETag);\n+ }\n+ }\n+\n[BlobStorageFact]\npublic async Task ReturnsCurrentETagForIfMatch()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add OpenReadAsync to ISimpleCloudBlob wrapper (#6758)
Progress on https://github.com/nuget/nugetgallery/issues/6449 |
455,736 | 17.12.2018 09:33:22 | 28,800 | d4df12227e03b0e1d2eb3e08794b527aefe60be8 | Add AccessConditionWrapper.GenerateIfNoneMatchCondition
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/AccessConditionWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/AccessConditionWrapper.cs",
"diff": "@@ -31,6 +31,13 @@ public static IAccessCondition GenerateIfMatchCondition(string etag)\nifMatchETag: AccessCondition.GenerateIfMatchCondition(etag).IfMatchETag);\n}\n+ public static IAccessCondition GenerateIfNoneMatchCondition(string etag)\n+ {\n+ return new AccessConditionWrapper(\n+ ifNoneMatchETag: AccessCondition.GenerateIfNoneMatchCondition(etag).IfNoneMatchETag,\n+ ifMatchETag: null);\n+ }\n+\npublic static IAccessCondition GenerateIfNotExistsCondition()\n{\nreturn new AccessConditionWrapper(\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add AccessConditionWrapper.GenerateIfNoneMatchCondition (#6762)
Progress on https://github.com/NuGet/NuGetGallery/issues/6449 |
455,747 | 18.12.2018 16:46:05 | 28,800 | 24fb2a3a5c766d22cc21c098b1823b6fd495ff01 | Fix bug with namespace reservation and snupkg push with older clients | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -56,6 +56,11 @@ public async Task EnsureValid(PackageArchiveReader packageArchiveReader)\npackageArchiveReader.GetNuspecReader(),\nstrict: true);\n+ if (packageMetadata.IsSymbolsPackage())\n+ {\n+ throw new InvalidPackageException(Strings.UploadPackage_SymbolsPackageNotAllowed);\n+ }\n+\nPackageHelper.ValidateNuGetPackageMetadata(packageMetadata);\nvar supportedFrameworks = GetSupportedFrameworks(packageArchiveReader).Select(fn => fn.ToShortNameOrNull()).ToArray();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReservedNamespaceService.cs",
"new_path": "src/NuGetGallery/Services/ReservedNamespaceService.cs",
"diff": "@@ -15,7 +15,7 @@ namespace NuGetGallery\n{\npublic class ReservedNamespaceService : IReservedNamespaceService\n{\n- private static readonly Regex NamespaceRegex = new Regex(@\"^\\w+([_.-]\\w+)*[.]?$\", RegexOptions.Compiled | RegexOptions.ExplicitCapture);\n+ private static readonly Regex NamespaceRegex = new Regex(@\"^\\w+([_.-]\\w+)*[.-]?$\", RegexOptions.Compiled | RegexOptions.ExplicitCapture);\npublic IEntitiesContext EntitiesContext { get; protected set; }\npublic IEntityRepository<ReservedNamespace> ReservedNamespaceRepository { get; protected set; }\n@@ -47,7 +47,14 @@ public async Task AddReservedNamespaceAsync(ReservedNamespace newNamespace)\nthrow new ArgumentNullException(nameof(newNamespace));\n}\n+ try\n+ {\nValidateNamespace(newNamespace.Value);\n+ }\n+ catch (ArgumentException ex)\n+ {\n+ throw new InvalidOperationException(ex.Message, ex);\n+ }\nvar matchingReservedNamespaces = FindAllReservedNamespacesForPrefix(prefix: newNamespace.Value, getExactMatches: !newNamespace.IsPrefix);\nif (matchingReservedNamespaces.Any())\n@@ -348,12 +355,12 @@ public static void ValidateNamespace(string value)\nthrow new ArgumentException(Strings.ReservedNamespace_InvalidNamespace);\n}\n- if (value.Length > NuGet.Services.Entities.Constants.MaxPackageIdLength)\n+ if (value.Length > Constants.MaxPackageIdLength)\n{\nthrow new ArgumentException(string.Format(\nCultureInfo.CurrentCulture,\nStrings.ReservedNamespace_NamespaceExceedsLength,\n- NuGet.Services.Entities.Constants.MaxPackageIdLength));\n+ Constants.MaxPackageIdLength));\n}\nif (!NamespaceRegex.IsMatch(value))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace NuGetGallery {\n// class via a tool like ResGen or Visual Studio.\n// To add or remove a member, edit your .ResX file then rerun ResGen\n// with the /str option, or rebuild your VS project.\n- [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"16.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"15.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\npublic class Strings {\n@@ -1535,7 +1535,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to The namespace '{0}' contains invalid characters. Examples of valid namespaces include 'MyNamespace' and 'MyNamespace.'..\n+ /// Looks up a localized string similar to The namespace '{0}' contains invalid characters. Examples of valid namespaces include 'MyNamespace', 'MyNamespace.' or 'MyNamespace-' etc..\n/// </summary>\npublic static string ReservedNamespace_InvalidCharactersInNamespace {\nget {\n@@ -2508,6 +2508,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Snupkg upload failed. Please use latest NuGet clients (v 4.9.0 or above) and a V3 endpoint to push Symbol packages. For details, refer https://docs.microsoft.com/nuget/create-packages/symbol-packages-snupkg.\n+ /// </summary>\n+ public static string UploadPackage_SymbolsPackageNotAllowed {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_SymbolsPackageNotAllowed\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Unsupported license type '{0}'..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -491,7 +491,7 @@ For more information, please contact '{2}'.</value>\n<value>This package will only be available to download with SemVer 2.0.0 compatible NuGet clients, such as Visual Studio 2017 (version 15.3) and above or NuGet client 4.3 and above. For more information, see https://go.microsoft.com/fwlink/?linkid=852248.</value>\n</data>\n<data name=\"ReservedNamespace_InvalidCharactersInNamespace\" xml:space=\"preserve\">\n- <value>The namespace '{0}' contains invalid characters. Examples of valid namespaces include 'MyNamespace' and 'MyNamespace.'.</value>\n+ <value>The namespace '{0}' contains invalid characters. Examples of valid namespaces include 'MyNamespace', 'MyNamespace.' or 'MyNamespace-' etc.</value>\n</data>\n<data name=\"ReservedNamespace_InvalidNamespace\" xml:space=\"preserve\">\n<value>Invalid namespace specified</value>\n@@ -1085,4 +1085,7 @@ The {1} Team</value>\n<value>The package metadata defines '{0}' as author more than once, which is not allowed by policy.</value>\n<comment>{0} is the list of duplicate package authors</comment>\n</data>\n+ <data name=\"UploadPackage_SymbolsPackageNotAllowed\" xml:space=\"preserve\">\n+ <value>Snupkg upload failed. Please use latest NuGet clients (v 4.9.0 or above) and a V3 endpoint to push Symbol packages. For details, refer https://docs.microsoft.com/nuget/create-packages/symbol-packages-snupkg</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/TestUtils/PackageServiceUtility.cs",
"new_path": "tests/NuGetGallery.Core.Facts/TestUtils/PackageServiceUtility.cs",
"diff": "@@ -190,5 +190,15 @@ public static Mock<TestPackageReader> CreateNuGetPackage(Stream testPackage)\nlicenseFilename: licenseFilename,\nlicenseFileContents: licenseFileContents);\n}\n+\n+ public static PackageArchiveReader CreateArchiveReader(Stream stream)\n+ {\n+ if (stream == null)\n+ {\n+ stream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n+ }\n+\n+ return new PackageArchiveReader(stream, leaveStreamOpen: true);\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -2059,6 +2059,21 @@ public async Task WillThrowIfThePackageIsNull()\n}\n}\n+ public class TheEnsureValidMethod\n+ {\n+ [Fact]\n+ public async Task EnsureValidThrowsForSymbolsPackage()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+ var packageStream = TestPackage.CreateTestSymbolPackageStream();\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(packageStream);\n+\n+ // Act and Assert\n+ await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.EnsureValid(packageArchiveReader));\n+ }\n+ }\n+\npublic class TheRemovePackageOwnerMethod\n{\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"diff": "@@ -99,7 +99,7 @@ public async Task EmptyOrNullNamespaceThrowsException(string value)\n{\nvar service = new TestableReservedNamespaceService();\nvar addNamespace = new ReservedNamespace(value, isSharedNamespace: false, isPrefix: true);\n- await Assert.ThrowsAsync<ArgumentException>(async () => await service.AddReservedNamespaceAsync(addNamespace));\n+ await Assert.ThrowsAsync<InvalidOperationException>(async () => await service.AddReservedNamespaceAsync(addNamespace));\n}\n[Theory]\n@@ -110,7 +110,7 @@ public async Task InvalidNamespaceThrowsException(string value)\n{\nvar service = new TestableReservedNamespaceService();\nvar addNamespace = new ReservedNamespace(value, isSharedNamespace: false, isPrefix: true);\n- await Assert.ThrowsAsync<ArgumentException>(async () => await service.AddReservedNamespaceAsync(addNamespace));\n+ await Assert.ThrowsAsync<InvalidOperationException>(async () => await service.AddReservedNamespaceAsync(addNamespace));\n}\n[Fact]\n@@ -969,6 +969,7 @@ public class ValidateNamespaceMethod\n[InlineData(\"Cont@ins$pecia|C#aracters\")]\n[InlineData(\"Endswithperods..\")]\n[InlineData(\"Multiple.Sequential..Periods.\")]\n+ [InlineData(\"Multiple-Sequential--hyphens\")]\npublic void InvalidNamespacesThrowsException(string value)\n{\nAssert.Throws<ArgumentException>(() => ReservedNamespaceService.ValidateNamespace(value));\n@@ -980,6 +981,9 @@ public void InvalidNamespacesThrowsException(string value)\n[InlineData(\"Name.Space.\")]\n[InlineData(\"123_Name.space.\")]\n[InlineData(\"123-Namespace.\")]\n+ [InlineData(\"123-Namespace-endswith-hyphen-\")]\n+ [InlineData(\"123_Namespace_endswith_Underscores_\")]\n+ [InlineData(\"Multiple_Sequential__Underscores\")]\npublic void ValidNamespacesDontThrowException(string value)\n{\nvar ex = Record.Exception(() => ReservedNamespaceService.ValidateNamespace(value));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SymbolPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SymbolPackageServiceFacts.cs",
"diff": "using System.IO.Compression;\nusing System.Threading.Tasks;\nusing Moq;\n-using NuGet.Packaging;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Packaging;\n+using NuGetGallery.TestUtils;\nusing Xunit;\nusing ClientPackageType = NuGet.Packaging.Core.PackageType;\n@@ -39,16 +39,6 @@ public class SymbolPackageServiceFacts\nreturn symbolPackageService.Object;\n}\n- private static PackageArchiveReader CreateArchiveReader(Stream stream)\n- {\n- if (stream == null)\n- {\n- stream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n- }\n-\n- return new PackageArchiveReader(stream, leaveStreamOpen: true);\n- }\n-\nprivate static List<ClientPackageType> CreateSymbolPackageTypesObject()\n{\nreturn new List<ClientPackageType>()\n@@ -91,7 +81,7 @@ public async Task WillThrowForMissingSymbolsPackageType()\n{\nvar service = CreateService();\nvar invalidSymbolPackageStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n- var packageArchiveReader = CreateArchiveReader(invalidSymbolPackageStream);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(invalidSymbolPackageStream);\nawait Assert.ThrowsAsync<InvalidPackageException>(async () => await service.EnsureValidAsync(packageArchiveReader));\n}\n@@ -105,7 +95,7 @@ public async Task WillThrowForIncorrectSymbolsPackageTypeVersion()\nnew ClientPackageType(\"SymbolsPackage\", new Version(\"1.1\"))\n};\nvar invalidSymbolPackageStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\", packageTypes: packageTypes);\n- var packageArchiveReader = CreateArchiveReader(invalidSymbolPackageStream);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(invalidSymbolPackageStream);\nawait Assert.ThrowsAsync<InvalidPackageException>(async () => await service.EnsureValidAsync(packageArchiveReader));\n}\n@@ -118,7 +108,7 @@ public async Task WillThrowForMultiplePackageTypesInNuspec()\npackageTypes.Add(new ClientPackageType(\"RandomPackageType\", ClientPackageType.EmptyVersion));\nvar invalidSymbolPackageStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\", packageTypes: packageTypes);\n- var packageArchiveReader = CreateArchiveReader(invalidSymbolPackageStream);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(invalidSymbolPackageStream);\nawait Assert.ThrowsAsync<InvalidPackageException>(async () => await service.EnsureValidAsync(packageArchiveReader));\n}\n@@ -130,7 +120,7 @@ public async Task WillThrowForAuthorsMetadataInNuspec()\nvar packageTypes = CreateSymbolPackageTypesObject();\nvar invalidSymbolPackageStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\", authors: \"Random authors\", packageTypes: packageTypes);\n- var packageArchiveReader = CreateArchiveReader(invalidSymbolPackageStream);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(invalidSymbolPackageStream);\nawait Assert.ThrowsAsync<InvalidDataException>(async () => await service.EnsureValidAsync(packageArchiveReader));\n}\n@@ -142,7 +132,7 @@ public async Task WillThrowForOwnersMetadataInNuspec()\nvar packageTypes = CreateSymbolPackageTypesObject();\nvar invalidSymbolPackageStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\", owners: \"Random owners\", packageTypes: packageTypes);\n- var packageArchiveReader = CreateArchiveReader(invalidSymbolPackageStream);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(invalidSymbolPackageStream);\nawait Assert.ThrowsAsync<InvalidDataException>(async () => await service.EnsureValidAsync(packageArchiveReader));\n}\n@@ -158,7 +148,7 @@ public async Task WillThrowForInvalidFilesInSnupkg(string extension)\nvar action = CreatePopulatePackageAction(extension);\nvar invalidSymbolPackageStream = TestPackage.CreateTestSymbolPackageStream(\"theId\", \"1.0.42\", populatePackage: action);\n- var packageArchiveReader = CreateArchiveReader(invalidSymbolPackageStream);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(invalidSymbolPackageStream);\nawait Assert.ThrowsAsync<InvalidDataException>(async () => await service.EnsureValidAsync(packageArchiveReader));\n}\n@@ -175,7 +165,7 @@ public async Task WillNotThrowForValidSnupkgFile(string extension)\nvar action = CreatePopulatePackageAction(extension);\nvar validSymbolPackageStream = TestPackage.CreateTestSymbolPackageStream(\"theId\", \"1.0.42\", populatePackage: action);\n- var packageArchiveReader = CreateArchiveReader(validSymbolPackageStream);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(validSymbolPackageStream);\nawait service.EnsureValidAsync(packageArchiveReader);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix bug with namespace reservation and snupkg push with older clients (#6768) |
455,751 | 10.01.2019 15:07:57 | 28,800 | 20e06839ad5aaf849d2cef7a030df79d19481196 | Not null the createdby on delete account
A support issue for a deleted account will have createdby field not null bu obfuscated. With this the issue will still be in the support issues view. Also the issue is automatically resolved. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs",
"diff": "@@ -20,6 +20,8 @@ public class SupportRequestService\nprivate IAuditingService _auditingService;\nprivate readonly string _siteRoot;\nprivate const string _unassignedAdmin = \"unassigned\";\n+ private const string _deletedAccount = \"_deletedaccount\";\n+ private const string _NuGetDSRAccount = \"_NuGetDSR\";\npublic SupportRequestService(\nISupportRequestDbContext supportRequestDbContext,\n@@ -302,7 +304,11 @@ public async Task DeleteSupportRequestsAsync(User user)\nforeach (var accountDeletedIssue in userIssues.Where(i => string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))\n{\naccountDeletedIssue.OwnerEmail = \"deletedaccount\";\n- accountDeletedIssue.CreatedBy = null;\n+ if(!accountDeletedIssue.CreatedBy.Equals(_NuGetDSRAccount, StringComparison.OrdinalIgnoreCase))\n+ {\n+ accountDeletedIssue.CreatedBy = _deletedAccount;\n+ }\n+ accountDeletedIssue.IssueStatusId = IssueStatusKeys.Resolved;\naccountDeletedIssue.Details = \"This support request has been redacted as the customer's account has been deleted.\";\nforeach (var historyEntry in accountDeletedIssue.HistoryEntries)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Controllers\\AccountsControllerFacts.cs\" />\n<Compile Include=\"Controllers\\OrganizationsControllerFacts.cs\" />\n<Compile Include=\"Controllers\\SupportControllerFacts.cs\" />\n+ <Compile Include=\"UsernameValidationRegex.cs\" />\n<Compile Include=\"Extensions\\NumberExtensionsFacts.cs\" />\n<Compile Include=\"Extensions\\RouteExtensionsFacts.cs\" />\n<Compile Include=\"Filters\\UIAuthorizeAttributeFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"diff": "@@ -102,7 +102,8 @@ public async Task DeleteRequestsNormalPath()\nAssert.False(supportRequestContext.Issues.Any(issue => string.Equals(issue.IssueTitle, \"Joe's OldIssue\")));\nvar deleteRequestIssue = supportRequestContext.Issues.Where(issue => issue.Key == 1).FirstOrDefault();\nAssert.NotNull(deleteRequestIssue);\n- Assert.Null(deleteRequestIssue.CreatedBy);\n+ Assert.Equal(deleteRequestIssue.CreatedBy, \"_deletedaccount\");\n+ Assert.Equal(deleteRequestIssue.IssueStatusId, IssueStatusKeys.Resolved);\nAssert.Null(deleteRequestIssue.HistoryEntries.ElementAt(0).EditedBy);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Not null the createdby on delete account (#6808)
A support issue for a deleted account will have createdby field not null bu obfuscated. With this the issue will still be in the support issues view. Also the issue is automatically resolved. |
455,776 | 22.01.2019 15:23:28 | 28,800 | 2c78f806073b2302d9465bd4f23bb64d0c5c150c | Gallery search results should not have owners right aligned | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -486,46 +486,27 @@ img.reserved-indicator-icon {\noverflow-wrap: break-word;\n}\n-.list-packages .package .package-header {\n- display: -webkit-box;\n- display: -webkit-flex;\n- display: -ms-flexbox;\n- display: flex;\n-\n- -webkit-box-pack: justify;\n- -webkit-justify-content: space-between;\n- -ms-flex-pack: justify;\n- justify-content: space-between;\n-}\n-.list-packages .package .package-header .package-title-container {\n- white-space: nowrap;\n-}\n-.list-packages .package .package-header .package-title-container .package-title {\n+.list-packages .package .package-header .package-title {\nfont-size: 24px;\nfont-weight: 300;\nline-height: .9;\n}\n-.list-packages .package .package-header .package-title-container .edit-button {\n- margin-left: 10px;\n- vertical-align: text-bottom;\n-}\n-.list-packages .package .package-header .package-title-container .reserved-indicator {\n+.list-packages .package .package-header .reserved-indicator {\nwidth: 20px;\nmargin-top: 3px;\nmargin-left: 3px;\nvertical-align: top;\n}\n-.list-packages .package .package-header .package-by-container {\n- overflow: hidden;\n- text-overflow: ellipsis;\n- white-space: nowrap;\n+.list-packages .package .package-header .edit-button {\n+ margin-left: 10px;\n+ vertical-align: text-bottom;\n}\n-.list-packages .package .package-header .package-by-container .package-by {\n+.list-packages .package .package-header .package-by {\nmargin-left: 10px;\ncolor: #000;\n}\n@media (max-width: 480px) {\n- .list-packages .package .package-header .package-by-container .package-by {\n+ .list-packages .package .package-header .package-by {\ndisplay: block;\nmargin-left: 0;\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": "font-size: 15px;\n.package-header {\n- display: flex;\n- justify-content: space-between;\n-\n- .package-title-container {\n- white-space: nowrap;\n-\n.package-title {\nfont-size: 24px;\nfont-weight: 300;\nline-height: 0.9;\n}\n- .edit-button {\n- vertical-align: text-bottom;\n- margin-left: 10px;\n- }\n-\n.reserved-indicator {\nmargin-top: 3px;\nmargin-left: 3px;\nvertical-align: top;\nwidth: 20px;\n}\n- }\n- .package-by-container {\n- white-space: nowrap;\n- overflow: hidden;\n- text-overflow: ellipsis;\n+ .edit-button {\n+ vertical-align: text-bottom;\n+ margin-left: 10px;\n+ }\n.package-by {\nmargin-left: @padding-small-horizontal;\n}\n}\n}\n- }\n.package-title {\nfont-size: 16px;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Gallery search results should not have owners right aligned (#6830) |
455,772 | 23.01.2019 14:29:34 | 28,800 | 576938d7a38eef4502f5a69b4a58cbe3768727d0 | Added asp.net blog URIs to microsoft URIs list | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/UriExtensions.cs",
"new_path": "src/NuGetGallery/Helpers/UriExtensions.cs",
"diff": "@@ -35,7 +35,7 @@ public static bool IsGitHubUri(this Uri uri)\nstring.Equals(uri.Host, \"github.com\", StringComparison.OrdinalIgnoreCase);\n}\n- public static bool IsGitHubPagerUri(this Uri uri)\n+ private static bool IsGitHubPagerUri(this Uri uri)\n{\nreturn uri.Authority.EndsWith(\".github.com\", StringComparison.OrdinalIgnoreCase) ||\nuri.Authority.EndsWith(\".github.io\", StringComparison.OrdinalIgnoreCase);\n@@ -43,18 +43,20 @@ public static bool IsGitHubPagerUri(this Uri uri)\nprivate static bool IsCodeplexUri(this Uri uri)\n{\n- return uri.Authority.EndsWith(\".codeplex.com\", StringComparison.OrdinalIgnoreCase) ||\n- string.Equals(uri.Authority, \"codeplex.com\", StringComparison.OrdinalIgnoreCase);\n+ return uri.IsInDomain(\"codeplex.com\");\n}\nprivate static bool IsMicrosoftUri(this Uri uri)\n{\n- return uri.Authority.EndsWith(\".microsoft.com\", StringComparison.OrdinalIgnoreCase) ||\n- string.Equals(uri.Authority, \"microsoft.com\", StringComparison.OrdinalIgnoreCase) ||\n- string.Equals(uri.Authority, \"www.asp.net\", StringComparison.OrdinalIgnoreCase) ||\n- string.Equals(uri.Authority, \"asp.net\", StringComparison.OrdinalIgnoreCase) ||\n- uri.Authority.EndsWith(\".msdn.com\", StringComparison.OrdinalIgnoreCase) ||\n- string.Equals(uri.Authority, \"msdn.com\", StringComparison.OrdinalIgnoreCase);\n+ return uri.IsInDomain(\"microsoft.com\") ||\n+ uri.IsInDomain(\"asp.net\") ||\n+ uri.IsInDomain(\"msdn.com\");\n+ }\n+\n+ private static bool IsInDomain(this Uri uri, string domain)\n+ {\n+ return uri.Authority.EndsWith(\".\" + domain, StringComparison.OrdinalIgnoreCase) ||\n+ string.Equals(uri.Authority, domain, StringComparison.OrdinalIgnoreCase);\n}\npublic static Uri ToHttps(this Uri uri)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -80,6 +80,7 @@ public void ItDeterminesRepositoryKind(string repoUrl, string repoType, Reposito\n[InlineData(\"http://microsoft.com:80/\", \"https://microsoft.com/\")]\n[InlineData(\"http://githubpages.github.io/my.page\", \"https://githubpages.github.io/my.page\")]\n[InlineData(\"http://githubpages.github.com\", \"https://githubpages.github.com/\")]\n+ [InlineData(\"http://weblogs.asp.net/j/fontawesome-portable\", \"https://weblogs.asp.net/j/fontawesome-portable\")]\npublic void ItInitializesProjectUrl(string projectUrl, string expected)\n{\nvar package = new Package\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Added asp.net blog URIs to microsoft URIs list (#6834) |
455,776 | 28.01.2019 12:52:06 | 28,800 | 91a4d5137ed9b8b0e3e5c4f564cea25981f9d250 | DisplayPackageViewModel.PackageVersions should not be enumerated multiple times | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -659,13 +659,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nreturn HttpNotFound();\n}\n- var packageHistory = package\n- .PackageRegistration\n- .Packages\n- .ToList()\n- .OrderByDescending(p => new NuGetVersion(p.Version));\n-\n- var model = new DisplayPackageViewModel(package, currentUser, packageHistory);\n+ var model = new DisplayPackageViewModel(package, currentUser);\nmodel.ValidatingTooLong = _validationService.IsValidatingTooLong(package);\nmodel.PackageValidationIssues = _validationService.GetLatestPackageValidationIssues(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DeletePackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DeletePackageViewModel.cs",
"diff": "@@ -13,7 +13,7 @@ namespace NuGetGallery\npublic class DeletePackageViewModel : DisplayPackageViewModel\n{\npublic DeletePackageViewModel(Package package, User currentUser, IReadOnlyList<ReportPackageReason> reasons)\n- : base(package, currentUser, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)))\n+ : base(package, currentUser)\n{\nDeletePackagesRequest = new DeletePackagesRequest\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -13,7 +13,7 @@ namespace NuGetGallery\n{\npublic class DisplayPackageViewModel : ListPackageItemViewModel\n{\n- public DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumerable<Package> packageHistory)\n+ public DisplayPackageViewModel(Package package, User currentUser)\n: this(package, currentUser, (string)null)\n{\nHasSemVer2Version = NuGetVersion.IsSemVer2;\n@@ -23,7 +23,13 @@ public DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumer\n.Any(p => (p.HasUpperBound && p.MaxVersion.IsSemVer2) || (p.HasLowerBound && p.MinVersion.IsSemVer2));\nDependencies = new DependencySetsViewModel(package.Dependencies);\n- PackageVersions = packageHistory.Select(p => new DisplayPackageViewModel(p, currentUser, GetPushedBy(p, currentUser)));\n+\n+ var packageHistory = package\n+ .PackageRegistration\n+ .Packages\n+ .OrderByDescending(p => new NuGetVersion(p.Version))\n+ .ToList();\n+ PackageVersions = packageHistory.Select(p => new DisplayPackageViewModel(p, currentUser, GetPushedBy(p, currentUser))).ToList();\nPushedBy = GetPushedBy(package, currentUser);\nPackageFileSize = package.PackageFileSize;\n@@ -42,7 +48,7 @@ public DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumer\n}\n}\n- public DisplayPackageViewModel(Package package, User currentUser, string pushedBy)\n+ private DisplayPackageViewModel(Package package, User currentUser, string pushedBy)\n: base(package, currentUser)\n{\nCopyright = package.Copyright;\n@@ -81,7 +87,7 @@ public DisplayPackageViewModel(Package package, User currentUser, string pushedB\npublic IReadOnlyList<ValidationIssue> PackageValidationIssues { get; set; }\npublic IReadOnlyList<ValidationIssue> SymbolsPackageValidationIssues { get; set; }\npublic DependencySetsViewModel Dependencies { get; set; }\n- public IEnumerable<DisplayPackageViewModel> PackageVersions { get; set; }\n+ public IReadOnlyList<DisplayPackageViewModel> PackageVersions { get; set; }\npublic string Copyright { get; set; }\npublic string ReadMeHtml { get; set; }\npublic DateTime? LastEdited { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"diff": "@@ -13,10 +13,7 @@ namespace NuGetGallery\npublic class ManagePackageViewModel : DisplayPackageViewModel\n{\npublic ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<ReportPackageReason> reasons, UrlHelper url, string readMe)\n- : base(\n- package,\n- currentUser,\n- package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)))\n+ : base(package, currentUser)\n{\nIsCurrentUserAnAdmin = currentUser != null && currentUser.IsAdministrator;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -50,9 +50,14 @@ public void ItDeterminesRepositoryKind(string repoUrl, string repoType, Reposito\nVersion = \"1.0.0\",\nRepositoryUrl = repoUrl,\nRepositoryType = repoType,\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ Packages = Enumerable.Empty<Package>().ToList()\n+ }\n};\n- var model = new DisplayPackageViewModel(package, null, \"test\");\n+ var model = new DisplayPackageViewModel(package, null);\nAssert.Equal(expectedKind, model.RepositoryType);\nAssert.Equal(expectedUrl, model.RepositoryUrl);\n}\n@@ -86,10 +91,15 @@ public void ItInitializesProjectUrl(string projectUrl, string expected)\nvar package = new Package\n{\nVersion = \"1.0.0\",\n- ProjectUrl = projectUrl\n+ ProjectUrl = projectUrl,\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ Packages = Enumerable.Empty<Package>().ToList()\n+ }\n};\n- var model = new DisplayPackageViewModel(package, null, \"test\");\n+ var model = new DisplayPackageViewModel(package, null);\nAssert.Equal(expected, model.ProjectUrl);\n}\n@@ -109,10 +119,15 @@ public void ItInitializesLicenseUrl(string licenseUrl, string expected)\nvar package = new Package\n{\nVersion = \"1.0.0\",\n- LicenseUrl = licenseUrl\n+ LicenseUrl = licenseUrl,\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ Packages = Enumerable.Empty<Package>().ToList()\n+ }\n};\n- var model = new DisplayPackageViewModel(package, null, \"test\");\n+ var model = new DisplayPackageViewModel(package, null);\nAssert.Equal(expected, model.LicenseUrl);\n}\n@@ -124,9 +139,14 @@ public void LicenseNamesAreParsedByCommas()\nLicenseUrl = \"https://mylicense.com\",\nVersion = \"1.0.0\",\nLicenseNames = \"l1,l2, l3 ,l4 , l5 \",\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ Packages = Enumerable.Empty<Package>().ToList()\n+ }\n};\n- var packageViewModel = new DisplayPackageViewModel(package, currentUser: null, pushedBy: \"test\");\n+ var packageViewModel = new DisplayPackageViewModel(package, currentUser: null);\nAssert.Equal(new string[] { \"l1\", \"l2\", \"l3\", \"l4\", \"l5\" }, packageViewModel.LicenseNames);\n}\n@@ -155,7 +175,7 @@ public void TheCtorSortsPackageVersionsProperly()\nnew Package { Version = \"1.0.10\", PackageRegistration = package.PackageRegistration }\n};\n- var packageVersions = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)))\n+ var packageVersions = new DisplayPackageViewModel(package, null)\n.PackageVersions.ToList();\n// Descending\n@@ -207,7 +227,7 @@ public void TheCtorDoesNotPopulateLatestSymbolsPackageForHistory()\n});\n}\n- var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Descending\nAssert.NotNull(viewModel.LatestSymbolsPackage);\n@@ -245,7 +265,7 @@ public void TheCtorReturnsLatestSymbolPackageByDateCreated()\npackage.SymbolPackages = symbolPackageList;\n- var viewModel = new DisplayPackageViewModel(package, null, packageHistory: Enumerable.Empty<Package>().OrderBy(x => 1));\n+ var viewModel = new DisplayPackageViewModel(package, null);\nAssert.Equal(symbolPackageList[0], viewModel.LatestSymbolsPackage);\n}\n@@ -282,10 +302,8 @@ public void AvgDownloadsPerDayConsidersOldestPackageVersionInHistory()\nnew Package { Version = \"2.0.1\", PackageRegistration = packageRegistration, DownloadCount = 140, Created = utcNow.AddDays(-3) }\n};\n- var packageHistory = packageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version));\n-\n// Act\n- var viewModel = new DisplayPackageViewModel(package, null, packageHistory);\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Assert\nAssert.Equal(daysSinceFirstPackageCreated, viewModel.TotalDaysSinceCreated);\n@@ -314,7 +332,7 @@ public void DownloadsPerDayLabelShowsLessThanOneWhenAverageBelowOne()\npackage.PackageRegistration.Packages = new[] { package };\n- var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Act\nvar label = viewModel.DownloadsPerDayLabel;\n@@ -346,7 +364,7 @@ public void DownloadsPerDayLabelShowsOneWhenAverageBetweenOneAndOnePointFive(int\npackage.PackageRegistration.Packages = new[] { package };\n- var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Act\nvar label = viewModel.DownloadsPerDayLabel;\n@@ -394,7 +412,7 @@ public void DownloadsPerDayLabelShowsOneWhenAverageBetweenOneAndOnePointFive(int\npackage.PackageRegistration.Packages = new[] { package, otherPackage };\n- var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Act\nvar hasNewerPrerelease = viewModel.HasNewerPrerelease;\n@@ -441,7 +459,7 @@ public void DownloadsPerDayLabelShowsOneWhenAverageBetweenOneAndOnePointFive(int\npackage.PackageRegistration.Packages = new[] { package, otherPackage };\n- var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Act\nvar hasNewerRelease = viewModel.HasNewerRelease;\n@@ -480,7 +498,7 @@ public void HasNewerPrereleaseDoesNotConsiderUnlistedVersions()\npackage.PackageRegistration.Packages = new[] { package, otherPackage };\n- var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Act\nvar hasNewerPrerelease = viewModel.HasNewerPrerelease;\n@@ -520,7 +538,7 @@ public void HasNewerReleaseDoesNotConsiderUnlistedVersions()\npackage.PackageRegistration.Packages = new[] { package, otherPackage };\n- var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Act\nvar hasNewerRelease = viewModel.HasNewerRelease;\n@@ -536,10 +554,9 @@ public void HasSemVer2DependencyIsFalseWhenInvalidDependencyVersionRange(string\n{\n// Arrange\nvar package = CreateTestPackage(\"1.0.0\", dependencyVersion: versionSpec);\n- var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n// Act\n- var viewModel = new DisplayPackageViewModel(package, null, history);\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Assert\nAssert.False(viewModel.HasSemVer2Dependency);\n@@ -553,10 +570,9 @@ public void HasSemVer2DependencyWhenSemVer2DependencyVersionSpec(string versionS\n{\n// Arrange\nvar package = CreateTestPackage(\"1.0.0\", dependencyVersion: versionSpec);\n- var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n// Act\n- var viewModel = new DisplayPackageViewModel(package, null, history);\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Assert\nAssert.True(viewModel.HasSemVer2Dependency);\n@@ -570,10 +586,9 @@ public void HasSemVer2DependencyIsFalseWhenNonSemVer2DependencyVersionSpec(strin\n{\n// Arrange\nvar package = CreateTestPackage(\"1.0.0\", dependencyVersion: versionSpec);\n- var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n// Act\n- var viewModel = new DisplayPackageViewModel(package, null, history);\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Assert\nAssert.False(viewModel.HasSemVer2Dependency);\n@@ -587,10 +602,9 @@ public void HasSemVer2VersionIsFalseWhenNonSemVer2Version(string version)\n{\n// Arrange\nvar package = CreateTestPackage(version);\n- var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n// Act\n- var viewModel = new DisplayPackageViewModel(package, null, history);\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Assert\nAssert.False(viewModel.HasSemVer2Version);\n@@ -604,10 +618,9 @@ public void HasSemVer2VersionIsTrueWhenSemVer2Version(string version)\n{\n// Arrange\nvar package = CreateTestPackage(version);\n- var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n// Act\n- var viewModel = new DisplayPackageViewModel(package, null, history);\n+ var viewModel = new DisplayPackageViewModel(package, null);\n// Assert\nAssert.True(viewModel.HasSemVer2Version);\n@@ -717,7 +730,7 @@ public static IEnumerable<object[]> Data\n[MemberData(nameof(Data))]\npublic void ReturnsExpectedUser(Package package, User currentUser, string expected)\n{\n- var model = new DisplayPackageViewModel(package, currentUser, new[] { package }.OrderByDescending(p => new NuGetVersion(p.Version)));\n+ var model = new DisplayPackageViewModel(package, currentUser);\nAssert.Equal(expected, model.PushedBy);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | DisplayPackageViewModel.PackageVersions should not be enumerated multiple times (#6855) |
455,736 | 25.01.2019 09:40:10 | 28,800 | cc82088d3e1d5806107db4d6042b8c6b6f0fe42a | Add simulate error endpoints to Pages, Api, and V2 curated feed controllers
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/NuGetODataV2CuratedFeedConfig.cs",
"new_path": "src/NuGetGallery/App_Start/NuGetODataV2CuratedFeedConfig.cs",
"diff": "using System;\nusing System.Linq;\n+using System.Net.Http;\nusing System.Web.Http;\nusing System.Web.Http.OData.Batch;\nusing System.Web.Http.OData.Builder;\nusing Microsoft.Data.Edm;\nusing Microsoft.Data.Edm.Csdl;\nusing Microsoft.Data.OData;\n+using NuGetGallery.Controllers;\nusing NuGetGallery.OData;\nusing NuGetGallery.OData.Conventions;\nusing NuGetGallery.OData.Routing;\n@@ -68,6 +70,9 @@ public static IEdmModel GetEdmModel()\nfindPackagesAction.Parameter<string>(\"id\");\nfindPackagesAction.ReturnsCollectionFromEntitySet<V2FeedPackage>(\"Packages\");\n+ var simulateErrorAction = builder.Action(nameof(ODataV2CuratedFeedController.SimulateError));\n+ simulateErrorAction.Parameter<string>(\"type\");\n+\nvar model = builder.GetEdmModel();\nmodel.SetEdmVersion(new Version(1, 0));\nmodel.SetEdmxVersion(new Version(1, 0));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -104,6 +104,11 @@ public static void RegisterUIRoutes(RouteCollection routes)\n\"pages/contributors\",\nnew { controller = \"Pages\", action = \"Contributors\" });\n+ routes.MapRoute(\n+ RouteName.PagesSimulateError,\n+ \"pages/simulate-error\",\n+ new { controller = \"Pages\", action = nameof(PagesController.SimulateError) });\n+\nroutes.MapRoute(\nRouteName.Policies,\n\"policies/{action}\",\n@@ -737,6 +742,11 @@ public static void RegisterApiV2Routes(RouteCollection routes)\nRouteName.DownloadNuGetExe,\n\"nuget.exe\",\nnew { controller = \"Api\", action = \"GetNuGetExeApi\" });\n+\n+ routes.MapRoute(\n+ RouteName.ApiSimulateError,\n+ \"api/simulate-error\",\n+ new { controller = \"Api\", action = nameof(ApiController.SimulateError) });\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": "@@ -275,6 +275,12 @@ public ActionResult HealthProbe()\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.OK, \"Gallery is Available\");\n}\n+ [HttpGet]\n+ public virtual ActionResult SimulateError(SimulatedErrorType type = SimulatedErrorType.Exception)\n+ {\n+ return type.MapToMvcResult();\n+ }\n+\n[HttpPost]\n[ApiAuthorize]\n[ApiScopeRequired(NuGetScopes.PackagePush, NuGetScopes.PackagePushVersion)]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"diff": "using System;\nusing System.Linq;\n+using System.Net;\n+using System.Net.Http;\nusing System.Threading.Tasks;\nusing System.Web.Http;\nusing System.Web.Http.OData;\n@@ -69,6 +71,20 @@ public class ODataV2CuratedFeedController\nreturn TrackedQueryResult(options, queryable, MaxPageSize, customQuery: true);\n}\n+ [HttpGet]\n+ [CacheOutput(NoCache = true)]\n+ public virtual HttpResponseMessage SimulateError(\n+ string curatedFeedName,\n+ [FromUri] string type = \"Exception\")\n+ {\n+ if (!Enum.TryParse<SimulatedErrorType>(type, out var parsedType))\n+ {\n+ parsedType = SimulatedErrorType.Exception;\n+ }\n+\n+ return parsedType.MapToWebApiResult();\n+ }\n+\n// /api/v2/curated-feed/curatedFeedName/Packages/$count?semVerLevel=\n[HttpGet]\n[CacheOutput(NoCache = true)]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PagesController.cs",
"diff": "@@ -148,5 +148,11 @@ public virtual async Task<ActionResult> Privacy()\n}\nreturn View();\n}\n+\n+ [HttpGet]\n+ public virtual ActionResult SimulateError(SimulatedErrorType type = SimulatedErrorType.Exception)\n+ {\n+ return type.MapToMvcResult();\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Extensions\\RouteExtensions.cs\" />\n<Compile Include=\"Extensions\\ScopeExtensions.cs\" />\n<Compile Include=\"Extensions\\CredentialExtensions.cs\" />\n+ <Compile Include=\"Extensions\\SimulatedErrorTypeExtensions.cs\" />\n<Compile Include=\"Extensions\\UserExtensions.cs\" />\n<Compile Include=\"Filters\\ApiScopeRequiredAttribute.cs\" />\n<Compile Include=\"Filters\\UIAuthorizeAttribute.cs\" />\n<Compile Include=\"Migrations\\201711021733062_ApiKeyOwnerScope.Designer.cs\">\n<DependentUpon>201711021733062_ApiKeyOwnerScope.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"RequestModels\\SimulatedErrorType.cs\" />\n<Compile Include=\"Security\\AutomaticOverwriteRequiredSignerPolicy.cs\" />\n<Compile Include=\"Security\\ControlRequiredSignerPolicy.cs\" />\n<Compile Include=\"Security\\MicrosoftTeamSubscription.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RouteName.cs",
"new_path": "src/NuGetGallery/RouteName.cs",
"diff": "@@ -100,5 +100,8 @@ public static class RouteName\npublic const string GetOrganizationCertificates = \"GetOrganizationCertificates\";\npublic const string SetRequiredSigner = \"SetRequiredSigner\";\npublic const string License = \"License\";\n+ public const string ApiV2CuratedSimulateError = \"api-v2curated-simulate-error\";\n+ public const string PagesSimulateError = \"PagesSimulateError\";\n+ public const string ApiSimulateError = \"ApiSimulateError\";\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add simulate error endpoints to Pages, Api, and V2 curated feed controllers (#6842)
Progress on https://github.com/NuGet/NuGetGallery/issues/6601 |
455,776 | 31.01.2019 14:00:04 | 28,800 | 17328b8764dd813ea8ca9d3e6880e79c447e0cdf | Add logging to the automatic RequireOrganizationTenantPolicy path | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "@@ -43,7 +43,7 @@ public LoginDiscontinuationConfiguration()\nDiscontinuedForDomains = new HashSet<string>(discontinuedForDomains, StringComparer.OrdinalIgnoreCase);\nExceptionsForEmailAddresses = new HashSet<string>(exceptionsForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nForceTransformationToOrganizationForEmailAddresses = new HashSet<string>(forceTransformationToOrganizationForEmailAddresses, StringComparer.OrdinalIgnoreCase);\n- EnabledOrganizationAadTenants = new HashSet<OrganizationTenantPair>(enabledOrganizationAadTenants, new OrganizationTenantPairComparer());\n+ EnabledOrganizationAadTenants = new HashSet<OrganizationTenantPair>(enabledOrganizationAadTenants);\nIsPasswordDiscontinuedForAll = isPasswordDiscontinuedForAll;\n}\n@@ -87,6 +87,16 @@ public bool ShouldUserTransformIntoOrganization(User user)\npublic bool IsTenantIdPolicySupportedForOrganization(string emailAddress, string tenantId)\n{\n+ if (string.IsNullOrEmpty(emailAddress))\n+ {\n+ throw new ArgumentException(nameof(emailAddress));\n+ }\n+\n+ if (string.IsNullOrEmpty(tenantId))\n+ {\n+ throw new ArgumentException(nameof(tenantId));\n+ }\n+\nreturn EnabledOrganizationAadTenants.Contains(new OrganizationTenantPair(new MailAddress(emailAddress).Host, tenantId));\n}\n@@ -105,7 +115,7 @@ public interface ILoginDiscontinuationConfiguration\nbool IsTenantIdPolicySupportedForOrganization(string emailAddress, string tenantId);\n}\n- public class OrganizationTenantPair\n+ public class OrganizationTenantPair : IEquatable<OrganizationTenantPair>\n{\npublic string EmailDomain { get; }\npublic string TenantId { get; }\n@@ -116,25 +126,28 @@ public OrganizationTenantPair(string emailDomain, string tenantId)\nEmailDomain = emailDomain ?? throw new ArgumentNullException(nameof(emailDomain));\nTenantId = tenantId ?? throw new ArgumentNullException(nameof(tenantId));\n}\n- }\n- public class OrganizationTenantPairComparer : IEqualityComparer<OrganizationTenantPair>\n- {\n- public bool Equals(OrganizationTenantPair x, OrganizationTenantPair y)\n- {\n- if (x == null || y == null)\n+ public override bool Equals(object obj)\n{\n- return x == null && y == null;\n+ return Equals(obj as OrganizationTenantPair);\n}\n- return\n- string.Equals(x.EmailDomain, y.EmailDomain, StringComparison.OrdinalIgnoreCase) &&\n- string.Equals(x.TenantId, y.TenantId, StringComparison.OrdinalIgnoreCase);\n+ public bool Equals(OrganizationTenantPair other)\n+ {\n+ return other != null &&\n+ string.Equals(EmailDomain, other.EmailDomain, StringComparison.OrdinalIgnoreCase) &&\n+ string.Equals(TenantId, other.TenantId, StringComparison.OrdinalIgnoreCase);\n}\n- public int GetHashCode(OrganizationTenantPair obj)\n+ /// <remarks>\n+ /// Autogenerated by \"Quick Actions and Refactoring\" -> \"Generate Equals and GetHashCode\".\n+ /// </remarks>\n+ public override int GetHashCode()\n{\n- return obj.EmailDomain.GetHashCode() ^ obj.TenantId.GetHashCode();\n+ var hashCode = -1334890813;\n+ hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(EmailDomain.ToLowerInvariant());\n+ hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(TenantId.ToLowerInvariant());\n+ return hashCode;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "using System.Linq;\nusing System.Text.RegularExpressions;\nusing System.Threading.Tasks;\n+using Microsoft.Extensions.Logging;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\n@@ -39,6 +40,8 @@ public class UserService : IUserService\npublic ITelemetryService TelemetryService { get; protected set; }\n+ public ILogger<UserService> Logger { get; protected set; }\n+\nprotected UserService() { }\npublic UserService(\n@@ -52,7 +55,8 @@ public class UserService : IUserService\nISecurityPolicyService securityPolicyService,\nIDateTimeProvider dateTimeProvider,\nICredentialBuilder credentialBuilder,\n- ITelemetryService telemetryService)\n+ ITelemetryService telemetryService,\n+ ILogger<UserService> logger)\n: this()\n{\nConfig = config;\n@@ -65,6 +69,7 @@ public class UserService : IUserService\nSecurityPolicyService = securityPolicyService;\nDateTimeProvider = dateTimeProvider;\nTelemetryService = telemetryService;\n+ Logger = logger;\n}\npublic async Task<MembershipRequest> AddMembershipRequestAsync(Organization organization, string memberName, bool isAdmin)\n@@ -591,12 +596,21 @@ public async Task<Organization> AddOrganizationAsync(string username, string ema\nprivate async Task SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(User organization, User adminUser, bool commitChanges = true)\n{\nvar tenantId = adminUser.Credentials.GetAzureActiveDirectoryCredential()?.TenantId;\n- if (string.IsNullOrWhiteSpace(tenantId) ||\n- !ContentObjectService.LoginDiscontinuationConfiguration.IsTenantIdPolicySupportedForOrganization(organization.EmailAddress ?? organization.UnconfirmedEmailAddress, tenantId))\n+ if (string.IsNullOrEmpty(tenantId))\n+ {\n+ Logger.LogInformation(\"Will not apply tenant policy to organization because admin user does not have an AAD credential.\");\n+ return;\n+ }\n+\n+ if (!ContentObjectService.LoginDiscontinuationConfiguration.IsTenantIdPolicySupportedForOrganization(\n+ organization.EmailAddress ?? organization.UnconfirmedEmailAddress,\n+ tenantId))\n{\n+ Logger.LogInformation(\"Will not apply tenant policy to organization because policy is not supported for email-tenant pair.\");\nreturn;\n}\n+ Logger.LogInformation(\"Applying tenant policy to organization.\");\nvar tenantPolicy = RequireOrganizationTenantPolicy.Create(tenantId);\nawait SecurityPolicyService.SubscribeAsync(organization, tenantPolicy, commitChanges);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -113,10 +113,10 @@ public async Task RefreshRefreshesObject()\ntyposquattingConfiguration = service.TyposquattingConfiguration as TyposquattingConfiguration;\n// Assert\n- Assert.True(loginDiscontinuationConfiguration.DiscontinuedForEmailAddresses.SequenceEqual(emails));\n- Assert.True(loginDiscontinuationConfiguration.DiscontinuedForDomains.SequenceEqual(domains));\n- Assert.True(loginDiscontinuationConfiguration.ExceptionsForEmailAddresses.SequenceEqual(exceptions));\n- Assert.True(loginDiscontinuationConfiguration.EnabledOrganizationAadTenants.SequenceEqual(orgTenantPairs, new OrganizationTenantPairComparer()));\n+ Assert.Equal(emails, loginDiscontinuationConfiguration.DiscontinuedForEmailAddresses);\n+ Assert.Equal(domains, loginDiscontinuationConfiguration.DiscontinuedForDomains);\n+ Assert.Equal(exceptions, loginDiscontinuationConfiguration.ExceptionsForEmailAddresses);\n+ Assert.Equal(orgTenantPairs, loginDiscontinuationConfiguration.EnabledOrganizationAadTenants);\nAssert.True(certificatesConfiguration.IsUIEnabledByDefault);\nAssert.Equal(alwaysEnabledForDomains, certificatesConfiguration.AlwaysEnabledForDomains);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"diff": "using NuGet.Services.Entities;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Framework;\n+using System;\nusing System.Collections.Generic;\nusing System.Linq;\nusing Xunit;\n@@ -19,6 +20,7 @@ public class LoginDiscontinuationConfigurationFacts\nprivate const string _email = \"[email protected]\";\nprivate const string _tenant = \"tenantId\";\nprivate const string _incorrectTenant = \"wrongTenantId\";\n+ private static User _user = new User(\"test\") { EmailAddress = _email };\npublic static IEnumerable<object[]> PossibleListStates\n{\n@@ -36,7 +38,17 @@ public static IEnumerable<object[]> PossibleListStates\n{\nforeach (var isWrongCase in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, isWrongCase);\n+ foreach (var isPasswordDiscontinuedForAll in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(\n+ isOnWhiteList,\n+ isOnDomainList,\n+ isOnExceptionList,\n+ isOnTransformList,\n+ isOnTenantPairList,\n+ isWrongCase,\n+ isPasswordDiscontinuedForAll);\n+ }\n}\n}\n}\n@@ -46,17 +58,52 @@ public static IEnumerable<object[]> PossibleListStates\n}\n}\n- public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList, bool isWrongCase)\n+ public static ILoginDiscontinuationConfiguration CreateConfiguration(WhitelistMethodData data)\n{\n- var emails = isOnWhiteList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectEmail, isWrongCase) };\n- var domains = isOnDomainList ? new[] { ToUppercaseIfWrongCase(_domain, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase) };\n- var exceptions = isOnExceptionList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectException, isWrongCase) };\n- var shouldTransforms = isOnTransformList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectException, isWrongCase) };\n- var orgTenantPairs = isOnTenantPairList ?\n- new[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_domain, isWrongCase), ToUppercaseIfWrongCase(_tenant, isWrongCase)) } :\n- new[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase), ToUppercaseIfWrongCase(_incorrectTenant, isWrongCase)) };\n+ return CreateConfiguration(\n+ data.IsOnWhiteList,\n+ data.IsOnDomainList,\n+ data.IsOnExceptionList,\n+ data.IsOnTransformList,\n+ data.IsOnTenantPairList,\n+ data.IsWrongCase,\n+ data.IsPasswordDiscontinuedForAll);\n+ }\n- return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs, isPasswordDiscontinuedForAll: false);\n+ public static ILoginDiscontinuationConfiguration CreateConfiguration(\n+ bool isOnWhiteList,\n+ bool isOnDomainList,\n+ bool isOnExceptionList,\n+ bool isOnTransformList,\n+ bool isOnTenantPairList,\n+ bool isWrongCase,\n+ bool isPasswordDiscontinuedForAll)\n+ {\n+ var emails = ToUppercaseIfWrongCase(new[] { isOnWhiteList ? _email : _incorrectEmail }, isWrongCase);\n+ var domains = ToUppercaseIfWrongCase(new[] { isOnDomainList ? _domain : _incorrectDomain }, isWrongCase);\n+ var exceptions = ToUppercaseIfWrongCase(new[] { isOnExceptionList ? _email : _incorrectException }, isWrongCase);\n+ var shouldTransforms = ToUppercaseIfWrongCase(new[] { isOnTransformList ? _email : _incorrectException }, isWrongCase);\n+ var orgTenantPairs = ToUppercaseIfWrongCase(new[] { isOnTenantPairList\n+ ? new OrganizationTenantPair(_domain, _tenant)\n+ : new OrganizationTenantPair(_incorrectDomain, _incorrectTenant) }, isWrongCase);\n+\n+ return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs, isPasswordDiscontinuedForAll);\n+ }\n+\n+ private static string[] ToUppercaseIfWrongCase(string[] input, bool isWrongCase)\n+ {\n+ return input\n+ .Select(i => ToUppercaseIfWrongCase(i, isWrongCase))\n+ .ToArray();\n+ }\n+\n+ private static OrganizationTenantPair[] ToUppercaseIfWrongCase(OrganizationTenantPair[] input, bool isWrongCase)\n+ {\n+ return input\n+ .Select(i => new OrganizationTenantPair(\n+ ToUppercaseIfWrongCase(i.EmailDomain, isWrongCase),\n+ ToUppercaseIfWrongCase(i.TenantId, isWrongCase)))\n+ .ToArray();\n}\nprivate static string ToUppercaseIfWrongCase(string input, bool isWrongCase)\n@@ -85,7 +132,17 @@ public static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Dat\n{\nforeach (var isWrongCase in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase);\n+ foreach (var isPasswordDiscontinuedForAll in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(\n+ credentialPasswordType,\n+ isOnWhiteList,\n+ isOnDomainList,\n+ isOnExceptionList,\n+ isOnTransformList,\n+ isWrongCase,\n+ isPasswordDiscontinuedForAll);\n+ }\n}\n}\n}\n@@ -97,10 +154,24 @@ public static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Dat\n[Theory]\n[MemberData(nameof(IfPasswordLoginReturnsTrueIfOnWhitelists_Data))]\n- public void IfPasswordLoginReturnsTrueIfOnWhitelists(string credentialPasswordType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isWrongCase)\n- {\n- TestIsLoginDiscontinued(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase,\n- expectedResult: (isOnWhiteList || isOnDomainList) && !isOnExceptionList);\n+ public void IfPasswordLoginReturnsTrueIfOnWhitelists(\n+ string credentialPasswordType,\n+ bool isOnWhiteList,\n+ bool isOnDomainList,\n+ bool isOnExceptionList,\n+ bool isOnTransformList,\n+ bool isWrongCase,\n+ bool isPasswordDiscontinuedForAll)\n+ {\n+ TestIsLoginDiscontinued(\n+ credentialPasswordType,\n+ isOnWhiteList,\n+ isOnDomainList,\n+ isOnExceptionList,\n+ isOnTransformList,\n+ isWrongCase,\n+ isPasswordDiscontinuedForAll,\n+ expectedResult: (isPasswordDiscontinuedForAll || isOnWhiteList || isOnDomainList) && !isOnExceptionList);\n}\npublic static IEnumerable<object[]> IfNotPasswordLoginReturnsFalse_Data\n@@ -126,7 +197,17 @@ public static IEnumerable<object[]> IfNotPasswordLoginReturnsFalse_Data\n{\nforeach (var isWrongCase in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase);\n+ foreach (var isPasswordDiscontinuedForAll in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(\n+ credentialType,\n+ isOnWhiteList,\n+ isOnDomainList,\n+ isOnExceptionList,\n+ isOnTransformList,\n+ isWrongCase,\n+ isPasswordDiscontinuedForAll);\n+ }\n}\n}\n}\n@@ -138,19 +219,49 @@ public static IEnumerable<object[]> IfNotPasswordLoginReturnsFalse_Data\n[Theory]\n[MemberData(nameof(IfNotPasswordLoginReturnsFalse_Data))]\n- public void IfNotPasswordLoginReturnsFalse(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isWrongCase)\n- {\n- TestIsLoginDiscontinued(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase, expectedResult: false);\n- }\n-\n- private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isWrongCase, bool expectedResult)\n+ public void IfNotPasswordLoginReturnsFalse(\n+ string credentialType,\n+ bool isOnWhiteList,\n+ bool isOnDomainList,\n+ bool isOnExceptionList,\n+ bool isOnTransformList,\n+ bool isWrongCase,\n+ bool isPasswordDiscontinuedForAll)\n+ {\n+ TestIsLoginDiscontinued(\n+ credentialType,\n+ isOnWhiteList,\n+ isOnDomainList,\n+ isOnExceptionList,\n+ isOnTransformList,\n+ isWrongCase,\n+ isPasswordDiscontinuedForAll,\n+ expectedResult: false);\n+ }\n+\n+ private void TestIsLoginDiscontinued(\n+ string credentialType,\n+ bool isOnWhiteList,\n+ bool isOnDomainList,\n+ bool isOnExceptionList,\n+ bool isOnTransformList,\n+ bool isWrongCase,\n+ bool isPasswordDiscontinuedForAll,\n+ bool expectedResult)\n{\n// Arrange\nvar credential = new Credential(credentialType, \"value\");\nvar user = new User(\"test\") { EmailAddress = _email, Credentials = new[] { credential } };\nvar authUser = new AuthenticatedUser(user, credential);\n- var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList: false, isWrongCase: isWrongCase);\n+ var config = CreateConfiguration(\n+ isOnWhiteList,\n+ isOnDomainList,\n+ isOnExceptionList,\n+ isOnTransformList,\n+ isOnTenantPairList: false,\n+ isWrongCase: isWrongCase,\n+ isPasswordDiscontinuedForAll: isPasswordDiscontinuedForAll);\n// Act\nvar result = config.IsLoginDiscontinued(authUser);\n@@ -168,6 +279,7 @@ public class WhitelistMethodData\npublic bool IsOnTransformList { get; }\npublic bool IsOnTenantPairList { get; }\npublic bool IsWrongCase { get; }\n+ public bool IsPasswordDiscontinuedForAll { get; }\npublic WhitelistMethodData(object[] data)\n{\n@@ -190,103 +302,64 @@ public WhitelistMethodData(object[] data)\nvar isWrongCase = boolData[5];\nIsWrongCase = isWrongCase;\n+\n+ var isPasswordDiscontinuedForAll = boolData[6];\n+ IsPasswordDiscontinuedForAll = isPasswordDiscontinuedForAll;\n}\n}\n- public static IEnumerable<object[]> WhitelistBaseMethodReturnsExpected_Data =>\n+ public class TheWhiteListMethods\n+ {\n+ public static IEnumerable<object[]> AllPossibleWhiteListData =>\nPossibleListStates.Select(data =>\nMemberDataHelper.AsData(\nnew WhitelistMethodData(data)));\n- public abstract class WhitelistBaseMethod\n- {\n- protected virtual User GetUser(WhitelistMethodData data)\n- {\n- return new User(\"test\") { EmailAddress = _email };\n- }\n-\n- protected abstract bool GetWhitelistValue(ILoginDiscontinuationConfiguration config, User user);\n-\n- public abstract bool GetExpectedValueForNonNull(WhitelistMethodData data);\n-\n[Theory]\n- [MemberData(\"ReturnsAsExpectedWhenNonNull_Data\")]\n+ [MemberData(nameof(AllPossibleWhiteListData))]\npublic void ReturnsExpectedWhenNonNull(WhitelistMethodData data)\n{\n// Arrange\n- var user = GetUser(data);\n- var config = GetConfiguration(data);\n+ var config = CreateConfiguration(data);\n// Act\n- var whitelistValue = GetWhitelistValue(config, user);\n+ var isOnWhiteList = config.IsUserOnWhitelist(_user);\n+ var shouldTransformIntoOrganization = config.ShouldUserTransformIntoOrganization(_user);\n+ var isOnTenantPairList = config.IsTenantIdPolicySupportedForOrganization(_email, _tenant);\n// Assert\n- Assert.Equal(GetExpectedValueForNonNull(data), whitelistValue);\n+ Assert.Equal(data.IsOnWhiteList || data.IsOnDomainList, isOnWhiteList);\n+ Assert.Equal(data.IsOnTransformList, shouldTransformIntoOrganization);\n+ Assert.Equal(data.IsOnTenantPairList, isOnTenantPairList);\n}\n- public abstract bool GetExpectedValueForNull(WhitelistMethodData data);\n-\n[Theory]\n- [MemberData(\"ReturnsFalseWhenNull_Data\")]\n+ [MemberData(nameof(AllPossibleWhiteListData))]\npublic void ReturnsExpectedWhenNull(WhitelistMethodData data)\n{\n// Arrange\n- var config = GetConfiguration(data);\n+ var config = CreateConfiguration(data);\n// Act\n- var whitelistValue = GetWhitelistValue(config, null);\n+ var isOnWhiteList = config.IsUserOnWhitelist(null);\n+ var shouldTransformIntoOrganization = config.ShouldUserTransformIntoOrganization(null);\n// Assert\n- Assert.Equal(GetExpectedValueForNull(data), whitelistValue);\n- }\n-\n- private ILoginDiscontinuationConfiguration GetConfiguration(WhitelistMethodData data)\n- {\n- return CreateConfiguration(data.IsOnWhiteList, data.IsOnDomainList, data.IsOnExceptionList, data.IsOnTransformList, data.IsOnTenantPairList, data.IsWrongCase);\n- }\n- }\n-\n- public class TheIsUserOnWhitelistMethod : WhitelistBaseMethod\n- {\n- public static IEnumerable<object[]> ReturnsAsExpectedWhenNonNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n+ Assert.Equal(false, isOnWhiteList);\n+ Assert.Equal(false, shouldTransformIntoOrganization);\n- public override bool GetExpectedValueForNonNull(WhitelistMethodData data)\n+ foreach (var orgEmail in new[] { null, _email })\n{\n- return data.IsOnWhiteList || data.IsOnDomainList;\n- }\n-\n- public static IEnumerable<object[]> ReturnsFalseWhenNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n-\n- public override bool GetExpectedValueForNull(WhitelistMethodData data)\n+ foreach (var orgTenant in new[] { null, _tenant })\n{\n- return false;\n- }\n-\n- protected override bool GetWhitelistValue(ILoginDiscontinuationConfiguration config, User user)\n+ if (!string.IsNullOrEmpty(orgEmail) && !string.IsNullOrEmpty(orgTenant))\n{\n- return config.IsUserOnWhitelist(user);\n+ continue;\n}\n- }\n-\n- public class TheShouldUserTransformIntoOrganizationMethod : WhitelistBaseMethod\n- {\n- public static IEnumerable<object[]> ReturnsAsExpectedWhenNonNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n- public override bool GetExpectedValueForNonNull(WhitelistMethodData data)\n- {\n- return data.IsOnTransformList;\n+ Assert.Throws<ArgumentException>(() => config.IsTenantIdPolicySupportedForOrganization(orgEmail, orgTenant));\n}\n-\n- public static IEnumerable<object[]> ReturnsFalseWhenNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n-\n- public override bool GetExpectedValueForNull(WhitelistMethodData data)\n- {\n- return false;\n}\n-\n- protected override bool GetWhitelistValue(ILoginDiscontinuationConfiguration config, User user)\n- {\n- return config.ShouldUserTransformIntoOrganization(user);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"diff": "using System.Collections.Generic;\nusing System.Linq;\nusing System.Linq.Expressions;\n+using Microsoft.Extensions.Logging;\nusing Moq;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Configuration;\n@@ -25,6 +26,7 @@ public class TestableUserService : UserService\npublic Mock<IContentObjectService> MockConfigObjectService { get; protected set; }\npublic Mock<IDateTimeProvider> MockDateTimeProvider { get; protected set; }\npublic Mock<ITelemetryService> MockTelemetryService { get; protected set; }\n+ public Mock<ILogger<TestableUserService>> MockLogger { get; protected set; }\npublic TestableUserService()\n{\n@@ -38,6 +40,7 @@ public TestableUserService()\nDateTimeProvider = (MockDateTimeProvider = new Mock<IDateTimeProvider>()).Object;\nAuditing = new TestAuditingService();\nTelemetryService = (MockTelemetryService = new Mock<ITelemetryService>()).Object;\n+ Logger = (MockLogger = new Mock<ILogger<TestableUserService>>()).Object;\n// Set ConfirmEmailAddress to a default of true\nMockConfig.Setup(c => c.ConfirmEmailAddresses).Returns(true);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add logging to the automatic RequireOrganizationTenantPolicy path (#6864) |
455,776 | 31.01.2019 17:04:39 | 28,800 | 248ac35bd31daff960be0a5cc6bdea97570e85f6 | Add tool to apply organization tenant policy to a list of organizations | [
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/ReflowCommand.cs",
"new_path": "src/GalleryTools/Commands/ReflowCommand.cs",
"diff": "@@ -18,7 +18,7 @@ public static class ReflowCommand\n{\nprivate const int DefaultBatch = 1;\nprivate const int DefaultSleepMultiplier = 60;\n- private const string PackageListShortOption = \"-p\";\n+ private const string PackageListOption = \"--path\";\npublic static void Configure(CommandLineApplication config)\n{\n@@ -26,7 +26,7 @@ public static void Configure(CommandLineApplication config)\nconfig.HelpOption(\"-? | -h | --help\");\nvar packageListOption = config.Option(\n- $\"{PackageListShortOption} | --path\",\n+ $\"-p | {PackageListOption}\",\n\"A path to a list of packages, one ID and version per line with a space in between.\",\nCommandOptionType.SingleValue);\n@@ -53,7 +53,7 @@ public static void Configure(CommandLineApplication config)\n{\nif (!packageListOption.HasValue())\n{\n- Console.WriteLine($\"The '{PackageListShortOption}' parameter is required.\");\n+ Console.WriteLine($\"The '{PackageListOption}' parameter is required.\");\nreturn 1;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "<ItemGroup>\n<Compile Include=\"Commands\\BackfillRepositoryMetadataCommand.cs\" />\n<Compile Include=\"Commands\\HashCommand.cs\" />\n+ <Compile Include=\"Commands\\ApplyTenantPolicyCommand.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": "@@ -16,6 +16,7 @@ public static int Main(params string[] args)\ncommandLineApplication.HelpOption(\"-? | -h | --help\");\ncommandLineApplication.Command(\"hash\", HashCommand.Configure);\ncommandLineApplication.Command(\"reflow\", ReflowCommand.Configure);\n+ commandLineApplication.Command(\"applyTenantPolicy\", ApplyTenantPolicyCommand.Configure);\ncommandLineApplication.Command(\"fillrepodata\", BackfillRepositoryMetadataCommand.Configure);\ncommandLineApplication.Command(\"verifyapikey\", VerifyApiKeyCommand.Configure);\ncommandLineApplication.Command(\"updateIsLatest\", UpdateIsLatestCommand.Configure);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add tool to apply organization tenant policy to a list of organizations (#6867) |
455,747 | 01.02.2019 19:14:43 | 0 | 694cde9173f388fe2fe03e2ff7a4d5975e38a24e | Improve runtime for DuplicatePushesAreRejectedAndNotDeleted | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"diff": "@@ -61,8 +61,8 @@ public static IEnumerable<object[]> UploadAndUnlistPackages_Data\n[Theory]\n[MemberData(nameof(UploadAndUnlistPackages_Data))]\n[Description(\"Tests upload and unlist scenarios with API key\")]\n- [Priority(0)]\n- [Category(\"P0Tests\")]\n+ [Priority(2)]\n+ [Category(\"P2Tests\")]\npublic async Task UploadAndUnlistPackages(string apiKey)\n{\n// Can push new package ID\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -36,7 +36,7 @@ public V2FeedExtendedTests(ITestOutputHelper testOutputHelper)\n[Fact]\n[Description(\"Upload two packages and then issue the FindPackagesById request, expect to return both versions\")]\n[Priority(1)]\n- [Category(\"P0Tests\")]\n+ [Category(\"P1Tests\")]\npublic async Task FindPackagesByIdTest()\n{\nvar packageInfo = await _clientSdkHelper.UploadPackageVersion();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"diff": "@@ -33,21 +33,30 @@ public ApiPushTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper)\npublic async Task DuplicatePushesAreRejectedAndNotDeleted()\n{\n// Arrange\n- using (var client = new HttpClient())\n- {\n- var packageCreationHelper = new PackageCreationHelper(TestOutputHelper);\nvar packageId = $\"{nameof(DuplicatePushesAreRejectedAndNotDeleted)}.{DateTime.UtcNow.Ticks}\";\n- for (var i = 0; i < 10; i++)\n+ int pushVersionCount = 10;\n+ var duplicatePushTasks = new List<Task>();\n+ for (var duplicateTaskIndex = 0; duplicateTaskIndex < pushVersionCount; duplicateTaskIndex++)\n+ {\n+ duplicatePushTasks.Add(PushDuplicates(packageId, $\"1.0.{duplicateTaskIndex}\", duplicateTaskIndex == 0));\n+ }\n+\n+ await Task.WhenAll(duplicatePushTasks);\n+ }\n+\n+ private async Task PushDuplicates(string packageId, string packageVersion, bool isFirstTask)\n+ {\n+ using (var client = new HttpClient())\n{\n- if (i > 0)\n+ var packageCreationHelper = new PackageCreationHelper(TestOutputHelper);\n+ if (!isFirstTask)\n{\nTestOutputHelper.WriteLine(string.Empty);\nTestOutputHelper.WriteLine(new string('=', 80));\nTestOutputHelper.WriteLine(string.Empty);\n}\n- var packageVersion = $\"1.0.{i}\";\nTestOutputHelper.WriteLine($\"Starting package {packageId} {packageVersion}...\");\nvar packagePath = await packageCreationHelper.CreatePackage(packageId, packageVersion);\n@@ -66,7 +75,7 @@ public async Task DuplicatePushesAreRejectedAndNotDeleted()\n// Assert\nfor (var taskIndex = 1; taskIndex <= statusCodes.Length; taskIndex++)\n{\n- TestOutputHelper.WriteLine($\"Task {taskIndex:D2} push: HTTP {(int)statusCodes[taskIndex - 1]}\");\n+ TestOutputHelper.WriteLine($\"{packageId}/{packageVersion} Task {taskIndex:D2} push: HTTP {(int)statusCodes[taskIndex - 1]}\");\n}\n//Wait for the packages to be available in V2(due to async validation)\n@@ -75,7 +84,7 @@ public async Task DuplicatePushesAreRejectedAndNotDeleted()\nvar downloadUrl = $\"{UrlHelper.V2FeedRootUrl}package/{packageId}/{packageVersion}\";\nusing (var response = await client.GetAsync(downloadUrl))\n{\n- TestOutputHelper.WriteLine($\"Package download: HTTP {(int)response.StatusCode}\");\n+ TestOutputHelper.WriteLine($\"Package {packageId}/{packageVersion} download: HTTP {(int)response.StatusCode}\");\nAssert.Equal(HttpStatusCode.OK, response.StatusCode);\n@@ -92,7 +101,6 @@ public async Task DuplicatePushesAreRejectedAndNotDeleted()\nAssert.Equal(TaskCount - 1, statusCodes.Count(x => x == HttpStatusCode.Conflict));\n}\n}\n- }\nprivate async Task<HttpStatusCode> PushAsync(\nHttpClient client,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Improve runtime for DuplicatePushesAreRejectedAndNotDeleted (#6861) |
455,747 | 01.02.2019 21:31:12 | 0 | 118c55f87f994621691f218334450773913d98c5 | Improve functional tests runtime | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"diff": "@@ -137,8 +137,8 @@ public async Task UploadAndDownloadPackageWithMinClientVersion()\n[PackageLockFact]\n[Description(\"Verifies push version, and delete are not allowed on a locked package\")]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\npublic async Task LockedPackageCannotBeModified()\n{\n// Arrange\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/License/LicenseTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/License/LicenseTests.cs",
"diff": "@@ -21,8 +21,8 @@ public LicenseTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper)\n[Fact]\n[Description(\"Push an invalidp package with license expression and verify uploading is blocked\")]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\npublic async Task UploadInValidPackageWithLicenseExpression()\n{\n// Arrange\n@@ -45,8 +45,8 @@ public async Task UploadInValidPackageWithLicenseExpression()\n[Theory]\n[Description(\"Push an invalid package with license file and verify uploading is blocked\")]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\n[InlineData(\"https://testNugetLicenseUrl\", \"license.txt\", \"license.txt\", \"It's a license\", \"when a license file is packaged, <licenseUrl> must be set to \")]\n[InlineData(\"https://aka.ms/deprecateLicenseUrl\", \"licensefolder\\\\license.txt\", \"license.txt\", \"It's a license\", \"does not exist in the package\")]\npublic async Task UploadInValidPackageWithLicenseFile(string licenseUrl, string licenseFile, string licenseFileName, string licenseFileContents, string expectedErrorMessage)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"diff": "@@ -28,8 +28,8 @@ public ApiPushTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper)\n[Fact]\n[Description(\"Pushes many packages of the same ID and version. Verifies exactly one push succeeds and the rest fail with a conflict.\")]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\npublic async Task DuplicatePushesAreRejectedAndNotDeleted()\n{\n// Arrange\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Statistics/PackageStatisticsTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Statistics/PackageStatisticsTests.cs",
"diff": "@@ -53,8 +53,8 @@ public async Task PackageFeedStatsSanityTest()\n/// </summary>\n[Fact]\n[Description(\"Verify the webresponse for stats/downloads/last6weeks/ contains the right amount of packages\")]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\npublic async Task PackageFeedCountParameterTest()\n{\nvar request = WebRequest.Create(UrlHelper.V2FeedRootUrl + @\"stats/downloads/last6weeks/\");\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/TyposquattingCheck/TyposquattingCheckForUploadPackageTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/TyposquattingCheck/TyposquattingCheckForUploadPackageTests.cs",
"diff": "@@ -21,8 +21,8 @@ public TyposquattingCheckForUploadPackageTests(ITestOutputHelper testOutputHelpe\n[TyposquattingTestFact]\n[Description(\"Push a package with a typosquatting Id and verify uploading is blocked\")]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\npublic async Task UploadTyposquattingPackageAndBlockUser()\n{\nvar packageId = \"newtonsoft-json\";\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Improve functional tests runtime (#6870) |
455,776 | 01.02.2019 15:14:34 | 28,800 | f87f32b9c87e20d0edf46312facd181fc21624a9 | Use IDiagnosticsSource for automatic RequireOrganizationTenantPolicy logs | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "using NuGet.Services.Entities;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\n+using NuGetGallery.Diagnostics;\nusing NuGetGallery.Infrastructure.Authentication;\nusing NuGetGallery.Security;\nusing Crypto = NuGetGallery.CryptographyService;\n@@ -40,7 +41,7 @@ public class UserService : IUserService\npublic ITelemetryService TelemetryService { get; protected set; }\n- public ILogger<UserService> Logger { get; protected set; }\n+ public IDiagnosticsSource DiagnosticsSource { get; protected set; }\nprotected UserService() { }\n@@ -56,7 +57,7 @@ public class UserService : IUserService\nIDateTimeProvider dateTimeProvider,\nICredentialBuilder credentialBuilder,\nITelemetryService telemetryService,\n- ILogger<UserService> logger)\n+ IDiagnosticsService diagnosticsService)\n: this()\n{\nConfig = config;\n@@ -69,7 +70,7 @@ public class UserService : IUserService\nSecurityPolicyService = securityPolicyService;\nDateTimeProvider = dateTimeProvider;\nTelemetryService = telemetryService;\n- Logger = logger;\n+ DiagnosticsSource = diagnosticsService.SafeGetSource(nameof(UserService));\n}\npublic async Task<MembershipRequest> AddMembershipRequestAsync(Organization organization, string memberName, bool isAdmin)\n@@ -598,7 +599,7 @@ private async Task SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(User\nvar tenantId = adminUser.Credentials.GetAzureActiveDirectoryCredential()?.TenantId;\nif (string.IsNullOrEmpty(tenantId))\n{\n- Logger.LogInformation(\"Will not apply tenant policy to organization because admin user does not have an AAD credential.\");\n+ DiagnosticsSource.LogInformation(\"Will not apply tenant policy to organization because admin user does not have an AAD credential.\");\nreturn;\n}\n@@ -606,11 +607,11 @@ private async Task SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(User\norganization.EmailAddress ?? organization.UnconfirmedEmailAddress,\ntenantId))\n{\n- Logger.LogInformation(\"Will not apply tenant policy to organization because policy is not supported for email-tenant pair.\");\n+ DiagnosticsSource.LogInformation(\"Will not apply tenant policy to organization because policy is not supported for email-tenant pair.\");\nreturn;\n}\n- Logger.LogInformation(\"Applying tenant policy to organization.\");\n+ DiagnosticsSource.LogInformation(\"Applying tenant policy to organization.\");\nvar tenantPolicy = RequireOrganizationTenantPolicy.Create(tenantId);\nawait SecurityPolicyService.SubscribeAsync(organization, tenantPolicy, commitChanges);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"diff": "using System.Collections.Generic;\nusing System.Linq;\nusing System.Linq.Expressions;\n-using Microsoft.Extensions.Logging;\nusing Moq;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Configuration;\n+using NuGetGallery.Diagnostics;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Security;\n@@ -26,7 +26,7 @@ public class TestableUserService : UserService\npublic Mock<IContentObjectService> MockConfigObjectService { get; protected set; }\npublic Mock<IDateTimeProvider> MockDateTimeProvider { get; protected set; }\npublic Mock<ITelemetryService> MockTelemetryService { get; protected set; }\n- public Mock<ILogger<TestableUserService>> MockLogger { get; protected set; }\n+ public Mock<IDiagnosticsSource> MockDiagnosticsSource { get; protected set; }\npublic TestableUserService()\n{\n@@ -40,7 +40,7 @@ public TestableUserService()\nDateTimeProvider = (MockDateTimeProvider = new Mock<IDateTimeProvider>()).Object;\nAuditing = new TestAuditingService();\nTelemetryService = (MockTelemetryService = new Mock<ITelemetryService>()).Object;\n- Logger = (MockLogger = new Mock<ILogger<TestableUserService>>()).Object;\n+ DiagnosticsSource = (MockDiagnosticsSource = new Mock<IDiagnosticsSource>()).Object;\n// Set ConfirmEmailAddress to a default of true\nMockConfig.Setup(c => c.ConfirmEmailAddresses).Returns(true);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Use IDiagnosticsSource for automatic RequireOrganizationTenantPolicy logs (#6871) |
455,776 | 07.02.2019 09:44:33 | 28,800 | f0e997b517a5fa05d803bc9163cb8088f0412aa9 | PackagesController methods should handle SemVer2 and missing packages properly | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1292,7 +1292,7 @@ public virtual ActionResult ManagePackageOwners(string id)\n[RequiresAccountConfirmation(\"manage a package\")]\npublic virtual async Task<ActionResult> Manage(string id, string version = null)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version);\n+ var package = _packageService.FindPackageByIdAndVersion(id, version, SemVerLevelKey.SemVer2);\nif (package == null)\n{\nreturn HttpNotFound();\n@@ -1318,7 +1318,7 @@ public virtual async Task<ActionResult> Manage(string id, string version = null)\n[RequiresAccountConfirmation(\"delete a symbols package\")]\npublic virtual ActionResult DeleteSymbols(string id, string version)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version);\n+ var package = _packageService.FindPackageByIdAndVersion(id, version, SemVerLevelKey.SemVer2);\nif (package == null)\n{\nreturn HttpNotFound();\n@@ -1360,7 +1360,7 @@ public virtual ActionResult DeleteSymbols(string id, string version)\n[RequiresAccountConfirmation(\"reflow a package\")]\npublic virtual async Task<ActionResult> Reflow(string id, string version)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version);\n+ var package = _packageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null)\n{\n@@ -1395,7 +1395,7 @@ public virtual async Task<ActionResult> Reflow(string id, string version)\n[RequiresAccountConfirmation(\"revalidate a package\")]\npublic virtual async Task<ActionResult> Revalidate(string id, string version)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version);\n+ var package = _packageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null)\n{\n@@ -1423,7 +1423,7 @@ public virtual async Task<ActionResult> Revalidate(string id, string version)\n[RequiresAccountConfirmation(\"revalidate a symbols package\")]\npublic virtual async Task<ActionResult> RevalidateSymbols(string id, string version)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version);\n+ var package = _packageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null)\n{\n@@ -1629,7 +1629,7 @@ public virtual async Task<ActionResult> UpdateListed(string id, string version,\n[RequiresAccountConfirmation(\"edit a package\")]\npublic virtual async Task<JsonResult> Edit(string id, string version, VerifyPackageRequest formData, string returnUrl)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version);\n+ var package = _packageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null)\n{\nreturn Json(HttpStatusCode.NotFound, new[] { new JsonValidationMessage(string.Format(Strings.PackageWithIdAndVersionNotFound, id, version)) });\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1758,7 +1758,7 @@ public async Task Returns403IfNotOwner(User currentUser, User owner)\n_packageRegistration.Owners.Add(owner);\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.Unknown, true))\n+ packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.SemVer2, true))\n.Returns(_package).Verifiable();\nvar controller = CreateController(\n@@ -1816,7 +1816,7 @@ public async Task FormatsSelectVersionListProperly(User currentUser, User owner)\n_packageRegistration.Owners.Add(owner);\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.Unknown, true))\n+ packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.SemVer2, true))\n.Returns(_package).Verifiable();\nvar controller = CreateController(\n@@ -1864,7 +1864,7 @@ public async Task WhenPackageRegistrationIsLockedReturnsLockedState(User current\n_packageRegistration.IsLocked = true;\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.Unknown, true))\n+ packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.SemVer2, true))\n.Returns(_package).Verifiable();\nvar controller = CreateController(\n@@ -1894,7 +1894,7 @@ public async Task WhenNoReadMeEditPending_ReturnsActive(User currentUser, User o\n_package.HasReadMe = true;\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.Unknown, true))\n+ packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.SemVer2, true))\n.Returns(_package).Verifiable();\nvar readMe = \"markdown\";\n@@ -1933,7 +1933,7 @@ public async Task WhenNoReadMe_ReturnsNull(User currentUser, User owner)\n_package.HasReadMe = false;\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.Unknown, true))\n+ packageService.Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.SemVer2, true))\n.Returns(_package).Verifiable();\nvar readMeService = new Mock<IReadMeService>(MockBehavior.Strict);\n@@ -2112,7 +2112,7 @@ public void WhenPackageRegistrationIsLockedReturnsLockedState()\n};\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService.Setup(svc => svc.FindPackageByIdAndVersion(\"Foo\", \"1.0.0\", SemVerLevelKey.Unknown, true))\n+ packageService.Setup(svc => svc.FindPackageByIdAndVersion(\"Foo\", \"1.0.0\", SemVerLevelKey.SemVer2, true))\n.Returns(package);\nvar controller = CreateController(GetConfigurationService(), packageService: packageService);\n@@ -2132,7 +2132,7 @@ private ActionResult GetDeleteSymbolsResult(User currentUser, User owner, out Pa\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\npackageService\n- .Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.Unknown, true))\n+ .Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.SemVer2, true))\n.Returns(_package).Verifiable();\ncontroller = CreateController(\n@@ -2626,7 +2626,7 @@ public static IEnumerable<object[]> NotOwner_Data\npackage.PackageRegistration.Owners.Add(owner);\nvar packageService = new Mock<IPackageService>();\n- packageService.Setup(s => s.FindPackageByIdAndVersion(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int?>(), It.IsAny<bool>()))\n+ packageService.Setup(s => s.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>()))\n.Returns(package);\npackageService.Setup(s => s.FindPackageRegistrationById(It.IsAny<string>()))\n.Returns(package.PackageRegistration);\n@@ -6496,11 +6496,9 @@ public TheRevalidateMethod()\n_packageService = new Mock<IPackageService>();\n_packageService\n- .Setup(svc => svc.FindPackageByIdAndVersion(\n+ .Setup(svc => svc.FindPackageByIdAndVersionStrict(\nIt.IsAny<string>(),\n- It.IsAny<string>(),\n- It.IsAny<int?>(),\n- It.IsAny<bool>()))\n+ It.IsAny<string>()))\n.Returns(_package);\n_validationService = new Mock<IValidationService>();\n@@ -6546,11 +6544,9 @@ public async Task ReturnsNotFoundForUnknownPackage()\n{\n// Arrange\n_packageService\n- .Setup(svc => svc.FindPackageByIdAndVersion(\n+ .Setup(svc => svc.FindPackageByIdAndVersionStrict(\nIt.IsAny<string>(),\n- It.IsAny<string>(),\n- It.IsAny<int?>(),\n- It.IsAny<bool>()))\n+ It.IsAny<string>()))\n.Returns<Package>(null);\n// Act\n@@ -6588,11 +6584,9 @@ public TheRevalidateSymbolsMethod()\n_packageService = new Mock<IPackageService>();\n_packageService\n- .Setup(svc => svc.FindPackageByIdAndVersion(\n+ .Setup(svc => svc.FindPackageByIdAndVersionStrict(\nIt.IsAny<string>(),\n- It.IsAny<string>(),\n- It.IsAny<int?>(),\n- It.IsAny<bool>()))\n+ It.IsAny<string>()))\n.Returns(_package);\n_validationService = new Mock<IValidationService>();\n@@ -6642,11 +6636,9 @@ public async Task ReturnsNotFoundForUnknownPackage()\n{\n// Arrange\n_packageService\n- .Setup(svc => svc.FindPackageByIdAndVersion(\n+ .Setup(svc => svc.FindPackageByIdAndVersionStrict(\nIt.IsAny<string>(),\n- It.IsAny<string>(),\n- It.IsAny<int?>(),\n- It.IsAny<bool>()))\n+ It.IsAny<string>()))\n.Returns<Package>(null);\n// Act\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | PackagesController methods should handle SemVer2 and missing packages properly (#6879) |
455,756 | 14.02.2019 11:21:25 | 28,800 | a0aeb495d8968dec2c156ce6a61ff02480365b53 | Delete UIAuthorize | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -735,7 +735,6 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\n}\n[HttpGet]\n- [UIAuthorize]\npublic virtual async Task<ActionResult> License(string id, string version)\n{\nvar package = _packageService.FindPackageByIdAndVersionStrict(id, version);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Delete UIAuthorize (#6893) |
455,747 | 14.02.2019 20:22:00 | 0 | fd7b1bb29d124c9002e5854d6b9cf3ebf9caeae7 | Add FAQ links to account login error messages | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@@ -659,4 +659,9 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);\n{\nreturn segment.Type == CompositeLicenseExpressionSegmentType.LicenseIdentifier || segment.Type == CompositeLicenseExpressionSegmentType.ExceptionIdentifier;\n}\n+\n+ public static MvcHtmlString GetExternalUrlAnchorTag(string data, string link)\n+ {\n+ return MvcHtmlString.Create(UriExtensions.GetExternalUrlAnchorTag(data, link));\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -497,8 +497,11 @@ public virtual async Task<ActionResult> LinkOrChangeExternalCredential(string re\n}\nelse\n{\n- // The identity value contains cookie non-compliant characters like `<, >`(eg: John Doe <[email protected]>), hence these need to be encoded\n- TempData[\"ErrorMessage\"] = string.Format(Strings.ChangeCredential_Failed, HttpUtility.UrlEncode(newCredential.Identity));\n+ // The identity value contains cookie non-compliant characters like `<, >`(eg: John Doe <[email protected]>),\n+ // These need to be replaced so that they are not treated as HTML tags\n+ TempData[\"RawErrorMessage\"] = string.Format(Strings.ChangeCredential_Failed,\n+ newCredential.Identity.Replace(\"<\", \"<\").Replace(\">\", \">\"),\n+ UriExtensions.GetExternalUrlAnchorTag(\"FAQs page\", GalleryConstants.FAQLinks.MSALinkedToAnotherAccount));\n}\nreturn SafeRedirect(returnUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/GalleryConstants.cs",
"new_path": "src/NuGetGallery/GalleryConstants.cs",
"diff": "@@ -129,5 +129,16 @@ public static class StatisticsDimensions\npublic const string ClientVersion = \"ClientVersion\";\npublic const string Operation = \"Operation\";\n}\n+\n+ public static class FAQLinks\n+ {\n+ public const string NuGetFAQ = \"https://aka.ms/nuget-faq\";\n+ public const string MSALinkedToAnotherAccount = \"https://aka.ms/nuget-faq-msa-linked-another-account\";\n+ public const string EmailLinkedToAnotherMSAAccount = \"https://aka.ms/nuget-faq-email-linked-another-msa\";\n+ public const string NuGetAccountManagement = \"https://aka.ms/nuget-faq-account-management\";\n+ public const string NuGetChangeUsername = \"https://aka.ms/nuget-faq-change-username\";\n+ public const string NuGetDeleteAccount = \"https://aka.ms/nuget-faq-delete-account\";\n+ public const string TransformToOrganization = \"https://aka.ms/nuget-faq-transform-org\";\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/UriExtensions.cs",
"new_path": "src/NuGetGallery/Helpers/UriExtensions.cs",
"diff": "@@ -9,6 +9,8 @@ namespace NuGetGallery\n{\npublic static class UriExtensions\n{\n+ private static string ExternalLinkAnchorTagFormat = $\"<a href=\\\"{{1}}\\\" target=\\\"_blank\\\">{{0}}</a>\";\n+\npublic static bool IsHttpsProtocol(this Uri uri)\n{\nreturn uri.Scheme == Uri.UriSchemeHttps;\n@@ -81,5 +83,10 @@ public static string AppendQueryStringToRelativeUri(string relativeUrl, IReadOnl\nbuilder.Query = query.ToString();\nreturn builder.Uri.PathAndQuery;\n}\n+\n+ public static string GetExternalUrlAnchorTag(string data, string link)\n+ {\n+ return string.Format(ExternalLinkAnchorTagFormat, data, link);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/CookieTempDataProvider.cs",
"new_path": "src/NuGetGallery/Infrastructure/CookieTempDataProvider.cs",
"diff": "@@ -97,7 +97,7 @@ protected virtual void SaveTempData(ControllerContext controllerContext, IDictio\ncontinue;\n}\n- cookie[item.Key] = Convert.ToString(item.Value, CultureInfo.InvariantCulture);\n+ cookie[item.Key] = HttpUtility.UrlEncode(Convert.ToString(item.Value, CultureInfo.InvariantCulture));\n}\n_httpContext.Response.Cookies.Add(cookie);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -596,7 +596,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Failed to update the Microsoft account with '{0}'. This could happen if it is already linked to another NuGet account. Contact support for more information..\n+ /// Looks up a localized string similar to Failed to update the Microsoft account with '{0}'. This could happen if it is already linked to another NuGet account. See {1} for more details..\n/// </summary>\npublic static string ChangeCredential_Failed {\nget {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -697,7 +697,7 @@ For more information, please contact '{2}'.</value>\nIf you would like to update the linked Microsoft account you can do so from the account settings page.</value>\n</data>\n<data name=\"ChangeCredential_Failed\" xml:space=\"preserve\">\n- <value>Failed to update the Microsoft account with '{0}'. This could happen if it is already linked to another NuGet account. Contact support for more information.</value>\n+ <value>Failed to update the Microsoft account with '{0}'. This could happen if it is already linked to another NuGet account. See {1} for more details.</value>\n</data>\n<data name=\"ChangeCredential_NotAllowed\" xml:space=\"preserve\">\n<value>The change of Azure active directory account is not allowed by your organization(s): {0}. Please leave these organization(s) to change your login.</value>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"diff": "The account with the email @Model.SignIn.UserNameOrEmail is linked to another Microsoft account.\n</p>\n<p class=\"text-center\">\n- If you would like to update the linked Microsoft account you can do so from the account settings page.\n+ Please refer to the @(ViewHelpers.GetExternalUrlAnchorTag(\"FAQs page\", GalleryConstants.FAQLinks.EmailLinkedToAnotherMSAAccount))\n+ for steps to resolve this issue.\n</p>\nbreak;\ncase AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsOrganization:\n<p class=\"text-center\">\nIf you would like to manage the organization account, you must sign in as one of its admins.\n</p>\n+\n+ <p class=\"text-center\">\n+ Please <a href=\"mailto:@Config.Current.GalleryOwner.Address\">contact support</a> if you need more assistance.\n+ </p>\nbreak;\ndefault:\n<p class=\"text-center\">\nAn unknown error occurred.\n</p>\n- break;\n- }\n<p class=\"text-center\">\nPlease <a href=\"mailto:@Config.Current.GalleryOwner.Address\">contact support</a> if you need more assistance.\n</p>\n+ break;\n+ }\n}\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/Contact.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/Contact.cshtml",
"diff": "</div>\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Having problems using a specific package?</h2>\n+ <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Having problems using a specific package on nuget.org?</h2>\n<p>\n- If you're having trouble installing a specific package, try contacting the owner of that package first.\n+ Please note that nuget.org does not offer any assistance for individual package issues. If you're having trouble installing or using a specific package, try contacting the owner of that package first.\nYou can reach them using the \"Contact Owners\" link on the package details page.\n</p>\n- <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Found a bug in NuGet or the website NuGet.org?</h2>\n+ <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Found a bug in NuGet or the website nuget.org?</h2>\n<p>\n- If you're having trouble with the <strong>NuGet.org Website</strong>,\n+ If you're having trouble with the <strong>nuget.org website</strong>,\nfile a bug on the NuGet Gallery <a href=\"https://github.com/NuGet/NuGetGallery/issues\">Issue Tracker</a>.\nIf you're having trouble with the <strong>NuGet client tools</strong> (the Visual Studio extension, NuGet.exe command line tool, .NET CLI restore etc.),\nfile a bug on the NuGet Client <a href=\"https://github.com/NuGet/Home/issues\">Issue Tracker</a>.\n<h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Is a package violating a license or otherwise abusive?</h2>\n<p>\nIf you feel that a package is violating the license of software you own or is violating our terms of service,\n- use the \"Report Abuse\" link on the package details page to report it directly to us.\n+ use the \"Report\" link on the package details page to report it directly to us.\n</p>\n- <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Want to change your NuGet.org username?</h2>\n+ <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Have trouble logging in to nuget.org with MSA/AAD logins?</h2>\n<p>\n- No need to contact support. Create a new user and transfer ownership of your packages to it.\n+ Check out our @(ViewHelpers.GetExternalUrlAnchorTag(\"nuget.org account management\", GalleryConstants.FAQLinks.NuGetAccountManagement)) FAQ page for solutions.\n</p>\n- <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Having issues working with NuGet.org?</h2>\n+ <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Want to change your nuget.org username?</h2>\n<p>\n- Before reaching out to NuGet support, check out the\n- <a href=\"https://docs.nuget.org/consume/nuget-faq#managing-packages-in-nuget.org\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr></a>.\n+ No need to contact support. Check out the steps for @(ViewHelpers.GetExternalUrlAnchorTag(\"changing nuget.org username\", GalleryConstants.FAQLinks.NuGetChangeUsername)) on the FAQ page for resolution steps.\n+\n+ </p>\n+\n+ <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Want to delete your nuget.org account?</h2>\n+ <p>\n+ No need to contact support. Check out the steps for @(ViewHelpers.GetExternalUrlAnchorTag(\"deleting nuget.org account\", GalleryConstants.FAQLinks.NuGetDeleteAccount)) on the FAQ page for resolution steps.\n+ </p>\n+\n+ <h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">Having issues working with nuget.org?</h2>\n+ <p>\n+ Before reaching out to NuGet support, check out the @(ViewHelpers.GetExternalUrlAnchorTag(\"FAQ\", GalleryConstants.FAQLinks.NuGetFAQ)).\n</p>\n@if (!User.Identity.IsAuthenticated)\n{\n<h2 class=\"ms-fontSize-xl ms-fontWeight-semibold\">The above doesn't help? @Html.ActionLink(\"Sign in\", \"LogOn\", new { controller = \"Authentication\", ReturnUrl = \"/policies/Contact\" }) to contact Support.</h2>\n<p>\n- Need help with your NuGet.org account? Please feel free to <span id=\"emailUs\"></span>.\n+ Need help with your nuget.org account? Please feel free to <span id=\"emailUs\"></span>.\n</p>\n}\nelse\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/_TransformOrLink.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/_TransformOrLink.cshtml",
"diff": "<span>Sign in with Microsoft</span>\n</button>\n</div>\n+ <div class=\"transform-text\">\n+ If you want to transform this account to an @(ViewHelpers.GetExternalUrlAnchorTag(\"organization\", \"https://aka.ms/nugetorgs\")), please follow the steps on our @(ViewHelpers.GetExternalUrlAnchorTag(\"FAQ page\", GalleryConstants.FAQLinks.TransformToOrganization)).\n+ </div>\n}\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "&& Request.IsAuthenticated\n&& Config.Current.DeprecateNuGetPasswordLogins\n&& User.HasPasswordLogin();\n+ var rawErrorMessage = TempData.ContainsKey(\"RawErrorMessage\") ? TempData[\"RawErrorMessage\"].ToString() : null;\n}\n@if (!string.IsNullOrWhiteSpace(Config.Current.WarningBanner))\n</div>\n}\n+@if (!string.IsNullOrEmpty(rawErrorMessage))\n+{\n+ <div class=\"alert-transient @(ViewBag.HasJumbotron == true ? \"alert-transient-jumbotron\" : string.Empty)\">\n+ <div class=\"container\">\n+ <div class=\"row\">\n+ <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\" role=\"alert\" aria-live=\"assertive\">\n+ @ViewHelpers.AlertDanger(@<span>@Html.Raw(@rawErrorMessage)</span>)\n+ </div>\n+ </div>\n+ </div>\n+ </div>\n+}\n+\n@if (ShowPasswordDeprecationBanner)\n{\n<div class=\"alert-transient @(ViewBag.HasJumbotron == true ? \"alert-transient-jumbotron\" : string.Empty)\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -1261,7 +1261,7 @@ public async Task GivenExistingCredential_ItSafeRedirectsToReturnUrlWithErrorMes\n// Arrange\nGetMock<AuthenticationService>(); // Force a mock to be created\nvar controller = GetController<AuthenticationController>();\n- var identity = \"Bloog\";\n+ var identity = \"Bloog <[email protected]>\";\nvar cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", identity);\nvar serviceMock = GetMock<AuthenticationService>();\nserviceMock\n@@ -1282,7 +1282,15 @@ public async Task GivenExistingCredential_ItSafeRedirectsToReturnUrlWithErrorMes\n// Assert\nResultAssert.IsSafeRedirectTo(result, \"theReturnUrl\");\n- Assert.Equal(string.Format(Strings.ChangeCredential_Failed, identity), controller.TempData[\"ErrorMessage\"]);\n+\n+ var errorMessage = controller.TempData[\"RawErrorMessage\"];\n+ var expectedMessage = string.Format(\n+ Strings.ChangeCredential_Failed,\n+ identity.Replace(\"<\", \"<\").Replace(\">\", \">\"),\n+ UriExtensions.GetExternalUrlAnchorTag(\"FAQs page\", GalleryConstants.FAQLinks.MSALinkedToAnotherAccount));\n+\n+ Assert.NotNull(errorMessage);\n+ Assert.Equal(expectedMessage, errorMessage);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/CookieTempDataProviderFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/CookieTempDataProviderFacts.cs",
"diff": "@@ -94,7 +94,7 @@ public void WithEmptyCookieReturnsEmptyDictionary()\npublic class TheSaveTempDataMethod\n{\n[Fact]\n- public void StoresValuesInCookie()\n+ public void StoresValuesInCookieInEncodedFormat()\n{\nvar cookies = new HttpCookieCollection();\nvar httpContext = new Mock<HttpContextBase>();\n@@ -115,9 +115,9 @@ public void StoresValuesInCookie()\nAssert.True(cookies[0].HttpOnly);\nAssert.True(cookies[0].Secure);\nAssert.Equal(3, cookies[0].Values.Count);\n- Assert.Equal(\"Say hello to my little friend\", cookies[0][\"message\"]);\n- Assert.Equal(\"123\", cookies[0][\"key2\"]);\n- Assert.Equal(\"dumb&dumber?:;,isit\", cookies[0][\"key3\"]);\n+ Assert.Equal(HttpUtility.UrlEncode(\"Say hello to my little friend\"), cookies[0][\"message\"]);\n+ Assert.Equal(HttpUtility.UrlEncode(\"123\"), cookies[0][\"key2\"]);\n+ Assert.Equal(HttpUtility.UrlEncode(\"dumb&dumber?:;,isit\"), cookies[0][\"key3\"]);\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add FAQ links to account login error messages (#6886) |
455,736 | 15.02.2019 15:47:00 | 28,800 | 13b3d34e238b90a4b46a9147a09f5e728b14f4be | Add a feature flag for the atom feed and enable prerelease filtering
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "{\n\"Features\": {\n- \"NuGetGallery.Typosquatting\": \"Enabled\"\n+ \"NuGetGallery.Typosquatting\": \"Enabled\",\n+ \"NuGetGallery.PackagesAtomFeed\": \"Enabled\"\n},\n-\n\"Flights\": {\n\"NuGetGallery.TyposquattingFlight\": {\n- \"All\": true\n+ \"All\": true,\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/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -109,6 +109,7 @@ public partial class PackagesController\nprivate readonly IDiagnosticsSource _trace;\nprivate readonly ICoreLicenseFileService _coreLicenseFileService;\nprivate readonly ILicenseExpressionSplitter _licenseExpressionSplitter;\n+ private readonly IFeatureFlagService _featureFlagService;\npublic PackagesController(\nIPackageService packageService,\n@@ -135,7 +136,8 @@ public partial class PackagesController\nISymbolPackageUploadService symbolPackageUploadService,\nIDiagnosticsService diagnosticsService,\nICoreLicenseFileService coreLicenseFileService,\n- ILicenseExpressionSplitter licenseExpressionSplitter)\n+ ILicenseExpressionSplitter licenseExpressionSplitter,\n+ IFeatureFlagService featureFlagService)\n{\n_packageService = packageService;\n_uploadFileService = uploadFileService;\n@@ -162,6 +164,7 @@ public partial class PackagesController\n_trace = diagnosticsService?.SafeGetSource(nameof(PackagesController)) ?? throw new ArgumentNullException(nameof(diagnosticsService));\n_coreLicenseFileService = coreLicenseFileService ?? throw new ArgumentNullException(nameof(coreLicenseFileService));\n_licenseExpressionSplitter = licenseExpressionSplitter ?? throw new ArgumentNullException(nameof(licenseExpressionSplitter));\n+ _featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));\n}\n[HttpGet]\n@@ -673,6 +676,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.PackageValidationIssues = _validationService.GetLatestPackageValidationIssues(package);\nmodel.SymbolsPackageValidationIssues = _validationService.GetLatestPackageValidationIssues(model.LatestSymbolsPackage);\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\n+ model.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n@@ -737,18 +741,31 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\n}\n[HttpGet]\n- public virtual ActionResult AtomFeed(string id, bool allowPrerelease = false)\n+ public virtual ActionResult AtomFeed(string id, bool prerel = true)\n{\n+ if (!_featureFlagService.IsPackagesAtomFeedEnabled())\n+ {\n+ return HttpNotFound();\n+ }\n+\nvar packageRegistration = _packageService.FindPackageRegistrationById(id);\nif (packageRegistration == null)\n{\nreturn HttpNotFound();\n}\n- var packageVersions = packageRegistration.Packages\n+ IEnumerable<Package> packageVersionsQuery = packageRegistration\n+ .Packages\n.Where(x => x.Listed && x.PackageStatusKey == PackageStatus.Available)\n- .OrderByDescending(p => NuGetVersion.Parse(p.NormalizedVersion))\n- .ToList();\n+ .OrderByDescending(p => NuGetVersion.Parse(p.NormalizedVersion));\n+\n+ if (!prerel)\n+ {\n+ packageVersionsQuery = packageVersionsQuery\n+ .Where(x => !x.IsPrerelease);\n+ }\n+\n+ var packageVersions = packageVersionsQuery.ToList();\nif (packageVersions.Count == 0)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"diff": "@@ -16,6 +16,8 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string TyposquattingFeatureName = GalleryPrefix + \"Typosquatting\";\nprivate const string TyposquattingFlightName = GalleryPrefix + \"TyposquattingFlight\";\n+ private const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\n+\nprivate readonly IFeatureFlagClient _client;\npublic FeatureFlagService(IFeatureFlagClient client)\n@@ -33,6 +35,11 @@ public bool IsTyposquattingEnabled(User user)\nreturn _client.IsEnabled(TyposquattingFlightName, user, defaultValue: false);\n}\n+ public bool IsPackagesAtomFeedEnabled()\n+ {\n+ return _client.IsEnabled(PackagesAtomFeedFeatureName, defaultValue: false);\n+ }\n+\nprivate bool IsEnabled(string flight, User user, bool defaultValue)\n{\nreturn _client.IsEnabled(flight, user, defaultValue);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"diff": "@@ -21,5 +21,12 @@ public interface IFeatureFlagService\n/// <param name=\"user\"></param>\n/// <returns></returns>\nbool IsTyposquattingEnabled(User user);\n+\n+ /// <summary>\n+ /// Whether the packages Atom feed is enabled. If true, users can subscribe to new package versions using a\n+ /// feed reader on a per package ID basis.\n+ /// </summary>\n+ /// <returns></returns>\n+ bool IsPackagesAtomFeedEnabled();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -99,6 +99,7 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed\npublic bool HasSemVer2Version { get; }\npublic bool HasSemVer2Dependency { get; }\npublic bool IsDotnetToolPackageType { get; set; }\n+ public bool IsAtomFeedEnabled { get; set; }\npublic bool HasNewerPrerelease\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<meta property=\"og:determiner\" content=\"a\" />\n<meta property=\"og:image\" content=\"@(PackageHelper.ShouldRenderUrl(Model.IconUrl) ? Model.IconUrl : Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\"))\" />\n+ @if (Model.IsAtomFeedEnabled)\n+ {\n<link rel=\"alternate\" type=\"application/atom+xml\" title=\"Subscribe to @Model.Id updates\" href=\"@Url.PackageAtomFeed(Model.Id)\" />\n}\n+}\n@helper VersionListDivider(int rowCount, bool versionsExpanded)\n{\n@@ -862,11 +865,14 @@ foreach (var owner in Model.Owners)\nsrc=\"@Url.Absolute(\"~/Content/gallery/img/twitter.svg\")\"\[email protected](Url.Absolute(\"~/Content/gallery/img/twitter-24x24.png\")) />\n</a>\n+ @if (Model.IsAtomFeedEnabled)\n+ {\n<a href=\"@Url.PackageAtomFeed(Model.Id)\" data-track=\"atom-feed\">\n<img width=\"24\" height=\"24\" alt=\"Use the Atom feed to subscribe to new versions of @Model.Id\"\nsrc=\"@Url.Absolute(\"~/Content/gallery/img/rss.svg\")\"\[email protected](Url.Absolute(\"~/Content/gallery/img/rss-24x24.png\")) />\n</a>\n+ }\n</p>\n}\n</aside>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -69,7 +69,8 @@ public class PackagesControllerFacts\nMock<IContentObjectService> contentObjectService = null,\nMock<ISymbolPackageUploadService> symbolPackageUploadService = null,\nMock<ICoreLicenseFileService> coreLicenseFileService = null,\n- Mock<ILicenseExpressionSplitter> licenseExpressionSplitter = null)\n+ Mock<ILicenseExpressionSplitter> licenseExpressionSplitter = null,\n+ Mock<IFeatureFlagService> featureFlagService = null)\n{\npackageService = packageService ?? new Mock<IPackageService>();\nif (uploadFileService == null)\n@@ -181,6 +182,12 @@ public class PackagesControllerFacts\nlicenseExpressionSplitter = licenseExpressionSplitter ?? new Mock<ILicenseExpressionSplitter>();\n+ if (featureFlagService == null)\n+ {\n+ featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService.SetReturnsDefault<bool>(true);\n+ }\n+\nvar diagnosticsService = new Mock<IDiagnosticsService>();\nvar controller = new Mock<PackagesController>(\npackageService.Object,\n@@ -207,7 +214,8 @@ public class PackagesControllerFacts\nsymbolPackageUploadService.Object,\ndiagnosticsService.Object,\ncoreLicenseFileService.Object,\n- licenseExpressionSplitter.Object);\n+ licenseExpressionSplitter.Object,\n+ featureFlagService.Object);\ncontroller.CallBase = true;\ncontroller.Object.SetOwinContextOverride(Fakes.CreateOwinContext());\n@@ -966,6 +974,111 @@ public void GivenAExistentPackageWithUnlistedAvailablePackagesIt404s()\nResultAssert.IsNotFound(result);\n}\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public void GivenAnExistentPackageTheFeatureFlagHidesTheFeed(bool enabled)\n+ {\n+ // Arrange\n+ var httpContext = new Mock<HttpContextBase>();\n+ var packageService = new Mock<IPackageService>();\n+ var configurationService = GetConfigurationService();\n+ configurationService.Current.Brand = \"Test Gallery\";\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsPackagesAtomFeedEnabled())\n+ .Returns(enabled);\n+\n+ var controller = CreateController(\n+ configurationService,\n+ packageService: packageService,\n+ featureFlagService: featureFlagService,\n+ httpContext: httpContext);\n+\n+ var packageRegistration = new PackageRegistration();\n+ packageRegistration.Id = \"Foo\";\n+\n+ var onlyVersion = new Package\n+ {\n+ Listed = true,\n+ PackageStatusKey = PackageStatus.Available,\n+ NormalizedVersion = \"2.0.0\",\n+ Version = \"2.0.0\",\n+ IsPrerelease = true,\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Id = \"Foo\"\n+ }\n+ };\n+ packageRegistration.Packages.Add(onlyVersion);\n+\n+ packageService.Setup(p => p.FindPackageRegistrationById(\"Foo\"))\n+ .Returns(packageRegistration);\n+\n+ // Act\n+ var result = controller.AtomFeed(\"Foo\");\n+\n+ // Assert\n+ if (enabled)\n+ {\n+ Assert.IsType<SyndicationAtomActionResult>(result);\n+ }\n+ else\n+ {\n+ ResultAssert.IsNotFound(result);\n+ }\n+ }\n+\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public void GivenAExistentPackagePrereleaseVersionsCanBeFilteredOut(bool includePrerelease)\n+ {\n+ // Arrange\n+ var httpContext = new Mock<HttpContextBase>();\n+ var packageService = new Mock<IPackageService>();\n+ var configurationService = GetConfigurationService();\n+ configurationService.Current.Brand = \"Test Gallery\";\n+\n+ var controller = CreateController(\n+ configurationService,\n+ packageService: packageService,\n+ httpContext: httpContext);\n+\n+ var packageRegistration = new PackageRegistration();\n+ packageRegistration.Id = \"Foo\";\n+\n+ var onlyVersion = new Package\n+ {\n+ Listed = true,\n+ PackageStatusKey = PackageStatus.Available,\n+ NormalizedVersion = \"2.0.0-beta\",\n+ Version = \"2.0.0-beta\",\n+ IsPrerelease = true,\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Id = \"Foo\"\n+ }\n+ };\n+ packageRegistration.Packages.Add(onlyVersion);\n+\n+ packageService.Setup(p => p.FindPackageRegistrationById(\"Foo\"))\n+ .Returns(packageRegistration);\n+\n+ // Act\n+ var result = controller.AtomFeed(\"Foo\", includePrerelease);\n+\n+ // Assert\n+ if (includePrerelease)\n+ {\n+ Assert.IsType<SyndicationAtomActionResult>(result);\n+ }\n+ else\n+ {\n+ ResultAssert.IsNotFound(result);\n+ }\n+ }\n+\n[Fact]\npublic void GivenAExistentPackageWithListedUnavailablePackagesIt404s()\n{\n@@ -1034,8 +1147,9 @@ public void GivenAExistentPackageWithListedAvailablePackagesItReturnsSyndication\n{\nListed = true,\nPackageStatusKey = PackageStatus.Available,\n- NormalizedVersion = \"2.0.0\",\n- Version = \"2.0.0\",\n+ NormalizedVersion = \"2.0.0-beta\",\n+ Version = \"2.0.0-beta\",\n+ IsPrerelease = true,\nDescription = \"Most recent version: Test Package\",\nCreated = dateTimeYesterDay,\nPackageRegistration = new PackageRegistration()\n@@ -1078,8 +1192,8 @@ public void GivenAExistentPackageWithListedAvailablePackagesItReturnsSyndication\nAssert.Equal(3, syndicationFeedItems.Count);\n- Assert.Equal(\"https://localhost/packages/Foo/2.0.0\", syndicationFeedItems[0].Id);\n- Assert.Equal(\"Foo 2.0.0\", syndicationFeedItems[0].Title.Text);\n+ Assert.Equal(\"https://localhost/packages/Foo/2.0.0-beta\", syndicationFeedItems[0].Id);\n+ Assert.Equal(\"Foo 2.0.0-beta\", syndicationFeedItems[0].Title.Text);\nAssert.Equal(\"Most recent version: Test Package\", (syndicationFeedItems[0].Content as System.ServiceModel.Syndication.TextSyndicationContent).Text);\nAssert.Equal(dateTimeYesterDay, syndicationFeedItems[0].PublishDate);\nAssert.Equal(dateTimeYesterDay, syndicationFeedItems[0].LastUpdatedTime);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add a feature flag for the atom feed and enable prerelease filtering (#6894)
Progress on https://github.com/NuGet/NuGetGallery/issues/2992 |
455,776 | 20.02.2019 01:49:24 | 0 | 8989c7c8bb60019bf31189e49048301e63e912c1 | Allow bulk inserts/deletes through EntitiesContext/EntityRepository | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -48,23 +48,23 @@ public EntitiesContext(DbConnection connection, bool readOnly)\n}\npublic bool ReadOnly { get; private set; }\n- public IDbSet<PackageRegistration> PackageRegistrations { get; set; }\n- public IDbSet<Credential> Credentials { get; set; }\n- public IDbSet<Scope> Scopes { get; set; }\n- public IDbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }\n- public IDbSet<ReservedNamespace> ReservedNamespaces { get; set; }\n- public IDbSet<Certificate> Certificates { get; set; }\n- public IDbSet<UserCertificate> UserCertificates { get; set; }\n- public IDbSet<SymbolPackage> SymbolPackages { get; set; }\n+ public DbSet<PackageRegistration> PackageRegistrations { get; set; }\n+ public DbSet<Credential> Credentials { get; set; }\n+ public DbSet<Scope> Scopes { get; set; }\n+ public DbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }\n+ public DbSet<ReservedNamespace> ReservedNamespaces { get; set; }\n+ public DbSet<Certificate> Certificates { get; set; }\n+ public DbSet<UserCertificate> UserCertificates { get; set; }\n+ public DbSet<SymbolPackage> SymbolPackages { get; set; }\n/// <summary>\n/// User or organization accounts.\n/// </summary>\n- public IDbSet<User> Users { get; set; }\n- public IDbSet<Cve> Cves { get; set; }\n- public IDbSet<Cwe> Cwes { get; set; }\n+ public DbSet<User> Users { get; set; }\n+ public DbSet<Cve> Cves { get; set; }\n+ public DbSet<Cwe> Cwes { get; set; }\n- IDbSet<T> IEntitiesContext.Set<T>()\n+ DbSet<T> IEntitiesContext.Set<T>()\n{\nreturn base.Set<T>();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"diff": "@@ -9,20 +9,20 @@ namespace NuGetGallery\n{\npublic interface IEntitiesContext\n{\n- IDbSet<Certificate> Certificates { get; set; }\n- IDbSet<PackageRegistration> PackageRegistrations { get; set; }\n- IDbSet<Credential> Credentials { get; set; }\n- IDbSet<Scope> Scopes { get; set; }\n- IDbSet<User> Users { get; set; }\n- IDbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }\n- IDbSet<ReservedNamespace> ReservedNamespaces { get; set; }\n- IDbSet<UserCertificate> UserCertificates { get; set; }\n- IDbSet<SymbolPackage> SymbolPackages { get; set; }\n- IDbSet<Cve> Cves { get; set; }\n- IDbSet<Cwe> Cwes { get; set; }\n+ DbSet<Certificate> Certificates { get; set; }\n+ DbSet<PackageRegistration> PackageRegistrations { get; set; }\n+ DbSet<Credential> Credentials { get; set; }\n+ DbSet<Scope> Scopes { get; set; }\n+ DbSet<User> Users { get; set; }\n+ DbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }\n+ DbSet<ReservedNamespace> ReservedNamespaces { get; set; }\n+ DbSet<UserCertificate> UserCertificates { get; set; }\n+ DbSet<SymbolPackage> SymbolPackages { get; set; }\n+ DbSet<Cve> Cves { get; set; }\n+ DbSet<Cwe> Cwes { get; set; }\nTask<int> SaveChangesAsync();\n- IDbSet<T> Set<T>() where T : class;\n+ DbSet<T> Set<T>() where T : class;\nvoid DeleteOnCommit<T>(T entity) where T : class;\nvoid SetCommandTimeout(int? seconds);\nIDatabase GetDatabase();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\UserServiceFacts.cs\" />\n<Compile Include=\"Services\\FeedServiceFacts.cs\" />\n<Compile Include=\"TestUtils\\ContractAssert.cs\" />\n- <Compile Include=\"TestUtils\\FakeDbSet.cs\" />\n<Compile Include=\"TestUtils\\FakeEntitiesContext.cs\" />\n<Compile Include=\"TestUtils\\MockExtensions.cs\" />\n<Compile Include=\"TestUtils\\MockHandler.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/TestSecurityPolicyService.cs",
"new_path": "tests/NuGetGallery.Facts/Security/TestSecurityPolicyService.cs",
"diff": "@@ -21,7 +21,7 @@ public class TestSecurityPolicyService : SecurityPolicyService\npublic IAppConfiguration AppConfiguration { get; }\n- public Mock<IDbSet<UserSecurityPolicy>> MockUserSecurityPolicies { get; }\n+ public Mock<DbSet<UserSecurityPolicy>> MockUserSecurityPolicies { get; }\npublic TestUserSecurityPolicyData Mocks { get; }\n@@ -51,7 +51,7 @@ public class TestSecurityPolicyService : SecurityPolicyService\nMock<IAuditingService> mockAuditing,\nIAppConfiguration configuration)\n{\n- MockUserSecurityPolicies = new Mock<IDbSet<UserSecurityPolicy>>();\n+ MockUserSecurityPolicies = new Mock<DbSet<UserSecurityPolicy>>();\nMockUserSecurityPolicies.Setup(p => p.Remove(It.IsAny<UserSecurityPolicy>())).Verifiable();\nMockEntitiesContext = mockEntities ?? new Mock<IEntitiesContext>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/CertificateServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/CertificateServiceFacts.cs",
"diff": "@@ -309,7 +309,7 @@ public async Task ActivateCertificateAsync_WhenCertificateAlreadyExistsInEntitie\n_certificateRepository.Setup(x => x.GetAll())\n.Returns(new EnumerableQuery<Certificate>(new[] { _certificate }));\n- var userCertificates = new Mock<IDbSet<UserCertificate>>(MockBehavior.Strict);\n+ var userCertificates = new Mock<DbSet<UserCertificate>>(MockBehavior.Strict);\nvar userCertificate = new UserCertificate()\n{\nKey = 7,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"diff": "@@ -150,10 +150,10 @@ internal class TestSupportRequestDbContext : ISupportRequestDbContext\n{\npublic TestSupportRequestDbContext()\n{\n- Admins = new FakeDbSet<Admin>(new FakeEntitiesContext());\n- Issues = new FakeDbSet<Issue>(new FakeEntitiesContext());\n- Histories = new FakeDbSet<History>(new FakeEntitiesContext());\n- IssueStatus = new FakeDbSet<IssueStatus>(new FakeEntitiesContext());\n+ Admins = FakeEntitiesContext.CreateDbSet<Admin>();\n+ Issues = FakeEntitiesContext.CreateDbSet<Issue>();\n+ Histories = FakeEntitiesContext.CreateDbSet<History>();\n+ IssueStatus = FakeEntitiesContext.CreateDbSet<IssueStatus>();\n}\npublic IDbSet<Admin> Admins { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Collections.ObjectModel;\nusing System.Data.Entity;\n+using System.Linq;\nusing System.Threading.Tasks;\n+using Moq;\nusing NuGet.Services.Entities;\nusing Xunit;\n@@ -15,7 +18,7 @@ public class FakeEntitiesContext : IEntitiesContext\nprivate readonly Dictionary<Type, object> dbSets = new Dictionary<Type, object>();\nprivate bool _areChangesSaved;\n- public IDbSet<PackageRegistration> PackageRegistrations\n+ public DbSet<PackageRegistration> PackageRegistrations\n{\nget\n{\n@@ -27,7 +30,7 @@ public IDbSet<PackageRegistration> PackageRegistrations\n}\n}\n- public IDbSet<Package> Packages\n+ public DbSet<Package> Packages\n{\nget\n{\n@@ -39,7 +42,7 @@ public IDbSet<Package> Packages\n}\n}\n- public IDbSet<Credential> Credentials\n+ public DbSet<Credential> Credentials\n{\nget\n{\n@@ -51,7 +54,7 @@ public IDbSet<Credential> Credentials\n}\n}\n- public IDbSet<Scope> Scopes\n+ public DbSet<Scope> Scopes\n{\nget\n{\n@@ -63,7 +66,7 @@ public IDbSet<Scope> Scopes\n}\n}\n- public IDbSet<User> Users\n+ public DbSet<User> Users\n{\nget\n{\n@@ -75,7 +78,7 @@ public IDbSet<User> Users\n}\n}\n- public IDbSet<Organization> Organizations\n+ public DbSet<Organization> Organizations\n{\nget\n{\n@@ -87,7 +90,7 @@ public IDbSet<Organization> Organizations\n}\n}\n- public IDbSet<UserSecurityPolicy> UserSecurityPolicies\n+ public DbSet<UserSecurityPolicy> UserSecurityPolicies\n{\nget\n{\n@@ -99,7 +102,7 @@ public IDbSet<UserSecurityPolicy> UserSecurityPolicies\n}\n}\n- public IDbSet<ReservedNamespace> ReservedNamespaces\n+ public DbSet<ReservedNamespace> ReservedNamespaces\n{\nget\n{\n@@ -111,7 +114,7 @@ public IDbSet<ReservedNamespace> ReservedNamespaces\n}\n}\n- public IDbSet<Certificate> Certificates\n+ public DbSet<Certificate> Certificates\n{\nget\n{\n@@ -123,7 +126,7 @@ public IDbSet<Certificate> Certificates\n}\n}\n- public IDbSet<UserCertificate> UserCertificates\n+ public DbSet<UserCertificate> UserCertificates\n{\nget\n{\n@@ -135,7 +138,7 @@ public IDbSet<UserCertificate> UserCertificates\n}\n}\n- public IDbSet<SymbolPackage> SymbolPackages\n+ public DbSet<SymbolPackage> SymbolPackages\n{\nget\n{\n@@ -147,7 +150,7 @@ public IDbSet<SymbolPackage> SymbolPackages\n}\n}\n- public IDbSet<Cve> Cves\n+ public DbSet<Cve> Cves\n{\nget\n{\n@@ -159,7 +162,7 @@ public IDbSet<Cve> Cves\n}\n}\n- public IDbSet<Cwe> Cwes\n+ public DbSet<Cwe> Cwes\n{\nget\n{\n@@ -177,19 +180,19 @@ public Task<int> SaveChangesAsync()\nreturn Task.FromResult(0);\n}\n- public IDbSet<T> Set<T>() where T : class\n+ public DbSet<T> Set<T>() where T : class\n{\nif (!dbSets.ContainsKey(typeof(T)))\n{\n- dbSets.Add(typeof(T), new FakeDbSet<T>(this));\n+ dbSets.Add(typeof(T), CreateDbSet<T>());\n}\n- return (IDbSet<T>)(dbSets[typeof(T)]);\n+ return (DbSet<T>)dbSets[typeof(T)];\n}\npublic void DeleteOnCommit<T>(T entity) where T : class\n{\n- ((FakeDbSet<T>)(Set<T>())).Remove(entity);\n+ Set<T>().Remove(entity);\n}\npublic void VerifyCommitChanges()\n@@ -207,6 +210,56 @@ public IDatabase GetDatabase()\n{\nthrow new NotSupportedException();\n}\n+\n+ public static DbSet<T> CreateDbSet<T>() where T : class\n+ {\n+ var data = new List<T>();\n+ var mockSet = new Mock<DbSet<T>>();\n+ mockSet\n+ .As<IQueryable<T>>()\n+ .Setup(m => m.Provider)\n+ .Returns(() => data.AsQueryable().Provider);\n+\n+ mockSet\n+ .As<IQueryable<T>>()\n+ .Setup(m => m.Expression)\n+ .Returns(() => data.AsQueryable().Expression);\n+\n+ mockSet\n+ .As<IQueryable<T>>()\n+ .Setup(m => m.ElementType)\n+ .Returns(() => data.AsQueryable().ElementType);\n+\n+ mockSet\n+ .As<IQueryable<T>>()\n+ .Setup(m => m.GetEnumerator())\n+ .Returns(() => data.GetEnumerator());\n+\n+ mockSet\n+ .Setup(x => x.Include(It.IsAny<string>()))\n+ .Returns(mockSet.Object);\n+\n+ mockSet\n+ .Setup(x => x.Add(It.IsAny<T>()))\n+ .Callback<T>(x => data.Add(x));\n+\n+ mockSet\n+ .Setup(x => x.AddRange(It.IsAny<IEnumerable<T>>()))\n+ .Callback<IEnumerable<T>>(x => data.AddRange(x));\n+\n+ mockSet\n+ .Setup(x => x.Remove(It.IsAny<T>()))\n+ .Callback<T>(x => data.Remove(x));\n+\n+ mockSet\n+ .Setup(x => x.RemoveRange(It.IsAny<IEnumerable<T>>()))\n+ .Callback<IEnumerable<T>>(x => x.Select(y => data.Remove(y)));\n+\n+ mockSet\n+ .Setup(x => x.Local)\n+ .Returns(() => new ObservableCollection<T>(data));\n+\n+ return mockSet.Object;\n+ }\n}\n}\n-\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Allow bulk inserts/deletes through EntitiesContext/EntityRepository (#6902) |
455,776 | 20.02.2019 17:43:33 | 0 | fa6ae9c2e8d6427664430670be23b7a089801109 | ManagePackageViewModel should not be dependent on DisplayPackageViewModel | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-edit-readme.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-edit-readme.js",
"diff": "}\nvar version = _viewModel.Versions[selectedVersion];\n- var cachedReadMe = version.readMe;\n+ var cachedReadMe = version.ReadMe;\nif (cachedReadMe === null) {\n- var url = version.getReadMe;\n+ var url = version.GetReadMeUrl;\n$.ajax({\nurl: url,\ntype: 'GET',\nstatusCode: {\n200: function (data) {\n- version.readMe = data;\n+ version.ReadMe = data;\n_viewModel.Edit = data;\nbindData(_viewModel);\n},\nreturn;\n}\n- var url = _viewModel.Versions[selectedVersion].submit;\n+ var url = _viewModel.Versions[selectedVersion].SubmitUrl;\n$.ajax({\nurl: url,\ntype: 'POST',\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"diff": "namespace NuGetGallery\n{\n- public class ManagePackageViewModel : DisplayPackageViewModel\n+ public class ManagePackageViewModel : ListPackageItemViewModel\n{\npublic ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<ReportPackageReason> reasons, UrlHelper url, string readMe)\n: base(package, currentUser)\n@@ -32,18 +32,50 @@ public ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<R\nIsLocked = package.PackageRegistration.IsLocked;\n- var versionSelectPackages = PackageVersions.Where(p => !p.Deleted);\n- VersionSelectList = new SelectList(\n- PackageVersions\n- .Where(p => !p.Deleted && !p.FailedValidation)\n- .Select(p => new SelectListItem\n+ var versionSelectPackages = package.PackageRegistration.Packages\n+ .Where(p => p.PackageStatusKey == PackageStatus.Available || p.PackageStatusKey == PackageStatus.Validating)\n+ .OrderByDescending(p => new NuGetVersion(p.Version))\n+ .ToList();\n+\n+ var versionSelectListItems = new List<SelectListItem>();\n+ VersionListedStateDictionary = new Dictionary<string, VersionListedState>();\n+ VersionReadMeStateDictionary = new Dictionary<string, VersionReadMeState>();\n+ var submitUrlTemplate = url.PackageVersionActionTemplate(\"Edit\");\n+ var getReadMeUrlTemplate = url.PackageVersionActionTemplate(\"GetReadMeMd\");\n+ string defaultSelectedVersion = null;\n+ foreach (var versionSelectPackage in versionSelectPackages)\n{\n- Text = p.FullVersion + (p.LatestVersionSemVer2 ? \" (Latest)\" : string.Empty),\n- Value = p.Version\n- }),\n- \"Value\",\n- \"Text\",\n- Version);\n+ var text = NuGetVersionFormatter.ToFullString(versionSelectPackage.Version) + (versionSelectPackage.IsLatestSemVer2 ? \" (Latest)\" : string.Empty);\n+ var value = NuGetVersionFormatter.Normalize(versionSelectPackage.Version);\n+ versionSelectListItems.Add(new SelectListItem\n+ {\n+ Text = text,\n+ Value = value\n+ });\n+\n+ if (versionSelectPackage == package)\n+ {\n+ defaultSelectedVersion = value;\n+ }\n+\n+ VersionListedStateDictionary.Add(\n+ value,\n+ new VersionListedState(versionSelectPackage));\n+\n+ var model = new TrivialPackageVersionModel(versionSelectPackage);\n+ VersionReadMeStateDictionary.Add(\n+ value,\n+ new VersionReadMeState(\n+ submitUrlTemplate.Resolve(model),\n+ getReadMeUrlTemplate.Resolve(model),\n+ null));\n+ }\n+\n+ VersionSelectList = new SelectList(\n+ versionSelectListItems,\n+ nameof(SelectListItem.Value),\n+ nameof(SelectListItem.Text),\n+ defaultSelectedVersion);\n// Update edit model with the readme.md data.\nReadMe = new EditPackageVersionReadMeRequest();\n@@ -63,5 +95,35 @@ public ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<R\npublic bool IsLocked { get; }\npublic EditPackageVersionReadMeRequest ReadMe { get; set; }\n+\n+ public Dictionary<string, VersionListedState> VersionListedStateDictionary { get; set; }\n+\n+ public Dictionary<string, VersionReadMeState> VersionReadMeStateDictionary { get; set; }\n+\n+ public class VersionListedState\n+ {\n+ public VersionListedState(Package package)\n+ {\n+ Listed = package.Listed;\n+ DownloadCount = package.DownloadCount;\n+ }\n+\n+ public bool Listed { get; set; }\n+ public int DownloadCount { get; set; }\n+ }\n+\n+ public class VersionReadMeState\n+ {\n+ public VersionReadMeState(string submitUrl, string getReadMeUrl, string readMe)\n+ {\n+ SubmitUrl = submitUrl;\n+ GetReadMeUrl = getReadMeUrl;\n+ ReadMe = readMe;\n+ }\n+\n+ public string SubmitUrl { get; set; }\n+ public string GetReadMeUrl { get; set; }\n+ public string ReadMe { get; set; }\n+ }\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": "@@ -19,7 +19,7 @@ public PackageViewModel(Package package)\n{\n_package = package ?? throw new ArgumentNullException(nameof(package));\n- FullVersion = NuGetVersionFormatter.ToFullStringOrFallback(package.Version, fallback: package.Version);\n+ FullVersion = NuGetVersionFormatter.ToFullString(package.Version);\nIsSemVer2 = package.SemVerLevelKey == SemVerLevelKey.SemVer2;\nVersion = String.IsNullOrEmpty(package.NormalizedVersion) ?\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Manage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Manage.cshtml",
"diff": "var strings_RemovingSelf = \"@Html.Raw(Strings.ManagePackageOwners_RemovingSelf)\";\n// Set up delete section\n- var versionListedState = @Html.Raw(\n- Json.Encode(\n- Model.VersionSelectList.ToDictionary(\n- v => v.Value,\n- v =>\n- {\n- var version = Model.PackageVersions.Single(p => p.Version == v.Value);\n- return new\n- {\n- version.Listed,\n- version.DownloadCount\n- };\n- })));\n+ var versionListedState = @Html.Raw(Json.Encode(Model.VersionListedStateDictionary));\n$(function () {\n// Set up documentation section\n- @{\n- var editTemplate = Url.PackageVersionActionTemplate(\"Edit\");\n- var getReadMeTemplate = Url.PackageVersionActionTemplate(\"GetReadMeMd\");\n- }\n-\nvar readMeModel = {\n- \"Versions\": @Html.Raw(Json.Encode(Model.VersionSelectList.ToDictionary(v => v.Value, v => {\n- var pvmodel = new TrivialPackageVersionModel(Model.Id, v.Value);\n- return new\n- {\n- submit = editTemplate.Resolve(pvmodel),\n- getReadMe = getReadMeTemplate.Resolve(pvmodel),\n- readMe = (EditPackageVersionReadMeRequest)null\n- };\n- }))),\n+ \"Versions\": @Html.Raw(Json.Encode(Model.VersionReadMeStateDictionary)),\n\"Edit\": @Html.Raw(Json.Encode(Model.ReadMe))\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -1366,10 +1366,10 @@ public virtual void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2Packa\nvar packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: true).ToList();\nvar nugetCatalogReaderPackage = packages.Single(p => p.PackageRegistration.Id == \"NuGet.CatalogReader\");\n- Assert.Equal(\"1.5.12+git.78e44a8\", NuGetVersionFormatter.ToFullStringOrFallback(nugetCatalogReaderPackage.Version, fallback: nugetCatalogReaderPackage.Version));\n+ Assert.Equal(\"1.5.12+git.78e44a8\", NuGetVersionFormatter.ToFullString(nugetCatalogReaderPackage.Version));\nvar sleetLibPackage = packages.Single(p => p.PackageRegistration.Id == \"SleetLib\");\n- Assert.Equal(\"2.2.24+git.f2a0cb6\", NuGetVersionFormatter.ToFullStringOrFallback(sleetLibPackage.Version, fallback: sleetLibPackage.Version));\n+ Assert.Equal(\"2.2.24+git.f2a0cb6\", NuGetVersionFormatter.ToFullString(sleetLibPackage.Version));\n}\nprotected FakeEntitiesContext GetMixedVersioningPackagesContext(User currentUser, User packageOwner)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | ManagePackageViewModel should not be dependent on DisplayPackageViewModel (#6900) |
455,736 | 20.02.2019 10:50:32 | 28,800 | 87f0f23c4dc1467eed7cfbff81a22b502c30aa67 | Add functional tests for the packages Atom feed
Address | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"diff": "<Reference Include=\"Microsoft.CSharp\" />\n<Reference Include=\"System.IO.Compression\" />\n<Reference Include=\"System.Net.Http\" />\n+ <Reference Include=\"System.ServiceModel\" />\n<Reference Include=\"System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\System.ValueTuple.4.5.0\\lib\\netstandard1.0\\System.ValueTuple.dll</HintPath>\n</Reference>\n</Reference>\n</ItemGroup>\n<ItemGroup>\n+ <Compile Include=\"AtomFeed\\AtomFeedTests.cs\" />\n<Compile Include=\"Commandline\\NuGetCommandLineTests.cs\" />\n<Compile Include=\"Commandline\\NuGetCoreTests.cs\" />\n<Compile Include=\"ODataFeeds\\CuratedFeedTest.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add functional tests for the packages Atom feed (#6910)
Address https://github.com/NuGet/NuGetGallery/issues/6898 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.