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 |
09.04.2018 09:49:21
| 25,200 |
c36e24090b9904db8d435cb1f990c31d46a56f31
|
[Organizations] Telemetry for organizations
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"new_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"diff": "@@ -33,16 +33,20 @@ public class ViewMessages\npublic IUserService UserService { get; }\n+ public ITelemetryService TelemetryService { get; }\n+\npublic AccountsController(\nAuthenticationService authenticationService,\nICuratedFeedService curatedFeedService,\nIMessageService messageService,\n- IUserService userService)\n+ IUserService userService,\n+ ITelemetryService telemetryService)\n{\nAuthenticationService = authenticationService ?? throw new ArgumentNullException(nameof(authenticationService));\nCuratedFeedService = curatedFeedService ?? throw new ArgumentNullException(nameof(curatedFeedService));\nMessageService = messageService ?? throw new ArgumentNullException(nameof(messageService));\nUserService = userService ?? throw new ArgumentNullException(nameof(userService));\n+ TelemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n}\npublic abstract string AccountAction { get; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"new_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"diff": "using System.Globalization;\nusing System.Linq;\nusing System.Net;\n-using System.Net.Mail;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Filters;\n-using NuGetGallery.Security;\nnamespace NuGetGallery\n{\n@@ -21,8 +19,9 @@ public class OrganizationsController\nAuthenticationService authService,\nICuratedFeedService curatedFeedService,\nIMessageService messageService,\n- IUserService userService)\n- : base(authService, curatedFeedService, messageService, userService)\n+ IUserService userService,\n+ ITelemetryService telemetryService)\n+ : base(authService, curatedFeedService, messageService, userService, telemetryService)\n{\n}\n@@ -68,6 +67,7 @@ public async Task<ActionResult> Add(AddOrganizationViewModel model)\n{\nvar organization = await UserService.AddOrganizationAsync(organizationName, organizationEmailAddress, adminUser);\nSendNewAccountEmail(organization);\n+ TelemetryService.TrackOrganizationAdded(organization);\nreturn RedirectToAction(nameof(ManageOrganization), new { accountName = organization.Username });\n}\ncatch (EntityException e)\n@@ -285,7 +285,7 @@ protected override void UpdateAccountViewModel(Organization account, Organizatio\naccount.Members.Select(m => new OrganizationMemberViewModel(m))\n.Concat(account.MemberRequests.Select(m => new OrganizationMemberViewModel(m)));\n- model.RequiresTenant = account.SecurityPolicies.Any(sp => string.Equals(sp.Name, RequireOrganizationTenantPolicy.PolicyName, StringComparison.OrdinalIgnoreCase));\n+ model.RequiresTenant = account.IsRestrictedToOrganizationTenantPolicy();\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "using System.Globalization;\nusing System.Linq;\nusing System.Net;\n-using System.Net.Mail;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\nusing NuGetGallery.Areas.Admin;\n@@ -39,8 +38,9 @@ public partial class UsersController\nAuthenticationService authService,\nICredentialBuilder credentialBuilder,\nIDeleteAccountService deleteAccountService,\n- ISupportRequestService supportRequestService)\n- : base(authService, feedsQuery, messageService, userService)\n+ ISupportRequestService supportRequestService,\n+ ITelemetryService telemetryService)\n+ : base(authService, feedsQuery, messageService, userService, telemetryService)\n{\n_packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n_packageOwnerRequestService = packageOwnerRequestService ?? throw new ArgumentNullException(nameof(packageOwnerRequestService));\n@@ -153,6 +153,8 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\nvar cancelUrl = Url.CancelTransformAccount(accountToTransform, relativeUrl: false);\nMessageService.SendOrganizationTransformInitiatedNotice(accountToTransform, adminUser, cancelUrl);\n+ TelemetryService.TrackOrganizationTransformInitiated(accountToTransform);\n+\n// sign out pending organization and prompt for admin sign in\nOwinContext.Authentication.SignOut();\n@@ -190,6 +192,8 @@ public virtual async Task<ActionResult> ConfirmTransformToOrganization(string ac\nMessageService.SendOrganizationTransformRequestAcceptedNotice(accountToTransform, adminUser);\n+ TelemetryService.TrackOrganizationTransformCompleted(accountToTransform);\n+\nTempData[\"Message\"] = String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_Success, accountNameToTransform);\n@@ -216,6 +220,8 @@ public virtual async Task<ActionResult> RejectTransformToOrganization(string acc\n{\nMessageService.SendOrganizationTransformRequestRejectedNotice(accountToTransform, adminUser);\n+ TelemetryService.TrackOrganizationTransformDeclined(accountToTransform);\n+\nmessage = String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_Rejected, accountNameToTransform);\n}\n@@ -240,7 +246,9 @@ public virtual async Task<ActionResult> CancelTransformToOrganization(string tok\nif (await UserService.CancelTransformUserToOrganizationRequest(accountToTransform, token))\n{\n- MessageService.SendOrganizationTransformRequestRejectedNotice(accountToTransform, adminUser);\n+ MessageService.SendOrganizationTransformRequestCancelledNotice(accountToTransform, adminUser);\n+\n+ TelemetryService.TrackOrganizationTransformCancelled(accountToTransform);\nTempData[\"Message\"] = String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_Cancelled);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/UserExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/UserExtensions.cs",
"diff": "using System.Security.Claims;\nusing System.Security.Principal;\nusing NuGetGallery.Authentication;\n+using NuGetGallery.Security;\nnamespace NuGetGallery\n{\n@@ -138,5 +139,10 @@ public static void SetAccountAsDeleted(this User user)\nuser.FailedLoginCount = 0;\nuser.IsDeleted = true;\n}\n+\n+ public static bool IsRestrictedToOrganizationTenantPolicy(this User user)\n+ {\n+ return user.SecurityPolicies.Any(sp => string.Equals(sp.Name, RequireOrganizationTenantPolicy.PolicyName, StringComparison.OrdinalIgnoreCase));\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -47,6 +47,31 @@ public interface ITelemetryService\n/// </summary>\nvoid TrackUserPackageDeleteExecuted(int packageKey, string packageId, string packageVersion, ReportPackageReason reason, bool success);\n+ /// <summary>\n+ /// A telemetry event emitted when a user requests transformation of their account into an organization.\n+ /// </summary>\n+ void TrackOrganizationTransformInitiated(User user);\n+\n+ /// <summary>\n+ /// A telemetry event emitted when a user completes transformation of their account into an organization.\n+ /// </summary>\n+ void TrackOrganizationTransformCompleted(User user);\n+\n+ /// <summary>\n+ /// A telemetry event emitted when a user's request to transform their account into an organization is declined.\n+ /// </summary>\n+ void TrackOrganizationTransformDeclined(User user);\n+\n+ /// <summary>\n+ /// A telemetry event emitted when a user cancels their request to transform their account into an organization.\n+ /// </summary>\n+ void TrackOrganizationTransformCancelled(User user);\n+\n+ /// <summary>\n+ /// A telemetry event emitted when a user adds a new organization to their account.\n+ /// </summary>\n+ void TrackOrganizationAdded(Organization organization);\n+\n/// <summary>\n/// Create a trace for an exception. These are informational for support requests.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -30,6 +30,11 @@ internal class Events\npublic const string PackageDelete = \"PackageDelete\";\npublic const string PackageHardDeleteReflow = \"PackageHardDeleteReflow\";\npublic const string PackageRevalidate = \"PackageRevalidate\";\n+ public const string OrganizationTransformInitiated = \"OrganizationTransformInitiated\";\n+ public const string OrganizationTransformCompleted = \"OrganizationTransformCompleted\";\n+ public const string OrganizationTransformDeclined = \"OrganizationTransformDeclined\";\n+ public const string OrganizationTransformCancelled = \"OrganizationTransformCancelled\";\n+ public const string OrganizationAdded = \"OrganizationAdded\";\n}\nprivate IDiagnosticsSource _diagnosticsSource;\n@@ -80,6 +85,10 @@ internal class Events\n// Package delete properties\npublic const string IsHardDelete = \"IsHardDelete\";\n+ // Organization properties\n+ public const string OrganizationAccountKey = \"OrganizationAccountKey\";\n+ public const string OrganizationIsRestrictedToOrganizationTenantPolicy = \"OrganizationIsRestrictedToOrganizationTenantPolicy\";\n+\npublic TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n{\nif (diagnosticsService == null)\n@@ -421,6 +430,50 @@ public void TrackUserPackageDeleteChecked(UserPackageDeleteEvent details, UserPa\n});\n}\n+ private void TrackMetricForOrganization(\n+ string metricName,\n+ User user,\n+ Action<Dictionary<string, string>> addProperties = null)\n+ {\n+ if (user == null)\n+ {\n+ throw new ArgumentNullException(nameof(user));\n+ }\n+\n+ TrackMetric(metricName, 1, properties =>\n+ {\n+ properties.Add(OrganizationAccountKey, user.Key.ToString());\n+ properties.Add(AccountCreationDate, GetAccountCreationDate(user));\n+ properties.Add(OrganizationIsRestrictedToOrganizationTenantPolicy, user.IsRestrictedToOrganizationTenantPolicy().ToString());\n+ addProperties?.Invoke(properties);\n+ });\n+ }\n+\n+ public void TrackOrganizationTransformInitiated(User user)\n+ {\n+ TrackMetricForOrganization(Events.OrganizationTransformInitiated, user);\n+ }\n+\n+ public void TrackOrganizationTransformCompleted(User user)\n+ {\n+ TrackMetricForOrganization(Events.OrganizationTransformCompleted, user);\n+ }\n+\n+ public void TrackOrganizationTransformDeclined(User user)\n+ {\n+ TrackMetricForOrganization(Events.OrganizationTransformDeclined, user);\n+ }\n+\n+ public void TrackOrganizationTransformCancelled(User user)\n+ {\n+ TrackMetricForOrganization(Events.OrganizationTransformCancelled, user);\n+ }\n+\n+ public void TrackOrganizationAdded(Organization organization)\n+ {\n+ TrackMetricForOrganization(Events.OrganizationAdded, organization);\n+ }\n+\n/// <summary>\n/// We use <see cref=\"ITelemetryClient.TrackMetric(string, double, IDictionary{string, string})\"/> instead of\n/// <see cref=\"ITelemetryClient.TrackEvent(string, IDictionary{string, string}, IDictionary{string, double})\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -316,7 +316,7 @@ public async Task WhenUserIsNotMember_ReturnsNonSuccess()\n}\n}\n- public class TheCreateAction : TestContainer\n+ public class TheAddAction : TestContainer\n{\nprivate const string OrgName = \"TestOrg\";\nprivate const string OrgEmail = \"TestOrg@testorg.com\";\n@@ -328,7 +328,7 @@ public class TheCreateAction : TestContainer\nprivate Fakes Fakes;\n- public TheCreateAction()\n+ public TheAddAction()\n{\nFakes = Get<Fakes>();\nAdmin = Fakes.User;\n@@ -350,7 +350,13 @@ public async Task WhenAddOrganizationThrowsEntityException_ReturnsViewWithMessag\nvar result = await controller.Add(Model);\nResultAssert.IsView<AddOrganizationViewModel>(result);\n+\nAssert.Equal(message, controller.TempData[\"AddOrganizationErrorMessage\"]);\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationAdded(It.IsAny<Organization>()),\n+ Times.Never());\n}\n[Fact]\n@@ -383,6 +389,10 @@ public async Task WhenAddOrganizationSucceeds_RedirectsToManageOrganization()\norg,\nIt.Is<string>(s => s.Contains(token))),\nTimes.Once());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationAdded(It.IsAny<Organization>()));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -2282,6 +2282,29 @@ public async Task WhenCanTransformReturnsFalse_ShowsError()\nAssert.NotNull(result);\nAssert.Equal(1, controller.ModelState[string.Empty].Errors.Count);\nAssert.Equal(\"error\", controller.ModelState[string.Empty].Errors.First().ErrorMessage);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequest(\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(\n+ m => m.SendOrganizationTransformInitiatedNotice(\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[Fact]\n@@ -2304,6 +2327,29 @@ public async Task WhenAdminIsNotFound_ShowsError()\nString.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_AdminAccountDoesNotExist, \"AdminThatDoesNotExist\"),\ncontroller.ModelState[string.Empty].Errors.First().ErrorMessage);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequest(\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.SendOrganizationTransformInitiatedNotice(\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[Fact]\n@@ -2321,6 +2367,24 @@ public async Task WhenValid_CreatesRequestAndRedirects()\n// Assert\nAssert.IsType<RedirectResult>(result);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m => m.SendOrganizationTransformRequest(\n+ It.IsAny<User>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>()));\n+\n+ GetMock<IMessageService>()\n+ .Verify(m => m.SendOrganizationTransformInitiatedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>()));\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformInitiated(It.IsAny<User>()));\n}\n}\n@@ -2344,6 +2408,18 @@ public async Task WhenAccountToTransformIsNotFound_ShowsError()\nAssert.Equal(\nString.Format(CultureInfo.CurrentCulture, Strings.TransformAccount_OrganizationAccountDoesNotExist, \"account\"),\nmodel.ErrorMessage);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestAcceptedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()),\n+ Times.Never());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformCompleted(It.IsAny<Organization>()),\n+ Times.Never());\n}\n[Fact]\n@@ -2363,6 +2439,18 @@ public async Task WhenCanTransformReturnsFalse_ShowsError()\nAssert.Equal(\n\"error\",\nmodel.ErrorMessage);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestAcceptedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()),\n+ Times.Never());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformCompleted(It.IsAny<Organization>()),\n+ Times.Never());\n}\n[Fact]\n@@ -2383,6 +2471,18 @@ public async Task WhenUserServiceReturnsFalse_ShowsError()\nString.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_Failed, \"account\"),\nmodel.ErrorMessage);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestAcceptedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()),\n+ Times.Never());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformCompleted(It.IsAny<Organization>()),\n+ Times.Never());\n}\n[Fact]\n@@ -2398,6 +2498,16 @@ public async Task WhenUserServiceReturnsSuccess_Redirects()\n// Assert\nAssert.NotNull(result);\nAssert.False(controller.TempData.ContainsKey(\"TransformError\"));\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestAcceptedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()));\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformCompleted(It.IsAny<User>()));\n}\nprivate UsersController CreateController(string accountToTransform, string canTransformErrorReason = \"\", bool success = true)\n@@ -2450,6 +2560,18 @@ public async Task WhenAccountToTransformIsNotFound_ShowsError()\nAssert.Equal(\nString.Format(CultureInfo.CurrentCulture, Strings.TransformAccount_OrganizationAccountDoesNotExist, \"account\"),\ncontroller.TempData[\"Message\"]);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestRejectedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()),\n+ Times.Never());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformDeclined(It.IsAny<Organization>()),\n+ Times.Never());\n}\n[Fact]\n@@ -2465,6 +2587,18 @@ public async Task WhenUserServiceReturnsFalse_ShowsError()\n// Assert\nAssert.NotNull(result);\nAssert.Equal(Strings.TransformAccount_FailedMissingRequestToCancel, controller.TempData[\"Message\"]);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestRejectedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()),\n+ Times.Never());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformDeclined(It.IsAny<Organization>()),\n+ Times.Never());\n}\n[Fact]\n@@ -2482,6 +2616,16 @@ public async Task WhenUserServiceReturnsSuccess_Redirects()\nAssert.Equal(\nString.Format(CultureInfo.CurrentCulture, Strings.TransformAccount_Rejected, accountToTransform),\ncontroller.TempData[\"Message\"]);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestRejectedNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()));\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformDeclined(It.IsAny<User>()));\n}\nprivate UsersController CreateController(string accountToTransform, bool success = true)\n@@ -2524,6 +2668,18 @@ public async Task WhenUserServiceReturnsFalse_ShowsError()\nAssert.Equal(\nStrings.TransformAccount_FailedMissingRequestToCancel,\ncontroller.TempData[\"ErrorMessage\"]);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestCancelledNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()),\n+ Times.Never());\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformCancelled(It.IsAny<Organization>()),\n+ Times.Never());\n}\n[Fact]\n@@ -2540,6 +2696,16 @@ public async Task WhenUserServiceReturnsSuccess_Redirects()\nAssert.Equal(\nString.Format(CultureInfo.CurrentCulture, Strings.TransformAccount_Cancelled),\ncontroller.TempData[\"Message\"]);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m =>\n+ m.SendOrganizationTransformRequestCancelledNotice(\n+ It.IsAny<User>(),\n+ It.IsAny<User>()));\n+\n+ GetMock<ITelemetryService>()\n+ .Verify(\n+ t => t.TrackOrganizationTransformCancelled(It.IsAny<User>()));\n}\nprivate UsersController CreateController(bool success = true)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "using Moq;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Framework;\n+using NuGetGallery.Security;\nusing Xunit;\nusing TrackAction = System.Action<NuGetGallery.TelemetryService>;\n@@ -116,6 +117,26 @@ public static IEnumerable<object[]> TrackMetricNames_Data\nReportPackageReason.ReleasedInPublicByAccident,\nsuccess: true))\n};\n+\n+ yield return new object[] { \"OrganizationTransformInitiated\",\n+ (TrackAction)(s => s.TrackOrganizationTransformInitiated(fakes.User))\n+ };\n+\n+ yield return new object[] { \"OrganizationTransformCompleted\",\n+ (TrackAction)(s => s.TrackOrganizationTransformCompleted(fakes.Organization))\n+ };\n+\n+ yield return new object[] { \"OrganizationTransformDeclined\",\n+ (TrackAction)(s => s.TrackOrganizationTransformDeclined(fakes.User))\n+ };\n+\n+ yield return new object[] { \"OrganizationTransformCancelled\",\n+ (TrackAction)(s => s.TrackOrganizationTransformCancelled(fakes.User))\n+ };\n+\n+ yield return new object[] { \"OrganizationAdded\",\n+ (TrackAction)(s => s.TrackOrganizationAdded(fakes.Organization))\n+ };\n}\n}\n@@ -288,6 +309,61 @@ public void TrackUserPackageDeleteExecutedThrowsIfPackageVersionIsNull()\nreason: ReportPackageReason.ReleasedInPublicByAccident,\nsuccess: true));\n}\n+\n+ [Fact]\n+ public void TrackOrganizationTransformInitiatedThrowsIfNullUser()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackOrganizationTransformInitiated(null));\n+ }\n+\n+ [Fact]\n+ public void TrackOrganizationTransformCompletedThrowsIfNullOrganization()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackOrganizationTransformCompleted(null));\n+ }\n+\n+ [Fact]\n+ public void TrackOrganizationTransformDeclinedThrowsIfNullUser()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackOrganizationTransformDeclined(null));\n+ }\n+\n+ [Fact]\n+ public void TrackOrganizationTransformCancelledThrowsIfNullUser()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackOrganizationTransformCancelled(null));\n+ }\n+\n+ [Fact]\n+ public void TrackOrganizationAddedThrowsIfNullUser()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackOrganizationAdded(null));\n+ }\n}\npublic class TheTraceExceptionMethod : BaseFacts\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Telemetry for organizations (#5717)
|
455,776 |
09.04.2018 10:14:45
| 25,200 |
973dafc16c88582a7cc2cf3306354f3aa3a169f8
|
Add organizations feature flag
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "@@ -17,13 +17,15 @@ public class LoginDiscontinuationConfiguration : ILoginDiscontinuationConfigurat\ninternal HashSet<string> ExceptionsForEmailAddresses { get; }\ninternal HashSet<string> ForceTransformationToOrganizationForEmailAddresses { get; }\ninternal HashSet<OrganizationTenantPair> EnabledOrganizationAadTenants { get; }\n+ internal bool OrganizationsEnabledForAll { get; }\npublic LoginDiscontinuationConfiguration()\n: this(Enumerable.Empty<string>(),\nEnumerable.Empty<string>(),\nEnumerable.Empty<string>(),\nEnumerable.Empty<string>(),\n- Enumerable.Empty<OrganizationTenantPair>())\n+ Enumerable.Empty<OrganizationTenantPair>(),\n+ organizationsEnabledForAll: false)\n{\n}\n@@ -33,13 +35,15 @@ public LoginDiscontinuationConfiguration()\nIEnumerable<string> discontinuedForDomains,\nIEnumerable<string> exceptionsForEmailAddresses,\nIEnumerable<string> forceTransformationToOrganizationForEmailAddresses,\n- IEnumerable<OrganizationTenantPair> enabledOrganizationAadTenants)\n+ IEnumerable<OrganizationTenantPair> enabledOrganizationAadTenants,\n+ bool organizationsEnabledForAll)\n{\nDiscontinuedForEmailAddresses = new HashSet<string>(discontinuedForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nDiscontinuedForDomains = new HashSet<string>(discontinuedForDomains, StringComparer.OrdinalIgnoreCase);\nExceptionsForEmailAddresses = new HashSet<string>(exceptionsForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nForceTransformationToOrganizationForEmailAddresses = new HashSet<string>(forceTransformationToOrganizationForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nEnabledOrganizationAadTenants = new HashSet<OrganizationTenantPair>(enabledOrganizationAadTenants, new OrganizationTenantPairComparer());\n+ OrganizationsEnabledForAll = organizationsEnabledForAll;\n}\npublic bool IsLoginDiscontinued(AuthenticatedUser authUser)\n@@ -69,6 +73,13 @@ public bool IsUserOnWhitelist(User user)\nDiscontinuedForEmailAddresses.Contains(email.Address);\n}\n+ public bool AreOrganizationsSupportedForUser(User user)\n+ {\n+ return OrganizationsEnabledForAll ||\n+ (user != null &&\n+ (user.Organizations.Any() || IsUserOnWhitelist(user)));\n+ }\n+\npublic bool ShouldUserTransformIntoOrganization(User user)\n{\nif (user == null)\n@@ -90,6 +101,7 @@ public interface ILoginDiscontinuationConfiguration\n{\nbool IsLoginDiscontinued(AuthenticatedUser authUser);\nbool IsUserOnWhitelist(User user);\n+ bool AreOrganizationsSupportedForUser(User user);\nbool ShouldUserTransformIntoOrganization(User user);\nbool IsTenantIdPolicySupportedForOrganization(string emailAddress, string tenantId);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -454,6 +454,11 @@ public bool CanTransformUserToOrganization(User accountToTransform, out string e\n{\nerrorReason = Strings.TransformAccount_AccountHasMemberships;\n}\n+ else if (!ContentObjectService.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(accountToTransform))\n+ {\n+ errorReason = String.Format(CultureInfo.CurrentCulture,\n+ Strings.Organizations_NotSupportedForAccount, accountToTransform.Username);\n+ }\nreturn errorReason == null;\n}\n@@ -493,6 +498,12 @@ public async Task<bool> TransformUserToOrganization(User accountToTransform, Use\npublic async Task<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser)\n{\n+ if (!ContentObjectService.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(adminUser))\n+ {\n+ throw new EntityException(String.Format(CultureInfo.CurrentCulture,\n+ Strings.Organizations_NotSupportedForAccount, adminUser.Username));\n+ }\n+\nvar existingUserWithIdentity = EntitiesContext.Users\n.FirstOrDefault(u => u.Username == username || u.EmailAddress == emailAddress);\nif (existingUserWithIdentity != null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1111,6 +1111,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Account '{0}' does not support organizations..\n+ /// </summary>\n+ public static string Organizations_NotSupportedForAccount {\n+ get {\n+ return ResourceManager.GetString(\"Organizations_NotSupportedForAccount\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Organization accounts cannot create credentials..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -842,4 +842,7 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"AddMember_UserIsOrganization\" xml:space=\"preserve\">\n<value>User '{0}' is an organization and cannot be a member of another organization.</value>\n</data>\n+ <data name=\"Organizations_NotSupportedForAccount\" xml:space=\"preserve\">\n+ <value>Account '{0}' does not support organizations.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "</li>\n<li role=\"presentation\"><a href=\"@Url.ManageMyApiKeys()\" role=\"menuitem\">API Keys</a></li>\n<li class=\"divider\"></li>\n+ @if (ContentObjectService.Value.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(CurrentUser))\n+ {\n<li role=\"presentation\"><a href=\"@Url.ManageMyOrganizations()\" role=\"menuitem\">Manage Organizations</a></li>\n+ }\n<li role=\"presentation\"><a href=\"@Url.ManageMyPackages()\" role=\"menuitem\">Manage Packages</a></li>\n<li role=\"presentation\"><a href=\"@Url.UploadPackage()\" role=\"menuitem\">Upload Package</a></li>\n<li class=\"divider\"></li>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -34,8 +34,9 @@ public async Task RefreshRefreshesObject()\nvar exceptions = new[] { \"exception@example.com\" };\nvar shouldTransforms = new[] { \"transfomer@example.com\" };\nvar orgTenantPairs = new[] { new OrganizationTenantPair(\"example.com\", \"tenantId\") };\n+ var orgsEnabledForAll = true;\n- var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs);\n+ var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs, orgsEnabledForAll);\nvar configString = JsonConvert.SerializeObject(config);\nGetMock<IContentService>()\n@@ -46,13 +47,14 @@ public async Task RefreshRefreshesObject()\n// Act\nawait service.Refresh();\n- var loginDiscontinuationAndMigrationConfiguration = service.LoginDiscontinuationConfiguration as LoginDiscontinuationConfiguration;\n+ var loginDiscontinuationConfiguration = service.LoginDiscontinuationConfiguration as LoginDiscontinuationConfiguration;\n// Assert\n- Assert.True(loginDiscontinuationAndMigrationConfiguration.DiscontinuedForEmailAddresses.SequenceEqual(emails));\n- Assert.True(loginDiscontinuationAndMigrationConfiguration.DiscontinuedForDomains.SequenceEqual(domains));\n- Assert.True(loginDiscontinuationAndMigrationConfiguration.ExceptionsForEmailAddresses.SequenceEqual(exceptions));\n- Assert.True(loginDiscontinuationAndMigrationConfiguration.EnabledOrganizationAadTenants.SequenceEqual(orgTenantPairs));\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));\n+ Assert.Equal(orgsEnabledForAll, loginDiscontinuationConfiguration.OrganizationsEnabledForAll);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"diff": "using NuGetGallery.Authentication;\nusing NuGetGallery.Framework;\nusing System.Collections.Generic;\n+using System.Linq;\nusing Xunit;\nnamespace NuGetGallery.Services\n@@ -31,10 +32,13 @@ public static IEnumerable<object[]> PossibleListStates\nforeach (var isOnTransformList in new[] { true, false })\n{\nforeach (var isOnTenantPairList in new[] { true, false })\n+ {\n+ foreach (var organizationsEnabledForAll in new[] { true, false })\n{\nforeach (var isWrongCase in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, isWrongCase);\n+ yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, organizationsEnabledForAll, isWrongCase);\n+ }\n}\n}\n}\n@@ -44,7 +48,7 @@ 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(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList, bool organizationsEnabledForAll, bool isWrongCase)\n{\nvar emails = isOnWhiteList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectEmail, isWrongCase) };\nvar domains = isOnDomainList ? new[] { ToUppercaseIfWrongCase(_domain, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase) };\n@@ -54,7 +58,7 @@ public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWh\nnew[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_domain, isWrongCase), ToUppercaseIfWrongCase(_tenant, isWrongCase)) } :\nnew[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase), ToUppercaseIfWrongCase(_incorrectTenant, isWrongCase)) };\n- return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs);\n+ return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs, organizationsEnabledForAll);\n}\nprivate static string ToUppercaseIfWrongCase(string input, bool isWrongCase)\n@@ -148,7 +152,7 @@ private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList,\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(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList: false, organizationsEnabledForAll: false, isWrongCase: isWrongCase);\n// Act\nvar result = config.IsLoginDiscontinued(authUser);\n@@ -158,35 +162,188 @@ private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList,\n}\n}\n- public class TheWhitelistMethods\n+ public class WhitelistMethodData\n+ {\n+ public bool IsOnWhiteList { get; }\n+ public bool IsOnDomainList { get; }\n+ public bool IsOnExceptionList { get; }\n+ public bool IsOnTransformList { get; }\n+ public bool IsOnTenantPairList { get; }\n+ public bool OrganizationsEnabledForAll { get; }\n+ public bool IsWrongCase { get; }\n+\n+ public WhitelistMethodData(object[] data)\n+ {\n+ var boolData = data.Cast<bool>().ToArray();\n+\n+ var isOnWhiteList = boolData[0];\n+ IsOnWhiteList = isOnWhiteList;\n+\n+ var isOnDomainList = boolData[1];\n+ IsOnDomainList = isOnDomainList;\n+\n+ var isOnExceptionList = boolData[2];\n+ IsOnExceptionList = isOnExceptionList;\n+\n+ var isOnTransformList = boolData[3];\n+ IsOnTransformList = isOnTransformList;\n+\n+ var isOnTenantPairList = boolData[4];\n+ IsOnTenantPairList = isOnTenantPairList;\n+\n+ var organizationsEnabledForAll = boolData[5];\n+ OrganizationsEnabledForAll = organizationsEnabledForAll;\n+\n+ var isWrongCase = boolData[6];\n+ IsWrongCase = isWrongCase;\n+ }\n+ }\n+\n+ public static IEnumerable<object[]> WhitelistBaseMethodReturnsExpected_Data =>\n+ PossibleListStates.Select(data =>\n+ MemberDataHelper.AsData(\n+ new WhitelistMethodData(data)));\n+\n+ public abstract class WhitelistBaseMethod\n{\n- public static IEnumerable<object[]> PossibleListStates => PossibleListStates;\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- public void ReturnsAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList, bool isWrongCase)\n+ public abstract bool GetExpectedValueForNonNull(WhitelistMethodData data);\n+\n+ [Theory]\n+ [MemberData(\"ReturnsAsExpectedWhenNonNull_Data\")]\n+ public void ReturnsExpectedWhenNonNull(WhitelistMethodData data)\n{\n// Arrange\n- var user = new User(\"test\") { EmailAddress = _email };\n+ var user = GetUser(data);\n+ var config = GetConfiguration(data);\n- var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, isWrongCase);\n+ // Act\n+ var whitelistValue = GetWhitelistValue(config, user);\n+\n+ // Assert\n+ Assert.Equal(GetExpectedValueForNonNull(data), whitelistValue);\n+ }\n+\n+ public abstract bool GetExpectedValueForNull(WhitelistMethodData data);\n+\n+ [Theory]\n+ [MemberData(\"ReturnsFalseWhenNull_Data\")]\n+ public void ReturnsExpectedWhenNull(WhitelistMethodData data)\n+ {\n+ // Arrange\n+ var config = GetConfiguration(data);\n// Act\n- var areOrganizationsSupported = config.IsUserOnWhitelist(user);\n- var shouldTransform = config.ShouldUserTransformIntoOrganization(user);\n+ var whitelistValue = GetWhitelistValue(config, null);\n// Assert\n- Assert.Equal(isOnWhiteList || isOnDomainList, areOrganizationsSupported);\n- Assert.Equal(isOnTransformList, shouldTransform);\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.OrganizationsEnabledForAll, data.IsWrongCase);\n+ }\n+ }\n+\n+ public class TheIsUserOnWhitelistMethod : WhitelistBaseMethod\n+ {\n+ public static IEnumerable<object[]> ReturnsAsExpectedWhenNonNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n+\n+ public override bool GetExpectedValueForNonNull(WhitelistMethodData data)\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+ {\n+ return false;\n+ }\n+\n+ protected override bool GetWhitelistValue(ILoginDiscontinuationConfiguration config, User user)\n+ {\n+ return config.IsUserOnWhitelist(user);\n+ }\n+ }\n+\n+ public class TheShouldUserTransformIntoOrganizationMethod : WhitelistBaseMethod\n+ {\n+ public static IEnumerable<object[]> ReturnsAsExpectedWhenNonNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n+\n+ public override bool GetExpectedValueForNonNull(WhitelistMethodData data)\n+ {\n+ return data.IsOnTransformList;\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- public void ReturnsFalseWhenNull()\n+ protected override bool GetWhitelistValue(ILoginDiscontinuationConfiguration config, User user)\n{\n- var config = new LoginDiscontinuationConfiguration();\n+ return config.ShouldUserTransformIntoOrganization(user);\n+ }\n+ }\n- var areOrganizationsSupported = config.IsUserOnWhitelist(null);\n- var shouldTransform = config.ShouldUserTransformIntoOrganization(null);\n+ public class TheAreOrganizationsSupportedForUserMethodData : WhitelistMethodData\n+ {\n+ public bool HasOrganization { get; }\n- Assert.False(areOrganizationsSupported);\n- Assert.False(shouldTransform);\n+ public TheAreOrganizationsSupportedForUserMethodData(object[] data, bool hasOrganization)\n+ : base(data)\n+ {\n+ HasOrganization = hasOrganization;\n+ }\n+ }\n+\n+ public class TheAreOrganizationsSupportedForUserMethod : WhitelistBaseMethod\n+ {\n+ protected override User GetUser(WhitelistMethodData data)\n+ {\n+ var user = base.GetUser(data);\n+ if ((data as TheAreOrganizationsSupportedForUserMethodData).HasOrganization)\n+ {\n+ user.Organizations = new[] { new Membership() };\n+ }\n+\n+ return user;\n+ }\n+\n+ public static IEnumerable<object[]> ReturnsAsExpectedWhenNonNull_Data =>\n+ PossibleListStates.SelectMany(data =>\n+ new[] { false, true }\n+ .Select(hasOrganization =>\n+ MemberDataHelper.AsData(\n+ new TheAreOrganizationsSupportedForUserMethodData(data, hasOrganization))));\n+\n+ public override bool GetExpectedValueForNonNull(WhitelistMethodData data)\n+ {\n+ return data.OrganizationsEnabledForAll ||\n+ (data as TheAreOrganizationsSupportedForUserMethodData).HasOrganization ||\n+ new TheIsUserOnWhitelistMethod().GetExpectedValueForNonNull(data);\n+ }\n+\n+ public static IEnumerable<object[]> ReturnsFalseWhenNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n+\n+ public override bool GetExpectedValueForNull(WhitelistMethodData data)\n+ {\n+ return data.OrganizationsEnabledForAll;\n+ }\n+\n+ protected override bool GetWhitelistValue(ILoginDiscontinuationConfiguration config, User user)\n+ {\n+ return config.AreOrganizationsSupportedForUser(user);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -1197,8 +1197,13 @@ public async Task ThrowsArgumentExceptionForNullUser()\n}\n}\n- public class TheCanTransformToOrganizationMethod\n+ public class TheCanTransformToOrganizationBaseMethod\n{\n+ protected virtual bool Invoke(TestableUserService service, User accountToTransform, out string errorReason)\n+ {\n+ return service.CanTransformUserToOrganization(accountToTransform, out errorReason);\n+ }\n+\n[Fact]\npublic void WhenAccountIsNotConfirmed_ReturnsFalse()\n{\n@@ -1207,8 +1212,7 @@ public void WhenAccountIsNotConfirmed_ReturnsFalse()\nvar unconfirmedUser = new User() { UnconfirmedEmailAddress = \"unconfirmed@example.com\" };\n// Act\n- string errorReason;\n- var result = service.CanTransformUserToOrganization(unconfirmedUser, out errorReason);\n+ var result = Invoke(service, unconfirmedUser, out var errorReason);\n// Assert\nAssert.False(result);\n@@ -1224,8 +1228,7 @@ public void WhenAccountIsOrganization_ReturnsFalse()\nvar fakes = new Fakes();\n// Act\n- string errorReason;\n- var result = service.CanTransformUserToOrganization(fakes.Organization, out errorReason);\n+ var result = Invoke(service, fakes.Organization, out var errorReason);\n// Assert\nAssert.False(result);\n@@ -1241,8 +1244,7 @@ public void WhenAccountHasMemberships_ReturnsFalse()\nvar fakes = new Fakes();\n// Act\n- string errorReason;\n- var result = service.CanTransformUserToOrganization(fakes.OrganizationCollaborator, out errorReason);\n+ var result = Invoke(service, fakes.OrganizationCollaborator, out var errorReason);\n// Assert\nAssert.False(result);\n@@ -1251,24 +1253,66 @@ public void WhenAccountHasMemberships_ReturnsFalse()\n}\n[Fact]\n- public void WhenAccountIsInWhitelist_ReturnsTrue()\n+ public void WhenAccountDoesNotSupportOrganizations_ReturnsFalse()\n{\n// Arrange\nvar service = new TestableUserService();\nvar fakes = new Fakes();\nvar user = fakes.User;\n+ var passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n+ passwordConfigMock\n+ .Setup(x => x.AreOrganizationsSupportedForUser(user))\n+ .Returns(false);\n+\n+ service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(passwordConfigMock.Object);\n+\n// Act\n- string errorReason;\n- var result = service.CanTransformUserToOrganization(user, out errorReason);\n+ var result = Invoke(service, user, out var errorReason);\n+\n+ // Assert\n+ Assert.False(result);\n+ Assert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n+ Strings.Organizations_NotSupportedForAccount, user.Username));\n+ }\n+ }\n+\n+ public class TheCanTransformToOrganizationMethod : TheCanTransformToOrganizationBaseMethod\n+ {\n+ [Fact]\n+ public void WhenAccountSupportsOrganizations_ReturnsTrue()\n+ {\n+ // Arrange\n+ var service = new TestableUserService();\n+ var fakes = new Fakes();\n+ var user = fakes.User;\n+\n+ var passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n+ passwordConfigMock\n+ .Setup(x => x.AreOrganizationsSupportedForUser(user))\n+ .Returns(true);\n+\n+ service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(passwordConfigMock.Object);\n+\n+ // Act\n+ var result = Invoke(service, user, out var errorReason);\n// Assert\nAssert.True(result);\n}\n}\n- public class TheCanTransformToOrganizationWithAdminMethod\n+ public class TheCanTransformToOrganizationWithAdminMethod : TheCanTransformToOrganizationBaseMethod\n{\n+ protected override bool Invoke(TestableUserService service, User accountToTransform, out string errorReason)\n+ {\n+ return service.CanTransformUserToOrganization(accountToTransform, null, out errorReason);\n+ }\n+\n[Fact]\npublic void WhenAdminMatchesAccountToTransform_ReturnsFalse()\n{\n@@ -1277,6 +1321,15 @@ public void WhenAdminMatchesAccountToTransform_ReturnsFalse()\nvar fakes = new Fakes();\nvar user = fakes.User;\n+ var passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n+ passwordConfigMock\n+ .Setup(x => x.AreOrganizationsSupportedForUser(user))\n+ .Returns(true);\n+\n+ service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(passwordConfigMock.Object);\n+\n// Act\nstring errorReason;\nvar result = service.CanTransformUserToOrganization(user, user, out errorReason);\n@@ -1296,6 +1349,15 @@ public void WhenAdminIsNotConfirmed_ReturnsFalse()\nvar unconfirmedUser = new User() { UnconfirmedEmailAddress = \"unconfirmed@example.com\" };\nvar user = fakes.User;\n+ var passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n+ passwordConfigMock\n+ .Setup(x => x.AreOrganizationsSupportedForUser(user))\n+ .Returns(true);\n+\n+ service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(passwordConfigMock.Object);\n+\n// Act\nstring errorReason;\nvar result = service.CanTransformUserToOrganization(user, unconfirmedUser, out errorReason);\n@@ -1315,6 +1377,15 @@ public void WhenAdminIsOrganization_ReturnsFalse()\nvar user = fakes.User;\nvar organization = fakes.Organization;\n+ var passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n+ passwordConfigMock\n+ .Setup(x => x.AreOrganizationsSupportedForUser(user))\n+ .Returns(true);\n+\n+ service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(passwordConfigMock.Object);\n+\n// Act\nstring errorReason;\nvar result = service.CanTransformUserToOrganization(user, organization, out errorReason);\n@@ -1531,6 +1602,18 @@ public class TheAddOrganizationAccountMethod\nprivate TestableUserService _service = new TestableUserService();\n+ [Fact]\n+ public async Task WithUserNotSupportedForOrganizations_ThrowsEntityException()\n+ {\n+ SetupOrganizationsSupportedForUser(supported: false);\n+ var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization());\n+ Assert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.Organizations_NotSupportedForAccount, AdminName), exception.Message);\n+\n+ _service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Never());\n+ _service.MockSecurityPolicyService.Verify(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false), Times.Never());\n+ _service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Never());\n+ }\n+\n[Fact]\npublic async Task WithUsernameConflict_ThrowsEntityException()\n{\n@@ -1540,6 +1623,8 @@ public async Task WithUsernameConflict_ThrowsEntityException()\n.Setup(x => x.Users)\n.Returns(new[] { new User(conflictUsername) }.MockDbSet().Object);\n+ SetupOrganizationsSupportedForUser();\n+\nvar exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(orgName: conflictUsername));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.UsernameNotAvailable, conflictUsername), exception.Message);\n@@ -1557,6 +1642,8 @@ public async Task WithEmailConflict_ThrowsEntityException()\n.Setup(x => x.Users)\n.Returns(new[] { new User(\"user\") { EmailAddress = conflictEmail } }.MockDbSet().Object);\n+ SetupOrganizationsSupportedForUser();\n+\nvar exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(orgEmail: conflictEmail));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.EmailAddressBeingUsed, conflictEmail), exception.Message);\n@@ -1572,6 +1659,8 @@ public async Task WhenAdminHasNoTenant_ReturnsNewOrgWithoutPolicy()\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+ SetupOrganizationsSupportedForUser();\n+\nvar org = await InvokeAddOrganization(admin: new User(AdminName) { Credentials = new Credential[0] });\nAssertNewOrganizationReturned(org, subscribedToPolicy: false);\n@@ -1589,6 +1678,10 @@ public async Task WhenAdminHasUnsupportedTenant_ReturnsNewOrgWithoutPolicy()\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n.Returns(false);\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == AdminName)))\n+ .Returns(true);\n+\n_service.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\n@@ -1610,6 +1703,10 @@ public async Task WhenSubscribingToPolicyFails_ReturnsNewOrgWithoutPolicy()\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n.Returns(true);\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == AdminName)))\n+ .Returns(true);\n+\n_service.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\n@@ -1635,6 +1732,10 @@ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n.Returns(true);\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == AdminName)))\n+ .Returns(true);\n+\n_service.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\n@@ -1691,6 +1792,18 @@ private void AssertNewOrganizationReturned(Organization org, bool subscribedToPo\nsubscribedToPolicy ? Times.Once() : Times.Never());\n_service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Once());\n}\n+\n+ private void SetupOrganizationsSupportedForUser(string adminUsername = null, bool supported = true)\n+ {\n+ adminUsername = adminUsername ?? AdminName;\n+\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == adminUsername)))\n+ .Returns(supported);\n+\n+ _service.MockConfigObjectService.Setup(x => x.LoginDiscontinuationConfiguration).Returns(mockLoginDiscontinuationConfiguration.Object);\n+ }\n}\npublic class TheRejectTransformUserToOrganizationRequestMethod\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add organizations feature flag (#5772)
|
455,776 |
09.04.2018 15:34:21
| 25,200 |
7881a236327be7a0d8e047ee63100e16bfa2e085
|
[Organizations] Functional tests should verify that collaborators can push new IDs
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"diff": "@@ -92,19 +92,15 @@ public async Task UploadAndUnlistPackagesAsOrganizationCollaborator()\n{\nvar apiKey = EnvironmentSettings.TestOrganizationCollaboratorAccountApiKey;\n- // Cannot push new package ID as organization\n- await _clientSdkHelper.UploadNewPackage(\n- UploadHelper.GetUniquePackageId(nameof(UploadAndUnlistPackagesAsOrganizationCollaborator)),\n- success: false,\n- apiKey: apiKey);\n+ // Can push new package ID as organization\n+ var id = UploadHelper.GetUniquePackageId(nameof(UploadAndUnlistPackagesAsOrganizationCollaborator));\n+ await _clientSdkHelper.UploadNewPackageAndVerify(id, \"1.0.0\", apiKey: apiKey);\n// Can push new version of an existing package as organization\n- var id = Constants.TestOrganizationCollaboratorPackageId;\n- var version = UploadHelper.GetUniquePackageVersion();\n- await _clientSdkHelper.UploadNewPackageAndVerify(id, version, apiKey: apiKey);\n+ await _clientSdkHelper.UploadNewPackageAndVerify(id, \"2.0.0\", apiKey: apiKey);\n// Can unlist versions of an existing package as organization\n- await _clientSdkHelper.UnlistPackageAndVerify(id, version, apiKey);\n+ await _clientSdkHelper.UnlistPackageAndVerify(id, \"2.0.0\", apiKey);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.P0/UploadAndDownload/UploadPackageToOrganizationAsCollaboratorFromUI.cs",
"new_path": "tests/NuGetGallery.WebUITests.P0/UploadAndDownload/UploadPackageToOrganizationAsCollaboratorFromUI.cs",
"diff": "@@ -11,12 +11,17 @@ namespace NuGetGallery.FunctionalTests.WebUITests.UploadAndDownload\n/// </summary>\npublic class UploadPackageToOrganizationAsCollaboratorFromUI : UploadPackageFromUI\n{\n+ private static string Owner = EnvironmentSettings.TestOrganizationCollaboratorAccountName;\n+\n+ private string _id = UploadHelper.GetUniquePackageId(nameof(UploadPackageToOrganizationAsCollaboratorFromUI));\n+\npublic override IEnumerable<UploadHelper.PackageToUpload> PackagesToUpload => new[]\n{\n+ // Upload new registration\n+ new UploadHelper.PackageToUpload(id: _id, version: \"1.0.0\", owner: Owner),\n+\n// Upload new version of existing registration\n- new UploadHelper.PackageToUpload(\n- id: Constants.TestOrganizationCollaboratorPackageId,\n- owner: EnvironmentSettings.TestOrganizationCollaboratorAccountName)\n+ new UploadHelper.PackageToUpload(id: _id, version: \"2.0.0\", owner: Owner)\n};\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Functional tests should verify that collaborators can push new IDs (#5785)
|
455,776 |
09.04.2018 23:05:19
| 25,200 |
eeeb76617b856fa6bd5cc8dde8fb5baa675aa1d5
|
[Organizations] Allow collaborators to create API keys scoped to an organization with the ability to push new IDs
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -778,9 +778,8 @@ public virtual async Task<JsonResult> GenerateApiKey(string description, string\nreturn Json(Strings.UserNotFound);\n}\n- // todo: move validation logic to PermissionsService\nvar resolvedScopes = BuildScopes(scopeOwner, scopes, subjects);\n- if (!VerifyScopes(scopeOwner, resolvedScopes))\n+ if (!VerifyScopes(resolvedScopes))\n{\nResponse.StatusCode = (int)HttpStatusCode.BadRequest;\nreturn Json(Strings.ApiKeyScopesNotAllowed);\n@@ -855,30 +854,58 @@ private async Task<CredentialViewModel> GenerateApiKeyInternal(string descriptio\nreturn credentialViewModel;\n}\n- // todo: integrate verification logic into PermissionsService.\n- private bool VerifyScopes(User scopeOwner, IEnumerable<Scope> scopes)\n+ private static IDictionary<string, IActionRequiringEntityPermissions[]> AllowedActionToActionRequiringEntityPermissionsMap = new Dictionary<string, IActionRequiringEntityPermissions[]>\n{\n- var currentUser = GetCurrentUser();\n+ { NuGetScopes.PackagePush, new IActionRequiringEntityPermissions[] { ActionsRequiringPermissions.UploadNewPackageId, ActionsRequiringPermissions.UploadNewPackageVersion } },\n+ { NuGetScopes.PackagePushVersion, new [] { ActionsRequiringPermissions.UploadNewPackageVersion } },\n+ { NuGetScopes.PackageUnlist, new [] { ActionsRequiringPermissions.UnlistOrRelistPackage } },\n+ { NuGetScopes.PackageVerify, new [] { ActionsRequiringPermissions.VerifyPackage } },\n+ };\n- // scoped to the user\n- if (currentUser.MatchesUser(scopeOwner))\n+ private bool VerifyScopes(IEnumerable<Scope> scopes)\n{\n- return true;\n+ if (!scopes.Any())\n+ {\n+ // All API keys must have at least one scope.\n+ return false;\n}\n- // scoped to the user's organization\n- else\n+\n+ foreach (var scope in scopes)\n+ {\n+ if (string.IsNullOrEmpty(scope.AllowedAction))\n+ {\n+ // All scopes must have an allowed action.\n+ return false;\n+ }\n+\n+ // Get the list of actions allowed by this scope.\n+ var actions = new List<IActionRequiringEntityPermissions>();\n+ foreach (var allowedAction in AllowedActionToActionRequiringEntityPermissionsMap.Keys)\n{\n- var organization = currentUser.Organizations\n- .Where(o => o.Organization.MatchesUser(scopeOwner))\n- .FirstOrDefault();\n- if (organization != null)\n+ if (scope.AllowsActions(allowedAction))\n{\n- return organization.IsAdmin || !scopes.Any(s => s.AllowsActions(NuGetScopes.PackagePush));\n+ actions.AddRange(AllowedActionToActionRequiringEntityPermissionsMap[allowedAction]);\n+ }\n}\n+\n+ if (!actions.Any())\n+ {\n+ // A scope should allow at least one action.\n+ return false;\n}\n+ foreach (var action in actions)\n+ {\n+ if (!action.IsAllowedOnBehalfOfAccount(GetCurrentUser(), scope.Owner))\n+ {\n+ // The user must be able to perform the actions allowed by the scope on behalf of the scope's owner.\nreturn false;\n}\n+ }\n+ }\n+\n+ return true;\n+ }\nprivate IList<Scope> BuildScopes(User scopeOwner, string[] scopes, string[] subjects)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IActionRequiringEntityPermissions.cs",
"new_path": "src/NuGetGallery/Services/IActionRequiringEntityPermissions.cs",
"diff": "namespace NuGetGallery\n{\n- public interface IActionRequiringEntityPermissions<TEntity>\n+ public interface IActionRequiringEntityPermissions\n{\n/// <summary>\n/// Determines whether <paramref name=\"currentUser\"/> can perform this action on an arbitrary <see cref=\"TEntity\"/> on behalf of <paramref name=\"account\"/>.\n@@ -19,7 +19,10 @@ public interface IActionRequiringEntityPermissions<TEntity>\n/// </summary>\n/// <returns>True if and only if <paramref name=\"currentPrincipal\"/> can perform this action on an arbitrary <see cref=\"TEntity\"/> on behalf of <paramref name=\"account\"/>.</returns>\nbool IsAllowedOnBehalfOfAccount(IPrincipal currentPrincipal, User account);\n+ }\n+ public interface IActionRequiringEntityPermissions<TEntity> : IActionRequiringEntityPermissions\n+ {\n/// <summary>\n/// Determines whether <paramref name=\"currentUser\"/> can perform this action on <paramref name=\"entity\"/> on behalf of <paramref name=\"account\"/>.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -595,32 +595,24 @@ public static IEnumerable<object[]> WhenScopeOwnerDoesNotMatch_ReturnsBadRequest\n[Theory]\n[MemberData(nameof(WhenScopeOwnerDoesNotMatch_ReturnsBadRequest_Data))]\n- public Task WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(Func<Fakes, User> getCurrentUser)\n+ public async Task WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar fakes = new Fakes();\nvar currentUser = getCurrentUser(fakes);\nvar userInOwnerScope = fakes.ShaUser;\n- return WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(currentUser, userInOwnerScope);\n- }\n-\n- private async Task WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(User currentUser, User userInOwnerScope)\n- {\n- // Arrange\n- var user = currentUser;\n- var otherUser = userInOwnerScope;\nGetMock<IUserService>()\n- .Setup(u => u.FindByUsername(otherUser.Username))\n- .Returns(otherUser);\n+ .Setup(u => u.FindByUsername(userInOwnerScope.Username))\n+ .Returns(userInOwnerScope);\nvar controller = GetController<UsersController>();\n- controller.SetCurrentUser(user);\n+ controller.SetCurrentUser(currentUser);\n// Act\nvar result = await controller.GenerateApiKey(\ndescription: \"theApiKey\",\n- owner: otherUser.Username,\n+ owner: userInOwnerScope.Username,\nscopes: new[] { NuGetScopes.PackagePush },\nsubjects: new[] { \"*\" },\nexpirationInDays: null);\n@@ -630,12 +622,27 @@ private async Task WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(User currentUser\nAssert.True(string.Compare((string)result.Data, Strings.ApiKeyScopesNotAllowed) == 0);\n}\n+ public static IEnumerable<object[]> WhenScopeOwnerMatchesOrganizationWithPermission_ReturnsSuccess_Data\n+ {\n+ get\n+ {\n+ foreach (var isAdmin in new[] { false, true })\n+ {\n+ foreach (var scope in new[] {\n+ NuGetScopes.All,\n+ NuGetScopes.PackagePush,\n+ NuGetScopes.PackagePushVersion,\n+ NuGetScopes.PackageUnlist,\n+ NuGetScopes.PackageVerify })\n+ {\n+ yield return MemberDataHelper.AsData(isAdmin, scope);\n+ }\n+ }\n+ }\n+ }\n+\n[Theory]\n- [InlineData(true, NuGetScopes.PackagePush)]\n- [InlineData(true, NuGetScopes.PackagePushVersion)]\n- [InlineData(true, NuGetScopes.PackageUnlist)]\n- [InlineData(false, NuGetScopes.PackagePushVersion)]\n- [InlineData(false, NuGetScopes.PackageUnlist)]\n+ [MemberData(nameof(WhenScopeOwnerMatchesOrganizationWithPermission_ReturnsSuccess_Data))]\npublic async Task WhenScopeOwnerMatchesOrganizationWithPermission_ReturnsSuccess(bool isAdmin, string scope)\n{\n// Arrange\n@@ -673,57 +680,6 @@ public async Task WhenScopeOwnerMatchesOrganizationWithPermission_ReturnsSuccess\nAssert.NotNull(apiKey);\n}\n- [Theory]\n- [InlineData(false, NuGetScopes.PackagePush)]\n- public async Task WhenScopeOwnerMatchesOrganizationWithoutPermission_ReturnsFailure(bool isAdmin, string scope)\n- {\n- // Arrange\n- var fakes = new Fakes();\n- var user = isAdmin ? fakes.OrganizationAdmin : fakes.OrganizationCollaborator;\n- var orgUser = fakes.Organization;\n- GetMock<IUserService>()\n- .Setup(u => u.FindByUsername(orgUser.Username))\n- .Returns(orgUser);\n-\n- var controller = GetController<UsersController>();\n- controller.SetCurrentUser(user);\n-\n- // Arrange & Act\n- var result = await controller.GenerateApiKey(\n- description: \"theApiKey\",\n- owner: orgUser.Username,\n- scopes: new[] { scope },\n- subjects: new[] { \"*\" },\n- expirationInDays: null);\n-\n- // Assert\n- Assert.Equal((int)HttpStatusCode.BadRequest, controller.Response.StatusCode);\n- Assert.True(string.Compare((string)result.Data, Strings.ApiKeyScopesNotAllowed) == 0);\n- }\n-\n- private async Task<JsonResult> GenerateApiKeyForOrganization(bool isAdmin, string scope)\n- {\n- // Arrange\n- var fakes = new Fakes();\n- var user = fakes.User;\n- var orgUser = fakes.Organization;\n- orgUser.Organizations.First().IsAdmin = isAdmin;\n- GetMock<IUserService>()\n- .Setup(u => u.FindByUsername(orgUser.Username))\n- .Returns(orgUser);\n-\n- var controller = GetController<UsersController>();\n- controller.SetCurrentUser(user);\n-\n- // Act\n- return await controller.GenerateApiKey(\n- description: \"theApiKey\",\n- owner: orgUser.Username,\n- scopes: new[] { scope },\n- subjects: new[] { \"*\" },\n- expirationInDays: null);\n- }\n-\n[InlineData(180, 180)]\n[InlineData(700, 365)]\n[InlineData(-1, 365)]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Allow collaborators to create API keys scoped to an organization with the ability to push new IDs (#5784)
|
455,736 |
09.04.2018 11:57:32
| 25,200 |
b373d3d2ea46a0f634d24948f8662065741d2ae3
|
Use JavaScript module pattern and 'use strict';
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"new_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"diff": "@@ -129,8 +129,7 @@ private static void BundlingPostStart()\n.Include(\"~/Scripts/jquery.validate.js\")\n.Include(\"~/Scripts/jquery.validate.unobtrusive.js\")\n.Include(\"~/Scripts/jquery.timeago.js\")\n- .Include(\"~/Scripts/nugetgallery.js\")\n- .Include(\"~/Scripts/stats.js\");\n+ .Include(\"~/Scripts/nugetgallery.js\");\nBundleTable.Bundles.Add(scriptBundle);\n// Modernizr needs to be delivered at the top of the page but putting it in a bundle gets us a cache-buster.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"packages.config\">\n<SubType>Designer</SubType>\n</Content>\n- <Content Include=\"Scripts\\statsgraphs.js\" />\n<Content Include=\"Scripts\\nugetgallery.js\" />\n- <Content Include=\"Scripts\\stats.js\" />\n<Content Include=\"Scripts\\gallery\\**\\*\" />\n<Content Include=\"Web.config\">\n<SubType>Designer</SubType>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/clamp.js",
"new_path": "src/NuGetGallery/Scripts/gallery/clamp.js",
"diff": "*/\n(function(root, factory) {\n+ 'use strict';\nif (typeof define === 'function' && define.amd) {\n// AMD\ndefine([], factory);\nroot.$clamp = factory();\n}\n}(this, function() {\n+ 'use strict';\n/**\n* Clamps a text node.\n* @param {HTMLElement} element. Element containing the text node to clamp.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "window.nuget = nuget;\ninitializeJQueryValidator();\n-})();\n$(function () {\n// Use moment.js to format attributes with the \"datetime\" attribute to \"X time ago\".\n@@ -365,3 +364,5 @@ $(function () {\n}\n});\n});\n+}());\n+\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Use JavaScript module pattern and 'use strict'; (#5786)
Address https://github.com/NuGet/Engineering/issues/1313
|
455,737 |
11.04.2018 12:34:45
| 25,200 |
cbcf66cf36e2a688bf0b029ffe6a26cfe2e94ee5
|
[Hotfix]Correct a typo in the CSP header.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<httpProtocol>\n<customHeaders>\n<remove name=\"X-Powered-By\" />\n- <add name=\"Content-Security-Policy\" value=\"frame-ancestor 'none'\"/>\n+ <add name=\"Content-Security-Policy\" value=\"frame-ancestors 'none'\"/>\n<add name=\"X-Frame-Options\" value=\"deny\" />\n<add name=\"X-XSS-Protection\" value=\"1; mode=block\" />\n<add name=\"X-Content-Type-Options\" value=\"nosniff\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Hotfix]Correct a typo in the CSP header.
|
455,733 |
11.04.2018 12:47:31
| 25,200 |
3c5a43c9ae205f8fb3352cd54a8ca2336df5bb95
|
Add alternate install command for global tools packages on the packages page
Don't display the tabs for managers that are not global tools compatible.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageManagerViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageManagerViewModel.cs",
"diff": "@@ -27,5 +27,22 @@ public class PackageManagerViewModel\n/// A string that represents the command used to install a specific package.\n/// </summary>\npublic string InstallPackageCommand { get; set; }\n+\n+ /// <summary>\n+ /// The alert message that contains clarifications about the command/scenario\n+ /// </summary>\n+ public string AlertMessage { get; set; }\n+\n+ /// <summary>\n+ /// The level with which the above message will be displayed.\n+ /// </summary>\n+ public AlertLevel AlertLevel { get; set; }\n+ }\n+\n+ public enum AlertLevel\n+ {\n+ None,\n+ Info,\n+ Warning\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": "@@ -43,6 +43,7 @@ public PackageViewModel(Package package)\nLatestStableVersionSemVer2 = package.IsLatestStableSemVer2;\nLastUpdated = package.Published;\nListed = package.Listed;\n+ IsDotnetToolPackageType = package.PackageTypes.Any(e => e.Name.Equals(\"DotnetTool\", StringComparison.OrdinalIgnoreCase));\n_packageStatus = package.PackageStatusKey;\nDownloadCount = package.DownloadCount;\nPrerelease = package.IsPrerelease;\n@@ -71,6 +72,7 @@ public PackageViewModel(Package package)\npublic bool Prerelease { get; set; }\npublic int DownloadCount { get; set; }\npublic bool Listed { get; set; }\n+ public bool IsDotnetToolPackageType { get; set; }\npublic bool FailedValidation => _packageStatus == PackageStatus.FailedValidation;\npublic bool Available => _packageStatus == PackageStatus.Available;\npublic bool Validating => _packageStatus == PackageStatus.Validating;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ThirdPartyPackageManagerViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ThirdPartyPackageManagerViewModel.cs",
"diff": "@@ -14,5 +14,12 @@ public class ThirdPartyPackageManagerViewModel : PackageManagerViewModel\n/// for support.\n/// </summary>\npublic string ContactUrl { get; set; }\n+\n+ public ThirdPartyPackageManagerViewModel(string contactUrl)\n+ {\n+ ContactUrl = contactUrl;\n+ AlertLevel = AlertLevel.Warning;\n+ AlertMessage = string.Format(\"The NuGet Team does not provide support for this client. Please contact its <a href=\\\"{0}\\\">maintainers</a> for support.\", contactUrl);\n+ }\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": "var absolutePackageUrl = Url.Absolute(Url.Package(Model.Id));\n- var packageManagers = new PackageManagerViewModel[]\n+ PackageManagerViewModel[] packageManagers;\n+\n+ if (Model.IsDotnetToolPackageType)\n+ {\n+ packageManagers = new PackageManagerViewModel[]\n+ {\n+ new PackageManagerViewModel()\n+ {\n+ Id = \"dotnet-cli\",\n+ Name = \".NET CLI\",\n+ CommandPrefix = \"> \",\n+ InstallPackageCommand = string.Format(\"dotnet tool install --global {0} --version {1}\", Model.Id, Model.Version),\n+ AlertLevel = AlertLevel.Info,\n+ AlertMessage = string.Format(\"This package contains a <a href=\\\"{0}\\\">.NET Core Global Tool</a> you can call from the shell/command line.\", \"https://aka.ms/global-tools\"),\n+ }\n+ };\n+ }\n+ else\n+ {\n+ packageManagers = new PackageManagerViewModel[]\n{\nnew PackageManagerViewModel()\n{\nInstallPackageCommand = string.Format(\"dotnet add package {0} --version {1}\", Model.Id, Model.Version)\n},\n- new ThirdPartyPackageManagerViewModel()\n+ new ThirdPartyPackageManagerViewModel(\"https://fsprojects.github.io/Paket/contact.html\")\n{\nId = \"paket-cli\",\nName = \"Paket CLI\",\nCommandPrefix = \"> \",\nInstallPackageCommand = string.Format(\"paket add {0} --version {1}\", Model.Id, Model.Version),\n- ContactUrl = \"https://fsprojects.github.io/Paket/contact.html\"\n- },\n+ }\n};\n}\n+}\n+\n@section SocialMeta {\n@if (!String.IsNullOrWhiteSpace(ViewBag.FacebookAppID))\n{\n</button>\n</div>\n</div>\n- @if (thirdPartyPackageManager != null)\n+\n+ @switch (packageManager.AlertLevel)\n{\n+ case AlertLevel.Info:\n+ @ViewHelpers.AlertInfo(\n+ @<text>\n+ @Html.Raw(packageManager.AlertMessage)\n+ </text>);\n+ break;\n+ case AlertLevel.Warning:\n@ViewHelpers.AlertWarning(\n@<text>\n- The NuGet Team does not provide support for this client.\n- Please contact its <a href=\"@thirdPartyPackageManager.ContactUrl\">maintainers</a> for support.\n- </text>)\n+ @Html.Raw(packageManager.AlertMessage)\n+ </text>);\n+ break;\n+ default:\n+ break;\n}\n</div>\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add alternate install command for global tools packages on the packages page (#5684)
Don't display the tabs for managers that are not global tools compatible.
|
455,751 |
11.04.2018 18:08:15
| 25,200 |
e2ddf4f20a5d7b371f00d5c0da8da8be86a76232
|
GA - obfuscate ip and user names
Obfuscate the GA data and ip.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Filters\\UIAuthorizeAttribute.cs\" />\n<Compile Include=\"GlobalSuppressions.cs\" />\n<Compile Include=\"Helpers\\GravatarHelper.cs\" />\n+ <Compile Include=\"Helpers\\ObfuscationHelper.cs\" />\n<Compile Include=\"Helpers\\PermissionsHelpers.cs\" />\n<Compile Include=\"Helpers\\RegexEx.cs\" />\n<Compile Include=\"Helpers\\RouteUrlTemplate.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Extensions\\OrganizationExtensionsFacts.cs\" />\n<Compile Include=\"Filters\\UIAuthorizeAttributeFacts.cs\" />\n<Compile Include=\"Framework\\MemberDataHelper.cs\" />\n+ <Compile Include=\"Helpers\\ObfuscationHelperFacts.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
|
GA - obfuscate ip and user names (#5791)
Obfuscate the GA data and ip.
|
455,776 |
16.04.2018 14:48:07
| 25,200 |
2b868e99a2752b1c60ff61f11f8f8b02924a6a1f
|
[Organizations] More UI fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1055,32 +1055,26 @@ img.reserved-indicator-icon {\n.manage-members-listing tbody:first-child {\nborder-style: hidden;\n}\n-.members-list {\n- margin-top: 15px;\n-}\n.members-list .manage-members-listing {\nmargin-bottom: 0;\n}\n-.members-list .manage-members-listing .heading-left {\n- padding-left: 5px;\n-}\n-.members-list .manage-members-listing .heading-right {\n- padding-right: 5px;\n-}\n-.members-list .manage-members-listing .icon-left {\n- padding-left: 25px;\n-}\n-.members-list .manage-members-listing .icon-right {\n- padding-right: 20px;\n+.members-list .manage-members-listing .alert-container .alert {\n+ margin-top: 0;\n}\n.members-list .manage-members-listing .role-description {\n- margin-top: 15px;\n+ margin-top: 25px;\nmargin-bottom: 25px;\n}\n-.members-list .manage-members-listing .alert {\n- margin-bottom: 5px;\n+.members-list .manage-members-listing .member-item hr {\n+ margin-top: 8px;\n+ margin-bottom: 8px;\n+}\n+.members-list .manage-members-listing .member-item .member-column {\n+ display: table;\n+ height: 36px;\n}\n-.members-list .manage-members-listing .row-center {\n+.members-list .manage-members-listing .member-item .member-column div {\n+ display: table-cell;\nvertical-align: middle;\n}\n.page-manage-owners h2 .ms-Icon {\n@@ -1123,6 +1117,9 @@ img.reserved-indicator-icon {\n.page-manage-owners .current-owner .remove-owner-disabled .icon-link:hover span {\ntext-decoration: none;\n}\n+.page-manage-packages .organizations-divider {\n+ color: #dbdbdb;\n+}\n.page-manage-packages h1 {\nmargin-bottom: 0;\n}\n@@ -1130,6 +1127,9 @@ img.reserved-indicator-icon {\nmargin-top: 0;\nmargin-bottom: 10px;\n}\n+.page-manage-packages .organizations-empty {\n+ margin-top: 60px;\n+}\n.page-manage-packages .subtitle {\nmargin-top: 33px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-manage-organizations.less",
"new_path": "src/Bootstrap/less/theme/page-manage-organizations.less",
"diff": "}\n.members-list {\n- margin-top: 15px;\n-\n.manage-members-listing {\nmargin-bottom: 0;\n- .heading-left {\n- padding-left: 5px;\n- }\n-\n- .heading-right {\n- padding-right: 5px;\n+ .alert-container {\n+ .alert {\n+ margin-top: 0px;\n}\n-\n- .icon-left {\n- padding-left: 25px;\n- }\n-\n- .icon-right {\n- padding-right: 20px;\n}\n.role-description {\n- margin-top: 15px;\n+ margin-top: 25px;\nmargin-bottom: 25px;\n}\n- .alert {\n- margin-bottom: 5px;\n+ .member-item {\n+ hr {\n+ margin-top: 8px;\n+ margin-bottom: 8px;\n}\n- .row-center {\n+ .member-column {\n+ display: table;\n+ height: 36px;\n+\n+ div {\n+ display: table-cell;\nvertical-align: middle;\n}\n}\n}\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"new_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"diff": ".page-manage-packages {\n@section-margin-top: 40px;\n+ .organizations-divider {\n+ color: @gray-lighter;\n+ }\n+\nh1 {\nmargin-bottom: 0;\n}\nmargin-top: 0;\n}\n+ .organizations-empty {\n+ margin-top: 60px;\n+ }\n+\n.subtitle {\nmargin-top: 33px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"diff": "<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n@ViewHelpers.OrganizationsBreadcrumb(Url, CurrentUser, true, @<text>Add</text>)\n- <p class=\"text-center\">\n+ <p>\nOrganizations allow you to manage and publish packages as a team or a group. <a href=\"https://go.microsoft.com/fwlink/?linkid=870439\">Learn more.</a>\n</p>\n@if (errorMessage != null)\n<div class=\"form-group @Html.HasErrorFor(m => m.OrganizationName)\" id=\"@organizationNameTextGroupId\">\n@Html.ShowLabelFor(m => m.OrganizationName)\n@Html.ShowTextBoxFor(m => m.OrganizationName)\n- @Html.ShowValidationMessagesFor(m => m.OrganizationName)\n<span class=\"ms-font-s\">This will be your organization account on <i id=\"@organizationNameTextId\">@Url.User(\"{username}\", relativeUrl: false)</i>.</span>\n+ @Html.ShowValidationMessagesFor(m => m.OrganizationName)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.OrganizationEmailAddress)\" id=\"@emailBoxGroupId\">\n@Html.ShowLabelFor(m => m.OrganizationEmailAddress)\n@Html.ShowTextBoxFor(m => m.OrganizationEmailAddress)\n- @Html.ShowValidationMessagesFor(m => m.OrganizationEmailAddress)\n<span class=\"ms-font-s\">Users can contact your organization at this email address.</span>\n+ @Html.ShowValidationMessagesFor(m => m.OrganizationEmailAddress)\n</div>\n<div class=\"form-group row\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "<script type=\"text/html\" id=\"error-container\">\n<p class=\"role-description\" data-bind=\"visible: !Error()\">\n- <span data-bind=\"text: NewMemberRoleDescription\"></span>\n- <a href=\"https://go.microsoft.com/fwlink/?linkid=870439\">Learn more.</a>\n+ <span data-bind=\"text: NewMemberRoleDescription\"></span> <a href=\"https://go.microsoft.com/fwlink/?linkid=870439\">Learn more.</a>\n</p>\n<!-- ko if: Error -->\n@ViewHelpers.AlertDanger(@<text><span data-bind=\"html: Error\"></span></text>)\n<script type=\"text/html\" id=\"manage-members\">\n<div class=\"col-md-12 manage-members-listing\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n+ <div class=\"alert-container\">\n@if (Model.RequiresTenant)\n{\n@ViewHelpers.AlertInfo(@<text>Membership to this organization is restricted to users from the AAD tenant determined by its email address.</text>)\n}\n+ </div>\n@if (Model.CanManage)\n{\n<div class=\"input-group col-xs-12\">\n- <div class=\"col-xs-8 icon-left heading-right\">\n+ <div class=\"row\">\n+ <div class=\"col-xs-8\">\n<input id=\"new-member-textbox\" class=\"form-control\" placeholder=\"Add existing NuGet.org user\" data-bind=\"textInput: NewMemberUsername, submit: AddMember\" aria-label=\"Enter username to add member\" />\n</div>\n- <div class=\"col-xs-3 heading-left heading-right\">\n+ <div class=\"col-xs-3\">\n<select class=\"form-control\" data-bind=\"value: AddMemberRole, options: RoleNames\" aria-label=\"Select new member role\">\n</select>\n</div>\n- <div class=\"text-center align-middle col-xs-1\">\n+ <div class=\"text-right col-xs-1\">\n<button class=\"btn\" type=\"submit\" title=\"Add new member\" aria-label=\"Add new member\" data-bind=\"click: AddMember\">Add</button>\n</div>\n</div>\n- <div class=\"icon-left icon-right\" data-bind=\"template: 'error-container'\"></div>\n+ </div>\n+ <div data-bind=\"template: 'error-container'\"></div>\n}\n- <table class=\"table\">\n- <tbody data-bind=\"foreach: Members\">\n- <tr>\n- <td class=\"align-middle row-center icon-left hidden-xs col-xs-1\">\n+ <div class=\"member-item\" data-bind=\"foreach: Members\">\n+ <hr data-bind=\"visible: $index()\" />\n+ <div class=\"row\">\n+ <div class=\"col-xs-1 hidden-xs\">\n<img data-bind=\"attr: { src: GravatarUrl, title: Username }\" class=\"owner-image\" alt=\"gravatar\"\n- height=\"@Constants.GravatarElementSize\" width=\"@Constants.GravatarElementSize\">\n- </td>\n- <td class=\"align-middle heading-right row-center col-xs-8 col-sm-7\">\n+ height=\"36\" width=\"36\">\n+ </div>\n+ <div class=\"col-xs-8 col-sm-7 member-column\">\n+ <div>\n<a title=\"View Member Profile\" data-bind=\"attr: { href: ProfileUrl }\">\n<span data-bind=\"text: Username\"></span>\n</a>\n<!-- ko if: Pending -->\n<i>(pending)</i>\n<!-- /ko -->\n- </td>\n- <td class=\"align-middle heading-left heading-right row-center col-xs-3\">\n+ </div>\n+ </div>\n+ <div class=\"col-xs-3\">\n@if (Model.CanManage)\n{\n<select class=\"form-control\" aria-label=\"Change member role\"\n{\n<span data-bind=\"text: SelectedRole()\"></span>\n}\n- </td>\n+ </div>\n<!-- ko if: IsCurrentUser || @(Model.CanManage ? \"true\" : \"false\") -->\n- <td class=\"text-center align-middle heading-right row-center col-xs-1\">\n+ <div class=\"col-xs-1 text-right member-column\">\n+ <div>\n<span>\n<button class=\"btn-link\" data-bind=\"click: DeleteMember, attr: { 'aria-label': 'Delete Member' }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n</button>\n</span>\n- </td>\n+ </div>\n+ </div>\n<!-- /ko -->\n- </tr>\n- </tbody>\n- </table>\n+ </div>\n+ </div>\n</div>\n</div>\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"diff": "<div class=\"col-md-12\">\n<div class=\"breadcrumb-menu\">\n<div>\n- @ViewHelpers.BreadcrumbWithProfile(Url, CurrentUser, false, @<text>Organizations</text>)\n- </div>\n- <div>\n- @if (Model.Organizations.Any())\n- {\n- <form action=\"@Url.AddOrganization()\">\n- <input type=\"submit\" class=\"btn btn-primary\" value=\"Add new\" />\n- </form>\n- }\n+ @ViewHelpers.BreadcrumbWithProfile(\n+ Url,\n+ CurrentUser,\n+ false,\n+ @<text>Organizations <span aria-hidden=\"true\" class=\"ms-font-xxl organizations-divider\">|</span> <a href=\"@Url.AddOrganization()\">Add new</a></text>)\n</div>\n</div>\n<hr class=\"breadcrumb-divider\"/>\nvar orgCount = Model.Organizations.Count();\nvar orgCountString = orgCount > 1 ? orgCount + \" organizations\" : orgCount + \" organization\";\n- <div class=\"subtitle\">\n+ <div>\n<p>You have @(orgCountString).</p>\n</div>\n<table class=\"table user-package-list\">\n}\nelse\n{\n- <div class=\"subtitle text-center\">\n- <img width=\"260\" height=\"150\" alt=\"Learn to use packages\"\n+ <div class=\"organizations-empty text-center\">\n+ <img width=\"260\" height=\"150\" alt=\"You are not a member of any organizations\"\nsrc=\"~/Content/gallery/img/manage-organizations.svg\"\n@ViewHelpers.ImageFallback(Url.Absolute(\"~/Content/gallery/img/manage-organizations-260x150.png\")) />\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] More UI fixes (#5802)
|
455,794 |
17.04.2018 11:34:01
| 25,200 |
84d786b849faaab5175474449781e23480916d02
|
Use System.Net.Http from net46
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/packages.config",
"new_path": "src/NuGetGallery/packages.config",
"diff": "<package id=\"System.IO\" version=\"4.1.0\" targetFramework=\"net46\" />\n<package id=\"System.Linq\" version=\"4.1.0\" targetFramework=\"net46\" />\n<package id=\"System.Linq.Expressions\" version=\"4.1.0\" targetFramework=\"net46\" />\n- <package id=\"System.Net.Http\" version=\"4.1.0\" targetFramework=\"net46\" />\n<package id=\"System.Net.Primitives\" version=\"4.0.11\" targetFramework=\"net46\" />\n<package id=\"System.Reflection\" version=\"4.1.0\" targetFramework=\"net46\" />\n<package id=\"System.Reflection.Extensions\" version=\"4.0.1\" targetFramework=\"net46\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/App.config",
"new_path": "tests/NuGetGallery.Facts/App.config",
"diff": "<assemblyIdentity name=\"Microsoft.IdentityModel.Clients.ActiveDirectory\" publicKeyToken=\"31bf3856ad364e35\" culture=\"neutral\" />\n<bindingRedirect oldVersion=\"0.0.0.0-3.13.4.878\" newVersion=\"3.13.4.878\" />\n</dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Net.Http\" publicKeyToken=\"b03f5f7f11d50a3a\" culture=\"neutral\" />\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\" />\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Security.Cryptography.X509Certificates\" publicKeyToken=\"b03f5f7f11d50a3a\" culture=\"neutral\" />\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.0.0\" newVersion=\"4.1.0.0\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "</Reference>\n<Reference Include=\"System.IO.Compression\" />\n<Reference Include=\"System.Net\" />\n- <Reference Include=\"System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\System.Net.Http.4.3.0-beta-24431-01\\lib\\net46\\System.Net.Http.dll</HintPath>\n- <Private>True</Private>\n- </Reference>\n+ <Reference Include=\"System.Net.Http\" />\n<Reference Include=\"System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<SpecificVersion>False</SpecificVersion>\n<HintPath>..\\..\\packages\\Microsoft.Net.Http.2.2.29\\lib\\net45\\System.Net.Http.Extensions.dll</HintPath>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/packages.config",
"new_path": "tests/NuGetGallery.Facts/packages.config",
"diff": "<package id=\"System.Globalization\" version=\"4.0.11\" targetFramework=\"net46\" />\n<package id=\"System.IO\" version=\"4.1.0\" targetFramework=\"net46\" />\n<package id=\"System.Linq\" version=\"4.1.0\" targetFramework=\"net46\" />\n- <package id=\"System.Net.Http\" version=\"4.3.0-beta-24431-01\" targetFramework=\"net46\" />\n<package id=\"System.Net.Primitives\" version=\"4.0.11\" targetFramework=\"net46\" />\n<package id=\"System.Reflection\" version=\"4.1.0\" targetFramework=\"net46\" />\n<package id=\"System.Reflection.Extensions\" version=\"4.0.1\" targetFramework=\"net46\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Use System.Net.Http from net46 (#5808)
|
455,731 |
17.04.2018 13:02:17
| 25,200 |
bdcf7f50ca56fd3d60b3ab29178132a4d2e24883
|
Certificates: add migration for certificate registration
Contribute to
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -232,6 +232,9 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.MapLeftKey(\"PackageRegistrationKey\")\n.MapRightKey(\"UserKey\"));\n+ modelBuilder.Entity<PackageRegistration>()\n+ .HasOptional(pr => pr.RequiredSigner);\n+\nmodelBuilder.Entity<Package>()\n.HasKey(p => p.Key);\n@@ -250,6 +253,9 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.WithRequired(pt => pt.Package)\n.HasForeignKey(pt => pt.PackageKey);\n+ modelBuilder.Entity<Package>()\n+ .HasOptional(p => p.Certificate);\n+\nmodelBuilder.Entity<PackageHistory>()\n.HasKey(pm => pm.Key);\n@@ -332,6 +338,27 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\nIsUnique = true,\n}\n}));\n+\n+ modelBuilder.Entity<Certificate>()\n+ .Property(c => c.Sha1Thumbprint)\n+ .HasMaxLength(40)\n+ .HasColumnType(\"varchar\")\n+ .IsOptional();\n+\n+ modelBuilder.Entity<UserCertificate>()\n+ .HasKey(uc => uc.Key);\n+\n+ modelBuilder.Entity<User>()\n+ .HasMany(u => u.UserCertificates)\n+ .WithRequired(uc => uc.User)\n+ .HasForeignKey(uc => uc.UserKey)\n+ .WillCascadeOnDelete(true); // Deleting a User entity will also delete related UserCertificate entities.\n+\n+ modelBuilder.Entity<Certificate>()\n+ .HasMany(c => c.UserCertificates)\n+ .WithRequired(uc => uc.Certificate)\n+ .HasForeignKey(uc => uc.CertificateKey)\n+ .WillCascadeOnDelete(true); // Deleting a Certificate entity will also delete related UserCertificate entities.\n}\n#pragma warning restore 618\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Package.cs",
"new_path": "src/NuGetGallery.Core/Entities/Package.cs",
"diff": "@@ -223,5 +223,15 @@ public Package()\n/// The package status key, referring to the <see cref=\"PackageStatus\"/> enum.\n/// </summary>\npublic PackageStatus PackageStatusKey { get; set; }\n+\n+ /// <summary>\n+ /// Gets or sets the foreign key of the certificate used to sign the package.\n+ /// </summary>\n+ public int? CertificateKey { get; set; }\n+\n+ /// <summary>\n+ /// Gets or sets the certificate used to sign the package.\n+ /// </summary>\n+ public virtual Certificate Certificate { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/PackageRegistration.cs",
"new_path": "src/NuGetGallery.Core/Entities/PackageRegistration.cs",
"diff": "@@ -26,6 +26,18 @@ public PackageRegistration()\npublic bool IsLocked { get; set; }\n+ /// <summary>\n+ /// Gets or sets the foreign key of the required signer for new package version submissions.\n+ /// </summary>\n+ /// <remarks>If <c>null</c>, any owner may submit new package versions.</remarks>\n+ public int? RequiredSignerKey { get; set; }\n+\n+ /// <summary>\n+ /// Gets or sets the required signer for new package version submissions.\n+ /// </summary>\n+ /// <remarks>If <c>null</c>, any owner may submit new package versions.</remarks>\n+ public virtual User RequiredSigner { get; set; }\n+\npublic virtual ICollection<User> Owners { get; set; }\npublic virtual ICollection<Package> Packages { get; set; }\npublic virtual ICollection<ReservedNamespace> ReservedNamespaces { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/User.cs",
"new_path": "src/NuGetGallery.Core/Entities/User.cs",
"diff": "@@ -51,6 +51,7 @@ public User(string username)\nOrganizationRequests = new List<MembershipRequest>();\nRoles = new List<Role>();\nUsername = username;\n+ UserCertificates = new List<UserCertificate>();\n}\n/// <summary>\n@@ -131,6 +132,11 @@ public string LastSavedEmailAddress\npublic virtual ICollection<UserSecurityPolicy> SecurityPolicies { get; set; }\n+ /// <summary>\n+ /// Gets or sets the collection of user certificates.\n+ /// </summary>\n+ public virtual ICollection<UserCertificate> UserCertificates { get; set; }\n+\npublic void ConfirmEmailAddress()\n{\nif (string.IsNullOrEmpty(UnconfirmedEmailAddress))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\Role.cs\" />\n<Compile Include=\"Entities\\Scope.cs\" />\n<Compile Include=\"Entities\\SuspendDbExecutionStrategy.cs\" />\n+ <Compile Include=\"Entities\\UserCertificate.cs\" />\n<Compile Include=\"Entities\\UserSecurityPolicy.cs\" />\n<Compile Include=\"Entities\\User.cs\" />\n<Compile Include=\"Extensions\\EntitiesContextExtensions.cs\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201804171613337_AddCertificateRegistration.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class AddCertificateRegistration : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddCertificateRegistration));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201804171613337_AddCertificateRegistration\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201804171613337_AddCertificateRegistration.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddCertificateRegistration : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ CreateTable(\n+ \"dbo.UserCertificates\",\n+ c => new\n+ {\n+ Key = c.Int(nullable: false, identity: true),\n+ CertificateKey = c.Int(nullable: false),\n+ UserKey = c.Int(nullable: false),\n+ IsActive = c.Boolean(nullable: false),\n+ })\n+ .PrimaryKey(t => t.Key)\n+ .ForeignKey(\"dbo.Users\", t => t.UserKey, cascadeDelete: true)\n+ .ForeignKey(\"dbo.Certificates\", t => t.CertificateKey, cascadeDelete: true)\n+ .Index(t => t.CertificateKey)\n+ .Index(t => t.UserKey);\n+\n+ AddColumn(\"dbo.Certificates\", \"Sha1Thumbprint\", c => c.String(maxLength: 40, unicode: false));\n+ AddColumn(\"dbo.PackageRegistrations\", \"RequiredSignerKey\", c => c.Int());\n+ AddColumn(\"dbo.Packages\", \"CertificateKey\", c => c.Int());\n+ CreateIndex(\"dbo.PackageRegistrations\", \"RequiredSignerKey\");\n+ CreateIndex(\"dbo.Packages\", \"CertificateKey\");\n+ AddForeignKey(\"dbo.Packages\", \"CertificateKey\", \"dbo.Certificates\", \"Key\");\n+ AddForeignKey(\"dbo.PackageRegistrations\", \"RequiredSignerKey\", \"dbo.Users\", \"Key\");\n+ }\n+\n+ public override void Down()\n+ {\n+ DropForeignKey(\"dbo.UserCertificates\", \"CertificateKey\", \"dbo.Certificates\");\n+ DropForeignKey(\"dbo.UserCertificates\", \"UserKey\", \"dbo.Users\");\n+ DropForeignKey(\"dbo.PackageRegistrations\", \"RequiredSignerKey\", \"dbo.Users\");\n+ DropForeignKey(\"dbo.Packages\", \"CertificateKey\", \"dbo.Certificates\");\n+ DropIndex(\"dbo.Packages\", new[] { \"CertificateKey\" });\n+ DropIndex(\"dbo.PackageRegistrations\", new[] { \"RequiredSignerKey\" });\n+ DropIndex(\"dbo.UserCertificates\", new[] { \"UserKey\" });\n+ DropIndex(\"dbo.UserCertificates\", new[] { \"CertificateKey\" });\n+ DropColumn(\"dbo.Packages\", \"CertificateKey\");\n+ DropColumn(\"dbo.PackageRegistrations\", \"RequiredSignerKey\");\n+ DropColumn(\"dbo.Certificates\", \"Sha1Thumbprint\");\n+ DropTable(\"dbo.UserCertificates\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201803202317063_AddEnableMultiFactorAuthentication.Designer.cs\">\n<DependentUpon>201803202317063_AddEnableMultiFactorAuthentication.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201804171613337_AddCertificateRegistration.cs\" />\n+ <Compile Include=\"Migrations\\201804171613337_AddCertificateRegistration.Designer.cs\">\n+ <DependentUpon>201804171613337_AddCertificateRegistration.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"RequestModels\\DeleteAccountRequest.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<EmbeddedResource Include=\"Migrations\\201803202317063_AddEnableMultiFactorAuthentication.resx\">\n<DependentUpon>201803202317063_AddEnableMultiFactorAuthentication.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201804171613337_AddCertificateRegistration.resx\">\n+ <DependentUpon>201804171613337_AddCertificateRegistration.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: add migration for certificate registration (#5811)
Contribute to https://github.com/NuGet/NuGetGallery/issues/5634.
|
455,731 |
17.04.2018 15:51:20
| 25,200 |
24f5e4e31607c6cd1823a62987e3bf97ebbed8d0
|
Certificates: add migration for certificate registration
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -232,6 +232,13 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.MapLeftKey(\"PackageRegistrationKey\")\n.MapRightKey(\"UserKey\"));\n+ modelBuilder.Entity<PackageRegistration>()\n+ .HasMany(pr => pr.RequiredSigners)\n+ .WithMany()\n+ .Map(c => c.ToTable(\"PackageRegistrationRequiredSigners\")\n+ .MapLeftKey(\"PackageRegistrationKey\")\n+ .MapRightKey(\"UserKey\"));\n+\nmodelBuilder.Entity<Package>()\n.HasKey(p => p.Key);\n@@ -250,6 +257,9 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.WithRequired(pt => pt.Package)\n.HasForeignKey(pt => pt.PackageKey);\n+ modelBuilder.Entity<Package>()\n+ .HasOptional(p => p.Certificate);\n+\nmodelBuilder.Entity<PackageHistory>()\n.HasKey(pm => pm.Key);\n@@ -332,6 +342,27 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\nIsUnique = true,\n}\n}));\n+\n+ modelBuilder.Entity<Certificate>()\n+ .Property(c => c.Sha1Thumbprint)\n+ .HasMaxLength(40)\n+ .HasColumnType(\"varchar\")\n+ .IsOptional();\n+\n+ modelBuilder.Entity<UserCertificate>()\n+ .HasKey(uc => uc.Key);\n+\n+ modelBuilder.Entity<User>()\n+ .HasMany(u => u.UserCertificates)\n+ .WithRequired(uc => uc.User)\n+ .HasForeignKey(uc => uc.UserKey)\n+ .WillCascadeOnDelete(true); // Deleting a User entity will also delete related UserCertificate entities.\n+\n+ modelBuilder.Entity<Certificate>()\n+ .HasMany(c => c.UserCertificates)\n+ .WithRequired(uc => uc.Certificate)\n+ .HasForeignKey(uc => uc.CertificateKey)\n+ .WillCascadeOnDelete(true); // Deleting a Certificate entity will also delete related UserCertificate entities.\n}\n#pragma warning restore 618\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Package.cs",
"new_path": "src/NuGetGallery.Core/Entities/Package.cs",
"diff": "@@ -223,5 +223,15 @@ public Package()\n/// The package status key, referring to the <see cref=\"PackageStatus\"/> enum.\n/// </summary>\npublic PackageStatus PackageStatusKey { get; set; }\n+\n+ /// <summary>\n+ /// Gets or sets the foreign key of the certificate used to sign the package.\n+ /// </summary>\n+ public int? CertificateKey { get; set; }\n+\n+ /// <summary>\n+ /// Gets or sets the certificate used to sign the package.\n+ /// </summary>\n+ public virtual Certificate Certificate { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/PackageRegistration.cs",
"new_path": "src/NuGetGallery.Core/Entities/PackageRegistration.cs",
"diff": "using System.Collections.Generic;\nusing System.ComponentModel.DataAnnotations;\n+using System.ComponentModel.DataAnnotations.Schema;\nnamespace NuGetGallery\n{\n@@ -14,6 +15,7 @@ public PackageRegistration()\nOwners = new HashSet<User>();\nPackages = new HashSet<Package>();\nReservedNamespaces = new HashSet<ReservedNamespace>();\n+ RequiredSigners = new HashSet<User>();\n}\n[StringLength(CoreConstants.MaxPackageIdLength)]\n@@ -30,6 +32,11 @@ public PackageRegistration()\npublic virtual ICollection<Package> Packages { get; set; }\npublic virtual ICollection<ReservedNamespace> ReservedNamespaces { get; set; }\n+ /// <summary>\n+ /// Gets or sets required signers for this package registration.\n+ /// </summary>\n+ public virtual ICollection<User> RequiredSigners { get; set; }\n+\npublic int Key { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/User.cs",
"new_path": "src/NuGetGallery.Core/Entities/User.cs",
"diff": "@@ -51,6 +51,7 @@ public User(string username)\nOrganizationRequests = new List<MembershipRequest>();\nRoles = new List<Role>();\nUsername = username;\n+ UserCertificates = new List<UserCertificate>();\n}\n/// <summary>\n@@ -131,6 +132,11 @@ public string LastSavedEmailAddress\npublic virtual ICollection<UserSecurityPolicy> SecurityPolicies { get; set; }\n+ /// <summary>\n+ /// Gets or sets the collection of user certificates.\n+ /// </summary>\n+ public virtual ICollection<UserCertificate> UserCertificates { get; set; }\n+\npublic void ConfirmEmailAddress()\n{\nif (string.IsNullOrEmpty(UnconfirmedEmailAddress))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\Role.cs\" />\n<Compile Include=\"Entities\\Scope.cs\" />\n<Compile Include=\"Entities\\SuspendDbExecutionStrategy.cs\" />\n+ <Compile Include=\"Entities\\UserCertificate.cs\" />\n<Compile Include=\"Entities\\UserSecurityPolicy.cs\" />\n<Compile Include=\"Entities\\User.cs\" />\n<Compile Include=\"Extensions\\EntitiesContextExtensions.cs\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201804171613337_AddCertificateRegistration.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class AddCertificateRegistration : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddCertificateRegistration));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201804171613337_AddCertificateRegistration\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201804171613337_AddCertificateRegistration.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddCertificateRegistration : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ CreateTable(\n+ \"dbo.UserCertificates\",\n+ c => new\n+ {\n+ Key = c.Int(nullable: false, identity: true),\n+ CertificateKey = c.Int(nullable: false),\n+ UserKey = c.Int(nullable: false),\n+ IsActive = c.Boolean(nullable: false),\n+ })\n+ .PrimaryKey(t => t.Key)\n+ .ForeignKey(\"dbo.Users\", t => t.UserKey, cascadeDelete: true)\n+ .ForeignKey(\"dbo.Certificates\", t => t.CertificateKey, cascadeDelete: true)\n+ .Index(t => t.CertificateKey)\n+ .Index(t => t.UserKey);\n+\n+ CreateTable(\n+ \"dbo.PackageRegistrationRequiredSigners\",\n+ c => new\n+ {\n+ PackageRegistrationKey = c.Int(nullable: false),\n+ UserKey = c.Int(nullable: false),\n+ })\n+ .PrimaryKey(t => new { t.PackageRegistrationKey, t.UserKey })\n+ .ForeignKey(\"dbo.PackageRegistrations\", t => t.PackageRegistrationKey, cascadeDelete: true)\n+ .ForeignKey(\"dbo.Users\", t => t.UserKey, cascadeDelete: true)\n+ .Index(t => t.PackageRegistrationKey)\n+ .Index(t => t.UserKey);\n+\n+ AddColumn(\"dbo.Certificates\", \"Sha1Thumbprint\", c => c.String(maxLength: 40, unicode: false));\n+ AddColumn(\"dbo.Packages\", \"CertificateKey\", c => c.Int());\n+ CreateIndex(\"dbo.Packages\", \"CertificateKey\");\n+ AddForeignKey(\"dbo.Packages\", \"CertificateKey\", \"dbo.Certificates\", \"Key\");\n+ }\n+\n+ public override void Down()\n+ {\n+ DropForeignKey(\"dbo.UserCertificates\", \"CertificateKey\", \"dbo.Certificates\");\n+ DropForeignKey(\"dbo.UserCertificates\", \"UserKey\", \"dbo.Users\");\n+ DropForeignKey(\"dbo.PackageRegistrationRequiredSigners\", \"UserKey\", \"dbo.Users\");\n+ DropForeignKey(\"dbo.PackageRegistrationRequiredSigners\", \"PackageRegistrationKey\", \"dbo.PackageRegistrations\");\n+ DropForeignKey(\"dbo.Packages\", \"CertificateKey\", \"dbo.Certificates\");\n+ DropIndex(\"dbo.PackageRegistrationRequiredSigners\", new[] { \"UserKey\" });\n+ DropIndex(\"dbo.PackageRegistrationRequiredSigners\", new[] { \"PackageRegistrationKey\" });\n+ DropIndex(\"dbo.Packages\", new[] { \"CertificateKey\" });\n+ DropIndex(\"dbo.UserCertificates\", new[] { \"UserKey\" });\n+ DropIndex(\"dbo.UserCertificates\", new[] { \"CertificateKey\" });\n+ DropColumn(\"dbo.Packages\", \"CertificateKey\");\n+ DropColumn(\"dbo.Certificates\", \"Sha1Thumbprint\");\n+ DropTable(\"dbo.PackageRegistrationRequiredSigners\");\n+ DropTable(\"dbo.UserCertificates\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201803202317063_AddEnableMultiFactorAuthentication.Designer.cs\">\n<DependentUpon>201803202317063_AddEnableMultiFactorAuthentication.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201804171613337_AddCertificateRegistration.cs\" />\n+ <Compile Include=\"Migrations\\201804171613337_AddCertificateRegistration.Designer.cs\">\n+ <DependentUpon>201804171613337_AddCertificateRegistration.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"RequestModels\\DeleteAccountRequest.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<EmbeddedResource Include=\"Migrations\\201803202317063_AddEnableMultiFactorAuthentication.resx\">\n<DependentUpon>201803202317063_AddEnableMultiFactorAuthentication.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201804171613337_AddCertificateRegistration.resx\">\n+ <DependentUpon>201804171613337_AddCertificateRegistration.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: add migration for certificate registration (#5814)
Progress on https://github.com/NuGet/NuGetGallery/issues/5634.
|
455,776 |
18.04.2018 15:42:29
| 25,200 |
2c222f72b4cbf5e5160a1f9cb1293e164213d6f9
|
Remove organizations feature flag
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "@@ -17,15 +17,13 @@ public class LoginDiscontinuationConfiguration : ILoginDiscontinuationConfigurat\ninternal HashSet<string> ExceptionsForEmailAddresses { get; }\ninternal HashSet<string> ForceTransformationToOrganizationForEmailAddresses { get; }\ninternal HashSet<OrganizationTenantPair> EnabledOrganizationAadTenants { get; }\n- internal bool OrganizationsEnabledForAll { get; }\npublic LoginDiscontinuationConfiguration()\n: this(Enumerable.Empty<string>(),\nEnumerable.Empty<string>(),\nEnumerable.Empty<string>(),\nEnumerable.Empty<string>(),\n- Enumerable.Empty<OrganizationTenantPair>(),\n- organizationsEnabledForAll: false)\n+ Enumerable.Empty<OrganizationTenantPair>())\n{\n}\n@@ -35,15 +33,13 @@ public LoginDiscontinuationConfiguration()\nIEnumerable<string> discontinuedForDomains,\nIEnumerable<string> exceptionsForEmailAddresses,\nIEnumerable<string> forceTransformationToOrganizationForEmailAddresses,\n- IEnumerable<OrganizationTenantPair> enabledOrganizationAadTenants,\n- bool organizationsEnabledForAll)\n+ IEnumerable<OrganizationTenantPair> enabledOrganizationAadTenants)\n{\nDiscontinuedForEmailAddresses = new HashSet<string>(discontinuedForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nDiscontinuedForDomains = new HashSet<string>(discontinuedForDomains, StringComparer.OrdinalIgnoreCase);\nExceptionsForEmailAddresses = new HashSet<string>(exceptionsForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nForceTransformationToOrganizationForEmailAddresses = new HashSet<string>(forceTransformationToOrganizationForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nEnabledOrganizationAadTenants = new HashSet<OrganizationTenantPair>(enabledOrganizationAadTenants, new OrganizationTenantPairComparer());\n- OrganizationsEnabledForAll = organizationsEnabledForAll;\n}\npublic bool IsLoginDiscontinued(AuthenticatedUser authUser)\n@@ -73,13 +69,6 @@ public bool IsUserOnWhitelist(User user)\nDiscontinuedForEmailAddresses.Contains(email.Address);\n}\n- public bool AreOrganizationsSupportedForUser(User user)\n- {\n- return OrganizationsEnabledForAll ||\n- (user != null &&\n- (user.Organizations.Any() || IsUserOnWhitelist(user)));\n- }\n-\npublic bool ShouldUserTransformIntoOrganization(User user)\n{\nif (user == null)\n@@ -101,7 +90,6 @@ public interface ILoginDiscontinuationConfiguration\n{\nbool IsLoginDiscontinued(AuthenticatedUser authUser);\nbool IsUserOnWhitelist(User user);\n- bool AreOrganizationsSupportedForUser(User user);\nbool ShouldUserTransformIntoOrganization(User user);\nbool IsTenantIdPolicySupportedForOrganization(string emailAddress, string tenantId);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -454,11 +454,6 @@ public bool CanTransformUserToOrganization(User accountToTransform, out string e\n{\nerrorReason = Strings.TransformAccount_AccountHasMemberships;\n}\n- else if (!ContentObjectService.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(accountToTransform))\n- {\n- errorReason = String.Format(CultureInfo.CurrentCulture,\n- Strings.Organizations_NotSupportedForAccount, accountToTransform.Username);\n- }\nreturn errorReason == null;\n}\n@@ -498,12 +493,6 @@ public async Task<bool> TransformUserToOrganization(User accountToTransform, Use\npublic async Task<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser)\n{\n- if (!ContentObjectService.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(adminUser))\n- {\n- throw new EntityException(String.Format(CultureInfo.CurrentCulture,\n- Strings.Organizations_NotSupportedForAccount, adminUser.Username));\n- }\n-\nvar existingUserWithIdentity = EntitiesContext.Users\n.FirstOrDefault(u => u.Username == username || u.EmailAddress == emailAddress);\nif (existingUserWithIdentity != null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1111,15 +1111,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to Account '{0}' does not support organizations..\n- /// </summary>\n- public static string Organizations_NotSupportedForAccount {\n- get {\n- return ResourceManager.GetString(\"Organizations_NotSupportedForAccount\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to Organization accounts cannot create credentials..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -842,7 +842,4 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"AddMember_UserIsOrganization\" xml:space=\"preserve\">\n<value>User '{0}' is an organization and cannot be a member of another organization.</value>\n</data>\n- <data name=\"Organizations_NotSupportedForAccount\" xml:space=\"preserve\">\n- <value>Account '{0}' does not support organizations.</value>\n- </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "</li>\n<li role=\"presentation\"><a href=\"@Url.ManageMyApiKeys()\" role=\"menuitem\">API Keys</a></li>\n<li class=\"divider\"></li>\n- @if (ContentObjectService.Value.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(CurrentUser))\n- {\n<li role=\"presentation\"><a href=\"@Url.ManageMyOrganizations()\" role=\"menuitem\">Manage Organizations</a></li>\n- }\n<li role=\"presentation\"><a href=\"@Url.ManageMyPackages()\" role=\"menuitem\">Manage Packages</a></li>\n<li role=\"presentation\"><a href=\"@Url.UploadPackage()\" role=\"menuitem\">Upload Package</a></li>\n<li class=\"divider\"></li>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -34,9 +34,8 @@ public async Task RefreshRefreshesObject()\nvar exceptions = new[] { \"exception@example.com\" };\nvar shouldTransforms = new[] { \"transfomer@example.com\" };\nvar orgTenantPairs = new[] { new OrganizationTenantPair(\"example.com\", \"tenantId\") };\n- var orgsEnabledForAll = true;\n- var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs, orgsEnabledForAll);\n+ var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs);\nvar configString = JsonConvert.SerializeObject(config);\nGetMock<IContentService>()\n@@ -54,7 +53,6 @@ public async Task RefreshRefreshesObject()\nAssert.True(loginDiscontinuationConfiguration.DiscontinuedForDomains.SequenceEqual(domains));\nAssert.True(loginDiscontinuationConfiguration.ExceptionsForEmailAddresses.SequenceEqual(exceptions));\nAssert.True(loginDiscontinuationConfiguration.EnabledOrganizationAadTenants.SequenceEqual(orgTenantPairs));\n- Assert.Equal(orgsEnabledForAll, loginDiscontinuationConfiguration.OrganizationsEnabledForAll);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"diff": "@@ -32,13 +32,10 @@ public static IEnumerable<object[]> PossibleListStates\nforeach (var isOnTransformList in new[] { true, false })\n{\nforeach (var isOnTenantPairList in new[] { true, false })\n- {\n- foreach (var organizationsEnabledForAll in new[] { true, false })\n{\nforeach (var isWrongCase in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, organizationsEnabledForAll, isWrongCase);\n- }\n+ yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, isWrongCase);\n}\n}\n}\n@@ -48,7 +45,7 @@ public static IEnumerable<object[]> PossibleListStates\n}\n}\n- public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList, bool organizationsEnabledForAll, bool isWrongCase)\n+ public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList, bool isWrongCase)\n{\nvar emails = isOnWhiteList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectEmail, isWrongCase) };\nvar domains = isOnDomainList ? new[] { ToUppercaseIfWrongCase(_domain, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase) };\n@@ -58,7 +55,7 @@ public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWh\nnew[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_domain, isWrongCase), ToUppercaseIfWrongCase(_tenant, isWrongCase)) } :\nnew[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase), ToUppercaseIfWrongCase(_incorrectTenant, isWrongCase)) };\n- return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs, organizationsEnabledForAll);\n+ return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs);\n}\nprivate static string ToUppercaseIfWrongCase(string input, bool isWrongCase)\n@@ -152,7 +149,7 @@ private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList,\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, organizationsEnabledForAll: false, isWrongCase: isWrongCase);\n+ var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList: false, isWrongCase: isWrongCase);\n// Act\nvar result = config.IsLoginDiscontinued(authUser);\n@@ -169,7 +166,6 @@ public class WhitelistMethodData\npublic bool IsOnExceptionList { get; }\npublic bool IsOnTransformList { get; }\npublic bool IsOnTenantPairList { get; }\n- public bool OrganizationsEnabledForAll { get; }\npublic bool IsWrongCase { get; }\npublic WhitelistMethodData(object[] data)\n@@ -191,10 +187,7 @@ public WhitelistMethodData(object[] data)\nvar isOnTenantPairList = boolData[4];\nIsOnTenantPairList = isOnTenantPairList;\n- var organizationsEnabledForAll = boolData[5];\n- OrganizationsEnabledForAll = organizationsEnabledForAll;\n-\n- var isWrongCase = boolData[6];\n+ var isWrongCase = boolData[5];\nIsWrongCase = isWrongCase;\n}\n}\n@@ -248,7 +241,7 @@ public void ReturnsExpectedWhenNull(WhitelistMethodData data)\nprivate ILoginDiscontinuationConfiguration GetConfiguration(WhitelistMethodData data)\n{\n- return CreateConfiguration(data.IsOnWhiteList, data.IsOnDomainList, data.IsOnExceptionList, data.IsOnTransformList, data.IsOnTenantPairList, data.OrganizationsEnabledForAll, data.IsWrongCase);\n+ return CreateConfiguration(data.IsOnWhiteList, data.IsOnDomainList, data.IsOnExceptionList, data.IsOnTransformList, data.IsOnTenantPairList, data.IsWrongCase);\n}\n}\n@@ -295,56 +288,5 @@ protected override bool GetWhitelistValue(ILoginDiscontinuationConfiguration con\nreturn config.ShouldUserTransformIntoOrganization(user);\n}\n}\n-\n- public class TheAreOrganizationsSupportedForUserMethodData : WhitelistMethodData\n- {\n- public bool HasOrganization { get; }\n-\n- public TheAreOrganizationsSupportedForUserMethodData(object[] data, bool hasOrganization)\n- : base(data)\n- {\n- HasOrganization = hasOrganization;\n- }\n- }\n-\n- public class TheAreOrganizationsSupportedForUserMethod : WhitelistBaseMethod\n- {\n- protected override User GetUser(WhitelistMethodData data)\n- {\n- var user = base.GetUser(data);\n- if ((data as TheAreOrganizationsSupportedForUserMethodData).HasOrganization)\n- {\n- user.Organizations = new[] { new Membership() };\n- }\n-\n- return user;\n- }\n-\n- public static IEnumerable<object[]> ReturnsAsExpectedWhenNonNull_Data =>\n- PossibleListStates.SelectMany(data =>\n- new[] { false, true }\n- .Select(hasOrganization =>\n- MemberDataHelper.AsData(\n- new TheAreOrganizationsSupportedForUserMethodData(data, hasOrganization))));\n-\n- public override bool GetExpectedValueForNonNull(WhitelistMethodData data)\n- {\n- return data.OrganizationsEnabledForAll ||\n- (data as TheAreOrganizationsSupportedForUserMethodData).HasOrganization ||\n- new TheIsUserOnWhitelistMethod().GetExpectedValueForNonNull(data);\n- }\n-\n- public static IEnumerable<object[]> ReturnsFalseWhenNull_Data => WhitelistBaseMethodReturnsExpected_Data;\n-\n- public override bool GetExpectedValueForNull(WhitelistMethodData data)\n- {\n- return data.OrganizationsEnabledForAll;\n- }\n-\n- protected override bool GetWhitelistValue(ILoginDiscontinuationConfiguration config, User user)\n- {\n- return config.AreOrganizationsSupportedForUser(user);\n- }\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -1251,38 +1251,12 @@ public void WhenAccountHasMemberships_ReturnsFalse()\nAssert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_AccountHasMemberships, fakes.OrganizationCollaborator.Username));\n}\n-\n- [Fact]\n- public void WhenAccountDoesNotSupportOrganizations_ReturnsFalse()\n- {\n- // Arrange\n- var service = new TestableUserService();\n- var fakes = new Fakes();\n- var user = fakes.User;\n-\n- var passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n- passwordConfigMock\n- .Setup(x => x.AreOrganizationsSupportedForUser(user))\n- .Returns(false);\n-\n- service.MockConfigObjectService\n- .Setup(x => x.LoginDiscontinuationConfiguration)\n- .Returns(passwordConfigMock.Object);\n-\n- // Act\n- var result = Invoke(service, user, out var errorReason);\n-\n- // Assert\n- Assert.False(result);\n- Assert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n- Strings.Organizations_NotSupportedForAccount, user.Username));\n- }\n}\npublic class TheCanTransformToOrganizationMethod : TheCanTransformToOrganizationBaseMethod\n{\n[Fact]\n- public void WhenAccountSupportsOrganizations_ReturnsTrue()\n+ public void WhenAccountHasNoMemberships_ReturnsTrue()\n{\n// Arrange\nvar service = new TestableUserService();\n@@ -1290,10 +1264,6 @@ public void WhenAccountSupportsOrganizations_ReturnsTrue()\nvar user = fakes.User;\nvar passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n- passwordConfigMock\n- .Setup(x => x.AreOrganizationsSupportedForUser(user))\n- .Returns(true);\n-\nservice.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(passwordConfigMock.Object);\n@@ -1322,10 +1292,6 @@ public void WhenAdminMatchesAccountToTransform_ReturnsFalse()\nvar user = fakes.User;\nvar passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n- passwordConfigMock\n- .Setup(x => x.AreOrganizationsSupportedForUser(user))\n- .Returns(true);\n-\nservice.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(passwordConfigMock.Object);\n@@ -1350,10 +1316,6 @@ public void WhenAdminIsNotConfirmed_ReturnsFalse()\nvar user = fakes.User;\nvar passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n- passwordConfigMock\n- .Setup(x => x.AreOrganizationsSupportedForUser(user))\n- .Returns(true);\n-\nservice.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(passwordConfigMock.Object);\n@@ -1378,10 +1340,6 @@ public void WhenAdminIsOrganization_ReturnsFalse()\nvar organization = fakes.Organization;\nvar passwordConfigMock = new Mock<ILoginDiscontinuationConfiguration>();\n- passwordConfigMock\n- .Setup(x => x.AreOrganizationsSupportedForUser(user))\n- .Returns(true);\n-\nservice.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(passwordConfigMock.Object);\n@@ -1602,18 +1560,6 @@ public class TheAddOrganizationAccountMethod\nprivate TestableUserService _service = new TestableUserService();\n- [Fact]\n- public async Task WithUserNotSupportedForOrganizations_ThrowsEntityException()\n- {\n- SetupOrganizationsSupportedForUser(supported: false);\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization());\n- Assert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.Organizations_NotSupportedForAccount, AdminName), exception.Message);\n-\n- _service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Never());\n- _service.MockSecurityPolicyService.Verify(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false), Times.Never());\n- _service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Never());\n- }\n-\n[Fact]\npublic async Task WithUsernameConflict_ThrowsEntityException()\n{\n@@ -1623,8 +1569,6 @@ public async Task WithUsernameConflict_ThrowsEntityException()\n.Setup(x => x.Users)\n.Returns(new[] { new User(conflictUsername) }.MockDbSet().Object);\n- SetupOrganizationsSupportedForUser();\n-\nvar exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(orgName: conflictUsername));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.UsernameNotAvailable, conflictUsername), exception.Message);\n@@ -1642,8 +1586,6 @@ public async Task WithEmailConflict_ThrowsEntityException()\n.Setup(x => x.Users)\n.Returns(new[] { new User(\"user\") { EmailAddress = conflictEmail } }.MockDbSet().Object);\n- SetupOrganizationsSupportedForUser();\n-\nvar exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(orgEmail: conflictEmail));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.EmailAddressBeingUsed, conflictEmail), exception.Message);\n@@ -1659,8 +1601,6 @@ public async Task WhenAdminHasNoTenant_ReturnsNewOrgWithoutPolicy()\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n- SetupOrganizationsSupportedForUser();\n-\nvar org = await InvokeAddOrganization(admin: new User(AdminName) { Credentials = new Credential[0] });\nAssertNewOrganizationReturned(org, subscribedToPolicy: false);\n@@ -1678,10 +1618,6 @@ public async Task WhenAdminHasUnsupportedTenant_ReturnsNewOrgWithoutPolicy()\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n.Returns(false);\n- mockLoginDiscontinuationConfiguration\n- .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == AdminName)))\n- .Returns(true);\n-\n_service.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\n@@ -1703,10 +1639,6 @@ public async Task WhenSubscribingToPolicyFails_ReturnsNewOrgWithoutPolicy()\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n.Returns(true);\n- mockLoginDiscontinuationConfiguration\n- .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == AdminName)))\n- .Returns(true);\n-\n_service.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\n@@ -1732,10 +1664,6 @@ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\n.Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n.Returns(true);\n- mockLoginDiscontinuationConfiguration\n- .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == AdminName)))\n- .Returns(true);\n-\n_service.MockConfigObjectService\n.Setup(x => x.LoginDiscontinuationConfiguration)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\n@@ -1792,18 +1720,6 @@ private void AssertNewOrganizationReturned(Organization org, bool subscribedToPo\nsubscribedToPolicy ? Times.Once() : Times.Never());\n_service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Once());\n}\n-\n- private void SetupOrganizationsSupportedForUser(string adminUsername = null, bool supported = true)\n- {\n- adminUsername = adminUsername ?? AdminName;\n-\n- var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n- mockLoginDiscontinuationConfiguration\n- .Setup(x => x.AreOrganizationsSupportedForUser(It.Is<User>(u => u.Username == adminUsername)))\n- .Returns(supported);\n-\n- _service.MockConfigObjectService.Setup(x => x.LoginDiscontinuationConfiguration).Returns(mockLoginDiscontinuationConfiguration.Object);\n- }\n}\npublic class TheRejectTransformUserToOrganizationRequestMethod\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove organizations feature flag (#5822)
|
455,736 |
19.04.2018 10:23:42
| 25,200 |
101141aea8058341008395114854dd969481dd70
|
Make version abbreviation a bit longer
Add title attribute to show the full version of abbreviated text
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@VersionListDivider(rowCount, versionsExpanded)\n<tr>\n<td>\n- <a href=\"@Url.Package(packageVersion)\">\n+ <a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.FullVersion\">\n<b>\n- @packageVersion.FullVersion.Abbreviate(15)\n+ @packageVersion.FullVersion.Abbreviate(30)\n@if (packageVersion.IsCurrent(Model))\n{\n- @:(current version)\n+ @:(current)\n}\n</b>\n</a>\n<span data-datetime=\"@packageVersion.LastUpdated.ToString(\"O\")\">@packageVersion.LastUpdated.ToNuGetShortDateString()</span>\n@if (packageVersion.PushedBy != null)\n{\n- <span>by @packageVersion.PushedBy.Abbreviate(15)</span>\n+ <text>\n+ by <span title=\"@packageVersion.PushedBy\">@packageVersion.PushedBy.Abbreviate(15)</span>\n+ </text>\n}\n</td>\n@if (packageVersion.CanDisplayPrivateMetadata)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Make version abbreviation a bit longer (#5826)
Add title attribute to show the full version of abbreviated text
Address https://github.com/NuGet/NuGetGallery/issues/5825
|
455,793 |
20.04.2018 14:37:12
| 25,200 |
fcd66268384a1ff7dd51e967432ea4a4aa057804
|
Fix CSS files rendering for branding folder'
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"new_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"diff": "@@ -148,6 +148,7 @@ private static void BundlingPostStart()\n{\nstylesBundle\n.Include(\"~/Content/\" + filename)\n+ .Include(\"~/Content/Branding/\" + filename)\n.Include(\"~/Branding/Content/\" + filename);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix CSS files rendering for branding folder' (#5828)
|
455,736 |
19.04.2018 12:44:06
| 25,200 |
f120d522798d73db6e999d9e5d465244e3c1b48a
|
Fix collection modified exception which causes rare HTTP 500s
Add unit tests to verify casing changes and repro of bug
Use ConcurrentDictionary instead of Dictionary
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/CloudDownloadCountService.cs",
"new_path": "src/NuGetGallery/Services/CloudDownloadCountService.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.Collections.Generic;\nusing System.IO;\nusing System.Linq;\n@@ -27,9 +28,8 @@ public class CloudDownloadCountService : IDownloadCountService\nprivate readonly object _refreshLock = new object();\nprivate bool _isRefreshing;\n- private readonly IDictionary<string, IDictionary<string, int>> _downloadCounts = new Dictionary<string, IDictionary<string, int>>(StringComparer.OrdinalIgnoreCase);\n-\n- public DateTime LastRefresh { get; protected set; }\n+ private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, int>> _downloadCounts\n+ = new ConcurrentDictionary<string, ConcurrentDictionary<string, int>>(StringComparer.OrdinalIgnoreCase);\npublic CloudDownloadCountService(ITelemetryClient telemetryClient, string connectionString, bool readAccessGeoRedundant)\n{\n@@ -46,11 +46,9 @@ public bool TryGetDownloadCountForPackageRegistration(string id, out int downloa\nthrow new ArgumentNullException(nameof(id));\n}\n- id = id.ToLowerInvariant();\n-\n- if (_downloadCounts.ContainsKey(id))\n+ if (_downloadCounts.TryGetValue(id, out var versions))\n{\n- downloadCount = _downloadCounts[id].Sum(kvp => kvp.Value);\n+ downloadCount = CalculateSum(versions);\nreturn true;\n}\n@@ -70,17 +68,11 @@ public bool TryGetDownloadCountForPackage(string id, string version, out int dow\nthrow new ArgumentNullException(nameof(version));\n}\n- id = id.ToLowerInvariant();\n- version = version.ToLowerInvariant();\n-\n- if (_downloadCounts.ContainsKey(id))\n- {\n- if (_downloadCounts[id].ContainsKey(version))\n+ if (_downloadCounts.TryGetValue(id, out var versions)\n+ && versions.TryGetValue(version, out downloadCount))\n{\n- downloadCount = _downloadCounts[id][version];\nreturn true;\n}\n- }\ndownloadCount = 0;\nreturn false;\n@@ -127,24 +119,47 @@ public void Refresh()\nfinally\n{\n_isRefreshing = false;\n- LastRefresh = DateTime.UtcNow;\n}\n}\n}\n- private void RefreshCore()\n+ /// <summary>\n+ /// This method is added for unit testing purposes.\n+ /// </summary>\n+ protected virtual int CalculateSum(ConcurrentDictionary<string, int> versions)\n{\n- try\n+ return versions.Sum(kvp => kvp.Value);\n+ }\n+\n+ /// <summary>\n+ /// This method is added for unit testing purposes. It can return a null stream if the blob does not exist\n+ /// and assumes the caller will properly dispose of the returned stream.\n+ /// </summary>\n+ protected virtual Stream GetBlobStream()\n{\nvar blob = GetBlobReference();\nif (blob == null)\n{\n- return;\n+ return null;\n+ }\n+\n+ return blob.OpenRead();\n}\n+ private void RefreshCore()\n+ {\n+ try\n+ {\n// The data in downloads.v1.json will be an array of Package records - which has Id, Array of Versions and download count.\n// Sample.json : [[\"AutofacContrib.NSubstitute\",[\"2.4.3.700\",406],[\"2.5.0\",137]],[\"Assman.Core\",[\"2.0.7\",138]]....\n- using (var jsonReader = new JsonTextReader(new StreamReader(blob.OpenRead())))\n+ using (var blobStream = GetBlobStream())\n+ {\n+ if (blobStream == null)\n+ {\n+ return;\n+ }\n+\n+ using (var jsonReader = new JsonTextReader(new StreamReader(blobStream)))\n{\ntry\n{\n@@ -166,18 +181,18 @@ private void RefreshCore()\ncontinue;\n}\n- if (!_downloadCounts.ContainsKey(id))\n- {\n- _downloadCounts.Add(id, new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase));\n- }\n- var versions = _downloadCounts[id];\n+ var versions = _downloadCounts.GetOrAdd(\n+ id,\n+ _ => new ConcurrentDictionary<string, int>(StringComparer.OrdinalIgnoreCase));\nforeach (JToken token in record)\n{\nif (token != null && token.Count() == 2)\n{\n- string version = token[0].ToString().ToLowerInvariant();\n- versions[version] = token[1].ToObject<int>();\n+ var version = token[0].ToString();\n+ var downloadCount = token[1].ToObject<int>();\n+\n+ versions.AddOrSet(version, downloadCount);\n}\n}\n}\n@@ -202,6 +217,7 @@ private void RefreshCore()\n}\n}\n}\n+ }\ncatch (Exception ex)\n{\n_telemetryClient.TrackException(ex, new Dictionary<string, string>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Security\\RequireMinProtocolVersionForPushPolicyFacts.cs\" />\n<Compile Include=\"Security\\RequireOrganizationTenantPolicyFacts.cs\" />\n<Compile Include=\"Services\\ActionRequiringEntityPermissionsFacts.cs\" />\n+ <Compile Include=\"Services\\CloudDownloadCountServiceFacts.cs\" />\n<Compile Include=\"Services\\DeleteAccountServiceFacts.cs\" />\n<Compile Include=\"Services\\JsonStatisticsServiceFacts.cs\" />\n<Compile Include=\"Services\\ContentObjectServiceFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix collection modified exception which causes rare HTTP 500s (#5830)
Add unit tests to verify casing changes and repro of bug
Use ConcurrentDictionary instead of Dictionary
Address https://github.com/NuGet/NuGetGallery/issues/5779
|
455,776 |
23.04.2018 08:35:39
| 25,200 |
4467e900325d417bf0625e0e8c2cbea3c29a6535
|
Fix plurality of manage orgs link on profiles page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "{\nif (Model.UserIsOrganization)\n{\n+ var administrators = (Model.User as Organization).Administrators.Count();\n+ var collaborators = (Model.User as Organization).Collaborators.Count();\n+\n<i class=\"ms-Icon ms-Icon--Group ms-font-xl\" aria-hidden=\"true\"> </i>\n- <a href=\"@Url.ManageMyOrganization(Model.Username)\" aria-label=\"Manage this organization\"><span class=\"ms-font-xxl\">@((Model.User as Organization).Administrators.Count())</span> Administrators </a><span aria-hidden=\"true\" class=\"ms-font-xxl organization-subtitle-divider\">|</span><a href=\"@Url.ManageMyOrganization(Model.Username)\" aria-label=\"Manage this organization\"> <span class=\"ms-font-xxl\">@((Model.User as Organization).Collaborators.Count())</span> Collaborators</a>\n+ <a href=\"@Url.ManageMyOrganization(Model.Username)\" aria-label=\"Manage this organization\"><span class=\"ms-font-xxl\">@administrators</span> Administrator@(administrators != 1 ? \"s\" : \"\") </a><span aria-hidden=\"true\" class=\"ms-font-xxl organization-subtitle-divider\">|</span><a href=\"@Url.ManageMyOrganization(Model.Username)\" aria-label=\"Manage this organization\"> <span class=\"ms-font-xxl\">@collaborators</span> Collaborator@(collaborators != 1 ? \"s\" : \"\")</a>\n}\nelse if (CurrentUser.MatchesUser(Model.User) && Model.User.Organizations.Any())\n{\n- <span>member of<a href=\"@Url.ManageMyOrganizations()\" aria-label=\"Manage my organizations\"><span class=\"ms-font-xxl\"> @(Model.User.Organizations.Count()) organizations</span></a></span>\n+ var organizations = Model.User.Organizations.Count();\n+ <span>member of<a href=\"@Url.ManageMyOrganizations()\" aria-label=\"Manage my organizations\"><span class=\"ms-font-xxl\"> @organizations organization@(organizations != 1 ? \"s\" : \"\")</span></a></span>\n}\n}\n</span>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix plurality of manage orgs link on profiles page (#5823)
|
455,751 |
23.04.2018 11:00:01
| 25,200 |
5f93d5ee74e0e84239c8f1871508bd7d56bdd13c
|
Delete Account for not confirmed email.
An user can self delete an account if the email is not confirmed.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -309,6 +309,23 @@ public virtual async Task<ActionResult> RequestAccountDeletion()\nreturn HttpNotFound(\"User not found.\");\n}\n+ if (!user.Confirmed)\n+ {\n+ // Unconfirmed users can be deleted immediately without creating a support request.\n+ DeleteUserAccountStatus accountDeleteStatus = await _deleteAccountService.DeleteGalleryUserAccountAsync(userToBeDeleted: user,\n+ userToExecuteTheDelete: user,\n+ signature: user.Username,\n+ unlistOrphanPackages: true,\n+ commitAsTransaction: true);\n+ if (!accountDeleteStatus.Success)\n+ {\n+ TempData[\"RequestFailedMessage\"] = Strings.AccountSelfDelete_Fail;\n+ return RedirectToAction(\"DeleteRequest\");\n+ }\n+ OwinContext.Authentication.SignOut();\n+ return SafeRedirect(Url.Home(false));\n+ }\n+\nvar isSupportRequestCreated = await _supportRequestService.TryAddDeleteSupportRequestAsync(user);\nif (!isSupportRequestCreated)\n{\n@@ -363,7 +380,12 @@ public virtual async Task<ActionResult> Delete(DeleteUserAccountViewModel model)\nelse\n{\nvar admin = GetCurrentUser();\n- var status = await _deleteAccountService.DeleteGalleryUserAccountAsync(user, admin, model.Signature, model.ShouldUnlist, commitAsTransaction: true);\n+ var status = await _deleteAccountService.DeleteGalleryUserAccountAsync(\n+ userToBeDeleted: user,\n+ userToExecuteTheDelete: admin,\n+ signature: model.Signature,\n+ unlistOrphanPackages: model.ShouldUnlist,\n+ commitAsTransaction: true);\nreturn View(\"DeleteUserAccountStatus\", status);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "@@ -60,20 +60,24 @@ IAuditingService auditingService\n/// 5. The user data will be cleaned.\n/// </summary>\n/// <param name=\"userToBeDeleted\">The user to be deleted.</param>\n- /// <param name=\"admin\">The admin that will perform the delete action.</param>\n+ /// <param name=\"userToExecuteTheDelete\">The user that will perform the delete action.</param>\n/// <param name=\"signature\">The admin signature.</param>\n/// <param name=\"unlistOrphanPackages\">If the orphaned packages will unlisted.</param>\n/// <param name=\"commitAsTransaction\">If the data will be persisted as a transaction.</param>\n/// <returns></returns>\n- public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User userToBeDeleted, User admin, string signature, bool unlistOrphanPackages, bool commitAsTransaction)\n+ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User userToBeDeleted,\n+ User userToExecuteTheDelete,\n+ string signature,\n+ bool unlistOrphanPackages,\n+ bool commitAsTransaction)\n{\nif (userToBeDeleted == null)\n{\nthrow new ArgumentNullException(nameof(userToBeDeleted));\n}\n- if (admin == null)\n+ if (userToExecuteTheDelete == null)\n{\n- throw new ArgumentNullException(nameof(admin));\n+ throw new ArgumentNullException(nameof(userToExecuteTheDelete));\n}\nif (userToBeDeleted.IsDeleted)\n@@ -125,18 +129,18 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\nusing (var strategy = new SuspendDbExecutionStrategy())\nusing (var transaction = _entitiesContext.GetDatabase().BeginTransaction())\n{\n- await DeleteGalleryUserAccountImplAsync(userToBeDeleted, admin, signature, unlistOrphanPackages);\n+ await DeleteGalleryUserAccountImplAsync(userToBeDeleted, userToExecuteTheDelete, signature, unlistOrphanPackages, HardDeleteUser(userToBeDeleted));\ntransaction.Commit();\n}\n}\nelse\n{\n- await DeleteGalleryUserAccountImplAsync(userToBeDeleted, admin, signature, unlistOrphanPackages);\n+ await DeleteGalleryUserAccountImplAsync(userToBeDeleted, userToExecuteTheDelete, signature, unlistOrphanPackages, HardDeleteUser(userToBeDeleted));\n}\nawait _auditingService.SaveAuditRecordAsync(new DeleteAccountAuditRecord(username: userToBeDeleted.Username,\nstatus: DeleteAccountAuditRecord.ActionStatus.Success,\naction: AuditedDeleteAccountAction.DeleteAccount,\n- adminUsername: admin.Username));\n+ adminUsername: userToExecuteTheDelete.Username));\nreturn new DeleteUserAccountStatus()\n{\nSuccess = true,\n@@ -160,7 +164,13 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\n}\n}\n- private async Task DeleteGalleryUserAccountImplAsync(User userToBeDeleted, User admin, string signature, bool unlistOrphanPackages)\n+ internal bool HardDeleteUser(User userToBeDeleted)\n+ {\n+ // If the userToBeDeleted does not have the email confirmed the user will be removed from the database.\n+ return !userToBeDeleted.Confirmed;\n+ }\n+\n+ private async Task DeleteGalleryUserAccountImplAsync(User userToBeDeleted, User admin, string signature, bool unlistOrphanPackages, bool hardDelete)\n{\nvar ownedPackages = _packageService.FindPackagesByAnyMatchingOwner(userToBeDeleted, includeUnlisted: true, includeVersions: true).ToList();\n@@ -168,9 +178,16 @@ private async Task DeleteGalleryUserAccountImplAsync(User userToBeDeleted, User\nawait RemoveReservedNamespaces(userToBeDeleted);\nawait RemoveSecurityPolicies(userToBeDeleted);\nawait RemoveUserCredentials(userToBeDeleted);\n+ if (hardDelete)\n+ {\n+ await RemoveUser(userToBeDeleted);\n+ }\n+ else\n+ {\nawait RemoveUserDataInUserTable(userToBeDeleted);\nawait InsertDeleteAccount(userToBeDeleted, admin, signature);\n}\n+ }\nprivate async Task InsertDeleteAccount(User user, User admin, string signature)\n{\n@@ -234,5 +251,11 @@ private async Task RemoveSupportRequests(User user)\n{\nawait _supportRequestService.DeleteSupportRequestsAsync(user.Username);\n}\n+\n+ private async Task RemoveUser(User user)\n+ {\n+ _userRepository.DeleteOnCommit(user);\n+ await _userRepository.CommitChangesAsync();\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IDeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/IDeleteAccountService.cs",
"diff": "@@ -12,11 +12,15 @@ public interface IDeleteAccountService\n/// Deletes an user gallery account.\n/// </summary>\n/// <param name=\"userToBeDeleted\">The user to be deleted.</param>\n- /// <param name=\"admin\">The admin that will execute the delete action.</param>\n+ /// <param name=\"userToExecuteTheDelete\">The admin that will execute the delete action.</param>\n/// <param name=\"signature\">The admin signature.</param>\n- /// <param name=\"unsignOrphanPackages\">True if the orphan packages will be unlisted.</param>\n+ /// <param name=\"unlistOrphanPackages:\">True if the orphan packages will be unlisted.</param>\n/// <param name=\"commitAsTransaction\">True if the changes will commited as a transaction.</param>\n/// <returns></returns>\n- Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User userToBeDeleted, User admin, string signature, bool unsignOrphanPackages, bool commitAsTransaction);\n+ Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User userToBeDeleted,\n+ User userToExecuteTheDelete,\n+ string signature,\n+ bool unlistOrphanPackages,\n+ bool commitAsTransaction);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -133,6 +133,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to An exception was encoutered while trying to delete the account. Please contact support for assistance..\n+ /// </summary>\n+ public static string AccountSelfDelete_Fail {\n+ get {\n+ return ResourceManager.GetString(\"AccountSelfDelete_Fail\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to User '{0}' is already a member of this organization..\n/// </summary>\n@@ -1111,6 +1120,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Account '{0}' does not support organizations..\n+ /// </summary>\n+ public static string Organizations_NotSupportedForAccount {\n+ get {\n+ return ResourceManager.GetString(\"Organizations_NotSupportedForAccount\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Organization accounts cannot create credentials..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -842,4 +842,10 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"AddMember_UserIsOrganization\" xml:space=\"preserve\">\n<value>User '{0}' is an organization and cannot be a member of another organization.</value>\n</data>\n+ <data name=\"Organizations_NotSupportedForAccount\" xml:space=\"preserve\">\n+ <value>Account '{0}' does not support organizations.</value>\n+ </data>\n+ <data name=\"AccountSelfDelete_Fail\" xml:space=\"preserve\">\n+ <value>An exception was encoutered while trying to delete the account. Please contact support for assistance.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -2178,6 +2178,43 @@ public async Task RequestDeleteAccountAsync(bool successOnSentRequest)\nbool tempData = controller.TempData.ContainsKey(\"RequestFailedMessage\");\nAssert.Equal<bool>(!successOnSentRequest, tempData);\n}\n+\n+ /// <summary>\n+ /// If the user does not have the email account confirmed the user record is deleted without sending a support request.\n+ /// </summary>\n+ [Fact]\n+ public async Task WhenUserIsUnconfirmedDeletesAccount()\n+ {\n+ // Arrange\n+ string userName = \"DeletedUser\";\n+ string emailAddress = $\"{userName}@coldmail.com\";\n+\n+ var controller = GetController<UsersController>();\n+\n+ var fakes = Get<Fakes>();\n+ var testUser = fakes.CreateUser(userName);\n+ testUser.UnconfirmedEmailAddress = emailAddress;\n+ controller.SetCurrentUser(testUser);\n+\n+ GetMock<IUserService>()\n+ .Setup(stub => stub.FindByUsername(userName))\n+ .Returns(testUser);\n+\n+ GetMock<IDeleteAccountService>()\n+ .Setup(stub => stub.DeleteGalleryUserAccountAsync(testUser, It.IsAny<User>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ .Returns(value: Task.FromResult(new DeleteUserAccountStatus()\n+ {\n+ AccountName = userName,\n+ Description = \"Delete user\",\n+ Success = true\n+ }));\n+\n+ // act\n+ var result = await controller.RequestAccountDeletion() as NuGetGallery.SafeRedirectResult;\n+\n+ // Assert\n+ Assert.NotNull(result);\n+ }\n}\npublic class TheTransformToOrganizationActionBase : TestContainer\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -117,7 +117,7 @@ public async Task DeleteDeletedUser()\nvar signature = \"Hello\";\nvar result = await deleteAccountService.\nDeleteGalleryUserAccountAsync(userToBeDeleted: testUser,\n- admin: testUser,\n+ userToExecuteTheDelete: testUser,\nsignature: signature,\nunlistOrphanPackages: true,\ncommitAsTransaction: false);\n@@ -148,7 +148,7 @@ public async Task DeleteHappyUser()\nvar signature = \"Hello\";\nawait deleteAccountService.\nDeleteGalleryUserAccountAsync(userToBeDeleted: testUser,\n- admin: testUser,\n+ userToExecuteTheDelete: testUser,\nsignature: signature,\nunlistOrphanPackages: true,\ncommitAsTransaction: false);\n@@ -166,6 +166,34 @@ await deleteAccountService.\nAssert.True(deleteRecord != null);\n}\n+ [Fact]\n+ public async Task WhenUserIsNotConfirmedTheUserRecordIsDeleted()\n+ {\n+ //Arange\n+ User testUser = new User();\n+ testUser.Username = \"TestsUser\";\n+ testUser.UnconfirmedEmailAddress = \"user@test.com\";\n+ var testableService = new DeleteAccountTestService(testUser);\n+ var deleteAccountService = testableService.GetDeleteAccountService();\n+\n+ //Act\n+ var status = await deleteAccountService.DeleteGalleryUserAccountAsync(userToBeDeleted: testUser,\n+ userToExecuteTheDelete: testUser,\n+ signature: testUser.Username,\n+ unlistOrphanPackages: true,\n+ commitAsTransaction: false);\n+\n+ //Assert\n+ Assert.True(status.Success);\n+ Assert.Null(testableService.User);\n+ Assert.Equal(1, testableService.AuditService.Records.Count);\n+ var deleteAccountAuditRecord = testableService.AuditService.Records[0] as DeleteAccountAuditRecord;\n+ Assert.NotNull(deleteAccountAuditRecord);\n+ Assert.Equal(testUser.Username, deleteAccountAuditRecord.AdminUsername);\n+ Assert.Equal(testUser.Username, deleteAccountAuditRecord.Username);\n+ Assert.Equal(DeleteAccountAuditRecord.ActionStatus.Success, deleteAccountAuditRecord.Status);\n+ }\n+\nprivate static User CreateTestData(ref PackageRegistration registration)\n{\nUser testUser = new User();\n@@ -200,6 +228,14 @@ public class DeleteAccountTestService\npublic List<Issue> SupportRequests = new List<Issue>();\npublic FakeAuditingService AuditService;\n+ public DeleteAccountTestService(User user)\n+ {\n+ _user = user;\n+ _userPackages = new List<Package>();\n+\n+ AuditService = new FakeAuditingService();\n+ }\n+\npublic DeleteAccountTestService(User user, PackageRegistration userPackagesRegistration)\n{\n_user = user;\n@@ -255,6 +291,11 @@ public Task SaveAuditRecordAsync(AuditRecord record)\n}\n}\n+ public User User\n+ {\n+ get { return _user; }\n+ }\n+\nprivate class TestableAuthService : AuthenticationService\n{\npublic TestableAuthService() : base()\n@@ -312,6 +353,8 @@ private Mock<IEntityRepository<User>> SetupUserRepository()\nvar userRepository = new Mock<IEntityRepository<User>>();\nuserRepository.Setup(m => m.CommitChangesAsync())\n.Returns(Task.CompletedTask);\n+ userRepository.Setup(m => m.DeleteOnCommit(_user))\n+ .Callback(()=>_user = null);\nreturn userRepository;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Delete Account for not confirmed email. (#5697)
An user can self delete an account if the email is not confirmed.
|
455,776 |
25.04.2018 10:27:59
| 25,200 |
9f61706f6b5312c7fffc2816d10cbe6d233fc70d
|
Manage packages page minor UI fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1173,6 +1173,9 @@ img.reserved-indicator-icon {\nposition: relative;\ntop: 2px;\n}\n+.page-manage-packages .inner-table {\n+ margin-bottom: 0;\n+}\n.page-delete-package h1 {\nmargin-bottom: 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"new_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"diff": "top: 2px;\n}\n}\n+\n+ .inner-table {\n+ margin-bottom: 0px;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "<script type=\"text/html\" id=\"manage-packages\">\n<div class=\"col-md-12\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n- <table class=\"table\">\n+ <!-- ko if: VisiblePackagesCount -->\n+ <table class=\"table inner-table\">\n<thead>\n<tr class=\"manage-package-headings\">\n<th class=\"hidden-xs\"><span class=\"hidden\">Package Icon</span></th>\n</tr>\n</tbody>\n</table>\n+ <!-- /ko -->\n+ <!-- ko ifnot: VisiblePackagesCount -->\n+ <span>There are no packages that fit this criteria.</span>\n+ <!-- /ko -->\n</div>\n</div>\n</script>\n<script type=\"text/html\" id=\"manage-namespaces\">\n<div class=\"col-md-12\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n- <table class=\"table\">\n+ <!-- ko if: VisibleNamespacesCount -->\n+ <table class=\"table inner-table\">\n<thead>\n<tr class=\"manage-package-headings\">\n<th class=\"hidden-xs\"><span class=\"hidden\">Reserved Namespace Icon</span></th>\n</tr>\n</tbody>\n</table>\n+ <!-- /ko -->\n+ <!-- ko ifnot: VisibleNamespacesCount -->\n+ <span>There are no reserved namespaces that fit this criteria.</span>\n+ <!-- /ko -->\n</div>\n</div>\n</script>\n<script type=\"text/html\" id=\"manage-owner-requests\">\n<div class=\"col-md-12\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n- <table class=\"table\">\n+ <!-- ko if: VisibleRequestsCount -->\n+ <table class=\"table inner-table\">\n<thead>\n<tr class=\"manage-package-headings\">\n<th class=\"hidden-xs\"><span class=\"hidden\">Package Icon</span></th>\n</tr>\n</tbody>\n</table>\n+ <!-- /ko -->\n+ <!-- ko ifnot: VisibleRequestsCount -->\n+ <span>There are no requests that fit this criteria.</span>\n+ <!-- /ko -->\n</div>\n</div>\n</script>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Manage packages page minor UI fixes (#5842)
|
455,776 |
26.04.2018 13:11:58
| 25,200 |
373c2cb38d2b003512098e9eb76f04a6296cd9cb
|
Package Edit page throws on Locked Packages
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1188,6 +1188,7 @@ public virtual async Task<ActionResult> Edit(string id, string version)\nPackageId = package.PackageRegistration.Id,\nPackageTitle = package.Title,\nVersion = package.NormalizedVersion,\n+ PackageRegistration = package.PackageRegistration,\nIsLocked = package.PackageRegistration.IsLocked,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RequestModels/EditPackageRequest.cs",
"new_path": "src/NuGetGallery/RequestModels/EditPackageRequest.cs",
"diff": "@@ -15,6 +15,7 @@ public class EditPackageRequest\npublic string PackageId { get; set; }\npublic string PackageTitle { get; set; }\npublic string Version { get; set; }\n+ public PackageRegistration PackageRegistration { get; set; }\npublic IList<Package> PackageVersions { get; set; }\npublic bool IsLocked { get; set; }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageHeadingModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageHeadingModel.cs",
"diff": "@@ -11,6 +11,7 @@ public class PackageHeadingModel\npublic string Id { get; }\npublic string Version { get; }\npublic bool ShowProfileBreadcrumb { get; }\n+\npublic string PackageDisplay\n{\nget\n@@ -25,6 +26,7 @@ public string PackageDisplay\n}\n}\n}\n+\npublic bool LinkIdOnly => string.IsNullOrEmpty(Version);\npublic PackageHeadingModel(User currentUser, Package package, string pageHeading, bool linkIdOnly = false)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Edit.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Edit.cshtml",
"diff": "\"_PackageHeading\",\nnew PackageHeadingModel(\nCurrentUser,\n- Model.PackageVersions.First(),\n- \"Edit\",\n- linkIdOnly: true))\n+ Model.PackageRegistration,\n+ \"Edit\"))\n@if (Model.IsLocked)\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Package Edit page throws on Locked Packages (#5848)
|
455,776 |
26.04.2018 14:13:08
| 25,200 |
67a260c9229a62f20d5c8a4ece171e29c8f814b9
|
[Organizations] Auditing for organizations
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditedUserAction.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditedUserAction.cs",
"diff": "@@ -16,6 +16,11 @@ public enum AuditedUserAction\nConfirmEmail,\nLogin,\nSubscribeToPolicies,\n- UnsubscribeFromPolicies\n+ UnsubscribeFromPolicies,\n+ AddOrganization,\n+ TransformOrganization,\n+ AddOrganizationMember,\n+ RemoveOrganizationMember,\n+ UpdateOrganizationMember\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/UserAuditRecord.cs",
"new_path": "src/NuGetGallery.Core/Auditing/UserAuditRecord.cs",
"diff": "@@ -15,25 +15,33 @@ public class UserAuditRecord : AuditRecord<AuditedUserAction>\npublic string UnconfirmedEmailAddress { get; }\npublic string[] Roles { get; }\npublic CredentialAuditRecord[] Credentials { get; }\n+\n+ /// <summary>\n+ /// The credential affected by <see cref=\"AuditRecord{T}.Action\"/>.\n+ /// </summary>\npublic CredentialAuditRecord[] AffectedCredential { get; }\n+\n+ /// <summary>\n+ /// The email address affected by <see cref=\"AuditRecord{T}.Action\"/>.\n+ /// </summary>\npublic string AffectedEmailAddress { get; }\n/// <summary>\n- /// Subset of user policies affected by the action (subscription / unsubscription).\n+ /// The username of the member affected by <see cref=\"AuditRecord{T}.Action\"/>.\n/// </summary>\n- public AuditedUserSecurityPolicy[] AffectedPolicies { get; }\n+ public string AffectedMemberUsername { get; }\n- public UserAuditRecord(User user, AuditedUserAction action)\n- : this(user, action, Enumerable.Empty<Credential>())\n- {\n- }\n+ /// <summary>\n+ /// Whether or not the member affected by <see cref=\"AuditRecord{T}.Action\"/> is an administrator or not.\n+ /// </summary>\n+ public bool AffectedMemberIsAdmin { get; }\n- public UserAuditRecord(User user, AuditedUserAction action, Credential affected)\n- : this(user, action, SingleEnumerable(affected))\n- {\n- }\n+ /// <summary>\n+ /// Subset of user policies affected by <see cref=\"AuditRecord{T}.Action\"/>.\n+ /// </summary>\n+ public AuditedUserSecurityPolicy[] AffectedPolicies { get; }\n- public UserAuditRecord(User user, AuditedUserAction action, IEnumerable<Credential> affected)\n+ public UserAuditRecord(User user, AuditedUserAction action)\n: base(action)\n{\nif (user == null)\n@@ -45,25 +53,45 @@ public UserAuditRecord(User user, AuditedUserAction action, IEnumerable<Credenti\nEmailAddress = user.EmailAddress;\nUnconfirmedEmailAddress = user.UnconfirmedEmailAddress;\nRoles = user.Roles.Select(r => r.Name).ToArray();\n+\nCredentials = user.Credentials.Where(CredentialTypes.IsSupportedCredential)\n.Select(c => new CredentialAuditRecord(c, removed: false)).ToArray();\n- if (affected != null)\n+ AffectedCredential = new CredentialAuditRecord[0];\n+ AffectedPolicies = new AuditedUserSecurityPolicy[0];\n+ }\n+\n+ public UserAuditRecord(User user, AuditedUserAction action, Credential affected)\n+ : this(user, action, new[] { affected })\n{\n- AffectedCredential = affected.Select(c => new CredentialAuditRecord(c, action == AuditedUserAction.RemoveCredential)).ToArray();\n}\n- Action = action;\n+ public UserAuditRecord(User user, AuditedUserAction action, IEnumerable<Credential> affected)\n+ : this(user, action)\n+ {\n+ AffectedCredential = affected.Select(c => new CredentialAuditRecord(c, action == AuditedUserAction.RemoveCredential)).ToArray();\n}\npublic UserAuditRecord(User user, AuditedUserAction action, string affectedEmailAddress)\n- : this(user, action, Enumerable.Empty<Credential>())\n+ : this(user, action)\n{\nAffectedEmailAddress = affectedEmailAddress;\n}\n+ public UserAuditRecord(User user, AuditedUserAction action, User affectedMember, bool affectedMemberIsAdmin)\n+ : this(user, action)\n+ {\n+ AffectedMemberUsername = affectedMember.Username;\n+ AffectedMemberIsAdmin = affectedMemberIsAdmin;\n+ }\n+\n+ public UserAuditRecord(User user, AuditedUserAction action, Membership affectedMembership)\n+ : this(user, action, affectedMembership.Member, affectedMembership.IsAdmin)\n+ {\n+ }\n+\npublic UserAuditRecord(User user, AuditedUserAction action, IEnumerable<UserSecurityPolicy> affectedPolicies)\n- : this(user, action, Enumerable.Empty<Credential>())\n+ : this(user, action)\n{\nif (affectedPolicies == null || affectedPolicies.Count() == 0)\n{\n@@ -77,10 +105,5 @@ public override string GetPath()\n{\nreturn Username.ToLowerInvariant();\n}\n-\n- private static IEnumerable<Credential> SingleEnumerable(Credential affected)\n- {\n- yield return affected;\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -218,12 +218,16 @@ public async Task<Membership> AddMemberAsync(Organization organization, string m\nIsAdmin = request.IsAdmin\n};\norganization.Members.Add(membership);\n+\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(organization, AuditedUserAction.AddOrganizationMember, membership));\n}\nelse\n{\n// If the user is already a member, update the existing membership.\n// If the request grants admin but this member is not an admin, grant admin to the member.\nmembership.IsAdmin = membership.IsAdmin || request.IsAdmin;\n+\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(organization, AuditedUserAction.UpdateOrganizationMember, membership));\n}\nawait EntitiesContext.SaveChangesAsync();\n@@ -251,6 +255,9 @@ public async Task<Membership> UpdateMemberAsync(Organization organization, strin\n}\nmembership.IsAdmin = isAdmin;\n+\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(organization, AuditedUserAction.UpdateOrganizationMember, membership));\n+\nawait EntitiesContext.SaveChangesAsync();\n}\n@@ -277,6 +284,9 @@ public async Task<User> DeleteMemberAsync(Organization organization, string memb\n}\norganization.Members.Remove(membership);\n+\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(organization, AuditedUserAction.RemoveOrganizationMember, membership));\n+\nawait EntitiesContext.SaveChangesAsync();\nreturn memberToRemove;\n@@ -499,8 +509,13 @@ public bool CanTransformUserToOrganization(User accountToTransform, User adminUs\npublic async Task<bool> TransformUserToOrganization(User accountToTransform, User adminUser, string token)\n{\nawait SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(accountToTransform, adminUser);\n+ var result = await EntitiesContext.TransformUserToOrganization(accountToTransform, adminUser, token);\n+ if (result)\n+ {\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(accountToTransform, AuditedUserAction.TransformOrganization, adminUser, affectedMemberIsAdmin: true));\n+ }\n- return await EntitiesContext.TransformUserToOrganization(accountToTransform, adminUser, token);\n+ return result;\n}\npublic async Task<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser)\n@@ -539,6 +554,8 @@ public async Task<Organization> AddOrganizationAsync(string username, string ema\nawait SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(organization, adminUser, commitChanges: false);\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(organization, AuditedUserAction.AddOrganization, membership));\n+\nawait EntitiesContext.SaveChangesAsync();\nreturn organization;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedUserActionTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedUserActionTests.cs",
"diff": "@@ -23,7 +23,12 @@ public void Definition_HasNotChanged()\n\"RemoveCredential\",\n\"RequestPasswordReset\",\n\"SubscribeToPolicies\",\n- \"UnsubscribeFromPolicies\"\n+ \"UnsubscribeFromPolicies\",\n+ \"AddOrganization\",\n+ \"TransformOrganization\",\n+ \"AddOrganizationMember\",\n+ \"RemoveOrganizationMember\",\n+ \"UpdateOrganizationMember\"\n};\nVerify(typeof(AuditedUserAction), expectedNames);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/TestAuditingService.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/TestAuditingService.cs",
"diff": "@@ -24,6 +24,11 @@ public Task SaveAuditRecordAsync(AuditRecord record)\npublic static class AuditingServiceTestExtensions\n{\n+ public static bool WroteRecord<T>(this IAuditingService self) where T : AuditRecord\n+ {\n+ return self.WroteRecord<T>(ar => true);\n+ }\n+\npublic static bool WroteRecord<T>(this IAuditingService self, Func<T, bool> predicate) where T : AuditRecord\n{\nTestAuditingService testService = self as TestAuditingService;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -389,29 +389,32 @@ public async Task WhereMemberIsOrganization_ThrowsEntityException(bool isAdmin)\npublic async Task WhenMemberExists_UpdatesMember(bool isAdmin)\n{\n// Arrange\n- var fakes = new Fakes();\n- var service = new TestableUserService();\n- service.MockUserRepository.Setup(r => r.GetAll())\n+ UserService.MockUserRepository.Setup(r => r.GetAll())\n.Returns(new[] {\n- fakes.User,\n- fakes.Organization\n+ Fakes.User,\n+ Fakes.Organization\n}.AsQueryable());\nvar token = \"token\";\n- fakes.Organization.MemberRequests.Add(new MembershipRequest\n+ Fakes.Organization.MemberRequests.Add(new MembershipRequest\n{\n- NewMember = fakes.OrganizationCollaborator,\n+ NewMember = Fakes.OrganizationCollaborator,\nConfirmationToken = token,\nIsAdmin = isAdmin\n});\n// Act\n- var result = await service.AddMemberAsync(fakes.Organization, fakes.OrganizationCollaborator.Username, token);\n+ var result = await UserService.AddMemberAsync(Fakes.Organization, Fakes.OrganizationCollaborator.Username, token);\nAssert.Equal(isAdmin, result.IsAdmin);\n- Assert.Equal(fakes.OrganizationCollaborator, result.Member);\n+ Assert.Equal(Fakes.OrganizationCollaborator, result.Member);\n- service.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n+ UserService.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n+ Assert.True(UserService.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.UpdateOrganizationMember &&\n+ ar.Username == Fakes.Organization.Username &&\n+ ar.AffectedMemberUsername == Fakes.OrganizationCollaborator.Username &&\n+ ar.AffectedMemberIsAdmin == isAdmin));\n}\n[Theory]\n@@ -505,6 +508,11 @@ public async Task WhenSecurityPolicyEvalutionSucceeds_CreatesMembership(bool isA\nAssert.Equal(Fakes.User, result.Member);\nUserService.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n+ Assert.True(UserService.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.AddOrganizationMember &&\n+ ar.Username == Fakes.Organization.Username &&\n+ ar.AffectedMemberUsername == Fakes.User.Username &&\n+ ar.AffectedMemberIsAdmin == isAdmin));\n}\n}\n@@ -583,6 +591,12 @@ public async Task WhenNotLastAdmin_DeletesMembership()\n// Assert\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n+\n+ Assert.True(service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.RemoveOrganizationMember &&\n+ ar.Username == fakes.Organization.Username &&\n+ ar.AffectedMemberUsername == fakes.OrganizationAdmin.Username &&\n+ ar.AffectedMemberIsAdmin == true));\n}\n[Fact]\n@@ -597,6 +611,12 @@ public async Task WhenCollaborator_DeletesMembership()\n// Assert\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n+\n+ Assert.True(service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.RemoveOrganizationMember &&\n+ ar.Username == fakes.Organization.Username &&\n+ ar.AffectedMemberUsername == fakes.OrganizationCollaborator.Username &&\n+ ar.AffectedMemberIsAdmin == false));\n}\n}\n@@ -829,7 +849,7 @@ public async Task WhenRemovingLastAdmin_ThrowsEntityException()\n}\n[Fact]\n- public async Task WhenNotRemovingLastAdmin_ReturnsSuccess()\n+ public async Task WhenNotDemotingLastAdmin_ReturnsSuccess()\n{\n// Arrange\nvar fakes = new Fakes();\n@@ -847,6 +867,70 @@ public async Task WhenNotRemovingLastAdmin_ReturnsSuccess()\nAssert.Equal(fakes.OrganizationAdmin, result.Member);\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n+\n+ Assert.True(service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.UpdateOrganizationMember &&\n+ ar.Username == fakes.Organization.Username &&\n+ ar.AffectedMemberUsername == fakes.OrganizationAdmin.Username &&\n+ ar.AffectedMemberIsAdmin == false));\n+ }\n+\n+ [Fact]\n+ public async Task WhenPromotingCollaboratorToAdmin_ReturnsSuccess()\n+ {\n+ // Arrange\n+ var fakes = new Fakes();\n+ var service = new TestableUserService();\n+\n+ // Act\n+ var result = await service.UpdateMemberAsync(fakes.Organization, fakes.OrganizationCollaborator.Username, true);\n+\n+ // Assert\n+ Assert.Equal(true, result.IsAdmin);\n+ Assert.Equal(fakes.OrganizationCollaborator, result.Member);\n+\n+ service.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n+\n+ Assert.True(service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.UpdateOrganizationMember &&\n+ ar.Username == fakes.Organization.Username &&\n+ ar.AffectedMemberUsername == fakes.OrganizationCollaborator.Username &&\n+ ar.AffectedMemberIsAdmin == true));\n+ }\n+\n+ public static IEnumerable<object[]> WhenMembershipMatches_DoesNotSaveChanges_Data => new object[][]\n+ {\n+ new object[]\n+ {\n+ new Func<Fakes, User>((Fakes fakes) => fakes.OrganizationAdmin),\n+ true\n+ },\n+ new object[]\n+ {\n+ new Func<Fakes, User>((Fakes fakes) => fakes.OrganizationCollaborator),\n+ false\n+ }\n+ };\n+\n+ [Theory]\n+ [MemberData(nameof(WhenMembershipMatches_DoesNotSaveChanges_Data))]\n+ public async Task WhenMembershipMatches_DoesNotSaveChanges(Func<Fakes, User> getMember, bool isAdmin)\n+ {\n+ // Arrange\n+ var fakes = new Fakes();\n+ var service = new TestableUserService();\n+ var member = getMember(fakes);\n+\n+ // Act\n+ var result = await service.UpdateMemberAsync(fakes.Organization, member.Username, isAdmin);\n+\n+ // Assert\n+ Assert.Equal(isAdmin, result.IsAdmin);\n+ Assert.Equal(member, result.Member);\n+\n+ service.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n+\n+ Assert.False(service.Auditing.WroteRecord<UserAuditRecord>());\n}\n}\n@@ -1471,10 +1555,20 @@ public class TheTransformToOrganizationAccountMethod\n{\nprivate TestableUserService _service = new TestableUserService();\n+ private const string TransformedUsername = \"Account\";\n+ private const string AdminUsername = \"Admin\";\n+\n[Fact]\npublic async Task WhenAdminHasNoTenant_TransformsAccountWithoutPolicy()\n{\n- Assert.True(await InvokeTransformUserToOrganization(3, new User(\"adminWithNoTenant\") { Credentials = new Credential[0] }));\n+ var tenantlessAdminUsername = \"adminWithNoTenant\";\n+ Assert.True(await InvokeTransformUserToOrganization(3, new User(tenantlessAdminUsername) { Credentials = new Credential[0] }));\n+\n+ Assert.True(_service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.TransformOrganization &&\n+ ar.Username == TransformedUsername &&\n+ ar.AffectedMemberUsername == tenantlessAdminUsername &&\n+ ar.AffectedMemberIsAdmin == true));\n}\npublic async Task WhenAdminHasUnsupportedTenant_TransformsAccountWithoutPolicy()\n@@ -1489,6 +1583,12 @@ public async Task WhenAdminHasUnsupportedTenant_TransformsAccountWithoutPolicy()\n.Returns(mockLoginDiscontinuationConfiguration.Object);\nAssert.True(await InvokeTransformUserToOrganization(3));\n+\n+ Assert.True(_service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.TransformOrganization &&\n+ ar.Username == TransformedUsername &&\n+ ar.AffectedMemberUsername == AdminUsername &&\n+ ar.AffectedMemberIsAdmin == true));\n}\npublic async Task WhenAdminHasSupportedTenant_TransformsAccountWithPolicy()\n@@ -1503,6 +1603,12 @@ public async Task WhenAdminHasSupportedTenant_TransformsAccountWithPolicy()\n.Returns(mockLoginDiscontinuationConfiguration.Object);\nAssert.True(await InvokeTransformUserToOrganization(3, subscribesToPolicy: true));\n+\n+ Assert.True(_service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.TransformOrganization &&\n+ ar.Username == TransformedUsername &&\n+ ar.AffectedMemberUsername == AdminUsername &&\n+ ar.AffectedMemberIsAdmin == true));\n}\n[Theory]\n@@ -1520,6 +1626,8 @@ public async Task WhenSqlResultIsZeroOrLess_ReturnsFalse(int affectedRecords)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\nAssert.False(await InvokeTransformUserToOrganization(affectedRecords));\n+\n+ Assert.False(_service.Auditing.WroteRecord<UserAuditRecord>());\n}\n[Theory]\n@@ -1537,13 +1645,19 @@ public async Task WhenSqlResultIsPositive_ReturnsTrue(int affectedRecords)\n.Returns(mockLoginDiscontinuationConfiguration.Object);\nAssert.True(await InvokeTransformUserToOrganization(affectedRecords));\n+\n+ Assert.True(_service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.TransformOrganization &&\n+ ar.Username == TransformedUsername &&\n+ ar.AffectedMemberUsername == AdminUsername &&\n+ ar.AffectedMemberIsAdmin == true));\n}\nprivate Task<bool> InvokeTransformUserToOrganization(int affectedRecords, User admin = null, bool subscribesToPolicy = false)\n{\n// Arrange\n- var account = new User(\"Account\");\n- admin = admin ?? new User(\"Admin\")\n+ var account = new User(TransformedUsername);\n+ admin = admin ?? new User(AdminUsername)\n{\nCredentials = new Credential[] {\nnew CredentialBuilder().CreateExternalCredential(\n@@ -1595,6 +1709,7 @@ public async Task WithUsernameConflict_ThrowsEntityException()\n_service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Never());\n_service.MockSecurityPolicyService.Verify(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false), Times.Never());\n_service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Never());\n+ Assert.False(_service.Auditing.WroteRecord<UserAuditRecord>());\n}\n[Fact]\n@@ -1612,6 +1727,7 @@ public async Task WithEmailConflict_ThrowsEntityException()\n_service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Never());\n_service.MockSecurityPolicyService.Verify(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false), Times.Never());\n_service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Never());\n+ Assert.False(_service.Auditing.WroteRecord<UserAuditRecord>());\n}\n[Fact]\n@@ -1738,6 +1854,11 @@ private void AssertNewOrganizationReturned(Organization org, bool subscribedToPo\n_service.MockSecurityPolicyService.Verify(\nsp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false),\nsubscribedToPolicy ? Times.Once() : Times.Never());\n+ Assert.True(_service.Auditing.WroteRecord<UserAuditRecord>(ar =>\n+ ar.Action == AuditedUserAction.AddOrganization &&\n+ ar.Username == org.Username &&\n+ ar.AffectedMemberUsername == AdminName &&\n+ ar.AffectedMemberIsAdmin == true));\n_service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Once());\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Auditing for organizations (#5805)
|
455,731 |
27.04.2018 14:08:44
| 25,200 |
ea1724d42bb9281f13c111d41c703760262917f2
|
Certificates: add 2FA requirement for signing
Resolve
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"new_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"diff": "@@ -335,6 +335,8 @@ protected virtual void UpdateAccountViewModel(TUser account, TAccountViewModel m\nmodel.CanManage = ActionsRequiringPermissions.ManageAccount.CheckPermissions(\nGetCurrentUser(), account) == PermissionsCheckResult.Allowed;\n+ model.WasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();\n+\nmodel.CuratedFeeds = CuratedFeedService\n.GetFeedsForManager(account.Key)\n.Select(f => f.Name)\n@@ -377,7 +379,7 @@ public virtual async Task<JsonResult> AddCertificate(string accountName, HttpPos\n}\nif (ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n- != PermissionsCheckResult.Allowed)\n+ != PermissionsCheckResult.Allowed || !User.WasMultiFactorAuthenticated())\n{\nreturn Json(HttpStatusCode.Forbidden, new { Strings.Unauthorized });\n}\n@@ -436,7 +438,7 @@ public virtual async Task<JsonResult> DeleteCertificate(string accountName, stri\n}\nif (ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n- != PermissionsCheckResult.Allowed)\n+ != PermissionsCheckResult.Allowed || !User.WasMultiFactorAuthenticated())\n{\nreturn Json(HttpStatusCode.Forbidden, new { Strings.Unauthorized });\n}\n@@ -469,6 +471,7 @@ public virtual JsonResult GetCertificates(string accountName)\nreturn Json(HttpStatusCode.Forbidden);\n}\n+ var wasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();\nvar canManage = ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n== PermissionsCheckResult.Allowed;\nvar template = GetDeleteCertificateForAccountTemplate(accountName);\n@@ -478,7 +481,7 @@ public virtual JsonResult GetCertificates(string accountName)\n{\nstring deactivateUrl = null;\n- if (canManage)\n+ if (wasMultiFactorAuthenticated && canManage)\n{\ndeactivateUrl = template.Resolve(certificate.Thumbprint);\n}\n@@ -517,6 +520,7 @@ public virtual JsonResult GetCertificate(string accountName, string thumbprint)\nreturn Json(HttpStatusCode.Forbidden);\n}\n+ var wasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();\nvar canManage = ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n== PermissionsCheckResult.Allowed;\nvar template = GetDeleteCertificateForAccountTemplate(accountName);\n@@ -527,7 +531,7 @@ public virtual JsonResult GetCertificate(string accountName, string thumbprint)\n{\nstring deactivateUrl = null;\n- if (canManage)\n+ if (wasMultiFactorAuthenticated && canManage)\n{\ndeactivateUrl = template.Resolve(certificate.Thumbprint);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1811,7 +1811,7 @@ public virtual async Task<JsonResult> SetRequiredSigner(string id, string userna\nif (ActionsRequiringPermissions.ManagePackageRequiredSigner\n.CheckPermissionsOnBehalfOfAnyAccount(currentUser, packageRegistration)\n- != PermissionsCheckResult.Allowed)\n+ != PermissionsCheckResult.Allowed || !User.WasMultiFactorAuthenticated())\n{\nreturn Json(HttpStatusCode.Forbidden);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -436,14 +436,18 @@ public virtual ActionResult Packages()\nnew ListPackageOwnerViewModel(currentUser)\n}.Concat(currentUser.Organizations.Select(o => new ListPackageOwnerViewModel(o.Organization)));\n+ var wasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();\n+\nvar packages = PackageService.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\nvar listedPackages = packages\n.Where(p => p.Listed)\n- .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService)).OrderBy(p => p.Id)\n+ .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasMultiFactorAuthenticated))\n+ .OrderBy(p => p.Id)\n.ToList();\nvar unlistedPackages = packages\n.Where(p => !p.Listed)\n- .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService)).OrderBy(p => p.Id)\n+ .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasMultiFactorAuthenticated))\n+ .OrderBy(p => p.Id)\n.ToList();\n// find all received ownership requests\n@@ -473,7 +477,8 @@ public virtual ActionResult Packages()\nListedPackages = listedPackages,\nUnlistedPackages = unlistedPackages,\nOwnerRequests = ownerRequests,\n- ReservedNamespaces = reservedPrefixes\n+ ReservedNamespaces = reservedPrefixes,\n+ WasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated()\n};\nreturn View(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/AccountViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/AccountViewModel.cs",
"diff": "@@ -22,6 +22,8 @@ public abstract class AccountViewModel\npublic bool CanManage { get; set; }\n+ public bool WasMultiFactorAuthenticated { get; set; }\n+\npublic IList<string> CuratedFeeds { get; set; }\npublic ChangeEmailViewModel ChangeEmail { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListPackageItemRequiredSignerViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListPackageItemRequiredSignerViewModel.cs",
"diff": "@@ -26,7 +26,8 @@ public sealed class ListPackageItemRequiredSignerViewModel : ListPackageItemView\npublic ListPackageItemRequiredSignerViewModel(\nPackage package,\nUser currentUser,\n- ISecurityPolicyService securityPolicyService)\n+ ISecurityPolicyService securityPolicyService,\n+ bool wasMultiFactorAuthenticated)\n: base(package, currentUser)\n{\nif (package == null)\n@@ -134,6 +135,8 @@ public sealed class ListPackageItemRequiredSignerViewModel : ListPackageItemView\nRequiredSignerMessage = GetRequiredSignerMessage(ownersWithRequiredSignerControl);\n}\n+\n+ CanEditRequiredSigner &= wasMultiFactorAuthenticated;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"diff": "@@ -16,5 +16,7 @@ public class ManagePackagesViewModel\npublic OwnerRequestsViewModel OwnerRequests { get; set; }\npublic ReservedNamespaceListViewModel ReservedNamespaces { get; set; }\n+\n+ public bool WasMultiFactorAuthenticated { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "var parent = (WebViewPage)TempData[\"Parent\"];\n}\n+@helper WarnFor2FARequirement()\n+{\n+ @ViewHelpers.AlertWarning(@<text>You must enable two-factor authentication before you can register or manage certificates. This can be enabled in your <a href=\"@Url.AccountSettings()\">Account Settings</a>.</text>)\n+}\n+\n@ViewHelpers.Section(\nparent,\n\"certificates\",\n</form>\n<div class=\"list-certificates\">\n+ @if (!Model.WasMultiFactorAuthenticated)\n+ {\n+ @WarnFor2FARequirement();\n+ }\n+\n<div class=\"row\" data-bind=\"ifnot: $data && $data.hasCertificates && $data.hasCertificates()\">\n<div class=\"col-xs-12 clearfix\">\nAll your packages need to be signed by one of the registered certificates. <a href=\"https://docs.microsoft.com/en-us/nuget/reference/signed-packages-reference\">Learn more about package signing.</a>\n</div>\n</div>\n- @if (Model.CanManage)\n+ @if (Model.WasMultiFactorAuthenticated && Model.CanManage)\n{\n<div class=\"collapse in\" id=\"upload-certificate-form\" aria-expanded=\"true\">\n@Html.ValidationSummary(true)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "</section>\n<script type=\"text/html\" id=\"manage-packages\">\n+ @if (!Model.WasMultiFactorAuthenticated)\n+ {\n+ <div data-bind=\"visible: Packages.length > 0\">\n+ @ViewHelpers.AlertWarning(@<text>You must enable two-factor authentication before you can change package signing requirements. This can be enabled in your <a href=\"@Url.AccountSettings()\">Account Settings</a>.</text>)\n+ </div>\n+ }\n<div class=\"col-md-12\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n<!-- ko if: VisiblePackagesCount -->\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "using System.Web.Mvc;\nusing Moq;\nusing NuGetGallery.Areas.Admin.ViewModels;\n+using NuGetGallery.Authentication;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Security;\nusing Xunit;\n@@ -1477,6 +1478,7 @@ public void GetCertificate_WhenOrganizationHasNoCertificates_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(Enumerable.Empty<Certificate>());\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificate(_organization.Username, _certificate.Thumbprint);\n@@ -1494,6 +1496,7 @@ public void GetCertificate_WhenOrganizationHasCertificate_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(new[] { _certificate });\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificate(_organization.Username, _certificate.Thumbprint);\n@@ -1623,6 +1626,7 @@ public void GetCertificates_WhenOrganizationHasNoCertificates_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(Enumerable.Empty<Certificate>());\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificates(_organization.Username);\n@@ -1640,6 +1644,7 @@ public void GetCertificates_WhenOrganizationHasCertificate_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(new[] { _certificate });\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificates(_organization.Username);\n@@ -1796,6 +1801,7 @@ public void AddCertificate_WhenUploadFileIsValid_ReturnsCreated()\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.AddCertificate(_organization.Username, uploadFile);\n@@ -1828,6 +1834,8 @@ public void AddCertificate_WhenUserIsSubscribedToAutomaticallyOverwriteRequiredS\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.AddCertificate(_organization.Username, uploadFile);\n@@ -1948,6 +1956,7 @@ public void DeleteCertificate_WithValidThumbprint_ReturnsOK()\nIt.Is<User>(user => user == _organization)))\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.DeleteCertificate(_organization.Username, _certificate.Thumbprint);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Globalization;\nusing System.IO;\nusing System.Linq;\nusing System.Linq.Expressions;\nusing System.Net;\nusing System.Net.Mail;\n+using System.Text;\nusing System.Threading.Tasks;\nusing System.Web;\nusing System.Web.Mvc;\nusing NuGetGallery.Areas.Admin.Models;\nusing NuGetGallery.AsyncFileUpload;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Authentication;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Helpers;\nusing NuGetGallery.Packaging;\nusing NuGetGallery.Security;\nusing Xunit;\n-using System.Globalization;\n-using System.Text;\nnamespace NuGetGallery\n{\n@@ -5315,6 +5316,7 @@ public async Task WhenSignerNotFound_ReturnsNotFound()\n.Returns<User>(null);\ncontroller.SetCurrentUser(currentUser);\n+ controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar result = await controller.SetRequiredSigner(_packageRegistration.Id, _signer.Username);\n@@ -5385,6 +5387,7 @@ public async Task WhenCurrentUserIsAuthenticatedOwner_ReturnsOK()\n.Returns(_signer);\ncontroller.SetCurrentUser(_signer);\n+ controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar result = await controller.SetRequiredSigner(_packageRegistration.Id, _signer.Username);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -2891,6 +2891,7 @@ public void GetCertificate_WhenCurrentUserHasNoCertificates_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _user)))\n.Returns(Enumerable.Empty<Certificate>());\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificate(accountName: null, thumbprint: _certificate.Thumbprint);\n@@ -2908,6 +2909,7 @@ public void GetCertificate_WhenCurrentUserHasCertificate_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _user)))\n.Returns(new[] { _certificate });\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificate(accountName: null, thumbprint: _certificate.Thumbprint);\n@@ -2965,6 +2967,7 @@ public void GetCertificates_WhenCurrentUserHasNoCertificates_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _user)))\n.Returns(Enumerable.Empty<Certificate>());\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificates(accountName: null);\n@@ -2982,6 +2985,7 @@ public void GetCertificates_WhenCurrentUserHasCertificate_ReturnsOK()\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _user)))\n.Returns(new[] { _certificate });\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.GetCertificates(accountName: null);\n@@ -3063,6 +3067,7 @@ public void AddCertificate_WhenUploadFileIsValid_ReturnsCreated()\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.AddCertificate(accountName: null, uploadFile: uploadFile);\n@@ -3095,6 +3100,7 @@ public void AddCertificate_WhenUserIsSubscribedToAutomaticallyOverwriteRequiredS\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.AddCertificate(accountName: null, uploadFile: uploadFile);\n@@ -3169,6 +3175,7 @@ public void DeleteCertificate_WithValidThumbprint_ReturnsOK()\nIt.Is<User>(user => user == _user)))\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ _controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\nvar response = _controller.DeleteCertificate(accountName: null, thumbprint: _certificate.Thumbprint);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"diff": "@@ -40,7 +40,8 @@ public void Constructor_WhenPackageIsNull_Throws()\n() => new ListPackageItemRequiredSignerViewModel(\npackage: null,\ncurrentUser: _currentUser,\n- securityPolicyService: _securityPolicyService.Object));\n+ securityPolicyService: _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true));\nAssert.Equal(\"package\", exception.ParamName);\n}\n@@ -58,7 +59,8 @@ public void Constructor_WhenCurrentUserIsNull_Throws()\n() => new ListPackageItemRequiredSignerViewModel(\npackage,\ncurrentUser: null,\n- securityPolicyService: _securityPolicyService.Object));\n+ securityPolicyService: _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true));\nAssert.Equal(\"currentUser\", exception.ParamName);\n}\n@@ -73,7 +75,11 @@ public void Constructor_WhenSecurityPolicyServiceIsNull_Throws()\n};\nvar exception = Assert.Throws<ArgumentNullException>(\n- () => new ListPackageItemRequiredSignerViewModel(package, _currentUser, securityPolicyService: null));\n+ () => new ListPackageItemRequiredSignerViewModel(\n+ package,\n+ _currentUser,\n+ securityPolicyService: null,\n+ wasMultiFactorAuthenticated: true));\nAssert.Equal(\"securityPolicyService\", exception.ParamName);\n}\n@@ -98,7 +104,8 @@ public void Constructor_WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequired\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -132,7 +139,8 @@ public void Constructor_WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequired\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -166,7 +174,8 @@ public void Constructor_WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequired\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -200,7 +209,8 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRe\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(string.Empty, viewModel.RequiredSigner.Username);\nAssert.Equal(\"Any\", viewModel.RequiredSigner.DisplayText);\n@@ -213,6 +223,91 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRe\n_securityPolicyService.VerifyAll();\n}\n+ [Fact]\n+ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwnerAndNotMultiFactorAuthenticated_WhenRequiredSignerIsNull()\n+ {\n+ var package = new Package()\n+ {\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Owners = new List<User>() { _currentUser, _otherUser }\n+ },\n+ Version = \"1.0.0\"\n+ };\n+\n+ _securityPolicyService.Setup(\n+ x => x.IsSubscribed(\n+ It.IsNotNull<User>(),\n+ It.Is<string>(s => s == ControlRequiredSignerPolicy.PolicyName)))\n+ .Returns(false);\n+\n+ var viewModel = new ListPackageItemRequiredSignerViewModel(\n+ package,\n+ _currentUser,\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: false);\n+\n+ Assert.Equal(string.Empty, viewModel.RequiredSigner.Username);\n+ Assert.Equal(\"Any\", viewModel.RequiredSigner.DisplayText);\n+ Assert.Null(viewModel.RequiredSignerMessage);\n+ VerifySigners(package.PackageRegistration.Owners, viewModel.AllSigners, expectAnySigner: true);\n+ Assert.True(viewModel.ShowRequiredSigner);\n+ Assert.False(viewModel.ShowTextBox);\n+ Assert.False(viewModel.CanEditRequiredSigner);\n+\n+ _securityPolicyService.VerifyAll();\n+ }\n+\n+ [Fact]\n+ public void Constructor_WhenPackageHasOneOwnerAndTheCurrentUserIsACollaborator_WhenRequiredSignerIsNull()\n+ {\n+ var organization = new Organization()\n+ {\n+ Key = 7,\n+ Username = \"c\"\n+ };\n+\n+ organization.Members.Add(new Membership()\n+ {\n+ OrganizationKey = organization.Key,\n+ Organization = organization,\n+ MemberKey = _currentUser.Key,\n+ Member = _currentUser,\n+ IsAdmin = false\n+ });\n+\n+ var package = new Package()\n+ {\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Owners = new List<User>() { organization }\n+ },\n+ Version = \"1.0.0\"\n+ };\n+\n+ _securityPolicyService.Setup(\n+ x => x.IsSubscribed(\n+ It.IsNotNull<User>(),\n+ It.Is<string>(s => s == ControlRequiredSignerPolicy.PolicyName)))\n+ .Returns(false);\n+\n+ var viewModel = new ListPackageItemRequiredSignerViewModel(\n+ package,\n+ _currentUser,\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\n+\n+ Assert.Equal(\"c\", viewModel.RequiredSigner.Username);\n+ Assert.Equal($\"{organization.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n+ Assert.Null(viewModel.RequiredSignerMessage);\n+ VerifySigners(package.PackageRegistration.Owners, viewModel.AllSigners, expectAnySigner: false);\n+ Assert.True(viewModel.ShowRequiredSigner);\n+ Assert.False(viewModel.ShowTextBox);\n+ Assert.False(viewModel.CanEditRequiredSigner);\n+\n+ _securityPolicyService.VerifyAll();\n+ }\n+\n[Fact]\npublic void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRequiredSignerIsCurrentUser()\n{\n@@ -235,7 +330,8 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRe\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -270,7 +366,8 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRe\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -332,7 +429,8 @@ public void Constructor_WhenPackageHasMultipleOwners_WhenOwnersHaveVaryingCertif\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\ncurrentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{currentUser.Username} (1 certificate)\", viewModel.RequiredSigner.DisplayText);\n@@ -367,7 +465,8 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenCu\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -407,7 +506,8 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenCu\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -458,7 +558,8 @@ public void Constructor_WhenPackageHasThreeOwnersAndTheCurrentUserIsAnOwner_When\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -520,7 +621,8 @@ public void Constructor_WhenPackageHasFourOwnersAndTheCurrentUserIsAnOwner_WhenT\nvar viewModel = new ListPackageItemRequiredSignerViewModel(\npackage,\n_currentUser,\n- _securityPolicyService.Object);\n+ _securityPolicyService.Object,\n+ wasMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: add 2FA requirement for signing (#5851)
Resolve https://github.com/NuGet/NuGetGallery/issues/5775
|
455,731 |
30.04.2018 08:42:19
| 25,200 |
25f062aa95b0a607cddb2bb528a7d19633cb7527
|
Certificates: add more tests
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -1776,6 +1776,21 @@ public void AddCertificate_WhenCurrentUserLacksPermission_ReturnsForbidden()\nAssert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n}\n+ [Fact]\n+ public void AddCertificate_WhenCurrentUserIsNotMultiFactorAuthenticated_ReturnsForbidden()\n+ {\n+ var uploadFile = GetUploadFile();\n+\n+ _controller.SetCurrentUser(_user);\n+\n+ var response = _controller.AddCertificate(_organization.Username, uploadFile);\n+\n+ Assert.NotNull(response);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n+\n+ _certificateService.VerifyAll();\n+ }\n+\n[Fact]\npublic void AddCertificate_WhenUploadFileIsNull_ReturnsBadRequest()\n{\n@@ -1948,6 +1963,17 @@ public void DeleteCertificate_WhenCurrentUserLacksPermission_ReturnsForbidden()\nAssert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n}\n+ [Fact]\n+ public void DeleteCertificate_WhenCurrentUserIsNotMultiFactorAuthenticated_ReturnsForbidden()\n+ {\n+ _controller.SetCurrentUser(_user);\n+\n+ var response = _controller.DeleteCertificate(_organization.Username, _certificate.Thumbprint);\n+\n+ Assert.NotNull(response);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n+ }\n+\n[Fact]\npublic void DeleteCertificate_WithValidThumbprint_ReturnsOK()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -5325,7 +5325,7 @@ public async Task WhenSignerNotFound_ReturnsNotFound()\n}\n[Fact]\n- public async Task WhenCurrentUserNotAuthenticated_ReturnsForbidden()\n+ public async Task WhenCurrentUserIsNotAuthenticated_ReturnsForbidden()\n{\nvar packageService = new Mock<IPackageService>();\nvar controller = CreateController(\n@@ -5344,6 +5344,31 @@ public async Task WhenCurrentUserNotAuthenticated_ReturnsForbidden()\nAssert.Equal((int)HttpStatusCode.Forbidden, controller.Response.StatusCode);\n}\n+ [Fact]\n+ public async Task WhenCurrentUserIsNotMultiFactorAuthenticated_ReturnsForbidden()\n+ {\n+ var packageService = new Mock<IPackageService>();\n+ var userService = new Mock<IUserService>();\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService,\n+ userService: userService);\n+\n+ packageService.Setup(x => x.FindPackageRegistrationById(\n+ It.Is<string>(id => id == _packageRegistration.Id)))\n+ .Returns(_packageRegistration);\n+ userService.Setup(x => x.FindByUsername(It.Is<string>(username => username == _signer.Username)))\n+ .Returns(_signer);\n+\n+ _packageRegistration.Owners.Add(_signer);\n+ controller.SetCurrentUser(_signer);\n+\n+ var result = await controller.SetRequiredSigner(_packageRegistration.Id, _signer.Username);\n+\n+ Assert.NotNull(result);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, controller.Response.StatusCode);\n+ }\n+\n[Fact]\npublic async Task WhenCurrentUserIsNotPackageOwner_ReturnsForbidden()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -3053,6 +3053,21 @@ public void AddCertificate_WhenUploadFileIsNull_ReturnsBadRequest()\nAssert.Equal((int)HttpStatusCode.BadRequest, _controller.Response.StatusCode);\n}\n+ [Fact]\n+ public void AddCertificate_WhenCurrentUserIsNotMultiFactorAuthenticated_ReturnsForbidden()\n+ {\n+ var uploadFile = GetUploadFile();\n+\n+ _controller.SetCurrentUser(_user);\n+\n+ var response = _controller.AddCertificate(accountName: null, uploadFile: uploadFile);\n+\n+ Assert.NotNull(response);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n+\n+ _certificateService.VerifyAll();\n+ }\n+\n[Fact]\npublic void AddCertificate_WhenUploadFileIsValid_ReturnsCreated()\n{\n@@ -3167,6 +3182,17 @@ public void DeleteCertificate_WhenCurrentUserIsNull_ReturnsUnauthorized()\nAssert.Equal((int)HttpStatusCode.Unauthorized, _controller.Response.StatusCode);\n}\n+ [Fact]\n+ public void DeleteCertificate_WhenCurrentUserIsNotMultiFactorAuthenticated_ReturnsForbidden()\n+ {\n+ _controller.SetCurrentUser(_user);\n+\n+ var response = _controller.DeleteCertificate(accountName: null, thumbprint: _certificate.Thumbprint);\n+\n+ Assert.NotNull(response);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n+ }\n+\n[Fact]\npublic void DeleteCertificate_WithValidThumbprint_ReturnsOK()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: add more tests (#5855)
|
455,776 |
30.04.2018 12:24:24
| 25,200 |
932026bd7fb73c19cf697c8167d137e1aeeca90e
|
Account deletion support for Organization members
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/DeleteAccount/DeleteUserAccount.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/DeleteAccount/DeleteUserAccount.cshtml",
"diff": "1. Revoke associated API key(s). <br />\n2. Remove the account as an owner for any child packages.<br />\n3. Dissociate all previously existent ID prefix reservations with this account.<br />\n+ 4. Remove the account as a member of any organizations.<br />\n</text>)\n<div class=\"form-group\">\n@Html.Partial(\"_UserPackagesListForDeletedAccount\", Model)\n</div>\n+ <div class=\"form-group\">\n+ @Html.Partial(\"_UserOrganizationsListForDeletedAccount\", Model.Organizations)\n+ </div>\n</div>\n@Html.Partial(\"_DeleteUserAccountForm\", new DeleteAccountAsAdminViewModel(Model))\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -289,7 +289,7 @@ public override async Task<ActionResult> RequestAccountDeletion(string accountNa\nif (user == null || user.IsDeleted)\n{\n- return HttpNotFound(\"User not found.\");\n+ return HttpNotFound();\n}\nif (!user.Confirmed)\n@@ -329,7 +329,7 @@ public virtual ActionResult Delete(string accountName)\nvar user = UserService.FindByUsername(accountName);\nif (user == null || user.IsDeleted || (user is Organization))\n{\n- return HttpNotFound(\"User not found.\");\n+ return HttpNotFound();\n}\nreturn View(\"DeleteUserAccount\", GetDeleteAccountViewModel(user));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Areas\\Admin\\Views\\Delete\\_ReflowBulkConfirm.cshtml\" />\n<Content Include=\"Areas\\Admin\\Views\\LockPackage\\Index.cshtml\" />\n<Content Include=\"App_Data\\Files\\Content\\Login-Discontinuation-Configuration.json\" />\n+ <Content Include=\"Areas\\Admin\\Views\\DeleteAccount\\_DeleteUserAccountForm.cshtml\" />\n<None Include=\"Scripts\\jquery-1.11.0.intellisense.js\" />\n<Content Include=\"Scripts\\jquery-1.11.0.js\" />\n<Content Include=\"Scripts\\jquery-1.11.0.min.js\" />\n<Content Include=\"Views\\Authentication\\_SigninAssistance.cshtml\" />\n<Content Include=\"Views\\Organizations\\Add.cshtml\" />\n<Content Include=\"Views\\Organizations\\HandleOrganizationMembershipRequest.cshtml\" />\n+ <Content Include=\"Views\\Users\\_UserOrganizationsListForDeletedAccount.cshtml\" />\n<Content Include=\"Views\\Organizations\\DeleteAccount.cshtml\" />\n<Content Include=\"Views\\Users\\_DeleteUserAccountForm.cshtml\" />\n<Content Include=\"Views\\Organizations\\_OrganizationMembersListForDeletedAccount.cshtml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "@@ -79,34 +79,22 @@ IAuditingService auditingService\n};\n}\n- // The deletion of members of organizations is disabled for now.\n- if (userToBeDeleted.Organizations.Any())\n- {\n- return new DeleteUserAccountStatus()\n- {\n- Success = false,\n- Description = string.Format(CultureInfo.CurrentCulture,\n- Strings.AccountDelete_OrganizationMemberDeleteNotImplemented,\n- userToBeDeleted.Username),\n- AccountName = userToBeDeleted.Username\n- };\n- }\n-\nreturn await RunAccountDeletionTask(\n- () => DeleteGalleryUserAccountImplAsync(\n+ () => DeleteAccountImplAsync(\nuserToBeDeleted,\nuserToExecuteTheDelete,\norphanPackagePolicy,\n- signature),\n+ signature ?? userToExecuteTheDelete.Username),\nuserToBeDeleted,\nuserToExecuteTheDelete,\ncommitAsTransaction);\n}\n- private async Task DeleteGalleryUserAccountImplAsync(User userToBeDeleted, User userToExecuteTheDelete, AccountDeletionOrphanPackagePolicy orphanPackagePolicy, string signature = null)\n+ private async Task DeleteAccountImplAsync(User userToBeDeleted, User userToExecuteTheDelete, AccountDeletionOrphanPackagePolicy orphanPackagePolicy, string signature)\n{\nawait RemoveReservedNamespaces(userToBeDeleted);\nawait RemovePackageOwnership(userToBeDeleted, userToExecuteTheDelete, orphanPackagePolicy);\n+ await RemoveMemberships(userToBeDeleted, userToExecuteTheDelete, orphanPackagePolicy, signature);\nawait RemoveSecurityPolicies(userToBeDeleted);\nawait RemoveUserCredentials(userToBeDeleted);\nawait RemovePackageOwnershipRequests(userToBeDeleted);\n@@ -114,7 +102,7 @@ private async Task DeleteGalleryUserAccountImplAsync(User userToBeDeleted, User\nvar organizationToBeDeleted = userToBeDeleted as Organization;\nif (organizationToBeDeleted != null)\n{\n- await RemoveMemberships(organizationToBeDeleted);\n+ await RemoveMembers(organizationToBeDeleted);\n}\nif (!userToBeDeleted.Confirmed)\n@@ -131,7 +119,7 @@ private async Task DeleteGalleryUserAccountImplAsync(User userToBeDeleted, User\nawait InsertDeleteAccount(\nuserToBeDeleted,\nuserToExecuteTheDelete,\n- signature ?? userToExecuteTheDelete.Username);\n+ signature);\n}\n}\n@@ -217,7 +205,54 @@ private async Task RemovePackageOwnershipRequests(User user)\n}\n}\n- private async Task RemoveMemberships(Organization organization)\n+ private async Task RemoveMemberships(User user, User requestingUser, AccountDeletionOrphanPackagePolicy orphanPackagePolicy, string signature)\n+ {\n+ foreach (var membership in user.Organizations.ToArray())\n+ {\n+ var organization = membership.Organization;\n+ var members = organization.Members.ToList();\n+ var collaborators = members.Where(m => !m.IsAdmin).ToList();\n+ var memberCount = members.Count();\n+ user.Organizations.Remove(membership);\n+\n+ if (memberCount < 2)\n+ {\n+ // The user we are deleting is the only member of the organization.\n+ // We should delete the entire organization.\n+ await DeleteAccountImplAsync(organization, requestingUser, orphanPackagePolicy, signature);\n+ }\n+ else if (memberCount - 1 <= collaborators.Count())\n+ {\n+ // All other members of this organization are collaborators, so we should promote them to administrators.\n+ foreach (var collaborator in collaborators)\n+ {\n+ collaborator.IsAdmin = true;\n+ }\n+ }\n+ }\n+\n+ foreach (var membershipRequest in user.OrganizationRequests.ToArray())\n+ {\n+ user.OrganizationRequests.Remove(membershipRequest);\n+ }\n+\n+ foreach (var transformationRequest in user.OrganizationMigrationRequests.ToArray())\n+ {\n+ user.OrganizationMigrationRequests.Remove(transformationRequest);\n+ transformationRequest.NewOrganization.OrganizationMigrationRequest = null;\n+ }\n+\n+ var migrationRequest = user.OrganizationMigrationRequest;\n+ user.OrganizationMigrationRequest = null;\n+ if (migrationRequest != null)\n+ {\n+ migrationRequest.AdminUser.OrganizationMigrationRequests.Remove(migrationRequest);\n+ }\n+\n+ await _entitiesContext.SaveChangesAsync();\n+ }\n+\n+ private async Task RemoveMembers(Organization organization)\n{\nforeach (var membership in organization.Members.ToList())\n{\n@@ -249,12 +284,6 @@ private async Task RemoveUser(User user)\nawait _userRepository.CommitChangesAsync();\n}\n- private async Task RemoveUser(Organization organization)\n- {\n- _entitiesContext.DeleteOnCommit(organization);\n- await _entitiesContext.SaveChangesAsync();\n- }\n-\nprivate async Task<DeleteUserAccountStatus> RunAccountDeletionTask(Func<Task> getTask, User userToBeDeleted, User requestingUser, bool commitAsTransaction)\n{\ntry\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IDeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/IDeleteAccountService.cs",
"diff": "@@ -12,7 +12,7 @@ public interface IDeleteAccountService\n/// Will clean-up the data related with an user account.\n/// The result will be:\n/// 1. The user will be removed as owner from its owned packages.\n- /// 2. Any of the packages that become orphaned as its result will be unlisted if the unlistOrphanPackages is set to true.\n+ /// 2. Any of the packages that become orphaned as its result will be handled according to <paramref name=\"orphanPackagePolicy\"/>.\n/// 3. Any owned namespaces will be released.\n/// 4. The user credentials will be cleaned.\n/// 5. The user data will be cleaned.\n@@ -22,7 +22,6 @@ public interface IDeleteAccountService\n/// <param name=\"orphanPackagePolicy\">If deleting the account creates any orphaned packages, a <see cref=\"AccountDeletionOrphanPackagePolicy\"/> that describes how those orphans should be handled.</param>\n/// <param name=\"commitAsTransaction\">Whether or not to commit the changes as a transaction.</param>\n/// <param name=\"signature\">The signature of the user deleting the account.</param>\n- /// <returns></returns>\nTask<DeleteUserAccountStatus> DeleteAccountAsync(User userToBeDeleted,\nUser userToExecuteTheDelete,\nbool commitAsTransaction,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -96,15 +96,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to Account '{0}' cannot be deleted because it is a member of an organization. The user needs to be manually removed from any organizations before the account can be deleted..\n- /// </summary>\n- public static string AccountDelete_OrganizationMemberDeleteNotImplemented {\n- get {\n- return ResourceManager.GetString(\"AccountDelete_OrganizationMemberDeleteNotImplemented\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to The account:{0} was deleted succesfully..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -670,9 +670,6 @@ For more information, please contact '{2}'.</value>\n<data name=\"AccountDelete_OrganizationDeleteNotImplemented\" xml:space=\"preserve\">\n<value>Account '{0}' cannot be deleted because it is an organization. The organization must be manually migrated to a user account without memberships before the account can be deleted.</value>\n</data>\n- <data name=\"AccountDelete_OrganizationMemberDeleteNotImplemented\" xml:space=\"preserve\">\n- <value>Account '{0}' cannot be deleted because it is a member of an organization. The user needs to be manually removed from any organizations before the account can be deleted.</value>\n- </data>\n<data name=\"PackageIsLocked\" xml:space=\"preserve\">\n<value>Package '{0}' has been locked. This means you cannot publish a new version or change the listing status of a published package version. Please contact support@nuget.org.</value>\n</data>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DeleteAccountViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DeleteAccountViewModel.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n+using NuGetGallery.Areas.Admin;\n+using NuGetGallery.Areas.Admin.Models;\nnamespace NuGetGallery\n{\n@@ -44,7 +46,7 @@ public class DeleteAccountViewModel : IDeleteAccountViewModel\npublic List<ListPackageItemViewModel> Packages { get; }\n- public User User { get; set; }\n+ public User User { get; }\npublic string AccountName => User.Username;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"diff": "@Html.Partial(\"_AccountCuratedFeeds\", Model)\n+ @Html.Partial(\"_AccountCertificates\", Model)\n+\n+ @if (Model.CanManage)\n+ {\n@ViewHelpers.Section(this,\n\"delete-organization\",\n@<text>Delete</text>,\n</div>\n</div>\n</text>)\n-\n- @Html.Partial(\"_AccountCertificates\", Model)\n+ }\n</div>\n</div>\n</section>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/DeleteAccount.cshtml",
"new_path": "src/NuGetGallery/Views/Users/DeleteAccount.cshtml",
"diff": "<li>Revoke your api key(s).</li>\n<li>Remove you as the owner for any packages you own.</li>\n<li>Remove your ownership from any ID prefix reservations and delete any ID prefix reservations that you were the only owner of.</li>\n+ <li>Remove you from any organizations that you are a member of.</li>\n<li>Not delete the NuGet packages associated with the account.</li>\n</ul>\n</p>\n@ViewHelpers.AlertDanger(@<text>One or more packages do not have co-owners.</text>)\n}\n<p>\n- Before submitting the request, it is recommended that you transfer ownership of any package where you are the sole owner, using the <i>manage owners</i> <i class=\"ms-Icon ms-Icon--People\" aria-hidden=\"true\"></i> button for that package below. Read more about <a href=\"https://go.microsoft.com/fwlink/?linkid=862794\">Manage package owners.</a>\n- This will enable us to expedite processing your request.<br />\n- If you choose to proceed without fixing this issue, someone from the NuGet team may reach out and work with you to find a resolution.\n+ It is recommended that you transfer ownership of any package where you are the sole owner, using the <i>manage owners</i> <i class=\"ms-Icon ms-Icon--People\" aria-hidden=\"true\"></i> button for that package below. Read more about <a href=\"https://go.microsoft.com/fwlink/?linkid=862794\">Manage package owners.</a>\n</p>\n<div class=\"form-group\">\n@Html.Partial(\"_UserPackagesListForDeletedAccount\", Model)\n</div>\n+ <p>\n+ It is also recommended that you transfer ownership of any organization where you are the sole member, using the <i>edit organization</i> <i class=\"ms-Icon ms-Icon--Edit\" aria-hidden=\"true\"></i> button for that organization below. Read more about <a href=\"https://go.microsoft.com/fwlink/?linkid=870439\">Organizations.</a>\n+ </p>\n+ <div class=\"form-group\">\n+ @Html.Partial(\"_UserOrganizationsListForDeletedAccount\", Model.Organizations)\n+ </div>\n+ <p>\n+ We can expedite processing your deletion request if you are not the sole owner of any packages or organizations.<br />\n+ If you choose to proceed as the sole owner of any packages or organizations, someone from the NuGet team may reach out and work with you to find a resolution.\n+ </p>\n<div class=\"form-group danger-zone\">\n<text>\n@using (Html.BeginForm(\"RequestAccountDeletion\", \"Users\", FormMethod.Post, new { id = \"delete-form\" }))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/_UserPackagesListForDeletedAccount.cshtml",
"new_path": "src/NuGetGallery/Views/Users/_UserPackagesListForDeletedAccount.cshtml",
"diff": "var hasMultipleOwnersMessage = isOrganization ? \"You do not need to transfer ownership of this package before you can delete your organization.\" : \"After account deletion, this package will still have at least one owner.\";\n}\n+@if (!Model.Packages.Any())\n+{\n+ <p>This account owns no packages.</p>\n+\n+ return;\n+}\n+\n<div class=\"row user-package-list align-left\">\n<div class=\"col-md-12 align-left \">\n<div class=\"panel-collapse collapse in\" id=\"packages-Packages\" aria-expanded=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -2037,7 +2037,7 @@ public void DeleteNotExistentAccount()\nvar result = controller.Delete(accountName: \"NotFoundUser\");\n// Assert\n- Assert.Equal((int)HttpStatusCode.NotFound, ((HttpNotFoundResult)result).StatusCode);\n+ ResultAssert.IsNotFound(result);\n}\n[Fact]\n@@ -2059,7 +2059,7 @@ public void DeleteDeletedAccount()\nvar result = controller.Delete(accountName: userName);\n// Assert\n- Assert.Equal((int)HttpStatusCode.NotFound, ((HttpNotFoundResult)result).StatusCode);\n+ ResultAssert.IsNotFound(result);\n}\n[Theory]\n@@ -2216,8 +2216,7 @@ private async Task ReturnsNotFound(UsersController controller)\n{\nvar result = await controller.RequestAccountDeletion(string.Empty);\n- var notFoundResult = ResultAssert.IsNotFound(result);\n- Assert.Equal(\"User not found.\", notFoundResult.StatusDescription);\n+ ResultAssert.IsNotFound(result);\n}\n[Theory]\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;\nusing System.Data.Entity;\n-using System.Globalization;\nusing System.Linq;\nusing System.Threading.Tasks;\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.Models;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Authentication;\n-using NuGetGallery.Framework;\nusing NuGetGallery.Security;\nusing Xunit;\nusing Moq;\n@@ -22,31 +20,7 @@ public class DeleteAccountServiceFacts\n{\npublic class TheDeleteGalleryUserAccountAsyncMethod\n{\n- [Fact]\n- public async Task WhenAccountIsOrganizationMember_DoesNotDelete()\n- {\n- // Arrange\n- var fakes = new Fakes();\n- var account = fakes.OrganizationCollaborator;\n- var testableService = new DeleteAccountTestService(account, fakes.Package);\n- var deleteAccountService = testableService.GetDeleteAccountService();\n-\n- // Act\n- var result = await deleteAccountService.DeleteAccountAsync(\n- account,\n- fakes.Admin,\n- commitAsTransaction: false,\n- signature: \"signature\",\n- orphanPackagePolicy: AccountDeletionOrphanPackagePolicy.UnlistOrphans);\n-\n- // Assert\n- Assert.False(result.Success);\n-\n- var expected = string.Format(CultureInfo.CurrentCulture,\n- Strings.AccountDelete_OrganizationMemberDeleteNotImplemented,\n- account.Username);\n- Assert.Equal(expected, result.Description);\n- }\n+ private static int Key = -1;\n[Fact]\npublic async Task NullUser()\n@@ -60,7 +34,7 @@ public async Task NullUser()\n// Assert\nawait Assert.ThrowsAsync<ArgumentNullException>(() => deleteAccountService.DeleteAccountAsync(\nnull,\n- new User(\"AdminUser\"),\n+ new User(\"AdminUser\") { Key = Key++ },\ncommitAsTransaction: false,\nsignature: \"signature\",\norphanPackagePolicy: AccountDeletionOrphanPackagePolicy.UnlistOrphans));\n@@ -77,7 +51,7 @@ public async Task NullAdmin()\n// Assert\nawait Assert.ThrowsAsync<ArgumentNullException>(() => deleteAccountService.DeleteAccountAsync(\n- new User(\"TestUser\"),\n+ new User(\"TestUser\") { Key = Key++ },\nnull,\ncommitAsTransaction: false,\nsignature: \"signature\",\n@@ -124,6 +98,7 @@ public async Task DeleteHappyUser()\n// Arrange\nPackageRegistration registration = null;\nvar testUser = CreateTestData(ref registration);\n+ var testUserOrganizations = testUser.Organizations.ToList();\nvar testableService = new DeleteAccountTestService(testUser, registration);\nvar deleteAccountService = testableService.GetDeleteAccountService();\n@@ -136,16 +111,34 @@ await deleteAccountService.\nsignature: signature,\norphanPackagePolicy: AccountDeletionOrphanPackagePolicy.UnlistOrphans);\n- Assert.Equal(0, registration.Owners.Count());\n- Assert.Equal(0, testUser.SecurityPolicies.Count());\n- Assert.Equal(0, testUser.ReservedNamespaces.Count());\n+ Assert.Empty(registration.Owners);\n+ Assert.Empty(testUser.SecurityPolicies);\n+ Assert.Empty(testUser.ReservedNamespaces);\nAssert.Equal(false, registration.Packages.ElementAt(0).Listed);\nAssert.Null(testUser.EmailAddress);\nAssert.Equal(1, testableService.DeletedAccounts.Count());\nAssert.Equal(signature, testableService.DeletedAccounts.ElementAt(0).Signature);\n- Assert.Equal(1, testableService.SupportRequests.Count);\n- Assert.Equal(0, testableService.PackageOwnerRequests.Count);\n- Assert.Equal(1, testableService.AuditService.Records.Count);\n+ Assert.Equal(1, testableService.SupportRequests.Count());\n+ Assert.Empty(testableService.PackageOwnerRequests);\n+ Assert.Equal(1, testableService.AuditService.Records.Count());\n+ Assert.Null(testUser.OrganizationMigrationRequest);\n+ Assert.Empty(testUser.OrganizationMigrationRequests);\n+ Assert.Empty(testUser.OrganizationRequests);\n+\n+ Assert.Empty(testUser.Organizations);\n+ foreach (var testUserOrganization in testUserOrganizations)\n+ {\n+ var notDeletedMembers = testUserOrganization.Organization.Members.Where(m => m.Member != testUser);\n+ if (!notDeletedMembers.Any())\n+ {\n+ Assert.Contains(testUserOrganization.Organization, testableService.DeletedUsers);\n+ }\n+ else\n+ {\n+ Assert.True(notDeletedMembers.Any(m => m.IsAdmin));\n+ }\n+ }\n+\nvar deleteRecord = testableService.AuditService.Records[0] as DeleteAccountAuditRecord;\nAssert.True(deleteRecord != null);\n}\n@@ -154,9 +147,7 @@ await deleteAccountService.\npublic async Task WhenUserIsNotConfirmedTheUserRecordIsDeleted()\n{\n//Arange\n- User testUser = new User();\n- testUser.Username = \"TestsUser\";\n- testUser.UnconfirmedEmailAddress = \"user@test.com\";\n+ User testUser = new User(\"TestsUser\") { Key = Key++, UnconfirmedEmailAddress = \"user@test.com\" };\nvar testableService = new DeleteAccountTestService(testUser);\nvar deleteAccountService = testableService.GetDeleteAccountService();\n@@ -182,14 +173,14 @@ public async Task WhenUserIsNotConfirmedTheUserRecordIsDeleted()\npublic async Task DeleteConfirmedOrganization()\n{\n// Arrange\n- var member = new User(\"testUser\");\n- var organization = new Organization(\"testOrganization\") { EmailAddress = \"org@test.com\" };\n+ var member = new User(\"testUser\") { Key = Key++ };\n+ var organization = new Organization(\"testOrganization\") { Key = Key++, EmailAddress = \"org@test.com\" };\nvar membership = new Membership() { Organization = organization, Member = member };\nmember.Organizations.Add(membership);\norganization.Members.Add(membership);\n- var requestedMember = new User(\"testRequestedMember\");\n+ var requestedMember = new User(\"testRequestedMember\") { Key = Key++ };\nvar memberRequest = new MembershipRequest() { Organization = organization, NewMember = requestedMember };\nrequestedMember.OrganizationRequests.Add(memberRequest);\norganization.MemberRequests.Add(memberRequest);\n@@ -234,14 +225,14 @@ public async Task DeleteConfirmedOrganization()\npublic async Task DeleteUnconfirmedOrganization()\n{\n// Arrange\n- var member = new User(\"testUser\");\n- var organization = new Organization(\"testOrganization\");\n+ var member = new User(\"testUser\") { Key = Key++ };\n+ var organization = new Organization(\"testOrganization\") { Key = Key++ };\nvar membership = new Membership() { Organization = organization, Member = member };\nmember.Organizations.Add(membership);\norganization.Members.Add(membership);\n- var requestedMember = new User(\"testRequestedMember\");\n+ var requestedMember = new User(\"testRequestedMember\") { Key = Key++ };\nvar memberRequest = new MembershipRequest() { Organization = organization, NewMember = requestedMember };\nrequestedMember.OrganizationRequests.Add(memberRequest);\norganization.MemberRequests.Add(memberRequest);\n@@ -284,14 +275,29 @@ public async Task DeleteUnconfirmedOrganization()\nprivate static User CreateTestData(ref PackageRegistration registration)\n{\n- User testUser = new User();\n- testUser.Username = \"TestsUser\";\n+ var testUser = new User(\"TestUser\") { Key = Key++ };\ntestUser.EmailAddress = \"user@test.com\";\n+ AddOrganizationMigrationRequest(testUser);\n+ AddOrganizationMigrationRequests(testUser);\n+ AddOrganizationRequests(testUser, false);\n+ AddOrganizationRequests(testUser, true);\n+\n+ foreach (var isAdmin in new[] { false, true })\n+ {\n+ foreach (var hasAdminMember in new[] { false, true })\n+ {\n+ foreach (var hasCollaboratorMember in new[] { false, true })\n+ {\n+ AddOrganization(testUser, isAdmin, hasAdminMember, hasCollaboratorMember);\n+ }\n+ }\n+ }\n+\nregistration = new PackageRegistration();\nregistration.Owners.Add(testUser);\n- Package p = new Package()\n+ var p = new Package()\n{\nDescription = \"TestPackage\",\nKey = 1\n@@ -300,6 +306,59 @@ private static User CreateTestData(ref PackageRegistration registration)\nregistration.Packages.Add(p);\nreturn testUser;\n}\n+\n+ private static void AddOrganizationMigrationRequest(User testUser)\n+ {\n+ var testOrganizationAdmin = new User(\"TestOrganizationAdmin\") { Key = Key++ };\n+\n+ var request = new OrganizationMigrationRequest { AdminUser = testOrganizationAdmin, NewOrganization = testUser };\n+ testUser.OrganizationMigrationRequest = request;\n+ testOrganizationAdmin.OrganizationMigrationRequests.Add(request);\n+ }\n+\n+ private static void AddOrganizationMigrationRequests(User testUser)\n+ {\n+ var testOrganization = new Organization(\"testOrganization\") { Key = Key++ };\n+\n+ var request = new OrganizationMigrationRequest { AdminUser = testUser, NewOrganization = testOrganization };\n+ testOrganization.OrganizationMigrationRequest = request;\n+ testUser.OrganizationMigrationRequests.Add(request);\n+ }\n+\n+ private static void AddOrganizationRequests(User testUser, bool isAdmin)\n+ {\n+ var testOrganization = new Organization(\"testOrganization\") { Key = Key++ };\n+\n+ var request = new MembershipRequest { IsAdmin = isAdmin, NewMember = testUser, Organization = testOrganization };\n+ testOrganization.MemberRequests.Add(request);\n+ testUser.OrganizationRequests.Add(request);\n+ }\n+\n+ private static void AddOrganization(User testUser, bool isAdmin, bool hasAdminMember, bool hasCollaboratorMember)\n+ {\n+ var testOrganization = new Organization(\"testOrganization\") { Key = Key++ };\n+\n+ AddMemberToOrganization(testOrganization, testUser, isAdmin);\n+\n+ if (hasAdminMember)\n+ {\n+ var adminUser = new User(\"testAdministrator\") { Key = Key++ };\n+ AddMemberToOrganization(testOrganization, adminUser, isAdmin);\n+ }\n+\n+ if (hasCollaboratorMember)\n+ {\n+ var collaboratorUser = new User(\"testCollaborator\") { Key = Key++ };\n+ AddMemberToOrganization(testOrganization, collaboratorUser, isAdmin);\n+ }\n+ }\n+\n+ private static void AddMemberToOrganization(Organization organization, User user, bool isAdmin)\n+ {\n+ var membership = new Membership { IsAdmin = isAdmin, Organization = organization, Member = user };\n+ organization.Members.Add(membership);\n+ user.Organizations.Add(membership);\n+ }\n}\npublic class DeleteAccountTestService\n@@ -313,6 +372,7 @@ public class DeleteAccountTestService\nprivate ICollection<Package> _userPackages;\npublic List<AccountDelete> DeletedAccounts = new List<AccountDelete>();\n+ public List<User> DeletedUsers = new List<User>();\npublic List<Issue> SupportRequests = new List<Issue>();\npublic List<PackageOwnerRequest> PackageOwnerRequests = new List<PackageOwnerRequest>();\npublic FakeAuditingService AuditService = new FakeAuditingService();\n@@ -422,8 +482,6 @@ public override async Task RemoveCredential(User user, Credential credential)\nprivate Mock<IEntitiesContext> SetupEntitiesContext()\n{\nvar mockContext = new Mock<IEntitiesContext>();\n- mockContext.Setup(m => m.DeleteOnCommit(_user))\n- .Callback(() => _user = null);\nvar dbContext = new Mock<DbContext>();\nmockContext.Setup(m => m.GetDatabase()).Returns(new DatabaseWrapper(dbContext.Object.Database));\nreturn mockContext;\n@@ -447,7 +505,7 @@ private Mock<ISecurityPolicyService> SetupSecurityPolicyService()\nvar securityPolicyService = new Mock<ISecurityPolicyService>();\nif (_user != null)\n{\n- securityPolicyService.Setup(m => m.UnsubscribeAsync(It.IsAny<User>(), SubscriptionName))\n+ securityPolicyService.Setup(m => m.UnsubscribeAsync(_user, SubscriptionName))\n.Returns(Task.CompletedTask)\n.Callback(() => _user.SecurityPolicies.Remove(_securityPolicy));\n}\n@@ -468,8 +526,18 @@ private Mock<IEntityRepository<User>> SetupUserRepository()\nvar userRepository = new Mock<IEntityRepository<User>>();\nuserRepository.Setup(m => m.CommitChangesAsync())\n.Returns(Task.CompletedTask);\n- userRepository.Setup(m => m.DeleteOnCommit(_user))\n- .Callback(()=>_user = null);\n+ userRepository.Setup(m => m.DeleteOnCommit(It.IsAny<User>()))\n+ .Callback<User>(user =>\n+ {\n+ if (user == _user)\n+ {\n+ _user = null;\n+ }\n+ else\n+ {\n+ DeletedUsers.Add(user);\n+ }\n+ });\nreturn userRepository;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Account deletion support for Organization members (#5797)
|
455,776 |
02.05.2018 12:29:50
| 25,200 |
e01b75e813c3d2fdd9e5c57ca935a157340504cc
|
Fix API keys page failure if user has API keys for orgs they are no longer a member of
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"diff": "function (owner) {\nreturn owner.Owner.toUpperCase() == data.Owner.toUpperCase()\n});\n+\n+ if (existingOwner == null) {\n+ existingOwner = { \"Owner\": data.Owner, \"PackageIds\": [] };\n+ }\n+\nthis.PackageOwner(existingOwner);\n} else {\nthis.PackageOwner(this.PackageOwners[0]);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix API keys page failure if user has API keys for orgs they are no longer a member of (#5871)
|
455,747 |
02.05.2018 15:42:51
| 25,200 |
717b5fa2a0fa4b936c9df011a25298e1adf35c43
|
[2FA] Auditing
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditedUserAction.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditedUserAction.cs",
"diff": "@@ -21,6 +21,8 @@ public enum AuditedUserAction\nTransformOrganization,\nAddOrganizationMember,\nRemoveOrganizationMember,\n- UpdateOrganizationMember\n+ UpdateOrganizationMember,\n+ EnabledMultiFactorAuthentication,\n+ DisabledMultiFactorAuthentication\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": "@@ -400,6 +400,8 @@ public async Task CancelChangeEmailAddress(User user)\npublic virtual async Task ChangeMultiFactorAuthentication(User user, bool enableMultiFactor)\n{\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(user, enableMultiFactor ? AuditedUserAction.EnabledMultiFactorAuthentication : AuditedUserAction.DisabledMultiFactorAuthentication));\n+\nuser.EnableMultiFactorAuthentication = enableMultiFactor;\nawait UserRepository.CommitChangesAsync();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedUserActionTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedUserActionTests.cs",
"diff": "@@ -28,7 +28,9 @@ public void Definition_HasNotChanged()\n\"TransformOrganization\",\n\"AddOrganizationMember\",\n\"RemoveOrganizationMember\",\n- \"UpdateOrganizationMember\"\n+ \"UpdateOrganizationMember\",\n+ \"EnabledMultiFactorAuthentication\",\n+ \"DisabledMultiFactorAuthentication\"\n};\nVerify(typeof(AuditedUserAction), expectedNames);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[2FA] Auditing (#5867)
|
455,731 |
03.05.2018 12:41:19
| 25,200 |
2a8b0026f9a200fda3193be7964e0fbb1b54b9dd
|
Certificates: fix required signer
Fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListPackageItemRequiredSignerViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListPackageItemRequiredSignerViewModel.cs",
"diff": "@@ -12,7 +12,8 @@ namespace NuGetGallery\npublic sealed class ListPackageItemRequiredSignerViewModel : ListPackageItemViewModel\n{\n// username must be an empty string because <select /> option values are based on username\n- // and this \"user\" must be distinguishable from an account named \"Any\" and any other user; null won't work.\n+ // and this \"user\" must be distinguishable from an account named \"Any\" and any other user;\n+ // null would be ideal, but null won't work as a <select /> option value.\nprivate static readonly SignerViewModel AnySigner =\nnew SignerViewModel(username: \"\", displayText: \"Any\");\n@@ -133,8 +134,15 @@ public sealed class ListPackageItemRequiredSignerViewModel : ListPackageItemView\nvar ownersWithRequiredSignerControl = owners.Where(\nowner => securityPolicyService.IsSubscribed(owner, ControlRequiredSignerPolicy.PolicyName));\n+ if (owners.Count() == 1)\n+ {\n+ ShowTextBox = true;\n+ }\n+ else\n+ {\nRequiredSignerMessage = GetRequiredSignerMessage(ownersWithRequiredSignerControl);\n}\n+ }\nCanEditRequiredSigner &= wasMultiFactorAuthenticated;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@VersionListDivider(rowCount, versionsExpanded)\n<tr>\n<td class=\"signature-info-cell\">\n- @if (packageVersion.CanDisplayPrivateMetadata && !string.IsNullOrEmpty(packageVersion.SignatureInformation))\n+ @if (!string.IsNullOrEmpty(packageVersion.SignatureInformation))\n{\n<i class=\"ms-Icon ms-Icon--Ribbon signature-info\" title=\"@packageVersion.SignatureInformation\"></i>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"diff": "@@ -302,7 +302,7 @@ public void Constructor_WhenPackageHasOneOwnerAndTheCurrentUserIsACollaborator_W\nAssert.Null(viewModel.RequiredSignerMessage);\nVerifySigners(package.PackageRegistration.Owners, viewModel.AllSigners, expectAnySigner: false);\nAssert.True(viewModel.ShowRequiredSigner);\n- Assert.False(viewModel.ShowTextBox);\n+ Assert.True(viewModel.ShowTextBox);\nAssert.False(viewModel.CanEditRequiredSigner);\n_securityPolicyService.VerifyAll();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: fix required signer (#5883)
Fix https://github.com/NuGet/NuGetGallery/issues/5882.
|
455,751 |
07.05.2018 13:39:20
| 25,200 |
5f03c7d19692d359c2fff58dbe74e698b40476bf
|
Fix nondeterministic test.
Fix nondeterministic test.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/SearchClient/RetryingHttpClientWrapperFacts.cs",
"new_path": "tests/NuGetGallery.Facts/SearchClient/RetryingHttpClientWrapperFacts.cs",
"diff": "@@ -104,22 +104,22 @@ public async Task LoadBalancesBetweenValidUrisForGetAsync()\nvar inspectingHandler = new RequestInspectingHandler();\nvar client = CreateWrapperClient(inspectingHandler);\n- bool hasHitUri1 = false;\n- bool hasHitUri2 = false;\n-\n- int numRequests = 0;\n- while ((!hasHitUri1 || !hasHitUri2) && numRequests < 25)\n- {\n- numRequests++;\n+ int hitUri1Count = 0;\n+ int hitUri2Count = 0;\nvar result = await client.GetAsync(new[] { ValidUri1, ValidUri2 });\nAssert.NotNull(result);\n- if (!hasHitUri1) hasHitUri1 = inspectingHandler.Requests.Any(r => r.RequestUri == ValidUri1);\n- if (!hasHitUri2) hasHitUri2 = inspectingHandler.Requests.Any(r => r.RequestUri == ValidUri2);\n+ if (inspectingHandler.Requests.Any(r => r.RequestUri == ValidUri1))\n+ {\n+ hitUri1Count++;\n}\n-\n- Assert.True(hasHitUri1, \"The first valid Uri has not been hit within the limit of \" + numRequests + \" requests.\");\n- Assert.True(hasHitUri2, \"The second valid Uri has not been hit within the limit of \" + numRequests + \" requests.\");\n+ if (inspectingHandler.Requests.Any(r => r.RequestUri == ValidUri2))\n+ {\n+ hitUri2Count++;\n+ }\n+ // Because the algorithm for choosing uri1 or uri2 is random asserting that the one or the other uri is not reliable\n+ // However the sum of requests between two uri requests needs to be larger or equal with 1\n+ Assert.True(hitUri1Count + hitUri2Count >= 1, $\"The uri1 had {hitUri1Count} hits and the uri2 had {hitUri2Count} hits. The sum will need to be at least 1.\");\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix nondeterministic test. (#5894)
Fix nondeterministic test.
|
455,731 |
09.05.2018 14:10:31
| 25,200 |
4e62466489003a4fd179186eee3ea61724412484
|
Certificates: make Certificates.Sha1Thumbprint column non-nullable
Resolve
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -348,7 +348,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.Property(c => c.Sha1Thumbprint)\n.HasMaxLength(40)\n.HasColumnType(\"varchar\")\n- .IsOptional();\n+ .IsRequired();\nmodelBuilder.Entity<UserCertificate>()\n.HasKey(uc => uc.Key);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201805091846502_MakeCertificatesSha1ThumbprintRequired.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class MakeCertificatesSha1ThumbprintRequired : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(MakeCertificatesSha1ThumbprintRequired));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201805091846502_MakeCertificatesSha1ThumbprintRequired\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201805091846502_MakeCertificatesSha1ThumbprintRequired.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class MakeCertificatesSha1ThumbprintRequired : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ AlterColumn(\"dbo.Certificates\", \"Sha1Thumbprint\", c => c.String(nullable: false, maxLength: 40, unicode: false));\n+ }\n+\n+ public override void Down()\n+ {\n+ AlterColumn(\"dbo.Certificates\", \"Sha1Thumbprint\", c => c.String(maxLength: 40, unicode: false));\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201805012001354_AddUserCertificatesIndex.Designer.cs\">\n<DependentUpon>201805012001354_AddUserCertificatesIndex.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201805091846502_MakeCertificatesSha1ThumbprintRequired.cs\" />\n+ <Compile Include=\"Migrations\\201805091846502_MakeCertificatesSha1ThumbprintRequired.Designer.cs\">\n+ <DependentUpon>201805091846502_MakeCertificatesSha1ThumbprintRequired.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"RequestModels\\DeleteAccountRequest.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<EmbeddedResource Include=\"Migrations\\201805012001354_AddUserCertificatesIndex.resx\">\n<DependentUpon>201805012001354_AddUserCertificatesIndex.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201805091846502_MakeCertificatesSha1ThumbprintRequired.resx\">\n+ <DependentUpon>201805091846502_MakeCertificatesSha1ThumbprintRequired.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: make Certificates.Sha1Thumbprint column non-nullable (#5903)
Resolve https://github.com/NuGet/NuGetGallery/issues/5902.
|
455,776 |
10.05.2018 09:20:58
| 25,200 |
95adba2b60cc72a94a14f34186e573ff2dd86533
|
Fix HTTP 500 error when verifying a new account
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"new_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"diff": "@@ -137,10 +137,10 @@ public virtual async Task<ActionResult> Confirm(string accountName, string token\n|| ActionsRequiringPermissions.ManageAccount.CheckPermissions(GetCurrentUser(), account)\n!= PermissionsCheckResult.Allowed)\n{\n- return View(new ConfirmationViewModel(account)\n+ return View(new ConfirmationViewModel(accountName)\n{\nWrongUsername = true,\n- SuccessfulConfirmation = false,\n+ SuccessfulConfirmation = false\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ConfirmationViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ConfirmationViewModel.cs",
"diff": "@@ -24,6 +24,12 @@ public class ConfirmationViewModel\npublic string UnconfirmedEmailAddress { get; }\n+ public ConfirmationViewModel(string username)\n+ {\n+ AccountName = username;\n+ AlreadyConfirmed = true;\n+ }\n+\npublic ConfirmationViewModel(User user)\n{\nIsOrganization = user is Organization;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AccountsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AccountsControllerFacts.cs",
"diff": "@@ -530,6 +530,26 @@ public virtual void WhenIsNotConfirmed_SendsEmail(Func<Fakes, User> getCurrentUs\npublic abstract class TheConfirmBaseAction : AccountsControllerTestContainer\n{\n+ [Theory]\n+ [MemberData(AllowedCurrentUsersDataName)]\n+ public virtual async Task WithNullUser_ShowsError(Func<Fakes, User> getCurrentUser)\n+ {\n+ // Arrange\n+ var controller = GetController();\n+ var accountUsername = \"nullUser\";\n+ controller.SetCurrentUser(getCurrentUser(Fakes));\n+\n+ // Act\n+ var result = await controller.Confirm(accountUsername, \"token\");\n+\n+ // Assert\n+ var model = ResultAssert.IsView<ConfirmationViewModel>(result);\n+ Assert.Equal(accountUsername, model.AccountName);\n+ Assert.False(model.SuccessfulConfirmation);\n+ Assert.True(model.WrongUsername);\n+ Assert.True(model.AlreadyConfirmed);\n+ }\n+\n[Theory]\n[MemberData(AllowedCurrentUsersDataName)]\npublic virtual async Task ClearsReturnUrlFromViewData(Func<Fakes, User> getCurrentUser)\n@@ -563,6 +583,7 @@ public virtual async Task WhenAlreadyConfirmed_DoesNotConfirmEmailAddress(Func<F\n// Assert\nvar model = ResultAssert.IsView<ConfirmationViewModel>(result);\n+ Assert.Equal(account.Username, model.AccountName);\nAssert.False(model.SuccessfulConfirmation);\nvar userService = GetMock<IUserService>();\n@@ -595,6 +616,7 @@ public virtual async Task WhenIsNotConfirmedAndNoExistingEmail_ConfirmsEmailAddr\n// Assert\nvar model = ResultAssert.IsView<ConfirmationViewModel>(result);\n+ Assert.Equal(account.Username, model.AccountName);\nAssert.True(model.SuccessfulConfirmation);\nvar userService = GetMock<IUserService>();\n@@ -626,6 +648,7 @@ public virtual async Task WhenIsNotConfirmedAndHasExistingEmail_ConfirmsEmailAdd\n// Assert\nvar model = ResultAssert.IsView<ConfirmationViewModel>(result);\n+ Assert.Equal(account.Username, model.AccountName);\nAssert.True(model.SuccessfulConfirmation);\nvar userService = GetMock<IUserService>();\n@@ -657,6 +680,7 @@ public async Task WhenIsNotConfirmedAndTokenDoesNotMatch_ShowsError(Func<Fakes,\n// Assert\nvar model = ResultAssert.IsView<ConfirmationViewModel>(result);\n+ Assert.Equal(account.Username, model.AccountName);\nAssert.False(model.SuccessfulConfirmation);\n}\n@@ -677,6 +701,7 @@ public async Task WhenIsNotConfirmedAndEntityExceptionThrown_ShowsErrorForDuplic\n// Assert\nvar model = ResultAssert.IsView<ConfirmationViewModel>(result);\n+ Assert.Equal(account.Username, model.AccountName);\nAssert.False(model.SuccessfulConfirmation);\nAssert.True(model.DuplicateEmailAddress);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix HTTP 500 error when verifying a new account (#5891)
|
455,776 |
10.05.2018 11:08:49
| 25,200 |
b6f932effbf489599dd15ff498ae253edc74bebb
|
Run multiple functional test categories in parallel
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedTests.cs",
"diff": "@@ -65,7 +65,7 @@ public async Task Top30PackagesFeedTest()\n[Description(\"Downloads a package from the V2 feed and checks if the file is present on local disk\")]\n[Priority(0)]\n[Category(\"P0Tests\")]\n- [Category(\"ReadonlyModeTests\")]\n+ [Category(\"ReadOnlyModeTests\")]\npublic async Task DownloadPackageFromV2Feed()\n{\nawait _odataHelper.DownloadPackageFromV2FeedWithOperation(Constants.TestPackageId, \"1.0.0\", \"Install\");\n@@ -75,7 +75,7 @@ public async Task DownloadPackageFromV2Feed()\n[Description(\"Restores a package from the V2 feed and checks if the file is present on local disk\")]\n[Priority(0)]\n[Category(\"P0Tests\")]\n- [Category(\"ReadonlyModeTests\")]\n+ [Category(\"ReadOnlyModeTests\")]\npublic async Task RestorePackageFromV2Feed()\n{\nawait _odataHelper.DownloadPackageFromV2FeedWithOperation(Constants.TestPackageId, \"1.0.0\", \"Restore\");\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/Scripts/BuildTests.ps1",
"diff": "+[CmdletBinding()]\n+param(\n+ [string]$Config = \"Release\",\n+ [string]$SolutionPath = \"NuGetGallery.FunctionalTests.sln\"\n+)\n+\n+# Move working directory one level up\n+$rootName = (Get-Item $PSScriptRoot).parent.FullName\n+\n+# Required tools\n+$msBuild = \"${Env:ProgramFiles(x86)}\\MsBuild\\14.0\\Bin\\msbuild\"\n+$nuget = \"$rootName\\nuget.exe\"\n+& \"$rootName\\Scripts\\DownloadLatestNuGetExeRelease.ps1\" $rootName\n+\n+# Restore packages\n+Write-Host \"Restoring packages\"\n+$fullSolutionPath = \"$rootName\\$SolutionPath\"\n+& $nuget \"restore\" $fullSolutionPath \"-NonInteractive\"\n+if ($LastExitCode) {\n+ throw \"Failed to restore packages!\"\n+}\n+\n+# Build the solution\n+Write-Host \"Building solution\"\n+& $msBuild $fullSolutionPath \"/p:Configuration=$Config\" \"/p:Platform=Any CPU\" \"/p:CodeAnalysis=true\" \"/m\" \"/v:M\" \"/fl\" \"/flp:LogFile=$rootName\\msbuild.log;Verbosity=diagnostic\" \"/nr:false\"\n+if ($LastExitCode) {\n+ throw \"Failed to build solution!\"\n+}\n+\n+$functionalTestsDirectory = \"$rootName\\NuGetGallery.FunctionalTests\\bin\\$Config\"\n+Copy-Item $nuget $functionalTestsDirectory\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/DownloadLatestNuGetExeRelease.ps1",
"new_path": "tests/Scripts/DownloadLatestNuGetExeRelease.ps1",
"diff": "-$sourceNugetExeUrl = \"https://dist.nuget.org/win-x86-commandline/latest/nuget.exe\"\n+[CmdletBinding()]\n+param(\n+ [Parameter(Mandatory)][string]$Directory\n+)\n+\n+$targetNugetExePath = \"$Directory\\nuget.exe\"\n+\n+if (Test-Path $targetNugetExePath) {\n+ Write-Host \"nuget.exe found in $Directory\"\n+ return\n+}\n+\n+Write-Host \"nuget.exe not found in $Directory\"\n+\n$sourceNuGetExePath = Join-Path $PSScriptRoot \"nuget.exe\"\n-$targetNugetExePath = \".\\nuget.exe\"\n-if (-Not (Test-Path $targetNugetExePath)) {\nif (Test-Path $sourceNuGetExePath) {\n+ Write-Host \"Copying nuget.exe from $sourceNuGetExePath\"\nCopy-Item $sourceNuGetExePath $targetNugetExePath\n} else {\n+ $sourceNugetExeUrl = \"https://dist.nuget.org/win-x86-commandline/latest/nuget.exe\"\n+ Write-Host \"Downloading nuget.exe from $sourceNugetExeUrl\"\nInvoke-WebRequest $sourceNugetExeUrl -OutFile $targetNugetExePath\n}\n\\ No newline at end of file\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/RunByTestList.cmd",
"new_path": null,
"diff": "-@echo off\n-\n-Echo Clear previulsly defined GalleryUrl\n-set GalleryURl=\n-\n-SET List=%1\n-if \"%List%\"==\"\" (\n- goto Error1\n-)\n-\n-SET Param=%2\n-if \"%Param%\" NEQ \"\" (\n-ECHO Param is defined. Setting GalleryUrl to %Param%.\n-SET GalleryUrl=%Param%\n-)\n-\n-REM If GalleryUrl is still not defined, the default is to use int.nugettest.org\n-if \"%GalleryUrl%\"==\"\" (\n-ECHO Setting GalleryUrl to the default - int.nugettest.org\n-SET GalleryUrl=https://int.nugettest.org/\n-)\n-ECHO The NuGet gallery tests are running against %GalleryUrl%\n-\n-If Exist \"\"%VS120COMNTOOLS%\"\\..\\IDE\\mstest.exe\" (\n- set toolpath=%VS120COMNTOOLS%\n- set VisualStudioVersion=12.0\n- goto Run\n-)\n-\n-If Exist \"\"%VS110COMNTOOLS%\"..\\IDE\\mstest.exe\" (\n- set toolpath=%VS110COMNTOOLS%\n- set VisualStudioVersion=11.0\n- goto Run\n-)\n-\n-:Error\n-Echo The variable toolpath is not set correctly. check your visual studio install. Exiting without running tests...\n-goto End\n-\n-:Run\n-Echo.\n-Echo. Build the NuGet Gallery solution...\n-call ..\\..\\build.cmd\n-Echo Done.\n-Echo.\n-\n-Echo Build the NuGet Gallery test solution...\n-\"%PROGRAMFILES(X86)%\\MsBuild\\14.0\\Bin\\msbuild\" ..\\NuGetGallery.FunctionalTests.sln\n-Echo Done.\n-Echo.\n-\n-Echo Start running NuGet Gallery Functional tests by test list...\n-set\n-Echo The path to mstest.exe is \"%toolpath%..\\IDE\\mstest.exe\"\n-\"%toolpath%..\\IDE\\mstest.exe\" /testlist:%List% /testmetadata:\"..\\NuGetGallery.FunctionalTests.vsmdi\"\n-Echo Finished running NuGet Gallery Functional tests...\n-Echo Exit.\n-goto End\n-\n-:Error1\n-Echo The variable testlist is not set correctly. It must be set for tests to run...\n-goto End\n-\n-:End\n-exit /b 0\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/RunEverything.cmd",
"new_path": null,
"diff": "-@echo Off\n-\n-REM Working directory one level up\n-cd ..\n-\n-set exitCode=0\n-\n-REM Configuration\n-set config=Release\n-set solutionPath=\"NuGetGallery.FunctionalTests.sln\"\n-\n-REM Required Tools\n-set msbuild=\"%PROGRAMFILES(X86)%\\MsBuild\\14.0\\Bin\\msbuild\"\n-set xunit=\"..\\packages\\xunit.runner.console.2.3.1\\tools\\net452\\xunit.console.exe\"\n-set nuget=\"nuget.exe\"\n-set mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\n-\n-REM Clean previous test results\n-if exist functionaltests.*.xml (\n- del functionaltests.*.xml\n-)\n-if exist resultsfile.*.trx (\n- del resultsfile.*.trx\n-)\n-if exist TestResults (\n- rd TestResults /S /Q\n-)\n-\n-REM Restore packages\n-if not exist nuget (\n- call PowerShell -NoProfile -ExecutionPolicy Bypass -File %cd%\\Scripts\\DownloadLatestNuGetExeRelease.ps1\n-)\n-call %nuget% restore \"%solutionPath%\" -NonInteractive\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Build the solution\n-call %msbuild% \"%solutionPath%\" /p:Configuration=\"%config%\" /p:Platform=\"Any CPU\" /p:CodeAnalysis=true /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diagnostic /nr:false\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Run functional tests\n-set testDir=\"NuGetGallery.FunctionalTests\\bin\\%config%\"\n-set fluentTestDir=\"NuGetGallery.FunctionalTests.Fluent\\bin\\%config%\"\n-copy %nuget% %testDir%\n-call %xunit% \"%testDir%\\NuGetGallery.FunctionalTests.dll\" -xml functionaltests.everything.xml\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-copy %nuget% %fluentTestDir%\n-call %xunit% \"%fluentTestDir%\\NuGetGallery.FunctionalTests.Fluent.dll\" -xml functionaltests.fluent.xml\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run web UI tests\n-call %mstest% /TestContainer:\"NuGetGallery.WebUITests.P0\\bin\\%config%\\NuGetGallery.WebUITests.P0.dll\" /TestSettings:Local.testsettings /detail:stdout /resultsfile:resultsfile.web1.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run web UI tests\n-call %mstest% /TestContainer:\"NuGetGallery.WebUITests.P1\\bin\\%config%\\NuGetGallery.WebUITests.P1.dll\" /TestSettings:Local.testsettings /detail:stdout /resultsfile:resultsfile.web2.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run web UI tests\n-call %mstest% /TestContainer:\"NuGetGallery.WebUITests.P2\\bin\\%config%\\NuGetGallery.WebUITests.P2.dll\" /TestSettings:Local.testsettings /detail:stdout /resultsfile:resultsfile.web3.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run Load tests\n-call %mstest% /TestContainer:\"NuGetGallery.LoadTests\\bin\\%config%\\NuGetGallery.LoadTests.dll\" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:resultsfile.load.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-goto end\n-\n-:failure\n-set exitCode=-1\n-\n-:end\n-exit /B %exitCode%\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/RunP0Tests.bat",
"new_path": null,
"diff": "-@echo Off\n-\n-REM Working directory one level up\n-cd ..\n-\n-REM Configuration\n-set config=Release\n-set testCategory=\"P0Tests\"\n-set solutionPath=\"NuGetGallery.FunctionalTests.sln\"\n-set exitCode=0\n-\n-REM Required Tools\n-set msbuild=\"%PROGRAMFILES(X86)%\\MsBuild\\14.0\\Bin\\msbuild\"\n-set xunit=\"..\\packages\\xunit.runner.console.2.3.1\\tools\\net452\\xunit.console.exe\"\n-set nuget=\"nuget.exe\"\n-set mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\n-\n-REM Clean previous test results\n-if exist functionaltests.P0.xml (\n- del functionaltests.P0.xml\n-)\n-if exist NuGetGallery.P0.*.trx (\n- del NuGetGallery.P0.*.trx\n-)\n-\n-REM Restore packages\n-if not exist nuget (\n- call PowerShell -NoProfile -ExecutionPolicy Bypass -File %cd%\\Scripts\\DownloadLatestNuGetExeRelease.ps1\n-)\n-call %nuget% restore \"%solutionPath%\" -NonInteractive\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Build the solution\n-call %msbuild% \"%solutionPath%\" /p:Configuration=\"%config%\" /p:Platform=\"Any CPU\" /p:CodeAnalysis=true /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diagnostic /nr:false\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Run functional tests\n-set testDir=\"NuGetGallery.FunctionalTests\\bin\\%config%\"\n-copy %nuget% %testDir%\n-call %xunit% \"%testDir%\\NuGetGallery.FunctionalTests.dll\" -trait \"Category=%testCategory%\" -xml functionaltests.P0.xml\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run web UI tests\n-call %mstest% /TestContainer:\"NuGetGallery.WebUITests.P0\\bin\\%config%\\NuGetGallery.WebUITests.P0.dll\" /TestSettings:Local.testsettings /detail:stdout /resultsfile:NuGetGallery.P0.WebUITests.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run Load tests\n-call %mstest% /TestContainer:\"NuGetGallery.LoadTests\\bin\\%config%\\NuGetGallery.LoadTests.dll\" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:NuGetGallery.P0.LoadTests.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-exit /B %exitCode%\n-\n-:failure\n-exit -1\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/RunP1Tests.bat",
"new_path": null,
"diff": "-@echo Off\n-\n-REM Working directory one level up\n-cd ..\n-\n-REM Configuration\n-set config=Release\n-set testCategory=\"P1Tests\"\n-set solutionPath=\"NuGetGallery.FunctionalTests.sln\"\n-set exitCode=0\n-\n-REM Required Tools\n-set msbuild=\"%PROGRAMFILES(X86)%\\MsBuild\\14.0\\Bin\\msbuild\"\n-set xunit=\"..\\packages\\xunit.runner.console.2.3.1\\tools\\net452\\xunit.console.exe\"\n-set nuget=\"nuget.exe\"\n-set mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\n-\n-REM Clean previous test results\n-if exist functionaltests.P1.xml (\n- del functionaltests.P1.xml\n-)\n-if exist NuGetGallery.P1.*.trx (\n- del NuGetGallery.P1.*.trx\n-)\n-\n-REM Restore packages\n-if not exist nuget (\n- call PowerShell -NoProfile -ExecutionPolicy Bypass -File %cd%\\Scripts\\DownloadLatestNuGetExeRelease.ps1\n-)\n-call %nuget% restore \"%solutionPath%\" -NonInteractive\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Build the solution\n-call %msbuild% \"%solutionPath%\" /p:Configuration=\"%config%\" /p:Platform=\"Any CPU\" /p:CodeAnalysis=true /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diagnostic /nr:false\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Run functional tests\n-set testDir=\"NuGetGallery.FunctionalTests\\bin\\%config%\"\n-copy %nuget% %testDir%\n-call %xunit% \"%testDir%\\NuGetGallery.FunctionalTests.dll\" -trait \"Category=%testCategory%\" -xml functionaltests.P1.xml\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run web UI tests\n-call %mstest% /TestContainer:\"NuGetGallery.WebUITests.P1\\bin\\%config%\\NuGetGallery.WebUITests.P1.dll\" /TestSettings:Local.testsettings /detail:stdout /resultsfile:NuGetGallery.P1.WebUITests.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run Load tests\n-call %mstest% /TestContainer:\"NuGetGallery.LoadTests\\bin\\%config%\\NuGetGallery.LoadTests.dll\" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:NuGetGallery.P1.LoadTests.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-exit /B %exitCode%\n-\n-:failure\n-exit -1\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/RunP2Tests.bat",
"new_path": null,
"diff": "-@echo Off\n-\n-REM Working directory one level up\n-cd ..\n-\n-REM Configuration\n-set config=Release\n-set testCategory=\"P2Tests\"\n-set solutionPath=\"NuGetGallery.FunctionalTests.sln\"\n-set exitCode=0\n-\n-REM Required Tools\n-set msbuild=\"%PROGRAMFILES(X86)%\\MsBuild\\14.0\\Bin\\msbuild\"\n-set xunit=\"..\\packages\\xunit.runner.console.2.3.1\\tools\\net452\\xunit.console.exe\"\n-set nuget=\"nuget.exe\"\n-set mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\n-\n-REM Clean previous test results\n-if exist functionaltests.P2.xml (\n- del functionaltests.P2.xml\n-)\n-if exist NuGetGallery.P2.*.trx (\n- del NuGetGallery.P2.*.trx\n-)\n-\n-REM Restore packages\n-if not exist nuget (\n- call PowerShell -NoProfile -ExecutionPolicy Bypass -File %cd%\\Scripts\\DownloadLatestNuGetExeRelease.ps1\n-)\n-call %nuget% restore \"%solutionPath%\" -NonInteractive\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Build the solution\n-call %msbuild% \"%solutionPath%\" /p:Configuration=\"%config%\" /p:Platform=\"Any CPU\" /p:CodeAnalysis=true /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diagnostic /nr:false\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Run functional tests\n-set testDir=\"NuGetGallery.FunctionalTests\\bin\\%config%\"\n-copy %nuget% %testDir%\n-call %xunit% \"%testDir%\\NuGetGallery.FunctionalTests.dll\" -trait \"Category=%testCategory%\" -xml functionaltests.P2.xml\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run web UI and load tests\n-call %mstest% /TestContainer:\"NuGetGallery.WebUITests.P2\\bin\\%config%\\NuGetGallery.WebUITests.P2.dll\" /TestSettings:Local.testsettings /detail:stdout /resultsfile:NuGetGallery.P2.WebUITests.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run Load tests\n-call %mstest% /TestContainer:\"NuGetGallery.LoadTests\\bin\\%config%\\NuGetGallery.LoadTests.dll\" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:NuGetGallery.P2.LoadTests.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-exit /B %exitCode%\n-\n-:failure\n-exit -1\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/RunReadonlyModeTests.bat",
"new_path": null,
"diff": "-@echo Off\n-\n-REM Working directory one level up\n-cd ..\n-\n-REM Configuration\n-set config=Release\n-set testCategory=\"ReadonlyModeTests\"\n-set solutionPath=\"NuGetGallery.FunctionalTests.sln\"\n-set exitCode=0\n-\n-REM Required Tools\n-set msbuild=\"%PROGRAMFILES(X86)%\\MsBuild\\14.0\\Bin\\msbuild\"\n-set xunit=\"..\\packages\\xunit.runner.console.2.3.1\\tools\\net452\\xunit.console.exe\"\n-set nuget=\"nuget.exe\"\n-set mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\n-\n-REM Clean previous test results\n-if exist functionaltests.*.xml (\n- del functionaltests.*.xml\n-)\n-if exist resultsfile.*.trx (\n- del resultsfile.*.trx\n-)\n-if exist TestResults (\n- rd TestResults /S /Q\n-)\n-\n-REM Restore packages\n-if not exist nuget (\n- call PowerShell -NoProfile -ExecutionPolicy Bypass -File %cd%\\Scripts\\DownloadLatestNuGetExeRelease.ps1\n-)\n-call %nuget% restore \"%solutionPath%\" -NonInteractive\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Build the solution\n-call %msbuild% \"%solutionPath%\" /p:Configuration=\"%config%\" /p:Platform=\"Any CPU\" /p:CodeAnalysis=true /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diagnostic /nr:false\n-if not \"%errorlevel%\"==\"0\" goto failure\n-\n-REM Run functional tests\n-set testDir=\"NuGetGallery.FunctionalTests\\bin\\%config%\"\n-copy %nuget% %testDir%\n-call %xunit% \"%testDir%\\NuGetGallery.FunctionalTests.dll\" -trait \"Category=%testCategory%\" -xml functionaltests.readonly.xml\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run web UI and load tests\n-call %mstest% /TestContainer:\"NuGetGallery.WebUITests.ReadOnlyMode\\bin\\%config%\\NuGetGallery.WebUITests.ReadOnlyMode.dll\" /TestSettings:Local.testsettings /detail:stdout /resultsfile:resultsfile.web.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-REM Run Load tests\n-call %mstest% /TestContainer:\"NuGetGallery.LoadTests\\bin\\%config%\\NuGetGallery.LoadTests.dll\" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:resultsfile.load.trx\n-if not \"%errorlevel%\"==\"0\" set exitCode=-1\n-\n-exit /B %exitCode%\n-\n-:failure\n-exit -1\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/RunSpecificTests.cmd",
"new_path": null,
"diff": "-@echo off\n-\n-Set Criteria=%1\n-Set Testkind=%2\n-Set GalleryUrl=%3\n-\n-IF \"%Criteria%\" == \"\" (\n-ECHO \"Specify a search string to filter tests. Example :RunSpecificTests.cmd EditPackage .Fluent. You can optionally specify the kind of tests and environment that you want to point to as second and third parameter.\"\n-exit /b\n-)\n-\n-REM If GalleryUrl is still not defined, the default is to use int.nugettest.org\n-if \"%GalleryUrl%\"==\"\" (\n-ECHO Setting GalleryUrl to the default - int.nugettest.org\n-SET GalleryUrl=https://int.nugettest.org/\n-)\n-ECHO The NuGet gallery tests are running against %GalleryUrl%\n-\n-If Exist \"\"%VS120COMNTOOLS%\"\\..\\IDE\\mstest.exe\" (\n- set toolpath=%VS120COMNTOOLS%\n- set VisualStudioVersion=12.0\n- goto Run\n-)\n-\n-If Exist \"\"%VS110COMNTOOLS%\"..\\IDE\\mstest.exe\" (\n- set toolpath=%VS110COMNTOOLS%\n- set VisualStudioVersion=11.0\n- goto Run\n-)\n-\n-:Error\n-Echo The variable toolpath is not set correctly. check your visual studio install. Exiting without running tests...\n-goto End\n-\n-:Run\n-Echo.\n-Echo. Build the NuGet Gallery solution...\n-call ..\\..\\build.cmd\n-Echo Done.\n-Echo.\n-\n-Echo Build the NuGet Gallery test solution...\n-\"%PROGRAMFILES(X86)%\\MsBuild\\14.0\\Bin\\msbuild\" ..\\NuGetGallery.FunctionalTests.sln\n-Echo Done.\n-Echo.\n-\n-Echo Start running the specific NuGet Gallery Functional tests...\n-Echo The path to mstest.exe is \"%toolpath%..\\IDE\\mstest.exe\"\n-\"%toolpath%..\\IDE\\mstest.exe\" /testsettings:\"..\\Local.testsettings\" /testContainer:\"..\\NuGetGallery.FunctionalTests%Testkind%\\bin\\NuGetGallery.FunctionalTests%Testkind%.dll\" /test:\"%Criteria%\"\n-\n-Echo Exit.\n-\n-:End\n-exit /b 0\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/RunTestScripts.ps1",
"new_path": "tests/Scripts/RunTestScripts.ps1",
"diff": "+[CmdletBinding()]\nparam(\n- [string]$TestCategories\n+ [Parameter(Mandatory)][string]$TestCategories\n)\n$dividerSymbol = \"~\"\n+$fullDivider = ($dividerSymbol * 20)\n+$halfDivider = ($dividerSymbol * 10)\n+\n+& \"$PSScriptRoot\\BuildTests.ps1\" | Out-Host\n+\n+Write-Host $fullDivider\n$failedTests = New-Object System.Collections.ArrayList\n-$TestCategories.Split(';') | ForEach-Object {\n- Write-Output ($dividerSymbol * 20)\n- Write-Output \"Testing $_.\"\n- Write-Output ($dividerSymbol * 10)\n+Function Output-Job {\n+ [CmdletBinding()]\n+ param(\n+ [Parameter(ValueFromPipeline)]$job\n+ )\n- & $env:COMSPEC /c \"$PSScriptRoot\\Run$_.bat\"\n+ Write-Host $fullDivider\n+ $jobName = $job.Name\n+ Write-Host \"Finished testing test category $jobName.\"\n+ Write-Host $halfDivider\n+ Receive-Job $job | Out-Host\n+ Write-Host $halfDivider\n+ $jobState = $job.State\n+ if ($jobState -eq \"Completed\") {\n+ Write-Host \"Test category $jobName succeeded!\"\n+ } else {\n+ $failedTests.Add($jobName) | Out-Null\n+ if ($jobState -eq \"Failed\") {\n+ Write-Host \"Test category $jobName failed!\"\n+ } elseif ($jobState -eq \"Stopped\") {\n+ Write-Host \"Test category $jobName was stopped!\"\n+ } else {\n+ Write-Host \"Test category $jobName had unexpected state of $jobState!\"\n+ }\n+ }\n+ Remove-Job $job | Out-Host\n+}\n- Write-Output ($dividerSymbol * 10)\n+$finished = $false\n+$TestCategoriesArray = $TestCategories.Split(';')\n+Write-Host \"Testing $($TestCategoriesArray -join \", \")\"\n+Write-Host $fullDivider\n+try {\n+ $TestCategoriesArray `\n+ | ForEach-Object {\n+ # Kill existing job\n+ $job = Get-Job -Name $_ -ErrorAction Ignore | Remove-Job -Force | Out-Host\n- Write-Output \"Finished testing $_.\"\n+ # Start new job\n+ Start-Job -Name $_ -ScriptBlock {\n+ param(\n+ [string]$testCategory,\n+ [string]$scriptRoot\n+ )\n+\n+ Set-Location -Path $scriptRoot | Out-Host\n+ $script = \"$scriptRoot\\RunTests.ps1\"\n+ Write-Host \"Running $script with test category $testCategory\"\n+ & $script -TestCategory $testCategory | Out-Host\nif ($LastExitCode) {\n- Write-Output \"$_ failed!\"\n- $failedTests.Add($_) | Out-Null\n- } else {\n- Write-Output \"$_ succeeded!\"\n+ throw \"$script with test category $testCategory failed!\"\n+ }\n+ } -ArgumentList ($_, $PSScriptRoot)\n+\n+ Write-Host \"Started testing $_\"\n+ } | Out-Null\n+\n+ Write-Host $fullDivider\n+\n+ do {\n+ Write-Host \"Waiting for $($TestCategoriesArray -join \", \")\"\n+ $jobs = Get-Job -Name $TestCategoriesArray\n+ $job = Wait-Job $jobs -Any\n+ Output-Job $job | Out-Host\n+ $TestCategoriesArray = @($TestCategoriesArray | Where-Object { $_ -ne $job.Name })\n+ Write-Host $fullDivider\n+ } while ($TestCategoriesArray.count -gt 0)\n+\n+ Write-Host \"All functional tests finished\"\n+\n+ $finished = $true\n+} finally {\n+ if (!($finished)) {\n+ Write-Host $fullDivider\n+ Write-Host \"Testing failed or was cancelled!\"\n+ Get-Job -Name $TestCategoriesArray `\n+ | ForEach-Object {\n+ Stop-Job $_ | Out-Host\n+ Output-Job $_ | Out-Host\n+ } | Out-Host\n}\n}\n-Write-Output ($dividerSymbol * 20)\n+Write-Host $fullDivider\nif ($failedTests.Count -gt 0) {\n- Write-Output \"Some functional tests failed!\"\n- $failedTests | ForEach-Object { Write-Output $_ }\n+ Write-Host \"Some functional tests failed!\"\n+ $failedTests | ForEach-Object { Write-Host \"Test category $_ failed\" }\nexit 1\n}\n-Write-Output \"All functional tests succeeded!\"\n+Write-Host \"All functional tests succeeded!\"\nexit 0\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/Scripts/RunTests.ps1",
"diff": "+[CmdletBinding()]\n+param(\n+ [string]$Config = \"Release\",\n+ [Parameter(Mandatory)][string]$TestCategory\n+)\n+\n+# Move working directory one level up\n+$root = (Get-Item $PSScriptRoot).parent\n+$rootName = $root.FullName\n+$rootRootName = $root.parent.FullName\n+\n+# Required tools\n+$nuget = \"$rootName\\nuget.exe\"\n+$msTest = \"${Env:ProgramFiles(x86)}\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\n+$xunit = \"$rootRootName\\packages\\xunit.runner.console.2.3.1\\tools\\net452\\xunit.console.exe\"\n+\n+# Test results files\n+$functionalTestsResults = \"$rootName/functionaltests.$TestCategory.xml\"\n+$webUITestResults = \"$rootName/NuGetGallery.$TestCategory.WebUITests.trx\"\n+$loadTestResults = \"$rootName/NuGetGallery.$TestCategory.LoadTests.trx\"\n+\n+# Clean previous test results\n+Remove-Item $functionalTestsResults -ErrorAction Ignore\n+Remove-Item $webUITestResults -ErrorAction Ignore\n+Remove-Item $loadTestResults -ErrorAction Ignore\n+\n+# Run functional tests\n+$fullTestCategory = \"$($testCategory)Tests\"\n+$exitCode = 0\n+\n+$functionalTestsDirectory = \"$rootName\\NuGetGallery.FunctionalTests\\bin\\$Config\"\n+& $xunit \"$functionalTestsDirectory\\NuGetGallery.FunctionalTests.dll\" \"-trait\" \"Category=$fullTestCategory\" \"-xml\" $functionalTestsResults\n+if ($LastExitCode) {\n+ $exitCode = 1\n+}\n+\n+# Run web UI tests\n+$webTestsDirectory = \"$rootName\\NuGetGallery.WebUITests.$TestCategory\\bin\\$Config\"\n+& $msTest \"/TestContainer:$webTestsDirectory\\NuGetGallery.WebUITests.$TestCategory.dll\" \"/TestSettings:$rootName\\Local.testsettings\" \"/detail:stdout\" \"/resultsfile:$webUITestResults\"\n+if ($LastExitCode) {\n+ $exitCode = 1\n+}\n+\n+# Run load tests\n+$loadTestsDirectory = \"$rootName\\NuGetGallery.LoadTests\\bin\\$Config\"\n+& $msTest \"/TestContainer:$loadTestsDirectory\\NuGetGallery.LoadTests.dll\" \"/TestSettings:$rootName\\Local.testsettings\" \"/detail:stdout\" \"/category:$fullTestCategory\" \"/resultsfile:$loadTestResults\"\n+if ($LastExitCode) {\n+ $exitCode = 1\n+}\n+\n+exit $exitCode\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/Scripts/TestRunSetupScript.cmd",
"new_path": null,
"diff": "-@echo off\n-\n-set RunFunctionalTests=true\n-set TestAccountName=testnuget@gmail.com\n-set TestAccountPassword=<password>\n-set TestEmailServerHost=imap.gmail.com\n-\n-Echo Clear previously defined GalleryUrl and branch.\n-set galleryUrl=\n-set branch=\n-Echo.\n-\n-Echo Set the gallery Url...\n-set galleryUrl=%1\n-if \"%galleryUrl%\" == \"\" (\n-Echo Setting galleryUrl to the default - int.nugettest.org\n-set galleryUrl=https://int.nugettest.org/\n-)\n-Echo The gallery Url was set to %galleryUrl%\n-Echo.\n-\n-Echo Set branch for NuGet.exe...\n-set branch=%2\n-if \"%branch%\" == \"\" (\n-Echo Setting branch to the default - master branch\n-set branch=master\n-)\n-Echo The NuGet.exe branch was set to %branch%\n-Echo.\n-\n-Echo copy the latest nuget.exe from %branch% branch...\n-copy /y \\\\nuget-ci\\drops\\%branch%\\latest-successful\\nuget.exe .\\..\\.nuget\\\n-Echo.\n-\n-Echo Set APIKey for the gallery...\n-.\\..\\.nuget\\nuget.exe setAPIKey <api key> -Source %galleryUrl%api/v2/package/\n-Echo Done.\n-\n-exit /b 0\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Run multiple functional test categories in parallel (#5905)
|
455,747 |
10.05.2018 16:52:51
| 25,200 |
35316100717d9156affcb5dd532eb94fe8f0af2c
|
Session persistence - Machine Keys
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "@@ -60,6 +60,9 @@ public static void Configuration(IAppBuilder app)\nvar config = dependencyResolver.GetService<IGalleryConfigurationService>();\nvar auth = dependencyResolver.GetService<AuthenticationService>();\n+ // Configure machine key for session persistence across slots\n+ SessionPersistence.Setup(config);\n+\n// Setup telemetry\nvar instrumentationKey = config.Current.AppInsightsInstrumentationKey;\nif (!string.IsNullOrEmpty(instrumentationKey))\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/App_Start/SessionPersistence.cs",
"diff": "+// Copyright (c) .NET Foundation. All rights reserved.\n+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n+\n+using System.Configuration;\n+using System.Reflection;\n+using System.Web.Configuration;\n+using NuGetGallery.Configuration;\n+\n+namespace NuGetGallery\n+{\n+ public static class SessionPersistence\n+ {\n+ public static void Setup(IGalleryConfigurationService config)\n+ {\n+ // The machine keys are used for encrypting/decrypting cookies used by ASP.NET, these are usually set by IIS in 'Auto' mode.\n+ // During a deployment to Azure cloud service the same machine key values are set on all the instances of a given cloud service,\n+ // thereby providing session persistence across different instances in the same deployment slot. However, across different slots(staging vs production)\n+ // these session keys are different. Thereby causing the loss of session upon a slot swap. Manually setting these values on role start ensures same\n+ // keys are used by all the instances across all the slots of a Azure cloud service. See more analysis here: https://github.com/NuGet/Engineering/issues/1329\n+ if (config.Current.EnableMachineKeyConfiguration\n+ && !string.IsNullOrWhiteSpace(config.Current.MachineKeyDecryption)\n+ && !string.IsNullOrWhiteSpace(config.Current.MachineKeyDecryptionKey)\n+ && !string.IsNullOrWhiteSpace(config.Current.MachineKeyValidationAlgorithm)\n+ && !string.IsNullOrWhiteSpace(config.Current.MachineKeyValidationKey))\n+ {\n+ var mksType = typeof(MachineKeySection);\n+ var mksSection = ConfigurationManager.GetSection(\"system.web/machineKey\") as MachineKeySection;\n+ var resetMethod = mksType.GetMethod(\"Reset\", BindingFlags.NonPublic | BindingFlags.Instance);\n+\n+ var machineKeyConfig = new MachineKeySection();\n+ machineKeyConfig.ApplicationName = mksSection.ApplicationName;\n+ machineKeyConfig.CompatibilityMode = mksSection.CompatibilityMode;\n+ machineKeyConfig.DataProtectorType = mksSection.DataProtectorType;\n+ machineKeyConfig.Validation = mksSection.Validation;\n+\n+ machineKeyConfig.DecryptionKey = config.Current.MachineKeyDecryptionKey;\n+ machineKeyConfig.Decryption = config.Current.MachineKeyDecryption;\n+ machineKeyConfig.ValidationKey = config.Current.MachineKeyValidationKey;\n+ machineKeyConfig.ValidationAlgorithm = config.Current.MachineKeyValidationAlgorithm;\n+\n+ resetMethod.Invoke(mksSection, new object[] { machineKeyConfig });\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -239,6 +239,31 @@ public class AppConfiguration : IAppConfiguration\n/// </summary>\npublic int WarnAboutExpirationInDaysForApiKeyV1 { get; set; }\n+ /// <summary>\n+ /// Configuration to enable manual setting of the machine key for session persistence across deployments/slots.\n+ /// </summary>\n+ public bool EnableMachineKeyConfiguration { get; set; }\n+\n+ /// <summary>\n+ /// Gets/sets the encryption aglorithm that is used for encrypting and decrypting forms authentication data.\n+ /// </summary>\n+ public string MachineKeyDecryption { get; set; }\n+\n+ /// <summary>\n+ /// Gets/sets the key that is sued to encrypt and decrypt data, or the process by which the key is generated.\n+ /// </summary>\n+ public string MachineKeyDecryptionKey { get; set; }\n+\n+ /// <summary>\n+ /// Gets/sets the hashing algorithm used for validating forms authentication and view state data.\n+ /// </summary>\n+ public string MachineKeyValidationAlgorithm { get; set; }\n+\n+ /// <summary>\n+ /// Gets/sets the key that is used to validate forms authentication and view state data, or the process by which the key is generated.\n+ /// </summary>\n+ public string MachineKeyValidationKey { get; set; }\n+\n/// <summary>\n/// Gets a string containing the PagerDuty account name.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -242,6 +242,31 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// </summary>\nint WarnAboutExpirationInDaysForApiKeyV1 { get; set; }\n+ /// <summary>\n+ /// Configuration to enable manual setting of the machine key for session persistence across deployments/slots.\n+ /// </summary>\n+ bool EnableMachineKeyConfiguration { get; set; }\n+\n+ /// <summary>\n+ /// Defines the encryption aglorithm that is used for encrypting and decrypting forms authentication data.\n+ /// </summary>\n+ string MachineKeyDecryption { get; set; }\n+\n+ /// <summary>\n+ /// Defines the key that is sued to encrypt and decrypt data, or the process by which the key is generated.\n+ /// </summary>\n+ string MachineKeyDecryptionKey { get; set; }\n+\n+ /// <summary>\n+ /// Defines the hashing algorithm used for validating forms authentication and view state data.\n+ /// </summary>\n+ string MachineKeyValidationAlgorithm { get; set; }\n+\n+ /// <summary>\n+ /// Defines the key that is used to validate forms authentication and view state data, or the process by which the key is generated.\n+ /// </summary>\n+ string MachineKeyValidationKey { get; set; }\n+\n/// <summary>\n/// Gets a string containing the PagerDuty account name.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"App_Start\\NuGetODataConfig.cs\" />\n<Compile Include=\"App_Start\\RuntimeServiceProvider.cs\" />\n<Compile Include=\"App_Start\\StorageDependent.cs\" />\n+ <Compile Include=\"App_Start\\SessionPersistence.cs\" />\n<Compile Include=\"App_Start\\WebApiConfig.cs\" />\n<Compile Include=\"App_Start\\AutofacConfig.cs\" />\n<Compile Include=\"Areas\\Admin\\Controllers\\DeleteAccountController.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Gallery.ExpirationInDaysForApiKeyV1\" value=\"365\" />\n<add key=\"Gallery.WarnAboutExpirationInDaysForApiKeyV1\" value=\"10\" />\n+ <!-- *********************************************************** -->\n+ <!-- Cookie session persistence across deployment/slots settings -->\n+ <!-- *********************************************************** -->\n+ <!-- Machine key configuration settings -->\n+ <add key=\"Gallery.EnableMachineKeyConfiguration\" value=\"false\" />\n+ <add key=\"Gallery.MachineKeyDecryption\" value=\"\" />\n+ <add key=\"Gallery.MachineKeyDecryptionKey\" value=\"\" />\n+ <add key=\"Gallery.MachineKeyValidationAlgorithm\" value=\"\" />\n+ <add key=\"Gallery.MachineKeyValidationKey\" value=\"\" />\n+\n<!-- To change password complexity requirements, uncomment those lines, and set your regex and password hint.\n<add key=\"Gallery.UserPasswordRegex\" value=\"^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9]).{8,64}$\" />\n<add key=\"Gallery.UserPasswordHint\" value=\"Your password must be at least 8 characters, should include at least one uppercase letter, one lowercase letter and a digit.\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Session persistence - Machine Keys (#5876)
|
455,747 |
11.05.2018 13:55:18
| 25,200 |
75dcd3ebbc6abb158b4bf567e2d48a51f71ffd56
|
Refresh content on app start
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -272,14 +272,6 @@ protected override void Load(ContainerBuilder builder)\n.As<ICertificateService>()\n.InstancePerLifetimeScope();\n- if (configuration.Current.IsHosted)\n- {\n- HostingEnvironment.QueueBackgroundWorkItem(async cancellationToken => await DependencyResolver\n- .Current\n- .GetService<IContentObjectService>()\n- .Refresh());\n- }\n-\nFunc<MailSender> mailSenderFactory = () =>\n{\nvar settings = configuration;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "using System.Net;\nusing System.Threading.Tasks;\nusing System.Web;\n+using System.Web.Hosting;\nusing System.Web.Http;\nusing System.Web.Mvc;\nusing Elmah;\n@@ -63,6 +64,13 @@ public static void Configuration(IAppBuilder app)\n// Configure machine key for session persistence across slots\nSessionPersistence.Setup(config);\n+ // Refresh the content for the ContentObjectService to guarantee it has loaded the latest configuration on startup.\n+ if (config.Current.IsHosted)\n+ {\n+ var contentObjectService = dependencyResolver.GetService<IContentObjectService>();\n+ HostingEnvironment.QueueBackgroundWorkItem(async cancellationToken => await contentObjectService.Refresh());\n+ }\n+\n// Setup telemetry\nvar instrumentationKey = config.Current.AppInsightsInstrumentationKey;\nif (!string.IsNullOrEmpty(instrumentationKey))\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Refresh content on app start (#5915)
|
455,747 |
15.05.2018 12:06:38
| 25,200 |
b9d71ab4b069a5c321a69387e3bd503d250386d5
|
[MSA] Fix logins on staging slots
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Linq;\nusing System.Security.Claims;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\n@@ -43,7 +44,9 @@ public static class AuthenticationType\npublic static readonly string V2CommonTenant = \"common\";\npublic static readonly string Authority = \"https://login.microsoftonline.com/{0}/v2.0\";\n+ private static string _callbackPath = \"users/account/authenticate/return\";\nprivate static HashSet<string> _errorMessageList = new HashSet<string> { \"access_denied\", \"consent_required\" };\n+ private static HashSet<string> _alternateSiteRootList;\n/// <summary>\n/// The possible values returned by <see cref=\"V2Claims.ACR\"/> claim, and also the possible token values to be sent\n@@ -72,10 +75,22 @@ protected override void AttachToOwinApp(IGalleryConfigurationService config, IAp\nsiteRoot = siteRoot.Replace(\"http://\", \"https://\");\n}\n+ if (!string.IsNullOrWhiteSpace(config.Current.AlternateSiteRootList))\n+ {\n+ var alternateSiteRootList = config\n+ .Current\n+ .AlternateSiteRootList\n+ .Split(';')\n+ .Select(d => d.Trim())\n+ .ToArray();\n+\n+ _alternateSiteRootList = new HashSet<string>(alternateSiteRootList, StringComparer.OrdinalIgnoreCase);\n+ }\n+\n// Configure OpenIdConnect\nvar options = new OpenIdConnectAuthenticationOptions(BaseConfig.AuthenticationType)\n{\n- RedirectUri = siteRoot + \"users/account/authenticate/return\",\n+ RedirectUri = siteRoot + _callbackPath,\nPostLogoutRedirectUri = siteRoot,\nScope = OpenIdConnectScopes.OpenIdProfile + \" email\",\nResponseType = OpenIdConnectResponseTypes.CodeIdToken,\n@@ -221,6 +236,12 @@ private Task RedirectToIdentityProvider(RedirectToIdentityProviderNotification<O\nnotification.ProtocolMessage.AcrValues = ACR_VALUES.ANY;\n}\n+ // Set the redirect_uri token for the alternate domains of same gallery instance\n+ if (_alternateSiteRootList != null && _alternateSiteRootList.Contains(notification.Request.Uri.Host))\n+ {\n+ notification.ProtocolMessage.RedirectUri = \"https://\" + notification.Request.Uri.Host + \"/\" + _callbackPath ;\n+ }\n+\nreturn Task.FromResult(0);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -239,6 +239,11 @@ public class AppConfiguration : IAppConfiguration\n/// </summary>\npublic int WarnAboutExpirationInDaysForApiKeyV1 { get; set; }\n+ /// <summary>\n+ /// Defines a semi-colon separated list of domains for the alternate site roots for gallery, used for MSA authentication by AADv2\n+ /// </summary>\n+ public string AlternateSiteRootList { get; set; }\n+\n/// <summary>\n/// Configuration to enable manual setting of the machine key for session persistence across deployments/slots.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -242,6 +242,11 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// </summary>\nint WarnAboutExpirationInDaysForApiKeyV1 { get; set; }\n+ /// <summary>\n+ /// Defines a semi-colon separated list of domains for the alternate site root for gallery, used for MSA authentication by AADv2\n+ /// </summary>\n+ string AlternateSiteRootList { get; set; }\n+\n/// <summary>\n/// Configuration to enable manual setting of the machine key for session persistence across deployments/slots.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Gallery.EnforcedAuthProviderForAdmin\" value=\"\" />\n<add key=\"Gallery.ExpirationInDaysForApiKeyV1\" value=\"365\" />\n<add key=\"Gallery.WarnAboutExpirationInDaysForApiKeyV1\" value=\"10\" />\n+ <!-- Semi-colon separated list of domains for the alternate site root for gallery, used for MSA authentication by AADv2-->\n+ <add key=\"Gallery.AlternateSiteRootList\" value=\"\" />\n<!-- *********************************************************** -->\n<!-- Cookie session persistence across deployment/slots settings -->\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[MSA] Fix logins on staging slots (#5921)
|
455,731 |
15.05.2018 13:11:12
| 25,200 |
f340e5d7b84e1afe237261d122832fb0788364f0
|
Cloud auditing: stop persisting package audit records for non-deletion events
Resolve
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"diff": "@@ -152,7 +152,10 @@ public override string RenderAuditEntry(AuditEntry entry)\npublic override bool RecordWillBePersisted(AuditRecord auditRecord)\n{\n- return auditRecord.GetType() == typeof(PackageAuditRecord);\n+ var packageAuditRecord = auditRecord as PackageAuditRecord;\n+\n+ return packageAuditRecord != null &&\n+ (packageAuditRecord.Action == AuditedPackageAction.Delete || packageAuditRecord.Action == AuditedPackageAction.SoftDelete);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/CloudAuditingServiceTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/CloudAuditingServiceTests.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Linq;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Newtonsoft.Json;\nusing Newtonsoft.Json.Linq;\n@@ -67,13 +66,24 @@ public static IEnumerable<object[]> OnlyPackageAuditRecordsWillBeSavedData\n{\nget\n{\n- List<object[]> data = new List<object[]>();\n+ var data = new List<object[]>();\n+\ndata.Add(new object[] { CreateUserAuditRecord(), false });\ndata.Add(new object[] { CreateFailedAuthenticatedOperationAuditRecord(), false });\ndata.Add(new object[] { CreateReservedNamespaceAuditRecord(), false });\ndata.Add(new object[] { CreateUserSecurityPolicyAuditRecord(), false });\ndata.Add(new object[] { CreatePackageRegistrationAuditRecord(), false });\n- data.Add(new object[] { CreatePackageAuditRecord(), true });\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.Create), false });\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.Delete), true });\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.Edit), false });\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.List), false });\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.SoftDelete), true });\n+#pragma warning disable CS0618\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.UndoEdit), false });\n+#pragma warning restore\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.Unlist), false });\n+ data.Add(new object[] { CreatePackageAuditRecord(AuditedPackageAction.Verify), false });\n+\nreturn data;\n}\n}\n@@ -104,9 +114,9 @@ static PackageRegistrationAuditRecord CreatePackageRegistrationAuditRecord()\nreturn new PackageRegistrationAuditRecord(new PackageRegistration(), AuditedPackageRegistrationAction.AddOwner, \"\");\n}\n- static PackageAuditRecord CreatePackageAuditRecord()\n+ static PackageAuditRecord CreatePackageAuditRecord(AuditedPackageAction packageAction)\n{\n- return new PackageAuditRecord(new Package() { PackageRegistration = new PackageRegistration() { Id = \"id\" } }, AuditedPackageAction.Create);\n+ return new PackageAuditRecord(new Package() { PackageRegistration = new PackageRegistration() { Id = \"id\" } }, packageAction);\n}\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Cloud auditing: stop persisting package audit records for non-deletion events (#5926)
Resolve https://github.com/NuGet/NuGetGallery/issues/5925.
|
455,731 |
15.05.2018 13:58:04
| 25,200 |
a171bd1a86fad6950e1d0c6531a3c286e9276812
|
Certificates: handle certificates in GetContentType(...)
Resolve
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreConstants.cs",
"new_path": "src/NuGetGallery.Core/CoreConstants.cs",
"diff": "@@ -20,6 +20,7 @@ public static class CoreConstants\npublic const string PackageContentType = \"binary/octet-stream\";\npublic const string OctetStreamContentType = \"application/octet-stream\";\npublic const string TextContentType = \"text/plain\";\n+ public const string CertificateContentType = \"application/pkix-cert\";\npublic const string UserCertificatesFolderName = \"user-certificates\";\npublic const string ContentFolderName = \"content\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -446,6 +446,9 @@ private static string GetContentType(string folderName)\ncase CoreConstants.PackageReadMesFolderName:\nreturn CoreConstants.TextContentType;\n+ case CoreConstants.UserCertificatesFolderName:\n+ return CoreConstants.CertificateContentType;\n+\ndefault:\nthrow new InvalidOperationException(\nString.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -53,7 +53,8 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)\nnew object[] { CoreConstants.PackageReadMesFolderName, false, CoreConstants.TextContentType },\nnew object[] { CoreConstants.PackagesFolderName, true, CoreConstants.PackageContentType },\nnew object[] { CoreConstants.UploadsFolderName, false, CoreConstants.PackageContentType },\n- new object[] { CoreConstants.ValidationFolderName, false, CoreConstants.PackageContentType },\n+ new object[] { CoreConstants.UserCertificatesFolderName, false, CoreConstants.CertificateContentType },\n+ new object[] { CoreConstants.ValidationFolderName, false, CoreConstants.PackageContentType }\n};\nif (!IncludePermissions && !IncludeContentTypes)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: handle certificates in GetContentType(...) (#5928)
Resolve https://github.com/NuGet/NuGetGallery/issues/5927.
|
455,747 |
15.05.2018 15:01:38
| 25,200 |
22c6234300f47f079e058a617aa0c2378092691d
|
Add 2FA and login metrics to AI
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -247,6 +247,8 @@ public virtual async Task CreateSessionAsync(IOwinContext owinContext, Authentic\nowinContext.Authentication.SignIn(identity);\nowinContext.Authentication.SignOut(AuthenticationTypes.External);\n+ _telemetryService.TrackUserLogin(authenticatedUser.User, authenticatedUser.CredentialUsed, wasMultiFactorAuthenticated);\n+\n// Write an audit record\nawait Auditing.SaveAuditRecordAsync(\nnew UserAuditRecord(authenticatedUser.User, AuditedUserAction.Login, authenticatedUser.CredentialUsed));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -39,6 +39,8 @@ public interface ITelemetryService\nvoid TrackNewCredentialCreated(User user, Credential credential);\n+ void TrackUserLogin(User user, Credential credential, bool wasMultiFactorAuthenticated);\n+\n/// <summary>\n/// A telemetry event emitted when the service checks whether a user package delete is allowed.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -22,6 +22,7 @@ internal class Events\npublic const string PackagePushNamespaceConflict = \"PackagePushNamespaceConflict\";\npublic const string NewUserRegistration = \"NewUserRegistration\";\npublic const string CredentialAdded = \"CredentialAdded\";\n+ public const string CredentialUsed = \"CredentialUsed\";\npublic const string UserPackageDeleteCheckedAfterHours = \"UserPackageDeleteCheckedAfterHours\";\npublic const string UserPackageDeleteExecuted = \"UserPackageDeleteExecuted\";\npublic const string UserMultiFactorAuthenticationEnabled = \"UserMultiFactorAuthenticationEnabled\";\n@@ -66,6 +67,7 @@ internal class Events\n// User properties\npublic const string RegistrationMethod = \"RegistrationMethod\";\npublic const string AccountCreationDate = \"AccountCreationDate\";\n+ public const string WasMultiFactorAuthenticated = \"WasMultiFactorAuthenticated\";\n// Verify package properties\npublic const string IsVerificationKeyUsed = \"IsVerificationKeyUsed\";\n@@ -217,6 +219,11 @@ public void TrackNewCredentialCreated(User user, Credential credential)\nTrackMetricForAccountActivity(Events.CredentialAdded, user, credential);\n}\n+ public void TrackUserLogin(User user, Credential credential, bool wasMultiFactorAuthenticated)\n+ {\n+ TrackMetricForAccountActivity(Events.CredentialUsed, user, credential, wasMultiFactorAuthenticated);\n+ }\n+\npublic void TrackUserPackageDeleteExecuted(int packageKey, string packageId, string packageVersion, ReportPackageReason reason, bool success)\n{\nif (packageId == null)\n@@ -307,7 +314,7 @@ public void TrackException(Exception exception, Action<Dictionary<string, string\n_telemetryClient.TrackException(exception, telemetryProperties, metrics: null);\n}\n- private void TrackMetricForAccountActivity(string eventName, User user, Credential credential)\n+ private void TrackMetricForAccountActivity(string eventName, User user, Credential credential, bool wasMultiFactorAuthenticated = false)\n{\nif (user == null)\n{\n@@ -319,6 +326,7 @@ private void TrackMetricForAccountActivity(string eventName, User user, Credenti\nproperties.Add(ProtocolVersion, GetProtocolVersion());\nproperties.Add(AccountCreationDate, GetAccountCreationDate(user));\nproperties.Add(RegistrationMethod, GetRegistrationMethod(credential));\n+ properties.Add(WasMultiFactorAuthenticated, wasMultiFactorAuthenticated.ToString());\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -116,6 +116,10 @@ public static IEnumerable<object[]> TrackMetricNames_Data\n(TrackAction)(s => s.TrackNewCredentialCreated(fakes.User, fakes.User.Credentials.First()))\n};\n+ yield return new object[] { \"CredentialUsed\",\n+ (TrackAction)(s => s.TrackUserLogin(fakes.User, fakes.User.Credentials.First(), wasMultiFactorAuthenticated: true))\n+ };\n+\nyield return new object[] { \"UserPackageDeleteCheckedAfterHours\",\n(TrackAction)(s => s.TrackUserPackageDeleteChecked(\nnew UserPackageDeleteEvent(\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add 2FA and login metrics to AI (#5931)
|
455,794 |
22.05.2018 07:39:41
| 25,200 |
7e9ecfa04eebbfc7e933084a8f892caab1a1a842
|
Remove PG integration for support
|
[
{
"change_type": "DELETE",
"old_path": "src/NuGetGallery/Areas/Admin/Services/PagerDutyClient.cs",
"new_path": null,
"diff": "-// Copyright (c) .NET Foundation. All rights reserved.\n-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Globalization;\n-using System.Net.Http;\n-using System.Net.Http.Headers;\n-using System.Threading.Tasks;\n-using Newtonsoft.Json.Linq;\n-\n-namespace NuGetGallery.Areas.Admin\n-{\n- // todo: move this out of the gallery code base...\n- internal sealed class PagerDutyClient\n- {\n- private const string _triggerIncidentUrl = \"https://events.pagerduty.com/generic/2010-04-15/create_event.json\";\n- private readonly string _apiKey;\n- private readonly string _serviceKey;\n- private readonly string _onCallUrl;\n-\n- internal PagerDutyClient(string accountName, string apiKey, string serviceKey)\n- {\n- _apiKey = apiKey;\n- _serviceKey = serviceKey;\n-\n- // Configure defaults\n- _onCallUrl = string.Format(CultureInfo.InvariantCulture, \"https://{0}.pagerduty.com/api/v1/users/on_call\", accountName);\n- }\n-\n- public async Task<string> GetPrimaryOnCallAsync()\n- {\n- var username = string.Empty;\n-\n- try\n- {\n- string response;\n- using (var httpClient = new HttpClient())\n- {\n- var token = \"Token token=\" + _apiKey;\n- httpClient.DefaultRequestHeaders.Add(\"Authorization\", token);\n-\n- response = await httpClient.GetStringAsync(_onCallUrl);\n- }\n-\n- if (!string.IsNullOrEmpty(response))\n- {\n- username = GetEmailAliasFromOnCallUser(response, \"PQP8V6O\");\n- }\n- }\n- catch (Exception e)\n- {\n- QuietLog.LogHandledException(e);\n- }\n-\n- return username;\n- }\n-\n- internal static string GetEmailAliasFromOnCallUser(string response, string policyId)\n- {\n- var username = string.Empty;\n-\n- var root = JObject.Parse(response);\n- var users = (JArray)root[\"users\"];\n-\n- foreach (var item in users)\n- {\n- foreach (var onCall in item[\"on_call\"])\n- {\n- if (Convert.ToInt32(onCall[\"level\"], CultureInfo.InvariantCulture) == 1)\n- {\n- var escalationPolicyId = onCall[\"escalation_policy\"][\"id\"].Value<string>();\n- if (string.Equals(escalationPolicyId, policyId, StringComparison.Ordinal))\n- {\n- var email = item[\"email\"].ToString();\n- var length = email.IndexOf(\"@\", 0, StringComparison.OrdinalIgnoreCase);\n- var alias = email.Substring(0, length);\n-\n- // Find the primary that is not nugetcore\n- if (!alias.Equals(\"nugetcore\", StringComparison.OrdinalIgnoreCase))\n- {\n- username = alias;\n- break;\n- }\n- }\n- }\n- }\n- }\n-\n- return username;\n- }\n-\n- public async Task TriggerIncidentAsync(string errorMessage)\n- {\n- try\n- {\n- using (var httpClient = new HttpClient())\n- {\n- var token = \"Token token=\" + _apiKey;\n- httpClient.DefaultRequestHeaders.Add(\"Authorization\", token);\n-\n- var obj = new JObject\n- {\n- { \"service_key\", _serviceKey },\n- { \"event_type\", \"trigger\" },\n- { \"description\", errorMessage }\n- };\n-\n- var content = new StringContent(obj.ToString());\n- content.Headers.ContentType = new MediaTypeHeaderValue(\"application/json\");\n-\n- var response = await httpClient.PostAsync(_triggerIncidentUrl, content);\n- response.EnsureSuccessStatusCode();\n- }\n- }\n- catch (Exception e)\n- {\n- QuietLog.LogHandledException(e);\n- }\n- }\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs",
"diff": "@@ -18,7 +18,6 @@ public class SupportRequestService\n{\nprivate readonly ISupportRequestDbContext _supportRequestDbContext;\nprivate IAuditingService _auditingService;\n- private readonly PagerDutyClient _pagerDutyClient;\nprivate readonly string _siteRoot;\nprivate const string _unassignedAdmin = \"unassigned\";\n@@ -29,8 +28,6 @@ public class SupportRequestService\n{\n_supportRequestDbContext = supportRequestDbContext;\n_siteRoot = config.SiteRoot;\n-\n- _pagerDutyClient = new PagerDutyClient(config.PagerDutyAccountName, config.PagerDutyAPIKey, config.PagerDutyServiceKey);\n_auditingService = auditingService ?? throw new ArgumentNullException(nameof(auditingService));\n}\n@@ -215,17 +212,6 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\n{\nvar newIssue = new Issue();\n- // If primary on-call person is not yet configured in the Support Request DB, assign to 'unassigned'.\n- var primaryOnCall = await _pagerDutyClient.GetPrimaryOnCallAsync();\n- if (string.IsNullOrEmpty(primaryOnCall) || GetAdminKeyFromUsername(primaryOnCall) == -1)\n- {\n- newIssue.AssignedTo = null;\n- }\n- else\n- {\n- newIssue.AssignedToId = GetAdminKeyFromUsername(primaryOnCall);\n- }\n-\nnewIssue.CreatedDate = DateTime.UtcNow;\nnewIssue.Details = message;\nnewIssue.IssueStatusId = IssueStatusKeys.New;\n@@ -243,20 +229,7 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\nawait AddIssueAsync(newIssue);\nreturn newIssue;\n}\n- catch (SqlException sqlException)\n- {\n- QuietLog.LogHandledException(sqlException);\n-\n- var packageInfo = \"N/A\";\n- if (package != null)\n- {\n- packageInfo = $\"{package.PackageRegistration.Id} v{package.Version}\";\n- }\n-\n- var errorMessage = $\"Error while submitting support request at {DateTime.UtcNow}. Support reason = {reason ?? \"N/A\"}. Package info = {packageInfo}\";\n- await _pagerDutyClient.TriggerIncidentAsync(errorMessage);\n- }\n- catch (Exception e) //In case getting data from PagerDuty has failed\n+ catch (Exception e)\n{\nQuietLog.LogHandledException(e);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -269,21 +269,6 @@ public class AppConfiguration : IAppConfiguration\n/// </summary>\npublic string MachineKeyValidationKey { get; set; }\n- /// <summary>\n- /// Gets a string containing the PagerDuty account name.\n- /// </summary>\n- public string PagerDutyAccountName { get; set; }\n-\n- /// <summary>\n- /// Gets a string containing the PagerDuty API key.\n- /// </summary>\n- public string PagerDutyAPIKey { get; set; }\n-\n- /// <summary>\n- /// Gets a string containing the PagerDuty Service key.\n- /// </summary>\n- public string PagerDutyServiceKey { get; set; }\n-\n/// <summary>\n/// Gets/sets a bool that indicates if the OData requests will be filtered.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -272,23 +272,6 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// </summary>\nstring MachineKeyValidationKey { get; set; }\n- /// <summary>\n- /// Gets a string containing the PagerDuty account name.\n- /// </summary>\n- string PagerDutyAccountName { get; set; }\n-\n- /// <summary>\n- /// Gets a string containing the PagerDuty API key.\n- /// </summary>\n- // ReSharper disable once InconsistentNaming\n- string PagerDutyAPIKey { get; set; }\n-\n- /// <summary>\n- /// Gets a string containing the PagerDuty Service key.\n- /// </summary>\n- // ReSharper disable once InconsistentNaming\n- string PagerDutyServiceKey { get; set; }\n-\n/// <summary>\n/// Gets/sets a bool that indicates if the OData requests will be filtered.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -741,6 +741,7 @@ public virtual async Task<ActionResult> ReportAbuse(string id, string version, R\n_messageService.ReportAbuse(request);\nTempData[\"Message\"] = \"Your abuse report has been sent to the gallery operators.\";\n+\nreturn Redirect(Url.Package(id, version));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PagesController.cs",
"diff": "@@ -24,7 +24,8 @@ public partial class PagesController\nprivate readonly ISupportRequestService _supportRequestService;\nprotected PagesController() { }\n- public PagesController(IContentService contentService,\n+ public PagesController(\n+ IContentService contentService,\nIContentObjectService contentObjectService,\nIMessageService messageService,\nISupportRequestService supportRequestService)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -312,7 +312,7 @@ public override async Task<ActionResult> RequestAccountDeletion(string accountNa\n}\nvar isSupportRequestCreated = await _supportRequestService.TryAddDeleteSupportRequestAsync(user);\n- if (await _supportRequestService.TryAddDeleteSupportRequestAsync(user))\n+ if (isSupportRequestCreated)\n{\nMessageService.SendAccountDeleteNotice(user);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Areas\\Admin\\ViewModels\\PackageValidationViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\ValidationPageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\ISupportRequestService.cs\" />\n- <Compile Include=\"Areas\\Admin\\Services\\PagerDutyClient.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\SupportRequestService.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\DeleteAccountSearchResult.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\ValidationEntityRepository.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\AsynchronousPackageValidationInitiatorFacts.cs\" />\n<Compile Include=\"Services\\ImmediatePackageValidatorFacts.cs\" />\n<Compile Include=\"Services\\NoLessSecureDestinationRedirectPolicyFacts.cs\" />\n- <Compile Include=\"Services\\PagerDutyClientFacts.cs\" />\n<Compile Include=\"Services\\PackageUploadServiceFacts.cs\" />\n<Compile Include=\"Services\\ReflowPackageServiceFacts.cs\" />\n<Compile Include=\"Services\\ReservedNamespaceServiceFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"diff": "@@ -122,12 +122,10 @@ static IAppConfiguration GetAppConfig()\n{\nvar appConfig = new Mock<IAppConfiguration>();\nappConfig.Setup(m => m.SiteRoot).Returns(\"SiteRoot\");\n- appConfig.Setup(m => m.PagerDutyAccountName).Returns(\"PagerDutyAccountName\");\n- appConfig.Setup(m => m.PagerDutyAPIKey).Returns(\"PagerDutyAPIKey\");\n- appConfig.Setup(m => m.PagerDutyServiceKey).Returns(\"PagerDutyServiceKey\");\nreturn appConfig.Object;\n}\n+\ninternal class TestSupportRequestDbContext : ISupportRequestDbContext\n{\npublic TestSupportRequestDbContext()\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove PG integration for support (#5972)
|
455,794 |
22.05.2018 11:40:18
| 25,200 |
26d3159d21be63f45533d1c1f231c776daa3648f
|
Remove all PG references in code and DB
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/SupportRequestController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/SupportRequestController.cs",
"diff": "@@ -87,11 +87,11 @@ public async Task<ActionResult> EnableAdmin(int key)\n[HttpPost]\n[ValidateAntiForgeryToken]\n- public async Task<ActionResult> AddAdmin(string galleryUsername, string pagerDutyUsername)\n+ public async Task<ActionResult> AddAdmin(string galleryUsername)\n{\ntry\n{\n- await _supportRequestService.AddAdminAsync(galleryUsername, pagerDutyUsername);\n+ await _supportRequestService.AddAdminAsync(galleryUsername);\nreturn new HttpStatusCodeResult(HttpStatusCode.NoContent);\n}\n@@ -103,11 +103,11 @@ public async Task<ActionResult> AddAdmin(string galleryUsername, string pagerDut\n[HttpPost]\n[ValidateAntiForgeryToken]\n- public async Task<ActionResult> UpdateAdmin(int key, string galleryUsername, string pagerDutyUsername)\n+ public async Task<ActionResult> UpdateAdmin(int key, string galleryUsername)\n{\ntry\n{\n- await _supportRequestService.UpdateAdminAsync(key, galleryUsername, pagerDutyUsername);\n+ await _supportRequestService.UpdateAdminAsync(key, galleryUsername);\nreturn new HttpStatusCodeResult(HttpStatusCode.NoContent);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Areas/Admin/Migrations/201805221605033_DropPagerDutyColumn.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Areas.Admin\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class DropPagerDutyColumn : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(DropPagerDutyColumn));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201805221605033_DropPagerDutyColumn\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Areas/Admin/Migrations/201805221605033_DropPagerDutyColumn.cs",
"diff": "+namespace NuGetGallery.Areas.Admin\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class DropPagerDutyColumn : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ DropIndex(\"dbo.Admins\", new[] { \"PagerDutyUsername\" });\n+ DropColumn(\"dbo.Admins\", \"PagerDutyUsername\");\n+ }\n+\n+ public override void Down()\n+ {\n+ AddColumn(\"dbo.Admins\", \"PagerDutyUsername\", c => c.String(nullable: false, maxLength: 255, unicode: false));\n+ CreateIndex(\"dbo.Admins\", \"PagerDutyUsername\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Models/Admin.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Models/Admin.cs",
"diff": "@@ -12,12 +12,6 @@ public partial class Admin : IEntity\n[Key]\npublic int Key { get; set; }\n- [Required(ErrorMessage =\"Please provide a Pagerduty username\")]\n- [StringLength(255)]\n- [Display(Name = \"Pager Duty username\")]\n- [Index]\n- public string PagerDutyUsername { get; set; }\n-\n[Required(ErrorMessage = \"Please provide a NuGet Gallery username\")]\n[Display(Name = \"NuGet Gallery username\")]\n[StringLength(255)]\n@@ -26,8 +20,8 @@ public partial class Admin : IEntity\npublic bool AccessDisabled { get; set; }\n- // Navigation properties\npublic virtual ICollection<Issue> Issues { get; set; }\n+\npublic virtual ICollection<History> HistoryEntries { get; set; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Models/SupportRequestDbContext.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Models/SupportRequestDbContext.cs",
"diff": "@@ -34,8 +34,11 @@ public SupportRequestDbContext(string connectionString)\n}\npublic virtual IDbSet<Admin> Admins { get; set; }\n+\npublic virtual IDbSet<Issue> Issues { get; set; }\n+\npublic virtual IDbSet<IssueStatus> IssueStatus { get; set; }\n+\npublic virtual IDbSet<History> Histories { get; set; }\npublic async Task CommitChangesAsync()\n@@ -45,8 +48,6 @@ public async Task CommitChangesAsync()\nprotected override void OnModelCreating(DbModelBuilder modelBuilder)\n{\n- modelBuilder.Entity<Admin>()\n- .Property(e => e.PagerDutyUsername).IsUnicode(false);\nmodelBuilder.Entity<Admin>()\n.Property(e => e.GalleryUsername).IsUnicode(false);\nmodelBuilder.Entity<Admin>()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs",
"diff": "@@ -42,17 +42,22 @@ public interface ISupportRequestService\nPackage package = null);\nTask UpdateIssueAsync(int issueId, int? assignedToId, int issueStatusId, string comment, string editedBy);\n+\nint GetIssueCount(int? assignedToId, string reason, int? issueStatusId);\nList<History> GetHistoryEntriesByIssueKey(int id);\nTask AddHistoryRecordAsync(History entry);\nIReadOnlyCollection<Models.Admin> GetAllAdmins();\n- int? GetAdminKeyFromUsername(string username);\n+\nTask ToggleAdminAccessAsync(int adminId, bool enabled);\n- Task UpdateAdminAsync(int adminId, string galleryUsername, string pagerDutyUsername);\n- Task AddAdminAsync(string galleryUsername, string pagerDutyUsername);\n+\n+ Task UpdateAdminAsync(int adminId, string galleryUsername);\n+\n+ Task AddAdminAsync(string galleryUsername);\n+\nTask DeleteSupportRequestsAsync(string createdBy);\n+\nTask<bool> TryAddDeleteSupportRequestAsync(User user);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Data.Entity;\n-using System.Data.SqlClient;\nusing System.Linq;\nusing System.Threading.Tasks;\nusing NuGetGallery.Areas.Admin.Models;\n@@ -36,17 +35,6 @@ public IReadOnlyCollection<Models.Admin> GetAllAdmins()\nreturn _supportRequestDbContext.Admins.ToList();\n}\n- public int? GetAdminKeyFromUsername(string username)\n- {\n- if (string.Equals(username, _unassignedAdmin, StringComparison.OrdinalIgnoreCase))\n- {\n- return null;\n- }\n-\n- var admin = _supportRequestDbContext.Admins.FirstOrDefault(a => username == a.PagerDutyUsername);\n- return admin?.Key;\n- }\n-\npublic List<History> GetHistoryEntriesByIssueKey(int id)\n{\nreturn _supportRequestDbContext.Histories.Where(h => h.IssueId == id).ToList();\n@@ -64,18 +52,13 @@ public int GetIssueCount(int? assignedToId, string reason, int? issueStatusId)\nreturn GetFilteredIssuesQueryable(assignedToId, reason, issueStatusId).Count();\n}\n- public async Task UpdateAdminAsync(int adminId, string galleryUsername, string pagerDutyUsername)\n+ public async Task UpdateAdminAsync(int adminId, string galleryUsername)\n{\nif (string.IsNullOrEmpty(galleryUsername))\n{\nthrow new ArgumentException(nameof(galleryUsername));\n}\n- if (string.IsNullOrEmpty(pagerDutyUsername))\n- {\n- throw new ArgumentException(nameof(pagerDutyUsername));\n- }\n-\nvar admin = GetAdminByKey(adminId);\nif (admin == null)\n{\n@@ -83,25 +66,18 @@ public async Task UpdateAdminAsync(int adminId, string galleryUsername, string p\n}\nadmin.GalleryUsername = galleryUsername;\n- admin.PagerDutyUsername = pagerDutyUsername;\nawait _supportRequestDbContext.CommitChangesAsync();\n}\n- public async Task AddAdminAsync(string galleryUsername, string pagerDutyUsername)\n+ public async Task AddAdminAsync(string galleryUsername)\n{\nif (string.IsNullOrEmpty(galleryUsername))\n{\nthrow new ArgumentException(nameof(galleryUsername));\n}\n- if (string.IsNullOrEmpty(pagerDutyUsername))\n- {\n- throw new ArgumentException(nameof(pagerDutyUsername));\n- }\n-\nvar admin = new Models.Admin();\n- admin.PagerDutyUsername = pagerDutyUsername;\nadmin.GalleryUsername = galleryUsername;\n_supportRequestDbContext.Admins.Add(admin);\n@@ -134,14 +110,14 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\nif (currentIssue.AssignedToId != assignedToId)\n{\n- var previousAssignedUsername = currentIssue.AssignedTo?.GalleryUsername ?? \"unassigned\";\n+ var previousAssignedUsername = currentIssue.AssignedTo?.GalleryUsername ?? _unassignedAdmin;\nstring newAssignedUsername;\nif (assignedToId.HasValue)\n{\nvar admin = GetAdminByKey(assignedToId.Value);\nif (admin == null)\n{\n- newAssignedUsername = \"unassigned\";\n+ newAssignedUsername = _unassignedAdmin;\n}\nelse\n{\n@@ -151,7 +127,7 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\n}\nelse\n{\n- newAssignedUsername = \"unassigned\";\n+ newAssignedUsername = _unassignedAdmin;\n}\ncomments += $\"Reassigned issue from '{previousAssignedUsername}' to '{newAssignedUsername}'.\\r\\n\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/ViewModels/SupportRequestAdminViewModel.cs",
"new_path": "src/NuGetGallery/Areas/Admin/ViewModels/SupportRequestAdminViewModel.cs",
"diff": "@@ -15,19 +15,12 @@ public SupportRequestAdminViewModel()\npublic SupportRequestAdminViewModel(Models.Admin a)\n{\nKey = a.Key;\n- PagerDutyUsername = a.PagerDutyUsername;\nGalleryUsername = a.GalleryUsername;\nAccessDisabled = a.AccessDisabled;\n}\npublic int Key { get; set; }\n- [Required(ErrorMessage = \"Please provide a Pagerduty username\")]\n- [StringLength(255)]\n- [Display(Name = \"Pager Duty username\")]\n- [Index]\n- public string PagerDutyUsername { get; set; }\n-\n[Required(ErrorMessage = \"Please provide a NuGet Gallery username\")]\n[Display(Name = \"NuGet Gallery username\")]\n[StringLength(255)]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/SupportRequest/Admins.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/SupportRequest/Admins.cshtml",
"diff": "<form id=\"addAdmin-form\">\n<fieldset class=\"form\">\n<legend>Add</legend>\n-\n<div class=\"form-field\">\n<label for=\"newGalleryUsername\">Gallery username</label>\n<input id=\"newGalleryUsername\"\nmaxlength=\"255\"\ndata-bind=\"value: newGalleryUsername\" />\n</div>\n-\n- <div class=\"form-field\">\n- <label for=\"newPagerDutyUsername\">PagerDuty username</label>\n- <input id=\"newPagerDutyUsername\"\n- name=\"newPagerDutyUsername\"\n- maxlength=\"255\"\n- data-bind=\"value: newPagerDutyUsername\" />\n- </div>\n</fieldset>\n</form>\n</div>\n<form id=\"editAdmin-form\">\n<fieldset class=\"form\">\n<legend>Edit</legend>\n-\n<div class=\"form-field\">\n<label for=\"editGalleryUsername\">Gallery username</label>\n<input id=\"editGalleryUsername\"\nmaxlength=\"255\"\ndata-bind=\"value: editGalleryUsername\" />\n</div>\n-\n- <div class=\"form-field\">\n- <label for=\"editPagerDutyUsername\">PagerDuty username</label>\n- <input id=\"editPagerDutyUsername\"\n- name=\"editPagerDutyUsername\"\n- maxlength=\"255\"\n- data-bind=\"value: editPagerDutyUsername\" />\n- </div>\n</fieldset>\n</form>\n</div>\n<tr>\n<th>Admin Key</th>\n<th>Gallery username</th>\n- <th>PagerDuty username</th>\n<th>Status</th>\n<th></th>\n</tr>\n<td>\n<span data-bind=\"text: GalleryUsername\"></span>\n</td>\n- <td>\n- <span data-bind=\"text: PagerDutyUsername\"></span>\n- </td>\n<td>\n<a href=\"#\" data-bind=\"text: $parent.getAdminStatus($data), click: $parent.toggleAdminAccess\"></a>\n</td>\nfunction AddAdminViewModel() {\nvar $self = this;\nthis.newGalleryUsername = ko.observable();\n- this.newPagerDutyUsername = ko.observable();\nthis.createAdmin = function (success, error) {\nvar url = '@Url.Action(\"AddAdmin\")';\nvar model = {\n- galleryUsername: $self.newGalleryUsername(),\n- pagerDutyUsername: $self.newPagerDutyUsername()\n+ galleryUsername: $self.newGalleryUsername()\n};\n$.ajax({\nthis.admin = ko.observable();\nthis.editGalleryUsername = ko.observable();\n- this.editPagerDutyUsername = ko.observable();\nthis.updateAdmin = function (success, error) {\nvar url = '@Url.Action(\"UpdateAdmin\")';\nvar model = {\nkey: $self.admin.Key,\n- galleryUsername: $self.editGalleryUsername,\n- pagerDutyUsername: $self.editPagerDutyUsername\n+ galleryUsername: $self.editGalleryUsername\n};\n$.ajax({\nthis.addAdminForm = $('#addAdmin-form').get(0);\nthis.newGalleryUsernameCtrl = $('#newGalleryUsername').get(0);\n- this.newPagerDutyUsernameCtrl = $('#newPagerDutyUsername').get(0);\nthis.editAdminForm = $('#editAdmin-form').get(0);\nthis.editGalleryUsernameCtrl = $('#editGalleryUsername').get(0);\n- this.editPagerDutyUsernameCtrl = $('#editPagerDutyUsername').get(0);\nthis.styleButtons = function () {\n$('a.addButton').button(\n};\nthis.addAdminFields = $([])\n- .add($self.newGalleryUsernameCtrl)\n- .add($self.newPagerDutyUsernameCtrl);\n+ .add($self.newGalleryUsernameCtrl);\nthis.editAdminFields = $([])\n- .add($self.editGalleryUsernameCtrl)\n- .add($self.editPagerDutyUsernameCtrl);\n+ .add($self.editGalleryUsernameCtrl);\nthis.createAdmin = function () {\nvar editViewModel = new EditAdminViewModel();\neditViewModel.admin = admin;\neditViewModel.editGalleryUsername = admin.GalleryUsername;\n- editViewModel.editPagerDutyUsername = admin.PagerDutyUsername;\nko.applyBindings(editViewModel, $self.editAdminForm);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Areas\\Admin\\Migrations\\201602191039005_PackageInfoIsOptional.Designer.cs\">\n<DependentUpon>201602191039005_PackageInfoIsOptional.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Areas\\Admin\\Migrations\\201805221605033_DropPagerDutyColumn.cs\" />\n+ <Compile Include=\"Areas\\Admin\\Migrations\\201805221605033_DropPagerDutyColumn.Designer.cs\">\n+ <DependentUpon>201805221605033_DropPagerDutyColumn.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"Areas\\Admin\\Models\\DeletedStatus.cs\" />\n<Compile Include=\"Areas\\Admin\\Models\\IssueStatusKeys.cs\" />\n<Compile Include=\"Areas\\Admin\\Migrations\\SupportRequestMigrationsConfiguration.cs\" />\n<Content Include=\"Content\\themes\\custom\\images\\ui-icons_888888_256x240.png\" />\n<Content Include=\"Content\\themes\\custom\\images\\ui-icons_cd0a0a_256x240.png\" />\n<Content Include=\"D3 LICENSE.txt\" />\n+ <EmbeddedResource Include=\"Areas\\Admin\\Migrations\\201805221605033_DropPagerDutyColumn.resx\">\n+ <DependentUpon>201805221605033_DropPagerDutyColumn.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"Infrastructure\\AddPackageLicenseReport2.Up.sql\" />\n<EmbeddedResource Include=\"Infrastructure\\AddPackageLicenseReport2.Down.sql\" />\n<Content Include=\"NuGetGallery.dll.config\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove all PG references in code and DB (#5981)
|
455,776 |
23.05.2018 09:39:29
| 25,200 |
8566f4af472fa63884657512e8a8fb9aa069c40f
|
UI fixes for Manage Organization
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"diff": "var account = Model.Account;\nViewBag.Title = \"Manage Organization\";\n+ ViewBag.MdPageColumns = Constants.ColumnsFormMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\nTempData[\"Parent\"] = this;\n<section role=\"main\" class=\"container main-container page-manage-organizations\">\n@ViewHelpers.AjaxAntiForgeryToken(Html)\n<div class=\"row\">\n- <div class=\"col-md-12\">\n+ <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n@ViewHelpers.OrganizationsBreadcrumb(\nUrl,\nCurrentUser,\ntrue,\n@<text>@Model.AccountName</text>)\n- </div>\n- <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n@{\nstring membershipString;\npermissionsString = \" \" + permissionsString;\n}\n- @ViewHelpers.AlertInfo(@<text>@membershipString@permissionsString</text>)\n+ @membershipString@permissionsString\n}\n@Html.Partial(\"_AccountConfirmationNotices\", Model)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
UI fixes for Manage Organization (#5987)
|
455,776 |
23.05.2018 12:24:31
| 25,200 |
62a28660a25d9890295942d4cae85f24383c6890
|
Allow organization admins to remove their organization's ownership of a package in a reserved namespace
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionRequiringReservedNamespacePermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionRequiringReservedNamespacePermissions.cs",
"diff": "@@ -15,7 +15,9 @@ namespace NuGetGallery\n/// E.g. \"JQuery.Extensions.MyCoolExtension\" matches both \"JQuery.*\" and \"JQuery.Extensions.*\".\n/// </remarks>\npublic class ActionRequiringReservedNamespacePermissions\n- : ActionRequiringEntityPermissions<IReadOnlyCollection<ReservedNamespace>>, IActionRequiringEntityPermissions<ActionOnNewPackageContext>\n+ : ActionRequiringEntityPermissions<IReadOnlyCollection<ReservedNamespace>>,\n+ IActionRequiringEntityPermissions<ActionOnNewPackageContext>,\n+ IActionRequiringEntityPermissions<ReservedNamespace>\n{\npublic PermissionsRequirement ReservedNamespacePermissionsRequirement { get; }\n@@ -32,11 +34,21 @@ public PermissionsCheckResult CheckPermissions(User currentUser, User account, A\nreturn CheckPermissions(currentUser, account, GetReservedNamespaces(newPackageContext));\n}\n+ public PermissionsCheckResult CheckPermissions(User currentUser, User account, ReservedNamespace reservedNamespace)\n+ {\n+ return CheckPermissions(currentUser, account, GetReservedNamespaces(reservedNamespace));\n+ }\n+\npublic PermissionsCheckResult CheckPermissions(IPrincipal currentPrincipal, User account, ActionOnNewPackageContext newPackageContext)\n{\nreturn CheckPermissions(currentPrincipal, account, GetReservedNamespaces(newPackageContext));\n}\n+ public PermissionsCheckResult CheckPermissions(IPrincipal currentPrincipal, User account, ReservedNamespace reservedNamespace)\n+ {\n+ return CheckPermissions(currentPrincipal, account, GetReservedNamespaces(reservedNamespace));\n+ }\n+\nprotected override PermissionsCheckResult CheckPermissionsForEntity(User account, IReadOnlyCollection<ReservedNamespace> reservedNamespaces)\n{\nif (!reservedNamespaces.Any())\n@@ -54,11 +66,21 @@ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentU\nreturn CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetReservedNamespaces(newPackageContext));\n}\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, ReservedNamespace reservedNamespace)\n+ {\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetReservedNamespaces(reservedNamespace));\n+ }\n+\npublic PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, ActionOnNewPackageContext newPackageContext, out IEnumerable<User> accountsAllowedOnBehalfOf)\n{\nreturn CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetReservedNamespaces(newPackageContext), out accountsAllowedOnBehalfOf);\n}\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, ReservedNamespace reservedNamespace, out IEnumerable<User> accountsAllowedOnBehalfOf)\n+ {\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetReservedNamespaces(reservedNamespace), out accountsAllowedOnBehalfOf);\n+ }\n+\nprotected override IEnumerable<User> GetOwners(IReadOnlyCollection<ReservedNamespace> reservedNamespaces)\n{\nreturn reservedNamespaces.Any() ? reservedNamespaces.SelectMany(rn => rn.Owners) : Enumerable.Empty<User>();\n@@ -68,5 +90,10 @@ private IReadOnlyCollection<ReservedNamespace> GetReservedNamespaces(ActionOnNew\n{\nreturn newPackageContext.ReservedNamespaceService.GetReservedNamespacesForId(newPackageContext.PackageId);\n}\n+\n+ private IReadOnlyCollection<ReservedNamespace> GetReservedNamespaces(ReservedNamespace reservedNamespace)\n+ {\n+ return new[] { reservedNamespace };\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionsRequiringPermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionsRequiringPermissions.cs",
"diff": "@@ -128,5 +128,21 @@ public static class ActionsRequiringPermissions\nnew ActionRequiringPackagePermissions(\naccountOnBehalfOfPermissionsRequirement: RequireOwnerOrOrganizationAdmin,\npackageRegistrationPermissionsRequirement: RequireOwnerOrOrganizationAdmin);\n+\n+ /// <summary>\n+ /// The action of adding a package to a reserved namespace that the package is in.\n+ /// </summary>\n+ public static ActionRequiringReservedNamespacePermissions AddPackageToReservedNamespace =\n+ new ActionRequiringReservedNamespacePermissions(\n+ accountOnBehalfOfPermissionsRequirement: PermissionsRequirement.Owner,\n+ reservedNamespacePermissionsRequirement: PermissionsRequirement.Owner);\n+\n+ /// <summary>\n+ /// The action of removing a package from a reserved namespace that the package is in.\n+ /// </summary>\n+ public static ActionRequiringReservedNamespacePermissions RemovePackageFromReservedNamespace =\n+ new ActionRequiringReservedNamespacePermissions(\n+ accountOnBehalfOfPermissionsRequirement: RequireOwnerOrSiteAdminOrOrganizationAdmin,\n+ reservedNamespacePermissionsRequirement: RequireOwnerOrOrganizationAdmin);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageService.cs",
"new_path": "src/NuGetGallery/Services/IPackageService.cs",
"diff": "@@ -68,7 +68,7 @@ public interface IPackageService : ICorePackageService\n/// <returns>Awaitable task.</returns>\nTask AddPackageOwnerAsync(PackageRegistration package, User newOwner);\n- Task RemovePackageOwnerAsync(PackageRegistration package, User user);\n+ Task RemovePackageOwnerAsync(PackageRegistration package, User user, bool commitChanges = true);\nTask SetLicenseReportVisibilityAsync(Package package, bool visible, bool commitChanges = true);\n@@ -76,7 +76,7 @@ public interface IPackageService : ICorePackageService\nTask IncrementDownloadCountAsync(string id, string version, bool commitChanges = true);\n- Task UpdatePackageVerifiedStatusAsync(IReadOnlyCollection<PackageRegistration> package, bool isVerified);\n+ Task UpdatePackageVerifiedStatusAsync(IReadOnlyCollection<PackageRegistration> package, bool isVerified, bool commitChanges = true);\n/// <summary>\n/// For a package get the list of owners that are not organizations.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IReservedNamespaceService.cs",
"new_path": "src/NuGetGallery/Services/IReservedNamespaceService.cs",
"diff": "@@ -57,9 +57,9 @@ public interface IReservedNamespaceService\n/// Remove the specified package registration from the reserved namespace. It is the caller's reponsibility to\n/// commit the changes to the database.\n/// </summary>\n- /// <param name=\"prefix\">The prefix value of the reserved namespace to modify</param>\n+ /// <param name=\"reservedNamespace\">The reserved namespace to modify</param>\n/// <param name=\"packageRegistration\">The package registration entity to be removed.</param>\n- void RemovePackageRegistrationFromNamespace(string prefix, PackageRegistration packageRegistration);\n+ void RemovePackageRegistrationFromNamespace(ReservedNamespace reservedNamespace, PackageRegistration packageRegistration);\n/// <summary>\n/// Retrieves the first reserved namespace which matches the given prefix.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageOwnershipManagementService.cs",
"new_path": "src/NuGetGallery/Services/PackageOwnershipManagementService.cs",
"diff": "@@ -121,13 +121,13 @@ public async Task RemovePackageOwnerAsync(PackageRegistration packageRegistratio\nusing (var strategy = new SuspendDbExecutionStrategy())\nusing (var transaction = _entitiesContext.GetDatabase().BeginTransaction())\n{\n- await RemovePackageOwnerImplAsync(packageRegistration, requestingOwner, ownerToBeRemoved);\n+ await RemovePackageOwnerImplAsync(packageRegistration, ownerToBeRemoved);\ntransaction.Commit();\n}\n}\nelse\n{\n- await RemovePackageOwnerImplAsync(packageRegistration, requestingOwner, ownerToBeRemoved);\n+ await RemovePackageOwnerImplAsync(packageRegistration, ownerToBeRemoved);\n}\nawait _auditingService.SaveAuditRecordAsync(\n@@ -139,38 +139,29 @@ public async Task RemovePackageOwnerAsync(PackageRegistration packageRegistratio\n}\n}\n- private async Task RemovePackageOwnerImplAsync(PackageRegistration packageRegistration, User requestingOwner, User ownerToBeRemoved)\n+ private async Task RemovePackageOwnerImplAsync(PackageRegistration packageRegistration, User ownerToBeRemoved)\n{\n- // 1. Remove this package registration from the namespaces owned by this user if he is the only package owner in the set of matching namespaces\n- // 2. Remove the IsVerified flag from package registration if all the matching namespaces are owned by this user alone (no other package owner owns a matching namespace for this PR)\n- var allMatchingNamespacesForRegistration = packageRegistration.ReservedNamespaces;\n- if (allMatchingNamespacesForRegistration.Any())\n- {\n- var allPackageOwners = packageRegistration.Owners;\n- var matchingNamespacesOwnedByUser = allMatchingNamespacesForRegistration\n- .Where(rn => rn.Owners.Any(o => o == ownerToBeRemoved));\n- var namespacesToModify = matchingNamespacesOwnedByUser\n- .Where(rn => rn.Owners.Intersect(allPackageOwners).Count() == 1)\n- .ToList();\n+ // Remove the user from owners list of package registration\n+ await _packageService.RemovePackageOwnerAsync(packageRegistration, ownerToBeRemoved, commitChanges: false);\n- if (namespacesToModify.Any())\n+ // Remove this package registration from the namespaces owned by this user that are owned by no other package owners\n+ foreach (var reservedNamespace in packageRegistration.ReservedNamespaces.ToArray())\n{\n- // The package will lose its 'IsVerified' flag if the user is the only package owner who owns all the namespaces that match this registration\n- var shouldModifyIsVerified = allMatchingNamespacesForRegistration.Count() == namespacesToModify.Count();\n- if (shouldModifyIsVerified && packageRegistration.IsVerified)\n+ if (!packageRegistration.Owners\n+ .Any(o => ActionsRequiringPermissions.AddPackageToReservedNamespace\n+ .CheckPermissionsOnBehalfOfAnyAccount(o, reservedNamespace) == PermissionsCheckResult.Allowed))\n{\n- await _packageService.UpdatePackageVerifiedStatusAsync(new List<PackageRegistration> { packageRegistration }, isVerified: false);\n+ _reservedNamespaceService.RemovePackageRegistrationFromNamespace(reservedNamespace, packageRegistration);\n}\n-\n- namespacesToModify\n- .ForEach(rn => _reservedNamespaceService.RemovePackageRegistrationFromNamespace(rn.Value, packageRegistration));\n-\n- await _entitiesContext.SaveChangesAsync();\n}\n+\n+ // Remove the IsVerified flag from package registration if all the matching namespaces are owned by this user alone (no other package owner owns a matching namespace for this PR)\n+ if (packageRegistration.IsVerified && !packageRegistration.ReservedNamespaces.Any())\n+ {\n+ await _packageService.UpdatePackageVerifiedStatusAsync(new List<PackageRegistration> { packageRegistration }, isVerified: false, commitChanges: false);\n}\n- // Remove the user from owners list of package registration\n- await _packageService.RemovePackageOwnerAsync(packageRegistration, ownerToBeRemoved);\n+ await _entitiesContext.SaveChangesAsync();\n}\npublic async Task DeletePackageOwnershipRequestAsync(PackageRegistration packageRegistration, User newOwner)\n@@ -192,30 +183,20 @@ public async Task DeletePackageOwnershipRequestAsync(PackageRegistration package\n}\n}\n- // The requesting owner can remove other owner only if\n- // 1. Is an admin.\n- // 2. Owns a namespace.\n- // 3. Or the other user also does not own a namespace.\nprivate static bool OwnerHasPermissionsToRemove(User requestingOwner, User ownerToBeRemoved, PackageRegistration packageRegistration)\n{\n- if (requestingOwner.IsAdministrator)\n+ var reservedNamespaces = packageRegistration.ReservedNamespaces.ToList();\n+ if (ActionsRequiringPermissions.AddPackageToReservedNamespace\n+ .CheckPermissionsOnBehalfOfAnyAccount(ownerToBeRemoved, reservedNamespaces) == PermissionsCheckResult.Allowed)\n{\n- return true;\n+ // If the owner to be removed owns a reserved namespace that applies to this package,\n+ // the requesting user must own a reserved namespace that applies to this package or be a site admin.\n+ return ActionsRequiringPermissions.RemovePackageFromReservedNamespace\n+ .CheckPermissionsOnBehalfOfAnyAccount(requestingOwner, reservedNamespaces) == PermissionsCheckResult.Allowed;\n}\n- var requestingOwnerOwnsNamespace = IsUserAnOwnerOfPackageNamespace(packageRegistration, requestingOwner);\n- if (requestingOwnerOwnsNamespace)\n- {\n+ // If the owner to be removed does not own any reserved namespaces that apply to this package, they can be removed by anyone.\nreturn true;\n}\n-\n- var ownerToBeRemovedOwnsNamespace = IsUserAnOwnerOfPackageNamespace(packageRegistration, ownerToBeRemoved);\n- return !ownerToBeRemovedOwnsNamespace;\n- }\n-\n- private static bool IsUserAnOwnerOfPackageNamespace(PackageRegistration packageRegistration, User user)\n- {\n- return packageRegistration.ReservedNamespaces.Any(rn => rn.Owners.Any(owner => owner == user));\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -361,12 +361,15 @@ public async Task AddPackageOwnerAsync(PackageRegistration package, User newOwne\n}\n}\n- public async Task RemovePackageOwnerAsync(PackageRegistration package, User user)\n+ public async Task RemovePackageOwnerAsync(PackageRegistration package, User user, bool commitChanges = true)\n{\n// To support the delete account scenario, the admin can delete the last owner of a package.\npackage.Owners.Remove(user);\n+ if (commitChanges)\n+ {\nawait _packageRepository.CommitChangesAsync();\n}\n+ }\npublic async Task MarkPackageListedAsync(Package package, bool commitChanges = true)\n{\n@@ -701,7 +704,7 @@ public async Task IncrementDownloadCountAsync(string id, string version, bool co\n}\n}\n- public virtual async Task UpdatePackageVerifiedStatusAsync(IReadOnlyCollection<PackageRegistration> packageRegistrationList, bool isVerified)\n+ public virtual async Task UpdatePackageVerifiedStatusAsync(IReadOnlyCollection<PackageRegistration> packageRegistrationList, bool isVerified, bool commitChanges = true)\n{\nvar packageRegistrationIdSet = new HashSet<string>(packageRegistrationList.Select(prl => prl.Id));\nvar allPackageRegistrations = _packageRegistrationRepository.GetAll();\n@@ -714,9 +717,12 @@ public virtual async Task UpdatePackageVerifiedStatusAsync(IReadOnlyCollection<P\npackageRegistrationsToUpdate\n.ForEach(pru => pru.IsVerified = isVerified);\n+ if (commitChanges)\n+ {\nawait _packageRegistrationRepository.CommitChangesAsync();\n}\n}\n+ }\n/// <summary>\n/// Asynchronously sets the signer as the required signer on all package registrations owned by the signer.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReservedNamespaceService.cs",
"new_path": "src/NuGetGallery/Services/ReservedNamespaceService.cs",
"diff": "@@ -222,10 +222,14 @@ private async Task<List<PackageRegistration>> DeleteOwnerFromReservedNamespaceIm\n.Any(pro => pro.Username == userToRemove.Username))\n.ToList();\n+ namespaceToModify.Owners.Remove(userToRemove);\n+\n// Remove verified mark for package registrations if the user to be removed is the only prefix owner\n// for the given package registration.\nvar packageRegistrationsToMarkUnverified = packagesOwnedByUserMatchingPrefix\n- .Where(pr => pr.Owners.Intersect(namespaceToModify.Owners).Count() == 1)\n+ .Where(pr => !pr.Owners.Any(o =>\n+ ActionsRequiringPermissions.AddPackageToReservedNamespace.CheckPermissionsOnBehalfOfAnyAccount(\n+ o, new[] { namespaceToModify }) == PermissionsCheckResult.Allowed))\n.ToList();\nif (packageRegistrationsToMarkUnverified.Any())\n@@ -236,7 +240,6 @@ private async Task<List<PackageRegistration>> DeleteOwnerFromReservedNamespaceIm\nawait PackageService.UpdatePackageVerifiedStatusAsync(packageRegistrationsToMarkUnverified, isVerified: false);\n}\n- namespaceToModify.Owners.Remove(userToRemove);\nawait ReservedNamespaceRepository.CommitChangesAsync();\nreturn packageRegistrationsToMarkUnverified;\n@@ -280,11 +283,11 @@ public void AddPackageRegistrationToNamespace(string prefix, PackageRegistration\n/// <param name=\"prefix\">The prefix value of the reserved namespace to modify</param>\n/// <param name=\"packageRegistration\">The package registration entity to be removed.</param>\n/// <returns>Awaitable task</returns>\n- public void RemovePackageRegistrationFromNamespace(string prefix, PackageRegistration packageRegistration)\n+ public void RemovePackageRegistrationFromNamespace(ReservedNamespace reservedNamespace, PackageRegistration packageRegistration)\n{\n- if (string.IsNullOrWhiteSpace(prefix))\n+ if (reservedNamespace == null)\n{\n- throw new ArgumentException(Strings.ReservedNamespace_InvalidNamespace);\n+ throw new ArgumentNullException(nameof(reservedNamespace));\n}\nif (packageRegistration == null)\n@@ -292,11 +295,7 @@ public void RemovePackageRegistrationFromNamespace(string prefix, PackageRegistr\nthrow new ArgumentNullException(nameof(packageRegistration));\n}\n- var namespaceToModify = FindReservedNamespaceForPrefix(prefix)\n- ?? throw new InvalidOperationException(string.Format(\n- CultureInfo.CurrentCulture, Strings.ReservedNamespace_NamespaceNotFound, prefix));\n-\n- namespaceToModify.PackageRegistrations.Remove(packageRegistration);\n+ reservedNamespace.PackageRegistrations.Remove(packageRegistration);\n}\npublic virtual ReservedNamespace FindReservedNamespaceForPrefix(string prefix)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageOwnershipManagementServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageOwnershipManagementServiceFacts.cs",
"diff": "@@ -35,17 +35,33 @@ public class PackageOwnershipManagementServiceFacts\nif (useDefaultSetup)\n{\n- packageService.Setup(x => x.AddPackageOwnerAsync(It.IsAny<PackageRegistration>(), It.IsAny<User>())).Returns(Task.CompletedTask).Verifiable();\n- packageService.Setup(x => x.UpdatePackageVerifiedStatusAsync(It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()))\n- .Returns((IReadOnlyCollection<PackageRegistration> list, bool isVerified) =>\n+ packageService\n+ .Setup(x => x.AddPackageOwnerAsync(It.IsAny<PackageRegistration>(), It.IsAny<User>()))\n+ .Returns(Task.CompletedTask)\n+ .Verifiable();\n+ packageService\n+ .Setup(x => x.UpdatePackageVerifiedStatusAsync(It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), It.IsAny<bool>()))\n+ .Returns((IReadOnlyCollection<PackageRegistration> list, bool isVerified, bool commitChanges) =>\n{\nlist.ToList().ForEach(item => item.IsVerified = isVerified);\nreturn Task.CompletedTask;\n- }).Verifiable();\n- packageService.Setup(x => x.RemovePackageOwnerAsync(It.IsAny<PackageRegistration>(), It.IsAny<User>())).Returns(Task.CompletedTask).Verifiable();\n+ })\n+ .Verifiable();\n+ packageService\n+ .Setup(x => x.RemovePackageOwnerAsync(It.IsAny<PackageRegistration>(), It.IsAny<User>(), It.IsAny<bool>()))\n+ .Callback<PackageRegistration, User, bool>((pr, user, commitChanges) => pr.Owners.Remove(user))\n+ .Returns(Task.CompletedTask)\n+ .Verifiable();\nreservedNamespaceService.Setup(x => x.AddPackageRegistrationToNamespace(It.IsAny<string>(), It.IsAny<PackageRegistration>())).Verifiable();\n- reservedNamespaceService.Setup(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<string>(), It.IsAny<PackageRegistration>())).Verifiable();\n+ reservedNamespaceService\n+ .Setup(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<ReservedNamespace>(), It.IsAny<PackageRegistration>()))\n+ .Callback<ReservedNamespace, PackageRegistration>((rn, pr) =>\n+ {\n+ rn.PackageRegistrations.Remove(pr);\n+ pr.ReservedNamespaces.Remove(rn);\n+ })\n+ .Verifiable();\npackageOwnerRequestService.Setup(x => x.GetPackageOwnershipRequests(It.IsAny<PackageRegistration>(), It.IsAny<User>(), It.IsAny<User>())).Returns(new[] { new PackageOwnerRequest() }).Verifiable();\npackageOwnerRequestService.Setup(x => x.DeletePackageOwnershipRequest(It.IsAny<PackageOwnerRequest>())).Returns(Task.CompletedTask).Verifiable();\n@@ -129,7 +145,7 @@ public async Task AddingOwnerMarksPackageVerifiedForMatchingNamespace()\nvar service = CreateService(packageService: packageService, reservedNamespaceService: reservedNamespaceService, packageOwnerRequestService: packageOwnerRequestService);\nawait service.AddPackageOwnerAsync(package, pendingOwner);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), It.Is<bool>(b => b == true)));\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), true, true));\npackageOwnerRequestService.Verify(x => x.GetPackageOwnershipRequests(It.IsAny<PackageRegistration>(), It.IsAny<User>(), It.IsAny<User>()));\npackageOwnerRequestService.Verify(x => x.DeletePackageOwnershipRequest(It.IsAny<PackageOwnerRequest>()));\nreservedNamespaceService.Verify(x => x.AddPackageRegistrationToNamespace(It.IsAny<string>(), It.IsAny<PackageRegistration>()), Times.Once);\n@@ -169,7 +185,7 @@ public async Task AddingOwnerDoesNotMarkRegistrationVerifiedForAbsoluteNamespace\nawait service.AddPackageOwnerAsync(package, pendingOwner);\nreservedNamespaceService.Verify(x => x.AddPackageRegistrationToNamespace(It.IsAny<string>(), It.IsAny<PackageRegistration>()), Times.Never);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()), Times.Never);\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), It.IsAny<bool>()), Times.Never);\n}\n[Fact]\n@@ -249,7 +265,7 @@ public async Task ExistingUserIsSuccessfullyRemovedFromPackage()\nvar service = CreateService(packageService: packageService);\nawait service.RemovePackageOwnerAsync(package, owner1, owner2);\n- packageService.Verify(x => x.RemovePackageOwnerAsync(package, owner2));\n+ packageService.Verify(x => x.RemovePackageOwnerAsync(package, owner2, false));\n}\n[Fact]\n@@ -271,14 +287,31 @@ public async Task WritesAnAuditRecord()\n}\n[Fact]\n- public async Task RemovingNamespaceOwnerRemovesPackageVerified()\n+ public Task RemovingNamespaceOwnerRemovesPackageVerified()\n{\nvar existingOwner1 = new User { Key = 100, Username = \"microsoft\" };\n+ return RemovingNamespaceOwnerRemovesPackageVerified(existingOwner1, existingOwner1);\n+ }\n+\n+ [Fact]\n+ public Task RemovingNamespaceOwnerAsOrganizationAdminRemovesPackageVerified()\n+ {\n+ var existingOrganizationOwner1 = new Organization { Key = 100, Username = \"microsoft\" };\n+ var existingOrganizationOwner1Admin = new User { Key = 101, Username = \"microsoftAdmin\" };\n+ var existingMembership = new Membership { IsAdmin = true, Member = existingOrganizationOwner1Admin, Organization = existingOrganizationOwner1 };\n+ existingOrganizationOwner1.Members.Add(existingMembership);\n+ existingOrganizationOwner1Admin.Organizations.Add(existingMembership);\n+\n+ return RemovingNamespaceOwnerRemovesPackageVerified(existingOrganizationOwner1, existingOrganizationOwner1Admin);\n+ }\n+\n+ private async Task RemovingNamespaceOwnerRemovesPackageVerified(User owner, User requestingUser)\n+ {\nvar existingNamespace = new ReservedNamespace(\"microsoft.aspnet.\", isSharedNamespace: false, isPrefix: true);\n- var package = new PackageRegistration { Key = 2, Id = \"Microsoft.Aspnet.Package1\", IsVerified = true, Owners = new List<User> { existingOwner1 } };\n- existingOwner1.ReservedNamespaces.Add(existingNamespace);\n+ var package = new PackageRegistration { Key = 2, Id = \"Microsoft.Aspnet.Package1\", IsVerified = true, Owners = new List<User> { owner } };\n+ owner.ReservedNamespaces.Add(existingNamespace);\npackage.ReservedNamespaces.Add(existingNamespace);\n- existingNamespace.Owners.Add(existingOwner1);\n+ existingNamespace.Owners.Add(owner);\nexistingNamespace.PackageRegistrations.Add(package);\nvar packageService = new Mock<IPackageService>();\n@@ -286,10 +319,10 @@ public async Task RemovingNamespaceOwnerRemovesPackageVerified()\nvar reservedNamespaceService = new Mock<IReservedNamespaceService>();\nvar service = CreateService(packageService: packageService, reservedNamespaceService: reservedNamespaceService, packageOwnerRequestService: packageOwnerRequestService);\n- await service.RemovePackageOwnerAsync(package, existingOwner1, existingOwner1);\n+ await service.RemovePackageOwnerAsync(package, requestingUser, owner);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), It.Is<bool>(b => b == false)));\n- reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<string>(), It.IsAny<PackageRegistration>()), Times.Once);\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), false, false));\n+ reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<ReservedNamespace>(), It.IsAny<PackageRegistration>()), Times.Once);\nAssert.False(package.IsVerified);\n}\n@@ -312,8 +345,8 @@ public async Task RemovingOneNamespaceOwnerDoesNotRemoveVerifiedFlag()\nvar service = CreateService(packageService: packageService, reservedNamespaceService: reservedNamespaceService, packageOwnerRequestService: packageOwnerRequestService);\nawait service.RemovePackageOwnerAsync(package, existingOwner2, existingOwner1);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), It.Is<bool>(b => b == false)), Times.Never);\n- reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<string>(), It.IsAny<PackageRegistration>()), Times.Never);\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), false, false), Times.Never);\n+ reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<ReservedNamespace>(), It.IsAny<PackageRegistration>()), Times.Never);\nAssert.True(package.IsVerified);\n}\n@@ -336,8 +369,8 @@ public async Task RemovingNonNamespaceOwnerDoesNotRemoveVerifiedFlag()\nvar service = CreateService(packageService: packageService, reservedNamespaceService: reservedNamespaceService, packageOwnerRequestService: packageOwnerRequestService);\nawait service.RemovePackageOwnerAsync(package, existingOwner1, existingOwner2);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), It.Is<bool>(b => b == false)), Times.Never);\n- reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<string>(), It.IsAny<PackageRegistration>()), Times.Never);\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), false, false), Times.Never);\n+ reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(It.IsAny<ReservedNamespace>(), It.IsAny<PackageRegistration>()), Times.Never);\nAssert.True(package.IsVerified);\n}\n@@ -367,8 +400,8 @@ public async Task MultipleNamespaceOwnersRemovalWorksCorrectly()\nvar service = CreateService(packageService: packageService, reservedNamespaceService: reservedNamespaceService, packageOwnerRequestService: packageOwnerRequestService);\nawait service.RemovePackageOwnerAsync(package, existingOwner1, existingOwner2);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), It.Is<bool>(b => b == false)), Times.Never);\n- reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(existingNamespace2.Value, package), Times.Once);\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), false, false), Times.Never);\n+ reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(existingNamespace2, package), Times.Once);\nAssert.True(package.IsVerified);\n}\n@@ -379,7 +412,7 @@ public async Task AdminCanRemoveAnyOwner()\nvar package = new PackageRegistration { Key = 2, Id = \"Microsoft.Aspnet.Package1\", IsVerified = true, Owners = new List<User> { existingOwner1 } };\nvar adminOwner = new User\n{\n- Key = 100,\n+ Key = 101,\nUsername = \"aspnet\",\nRoles = new List<Role>\n{\n@@ -400,8 +433,8 @@ public async Task AdminCanRemoveAnyOwner()\nvar service = CreateService(packageService: packageService, reservedNamespaceService: reservedNamespaceService, packageOwnerRequestService: packageOwnerRequestService);\nawait service.RemovePackageOwnerAsync(package, adminOwner, existingOwner1);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), It.Is<bool>(b => b == false)), Times.Once);\n- reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(existingNamespace1.Value, package), Times.Once);\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), false, false), Times.Once);\n+ reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(existingNamespace1, package), Times.Once);\nAssert.False(package.IsVerified);\n}\n@@ -445,8 +478,8 @@ public async Task NonNamespaceOwnerCanRemoveOtherSimilarOwners()\nvar service = CreateService(packageService: packageService, reservedNamespaceService: reservedNamespaceService, packageOwnerRequestService: packageOwnerRequestService);\nawait service.RemovePackageOwnerAsync(package, existingOwner1, existingOwner2);\n- packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), It.Is<bool>(b => b == false)), Times.Never);\n- reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(existingNamespace1.Value, package), Times.Never);\n+ packageService.Verify(x => x.UpdatePackageVerifiedStatusAsync(It.Is<IReadOnlyCollection<PackageRegistration>>(pr => pr.First() == package), false, false), Times.Never);\n+ reservedNamespaceService.Verify(x => x.RemovePackageRegistrationFromNamespace(existingNamespace1, package), Times.Never);\nAssert.True(package.IsVerified);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"diff": "@@ -201,7 +201,7 @@ public async Task VanillaReservedNamespaceIsDeletedCorrectly()\n.Verify(x => x.CommitChangesAsync());\nservice\n.MockPackageService\n- .Verify(p => p.UpdatePackageVerifiedStatusAsync(It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()), Times.Never);\n+ .Verify(p => p.UpdatePackageVerifiedStatusAsync(It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), It.IsAny<bool>()), Times.Never);\n}\n[Fact]\n@@ -273,7 +273,8 @@ public async Task DeletingNamespaceClearsVerifiedFlagOnPackage(bool isSharedName\nIt.Is<IReadOnlyCollection<PackageRegistration>>(\nlist => list.Count() == registrationsShouldUpdate.Count()\n&& list.Any(pr => registrationsShouldUpdate.Any(ru => ru.Id == pr.Id))),\n- false),\n+ false,\n+ true),\nTimes.Once);\nmsPrefix.PackageRegistrations.ToList().ForEach(rn => Assert.False(rn.IsVerified));\n@@ -361,7 +362,7 @@ public async Task AddAnOwnerToNamespaceSuccessfully()\nservice\n.MockPackageService\n.Verify(p => p.UpdatePackageVerifiedStatusAsync(\n- It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()),\n+ It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), It.IsAny<bool>()),\nTimes.Never);\nAssert.True(existingNamespace.Owners.Contains(owner));\n@@ -414,7 +415,7 @@ public async Task AddingOwnerToNamespaceMarksRegistrationsVerified()\nservice\n.MockPackageService\n.Verify(p => p.UpdatePackageVerifiedStatusAsync(\n- It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()),\n+ It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), true),\nTimes.Once);\nAssert.True(existingNamespace.Owners.Contains(owner1));\n@@ -463,7 +464,7 @@ public async Task AddingOwnerToAbsoluteNamespaceMarksOnlyAbsoluteRegistrationsVe\nservice\n.MockPackageService\n.Verify(p => p.UpdatePackageVerifiedStatusAsync(\n- It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()),\n+ It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), true),\nTimes.Once);\nAssert.True(existingNamespace.Owners.Contains(owner1));\n@@ -549,15 +550,12 @@ public void CommitChangesIsNotExecuted()\npublic class TheRemovePackageRegistrationFromNamespaceMethod\n{\n- [Theory]\n- [InlineData(null)]\n- [InlineData(\"\")]\n- [InlineData(\" \")]\n- public void NullNamespaceThrowsException(string value)\n+ [Fact]\n+ public void NullNamespaceThrowsException()\n{\nvar service = new TestableReservedNamespaceService();\n- Assert.Throws<ArgumentException>(() => service.RemovePackageRegistrationFromNamespace(value, new PackageRegistration()));\n+ Assert.Throws<ArgumentNullException>(() => service.RemovePackageRegistrationFromNamespace(null, new PackageRegistration()));\n}\n[Fact]\n@@ -565,18 +563,7 @@ public void NullPackageRegistrationThrowsException()\n{\nvar service = new TestableReservedNamespaceService();\n- Assert.Throws<ArgumentNullException>(() => service.RemovePackageRegistrationFromNamespace(\"Microsoft.\", null));\n- }\n-\n- [Fact]\n- public void NonExistentNamespaceThrowsException()\n- {\n- var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();\n- var testPackageRegistrations = ReservedNamespaceServiceTestData.GetRegistrations();\n- var existingReg = testPackageRegistrations.First();\n- var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);\n-\n- Assert.Throws<InvalidOperationException>(() => service.RemovePackageRegistrationFromNamespace(\"Non.Existent.Namespace.\", existingReg));\n+ Assert.Throws<ArgumentNullException>(() => service.RemovePackageRegistrationFromNamespace(new ReservedNamespace(), null));\n}\n[Fact]\n@@ -589,7 +576,7 @@ public void PackageRegistrationIsRemovedFromNamespaceSuccessfully()\nexistingNamespace.PackageRegistrations.Add(existingReg);\nvar service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);\n- service.RemovePackageRegistrationFromNamespace(existingNamespace.Value, existingReg);\n+ service.RemovePackageRegistrationFromNamespace(existingNamespace, existingReg);\nAssert.False(existingNamespace.PackageRegistrations.Contains(existingReg));\n}\n@@ -604,7 +591,7 @@ public void CommitChangesIsNotExecuted()\nexistingNamespace.PackageRegistrations.Add(existingReg);\nvar service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);\n- service.RemovePackageRegistrationFromNamespace(existingNamespace.Value, existingReg);\n+ service.RemovePackageRegistrationFromNamespace(existingNamespace, existingReg);\nservice\n.MockReservedNamespaceRepository\n@@ -694,7 +681,7 @@ public async Task DeleteOwnerFromNamespaceSuccessfully()\nservice\n.MockPackageService\n.Verify(p => p.UpdatePackageVerifiedStatusAsync(\n- It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()),\n+ It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), true),\nTimes.Never);\nAssert.False(existingNamespace.Owners.Contains(owner));\n@@ -754,7 +741,7 @@ public async Task DeletingOwnerFromNamespaceMarksRegistrationsUnverified()\nservice\n.MockPackageService\n.Verify(p => p.UpdatePackageVerifiedStatusAsync(\n- It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()),\n+ It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), true),\nTimes.Once);\nAssert.False(existingNamespace.Owners.Contains(owner1));\n@@ -799,7 +786,7 @@ public async Task DeletingOwnerFromMultipleOwnedNamespaceDoesNotMarkPackagesUnVe\nservice\n.MockPackageService\n.Verify(p => p.UpdatePackageVerifiedStatusAsync(\n- It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>()),\n+ It.IsAny<IReadOnlyCollection<PackageRegistration>>(), It.IsAny<bool>(), true),\nTimes.Once);\nAssert.False(existingNamespace.Owners.Contains(owner1));\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Allow organization admins to remove their organization's ownership of a package in a reserved namespace (#5984)
|
455,794 |
24.05.2018 04:28:29
| 25,200 |
3b62a3ccfff95bfdc98be57209e9b447eef0d671
|
Update external search to set semVer2 isLatest props
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"diff": "@@ -149,7 +149,7 @@ private async Task<SearchResults> SearchCore(SearchFilter filter, bool raw)\nresults = new SearchResults(\ncontent.TotalHits,\ncontent.IndexTimestamp,\n- content.Data.Select(ReadPackage).AsQueryable());\n+ content.Data.Select(x => ReadPackage(x, filter.SemVerLevel)).AsQueryable());\n}\n}\nelse\n@@ -240,7 +240,7 @@ private async Task EnsureDiagnostics()\n}\n}\n- private static Package ReadPackage(JObject doc)\n+ internal static Package ReadPackage(JObject doc, string semVerLevel)\n{\nvar dependencies =\ndoc.Value<JArray>(\"Dependencies\")\n@@ -272,6 +272,10 @@ private static Package ReadPackage(JObject doc)\n};\n}\n+ var isLatest = doc.Value<bool>(\"IsLatest\");\n+ var isLatestStable = doc.Value<bool>(\"IsLatestStable\");\n+ var semVer2 = SemVerLevelKey.ForSemVerLevel(semVerLevel) == SemVerLevelKey.SemVer2;\n+\nreturn new Package\n{\nCopyright = doc.Value<string>(\"Copyright\"),\n@@ -284,8 +288,10 @@ private static Package ReadPackage(JObject doc)\nHash = doc.Value<string>(\"Hash\"),\nHashAlgorithm = doc.Value<string>(\"HashAlgorithm\"),\nIconUrl = doc.Value<string>(\"IconUrl\"),\n- IsLatest = doc.Value<bool>(\"IsLatest\"),\n- IsLatestStable = doc.Value<bool>(\"IsLatestStable\"),\n+ IsLatest = isLatest,\n+ IsLatestStable = isLatestStable,\n+ IsLatestSemVer2 = semVer2 ? isLatest : false,\n+ IsLatestStableSemVer2 = semVer2 ? isLatestStable : false,\nKey = doc.Value<int>(\"Key\"),\nLanguage = doc.Value<string>(\"Language\"),\nLastUpdated = doc.Value<DateTime>(\"LastUpdated\"),\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Helpers\\HtmlExtensionsFacts.cs\" />\n<Compile Include=\"HttpContextBaseExtensionsFacts.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\Base32EncoderTests.cs\" />\n+ <Compile Include=\"Infrastructure\\Lucene\\ExternalSearchServiceFacts.cs\" />\n<Compile Include=\"Security\\ControlRequiredSignerPolicyFacts.cs\" />\n<Compile Include=\"Security\\AutomaticallyOverwriteRequiredSignerPolicyFacts.cs\" />\n<Compile Include=\"Security\\RequireMinProtocolVersionForPushPolicyFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update external search to set semVer2 isLatest props (#5989)
|
455,731 |
29.05.2018 15:09:11
| 25,200 |
3c0d1a5c58daa61cb8b7c02ca67b31e58e134df0
|
Storage: enable setting blob metadata
Resolve
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -328,6 +328,55 @@ public async Task<Uri> GetFileReadUriAsync(string folderName, string fileName, D\nblob.GetSharedAccessSignature(SharedAccessBlobPermissions.Read, endOfAccess));\n}\n+ /// <summary>\n+ /// Asynchronously sets blob metadata.\n+ /// </summary>\n+ /// <param name=\"folderName\">The folder (container) name.</param>\n+ /// <param name=\"fileName\">The blob file name.</param>\n+ /// <param name=\"updateMetadataAsync\">A function which updates a metadata dictionary 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 SetMetadataAsync(\n+ string folderName,\n+ string fileName,\n+ Func<Lazy<Task<Stream>>, IDictionary<string, string>, Task<bool>> updateMetadataAsync)\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 (updateMetadataAsync == null)\n+ {\n+ throw new ArgumentNullException(nameof(updateMetadataAsync));\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 updateMetadataAsync(lazyStream, blob.Metadata);\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.SetMetadataAsync(mappedAccessCondition);\n+ }\n+ }\n+\nprivate static SharedAccessBlobPermissions MapFileUriPermissions(FileUriPermissions permissions)\n{\nreturn (SharedAccessBlobPermissions)permissions;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.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.IO;\nusing System.Net;\nusing System.Threading.Tasks;\n@@ -15,52 +16,26 @@ public class CloudBlobWrapper : ISimpleCloudBlob\n{\nprivate readonly CloudBlockBlob _blob;\n+ public BlobProperties Properties => _blob.Properties;\n+ public IDictionary<string, string> Metadata => _blob.Metadata;\n+ public CopyState CopyState => _blob.CopyState;\n+ public Uri Uri => _blob.Uri;\n+ public string Name => _blob.Name;\n+ public DateTime LastModifiedUtc => _blob.Properties.LastModified?.UtcDateTime ?? DateTime.MinValue;\n+ public string ETag => _blob.Properties.ETag;\n+\npublic CloudBlobWrapper(CloudBlockBlob blob)\n{\n_blob = blob;\n}\n- public BlobProperties Properties\n- {\n- get { return _blob.Properties; }\n- }\n-\n- public CopyState CopyState\n- {\n- get { return _blob.CopyState; }\n- }\n-\n- public Uri Uri\n- {\n- get { return _blob.Uri; }\n- }\n-\n- public string Name\n+ public async Task DeleteIfExistsAsync()\n{\n- get { return _blob.Name; }\n- }\n-\n- public DateTime LastModifiedUtc\n- {\n- get { return _blob.Properties.LastModified?.UtcDateTime ?? DateTime.MinValue; }\n- }\n-\n- public string ETag\n- {\n- get { return _blob.Properties.ETag; }\n- }\n-\n- public Task DeleteIfExistsAsync()\n- {\n- return Task.Factory.FromAsync<bool>(\n- (cb, state) => _blob.BeginDeleteIfExists(deleteSnapshotsOption: DeleteSnapshotsOption.IncludeSnapshots,\n+ await _blob.DeleteIfExistsAsync(\n+ DeleteSnapshotsOption.IncludeSnapshots,\naccessCondition: null,\noptions: null,\n- operationContext: null,\n- callback: cb,\n- state: state),\n- ar => _blob.EndDeleteIfExists(ar),\n- state: null);\n+ operationContext: null);\n}\npublic Task DownloadToStreamAsync(Stream target)\n@@ -68,7 +43,7 @@ public Task DownloadToStreamAsync(Stream target)\nreturn DownloadToStreamAsync(target, accessCondition: null);\n}\n- public Task DownloadToStreamAsync(Stream target, AccessCondition accessCondition)\n+ public async Task DownloadToStreamAsync(Stream target, AccessCondition accessCondition)\n{\n// Note: Overloads of FromAsync that take an AsyncCallback and State to pass through are more efficient:\n// http://blogs.msdn.com/b/pfxteam/archive/2009/06/09/9716439.aspx\n@@ -78,32 +53,22 @@ public Task DownloadToStreamAsync(Stream target, AccessCondition accessCondition\nRetryPolicy = new DontRetryOnNotModifiedPolicy(new LinearRetry())\n};\n- return Task.Factory.FromAsync(\n- (cb, state) => _blob.BeginDownloadToStream(\n- target,\n- accessCondition,\n- options: options,\n- operationContext: null,\n- callback: cb,\n- state: state),\n- ar => _blob.EndDownloadToStream(ar),\n- state: null);\n+ await _blob.DownloadToStreamAsync(target, accessCondition, options, operationContext: null);\n+ }\n+\n+ public async Task<bool> ExistsAsync()\n+ {\n+ return await _blob.ExistsAsync();\n}\n- public Task<bool> ExistsAsync()\n+ public async Task SetPropertiesAsync()\n{\n- return Task.Factory.FromAsync(\n- (cb, state) => _blob.BeginExists(cb, state),\n- ar => _blob.EndExists(ar),\n- state: null);\n+ await _blob.SetPropertiesAsync();\n}\n- public Task SetPropertiesAsync()\n+ public async Task SetMetadataAsync(AccessCondition accessCondition)\n{\n- return Task.Factory.FromAsync(\n- (cb, state) => _blob.BeginSetProperties(cb, state),\n- ar => _blob.EndSetProperties(ar),\n- state: null);\n+ await _blob.SetMetadataAsync(accessCondition, options: null, operationContext: null);\n}\npublic async Task UploadFromStreamAsync(Stream packageFile, bool overwrite)\n@@ -122,12 +87,9 @@ public async Task UploadFromStreamAsync(Stream packageFile, bool overwrite)\n}\n}\n- public Task FetchAttributesAsync()\n+ public async Task FetchAttributesAsync()\n{\n- return Task.Factory.FromAsync(\n- (cb, state) => _blob.BeginFetchAttributes(cb, state),\n- ar => _blob.EndFetchAttributes(ar),\n- state: null);\n+ await _blob.FetchAttributesAsync();\n}\npublic string GetSharedAccessSignature(SharedAccessBlobPermissions permissions, DateTimeOffset? endOfAccess)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.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.IO;\nusing System.Threading.Tasks;\n@@ -97,5 +98,17 @@ public interface ICoreFileStorageService\nstring destFolderName,\nstring destFileName,\nIAccessCondition destAccessCondition);\n+\n+ /// <summary>\n+ /// Updates metadata on the file.\n+ /// </summary>\n+ /// <param name=\"folderName\">The folder name.</param>\n+ /// <param name=\"fileName\">The file name.</param>\n+ /// <param name=\"updateMetadataAsync\">A function that will update file metadata.</param>\n+ /// <returns>A task that represents the asynchronous operation.</returns>\n+ Task SetMetadataAsync(\n+ string folderName,\n+ string fileName,\n+ Func<Lazy<Task<Stream>>, IDictionary<string, string>, Task<bool>> updateMetadataAsync);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"new_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.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.IO;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\n@@ -12,6 +13,7 @@ namespace NuGetGallery\npublic interface ISimpleCloudBlob\n{\nBlobProperties Properties { get; }\n+ IDictionary<string, string> Metadata { get; }\nCopyState CopyState { get; }\nUri Uri { get; }\nstring Name { get; }\n@@ -24,6 +26,7 @@ public interface ISimpleCloudBlob\nTask<bool> ExistsAsync();\nTask SetPropertiesAsync();\n+ Task SetMetadataAsync(AccessCondition accessCondition);\nTask UploadFromStreamAsync(Stream packageFile, bool overwrite);\nTask FetchAttributesAsync();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.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.Globalization;\nusing System.IO;\nusing System.Threading.Tasks;\n@@ -242,6 +243,14 @@ public Task<Uri> GetPriviledgedFileUriAsync(string folderName, string fileName,\nthrow new NotImplementedException();\n}\n+ public Task SetMetadataAsync(\n+ string folderName,\n+ string fileName,\n+ Func<Lazy<Task<Stream>>, IDictionary<string, string>, Task<bool>> updateMetadataAsync)\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": "using System.Linq;\nusing System.Net;\nusing System.Reflection;\n+using System.Text;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Blob;\n@@ -639,7 +640,6 @@ public async Task WillPassTheEndOfAccessTimestampFurther()\n}\n}\n-\npublic class TheGetFileReadUriAsyncMethod\n{\nprivate const string folderName = \"theFolderName\";\n@@ -1108,5 +1108,109 @@ private void SetBlobContentMD5(BlobProperties properties, string contentMD5)\n.SetValue(properties, contentMD5, null);\n}\n}\n+\n+ public class TheSetMetadataAsyncMethod\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 TheSetMetadataAsyncMethod()\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.SetMetadataAsync(\n+ folderName: CoreConstants.PackagesFolderName,\n+ fileName: \"a\",\n+ updateMetadataAsync: async (lazyStream, metadata) =>\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_MetadataChangesAreNotPersisted()\n+ {\n+ _blob.SetupGet(x => x.Metadata)\n+ .Returns(new Dictionary<string, string>());\n+\n+ await _service.SetMetadataAsync(\n+ folderName: CoreConstants.PackagesFolderName,\n+ fileName: \"a\",\n+ updateMetadataAsync: (lazyStream, metadata) =>\n+ {\n+ Assert.NotNull(metadata);\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_MetadataChangesAreNotPersisted()\n+ {\n+ _blob.SetupGet(x => x.Metadata)\n+ .Returns(new Dictionary<string, string>());\n+ _blob.Setup(x => x.SetMetadataAsync(It.IsNotNull<AccessCondition>()))\n+ .Returns(Task.FromResult(0));\n+\n+ await _service.SetMetadataAsync(\n+ folderName: CoreConstants.PackagesFolderName,\n+ fileName: \"a\",\n+ updateMetadataAsync: (lazyStream, metadata) =>\n+ {\n+ Assert.NotNull(metadata);\n+\n+ return Task.FromResult(true);\n+ });\n+\n+ _blob.VerifyAll();\n+ _blobContainer.VerifyAll();\n+ _blobClient.VerifyAll();\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"diff": "@@ -711,5 +711,16 @@ private static async Task<bool> SaveFileAsync(FileSystemFileStorageService servi\n}\n}\n}\n+\n+ public class TheSetMetadataAsyncMethod\n+ {\n+ [Fact]\n+ public async Task NoOps()\n+ {\n+ var service = CreateService();\n+\n+ await service.SetMetadataAsync(folderName: null, fileName: null, updateMetadataAsync: null);\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Storage: enable setting blob metadata (#6001)
Resolve https://github.com/NuGet/NuGetGallery/issues/6000.
|
455,776 |
31.05.2018 09:21:39
| 25,200 |
a6679a2685ea0437930ed98bfbcea4995e6d0527
|
Delete API keys scoped to a user when that user is deleted
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -154,6 +154,11 @@ protected override void Load(ContainerBuilder builder)\n.As<IEntityRepository<Credential>>()\n.InstancePerLifetimeScope();\n+ builder.RegisterType<EntityRepository<Scope>>()\n+ .AsSelf()\n+ .As<IEntityRepository<Scope>>()\n+ .InstancePerLifetimeScope();\n+\nbuilder.RegisterType<EntityRepository<PackageOwnerRequest>>()\n.AsSelf()\n.As<IEntityRepository<PackageOwnerRequest>>()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "@@ -24,11 +24,13 @@ public class DeleteAccountService : IDeleteAccountService\nprivate readonly ISecurityPolicyService _securityPolicyService;\nprivate readonly AuthenticationService _authService;\nprivate readonly IEntityRepository<User> _userRepository;\n+ private readonly IEntityRepository<Scope> _scopeRepository;\nprivate readonly ISupportRequestService _supportRequestService;\nprivate readonly IAuditingService _auditingService;\npublic DeleteAccountService(IEntityRepository<AccountDelete> accountDeleteRepository,\nIEntityRepository<User> userRepository,\n+ IEntityRepository<Scope> scopeRepository,\nIEntitiesContext entitiesContext,\nIPackageService packageService,\nIPackageOwnershipManagementService packageOwnershipManagementService,\n@@ -41,6 +43,7 @@ IAuditingService auditingService\n{\n_accountDeleteRepository = accountDeleteRepository ?? throw new ArgumentNullException(nameof(accountDeleteRepository));\n_userRepository = userRepository ?? throw new ArgumentNullException(nameof(userRepository));\n+ _scopeRepository = scopeRepository ?? throw new ArgumentNullException(nameof(scopeRepository));\n_entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n_packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n_packageOwnershipManagementService = packageOwnershipManagementService ?? throw new ArgumentNullException(nameof(packageOwnershipManagementService));\n@@ -138,17 +141,28 @@ private async Task InsertDeleteAccount(User user, User admin, string signature)\nprivate async Task RemoveUserCredentials(User user)\n{\n- var copyOfUserCred = user.Credentials.ToArray();\n- foreach (var uc in copyOfUserCred)\n+ // Remove any credential owned by this user.\n+ foreach (var uc in user.Credentials.ToArray())\n{\nawait _authService.RemoveCredential(user, uc);\n}\n+\n+ // Remove any credential scoped to this user.\n+ var userScopes = _scopeRepository\n+ .GetAll()\n+ .Where(s => s.OwnerKey == user.Key)\n+ .ToArray();\n+\n+ var credentials = userScopes.Select(s => s.Credential).Distinct().ToArray();\n+ foreach (var credential in credentials)\n+ {\n+ await _authService.RemoveCredential(credential.User, credential);\n+ }\n}\nprivate async Task RemoveSecurityPolicies(User user)\n{\n- var copyOfUserPolicies = user.SecurityPolicies.ToArray();\n- foreach (var usp in copyOfUserPolicies)\n+ foreach (var usp in user.SecurityPolicies.ToArray())\n{\nawait _securityPolicyService.UnsubscribeAsync(user, usp.Subscription);\n}\n@@ -156,8 +170,7 @@ private async Task RemoveSecurityPolicies(User user)\nprivate async Task RemoveReservedNamespaces(User user)\n{\n- var copyOfUserNS = user.ReservedNamespaces.ToArray();\n- foreach (var rn in copyOfUserNS)\n+ foreach (var rn in user.ReservedNamespaces.ToArray())\n{\nawait _reservedNamespaceService.DeleteOwnerFromReservedNamespaceAsync(rn.Value, user.Username, commitAsTransaction:false);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -120,6 +120,7 @@ await deleteAccountService.\nAssert.Equal(signature, testableService.DeletedAccounts.ElementAt(0).Signature);\nAssert.Equal(1, testableService.SupportRequests.Count());\nAssert.Empty(testableService.PackageOwnerRequests);\n+ Assert.True(testableService.HasDeletedOwnerScope);\nAssert.Equal(1, testableService.AuditService.Records.Count());\nAssert.Null(testUser.OrganizationMigrationRequest);\nAssert.Empty(testUser.OrganizationMigrationRequests);\n@@ -161,6 +162,7 @@ public async Task WhenUserIsNotConfirmedTheUserRecordIsDeleted()\n//Assert\nAssert.True(status.Success);\nAssert.Null(testableService.User);\n+ Assert.True(testableService.HasDeletedOwnerScope);\nAssert.Equal(1, testableService.AuditService.Records.Count);\nvar deleteAccountAuditRecord = testableService.AuditService.Records[0] as DeleteAccountAuditRecord;\nAssert.NotNull(deleteAccountAuditRecord);\n@@ -217,6 +219,7 @@ public async Task DeleteConfirmedOrganization()\nAssert.Equal(1, testableService.SupportRequests.Count);\nAssert.Equal(0, testableService.PackageOwnerRequests.Count);\nAssert.Equal(1, testableService.AuditService.Records.Count);\n+ Assert.True(testableService.HasDeletedOwnerScope);\nvar deleteRecord = testableService.AuditService.Records[0] as DeleteAccountAuditRecord;\nAssert.True(deleteRecord != null);\n}\n@@ -268,6 +271,7 @@ public async Task DeleteUnconfirmedOrganization()\nAssert.Equal(0, testableService.DeletedAccounts.Count());\nAssert.Equal(1, testableService.SupportRequests.Count);\nAssert.Equal(0, testableService.PackageOwnerRequests.Count);\n+ Assert.True(testableService.HasDeletedOwnerScope);\nAssert.Equal(1, testableService.AuditService.Records.Count);\nvar deleteRecord = testableService.AuditService.Records[0] as DeleteAccountAuditRecord;\nAssert.True(deleteRecord != null);\n@@ -370,12 +374,14 @@ public class DeleteAccountTestService\nprivate UserSecurityPolicy _securityPolicy = new UserSecurityPolicy(\"PolicyName\", SubscriptionName);\nprivate PackageRegistration _userPackagesRegistration = null;\nprivate ICollection<Package> _userPackages;\n+ private bool _hasDeletedCredentialWithOwnerScope = false;\npublic List<AccountDelete> DeletedAccounts = new List<AccountDelete>();\npublic List<User> DeletedUsers = new List<User>();\npublic List<Issue> SupportRequests = new List<Issue>();\npublic List<PackageOwnerRequest> PackageOwnerRequests = new List<PackageOwnerRequest>();\npublic FakeAuditingService AuditService = new FakeAuditingService();\n+ public bool HasDeletedOwnerScope => _hasDeletedCredentialWithOwnerScope;\npublic DeleteAccountTestService(User user)\n{\n@@ -435,12 +441,13 @@ public DeleteAccountService GetDeleteAccountService()\n{\nreturn new DeleteAccountService(SetupAccountDeleteRepository().Object,\nSetupUserRepository().Object,\n+ SetupScopeRepository().Object,\nSetupEntitiesContext().Object,\nSetupPackageService().Object,\nSetupPackageOwnershipManagementService().Object,\nSetupReservedNamespaceService().Object,\nSetupSecurityPolicyService().Object,\n- new TestableAuthService(),\n+ SetupAuthenticationService().Object,\nSetupSupportRequestService().Object,\nAuditService);\n}\n@@ -461,24 +468,6 @@ public User User\nget { return _user; }\n}\n- private class TestableAuthService : AuthenticationService\n- {\n- public TestableAuthService() : base()\n- { }\n-\n- public override async Task AddCredential(User user, Credential credential)\n- {\n- await Task.Yield();\n- user.Credentials.Add(credential);\n- }\n-\n- public override async Task RemoveCredential(User user, Credential credential)\n- {\n- await Task.Yield();\n- user.Credentials.Remove(credential);\n- }\n- }\n-\nprivate Mock<IEntitiesContext> SetupEntitiesContext()\n{\nvar mockContext = new Mock<IEntitiesContext>();\n@@ -524,9 +513,11 @@ private Mock<IEntityRepository<AccountDelete>> SetupAccountDeleteRepository()\nprivate Mock<IEntityRepository<User>> SetupUserRepository()\n{\nvar userRepository = new Mock<IEntityRepository<User>>();\n- userRepository.Setup(m => m.CommitChangesAsync())\n+ userRepository\n+ .Setup(m => m.CommitChangesAsync())\n.Returns(Task.CompletedTask);\n- userRepository.Setup(m => m.DeleteOnCommit(It.IsAny<User>()))\n+ userRepository\n+ .Setup(m => m.DeleteOnCommit(It.IsAny<User>()))\n.Callback<User>(user =>\n{\nif (user == _user)\n@@ -541,6 +532,31 @@ private Mock<IEntityRepository<User>> SetupUserRepository()\nreturn userRepository;\n}\n+ private Mock<IEntityRepository<Scope>> SetupScopeRepository()\n+ {\n+ var scopeRepository = new Mock<IEntityRepository<Scope>>();\n+\n+ var user = new User(\"userWithApiKeyScopedToDeletedUser\") { Key = 54325 };\n+ var credential = new Credential(\"CredentialType\", \"CredentialValue\") { User = user };\n+ user.Credentials.Add(credential);\n+\n+ var scope = new Scope(_user, \"subject1\", \"action1\") { OwnerKey = _user.Key };\n+ credential.Scopes = new[] { scope };\n+ scope.Credential = credential;\n+\n+ scopeRepository\n+ .Setup(m => m.GetAll())\n+ .Returns(new[] { scope }.AsQueryable());\n+ scopeRepository\n+ .Setup(m => m.CommitChangesAsync())\n+ .Returns(Task.CompletedTask);\n+ scopeRepository\n+ .Setup(m => m.DeleteOnCommit(It.IsAny<Scope>()))\n+ .Throws(new Exception(\"Scopes should be deleted by the AuthenticationService!\"));\n+\n+ return scopeRepository;\n+ }\n+\nprivate Mock<IPackageService> SetupPackageService()\n{\nvar packageService = new Mock<IPackageService>();\n@@ -555,6 +571,28 @@ private Mock<IPackageService> SetupPackageService()\nreturn packageService;\n}\n+ private Mock<AuthenticationService> SetupAuthenticationService()\n+ {\n+ var authService = new Mock<AuthenticationService>();\n+ authService\n+ .Setup(m => m.AddCredential(It.IsAny<User>(), It.IsAny<Credential>()))\n+ .Callback<User, Credential>((user, credential) => user.Credentials.Add(credential))\n+ .Returns(Task.CompletedTask);\n+ authService\n+ .Setup(m => m.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()))\n+ .Callback<User, Credential>((user, credential) =>\n+ {\n+ user.Credentials.Remove(credential);\n+ if (credential.Scopes.Any(s => s.Owner == _user))\n+ {\n+ _hasDeletedCredentialWithOwnerScope = true;\n+ }\n+ })\n+ .Returns(Task.CompletedTask);\n+\n+ return authService;\n+ }\n+\nprivate Mock<ISupportRequestService> SetupSupportRequestService()\n{\nvar supportService = new Mock<ISupportRequestService>();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Delete API keys scoped to a user when that user is deleted (#5986)
|
455,747 |
01.06.2018 11:01:09
| 25,200 |
af2e0d5e5c6e30cc75e3dd7064f70953cbb45e5f
|
Remove 2FA Restrictions for AAD and Certificate management
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"new_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"diff": "@@ -385,8 +385,7 @@ public virtual async Task<JsonResult> AddCertificate(string accountName, HttpPos\nreturn Json(HttpStatusCode.NotFound);\n}\n- if (ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n- != PermissionsCheckResult.Allowed || !User.WasMultiFactorAuthenticated())\n+ if (!CanManageCertificates(currentUser, account))\n{\nreturn Json(HttpStatusCode.Forbidden, new { Strings.Unauthorized });\n}\n@@ -444,8 +443,7 @@ public virtual async Task<JsonResult> DeleteCertificate(string accountName, stri\nreturn Json(HttpStatusCode.NotFound);\n}\n- if (ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n- != PermissionsCheckResult.Allowed || !User.WasMultiFactorAuthenticated())\n+ if (!CanManageCertificates(currentUser, account))\n{\nreturn Json(HttpStatusCode.Forbidden, new { Strings.Unauthorized });\n}\n@@ -478,9 +476,7 @@ public virtual JsonResult GetCertificates(string accountName)\nreturn Json(HttpStatusCode.Forbidden);\n}\n- var wasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();\n- var canManage = ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n- == PermissionsCheckResult.Allowed;\n+ var canManageCertificates = CanManageCertificates(currentUser, account);\nvar template = GetDeleteCertificateForAccountTemplate(accountName);\nvar certificates = CertificateService.GetCertificates(account)\n@@ -488,7 +484,7 @@ public virtual JsonResult GetCertificates(string accountName)\n{\nstring deactivateUrl = null;\n- if (wasMultiFactorAuthenticated && canManage)\n+ if (canManageCertificates)\n{\ndeactivateUrl = template.Resolve(certificate.Thumbprint);\n}\n@@ -527,9 +523,7 @@ public virtual JsonResult GetCertificate(string accountName, string thumbprint)\nreturn Json(HttpStatusCode.Forbidden);\n}\n- var wasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();\n- var canManage = ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n- == PermissionsCheckResult.Allowed;\n+ var canManageCertificates = CanManageCertificates(currentUser, account);\nvar template = GetDeleteCertificateForAccountTemplate(accountName);\nvar certificates = CertificateService.GetCertificates(account)\n@@ -538,7 +532,7 @@ public virtual JsonResult GetCertificate(string accountName, string thumbprint)\n{\nstring deactivateUrl = null;\n- if (wasMultiFactorAuthenticated && canManage)\n+ if (canManageCertificates)\n{\ndeactivateUrl = template.Resolve(certificate.Thumbprint);\n}\n@@ -549,6 +543,13 @@ public virtual JsonResult GetCertificate(string accountName, string thumbprint)\nreturn Json(HttpStatusCode.OK, certificates, JsonRequestBehavior.AllowGet);\n}\n+ private bool CanManageCertificates(User currentUser, User account)\n+ {\n+ var wasAADLoginOrMultiFactorAuthenticated = User.WasMultiFactorAuthenticated() || User.WasAzureActiveDirectoryAccountUsedForSignin();\n+ return wasAADLoginOrMultiFactorAuthenticated\n+ && ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account) == PermissionsCheckResult.Allowed;\n+ }\n+\nprotected abstract RouteUrlTemplate<string> GetDeleteCertificateForAccountTemplate(string accountName);\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": "@@ -1803,9 +1803,12 @@ public virtual async Task<JsonResult> SetRequiredSigner(string id, string userna\nvar currentUser = GetCurrentUser();\n- if (ActionsRequiringPermissions.ManagePackageRequiredSigner\n- .CheckPermissionsOnBehalfOfAnyAccount(currentUser, packageRegistration)\n- != PermissionsCheckResult.Allowed || !User.WasMultiFactorAuthenticated())\n+ var wasAADLoginOrMultiFactorAuthenticated = User.WasMultiFactorAuthenticated() || User.WasAzureActiveDirectoryAccountUsedForSignin();\n+ var canManagePackageRequiredSigner = wasAADLoginOrMultiFactorAuthenticated\n+ && ActionsRequiringPermissions\n+ .ManagePackageRequiredSigner\n+ .CheckPermissionsOnBehalfOfAnyAccount(currentUser, packageRegistration) == PermissionsCheckResult.Allowed;\n+ if (!canManagePackageRequiredSigner)\n{\nreturn Json(HttpStatusCode.Forbidden);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -438,17 +438,17 @@ public virtual ActionResult Packages()\nnew ListPackageOwnerViewModel(currentUser)\n}.Concat(currentUser.Organizations.Select(o => new ListPackageOwnerViewModel(o.Organization)));\n- var wasMultiFactorAuthenticated = User.WasMultiFactorAuthenticated();\n+ var wasAADLoginOrMultiFactorAuthenticated = User.WasMultiFactorAuthenticated() || User.WasAzureActiveDirectoryAccountUsedForSignin();\nvar packages = PackageService.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\nvar listedPackages = packages\n.Where(p => p.Listed)\n- .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasMultiFactorAuthenticated))\n+ .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasAADLoginOrMultiFactorAuthenticated))\n.OrderBy(p => p.Id)\n.ToList();\nvar unlistedPackages = packages\n.Where(p => !p.Listed)\n- .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasMultiFactorAuthenticated))\n+ .Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasAADLoginOrMultiFactorAuthenticated))\n.OrderBy(p => p.Id)\n.ToList();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -487,7 +487,7 @@ public static User GetCurrentUser(this IOwinContext self)\n/// This method will add the claim to the OwinContext with default value and update the cookie with the updated claims\n/// </summary>\n/// <returns>True if successfully adds the claim to the context, false otherwise</returns>\n- public static bool AddClaim(this IOwinContext self, string claimType)\n+ public static bool AddClaim(this IOwinContext self, string claimType, string claimValue = null)\n{\nvar identity = GetIdentity(self);\nif (identity == null || !identity.IsAuthenticated)\n@@ -495,7 +495,7 @@ public static bool AddClaim(this IOwinContext self, string claimType)\nreturn false;\n}\n- if (identity.TryAddClaim(claimType))\n+ if (identity.TryAddClaim(claimType, claimValue))\n{\n// Update the cookies for the newly added claim\nself.Authentication.AuthenticationResponseGrant = new AuthenticationResponseGrant(new ClaimsPrincipal(identity), new AuthenticationProperties() { IsPersistent = true });\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/PrincipalExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/PrincipalExtensions.cs",
"diff": "@@ -218,14 +218,19 @@ public static bool TryRemoveClaim(this IIdentity identity, string claimType)\n/// </summary>\n/// <param name=\"identity\">IIdentity from which the claim is to be removed</param>\n/// <param name=\"claimType\">The claim type to be added</param>\n+ /// <param name=\"claimValue\">The claim value for the type to be added, null will add default boolean claim</param>\n/// <returns>True if successfully able to add the claim, false otherwise</returns>\n- public static bool TryAddClaim(this IIdentity identity, string claimType)\n+ public static bool TryAddClaim(this IIdentity identity, string claimType, string claimValue = null)\n{\nvar claimsIdentity = identity as ClaimsIdentity;\nvar existingClaim = claimsIdentity?.FindFirst(claimType);\nif (existingClaim == null)\n{\n- claimsIdentity.AddClaim(ClaimsExtensions.CreateBooleanClaim(claimType));\n+ var claim = string.IsNullOrEmpty(claimValue)\n+ ? ClaimsExtensions.CreateBooleanClaim(claimType)\n+ : new Claim(claimType, claimValue);\n+\n+ claimsIdentity.AddClaim(claim);\nreturn true;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListPackageItemRequiredSignerViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListPackageItemRequiredSignerViewModel.cs",
"diff": "@@ -28,7 +28,7 @@ public sealed class ListPackageItemRequiredSignerViewModel : ListPackageItemView\nPackage package,\nUser currentUser,\nISecurityPolicyService securityPolicyService,\n- bool wasMultiFactorAuthenticated)\n+ bool wasAADLoginOrMultiFactorAuthenticated)\n: base(package, currentUser)\n{\nif (package == null)\n@@ -144,7 +144,7 @@ public sealed class ListPackageItemRequiredSignerViewModel : ListPackageItemView\n}\n}\n- CanEditRequiredSigner &= wasMultiFactorAuthenticated;\n+ CanEditRequiredSigner &= wasAADLoginOrMultiFactorAuthenticated;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "</form>\n<div class=\"list-certificates\">\n- @if (!Model.WasMultiFactorAuthenticated)\n+ @if (!Model.WasMultiFactorAuthenticated && !User.WasAzureActiveDirectoryAccountUsedForSignin())\n{\n@WarnFor2FARequirement();\n}\n</div>\n</div>\n- @if (Model.WasMultiFactorAuthenticated && Model.CanManage)\n+ @if ((Model.WasMultiFactorAuthenticated || User.WasAzureActiveDirectoryAccountUsedForSignin()) && Model.CanManage)\n{\n<div class=\"collapse in row\" id=\"upload-certificate-form\" aria-expanded=\"true\">\n@Html.ValidationSummary(true)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "</section>\n<script type=\"text/html\" id=\"manage-packages\">\n- @if (Model.IsCertificatesUIEnabled && !Model.WasMultiFactorAuthenticated)\n+ @if (Model.IsCertificatesUIEnabled && !Model.WasMultiFactorAuthenticated && !User.WasAzureActiveDirectoryAccountUsedForSignin())\n{\n<div data-bind=\"visible: Packages.length > 0\">\n@if (Model.User.EnableMultiFactorAuthentication)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -1472,13 +1472,22 @@ public void GetCertificate_WhenCurrentUserLacksPermission_ReturnsForbidden()\nAssert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n}\n- [Fact]\n- public void GetCertificate_WhenOrganizationHasNoCertificates_ReturnsOK()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void GetCertificate_WhenOrganizationHasNoCertificates_ReturnsOK(bool multiFactorAuthenticatedButNotAADLoggedIn)\n{\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(Enumerable.Empty<Certificate>());\n_controller.SetCurrentUser(_user);\n+ if (multiFactorAuthenticatedButNotAADLoggedIn)\n+ {\n_controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ }\n+ else\n+ {\n+ _controller.OwinContext.AddClaim(NuGetClaims.ExternalLoginCredentialType, NuGetClaims.ExternalLoginCredentialValues.AzureActiveDirectory);\n+ }\nvar response = _controller.GetCertificate(_organization.Username, _certificate.Thumbprint);\n@@ -1490,13 +1499,22 @@ public void GetCertificate_WhenOrganizationHasNoCertificates_ReturnsOK()\n_certificateService.VerifyAll();\n}\n- [Fact]\n- public void GetCertificate_WhenOrganizationHasCertificate_ReturnsOK()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void GetCertificate_WhenOrganizationHasCertificate_ReturnsOK(bool multiFactorAuthenticatedButNotAADLoggedIn)\n{\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(new[] { _certificate });\n_controller.SetCurrentUser(_user);\n+ if (multiFactorAuthenticatedButNotAADLoggedIn)\n+ {\n_controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ }\n+ else\n+ {\n+ _controller.OwinContext.AddClaim(NuGetClaims.ExternalLoginCredentialType, NuGetClaims.ExternalLoginCredentialValues.AzureActiveDirectory);\n+ }\nvar response = _controller.GetCertificate(_organization.Username, _certificate.Thumbprint);\n@@ -1620,13 +1638,22 @@ public void GetCertificates_WhenCurrentUserLacksPermission_ReturnsForbidden()\nAssert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n}\n- [Fact]\n- public void GetCertificates_WhenOrganizationHasNoCertificates_ReturnsOK()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void GetCertificates_WhenOrganizationHasNoCertificates_ForAllValidClaims_ReturnsOK(bool multiFactorAuthenticatedButNotAADLoggedIn)\n{\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(Enumerable.Empty<Certificate>());\n_controller.SetCurrentUser(_user);\n+ if (multiFactorAuthenticatedButNotAADLoggedIn)\n+ {\n_controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ }\n+ else\n+ {\n+ _controller.OwinContext.AddClaim(NuGetClaims.ExternalLoginCredentialType, NuGetClaims.ExternalLoginCredentialValues.AzureActiveDirectory);\n+ }\nvar response = _controller.GetCertificates(_organization.Username);\n@@ -1638,13 +1665,22 @@ public void GetCertificates_WhenOrganizationHasNoCertificates_ReturnsOK()\n_certificateService.VerifyAll();\n}\n- [Fact]\n- public void GetCertificates_WhenOrganizationHasCertificate_ReturnsOK()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void GetCertificates_WhenOrganizationHasCertificate_ForAllValidClaims_ReturnsOK(bool multiFactorAuthenticatedButNotAADLoggedIn)\n{\n_certificateService.Setup(x => x.GetCertificates(It.Is<User>(u => u == _organization)))\n.Returns(new[] { _certificate });\n_controller.SetCurrentUser(_user);\n+ if (multiFactorAuthenticatedButNotAADLoggedIn)\n+ {\n_controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ }\n+ else\n+ {\n+ _controller.OwinContext.AddClaim(NuGetClaims.ExternalLoginCredentialType, NuGetClaims.ExternalLoginCredentialValues.AzureActiveDirectory);\n+ }\nvar response = _controller.GetCertificates(_organization.Username);\n@@ -1802,8 +1838,10 @@ public void AddCertificate_WhenUploadFileIsNull_ReturnsBadRequest()\nAssert.Equal((int)HttpStatusCode.BadRequest, _controller.Response.StatusCode);\n}\n- [Fact]\n- public void AddCertificate_WhenUploadFileIsValid_ReturnsCreated()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void AddCertificate_WhenUploadFileIsValid_ForAllValidClaims_ReturnsCreated(bool multiFactorAuthenticatedButNotAADLoggedIn)\n{\nvar uploadFile = GetUploadFile();\n@@ -1816,7 +1854,14 @@ public void AddCertificate_WhenUploadFileIsValid_ReturnsCreated()\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ if (multiFactorAuthenticatedButNotAADLoggedIn)\n+ {\n_controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ }\n+ else\n+ {\n+ _controller.OwinContext.AddClaim(NuGetClaims.ExternalLoginCredentialType, NuGetClaims.ExternalLoginCredentialValues.AzureActiveDirectory);\n+ }\nvar response = _controller.AddCertificate(_organization.Username, uploadFile);\n@@ -1974,15 +2019,24 @@ public void DeleteCertificate_WhenCurrentUserIsNotMultiFactorAuthenticated_Retur\nAssert.Equal((int)HttpStatusCode.Forbidden, _controller.Response.StatusCode);\n}\n- [Fact]\n- public void DeleteCertificate_WithValidThumbprint_ReturnsOK()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void DeleteCertificate_WithValidThumbprint_ForAllValidClaims_ReturnsOK(bool multiFactorAuthenticatedButNotAADLoggedIn)\n{\n_certificateService.Setup(x => x.DeactivateCertificateAsync(\nIt.Is<string>(thumbprint => thumbprint == _certificate.Thumbprint),\nIt.Is<User>(user => user == _organization)))\n.Returns(Task.CompletedTask);\n_controller.SetCurrentUser(_user);\n+ if (multiFactorAuthenticatedButNotAADLoggedIn)\n+ {\n_controller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ }\n+ else\n+ {\n+ _controller.OwinContext.AddClaim(NuGetClaims.ExternalLoginCredentialType, NuGetClaims.ExternalLoginCredentialValues.AzureActiveDirectory);\n+ }\nvar response = _controller.DeleteCertificate(_organization.Username, _certificate.Thumbprint);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -5393,8 +5393,10 @@ public async Task WhenCurrentUserIsNotPackageOwner_ReturnsForbidden()\nAssert.Equal((int)HttpStatusCode.Forbidden, controller.Response.StatusCode);\n}\n- [Fact]\n- public async Task WhenCurrentUserIsAuthenticatedOwner_ReturnsOK()\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task WhenCurrentUserIsAuthenticatedOwner_ReturnsOK(bool multiFactorAuthenticatedButNotAADLoggedIn)\n{\nvar packageService = new Mock<IPackageService>();\nvar userService = new Mock<IUserService>();\n@@ -5412,7 +5414,14 @@ public async Task WhenCurrentUserIsAuthenticatedOwner_ReturnsOK()\n.Returns(_signer);\ncontroller.SetCurrentUser(_signer);\n+ if (multiFactorAuthenticatedButNotAADLoggedIn)\n+ {\ncontroller.OwinContext.AddClaim(NuGetClaims.WasMultiFactorAuthenticated);\n+ }\n+ else\n+ {\n+ controller.OwinContext.AddClaim(NuGetClaims.ExternalLoginCredentialType, NuGetClaims.ExternalLoginCredentialValues.AzureActiveDirectory);\n+ }\nvar result = await controller.SetRequiredSigner(_packageRegistration.Id, _signer.Username);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemRequiredSignerViewModelFacts.cs",
"diff": "@@ -41,7 +41,7 @@ public void Constructor_WhenPackageIsNull_Throws()\npackage: null,\ncurrentUser: _currentUser,\nsecurityPolicyService: _securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true));\n+ wasAADLoginOrMultiFactorAuthenticated: true));\nAssert.Equal(\"package\", exception.ParamName);\n}\n@@ -60,7 +60,7 @@ public void Constructor_WhenCurrentUserIsNull_Throws()\npackage,\ncurrentUser: null,\nsecurityPolicyService: _securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true));\n+ wasAADLoginOrMultiFactorAuthenticated: true));\nAssert.Equal(\"currentUser\", exception.ParamName);\n}\n@@ -79,7 +79,7 @@ public void Constructor_WhenSecurityPolicyServiceIsNull_Throws()\npackage,\n_currentUser,\nsecurityPolicyService: null,\n- wasMultiFactorAuthenticated: true));\n+ wasAADLoginOrMultiFactorAuthenticated: true));\nAssert.Equal(\"securityPolicyService\", exception.ParamName);\n}\n@@ -105,7 +105,7 @@ public void Constructor_WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequired\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -140,7 +140,7 @@ public void Constructor_WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequired\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -175,7 +175,7 @@ public void Constructor_WhenPackageHasOneOwnerAndItIsTheCurrentUser_WhenRequired\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -210,7 +210,7 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRe\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(string.Empty, viewModel.RequiredSigner.Username);\nAssert.Equal(\"Any\", viewModel.RequiredSigner.DisplayText);\n@@ -245,7 +245,7 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwnerAndNotM\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: false);\n+ wasAADLoginOrMultiFactorAuthenticated: false);\nAssert.Equal(string.Empty, viewModel.RequiredSigner.Username);\nAssert.Equal(\"Any\", viewModel.RequiredSigner.DisplayText);\n@@ -295,7 +295,7 @@ public void Constructor_WhenPackageHasOneOwnerAndTheCurrentUserIsACollaborator_W\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(\"c\", viewModel.RequiredSigner.Username);\nAssert.Equal($\"{organization.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -331,7 +331,7 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRe\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -367,7 +367,7 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenRe\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -430,7 +430,7 @@ public void Constructor_WhenPackageHasMultipleOwners_WhenOwnersHaveVaryingCertif\npackage,\ncurrentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{currentUser.Username} (1 certificate)\", viewModel.RequiredSigner.DisplayText);\n@@ -466,7 +466,7 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenCu\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -507,7 +507,7 @@ public void Constructor_WhenPackageHasTwoOwnersAndTheCurrentUserIsAnOwner_WhenCu\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -559,7 +559,7 @@ public void Constructor_WhenPackageHasThreeOwnersAndTheCurrentUserIsAnOwner_When\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_currentUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_currentUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n@@ -622,7 +622,7 @@ public void Constructor_WhenPackageHasFourOwnersAndTheCurrentUserIsAnOwner_WhenT\npackage,\n_currentUser,\n_securityPolicyService.Object,\n- wasMultiFactorAuthenticated: true);\n+ wasAADLoginOrMultiFactorAuthenticated: true);\nAssert.Equal(_otherUser.Username, viewModel.RequiredSigner.Username);\nAssert.Equal($\"{_otherUser.Username} (0 certificates)\", viewModel.RequiredSigner.DisplayText);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove 2FA Restrictions for AAD and Certificate management (#6017)
|
455,794 |
04.06.2018 08:52:23
| 25,200 |
9ef44653cb6c17417e46908f3ebdb6e632fab59c
|
Replace PoliteCaptcha
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@@ -613,3 +613,23 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);\n@BreadcrumbWithProfile(url, currentUser, showDivider, newSegments);\n}\n+\n+@helper RecatpchaScripts(string reCaptchaPublicKey, string submitId)\n+{\n+ if (!string.IsNullOrEmpty(reCaptchaPublicKey))\n+ {\n+ <script src='https://www.google.com/recaptcha/api.js' async defer></script>\n+ <script type=\"text/javascript\">\n+ var $submit = $('@(\"#\" + submitId)');\n+ $submit.addClass(\"g-recaptcha\");\n+ $submit.attr({\n+ 'data-sitekey': \"@reCaptchaPublicKey\",\n+ 'data-size': \"invisible\",\n+ 'data-callback': \"onSubmit\"\n+ });\n+ function onSubmit(token) {\n+ $submit.parents('form').submit();\n+ }\n+ </script>\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -56,10 +56,6 @@ protected override void Load(ContainerBuilder builder)\nUrlExtensions.SetConfigurationService(configuration);\n- builder.RegisterInstance(configuration)\n- .AsSelf()\n- .As<PoliteCaptcha.IConfigurationSource>();\n-\nbuilder.RegisterInstance(configuration)\n.AsSelf()\n.As<IGalleryConfigurationService>();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -194,6 +194,16 @@ public class AppConfiguration : IAppConfiguration\n/// </summary>\npublic string SiteRoot { get; set; }\n+ /// <summary>\n+ /// Private key for verifying recaptcha user response.\n+ /// </summary>\n+ public string ReCaptchaPrivateKey { get; set; }\n+\n+ /// <summary>\n+ /// Public key for verifying recaptcha user response.\n+ /// </summary>\n+ public string ReCaptchaPublicKey { get; set; }\n+\n/// <summary>\n/// Gets the Google Analytics Property ID being used, if any.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/ConfigurationService.cs",
"new_path": "src/NuGetGallery/Configuration/ConfigurationService.cs",
"diff": "namespace NuGetGallery.Configuration\n{\n- public class ConfigurationService : PoliteCaptcha.IConfigurationSource, IGalleryConfigurationService\n+ public class ConfigurationService : IGalleryConfigurationService\n{\nprotected const string SettingPrefix = \"Gallery.\";\nprotected const string FeaturePrefix = \"Feature.\";\n@@ -53,16 +53,6 @@ public static IEnumerable<PropertyDescriptor> GetConfigProperties<T>(T instance)\nreturn TypeDescriptor.GetProperties(instance).Cast<PropertyDescriptor>().Where(p => !p.IsReadOnly);\n}\n- /// <summary>\n- /// PoliteCaptcha.IConfigurationSource implementation\n- /// </summary>\n- public string GetConfigurationValue(string key)\n- {\n- // Fudge the name because Azure cscfg system doesn't allow : in setting names\n- // Used by PoliteCaptcha\n- return ReadSetting(key.Replace(\"::\", \".\")).Result;\n- }\n-\npublic IAppConfiguration Current => _lazyAppConfiguration.Value;\npublic FeatureConfiguration Features => _lazyFeatureConfiguration.Value;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -200,6 +200,16 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// </summary>\nstring SiteRoot { get; set; }\n+ /// <summary>\n+ /// Private key for verifying recaptcha user response.\n+ /// </summary>\n+ string ReCaptchaPrivateKey { get; set; }\n+\n+ /// <summary>\n+ /// Public key for verifying recaptcha user response.\n+ /// </summary>\n+ string ReCaptchaPublicKey { get; set; }\n+\n/// <summary>\n/// Gets the Google Analytics Property ID being used, if any.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/Site.css",
"new_path": "src/NuGetGallery/Content/Site.css",
"diff": "@@ -1217,17 +1217,6 @@ button, input[type=\"submit\"], .btn {\nlist-style: none;\n}\n-.PoliteCaptcha.editor-field .field-validation-error {\n- position: static;\n- width: 300px;\n-}\n-\n-/* To fix alignment of generated reCAPTCHA table */\n-\n-.PoliteCaptcha.editor-field table {\n- margin-left: -3px !important;\n-}\n-\n.clear-fix {\nclear: both;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "using NuGetGallery.OData;\nusing NuGetGallery.Packaging;\nusing NuGetGallery.Security;\n-using PoliteCaptcha;\nnamespace NuGetGallery\n{\n@@ -683,7 +682,7 @@ public virtual async Task<ActionResult> ReportMyPackage(string id, string versio\n[HttpPost]\n[ValidateAntiForgeryToken]\n- [ValidateSpamPrevention]\n+ [ValidateRecaptchaResponse]\npublic virtual async Task<ActionResult> ReportAbuse(string id, string version, ReportAbuseViewModel reportForm)\n{\nreportForm.Message = HttpUtility.HtmlEncode(reportForm.Message);\n@@ -749,7 +748,7 @@ public virtual async Task<ActionResult> ReportAbuse(string id, string version, R\n[UIAuthorize]\n[RequiresAccountConfirmation(\"contact support about your package\")]\n[ValidateAntiForgeryToken]\n- [ValidateSpamPrevention]\n+ [ValidateRecaptchaResponse]\npublic virtual async Task<ActionResult> ReportMyPackage(string id, string version, ReportMyPackageViewModel reportForm)\n{\nvar package = _packageService.FindPackageByIdAndVersionStrict(id, version);\n@@ -956,6 +955,7 @@ public virtual ActionResult ContactOwners(string id, string version)\n[HttpPost]\n[UIAuthorize]\n[ValidateAntiForgeryToken]\n+ [ValidateRecaptchaResponse]\n[RequiresAccountConfirmation(\"contact package owners\")]\npublic virtual ActionResult ContactOwners(string id, string version, ContactOwnersViewModel contactForm)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<HintPath>..\\..\\packages\\Owin.1.0\\lib\\net40\\Owin.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"PoliteCaptcha, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\PoliteCaptcha.0.4.0.1\\lib\\net40\\PoliteCaptcha.dll</HintPath>\n- <Private>True</Private>\n- </Reference>\n<Reference Include=\"QueryInterceptor, Version=0.1.4237.2400, Culture=neutral, processorArchitecture=MSIL\">\n<SpecificVersion>False</SpecificVersion>\n<HintPath>..\\..\\packages\\QueryInterceptor.0.1.4237.2400\\lib\\net40\\QueryInterceptor.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Recaptcha, Version=1.0.5.0, Culture=neutral, PublicKeyToken=9afc4d65b28c38c2, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\recaptcha.1.0.5.0\\lib\\.NetFramework 4.0\\Recaptcha.dll</HintPath>\n- <Private>True</Private>\n- </Reference>\n<Reference Include=\"RouteMagic, Version=1.1.3.0, Culture=neutral, PublicKeyToken=84b59be021aa4cee, processorArchitecture=MSIL\">\n<SpecificVersion>False</SpecificVersion>\n<HintPath>..\\..\\packages\\RouteMagic.1.1.3\\lib\\net40\\RouteMagic.dll</HintPath>\n<Compile Include=\"Extensions\\UserExtensions.cs\" />\n<Compile Include=\"Filters\\ApiScopeRequiredAttribute.cs\" />\n<Compile Include=\"Filters\\UIAuthorizeAttribute.cs\" />\n+ <Compile Include=\"Filters\\ValidateRecaptchaResponseAttribute.cs\" />\n<Compile Include=\"GlobalSuppressions.cs\" />\n<Compile Include=\"Helpers\\GravatarHelper.cs\" />\n<Compile Include=\"Helpers\\ObfuscationHelper.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -922,6 +922,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Recaptcha response was not valid. Try again or email support if you need assistance..\n+ /// </summary>\n+ public static string InvalidRecaptchaResponse {\n+ get {\n+ return ResourceManager.GetString(\"InvalidRecaptchaResponse\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Job Log Blob name is invalid Bob! Expected [jobname].[yyyy-MM-dd].json or [jobname].json. Got: {0}.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -905,4 +905,7 @@ If you would like to update the linked Microsoft account you can do so from the\n<data name=\"DiscontinuedLogin_PasswordRemoved\" xml:space=\"preserve\">\n<value>The password login is discontinued and has been removed for your account. Please use your Microsoft account to log into {0} going forward.</value>\n</data>\n+ <data name=\"InvalidRecaptchaResponse\" xml:space=\"preserve\">\n+ <value>Recaptcha response was not valid. Try again or email support if you need assistance.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ContactOwners.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ContactOwners.cshtml",
"diff": "@Html.ShowValidationMessagesFor(m => m.CopySender)\n</div>\n<div class=\"form-group\">\n- <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Send\" />\n+ <input id=\"Submit\" type=\"submit\" class=\"btn btn-primary form-control\" value=\"Send\" />\n</div>\n}\n}\n</div>\n</div>\n</section>\n+\n+@section BottomScripts {\n+ @ViewHelpers.RecatpchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n+}\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.AzureCdnHost\" value=\"\" />\n<!-- Set this to the Azure CDN Host you are using for blob storage, if you have configured one -->\n<add key=\"Gallery.SiteRoot\" value=\"http://localhost\" />\n- <add key=\"reCAPTCHA::PrivateKey\" value=\"\" />\n- <add key=\"reCAPTCHA::PublicKey\" value=\"\" />\n+ <!-- Set this to add recatpcha to report abuse forms -->\n+ <add key=\"Gallery.ReCaptchaPrivateKey\" value=\"\" />\n+ <add key=\"Gallery.ReCaptchaPublicKey\" value=\"\" />\n<!-- Values required for PagerDuty integration -->\n<add key=\"Gallery.PagerDutyAccountName\" value=\"\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/packages.config",
"new_path": "src/NuGetGallery/packages.config",
"diff": "<package id=\"NuGet.Services.Validation.Issues\" version=\"2.25.0-master-30191\" targetFramework=\"net46\" />\n<package id=\"NuGet.Versioning\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"Owin\" version=\"1.0\" targetFramework=\"net46\" />\n- <package id=\"PoliteCaptcha\" version=\"0.4.0.1\" targetFramework=\"net46\" />\n<package id=\"QueryInterceptor\" version=\"0.1.4237.2400\" targetFramework=\"net46\" />\n- <package id=\"recaptcha\" version=\"1.0.5.0\" targetFramework=\"net46\" />\n<package id=\"RouteMagic\" version=\"1.1.3\" targetFramework=\"net46\" />\n<package id=\"Serilog\" version=\"2.0.0\" targetFramework=\"net46\" />\n<package id=\"Serilog.Enrichers.Environment\" version=\"2.1.0\" targetFramework=\"net46\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Replace PoliteCaptcha (#6006)
|
455,759 |
05.06.2018 14:34:11
| -7,200 |
35ca9fcb702285681db5cb924578f20df4f5b738
|
Fix confusing "There is a newer prerelease version of this package available" when newer released version is available
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -75,6 +75,18 @@ public bool HasNewerPrerelease\n}\n}\n+ public bool HasNewerRelease\n+ {\n+ get\n+ {\n+ var latestReleaseVersion = PackageVersions\n+ .Where(pv => !pv.Prerelease && pv.Available && pv.Listed)\n+ .Max(pv => pv.NuGetVersion);\n+\n+ return latestReleaseVersion > NuGetVersion;\n+ }\n+ }\n+\npublic bool? IsIndexed { get; set; }\npublic string DownloadsPerDayLabel { get; private set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": ")\n}\n- @if (Model.HasNewerPrerelease)\n+ @if (Model.HasNewerRelease)\n+ {\n+ @ViewHelpers.AlertInfo(\n+ @<text>\n+ There is a newer version of this package available.\n+ <br /> See the version list below for details.\n+ </text>\n+ )\n+ }\n+ else if (Model.HasNewerPrerelease)\n{\n@ViewHelpers.AlertInfo(\n@<text>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -202,6 +202,53 @@ public void DownloadsPerDayLabelShowsOneWhenAverageBetweenOneAndOnePointFive(int\nAssert.Equal(expectedNewerPrereleaseAvailable, hasNewerPrerelease);\n}\n+ [Theory]\n+ [InlineData(\"1.0.0\", \"1.0.1\", true)]\n+ [InlineData(\"1.0.1-alpha+metadata\", \"1.0.1\", true)]\n+ [InlineData(\"1.0.1-alpha.1\", \"1.0.1\", true)]\n+ [InlineData(\"1.0.1\", \"1.0.0\", false)]\n+ [InlineData(\"1.0.1-alpha\", \"1.0.0\", false)]\n+ [InlineData(\"1.0.1-alpha+metadata\", \"1.0.0\", false)]\n+ [InlineData(\"1.0.1-alpha.1\", \"1.0.0\", false)]\n+ public void HasNewerReleaseReturnsTrueWhenNewerReleaseAvailable(\n+ string currentVersion,\n+ string otherVersion,\n+ bool expectedNewerReleaseAvailable)\n+ {\n+ // Arrange\n+ var dependencies = Enumerable.Empty<PackageDependency>().ToList();\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ };\n+\n+ var package = new Package\n+ {\n+ Dependencies = dependencies,\n+ PackageRegistration = packageRegistration,\n+ IsPrerelease = NuGetVersion.Parse(currentVersion).IsPrerelease,\n+ Version = currentVersion\n+ };\n+\n+ var otherPackage = new Package\n+ {\n+ Dependencies = dependencies,\n+ PackageRegistration = packageRegistration,\n+ IsPrerelease = NuGetVersion.Parse(otherVersion).IsPrerelease,\n+ Version = otherVersion\n+ };\n+\n+ package.PackageRegistration.Packages = new[] { package, otherPackage };\n+\n+ var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+\n+ // Act\n+ var hasNewerRelease = viewModel.HasNewerRelease;\n+\n+ // Assert\n+ Assert.Equal(expectedNewerReleaseAvailable, hasNewerRelease);\n+ }\n+\n[Fact]\npublic void HasNewerPrereleaseDoesNotConsiderUnlistedVersions()\n{\n@@ -241,6 +288,46 @@ public void HasNewerPrereleaseDoesNotConsiderUnlistedVersions()\nAssert.False(hasNewerPrerelease);\n}\n+\n+ [Fact]\n+ public void HasNewerReleaseDoesNotConsiderUnlistedVersions()\n+ {\n+ // Arrange\n+ var dependencies = Enumerable.Empty<PackageDependency>().ToList();\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ };\n+\n+ var package = new Package\n+ {\n+ Dependencies = dependencies,\n+ PackageRegistration = packageRegistration,\n+ IsPrerelease = false,\n+ Version = \"1.0.0\"\n+ };\n+\n+ // This is a newer prerelease version, however unlisted.\n+ var otherPackage = new Package\n+ {\n+ Dependencies = dependencies,\n+ PackageRegistration = packageRegistration,\n+ IsPrerelease = false,\n+ Version = \"1.0.1\",\n+ Listed = false\n+ };\n+\n+ package.PackageRegistration.Packages = new[] { package, otherPackage };\n+\n+ var viewModel = new DisplayPackageViewModel(package, null, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+\n+ // Act\n+ var hasNewerRelease = viewModel.HasNewerRelease;\n+\n+ // Assert\n+ Assert.False(hasNewerRelease);\n+ }\n+\n[Theory]\n[InlineData(null)]\n[InlineData(\"\")]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix confusing "There is a newer prerelease version of this package available" when newer released version is available #5663 (#6027)
|
455,751 |
08.06.2018 16:46:29
| 25,200 |
d3fc3acc0c499f15494b01d56c81232bc04cffc0
|
Fix issue 6035 - incorrect account name in the delete account email message body.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "@@ -652,7 +652,7 @@ public void SendAccountDeleteNotice(User user)\nbody = String.Format(\nCultureInfo.CurrentCulture,\nbody,\n- user,\n+ user.Username,\nConfig.GalleryOwner.DisplayName,\nEnvironment.NewLine);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -106,7 +106,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to DeleteAccountRequest.\n+ /// Looks up a localized string similar to Account Deletion Request.\n/// </summary>\npublic static string AccountDelete_SupportRequestTitle {\nget {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -610,7 +610,7 @@ For more information, please contact '{2}'.</value>\n<value>The request failed to be submitted. Please try again or contact support.</value>\n</data>\n<data name=\"AccountDelete_SupportRequestTitle\" xml:space=\"preserve\">\n- <value>DeleteAccountRequest</value>\n+ <value>Account Deletion Request</value>\n</data>\n<data name=\"MessageIsRequired\" xml:space=\"preserve\">\n<value>Please enter a message.</value>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -1948,6 +1948,32 @@ public void WillNotSendEmailIfEmailNotAllowed()\n}\n}\n+ public class TheSendAccountDeleteNoticeMethod\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void VerifyTheMessageBody()\n+ {\n+ // Arrange\n+ var userName = \"deleteduser\";\n+ var userEmailAddress = \"onedeleteduser@hotmail.com\";\n+ var userToDelete = new User(userName) { EmailAddress = userEmailAddress };\n+\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n+\n+ // Act\n+ messageService.SendAccountDeleteNotice(userToDelete);\n+\n+ // Assert\n+ var message = messageService.MockMailSender.Sent.Last();\n+\n+ Assert.Equal(userToDelete.EmailAddress, message.To[0].Address);\n+ Assert.Equal(TestGalleryNoReplyAddress, message.From);\n+ Assert.Equal(\"Account Deletion Request\", message.Subject);\n+ Assert.Contains($\"We received a request to delete your account {userName}.\", message.Body);\n+ }\n+ }\n+\nprivate static void AssertMessageSentToAccountManagersOfOrganizationOnly(MailMessage message, Organization organization)\n{\nAssertMessageSentToMembersOfOrganizationWithPermissionOnly(message, organization, ActionsRequiringPermissions.ManageAccount);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix issue 6035 - incorrect account name in the delete account email message body. (#6040)
|
455,735 |
11.06.2018 10:42:40
| 25,200 |
1003dc8a0b5bc3a7981106dea47055ddb6074483
|
Update ApiKeys.cshtml
typo fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<div class=\"col-sm-12\">\n<b class=\"ms-fontSize-xl\">Select Packages</b>\n<p>\n- To select which pages to associate with a key, use a glob pattern, select\n+ To select which packages to associate with a key, use a glob pattern, select\nindividual packages, or both.\n</p>\n<div class=\"has-error\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update ApiKeys.cshtml
typo fix #6044
|
455,776 |
11.06.2018 17:47:41
| 25,200 |
f262ce11b5de6c30885568cb5bd8e28434cc87ee
|
Correctly unverify packages when they are removed from their reserved namespaces (HOTFIX)
(also see https://github.com/NuGet/NuGetGallery/pull/6043)
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReservedNamespaceService.cs",
"new_path": "src/NuGetGallery/Services/ReservedNamespaceService.cs",
"diff": "@@ -296,6 +296,7 @@ public void RemovePackageRegistrationFromNamespace(ReservedNamespace reservedNam\n}\nreservedNamespace.PackageRegistrations.Remove(packageRegistration);\n+ packageRegistration.ReservedNamespaces.Remove(reservedNamespace);\n}\npublic virtual ReservedNamespace FindReservedNamespaceForPrefix(string prefix)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs",
"diff": "@@ -574,11 +574,13 @@ public void PackageRegistrationIsRemovedFromNamespaceSuccessfully()\nvar testPackageRegistrations = ReservedNamespaceServiceTestData.GetRegistrations();\nvar existingReg = testPackageRegistrations.First();\nexistingNamespace.PackageRegistrations.Add(existingReg);\n+ existingReg.ReservedNamespaces.Add(existingNamespace);\nvar service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);\nservice.RemovePackageRegistrationFromNamespace(existingNamespace, existingReg);\nAssert.False(existingNamespace.PackageRegistrations.Contains(existingReg));\n+ Assert.False(existingReg.ReservedNamespaces.Contains(existingNamespace));\n}\n[Fact]\n@@ -589,6 +591,7 @@ public void CommitChangesIsNotExecuted()\nvar testPackageRegistrations = ReservedNamespaceServiceTestData.GetRegistrations();\nvar existingReg = testPackageRegistrations.First();\nexistingNamespace.PackageRegistrations.Add(existingReg);\n+ existingReg.ReservedNamespaces.Add(existingNamespace);\nvar service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);\nservice.RemovePackageRegistrationFromNamespace(existingNamespace, existingReg);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Correctly unverify packages when they are removed from their reserved namespaces (HOTFIX) (#6047)
https://github.com/NuGet/NuGetGallery/issues/6039
(also see https://github.com/NuGet/NuGetGallery/pull/6043)
|
455,794 |
12.06.2018 15:56:09
| 25,200 |
22f8bf6f779feb559513047f50c5f44334a867a8
|
Update Gallery and Support contexts to allow AAD authentication
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.ComponentModel.DataAnnotations.Schema;\n+using System.Data.Common;\nusing System.Data.Entity;\nusing System.Data.Entity.Infrastructure.Annotations;\nusing System.Threading.Tasks;\n@@ -39,6 +40,12 @@ public EntitiesContext(string connectionString, bool readOnly)\nReadOnly = readOnly;\n}\n+ public EntitiesContext(DbConnection connection, bool readOnly)\n+ : base(connection, contextOwnsConnection: true)\n+ {\n+ ReadOnly = readOnly;\n+ }\n+\npublic bool ReadOnly { get; private set; }\npublic IDbSet<CuratedFeed> CuratedFeeds { get; set; }\npublic IDbSet<CuratedPackage> CuratedPackages { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Interception/ObjectMaterializedInterceptingDbContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/Interception/ObjectMaterializedInterceptingDbContext.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.Data.Common;\nusing System.Data.Entity;\nusing System.Data.Entity.Core.Objects;\nusing System.Data.Entity.Infrastructure;\n@@ -16,6 +17,12 @@ public ObjectMaterializedInterceptingDbContext(string connectionString)\nObjectContext.ObjectMaterialized += ObjectContextOnObjectMaterialized;\n}\n+ public ObjectMaterializedInterceptingDbContext(DbConnection sqlConnection, bool contextOwnsConnection)\n+ : base(sqlConnection, contextOwnsConnection)\n+ {\n+ ObjectContext.ObjectMaterialized += ObjectContextOnObjectMaterialized;\n+ }\n+\nprivate void ObjectContextOnObjectMaterialized(object sender, ObjectMaterializedEventArgs objectMaterializedEventArgs)\n{\nObjectMaterializedInterception.InterceptObjectMaterialized(objectMaterializedEventArgs.Entity);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Data.Common;\nusing System.Data.Entity;\nusing System.IO;\nusing System.Linq;\nusing System.Net;\nusing System.Net.Mail;\nusing System.Security.Principal;\n+using System.Threading.Tasks;\nusing System.Web;\nusing System.Web.Hosting;\nusing System.Web.Mvc;\nusing Elmah;\nusing Microsoft.WindowsAzure.ServiceRuntime;\nusing NuGet.Services.ServiceBus;\n+using NuGet.Services.Sql;\nusing NuGet.Services.Validation;\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.Models;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Configuration;\n-using NuGetGallery.Configuration.SecretReader;\nusing NuGetGallery.Cookies;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Infrastructure;\nusing NuGetGallery.Infrastructure.Authentication;\nusing NuGetGallery.Infrastructure.Lucene;\nusing NuGetGallery.Security;\n+using SecretReaderFactory = NuGetGallery.Configuration.SecretReader.SecretReaderFactory;\nnamespace NuGetGallery\n{\n@@ -52,7 +55,11 @@ protected override void Load(ContainerBuilder builder)\n.As<IDiagnosticsService>()\n.SingleInstance();\n- var configuration = new ConfigurationService(new SecretReaderFactory(diagnosticsService));\n+ var configuration = new ConfigurationService();\n+ var secretReaderFactory = new SecretReaderFactory(configuration, diagnosticsService);\n+ var secretReader = secretReaderFactory.CreateSecretReader();\n+ var secretInjector = secretReaderFactory.CreateSecretInjector(secretReader);\n+ configuration.SecretInjector = secretInjector;\nUrlExtensions.SetConfigurationService(configuration);\n@@ -89,7 +96,13 @@ protected override void Load(ContainerBuilder builder)\n.As<ICacheService>()\n.InstancePerLifetimeScope();\n- builder.Register(c => new EntitiesContext(configuration.Current.SqlConnectionString, readOnly: configuration.Current.ReadOnlyMode))\n+ var galleryDbConnectionFactory = new AzureSqlConnectionFactory(configuration.Current.SqlConnectionString, secretInjector);\n+\n+ builder.RegisterInstance(galleryDbConnectionFactory)\n+ .AsSelf()\n+ .Keyed<ISqlConnectionFactory>(nameof(EntitiesContext));\n+\n+ builder.Register(c => new EntitiesContext(CreateDbConnection(galleryDbConnectionFactory), configuration.Current.ReadOnlyMode))\n.AsSelf()\n.As<IEntitiesContext>()\n.As<DbContext>()\n@@ -170,7 +183,9 @@ protected override void Load(ContainerBuilder builder)\n.As<ICuratedFeedService>()\n.InstancePerLifetimeScope();\n- builder.Register(c => new SupportRequestDbContext(configuration.Current.SqlConnectionStringSupportRequest))\n+ var supportDbConnectionFactory = new AzureSqlConnectionFactory(configuration.Current.SqlConnectionStringSupportRequest, secretInjector);\n+\n+ builder.Register(c => new SupportRequestDbContext(CreateDbConnection(supportDbConnectionFactory)))\n.AsSelf()\n.As<ISupportRequestDbContext>()\n.InstancePerLifetimeScope();\n@@ -379,6 +394,11 @@ protected override void Load(ContainerBuilder builder)\nConfigureAutocomplete(builder, configuration);\n}\n+ private static DbConnection CreateDbConnection(ISqlConnectionFactory connectionFactory)\n+ {\n+ return Task.Run(() => connectionFactory.CreateAsync()).Result;\n+ }\n+\nprivate static void ConfigureValidationAdmin(ContainerBuilder builder, ConfigurationService configuration)\n{\nbuilder.Register(c => new ValidationEntitiesContext(configuration.Current.SqlConnectionStringValidation))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/AdminAreaRegistration.cs",
"new_path": "src/NuGetGallery/Areas/Admin/AdminAreaRegistration.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Web.Mvc;\n+using Autofac.Features.Indexed;\n+using NuGet.Services.Sql;\nusing NuGetGallery.Areas.Admin.DynamicData;\n-using NuGetGallery.Configuration;\nnamespace NuGetGallery.Areas.Admin\n{\n@@ -15,7 +16,7 @@ public class AdminAreaRegistration : AreaRegistration\npublic override void RegisterArea(AreaRegistrationContext context)\n{\n- var config = DependencyResolver.Current.GetService<IAppConfiguration>();\n+ var config = DependencyResolver.Current.GetService<IIndex<string, ISqlConnectionFactory>>();\ncontext.Routes.Ignore(\"Admin/Errors.axd/{*pathInfo}\"); // ELMAH owns this root\nDynamicDataManager.Register(context.Routes, \"Admin/Database\", config);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/DynamicData/DynamicDataManager.cs",
"new_path": "src/NuGetGallery/Areas/Admin/DynamicData/DynamicDataManager.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Data;\n+using System.Data.Common;\nusing System.Data.SqlClient;\nusing System.Diagnostics.CodeAnalysis;\n+using System.Threading.Tasks;\nusing System.Web.DynamicData;\nusing System.Web.Routing;\n+using Autofac.Features.Indexed;\nusing Microsoft.AspNet.DynamicData.ModelProviders;\n-using NuGetGallery.Configuration;\n+using NuGet.Services.Sql;\nnamespace NuGetGallery.Areas.Admin.DynamicData\n{\n@@ -18,26 +21,31 @@ public class DynamicDataManager\nprivate static DynamicDataRoute _route;\n- public static void Register(RouteCollection routes, string root, IAppConfiguration configuration)\n+ public static void Register(RouteCollection routes, string root, IIndex<string, ISqlConnectionFactory> connectionFactories)\n{\n// Set up unobtrusive validation\nInitializeValidation();\n// Set up dynamic data\n- InitializeDynamicData(routes, root, configuration);\n+ InitializeDynamicData(routes, root, connectionFactories[nameof(EntitiesContext)]);\n}\nprivate static void InitializeValidation()\n{\n}\n- private static void InitializeDynamicData(RouteCollection routes, string root, IAppConfiguration configuration)\n+ private static DbConnection CreateConnection(ISqlConnectionFactory connectionFactory)\n+ {\n+ return Task.Run(() => connectionFactory.CreateAsync()).Result;\n+ }\n+\n+ private static void InitializeDynamicData(RouteCollection routes, string root, ISqlConnectionFactory connectionFactory)\n{\ntry\n{\nDefaultModel.RegisterContext(\nnew EFDataModelProvider(\n- () => new EntitiesContext(configuration.SqlConnectionString, readOnly: false)), // DB Admins do not need to respect read-only mode.\n+ () => new EntitiesContext(CreateConnection(connectionFactory), readOnly: false)), // DB Admins do not need to respect read-only mode.\nconfiguration: new ContextConfiguration { ScaffoldAllTables = true });\n}\ncatch (SqlException e)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Models/SupportRequestDbContext.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Models/SupportRequestDbContext.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.Data.Common;\nusing System.Data.Entity;\nusing System.Threading.Tasks;\n@@ -33,6 +34,11 @@ public SupportRequestDbContext(string connectionString)\n{\n}\n+ public SupportRequestDbContext(DbConnection connection)\n+ : base(connection, contextOwnsConnection: true)\n+ {\n+ }\n+\npublic virtual IDbSet<Admin> Admins { get; set; }\npublic virtual IDbSet<Issue> Issues { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/ConfigurationService.cs",
"new_path": "src/NuGetGallery/Configuration/ConfigurationService.cs",
"diff": "using System.Web.Configuration;\nusing Microsoft.WindowsAzure.ServiceRuntime;\nusing NuGet.Services.KeyVault;\n-using NuGetGallery.Configuration.SecretReader;\nnamespace NuGetGallery.Configuration\n{\n@@ -27,18 +26,15 @@ public class ConfigurationService : IGalleryConfigurationService\nprivate bool _notInCloud;\nprivate readonly Lazy<string> _httpSiteRootThunk;\nprivate readonly Lazy<string> _httpsSiteRootThunk;\n- private readonly ISecretReaderFactory _secretReaderFactory;\n- private readonly Lazy<ISecretInjector> _secretInjector;\nprivate readonly Lazy<IAppConfiguration> _lazyAppConfiguration;\nprivate readonly Lazy<FeatureConfiguration> _lazyFeatureConfiguration;\nprivate readonly Lazy<IServiceBusConfiguration> _lazyServiceBusConfiguration;\nprivate readonly Lazy<IPackageDeleteConfiguration> _lazyPackageDeleteConfiguration;\n- public ConfigurationService(ISecretReaderFactory secretReaderFactory)\n- {\n- _secretReaderFactory = secretReaderFactory ?? throw new ArgumentNullException(nameof(secretReaderFactory));\n- _secretInjector = new Lazy<ISecretInjector>(InitSecretInjector, isThreadSafe: false);\n+ internal ISecretInjector SecretInjector { get; set; }\n+ public ConfigurationService()\n+ {\n_httpSiteRootThunk = new Lazy<string>(GetHttpSiteRoot);\n_httpsSiteRootThunk = new Lazy<string>(GetHttpsSiteRoot);\n@@ -80,7 +76,7 @@ public async Task<T> ResolveConfigObject<T>(T instance, string prefix)\nstring baseName = string.IsNullOrEmpty(property.DisplayName) ? property.Name : property.DisplayName;\nstring settingName = prefix + baseName;\n- string value = await ReadSetting(settingName);\n+ string value = await ReadSettingAsync(settingName);\nif (string.IsNullOrEmpty(value))\n{\n@@ -119,7 +115,19 @@ public async Task<T> ResolveConfigObject<T>(T instance, string prefix)\nreturn instance;\n}\n- public async Task<string> ReadSetting(string settingName)\n+ public async Task<string> ReadSettingAsync(string settingName)\n+ {\n+ var value = ReadRawSetting(settingName);\n+\n+ if (!string.IsNullOrEmpty(value))\n+ {\n+ value = await SecretInjector.InjectAsync(value);\n+ }\n+\n+ return value;\n+ }\n+\n+ public string ReadRawSetting(string settingName)\n{\nstring value;\n@@ -135,11 +143,6 @@ public async Task<string> ReadSetting(string settingName)\nvalue = cstr != null ? cstr.ConnectionString : GetAppSetting(settingName);\n}\n- if (!string.IsNullOrEmpty(value))\n- {\n- value = await _secretInjector.Value.InjectAsync(value);\n- }\n-\nreturn value;\n}\n@@ -148,11 +151,6 @@ protected virtual HttpRequestBase GetCurrentRequest()\nreturn new HttpRequestWrapper(HttpContext.Current.Request);\n}\n- private ISecretInjector InitSecretInjector()\n- {\n- return _secretReaderFactory.CreateSecretInjector(_secretReaderFactory.CreateSecretReader(new ConfigurationService(new EmptySecretReaderFactory())));\n- }\n-\nprivate async Task<FeatureConfiguration> ResolveFeatures()\n{\nreturn await ResolveConfigObject(new FeatureConfiguration(), FeaturePrefix);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IGalleryConfigurationService.cs",
"new_path": "src/NuGetGallery/Configuration/IGalleryConfigurationService.cs",
"diff": "@@ -25,6 +25,18 @@ public interface IGalleryConfigurationService\n/// <param name=\"prefix\">The prefix of the properties in the config.</param>\nTask<T> ResolveConfigObject<T>(T instance, string prefix);\n- Task<string> ReadSetting(string settingName);\n+ /// <summary>\n+ /// Read a configuration setting with secret injection applied.\n+ /// </summary>\n+ /// <param name=\"settingName\">Setting name.</param>\n+ /// <returns>Setting value.</returns>\n+ Task<string> ReadSettingAsync(string settingName);\n+\n+ /// <summary>\n+ /// Read a configuration setting without secret injection applied, used for KeyVault configuration.\n+ /// </summary>\n+ /// <param name=\"settingName\">Setting name.</param>\n+ /// <returns>Setting value.</returns>\n+ string ReadRawSetting(string settingName);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/SecretReader/EmptySecretReaderFactory.cs",
"new_path": "src/NuGetGallery/Configuration/SecretReader/EmptySecretReaderFactory.cs",
"diff": "@@ -12,7 +12,7 @@ public ISecretInjector CreateSecretInjector(ISecretReader secretReader)\nreturn new SecretInjector(secretReader);\n}\n- public ISecretReader CreateSecretReader(IGalleryConfigurationService configurationService)\n+ public ISecretReader CreateSecretReader()\n{\nreturn new EmptySecretReader();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/SecretReader/SecretReaderFactory.cs",
"new_path": "src/NuGetGallery/Configuration/SecretReader/SecretReaderFactory.cs",
"diff": "using System;\nusing System.Globalization;\n+using System.Security.Cryptography.X509Certificates;\nusing NuGet.Services.KeyVault;\nusing NuGetGallery.Diagnostics;\n@@ -15,15 +16,12 @@ public class SecretReaderFactory : ISecretReaderFactory\ninternal const string ClientIdConfigurationKey = \"ClientId\";\ninternal const string CertificateThumbprintConfigurationKey = \"CertificateThumbprint\";\nprivate IDiagnosticsService _diagnosticsService;\n+ private IGalleryConfigurationService _configurationService;\n- public SecretReaderFactory(IDiagnosticsService diagnosticsService)\n+ public SecretReaderFactory(IGalleryConfigurationService configurationService, IDiagnosticsService diagnosticsService)\n{\n- if (diagnosticsService == null)\n- {\n- throw new ArgumentNullException(nameof(diagnosticsService));\n- }\n-\n- _diagnosticsService = diagnosticsService;\n+ _configurationService = configurationService ?? throw new ArgumentNullException(nameof(configurationService));\n+ _diagnosticsService = diagnosticsService ?? throw new ArgumentNullException(nameof(diagnosticsService));\n}\npublic ISecretInjector CreateSecretInjector(ISecretReader secretReader)\n@@ -36,26 +34,24 @@ public ISecretInjector CreateSecretInjector(ISecretReader secretReader)\nreturn new SecretInjector(secretReader);\n}\n- public ISecretReader CreateSecretReader(IGalleryConfigurationService configurationService)\n+ private string ResolveKeyVaultSettingName(string settingName)\n{\n- if (configurationService == null)\n- {\n- throw new ArgumentNullException(nameof(configurationService));\n+ return string.Format(CultureInfo.InvariantCulture, \"{0}{1}\", KeyVaultConfigurationPrefix, settingName);\n}\n+ public ISecretReader CreateSecretReader()\n+ {\nISecretReader secretReader;\n- var vaultName = configurationService.ReadSetting(\n- string.Format(CultureInfo.InvariantCulture, \"{0}{1}\", KeyVaultConfigurationPrefix, VaultNameConfigurationKey)).Result;\n+ var vaultName = _configurationService.ReadRawSetting(ResolveKeyVaultSettingName(VaultNameConfigurationKey));\nif (!string.IsNullOrEmpty(vaultName))\n{\n- var clientId = configurationService.ReadSetting(\n- string.Format(CultureInfo.InvariantCulture, \"{0}{1}\", KeyVaultConfigurationPrefix, ClientIdConfigurationKey)).Result;\n- var certificateThumbprint = configurationService.ReadSetting(\n- string.Format(CultureInfo.InvariantCulture, \"{0}{1}\", KeyVaultConfigurationPrefix, CertificateThumbprintConfigurationKey)).Result;\n+ var clientId = _configurationService.ReadRawSetting(ResolveKeyVaultSettingName(ClientIdConfigurationKey));\n+ var certificateThumbprint = _configurationService.ReadRawSetting(ResolveKeyVaultSettingName(CertificateThumbprintConfigurationKey));\n+ var certificate = CertificateUtility.FindCertificateByThumbprint(StoreName.My, StoreLocation.LocalMachine, certificateThumbprint, true);\n- var keyVaultConfiguration = new KeyVaultConfiguration(vaultName, clientId, certificateThumbprint, validateCertificate: true);\n+ var keyVaultConfiguration = new KeyVaultConfiguration(vaultName, clientId, certificate);\nsecretReader = new KeyVaultReader(keyVaultConfiguration);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Configuration\\PackageDeleteConfiguration.cs\" />\n<Compile Include=\"Configuration\\SecretReader\\CachingSecretReader.cs\" />\n<Compile Include=\"Configuration\\SecretReader\\EmptySecretReaderFactory.cs\" />\n- <Compile Include=\"Configuration\\SecretReader\\ISecretReaderFactory.cs\" />\n<Compile Include=\"Configuration\\SecretReader\\SecretReaderFactory.cs\" />\n<Compile Include=\"Configuration\\ServiceBusConfiguration.cs\" />\n<Compile Include=\"Configuration\\StringArrayConverter.cs\" />\n<Version>1.1.2</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.IdentityModel.Clients.ActiveDirectory\">\n- <Version>3.13.9</Version>\n+ <Version>3.19.4</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.jQuery.Unobtrusive.Ajax\">\n<Version>2.0.30116</Version>\n<Version>2.25.0-master-30191</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>1.0.0</Version>\n+ <Version>2.25.0-master-30453</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n<Version>2.2.3</Version>\n<PackageReference Include=\"NuGet.Services.ServiceBus\">\n<Version>2.25.0-master-30191</Version>\n</PackageReference>\n+ <PackageReference Include=\"NuGet.Services.Sql\">\n+ <Version>2.25.0-master-30453</Version>\n+ </PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n<Version>2.25.0-master-30191</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"new_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"diff": "using System.Data;\nusing System.Threading.Tasks;\n+using Autofac.Features.Indexed;\n+using NuGet.Services.Sql;\nusing NuGetGallery.Configuration;\nnamespace NuGetGallery\n@@ -10,6 +12,7 @@ namespace NuGetGallery\npublic class SqlAggregateStatsService : IAggregateStatsService\n{\nprivate readonly IAppConfiguration _configuration;\n+ private readonly ISqlConnectionFactory _connectionFactory;\n// Note the NOLOCK hints here!\nprivate static readonly string GetStatisticsSql = @\"SELECT\n@@ -17,14 +20,16 @@ public class SqlAggregateStatsService : IAggregateStatsService\nWHERE EXISTS (SELECT 1 FROM Packages p WITH (NOLOCK) WHERE p.PackageRegistrationKey = pr.[Key] AND p.Listed = 1 AND p.PackageDelete_Key IS NULL)) AS UniquePackages,\n(SELECT COUNT([Key]) FROM Packages WITH (NOLOCK) WHERE Listed = 1) AS TotalPackages\";\n- public SqlAggregateStatsService(IAppConfiguration configuration)\n+ public SqlAggregateStatsService(IAppConfiguration configuration, IIndex<string, ISqlConnectionFactory> connectionFactories)\n{\n_configuration = configuration;\n+ _connectionFactory = connectionFactories[nameof(EntitiesContext)];\n}\npublic Task<AggregateStats> GetAggregateStats()\n{\n- using (var dbContext = new EntitiesContext(_configuration.SqlConnectionString, readOnly: true)) // true - set readonly but it is ignored anyway, as this class doesn't call EntitiesContext.SaveChanges()\n+ var connection = Task.Run(() => _connectionFactory.CreateAsync()).Result;\n+ using (var dbContext = new EntitiesContext(connection, readOnly: true)) // true - set readonly but it is ignored anyway, as this class doesn't call EntitiesContext.SaveChanges()\n{\nvar database = dbContext.Database;\nusing (var command = database.Connection.CreateCommand())\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/App_Start/CachingSecretReaderFacts.cs",
"new_path": "tests/NuGetGallery.Facts/App_Start/CachingSecretReaderFacts.cs",
"diff": "using System.Threading.Tasks;\nusing Moq;\nusing NuGet.Services.KeyVault;\n-using NuGetGallery.Configuration.SecretReader;\nusing NuGetGallery.Diagnostics;\nusing Xunit;\n+using CachingSecretReader = NuGetGallery.Configuration.SecretReader.CachingSecretReader;\nnamespace NuGetGallery.App_Start\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/App_Start/ConfigurationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/App_Start/ConfigurationServiceFacts.cs",
"diff": "@@ -18,12 +18,15 @@ public class TheGetSiteRootMethod\n{\nprivate class TestableConfigurationService : ConfigurationService\n{\n- public TestableConfigurationService() : base(new EmptySecretReaderFactory())\n+ public TestableConfigurationService() : base()\n{\nStubConfiguredSiteRoot = \"http://aSiteRoot/\";\nStubRequest = new Mock<HttpRequestBase>();\nStubRequest.Setup(stub => stub.IsLocal).Returns(false);\n+\n+ var secretReaderFactory = new EmptySecretReaderFactory();\n+ SecretInjector = secretReaderFactory.CreateSecretInjector(secretReaderFactory.CreateSecretReader());\n}\npublic string StubConfiguredSiteRoot { get; set; }\n@@ -102,9 +105,9 @@ public class TheReadSettingMethod\n{\nprivate class TestableConfigurationService : ConfigurationService\n{\n- public TestableConfigurationService(ISecretReaderFactory secretReaderFactory = null)\n- : base(secretReaderFactory ?? new EmptySecretReaderFactory())\n+ public TestableConfigurationService(ISecretInjector secretInjector = null)\n{\n+ SecretInjector = secretInjector ?? CreateDefaultSecretInjector();\n}\npublic string ConnectionStringStub { get; set; }\n@@ -127,6 +130,12 @@ protected override string GetAppSetting(string settingName)\n{\nreturn AppSettingStub;\n}\n+\n+ private static ISecretInjector CreateDefaultSecretInjector()\n+ {\n+ var secretReaderFactory = new EmptySecretReaderFactory();\n+ return secretReaderFactory.CreateSecretInjector(secretReaderFactory.CreateSecretReader());\n+ }\n}\n[Fact]\n@@ -139,7 +148,7 @@ public async Task WhenCloudSettingIsNullStringNullIsReturned()\nconfigurationService.ConnectionStringStub = \"abc\";\n// Act\n- string result = await configurationService.ReadSetting(\"any\");\n+ string result = await configurationService.ReadSettingAsync(\"any\");\n// Assert\nAssert. Null(result);\n@@ -155,7 +164,7 @@ public async Task WhenCloudSettingIsEmptyAppSettingIsReturned()\nconfigurationService.ConnectionStringStub = \"abc\";\n// Act\n- string result = await configurationService.ReadSetting(\"any\");\n+ string result = await configurationService.ReadSettingAsync(\"any\");\n// Assert\nAssert.Equal(configurationService.ConnectionStringStub, result);\n@@ -169,17 +178,11 @@ public async Task WhenSettingIsNotEmptySecretInjectorIsRan()\nsecretInjectorMock.Setup(x => x.InjectAsync(It.IsAny<string>()))\n.Returns<string>(s => Task.FromResult(s + \"parsed\"));\n- var secretReaderFactory = new Mock<ISecretReaderFactory>();\n- secretReaderFactory.Setup(x => x.CreateSecretReader(It.IsAny<IGalleryConfigurationService>()))\n- .Returns(new EmptySecretReader());\n- secretReaderFactory.Setup(x => x.CreateSecretInjector(It.IsAny<ISecretReader>()))\n- .Returns(secretInjectorMock.Object);\n-\n- var configurationService = new TestableConfigurationService(secretReaderFactory.Object);\n+ var configurationService = new TestableConfigurationService(secretInjectorMock.Object);\nconfigurationService.CloudSettingStub = \"somevalue\";\n// Act\n- string result = await configurationService.ReadSetting(\"any\");\n+ string result = await configurationService.ReadSettingAsync(\"any\");\n// Assert\nAssert.Equal(\"somevalueparsed\", result);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/TestGalleryConfigurationService.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/TestGalleryConfigurationService.cs",
"diff": "@@ -12,8 +12,9 @@ public class TestGalleryConfigurationService : ConfigurationService\npublic IDictionary<string, string> Settings = new Dictionary<string, string>();\npublic TestGalleryConfigurationService()\n- : base(new EmptySecretReaderFactory())\n{\n+ var secretReaderFactory = new EmptySecretReaderFactory();\n+ SecretInjector = secretReaderFactory.CreateSecretInjector(secretReaderFactory.CreateSecretReader());\n}\nprotected override string GetAppSetting(string settingName)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update Gallery and Support contexts to allow AAD authentication (#6011)
|
455,794 |
12.06.2018 20:52:14
| 25,200 |
1800bffe15668dc29a64e1209ec9c0fea8d3717d
|
Update validation db to support AAD authentication
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "using Autofac.Core;\nusing Elmah;\nusing Microsoft.WindowsAzure.ServiceRuntime;\n+using NuGet.Services.KeyVault;\nusing NuGet.Services.ServiceBus;\nusing NuGet.Services.Sql;\nusing NuGet.Services.Validation;\n@@ -59,6 +60,12 @@ protected override void Load(ContainerBuilder builder)\nvar secretReaderFactory = new SecretReaderFactory(configuration, diagnosticsService);\nvar secretReader = secretReaderFactory.CreateSecretReader();\nvar secretInjector = secretReaderFactory.CreateSecretInjector(secretReader);\n+\n+ builder.RegisterInstance(secretInjector)\n+ .AsSelf()\n+ .As<ISecretInjector>()\n+ .SingleInstance();\n+\nconfiguration.SecretInjector = secretInjector;\nUrlExtensions.SetConfigurationService(configuration);\n@@ -355,7 +362,7 @@ protected override void Load(ContainerBuilder builder)\nbreak;\n}\n- RegisterAsynchronousValidation(builder, configuration);\n+ RegisterAsynchronousValidation(builder, configuration, secretInjector);\nRegisterAuditingServices(builder, defaultAuditingService);\n@@ -399,9 +406,12 @@ private static DbConnection CreateDbConnection(ISqlConnectionFactory connectionF\nreturn Task.Run(() => connectionFactory.CreateAsync()).Result;\n}\n- private static void ConfigureValidationAdmin(ContainerBuilder builder, ConfigurationService configuration)\n+ private static void ConfigureValidationAdmin(ContainerBuilder builder, ConfigurationService configuration, ISecretInjector secretInjector)\n{\n- builder.Register(c => new ValidationEntitiesContext(configuration.Current.SqlConnectionStringValidation))\n+ var connectionString = configuration.Current.SqlConnectionStringValidation;\n+ var validationDbConnectionFactory = new AzureSqlConnectionFactory(connectionString, secretInjector);\n+\n+ builder.Register(c => new ValidationEntitiesContext(CreateDbConnection(validationDbConnectionFactory)))\n.AsSelf()\n.InstancePerLifetimeScope();\n@@ -418,9 +428,9 @@ private static void ConfigureValidationAdmin(ContainerBuilder builder, Configura\n.InstancePerLifetimeScope();\n}\n- private void RegisterAsynchronousValidation(ContainerBuilder builder, ConfigurationService configuration)\n+ private void RegisterAsynchronousValidation(ContainerBuilder builder, ConfigurationService configuration, ISecretInjector secretInjector)\n{\n- ConfigureValidationAdmin(builder, configuration);\n+ ConfigureValidationAdmin(builder, configuration, secretInjector);\nbuilder\n.RegisterType<ServiceBusMessageSerializer>()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<PackageReference Include=\"NuGet.Protocol\">\n<Version>4.3.0-preview1-2524</Version>\n</PackageReference>\n- <PackageReference Include=\"NuGet.Services.Contracts\">\n- <Version>2.25.0-master-30191</Version>\n- </PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.25.0-master-30453</Version>\n+ <Version>2.26.0-master-33065</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n<Version>2.2.3</Version>\n<Version>3.0.29-r-master</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.ServiceBus\">\n- <Version>2.25.0-master-30191</Version>\n+ <Version>2.26.0-master-33065</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.25.0-master-30453</Version>\n+ <Version>2.26.0-master-33065</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.25.0-master-30191</Version>\n+ <Version>2.26.0-master-33065</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.25.0-master-30191</Version>\n+ <Version>2.26.0-master-33065</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Versioning\">\n<Version>4.3.0-preview1-2524</Version>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update validation db to support AAD authentication (#6013)
|
455,731 |
13.06.2018 10:48:56
| 25,200 |
896671c42478b471decbd5bf1f2835ecb971b37a
|
Certificates: disallow certificate management if email is unconfirmed
Resolve
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "var parent = (WebViewPage)TempData[\"Parent\"];\n}\n+@helper WarnForUnconfirmedEmailAddress()\n+{\n+ if (Model.IsOrganization)\n+ {\n+ @ViewHelpers.AlertWarning(@<text>You must confirm the organization's email address before you can register or manage certificates.</text>)\n+ }\n+ else\n+ {\n+ @ViewHelpers.AlertWarning(@<text>You must confirm your email address before you can register or manage certificates.</text>)\n+ }\n+}\n+\n@helper WarnFor2FARequirement()\n{\nif (Model.User.EnableMultiFactorAuthentication)\n</form>\n<div class=\"list-certificates\">\n+ @if (!Model.HasConfirmedEmailAddress)\n+ {\n+ @WarnForUnconfirmedEmailAddress()\n+ }\n+\n@if (!Model.WasMultiFactorAuthenticated && !User.WasAzureActiveDirectoryAccountUsedForSignin())\n{\n- @WarnFor2FARequirement();\n+ @WarnFor2FARequirement()\n}\n<div class=\"row\" data-bind=\"ifnot: $data && $data.hasCertificates && $data.hasCertificates()\">\n</div>\n</div>\n- @if ((Model.WasMultiFactorAuthenticated || User.WasAzureActiveDirectoryAccountUsedForSignin()) && Model.CanManage)\n+ @if ((Model.WasMultiFactorAuthenticated || User.WasAzureActiveDirectoryAccountUsedForSignin()) && Model.CanManage && Model.HasConfirmedEmailAddress)\n{\n<div class=\"collapse in row\" id=\"upload-certificate-form\" aria-expanded=\"true\">\n@Html.ValidationSummary(true)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Certificates: disallow certificate management if email is unconfirmed (#6057)
Resolve https://github.com/NuGet/NuGetGallery/issues/6036.
|
455,747 |
13.06.2018 12:54:11
| 25,200 |
5c7985af5e8957c5667328a352e8f06725d988c4
|
Fix Null ref on signin assistance
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -337,7 +337,7 @@ public virtual JsonResult SignInAssistance(string username, string providedEmail\nthrow new ArgumentException(Strings.UserNotFound);\n}\n- var email = user.EmailAddress;\n+ var email = user.EmailAddress ?? user.UnconfirmedEmailAddress;\nif (string.IsNullOrWhiteSpace(providedEmailAddress))\n{\nvar formattedEmail = FormatEmailAddressForAssistance(email);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -137,6 +137,29 @@ public void NullProvidedEmailReturnsFormattedEmail(string email, string expected\nAssert.Equal(expectedEmail, data.EmailAddress);\n}\n+ [Theory]\n+ [InlineData(\"random@address.com\", \"r**********m@address.com\")]\n+ [InlineData(\"rm@address.com\", \"r**********m@address.com\")]\n+ [InlineData(\"r@address.com\", \"r**********@address.com\")]\n+ [InlineData(\"random.very.long.address@address.com\", \"r**********s@address.com\")]\n+ public void NullProvidedEmailReturnsFormattedEmailForUnconfirmedAccount(string email, string expectedEmail)\n+ {\n+ var cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", identity: \"John Doe <random@address.com>\");\n+ var existingUser = new User(\"existingUser\") { UnconfirmedEmailAddress = email, Credentials = new[] { cred } };\n+\n+ GetMock<AuthenticationService>(); // Force a mock to be created\n+ GetMock<IUserService>()\n+ .Setup(u => u.FindByUsername(It.IsAny<string>(), false))\n+ .Returns(existingUser);\n+\n+ var controller = GetController<AuthenticationController>();\n+\n+ var result = controller.SignInAssistance(username: \"existingUser\", providedEmailAddress: null);\n+ dynamic data = result.Data;\n+ Assert.True(data.success);\n+ Assert.Equal(expectedEmail, data.EmailAddress);\n+ }\n+\n[Theory]\n[InlineData(\"blarg\")]\n[InlineData(\"wrong@email\")]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix Null ref on signin assistance (#6062)
|
455,758 |
13.06.2018 22:50:55
| -3,600 |
8f29dbfe5eed944ed379940ed3436910a055dc46
|
Add missing statistics data when using SQL storage
Fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"new_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"diff": "@@ -16,8 +16,9 @@ public class SqlAggregateStatsService : IAggregateStatsService\n// Note the NOLOCK hints here!\nprivate static readonly string GetStatisticsSql = @\"SELECT\n+ (SELECT SUM([DownloadCount]) FROM PackageRegistrations WITH (NOLOCK)) As Downloads,\n(SELECT COUNT([Key]) FROM PackageRegistrations pr WITH (NOLOCK)\n- WHERE EXISTS (SELECT 1 FROM Packages p WITH (NOLOCK) WHERE p.PackageRegistrationKey = pr.[Key] AND p.Listed = 1 AND p.PackageDelete_Key IS NULL)) AS UniquePackages,\n+ WHERE EXISTS (SELECT 1 FROM Packages p WITH (NOLOCK) WHERE p.PackageRegistrationKey = pr.[Key] AND p.Listed = 1 AND p.PackageStatusKey = 0)) AS UniquePackages,\n(SELECT COUNT([Key]) FROM Packages WITH (NOLOCK) WHERE Listed = 1) AS TotalPackages\";\npublic SqlAggregateStatsService(IAppConfiguration configuration, IIndex<string, ISqlConnectionFactory> connectionFactories)\n@@ -46,8 +47,9 @@ public Task<AggregateStats> GetAggregateStats()\nreturn Task.FromResult(new AggregateStats\n{\n- UniquePackages = reader.IsDBNull(0) ? 0 : reader.GetInt32(0),\n- TotalPackages = reader.IsDBNull(1) ? 0 : reader.GetInt32(1)\n+ Downloads = reader.IsDBNull(0) ? 0 : reader.GetInt32(0),\n+ UniquePackages = reader.IsDBNull(1) ? 0 : reader.GetInt32(1),\n+ TotalPackages = reader.IsDBNull(2) ? 0 : reader.GetInt32(2)\n});\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add missing statistics data when using SQL storage (#6028)
Fixes https://github.com/NuGet/NuGetGallery/issues/6026
|
455,794 |
13.06.2018 15:04:39
| 25,200 |
7def023f351bc6e69162289086062821d786ed05
|
Setup: packageRef migration fix
|
[
{
"change_type": "MODIFY",
"old_path": "tools/Update-Databases.ps1",
"new_path": "tools/Update-Databases.ps1",
"diff": "@@ -5,7 +5,7 @@ param(\nfunction Initialize-MigrateExe() {\n[string] $migrateDirectory = [System.IO.Path]::Combine($PSScriptRoot, '__temp_migrate_directory_' + [guid]::NewGuid().ToString(\"N\") )\n- [string] $efDirectory = [System.IO.Path]::Combine($PSScriptRoot, '..\\packages\\EntityFramework.6.1.3')\n+ [string] $efDirectory = [System.IO.Path]::Combine($PSScriptRoot, '${env:userprofile}\\.nuget\\packages\\EntityFramework\\6.1.3')\n[string] $migrate = ([System.IO.Path]::Combine($migrateDirectory, 'migrate.exe'))\nif (-not (New-Item -ItemType Directory -Path $migrateDirectory -Force).Exists) {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Setup: packageRef migration fix (#6059)
|
455,794 |
13.06.2018 15:05:23
| 25,200 |
fa038068e0dbc8fb8d52fb00ed58527901627bb8
|
Autofac upgrade and cleanup
|
[
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"Autofac\">\n- <Version>3.5.2</Version>\n+ <Version>4.6.2</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.Extensions.CommandLineUtils\">\n<Version>1.1.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -107,7 +107,8 @@ protected override void Load(ContainerBuilder builder)\nbuilder.RegisterInstance(galleryDbConnectionFactory)\n.AsSelf()\n- .Keyed<ISqlConnectionFactory>(nameof(EntitiesContext));\n+ .As<ISqlConnectionFactory>()\n+ .SingleInstance();\nbuilder.Register(c => new EntitiesContext(CreateDbConnection(galleryDbConnectionFactory), configuration.Current.ReadOnlyMode))\n.AsSelf()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/AdminAreaRegistration.cs",
"new_path": "src/NuGetGallery/Areas/Admin/AdminAreaRegistration.cs",
"diff": "@@ -16,10 +16,10 @@ public class AdminAreaRegistration : AreaRegistration\npublic override void RegisterArea(AreaRegistrationContext context)\n{\n- var config = DependencyResolver.Current.GetService<IIndex<string, ISqlConnectionFactory>>();\n+ var galleryDbConnectionFactory = DependencyResolver.Current.GetService<ISqlConnectionFactory>();\ncontext.Routes.Ignore(\"Admin/Errors.axd/{*pathInfo}\"); // ELMAH owns this root\n- DynamicDataManager.Register(context.Routes, \"Admin/Database\", config);\n+ DynamicDataManager.Register(context.Routes, \"Admin/Database\", galleryDbConnectionFactory);\ncontext.MapRoute(\n\"Admin_default\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/DynamicData/DynamicDataManager.cs",
"new_path": "src/NuGetGallery/Areas/Admin/DynamicData/DynamicDataManager.cs",
"diff": "using System.Threading.Tasks;\nusing System.Web.DynamicData;\nusing System.Web.Routing;\n-using Autofac.Features.Indexed;\nusing Microsoft.AspNet.DynamicData.ModelProviders;\nusing NuGet.Services.Sql;\n@@ -21,13 +20,13 @@ public class DynamicDataManager\nprivate static DynamicDataRoute _route;\n- public static void Register(RouteCollection routes, string root, IIndex<string, ISqlConnectionFactory> connectionFactories)\n+ public static void Register(RouteCollection routes, string root, ISqlConnectionFactory galleryDbSqlConnectionFactory)\n{\n// Set up unobtrusive validation\nInitializeValidation();\n// Set up dynamic data\n- InitializeDynamicData(routes, root, connectionFactories[nameof(EntitiesContext)]);\n+ InitializeDynamicData(routes, root, galleryDbSqlConnectionFactory);\n}\nprivate static void InitializeValidation()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>1.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"Autofac\">\n- <Version>3.5.2</Version>\n+ <Version>4.6.2</Version>\n</PackageReference>\n<PackageReference Include=\"Autofac.Mvc5\">\n- <Version>3.3.4</Version>\n+ <Version>4.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"Autofac.Mvc5.Owin\">\n- <Version>3.1.0</Version>\n+ <Version>4.0.1</Version>\n</PackageReference>\n<PackageReference Include=\"Autofac.Owin\">\n- <Version>3.1.0</Version>\n+ <Version>4.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"Autofac.WebApi2\">\n- <Version>3.4.0</Version>\n+ <Version>4.1.0</Version>\n</PackageReference>\n<PackageReference Include=\"CommonMark.NET\">\n<Version>0.15.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"new_path": "src/NuGetGallery/Services/SqlAggregateStatsService.cs",
"diff": "@@ -21,10 +21,10 @@ public class SqlAggregateStatsService : IAggregateStatsService\nWHERE EXISTS (SELECT 1 FROM Packages p WITH (NOLOCK) WHERE p.PackageRegistrationKey = pr.[Key] AND p.Listed = 1 AND p.PackageStatusKey = 0)) AS UniquePackages,\n(SELECT COUNT([Key]) FROM Packages WITH (NOLOCK) WHERE Listed = 1) AS TotalPackages\";\n- public SqlAggregateStatsService(IAppConfiguration configuration, IIndex<string, ISqlConnectionFactory> connectionFactories)\n+ public SqlAggregateStatsService(IAppConfiguration configuration, ISqlConnectionFactory galleryDbConnectionFactory)\n{\n_configuration = configuration;\n- _connectionFactory = connectionFactories[nameof(EntitiesContext)];\n+ _connectionFactory = galleryDbConnectionFactory;\n}\npublic Task<AggregateStats> GetAggregateStats()\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=\"Autofac.Integration.Owin\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Diagnostics.Tracing\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Autofac\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-3.5.0.0\" newVersion=\"3.5.0.0\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.6.2.0\" newVersion=\"4.6.2.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.IO\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -63,9 +63,11 @@ public void GivenNoAuthenticatedUser_ItLoadsProvidersIntoViewModelAndDisplaysLog\nAssert.NotNull(model.SignIn);\nAssert.NotNull(model.Register);\nAssert.Equal(3, model.Providers.Count);\n- Assert.Equal(\"AzureActiveDirectoryV2\", model.Providers[0].ProviderName);\n- Assert.Equal(\"AzureActiveDirectory\", model.Providers[1].ProviderName);\n- Assert.Equal(\"MicrosoftAccount\", model.Providers[2].ProviderName);\n+\n+ var providerNames = model.Providers.Select(p => p.ProviderName);\n+ Assert.Contains(\"AzureActiveDirectoryV2\", providerNames);\n+ Assert.Contains(\"AzureActiveDirectory\", providerNames);\n+ Assert.Contains(\"MicrosoftAccount\", providerNames);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/TestContainer.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/TestContainer.cs",
"diff": "@@ -30,7 +30,6 @@ protected TController GetController<TController>()\n{\nvar updater = new ContainerBuilder();\nupdater.RegisterType<TController>().PropertiesAutowired().AsSelf();\n- updater.Update(Container);\n}\nvar c = Container.Resolve<TController>();\n@@ -63,7 +62,6 @@ protected TService GetService<TService>()\n{\nvar updater = new ContainerBuilder();\nupdater.RegisterType<TService>().AsImplementedInterfaces().AsSelf();\n- updater.Update(Container);\nreturn Get<TService>();\n}\n@@ -89,7 +87,9 @@ protected FakeEntitiesContext GetFakeContext()\nupdater.RegisterInstance(new EntityRepository<PackageRegistration>(fakeContext))\n.As<IEntityRepository<PackageRegistration>>();\n+#pragma warning disable CS0618 // Type or member is obsolete\nupdater.Update(Container);\n+#pragma warning restore CS0618 // Type or member is obsolete\nreturn fakeContext;\n}\n@@ -125,7 +125,9 @@ protected T Get<T>()\nvar updater = new ContainerBuilder();\nupdater.RegisterInstance(mockInstance).As<T>();\n+#pragma warning disable CS0618 // Type or member is obsolete\nupdater.Update(Container);\n+#pragma warning restore CS0618 // Type or member is obsolete\n}\nT instance = Container.Resolve<T>();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Autofac upgrade and cleanup (#6058)
|
455,794 |
13.06.2018 15:24:02
| 25,200 |
f1bdc130352e38337591752001d460eef1923356
|
Regression fix: validation db dependency
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -407,7 +407,7 @@ private static DbConnection CreateDbConnection(ISqlConnectionFactory connectionF\nreturn Task.Run(() => connectionFactory.CreateAsync()).Result;\n}\n- private static void ConfigureValidationAdmin(ContainerBuilder builder, ConfigurationService configuration, ISecretInjector secretInjector)\n+ private static void ConfigureValidationEntitiesContext(ContainerBuilder builder, ConfigurationService configuration, ISecretInjector secretInjector)\n{\nvar connectionString = configuration.Current.SqlConnectionStringValidation;\nvar validationDbConnectionFactory = new AzureSqlConnectionFactory(connectionString, secretInjector);\n@@ -423,16 +423,10 @@ private static void ConfigureValidationAdmin(ContainerBuilder builder, Configura\nbuilder.RegisterType<ValidationEntityRepository<PackageValidation>>()\n.As<IEntityRepository<PackageValidation>>()\n.InstancePerLifetimeScope();\n-\n- builder.RegisterType<ValidationAdminService>()\n- .AsSelf()\n- .InstancePerLifetimeScope();\n}\nprivate void RegisterAsynchronousValidation(ContainerBuilder builder, ConfigurationService configuration, ISecretInjector secretInjector)\n{\n- ConfigureValidationAdmin(builder, configuration, secretInjector);\n-\nbuilder\n.RegisterType<ServiceBusMessageSerializer>()\n.As<IServiceBusMessageSerializer>();\n@@ -443,6 +437,8 @@ private void RegisterAsynchronousValidation(ContainerBuilder builder, Configurat\nif (configuration.Current.AsynchronousPackageValidationEnabled)\n{\n+ ConfigureValidationEntitiesContext(builder, configuration, secretInjector);\n+\nbuilder\n.RegisterType<AsynchronousPackageValidationInitiator>()\n.As<IPackageValidationInitiator>();\n@@ -466,6 +462,10 @@ private void RegisterAsynchronousValidation(ContainerBuilder builder, Configurat\n.RegisterType<ImmediatePackageValidator>()\n.As<IPackageValidationInitiator>();\n}\n+\n+ builder.RegisterType<ValidationAdminService>()\n+ .AsSelf()\n+ .InstancePerLifetimeScope();\n}\nprivate static void ConfigureSearch(ContainerBuilder builder, IGalleryConfigurationService configuration)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ValidationService.cs",
"new_path": "src/NuGetGallery/Services/ValidationService.cs",
"diff": "@@ -24,14 +24,22 @@ public class ValidationService : IValidationService\nIAppConfiguration appConfiguration,\nIPackageService packageService,\nIPackageValidationInitiator initiator,\n- IEntityRepository<PackageValidationSet> validationSets,\n- ITelemetryService telemetryService)\n+ ITelemetryService telemetryService,\n+ IEntityRepository<PackageValidationSet> validationSets = null)\n{\n_appConfiguration = appConfiguration ?? throw new ArgumentNullException(nameof(appConfiguration));\n_packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n_initiator = initiator ?? throw new ArgumentNullException(nameof(initiator));\n- _validationSets = validationSets ?? throw new ArgumentNullException(nameof(validationSets));\n_telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n+\n+ _validationSets = validationSets;\n+\n+ // Validation database should not be accessed when async validation is disabled. Features\n+ // which depend on the database should be behind this feature flag.\n+ if (_appConfiguration.AsynchronousPackageValidationEnabled && _validationSets == null)\n+ {\n+ throw new ArgumentNullException(nameof(validationSets));\n+ }\n}\npublic async Task StartValidationAsync(Package package)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"diff": "@@ -395,8 +395,8 @@ public FactsBase()\n_appConfiguration.Object,\n_packageService.Object,\n_initiator.Object,\n- _validationSets.Object,\n- _telemetryService.Object);\n+ _telemetryService.Object,\n+ _validationSets.Object);\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Regression fix: validation db dependency (#6063)
|
455,794 |
13.06.2018 20:38:01
| 25,200 |
88603b7901e1467494a8045190e4099bb815be91
|
Defer open of DB connection to EF context
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>4.3.0-preview1-2524</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.26.0-master-33065</Version>\n+ <Version>2.26.0-master-33196</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n<Version>2.2.3</Version>\n<Version>3.0.29-r-master</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.ServiceBus\">\n- <Version>2.26.0-master-33065</Version>\n+ <Version>2.26.0-master-33196</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.26.0-master-33065</Version>\n+ <Version>2.26.0-master-33196</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.26.0-master-33065</Version>\n+ <Version>2.26.0-master-33196</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.26.0-master-33065</Version>\n+ <Version>2.26.0-master-33196</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Versioning\">\n<Version>4.3.0-preview1-2524</Version>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Defer open of DB connection to EF context (#6064)
|
455,759 |
14.06.2018 19:11:49
| -7,200 |
a33c01d393504e4ca264bcf8a508c9c30c19aad3
|
Package view table is not properly aligned after version deleted
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "rowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"deleted\">\n- <td class=\"version\">\n+ <td class=\"version\" colspan=\"2\">\n@packageVersion.FullVersion (deleted)\n</td>\n<td>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Package view table is not properly aligned after version deleted #5934 (#6067)
|
455,737 |
14.06.2018 14:58:49
| 25,200 |
ecfc4015110bbef60b740847fa817594f3051dab
|
Update client library references in preparation to consume an upcoming change.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Version>9.0.1</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Common\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Frameworks\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Packaging\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Packaging.Core\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Versioning\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</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>9.0.1</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Common\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Configuration\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Frameworks\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Packaging\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Packaging.Core\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Protocol\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n<Version>2.26.0-master-33196</Version>\n<Version>2.26.0-master-33196</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Versioning\">\n- <Version>4.3.0-preview1-2524</Version>\n+ <Version>4.8.0-preview1.5156</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update client library references in preparation to consume an upcoming change. (#6066)
|
455,759 |
15.06.2018 06:54:28
| -7,200 |
9596762944b2f1372859d5e78b956b2545fb20f7
|
Package that failed validation is visible under "Published Packages" heading
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -442,12 +442,12 @@ public virtual ActionResult Packages()\nvar packages = PackageService.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\nvar listedPackages = packages\n- .Where(p => p.Listed)\n+ .Where(p => p.Listed && p.PackageStatusKey == PackageStatus.Available)\n.Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasAADLoginOrMultiFactorAuthenticated))\n.OrderBy(p => p.Id)\n.ToList();\nvar unlistedPackages = packages\n- .Where(p => !p.Listed)\n+ .Where(p => !p.Listed || p.PackageStatusKey != PackageStatus.Available)\n.Select(p => new ListPackageItemRequiredSignerViewModel(p, currentUser, SecurityPolicyService, wasAADLoginOrMultiFactorAuthenticated))\n.OrderBy(p => p.Id)\n.ToList();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Package that failed validation is visible under "Published Packages" heading #5375 (#6068)
|
455,776 |
19.06.2018 10:37:26
| 25,200 |
8af099187fb447c1f4f7976bfe3678203ca6c8cc
|
Allow packages that failed validation to be reuploaded
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "using System.Net;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\n-using System.Web.UI;\nusing Newtonsoft.Json.Linq;\nusing NuGet.Frameworks;\nusing NuGet.Packaging;\n@@ -53,6 +52,7 @@ public partial class ApiController\nprotected ISecurityPolicyService SecurityPolicyService { get; set; }\npublic IReservedNamespaceService ReservedNamespaceService { get; set; }\npublic IPackageUploadService PackageUploadService { get; set; }\n+ public IPackageDeleteService PackageDeleteService { get; set; }\nprotected ApiController()\n{\n@@ -78,7 +78,8 @@ protected ApiController()\nICredentialBuilder credentialBuilder,\nISecurityPolicyService securityPolicies,\nIReservedNamespaceService reservedNamespaceService,\n- IPackageUploadService packageUploadService)\n+ IPackageUploadService packageUploadService,\n+ IPackageDeleteService packageDeleteService)\n{\nApiScopeEvaluator = apiScopeEvaluator;\nEntitiesContext = entitiesContext;\n@@ -122,11 +123,12 @@ protected ApiController()\nICredentialBuilder credentialBuilder,\nISecurityPolicyService securityPolicies,\nIReservedNamespaceService reservedNamespaceService,\n- IPackageUploadService packageUploadService)\n+ IPackageUploadService packageUploadService,\n+ IPackageDeleteService packageDeleteService)\n: this(apiScopeEvaluator, entitiesContext, packageService, packageFileService, userService, contentService,\nindexingService, searchService, autoCuratePackage, statusService, messageService, auditingService,\nconfigurationService, telemetryService, authenticationService, credentialBuilder, securityPolicies,\n- reservedNamespaceService, packageUploadService)\n+ reservedNamespaceService, packageUploadService, packageDeleteService)\n{\nStatisticsService = statisticsService;\n}\n@@ -441,21 +443,28 @@ private async Task<ActionResult> CreatePackageInternal()\nstring.Format(CultureInfo.CurrentCulture, Strings.PackageIsLocked, packageRegistration.Id));\n}\n- // Check if a particular Id-Version combination already exists. We eventually need to remove this check.\n- string normalizedVersion = version.ToNormalizedString();\n- bool packageExists =\n- packageRegistration.Packages.Any(\n- p => string.Equals(\n- p.NormalizedVersion,\n- normalizedVersion,\n- StringComparison.OrdinalIgnoreCase));\n+ var nuspecVersion = nuspec.GetVersion();\n+ var existingPackage = PackageService.FindPackageByIdAndVersionStrict(nuspec.GetId(), nuspecVersion.ToStringSafe());\n+ if (existingPackage != null)\n+ {\n+ if (existingPackage.PackageStatusKey == PackageStatus.FailedValidation)\n+ {\n+ TelemetryService.TrackPackageReupload(existingPackage);\n- if (packageExists)\n+ await PackageDeleteService.HardDeletePackagesAsync(\n+ new[] { existingPackage },\n+ currentUser,\n+ Strings.FailedValidationHardDeleteReason,\n+ Strings.AutomatedPackageDeleteSignature,\n+ deleteEmptyPackageRegistration: false);\n+ }\n+ else\n{\nreturn new HttpStatusCodeWithBodyResult(\nHttpStatusCode.Conflict,\nstring.Format(CultureInfo.CurrentCulture, Strings.PackageExistsAndCannotBeModified,\n- id, nuspec.GetVersion().ToNormalizedStringSafe()));\n+ id, nuspecVersion.ToNormalizedStringSafe()));\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -359,6 +359,20 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nvar nuspecVersion = nuspec.GetVersion();\nvar existingPackage = _packageService.FindPackageByIdAndVersionStrict(nuspec.GetId(), nuspecVersion.ToStringSafe());\nif (existingPackage != null)\n+ {\n+ if (existingPackage.PackageStatusKey == PackageStatus.FailedValidation)\n+ {\n+ _telemetryService.TrackPackageReupload(existingPackage);\n+\n+ // Packages that failed validation can be reuploaded.\n+ await _packageDeleteService.HardDeletePackagesAsync(\n+ new[] { existingPackage },\n+ currentUser,\n+ Strings.FailedValidationHardDeleteReason,\n+ Strings.AutomatedPackageDeleteSignature,\n+ deleteEmptyPackageRegistration: false);\n+ }\n+ else\n{\n// Determine if the package versions only differ by metadata,\n// and provide the most optimal the user-facing error message.\n@@ -388,6 +402,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nreturn Json(HttpStatusCode.Conflict, new[] { message });\n}\n+ }\nawait _uploadFileService.SaveUploadFileAsync(currentUser.Key, uploadStream);\n}\n@@ -896,7 +911,7 @@ private void NotifyReportMyPackageSupportRequest(ReportMyPackageViewModel report\nnew[] { package },\nuser,\nreason,\n- signature: Strings.UserPackageDeleteSignature);\n+ signature: Strings.AutomatedPackageDeleteSignature);\ndeleted = true;\n}\ncatch (Exception e)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -19,6 +19,8 @@ public interface ITelemetryService\nvoid TrackPackageDelete(Package package, bool isHardDelete);\n+ void TrackPackageReupload(Package package);\n+\nvoid TrackPackageReflow(Package package);\nvoid TrackPackageHardDeleteReflow(string packageId, string packageVersion);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -31,6 +31,7 @@ internal class Events\npublic const string PackageUnlisted = \"PackageUnlisted\";\npublic const string PackageListed = \"PackageListed\";\npublic const string PackageDelete = \"PackageDelete\";\n+ public const string PackageReupload = \"PackageReupload\";\npublic const string PackageHardDeleteReflow = \"PackageHardDeleteReflow\";\npublic const string PackageRevalidate = \"PackageRevalidate\";\npublic const string OrganizationTransformInitiated = \"OrganizationTransformInitiated\";\n@@ -263,6 +264,11 @@ public void TrackPackageDelete(Package package, bool isHardDelete)\n});\n}\n+ public void TrackPackageReupload(Package package)\n+ {\n+ TrackMetricForPackage(Events.PackageReupload, package);\n+ }\n+\npublic void TrackPackageReflow(Package package)\n{\nTrackMetricForPackage(Events.PackageReflow, package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -478,6 +478,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to (automated).\n+ /// </summary>\n+ public static string AutomatedPackageDeleteSignature {\n+ get {\n+ return ResourceManager.GetString(\"AutomatedPackageDeleteSignature\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Azure Active Directory account.\n/// </summary>\n@@ -895,6 +904,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Automatic hard-delete for reupload of package that failed validation.\n+ /// </summary>\n+ public static string FailedValidationHardDeleteReason {\n+ get {\n+ return ResourceManager.GetString(\"FailedValidationHardDeleteReason\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The API key '{0}' is invalid..\n/// </summary>\n@@ -2164,15 +2182,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to (automated).\n- /// </summary>\n- public static string UserPackageDeleteSignature {\n- get {\n- return ResourceManager.GetString(\"UserPackageDeleteSignature\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to This support request is intended for automatic package deletion..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -631,7 +631,7 @@ For more information, please contact '{2}'.</value>\n<data name=\"UserPackageDeleteDecisionIsRequired\" xml:space=\"preserve\">\n<value>You must choose whether to delete the package or contact support.</value>\n</data>\n- <data name=\"UserPackageDeleteSignature\" xml:space=\"preserve\">\n+ <data name=\"AutomatedPackageDeleteSignature\" xml:space=\"preserve\">\n<value>(automated)</value>\n</data>\n<data name=\"UserPackageDeleteSupportRequestMessage\" xml:space=\"preserve\">\n@@ -908,4 +908,7 @@ If you would like to update the linked Microsoft account you can do so from the\n<data name=\"InvalidRecaptchaResponse\" xml:space=\"preserve\">\n<value>Recaptcha response was not valid. Try again or email support if you need assistance.</value>\n</data>\n+ <data name=\"FailedValidationHardDeleteReason\" xml:space=\"preserve\">\n+ <value>Automatic hard-delete for reupload of package that failed validation</value>\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": "@@ -46,6 +46,7 @@ internal class TestableApiController\npublic Mock<ISecurityPolicyService> MockSecurityPolicyService { get; private set; }\npublic Mock<IReservedNamespaceService> MockReservedNamespaceService { get; private set; }\npublic Mock<IPackageUploadService> MockPackageUploadService { get; private set; }\n+ public Mock<IPackageDeleteService> MockPackageDeleteService { get; set; }\nprivate Stream PackageFromInputStream { get; set; }\n@@ -66,6 +67,7 @@ internal class TestableApiController\nSecurityPolicyService = (MockSecurityPolicyService = new Mock<ISecurityPolicyService>()).Object;\nReservedNamespaceService = (MockReservedNamespaceService = new Mock<IReservedNamespaceService>()).Object;\nPackageUploadService = (MockPackageUploadService = new Mock<IPackageUploadService>()).Object;\n+ PackageDeleteService = (MockPackageDeleteService = new Mock<IPackageDeleteService>()).Object;\nSetupApiScopeEvaluatorOnAllInputs();\n@@ -351,8 +353,11 @@ public async Task CreatePackageReturns400IfPackageIdIsInvalid(string packageId)\nResultAssert.IsStatusCode(result, HttpStatusCode.BadRequest);\n}\n- [Fact]\n- public async Task WillReturnConflictIfAPackageWithTheIdAndSameNormalizedVersionAlreadyExists()\n+ [Theory]\n+ [InlineData(PackageStatus.Available)]\n+ [InlineData(PackageStatus.Deleted)]\n+ [InlineData(PackageStatus.Validating)]\n+ public async Task WillReturnConflictIfAPackageWithTheIdAndSameNormalizedVersionAlreadyExists(PackageStatus status)\n{\nvar id = \"theId\";\nvar version = \"1.0.42\";\n@@ -360,28 +365,92 @@ public async Task WillReturnConflictIfAPackageWithTheIdAndSameNormalizedVersionA\nvar user = new User() { EmailAddress = \"confirmed1@email.com\" };\n+ var conflictingPackage = new Package { Version = version, NormalizedVersion = version, PackageStatusKey = status };\nvar packageRegistration = new PackageRegistration\n{\nId = id,\n- Packages = new List<Package> { new Package { Version = version, NormalizedVersion = version } },\n+ Packages = new List<Package> { conflictingPackage },\nOwners = new List<User> { user }\n};\nvar controller = new TestableApiController(GetConfigurationService());\ncontroller.SetCurrentUser(new User() { EmailAddress = \"confirmed2@email.com\" });\ncontroller.MockPackageService.Setup(x => x.FindPackageRegistrationById(id)).Returns(packageRegistration);\n+ controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(id, version)).Returns(conflictingPackage);\ncontroller.SetupPackageFromInputStream(nuGetPackage);\n// Act\nvar result = await controller.CreatePackagePut();\n// Assert\n+ controller.MockPackageDeleteService.Verify(\n+ x => x.HardDeletePackagesAsync(\n+ It.IsAny<IEnumerable<Package>>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ It.IsAny<bool>()),\n+ Times.Never());\n+\n+ controller.MockTelemetryService.Verify(\n+ x => x.TrackPackageReupload(It.IsAny<Package>()),\n+ Times.Never());\n+\nResultAssert.IsStatusCode(\nresult,\nHttpStatusCode.Conflict,\nString.Format(Strings.PackageExistsAndCannotBeModified, id, version));\n}\n+ [Fact]\n+ public async Task WillAllowReuploadingPackageIfFailedValidation()\n+ {\n+ var id = \"theId\";\n+ var version = \"1.0.42\";\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(id, version);\n+\n+ var user = new User() { EmailAddress = \"confirmed1@email.com\" };\n+\n+ var conflictingPackage = new Package { Version = version, NormalizedVersion = version, PackageStatusKey = PackageStatus.FailedValidation };\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = id,\n+ Packages = new List<Package> { conflictingPackage },\n+ Owners = new List<User> { user }\n+ };\n+\n+ var currentUser = new User() { EmailAddress = \"confirmed2@email.com\" };\n+\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.SetCurrentUser(currentUser);\n+ controller.MockPackageService.Setup(x => x.FindPackageRegistrationById(id)).Returns(packageRegistration);\n+ controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(id, version)).Returns(conflictingPackage);\n+ controller.SetupPackageFromInputStream(nuGetPackage);\n+\n+ // Act\n+ var result = await controller.CreatePackagePut();\n+\n+ // Assert\n+ controller.MockPackageDeleteService.Verify(\n+ x => x.HardDeletePackagesAsync(\n+ new[] { conflictingPackage },\n+ currentUser,\n+ Strings.FailedValidationHardDeleteReason,\n+ Strings.AutomatedPackageDeleteSignature,\n+ false),\n+ Times.Once());\n+\n+ controller.MockTelemetryService.Verify(\n+ x => x.TrackPackageReupload(conflictingPackage),\n+ Times.Once());\n+\n+ controller.MockPackageUploadService.Verify(\n+ x => x.CommitPackageAsync(\n+ It.IsAny<Package>(),\n+ It.IsAny<Stream>()),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillReturnConflictIfCommittingPackageReturnsConflict()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -2998,7 +2998,7 @@ public async Task AllowsPackageDelete(User currentUser, User owner)\nIt.Is<IEnumerable<Package>>(p => p.First() == _package),\ncurrentUser,\nEnumHelper.GetDescription(_viewModel.Reason.Value),\n- Strings.UserPackageDeleteSignature),\n+ Strings.AutomatedPackageDeleteSignature),\nTimes.Once);\n_supportRequestService.Verify(\nx => x.UpdateIssueAsync(\n@@ -3058,7 +3058,7 @@ public async Task TreatsDeleteFailureAsNormalRequest(User currentUser, User owne\nIt.Is<IEnumerable<Package>>(p => p.First() == _package),\ncurrentUser,\nEnumHelper.GetDescription(_viewModel.Reason.Value),\n- Strings.UserPackageDeleteSignature),\n+ Strings.AutomatedPackageDeleteSignature),\nTimes.Once);\n_supportRequestService.Verify(\nx => x.UpdateIssueAsync(\n@@ -3716,7 +3716,7 @@ public async Task WillUploadThePackageWhenIdMatchesOwnedNamespace(User currentUs\nAssert.Equal(reservedNamespaceOwner.Username, model.PossibleOwners.Single());\n}\n- public static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageAlreadyExists_Data\n+ public static IEnumerable<object[]> PackageAlreadyExists_Data\n{\nget\n{\n@@ -3728,7 +3728,7 @@ public static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageAlrea\n}\n[Theory]\n- [MemberData(nameof(WillShowTheViewWithErrorsWhenThePackageAlreadyExists_Data))]\n+ [MemberData(nameof(PackageAlreadyExists_Data))]\npublic async Task WillUploadThePackageWhenIdMatchesUnownedNamespaceButPackageExists(User currentUser, User existingPackageOwner)\n{\nvar packageId = \"Random.Package1\";\n@@ -3773,9 +3773,14 @@ public async Task WillUploadThePackageWhenIdMatchesUnownedNamespaceButPackageExi\nAssert.Equal(existingPackageOwner.Username, model.PossibleOwners.Single());\n}\n+ public static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageAlreadyExists_Data =>\n+ MemberDataHelper.Combine(\n+ PackageAlreadyExists_Data,\n+ MemberDataHelper.AsDataSet(PackageStatus.Available, PackageStatus.Deleted, PackageStatus.Validating));\n+\n[Theory]\n[MemberData(nameof(WillShowTheViewWithErrorsWhenThePackageAlreadyExists_Data))]\n- public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists(User currentUser, User existingPackageOwner)\n+ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists(User currentUser, User existingPackageOwner, PackageStatus status)\n{\nvar fakeUploadedFile = new Mock<HttpPostedFileBase>();\nfakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n@@ -3783,10 +3788,14 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists(User curr\nfakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\nvar fakePackageService = new Mock<IPackageService>();\nfakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(\n- new Package { PackageRegistration = new PackageRegistration { Id = \"theId\", Owners = new[] { existingPackageOwner } }, Version = \"1.0.0\" });\n+ new Package { PackageRegistration = new PackageRegistration { Id = \"theId\", Owners = new[] { existingPackageOwner } }, Version = \"1.0.0\", PackageStatusKey = status });\n+ var fakePackageDeleteService = new Mock<IPackageDeleteService>();\n+ var fakeTelemetryService = new Mock<ITelemetryService>();\nvar controller = CreateController(\nGetConfigurationService(),\n- packageService: fakePackageService);\n+ packageService: fakePackageService,\n+ packageDeleteService: fakePackageDeleteService,\n+ telemetryService: fakeTelemetryService);\ncontroller.SetCurrentUser(currentUser);\nvar result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;\n@@ -3796,10 +3805,25 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists(User curr\nAssert.Equal(\nString.Format(Strings.PackageExistsAndCannotBeModified, \"theId\", \"1.0.0\"),\ncontroller.ModelState[String.Empty].Errors[0].ErrorMessage);\n+ fakePackageDeleteService.Verify(\n+ x => x.HardDeletePackagesAsync(\n+ It.IsAny<IEnumerable<Package>>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ It.IsAny<bool>()),\n+ Times.Never());\n+\n+ fakeTelemetryService.Verify(\n+ x => x.TrackPackageReupload(It.IsAny<Package>()),\n+ Times.Never());\n}\n- [Fact]\n- public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExistsAndOnlyDiffersByMetadata()\n+ [Theory]\n+ [InlineData(PackageStatus.Available)]\n+ [InlineData(PackageStatus.Deleted)]\n+ [InlineData(PackageStatus.Validating)]\n+ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExistsAndOnlyDiffersByMetadata(PackageStatus status)\n{\nvar fakeUploadedFile = new Mock<HttpPostedFileBase>();\nfakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n@@ -3808,9 +3832,13 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExistsAndOnlyDif\nvar fakePackageService = new Mock<IPackageService>();\nfakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(\nnew Package { PackageRegistration = new PackageRegistration { Id = \"theId\" }, Version = \"1.0.0+metadata\" });\n+ var fakePackageDeleteService = new Mock<IPackageDeleteService>();\n+ var fakeTelemetryService = new Mock<ITelemetryService>();\nvar controller = CreateController(\nGetConfigurationService(),\n- packageService: fakePackageService);\n+ packageService: fakePackageService,\n+ packageDeleteService: fakePackageDeleteService,\n+ telemetryService: fakeTelemetryService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;\n@@ -3820,6 +3848,67 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExistsAndOnlyDif\nAssert.Equal(\nString.Format(Strings.PackageVersionDiffersOnlyByMetadataAndCannotBeModified, \"theId\", \"1.0.0+metadata\"),\ncontroller.ModelState[String.Empty].Errors[0].ErrorMessage);\n+ fakePackageDeleteService.Verify(\n+ x => x.HardDeletePackagesAsync(\n+ It.IsAny<IEnumerable<Package>>(),\n+ It.IsAny<User>(),\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ It.IsAny<bool>()),\n+ Times.Never());\n+\n+ fakeTelemetryService.Verify(\n+ x => x.TrackPackageReupload(It.IsAny<Package>()),\n+ Times.Never());\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(PackageAlreadyExists_Data))]\n+ public async Task WillReuploadThePackageWhenPackageFailedValidation(User currentUser, User existingPackageOwner)\n+ {\n+ var id = \"theId\";\n+ var version = \"1.0.0\";\n+ Func<Package, bool> isPackage = (Package p) => p.PackageRegistration.Id == id && p.Version == version;\n+\n+ var fakeUploadedFile = new Mock<HttpPostedFileBase>();\n+ fakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n+ var fakeFileStream = TestPackage.CreateTestPackageStream(id, version);\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+ var fakePackageService = new Mock<IPackageService>();\n+ fakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(\n+ new Package { PackageRegistration = new PackageRegistration { Id = id, Owners = new[] { existingPackageOwner } }, Version = version, PackageStatusKey = PackageStatus.FailedValidation });\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(currentUser.Key)).Returns(Task.FromResult(0));\n+ fakeUploadFileService.SetupSequence(x => x.GetUploadFileAsync(currentUser.Key))\n+ .Returns(Task.FromResult<Stream>(null))\n+ .Returns(Task.FromResult(fakeFileStream));\n+ fakeUploadFileService.Setup(x => x.SaveUploadFileAsync(currentUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));\n+ var fakePackageDeleteService = new Mock<IPackageDeleteService>();\n+ var fakeTelemetryService = new Mock<ITelemetryService>();\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: fakePackageService,\n+ packageDeleteService: fakePackageDeleteService,\n+ uploadFileService: fakeUploadFileService,\n+ telemetryService: fakeTelemetryService);\n+ controller.SetCurrentUser(currentUser);\n+\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;\n+\n+ Assert.NotNull(result);\n+ Assert.True(result.Data is VerifyPackageRequest);\n+ fakePackageDeleteService.Verify(\n+ x => x.HardDeletePackagesAsync(\n+ It.Is<IEnumerable<Package>>(packages => isPackage(packages.Single())),\n+ currentUser,\n+ Strings.FailedValidationHardDeleteReason,\n+ Strings.AutomatedPackageDeleteSignature,\n+ false),\n+ Times.Once());\n+\n+ fakeTelemetryService.Verify(\n+ x => x.TrackPackageReupload(It.Is<Package>(package => isPackage(package))),\n+ Times.Once());\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/MemberDataHelper.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/MemberDataHelper.cs",
"diff": "@@ -13,6 +13,11 @@ public static object[] AsData(params object[] data)\nreturn data;\n}\n+ public static IEnumerable<object[]> AsDataSet(params object[] dataSet)\n+ {\n+ return dataSet.Select(d => new[] { d });\n+ }\n+\npublic static IEnumerable<object[]> Combine(IEnumerable<object[]> firstDataSet, IEnumerable<object[]> secondDataSet)\n{\nforeach (var firstData in firstDataSet)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -72,6 +72,10 @@ public static IEnumerable<object[]> TrackMetricNames_Data\n(TrackAction)(s => s.TrackPackageDelete(package, isHardDelete: true))\n};\n+ yield return new object[] { \"PackageReupload\",\n+ (TrackAction)(s => s.TrackPackageReupload(package))\n+ };\n+\nyield return new object[] { \"PackageReflow\",\n(TrackAction)(s => s.TrackPackageReflow(package))\n};\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Allow packages that failed validation to be reuploaded (#6065)
|
455,776 |
19.06.2018 16:53:31
| 25,200 |
b86c4cc1c7f20efc5bf6e06cd94bdd5ddb3dc2dc
|
Track metric for unexpected failed package pushes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -333,6 +333,11 @@ public virtual Task<ActionResult> CreatePackagePost()\n}\nprivate async Task<ActionResult> CreatePackageInternal()\n+ {\n+ string id = null;\n+ NuGetVersion version = null;\n+\n+ try\n{\nvar policyResult = await SecurityPolicyService.EvaluateUserPoliciesAsync(SecurityPolicyAction.PackagePush, HttpContext);\nif (!policyResult.Success)\n@@ -404,8 +409,8 @@ private async Task<ActionResult> CreatePackageInternal()\nUser owner;\n// Ensure that the user can push packages for this partialId.\n- var id = nuspec.GetId();\n- var version = nuspec.GetVersion();\n+ id = nuspec.GetId();\n+ version = nuspec.GetVersion();\nvar packageRegistration = PackageService.FindPackageRegistrationById(id);\nif (packageRegistration == null)\n{\n@@ -550,6 +555,12 @@ private async Task<ActionResult> CreatePackageInternal()\n}\n}\n}\n+ catch (Exception)\n+ {\n+ TelemetryService.TrackPackagePushFailureEvent(id, version);\n+ throw;\n+ }\n+ }\nprivate static ActionResult BadRequestForExceptionMessage(Exception ex)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1473,6 +1473,11 @@ internal virtual async Task<ActionResult> Edit(string id, string version, bool?\n[ValidateAntiForgeryToken]\n[ValidateInput(false)] // Security note: Disabling ASP.Net input validation which does things like disallow angle brackets in submissions. See http://go.microsoft.com/fwlink/?LinkID=212874\npublic virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formData)\n+ {\n+ string packageId = null;\n+ NuGetVersion packageVersion = null;\n+\n+ try\n{\nif (!ModelState.IsValid)\n{\n@@ -1539,8 +1544,8 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nSize = uploadFile.Length,\n};\n- var packageId = packageMetadata.Id;\n- var packageVersion = packageMetadata.Version;\n+ packageId = packageMetadata.Id;\n+ packageVersion = packageMetadata.Version;\nvar existingPackageRegistration = _packageService.FindPackageRegistrationById(packageId);\nif (existingPackageRegistration == null)\n@@ -1706,6 +1711,12 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n}\n}\n}\n+ catch (Exception)\n+ {\n+ _telemetryService.TrackPackagePushFailureEvent(packageId, packageVersion);\n+ throw;\n+ }\n+ }\nprivate async Task<PackageArchiveReader> SafeCreatePackage(User currentUser, Stream uploadFile)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Security.Principal;\n+using NuGet.Versioning;\nnamespace NuGetGallery\n{\n@@ -13,6 +14,8 @@ public interface ITelemetryService\nvoid TrackPackagePushEvent(Package package, User user, IIdentity identity);\n+ void TrackPackagePushFailureEvent(string id, NuGetVersion version);\n+\nvoid TrackPackageUnlisted(Package package);\nvoid TrackPackageListed(Package package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "using System.Collections.Generic;\nusing System.Security.Principal;\nusing System.Web;\n+using NuGet.Versioning;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Diagnostics;\n@@ -16,6 +17,7 @@ internal class Events\n{\npublic const string ODataQueryFilter = \"ODataQueryFilter\";\npublic const string PackagePush = \"PackagePush\";\n+ public const string PackagePushFailure = \"PackagePushFailure\";\npublic const string CreatePackageVerificationKey = \"CreatePackageVerificationKey\";\npublic const string VerifyPackageKey = \"VerifyPackageKey\";\npublic const string PackageReadMeChanged = \"PackageReadMeChanged\";\n@@ -170,6 +172,16 @@ public void TrackPackagePushEvent(Package package, User user, IIdentity identity\nTrackMetricForPackage(Events.PackagePush, package.PackageRegistration.Id, package.NormalizedVersion, user, identity);\n}\n+ public void TrackPackagePushFailureEvent(string id, NuGetVersion version)\n+ {\n+ TrackMetric(Events.PackagePushFailure, 1, properties => {\n+ properties.Add(ClientVersion, GetClientVersion());\n+ properties.Add(ProtocolVersion, GetProtocolVersion());\n+ properties.Add(PackageId, id);\n+ properties.Add(PackageVersion, version.ToNormalizedString());\n+ });\n+ }\n+\npublic void TrackPackagePushNamespaceConflictEvent(string packageId, string packageVersion, User user, IIdentity identity)\n{\nTrackMetricForPackage(Events.PackagePushNamespaceConflict, packageId, packageVersion, user, identity);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "using Moq;\nusing Newtonsoft.Json.Linq;\nusing NuGet.Packaging;\n+using NuGet.Versioning;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Configuration;\n@@ -178,6 +179,62 @@ public static IEnumerable<object[]> InvalidScopes_Data\npublic class TheCreatePackageAction\n: TestContainer\n{\n+ [Fact]\n+ public async Task CreatePackage_TracksFailureIfUnexpectedExceptionWithoutIdVersion()\n+ {\n+ // Arrange\n+ var controller = new TestableApiController(GetConfigurationService());\n+ controller.MockSecurityPolicyService\n+ .Setup(x => x.EvaluateUserPoliciesAsync(It.IsAny<SecurityPolicyAction>(), It.IsAny<HttpContextBase>()))\n+ .Throws<Exception>();\n+ var user = new User(\"test\") { Key = 1 };\n+ controller.SetCurrentUser(user);\n+\n+ // Act\n+ await Assert.ThrowsAnyAsync<Exception>(() => controller.CreatePackagePut());\n+\n+ // Assert\n+ controller.MockTelemetryService.Verify(x => x.TrackPackagePushFailureEvent(null, null), Times.Once());\n+ }\n+\n+ [Fact]\n+ public async Task CreatePackage_TracksFailureIfUnexpectedExceptionWithIdVersion()\n+ {\n+ // Arrange\n+ var user = new User() { EmailAddress = \"confirmed@email.com\" };\n+ var packageRegistration = new PackageRegistration();\n+ packageRegistration.Id = \"theId\";\n+ packageRegistration.Owners.Add(user);\n+ var package = new Package();\n+ package.PackageRegistration = packageRegistration;\n+ package.Version = \"1.0.42\";\n+ packageRegistration.Packages.Add(package);\n+\n+ TestGalleryConfigurationService configurationService = GetConfigurationService();\n+ var controller = new TestableApiController(configurationService);\n+ controller.SetCurrentUser(user);\n+ controller.MockPackageUploadService\n+ .Setup(p => p.GeneratePackageAsync(\n+ It.IsAny<string>(),\n+ It.IsAny<PackageArchiveReader>(),\n+ It.IsAny<PackageStreamMetadata>(),\n+ It.IsAny<User>(),\n+ It.IsAny<User>()))\n+ .Returns(Task.FromResult(package));\n+ controller.MockPackageService\n+ .Setup(x => x.FindPackageRegistrationById(It.IsAny<string>()))\n+ .Throws<Exception>();\n+\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n+ controller.SetupPackageFromInputStream(nuGetPackage);\n+\n+ // Act\n+ await Assert.ThrowsAnyAsync<Exception>(() => controller.CreatePackagePut());\n+\n+ // Assert\n+ controller.MockTelemetryService.Verify(x => x.TrackPackagePushFailureEvent(packageRegistration.Id, new NuGetVersion(package.Version)), Times.Once());\n+ }\n+\n[Fact]\npublic async Task CreatePackage_Returns400IfSecurityPolicyFails()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -3993,6 +3993,82 @@ public async Task WillShowViewWithErrorWhenThePackageRegistrationIsLocked()\npublic class TheVerifyPackageActionForPostRequests\n: TestContainer\n{\n+ [Fact]\n+ public async Task WillTrackFailureIfUnexpectedExceptionWithoutIdVersion()\n+ {\n+ // Arrange\n+ var fakeUserService = new Mock<IUserService>();\n+ fakeUserService\n+ .Setup(x => x.FindByUsername(It.IsAny<string>(), false))\n+ .Throws<Exception>();\n+ var fakeTelemetryService = new Mock<ITelemetryService>();\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ userService: fakeUserService,\n+ telemetryService: fakeTelemetryService);\n+ var user = TestUtility.FakeUser;\n+ controller.SetCurrentUser(user);\n+\n+ // Act\n+ await Assert.ThrowsAnyAsync<Exception>(() => controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Owner = user.Username }));\n+\n+ // Assert\n+ fakeTelemetryService.Verify(x => x.TrackPackagePushFailureEvent(null, null), Times.Once());\n+ }\n+\n+ [Fact]\n+ public async Task WillTrackFailureIfUnexpectedExceptionWithIdVersion()\n+ {\n+ // Arrange\n+ var packageId = \"theId\";\n+ var packageVersion = \"1.0.0\";\n+ var currentUser = TestUtility.FakeUser;\n+ var ownerInForm = currentUser;\n+\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ using (var fakeFileStream = new MemoryStream())\n+ {\n+ var fakePackageService = new Mock<IPackageService>();\n+ fakePackageService\n+ .Setup(x => x.FindPackageRegistrationById(It.IsAny<string>()))\n+ .Throws<Exception>();\n+\n+ fakeUploadFileService.Setup(x => x.GetUploadFileAsync(currentUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));\n+ fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(currentUser.Key)).Returns(Task.FromResult(0));\n+ var fakePackageUploadService = new Mock<IPackageUploadService>();\n+ fakePackageUploadService\n+ .Setup(x => x.GeneratePackageAsync(\n+ It.IsAny<string>(),\n+ It.IsAny<PackageArchiveReader>(),\n+ It.IsAny<PackageStreamMetadata>(),\n+ It.IsAny<User>(),\n+ It.IsAny<User>()))\n+ .Returns(Task.FromResult(new Package { PackageRegistration = new PackageRegistration { Id = packageId }, Version = packageVersion }));\n+ var fakeNuGetPackage = TestPackage.CreateTestPackageStream(packageId, packageVersion);\n+\n+ var fakeUserService = new Mock<IUserService>();\n+ fakeUserService.Setup(x => x.FindByUsername(ownerInForm.Username, false)).Returns(ownerInForm);\n+\n+ var fakeTelemetryService = new Mock<ITelemetryService>();\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageUploadService: fakePackageUploadService,\n+ uploadFileService: fakeUploadFileService,\n+ fakeNuGetPackage: fakeNuGetPackage,\n+ userService: fakeUserService,\n+ packageService: fakePackageService,\n+ telemetryService: fakeTelemetryService);\n+ controller.SetCurrentUser(currentUser);\n+\n+ // Act\n+ await Assert.ThrowsAnyAsync<Exception>(() => controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Owner = ownerInForm.Username }));\n+\n+ // Assert\n+ fakeTelemetryService.Verify(x => x.TrackPackagePushFailureEvent(packageId, new NuGetVersion(packageVersion)), Times.Once());\n+ }\n+ }\n+\n[Fact]\npublic async Task WillRedirectToUploadPageWhenThereIsNoUploadInProgress()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "using System.Diagnostics;\nusing System.Linq;\nusing Moq;\n+using NuGet.Versioning;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Framework;\nusing Xunit;\n@@ -60,6 +61,10 @@ public static IEnumerable<object[]> TrackMetricNames_Data\n(TrackAction)(s => s.TrackPackagePushEvent(package, fakes.User, identity))\n};\n+ yield return new object[] { \"PackagePushFailure\",\n+ (TrackAction)(s => s.TrackPackagePushFailureEvent(\"id\", new NuGetVersion(\"1.2.3\")))\n+ };\n+\nyield return new object[] { \"PackageUnlisted\",\n(TrackAction)(s => s.TrackPackageUnlisted(package))\n};\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Track metric for unexpected failed package pushes (#5938)
|
455,731 |
21.06.2018 08:50:17
| 25,200 |
336cb4b02a51721687ab282313f71472a6f902ca
|
Add logging if blob does not exist before calling FetchAttributesAsync()
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -178,6 +178,14 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\nIfMatchETag = destAccessCondition.IfMatchETag,\n};\n+ if (!await srcBlob.ExistsAsync())\n+ {\n+ _trace.TraceEvent(\n+ TraceEventType.Warning,\n+ id: 0,\n+ message: $\"Before calling FetchAttributesAsync(), the source blob '{srcBlob.Name}' does not exist.\");\n+ }\n+\n// Determine the source blob etag.\nawait srcBlob.FetchAttributesAsync();\nvar srcAccessCondition = AccessCondition.GenerateIfMatchCondition(srcBlob.ETag);\n@@ -247,6 +255,14 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\nwhile (destBlob.CopyState.Status == CopyStatus.Pending\n&& stopwatch.Elapsed < MaxCopyDuration)\n{\n+ if (!await destBlob.ExistsAsync())\n+ {\n+ _trace.TraceEvent(\n+ TraceEventType.Warning,\n+ id: 0,\n+ message: $\"Before calling FetchAttributesAsync(), the destination blob '{destBlob.Name}' does not exist.\");\n+ }\n+\nawait destBlob.FetchAttributesAsync();\nawait Task.Delay(CopyPollFrequency);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add logging if blob does not exist before calling FetchAttributesAsync() (#6083)
Progress on https://github.com/NuGet/Engineering/issues/1482.
|
455,776 |
26.06.2018 16:32:47
| 25,200 |
d4b99cfae4bf17bd4023e0943ccae90eabc88b68
|
Improve gallery user experience for package reupload
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -801,6 +801,10 @@ img.reserved-indicator-icon {\n.page-package-details .package-title .reserved-indicator {\nwidth: 25px;\n}\n+.page-package-details .failed-validation-alert-list {\n+ margin-top: 15px;\n+ margin-bottom: 15px;\n+}\n.page-package-details .package-details-main {\nword-break: normal;\nword-break: break-word;\n@@ -1153,7 +1157,8 @@ img.reserved-indicator-icon {\n.page-manage-owners .current-owner .remove-owner-disabled .icon-link:hover span {\ntext-decoration: none;\n}\n-.page-manage-packages .organizations-divider {\n+.page-manage-packages .organizations-divider,\n+.page-manage-packages .packages-divider {\ncolor: #dbdbdb;\n}\n.page-manage-packages h1 {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "}\n}\n+ .failed-validation-alert-list {\n+ margin-top: 15px;\n+ margin-bottom: 15px;\n+ }\n+\n.package-details-main {\n.break-word;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "+@using NuGet.Services.Validation;\n+\n@model DisplayPackageViewModel\n@{\nViewBag.Title = Model.Id + \" \" + Model.Version;\n}\n@if (Model.FailedValidation)\n- {\n- foreach (var issue in Model.ValidationIssues)\n{\n@ViewHelpers.AlertDanger(\n@<text>\n- @Html.Partial(\"_ValidationIssue\", issue)\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+ {\n+ <li>@Html.Partial(\"_ValidationIssue\", issue)</li>\n}\n+ </ul>\n+ @if (!Model.ValidationIssues.Any(i => i.IssueCode == ValidationIssueCode.Unknown))\n+ {\n+ var issuePluralString = Model.ValidationIssues.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+ }\n+ else\n+ {\n+ <text>Please contact <a href=\"mailto:support@nuget.org\">support@nuget.org</a> to help fix your package.</text>\n+ }\n+ </text>)\n}\n@if (Model.Deleted)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"diff": "{\ncase ValidationIssueCode.PackageIsSigned:\n<text>\n- <b>Package publishing failed.</b> This package could not be published since it is signed. We do not accept\n- signed packages at this moment. To be notified about package signing and more, watch our\n+ We do not accept signed packages at this moment. To be notified about package signing and more, watch our\n<a href=\"https://github.com/nuget/announcements/issues\">Announcements</a> page or follow us on\n<a href=\"https://twitter.com/nuget\">Twitter</a>.\n</text>\nbreak;\ncase ValidationIssueCode.PackageIsNotSigned:\n<text>\n- <b>Package publishing failed.</b> The package must be signed with a registered certificate. <a href=\"https://aka.ms/nuget-signed-ref\">Read more...</a>\n+ This package must be signed with a registered certificate. <a href=\"https://aka.ms/nuget-signed-ref\">Read more...</a>\n</text>\nbreak;\ncase ValidationIssueCode.PackageIsSignedWithUnauthorizedCertificate:\n{\nvar typedIssue = (UnauthorizedCertificateFailure)Model;\n<text>\n- <b>Package publishing failed.</b> The package was signed, but the signing certificate (SHA-1 thumbprint @typedIssue.Sha1Thumbprint) is not associated with your account. You must register this certificate to publish signed packages. <a href=\"https://aka.ms/nuget-signed-ref\">Read more...</a>\n+ The package was signed, but the signing certificate (SHA-1 thumbprint @typedIssue.Sha1Thumbprint) is not associated with your account.\n+ You must register this certificate to publish signed packages. <a href=\"https://aka.ms/nuget-signed-ref\">Read more...</a>\n</text>\nbreak;\n}\ndefault:\n<text>\n- <strong>Package publishing failed.</strong> This package could not be published since package validation\n- failed. Please contact <a href=\"mailto:support@nuget.org\">support@nuget.org</a>.\n+ There was an unknown failure when validating your package.\n</text>\nbreak;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"diff": "@@ -16,9 +16,7 @@ namespace NuGetGallery.Views.Packages\n{\npublic class ValidationIssueFacts\n{\n- private const string UnknownIssueMessage = \"<strong>Package publishing failed.</strong> This package could \" +\n- \"not be published since package validation failed. Please contact <a href=\\\"mailto:support@nuget.org\\\">\" +\n- \"support@nuget.org</a>.\";\n+ private const string UnknownIssueMessage = \"There was an unknown failure when validating your package.\";\nprivate readonly ITestOutputHelper _output;\npublic ValidationIssueFacts(ITestOutputHelper output)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Improve gallery user experience for package reupload (#6099)
|
455,776 |
28.06.2018 12:47:29
| 25,200 |
06ce2507b59d90dd446943d1b0dec1c8942fabab
|
Fix the mail template for the addition of a member to an org
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "@@ -882,7 +882,7 @@ public void SendOrganizationMembershipRequestInitiatedNotice(Organization organi\nstring subject = $\"[{Config.GalleryOwner.DisplayName}] Membership request for organization '{organization.Username}'\";\n- string body = string.Format(CultureInfo.CurrentCulture, $@\"The user '{requestingUser.Username}' has requested that user '{pendingUser.Username}' be added as {membershipLevel} of organization '{organization.Username}'.\n+ string body = string.Format(CultureInfo.CurrentCulture, $@\"The user '{requestingUser.Username}' has requested that user '{pendingUser.Username}' be added as {membershipLevel} of organization '{organization.Username}'. A confirmation mail has been sent to user '{pendingUser.Username}' to accept the membership request. This mail is to inform you of the membership changes to organization '{organization.Username}' and there is no action required from you.\nThanks,\nThe {Config.GalleryOwner.DisplayName} Team\");\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix the mail template for the addition of a member to an org (#6104)
|
455,776 |
29.06.2018 16:50:35
| 25,200 |
e0cfa5bf4147fcb928d8fac84aead408c0208a0b
|
Include failure reasons in email sent when package validation fails
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\User.cs\" />\n<Compile Include=\"Extensions\\EntitiesContextExtensions.cs\" />\n<Compile Include=\"Extensions\\PackageRegistrationExtensions.cs\" />\n+ <Compile Include=\"Extensions\\PackageValidationSetExtensions.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCore.cs\" />\n<Compile Include=\"ICloudStorageStatusDependency.cs\" />\n<Compile Include=\"Infrastructure\\AzureEntityList.cs\" />\n<PackageReference Include=\"NuGet.Packaging.Core\">\n<Version>4.8.0-preview4.5287</Version>\n</PackageReference>\n+ <PackageReference Include=\"NuGet.Services.Validation\">\n+ <Version>2.26.0-master-33196</Version>\n+ </PackageReference>\n+ <PackageReference Include=\"NuGet.Services.Validation.Issues\">\n+ <Version>2.26.0-master-33196</Version>\n+ </PackageReference>\n<PackageReference Include=\"NuGet.Versioning\">\n<Version>4.8.0-preview4.5287</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CoreMessageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CoreMessageService.cs",
"diff": "using System.Globalization;\nusing System.Linq;\nusing System.Net.Mail;\n+using System.Text;\nusing AnglicanGeek.MarkdownMailer;\n+using NuGet.Services.Validation;\n+using NuGet.Services.Validation.Issues;\nnamespace NuGetGallery.Services\n{\n@@ -50,58 +53,41 @@ public void SendPackageAddedNotice(Package package, string packageUrl, string pa\n}\n}\n- public void SendPackageValidationFailedNotice(Package package, string packageUrl, string packageSupportUrl)\n+ public void SendPackageValidationFailedNotice(Package package, PackageValidationSet validationSet, string packageUrl, string packageSupportUrl, string announcementsUrl, string twitterUrl)\n{\n- string subject = \"[{0}] Package validation failed - {1} {2}\";\n- string body = @\"The package [{1} {2}]({3}) failed validation and was therefore not published on {0}. Note that the package will not be available for consumption and you will not be able to push the same package ID and version until further action is taken. Please [contact support]({4}) for next steps.\";\n+ var validationIssues = validationSet.GetValidationIssues();\n- body = string.Format(\n- CultureInfo.CurrentCulture,\n- body,\n- CoreConfiguration.GalleryOwner.DisplayName,\n- package.PackageRegistration.Id,\n- package.Version,\n- packageUrl,\n- packageSupportUrl);\n-\n- subject = string.Format(CultureInfo.CurrentCulture, subject, CoreConfiguration.GalleryOwner.DisplayName, package.PackageRegistration.Id, package.Version);\n+ var subject = $\"[{CoreConfiguration.GalleryOwner.DisplayName}] Package validation failed - {package.PackageRegistration.Id} {package.Version}\";\n+ var bodyBuilder = new StringBuilder();\n+ bodyBuilder.Append($@\"The package [{package.PackageRegistration.Id} {package.Version}]({packageUrl}) failed validation because of the following reason(s):\n+\");\n- using (var mailMessage = new MailMessage())\n+ foreach (var validationIssue in validationIssues)\n{\n- mailMessage.Subject = subject;\n- mailMessage.Body = body;\n- mailMessage.From = CoreConfiguration.GalleryNoReplyAddress;\n+ bodyBuilder.Append($@\"\n+- {ParseValidationIssue(validationIssue, announcementsUrl, twitterUrl)}\");\n+ }\n- AddAllOwnersToMailMessage(package.PackageRegistration, mailMessage);\n+ bodyBuilder.Append($@\"\n- if (mailMessage.To.Any())\n+Your package was not published on {CoreConfiguration.GalleryOwner.DisplayName} and is not available for consumption.\n+\n+\");\n+\n+ if (validationIssues.Any(i => i.IssueCode == ValidationIssueCode.Unknown))\n{\n- SendMessage(mailMessage, copySender: false);\n+ bodyBuilder.Append($\"Please [contact support]({packageSupportUrl}) to help fix your package.\");\n}\n- }\n- }\n-\n- public void SendSignedPackageNotAllowedNotice(Package package, string packageUrl, string announcementsUrl, string twitterUrl)\n+ else\n{\n- string subject = \"[{0}] Package validation failed - {1} {2}\";\n- string body = @\"The package [{1} {2}]({3}) could not be published since it is signed. {0} does not accept signed packages at this moment. To be notified when {0} starts accepting signed packages, and more, watch our [Announcements]({4}) page or follow us on [Twitter]({5}).\";\n-\n- body = string.Format(\n- CultureInfo.CurrentCulture,\n- body,\n- CoreConfiguration.GalleryOwner.DisplayName,\n- package.PackageRegistration.Id,\n- package.Version,\n- packageUrl,\n- announcementsUrl,\n- twitterUrl);\n-\n- subject = string.Format(CultureInfo.CurrentCulture, subject, CoreConfiguration.GalleryOwner.DisplayName, package.PackageRegistration.Id, package.Version);\n+ var issuePluralString = validationIssues.Count() > 1 ? \"all the issues\" : \"the issue\";\n+ bodyBuilder.Append($\"You can reupload your package once you've fixed {issuePluralString} with it.\");\n+ }\nusing (var mailMessage = new MailMessage())\n{\nmailMessage.Subject = subject;\n- mailMessage.Body = body;\n+ mailMessage.Body = bodyBuilder.ToString();\nmailMessage.From = CoreConfiguration.GalleryNoReplyAddress;\nAddAllOwnersToMailMessage(package.PackageRegistration, mailMessage);\n@@ -113,6 +99,37 @@ public void SendSignedPackageNotAllowedNotice(Package package, string packageUrl\n}\n}\n+ private static string ParseValidationIssue(ValidationIssue validationIssue, string announcementsUrl, string twitterUrl)\n+ {\n+ switch (validationIssue.IssueCode)\n+ {\n+ case ValidationIssueCode.PackageIsSigned:\n+ return $\"This package could not be published since it is signed. We do not accept signed packages at this moment. To be notified about package signing and more, watch our [Announcements]({announcementsUrl}) page or follow us on [Twitter]({twitterUrl}).\";\n+ case ValidationIssueCode.ClientSigningVerificationFailure:\n+ var clientIssue = (ClientSigningVerificationFailure)validationIssue;\n+ return clientIssue != null\n+ ? $\"**{clientIssue.ClientCode}**: {clientIssue.ClientMessage}\"\n+ : \"This package's signature was unable to be verified.\";\n+ case ValidationIssueCode.PackageIsZip64:\n+ return \"Zip64 packages are not supported.\";\n+ case ValidationIssueCode.OnlyAuthorSignaturesSupported:\n+ return \"Signed packages must only have an author signature. Other signature types are not supported.\";\n+ case ValidationIssueCode.AuthorAndRepositoryCounterSignaturesNotSupported:\n+ return \"Author countersignatures and repository countersignatures are not supported.\";\n+ case ValidationIssueCode.OnlySignatureFormatVersion1Supported:\n+ return \"**NU3007:** Package signatures must have format version 1.\";\n+ case ValidationIssueCode.AuthorCounterSignaturesNotSupported:\n+ return \"Author countersignatures are not supported.\";\n+ case ValidationIssueCode.PackageIsNotSigned:\n+ return \"This package must be signed with a registered certificate. [Read more...](https://aka.ms/nuget-signed-ref)\";\n+ case ValidationIssueCode.PackageIsSignedWithUnauthorizedCertificate:\n+ var certIssue = (UnauthorizedCertificateFailure)validationIssue;\n+ return $\"The package was signed, but the signing certificate {(certIssue != null ? $\"(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)\";\n+ default:\n+ return \"There was an unknown failure when validating your package.\";\n+ }\n+ }\n+\npublic void SendValidationTakingTooLongNotice(Package package, string packageUrl)\n{\nstring subject = \"[{0}] Package validation taking longer than expected - {1} {2}\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ValidationService.cs",
"new_path": "src/NuGetGallery/Services/ValidationService.cs",
"diff": "@@ -71,7 +71,7 @@ public bool IsValidatingTooLong(Package package)\npublic IReadOnlyList<ValidationIssue> GetLatestValidationIssues(Package package)\n{\n- var issues = Enumerable.Empty<ValidationIssue>();\n+ IReadOnlyList<ValidationIssue> issues = new ValidationIssue[0];\n// Only query the database for validation issues if the package has failed validation.\nif (package.PackageStatusKey == PackageStatus.FailedValidation)\n@@ -89,30 +89,11 @@ public IReadOnlyList<ValidationIssue> GetLatestValidationIssues(Package package)\nif (validationSet != null)\n{\n- // Get the failed validation set's validation issues. The issues are ordered by their\n- // key so that it appears that issues are appended as more validations fail.\n- issues = validationSet\n- .PackageValidations\n- .SelectMany(v => v.PackageValidationIssues)\n- .OrderBy(i => i.Key)\n- .Select(i => ValidationIssue.Deserialize(i.IssueCode, i.Data))\n- .ToList();\n- }\n-\n- // If the package failed validation, use the generic error message.\n- if (issues == null || !issues.Any())\n- {\n- issues = new[] { ValidationIssue.Unknown };\n+ issues = validationSet.GetValidationIssues();\n}\n}\n- // Filter out unknown issues and deduplicate the issues by code and data. This also deduplicates cases\n- // where there is extraneous data in the serialized data field or if the issue code is unknown to the\n- // gallery.\n- return issues\n- .GroupBy(x => new { x.IssueCode, Data = x.Serialize() })\n- .Select(x => x.First())\n- .ToList();\n+ return issues;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "using NuGetGallery.Infrastructure.Authentication;\nusing Xunit;\nusing NuGet.Versioning;\n+using NuGet.Services.Validation;\n+using NuGet.Services.Validation.Issues;\nnamespace NuGetGallery\n{\n@@ -1115,62 +1117,42 @@ public void WillNotAttemptToSendIfNoOwnersAllow()\npublic class TheSendPackageValidationFailedNoticeMethod\n: TestContainer\n{\n- [Theory]\n- [InlineData(\"1.2.3\")]\n- [InlineData(\"1.2.3-alpha\")]\n- [InlineData(\"1.2.3-alpha.1\")]\n- [InlineData(\"1.2.3+metadata\")]\n- [InlineData(\"1.2.3-alpha+metadata\")]\n- [InlineData(\"1.2.3-alpha.1+metadata\")]\n- public void WillSendEmailToAllOwners(string version)\n+ public static IEnumerable<object[]> WillSendEmailToAllOwners_Data\n{\n- // Arrange\n- var nugetVersion = new NuGetVersion(version);\n- var packageRegistration = new PackageRegistration\n+ get\n{\n- Id = \"smangit\",\n- Owners = new[]\n+ foreach (var user1PushAllowed in new[] { false, true })\n{\n- new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = true },\n- new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = true }\n- }\n- };\n- var package = new Package\n+ foreach (var user2PushAllowed in new[] { false, true })\n{\n- Version = version,\n- PackageRegistration = packageRegistration\n- };\n- packageRegistration.Packages.Add(package);\n-\n- // Act\n- var messageService = TestableMessageService.Create(GetConfigurationService());\n- var packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\n- var supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\n- messageService.SendPackageValidationFailedNotice(package, packageUrl, supportUrl);\n-\n- // Assert\n- var message = messageService.MockMailSender.Sent.Last();\n-\n- Assert.Equal(\"yung@example.com\", message.To[0].Address);\n- Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n- Assert.Equal(TestGalleryNoReplyAddress, message.From);\n- Assert.Contains($\"[{TestGalleryOwner.DisplayName}] Package validation failed - {packageRegistration.Id} {nugetVersion.ToNormalizedString()}\", message.Subject);\n- Assert.Contains(\n- $\"The package [{packageRegistration.Id} {nugetVersion.ToFullString()}]({packageUrl}) failed validation and was therefore not published on {TestGalleryOwner.DisplayName}. \" +\n- $\"Note that the package will not be available for consumption and you will not be able to push the same package ID and version until further action is taken. \" +\n- $\"Please [contact support]({supportUrl}) for next steps.\", message.Body);\n+ foreach (var user1EmailAllowed in new[] { false, true })\n+ {\n+ foreach (var user2EmailAllowed in new[] { false, true })\n+ {\n+ foreach (var validationIssue in new[] {\n+ ValidationIssue.AuthorAndRepositoryCounterSignaturesNotSupported,\n+ ValidationIssue.AuthorCounterSignaturesNotSupported,\n+ ValidationIssue.OnlyAuthorSignaturesSupported,\n+ ValidationIssue.OnlySignatureFormatVersion1Supported,\n+ ValidationIssue.PackageIsNotSigned,\n+ ValidationIssue.PackageIsSigned,\n+ ValidationIssue.PackageIsZip64,\n+ ValidationIssue.Unknown,\n+ new ClientSigningVerificationFailure(\"NU9999\", \"test message\"),\n+ new UnauthorizedCertificateFailure(\"asdfasdfasdf\")})\n+ {\n+ yield return MemberDataHelper.AsData(validationIssue, user1PushAllowed, user2PushAllowed, user1EmailAllowed, user2EmailAllowed);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n}\n-\n- public static IEnumerable<object[]> EmailSettingsCombinations\n- => from u1pa in new[] { true, false }\n- from u2pa in new[] { true, false }\n- from u1ea in new[] { true, false }\n- from u2ea in new[] { true, false }\n- select new object[] { u1pa, u2pa, u1ea, u2ea };\n[Theory]\n- [MemberData(nameof(EmailSettingsCombinations))]\n- public void WillSendEmailToOwnersRegardlessOfSettings(bool user1PushAllowed, bool user2PushAllowed, bool user1EmailAllowed, bool user2EmailAllowed)\n+ [MemberData(nameof(WillSendEmailToAllOwners_Data))]\n+ public void WillSendEmailToAllOwners(ValidationIssue validationIssue, bool user1PushAllowed, bool user2PushAllowed, bool user1EmailAllowed, bool user2EmailAllowed)\n{\n// Arrange\nvar packageRegistration = new PackageRegistration\n@@ -1189,108 +1171,82 @@ public void WillSendEmailToOwnersRegardlessOfSettings(bool user1PushAllowed, boo\n};\npackageRegistration.Packages.Add(package);\n- // Act\n- var messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendPackageValidationFailedNotice(package, \"http://dummy1\", \"http://dummy2\");\n-\n- // Assert\n- var message = messageService.MockMailSender.Sent.Last();\n-\n- Assert.Equal(\"yung@example.com\", message.To[0].Address);\n- Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n- Assert.Equal(2, message.To.Count);\n- }\n- }\n-\n- public class TheSendSignedPackageNotAllowedNoticeMethod\n- : TestContainer\n+ var packageValidationSet = new PackageValidationSet()\n{\n- [Theory]\n- [InlineData(\"1.2.3\")]\n- [InlineData(\"1.2.3-alpha\")]\n- [InlineData(\"1.2.3-alpha.1\")]\n- [InlineData(\"1.2.3+metadata\")]\n- [InlineData(\"1.2.3-alpha+metadata\")]\n- [InlineData(\"1.2.3-alpha.1+metadata\")]\n- public void WillSendEmailToAllOwners(string version)\n+ PackageValidations = new[]\n{\n- // Arrange\n- var nugetVersion = new NuGetVersion(version);\n- var packageRegistration = new PackageRegistration\n+ new PackageValidation()\n{\n- Id = \"smangit\",\n- Owners = new[]\n+ PackageValidationIssues = new[]\n{\n- new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = true },\n- new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = true }\n- }\n- };\n- var package = new Package\n+ new PackageValidationIssue()\n{\n- Version = version,\n- PackageRegistration = packageRegistration\n+ Key = 0,\n+ IssueCode = validationIssue.IssueCode,\n+ Data = validationIssue.Serialize()\n+ }\n+ }\n+ }\n+ }\n};\n- packageRegistration.Packages.Add(package);\n// Act\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- var packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\n- var supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\n- var announcementsUrl = \"https://example.com/announcements\";\n- var twitterUrl = \"https://example.com/twitter\";\n- messageService.SendSignedPackageNotAllowedNotice(package, packageUrl, announcementsUrl, twitterUrl);\n+ var packageUrl = $\"https://packageUrl\";\n+ var supportUrl = $\"https://supportUrl\";\n+ var announcementsUrl = \"https://announcementsUrl\";\n+ var twitterUrl = \"https://twitterUrl\";\n+ messageService.SendPackageValidationFailedNotice(package, packageValidationSet, packageUrl, supportUrl, announcementsUrl, twitterUrl);\n// Assert\nvar message = messageService.MockMailSender.Sent.Last();\nAssert.Equal(\"yung@example.com\", message.To[0].Address);\nAssert.Equal(\"flynt@example.com\", message.To[1].Address);\n+ Assert.Equal(2, message.To.Count);\nAssert.Equal(TestGalleryNoReplyAddress, message.From);\n- Assert.Contains($\"[{TestGalleryOwner.DisplayName}] Package validation failed - {packageRegistration.Id} {nugetVersion.ToNormalizedString()}\", message.Subject);\n- Assert.Contains(\n- $\"The package [{packageRegistration.Id} {nugetVersion.ToFullString()}]({packageUrl}) could not be published since it is signed. \" +\n- $\"{TestGalleryOwner.DisplayName} does not accept signed packages at this moment. To be notified when {TestGalleryOwner.DisplayName} starts accepting signed packages, \" +\n- $\"and more, watch our [Announcements]({announcementsUrl}) page or follow us on [Twitter]({twitterUrl}).\", message.Body);\n- }\n+ Assert.Contains($\"[{TestGalleryOwner.DisplayName}] Package validation failed - {packageRegistration.Id} {package.Version}\", message.Subject);\n+ Assert.Contains($\"The package [{package.PackageRegistration.Id} {package.Version}]({packageUrl}) failed validation because of the following reason(s):\", message.Body);\n+ Assert.Contains(ParseValidationIssue(validationIssue, announcementsUrl, twitterUrl), message.Body);\n+ Assert.Contains($\"Your package was not published on {TestGalleryOwner.DisplayName} and is not available for consumption.\", message.Body);\n- public static IEnumerable<object[]> EmailSettingsCombinations\n- => from u1pa in new[] { true, false }\n- from u2pa in new[] { true, false }\n- from u1ea in new[] { true, false }\n- from u2ea in new[] { true, false }\n- select new object[] { u1pa, u2pa, u1ea, u2ea };\n-\n- [Theory]\n- [MemberData(nameof(EmailSettingsCombinations))]\n- public void WillSendEmailToOwnersRegardlessOfSettings(bool user1PushAllowed, bool user2PushAllowed, bool user1EmailAllowed, bool user2EmailAllowed)\n- {\n- // Arrange\n- var packageRegistration = new PackageRegistration\n- {\n- Id = \"smangit\",\n- Owners = new[]\n+ if (validationIssue.IssueCode == ValidationIssueCode.Unknown)\n{\n- new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = user1PushAllowed, EmailAllowed = user1EmailAllowed },\n- new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = user2PushAllowed, EmailAllowed = user2EmailAllowed }\n+ Assert.Contains($\"Please [contact support]({supportUrl}) to help fix your package.\", message.Body);\n}\n- };\n- var package = new Package\n+ else\n{\n- Version = \"1.2.3\",\n- PackageRegistration = packageRegistration\n- };\n- packageRegistration.Packages.Add(package);\n-\n- // Act\n- var messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendSignedPackageNotAllowedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n-\n- // Assert\n- var message = messageService.MockMailSender.Sent.Last();\n-\n- Assert.Equal(\"yung@example.com\", message.To[0].Address);\n- Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n- Assert.Equal(2, message.To.Count);\n+ Assert.Contains($\"You can reupload your package once you've fixed the issue with it.\", message.Body);\n+ }\n+ }\n+\n+ private static string ParseValidationIssue(ValidationIssue validationIssue, string announcementsUrl, string twitterUrl)\n+ {\n+ switch (validationIssue.IssueCode)\n+ {\n+ case ValidationIssueCode.PackageIsSigned:\n+ return $\"This package could not be published since it is signed. We do not accept signed packages at this moment. To be notified about package signing and more, watch our [Announcements]({announcementsUrl}) page or follow us on [Twitter]({twitterUrl}).\";\n+ case ValidationIssueCode.ClientSigningVerificationFailure:\n+ var clientIssue = (ClientSigningVerificationFailure)validationIssue;\n+ return $\"**{clientIssue.ClientCode}**: {clientIssue.ClientMessage}\";\n+ case ValidationIssueCode.PackageIsZip64:\n+ return \"Zip64 packages are not supported.\";\n+ case ValidationIssueCode.OnlyAuthorSignaturesSupported:\n+ return \"Signed packages must only have an author signature. Other signature types are not supported.\";\n+ case ValidationIssueCode.AuthorAndRepositoryCounterSignaturesNotSupported:\n+ return \"Author countersignatures and repository countersignatures are not supported.\";\n+ case ValidationIssueCode.OnlySignatureFormatVersion1Supported:\n+ return \"**NU3007:** Package signatures must have format version 1.\";\n+ case ValidationIssueCode.AuthorCounterSignaturesNotSupported:\n+ return \"Author countersignatures are not supported.\";\n+ case ValidationIssueCode.PackageIsNotSigned:\n+ return \"This package must be signed with a registered certificate. [Read more...](https://aka.ms/nuget-signed-ref)\";\n+ case ValidationIssueCode.PackageIsSignedWithUnauthorizedCertificate:\n+ var certIssue = (UnauthorizedCertificateFailure)validationIssue;\n+ return $\"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)\";\n+ default:\n+ return \"There was an unknown failure when validating your package.\";\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Include failure reasons in email sent when package validation fails (#6105)
|
455,794 |
03.07.2018 05:33:47
| 25,200 |
59c26d59546ba4824ebc3d9e7424c0f577346ff1
|
Fix NullRef from StorageException.ExtendedErrorInformation
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -470,7 +470,7 @@ private async Task<StorageResult> GetBlobContentAsync(string folderName, string\n{\nreturn new StorageResult(HttpStatusCode.NotModified, null);\n}\n- else if (ex.RequestInformation.ExtendedErrorInformation.ErrorCode == BlobErrorCodeStrings.BlobNotFound)\n+ else if (ex.RequestInformation.ExtendedErrorInformation?.ErrorCode == BlobErrorCodeStrings.BlobNotFound)\n{\nreturn new StorageResult(HttpStatusCode.NotFound, null);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix NullRef from StorageException.ExtendedErrorInformation
|
455,794 |
03.07.2018 06:52:08
| 25,200 |
644b0dc2b84edf8ff34d87ac2ed490c781d58e97
|
fail recaptcha on no response
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Filters/ValidateRecaptchaResponseAttribute.cs",
"new_path": "src/NuGetGallery/Filters/ValidateRecaptchaResponseAttribute.cs",
"diff": "@@ -27,21 +27,24 @@ public override void OnActionExecuting(ActionExecutingContext filterContext)\nif (!string.IsNullOrEmpty(privateKey))\n{\nvar response = controller.HttpContext.Request.Form[RecaptchaResponseId];\n- if (!string.IsNullOrEmpty(response))\n- {\n+\nif (!(Task.Run(() => RecaptchaIsValid(privateKey, response)).Result))\n{\ncontroller.TempData[\"Message\"] = Strings.InvalidRecaptchaResponse;\nfilterContext.Result = new RedirectResult(controller.Url.Current());\n}\n}\n- }\nbase.OnActionExecuting(filterContext);\n}\nprivate async Task<bool> RecaptchaIsValid(string privateKey, string response)\n{\n+ if (string.IsNullOrEmpty(response))\n+ {\n+ return false;\n+ }\n+\nvar validationUrl = string.Format(CultureInfo.InvariantCulture, RecaptchaValidationUrl, privateKey, response);\ntry\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
fail recaptcha on no response
|
455,772 |
06.07.2018 09:56:23
| 25,200 |
849ac6a0c24a6a18372e37135ddb9b65077cb9d7
|
Functional tests for OData API api/v2/packages() caching
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"diff": "<Reference Include=\"System.Core\" />\n<Reference Include=\"Microsoft.CSharp\" />\n<Reference Include=\"System.Net.Http\" />\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 Include=\"System.Xml\" />\n<Reference Include=\"xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\xunit.abstractions.2.0.1\\lib\\net35\\xunit.abstractions.dll</HintPath>\n<Private>True</Private>\n<Compile Include=\"WebPages\\FluentLinkChecker.cs\" />\n<Compile Include=\"WebPages\\LinksTests.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n+ <Compile Include=\"ApiManagement\\CachingTests.cs\" />\n</ItemGroup>\n<ItemGroup>\n<None Include=\"app.config\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/packages.config",
"new_path": "tests/NuGetGallery.FunctionalTests/packages.config",
"diff": "<packages>\n<package id=\"FluentLinkChecker\" version=\"1.0.0.10\" targetFramework=\"net45\" />\n<package id=\"Newtonsoft.Json\" version=\"7.0.1\" targetFramework=\"net45\" />\n+ <package id=\"System.ValueTuple\" version=\"4.5.0\" targetFramework=\"net452\" />\n<package id=\"xunit\" version=\"2.3.1\" targetFramework=\"net452\" />\n<package id=\"xunit.abstractions\" version=\"2.0.1\" targetFramework=\"net45\" />\n<package id=\"xunit.analyzers\" version=\"0.7.0\" targetFramework=\"net452\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/BuildTests.ps1",
"new_path": "tests/Scripts/BuildTests.ps1",
"diff": "@@ -8,7 +8,7 @@ param(\n$rootName = (Get-Item $PSScriptRoot).parent.FullName\n# Required tools\n-$msBuild = \"${Env:ProgramFiles(x86)}\\MsBuild\\14.0\\Bin\\msbuild\"\n+$msBuild = \"${Env:ProgramFiles(x86)}\\Microsoft Visual Studio\\2017\\Enterprise\\MSBuild\\15.0\\Bin\\msbuild\"\n$nuget = \"$rootName\\nuget.exe\"\n& \"$rootName\\Scripts\\DownloadLatestNuGetExeRelease.ps1\" $rootName\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/RunTests.ps1",
"new_path": "tests/Scripts/RunTests.ps1",
"diff": "@@ -36,10 +36,13 @@ if ($LastExitCode) {\n# Run web UI tests\n$webTestsDirectory = \"$rootName\\NuGetGallery.WebUITests.$TestCategory\\bin\\$Config\"\n+\n+if(Test-Path $webTestsDirectory -PathType Container) {\n& $msTest \"/TestContainer:$webTestsDirectory\\NuGetGallery.WebUITests.$TestCategory.dll\" \"/TestSettings:$rootName\\Local.testsettings\" \"/detail:stdout\" \"/resultsfile:$webUITestResults\"\nif ($LastExitCode) {\n$exitCode = 1\n}\n+}\n# Run load tests\n$loadTestsDirectory = \"$rootName\\NuGetGallery.LoadTests\\bin\\$Config\"\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Functional tests for OData API api/v2/packages() caching (#6146)
|
455,794 |
09.07.2018 16:12:04
| 25,200 |
eb9ad01788c3d95b80fc28a708a887c42b712891
|
Improve experience when users hit package size limit
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "using System.Linq;\nusing System.Net;\nusing System.Threading.Tasks;\n+using System.Web;\nusing System.Web.Mvc;\nusing Newtonsoft.Json.Linq;\nusing NuGet.Frameworks;\n@@ -555,6 +556,13 @@ private async Task<ActionResult> CreatePackageInternal()\n}\n}\n}\n+ catch (HttpException ex) when (ex.IsMaxRequestLengthExceeded())\n+ {\n+ // ASP.NET throws HttpException when maxRequestLength limit is exceeded.\n+ return new HttpStatusCodeWithBodyResult(\n+ HttpStatusCode.RequestEntityTooLarge,\n+ Strings.PackageFileTooLarge);\n+ }\ncatch (Exception)\n{\nTelemetryService.TrackPackagePushFailureEvent(id, version);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Controllers\\AppController.cs\" />\n<Compile Include=\"Controllers\\ErrorsController.cs\" />\n<Compile Include=\"Controllers\\PagesController.cs\" />\n+ <Compile Include=\"Extensions\\HttpExceptionExtensions.cs\" />\n<Compile Include=\"Extensions\\OrganizationExtensions.cs\" />\n<Compile Include=\"Extensions\\PrincipalExtensions.cs\" />\n<Compile Include=\"Extensions\\RouteExtensions.cs\" />\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": "case \"abort\":\ndisplayErrors([\"The operation was aborted. Please try again.\"]);\nbreak;\n+ case \"error\":\n+ // IIS returns 404.13 (NotFound) when maxAllowedContentLength limit is exceeded.\n+ if (fullResponse === \"Not Found\") {\n+ displayErrors([\"The package file exceeds the size limit. Please try again.\"]);\n+ }\n+ break;\ndefault:\ndisplayErrors(model.responseJSON);\nbreak;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -113,6 +113,8 @@ internal class Events\npublic const string CreatedDateForAccountToBeDeleted = \"CreatedDateForAccountToBeDeleted\";\npublic const string AccountDeleteSucceeded = \"AccountDeleteSucceeded\";\n+ public const string ValueUnknown = \"Unknown\";\n+\npublic TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n{\nif (diagnosticsService == null)\n@@ -184,11 +186,13 @@ public void TrackPackagePushEvent(Package package, User user, IIdentity identity\npublic void TrackPackagePushFailureEvent(string id, NuGetVersion version)\n{\n+ var normalizedVersion = version?.ToNormalizedString();\n+\nTrackMetric(Events.PackagePushFailure, 1, properties => {\nproperties.Add(ClientVersion, GetClientVersion());\nproperties.Add(ProtocolVersion, GetProtocolVersion());\n- properties.Add(PackageId, id);\n- properties.Add(PackageVersion, version.ToNormalizedString());\n+ properties.Add(PackageId, id ?? ValueUnknown);\n+ properties.Add(PackageVersion, normalizedVersion ?? ValueUnknown);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1255,6 +1255,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package file exceeds the size limit. Please try again..\n+ /// </summary>\n+ public static string PackageFileTooLarge {\n+ get {\n+ return ResourceManager.GetString(\"PackageFileTooLarge\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The package ID '{0}' is not available..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -911,4 +911,7 @@ If you would like to update the linked Microsoft account you can do so from the\n<data name=\"FailedValidationHardDeleteReason\" xml:space=\"preserve\">\n<value>Automatic hard-delete for reupload of package that failed validation</value>\n</data>\n+ <data name=\"PackageFileTooLarge\" xml:space=\"preserve\">\n+ <value>The package file exceeds the size limit. Please try again.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Improve experience when users hit package size limit (#6147)
|
455,751 |
10.07.2018 10:59:26
| 25,200 |
8e27918a9d713866906ff911d3d35ca38dcbdba2
|
Refactor CorePackageFileService
Refactor CorePackageFileService to allow flexibility in metadata.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Services\\ICorePackageService.cs\" />\n<Compile Include=\"Services\\IFileReference.cs\" />\n<Compile Include=\"Services\\ICoreFileStorageService.cs\" />\n+ <Compile Include=\"Services\\IFileMetadataService.cs\" />\n<Compile Include=\"Services\\ISimpleCloudBlob.cs\" />\n+ <Compile Include=\"Services\\PackageFileServiceMetadata.cs\" />\n<Compile Include=\"Services\\TestableStorageClientException.cs\" />\n<Compile Include=\"StreamExtensions.cs\" />\n<Compile Include=\"CoreStrings.Designer.cs\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CorePackageFileService.cs",
"new_path": "src/NuGetGallery.Core/Services/CorePackageFileService.cs",
"diff": "@@ -13,10 +13,12 @@ namespace NuGetGallery\npublic class CorePackageFileService : ICorePackageFileService\n{\nprivate readonly ICoreFileStorageService _fileStorageService;\n+ private readonly IFileMetadataService _metadata;\n- public CorePackageFileService(ICoreFileStorageService fileStorageService)\n+ public CorePackageFileService(ICoreFileStorageService fileStorageService, IFileMetadataService metadata)\n{\n- _fileStorageService = fileStorageService;\n+ _fileStorageService = fileStorageService ?? throw new ArgumentNullException(nameof(fileStorageService));\n+ _metadata = metadata ?? throw new ArgumentNullException(nameof(metadata));\n}\npublic Task SavePackageFileAsync(Package package, Stream packageFile)\n@@ -26,26 +28,26 @@ public Task SavePackageFileAsync(Package package, Stream packageFile)\nthrow new ArgumentNullException(nameof(packageFile));\n}\n- var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);\n- return _fileStorageService.SaveFileAsync(CoreConstants.PackagesFolderName, fileName, packageFile, overwrite: false);\n+ var fileName = BuildFileName(package, _metadata.FileSavePathTemplate, _metadata.FileExtension);\n+ return _fileStorageService.SaveFileAsync(_metadata.FileFolderName, fileName, packageFile, overwrite: false);\n}\npublic Task<Stream> DownloadPackageFileAsync(Package package)\n{\n- var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);\n- return _fileStorageService.GetFileAsync(CoreConstants.PackagesFolderName, fileName);\n+ var fileName = BuildFileName(package, _metadata.FileSavePathTemplate, _metadata.FileExtension);\n+ return _fileStorageService.GetFileAsync(_metadata.FileFolderName, fileName);\n}\npublic Task<Uri> GetPackageReadUriAsync(Package package)\n{\n- var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);\n- return _fileStorageService.GetFileReadUriAsync(CoreConstants.PackagesFolderName, fileName, endOfAccess: null);\n+ var fileName = BuildFileName(package, _metadata.FileSavePathTemplate, _metadata.FileExtension);\n+ return _fileStorageService.GetFileReadUriAsync(_metadata.FileFolderName, fileName, endOfAccess: null);\n}\npublic Task<bool> DoesPackageFileExistAsync(Package package)\n{\n- var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);\n- return _fileStorageService.FileExistsAsync(CoreConstants.PackagesFolderName, fileName);\n+ var fileName = BuildFileName(package, _metadata.FileSavePathTemplate, _metadata.FileExtension);\n+ return _fileStorageService.FileExistsAsync(_metadata.FileFolderName, fileName);\n}\npublic Task SaveValidationPackageFileAsync(Package package, Stream packageFile)\n@@ -57,11 +59,11 @@ public Task SaveValidationPackageFileAsync(Package package, Stream packageFile)\nvar fileName = BuildFileName(\npackage,\n- CoreConstants.PackageFileSavePathTemplate,\n- CoreConstants.NuGetPackageFileExtension);\n+ _metadata.FileSavePathTemplate,\n+ _metadata.FileExtension);\nreturn _fileStorageService.SaveFileAsync(\n- CoreConstants.ValidationFolderName,\n+ _metadata.ValidationFolderName,\nfileName,\npackageFile,\noverwrite: false);\n@@ -71,10 +73,10 @@ public Task<Stream> DownloadValidationPackageFileAsync(Package package)\n{\nvar fileName = BuildFileName(\npackage,\n- CoreConstants.PackageFileSavePathTemplate,\n- CoreConstants.NuGetPackageFileExtension);\n+ _metadata.FileSavePathTemplate,\n+ _metadata.FileExtension);\n- return _fileStorageService.GetFileAsync(CoreConstants.ValidationFolderName, fileName);\n+ return _fileStorageService.GetFileAsync(_metadata.ValidationFolderName, fileName);\n}\npublic Task DeleteValidationPackageFileAsync(string id, string version)\n@@ -88,10 +90,10 @@ public Task DeleteValidationPackageFileAsync(string id, string version)\nvar fileName = BuildFileName(\nid,\nnormalizedVersion,\n- CoreConstants.PackageFileSavePathTemplate,\n- CoreConstants.NuGetPackageFileExtension);\n+ _metadata.FileSavePathTemplate,\n+ _metadata.FileExtension);\n- return _fileStorageService.DeleteFileAsync(CoreConstants.ValidationFolderName, fileName);\n+ return _fileStorageService.DeleteFileAsync(_metadata.ValidationFolderName, fileName);\n}\npublic Task DeletePackageFileAsync(string id, string version)\n@@ -108,8 +110,8 @@ public Task DeletePackageFileAsync(string id, string version)\nvar normalizedVersion = NuGetVersionFormatter.Normalize(version);\n- var fileName = BuildFileName(id, normalizedVersion, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);\n- return _fileStorageService.DeleteFileAsync(CoreConstants.PackagesFolderName, fileName);\n+ var fileName = BuildFileName(id, normalizedVersion, _metadata.FileSavePathTemplate, _metadata.FileExtension);\n+ return _fileStorageService.DeleteFileAsync(_metadata.FileFolderName, fileName);\n}\npublic Task<Uri> GetValidationPackageReadUriAsync(Package package, DateTimeOffset endOfAccess)\n@@ -118,16 +120,16 @@ public Task<Uri> GetValidationPackageReadUriAsync(Package package, DateTimeOffse\nvar fileName = BuildFileName(\npackage,\n- CoreConstants.PackageFileSavePathTemplate,\n- CoreConstants.NuGetPackageFileExtension);\n+ _metadata.FileSavePathTemplate,\n+ _metadata.FileExtension);\n- return _fileStorageService.GetFileReadUriAsync(CoreConstants.ValidationFolderName, fileName, endOfAccess);\n+ return _fileStorageService.GetFileReadUriAsync(_metadata.ValidationFolderName, fileName, endOfAccess);\n}\npublic Task<bool> DoesValidationPackageFileExistAsync(Package package)\n{\n- var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);\n- return _fileStorageService.FileExistsAsync(CoreConstants.ValidationFolderName, fileName);\n+ var fileName = BuildFileName(package, _metadata.FileSavePathTemplate, _metadata.FileExtension);\n+ return _fileStorageService.FileExistsAsync(_metadata.ValidationFolderName, fileName);\n}\npublic async Task StorePackageFileInBackupLocationAsync(Package package, Stream packageFile)\n@@ -169,18 +171,20 @@ public async Task StorePackageFileInBackupLocationAsync(Package package, Stream\nvar fileName = BuildBackupFileName(\npackage.PackageRegistration.Id,\nversion,\n- hash);\n+ hash,\n+ _metadata.FileExtension,\n+ _metadata.FileBackupSavePathTemplate);\n// If the package already exists, don't even bother uploading it. The file name is based off of the hash so\n// we know the upload isn't necessary.\n- if (await _fileStorageService.FileExistsAsync(CoreConstants.PackageBackupsFolderName, fileName))\n+ if (await _fileStorageService.FileExistsAsync(_metadata.FileBackupsFolderName, fileName))\n{\nreturn;\n}\ntry\n{\n- await _fileStorageService.SaveFileAsync(CoreConstants.PackageBackupsFolderName, fileName, packageFile);\n+ await _fileStorageService.SaveFileAsync(_metadata.FileBackupsFolderName, fileName, packageFile);\n}\ncatch (FileAlreadyExistsException)\n{\n@@ -189,7 +193,7 @@ public async Task StorePackageFileInBackupLocationAsync(Package package, Stream\n}\n}\n- private static string BuildBackupFileName(string id, string version, string hash)\n+ private static string BuildBackupFileName(string id, string version, string hash, string extension, string fileBackupSavePathTemplate)\n{\nif (id == null)\n{\n@@ -210,11 +214,11 @@ private static string BuildBackupFileName(string id, string version, string hash\nreturn string.Format(\nCultureInfo.InvariantCulture,\n- CoreConstants.PackageFileBackupSavePathTemplate,\n+ fileBackupSavePathTemplate,\nid.ToLowerInvariant(),\nversion.ToLowerInvariant(),\nHttpServerUtility.UrlTokenEncode(hashBytes),\n- CoreConstants.NuGetPackageFileExtension);\n+ extension);\n}\nprotected static string BuildFileName(Package package, string format, string extension)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageFileService.cs",
"new_path": "src/NuGetGallery/Services/PackageFileService.cs",
"diff": "@@ -22,7 +22,7 @@ public class PackageFileService : CorePackageFileService, IPackageFileService\nprivate readonly IFileStorageService _fileStorageService;\npublic PackageFileService(IFileStorageService fileStorageService)\n- : base(fileStorageService)\n+ : base(fileStorageService, new PackageFileMetadataService())\n{\n_fileStorageService = fileStorageService;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageFileServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageFileServiceFacts.cs",
"diff": "@@ -772,7 +772,7 @@ static CorePackageFileService CreateService(Mock<ICoreFileStorageService> fileSt\nfileStorageService = fileStorageService ?? new Mock<ICoreFileStorageService>();\nreturn new CorePackageFileService(\n- fileStorageService.Object);\n+ fileStorageService.Object, new PackageFileMetadataService());\n}\npublic abstract class FactsBase\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\DeleteAccountServiceFacts.cs\" />\n<Compile Include=\"Services\\JsonStatisticsServiceFacts.cs\" />\n<Compile Include=\"Services\\ContentObjectServiceFacts.cs\" />\n+ <Compile Include=\"Services\\PackageFileServiceMetadataFacts.cs\" />\n<Compile Include=\"Services\\PackageOwnerRequestServiceFacts.cs\" />\n<Compile Include=\"Services\\PackageOwnershipManagementServiceFacts.cs\" />\n<Compile Include=\"Services\\LoginDiscontinuationConfigurationFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Refactor CorePackageFileService (#6148)
Refactor CorePackageFileService to allow flexibility in metadata.
|
455,751 |
12.07.2018 10:38:05
| 25,200 |
f642ca68c8313acd5db92b317e605adeeb2a4cea
|
Display errors fix.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"new_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"diff": "if (fullResponse === \"Not Found\") {\ndisplayErrors([\"The package file exceeds the size limit. Please try again.\"]);\n}\n+ else {\n+ displayErrors(model.responseJSON);\n+ }\nbreak;\ndefault:\ndisplayErrors(model.responseJSON);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Display errors fix. (#6161)
|
455,794 |
13.07.2018 09:27:08
| 25,200 |
c9acabf22aa8dbe3959e864c9e8c8a6590186830
|
Delete org with policies fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/DeleteAccountController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/DeleteAccountController.cs",
"diff": "@@ -30,7 +30,7 @@ public virtual ActionResult Search(string query)\nif (!string.IsNullOrWhiteSpace(query))\n{\nvar user = _userService.FindByUsername(query);\n- if (user != null && user.Username != null && !user.IsDeleted && !(user is Organization))\n+ if (user != null && user.Username != null && !user.IsDeleted)\n{\nvar result = new DeleteAccountSearchResult(user.Username);\nresults.Add(result);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/ISecurityPolicyService.cs",
"new_path": "src/NuGetGallery/Security/ISecurityPolicyService.cs",
"diff": "using System.Collections.Generic;\nusing System.Threading.Tasks;\nusing System.Web;\n-using NuGetGallery.Filters;\nnamespace NuGetGallery.Security\n{\n@@ -18,6 +17,11 @@ public interface ISecurityPolicyService\n/// </summary>\nIEnumerable<IUserSecurityPolicySubscription> UserSubscriptions { get; }\n+ /// <summary>\n+ /// Available organization security policy subscriptions.\n+ /// </summary>\n+ IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscriptions { get; }\n+\n/// <summary>\n/// Check if a user is subscribed to one or more security policies.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/RequireOrganizationTenantPolicy.cs",
"new_path": "src/NuGetGallery/Security/RequireOrganizationTenantPolicy.cs",
"diff": "@@ -12,7 +12,7 @@ namespace NuGetGallery.Security\n{\npublic class RequireOrganizationTenantPolicy : UserSecurityPolicyHandler, IUserSecurityPolicySubscription\n{\n- public const string _SubscriptionName = \"AzureActiveDirectoryTenant\";\n+ public const string _SubscriptionName = nameof(RequireOrganizationTenantPolicy);\npublic const string PolicyName = nameof(RequireOrganizationTenantPolicy);\npublic string SubscriptionName => _SubscriptionName;\n@@ -25,18 +25,13 @@ public class State\npublic string Tenant { get; set; }\n}\n- public RequireOrganizationTenantPolicy()\n- : base(PolicyName, SecurityPolicyAction.JoinOrganization)\n- {\n- }\n-\nprivate RequireOrganizationTenantPolicy(IEnumerable<UserSecurityPolicy> policies)\n: base(PolicyName, SecurityPolicyAction.JoinOrganization)\n{\nPolicies = policies;\n}\n- public static IUserSecurityPolicySubscription Create(string tenantId)\n+ public static RequireOrganizationTenantPolicy Create(string tenantId = \"\")\n{\nvar value = JsonConvert.SerializeObject(new State()\n{\n@@ -45,7 +40,7 @@ public static IUserSecurityPolicySubscription Create(string tenantId)\nreturn new RequireOrganizationTenantPolicy(new []\n{\n- new UserSecurityPolicy(PolicyName, PolicyName, value)\n+ new UserSecurityPolicy(PolicyName, _SubscriptionName, value)\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Areas/Admin/Controllers/DeleteAccountControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Areas/Admin/Controllers/DeleteAccountControllerFacts.cs",
"diff": "using System.Collections.Generic;\nusing System.Web.Mvc;\nusing NuGetGallery.Areas.Admin.ViewModels;\n+using NuGetGallery.Framework;\nusing Moq;\nusing Xunit;\n-\nnamespace NuGetGallery.Areas.Admin.Controllers\n{\npublic class DeleteAccountControllerFacts\n{\n+ private Fakes _fakes = new Fakes();\n+\n[Fact]\npublic void CtorThrowsOnNullArg()\n{\n@@ -20,84 +22,86 @@ public void CtorThrowsOnNullArg()\nAssert.Throws<ArgumentNullException>(() => new DeleteAccountController(null));\n}\n+ public class TheSearchMethod\n+ {\n+ private Fakes _fakes = new Fakes();\n+\n[Theory]\n[InlineData(\"\")]\n[InlineData(null)]\n- public void SearchNullOrEmptyQueryAccounts(string query)\n+ public void WhenQueryMissing_ReturnsEmpty(string query)\n{\n- // Arrange\n- var userService = new Mock<IUserService>();\n- var controller = new DeleteAccountController(userService.Object);\n-\n- // Act\n- var searchResult = controller.Search(query);\n+ // Arrange & Act\n+ var searchResult = SearchAccount(query, findByUsernameTimes: 0);\n// Assert\n- var data = (List<DeleteAccountSearchResult>)((JsonResult)searchResult).Data;\n- Assert.Empty(data);\n+ Assert.Empty(searchResult);\n}\n[Fact]\n- public void SearchNotExistentUser()\n+ public void WhenUser_ReturnsMatch()\n{\n- // Arrange\n- User currentUser = null;\n- var userService = new Mock<IUserService>();\n- userService.Setup(m => m.FindByUsername(It.IsAny<string>(), false)).Returns(currentUser);\n- var controller = new DeleteAccountController(userService.Object);\n-\n- // Act\n- var searchResult = controller.Search(\"SomeAccount\");\n+ // Arrange & Act\n+ var searchResult = SearchAccount(_fakes.User.Username, _fakes.User);\n// Assert\n- var data = (List<DeleteAccountSearchResult>)((JsonResult)searchResult).Data;\n- Assert.Empty(data);\n+ Assert.Single(searchResult);\n}\n[Fact]\n- public void SearchDeletedAccont()\n+ public void WhenOrganization_ReturnsMatch()\n{\n- // Arrange\n- var userName = \"TestUser\";\n- var currentUser = new User()\n- {\n- Username = userName,\n- IsDeleted = true\n- };\n+ // Arrange & Act\n+ var searchResult = SearchAccount(_fakes.Organization.Username, _fakes.Organization);\n- var userService = new Mock<IUserService>();\n- userService.Setup(m => m.FindByUsername(userName, false)).Returns(currentUser);\n- var controller = new DeleteAccountController(userService.Object);\n+ // Assert\n+ Assert.Single(searchResult);\n+ }\n- // Act\n- var searchResult = controller.Search(userName);\n+ [Fact]\n+ public void WhenNotFound_ReturnsEmpty()\n+ {\n+ // Arrange & Act\n+ _fakes.ShaUser.IsDeleted = true;\n+\n+ var searchResult = SearchAccount(\"UserNotFound\");\n// Assert\n- var data = (List<DeleteAccountSearchResult>)((JsonResult)searchResult).Data;\n- Assert.Empty(data);\n+ Assert.Empty(searchResult);\n}\n[Fact]\n- public void SearchHappyAccont()\n- {\n- // Arrange\n- var userName = \"TestUser\";\n- var currentUser = new User()\n+ public void WhenDeletedUser_ReturnsEmpty()\n{\n- Username = userName,\n- IsDeleted = false\n- };\n+ // Arrange & Act\n+ _fakes.ShaUser.IsDeleted = true;\n+\n+ var searchResult = SearchAccount(_fakes.ShaUser.Username);\n+ // Assert\n+ Assert.Empty(searchResult);\n+ }\n+\n+ private List<DeleteAccountSearchResult> SearchAccount(string userName, User findByUsernameResult = null, int findByUsernameTimes = 1)\n+ {\n+ // Arrange\nvar userService = new Mock<IUserService>();\n- userService.Setup(m => m.FindByUsername(userName, false)).Returns(currentUser);\n+\n+ userService.Setup(m => m.FindByUsername(It.IsAny<string>(), It.IsAny<bool>()))\n+ .Returns(findByUsernameResult)\n+ .Verifiable();\n+\nvar controller = new DeleteAccountController(userService.Object);\n// Act\n- var searchResult = controller.Search(userName);\n+ var result = controller.Search(userName) as JsonResult;\n// Assert\n- var data = (List<DeleteAccountSearchResult>)((JsonResult)searchResult).Data;\n- Assert.Single(data);\n+ userService.Verify(m => m.FindByUsername(userName, false), Times.Exactly(findByUsernameTimes));\n+\n+ Assert.NotNull(result);\n+ return result.Data as List<DeleteAccountSearchResult>;\n+ }\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Areas/Admin/Controllers/SecurityPolicyControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Areas/Admin/Controllers/SecurityPolicyControllerFacts.cs",
"diff": "@@ -95,7 +95,7 @@ public async Task SearchReturnsUserSubscriptions()\n// Arrange.\nvar policyService = new TestSecurityPolicyService();\nvar dbUsers = TestUsers.ToArray();\n- var subscription = policyService.Mocks.Subscription.Object;\n+ var subscription = policyService.Mocks.UserPoliciesSubscription.Object;\nvar subscriptionName = subscription.SubscriptionName;\nawait policyService.SubscribeAsync(dbUsers[1], subscription);\n@@ -135,7 +135,7 @@ public async Task UpdateSubscribesUsers()\nvar entitiesMock = policyService.MockEntitiesContext;\nentitiesMock.Setup(c => c.Users).Returns(users.MockDbSet().Object);\nvar controller = new SecurityPolicyController(entitiesMock.Object, policyService);\n- var subscription = policyService.Mocks.Subscription.Object;\n+ var subscription = policyService.Mocks.UserPoliciesSubscription.Object;\nAssert.DoesNotContain(users, u => policyService.IsSubscribed(u, subscription));\n@@ -165,7 +165,7 @@ public async Task UpdateUnsubscribesUsers()\nvar entitiesMock = policyService.MockEntitiesContext;\nentitiesMock.Setup(c => c.Users).Returns(users.MockDbSet().Object);\nvar controller = new SecurityPolicyController(entitiesMock.Object, policyService);\n- var subscription = policyService.Mocks.Subscription.Object;\n+ var subscription = policyService.Mocks.UserPoliciesSubscription.Object;\nusers.ForEach(async u => await policyService.SubscribeAsync(u, subscription));\npolicyService.MockEntitiesContext.ResetCalls();\n@@ -196,7 +196,7 @@ public async Task UpdateIgnoresBadUsers()\nvar entitiesMock = policyService.MockEntitiesContext;\nentitiesMock.Setup(c => c.Users).Returns(users.MockDbSet().Object);\nvar controller = new SecurityPolicyController(entitiesMock.Object, policyService);\n- var subscription = policyService.Mocks.Subscription.Object;\n+ var subscription = policyService.Mocks.UserPoliciesSubscription.Object;\n// Act.\nvar model = new List<string>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/RequireOrganizationTenantPolicyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/RequireOrganizationTenantPolicyFacts.cs",
"diff": "@@ -61,7 +61,9 @@ private SecurityPolicyResult Evaluate(string userTenantId)\ntargetAccount: fakes.User\n);\n- return new RequireOrganizationTenantPolicy().Evaluate(context);\n+ return RequireOrganizationTenantPolicy\n+ .Create()\n+ .Evaluate(context);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/SecurityPolicyServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Security/SecurityPolicyServiceFacts.cs",
"diff": "@@ -94,7 +94,7 @@ public async Task EvaluateAsync_ReturnsSuccessWithEvaluationIfPoliciesFoundAndMe\n// Arrange\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act\n@@ -115,7 +115,7 @@ public async Task EvaluateAsync_ReturnsNonSuccessAfterFirstFailure()\nvar policyData = new TestUserSecurityPolicyData(policy1Result: false, policy2Result: true);\nvar service = new TestSecurityPolicyService(policyData);\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act\n@@ -134,7 +134,7 @@ public async Task EvaluateAsync_SavesAuditRecordsForSuccessAndFailureCases(bool\nvar policyData = new TestUserSecurityPolicyData(policy1Result: success, policy2Result: success);\nvar service = new TestSecurityPolicyService(policyData);\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act\n@@ -158,7 +158,7 @@ public async Task EvaluateAsync_EvaluatesOnlyPoliciesRelevantToTheAction()\nvar service = new TestSecurityPolicyService(policyData, policyHandlers);\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nvar userSecurityPolicies = new List<UserSecurityPolicy>(subscription.Policies);\nuserSecurityPolicies.Add(new UserSecurityPolicy(extraPolicyName, \"ExtraSubscription\"));\n@@ -183,7 +183,7 @@ public async Task EvaluateAsync_WhenEnforceDefaultSecurityPoliciesIsFalseDefault\nvar policyData = new TestUserSecurityPolicyData(policy1Result: true, policy2Result: true, defaultPolicy1Result: false, defaultPolicy2Result: false);\nvar service = new TestSecurityPolicyService(policyData);\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act\n@@ -203,9 +203,9 @@ public async Task EvaluateAsync_WhenDefaultSecurityPolicyNotMetReturnFailure()\n// Arrange\nvar policyData = new TestUserSecurityPolicyData(policy1Result: true, policy2Result: true, defaultPolicy1Result: true, defaultPolicy2Result: false);\nvar configuration = new AppConfiguration() { EnforceDefaultSecurityPolicies = true };\n- var service = new TestSecurityPolicyService(policyData, null, null, null, null, configuration);\n+ var service = new TestSecurityPolicyService(policyData, configuration: configuration);\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act\n@@ -233,9 +233,9 @@ public async Task EvaluateAsync_WhenDefaultSecurityPolicyIsMetUserPolicyIsEvalua\n// Arrange\nvar policyData = new TestUserSecurityPolicyData(policy1Result: true, policy2Result: userPolicyMet, defaultPolicy1Result: true, defaultPolicy2Result: true);\nvar configuration = new AppConfiguration() { EnforceDefaultSecurityPolicies = true };\n- var service = new TestSecurityPolicyService(policyData, null, null, null, null, configuration);\n+ var service = new TestSecurityPolicyService(policyData, configuration: configuration);\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act\n@@ -277,7 +277,7 @@ public void IsSubscribed_ReturnsTrueIfUserHasSubscriptionPolicies()\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies = subscription.Policies.ToList();\n// Act & Assert.\n@@ -291,7 +291,7 @@ public void IsSubscribed_ReturnsTrueIfUserHasSubscriptionAndOtherPolicies()\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\nuser.SecurityPolicies.Add(new UserSecurityPolicy(\"OtherPolicy\", \"OtherSubscription\"));\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nforeach (var policy in subscription.Policies)\n{\nuser.SecurityPolicies.Add(policy);\n@@ -307,7 +307,7 @@ public void IsSubscribed_ReturnsFalseIfUserDoesNotHaveAllSubscriptionPolicies()\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nuser.SecurityPolicies.Add(subscription.Policies.First());\n// Act & Assert.\n@@ -352,7 +352,7 @@ public async Task SubscribeAsync_AddsAllSubscriptionPoliciesWhenHasNoneToStart()\nAssert.Equal(2, user.SecurityPolicies.Count);\nservice.Mocks.VerifySubscriptionPolicies(user.SecurityPolicies);\n- service.Mocks.Subscription.Verify(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\n+ service.Mocks.UserPoliciesSubscription.Verify(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n}\n@@ -363,7 +363,7 @@ public async Task SubscribeAsync_AddsAllSubscriptionPoliciesWhenHasSameAsDiffere\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\nvar subscriptionName2 = \"MockSubscription2\";\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nforeach (var policy in subscription.Policies)\n{\nuser.SecurityPolicies.Add(new UserSecurityPolicy(policy.Name, subscriptionName2));\n@@ -381,7 +381,7 @@ public async Task SubscribeAsync_AddsAllSubscriptionPoliciesWhenHasSameAsDiffere\nAssert.Equal(subscriptionName2, policies[0].Subscription);\nservice.Mocks.VerifySubscriptionPolicies(policies.Skip(2));\n- service.Mocks.Subscription.Verify(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\n+ service.Mocks.UserPoliciesSubscription.Verify(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\n}\n@@ -391,7 +391,7 @@ public async Task SubscribeAsync_DoesNotAddSubscriptionPoliciesIfAlreadySubscrib\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nforeach (var policy in subscription.Policies)\n{\nuser.SecurityPolicies.Add(new UserSecurityPolicy(policy));\n@@ -406,7 +406,7 @@ public async Task SubscribeAsync_DoesNotAddSubscriptionPoliciesIfAlreadySubscrib\nAssert.Equal(2, user.SecurityPolicies.Count);\nservice.Mocks.VerifySubscriptionPolicies(user.SecurityPolicies);\n- service.Mocks.Subscription.Verify(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Never);\n+ service.Mocks.UserPoliciesSubscription.Verify(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Never);\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n}\n@@ -471,7 +471,7 @@ public async Task UnsubscribeAsync_RemovesAllSubscriptionPolicies()\n// Arrange.\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nforeach (var policy in subscription.Policies)\n{\nuser.SecurityPolicies.Add(new UserSecurityPolicy(policy));\n@@ -484,7 +484,7 @@ public async Task UnsubscribeAsync_RemovesAllSubscriptionPolicies()\n// Act & Assert.\nAssert.Equal(0, user.SecurityPolicies.Count);\n- service.Mocks.Subscription.Verify(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\n+ service.Mocks.UserPoliciesSubscription.Verify(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\nservice.MockUserSecurityPolicies.Verify(p => p.Remove(It.IsAny<UserSecurityPolicy>()), Times.Exactly(2));\n}\n@@ -496,7 +496,7 @@ public async Task UnsubscribeAsync_DoesNotRemoveOtherSubscriptionPolicies()\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\nvar subscriptionName2 = \"MockSubscription2\";\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nforeach (var policy in subscription.Policies)\n{\nuser.SecurityPolicies.Add(new UserSecurityPolicy(policy));\n@@ -513,7 +513,7 @@ public async Task UnsubscribeAsync_DoesNotRemoveOtherSubscriptionPolicies()\nAssert.Equal(subscriptionName2, policies[0].Subscription);\nAssert.Equal(subscriptionName2, policies[1].Subscription);\n- service.Mocks.Subscription.Verify(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\n+ service.Mocks.UserPoliciesSubscription.Verify(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Once);\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Once);\nservice.MockUserSecurityPolicies.Verify(p => p.Remove(It.IsAny<UserSecurityPolicy>()), Times.Exactly(2));\n}\n@@ -525,7 +525,7 @@ public async Task UnsubscribeAsync_RemovesNoPoliciesIfNotSubscribed()\nvar service = new TestSecurityPolicyService();\nvar user = new User(\"testUser\");\nvar subscriptionName2 = \"MockSubscription2\";\n- var subscription = service.Mocks.Subscription.Object;\n+ var subscription = service.Mocks.UserPoliciesSubscription.Object;\nforeach (var policy in subscription.Policies)\n{\nuser.SecurityPolicies.Add(new UserSecurityPolicy(policy.Name, subscriptionName2));\n@@ -538,7 +538,7 @@ public async Task UnsubscribeAsync_RemovesNoPoliciesIfNotSubscribed()\n// Act & Assert.\nAssert.Equal(2, user.SecurityPolicies.Count);\n- service.Mocks.Subscription.Verify(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Never);\n+ service.Mocks.UserPoliciesSubscription.Verify(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()), Times.Never);\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\nservice.MockUserSecurityPolicies.Verify(p => p.Remove(It.IsAny<UserSecurityPolicy>()), Times.Never);\n}\n@@ -575,6 +575,30 @@ public async Task UnsubscribeAsync_DoesNotSaveAuditRecordIfWasNotSubscribed()\nservice.MockAuditingService.Verify(s => s.SaveAuditRecordAsync(It.IsAny<AuditRecord>()), Times.Never);\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": "@@ -26,12 +26,15 @@ public class TestSecurityPolicyService : SecurityPolicyService\npublic override IEnumerable<IUserSecurityPolicySubscription> UserSubscriptions { get; }\n+ public override IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscriptions { get; }\n+\nprotected override IEnumerable<UserSecurityPolicyHandler> UserHandlers { get; }\npublic TestSecurityPolicyService(\nTestUserSecurityPolicyData mocks = null,\nIEnumerable<UserSecurityPolicyHandler> userHandlers = null,\nIEnumerable<IUserSecurityPolicySubscription> userSubscriptions = null,\n+ IEnumerable<IUserSecurityPolicySubscription> organizationSubscriptions = null,\nMock<IEntitiesContext> mockEntities = null,\nMock<IAuditingService> mockAuditing = null,\nIAppConfiguration configuration = null)\n@@ -40,7 +43,8 @@ public class TestSecurityPolicyService : SecurityPolicyService\nMocks = mocks ?? new TestUserSecurityPolicyData();\nUserHandlers = userHandlers ?? Mocks.Handlers.Select(m => m.Object);\n- UserSubscriptions = userSubscriptions ?? new [] { Mocks.Subscription.Object };\n+ UserSubscriptions = userSubscriptions ?? new [] { Mocks.UserPoliciesSubscription.Object };\n+ OrganizationSubscriptions = organizationSubscriptions ?? new[] { Mocks.OrganizationPoliciesSubscription.Object };\nDefaultSubscription = Mocks.DefaultSubscription.Object;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Security/TestUserSecurityPolicyData.cs",
"new_path": "tests/NuGetGallery.Facts/Security/TestUserSecurityPolicyData.cs",
"diff": "@@ -11,40 +11,52 @@ namespace NuGetGallery.Security\n{\npublic class TestUserSecurityPolicyData\n{\n- private const string MockSubscriptionName = \"MockSubscription\";\n+ private const string UserPoliciesSubscriptionName = \"MockSubscription\";\n+ private const string OrganizationPoliciesSubscriptionName = \"MockSubscription2\";\nprivate const string MockDefaultSubscriptionName = \"Default\";\npublic TestUserSecurityPolicyData(bool policy1Result = true, bool policy2Result = true, bool defaultPolicy1Result = true, bool defaultPolicy2Result = true)\n{\nvar resultPerSubscription1 = new Dictionary<string, bool>()\n{\n- { MockSubscriptionName, policy1Result },\n+ { UserPoliciesSubscriptionName, policy1Result },\n{ MockDefaultSubscriptionName, defaultPolicy1Result }\n};\nvar resultPerSubscription2 = new Dictionary<string, bool>()\n{\n- { MockSubscriptionName, policy2Result },\n+ { UserPoliciesSubscriptionName, policy2Result },\n{ MockDefaultSubscriptionName, defaultPolicy2Result }\n};\nMockPolicyHandler1 = MockHandler(nameof(MockPolicyHandler1), resultPerSubscription1);\nMockPolicyHandler2 = MockHandler(nameof(MockPolicyHandler2), resultPerSubscription2);\n- Subscription = new Mock<IUserSecurityPolicySubscription>();\n- Subscription.Setup(s => s.SubscriptionName).Returns(MockSubscriptionName);\n- Subscription.Setup(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()))\n- .Returns(Task.CompletedTask).Verifiable();\n- Subscription.Setup(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()))\n- .Returns(Task.CompletedTask).Verifiable();\n- Subscription.Setup(s => s.Policies).Returns(GetMockPolicies(MockSubscriptionName));\n+ UserPoliciesSubscription = CreateSubscriptionMock(UserPoliciesSubscriptionName);\n+ OrganizationPoliciesSubscription = CreateSubscriptionMock(OrganizationPoliciesSubscriptionName);\nDefaultSubscription = new Mock<IUserSecurityPolicySubscription>();\nDefaultSubscription.Setup(s => s.SubscriptionName).Returns(MockDefaultSubscriptionName);\nDefaultSubscription.Setup(s => s.Policies).Returns(GetMockPolicies(MockDefaultSubscriptionName));\n}\n- public Mock<IUserSecurityPolicySubscription> Subscription { get; }\n+ private Mock<IUserSecurityPolicySubscription> CreateSubscriptionMock(string name)\n+ {\n+ var subscription = new Mock<IUserSecurityPolicySubscription>();\n+\n+ subscription.Setup(s => s.SubscriptionName).Returns(name);\n+ subscription.Setup(s => s.OnSubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()))\n+ .Returns(Task.CompletedTask).Verifiable();\n+ subscription.Setup(s => s.OnUnsubscribeAsync(It.IsAny<UserSecurityPolicySubscriptionContext>()))\n+ .Returns(Task.CompletedTask).Verifiable();\n+ subscription.Setup(s => s.Policies).Returns(GetMockPolicies(name));\n+\n+ return subscription;\n+ }\n+\n+ public Mock<IUserSecurityPolicySubscription> UserPoliciesSubscription { get; }\n+\n+ public Mock<IUserSecurityPolicySubscription> OrganizationPoliciesSubscription { get; }\npublic Mock<IUserSecurityPolicySubscription> DefaultSubscription { get; }\n@@ -64,7 +76,7 @@ public IEnumerable<Mock<UserSecurityPolicyHandler>> Handlers\npublic void VerifySubscriptionPolicies(IEnumerable<UserSecurityPolicy> actualPolicies)\n{\nvar actual = actualPolicies.ToList();\n- var expected = Subscription.Object.Policies.ToList();\n+ var expected = UserPoliciesSubscription.Object.Policies.ToList();\nAssert.Equal(expected.Count, actual.Count);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Delete org with policies fix (#6140)
|
455,747 |
13.07.2018 12:20:35
| 25,200 |
ee57c480d559dc682d92785bac67b8da7b181bb6
|
Disable ID-Title validation for upload
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -208,11 +208,6 @@ protected override void Load(ContainerBuilder builder)\n.As<IUserService>()\n.InstancePerLifetimeScope();\n- builder.RegisterType<PackageNamingConflictValidator>()\n- .AsSelf()\n- .As<IPackageNamingConflictValidator>()\n- .InstancePerLifetimeScope();\n-\nbuilder.RegisterType<PackageService>()\n.AsSelf()\n.As<IPackageService>()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\NullStatisticsService.cs\" />\n<Compile Include=\"Services\\PackageDeleteService.cs\" />\n<Compile Include=\"Services\\PackageFileService.cs\" />\n- <Compile Include=\"Services\\IPackageNamingConflictValidator.cs\" />\n- <Compile Include=\"Services\\PackageNamingConflictValidator.cs\" />\n<Compile Include=\"Services\\PackageSearchResults.cs\" />\n<Compile Include=\"Services\\JsonAggregateStatsService.cs\" />\n<Compile Include=\"Services\\SearchResults.cs\" />\n"
},
{
"change_type": "DELETE",
"old_path": "src/NuGetGallery/Services/PackageNamingConflictValidator.cs",
"new_path": null,
"diff": "-// Copyright (c) .NET Foundation. All rights reserved.\n-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Linq;\n-\n-namespace NuGetGallery\n-{\n- public class PackageNamingConflictValidator\n- : IPackageNamingConflictValidator\n- {\n- private readonly IEntityRepository<PackageRegistration> _packageRegistrationRepository;\n- private readonly IEntityRepository<Package> _packageRepository;\n-\n- public PackageNamingConflictValidator(\n- IEntityRepository<PackageRegistration> packageRegistrationRepository,\n- IEntityRepository<Package> packageRepository)\n- {\n- _packageRegistrationRepository = packageRegistrationRepository;\n- _packageRepository = packageRepository;\n- }\n-\n- public bool TitleConflictsWithExistingRegistrationId(string registrationId, string packageTitle)\n- {\n- if (string.IsNullOrEmpty(registrationId))\n- {\n- throw new ArgumentNullException(nameof(registrationId));\n- }\n-\n- if (!string.IsNullOrEmpty(packageTitle))\n- {\n- var cleanedTitle = packageTitle.Trim().ToLowerInvariant();\n- if (!string.IsNullOrEmpty(cleanedTitle))\n- {\n- var packageRegistration = _packageRegistrationRepository.GetAll()\n- .SingleOrDefault(pr => pr.Id.ToLower() == cleanedTitle);\n-\n- if (packageRegistration != null\n- && !String.Equals(packageRegistration.Id, registrationId, StringComparison.OrdinalIgnoreCase))\n- {\n- return true;\n- }\n- }\n- }\n-\n- return false;\n- }\n-\n- public bool IdConflictsWithExistingPackageTitle(string registrationId)\n- {\n- if (string.IsNullOrEmpty(registrationId))\n- {\n- throw new ArgumentNullException(nameof(registrationId));\n- }\n-\n- registrationId = registrationId.ToLowerInvariant();\n-\n- // We allow any package status aside from soft-deleted to be considered for ID/title conflicts.\n- return _packageRepository.GetAll()\n- .Any(p => p.PackageStatusKey != PackageStatus.Deleted && p.Title.ToLower() == registrationId);\n- }\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -19,7 +19,6 @@ namespace NuGetGallery\n{\npublic class PackageService : CorePackageService, IPackageService\n{\n- private readonly IPackageNamingConflictValidator _packageNamingConflictValidator;\nprivate readonly IAuditingService _auditingService;\nprivate readonly ITelemetryService _telemetryService;\nprivate readonly ISecurityPolicyService _securityPolicyService;\n@@ -28,13 +27,11 @@ public class PackageService : CorePackageService, IPackageService\nIEntityRepository<PackageRegistration> packageRegistrationRepository,\nIEntityRepository<Package> packageRepository,\nIEntityRepository<Certificate> certificateRepository,\n- IPackageNamingConflictValidator packageNamingConflictValidator,\nIAuditingService auditingService,\nITelemetryService telemetryService,\nISecurityPolicyService securityPolicyService)\n: base(packageRepository, packageRegistrationRepository, certificateRepository)\n{\n- _packageNamingConflictValidator = packageNamingConflictValidator ?? throw new ArgumentNullException(nameof(packageNamingConflictValidator));\n_auditingService = auditingService ?? throw new ArgumentNullException(nameof(auditingService));\n_telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n_securityPolicyService = securityPolicyService ?? throw new ArgumentNullException(nameof(securityPolicyService));\n@@ -59,8 +56,6 @@ public async Task EnsureValid(PackageArchiveReader packageArchiveReader)\nValidateNuGetPackageMetadata(packageMetadata);\n- ValidatePackageTitle(packageMetadata);\n-\nvar supportedFrameworks = GetSupportedFrameworks(packageArchiveReader).Select(fn => fn.ToShortNameOrNull()).ToArray();\nif (!supportedFrameworks.AnySafe(sf => sf == null))\n{\n@@ -101,8 +96,6 @@ public async Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage,\nValidateNuGetPackageMetadata(packageMetadata);\n- ValidatePackageTitle(packageMetadata);\n-\npackageRegistration = CreateOrGetPackageRegistration(owner, currentUser, packageMetadata, isVerified);\n}\ncatch (Exception exception) when (exception is EntityException || exception is PackagingException)\n@@ -456,10 +449,6 @@ private PackageRegistration CreateOrGetPackageRegistration(User owner, User curr\nif (packageRegistration == null)\n{\n- if (_packageNamingConflictValidator.IdConflictsWithExistingPackageTitle(packageMetadata.Id))\n- {\n- throw new EntityException(Strings.NewRegistrationIdMatchesExistingPackageTitle, packageMetadata.Id);\n- }\npackageRegistration = new PackageRegistration\n{\n@@ -679,14 +668,6 @@ private static void ValidateSupportedFrameworks(string[] supportedFrameworks)\n}\n}\n- private void ValidatePackageTitle(PackageMetadata packageMetadata)\n- {\n- if (_packageNamingConflictValidator.TitleConflictsWithExistingRegistrationId(packageMetadata.Id, packageMetadata.Title))\n- {\n- throw new EntityException(Strings.TitleMatchesExistingRegistration, packageMetadata.Title);\n- }\n- }\n-\npublic async Task SetLicenseReportVisibilityAsync(Package package, bool visible, bool commitChanges = true)\n{\nif (package == null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1111,15 +1111,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to The ID of your package, '{0}', is similar to the title of an existing package, which can cause confusion with our users. Please modify the ID of your package and try uploading again..\n- /// </summary>\n- public static string NewRegistrationIdMatchesExistingPackageTitle {\n- get {\n- return ResourceManager.GetString(\"NewRegistrationIdMatchesExistingPackageTitle\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to No.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -342,9 +342,6 @@ The {1} Team</value>\n<data name=\"TitleMatchesExistingRegistration\" xml:space=\"preserve\">\n<value>The title of your package, '{0}', is similar to the ID of an existing package, which can cause confusion with our users. Please modify the title of your package and try uploading again.</value>\n</data>\n- <data name=\"NewRegistrationIdMatchesExistingPackageTitle\" xml:space=\"preserve\">\n- <value>The ID of your package, '{0}', is similar to the title of an existing package, which can cause confusion with our users. Please modify the ID of your package and try uploading again.</value>\n- </data>\n<data name=\"InvalidPortableFramework\" xml:space=\"preserve\">\n<value>The package framework '{0}' is not supported. Frameworks within the portable profile are not allowed to have profiles themselves.</value>\n</data>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"ExtensionMethodsFacts.cs\" />\n<Compile Include=\"Filters\\ApiAuthorizeAttributeFacts.cs\" />\n<Compile Include=\"Filters\\RequiresAccountConfirmationAttributeFacts.cs\" />\n- <Compile Include=\"Services\\PackageNamingConflictValidatorFacts.cs\" />\n<Compile Include=\"TestPackage.cs\" />\n<Compile Include=\"Framework\\AssertEx.cs\" />\n<Compile Include=\"Framework\\Fakes.cs\" />\n"
},
{
"change_type": "DELETE",
"old_path": "tests/NuGetGallery.Facts/Services/PackageNamingConflictValidatorFacts.cs",
"new_path": null,
"diff": "-// Copyright (c) .NET Foundation. All rights reserved.\n-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System.Collections.Generic;\n-using System.Linq;\n-using Moq;\n-using Xunit;\n-\n-namespace NuGetGallery\n-{\n- public class PackageNamingConflictValidatorFacts\n- {\n- [Theory]\n- [InlineData(\"Microsoft.FooBar\", \"Microsoft.FooBar\", true)]\n- [InlineData(\"Microsoft.FooBar\", \"microsoft.foobar\", true)]\n- [InlineData(\"Microsoft.FooBar\", \"Another.Package\", false)]\n- [InlineData(\"Microsoft.FooBar\", \"another.package\", false)]\n- [InlineData(\"Microsoft.FooBar\", \"Microsoft.FooBar contribution package\", false)]\n- public void TitleConflictsWithExistingRegistrationIdTests(string existingRegistrationId, string newPackageTitle, bool shouldBeConflict)\n- {\n- // Arrange\n- var existingPackageRegistration = new PackageRegistration\n- {\n- Id = existingRegistrationId,\n- Owners = new HashSet<User>()\n- };\n-\n- var target = CreateValidator(existingPackageRegistration, package: null);\n-\n- // Act\n- var result = target.TitleConflictsWithExistingRegistrationId(\"NewPackageId\", newPackageTitle);\n-\n- // Assert\n- Assert.True(result == shouldBeConflict);\n- }\n-\n- [Theory]\n- [InlineData(\"ExistingPackageId\", \"ExistingPackageTitle\", \"NewPackageId\", false)]\n- [InlineData(\"ExistingPackageId\", \"ExistingPackageTitle\", \"newpackageid\", false)]\n- [InlineData(\"AnotherPackageTitle\", \"ExistingPackageTitle\", \"ExistingPackageTitle\", true)]\n- [InlineData(\"AnotherPackageTitle\", \"ExistingPackageTitle\", \"EXISTingPACKAGETiTLE\", true)]\n- public void IdConflictsWithExistingPackageTitleTests(string existingPackageId, string existingPackageTitle, string newPackageId, bool shouldBeConflict)\n- {\n- // Arrange\n- var existingPackageRegistration = new PackageRegistration\n- {\n- Id = existingPackageId,\n- Owners = new HashSet<User>()\n- };\n- var existingPackage = new Package\n- {\n- PackageRegistration = existingPackageRegistration,\n- Version = \"1.0.0\",\n- Title = existingPackageTitle\n- };\n-\n- var target = CreateValidator(existingPackageRegistration, existingPackage);\n-\n- // Act\n- var result = target.IdConflictsWithExistingPackageTitle(newPackageId);\n-\n- // Assert\n- Assert.True(result == shouldBeConflict);\n- }\n-\n- [Theory]\n- [InlineData(true)]\n- [InlineData(false)]\n- public void IdConflictsWithExistingPackageTitle_DoesNotSupportTitleReuseWithNonDeletedPackage(bool isExistingPackageListed)\n- {\n- // Arrange\n- var packageRegistration = new PackageRegistration\n- {\n- Id = \"A\",\n- Owners = new HashSet<User>()\n- };\n- var package = new Package\n- {\n- PackageRegistration = packageRegistration,\n- Version = \"1.0.0\",\n- Title = \"B\",\n- Listed = isExistingPackageListed,\n- PackageStatusKey = PackageStatus.Available,\n- };\n- var target = CreateValidator(packageRegistration, package);\n-\n- // Act\n- var actualResult = target.IdConflictsWithExistingPackageTitle(registrationId: \"B\");\n-\n- // Assert\n- Assert.True(actualResult);\n- }\n-\n- [Fact]\n- public void IdConflictsWithExistingPackageTitle_SupportsTitleReuseWithSoftDeletedPackage()\n- {\n- // Arrange\n- var packageRegistration = new PackageRegistration\n- {\n- Id = \"A\",\n- Owners = new HashSet<User>()\n- };\n- var package = new Package\n- {\n- PackageRegistration = packageRegistration,\n- Version = \"1.0.0\",\n- Title = \"B\",\n- Listed = false,\n- PackageStatusKey = PackageStatus.Deleted,\n- };\n- var target = CreateValidator(packageRegistration, package);\n-\n- // Act\n- var actualResult = target.IdConflictsWithExistingPackageTitle(registrationId: \"B\");\n-\n- // Assert\n- Assert.False(actualResult);\n- }\n-\n- private static PackageNamingConflictValidator CreateValidator(PackageRegistration packageRegistration, Package package)\n- {\n- var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n- packageRegistrationRepository.Setup(r => r.GetAll()).Returns(new[] { packageRegistration }.AsQueryable());\n-\n- var packageRepository = new Mock<IEntityRepository<Package>>();\n-\n- if (package != null)\n- {\n- packageRepository.Setup(r => r.GetAll()).Returns(new[] { package }.AsQueryable());\n- }\n-\n- return new PackageNamingConflictValidator(packageRegistrationRepository.Object, packageRepository.Object);\n- }\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -24,7 +24,6 @@ public class PackageServiceFacts\nMock<IEntityRepository<PackageRegistration>> packageRegistrationRepository = null,\nMock<IEntityRepository<Package>> packageRepository = null,\nMock<IEntityRepository<Certificate>> certificateRepository = null,\n- IPackageNamingConflictValidator packageNamingConflictValidator = null,\nIAuditingService auditingService = null,\nMock<ITelemetryService> telemetryService = null,\nMock<ISecurityPolicyService> securityPolicyService = null,\n@@ -37,18 +36,10 @@ public class PackageServiceFacts\ntelemetryService = telemetryService ?? new Mock<ITelemetryService>();\nsecurityPolicyService = securityPolicyService ?? new Mock<ISecurityPolicyService>();\n- if (packageNamingConflictValidator == null)\n- {\n- packageNamingConflictValidator = new PackageNamingConflictValidator(\n- packageRegistrationRepository.Object,\n- packageRepository.Object);\n- }\n-\nvar packageService = new Mock<PackageService>(\npackageRegistrationRepository.Object,\npackageRepository.Object,\ncertificateRepository.Object,\n- packageNamingConflictValidator,\nauditingService,\ntelemetryService.Object,\nsecurityPolicyService.Object);\n@@ -190,48 +181,6 @@ public void WillCreateANewPackageRegistrationUsingTheNugetPackIdWhenOneDoesNotAl\npackageRegistrationRepository.Verify(x => x.InsertOnCommit(It.Is<PackageRegistration>(pr => pr.Id == \"theId\")));\n}\n- [Fact]\n- public async Task WillThrowWhenCreateANewPackageRegistrationWithAnIdThatMatchesAnExistingPackageTitle()\n- {\n- // Arrange\n- var idThatMatchesExistingTitle = \"AwesomePackage\";\n-\n- var currentUser = new User();\n- var existingPackageRegistration = new PackageRegistration\n- {\n- Id = \"SomePackageId\",\n- Owners = new HashSet<User>()\n- };\n- var existingPackage = new Package\n- {\n- PackageRegistration = existingPackageRegistration,\n- Version = \"1.0.0\",\n- Title = idThatMatchesExistingTitle\n- };\n-\n- var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n- packageRegistrationRepository.Setup(r => r.GetAll()).Returns(new[] { existingPackageRegistration }.AsQueryable());\n-\n- var packageRepository = new Mock<IEntityRepository<Package>>();\n- packageRepository.Setup(r => r.GetAll()).Returns(new[] { existingPackage }.AsQueryable());\n-\n- var service = CreateService(\n- packageRegistrationRepository: packageRegistrationRepository,\n- packageRepository: packageRepository,\n- setup: mockPackageService =>\n- {\n- mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null);\n- });\n-\n- // Act\n- var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: idThatMatchesExistingTitle);\n-\n- // Assert\n- var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, currentUser, isVerified: false));\n-\n- Assert.Equal(String.Format(Strings.NewRegistrationIdMatchesExistingPackageTitle, idThatMatchesExistingTitle), ex.Message);\n- }\n-\n[Fact]\npublic void WillMakeTheCurrentUserTheOwnerWhenCreatingANewPackageRegistration()\n{\n@@ -444,34 +393,6 @@ private async Task WillSaveTheCreatedPackageWhenThePackageRegistrationAlreadyExi\nAssert.Same(packageRegistration.Packages.ElementAt(0), package);\n}\n- [Theory]\n- [InlineData(\"Microsoft.FooBar\", \"Microsoft.FooBar\")]\n- [InlineData(\"Microsoft.FooBar\", \"microsoft.foobar\")]\n- [InlineData(\"Microsoft.FooBar\", \" microsoft.foObar \")]\n- private async Task WillThrowIfThePackageTitleMatchesAnExistingPackageRegistrationId(string existingRegistrationId, string newPackageTitle)\n- {\n- // Arrange\n- var currentUser = new User();\n- var existingPackageRegistration = new PackageRegistration\n- {\n- Id = existingRegistrationId,\n- Owners = new HashSet<User>()\n- };\n-\n- var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n- packageRegistrationRepository.Setup(r => r.GetAll()).Returns(new[] { existingPackageRegistration }.AsQueryable());\n-\n- var service = CreateService(packageRegistrationRepository: packageRegistrationRepository);\n-\n- // Act\n- var nugetPackage = PackageServiceUtility.CreateNuGetPackage(title: newPackageTitle);\n-\n- // Assert\n- var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, currentUser, isVerified: false));\n-\n- Assert.Equal(String.Format(Strings.TitleMatchesExistingRegistration, newPackageTitle), ex.Message);\n- }\n-\n[Fact]\nprivate async Task WillThrowIfTheNuGetPackageIdIsLongerThanMaxPackageIdLength()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"diff": "@@ -339,9 +339,6 @@ private static Mock<PackageService> SetupPackageService(Package package)\nvar packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\nvar packageRepository = new Mock<IEntityRepository<Package>>();\nvar certificateRepository = new Mock<IEntityRepository<Certificate>>();\n- var packageNamingConflictValidator = new PackageNamingConflictValidator(\n- packageRegistrationRepository.Object,\n- packageRepository.Object);\nvar auditingService = new TestAuditingService();\nvar telemetryService = new Mock<ITelemetryService>();\nvar securityPolicyService = new Mock<ISecurityPolicyService>();\n@@ -350,7 +347,6 @@ private static Mock<PackageService> SetupPackageService(Package package)\npackageRegistrationRepository.Object,\npackageRepository.Object,\ncertificateRepository.Object,\n- packageNamingConflictValidator,\nauditingService,\ntelemetryService.Object,\nsecurityPolicyService.Object);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"diff": "@@ -290,9 +290,6 @@ private Mock<PackageService> SetupPackageService()\nvar packageRepository = new Mock<IEntityRepository<Package>>();\nvar certificateRepository = new Mock<IEntityRepository<Certificate>>();\n- var packageNamingConflictValidator = new PackageNamingConflictValidator(\n- packageRegistrationRepository.Object,\n- packageRepository.Object);\nvar auditingService = new TestAuditingService();\nvar telemetryService = new Mock<ITelemetryService>();\n@@ -303,7 +300,6 @@ private Mock<PackageService> SetupPackageService()\npackageRegistrationRepository.Object,\npackageRepository.Object,\ncertificateRepository.Object,\n- packageNamingConflictValidator,\nauditingService,\ntelemetryService.Object,\nsecurityPolicyService.Object);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Disable ID-Title validation for upload (#6163)
|
455,747 |
18.07.2018 12:52:51
| 25,200 |
68cee3ea12b3fb25068ddee8225e48056ac42e61
|
[Symbol Server]Add DB Schema changes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -56,6 +56,7 @@ public EntitiesContext(DbConnection connection, bool readOnly)\npublic IDbSet<ReservedNamespace> ReservedNamespaces { get; set; }\npublic IDbSet<Certificate> Certificates { get; set; }\npublic IDbSet<UserCertificate> UserCertificates { get; set; }\n+ public IDbSet<SymbolPackage> SymbolPackages { get; set; }\n/// <summary>\n/// User or organization accounts.\n@@ -371,6 +372,18 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.WithRequired(uc => uc.Certificate)\n.HasForeignKey(uc => uc.CertificateKey)\n.WillCascadeOnDelete(true); // Deleting a Certificate entity will also delete related UserCertificate entities.\n+\n+ modelBuilder.Entity<SymbolPackage>()\n+ .HasKey(s => s.Key);\n+\n+ modelBuilder.Entity<Package>()\n+ .HasMany(p => p.SymbolPackages)\n+ .WithRequired(s => s.Package)\n+ .HasForeignKey(p => p.PackageKey);\n+\n+ modelBuilder.Entity<SymbolPackage>()\n+ .Property(s => s.RowVersion)\n+ .IsRowVersion();\n}\n#pragma warning restore 618\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Package.cs",
"new_path": "src/NuGetGallery.Core/Entities/Package.cs",
"diff": "@@ -233,5 +233,7 @@ public Package()\n/// Gets or sets the certificate used to sign the package.\n/// </summary>\npublic virtual Certificate Certificate { get; set; }\n+\n+ public virtual ICollection<SymbolPackage> SymbolPackages { get; set; }\n}\n}\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": "<Compile Include=\"Entities\\AccountDelete.cs\" />\n<Compile Include=\"Entities\\MembershipRequest.cs\" />\n<Compile Include=\"Entities\\OrganizationMigrationRequest.cs\" />\n+ <Compile Include=\"Entities\\SymbolPackage.cs\" />\n<Compile Include=\"Entities\\PackageDelete.cs\" />\n<Compile Include=\"Entities\\EmailMessage.cs\" />\n<Compile Include=\"Entities\\EntitiesConfiguration.cs\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201807181816293_SymbolPackages.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class SymbolPackages : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(SymbolPackages));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201807181816293_SymbolPackages\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201807181816293_SymbolPackages.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class SymbolPackages : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ CreateTable(\n+ \"dbo.SymbolPackages\",\n+ c => new\n+ {\n+ Key = c.Int(nullable: false, identity: true),\n+ PackageKey = c.Int(nullable: false),\n+ Created = c.DateTime(nullable: false),\n+ Published = c.DateTime(),\n+ FileSize = c.Long(nullable: false),\n+ HashAlgorithm = c.String(maxLength: 10),\n+ Hash = c.String(nullable: false, maxLength: 256),\n+ StatusKey = c.Int(nullable: false),\n+ RowVersion = c.Binary(nullable: false, fixedLength: true, timestamp: true, storeType: \"rowversion\"),\n+ })\n+ .PrimaryKey(t => t.Key)\n+ .ForeignKey(\"dbo.Packages\", t => t.PackageKey, cascadeDelete: true)\n+ .Index(t => t.PackageKey);\n+\n+ }\n+\n+ public override void Down()\n+ {\n+ DropForeignKey(\"dbo.SymbolPackages\", \"PackageKey\", \"dbo.Packages\");\n+ DropIndex(\"dbo.SymbolPackages\", new[] { \"PackageKey\" });\n+ DropTable(\"dbo.SymbolPackages\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201807031816101_AccountDeleteSignatureNotRequired.Designer.cs\">\n<DependentUpon>201807031816101_AccountDeleteSignatureNotRequired.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201807181816293_SymbolPackages.cs\" />\n+ <Compile Include=\"Migrations\\201807181816293_SymbolPackages.Designer.cs\">\n+ <DependentUpon>201807181816293_SymbolPackages.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"RequestModels\\DeleteAccountRequest.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<EmbeddedResource Include=\"Migrations\\201807031816101_AccountDeleteSignatureNotRequired.resx\">\n<DependentUpon>201807031816101_AccountDeleteSignatureNotRequired.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201807181816293_SymbolPackages.resx\">\n+ <DependentUpon>201807181816293_SymbolPackages.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Symbol Server]Add DB Schema changes (#6177)
|
455,794 |
20.07.2018 10:29:14
| 25,200 |
e1a55f020302000d475940115127bba3ea80caa0
|
Add missing org policies
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"new_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"diff": "@@ -86,6 +86,8 @@ public virtual IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscrip\n{\nget\n{\n+ yield return _controlRequiredSignerPolicy;\n+ yield return _automaticallyOverwriteRequiredSignerPolicy;\nyield return _organizationTenantPolicy;\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add missing org policies (#6195)
|
455,747 |
20.07.2018 13:20:59
| 25,200 |
48b596f74f599811ba46b8b0ece374b969d1516e
|
[NuGet Symbol Server] Add core symbol package service
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreConstants.cs",
"new_path": "src/NuGetGallery.Core/CoreConstants.cs",
"diff": "@@ -31,5 +31,9 @@ public static class CoreConstants\npublic const string UploadsFolderName = \"uploads\";\npublic const string ValidationFolderName = \"validation\";\npublic const string RevalidationFolderName = \"revalidation\";\n+\n+ public const string SymbolPackagesFolderName = \"symbol-packages\";\n+ public const string NuGetSymbolPackageFileExtension = \".snupkg\";\n+ public const string SymbolPackageBackupsFolderName = \"symbol-package-backups\";\n}\n}\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": "<Compile Include=\"Services\\CloudFileReference.cs\" />\n<Compile Include=\"Services\\CoreMessageService.cs\" />\n<Compile Include=\"Services\\CorePackageFileService.cs\" />\n+ <Compile Include=\"Services\\CoreSymbolPackageService.cs\" />\n<Compile Include=\"Services\\CorePackageService.cs\" />\n<Compile Include=\"Services\\CryptographyService.cs\" />\n<Compile Include=\"Services\\FileAlreadyExistsException.cs\" />\n<Compile Include=\"Services\\ICoreMessageService.cs\" />\n<Compile Include=\"Services\\ICoreMessageServiceConfiguration.cs\" />\n<Compile Include=\"Services\\ICorePackageFileService.cs\" />\n+ <Compile Include=\"Services\\ICoreSymbolPackageService.cs\" />\n<Compile Include=\"Services\\ICorePackageService.cs\" />\n<Compile Include=\"Services\\IFileReference.cs\" />\n<Compile Include=\"Services\\ICoreFileStorageService.cs\" />\n<Compile Include=\"Services\\IFileMetadataService.cs\" />\n<Compile Include=\"Services\\IRevalidationStateService.cs\" />\n<Compile Include=\"Services\\ISimpleCloudBlob.cs\" />\n+ <Compile Include=\"Services\\SymbolPackageFileServiceMetadata.cs\" />\n<Compile Include=\"Services\\PackageFileServiceMetadata.cs\" />\n<Compile Include=\"Services\\RevalidationState.cs\" />\n<Compile Include=\"Services\\RevalidationStateService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"diff": "@@ -291,6 +291,7 @@ protected IQueryable<Package> GetPackagesByIdQueryable(string id)\n.Include(p => p.LicenseReports)\n.Include(p => p.PackageRegistration)\n.Include(p => p.User)\n+ .Include(p => p.SymbolPackages)\n.Where(p => p.PackageRegistration.Id == id);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -449,8 +449,7 @@ private async Task<ActionResult> CreatePackageInternal()\nstring.Format(CultureInfo.CurrentCulture, Strings.PackageIsLocked, packageRegistration.Id));\n}\n- var nuspecVersion = nuspec.GetVersion();\n- var existingPackage = PackageService.FindPackageByIdAndVersionStrict(nuspec.GetId(), nuspecVersion.ToStringSafe());\n+ var existingPackage = PackageService.FindPackageByIdAndVersionStrict(id, version.ToStringSafe());\nif (existingPackage != null)\n{\nif (existingPackage.PackageStatusKey == PackageStatus.FailedValidation)\n@@ -469,7 +468,7 @@ private async Task<ActionResult> CreatePackageInternal()\nreturn new HttpStatusCodeWithBodyResult(\nHttpStatusCode.Conflict,\nstring.Format(CultureInfo.CurrentCulture, Strings.PackageExistsAndCannotBeModified,\n- id, nuspecVersion.ToNormalizedStringSafe()));\n+ id, version.ToNormalizedStringSafe()));\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\IContentObjectService.cs\" />\n<Compile Include=\"Services\\ImmediatePackageValidator.cs\" />\n<Compile Include=\"Services\\ContentObjectService.cs\" />\n+ <Compile Include=\"Services\\ISymbolPackageService.cs\" />\n<Compile Include=\"Services\\PackageOwnershipManagementService.cs\" />\n<Compile Include=\"Services\\IPackageOwnershipManagementService.cs\" />\n<Compile Include=\"Services\\IPackageValidationInitiator.cs\" />\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": "<Compile Include=\"Packaging\\NupkgRewriterFacts.cs\" />\n<Compile Include=\"SemVerLevelKeyFacts.cs\" />\n<Compile Include=\"Services\\AccessConditionWrapperFacts.cs\" />\n+ <Compile Include=\"Services\\CoreSymbolPackageServiceFacts.cs\" />\n<Compile Include=\"Services\\FileUriPermissionsFacts.cs\" />\n<Compile Include=\"Services\\RevalidationStateServiceFacts.cs\" />\n<Compile Include=\"TestUtils\\BlobStorageCollection.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[NuGet Symbol Server] Add core symbol package service (#6190)
|
455,735 |
23.07.2018 09:05:32
| 25,200 |
6c88bf6ba2cdbc6c214d602afe25c560ae48ac01
|
Update UploadPackage.cshtml
Fix for
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"diff": "<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n@ViewHelpers.PackagesBreadcrumb(Url, CurrentUser, true, @<text>Upload</text>)\n- <div class=\"text-center\">\n+ <div class=\"text-left\">\n<p class=\"message\">Your package file will be uploaded and hosted on the @(Config.Current.Brand) server (@(Config.Current.SiteRoot)).</p>\n</div>\n<div id=\"upload-package-container\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update UploadPackage.cshtml (#6174)
Fix for #6173
|
455,794 |
23.07.2018 09:18:35
| 25,200 |
c16ba4fb4672eb147f8b062b25791ee502582626
|
Fix PackageFeedSortingTest functional test
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "using System.IO;\nusing System.Linq;\nusing System.Net;\n+using System.Text;\nusing System.Threading.Tasks;\nusing Newtonsoft.Json.Linq;\nusing NuGetGallery.FunctionalTests.Helpers;\n@@ -193,50 +194,74 @@ public async Task GetUpdates1199RegressionTest()\n[Category(\"P1Tests\")]\npublic async Task PackageFeedSortingTest()\n{\n- var request = WebRequest.Create(UrlHelper.V2FeedRootUrl + @\"stats/downloads/last6weeks/\");\n- var response = await request.GetResponseAsync();\n+ var topDownloadsResponse = await GetResponseTextAsync(UrlHelper.V2FeedRootUrl + @\"stats/downloads/last6weeks/\");\n- string responseText;\n- using (var sr = new StreamReader(response.GetResponseStream()))\n+ // Search Gallery v2 feed for the top 10 unique package ids, or as many as exist.\n+ string[] topDownloadsNames = GetPackageNamesFromFeedResponse(topDownloadsResponse);\n+\n+ // Ensure at least 1 package was found.\n+ Assert.NotEmpty(topDownloadsNames);\n+\n+ // Search Gallery statistics for the top downloaded packages.\n+ var statsResponse = await GetResponseTextAsync(UrlHelper.BaseUrl + @\"stats/packageversions\");\n+\n+ var expectedNames = String.Join(\", \", topDownloadsNames);\n+ var last = topDownloadsNames.First();\n+ foreach (var current in topDownloadsNames.Skip(1))\n{\n- responseText = await sr.ReadToEndAsync();\n+ // Check to make sure the top 10 packages are in the same order as the feed.\n+ // We add angle brackets to prevent false failures due to duplicate package names in the page.\n+ var condition = statsResponse.IndexOf(\">\" + last + \"<\", StringComparison.Ordinal)\n+ < statsResponse.IndexOf(\">\" + current + \"<\", StringComparison.Ordinal);\n+ Assert.True(condition, $\"Expected string {last} to come before {current}. Expected list is: {expectedNames}.\");\n+\n+ Assert.NotEqual(last, current);\n+ last = current;\n+ }\n}\n- // Grab the top 10 package names in the feed.\n- string[] packageName = new string[10];\n- responseText = packageName[0] = responseText.Substring(responseText.IndexOf(@\"\"\"PackageId\"\": \"\"\", StringComparison.Ordinal) + 14);\n- packageName[0] = packageName[0].Substring(0, responseText.IndexOf(@\"\"\"\", StringComparison.Ordinal));\n- for (int i = 1; i < 10; i++)\n- {\n- responseText = packageName[i] = responseText.Substring(responseText.IndexOf(@\"\"\"PackageId\"\": \"\"\", StringComparison.Ordinal) + 14);\n- packageName[i] = packageName[i].Substring(0, responseText.IndexOf(@\"\"\"\", StringComparison.Ordinal));\n- // Sometimes two versions of a single package appear in the top 10. Stripping second and later instances for this test.\n- for (int j = 0; j < i; j++)\n+ private async Task<string> GetResponseTextAsync(string url)\n{\n- if (packageName[j] == packageName[i])\n+ using (var wr = await WebRequest.Create(url).GetResponseAsync())\n+ using (var sr = new StreamReader(wr.GetResponseStream()))\n{\n- packageName[i] = null;\n- i--;\n- }\n+ return await sr.ReadToEndAsync();\n}\n}\n- request = WebRequest.Create(UrlHelper.BaseUrl + @\"stats/packageversions\");\n+ private string[] GetPackageNamesFromFeedResponse(string feedResponseText)\n+ {\n+ const string PackageIdStartKey = @\"\"\"PackageId\"\": \"\"\";\n+ const string PackageIdEndKey = @\"\"\"\";\n- // Get the response.\n- response = await request.GetResponseAsync();\n- using (var sr = new StreamReader(response.GetResponseStream()))\n+ var results = new List<string>();\n+\n+ Func<string, int> seekStart = s => s.IndexOf(PackageIdStartKey, StringComparison.Ordinal);\n+ Func<string, int> seekEnd = s => s.IndexOf(PackageIdEndKey, StringComparison.Ordinal);\n+\n+ do\n+ {\n+ var start = seekStart(feedResponseText);\n+ if (start < 0)\n{\n- responseText = await sr.ReadToEndAsync();\n+ break;\n}\n- for (int i = 1; i < 10; i++)\n+ feedResponseText = feedResponseText.Substring(start + PackageIdStartKey.Length);\n+ var end = seekEnd(feedResponseText);\n+ if (end >= 0)\n{\n- // Check to make sure the top 10 packages are in the same order as the feed.\n- // We add angle brackets to prevent false failures due to duplicate package names in the page.\n- var condition = responseText.IndexOf(\">\" + packageName[i - 1] + \"<\", StringComparison.Ordinal) < responseText.IndexOf(\">\" + packageName[i] + \"<\", StringComparison.Ordinal);\n- Assert.True(condition, \"Expected string \" + packageName[i - 1] + \" to come before \" + packageName[i] + \". Expected list is: \" + packageName[0] + \", \" + packageName[1] + \", \" + packageName[2] + \", \" + packageName[3] + \", \" + packageName[4] + \", \" + packageName[5] + \", \" + packageName[6] + \", \" + packageName[7] + \", \" + packageName[8] + \", \" + packageName[9]);\n+ var name = feedResponseText.Substring(0, end);\n+ if (!results.Contains(name, StringComparer.Ordinal))\n+ {\n+ results.Add(name);\n+ }\n+ feedResponseText = feedResponseText.Substring(end);\n}\n}\n+ while (results.Count < 10);\n+\n+ return results.ToArray();\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix PackageFeedSortingTest functional test (#6185)
|
455,736 |
23.07.2018 10:54:42
| 25,200 |
c878ae093da6f67da94873321aa50ccdf3140497
|
Add IsSigningAllowed method
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Extensions/PackageRegistrationExtensions.cs",
"new_path": "src/NuGetGallery.Core/Extensions/PackageRegistrationExtensions.cs",
"diff": "@@ -8,6 +8,30 @@ namespace NuGetGallery.Extensions\n{\npublic static class PackageRegistrationExtensions\n{\n+ /// <summary>\n+ /// Determines if package signing is allowed for the specified package registration.\n+ /// </summary>\n+ /// <param name=\"packageRegistration\">A package registration.</param>\n+ /// <returns>A flag indicating whether package signing is allowed.</returns>\n+ /// <exception cref=\"ArgumentNullException\">Thrown if <paramref name=\"packageRegistration\" />\n+ /// is <c>null</c>.</exception>\n+ public static bool IsSigningAllowed(this PackageRegistration packageRegistration)\n+ {\n+ if (packageRegistration == null)\n+ {\n+ throw new ArgumentNullException(nameof(packageRegistration));\n+ }\n+\n+ var requiredSigner = packageRegistration.RequiredSigners.FirstOrDefault();\n+\n+ if (requiredSigner == null)\n+ {\n+ return packageRegistration.Owners.Any(owner => HasAnyCertificate(owner));\n+ }\n+\n+ return HasAnyCertificate(requiredSigner);\n+ }\n+\n/// <summary>\n/// Determines if package signing is required for the specified package registration.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Extensions/PackageRegistrationExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Extensions/PackageRegistrationExtensionsFacts.cs",
"diff": "@@ -8,6 +8,224 @@ namespace NuGetGallery.Extensions\n{\npublic class PackageRegistrationExtensionsFacts\n{\n+ public class TheIsSigningAllowedMethod\n+ {\n+ private readonly Package _package;\n+ private readonly PackageRegistration _packageRegistration;\n+ private readonly User _user;\n+\n+ public TheIsSigningAllowedMethod()\n+ {\n+ _user = new User()\n+ {\n+ Key = 1,\n+ Username = \"a\"\n+ };\n+ _packageRegistration = new PackageRegistration()\n+ {\n+ Key = 2,\n+ Id = \"b\"\n+ };\n+ _package = new Package()\n+ {\n+ Key = 3,\n+ PackageRegistration = _packageRegistration\n+ };\n+\n+ _packageRegistration.Owners.Add(_user);\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WhenPackageRegistrationIsNull_Throws()\n+ {\n+ var exception = Assert.Throws<ArgumentNullException>(\n+ () => PackageRegistrationExtensions.IsSigningRequired(packageRegistration: null));\n+\n+ Assert.Equal(\"packageRegistration\", exception.ParamName);\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithOneOwner_WhenRequiredSignerIsNullAndOwnerHasNoCertificate_ReturnsFalse()\n+ {\n+ Assert.False(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithOneOwner_WhenRequiredSignerIsNullAndOwnerHasCertificate_ReturnsTrue()\n+ {\n+ _user.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 4,\n+ User = _user,\n+ UserKey = _user.Key\n+ });\n+\n+ Assert.True(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithTwoOwners_WhenRequiredSignerIsNullAndOnlyOwnerHasCertificate_ReturnsTrue()\n+ {\n+ var otherOwner = new User()\n+ {\n+ Key = 4,\n+ Username = \"d\"\n+ };\n+\n+ _user.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 5,\n+ User = _user,\n+ UserKey = _user.Key\n+ });\n+\n+ _packageRegistration.Owners.Add(otherOwner);\n+\n+ Assert.True(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithTwoOwners_WhenRequiredSignerIsNullAndOnlyOtherOwnerHasCertificate_ReturnsTrue()\n+ {\n+ var otherOwner = new User()\n+ {\n+ Key = 4,\n+ Username = \"d\"\n+ };\n+ otherOwner.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 5,\n+ User = otherOwner,\n+ UserKey = otherOwner.Key\n+ });\n+\n+ _packageRegistration.Owners.Add(otherOwner);\n+\n+ Assert.True(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithOneOwner_WhenRequiredSignerIsOwnerAndOwnerHasNoCertificate_ReturnsFalse()\n+ {\n+ _packageRegistration.RequiredSigners.Add(_user);\n+\n+ Assert.False(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithOneOwner_WhenRequiredSignerIsOwnerAndOwnerHasCertificate_ReturnsTrue()\n+ {\n+ _user.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 4,\n+ User = _user,\n+ UserKey = _user.Key\n+ });\n+\n+ _packageRegistration.RequiredSigners.Add(_user);\n+\n+ Assert.True(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithTwoOwners_WhenRequiredSignerIsOwnerAndOnlyOwnerHasCertificate_ReturnsTrue()\n+ {\n+ var otherOwner = new User()\n+ {\n+ Key = 4,\n+ Username = \"d\"\n+ };\n+ _user.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 5,\n+ User = _user,\n+ UserKey = _user.Key\n+ });\n+\n+ _packageRegistration.Owners.Add(otherOwner);\n+ _packageRegistration.RequiredSigners.Add(_user);\n+\n+ Assert.True(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithTwoOwners_WhenRequiredSignerIsOwnerAndOnlyOtherOwnerHasCertificate_ReturnsFalse()\n+ {\n+ var otherOwner = new User()\n+ {\n+ Key = 4,\n+ Username = \"d\"\n+ };\n+ otherOwner.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 5,\n+ User = otherOwner,\n+ UserKey = otherOwner.Key\n+ });\n+\n+ _packageRegistration.Owners.Add(otherOwner);\n+ _packageRegistration.RequiredSigners.Add(_user);\n+\n+ Assert.False(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithTwoOwners_WhenRequiredSignerIsOwnerAndAllOwnersHaveCertificate_ReturnsTrue()\n+ {\n+ _user.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 5,\n+ User = _user,\n+ UserKey = _user.Key\n+ });\n+ var otherOwner = new User()\n+ {\n+ Key = 4,\n+ Username = \"d\"\n+ };\n+ otherOwner.UserCertificates.Add(new UserCertificate()\n+ {\n+ Key = 6,\n+ User = otherOwner,\n+ UserKey = otherOwner.Key\n+ });\n+\n+ _packageRegistration.Owners.Add(otherOwner);\n+ _packageRegistration.RequiredSigners.Add(_user);\n+\n+ Assert.True(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithTwoOwners_WhenRequiredSignerIsOwnerAndNoOwnersHaveCertificate_ReturnsFalse()\n+ {\n+ var otherOwner = new User()\n+ {\n+ Key = 4,\n+ Username = \"d\"\n+ };\n+\n+ _packageRegistration.Owners.Add(otherOwner);\n+ _packageRegistration.RequiredSigners.Add(_user);\n+\n+ Assert.False(_packageRegistration.IsSigningAllowed());\n+ }\n+\n+ [Fact]\n+ public void IsSigningAllowed_WithTwoOwners_WhenRequiredSignerIsNullAndNeitherOwnerHasCertificate_ReturnsFalse()\n+ {\n+ var otherOwner = new User()\n+ {\n+ Key = 4,\n+ Username = \"d\"\n+ };\n+\n+ _packageRegistration.Owners.Add(otherOwner);\n+\n+ Assert.False(_packageRegistration.IsSigningAllowed());\n+ }\n+ }\n+\npublic class TheIsSigningRequiredMethod\n{\nprivate readonly Package _package;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add IsSigningAllowed method (#6199)
Progress on https://github.com/NuGet/NuGetGallery/issues/6181
|
455,794 |
24.07.2018 10:15:34
| 25,200 |
27f47c50565b72e57e1736b0228604f77dd99b7f
|
FI merge of hotfixes from master->dev
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"new_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"diff": "@@ -86,6 +86,8 @@ public virtual IEnumerable<IUserSecurityPolicySubscription> OrganizationSubscrip\n{\nget\n{\n+ yield return _controlRequiredSignerPolicy;\n+ yield return _automaticallyOverwriteRequiredSignerPolicy;\nyield return _organizationTenantPolicy;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tools/Update-Databases.ps1",
"new_path": "tools/Update-Databases.ps1",
"diff": "@@ -5,7 +5,7 @@ param(\nfunction Initialize-MigrateExe() {\n[string] $migrateDirectory = [System.IO.Path]::Combine($PSScriptRoot, '__temp_migrate_directory_' + [guid]::NewGuid().ToString(\"N\") )\n- [string] $efDirectory = [System.IO.Path]::Combine($PSScriptRoot, \"${env:userprofile}\\.nuget\\packages\\EntityFramework\\6.1.3\")\n+ [string] $efDirectory = \"$env:userprofile\\.nuget\\packages\\EntityFramework\\6.1.3\"\n[string] $migrate = ([System.IO.Path]::Combine($migrateDirectory, 'migrate.exe'))\nif (-not (New-Item -ItemType Directory -Path $migrateDirectory -Force).Exists) {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
FI merge of hotfixes from master->dev (#6204)
|
455,794 |
24.07.2018 10:41:06
| 25,200 |
2cd942736a3da00b8ab785ad4eba076dbcab129c
|
Update to latest NuGet.Services.Sql
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Diagnostics/IDiagnosticsSource.cs",
"new_path": "src/NuGetGallery.Core/Diagnostics/IDiagnosticsSource.cs",
"diff": "using System.Collections.Generic;\nusing System.Diagnostics;\nusing System.Runtime.CompilerServices;\n+using Microsoft.Extensions.Logging;\nnamespace NuGetGallery.Diagnostics\n{\n- public interface IDiagnosticsSource\n+ public interface IDiagnosticsSource : ILogger\n{\nvoid ExceptionEvent(Exception exception);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Diagnostics/NullDiagnosticsSource.cs",
"new_path": "src/NuGetGallery.Core/Diagnostics/NullDiagnosticsSource.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Diagnostics.CodeAnalysis;\n+using Microsoft.Extensions.Logging;\nnamespace NuGetGallery.Diagnostics\n{\n@@ -28,5 +29,20 @@ public void PerfEvent(string name, TimeSpan time, IEnumerable<KeyValuePair<strin\n{\n// No-op!\n}\n+\n+ void ILogger.Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)\n+ {\n+ // No-op!\n+ }\n+\n+ bool ILogger.IsEnabled(LogLevel logLevel)\n+ {\n+ return false;\n+ }\n+\n+ IDisposable ILogger.BeginScope<TState>(TState state)\n+ {\n+ return null;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -103,7 +103,11 @@ protected override void Load(ContainerBuilder builder)\n.As<ICacheService>()\n.InstancePerLifetimeScope();\n- var galleryDbConnectionFactory = new AzureSqlConnectionFactory(configuration.Current.SqlConnectionString, secretInjector);\n+ var galleryDbConnectionFactory = CreateDbConnectionFactory(\n+ diagnosticsService,\n+ nameof(EntitiesContext),\n+ configuration.Current.SqlConnectionString,\n+ secretInjector);\nbuilder.RegisterInstance(galleryDbConnectionFactory)\n.AsSelf()\n@@ -191,7 +195,11 @@ protected override void Load(ContainerBuilder builder)\n.As<ICuratedFeedService>()\n.InstancePerLifetimeScope();\n- var supportDbConnectionFactory = new AzureSqlConnectionFactory(configuration.Current.SqlConnectionStringSupportRequest, secretInjector);\n+ var supportDbConnectionFactory = CreateDbConnectionFactory(\n+ diagnosticsService,\n+ nameof(SupportRequestDbContext),\n+ configuration.Current.SqlConnectionStringSupportRequest,\n+ secretInjector);\nbuilder.Register(c => new SupportRequestDbContext(CreateDbConnection(supportDbConnectionFactory)))\n.AsSelf()\n@@ -358,7 +366,7 @@ protected override void Load(ContainerBuilder builder)\nbreak;\n}\n- RegisterAsynchronousValidation(builder, configuration, secretInjector);\n+ RegisterAsynchronousValidation(builder, diagnosticsService, configuration, secretInjector);\nRegisterAuditingServices(builder, defaultAuditingService);\n@@ -397,15 +405,26 @@ protected override void Load(ContainerBuilder builder)\nConfigureAutocomplete(builder, configuration);\n}\n+ private static ISqlConnectionFactory CreateDbConnectionFactory(IDiagnosticsService diagnostics, string name,\n+ string connectionString, ISecretInjector secretInjector)\n+ {\n+ var logger = diagnostics.SafeGetSource($\"AzureSqlConnectionFactory-{name}\");\n+ return new AzureSqlConnectionFactory(connectionString, secretInjector, logger);\n+ }\n+\nprivate static DbConnection CreateDbConnection(ISqlConnectionFactory connectionFactory)\n{\nreturn Task.Run(() => connectionFactory.CreateAsync()).Result;\n}\n- private static void ConfigureValidationEntitiesContext(ContainerBuilder builder, ConfigurationService configuration, ISecretInjector secretInjector)\n+ private static void ConfigureValidationEntitiesContext(ContainerBuilder builder, IDiagnosticsService diagnostics,\n+ ConfigurationService configuration, ISecretInjector secretInjector)\n{\n- var connectionString = configuration.Current.SqlConnectionStringValidation;\n- var validationDbConnectionFactory = new AzureSqlConnectionFactory(connectionString, secretInjector);\n+ var validationDbConnectionFactory = CreateDbConnectionFactory(\n+ diagnostics,\n+ nameof(ValidationEntitiesContext),\n+ configuration.Current.SqlConnectionStringValidation,\n+ secretInjector);\nbuilder.Register(c => new ValidationEntitiesContext(CreateDbConnection(validationDbConnectionFactory)))\n.AsSelf()\n@@ -424,7 +443,8 @@ private static void ConfigureValidationEntitiesContext(ContainerBuilder builder,\n.InstancePerLifetimeScope();\n}\n- private void RegisterAsynchronousValidation(ContainerBuilder builder, ConfigurationService configuration, ISecretInjector secretInjector)\n+ private void RegisterAsynchronousValidation(ContainerBuilder builder, IDiagnosticsService diagnostics,\n+ ConfigurationService configuration, ISecretInjector secretInjector)\n{\nbuilder\n.RegisterType<ServiceBusMessageSerializer>()\n@@ -436,7 +456,7 @@ private void RegisterAsynchronousValidation(ContainerBuilder builder, Configurat\nif (configuration.Current.AsynchronousPackageValidationEnabled)\n{\n- ConfigureValidationEntitiesContext(builder, configuration, secretInjector);\n+ ConfigureValidationEntitiesContext(builder, diagnostics, configuration, secretInjector);\nbuilder\n.RegisterType<AsynchronousPackageValidationInitiator>()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Diagnostics/TraceDiagnosticsSource.cs",
"new_path": "src/NuGetGallery/Diagnostics/TraceDiagnosticsSource.cs",
"diff": "using System.Diagnostics;\nusing System.Globalization;\nusing System.Runtime.CompilerServices;\n+using Microsoft.Extensions.Logging;\nnamespace NuGetGallery.Diagnostics\n{\n@@ -13,6 +14,8 @@ namespace NuGetGallery.Diagnostics\n/// Gallery diagnostics source. Trace events (including LogError extension) use System.Diagnostics traces, whereas\n/// Exception events are tracked as exceptions in ApplicationInsights. Eventually this class should be updated to\n/// use ApplicationInsights for trace events for consistency across the Gallery.\n+ ///\n+ /// ILogger implementation based on https://github.com/aspnet/Logging/tree/master/src/Microsoft.Extensions.Logging.TraceSource\n/// </summary>\npublic class TraceDiagnosticsSource : IDiagnosticsSource, IDisposable\n{\n@@ -94,5 +97,34 @@ private static string FormatMessage(string message, string member, string file,\n{\nreturn String.Format(CultureInfo.CurrentCulture, \"[{0}:{1} in {2}] {3}\", file, line, member, message);\n}\n+\n+ void ILogger.Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)\n+ {\n+ var message = formatter(state, exception);\n+ TraceEvent(LogLevelToTraceEventType(logLevel), eventId.Id, message);\n+ }\n+\n+ bool ILogger.IsEnabled(LogLevel logLevel)\n+ {\n+ return true;\n+ }\n+\n+ IDisposable ILogger.BeginScope<TState>(TState state)\n+ {\n+ return new TraceDiagnosticsSourceScope(state);\n+ }\n+\n+ private static TraceEventType LogLevelToTraceEventType(LogLevel logLevel)\n+ {\n+ switch (logLevel)\n+ {\n+ case LogLevel.Critical: return TraceEventType.Critical;\n+ case LogLevel.Error: return TraceEventType.Error;\n+ case LogLevel.Warning: return TraceEventType.Warning;\n+ case LogLevel.Information: return TraceEventType.Information;\n+ case LogLevel.Trace:\n+ default: return TraceEventType.Verbose;\n+ }\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=\"Authentication\\Providers\\AzureActiveDirectoryV2\\AzureActiveDirectoryV2AuthenticatorConfiguration.cs\" />\n<Compile Include=\"Authentication\\Providers\\AzureActiveDirectory\\AzureActiveDirectoryAuthenticator.cs\" />\n<Compile Include=\"Authentication\\Providers\\AzureActiveDirectory\\AzureActiveDirectoryAuthenticatorConfiguration.cs\" />\n+ <Compile Include=\"Diagnostics\\TraceDiagnosticsSourceScope.cs\" />\n<Compile Include=\"Extensions\\ClaimsExtensions.cs\" />\n<Compile Include=\"Configuration\\IGalleryConfigurationService.cs\" />\n<Compile Include=\"Configuration\\IPackageDeleteConfiguration.cs\" />\n<Version>4.8.0-preview4.5287</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.26.0-master-33196</Version>\n+ <Version>2.27.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n<Version>2.2.3</Version>\n<Version>2.26.0-master-33196</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.26.0-master-33196</Version>\n+ <Version>2.27.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n<Version>2.26.0-master-33196</Version>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update to latest NuGet.Services.Sql (#6165)
|
455,794 |
25.07.2018 11:48:33
| 25,200 |
cc1d16b135fdd553d99225e123f36aac79847e4f
|
Add ko2 back for admins (regression from f559b6d)
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Scripts/knockout-2.2.1.js",
"diff": "+// Knockout JavaScript library v2.2.1\n+// (c) Steven Sanderson - http://knockoutjs.com/\n+// License: MIT (http://www.opensource.org/licenses/mit-license.php)\n+\n+(function() {function j(w){throw w;}var m=!0,p=null,r=!1;function u(w){return function(){return w}};var x=window,y=document,ga=navigator,F=window.jQuery,I=void 0;\n+function L(w){function ha(a,d,c,e,f){var g=[];a=b.j(function(){var a=d(c,f)||[];0<g.length&&(b.a.Ya(M(g),a),e&&b.r.K(e,p,[c,a,f]));g.splice(0,g.length);b.a.P(g,a)},p,{W:a,Ka:function(){return 0==g.length||!b.a.X(g[0])}});return{M:g,j:a.pa()?a:I}}function M(a){for(;a.length&&!b.a.X(a[0]);)a.splice(0,1);if(1<a.length){for(var d=a[0],c=a[a.length-1],e=[d];d!==c;){d=d.nextSibling;if(!d)return;e.push(d)}Array.prototype.splice.apply(a,[0,a.length].concat(e))}return a}function S(a,b,c,e,f){var g=Math.min,\n+h=Math.max,k=[],l,n=a.length,q,s=b.length,v=s-n||1,G=n+s+1,J,A,z;for(l=0;l<=n;l++){A=J;k.push(J=[]);z=g(s,l+v);for(q=h(0,l-1);q<=z;q++)J[q]=q?l?a[l-1]===b[q-1]?A[q-1]:g(A[q]||G,J[q-1]||G)+1:q+1:l+1}g=[];h=[];v=[];l=n;for(q=s;l||q;)s=k[l][q]-1,q&&s===k[l][q-1]?h.push(g[g.length]={status:c,value:b[--q],index:q}):l&&s===k[l-1][q]?v.push(g[g.length]={status:e,value:a[--l],index:l}):(g.push({status:\"retained\",value:b[--q]}),--l);if(h.length&&v.length){a=10*n;var t;for(b=c=0;(f||b<a)&&(t=h[c]);c++){for(e=\n+0;k=v[e];e++)if(t.value===k.value){t.moved=k.index;k.moved=t.index;v.splice(e,1);b=e=0;break}b+=e}}return g.reverse()}function T(a,d,c,e,f){f=f||{};var g=a&&N(a),g=g&&g.ownerDocument,h=f.templateEngine||O;b.za.vb(c,h,g);c=h.renderTemplate(c,e,f,g);(\"number\"!=typeof c.length||0<c.length&&\"number\"!=typeof c[0].nodeType)&&j(Error(\"Template engine must return an array of DOM nodes\"));g=r;switch(d){case \"replaceChildren\":b.e.N(a,c);g=m;break;case \"replaceNode\":b.a.Ya(a,c);g=m;break;case \"ignoreTargetNode\":break;\n+default:j(Error(\"Unknown renderMode: \"+d))}g&&(U(c,e),f.afterRender&&b.r.K(f.afterRender,p,[c,e.$data]));return c}function N(a){return a.nodeType?a:0<a.length?a[0]:p}function U(a,d){if(a.length){var c=a[0],e=a[a.length-1];V(c,e,function(a){b.Da(d,a)});V(c,e,function(a){b.s.ib(a,[d])})}}function V(a,d,c){var e;for(d=b.e.nextSibling(d);a&&(e=a)!==d;)a=b.e.nextSibling(e),(1===e.nodeType||8===e.nodeType)&&c(e)}function W(a,d,c){a=b.g.aa(a);for(var e=b.g.Q,f=0;f<a.length;f++){var g=a[f].key;if(e.hasOwnProperty(g)){var h=\n+e[g];\"function\"===typeof h?(g=h(a[f].value))&&j(Error(g)):h||j(Error(\"This template engine does not support the '\"+g+\"' binding within its templates\"))}}a=\"ko.__tr_ambtns(function($context,$element){return(function(){return{ \"+b.g.ba(a)+\" } })()})\";return c.createJavaScriptEvaluatorBlock(a)+d}function X(a,d,c,e){function f(a){return function(){return k[a]}}function g(){return k}var h=0,k,l;b.j(function(){var n=c&&c instanceof b.z?c:new b.z(b.a.d(c)),q=n.$data;e&&b.eb(a,n);if(k=(\"function\"==typeof d?\n+d(n,a):d)||b.J.instance.getBindings(a,n)){if(0===h){h=1;for(var s in k){var v=b.c[s];v&&8===a.nodeType&&!b.e.I[s]&&j(Error(\"The binding '\"+s+\"' cannot be used with virtual elements\"));if(v&&\"function\"==typeof v.init&&(v=(0,v.init)(a,f(s),g,q,n))&&v.controlsDescendantBindings)l!==I&&j(Error(\"Multiple bindings (\"+l+\" and \"+s+\") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.\")),l=s}h=2}if(2===h)for(s in k)(v=b.c[s])&&\"function\"==\n+typeof v.update&&(0,v.update)(a,f(s),g,q,n)}},p,{W:a});return{Nb:l===I}}function Y(a,d,c){var e=m,f=1===d.nodeType;f&&b.e.Ta(d);if(f&&c||b.J.instance.nodeHasBindings(d))e=X(d,p,a,c).Nb;e&&Z(a,d,!f)}function Z(a,d,c){for(var e=b.e.firstChild(d);d=e;)e=b.e.nextSibling(d),Y(a,d,c)}function $(a,b){var c=aa(a,b);return c?0<c.length?c[c.length-1].nextSibling:a.nextSibling:p}function aa(a,b){for(var c=a,e=1,f=[];c=c.nextSibling;){if(H(c)&&(e--,0===e))return f;f.push(c);B(c)&&e++}b||j(Error(\"Cannot find closing comment tag to match: \"+\n+a.nodeValue));return p}function H(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ia)}function B(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ja)}function P(a,b){for(var c=p;a!=c;)c=a,a=a.replace(ka,function(a,c){return b[c]});return a}function la(){var a=[],d=[];this.save=function(c,e){var f=b.a.i(a,c);0<=f?d[f]=e:(a.push(c),d.push(e))};this.get=function(c){c=b.a.i(a,c);return 0<=c?d[c]:I}}function ba(a,b,c){function e(e){var g=b(a[e]);switch(typeof g){case \"boolean\":case \"number\":case \"string\":case \"function\":f[e]=\n+g;break;case \"object\":case \"undefined\":var h=c.get(g);f[e]=h!==I?h:ba(g,b,c)}}c=c||new la;a=b(a);if(!(\"object\"==typeof a&&a!==p&&a!==I&&!(a instanceof Date)))return a;var f=a instanceof Array?[]:{};c.save(a,f);var g=a;if(g instanceof Array){for(var h=0;h<g.length;h++)e(h);\"function\"==typeof g.toJSON&&e(\"toJSON\")}else for(h in g)e(h);return f}function ca(a,d){if(a)if(8==a.nodeType){var c=b.s.Ua(a.nodeValue);c!=p&&d.push({sb:a,Fb:c})}else if(1==a.nodeType)for(var c=0,e=a.childNodes,f=e.length;c<f;c++)ca(e[c],\n+d)}function Q(a,d,c,e){b.c[a]={init:function(a){b.a.f.set(a,da,{});return{controlsDescendantBindings:m}},update:function(a,g,h,k,l){h=b.a.f.get(a,da);g=b.a.d(g());k=!c!==!g;var n=!h.Za;if(n||d||k!==h.qb)n&&(h.Za=b.a.Ia(b.e.childNodes(a),m)),k?(n||b.e.N(a,b.a.Ia(h.Za)),b.Ea(e?e(l,g):l,a)):b.e.Y(a),h.qb=k}};b.g.Q[a]=r;b.e.I[a]=m}function ea(a,d,c){c&&d!==b.k.q(a)&&b.k.T(a,d);d!==b.k.q(a)&&b.r.K(b.a.Ba,p,[a,\"change\"])}var b=\"undefined\"!==typeof w?w:{};b.b=function(a,d){for(var c=a.split(\".\"),e=b,f=0;f<\n+c.length-1;f++)e=e[c[f]];e[c[c.length-1]]=d};b.p=function(a,b,c){a[b]=c};b.version=\"2.2.1\";b.b(\"version\",b.version);b.a=new function(){function a(a,d){if(\"input\"!==b.a.u(a)||!a.type||\"click\"!=d.toLowerCase())return r;var c=a.type;return\"checkbox\"==c||\"radio\"==c}var d=/^(\\s|\\u00A0)+|(\\s|\\u00A0)+$/g,c={},e={};c[/Firefox\\/2/i.test(ga.userAgent)?\"KeyboardEvent\":\"UIEvents\"]=[\"keyup\",\"keydown\",\"keypress\"];c.MouseEvents=\"click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave\".split(\" \");\n+for(var f in c){var g=c[f];if(g.length)for(var h=0,k=g.length;h<k;h++)e[g[h]]=f}var l={propertychange:m},n,c=3;f=y.createElement(\"div\");for(g=f.getElementsByTagName(\"i\");f.innerHTML=\"\\x3c!--[if gt IE \"+ ++c+\"]><i></i><![endif]--\\x3e\",g[0];);n=4<c?c:I;return{Na:[\"authenticity_token\",/^__RequestVerificationToken(_.*)?$/],o:function(a,b){for(var d=0,c=a.length;d<c;d++)b(a[d])},i:function(a,b){if(\"function\"==typeof Array.prototype.indexOf)return Array.prototype.indexOf.call(a,b);for(var d=0,c=a.length;d<\n+c;d++)if(a[d]===b)return d;return-1},lb:function(a,b,d){for(var c=0,e=a.length;c<e;c++)if(b.call(d,a[c]))return a[c];return p},ga:function(a,d){var c=b.a.i(a,d);0<=c&&a.splice(c,1)},Ga:function(a){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)0>b.a.i(d,a[c])&&d.push(a[c]);return d},V:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)d.push(b(a[c]));return d},fa:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)b(a[c])&&d.push(a[c]);return d},P:function(a,b){if(b instanceof Array)a.push.apply(a,\n+b);else for(var d=0,c=b.length;d<c;d++)a.push(b[d]);return a},extend:function(a,b){if(b)for(var d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a},ka:function(a){for(;a.firstChild;)b.removeNode(a.firstChild)},Hb:function(a){a=b.a.L(a);for(var d=y.createElement(\"div\"),c=0,e=a.length;c<e;c++)d.appendChild(b.A(a[c]));return d},Ia:function(a,d){for(var c=0,e=a.length,g=[];c<e;c++){var f=a[c].cloneNode(m);g.push(d?b.A(f):f)}return g},N:function(a,d){b.a.ka(a);if(d)for(var c=0,e=d.length;c<e;c++)a.appendChild(d[c])},\n+Ya:function(a,d){var c=a.nodeType?[a]:a;if(0<c.length){for(var e=c[0],g=e.parentNode,f=0,h=d.length;f<h;f++)g.insertBefore(d[f],e);f=0;for(h=c.length;f<h;f++)b.removeNode(c[f])}},bb:function(a,b){7>n?a.setAttribute(\"selected\",b):a.selected=b},D:function(a){return(a||\"\").replace(d,\"\")},Rb:function(a,d){for(var c=[],e=(a||\"\").split(d),f=0,g=e.length;f<g;f++){var h=b.a.D(e[f]);\"\"!==h&&c.push(h)}return c},Ob:function(a,b){a=a||\"\";return b.length>a.length?r:a.substring(0,b.length)===b},tb:function(a,b){if(b.compareDocumentPosition)return 16==\n+(b.compareDocumentPosition(a)&16);for(;a!=p;){if(a==b)return m;a=a.parentNode}return r},X:function(a){return b.a.tb(a,a.ownerDocument)},u:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},n:function(b,d,c){var e=n&&l[d];if(!e&&\"undefined\"!=typeof F){if(a(b,d)){var f=c;c=function(a,b){var d=this.checked;b&&(this.checked=b.nb!==m);f.call(this,a);this.checked=d}}F(b).bind(d,c)}else!e&&\"function\"==typeof b.addEventListener?b.addEventListener(d,c,r):\"undefined\"!=typeof b.attachEvent?b.attachEvent(\"on\"+\n+d,function(a){c.call(b,a)}):j(Error(\"Browser doesn't support addEventListener or attachEvent\"))},Ba:function(b,d){(!b||!b.nodeType)&&j(Error(\"element must be a DOM node when calling triggerEvent\"));if(\"undefined\"!=typeof F){var c=[];a(b,d)&&c.push({nb:b.checked});F(b).trigger(d,c)}else\"function\"==typeof y.createEvent?\"function\"==typeof b.dispatchEvent?(c=y.createEvent(e[d]||\"HTMLEvents\"),c.initEvent(d,m,m,x,0,0,0,0,0,r,r,r,r,0,b),b.dispatchEvent(c)):j(Error(\"The supplied element doesn't support dispatchEvent\")):\n+\"undefined\"!=typeof b.fireEvent?(a(b,d)&&(b.checked=b.checked!==m),b.fireEvent(\"on\"+d)):j(Error(\"Browser doesn't support triggering events\"))},d:function(a){return b.$(a)?a():a},ua:function(a){return b.$(a)?a.t():a},da:function(a,d,c){if(d){var e=/[\\w-]+/g,f=a.className.match(e)||[];b.a.o(d.match(e),function(a){var d=b.a.i(f,a);0<=d?c||f.splice(d,1):c&&f.push(a)});a.className=f.join(\" \")}},cb:function(a,d){var c=b.a.d(d);if(c===p||c===I)c=\"\";if(3===a.nodeType)a.data=c;else{var e=b.e.firstChild(a);\n+!e||3!=e.nodeType||b.e.nextSibling(e)?b.e.N(a,[y.createTextNode(c)]):e.data=c;b.a.wb(a)}},ab:function(a,b){a.name=b;if(7>=n)try{a.mergeAttributes(y.createElement(\"<input name='\"+a.name+\"'/>\"),r)}catch(d){}},wb:function(a){9<=n&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},ub:function(a){if(9<=n){var b=a.style.width;a.style.width=0;a.style.width=b}},Lb:function(a,d){a=b.a.d(a);d=b.a.d(d);for(var c=[],e=a;e<=d;e++)c.push(e);return c},L:function(a){for(var b=[],d=0,c=a.length;d<\n+c;d++)b.push(a[d]);return b},Pb:6===n,Qb:7===n,Z:n,Oa:function(a,d){for(var c=b.a.L(a.getElementsByTagName(\"input\")).concat(b.a.L(a.getElementsByTagName(\"textarea\"))),e=\"string\"==typeof d?function(a){return a.name===d}:function(a){return d.test(a.name)},f=[],g=c.length-1;0<=g;g--)e(c[g])&&f.push(c[g]);return f},Ib:function(a){return\"string\"==typeof a&&(a=b.a.D(a))?x.JSON&&x.JSON.parse?x.JSON.parse(a):(new Function(\"return \"+a))():p},xa:function(a,d,c){(\"undefined\"==typeof JSON||\"undefined\"==typeof JSON.stringify)&&\n+j(Error(\"Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js\"));return JSON.stringify(b.a.d(a),d,c)},Jb:function(a,d,c){c=c||{};var e=c.params||{},f=c.includeFields||this.Na,g=a;if(\"object\"==typeof a&&\"form\"===b.a.u(a))for(var g=a.action,h=f.length-1;0<=h;h--)for(var k=b.a.Oa(a,f[h]),l=k.length-1;0<=l;l--)e[k[l].name]=k[l].value;d=b.a.d(d);var n=y.createElement(\"form\");\n+n.style.display=\"none\";n.action=g;n.method=\"post\";for(var w in d)a=y.createElement(\"input\"),a.name=w,a.value=b.a.xa(b.a.d(d[w])),n.appendChild(a);for(w in e)a=y.createElement(\"input\"),a.name=w,a.value=e[w],n.appendChild(a);y.body.appendChild(n);c.submitter?c.submitter(n):n.submit();setTimeout(function(){n.parentNode.removeChild(n)},0)}}};b.b(\"utils\",b.a);b.b(\"utils.arrayForEach\",b.a.o);b.b(\"utils.arrayFirst\",b.a.lb);b.b(\"utils.arrayFilter\",b.a.fa);b.b(\"utils.arrayGetDistinctValues\",b.a.Ga);b.b(\"utils.arrayIndexOf\",\n+b.a.i);b.b(\"utils.arrayMap\",b.a.V);b.b(\"utils.arrayPushAll\",b.a.P);b.b(\"utils.arrayRemoveItem\",b.a.ga);b.b(\"utils.extend\",b.a.extend);b.b(\"utils.fieldsIncludedWithJsonPost\",b.a.Na);b.b(\"utils.getFormFields\",b.a.Oa);b.b(\"utils.peekObservable\",b.a.ua);b.b(\"utils.postJson\",b.a.Jb);b.b(\"utils.parseJson\",b.a.Ib);b.b(\"utils.registerEventHandler\",b.a.n);b.b(\"utils.stringifyJson\",b.a.xa);b.b(\"utils.range\",b.a.Lb);b.b(\"utils.toggleDomNodeCssClass\",b.a.da);b.b(\"utils.triggerEvent\",b.a.Ba);b.b(\"utils.unwrapObservable\",\n+b.a.d);Function.prototype.bind||(Function.prototype.bind=function(a){var b=this,c=Array.prototype.slice.call(arguments);a=c.shift();return function(){return b.apply(a,c.concat(Array.prototype.slice.call(arguments)))}});b.a.f=new function(){var a=0,d=\"__ko__\"+(new Date).getTime(),c={};return{get:function(a,d){var c=b.a.f.la(a,r);return c===I?I:c[d]},set:function(a,d,c){c===I&&b.a.f.la(a,r)===I||(b.a.f.la(a,m)[d]=c)},la:function(b,f){var g=b[d];if(!g||!(\"null\"!==g&&c[g])){if(!f)return I;g=b[d]=\"ko\"+\n+a++;c[g]={}}return c[g]},clear:function(a){var b=a[d];return b?(delete c[b],a[d]=p,m):r}}};b.b(\"utils.domData\",b.a.f);b.b(\"utils.domData.clear\",b.a.f.clear);b.a.F=new function(){function a(a,d){var e=b.a.f.get(a,c);e===I&&d&&(e=[],b.a.f.set(a,c,e));return e}function d(c){var e=a(c,r);if(e)for(var e=e.slice(0),k=0;k<e.length;k++)e[k](c);b.a.f.clear(c);\"function\"==typeof F&&\"function\"==typeof F.cleanData&&F.cleanData([c]);if(f[c.nodeType])for(e=c.firstChild;c=e;)e=c.nextSibling,8===c.nodeType&&d(c)}\n+var c=\"__ko_domNodeDisposal__\"+(new Date).getTime(),e={1:m,8:m,9:m},f={1:m,9:m};return{Ca:function(b,d){\"function\"!=typeof d&&j(Error(\"Callback must be a function\"));a(b,m).push(d)},Xa:function(d,e){var f=a(d,r);f&&(b.a.ga(f,e),0==f.length&&b.a.f.set(d,c,I))},A:function(a){if(e[a.nodeType]&&(d(a),f[a.nodeType])){var c=[];b.a.P(c,a.getElementsByTagName(\"*\"));for(var k=0,l=c.length;k<l;k++)d(c[k])}return a},removeNode:function(a){b.A(a);a.parentNode&&a.parentNode.removeChild(a)}}};b.A=b.a.F.A;b.removeNode=\n+b.a.F.removeNode;b.b(\"cleanNode\",b.A);b.b(\"removeNode\",b.removeNode);b.b(\"utils.domNodeDisposal\",b.a.F);b.b(\"utils.domNodeDisposal.addDisposeCallback\",b.a.F.Ca);b.b(\"utils.domNodeDisposal.removeDisposeCallback\",b.a.F.Xa);b.a.ta=function(a){var d;if(\"undefined\"!=typeof F)if(F.parseHTML)d=F.parseHTML(a);else{if((d=F.clean([a]))&&d[0]){for(a=d[0];a.parentNode&&11!==a.parentNode.nodeType;)a=a.parentNode;a.parentNode&&a.parentNode.removeChild(a)}}else{var c=b.a.D(a).toLowerCase();d=y.createElement(\"div\");\n+c=c.match(/^<(thead|tbody|tfoot)/)&&[1,\"<table>\",\"</table>\"]||!c.indexOf(\"<tr\")&&[2,\"<table><tbody>\",\"</tbody></table>\"]||(!c.indexOf(\"<td\")||!c.indexOf(\"<th\"))&&[3,\"<table><tbody><tr>\",\"</tr></tbody></table>\"]||[0,\"\",\"\"];a=\"ignored<div>\"+c[1]+a+c[2]+\"</div>\";for(\"function\"==typeof x.innerShiv?d.appendChild(x.innerShiv(a)):d.innerHTML=a;c[0]--;)d=d.lastChild;d=b.a.L(d.lastChild.childNodes)}return d};b.a.ca=function(a,d){b.a.ka(a);d=b.a.d(d);if(d!==p&&d!==I)if(\"string\"!=typeof d&&(d=d.toString()),\n+\"undefined\"!=typeof F)F(a).html(d);else for(var c=b.a.ta(d),e=0;e<c.length;e++)a.appendChild(c[e])};b.b(\"utils.parseHtmlFragment\",b.a.ta);b.b(\"utils.setHtml\",b.a.ca);var R={};b.s={ra:function(a){\"function\"!=typeof a&&j(Error(\"You can only pass a function to ko.memoization.memoize()\"));var b=(4294967296*(1+Math.random())|0).toString(16).substring(1)+(4294967296*(1+Math.random())|0).toString(16).substring(1);R[b]=a;return\"\\x3c!--[ko_memo:\"+b+\"]--\\x3e\"},hb:function(a,b){var c=R[a];c===I&&j(Error(\"Couldn't find any memo with ID \"+\n+a+\". Perhaps it's already been unmemoized.\"));try{return c.apply(p,b||[]),m}finally{delete R[a]}},ib:function(a,d){var c=[];ca(a,c);for(var e=0,f=c.length;e<f;e++){var g=c[e].sb,h=[g];d&&b.a.P(h,d);b.s.hb(c[e].Fb,h);g.nodeValue=\"\";g.parentNode&&g.parentNode.removeChild(g)}},Ua:function(a){return(a=a.match(/^\\[ko_memo\\:(.*?)\\]$/))?a[1]:p}};b.b(\"memoization\",b.s);b.b(\"memoization.memoize\",b.s.ra);b.b(\"memoization.unmemoize\",b.s.hb);b.b(\"memoization.parseMemoText\",b.s.Ua);b.b(\"memoization.unmemoizeDomNodeAndDescendants\",\n+b.s.ib);b.Ma={throttle:function(a,d){a.throttleEvaluation=d;var c=p;return b.j({read:a,write:function(b){clearTimeout(c);c=setTimeout(function(){a(b)},d)}})},notify:function(a,d){a.equalityComparer=\"always\"==d?u(r):b.m.fn.equalityComparer;return a}};b.b(\"extenders\",b.Ma);b.fb=function(a,d,c){this.target=a;this.ha=d;this.rb=c;b.p(this,\"dispose\",this.B)};b.fb.prototype.B=function(){this.Cb=m;this.rb()};b.S=function(){this.w={};b.a.extend(this,b.S.fn);b.p(this,\"subscribe\",this.ya);b.p(this,\"extend\",\n+this.extend);b.p(this,\"getSubscriptionsCount\",this.yb)};b.S.fn={ya:function(a,d,c){c=c||\"change\";var e=new b.fb(this,d?a.bind(d):a,function(){b.a.ga(this.w[c],e)}.bind(this));this.w[c]||(this.w[c]=[]);this.w[c].push(e);return e},notifySubscribers:function(a,d){d=d||\"change\";this.w[d]&&b.r.K(function(){b.a.o(this.w[d].slice(0),function(b){b&&b.Cb!==m&&b.ha(a)})},this)},yb:function(){var a=0,b;for(b in this.w)this.w.hasOwnProperty(b)&&(a+=this.w[b].length);return a},extend:function(a){var d=this;if(a)for(var c in a){var e=\n+b.Ma[c];\"function\"==typeof e&&(d=e(d,a[c]))}return d}};b.Qa=function(a){return\"function\"==typeof a.ya&&\"function\"==typeof a.notifySubscribers};b.b(\"subscribable\",b.S);b.b(\"isSubscribable\",b.Qa);var C=[];b.r={mb:function(a){C.push({ha:a,La:[]})},end:function(){C.pop()},Wa:function(a){b.Qa(a)||j(Error(\"Only subscribable things can act as dependencies\"));if(0<C.length){var d=C[C.length-1];d&&!(0<=b.a.i(d.La,a))&&(d.La.push(a),d.ha(a))}},K:function(a,b,c){try{return C.push(p),a.apply(b,c||[])}finally{C.pop()}}};\n+var ma={undefined:m,\"boolean\":m,number:m,string:m};b.m=function(a){function d(){if(0<arguments.length){if(!d.equalityComparer||!d.equalityComparer(c,arguments[0]))d.H(),c=arguments[0],d.G();return this}b.r.Wa(d);return c}var c=a;b.S.call(d);d.t=function(){return c};d.G=function(){d.notifySubscribers(c)};d.H=function(){d.notifySubscribers(c,\"beforeChange\")};b.a.extend(d,b.m.fn);b.p(d,\"peek\",d.t);b.p(d,\"valueHasMutated\",d.G);b.p(d,\"valueWillMutate\",d.H);return d};b.m.fn={equalityComparer:function(a,\n+b){return a===p||typeof a in ma?a===b:r}};var E=b.m.Kb=\"__ko_proto__\";b.m.fn[E]=b.m;b.ma=function(a,d){return a===p||a===I||a[E]===I?r:a[E]===d?m:b.ma(a[E],d)};b.$=function(a){return b.ma(a,b.m)};b.Ra=function(a){return\"function\"==typeof a&&a[E]===b.m||\"function\"==typeof a&&a[E]===b.j&&a.zb?m:r};b.b(\"observable\",b.m);b.b(\"isObservable\",b.$);b.b(\"isWriteableObservable\",b.Ra);b.R=function(a){0==arguments.length&&(a=[]);a!==p&&(a!==I&&!(\"length\"in a))&&j(Error(\"The argument passed when initializing an observable array must be an array, or null, or undefined.\"));\n+var d=b.m(a);b.a.extend(d,b.R.fn);return d};b.R.fn={remove:function(a){for(var b=this.t(),c=[],e=\"function\"==typeof a?a:function(b){return b===a},f=0;f<b.length;f++){var g=b[f];e(g)&&(0===c.length&&this.H(),c.push(g),b.splice(f,1),f--)}c.length&&this.G();return c},removeAll:function(a){if(a===I){var d=this.t(),c=d.slice(0);this.H();d.splice(0,d.length);this.G();return c}return!a?[]:this.remove(function(d){return 0<=b.a.i(a,d)})},destroy:function(a){var b=this.t(),c=\"function\"==typeof a?a:function(b){return b===\n+a};this.H();for(var e=b.length-1;0<=e;e--)c(b[e])&&(b[e]._destroy=m);this.G()},destroyAll:function(a){return a===I?this.destroy(u(m)):!a?[]:this.destroy(function(d){return 0<=b.a.i(a,d)})},indexOf:function(a){var d=this();return b.a.i(d,a)},replace:function(a,b){var c=this.indexOf(a);0<=c&&(this.H(),this.t()[c]=b,this.G())}};b.a.o(\"pop push reverse shift sort splice unshift\".split(\" \"),function(a){b.R.fn[a]=function(){var b=this.t();this.H();b=b[a].apply(b,arguments);this.G();return b}});b.a.o([\"slice\"],\n+function(a){b.R.fn[a]=function(){var b=this();return b[a].apply(b,arguments)}});b.b(\"observableArray\",b.R);b.j=function(a,d,c){function e(){b.a.o(z,function(a){a.B()});z=[]}function f(){var a=h.throttleEvaluation;a&&0<=a?(clearTimeout(t),t=setTimeout(g,a)):g()}function g(){if(!q)if(n&&w())A();else{q=m;try{var a=b.a.V(z,function(a){return a.target});b.r.mb(function(c){var d;0<=(d=b.a.i(a,c))?a[d]=I:z.push(c.ya(f))});for(var c=s.call(d),e=a.length-1;0<=e;e--)a[e]&&z.splice(e,1)[0].B();n=m;h.notifySubscribers(l,\n+\"beforeChange\");l=c}finally{b.r.end()}h.notifySubscribers(l);q=r;z.length||A()}}function h(){if(0<arguments.length)return\"function\"===typeof v?v.apply(d,arguments):j(Error(\"Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.\")),this;n||g();b.r.Wa(h);return l}function k(){return!n||0<z.length}var l,n=r,q=r,s=a;s&&\"object\"==typeof s?(c=s,s=c.read):(c=c||{},s||(s=c.read));\"function\"!=typeof s&&j(Error(\"Pass a function that returns the value of the ko.computed\"));\n+var v=c.write,G=c.disposeWhenNodeIsRemoved||c.W||p,w=c.disposeWhen||c.Ka||u(r),A=e,z=[],t=p;d||(d=c.owner);h.t=function(){n||g();return l};h.xb=function(){return z.length};h.zb=\"function\"===typeof c.write;h.B=function(){A()};h.pa=k;b.S.call(h);b.a.extend(h,b.j.fn);b.p(h,\"peek\",h.t);b.p(h,\"dispose\",h.B);b.p(h,\"isActive\",h.pa);b.p(h,\"getDependenciesCount\",h.xb);c.deferEvaluation!==m&&g();if(G&&k()){A=function(){b.a.F.Xa(G,arguments.callee);e()};b.a.F.Ca(G,A);var D=w,w=function(){return!b.a.X(G)||D()}}return h};\n+b.Bb=function(a){return b.ma(a,b.j)};w=b.m.Kb;b.j[w]=b.m;b.j.fn={};b.j.fn[w]=b.j;b.b(\"dependentObservable\",b.j);b.b(\"computed\",b.j);b.b(\"isComputed\",b.Bb);b.gb=function(a){0==arguments.length&&j(Error(\"When calling ko.toJS, pass the object you want to convert.\"));return ba(a,function(a){for(var c=0;b.$(a)&&10>c;c++)a=a();return a})};b.toJSON=function(a,d,c){a=b.gb(a);return b.a.xa(a,d,c)};b.b(\"toJS\",b.gb);b.b(\"toJSON\",b.toJSON);b.k={q:function(a){switch(b.a.u(a)){case \"option\":return a.__ko__hasDomDataOptionValue__===\n+m?b.a.f.get(a,b.c.options.sa):7>=b.a.Z?a.getAttributeNode(\"value\").specified?a.value:a.text:a.value;case \"select\":return 0<=a.selectedIndex?b.k.q(a.options[a.selectedIndex]):I;default:return a.value}},T:function(a,d){switch(b.a.u(a)){case \"option\":switch(typeof d){case \"string\":b.a.f.set(a,b.c.options.sa,I);\"__ko__hasDomDataOptionValue__\"in a&&delete a.__ko__hasDomDataOptionValue__;a.value=d;break;default:b.a.f.set(a,b.c.options.sa,d),a.__ko__hasDomDataOptionValue__=m,a.value=\"number\"===typeof d?\n+d:\"\"}break;case \"select\":for(var c=a.options.length-1;0<=c;c--)if(b.k.q(a.options[c])==d){a.selectedIndex=c;break}break;default:if(d===p||d===I)d=\"\";a.value=d}}};b.b(\"selectExtensions\",b.k);b.b(\"selectExtensions.readValue\",b.k.q);b.b(\"selectExtensions.writeValue\",b.k.T);var ka=/\\@ko_token_(\\d+)\\@/g,na=[\"true\",\"false\"],oa=/^(?:[$_a-z][$\\w]*|(.+)(\\.\\s*[$_a-z][$\\w]*|\\[.+\\]))$/i;b.g={Q:[],aa:function(a){var d=b.a.D(a);if(3>d.length)return[];\"{\"===d.charAt(0)&&(d=d.substring(1,d.length-1));a=[];for(var c=\n+p,e,f=0;f<d.length;f++){var g=d.charAt(f);if(c===p)switch(g){case '\"':case \"'\":case \"/\":c=f,e=g}else if(g==e&&\"\\\\\"!==d.charAt(f-1)){g=d.substring(c,f+1);a.push(g);var h=\"@ko_token_\"+(a.length-1)+\"@\",d=d.substring(0,c)+h+d.substring(f+1),f=f-(g.length-h.length),c=p}}e=c=p;for(var k=0,l=p,f=0;f<d.length;f++){g=d.charAt(f);if(c===p)switch(g){case \"{\":c=f;l=g;e=\"}\";break;case \"(\":c=f;l=g;e=\")\";break;case \"[\":c=f,l=g,e=\"]\"}g===l?k++:g===e&&(k--,0===k&&(g=d.substring(c,f+1),a.push(g),h=\"@ko_token_\"+(a.length-\n+1)+\"@\",d=d.substring(0,c)+h+d.substring(f+1),f-=g.length-h.length,c=p))}e=[];d=d.split(\",\");c=0;for(f=d.length;c<f;c++)k=d[c],l=k.indexOf(\":\"),0<l&&l<k.length-1?(g=k.substring(l+1),e.push({key:P(k.substring(0,l),a),value:P(g,a)})):e.push({unknown:P(k,a)});return e},ba:function(a){var d=\"string\"===typeof a?b.g.aa(a):a,c=[];a=[];for(var e,f=0;e=d[f];f++)if(0<c.length&&c.push(\",\"),e.key){var g;a:{g=e.key;var h=b.a.D(g);switch(h.length&&h.charAt(0)){case \"'\":case '\"':break a;default:g=\"'\"+h+\"'\"}}e=e.value;\n+c.push(g);c.push(\":\");c.push(e);e=b.a.D(e);0<=b.a.i(na,b.a.D(e).toLowerCase())?e=r:(h=e.match(oa),e=h===p?r:h[1]?\"Object(\"+h[1]+\")\"+h[2]:e);e&&(0<a.length&&a.push(\", \"),a.push(g+\" : function(__ko_value) { \"+e+\" = __ko_value; }\"))}else e.unknown&&c.push(e.unknown);d=c.join(\"\");0<a.length&&(d=d+\", '_ko_property_writers' : { \"+a.join(\"\")+\" } \");return d},Eb:function(a,d){for(var c=0;c<a.length;c++)if(b.a.D(a[c].key)==d)return m;return r},ea:function(a,d,c,e,f){if(!a||!b.Ra(a)){if((a=d()._ko_property_writers)&&\n+a[c])a[c](e)}else(!f||a.t()!==e)&&a(e)}};b.b(\"expressionRewriting\",b.g);b.b(\"expressionRewriting.bindingRewriteValidators\",b.g.Q);b.b(\"expressionRewriting.parseObjectLiteral\",b.g.aa);b.b(\"expressionRewriting.preProcessBindings\",b.g.ba);b.b(\"jsonExpressionRewriting\",b.g);b.b(\"jsonExpressionRewriting.insertPropertyAccessorsIntoJson\",b.g.ba);var K=\"\\x3c!--test--\\x3e\"===y.createComment(\"test\").text,ja=K?/^\\x3c!--\\s*ko(?:\\s+(.+\\s*\\:[\\s\\S]*))?\\s*--\\x3e$/:/^\\s*ko(?:\\s+(.+\\s*\\:[\\s\\S]*))?\\s*$/,ia=K?/^\\x3c!--\\s*\\/ko\\s*--\\x3e$/:\n+/^\\s*\\/ko\\s*$/,pa={ul:m,ol:m};b.e={I:{},childNodes:function(a){return B(a)?aa(a):a.childNodes},Y:function(a){if(B(a)){a=b.e.childNodes(a);for(var d=0,c=a.length;d<c;d++)b.removeNode(a[d])}else b.a.ka(a)},N:function(a,d){if(B(a)){b.e.Y(a);for(var c=a.nextSibling,e=0,f=d.length;e<f;e++)c.parentNode.insertBefore(d[e],c)}else b.a.N(a,d)},Va:function(a,b){B(a)?a.parentNode.insertBefore(b,a.nextSibling):a.firstChild?a.insertBefore(b,a.firstChild):a.appendChild(b)},Pa:function(a,d,c){c?B(a)?a.parentNode.insertBefore(d,\n+c.nextSibling):c.nextSibling?a.insertBefore(d,c.nextSibling):a.appendChild(d):b.e.Va(a,d)},firstChild:function(a){return!B(a)?a.firstChild:!a.nextSibling||H(a.nextSibling)?p:a.nextSibling},nextSibling:function(a){B(a)&&(a=$(a));return a.nextSibling&&H(a.nextSibling)?p:a.nextSibling},jb:function(a){return(a=B(a))?a[1]:p},Ta:function(a){if(pa[b.a.u(a)]){var d=a.firstChild;if(d){do if(1===d.nodeType){var c;c=d.firstChild;var e=p;if(c){do if(e)e.push(c);else if(B(c)){var f=$(c,m);f?c=f:e=[c]}else H(c)&&\n+(e=[c]);while(c=c.nextSibling)}if(c=e){e=d.nextSibling;for(f=0;f<c.length;f++)e?a.insertBefore(c[f],e):a.appendChild(c[f])}}while(d=d.nextSibling)}}}};b.b(\"virtualElements\",b.e);b.b(\"virtualElements.allowedBindings\",b.e.I);b.b(\"virtualElements.emptyNode\",b.e.Y);b.b(\"virtualElements.insertAfter\",b.e.Pa);b.b(\"virtualElements.prepend\",b.e.Va);b.b(\"virtualElements.setDomNodeChildren\",b.e.N);b.J=function(){this.Ha={}};b.a.extend(b.J.prototype,{nodeHasBindings:function(a){switch(a.nodeType){case 1:return a.getAttribute(\"data-bind\")!=\n+p;case 8:return b.e.jb(a)!=p;default:return r}},getBindings:function(a,b){var c=this.getBindingsString(a,b);return c?this.parseBindingsString(c,b,a):p},getBindingsString:function(a){switch(a.nodeType){case 1:return a.getAttribute(\"data-bind\");case 8:return b.e.jb(a);default:return p}},parseBindingsString:function(a,d,c){try{var e;if(!(e=this.Ha[a])){var f=this.Ha,g,h=\"with($context){with($data||{}){return{\"+b.g.ba(a)+\"}}}\";g=new Function(\"$context\",\"$element\",h);e=f[a]=g}return e(d,c)}catch(k){j(Error(\"Unable to parse bindings.\\nMessage: \"+\n+k+\";\\nBindings value: \"+a))}}});b.J.instance=new b.J;b.b(\"bindingProvider\",b.J);b.c={};b.z=function(a,d,c){d?(b.a.extend(this,d),this.$parentContext=d,this.$parent=d.$data,this.$parents=(d.$parents||[]).slice(0),this.$parents.unshift(this.$parent)):(this.$parents=[],this.$root=a,this.ko=b);this.$data=a;c&&(this[c]=a)};b.z.prototype.createChildContext=function(a,d){return new b.z(a,this,d)};b.z.prototype.extend=function(a){var d=b.a.extend(new b.z,this);return b.a.extend(d,a)};b.eb=function(a,d){if(2==\n+arguments.length)b.a.f.set(a,\"__ko_bindingContext__\",d);else return b.a.f.get(a,\"__ko_bindingContext__\")};b.Fa=function(a,d,c){1===a.nodeType&&b.e.Ta(a);return X(a,d,c,m)};b.Ea=function(a,b){(1===b.nodeType||8===b.nodeType)&&Z(a,b,m)};b.Da=function(a,b){b&&(1!==b.nodeType&&8!==b.nodeType)&&j(Error(\"ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node\"));b=b||x.document.body;Y(a,b,m)};b.ja=function(a){switch(a.nodeType){case 1:case 8:var d=b.eb(a);if(d)return d;\n+if(a.parentNode)return b.ja(a.parentNode)}return I};b.pb=function(a){return(a=b.ja(a))?a.$data:I};b.b(\"bindingHandlers\",b.c);b.b(\"applyBindings\",b.Da);b.b(\"applyBindingsToDescendants\",b.Ea);b.b(\"applyBindingsToNode\",b.Fa);b.b(\"contextFor\",b.ja);b.b(\"dataFor\",b.pb);var fa={\"class\":\"className\",\"for\":\"htmlFor\"};b.c.attr={update:function(a,d){var c=b.a.d(d())||{},e;for(e in c)if(\"string\"==typeof e){var f=b.a.d(c[e]),g=f===r||f===p||f===I;g&&a.removeAttribute(e);8>=b.a.Z&&e in fa?(e=fa[e],g?a.removeAttribute(e):\n+a[e]=f):g||a.setAttribute(e,f.toString());\"name\"===e&&b.a.ab(a,g?\"\":f.toString())}}};b.c.checked={init:function(a,d,c){b.a.n(a,\"click\",function(){var e;if(\"checkbox\"==a.type)e=a.checked;else if(\"radio\"==a.type&&a.checked)e=a.value;else return;var f=d(),g=b.a.d(f);\"checkbox\"==a.type&&g instanceof Array?(e=b.a.i(g,a.value),a.checked&&0>e?f.push(a.value):!a.checked&&0<=e&&f.splice(e,1)):b.g.ea(f,c,\"checked\",e,m)});\"radio\"==a.type&&!a.name&&b.c.uniqueName.init(a,u(m))},update:function(a,d){var c=b.a.d(d());\n+\"checkbox\"==a.type?a.checked=c instanceof Array?0<=b.a.i(c,a.value):c:\"radio\"==a.type&&(a.checked=a.value==c)}};b.c.css={update:function(a,d){var c=b.a.d(d());if(\"object\"==typeof c)for(var e in c){var f=b.a.d(c[e]);b.a.da(a,e,f)}else c=String(c||\"\"),b.a.da(a,a.__ko__cssValue,r),a.__ko__cssValue=c,b.a.da(a,c,m)}};b.c.enable={update:function(a,d){var c=b.a.d(d());c&&a.disabled?a.removeAttribute(\"disabled\"):!c&&!a.disabled&&(a.disabled=m)}};b.c.disable={update:function(a,d){b.c.enable.update(a,function(){return!b.a.d(d())})}};\n+b.c.event={init:function(a,d,c,e){var f=d()||{},g;for(g in f)(function(){var f=g;\"string\"==typeof f&&b.a.n(a,f,function(a){var g,n=d()[f];if(n){var q=c();try{var s=b.a.L(arguments);s.unshift(e);g=n.apply(e,s)}finally{g!==m&&(a.preventDefault?a.preventDefault():a.returnValue=r)}q[f+\"Bubble\"]===r&&(a.cancelBubble=m,a.stopPropagation&&a.stopPropagation())}})})()}};b.c.foreach={Sa:function(a){return function(){var d=a(),c=b.a.ua(d);if(!c||\"number\"==typeof c.length)return{foreach:d,templateEngine:b.C.oa};\n+b.a.d(d);return{foreach:c.data,as:c.as,includeDestroyed:c.includeDestroyed,afterAdd:c.afterAdd,beforeRemove:c.beforeRemove,afterRender:c.afterRender,beforeMove:c.beforeMove,afterMove:c.afterMove,templateEngine:b.C.oa}}},init:function(a,d){return b.c.template.init(a,b.c.foreach.Sa(d))},update:function(a,d,c,e,f){return b.c.template.update(a,b.c.foreach.Sa(d),c,e,f)}};b.g.Q.foreach=r;b.e.I.foreach=m;b.c.hasfocus={init:function(a,d,c){function e(e){a.__ko_hasfocusUpdating=m;var f=a.ownerDocument;\"activeElement\"in\n+f&&(e=f.activeElement===a);f=d();b.g.ea(f,c,\"hasfocus\",e,m);a.__ko_hasfocusUpdating=r}var f=e.bind(p,m),g=e.bind(p,r);b.a.n(a,\"focus\",f);b.a.n(a,\"focusin\",f);b.a.n(a,\"blur\",g);b.a.n(a,\"focusout\",g)},update:function(a,d){var c=b.a.d(d());a.__ko_hasfocusUpdating||(c?a.focus():a.blur(),b.r.K(b.a.Ba,p,[a,c?\"focusin\":\"focusout\"]))}};b.c.html={init:function(){return{controlsDescendantBindings:m}},update:function(a,d){b.a.ca(a,d())}};var da=\"__ko_withIfBindingData\";Q(\"if\");Q(\"ifnot\",r,m);Q(\"with\",m,r,function(a,\n+b){return a.createChildContext(b)});b.c.options={update:function(a,d,c){\"select\"!==b.a.u(a)&&j(Error(\"options binding applies only to SELECT elements\"));for(var e=0==a.length,f=b.a.V(b.a.fa(a.childNodes,function(a){return a.tagName&&\"option\"===b.a.u(a)&&a.selected}),function(a){return b.k.q(a)||a.innerText||a.textContent}),g=a.scrollTop,h=b.a.d(d());0<a.length;)b.A(a.options[0]),a.remove(0);if(h){c=c();var k=c.optionsIncludeDestroyed;\"number\"!=typeof h.length&&(h=[h]);if(c.optionsCaption){var l=y.createElement(\"option\");\n+b.a.ca(l,c.optionsCaption);b.k.T(l,I);a.appendChild(l)}d=0;for(var n=h.length;d<n;d++){var q=h[d];if(!q||!q._destroy||k){var l=y.createElement(\"option\"),s=function(a,b,c){var d=typeof b;return\"function\"==d?b(a):\"string\"==d?a[b]:c},v=s(q,c.optionsValue,q);b.k.T(l,b.a.d(v));q=s(q,c.optionsText,v);b.a.cb(l,q);a.appendChild(l)}}h=a.getElementsByTagName(\"option\");d=k=0;for(n=h.length;d<n;d++)0<=b.a.i(f,b.k.q(h[d]))&&(b.a.bb(h[d],m),k++);a.scrollTop=g;e&&\"value\"in c&&ea(a,b.a.ua(c.value),m);b.a.ub(a)}}};\n+b.c.options.sa=\"__ko.optionValueDomData__\";b.c.selectedOptions={init:function(a,d,c){b.a.n(a,\"change\",function(){var e=d(),f=[];b.a.o(a.getElementsByTagName(\"option\"),function(a){a.selected&&f.push(b.k.q(a))});b.g.ea(e,c,\"value\",f)})},update:function(a,d){\"select\"!=b.a.u(a)&&j(Error(\"values binding applies only to SELECT elements\"));var c=b.a.d(d());c&&\"number\"==typeof c.length&&b.a.o(a.getElementsByTagName(\"option\"),function(a){var d=0<=b.a.i(c,b.k.q(a));b.a.bb(a,d)})}};b.c.style={update:function(a,\n+d){var c=b.a.d(d()||{}),e;for(e in c)if(\"string\"==typeof e){var f=b.a.d(c[e]);a.style[e]=f||\"\"}}};b.c.submit={init:function(a,d,c,e){\"function\"!=typeof d()&&j(Error(\"The value for a submit binding must be a function\"));b.a.n(a,\"submit\",function(b){var c,h=d();try{c=h.call(e,a)}finally{c!==m&&(b.preventDefault?b.preventDefault():b.returnValue=r)}})}};b.c.text={update:function(a,d){b.a.cb(a,d())}};b.e.I.text=m;b.c.uniqueName={init:function(a,d){if(d()){var c=\"ko_unique_\"+ ++b.c.uniqueName.ob;b.a.ab(a,\n+c)}}};b.c.uniqueName.ob=0;b.c.value={init:function(a,d,c){function e(){h=r;var e=d(),f=b.k.q(a);b.g.ea(e,c,\"value\",f)}var f=[\"change\"],g=c().valueUpdate,h=r;g&&(\"string\"==typeof g&&(g=[g]),b.a.P(f,g),f=b.a.Ga(f));if(b.a.Z&&(\"input\"==a.tagName.toLowerCase()&&\"text\"==a.type&&\"off\"!=a.autocomplete&&(!a.form||\"off\"!=a.form.autocomplete))&&-1==b.a.i(f,\"propertychange\"))b.a.n(a,\"propertychange\",function(){h=m}),b.a.n(a,\"blur\",function(){h&&e()});b.a.o(f,function(c){var d=e;b.a.Ob(c,\"after\")&&(d=function(){setTimeout(e,\n+0)},c=c.substring(5));b.a.n(a,c,d)})},update:function(a,d){var c=\"select\"===b.a.u(a),e=b.a.d(d()),f=b.k.q(a),g=e!=f;0===e&&(0!==f&&\"0\"!==f)&&(g=m);g&&(f=function(){b.k.T(a,e)},f(),c&&setTimeout(f,0));c&&0<a.length&&ea(a,e,r)}};b.c.visible={update:function(a,d){var c=b.a.d(d()),e=\"none\"!=a.style.display;c&&!e?a.style.display=\"\":!c&&e&&(a.style.display=\"none\")}};b.c.click={init:function(a,d,c,e){return b.c.event.init.call(this,a,function(){var a={};a.click=d();return a},c,e)}};b.v=function(){};b.v.prototype.renderTemplateSource=\n+function(){j(Error(\"Override renderTemplateSource\"))};b.v.prototype.createJavaScriptEvaluatorBlock=function(){j(Error(\"Override createJavaScriptEvaluatorBlock\"))};b.v.prototype.makeTemplateSource=function(a,d){if(\"string\"==typeof a){d=d||y;var c=d.getElementById(a);c||j(Error(\"Cannot find template with ID \"+a));return new b.l.h(c)}if(1==a.nodeType||8==a.nodeType)return new b.l.O(a);j(Error(\"Unknown template type: \"+a))};b.v.prototype.renderTemplate=function(a,b,c,e){a=this.makeTemplateSource(a,e);\n+return this.renderTemplateSource(a,b,c)};b.v.prototype.isTemplateRewritten=function(a,b){return this.allowTemplateRewriting===r?m:this.makeTemplateSource(a,b).data(\"isRewritten\")};b.v.prototype.rewriteTemplate=function(a,b,c){a=this.makeTemplateSource(a,c);b=b(a.text());a.text(b);a.data(\"isRewritten\",m)};b.b(\"templateEngine\",b.v);var qa=/(<[a-z]+\\d*(\\s+(?!data-bind=)[a-z0-9\\-]+(=(\\\"[^\\\"]*\\\"|\\'[^\\']*\\'))?)*\\s+)data-bind=([\"'])([\\s\\S]*?)\\5/gi,ra=/\\x3c!--\\s*ko\\b\\s*([\\s\\S]*?)\\s*--\\x3e/g;b.za={vb:function(a,\n+d,c){d.isTemplateRewritten(a,c)||d.rewriteTemplate(a,function(a){return b.za.Gb(a,d)},c)},Gb:function(a,b){return a.replace(qa,function(a,e,f,g,h,k,l){return W(l,e,b)}).replace(ra,function(a,e){return W(e,\"\\x3c!-- ko --\\x3e\",b)})},kb:function(a){return b.s.ra(function(d,c){d.nextSibling&&b.Fa(d.nextSibling,a,c)})}};b.b(\"__tr_ambtns\",b.za.kb);b.l={};b.l.h=function(a){this.h=a};b.l.h.prototype.text=function(){var a=b.a.u(this.h),a=\"script\"===a?\"text\":\"textarea\"===a?\"value\":\"innerHTML\";if(0==arguments.length)return this.h[a];\n+var d=arguments[0];\"innerHTML\"===a?b.a.ca(this.h,d):this.h[a]=d};b.l.h.prototype.data=function(a){if(1===arguments.length)return b.a.f.get(this.h,\"templateSourceData_\"+a);b.a.f.set(this.h,\"templateSourceData_\"+a,arguments[1])};b.l.O=function(a){this.h=a};b.l.O.prototype=new b.l.h;b.l.O.prototype.text=function(){if(0==arguments.length){var a=b.a.f.get(this.h,\"__ko_anon_template__\")||{};a.Aa===I&&a.ia&&(a.Aa=a.ia.innerHTML);return a.Aa}b.a.f.set(this.h,\"__ko_anon_template__\",{Aa:arguments[0]})};b.l.h.prototype.nodes=\n+function(){if(0==arguments.length)return(b.a.f.get(this.h,\"__ko_anon_template__\")||{}).ia;b.a.f.set(this.h,\"__ko_anon_template__\",{ia:arguments[0]})};b.b(\"templateSources\",b.l);b.b(\"templateSources.domElement\",b.l.h);b.b(\"templateSources.anonymousTemplate\",b.l.O);var O;b.wa=function(a){a!=I&&!(a instanceof b.v)&&j(Error(\"templateEngine must inherit from ko.templateEngine\"));O=a};b.va=function(a,d,c,e,f){c=c||{};(c.templateEngine||O)==I&&j(Error(\"Set a template engine before calling renderTemplate\"));\n+f=f||\"replaceChildren\";if(e){var g=N(e);return b.j(function(){var h=d&&d instanceof b.z?d:new b.z(b.a.d(d)),k=\"function\"==typeof a?a(h.$data,h):a,h=T(e,f,k,h,c);\"replaceNode\"==f&&(e=h,g=N(e))},p,{Ka:function(){return!g||!b.a.X(g)},W:g&&\"replaceNode\"==f?g.parentNode:g})}return b.s.ra(function(e){b.va(a,d,c,e,\"replaceNode\")})};b.Mb=function(a,d,c,e,f){function g(a,b){U(b,k);c.afterRender&&c.afterRender(b,a)}function h(d,e){k=f.createChildContext(b.a.d(d),c.as);k.$index=e;var g=\"function\"==typeof a?\n+a(d,k):a;return T(p,\"ignoreTargetNode\",g,k,c)}var k;return b.j(function(){var a=b.a.d(d)||[];\"undefined\"==typeof a.length&&(a=[a]);a=b.a.fa(a,function(a){return c.includeDestroyed||a===I||a===p||!b.a.d(a._destroy)});b.r.K(b.a.$a,p,[e,a,h,c,g])},p,{W:e})};b.c.template={init:function(a,d){var c=b.a.d(d());if(\"string\"!=typeof c&&!c.name&&(1==a.nodeType||8==a.nodeType))c=1==a.nodeType?a.childNodes:b.e.childNodes(a),c=b.a.Hb(c),(new b.l.O(a)).nodes(c);return{controlsDescendantBindings:m}},update:function(a,\n+d,c,e,f){d=b.a.d(d());c={};e=m;var g,h=p;\"string\"!=typeof d&&(c=d,d=c.name,\"if\"in c&&(e=b.a.d(c[\"if\"])),e&&\"ifnot\"in c&&(e=!b.a.d(c.ifnot)),g=b.a.d(c.data));\"foreach\"in c?h=b.Mb(d||a,e&&c.foreach||[],c,a,f):e?(f=\"data\"in c?f.createChildContext(g,c.as):f,h=b.va(d||a,f,c,a)):b.e.Y(a);f=h;(g=b.a.f.get(a,\"__ko__templateComputedDomDataKey__\"))&&\"function\"==typeof g.B&&g.B();b.a.f.set(a,\"__ko__templateComputedDomDataKey__\",f&&f.pa()?f:I)}};b.g.Q.template=function(a){a=b.g.aa(a);return 1==a.length&&a[0].unknown||\n+b.g.Eb(a,\"name\")?p:\"This template engine does not support anonymous templates nested within its templates\"};b.e.I.template=m;b.b(\"setTemplateEngine\",b.wa);b.b(\"renderTemplate\",b.va);b.a.Ja=function(a,b,c){a=a||[];b=b||[];return a.length<=b.length?S(a,b,\"added\",\"deleted\",c):S(b,a,\"deleted\",\"added\",c)};b.b(\"utils.compareArrays\",b.a.Ja);b.a.$a=function(a,d,c,e,f){function g(a,b){t=l[b];w!==b&&(z[a]=t);t.na(w++);M(t.M);s.push(t);A.push(t)}function h(a,c){if(a)for(var d=0,e=c.length;d<e;d++)c[d]&&b.a.o(c[d].M,\n+function(b){a(b,d,c[d].U)})}d=d||[];e=e||{};var k=b.a.f.get(a,\"setDomNodeChildrenFromArrayMapping_lastMappingResult\")===I,l=b.a.f.get(a,\"setDomNodeChildrenFromArrayMapping_lastMappingResult\")||[],n=b.a.V(l,function(a){return a.U}),q=b.a.Ja(n,d),s=[],v=0,w=0,B=[],A=[];d=[];for(var z=[],n=[],t,D=0,C,E;C=q[D];D++)switch(E=C.moved,C.status){case \"deleted\":E===I&&(t=l[v],t.j&&t.j.B(),B.push.apply(B,M(t.M)),e.beforeRemove&&(d[D]=t,A.push(t)));v++;break;case \"retained\":g(D,v++);break;case \"added\":E!==I?\n+g(D,E):(t={U:C.value,na:b.m(w++)},s.push(t),A.push(t),k||(n[D]=t))}h(e.beforeMove,z);b.a.o(B,e.beforeRemove?b.A:b.removeNode);for(var D=0,k=b.e.firstChild(a),H;t=A[D];D++){t.M||b.a.extend(t,ha(a,c,t.U,f,t.na));for(v=0;q=t.M[v];k=q.nextSibling,H=q,v++)q!==k&&b.e.Pa(a,q,H);!t.Ab&&f&&(f(t.U,t.M,t.na),t.Ab=m)}h(e.beforeRemove,d);h(e.afterMove,z);h(e.afterAdd,n);b.a.f.set(a,\"setDomNodeChildrenFromArrayMapping_lastMappingResult\",s)};b.b(\"utils.setDomNodeChildrenFromArrayMapping\",b.a.$a);b.C=function(){this.allowTemplateRewriting=\n+r};b.C.prototype=new b.v;b.C.prototype.renderTemplateSource=function(a){var d=!(9>b.a.Z)&&a.nodes?a.nodes():p;if(d)return b.a.L(d.cloneNode(m).childNodes);a=a.text();return b.a.ta(a)};b.C.oa=new b.C;b.wa(b.C.oa);b.b(\"nativeTemplateEngine\",b.C);b.qa=function(){var a=this.Db=function(){if(\"undefined\"==typeof F||!F.tmpl)return 0;try{if(0<=F.tmpl.tag.tmpl.open.toString().indexOf(\"__\"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,c,e){e=e||{};2>a&&j(Error(\"Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.\"));\n+var f=b.data(\"precompiled\");f||(f=b.text()||\"\",f=F.template(p,\"{{ko_with $item.koBindingContext}}\"+f+\"{{/ko_with}}\"),b.data(\"precompiled\",f));b=[c.$data];c=F.extend({koBindingContext:c},e.templateOptions);c=F.tmpl(f,b,c);c.appendTo(y.createElement(\"div\"));F.fragments={};return c};this.createJavaScriptEvaluatorBlock=function(a){return\"{{ko_code ((function() { return \"+a+\" })()) }}\"};this.addTemplate=function(a,b){y.write(\"<script type='text/html' id='\"+a+\"'>\"+b+\"\\x3c/script>\")};0<a&&(F.tmpl.tag.ko_code=\n+{open:\"__.push($1 || '');\"},F.tmpl.tag.ko_with={open:\"with($1) {\",close:\"} \"})};b.qa.prototype=new b.v;w=new b.qa;0<w.Db&&b.wa(w);b.b(\"jqueryTmplTemplateEngine\",b.qa)}\"function\"===typeof require&&\"object\"===typeof exports&&\"object\"===typeof module?L(module.exports||exports):\"function\"===typeof define&&define.amd?define([\"exports\"],L):L(x.ko={});m;\n+})();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add ko2 back for admins (regression from f559b6d) (#6209)
|
455,747 |
25.07.2018 11:53:14
| 25,200 |
7df2d8441ad4fc2ce4d2d2803a31aaa17962f214
|
Add symbols configuration
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/App_Data/Files/Content/Symbols-Configuration.json",
"diff": "+{\n+ \"isSymbolsUploadEnabledForAll\": false,\n+ \"alwaysEnabledForEmailAddresses\": [\n+ ],\n+ \"alwasyEnabledForDomains\": [\n+ ]\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -99,6 +99,7 @@ public static class ContentNames\npublic static readonly string Team = \"Team\";\npublic static readonly string LoginDiscontinuationConfiguration = \"Login-Discontinuation-Configuration\";\npublic static readonly string CertificatesConfiguration = \"Certificates-Configuration\";\n+ public static readonly string SymbolsConfiguration = \"Symbols-Configuration\";\n}\npublic static class StatisticsDimensions\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\ActionRequiringReservedNamespacePermissions.cs\" />\n<Compile Include=\"Services\\ActionsRequiringPermissions.cs\" />\n<Compile Include=\"Services\\AsynchronousPackageValidationInitiator.cs\" />\n+ <Compile Include=\"Services\\ISymbolsConfiguration.cs\" />\n+ <Compile Include=\"Services\\SymbolsConfiguration.cs\" />\n<Compile Include=\"Services\\CertificatesConfiguration.cs\" />\n<Compile Include=\"Services\\CertificateService.cs\" />\n<Compile Include=\"Services\\CertificateValidator.cs\" />\n<CopyToOutputDirectory>Always</CopyToOutputDirectory>\n</Content>\n<Content Include=\"Areas\\Admin\\Views\\Revalidation\\Index.cshtml\" />\n+ <Content Include=\"App_Data\\Files\\Content\\Symbols-Configuration.json\" />\n<None Include=\"Scripts\\jquery-1.11.0.intellisense.js\" />\n<Content Include=\"Scripts\\jquery-1.11.0.js\" />\n<Content Include=\"Scripts\\jquery-1.11.0.min.js\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "@@ -10,7 +10,7 @@ namespace NuGetGallery\n{\npublic class ContentObjectService : IContentObjectService\n{\n- private const int RefreshIntervalHours = 1;\n+ private const int RefreshIntervalMinutes = 5;\nprivate readonly IContentService _contentService;\n@@ -20,10 +20,12 @@ public ContentObjectService(IContentService contentService)\nLoginDiscontinuationConfiguration = new LoginDiscontinuationConfiguration();\nCertificatesConfiguration = new CertificatesConfiguration();\n+ SymbolsConfiguration = new SymbolsConfiguration();\n}\npublic ILoginDiscontinuationConfiguration LoginDiscontinuationConfiguration { get; set; }\npublic ICertificatesConfiguration CertificatesConfiguration { get; set; }\n+ public ISymbolsConfiguration SymbolsConfiguration { get; set; }\npublic async Task Refresh()\n{\n@@ -34,12 +36,16 @@ public async Task Refresh()\nCertificatesConfiguration =\nawait Refresh<CertificatesConfiguration>(Constants.ContentNames.CertificatesConfiguration) ??\nnew CertificatesConfiguration();\n+\n+ SymbolsConfiguration =\n+ await Refresh<SymbolsConfiguration>(Constants.ContentNames.SymbolsConfiguration) ??\n+ new SymbolsConfiguration();\n}\nprivate async Task<T> Refresh<T>(string contentName)\nwhere T : class\n{\n- var configString = (await _contentService.GetContentItemAsync(contentName, TimeSpan.FromHours(RefreshIntervalHours)))?.ToString();\n+ var configString = (await _contentService.GetContentItemAsync(contentName, TimeSpan.FromMinutes(RefreshIntervalMinutes)))?.ToString();\nif (string.IsNullOrEmpty(configString))\n{\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -30,6 +30,12 @@ public void ObjectsHaveDefaultStateIfNotRefreshed()\nAssert.False(certificatesConfiguration.IsUIEnabledByDefault);\nAssert.Empty(certificatesConfiguration.AlwaysEnabledForDomains);\nAssert.Empty(certificatesConfiguration.AlwaysEnabledForEmailAddresses);\n+\n+ var symbolsConfiguration = service.SymbolsConfiguration as SymbolsConfiguration;\n+\n+ Assert.False(symbolsConfiguration.IsSymbolsUploadEnabledForAll);\n+ Assert.Empty(symbolsConfiguration.AlwaysEnabledForDomains);\n+ Assert.Empty(symbolsConfiguration.AlwaysEnabledForEmailAddresses);\n}\n[Fact]\n@@ -55,6 +61,12 @@ public async Task RefreshRefreshesObject()\nalwaysEnabledForEmailAddresses);\nvar certificatesJson = JsonConvert.SerializeObject(certificatesConfiguration);\n+ var symbolsConfiguration = new SymbolsConfiguration(\n+ isSymbolsUploadEnabledForAll: true,\n+ alwaysEnabledForDomains: alwaysEnabledForDomains,\n+ alwaysEnabledForEmailAddresses: alwaysEnabledForEmailAddresses);\n+ var symbolsJson = JsonConvert.SerializeObject(symbolsConfiguration);\n+\nvar contentService = GetMock<IContentService>();\ncontentService\n@@ -65,6 +77,10 @@ public async Task RefreshRefreshesObject()\n.Setup(x => x.GetContentItemAsync(Constants.ContentNames.CertificatesConfiguration, It.IsAny<TimeSpan>()))\n.Returns(Task.FromResult<IHtmlString>(new HtmlString(certificatesJson)));\n+ contentService\n+ .Setup(x => x.GetContentItemAsync(Constants.ContentNames.SymbolsConfiguration, It.IsAny<TimeSpan>()))\n+ .Returns(Task.FromResult<IHtmlString>(new HtmlString(symbolsJson)));\n+\nvar service = GetService<ContentObjectService>();\n// Act\n@@ -72,6 +88,7 @@ public async Task RefreshRefreshesObject()\nloginDiscontinuationConfiguration = service.LoginDiscontinuationConfiguration as LoginDiscontinuationConfiguration;\ncertificatesConfiguration = service.CertificatesConfiguration as CertificatesConfiguration;\n+ symbolsConfiguration = service.SymbolsConfiguration as SymbolsConfiguration;\n// Assert\nAssert.True(loginDiscontinuationConfiguration.DiscontinuedForEmailAddresses.SequenceEqual(emails));\n@@ -82,6 +99,10 @@ public async Task RefreshRefreshesObject()\nAssert.True(certificatesConfiguration.IsUIEnabledByDefault);\nAssert.Equal(alwaysEnabledForDomains, certificatesConfiguration.AlwaysEnabledForDomains);\nAssert.Equal(alwaysEnabledForEmailAddresses, certificatesConfiguration.AlwaysEnabledForEmailAddresses);\n+\n+ Assert.True(symbolsConfiguration.IsSymbolsUploadEnabledForAll);\n+ Assert.Equal(alwaysEnabledForDomains, symbolsConfiguration.AlwaysEnabledForDomains);\n+ Assert.Equal(alwaysEnabledForEmailAddresses, symbolsConfiguration.AlwaysEnabledForEmailAddresses);\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add symbols configuration (#6207)
|
455,776 |
26.07.2018 08:57:27
| 25,200 |
370d94eb1057d98ac1f0353c4c096c87cb05e77a
|
Fix Symbols-Configuration.json
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/Symbols-Configuration.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/Symbols-Configuration.json",
"diff": "\"isSymbolsUploadEnabledForAll\": false,\n\"alwaysEnabledForEmailAddresses\": [\n],\n- \"alwasyEnabledForDomains\": [\n+ \"alwaysEnabledForDomains\": [\n]\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix Symbols-Configuration.json (#6213)
|
455,736 |
26.07.2018 11:11:04
| 25,200 |
37ae0a49f7a92f6e7a2587d510d2ea4e90865346
|
Add information columns to Certificates table
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -373,6 +373,11 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.HasForeignKey(uc => uc.CertificateKey)\n.WillCascadeOnDelete(true); // Deleting a Certificate entity will also delete related UserCertificate entities.\n+ modelBuilder.Entity<Certificate>()\n+ .Property(pv => pv.Expiration)\n+ .IsOptional()\n+ .HasColumnType(\"datetime2\");\n+\nmodelBuilder.Entity<SymbolPackage>()\n.HasKey(s => s.Key);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201807261747084_AddCertificateDetails.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class AddCertificateDetails : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddCertificateDetails));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201807261747084_AddCertificateDetails\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201807261747084_AddCertificateDetails.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddCertificateDetails : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ AddColumn(\"dbo.Certificates\", \"Subject\", c => c.String());\n+ AddColumn(\"dbo.Certificates\", \"Issuer\", c => c.String());\n+ AddColumn(\"dbo.Certificates\", \"Expiration\", c => c.DateTime(precision: 7, storeType: \"datetime2\"));\n+ }\n+\n+ public override void Down()\n+ {\n+ DropColumn(\"dbo.Certificates\", \"Expiration\");\n+ DropColumn(\"dbo.Certificates\", \"Issuer\");\n+ DropColumn(\"dbo.Certificates\", \"Subject\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201807181816293_SymbolPackages.Designer.cs\">\n<DependentUpon>201807181816293_SymbolPackages.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201807261747084_AddCertificateDetails.cs\" />\n+ <Compile Include=\"Migrations\\201807261747084_AddCertificateDetails.Designer.cs\">\n+ <DependentUpon>201807261747084_AddCertificateDetails.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"RequestModels\\DeleteAccountRequest.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<EmbeddedResource Include=\"Migrations\\201807181816293_SymbolPackages.resx\">\n<DependentUpon>201807181816293_SymbolPackages.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201807261747084_AddCertificateDetails.resx\">\n+ <DependentUpon>201807261747084_AddCertificateDetails.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add information columns to Certificates table (#6214)
Progress on https://github.com/NuGet/NuGetGallery/issues/6183
|
455,736 |
30.07.2018 15:28:23
| 25,200 |
a92d27e042dde1c395b5ea0512f97f43404cf937
|
Add ShortSubject and ShortIssuer to Certificate entity
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Certificate.cs",
"new_path": "src/NuGetGallery.Core/Entities/Certificate.cs",
"diff": "@@ -33,10 +33,20 @@ public class Certificate : IEntity\npublic string Subject { get; set; }\n/// <summary>\n- /// The subject distinguished name of the certificate.\n+ /// The short subject of the certificate. In most cases, this is the CN attribute.\n+ /// </summary>\n+ public string ShortSubject { get; set; }\n+\n+ /// <summary>\n+ /// The issuer distinguished name of the certificate.\n/// </summary>\npublic string Issuer { get; set; }\n+ /// <summary>\n+ /// The short issuer of the certificate. In most cases, this is the CN attribute.\n+ /// </summary>\n+ public string ShortIssuer { get; set; }\n+\n/// <summary>\n/// The expiration date and time of the certificate.\n/// </summary>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201807302212501_AddShortCertificateNames.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class AddShortCertificateNames : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddShortCertificateNames));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201807302212501_AddShortCertificateNames\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201807302212501_AddShortCertificateNames.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddShortCertificateNames : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ AddColumn(\"dbo.Certificates\", \"ShortSubject\", c => c.String());\n+ AddColumn(\"dbo.Certificates\", \"ShortIssuer\", c => c.String());\n+ }\n+\n+ public override void Down()\n+ {\n+ DropColumn(\"dbo.Certificates\", \"ShortIssuer\");\n+ DropColumn(\"dbo.Certificates\", \"ShortSubject\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201807261747084_AddCertificateDetails.Designer.cs\">\n<DependentUpon>201807261747084_AddCertificateDetails.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201807302212501_AddShortCertificateNames.cs\" />\n+ <Compile Include=\"Migrations\\201807302212501_AddShortCertificateNames.Designer.cs\">\n+ <DependentUpon>201807302212501_AddShortCertificateNames.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"RequestModels\\DeleteAccountRequest.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<EmbeddedResource Include=\"Migrations\\201807261747084_AddCertificateDetails.resx\">\n<DependentUpon>201807261747084_AddCertificateDetails.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201807302212501_AddShortCertificateNames.resx\">\n+ <DependentUpon>201807302212501_AddShortCertificateNames.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add ShortSubject and ShortIssuer to Certificate entity (#6234)
Progress on https://github.com/NuGet/NuGetGallery/issues/6183
|
455,736 |
31.07.2018 16:46:17
| 25,200 |
9762ffd26f59c3b32db729a9d9109164ff3393a9
|
Assert package ID and version instead of file size
Address
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"diff": "<Reference Include=\"FluentLinkChecker\">\n<HintPath>..\\..\\packages\\FluentLinkChecker.1.0.0.10\\lib\\net40\\FluentLinkChecker.dll</HintPath>\n</Reference>\n- <Reference Include=\"Newtonsoft.Json\">\n- <HintPath>..\\..\\packages\\Newtonsoft.Json.7.0.1\\lib\\net45\\Newtonsoft.Json.dll</HintPath>\n+ <Reference Include=\"Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Newtonsoft.Json.9.0.1\\lib\\net45\\Newtonsoft.Json.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Common, Version=4.5.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Common.4.5.0\\lib\\net45\\NuGet.Common.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Frameworks, Version=4.5.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Frameworks.4.5.0\\lib\\net45\\NuGet.Frameworks.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Packaging, Version=4.5.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Packaging.4.5.0\\lib\\net45\\NuGet.Packaging.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Packaging.Core, Version=4.5.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Packaging.Core.4.5.0\\lib\\net45\\NuGet.Packaging.Core.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Versioning, Version=4.5.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Versioning.4.5.0\\lib\\net45\\NuGet.Versioning.dll</HintPath>\n</Reference>\n<Reference Include=\"System\" />\n<Reference Include=\"System.Core\" />\n<Reference Include=\"Microsoft.CSharp\" />\n+ <Reference Include=\"System.IO.Compression\" />\n<Reference Include=\"System.Net.Http\" />\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 Include=\"System.Xml\" />\n+ <Reference Include=\"System.Xml.Linq\" />\n<Reference Include=\"xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\xunit.abstractions.2.0.1\\lib\\net35\\xunit.abstractions.dll</HintPath>\n<Private>True</Private>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"diff": "using System.Net.Http;\nusing System.Threading;\nusing System.Threading.Tasks;\n+using NuGet.Packaging;\nusing Xunit;\nusing Xunit.Abstractions;\n@@ -77,12 +78,14 @@ public async Task DuplicatePushesAreRejectedAndNotDeleted()\nTestOutputHelper.WriteLine($\"Package download: HTTP {(int)response.StatusCode}\");\nAssert.Equal(HttpStatusCode.OK, response.StatusCode);\n- var expectedBytes = File.ReadAllBytes(packagePath);\n- var actualPackageBytes = await response.Content.ReadAsByteArrayAsync();\n- // The file length assertion is easier to read in the log.\n- Assert.Equal(expectedBytes.Length, actualPackageBytes.Length);\n- Assert.Equal(expectedBytes, actualPackageBytes);\n+ var actualPackageBytes = await response.Content.ReadAsByteArrayAsync();\n+ using (var stream = new MemoryStream(actualPackageBytes))\n+ using (var packageReader = new PackageArchiveReader(stream))\n+ {\n+ Assert.Equal(packageId, packageReader.NuspecReader.GetId());\n+ Assert.Equal(packageVersion, packageReader.NuspecReader.GetVersion().ToNormalizedString());\n+ }\n}\nAssert.Equal(1, statusCodes.Count(x => x == HttpStatusCode.Created));\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Assert package ID and version instead of file size (#6240)
Address https://github.com/NuGet/NuGetGallery/issues/6241
|
455,736 |
31.07.2018 10:09:22
| 25,200 |
5749f9c10a40fc803ad1fe9a595e15f0a12b67fd
|
Add gallery UI to display new certificate information
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -624,6 +624,10 @@ img.reserved-indicator-icon {\ndisplay: inline-block;\nwidth: 100%;\n}\n+.page-account-settings .expired-certificate {\n+ font-weight: bold;\n+ color: #a94442;\n+}\n.page-api-keys .example-commands {\npadding: 8px 10px;\nfont-family: Consolas, Menlo, Monaco, \"Courier New\", monospace;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-account-settings.less",
"new_path": "src/Bootstrap/less/theme/page-account-settings.less",
"diff": "display: inline-block;\nwidth: 100%;\n}\n+\n+ .expired-certificate {\n+ color: @state-danger-text;\n+ font-weight: bold;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "</div>\n}\n+@helper Alert(string htmlContent, string subclass, string icon, bool isAlertRole = false)\n+{\n+ @Alert(s => new HelperResult(t => t.Write(htmlContent)), subclass, icon, isAlertRole);\n+}\n+\n+@helper AlertInfo(string htmlContent, bool isAlertRole = false)\n+{\n+ @Alert(htmlContent, \"info\", \"Info\", isAlertRole)\n+}\n+\n@helper AlertInfo(Func<MvcHtmlString, HelperResult> htmlContent, bool isAlertRole = false)\n{\n@Alert(htmlContent, \"info\", \"Info\", isAlertRole)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/certificates.js",
"new_path": "src/NuGetGallery/Scripts/gallery/certificates.js",
"diff": "_model = {\ncertificates: ko.observableArray(data),\ndeleteCertificate: deleteCertificateAsync,\n+ hasMissingInfo: function () {\n+ var currentCertificates = this.certificates();\n+ for (var i = 0; i < currentCertificates.length; i++) {\n+ if (!currentCertificates[i].HasInfo) {\n+ return true;\n+ }\n+ }\n+ return false;\n+ },\nhasCertificates: function () {\nreturn this.certificates().length > 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListCertificateItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListCertificateItemViewModel.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using NuGetGallery.Helpers;\nnamespace NuGetGallery\n{\npublic sealed class ListCertificateItemViewModel\n{\n+ /// <summary>\n+ /// This value allows an abbreviated issuer and subject to show up on a single line in the web UI in the\n+ /// \"MD\" Bootstrap screen size. This is approximately the P75 of CN length on NuGet.org.\n+ /// </summary>\n+ private const int AbbreviationLength = 36;\n+\npublic string Sha1Thumbprint { get; }\n+ public bool HasInfo { get; }\n+ public bool IsExpired { get; }\n+ public string ExpirationDisplay { get; }\n+ public string ExpirationIso { get; }\n+ public string Subject { get; }\n+ public string Issuer { get; }\n+ public string ShortSubject { get; }\n+ public string ShortIssuer { get; }\npublic bool CanDelete { get; }\npublic string DeleteUrl { get; }\n@@ -19,6 +34,19 @@ public ListCertificateItemViewModel(Certificate certificate, string deleteUrl)\n}\nSha1Thumbprint = certificate.Sha1Thumbprint;\n+ HasInfo = certificate.Expiration.HasValue;\n+ if (certificate.Expiration.HasValue)\n+ {\n+ // The value stored in the database is assumed to be UTC.\n+ var expirationUtc = DateTime.SpecifyKind(certificate.Expiration.Value, DateTimeKind.Utc);\n+ IsExpired = expirationUtc < DateTime.UtcNow;\n+ ExpirationDisplay = expirationUtc.ToNuGetShortDateString();\n+ ExpirationIso = expirationUtc.ToString(\"O\");\n+ }\n+ Subject = certificate.Subject;\n+ Issuer = certificate.Issuer;\n+ ShortSubject = certificate.ShortSubject ?? certificate.Subject?.Abbreviate(AbbreviationLength);\n+ ShortIssuer = certificate.ShortIssuer ?? certificate.Issuer?.Abbreviate(AbbreviationLength);\nCanDelete = !string.IsNullOrEmpty(deleteUrl);\nDeleteUrl = deleteUrl;\n}\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- ViewBag.MdPageColumns = Constants.ColumnsFormMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "@InformAboutOrgSettingsPage()\n+ <!-- ko if: $data.hasMissingInfo() -->\n+ @ViewHelpers.AlertInfo(\"The certificate details will be available when you push a package signed by the registered certificate(s).\")\n+ <!-- /ko -->\n+\n<div class=\"row\" data-bind=\"ifnot: $data && $data.hasCertificates && $data.hasCertificates()\">\n<div class=\"col-xs-12 clearfix\">\nAll your packages need to be signed by one of the registered certificates. <a href=\"https://docs.microsoft.com/en-us/nuget/reference/signed-packages-reference\">Learn more about package signing.</a>\n<thead>\n<tr class=\"manage-certificate-headings\">\n<th>Fingerprint</th>\n+ <th>Subject</th>\n+ <th>Expiration</th>\n+ <th>Issuer</th>\n<th><span class=\"hidden\">Icon</span></th>\n</tr>\n</thead>\n<tbody data-bind=\"foreach: $data.certificates\">\n<tr class=\"manage-certificate-listing\" role=\"listitem\">\n- <td class=\"align-middle\" data-bind=\"text: Sha1Thumbprint\"></td>\n+ <td data-bind=\"text: Sha1Thumbprint\"></td>\n+ <td data-bind=\"text: ShortSubject, attr: { title: Subject }\"></td>\n+ <td data-bind=\"text: ExpirationDisplay, attr: {\n+ title: IsExpired ? 'This certificate\\'s expiration date is in the past. Future packages signed with this certificate will fail validation. Upload a renewed certificate to enable signed package uploads.' : ExpirationIso,\n+ class: IsExpired ? 'expired-certificate' : ''\n+ }\">\n+ </td>\n+ <td data-bind=\"text: ShortIssuer, attr: { title: Issuer }\"></td>\n<td class=\"text-right align-middle package-controls\">\n<span data-bind=\"visible: CanDelete\">\n<a class=\"btn\" title=\"Delete certificate\" tabindex=\"0\" data-bind=\"attr: { 'data-href': DeleteUrl, 'aria-label': 'Delete certificate' }, click: $parent.deleteCertificate\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "@using NuGetGallery.Authentication\n@{\nViewBag.Title = \"API Keys\";\n- ViewBag.MdPageColumns = Constants.ColumnsFormMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add gallery UI to display new certificate information (#6238)
Progress on https://github.com/NuGet/NuGetGallery/issues/6183.
|
455,782 |
02.08.2018 13:32:56
| 25,200 |
2e99a8507d02cba4bc7b76878c2ebeeee1be2e32
|
Use (short) version string in package version history
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "+\n@using NuGet.Services.Validation;\n@model DisplayPackageViewModel\n<td>\n<a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.FullVersion\">\n<b>\n- @packageVersion.FullVersion.Abbreviate(30)\n+ @packageVersion.Version.Abbreviate(30)\n@if (packageVersion.IsCurrent(Model))\n{\n@:(current)\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"deleted\">\n<td class=\"version\" colspan=\"2\">\n- @packageVersion.FullVersion (deleted)\n+ @packageVersion.Version (deleted)\n</td>\n<td>\n@packageVersion.DownloadCount\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Use (short) version string in package version history (#6159)
|
455,776 |
02.08.2018 14:40:55
| 25,200 |
7f6ba8371c2aad0e6633c82fdb85c163eb58ed27
|
CSS changes for status page for to status from serialized ServiceStatus JSON blob
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1491,8 +1491,8 @@ img.reserved-indicator-icon {\n.page-status .status-degraded .ms-Icon {\ncolor: orange;\n}\n-.page-status .latest-updates + p {\n- margin-top: 24px;\n+.page-status .update {\n+ margin-bottom: 24px;\n}\n.page-status .ms-Icon {\nmargin-right: 10px;\n@@ -1547,6 +1547,15 @@ img.reserved-indicator-icon {\n.page-status .table tbody + tbody {\nborder: none;\n}\n+.page-status textarea {\n+ min-width: 100%;\n+}\n+.page-status input[type='checkbox'] {\n+ margin-right: 15px;\n+}\n+.page-status a .ms-Icon {\n+ font-size: .6em;\n+}\n.page-transform-account .transform-alert {\nmargin-bottom: 33px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-status.less",
"new_path": "src/Bootstrap/less/theme/page-status.less",
"diff": "}\n}\n- .latest-updates + p {\n- margin-top: @status-general-margin-bottom;\n+ .update {\n+ margin-bottom: @status-general-margin-bottom;\n}\n.ms-Icon {\nborder: none;\n}\n}\n+\n+ textarea {\n+ min-width: 100%;\n+ }\n+\n+ input[type='checkbox'] {\n+ margin-right: 15px;\n+ }\n+\n+ a .ms-Icon {\n+ font-size: .6em;\n+ }\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
CSS changes for status page for to status from serialized ServiceStatus JSON blob (#6205)
|
455,756 |
02.08.2018 15:17:10
| 25,200 |
b5be954e335f87fdcfe59dfa5d4905a9693830c6
|
Fix owner info missing issue
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "title=\"@Strings.ReservedNamespace_ReservedIndicatorTooltip\"/>\n}\n+ @if (Model.Owners != null && Model.Owners.Any())\n+ {\n<span class=\"package-by\">\nby:\n@foreach (var owner in Model.Owners)\n<a href=\"@Url.User(owner)\" title=\"View @owner.Username's profile\">@owner.Username</a>\n}\n</span>\n+ }\n</div>\n@if (!StringComparer.OrdinalIgnoreCase.Equals(Model.Id, Model.Title))\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix owner info missing issue (#6257)
|
455,747 |
03.08.2018 16:37:27
| 25,200 |
e52830c111da67a6d32c654c193258b096ff1f68
|
Add no-op migration
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201808032317064_FixSymbolCreatedColumnEFIssue.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class FixSymbolCreatedColumnEFIssue : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(FixSymbolCreatedColumnEFIssue));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201808032317064_FixSymbolCreatedColumnEFIssue\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201808032317064_FixSymbolCreatedColumnEFIssue.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class FixSymbolCreatedColumnEFIssue : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ AlterColumn(\"dbo.SymbolPackages\", \"Created\", c => c.DateTime(nullable: false));\n+ }\n+\n+ public override void Down()\n+ {\n+ AlterColumn(\"dbo.SymbolPackages\", \"Created\", c => c.DateTime(nullable: false));\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201808010014291_AddRepositoryType.Designer.cs\">\n<DependentUpon>201808010014291_AddRepositoryType.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201808032317064_FixSymbolCreatedColumnEFIssue.cs\" />\n+ <Compile Include=\"Migrations\\201808032317064_FixSymbolCreatedColumnEFIssue.Designer.cs\">\n+ <DependentUpon>201808032317064_FixSymbolCreatedColumnEFIssue.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"RequestModels\\DeleteAccountRequest.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.cs\" />\n<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<EmbeddedResource Include=\"Migrations\\201808010014291_AddRepositoryType.resx\">\n<DependentUpon>201808010014291_AddRepositoryType.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201808032317064_FixSymbolCreatedColumnEFIssue.resx\">\n+ <DependentUpon>201808032317064_FixSymbolCreatedColumnEFIssue.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add no-op migration (#6263)
|
455,759 |
07.08.2018 18:48:19
| -7,200 |
af207870d7c60a5262a41325e2cd951ab1086bdc
|
Added package compliance policy checks when uploading through NuGet.org UI
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1619,6 +1619,16 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nreturn Json(HttpStatusCode.BadRequest, new[] { ex.Message });\n}\n+ var packagePolicyResult = await _securityPolicyService.EvaluatePackagePoliciesAsync(\n+ SecurityPolicyAction.PackagePush,\n+ HttpContext,\n+ package);\n+\n+ if (!packagePolicyResult.Success)\n+ {\n+ return Json(HttpStatusCode.BadRequest, new[] { packagePolicyResult.ErrorMessage });\n+ }\n+\n// Perform validations that require the package already being in the entity context.\nvar afterValidationResult = await _packageUploadService.ValidateAfterGeneratePackageAsync(\npackage,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -96,7 +96,13 @@ public class PackagesControllerFacts\ntelemetryService = telemetryService ?? new Mock<ITelemetryService>();\n- securityPolicyService = securityPolicyService ?? new Mock<ISecurityPolicyService>();\n+ if (securityPolicyService == null)\n+ {\n+ securityPolicyService = new Mock<ISecurityPolicyService>();\n+ securityPolicyService\n+ .Setup(m => m.EvaluatePackagePoliciesAsync(SecurityPolicyAction.PackagePush, It.IsAny<HttpContextBase>(), It.IsAny<Package>()))\n+ .ReturnsAsync(SecurityPolicyResult.SuccessResult);\n+ }\nif (reservedNamespaceService == null)\n{\n@@ -4620,6 +4626,61 @@ public Task WillNotCreateThePackageIfCurrentUserDoesNotHavePermissionsToUploadOn\nexpectedMessage: message);\n}\n+ [Fact]\n+ public async Task WillShowTheValidationMessageWhenPackageSecurityPolicyCreatesErrorMessage()\n+ {\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ using (var fakeFileStream = new MemoryStream())\n+ {\n+ var expectedMessage = \"The package is just bad.\";\n+\n+ fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));\n+ fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));\n+ var fakePackageUploadService = GetValidPackageUploadService(PackageId, PackageVersion);\n+ fakePackageUploadService\n+ .Setup(x => x.ValidateAfterGeneratePackageAsync(\n+ It.IsAny<Package>(),\n+ It.IsAny<PackageArchiveReader>(),\n+ It.IsAny<User>(),\n+ It.IsAny<User>()))\n+ .ReturnsAsync(PackageValidationResult.Accepted);\n+ var fakeNuGetPackage = TestPackage.CreateTestPackageStream(PackageId, PackageVersion);\n+\n+ var fakeUserService = new Mock<IUserService>();\n+ fakeUserService.Setup(x => x.FindByUsername(TestUtility.FakeUser.Username, false)).Returns(TestUtility.FakeUser);\n+\n+ var securityPolicyService = new Mock<ISecurityPolicyService>();\n+ securityPolicyService\n+ .Setup(m => m.EvaluatePackagePoliciesAsync(SecurityPolicyAction.PackagePush, It.IsAny<HttpContextBase>(), It.IsAny<Package>()))\n+ .ReturnsAsync(SecurityPolicyResult.CreateErrorResult(expectedMessage));\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageUploadService: fakePackageUploadService,\n+ uploadFileService: fakeUploadFileService,\n+ fakeNuGetPackage: fakeNuGetPackage,\n+ userService: fakeUserService,\n+ securityPolicyService: securityPolicyService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Owner = TestUtility.FakeUser.Username });\n+\n+ fakePackageUploadService.Verify(\n+ x => x.GeneratePackageAsync(\n+ It.IsAny<string>(),\n+ It.IsAny<PackageArchiveReader>(),\n+ It.IsAny<PackageStreamMetadata>(),\n+ It.IsAny<User>(),\n+ It.IsAny<User>()),\n+ Times.Once);\n+\n+ var jsonResult = Assert.IsType<JsonResult>(result);\n+ Assert.Equal((int)HttpStatusCode.BadRequest, controller.Response.StatusCode);\n+ var message = (jsonResult.Data as string[])[0];\n+ Assert.Equal(expectedMessage, message);\n+ }\n+ }\n+\n[Theory]\n[InlineData(PackageValidationResultType.Invalid)]\n[InlineData(PackageValidationResultType.PackageShouldNotBeSigned)]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Added package compliance policy checks when uploading through NuGet.org UI (#6272)
|
455,759 |
07.08.2018 21:05:38
| -7,200 |
fdeb46a59871a68fae5ffe458f46a9a60712b0c4
|
Admin should have permissions to manage certificates for an org
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionsRequiringPermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionsRequiringPermissions.cs",
"diff": "@@ -120,7 +120,7 @@ public static class ActionsRequiringPermissions\n/// </summary>\npublic static ActionRequiringAccountPermissions ManageAccount =\nnew ActionRequiringAccountPermissions(\n- accountPermissionsRequirement: RequireOwnerOrOrganizationAdmin);\n+ accountPermissionsRequirement: RequireOwnerOrSiteAdminOrOrganizationAdmin);\n/// <summary>\n/// The action of managing an organization's memberships.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -48,17 +48,16 @@ public static IEnumerable<object[]> AllowedCurrentUsers_Data\n// Note general account tests are in the base class. Organization-specific tests are below.\n- public static IEnumerable<object[]> WithNonOrganizationAdmin_ReturnsPartialPermissions_Data\n+ public static IEnumerable<object[]> WithNonOrganizationOrSiteAdmin_ReturnsPartialPermissions_Data\n{\nget\n{\n- yield return MemberDataHelper.AsData(_getFakesSiteAdmin, false, true);\nyield return MemberDataHelper.AsData(_getFakesOrganizationCollaborator, false, false);\n}\n}\n[Theory]\n- [MemberData(nameof(WithNonOrganizationAdmin_ReturnsPartialPermissions_Data))]\n+ [MemberData(nameof(WithNonOrganizationOrSiteAdmin_ReturnsPartialPermissions_Data))]\npublic void WithNonOrganizationAdmin_ReturnsPartialPermissions(Func<Fakes, User> getCurrentUser, bool canManage, bool canManageMemberships)\n{\n// Arrange\n@@ -88,19 +87,18 @@ public static IEnumerable<object[]> AllowedCurrentUsers_Data\n// Note general account tests are in the base class. Organization-specific tests are below.\n- public static IEnumerable<object[]> WithNonOrganizationAdmin_ReturnsForbidden_Data\n+ public static IEnumerable<object[]> WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data\n{\nget\n{\nyield return MemberDataHelper.AsData(_getFakesUser);\n- yield return MemberDataHelper.AsData(_getFakesSiteAdmin);\nyield return MemberDataHelper.AsData(_getFakesOrganizationCollaborator);\n}\n}\n[Theory]\n- [MemberData(nameof(WithNonOrganizationAdmin_ReturnsForbidden_Data))]\n- public async Task WithNonOrganizationAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n+ [MemberData(nameof(WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data))]\n+ public async Task WithNonOrganizationOrSiteAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar controller = GetController();\n@@ -127,19 +125,18 @@ public static IEnumerable<object[]> AllowedCurrentUsers_Data\n// Note general account tests are in the base class. Organization-specific tests are below.\n- public static IEnumerable<object[]> WithNonOrganizationAdmin_ReturnsForbidden_Data\n+ public static IEnumerable<object[]> WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data\n{\nget\n{\nyield return MemberDataHelper.AsData(_getFakesUser);\n- yield return MemberDataHelper.AsData(_getFakesSiteAdmin);\nyield return MemberDataHelper.AsData(_getFakesOrganizationCollaborator);\n}\n}\n[Theory]\n- [MemberData(nameof(WithNonOrganizationAdmin_ReturnsForbidden_Data))]\n- public async Task WithNonOrganizationAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n+ [MemberData(nameof(WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data))]\n+ public async Task WithNonOrganizationOrSiteAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar controller = GetController();\n@@ -168,19 +165,18 @@ public static IEnumerable<object[]> AllowedCurrentUsers_Data\n// Note general account tests are in the base class. Organization-specific tests are below.\n- public static IEnumerable<object[]> WithNonOrganizationAdmin_ReturnsForbidden_Data\n+ public static IEnumerable<object[]> WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data\n{\nget\n{\nyield return MemberDataHelper.AsData(_getFakesUser);\n- yield return MemberDataHelper.AsData(_getFakesSiteAdmin);\nyield return MemberDataHelper.AsData(_getFakesOrganizationCollaborator);\n}\n}\n[Theory]\n- [MemberData(nameof(WithNonOrganizationAdmin_ReturnsForbidden_Data))]\n- public async Task WithNonOrganizationAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n+ [MemberData(nameof(WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data))]\n+ public async Task WithNonOrganizationOrSiteAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar controller = GetController();\n@@ -206,19 +202,18 @@ public static IEnumerable<object[]> AllowedCurrentUsers_Data\n// Note general account tests are in the base class. Organization-specific tests are below.\n- public static IEnumerable<object[]> WithNonOrganizationAdmin_ReturnsForbidden_Data\n+ public static IEnumerable<object[]> WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data\n{\nget\n{\nyield return MemberDataHelper.AsData(_getFakesUser);\n- yield return MemberDataHelper.AsData(_getFakesSiteAdmin);\nyield return MemberDataHelper.AsData(_getFakesOrganizationCollaborator);\n}\n}\n[Theory]\n- [MemberData(nameof(WithNonOrganizationAdmin_ReturnsForbidden_Data))]\n- public void WithNonOrganizationAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n+ [MemberData(nameof(WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data))]\n+ public void WithNonOrganizationOrSiteAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar controller = GetController();\n@@ -245,19 +240,18 @@ public static IEnumerable<object[]> AllowedCurrentUsers_Data\n// Note general account tests are in the base class. Organization-specific tests are below.\n- public static IEnumerable<object[]> WithNonOrganizationAdmin_ReturnsForbidden_Data\n+ public static IEnumerable<object[]> WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data\n{\nget\n{\nyield return MemberDataHelper.AsData(_getFakesUser);\n- yield return MemberDataHelper.AsData(_getFakesSiteAdmin);\nyield return MemberDataHelper.AsData(_getFakesOrganizationCollaborator);\n}\n}\n[Theory]\n- [MemberData(nameof(WithNonOrganizationAdmin_ReturnsForbidden_Data))]\n- public async Task WithNonOrganizationAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n+ [MemberData(nameof(WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data))]\n+ public async Task WithNonOrganizationOrSiteAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar controller = GetController();\n@@ -284,19 +278,18 @@ public static IEnumerable<object[]> AllowedCurrentUsers_Data\n// Note general account tests are in the base class. Organization-specific tests are below.\n- public static IEnumerable<object[]> WithNonOrganizationAdmin_ReturnsForbidden_Data\n+ public static IEnumerable<object[]> WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data\n{\nget\n{\nyield return MemberDataHelper.AsData(_getFakesUser);\n- yield return MemberDataHelper.AsData(_getFakesSiteAdmin);\nyield return MemberDataHelper.AsData(_getFakesOrganizationCollaborator);\n}\n}\n[Theory]\n- [MemberData(nameof(WithNonOrganizationAdmin_ReturnsForbidden_Data))]\n- public async Task WithNonOrganizationAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n+ [MemberData(nameof(WithNonOrganizationOrSiteAdmin_ReturnsForbidden_Data))]\n+ public async Task WithNonOrganizationOrSiteAdmin_ReturnsForbidden(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar controller = GetController();\n@@ -1194,7 +1187,6 @@ public static IEnumerable<object[]> IfNotAdministrator_ReturnsNotFound_Data\nget\n{\nyield return MemberDataHelper.AsData(new Func<Fakes, User>(fakes => fakes.User));\n- yield return MemberDataHelper.AsData(new Func<Fakes, User>(fakes => fakes.Admin));\nyield return MemberDataHelper.AsData(new Func<Fakes, User>(fakes => fakes.OrganizationCollaborator));\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Admin should have permissions to manage certificates for an org (#6274)
|
455,782 |
07.08.2018 13:39:59
| 25,200 |
d1610bbcbe48e5e21a8a81ad7d47814cc493051d
|
Fix logging exceptions from background thread
The previous code would try to resolve a service from DI in a background thread without a HttpContext, and Autofac would throw an exception. So, pass the required service to the background thread when it can be resolved.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/BackgroundMessageService.cs",
"new_path": "src/NuGetGallery/Services/BackgroundMessageService.cs",
"diff": "using System.Net.Mail;\nusing System.Threading.Tasks;\nusing AnglicanGeek.MarkdownMailer;\n+using Elmah;\nusing NuGetGallery.Configuration;\nnamespace NuGetGallery.Services\n{\npublic class BackgroundMessageService : MessageService\n{\n- public BackgroundMessageService(IMailSender mailSender, IAppConfiguration config, ITelemetryService telemetryService)\n+ public BackgroundMessageService(IMailSender mailSender, IAppConfiguration config, ITelemetryService telemetryService, ErrorLog errorLog)\n:base(mailSender, config, telemetryService)\n{\n+ this.errorLog = errorLog;\n}\n+ private ErrorLog errorLog;\n+\nprotected override Task SendMessageAsync(MailMessage mailMessage)\n{\n// Send email as background task, as we don't want to delay the HTTP response.\n@@ -34,7 +38,7 @@ protected override Task SendMessageAsync(MailMessage mailMessage)\ncatch (Exception ex)\n{\n// Log but swallow the exception.\n- QuietLog.LogHandledException(ex);\n+ QuietLog.LogHandledException(ex, errorLog);\n}\nfinally\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/QuietLog.cs",
"new_path": "src/NuGetGallery/Telemetry/QuietLog.cs",
"diff": "@@ -38,6 +38,31 @@ public static void LogHandledException(Exception e)\n}\n}\n+ public static void LogHandledException(Exception e, ErrorLog errorLog)\n+ {\n+ var aggregateExceptionId = Guid.NewGuid().ToString();\n+\n+ var aggregateException = e as AggregateException;\n+ if (aggregateException != null)\n+ {\n+ LogHandledExceptionCore(aggregateException, aggregateExceptionId, errorLog);\n+\n+ foreach (var innerException in aggregateException.InnerExceptions)\n+ {\n+ LogHandledExceptionCore(innerException, aggregateExceptionId, errorLog);\n+ }\n+ }\n+ else\n+ {\n+ LogHandledExceptionCore(e, aggregateExceptionId, errorLog);\n+\n+ if (e.InnerException != null)\n+ {\n+ LogHandledExceptionCore(e.InnerException, aggregateExceptionId, errorLog);\n+ }\n+ }\n+ }\n+\nprivate static void LogHandledExceptionCore(Exception e, string aggregateExceptionId)\n{\ntry\n@@ -65,6 +90,24 @@ private static void LogHandledExceptionCore(Exception e, string aggregateExcepti\n}\n}\n+ private static void LogHandledExceptionCore(Exception e, string aggregateExceptionId, ErrorLog errorLog)\n+ {\n+ try\n+ {\n+ errorLog.Log(new Error(e));\n+\n+ // send exception to AppInsights\n+ Telemetry.TrackException(e, new Dictionary<string, string>\n+ {\n+ { \"aggregateExceptionId\", aggregateExceptionId }\n+ });\n+ }\n+ catch\n+ {\n+ // logging failed, don't allow exception to escape\n+ }\n+ }\n+\ninternal static bool IsPIIRoute(RouteData route, out string operation)\n{\nif(route == null)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix logging exceptions from background thread (#6273)
The previous code would try to resolve a service from DI in a background thread without a HttpContext, and Autofac would throw an exception. So, pass the required service to the background thread when it can be resolved.
|
455,782 |
07.08.2018 15:25:35
| 25,200 |
e60e75fcab128094aa8aa0410a17ffc57bddf4bd
|
Don't throw when SmtpUri is not set
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "@@ -22,7 +22,7 @@ public MessageService(IMailSender mailSender, IAppConfiguration config, ITelemet\n: base(mailSender, config)\n{\nthis.telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n- smtpUri = config.SmtpUri?.Host ?? throw new ArgumentNullException(nameof(config) + \".\" + nameof(config.SmtpUri));\n+ smtpUri = config.SmtpUri?.Host;\n}\nprivate readonly ITelemetryService telemetryService;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Don't throw when SmtpUri is not set (#6278)
|
455,736 |
07.08.2018 17:03:10
| 25,200 |
f507de0d6b261477eb0580afda909939b90c43b1
|
Collapse multi-line reason phrases in HttpStatusCodeWithBodyResult
Address
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -590,13 +590,13 @@ public async Task CreatePackage_Returns400IfPackageSecurityPolicyFails()\n.Returns(new ApiScopeEvaluationResult(owner, PermissionsCheckResult.Allowed, scopesAreValid: true));\ncontroller.MockSecurityPolicyService.Setup(s => s.EvaluatePackagePoliciesAsync(It.IsAny<SecurityPolicyAction>(), It.IsAny<HttpContextBase>(), It.IsAny<Package>()))\n- .Returns(Task.FromResult(SecurityPolicyResult.CreateErrorResult(\"Package not compliant.\")));\n+ .Returns(Task.FromResult(SecurityPolicyResult.CreateErrorResult(\"Package not compliant.\\n\\rFix your package!\")));\n// Act\nvar result = await controller.CreatePackagePut();\n// Assert\n- ResultAssert.IsStatusCode(result, HttpStatusCode.BadRequest, \"Package not compliant.\");\n+ ResultAssert.IsStatusCode(result, HttpStatusCode.BadRequest, \"Package not compliant. Fix your package!\");\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Helpers\\HtmlExtensionsFacts.cs\" />\n<Compile Include=\"HttpContextBaseExtensionsFacts.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\Base32EncoderTests.cs\" />\n+ <Compile Include=\"Infrastructure\\HttpStatusCodeWithBodyResultFacts.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\ExternalSearchServiceFacts.cs\" />\n<Compile Include=\"Security\\ControlRequiredSignerPolicyFacts.cs\" />\n<Compile Include=\"Security\\AutomaticallyOverwriteRequiredSignerPolicyFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Collapse multi-line reason phrases in HttpStatusCodeWithBodyResult (#6280)
Address https://github.com/NuGet/NuGetGallery/issues/6279
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.