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,794 |
24.01.2018 15:36:08
| 28,800 |
dcbf0ea3887f8bf9de44464435c9d4408e7c2edc
|
Bug bash: fix transform issues
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -106,8 +106,7 @@ public virtual ActionResult Account()\npublic virtual ActionResult TransformToOrganization()\n{\nvar accountToTransform = GetCurrentUser();\n- string errorReason;\n- if (!_userService.CanTransformUserToOrganization(accountToTransform, out errorReason))\n+ if (!_userService.CanTransformUserToOrganization(accountToTransform, out var errorReason))\n{\nreturn TransformToOrganizationFailed(errorReason);\n}\n@@ -115,8 +114,8 @@ public virtual ActionResult TransformToOrganization()\nvar transformRequest = accountToTransform.OrganizationMigrationRequest;\nif (transformRequest != null)\n{\n- TempData[\"Message\"] = String.Format(CultureInfo.CurrentCulture, Strings.TransformAccount_RequestExists,\n- transformRequest.RequestDate.ToNuGetShortDateString(), transformRequest.AdminUser.Username);\n+ TempData[\"Message\"] = String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_RequestExists, transformRequest.AdminUser.Username);\n}\nreturn View(new TransformAccountViewModel());\n@@ -129,11 +128,6 @@ public virtual ActionResult TransformToOrganization()\npublic virtual async Task<ActionResult> TransformToOrganization(TransformAccountViewModel transformViewModel)\n{\nvar accountToTransform = GetCurrentUser();\n- string errorReason;\n- if (!_userService.CanTransformUserToOrganization(accountToTransform, out errorReason))\n- {\n- return TransformToOrganizationFailed(errorReason);\n- }\nvar adminUser = _userService.FindByUsername(transformViewModel.AdminUsername);\nif (adminUser == null)\n@@ -143,10 +137,9 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\nreturn View(transformViewModel);\n}\n- if (!adminUser.Confirmed)\n+ if (!_userService.CanTransformUserToOrganization(accountToTransform, adminUser, out var errorReason))\n{\n- ModelState.AddModelError(\"AdminUsername\", Strings.TransformAccount_AdminAccountNotConfirmed);\n- return View(transformViewModel);\n+ return TransformToOrganizationFailed(errorReason);\n}\nawait _userService.RequestTransformToOrganizationAccount(accountToTransform, adminUser);\n@@ -166,10 +159,6 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\npublic virtual async Task<ActionResult> ConfirmTransformToOrganization(string accountNameToTransform, string token)\n{\nvar adminUser = GetCurrentUser();\n- if (!adminUser.Confirmed)\n- {\n- return TransformToOrganizationFailed(Strings.TransformAccount_NotConfirmed);\n- }\nstring errorReason;\nvar accountToTransform = _userService.FindByUsername(accountNameToTransform);\n@@ -180,15 +169,14 @@ public virtual async Task<ActionResult> ConfirmTransformToOrganization(string ac\nreturn TransformToOrganizationFailed(errorReason);\n}\n- if (!_userService.CanTransformUserToOrganization(accountToTransform, out errorReason))\n+ if (!_userService.CanTransformUserToOrganization(accountToTransform, adminUser, out errorReason))\n{\nreturn TransformToOrganizationFailed(errorReason);\n}\nif (!await _userService.TransformUserToOrganization(accountToTransform, adminUser, token))\n{\n- errorReason = String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_Failed, accountNameToTransform);\n+ errorReason = Strings.TransformAccount_Failed;\nreturn TransformToOrganizationFailed(errorReason);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IUserService.cs",
"new_path": "src/NuGetGallery/Services/IUserService.cs",
"diff": "@@ -30,6 +30,8 @@ public interface IUserService\nbool CanTransformUserToOrganization(User accountToTransform, out string errorReason);\n+ bool CanTransformUserToOrganization(User accountToTransform, User adminUser, out string errorReason);\n+\nTask RequestTransformToOrganizationAccount(User accountToTransform, User adminUser);\nTask<bool> TransformUserToOrganization(User accountToTransform, User adminUser, string token);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -192,17 +192,16 @@ public bool CanTransformUserToOrganization(User accountToTransform, out string e\nif (!accountToTransform.Confirmed)\n{\nerrorReason = String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_FailedReasonNotConfirmedUser, accountToTransform.Username);\n+ Strings.TransformAccount_AccountNotConfirmed, accountToTransform.Username);\n}\nelse if (accountToTransform is Organization)\n{\nerrorReason = String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_FailedReasonIsOrganization, accountToTransform.Username);\n+ Strings.TransformAccount_AccountIsAnOrganization, accountToTransform.Username);\n}\nelse if (accountToTransform.Organizations.Any() || accountToTransform.OrganizationRequests.Any())\n{\n- errorReason = String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_FailedReasonHasMemberships, accountToTransform.Username);\n+ errorReason = Strings.TransformAccount_AccountHasMemberships;\n}\nelse if (enabledDomains == null ||\n!enabledDomains.Contains(accountToTransform.ToMailAddress().Host, StringComparer.OrdinalIgnoreCase))\n@@ -214,6 +213,32 @@ public bool CanTransformUserToOrganization(User accountToTransform, out string e\nreturn errorReason == null;\n}\n+ public bool CanTransformUserToOrganization(User accountToTransform, User adminUser, out string errorReason)\n+ {\n+ if (!CanTransformUserToOrganization(accountToTransform, out errorReason))\n+ {\n+ return false;\n+ }\n+\n+ if (adminUser.MatchesUser(accountToTransform))\n+ {\n+ errorReason = String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_AdminMustBeDifferentAccount, adminUser.Username);\n+ }\n+ else if (!adminUser.Confirmed)\n+ {\n+ errorReason = String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_AdminAccountNotConfirmed, adminUser.Username);\n+ }\n+ else if (adminUser is Organization)\n+ {\n+ errorReason = String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_AdminAccountIsOrganization, adminUser.Username);\n+ }\n+\n+ return errorReason == null;\n+ }\n+\npublic async Task<bool> TransformUserToOrganization(User accountToTransform, User adminUser, string token)\n{\n// todo: check for tenantId and add organization policy to enforce this (future work, with manage organization)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1408,74 +1408,83 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Administrator account '{0}' does not exist..\n+ /// Looks up a localized string similar to You are a member of one or more organizations. You must leave all organizations before transforming your account..\n/// </summary>\n- public static string TransformAccount_AdminAccountDoesNotExist {\n+ public static string TransformAccount_AccountHasMemberships {\nget {\n- return ResourceManager.GetString(\"TransformAccount_AdminAccountDoesNotExist\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_AccountHasMemberships\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to Administrator account '{0}' has not confirmed their email address..\n+ /// Looks up a localized string similar to Account '{0}' is already an organization..\n/// </summary>\n- public static string TransformAccount_AdminAccountNotConfirmed {\n+ public static string TransformAccount_AccountIsAnOrganization {\nget {\n- return ResourceManager.GetString(\"TransformAccount_AdminAccountNotConfirmed\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_AccountIsAnOrganization\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to Unexpected error when transforming account '{0}'. Contact support@nuget.org for more details..\n+ /// Looks up a localized string similar to Account '{0}' should be a confirmed user..\n/// </summary>\n- public static string TransformAccount_Failed {\n+ public static string TransformAccount_AccountNotConfirmed {\nget {\n- return ResourceManager.GetString(\"TransformAccount_Failed\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_AccountNotConfirmed\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to Account '{0}' should not belong to any organizations..\n+ /// Looks up a localized string similar to Administrator account '{0}' does not exist..\n/// </summary>\n- public static string TransformAccount_FailedReasonHasMemberships {\n+ public static string TransformAccount_AdminAccountDoesNotExist {\nget {\n- return ResourceManager.GetString(\"TransformAccount_FailedReasonHasMemberships\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_AdminAccountDoesNotExist\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to Account '{0}' is already an organization..\n+ /// Looks up a localized string similar to Administrator account '{0}' cannot be an organization..\n/// </summary>\n- public static string TransformAccount_FailedReasonIsOrganization {\n+ public static string TransformAccount_AdminAccountIsOrganization {\nget {\n- return ResourceManager.GetString(\"TransformAccount_FailedReasonIsOrganization\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_AdminAccountIsOrganization\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to Account '{0}' should be a confirmed user..\n+ /// Looks up a localized string similar to Administrator account '{0}' has not confirmed their email address..\n/// </summary>\n- public static string TransformAccount_FailedReasonNotConfirmedUser {\n+ public static string TransformAccount_AdminAccountNotConfirmed {\nget {\n- return ResourceManager.GetString(\"TransformAccount_FailedReasonNotConfirmedUser\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_AdminAccountNotConfirmed\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to Account '{0}' does not support organizations..\n+ /// Looks up a localized string similar to Administrator account '{0}' cannot be the same account as the one being transformed..\n/// </summary>\n- public static string TransformAccount_FailedReasonNotInDomainWhitelist {\n+ public static string TransformAccount_AdminMustBeDifferentAccount {\nget {\n- return ResourceManager.GetString(\"TransformAccount_FailedReasonNotInDomainWhitelist\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_AdminMustBeDifferentAccount\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to An unexpected error occurred while transforming this account. Contact support for assistance..\n+ /// </summary>\n+ public static string TransformAccount_Failed {\n+ get {\n+ return ResourceManager.GetString(\"TransformAccount_Failed\", resourceCulture);\n}\n}\n/// <summary>\n- /// Looks up a localized string similar to You must confirm the email address for this account in order to complete this request..\n+ /// Looks up a localized string similar to Account '{0}' does not support organizations..\n/// </summary>\n- public static string TransformAccount_NotConfirmed {\n+ public static string TransformAccount_FailedReasonNotInDomainWhitelist {\nget {\n- return ResourceManager.GetString(\"TransformAccount_NotConfirmed\", resourceCulture);\n+ return ResourceManager.GetString(\"TransformAccount_FailedReasonNotInDomainWhitelist\", resourceCulture);\n}\n}\n@@ -1489,7 +1498,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Another tranform request was created on {0} for administrator '{1}'. Note that a new request will overwrite this request..\n+ /// Looks up a localized string similar to A transform request, with account '{0}' as administrator, is in progress. A new request will override any existing request(s)..\n/// </summary>\npublic static string TransformAccount_RequestExists {\nget {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -703,11 +703,8 @@ For more information, please contact '{2}'.</value>\n<data name=\"VerifyPackage_UserNonExistent\" xml:space=\"preserve\">\n<value>The user '{0}' doesn't exist. You cannot upload a package as a user that doesn't exist.</value>\n</data>\n- <data name=\"TransformAccount_NotConfirmed\" xml:space=\"preserve\">\n- <value>You must confirm the email address for this account in order to complete this request.</value>\n- </data>\n<data name=\"TransformAccount_Failed\" xml:space=\"preserve\">\n- <value>Unexpected error when transforming account '{0}'. Contact support@nuget.org for more details.</value>\n+ <value>An unexpected error occurred while transforming this account. Contact support for assistance.</value>\n</data>\n<data name=\"TransformAccount_OrganizationAccountDoesNotExist\" xml:space=\"preserve\">\n<value>Organization account '{0}' does not exist.</value>\n@@ -715,16 +712,16 @@ For more information, please contact '{2}'.</value>\n<data name=\"TransformAccount_Success\" xml:space=\"preserve\">\n<value>Account '{0}' was successfully transformed into an organization.</value>\n</data>\n- <data name=\"TransformAccount_FailedReasonHasMemberships\" xml:space=\"preserve\">\n- <value>Account '{0}' should not belong to any organizations.</value>\n+ <data name=\"TransformAccount_AccountHasMemberships\" xml:space=\"preserve\">\n+ <value>You are a member of one or more organizations. You must leave all organizations before transforming your account.</value>\n</data>\n- <data name=\"TransformAccount_FailedReasonNotConfirmedUser\" xml:space=\"preserve\">\n+ <data name=\"TransformAccount_AccountNotConfirmed\" xml:space=\"preserve\">\n<value>Account '{0}' should be a confirmed user.</value>\n</data>\n<data name=\"TransformAccount_FailedReasonNotInDomainWhitelist\" xml:space=\"preserve\">\n<value>Account '{0}' does not support organizations.</value>\n</data>\n- <data name=\"TransformAccount_FailedReasonIsOrganization\" xml:space=\"preserve\">\n+ <data name=\"TransformAccount_AccountIsAnOrganization\" xml:space=\"preserve\">\n<value>Account '{0}' is already an organization.</value>\n</data>\n<data name=\"TransformAccount_AdminAccountDoesNotExist\" xml:space=\"preserve\">\n@@ -734,9 +731,15 @@ For more information, please contact '{2}'.</value>\n<value>Administrator account '{0}' has not confirmed their email address.</value>\n</data>\n<data name=\"TransformAccount_RequestExists\" xml:space=\"preserve\">\n- <value>Another tranform request was created on {0} for administrator '{1}'. Note that a new request will overwrite this request.</value>\n+ <value>A transform request, with account '{0}' as administrator, is in progress. A new request will override any existing request(s).</value>\n</data>\n<data name=\"TransformAccount_SignInToConfirm\" xml:space=\"preserve\">\n<value>Please sign in as administrator '{0}' to finish transforming account '{1}' into an organization.</value>\n</data>\n+ <data name=\"TransformAccount_AdminAccountIsOrganization\" xml:space=\"preserve\">\n+ <value>Administrator account '{0}' cannot be an organization.</value>\n+ </data>\n+ <data name=\"TransformAccount_AdminMustBeDifferentAccount\" xml:space=\"preserve\">\n+ <value>Administrator account '{0}' cannot be the same account as the one being transformed.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/SignIn.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/SignIn.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container page-sign-in\">\n- <div class=\"row\">\n- <div class=\"col-xs-12 text-center\">\n- <h1>Sign in</h1>\n@if (!string.IsNullOrEmpty(returnUrlMessage))\n{\n+ <div class=\"row\">\n+ <div class=\"col-xs-12 text-center\">\n@ViewHelpers.AlertInfo(@<text>@returnUrlMessage</text>)\n+ </div>\n+ </div>\n}\n+\n+ <div class=\"row\">\n+ <div class=\"col-xs-12 text-center\">\n+ <h1>Sign in</h1>\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"diff": "ViewBag.Title = \"Transform Account\";\nViewBag.MdPageColumns = Constants.ColumnsFormMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n+\n+ var transformNote = \"Note that administrators have full control over the organization, including the ability to add and remove other members.\";\n+ var transformToolTip = \"Please enter a username for the organization administrator. \" + transformNote;\n+ var transformConfirmation = \"You have added '{0}' as an administrator. \" + transformNote;\n}\n<section role=\"main\" class=\"container main-container page-account-settings\">\n<p>@CurrentUser.EmailAddress</p>\n</div>\n- @using (Html.BeginForm(\"Transform\", \"Users\"))\n+ @using (Html.BeginForm(\"Transform\", \"Users\", FormMethod.Post, new { id = \"transform\"}))\n{\n@Html.AntiForgeryToken()\n<div class=\"row form-group col-md-9 col-md-pull-3 @Html.HasErrorFor(m => m.AdminUsername)\">\n@Html.ShowLabelFor(m => m.AdminUsername)\n- @ViewHelpers.AlertInfo(\n- @<text>\n- Please enter a username for an organization administrator. Note that administrators\n- have full control over the organization, including the ability to add and remove other members.\n- </text>)\n-\n+ <a href=\"#\" data-toggle=\"tooltip\" title=\"@transformToolTip\">\n+ <i class=\"ms-Icon ms-Icon--Info\" aria-hidden=\"true\" style=\"vertical-align: -2px\"></i>\n+ </a>\n@Html.ShowTextBoxFor(m => m.AdminUsername)\n@Html.ShowValidationMessagesFor(m => m.AdminUsername)\n</div>\n</div>\n</div>\n</section>\n+\n+@section bottomScripts {\n+ <script type=\"text/javascript\">\n+ $(function ()\n+ {\n+ var confirmation = \"@Html.Raw(transformConfirmation)\";\n+ $(\"#transform\").submit(function (event) {\n+ return window.nuget.confirmEvent(\n+ window.nuget.formatString(confirmation, $(\"#AdminUsername\").val()),\n+ event);\n+ })\n+ });\n+ </script>\n+ @Scripts.Render(\"~/Scripts/gallery/site.min.js\")\n+}\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": "@@ -2372,6 +2372,10 @@ protected UsersController CreateController(string accountToTransform, string can\n.Setup(u => u.CanTransformUserToOrganization(It.IsAny<User>(), out canTransformErrorReason))\n.Returns(string.IsNullOrEmpty(canTransformErrorReason));\n+ GetMock<IUserService>()\n+ .Setup(u => u.CanTransformUserToOrganization(It.IsAny<User>(), It.IsAny<User>(), out canTransformErrorReason))\n+ .Returns(string.IsNullOrEmpty(canTransformErrorReason));\n+\nGetMock<IUserService>()\n.Setup(s => s.RequestTransformToOrganizationAccount(It.IsAny<User>(), It.IsAny<User>()))\n.Callback<User, User>((acct, admin) => {\n@@ -2473,24 +2477,6 @@ public async Task WhenValid_CreatesRequestAndRedirects()\npublic class TheConfirmTransformToOrganizationAction : TestContainer\n{\n- [Fact]\n- public async Task WhenAdminIsNotConfirmed_ShowsError()\n- {\n- // Arrange\n- var controller = GetController<UsersController>();\n- var currentUser = new User() { UnconfirmedEmailAddress = \"unconfirmed@example.com\" };\n- controller.SetCurrentUser(currentUser);\n-\n- // Act\n- var result = await controller.ConfirmTransformToOrganization(\"account\", \"token\") as ViewResult;\n-\n- // Assert\n- Assert.NotNull(result);\n-\n- var model = result.Model as TransformAccountFailedViewModel;\n- Assert.Equal(Strings.TransformAccount_NotConfirmed, model.ErrorMessage);\n- }\n-\n[Fact]\npublic async Task WhenAccountToTransformIsNotFound_ShowsError()\n{\n@@ -2586,6 +2572,10 @@ private UsersController CreateController(string accountToTransform, string canTr\n.Setup(u => u.CanTransformUserToOrganization(It.IsAny<User>(), out canTransformErrorReason))\n.Returns(string.IsNullOrEmpty(canTransformErrorReason));\n+ GetMock<IUserService>()\n+ .Setup(u => u.CanTransformUserToOrganization(It.IsAny<User>(), It.IsAny<User>(), out canTransformErrorReason))\n+ .Returns(string.IsNullOrEmpty(canTransformErrorReason));\n+\nGetMock<IUserService>()\n.Setup(s => s.TransformUserToOrganization(It.IsAny<User>(), It.IsAny<User>(), It.IsAny<string>()))\n.Returns(Task.FromResult(success));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.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.Data;\nusing System.Globalization;\nusing System.Linq;\nusing System.Threading.Tasks;\n@@ -380,7 +379,7 @@ public void WhenAccountIsNotConfirmed_ReturnsFalse()\n// Assert\nAssert.False(result);\nAssert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_FailedReasonNotConfirmedUser, unconfirmedUser.Username));\n+ Strings.TransformAccount_AccountNotConfirmed, unconfirmedUser.Username));\n}\n[Fact]\n@@ -397,7 +396,7 @@ public void WhenAccountIsOrganization_ReturnsFalse()\n// Assert\nAssert.False(result);\nAssert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_FailedReasonIsOrganization, fakes.Organization.Username));\n+ Strings.TransformAccount_AccountIsAnOrganization, fakes.Organization.Username));\n}\n[Fact]\n@@ -414,7 +413,7 @@ public void WhenAccountHasMemberships_ReturnsFalse()\n// Assert\nAssert.False(result);\nAssert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n- Strings.TransformAccount_FailedReasonHasMemberships, fakes.OrganizationCollaborator.Username));\n+ Strings.TransformAccount_AccountHasMemberships, fakes.OrganizationCollaborator.Username));\n}\n[Fact]\n@@ -452,6 +451,64 @@ public void WhenAccountIsInWhitelist_ReturnsTrue()\n}\n}\n+ public class TheCanTransformToOrganizationWithAdminMethod\n+ {\n+ [Fact]\n+ public void WhenAdminMatchesAccountToTransform_ReturnsFalse()\n+ {\n+ // Arrange\n+ var service = new TestableUserService();\n+ service.MockConfig.SetupGet(c => c.OrganizationsEnabledForDomains).Returns(new[] { \"example.com\" });\n+ var fakes = new Fakes();\n+\n+ // Act\n+ string errorReason;\n+ var result = service.CanTransformUserToOrganization(fakes.User, fakes.User, out errorReason);\n+\n+ // Assert\n+ Assert.False(result);\n+ Assert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_AdminMustBeDifferentAccount, fakes.User.Username));\n+ }\n+\n+ [Fact]\n+ public void WhenAdminIsNotConfirmed_ReturnsFalse()\n+ {\n+ // Arrange\n+ var service = new TestableUserService();\n+ service.MockConfig.SetupGet(c => c.OrganizationsEnabledForDomains).Returns(new[] { \"example.com\" });\n+ var fakes = new Fakes();\n+ var unconfirmedUser = new User() { UnconfirmedEmailAddress = \"unconfirmed@example.com\" };\n+\n+ // Act\n+ string errorReason;\n+ var result = service.CanTransformUserToOrganization(fakes.User, unconfirmedUser, out errorReason);\n+\n+ // Assert\n+ Assert.False(result);\n+ Assert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_AdminAccountNotConfirmed, unconfirmedUser.Username));\n+ }\n+\n+ [Fact]\n+ public void WhenAdminIsOrganization_ReturnsFalse()\n+ {\n+ // Arrange\n+ var service = new TestableUserService();\n+ service.MockConfig.SetupGet(c => c.OrganizationsEnabledForDomains).Returns(new[] { \"example.com\" });\n+ var fakes = new Fakes();\n+\n+ // Act\n+ string errorReason;\n+ var result = service.CanTransformUserToOrganization(fakes.User, fakes.Organization, out errorReason);\n+\n+ // Assert\n+ Assert.False(result);\n+ Assert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_AdminAccountIsOrganization, fakes.Organization.Username));\n+ }\n+ }\n+\npublic class TheRequestTransformToOrganizationAccountMethod\n{\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Bug bash: fix transform issues (#5329)
|
455,794 |
24.01.2018 15:52:08
| 28,800 |
d682501fc10e83cf052c0277a98f8d4a3b0018f4
|
Organization bug bash: Manage Packages page
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -922,6 +922,37 @@ 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 h1 {\n+ margin-bottom: 0;\n+}\n+.page-manage-packages h2 {\n+ margin-top: 0;\n+ margin-bottom: 10px;\n+}\n+.page-manage-packages .form-section-title {\n+ margin-top: 40px;\n+}\n+@media (min-width: 768px) {\n+ .page-manage-packages .form-section-title {\n+ float: left;\n+ text-align: right;\n+ }\n+}\n+@media (min-width: 768px) {\n+ .page-manage-packages .form-section-data {\n+ float: right;\n+ margin-top: 40px;\n+ line-height: 3;\n+ text-align: right;\n+ }\n+}\n+.page-manage-packages .panel {\n+ margin-top: 5px;\n+}\n+.page-manage-packages .manage-package-listing .ms-Icon {\n+ position: relative;\n+ top: 2px;\n+}\n.page-delete-package h1 {\nmargin-bottom: 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/js/bootstrap.js",
"new_path": "src/Bootstrap/dist/js/bootstrap.js",
"diff": "/*!\n* Bootstrap v3.3.7 (http://getbootstrap.com)\n- * Copyright 2011-2017 Twitter, Inc.\n+ * Copyright 2011-2018 Twitter, Inc.\n* Licensed under the MIT license\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-list-packages.less\";\n@import \"page-manage-curated-feed.less\";\n@import \"page-manage-owners.less\";\n+@import \"page-manage-packages.less\";\n@import \"page-delete-package.less\";\n@import \"page-profile.less\";\n@import \"page-report-abuse.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"diff": "+.page-manage-packages {\n+ @section-margin-top: 40px;\n+\n+ h1 {\n+ margin-bottom: 0;\n+ }\n+\n+ h2 {\n+ margin-bottom: 10px;\n+ margin-top: 0;\n+ }\n+\n+ .form-section-title {\n+ margin-top: @section-margin-top;\n+\n+ @media (min-width: @screen-sm-min) {\n+ float: left;\n+ text-align: right;\n+ }\n+ }\n+\n+ .form-section-data {\n+ @media (min-width: @screen-sm-min) {\n+ margin-top: @section-margin-top;\n+ line-height: 3;\n+ float: right;\n+ text-align: right;\n+ }\n+ }\n+\n+ .panel {\n+ margin-top: 5px;\n+ }\n+\n+ .manage-package-listing {\n+ .ms-Icon {\n+ position: relative;\n+ top: 2px;\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -396,10 +396,10 @@ public virtual ActionResult Packages()\n.Select(p => new ListPackageItemViewModel(p, currentUser)).OrderBy(p => p.Id)\n.ToList();\n- var incoming = _packageOwnerRequestService.GetPackageOwnershipRequests(newOwner: currentUser);\n- var outgoing = _packageOwnerRequestService.GetPackageOwnershipRequests(requestingOwner: currentUser);\n+ var received = _packageOwnerRequestService.GetPackageOwnershipRequests(newOwner: currentUser);\n+ var sent = _packageOwnerRequestService.GetPackageOwnershipRequests(requestingOwner: currentUser);\n- var ownerRequests = new OwnerRequestsViewModel(incoming, outgoing, currentUser, _packageService);\n+ var ownerRequests = new OwnerRequestsViewModel(received, sent, currentUser, _packageService);\nvar reservedPrefixes = new ReservedNamespaceListViewModel(currentUser.ReservedNamespaces);\nvar model = new ManagePackagesViewModel\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"diff": "this.TotalCount = ko.pureComputed(function () {\nreturn this.PendingPackages().length;\n}, this);\n+ this.SelectedCountLabel = ko.pureComputed(function () {\n+ return ko.unwrap(SelectedCount).toLocaleString()\n+ + ' of '\n+ + ko.unwrap(TotalCount).toLocaleString()\n+ + ' package' + (TotalCount == 1 ? '' : 's')\n+ + ' selected';\n+ }, this);\n// Apply the glob pattern to the package IDs\nthis.ApplyPendingGlobPattern = function (newValue) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/OwnerRequestsViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/OwnerRequestsViewModel.cs",
"diff": "@@ -10,17 +10,21 @@ public class OwnerRequestsViewModel\n/// <summary>\n/// A model to show the requests for this user to become an owner of a package.\n/// </summary>\n- public OwnerRequestsListViewModel Incoming { get; }\n+ public OwnerRequestsListViewModel Received { get; }\n/// <summary>\n/// A model to show the requests this user has sent to other users to become owners.\n/// </summary>\n- public OwnerRequestsListViewModel Outgoing { get; }\n+ public OwnerRequestsListViewModel Sent { get; }\n- public OwnerRequestsViewModel(IEnumerable<PackageOwnerRequest> incoming, IEnumerable<PackageOwnerRequest> outgoing, User currentUser, IPackageService packageService)\n+ public OwnerRequestsViewModel(\n+ IEnumerable<PackageOwnerRequest> received,\n+ IEnumerable<PackageOwnerRequest> sent,\n+ User currentUser,\n+ IPackageService packageService)\n{\n- Incoming = new OwnerRequestsListViewModel(incoming, nameof(Incoming), currentUser, packageService);\n- Outgoing = new OwnerRequestsListViewModel(outgoing, nameof(Outgoing), currentUser, packageService);\n+ Received = new OwnerRequestsListViewModel(received, nameof(Received), currentUser, packageService);\n+ Sent = new OwnerRequestsListViewModel(sent, nameof(Sent), currentUser, packageService);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<div class=\"row\" data-bind=\"css: { disabled: !SelectPackagesEnabled() }\">\n<div class=\"col-sm-12\">\n<p>\n- <span data-bind=\"text: SelectedCount\"></span> of <span data-bind=\"text: TotalCount\"></span>\n- <span data-bind=\"text: TotalCount > 1 ? 'packages' : 'package'\"></span> selected\n+ <span data-bind=\"text: SelectedCountLabel\"></span>\n</p>\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "ViewBag.Title = \"Manage My Package\";\nViewBag.Tab = \"Packages\";\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n+\n+ var namespacesCount = Model.ReservedNamespaces.ReservedNamespaces.Count();\n+ var ownerRequestsReceivedCount = Model.OwnerRequests.Received.RequestItems.Count();\n+ var ownerRequestsSentCount = Model.OwnerRequests.Sent.RequestItems.Count();\n}\n-<section role=\"main\" class=\"container main-container page-manage-packages page-package-details\">\n+<section role=\"main\" class=\"container main-container page-manage-packages\">\n<div class=\"row\">\n- <div class=\"col-xs-12\">\n- <h1>My Packages</h1>\n- <div class=\"col-xs-3 text-right form-group pull-right\">\n+ <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n+\n+ <div class=\"clearfix\">\n+ <h1 class=\"pull-left\">Manage Packages</h1>\n+ <div class=\"text-center ms-font-xxl\">\n+ <span class=\"form-section-data\">\n<select id=\"ownerFilter\" class=\"form-control pull-right hidden\"\ndata-bind=\"options: Owners, value: OwnerFilter, optionsText: 'Username'\"></select>\n+ </span>\n</div>\n- @ViewHelpers.Section(this, \"listed\", \"Published\",\n+ </div>\n+\n+ @ViewHelpers.Section(this, \"listed\", @<text>Published Packages</text>,\n+ @<text>\n+ <span id=\"listed-data\" data-bind=\"text: ListedPackages.VisiblePackagesHeading()\"></span>\n+ </text>,\n@<text>\n<div class=\"row user-package-list\">\n<div data-bind=\"template: { name: 'manage-packages', data: ListedPackages }\"></div>\n</div>\n- </text>)\n+ </text>, expanded: false)\n- @ViewHelpers.Section(this, \"unlisted\", \"Unlisted\",\n+ @ViewHelpers.Section(this, \"unlisted\", @<text>Unlisted Packages</text>,\n+ @<text>\n+ <span id=\"unlisted-data\" data-bind=\"text: UnlistedPackages.VisiblePackagesHeading()\"></span>\n+ </text>,\n@<text>\n<div class=\"row user-package-list\">\n<div data-bind=\"template: { name: 'manage-packages', data: UnlistedPackages }\"></div>\n</div>\n- </text>)\n- </div>\n- </div>\n+ </text>, expanded: false)\n- @if (Model.ReservedNamespaces.ReservedNamespaces.Any())\n+ @if (namespacesCount > 0)\n{\n- <div class=\"row\">\n- <div class=\"col-xs-12\">\n- <h1>My Reserved Namespaces</h1>\n- @ViewHelpers.Section(this,\n- \"namespaces\",\n- \"Namespaces\",\n+ @ViewHelpers.Section(this, \"namespaces\",\n+ @<text>Reserved Namespaces</text>,\n+ @<text>@Html.Raw(namespacesCount + \" namespace\" + (namespacesCount == 1 ? \"\" : \"s\"))</text>,\n@<text>\n@Html.Partial(\"_ReservedNamespacesList\", Model.ReservedNamespaces)\n- </text>)\n- </div>\n- </div>\n+ </text>, expanded: false)\n}\n- @if (Model.OwnerRequests.Incoming.RequestItems.Any() || Model.OwnerRequests.Outgoing.RequestItems.Any())\n- {\n- <div class=\"row\">\n- <div class=\"col-xs-12\">\n- <h1>My Pending Ownership Requests</h1>\n- @if (Model.OwnerRequests.Incoming.RequestItems.Any())\n+ @if (Model.OwnerRequests.Received.RequestItems.Any())\n{\n- @ViewHelpers.Section(this,\n- \"requests-incoming\",\n- \"Incoming\",\n+ @ViewHelpers.Section(this, \"requests-received\",\n+ @<text>Ownership Requests (Received)</text>,\n+ @<text>@Html.Raw(ownerRequestsReceivedCount + \" request\" + (ownerRequestsReceivedCount == 1 ? \"\" : \"s\"))</text>,\n@<text>\n- @Html.Partial(\"_OwnerRequestsList\", Model.OwnerRequests.Incoming)\n- </text>)\n+ @Html.Partial(\"_OwnerRequestsList\", Model.OwnerRequests.Received)\n+ </text>, expanded: false)\n}\n- @if (Model.OwnerRequests.Outgoing.RequestItems.Any())\n+ @if (Model.OwnerRequests.Sent.RequestItems.Any())\n{\n- @ViewHelpers.Section(this,\n- \"requests-outgoing\",\n- \"Outgoing\",\n+ @ViewHelpers.Section(this, \"requests-sent\",\n+ @<text>Ownership Requests (Sent)</text>,\n+ @<text>@Html.Raw(ownerRequestsSentCount + \" request\" + (ownerRequestsSentCount == 1 ? \"\" : \"s\"))</text>,\n@<text>\n- @Html.Partial(\"_OwnerRequestsList\", Model.OwnerRequests.Outgoing)\n- </text>)\n+ @Html.Partial(\"_OwnerRequestsList\", Model.OwnerRequests.Sent)\n+ </text>, expanded: false)\n}\n</div>\n- </div>\n- }\n</section>\n<script type=\"text/html\" id=\"manage-packages\">\n<div class=\"col-md-12\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n- <p>\n- You have\n- <b>\n- <span data-bind=\"text: VisiblePackagesCount\"></span>\n- <span data-bind=\"text: Type\"></span>\n- <span data-bind=\"text: VisiblePackagesCount() === 1 ? 'package' : 'packages'\"></span>\n- </b>\n- with a total of\n- <b>\n- <span data-bind=\"text: VisibleDownloadCount\"></span>\n- <span data-bind=\"text: VisibleDownloadCount() === 1 ? 'download' : 'downloads'\"></span>\n- </b>\n- </p>\n<table class=\"table\">\n<thead>\n<tr class=\"manage-package-headings\">\n<td class=\"align-middle\">\n<span class=\"ms-noWrap\" data-bind=\"foreach: Owners\">\n<i class=\"ms-Icon ms-Icon--Group\" aria-hidden=\"true\" data-bind=\"visible: IsOrganization\"></i>\n- <a data-bind=\"attr: { href: ProfileUrl }\">\n- <span data-bind=\"text: Username\"></span>\n- </a>\n+ <a data-bind=\"attr: { href: ProfileUrl }\"><span data-bind=\"text: Username\"></span></a><!-- ko if: ($index() < ($parent.Owners.length - 1)) -->, <!-- /ko -->\n</span>\n</td>\n<td class=\"align-middle text-nowrap\">\n- <span data-bind=\"text: DownloadCount\"></span>\n+ <span data-bind=\"text: FormattedDownloadCount\"></span>\n</td>\n<td class=\"align-middle text-nowrap\">\n<span data-bind=\"text: LatestVersion\"></span>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Organization bug bash: Manage Packages page (#5335)
|
455,794 |
24.01.2018 16:24:00
| 28,800 |
455fbcc19a336ca0ca8d83d97d7ea2486c322148
|
Fix ApiKeys page issues from bug bash
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -514,7 +514,6 @@ img.reserved-indicator-icon {\n}\n.page-api-keys .api-key-details {\npadding: 20px 0;\n- border-bottom: 1px solid #dbdbdb;\n}\n.page-api-keys .api-key-details .ms-Icon {\nposition: relative;\n@@ -532,6 +531,9 @@ img.reserved-indicator-icon {\nmargin-left: 10px;\nborder-left: 1px solid #dbdbdb;\n}\n+.page-api-keys .api-key-details:not(:first-child) {\n+ border-top: 1px solid #dbdbdb;\n+}\n.page-blog {\nmargin-top: 33px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-api-keys.less",
"new_path": "src/Bootstrap/less/theme/page-api-keys.less",
"diff": ".api-key-details {\npadding: @section-padding;\n- border-bottom: @section-border;\n.ms-Icon {\nposition: relative;\n}\n}\n}\n+\n+ .api-key-details:not(:first-child)\n+ {\n+ border-top: @section-border;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"diff": "this.Scopes(data.Scopes || []);\nthis.Packages(data.Packages || []);\nthis.GlobPattern(data.GlobPattern || \"\");\n- this._SetPackageSelection(this.Packages())\n+ this._SetPackageSelection(this.Packages());\n+\n+ if (this.Owner()) {\n+ var existingOwner = ko.utils.arrayFirst(\n+ this.PackageOwners,\n+ function (owner) {\n+ return owner.Owner.toUpperCase() == data.Owner.toUpperCase()\n+ });\n+ this.PackageOwner(existingOwner);\n+ } else {\n+ this.PackageOwner(this.PackageOwners[0]);\n+ }\n};\nthis.Key = ko.observable();\nthis.Type = ko.observable();\nthis.Scopes = ko.observableArray();\nthis.Packages = ko.observableArray();\nthis.GlobPattern = ko.observable();\n- this._UpdateData(data);\n// Properties used for the form\nthis.PendingDescription = ko.observable();\n});\nself.PendingPackages(self.packageViewModels);\nself.ApplyPendingGlobPattern(self.PendingGlobPattern());\n+\n+ // reset form validation error\n+ self.ScopesError(null);\n+ self.SubjectsError(null);\n});\n+ // Update data only after PackageOwner subscription is fully enabled.\n+ this._UpdateData(data);\n+\n// Default owner to self to initialize the pending data.\nthis.PendingGlobPattern(this.GlobPattern());\n- this.PackageOwner(this.PackageOwners[0]);\n// Apply validation to the scopes and subjects\nthis.PendingScopes.subscribe(function (newValue) {\n// Reset the field values.\nself.PendingDescription(self.Description());\n- self.PackageOwner($(\"#\" + self.PackageOwnerId() + \" option:first-child\").val());\nself.ExpiresIn($(\"#\" + self.ExpiresInId() + \" option:last-child\").val());\nself.PushEnabled(false);\nself.PushScope(initialData.PackagePushScope);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "\"create\",\n\"Create\",\n@<text>\n- <div class=\"panel panel-default upsert-api-key\">\n- <div class=\"panel-body\"\n- data-bind=\"template: { name: 'upsert-api-key', data: NewApiKey }\">\n- </div>\n+ <div class=\"upsert-api-key\">\n+ <div class=\"panel-body\" data-bind=\"template: { name: 'upsert-api-key', data: NewApiKey }\"></div>\n</div>\n</text>,\nexpanded: false,\n</ul>\n</div>\n</div>\n+\n<div class=\"upsert-api-key\">\n<div class=\"panel panel-default panel-collapse collapse\"\ndata-bind=\"attr: { id: EditContainerId() },\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix ApiKeys page issues from bug bash (#5341)
|
455,794 |
25.01.2018 08:03:45
| 28,800 |
69b67bdafa90851d2cb0aebbf89515df787f1f6a
|
Hide DeleteUser link for organizations
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/UserProfileModel.cs",
"new_path": "src/NuGetGallery/ViewModels/UserProfileModel.cs",
"diff": "@@ -43,5 +43,13 @@ public UserProfileModel(User user, List<ListPackageItemViewModel> allPackages, i\npublic int PackagePage { get; private set; }\npublic int PackagePageSize { get; private set; }\npublic IPreviousNextPager Pager { get; private set; }\n+\n+ public bool UserIsOrganization\n+ {\n+ get\n+ {\n+ return User is Organization;\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "<div class=\"value\">@Model.TotalPackageDownloadCount.ToNuGetNumberString()</div>\n<div class=\"description\">Total @(Model.TotalPackageDownloadCount == 1 ? \"download\" : \"downloads\") of packages</div>\n</div>\n- @if (User.IsAdministrator())\n+ @if (User.IsAdministrator() && !Model.UserIsOrganization)\n{\n<div class=\"statistic\">\n<div class=\"value\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hide DeleteUser link for organizations (#5348)
|
455,776 |
25.01.2018 11:09:28
| 28,800 |
518c019eb8182a9db6c109c370aabbc75d77fb5b
|
[Organizations] Fix Manage Package Owners issues
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "using System.Threading.Tasks;\nusing System.Web.Mvc;\nusing NuGetGallery.Authentication;\n-using NuGetGallery.Filters;\nusing NuGetGallery.Infrastructure.Authentication;\nnamespace NuGetGallery\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -988,7 +988,7 @@ public virtual ActionResult ManagePackageOwners(string id)\nif (ActionsRequiringPermissions.ManagePackageOwnership.CheckPermissionsOnBehalfOfAnyAccount(GetCurrentUser(), package) != PermissionsCheckResult.Allowed)\n{\n- return new HttpStatusCodeResult(401, \"Unauthorized\");\n+ return HttpForbidden();\n}\nvar model = new ManagePackageOwnersViewModel(package, GetCurrentUser());\n@@ -1008,7 +1008,7 @@ public virtual ActionResult Delete(string id, string version)\n}\nif (ActionsRequiringPermissions.UnlistOrRelistPackage.CheckPermissionsOnBehalfOfAnyAccount(GetCurrentUser(), package) != PermissionsCheckResult.Allowed)\n{\n- return new HttpStatusCodeResult(401, \"Unauthorized\");\n+ return HttpForbidden();\n}\nvar model = new DeletePackageViewModel(package, GetCurrentUser(), ReportMyPackageReasons);\n@@ -1463,7 +1463,7 @@ internal virtual async Task<ActionResult> Edit(string id, string version, bool?\nif (ActionsRequiringPermissions.EditPackage.CheckPermissionsOnBehalfOfAnyAccount(GetCurrentUser(), package) != PermissionsCheckResult.Allowed)\n{\n- return new HttpStatusCodeResult(401, \"Unauthorized\");\n+ return HttpForbidden();\n}\nif (package.PackageRegistration.IsLocked)\n@@ -1787,7 +1787,7 @@ internal virtual async Task<ActionResult> SetLicenseReportVisibility(string id,\n}\nif (ActionsRequiringPermissions.EditPackage.CheckPermissionsOnBehalfOfAnyAccount(GetCurrentUser(), package) != PermissionsCheckResult.Allowed)\n{\n- return new HttpStatusCodeResult(401, \"Unauthorized\");\n+ return HttpForbidden();\n}\nawait _packageService.SetLicenseReportVisibilityAsync(package, visible);\n@@ -1843,5 +1843,10 @@ private static bool IsDifferent(string posted, string package)\n// Ignore those pesky '\\r' characters which screw up comparisons.\nreturn !String.Equals(posted.Replace(\"\\r\", \"\"), package.Replace(\"\\r\", \"\"), StringComparison.Ordinal);\n}\n+\n+ private static HttpStatusCodeResult HttpForbidden()\n+ {\n+ return new HttpStatusCodeResult(HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/OrganizationExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/OrganizationExtensions.cs",
"diff": "@@ -8,6 +8,11 @@ namespace NuGetGallery\n{\npublic static class OrganizationExtensions\n{\n+ public static Membership GetMembershipOfUser(this Organization organization, User member)\n+ {\n+ return organization.Members.FirstOrDefault(m => m.Member.MatchesUser(member));\n+ }\n+\n/// <summary>\n/// Returns all the user accounts that are members of an organization.\n/// If the organization has nested organizations their members will be returned as well.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageOwnersResultViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageOwnersResultViewModel.cs",
"diff": "@@ -32,7 +32,7 @@ public PackageOwnersResultViewModel(User user, User currentUser, PackageRegistra\nProfileUrl = url.User(user, relativeUrl: false);\nImageUrl = GravatarHelper.Url(user.EmailAddress, size: Constants.GravatarImageSize);\nGrantsCurrentUserAccess = ActionsRequiringPermissions.ManagePackageOwnership.CheckPermissions(currentUser, user, packageRegistration) == PermissionsCheckResult.Allowed;\n- IsCurrentUserAdminOfOrganization = user is Organization && (user as Organization).Members.Where(m => m.IsAdmin).Any();\n+ IsCurrentUserAdminOfOrganization = (user as Organization)?.GetMembershipOfUser(currentUser)?.IsAdmin ?? false;\nPending = isPending;\nIsNamespaceOwner = isNamespaceOwner;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"diff": "@@ -956,6 +956,44 @@ public void ReturnsFailureIfUserIsNotPackageOwner(Func<Fakes, User> getCurrentUs\n// Assert\nAssert.IsType(typeof(HttpUnauthorizedResult), result);\n}\n+\n+ public void ReturnsExpectedDataAsOwner()\n+ {\n+ var fakes = Get<Fakes>();\n+ var currentUser = fakes.Owner;\n+ var result = InvokeAsUser(currentUser);\n+\n+ Assert.True(result.Any(m => ModelMatchesUser(m, fakes.Owner, grantsCurrentUserAccess: true, isCurrentUserIsAdminOfOrganization: false)));\n+ Assert.True(result.Any(m => ModelMatchesUser(m, fakes.OrganizationOwner, grantsCurrentUserAccess: false, isCurrentUserIsAdminOfOrganization: false)));\n+ }\n+\n+ public void ReturnsExpectedDataAsOrganizationAdmin()\n+ {\n+ var fakes = Get<Fakes>();\n+ var currentUser = fakes.Owner;\n+ var result = InvokeAsUser(currentUser);\n+\n+ Assert.True(result.Any(m => ModelMatchesUser(m, fakes.Owner, grantsCurrentUserAccess: false, isCurrentUserIsAdminOfOrganization: false)));\n+ Assert.True(result.Any(m => ModelMatchesUser(m, fakes.OrganizationOwner, grantsCurrentUserAccess: true, isCurrentUserIsAdminOfOrganization: true)));\n+ }\n+\n+ private IEnumerable<PackageOwnersResultViewModel> InvokeAsUser(User currentUser)\n+ {\n+ var controller = GetController<JsonApiController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ var result = controller.GetPackageOwners(\"fakeId\", \"2.0.0\");\n+ return ((JsonResult)result).Data as IEnumerable<PackageOwnersResultViewModel>;\n+ }\n+\n+ private bool ModelMatchesUser(PackageOwnersResultViewModel model, User user, bool grantsCurrentUserAccess, bool isCurrentUserIsAdminOfOrganization)\n+ {\n+ return\n+ user.Username == model.Name &&\n+ user.EmailAddress == model.EmailAddress &&\n+ grantsCurrentUserAccess == model.GrantsCurrentUserAccess &&\n+ isCurrentUserIsAdminOfOrganization == model.IsCurrentUserAdminOfOrganization;\n+ }\n}\nprivate static Func<Fakes, User> _getFakesNull = (Fakes fakes) => null;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1603,13 +1603,13 @@ public static IEnumerable<object[]> NotOwner_Data\n[Theory]\n[MemberData(nameof(NotOwner_Data))]\n- public void Returns401IfNotOwner(User currentUser, User owner)\n+ public void Returns403IfNotOwner(User currentUser, User owner)\n{\nvar result = GetDeleteResult(currentUser, owner, out var controller);\nAssert.IsType<HttpStatusCodeResult>(result);\nvar httpStatusCodeResult = result as HttpStatusCodeResult;\n- Assert.Equal(401, httpStatusCodeResult.StatusCode);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, httpStatusCodeResult.StatusCode);\n}\npublic static IEnumerable<object[]> Owner_Data\n@@ -1747,7 +1747,7 @@ public static IEnumerable<object[]> NotOwner_Data\n[Theory]\n[MemberData(nameof(NotOwner_Data))]\n- public async Task Returns401IfNotOwner(User currentUser, User owner)\n+ public async Task Returns403IfNotOwner(User currentUser, User owner)\n{\n// Arrange\nvar package = new Package\n@@ -1775,7 +1775,7 @@ public async Task Returns401IfNotOwner(User currentUser, User owner)\n// Assert\nAssert.IsType<HttpStatusCodeResult>(result);\nvar httpStatusCodeResult = result as HttpStatusCodeResult;\n- Assert.Equal(401, httpStatusCodeResult.StatusCode);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, httpStatusCodeResult.StatusCode);\n}\npublic static IEnumerable<object[]> Owner_Data\n@@ -2223,7 +2223,7 @@ public static IEnumerable<object[]> OnPostBackWithReadMe_Saves_Data\n[Theory]\n[MemberData(nameof(NotOwner_Data))]\n- public async Task Returns401IfNotOwner(User currentUser, User owner)\n+ public async Task Returns403IfNotOwner(User currentUser, User owner)\n{\n// Arrange\nvar package = new Package\n@@ -2251,7 +2251,7 @@ public async Task Returns401IfNotOwner(User currentUser, User owner)\n// Assert\nAssert.IsType<HttpStatusCodeResult>(result);\nvar httpStatusCodeResult = result as HttpStatusCodeResult;\n- Assert.Equal(401, httpStatusCodeResult.StatusCode);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, httpStatusCodeResult.StatusCode);\n}\n[Theory]\n@@ -2439,13 +2439,13 @@ public static IEnumerable<object[]> NotOwner_Data\n[Theory]\n[MemberData(nameof(NotOwner_Data))]\n- public void Returns401IfNotOwner(User currentUser, User owner)\n+ public void Returns403IfNotOwner(User currentUser, User owner)\n{\nvar result = GetManagePackageOwnersResult(currentUser, owner);\nAssert.IsType<HttpStatusCodeResult>(result);\nvar httpStatusCodeResult = result as HttpStatusCodeResult;\n- Assert.Equal(401, httpStatusCodeResult.StatusCode);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, httpStatusCodeResult.StatusCode);\n}\npublic static IEnumerable<object[]> Owner_Data\n@@ -4962,7 +4962,7 @@ public static IEnumerable<object[]> NotOwner_Data\n[Theory]\n[MemberData(nameof(NotOwner_Data))]\n- public async Task Returns401IfNotOwner(User currentUser, User owner, bool visible)\n+ public async Task Returns403IfNotOwner(User currentUser, User owner, bool visible)\n{\n// Arrange\nvar package = new Package\n@@ -4990,7 +4990,7 @@ public async Task Returns401IfNotOwner(User currentUser, User owner, bool visibl\n// Assert\nAssert.IsType<HttpStatusCodeResult>(result);\nvar httpStatusCodeResult = result as HttpStatusCodeResult;\n- Assert.Equal(401, httpStatusCodeResult.StatusCode);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, httpStatusCodeResult.StatusCode);\n}\npublic static IEnumerable<object[]> Owner_Data\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Fix Manage Package Owners issues (#5336)
|
455,794 |
25.01.2018 11:40:39
| 28,800 |
a36fae43d90bc12b10623215715fbb3bb7e5bfa4
|
Create derived UserAccountViewModel for User (non-Organization) accounts
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -97,7 +97,7 @@ public virtual ActionResult ConfirmationRequiredPost()\n[Authorize]\npublic virtual ActionResult Account()\n{\n- return AccountView(new AccountViewModel());\n+ return AccountView<UserAccountViewModel>();\n}\n[HttpGet]\n@@ -348,7 +348,7 @@ private ApiKeyOwnerViewModel CreateApiKeyOwnerViewModel(User user, bool canPushN\n[Authorize]\n[HttpPost]\n[ValidateAntiForgeryToken]\n- public virtual async Task<ActionResult> ChangeEmailSubscription(AccountViewModel model)\n+ public virtual async Task<ActionResult> ChangeEmailSubscription(UserAccountViewModel model)\n{\nvar user = GetCurrentUser();\n@@ -527,9 +527,7 @@ public virtual async Task<ActionResult> ResetPassword(string username, string to\n_messageService.SendCredentialAddedNotice(credential.User, _authService.DescribeCredential(credential));\n}\n- return RedirectToAction(\n- actionName: \"PasswordChanged\",\n- controllerName: \"Users\");\n+ return RedirectToAction(\"PasswordChanged\");\n}\n[Authorize]\n@@ -607,7 +605,7 @@ public virtual ActionResult Profiles(string username, int page = 1)\n[HttpPost]\n[Authorize]\n[ValidateAntiForgeryToken]\n- public virtual async Task<ActionResult> ChangeEmail(AccountViewModel model)\n+ public virtual async Task<ActionResult> ChangeEmail(UserAccountViewModel model)\n{\nif (!ModelState.IsValidField(\"ChangeEmail.NewEmail\"))\n{\n@@ -667,7 +665,7 @@ public virtual async Task<ActionResult> ChangeEmail(AccountViewModel model)\n[HttpPost]\n[Authorize]\n[ValidateAntiForgeryToken]\n- public virtual async Task<ActionResult> CancelChangeEmail(AccountViewModel model)\n+ public virtual async Task<ActionResult> CancelChangeEmail(UserAccountViewModel model)\n{\nvar user = GetCurrentUser();\n@@ -687,7 +685,7 @@ public virtual async Task<ActionResult> CancelChangeEmail(AccountViewModel model\n[HttpPost]\n[Authorize]\n[ValidateAntiForgeryToken]\n- public virtual async Task<ActionResult> ChangePassword(AccountViewModel model)\n+ public virtual async Task<ActionResult> ChangePassword(UserAccountViewModel model)\n{\nvar user = GetCurrentUser();\n@@ -1010,34 +1008,54 @@ private async Task<ActionResult> RemoveCredentialInternal(User user, Credential\nreturn RedirectToAction(\"Account\");\n}\n- private ActionResult AccountView(AccountViewModel model)\n+ private ActionResult AccountView<TAccountViewModel>(TAccountViewModel model = null)\n+ where TAccountViewModel : AccountViewModel\n{\n- var user = GetCurrentUser();\n+ model = model ?? Activator.CreateInstance<TAccountViewModel>();\n+\n+ // only users for now, but organizations are coming\n+ var userModel = model as UserAccountViewModel;\n+ if (userModel == null)\n+ {\n+ throw new ArgumentException(\"Invalid view model type.\", nameof(model));\n+ }\n+\n+ // update model for all accounts\n+ var account = GetCurrentUser();\nmodel.CuratedFeeds = _curatedFeedService\n- .GetFeedsForManager(user.Key)\n+ .GetFeedsForManager(account.Key)\n.Select(f => f.Name)\n.ToList();\n- model.CredentialGroups = GetCredentialGroups(user);\n+\n+ model.HasPassword = account.Credentials.Any(c => c.Type.StartsWith(CredentialTypes.Password.Prefix));\n+ model.CurrentEmailAddress = account.UnconfirmedEmailAddress ?? account.EmailAddress;\n+ model.HasConfirmedEmailAddress = !string.IsNullOrEmpty(account.EmailAddress);\n+ model.HasUnconfirmedEmailAddress = !string.IsNullOrEmpty(account.UnconfirmedEmailAddress);\n+\n+ model.ChangeEmail = new ChangeEmailViewModel();\n+\n+ model.ChangeNotifications = model.ChangeNotifications ?? new ChangeNotificationsViewModel();\n+ model.ChangeNotifications.EmailAllowed = account.EmailAllowed;\n+ model.ChangeNotifications.NotifyPackagePushed = account.NotifyPackagePushed;\n+\n+ // update model for user accounts\n+ UpdateUserAccountModel(account, userModel);\n+\n+ return View(\"Account\", model);\n+ }\n+\n+ private void UpdateUserAccountModel(User account, UserAccountViewModel model)\n+ {\n+ model.CredentialGroups = GetCredentialGroups(account);\nmodel.SignInCredentialCount = model\n.CredentialGroups\n.Where(p => p.Key == CredentialKind.Password || p.Key == CredentialKind.External)\n.Sum(p => p.Value.Count);\n-\nmodel.ExpirationInDaysForApiKeyV1 = _config.ExpirationInDaysForApiKeyV1;\n- model.HasPassword = model.CredentialGroups.ContainsKey(CredentialKind.Password);\n- model.CurrentEmailAddress = user.UnconfirmedEmailAddress ?? user.EmailAddress;\n- model.HasConfirmedEmailAddress = !string.IsNullOrEmpty(user.EmailAddress);\n- model.HasUnconfirmedEmailAddress = !string.IsNullOrEmpty(user.UnconfirmedEmailAddress);\nmodel.ChangePassword = model.ChangePassword ?? new ChangePasswordViewModel();\nmodel.ChangePassword.EnablePasswordLogin = model.HasPassword;\n-\n- model.ChangeNotifications = model.ChangeNotifications ?? new ChangeNotificationsViewModel();\n- model.ChangeNotifications.EmailAllowed = user.EmailAllowed;\n- model.ChangeNotifications.NotifyPackagePushed = user.NotifyPackagePushed;\n-\n- return View(\"Account\", model);\n}\nprivate Dictionary<CredentialKind, List<CredentialViewModel>> GetCredentialGroups(User user)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Areas\\Admin\\ViewModels\\DeleteUserAccountViewModel.cs\" />\n<Compile Include=\"ViewModels\\ListOrganizationsItemViewModel.cs\" />\n<Compile Include=\"ViewModels\\ListOrganizationsViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ChangeEmailViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ChangeNotificationsViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ChangePasswordViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\CredentialKind.cs\" />\n+ <Compile Include=\"ViewModels\\CredentialViewModel.cs\" />\n<Compile Include=\"ViewModels\\ListPackageOwnerViewModel.cs\" />\n<Compile Include=\"ViewModels\\PackageDeleteDecision.cs\" />\n<Compile Include=\"ViewModels\\DeleteAccountViewModel.cs\" />\n<Compile Include=\"ViewModels\\ThirdPartyPackageManagerViewModel.cs\" />\n<Compile Include=\"ViewModels\\TransformAccountFailedViewModel.cs\" />\n<Compile Include=\"ViewModels\\TransformAccountViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\UserAccountViewModel.cs\" />\n<Compile Include=\"WebApi\\PlainTextResult.cs\" />\n<Compile Include=\"WebApi\\QueryResult.cs\" />\n<Compile Include=\"WebApi\\QueryResultDefaults.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -51,7 +51,7 @@ public void WillReturnTheAccountViewModelWithTheCuratedFeeds()\n.Returns(new[] { new CuratedFeed { Name = \"theCuratedFeed\" } });\n// act\n- var model = ResultAssert.IsView<AccountViewModel>(controller.Account(), viewName: \"Account\");\n+ var model = ResultAssert.IsView<UserAccountViewModel>(controller.Account(), viewName: \"Account\");\n// verify\nAssert.Equal(\"theCuratedFeed\", model.CuratedFeeds.First());\n@@ -75,7 +75,7 @@ public void LoadsDescriptionsOfCredentialsInToViewModel()\nvar result = controller.Account();\n// Assert\n- var model = ResultAssert.IsView<AccountViewModel>(result, viewName: \"Account\");\n+ var model = ResultAssert.IsView<UserAccountViewModel>(result, viewName: \"Account\");\nvar descs = model\n.CredentialGroups\n.SelectMany(x => x.Value)\n@@ -114,7 +114,7 @@ public void FiltersOutUnsupportedCredentialsInToViewModel()\nvar result = controller.Account();\n// Assert\n- var model = ResultAssert.IsView<AccountViewModel>(result, viewName: \"Account\");\n+ var model = ResultAssert.IsView<UserAccountViewModel>(result, viewName: \"Account\");\nvar descs = model\n.CredentialGroups\n.SelectMany(x => x.Value)\n@@ -181,9 +181,9 @@ public async Task UpdatesEmailAllowedSetting()\n.Setup(u => u.ChangeEmailSubscriptionAsync(user, false, true))\n.Returns(Task.CompletedTask);\n- var result = await controller.ChangeEmailSubscription(new AccountViewModel\n+ var result = await controller.ChangeEmailSubscription(new UserAccountViewModel\n{\n- ChangeNotifications =\n+ ChangeNotifications = new ChangeNotificationsViewModel\n{\nEmailAllowed = false,\nNotifyPackagePushed = true\n@@ -1163,7 +1163,7 @@ public async Task DoesNotLetYouUseSomeoneElsesConfirmedEmailAddress()\ncontroller.SetCurrentUser(user);\nvar result = await controller.ChangeEmail(\n- new AccountViewModel()\n+ new UserAccountViewModel()\n{\nChangeEmail = new ChangeEmailViewModel\n{\n@@ -1199,7 +1199,7 @@ public async Task SendsEmailChangeConfirmationNoticeWhenChangingAConfirmedEmailA\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var model = new AccountViewModel()\n+ var model = new UserAccountViewModel()\n{\nChangeEmail = new ChangeEmailViewModel\n{\n@@ -1235,7 +1235,7 @@ public async Task DoesNotSendEmailChangeConfirmationNoticeWhenAddressDoesntChang\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var model = new AccountViewModel()\n+ var model = new UserAccountViewModel()\n{\nChangeEmail = new ChangeEmailViewModel\n{\n@@ -1272,7 +1272,7 @@ public async Task DoesNotSendEmailChangeConfirmationNoticeWhenUserWasNotConfirme\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var model = new AccountViewModel()\n+ var model = new UserAccountViewModel()\n{\nChangeEmail = new ChangeEmailViewModel\n{\n@@ -1309,7 +1309,7 @@ public async Task WhenPasswordValidationFailsErrorIsReturned()\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var model = new AccountViewModel\n+ var model = new UserAccountViewModel\n{\nChangeEmail = new ChangeEmailViewModel\n{\n@@ -1321,7 +1321,7 @@ public async Task WhenPasswordValidationFailsErrorIsReturned()\nvar result = await controller.ChangeEmail(model);\nAssert.IsType<ViewResult>(result);\n- Assert.IsType<AccountViewModel>(((ViewResult)result).Model);\n+ Assert.IsType<UserAccountViewModel>(((ViewResult)result).Model);\n}\n}\n@@ -1333,9 +1333,9 @@ public async Task GivenInvalidView_ItReturnsView()\n// Arrange\nvar controller = GetController<UsersController>();\ncontroller.ModelState.AddModelError(\"ChangePassword.blarg\", \"test\");\n- var inputModel = new AccountViewModel\n+ var inputModel = new UserAccountViewModel\n{\n- ChangePassword =\n+ ChangePassword = new ChangePasswordViewModel\n{\nEnablePasswordLogin = true,\n}\n@@ -1351,7 +1351,7 @@ public async Task GivenInvalidView_ItReturnsView()\nvar result = await controller.ChangePassword(inputModel);\n// Assert\n- var outputModel = ResultAssert.IsView<AccountViewModel>(result, viewName: \"Account\");\n+ var outputModel = ResultAssert.IsView<UserAccountViewModel>(result, viewName: \"Account\");\nAssert.Same(inputModel, outputModel);\n}\n@@ -1369,7 +1369,7 @@ public async Task GivenMismatchedNewPassword_ItAddsModelError()\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var inputModel = new AccountViewModel()\n+ var inputModel = new UserAccountViewModel()\n{\nChangePassword = new ChangePasswordViewModel()\n{\n@@ -1384,7 +1384,7 @@ public async Task GivenMismatchedNewPassword_ItAddsModelError()\nvar result = await controller.ChangePassword(inputModel);\n// Assert\n- var outputModel = ResultAssert.IsView<AccountViewModel>(result, viewName: \"Account\");\n+ var outputModel = ResultAssert.IsView<UserAccountViewModel>(result, viewName: \"Account\");\nAssert.Same(inputModel, outputModel);\nAssert.NotEqual(inputModel.ChangePassword.NewPassword, inputModel.ChangePassword.VerifyPassword);\n@@ -1410,7 +1410,7 @@ public async Task GivenFailureInAuthService_ItAddsModelError()\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var inputModel = new AccountViewModel()\n+ var inputModel = new UserAccountViewModel()\n{\nChangePassword = new ChangePasswordViewModel()\n{\n@@ -1425,7 +1425,7 @@ public async Task GivenFailureInAuthService_ItAddsModelError()\nvar result = await controller.ChangePassword(inputModel);\n// Assert\n- var outputModel = ResultAssert.IsView<AccountViewModel>(result, viewName: \"Account\");\n+ var outputModel = ResultAssert.IsView<UserAccountViewModel>(result, viewName: \"Account\");\nAssert.Same(inputModel, outputModel);\nvar errorMessages = controller\n@@ -1459,7 +1459,7 @@ public async Task GivenDisabledPasswordLogin_RemovesCredentialAndSendsNotice()\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var inputModel = new AccountViewModel()\n+ var inputModel = new UserAccountViewModel()\n{\nChangePassword = new ChangePasswordViewModel()\n{\n@@ -1487,7 +1487,7 @@ public async Task GivenSuccessInAuthService_ItRedirectsBackToManageCredentialsWi\n.CompletesWith(true);\nvar controller = GetController<UsersController>();\ncontroller.SetCurrentUser(user);\n- var inputModel = new AccountViewModel()\n+ var inputModel = new UserAccountViewModel()\n{\nChangePassword = new ChangePasswordViewModel()\n{\n@@ -1529,7 +1529,7 @@ public async Task GivenNoOldPassword_ItSendsAPasswordSetEmail()\ncontroller.SetCurrentUser(user);\n// Act\n- await controller.ChangePassword(new AccountViewModel());\n+ await controller.ChangePassword(new UserAccountViewModel());\n// Assert\nAssert.Equal(TestUtility.GallerySiteRootHttps + \"account/setpassword/test/t0k3n\", actualConfirmUrl);\n@@ -1551,7 +1551,7 @@ public async Task GivenNoOldPasswordForUnconfirmedAccount_ItAddsModelError()\ncontroller.SetCurrentUser(user);\n// Act\n- await controller.ChangePassword(new AccountViewModel());\n+ await controller.ChangePassword(new UserAccountViewModel());\n// Assert\nvar errorMessages = controller\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Create derived UserAccountViewModel for User (non-Organization) accounts (#5295)
|
455,794 |
26.01.2018 10:42:30
| 28,800 |
5b8fadd389be67f7384d5cae092652e663110055
|
Do not show organization packages on profile
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -590,7 +590,7 @@ public virtual ActionResult Profiles(string username, int page = 1)\nreturn HttpNotFound();\n}\n- var packages = _packageService.FindPackagesByAnyMatchingOwner(user, includeUnlisted: false)\n+ var packages = _packageService.FindPackagesByOwner(user, includeUnlisted: false)\n.OrderByDescending(p => p.PackageRegistration.DownloadCount)\n.Select(p => new ListPackageItemViewModel(p, user)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageService.cs",
"new_path": "src/NuGetGallery/Services/IPackageService.cs",
"diff": "@@ -29,8 +29,13 @@ public interface IPackageService : ICorePackageService\nPackage FindPackageByIdAndVersion(string id, string version, int? semVerLevelKey = null, bool allowPrerelease = true);\nPackage FindAbsoluteLatestPackageById(string id, int? semVerLevelKey);\n+\n+ IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false);\n+\nIEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted, bool includeVersions = false);\n+\nIEnumerable<PackageRegistration> FindPackageRegistrationsByOwner(User user);\n+\nIEnumerable<Package> FindDependentPackages(Package package);\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -211,6 +211,15 @@ public virtual Package FindAbsoluteLatestPackageById(string id, int? semVerLevel\nreturn package;\n}\n+ public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false)\n+ {\n+ var packages = GetPackagesForOwners(new[] { user.Key }, includeUnlisted);\n+\n+ return includeVersions\n+ ? packages\n+ : GetLatestPackageForEachRegistration(packages.ToList());\n+ }\n+\n/// <summary>\n/// Find packages by owner, including organization owners that the user belongs to.\n/// </summary>\n@@ -220,14 +229,10 @@ public IEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool inclu\nownerKeys.Insert(0, user.Key);\nvar packages = GetPackagesForOwners(ownerKeys, includeUnlisted);\n- if (includeVersions)\n- {\n- return packages;\n- }\n- else\n- {\n- return GetLatestPackageForEachRegistration(packages.ToList());\n- }\n+\n+ return includeVersions\n+ ? packages\n+ : GetLatestPackageForEachRegistration(packages.ToList());\n}\nprivate IEnumerable<Package> GetLatestPackageForEachRegistration(IReadOnlyCollection<Package> packages)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -901,11 +901,137 @@ public void ReturnsTheMostRecentVersionWhenSemVerLevel2()\n}\n}\n- public class TheFindPackagesByAnyMatchingOwnerMethod : TestContainer\n+ public class TheFindPackagesByOwnerMethod : TheFindPackagesByOwnersMethodsBase\n{\n- public static IEnumerable<object[]> TestData_PackageOwnerVariants\n+ public static IEnumerable<object[]> TestData_RoleVariants\n{\nget\n+ {\n+ var roles = TheFindPackagesByOwnersMethodsBase.CreateTestUserRoles();\n+\n+ yield return new object[] { roles.Admin, roles.Admin };\n+ yield return new object[] { roles.Organization, roles.Organization };\n+ }\n+ }\n+\n+ public override IEnumerable<Package> InvokeFindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false)\n+ {\n+ return PackageService.FindPackagesByOwner(user, includeUnlisted, includeVersions);\n+ }\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsAListedPackage(User currentUser, User packageOwner)\n+ => base.ReturnsAListedPackage(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(User currentUser, User packageOwner)\n+ => base.ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(User currentUser, User packageOwner)\n+ => base.ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsAPackageForEachPackageRegistration(User currentUser, User packageOwner)\n+ => base.ReturnsAPackageForEachPackageRegistration(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User currentUser, User packageOwner)\n+ => base.ReturnsOnlyLatestStableSemVer2PackageIfBothExist(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User currentUser, User packageOwner)\n+ => base.ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ => base.ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User packageOwner)\n+ => base.ReturnsFirstIfMultiplePackagesSetToLatest(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ => base.ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedTrue(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedFalse(User currentUser, User packageOwner)\n+ => base.ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedFalse(currentUser, packageOwner);\n+ }\n+\n+ public class TheFindPackagesByAnyMatchingOwnerMethod : TheFindPackagesByOwnersMethodsBase\n+ {\n+ public static IEnumerable<object[]> TestData_RoleVariants\n+ {\n+ get\n+ {\n+ var roles = TheFindPackagesByOwnersMethodsBase.CreateTestUserRoles();\n+\n+ yield return new object[] { roles.Admin, roles.Admin };\n+ yield return new object[] { roles.Admin, roles.Organization };\n+ yield return new object[] { roles.Collaborator, roles.Organization };\n+ }\n+ }\n+\n+ public override IEnumerable<Package> InvokeFindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false)\n+ {\n+ return PackageService.FindPackagesByAnyMatchingOwner(user, includeUnlisted, includeVersions);\n+ }\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsAListedPackage(User currentUser, User packageOwner)\n+ => base.ReturnsAListedPackage(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(User currentUser, User packageOwner)\n+ => base.ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(User currentUser, User packageOwner)\n+ => base.ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsAPackageForEachPackageRegistration(User currentUser, User packageOwner)\n+ => base.ReturnsAPackageForEachPackageRegistration(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User currentUser, User packageOwner)\n+ => base.ReturnsOnlyLatestStableSemVer2PackageIfBothExist(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User currentUser, User packageOwner)\n+ => base.ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ => base.ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User packageOwner)\n+ => base.ReturnsFirstIfMultiplePackagesSetToLatest(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ => base.ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedTrue(currentUser, packageOwner);\n+\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedFalse(User currentUser, User packageOwner)\n+ => base.ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedFalse(currentUser, packageOwner);\n+ }\n+\n+ public abstract class TheFindPackagesByOwnersMethodsBase : TestContainer\n+ {\n+ public abstract IEnumerable<Package> InvokeFindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false);\n+\n+ protected class TestUserRoles\n+ {\n+ public User Admin { get; set; }\n+ public User Collaborator { get; set; }\n+ public User Organization { get; set; }\n+ }\n+\n+ protected static TestUserRoles CreateTestUserRoles()\n{\nvar organization = new Organization { Username = \"organization\" };\n@@ -929,15 +1055,24 @@ public static IEnumerable<object[]> TestData_PackageOwnerVariants\norganization.Members.Add(collaboratorMembership);\ncollaborator.Organizations.Add(collaboratorMembership);\n- yield return new object[] { admin, admin };\n- yield return new object[] { admin, organization };\n- yield return new object[] { collaborator, organization };\n+ return new TestUserRoles\n+ {\n+ Organization = organization,\n+ Admin = admin,\n+ Collaborator = collaborator\n+ };\n+ }\n+\n+ protected IPackageService PackageService\n+ {\n+ get\n+ {\n+ return GetService<PackageService>();\n}\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsAListedPackage(User currentUser, User packageOwner)\n+ public virtual void ReturnsAListedPackage(User currentUser, User packageOwner)\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatestSemVer2 = true, IsLatestStableSemVer2 = true };\n@@ -947,15 +1082,13 @@ public void ReturnsAListedPackage(User currentUser, User packageOwner)\ncontext.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false);\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: false);\nAssert.Equal(1, packages.Count());\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(User currentUser, User packageOwner)\n+ public virtual void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(User currentUser, User packageOwner)\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = false, IsLatest = false, IsLatestStable = false };\n@@ -965,15 +1098,13 @@ public void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(User currentUser\ncontext.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false);\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: false);\nAssert.Equal(0, packages.Count());\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(User currentUser, User packageOwner)\n+ public virtual void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(User currentUser, User packageOwner)\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = false, IsLatest = false, IsLatestStable = false };\n@@ -983,15 +1114,13 @@ public void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(User currentUser,\ncontext.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: true);\nAssert.Equal(1, packages.Count());\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsAPackageForEachPackageRegistration(User currentUser, User packageOwner)\n+ public virtual void ReturnsAPackageForEachPackageRegistration(User currentUser, User packageOwner)\n{\nvar packageRegistrationA = new PackageRegistration { Id = \"idA\", Owners = { packageOwner } };\nvar packageRegistrationB = new PackageRegistration { Id = \"idB\", Owners = { packageOwner } };\n@@ -1006,17 +1135,15 @@ public void ReturnsAPackageForEachPackageRegistration(User currentUser, User pac\ncontext.PackageRegistrations.Add(packageRegistrationB);\ncontext.Packages.Add(packageA);\ncontext.Packages.Add(packageB);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false).ToList();\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(2, packages.Count);\nAssert.Contains(packageA, packages);\nAssert.Contains(packageB, packages);\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User currentUser, User packageOwner)\n+ public virtual void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User currentUser, User packageOwner)\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar latestPackage = new Package { Version = \"2.0.0-alpha\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true };\n@@ -1030,16 +1157,14 @@ public void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User currentUser, U\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(latestPackage);\ncontext.Packages.Add(latestStablePackage);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false).ToList();\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(1, packages.Count);\nAssert.Contains(latestStablePackage, packages);\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User currentUser, User packageOwner)\n+ public virtual void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User currentUser, User packageOwner)\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar latestPackage = new Package { Version = \"2.0.0-alpha\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true };\n@@ -1052,9 +1177,8 @@ public void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User curr\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(latestPackage);\ncontext.Packages.Add(latestStablePackage);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false).ToList();\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(1, packages.Count);\nAssert.Contains(latestStablePackage, packages);\n}\n@@ -1108,13 +1232,11 @@ private FakeEntitiesContext GetMixedVersioningPackagesContext(User currentUser,\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ public virtual void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n{\nvar context = GetMixedVersioningPackagesContext(currentUser, packageOwner);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true).ToList();\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: true).ToList();\nvar nugetCatalogReaderPackage = packages.Single(p => p.PackageRegistration.Id == \"NuGet.CatalogReader\");\nAssert.Equal(\"1.5.12+git.78e44a8\", NuGetVersionFormatter.ToFullStringOrFallback(nugetCatalogReaderPackage.Version, fallback: nugetCatalogReaderPackage.Version));\n@@ -1124,8 +1246,7 @@ public void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersio\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User packageOwner)\n+ public virtual void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User packageOwner)\n{\n// Verify behavior to work around IsLatest concurrency issue: https://github.com/NuGet/NuGetGallery/issues/2514\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\n@@ -1139,16 +1260,14 @@ public void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User pac\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package2);\ncontext.Packages.Add(package1);\n- var service = Get<PackageService>();\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false);\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: false);\nAssert.Equal(1, packages.Count());\nAssert.Contains(package2, packages);\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ public virtual void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedTrue(User currentUser, User packageOwner)\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package1 = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = false, IsLatest = false, IsLatestStable = false };\n@@ -1163,15 +1282,12 @@ public void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedTrue(User c\ncontext.Packages.Add(package1);\ncontext.Packages.Add(package2);\n- var service = Get<PackageService>();\n-\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true, includeVersions: true);\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: true, includeVersions: true);\nAssert.Equal(2, packages.Count());\n}\n[Theory]\n- [MemberData(nameof(TestData_PackageOwnerVariants))]\n- public void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedFalse(User currentUser, User packageOwner)\n+ public virtual void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedFalse(User currentUser, User packageOwner)\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package1 = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = false, IsLatest = false, IsLatestStable = false };\n@@ -1186,9 +1302,7 @@ public void ReturnsVersionsWhenIncludedVersionsIsTrue_IncludeUnlistedFalse(User\ncontext.Packages.Add(package1);\ncontext.Packages.Add(package2);\n- var service = Get<PackageService>();\n-\n- var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false, includeVersions: true);\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: false, includeVersions: true);\nAssert.Equal(1, packages.Count());\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Do not show organization packages on profile (#5349)
|
455,751 |
26.01.2018 12:38:37
| 28,800 |
8333e17e01e91f0903fe371871dd75910042b5d5
|
Audit for DeleteAccount
Support for audit delete account-updated.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery.Core/Auditing/AuditedDeleteAccountAction.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+namespace NuGetGallery.Auditing\n+{\n+ public enum AuditedDeleteAccountAction\n+ {\n+ DeleteAccount,\n+ RequestAccountDeletion\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": "</ItemGroup>\n<ItemGroup>\n<Compile Include=\"Auditing\\AggregateAuditingService.cs\" />\n+ <Compile Include=\"Auditing\\AuditedDeleteAccountAction.cs\" />\n<Compile Include=\"Auditing\\Obfuscation\\ObfuscateAttribute.cs\" />\n<Compile Include=\"Auditing\\Obfuscation\\ObfuscationType.cs\" />\n<Compile Include=\"Auditing\\Obfuscation\\ObfuscatorJsonConverter.cs\" />\n<Compile Include=\"Auditing\\AuditRecord.cs\" />\n<Compile Include=\"Auditing\\FailedAuthenticatedOperationAuditRecord.cs\" />\n<Compile Include=\"Auditing\\Obfuscation\\Obfuscator.cs\" />\n+ <Compile Include=\"Auditing\\DeleteAccountAuditRecord.cs\" />\n<Compile Include=\"Auditing\\ReservedNamespaceAuditRecord.cs\" />\n<Compile Include=\"Auditing\\UserSecurityPolicyAuditRecord.cs\" />\n<Compile Include=\"Auditing\\FileSystemAuditingService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs",
"diff": "@@ -53,5 +53,6 @@ public interface ISupportRequestService\nTask UpdateAdminAsync(int adminId, string galleryUsername, string pagerDutyUsername);\nTask AddAdminAsync(string galleryUsername, string pagerDutyUsername);\nTask DeleteSupportRequestsAsync(string createdBy);\n+ Task<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.Linq;\nusing System.Threading.Tasks;\nusing NuGetGallery.Areas.Admin.Models;\n+using NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\nnamespace NuGetGallery.Areas.Admin\n@@ -16,18 +17,21 @@ public class SupportRequestService\n: ISupportRequestService\n{\nprivate readonly ISupportRequestDbContext _supportRequestDbContext;\n+ private IAuditingService _auditingService;\nprivate readonly PagerDutyClient _pagerDutyClient;\nprivate readonly string _siteRoot;\nprivate const string _unassignedAdmin = \"unassigned\";\npublic SupportRequestService(\nISupportRequestDbContext supportRequestDbContext,\n- IAppConfiguration config)\n+ IAppConfiguration config,\n+ IAuditingService auditingService)\n{\n_supportRequestDbContext = supportRequestDbContext;\n_siteRoot = config.SiteRoot;\n_pagerDutyClient = new PagerDutyClient(config.PagerDutyAccountName, config.PagerDutyAPIKey, config.PagerDutyServiceKey);\n+ _auditingService = auditingService ?? throw new ArgumentNullException(nameof(auditingService));\n}\npublic IReadOnlyCollection<Models.Admin> GetAllAdmins()\n@@ -237,7 +241,6 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\nnewIssue.PackageRegistrationKey = package?.PackageRegistrationKey;\nawait AddIssueAsync(newIssue);\n-\nreturn newIssue;\n}\ncatch (SqlException sqlException)\n@@ -250,8 +253,7 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\npackageInfo = $\"{package.PackageRegistration.Id} v{package.Version}\";\n}\n- var errorMessage = $\"Error while submitting support request at {DateTime.UtcNow}. User requesting support = {loggedInUser}. Support reason = {reason ?? \"N/A\"}. Package info = {packageInfo}\";\n-\n+ var errorMessage = $\"Error while submitting support request at {DateTime.UtcNow}. Support reason = {reason ?? \"N/A\"}. Package info = {packageInfo}\";\nawait _pagerDutyClient.TriggerIncidentAsync(errorMessage);\n}\ncatch (Exception e) //In case getting data from PagerDuty has failed\n@@ -262,6 +264,22 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\nreturn null;\n}\n+ public async Task<bool> TryAddDeleteSupportRequestAsync(User user)\n+ {\n+ var requestSent = await AddNewSupportRequestAsync(\n+ Strings.AccountDelete_SupportRequestTitle,\n+ Strings.AccountDelete_SupportRequestTitle,\n+ user.EmailAddress,\n+ \"The user requested to have the account deleted.\",\n+ user) != null;\n+ var status = requestSent ? DeleteAccountAuditRecord.ActionStatus.Success : DeleteAccountAuditRecord.ActionStatus.Failure;\n+ await _auditingService.SaveAuditRecordAsync(new DeleteAccountAuditRecord(username: user.Username,\n+ status: status,\n+ action: AuditedDeleteAccountAction.RequestAccountDeletion));\n+\n+ return requestSent;\n+ }\n+\nprivate async Task AddIssueAsync(Issue issue)\n{\n_supportRequestDbContext.Issues.Add(issue);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -235,13 +235,7 @@ public virtual async Task<ActionResult> RequestAccountDeletion()\nreturn HttpNotFound(\"User not found.\");\n}\n- var supportRequest = await _supportRequestService.AddNewSupportRequestAsync(\n- Strings.AccountDelete_SupportRequestTitle,\n- Strings.AccountDelete_SupportRequestTitle,\n- user.EmailAddress,\n- \"The user requested to have the account deleted.\",\n- user);\n- var isSupportRequestCreated = supportRequest != null;\n+ var isSupportRequestCreated = await _supportRequestService.TryAddDeleteSupportRequestAsync(user);\nif (!isSupportRequestCreated)\n{\nTempData[\"RequestFailedMessage\"] = Strings.AccountDelete_CreateSupportRequestFails;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "using System.Globalization;\nusing System.Linq;\nusing System.Threading.Tasks;\n-using System.Transactions;\n-using NuGetGallery.Authentication;\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.ViewModels;\n+using NuGetGallery.Auditing;\n+using NuGetGallery.Authentication;\nusing NuGetGallery.Security;\nnamespace NuGetGallery\n@@ -24,6 +24,7 @@ public class DeleteAccountService : IDeleteAccountService\nprivate readonly AuthenticationService _authService;\nprivate readonly IEntityRepository<User> _userRepository;\nprivate readonly ISupportRequestService _supportRequestService;\n+ private readonly IAuditingService _auditingService;\npublic DeleteAccountService(IEntityRepository<AccountDelete> accountDeleteRepository,\nIEntityRepository<User> userRepository,\n@@ -33,7 +34,8 @@ public class DeleteAccountService : IDeleteAccountService\nIReservedNamespaceService reservedNamespaceService,\nISecurityPolicyService securityPolicyService,\nAuthenticationService authService,\n- ISupportRequestService supportRequestService\n+ ISupportRequestService supportRequestService,\n+ IAuditingService auditingService\n)\n{\n_accountDeleteRepository = accountDeleteRepository ?? throw new ArgumentNullException(nameof(accountDeleteRepository));\n@@ -45,6 +47,7 @@ ISupportRequestService supportRequestService\n_securityPolicyService = securityPolicyService ?? throw new ArgumentNullException(nameof(securityPolicyService));\n_authService = authService ?? throw new ArgumentNullException(nameof(authService));\n_supportRequestService = supportRequestService ?? throw new ArgumentNullException(nameof(supportRequestService));\n+ _auditingService = auditingService ?? throw new ArgumentNullException(nameof(auditingService));\n}\n/// <summary>\n@@ -130,6 +133,10 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\n{\nawait DeleteGalleryUserAccountImplAsync(userToBeDeleted, admin, signature, unlistOrphanPackages);\n}\n+ await _auditingService.SaveAuditRecordAsync(new DeleteAccountAuditRecord(username: userToBeDeleted.Username,\n+ status: DeleteAccountAuditRecord.ActionStatus.Success,\n+ action: AuditedDeleteAccountAction.DeleteAccount,\n+ adminUsername: admin.Username));\nreturn new DeleteUserAccountStatus()\n{\nSuccess = true,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -2336,8 +2336,8 @@ public async Task RequestDeleteAccountAsync(bool successOnSentRequest)\n.Setup(stub => stub.GetIssues(null, null, null, userName))\n.Returns(issues);\nGetMock<ISupportRequestService>()\n- .Setup(stub => stub.AddNewSupportRequestAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), testUser, null))\n- .ReturnsAsync(successOnSentRequest ? new Issue() : (Issue)null);\n+ .Setup(stub => stub.TryAddDeleteSupportRequestAsync(testUser))\n+ .ReturnsAsync(successOnSentRequest);\n// act\nvar result = await controller.RequestAccountDeletion() as RedirectToRouteResult;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "using System.Threading.Tasks;\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.Models;\n+using NuGetGallery.Auditing;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Security;\n@@ -160,6 +161,9 @@ await deleteAccountService.\nAssert.Equal<int>(1, testableService.DeletedAccounts.Count());\nAssert.Equal<string>(signature, testableService.DeletedAccounts.ElementAt(0).Signature);\nAssert.Equal<int>(1, testableService.SupportRequests.Count);\n+ Assert.Equal(1, testableService.AuditService.Records.Count);\n+ var deleteRecord = testableService.AuditService.Records[0] as DeleteAccountAuditRecord;\n+ Assert.True(deleteRecord != null);\n}\nprivate static User CreateTestData(ref PackageRegistration registration)\n@@ -194,6 +198,7 @@ public class DeleteAccountTestService\npublic List<AccountDelete> DeletedAccounts = new List<AccountDelete>();\npublic List<Issue> SupportRequests = new List<Issue>();\n+ public FakeAuditingService AuditService;\npublic DeleteAccountTestService(User user, PackageRegistration userPackagesRegistration)\n{\n@@ -221,6 +226,8 @@ public DeleteAccountTestService(User user, PackageRegistration userPackagesRegis\nIssueStatusId = IssueStatusKeys.New,\nHistoryEntries = new List<History>() { new History() { EditedBy = $\"{user.Username}_second\", IssueId = 2, Key = 2, IssueStatusId = IssueStatusKeys.New } }\n});\n+\n+ AuditService = new FakeAuditingService();\n}\npublic DeleteAccountService GetDeleteAccountService()\n@@ -233,7 +240,19 @@ public DeleteAccountService GetDeleteAccountService()\nSetupReservedNamespaceService().Object,\nSetupSecurityPolicyService().Object,\nnew TestableAuthService(),\n- SetupSupportRequestService().Object);\n+ SetupSupportRequestService().Object,\n+ AuditService);\n+ }\n+\n+ public class FakeAuditingService : IAuditingService\n+ {\n+ public List<AuditRecord> Records = new List<AuditRecord>();\n+\n+ public Task SaveAuditRecordAsync(AuditRecord record)\n+ {\n+ Records.Add(record);\n+ return Task.FromResult(true);\n+ }\n}\nprivate class TestableAuthService : AuthenticationService\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SupportRequestServiceFacts.cs",
"diff": "using System.Collections.Generic;\nusing System.Data.Entity;\nusing System.Linq;\n-using System.Net.Mail;\nusing System.Threading.Tasks;\nusing NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.Models;\n+using NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\nusing Moq;\nusing Xunit;\n@@ -23,8 +23,9 @@ public class TheDeleteSupportRequestsAsync\npublic async Task DeleteRequestsNullInput()\n{\n// Arrange\n+ var auditingService = new Mock<IAuditingService>();\nTestSupportRequestDbContext supportRequestContext = new TestSupportRequestDbContext();\n- SupportRequestService supportRequestService = new SupportRequestService(supportRequestContext, GetAppConfig());\n+ SupportRequestService supportRequestService = new SupportRequestService(supportRequestContext, GetAppConfig(), auditingService.Object);\n// Act + Assert\nawait Assert.ThrowsAsync<ArgumentNullException>(() => supportRequestService.DeleteSupportRequestsAsync(null));\n@@ -70,7 +71,8 @@ public async Task DeleteRequestsNormalPath()\nsupportRequestContext.Issues.Add(JoesOldIssue);\nsupportRequestContext.Issues.Add(randomIssue);\n- SupportRequestService supportRequestService = new SupportRequestService(supportRequestContext, GetAppConfig());\n+ var auditingService = new Mock<IAuditingService>();\n+ SupportRequestService supportRequestService = new SupportRequestService(supportRequestContext, GetAppConfig(),auditingService.Object);\n// Act\nawait supportRequestService.DeleteSupportRequestsAsync(userName);\n@@ -84,6 +86,36 @@ public async Task DeleteRequestsNormalPath()\nAssert.Null(deleteRequestIssue.CreatedBy);\nAssert.Null(deleteRequestIssue.HistoryEntries.ElementAt(0).EditedBy);\n}\n+\n+ [Fact]\n+ public async Task DeleteAccountRequestWillAudit()\n+ {\n+ // Arrange\n+ var auditingService = new FakeAuditingService();\n+ TestSupportRequestDbContext supportRequestContext = new TestSupportRequestDbContext();\n+ SupportRequestService supportRequestService = new SupportRequestService(supportRequestContext, GetAppConfig(), auditingService);\n+ User user = new User(\"testUser\");\n+\n+ // Act\n+ await supportRequestService.TryAddDeleteSupportRequestAsync(user);\n+\n+ // Assert\n+ Assert.Equal(1, auditingService.Records.Count);\n+ var deleteRecord = auditingService.Records[0] as DeleteAccountAuditRecord;\n+ Assert.True(deleteRecord != null);\n+ Assert.Equal(DeleteAccountAuditRecord.ActionStatus.Success, deleteRecord.Status);\n+ }\n+ }\n+\n+ internal class FakeAuditingService : IAuditingService\n+ {\n+ public List<AuditRecord> Records = new List<AuditRecord>();\n+\n+ public Task SaveAuditRecordAsync(AuditRecord record)\n+ {\n+ Records.Add(record);\n+ return Task.FromResult(true);\n+ }\n}\nstatic IAppConfiguration GetAppConfig()\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Audit for DeleteAccount (#5297)
Support for audit delete account-updated.
|
455,776 |
26.01.2018 14:36:37
| 28,800 |
cb773cf6ab55a61d880a18ee38e3834352a62f34
|
Profile page should only show "Edit", "Manage Package Owners", and "Delete" links when the current user has permission
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -196,27 +196,27 @@ private ActionResult TransformToOrganizationFailed(string errorMessage)\n[Authorize]\npublic virtual ActionResult DeleteRequest()\n{\n- var user = GetCurrentUser();\n+ var currentUser = GetCurrentUser();\n- if (user == null || user.IsDeleted)\n+ if (currentUser == null || currentUser.IsDeleted)\n{\nreturn HttpNotFound(\"User not found.\");\n}\nvar listPackageItems = _packageService\n- .FindPackagesByAnyMatchingOwner(user, includeUnlisted: true)\n- .Select(p => new ListPackageItemViewModel(p, user))\n+ .FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true)\n+ .Select(p => new ListPackageItemViewModel(p, currentUser))\n.ToList();\n- bool hasPendingRequest = _supportRequestService.GetIssues().Where((issue) => (issue.UserKey.HasValue && issue.UserKey.Value == user.Key) &&\n+ bool hasPendingRequest = _supportRequestService.GetIssues().Where((issue) => (issue.UserKey.HasValue && issue.UserKey.Value == currentUser.Key) &&\nstring.Equals(issue.IssueTitle, Strings.AccountDelete_SupportRequestTitle) &&\nissue.Key != IssueStatusKeys.Resolved).Any();\nvar model = new DeleteAccountViewModel()\n{\nPackages = listPackageItems,\n- User = user,\n- AccountName = user.Username,\n+ User = currentUser,\n+ AccountName = currentUser.Username,\nHasPendingRequests = hasPendingRequest\n};\n@@ -250,6 +250,7 @@ public virtual async Task<ActionResult> RequestAccountDeletion()\n[Authorize(Roles = \"Admins\")]\npublic virtual ActionResult Delete(string accountName)\n{\n+ var currentUser = GetCurrentUser();\nvar user = _userService.FindByUsername(accountName);\nif (user == null || user.IsDeleted || (user is Organization))\n{\n@@ -258,7 +259,7 @@ public virtual ActionResult Delete(string accountName)\nvar listPackageItems = _packageService\n.FindPackagesByAnyMatchingOwner(user, includeUnlisted: true)\n- .Select(p => new ListPackageItemViewModel(p, user))\n+ .Select(p => new ListPackageItemViewModel(p, currentUser))\n.ToList();\nvar model = new DeleteUserAccountViewModel\n{\n@@ -578,6 +579,7 @@ public virtual async Task<ActionResult> Confirm(string username, string token)\n[HttpGet]\npublic virtual ActionResult Profiles(string username, int page = 1)\n{\n+ var currentUser = GetCurrentUser();\nvar user = _userService.FindByUsername(username);\nif (user == null || user.IsDeleted)\n{\n@@ -586,7 +588,7 @@ public virtual ActionResult Profiles(string username, int page = 1)\nvar packages = _packageService.FindPackagesByOwner(user, includeUnlisted: false)\n.OrderByDescending(p => p.PackageRegistration.DownloadCount)\n- .Select(p => new ListPackageItemViewModel(p, user)\n+ .Select(p => new ListPackageItemViewModel(p, currentUser)\n{\nDownloadCount = p.PackageRegistration.DownloadCount\n}).ToList();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1137,6 +1137,188 @@ public async Task SendsNotificationMailToUser()\n}\n}\n+ public class TheProfilesAction : TestContainer\n+ {\n+ public static IEnumerable<object[]> Returns404ForMissingOrDeletedUser_Data\n+ {\n+ get\n+ {\n+ yield return MemberDataHelper.AsData((User)null);\n+ yield return MemberDataHelper.AsData(new User(\"test\") { IsDeleted = true });\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(Returns404ForMissingOrDeletedUser_Data))]\n+ public void Returns404ForMissingOrDeletedUser(User user)\n+ {\n+ // Arrange\n+ var username = \"test\";\n+\n+ GetMock<IUserService>()\n+ .Setup(x => x.FindByUsername(username))\n+ .Returns(user);\n+\n+ var controller = GetController<UsersController>();\n+\n+ // Act\n+ var result = controller.Profiles(username);\n+\n+ // Assert\n+ ResultAssert.IsStatusCode(result, HttpStatusCode.NotFound);\n+ }\n+\n+ public static IEnumerable<object[]> PossibleOwnershipScenarios_Data\n+ {\n+ get\n+ {\n+ yield return MemberDataHelper.AsData(null, TestUtility.FakeUser);\n+ yield return MemberDataHelper.AsData(TestUtility.FakeUser, new User(\"randomUser\") { Key = 5535 });\n+ yield return MemberDataHelper.AsData(TestUtility.FakeUser, TestUtility.FakeUser);\n+ yield return MemberDataHelper.AsData(TestUtility.FakeAdminUser, TestUtility.FakeUser);\n+ yield return MemberDataHelper.AsData(TestUtility.FakeAdminUser, TestUtility.FakeOrganization);\n+ yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationAdmin, TestUtility.FakeOrganization);\n+ yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization);\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(PossibleOwnershipScenarios_Data))]\n+ public void ReturnsSinglePackageAsExpected(User currentUser, User owner)\n+ {\n+ // Arrange\n+ var username = \"test\";\n+\n+ var package = new Package\n+ {\n+ Version = \"1.1.1\",\n+\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"package\",\n+ Owners = new[] { owner },\n+ DownloadCount = 150\n+ },\n+\n+ DownloadCount = 100\n+ };\n+\n+ GetMock<IUserService>()\n+ .Setup(x => x.FindByUsername(username))\n+ .Returns(owner);\n+\n+ GetMock<IPackageService>()\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false))\n+ .Returns(new[] { package });\n+\n+ var controller = GetController<UsersController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ // Act\n+ var result = controller.Profiles(username);\n+\n+ // Assert\n+ var model = ResultAssert.IsView<UserProfileModel>(result);\n+ AssertUserProfileModel(model, currentUser, owner, package);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(PossibleOwnershipScenarios_Data))]\n+ public void SortsPackagesByDownloadCount(User currentUser, User owner)\n+ {\n+ // Arrange\n+ var username = \"test\";\n+\n+ var package1 = new Package\n+ {\n+ Version = \"1.1.1\",\n+\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"package\",\n+ Owners = new[] { owner },\n+ DownloadCount = 150\n+ },\n+\n+ DownloadCount = 100\n+ };\n+\n+ var package2 = new Package\n+ {\n+ Version = \"1.32.1\",\n+\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"otherPackage\",\n+ Owners = new[] { owner },\n+ DownloadCount = 200\n+ },\n+\n+ DownloadCount = 150\n+ };\n+\n+ GetMock<IUserService>()\n+ .Setup(x => x.FindByUsername(username))\n+ .Returns(owner);\n+\n+ GetMock<IPackageService>()\n+ .Setup(x => x.FindPackagesByOwner(owner, false, false))\n+ .Returns(new[] { package1, package2 });\n+\n+ var controller = GetController<UsersController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ // Act\n+ var result = controller.Profiles(username);\n+\n+ // Assert\n+ var model = ResultAssert.IsView<UserProfileModel>(result);\n+ AssertUserProfileModel(model, currentUser, owner, package2, package1);\n+ }\n+\n+ private void AssertUserProfileModel(UserProfileModel model, User currentUser, User owner, params Package[] orderedPackages)\n+ {\n+ Assert.Equal(owner, model.User);\n+ Assert.Equal(owner.EmailAddress, model.EmailAddress);\n+ Assert.Equal(owner.Username, model.Username);\n+ Assert.Equal(orderedPackages.Count(), model.TotalPackages);\n+ Assert.Equal(orderedPackages.Sum(p => p.PackageRegistration.DownloadCount), model.TotalPackageDownloadCount);\n+\n+ var orderedPackagesIndex = 0;\n+ foreach (var package in model.AllPackages)\n+ {\n+ AssertListPackageItemViewModel(package, currentUser, orderedPackages[orderedPackagesIndex++]);\n+ }\n+ }\n+\n+ private void AssertListPackageItemViewModel(\n+ ListPackageItemViewModel packageModel,\n+ User currentUser,\n+ Package package)\n+ {\n+ Assert.Equal(package.PackageRegistration.Id, packageModel.Id);\n+ Assert.Equal(package.Version, packageModel.Version);\n+ Assert.Equal(package.PackageRegistration.DownloadCount, packageModel.DownloadCount);\n+\n+ AssertListPackageItemViewModelPermissions(packageModel, p => p.CanDisplayPrivateMetadata, currentUser, package, ActionsRequiringPermissions.DisplayPrivatePackageMetadata);\n+ AssertListPackageItemViewModelPermissions(packageModel, p => p.CanEdit, currentUser, package, ActionsRequiringPermissions.EditPackage);\n+ AssertListPackageItemViewModelPermissions(packageModel, p => p.CanUnlistOrRelist, currentUser, package, ActionsRequiringPermissions.UnlistOrRelistPackage);\n+ AssertListPackageItemViewModelPermissions(packageModel, p => p.CanManageOwners, currentUser, package, ActionsRequiringPermissions.ManagePackageOwnership);\n+ AssertListPackageItemViewModelPermissions(packageModel, p => p.CanReportAsOwner, currentUser, package, ActionsRequiringPermissions.ReportPackageAsOwner);\n+ }\n+\n+ private void AssertListPackageItemViewModelPermissions(\n+ ListPackageItemViewModel packageModel,\n+ Func<ListPackageItemViewModel, bool> getPermissionsField,\n+ User currentUser,\n+ Package package,\n+ IActionRequiringEntityPermissions<Package> action)\n+ {\n+ var expectedPermissions = action.CheckPermissionsOnBehalfOfAnyAccount(currentUser, package) == PermissionsCheckResult.Allowed;\n+ Assert.Equal(expectedPermissions, getPermissionsField(packageModel));\n+ }\n+ }\n+\npublic class TheChangeEmailAction : TestContainer\n{\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Profile page should only show "Edit", "Manage Package Owners", and "Delete" links when the current user has permission (#5342)
|
455,794 |
29.01.2018 08:20:57
| 28,800 |
9b79fd6f8d2c986cb1f3bff12209ac483db723c7
|
ApiKeys fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"diff": "return this.PendingPackages().length;\n}, this);\nthis.SelectedCountLabel = ko.pureComputed(function () {\n- return ko.unwrap(SelectedCount).toLocaleString()\n+ return ko.unwrap(this.SelectedCount).toLocaleString()\n+ ' of '\n- + ko.unwrap(TotalCount).toLocaleString()\n- + ' package' + (TotalCount == 1 ? '' : 's')\n+ + ko.unwrap(this.TotalCount).toLocaleString()\n+ + ' package' + (this.TotalCount == 1 ? '' : 's')\n+ ' selected';\n}, this);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
ApiKeys fix (#5366)
|
455,776 |
30.01.2018 12:25:30
| 28,800 |
116b8a6c4f48467684bc9d18f98af9345f97e776
|
Update External Account Linking Flow
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CredentialAuditRecord.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CredentialAuditRecord.cs",
"diff": "@@ -31,10 +31,19 @@ public CredentialAuditRecord(Credential credential, bool removed)\nIdentity = credential.Identity;\n// Track the value for credentials that are definitely revocable (API Key, etc.) and have been removed\n- if (removed && !CredentialTypes.IsPassword(credential.Type))\n+ if (removed)\n+ {\n+ if (Type == null)\n+ {\n+ throw new ArgumentNullException(nameof(credential.Type));\n+ }\n+\n+ if (!credential.IsPassword())\n{\nValue = credential.Value;\n}\n+ }\n+\nCreated = credential.Created;\nExpires = credential.Expires;\nLastUsed = credential.LastUsed;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CredentialTypes.cs",
"new_path": "src/NuGetGallery.Core/CredentialTypes.cs",
"diff": "@@ -29,24 +29,24 @@ public static class ApiKey\npublic const string ExternalPrefix = \"external.\";\n- public static bool IsPassword(string type)\n- {\n- if (type == null)\n+ public static bool IsPassword(this Credential c)\n{\n- throw new ArgumentNullException(nameof(type));\n+ return c?.Type?.StartsWith(Password.Prefix, StringComparison.OrdinalIgnoreCase) ?? false;\n}\n- return type.StartsWith(Password.Prefix, StringComparison.OrdinalIgnoreCase);\n+ public static bool IsExternal(this Credential c)\n+ {\n+ return c?.Type?.StartsWith(ExternalPrefix, StringComparison.OrdinalIgnoreCase) ?? false;\n}\n- public static bool IsApiKey(string type)\n+ public static bool IsApiKey(this Credential c)\n{\n- return type.StartsWith(ApiKey.Prefix, StringComparison.OrdinalIgnoreCase);\n+ return c?.Type?.StartsWith(ApiKey.Prefix, StringComparison.OrdinalIgnoreCase) ?? false;\n}\n- public static bool IsPackageVerificationApiKey(string type)\n+ public static bool IsType(this Credential c, string type)\n{\n- return type.Equals(ApiKey.VerifyV1, StringComparison.OrdinalIgnoreCase);\n+ return c?.Type?.Equals(type, StringComparison.OrdinalIgnoreCase) ?? false;\n}\ninternal static IReadOnlyList<string> SupportedCredentialTypes = new List<string>\n@@ -79,13 +79,29 @@ public static bool IsSupportedCredential(this Credential credential)\n/// <returns></returns>\npublic static bool IsViewSupportedCredential(this Credential credential)\n{\n- return SupportedCredentialTypes.Any(credType => string.Compare(credential.Type, credType, StringComparison.OrdinalIgnoreCase) == 0)\n- || credential.Type.StartsWith(ExternalPrefix, StringComparison.OrdinalIgnoreCase);\n+ return\n+ SupportedCredentialTypes.Any(credType => credential.IsType(credType)) ||\n+ credential.IsExternal();\n}\npublic static bool IsScopedApiKey(this Credential credential)\n{\nreturn IsApiKey(credential.Type) && credential.Scopes != null && credential.Scopes.Any();\n}\n+\n+ public static bool IsPassword(string type)\n+ {\n+ return type?.StartsWith(Password.Prefix, StringComparison.OrdinalIgnoreCase) ?? false;\n+ }\n+\n+ public static bool IsApiKey(string type)\n+ {\n+ return type?.StartsWith(ApiKey.Prefix, StringComparison.OrdinalIgnoreCase) ?? false;\n+ }\n+\n+ public static bool IsPackageVerificationApiKey(string type)\n+ {\n+ return type?.Equals(ApiKey.VerifyV1, StringComparison.OrdinalIgnoreCase) ?? false;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -128,7 +128,7 @@ public virtual async Task<PasswordAuthenticationResult> Authenticate(string user\nvar passwordCredentials = user\n.Credentials\n- .Where(c => CredentialTypes.IsPassword(c.Type))\n+ .Where(c => c.IsPassword())\n.ToList();\nif (passwordCredentials.Count > 1 ||\n@@ -160,7 +160,7 @@ public virtual async Task<AuthenticatedUser> Authenticate(Credential credential)\nprivate async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Credential> matchCredential, Credential credential)\n{\n- if (credential.Type.StartsWith(CredentialTypes.Password.Prefix, StringComparison.OrdinalIgnoreCase))\n+ if (credential.IsPassword())\n{\n// Password credentials cannot be used this way.\nthrow new ArgumentException(Strings.PasswordCredentialsCannotBeUsedHere, nameof(credential));\n@@ -201,7 +201,7 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\nreturn null;\n}\n- if (CredentialTypes.IsApiKey(matched.Type) &&\n+ if (matched.IsApiKey() &&\n!matched.IsScopedApiKey() &&\n!matched.HasBeenUsedInLastDays(_config.ExpirationInDaysForApiKeyV1))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectory/AzureActiveDirectoryAuthenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectory/AzureActiveDirectoryAuthenticator.cs",
"diff": "@@ -17,6 +17,7 @@ namespace NuGetGallery.Authentication.Providers.AzureActiveDirectory\npublic class AzureActiveDirectoryAuthenticator : Authenticator<AzureActiveDirectoryAuthenticatorConfiguration>\n{\npublic static readonly string DefaultAuthenticationType = \"AzureActiveDirectory\";\n+ public static readonly string ClaimTypeName = \"name\";\nprotected override void AttachToOwinApp(IGalleryConfigurationService config, IAppBuilder app)\n{\n@@ -83,7 +84,7 @@ public override ActionResult Challenge(string redirectUrl)\npublic override IdentityInformation GetIdentityInformation(ClaimsIdentity claimsIdentity)\n{\n- return ClaimsExtentions.GetIdentityInformation(claimsIdentity, DefaultAuthenticationType);\n+ return ClaimsExtentions.GetIdentityInformation(claimsIdentity, DefaultAuthenticationType, ClaimTypes.NameIdentifier, ClaimTypeName, ClaimTypes.Name);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/Utils/ClaimsExtentions.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/Utils/ClaimsExtentions.cs",
"diff": "@@ -10,19 +10,24 @@ public static class ClaimsExtentions\n{\npublic static IdentityInformation GetIdentityInformation(ClaimsIdentity claimsIdentity, string authType)\n{\n- var identifierClaim = claimsIdentity.FindFirst(ClaimTypes.NameIdentifier);\n+ return GetIdentityInformation(claimsIdentity, authType, ClaimTypes.NameIdentifier, ClaimTypes.Name, ClaimTypes.Email);\n+ }\n+\n+ public static IdentityInformation GetIdentityInformation(ClaimsIdentity claimsIdentity, string authType, string nameIdentifierClaimType, string nameClaimType, string emailClaimType)\n+ {\n+ var identifierClaim = claimsIdentity.FindFirst(nameIdentifierClaimType);\nif (identifierClaim == null)\n{\n- throw new ArgumentException($\"External Authentication is missing required claim: {ClaimTypes.NameIdentifier}\");\n+ throw new ArgumentException($\"External Authentication is missing required claim: {nameIdentifierClaimType}\");\n}\n- var nameClaim = claimsIdentity.FindFirst(ClaimTypes.Name);\n+ var nameClaim = claimsIdentity.FindFirst(nameClaimType);\nif (nameClaim == null)\n{\n- throw new ArgumentException($\"External Authentication is missing required claim: {ClaimTypes.Name}\");\n+ throw new ArgumentException($\"External Authentication is missing required claim: {nameClaimType}\");\n}\n- var emailClaim = claimsIdentity.FindFirst(ClaimTypes.Email);\n+ var emailClaim = claimsIdentity.FindFirst(emailClaimType);\nreturn new IdentityInformation(identifierClaim.Value, nameClaim.Value, emailClaim?.Value, authType, tenantId: null);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -148,18 +148,26 @@ public virtual async Task<ActionResult> SignIn(LogOnViewModel model, string retu\nmodelErrorMessage = string.Format(CultureInfo.CurrentCulture, Strings.UserAccountLocked, timeRemaining);\n}\n- ModelState.AddModelError(\"SignIn\", modelErrorMessage);\n-\n- return SignInOrExternalLinkView(model, linkingAccount);\n+ return SignInFailure(model, linkingAccount, modelErrorMessage);\n}\n- var user = authenticationResult.AuthenticatedUser;\n+ var authenticatedUser = authenticationResult.AuthenticatedUser;\nif (linkingAccount)\n{\n+ // Verify account has no other external accounts\n+ if (authenticatedUser.User.Credentials.Any(c => c.IsExternal()) && !authenticatedUser.User.IsAdministrator())\n+ {\n+ var message = string.Format(\n+ CultureInfo.CurrentCulture,\n+ Strings.AccountIsLinkedToAnotherExternalAccount,\n+ authenticatedUser.User.EmailAddress);\n+ return SignInFailure(model, linkingAccount, message);\n+ }\n+\n// Link with an external account\n- user = await AssociateCredential(user);\n- if (user == null)\n+ authenticatedUser = await AssociateCredential(authenticatedUser);\n+ if (authenticatedUser == null)\n{\nreturn ExternalLinkExpired();\n}\n@@ -169,16 +177,23 @@ public virtual async Task<ActionResult> SignIn(LogOnViewModel model, string retu\n// to require a specific authentication provider, challenge that provider if needed.\nActionResult challenge;\nif (ShouldChallengeEnforcedProvider(\n- NuGetContext.Config.Current.EnforcedAuthProviderForAdmin, user, returnUrl, out challenge))\n+ NuGetContext.Config.Current.EnforcedAuthProviderForAdmin, authenticatedUser, returnUrl, out challenge))\n{\nreturn challenge;\n}\n// Create session\n- await _authService.CreateSessionAsync(OwinContext, user);\n+ await _authService.CreateSessionAsync(OwinContext, authenticatedUser);\nreturn SafeRedirect(returnUrl);\n}\n+ private ActionResult SignInFailure(LogOnViewModel model, bool linkingAccount, string modelErrorMessage)\n+ {\n+ ModelState.AddModelError(\"SignIn\", modelErrorMessage);\n+\n+ return SignInOrExternalLinkView(model, linkingAccount);\n+ }\n+\ninternal bool ShouldChallengeEnforcedProvider(string enforcedProviders, AuthenticatedUser authenticatedUser, string returnUrl, out ActionResult challenge)\n{\nif (!string.IsNullOrEmpty(enforcedProviders)\n@@ -366,9 +381,7 @@ public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl)\n{\n// Consume the exception for now, for backwards compatibility to previous MSA provider.\nemail = result.ExternalIdentity.GetClaimOrDefault(ClaimTypes.Email);\n- name = result\n- .ExternalIdentity\n- .GetClaimOrDefault(ClaimTypes.Name);\n+ name = result.ExternalIdentity.GetClaimOrDefault(ClaimTypes.Name);\n}\n// Check for a user with this email address\n@@ -378,11 +391,27 @@ public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl)\nexistingUser = _userService.FindByEmailAddress(email);\n}\n+ var foundExistingUser = existingUser != null;\n+ var existingUserLinkingError = AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.None;\n+\n+ if (foundExistingUser)\n+ {\n+ if (existingUser is Organization)\n+ {\n+ existingUserLinkingError = AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsOrganization;\n+ }\n+ else if (existingUser.Credentials.Any(c => c.IsExternal()) && !existingUser.IsAdministrator())\n+ {\n+ existingUserLinkingError = AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsAlreadyLinked;\n+ }\n+ }\n+\nvar external = new AssociateExternalAccountViewModel()\n{\nProviderAccountNoun = authUI.AccountNoun,\nAccountName = name,\n- FoundExistingUser = existingUser != null\n+ FoundExistingUser = foundExistingUser,\n+ ExistingUserLinkingError = existingUserLinkingError\n};\nvar model = new LogOnViewModel\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -987,7 +987,7 @@ private async Task<ActionResult> RemoveCredentialInternal(User user, Credential\n}\n// Count credentials and make sure the user can always login\n- if (!CredentialTypes.IsApiKey(cred.Type) && CountLoginCredentials(user) <= 1)\n+ if (!cred.IsApiKey() && CountLoginCredentials(user) <= 1)\n{\nTempData[\"Message\"] = Strings.CannotRemoveOnlyLoginCredential;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/SecurePushSubscription.cs",
"new_path": "src/NuGetGallery/Security/SecurePushSubscription.cs",
"diff": "@@ -66,7 +66,7 @@ public SecurePushSubscription(IAuditingService auditing, IDiagnosticsService dia\npublic async Task OnSubscribeAsync(UserSecurityPolicySubscriptionContext context)\n{\nvar pushKeys = context.User.Credentials.Where(c =>\n- CredentialTypes.IsApiKey(c.Type) &&\n+ c.IsApiKey() &&\n(\nc.Scopes.Count == 0 ||\nc.Scopes.Any(s =>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -123,6 +123,16 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The account with the email {0} is linked to another Microsoft account.\n+ ///If you wish to update the linked Microsoft account you can do so from the account settings page..\n+ /// </summary>\n+ public static string AccountIsLinkedToAnotherExternalAccount {\n+ get {\n+ return ResourceManager.GetString(\"AccountIsLinkedToAnotherExternalAccount\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The user '{0}' is already an owner or pending owner of the package..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -742,4 +742,8 @@ For more information, please contact '{2}'.</value>\n<data name=\"TransformAccount_AdminMustBeDifferentAccount\" xml:space=\"preserve\">\n<value>Administrator account '{0}' cannot be the same account as the one being transformed.</value>\n</data>\n+ <data name=\"AccountIsLinkedToAnotherExternalAccount\" xml:space=\"preserve\">\n+ <value>The account with the email {0} is linked to another Microsoft account.\n+If you wish to update the linked Microsoft account you can do so from the account settings page.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/LogOnViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/LogOnViewModel.cs",
"diff": "@@ -33,6 +33,15 @@ public class AssociateExternalAccountViewModel\npublic string ProviderAccountNoun { get; set; }\npublic string AccountName { get; set; }\npublic bool FoundExistingUser { get; set; }\n+ public bool ExistingUserCanBeLinked => ExistingUserLinkingError == ExistingUserLinkingErrorType.None;\n+ public ExistingUserLinkingErrorType ExistingUserLinkingError { get; set; }\n+\n+ public enum ExistingUserLinkingErrorType\n+ {\n+ None = (int)default(ExistingUserLinkingErrorType),\n+ AccountIsOrganization,\n+ AccountIsAlreadyLinked\n+ }\n}\npublic class SignInViewModel\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"diff": "@{\nViewBag.Title = \"Sign In\";\nViewBag.Tab = \"Sign in\";\n- ViewBag.SmPageColumns = Constants.ColumnsAuthenticationSm;\n- ViewBag.MdPageColumns = Constants.ColumnsAuthenticationMd;\n+ ViewBag.SmPageColumns = Constants.ColumnsWideAuthenticationSm;\n+ ViewBag.MdPageColumns = Constants.ColumnsWideAuthenticationMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n-\n- // Show the sign in container if we found and existing user or if there are sign in errors.\n- var showSignInContainer =\n- Model.External.FoundExistingUser ||\n- ViewData.ModelState.Keys.Any(x => x.StartsWith(\"SignIn\"));\n-\n- // Show the register container if there are register errors.\n- var showRegisterContainer =\n- ViewData.ModelState.Keys.Any(x => x.StartsWith(\"Register\"));\n-\n- // Show the choice container if both sign in and register containers are hidden.\n- var showChoiceContainer = !showSignInContainer && !showRegisterContainer;\n}\n<section role=\"main\" class=\"container main-container page-sign-in\">\n</div>\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- <p class=\"text-center\">\n@if (Model.External.FoundExistingUser)\n{\n- <text>\n- We found an account with this email address. Sign in with your password to link with this account.\n- Don't have a password? Sorry, you'll have to log in using an existing credential and\n- set a password to associate a @Model.External.ProviderAccountNoun. If you're still having trouble, you can\n- <a href=\"mailto:@Config.Current.GalleryOwner.Address\">contact support.</a>\n- </text>\n+ if (Model.External.ExistingUserCanBeLinked)\n+ {\n+ <p class=\"text-center\">\n+ We found an account with this email address. Sign in with your password to link with this Microsoft account.\n+ Please <a href=\"mailto:@Config.Current.GalleryOwner.Address\">contact support</a> if you need more assistance.\n+ </p>\n+\n+ @Html.Partial(\"_SignIn\", Model);\n}\nelse\n{\n- <text>\n- Looks like we don't recognize\n- @if (String.IsNullOrEmpty(Model.External.AccountName))\n+ switch (Model.External.ExistingUserLinkingError)\n{\n- @:this @Model.External.ProviderAccountNoun.\n+ case AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsAlreadyLinked:\n+ <p class=\"text-center\">\n+ The account with the email @Model.SignIn.UserNameOrEmail is linked to another Microsoft account.\n+ </p>\n+ <p class=\"text-center\">\n+ If you wish to update the linked Microsoft account you can do so from the account settings page.\n+ </p>\n+ break;\n+ case AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsOrganization:\n+ <p class=\"text-center\">\n+ The email @Model.SignIn.UserNameOrEmail is linked to an organization.\n+ </p>\n+ <p class=\"text-center\">\n+ If you wish to manage the organization account, you must sign in as one of its admins.\n+ </p>\n+ break;\n+ default:\n+ <p class=\"text-center\">\n+ An unknown error occurred.\n+ </p>\n+ break;\n}\n- else\n- {\n- @:the @Model.External.ProviderAccountNoun '@Model.External.AccountName'.\n+\n+ <p class=\"text-center\">\n+ Please <a href=\"mailto:@Config.Current.GalleryOwner.Address\">contact support</a> if you need more assistance.\n+ </p>\n}\n- Let's fix that.\n- </text>\n}\n+ else\n+ {\n+ <p class=\"text-center\">\n+ Looks like we don't have an account with this email address (@Model.SignIn.UserNameOrEmail) in our records.\n</p>\n- </div>\n- </div>\n- <div class=\"row @(showChoiceContainer ? string.Empty : \"hidden\")\" aria-hidden=\"@(showChoiceContainer ? \"false\" : \"true\")\" id=\"choice-container\">\n- <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- <div class=\"form-group\">\n- <a class=\"btn btn-primary btn-block\" href=\"#\" role=\"button\" id=\"show-sign-in\">Connect to an existing NuGet.org account</a>\n- <b class=\"or-row center-block text-center\">OR</b>\n- <a class=\"btn btn-primary btn-block\" href=\"#\" role=\"button\" id=\"show-register\">Create a new NuGet.org account</a>\n- </div>\n- </div>\n- </div>\n- <div class=\"row @(showSignInContainer ? string.Empty : \"hidden\")\" aria-hidden=\"@(showSignInContainer ? \"false\" : \"true\")\" id=\"sign-in-container\">\n- <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- @Html.Partial(\"_SignIn\", Model)\n- </div>\n- </div>\n- <div class=\"row @(showRegisterContainer ? string.Empty : \"hidden\")\" aria-hidden=\"@(showRegisterContainer ? \"false\" : \"true\")\" id=\"register-container\">\n- <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- @Html.Partial(\"_Register\", Model)\n+ <p class=\"text-center\">\n+ Please provide a username so that we can create an account for you!\n+ </p>\n+\n+ @Html.Partial(\"_Register\", Model);\n+ }\n</div>\n</div>\n</section>\n\\ No newline at end of file\n-\n-@section bottomScripts {\n- <script type=\"text/javascript\">\n- $(function () {\n- function setHidden(id, hidden) {\n- var $el = $('#' + id);\n- if (hidden) {\n- $el.addClass('hidden');\n- $el.attr('aria-hidden', 'true');\n- } else {\n- $el.removeClass('hidden');\n- $el.attr('aria-hidden', 'false');\n- }\n- }\n-\n- $('#show-sign-in').click(function () {\n- setHidden('choice-container', true);\n- setHidden('sign-in-container', false);\n- });\n- $('#cancel-sign-in').click(function () {\n- setHidden('choice-container', false);\n- setHidden('sign-in-container', true);\n- });\n- $('#show-register').click(function () {\n- setHidden('choice-container', true);\n- setHidden('register-container', false);\n- });\n- $('#cancel-register').click(function () {\n- setHidden('choice-container', false);\n- setHidden('register-container', true);\n- });\n- });\n- </script>\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/_Register.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/_Register.cshtml",
"diff": "}\n<div class=\"form-group @Html.HasErrorFor(m => m.Register.EmailAddress)\">\n@Html.ShowLabelFor(m => m.Register.EmailAddress)\n+ @if (Model.External != null && !string.IsNullOrEmpty(Model.Register.EmailAddress))\n+ {\n+ @Html.HiddenFor(m => m.Register.EmailAddress)\n+ <p>@Model.Register.EmailAddress</p>\n+ }\n+ else\n+ {\n@Html.ShowEmailBoxFor(m => m.Register.EmailAddress)\n+ }\n@Html.ShowValidationMessagesFor(m => m.Register.EmailAddress)\n</div>\n<div class=\"panel panel-default text-center\">\n<a href=\"@Url.Terms()\">Terms of Use</a> and <a href=\"@Url.Privacy()\">Privacy Policy</a>.\n</div>\n</div>\n- if (Model.External != null)\n- {\n- <div class=\"form-group row\">\n- <div class=\"col-sm-6\">\n- <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Register\" />\n- </div>\n- <div class=\"col-sm-6\">\n- <input type=\"reset\" class=\"btn btn-default form-control\" value=\"Cancel\" id=\"cancel-register\" />\n- </div>\n- </div>\n- }\n- else\n- {\n<div class=\"form-group\">\n<input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Register\" />\n</div>\n}\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/_SignIn.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/_SignIn.cshtml",
"diff": "<div class=\"form-group @Html.HasErrorFor(m => m.SignIn.UserNameOrEmail)\">\n@Html.ShowLabelFor(m => m.SignIn.UserNameOrEmail)\n+ @if (Model.External != null && !string.IsNullOrEmpty(Model.SignIn.UserNameOrEmail))\n+ {\n+ @Html.HiddenFor(m => m.SignIn.UserNameOrEmail)\n+ <p>@Model.SignIn.UserNameOrEmail</p>\n+ }\n+ else\n+ {\n@Html.ShowTextBoxFor(m => m.SignIn.UserNameOrEmail)\n+ }\n@Html.ShowValidationMessagesFor(m => m.SignIn.UserNameOrEmail)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.SignIn.Password)\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.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.Globalization;\nusing System.Net.Mail;\nusing System.Security.Claims;\nusing System.Threading.Tasks;\n+using System.Web;\nusing System.Web.Mvc;\nusing Microsoft.Owin;\nusing Moq;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Authentication.Providers.AzureActiveDirectory;\n-using NuGetGallery.Configuration;\nusing NuGetGallery.Authentication.Providers.MicrosoftAccount;\nusing NuGetGallery.Infrastructure.Authentication;\nusing Xunit;\n-using System.Web;\nnamespace NuGetGallery.Controllers\n{\n@@ -243,6 +243,134 @@ public async Task WillLogTheUserOnWithUsernameEvenWithoutConfirmedEmailAddress()\nGetMock<AuthenticationService>().VerifyAll();\n}\n+ public async Task WhenAttemptingToLinkExternalToExistingAccountWithNoExternalAccounts_AllowsLinking()\n+ {\n+ // Arrange\n+ var authUser = new AuthenticatedUser(\n+ new User(\"theUsername\") { EmailAddress = \"confirmed@example.com\" },\n+ new Credential() { Type = \"foo\" });\n+\n+ var authResult =\n+ new PasswordAuthenticationResult(PasswordAuthenticationResult.AuthenticationResult.Success, authUser);\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.Authenticate(\"confirmed@example.com\", \"thePassword\"))\n+ .CompletesWith(authResult);\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.ReadExternalLoginCredential(It.IsAny<OwinContext>()))\n+ .Returns(Task.FromResult(new AuthenticateExternalLoginResult { ExternalIdentity = new ClaimsIdentity() }));\n+\n+ var controller = GetController<AuthenticationController>();\n+\n+ // Act\n+ var result = await controller.SignIn(\n+ new LogOnViewModel(\n+ new SignInViewModel(\n+ \"confirmed@example.com\",\n+ \"thePassword\")),\n+ \"theReturnUrl\", linkingAccount: true);\n+\n+ // Assert\n+ GetMock<AuthenticationService>()\n+ .Verify(x => x.AddCredential(It.IsAny<User>(), It.IsAny<Credential>()));\n+\n+ GetMock<AuthenticationService>()\n+ .Verify(x => x.CreateSessionAsync(controller.OwinContext, authUser));\n+\n+ GetMock<IMessageService>()\n+ .Verify(x => x.SendCredentialAddedNotice(It.IsAny<User>(), It.IsAny<CredentialViewModel>()));\n+ }\n+\n+ public async Task WhenAttemptingToLinkExternalToAccountWithExistingExternals_RejectsLinking()\n+ {\n+ // Arrange\n+ var user = new User(\"theUsername\")\n+ {\n+ EmailAddress = \"confirmed@example.com\",\n+ Credentials = new[] { new Credential { Type = CredentialTypes.ExternalPrefix + \"Foo\" } }\n+ };\n+\n+ var authUser = new AuthenticatedUser(\n+ user,\n+ new Credential() { Type = \"Foo\" });\n+\n+ var authResult =\n+ new PasswordAuthenticationResult(PasswordAuthenticationResult.AuthenticationResult.Success, authUser);\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.Authenticate(\"confirmed@example.com\", \"thePassword\"))\n+ .CompletesWith(authResult);\n+ var controller = GetController<AuthenticationController>();\n+\n+ // Act\n+ var result = await controller.SignIn(\n+ new LogOnViewModel(\n+ new SignInViewModel(\n+ \"confirmed@example.com\",\n+ \"thePassword\")),\n+ \"theReturnUrl\", linkingAccount: true);\n+\n+ // Assert\n+ GetMock<AuthenticationService>().Verify(a => a.CreateSessionAsync(controller.OwinContext, authUser), Times.Never());\n+ ResultAssert.IsView(result, viewName: SignInViewNuGetName);\n+ Assert.False(controller.ModelState.IsValid);\n+ Assert.Equal(Strings.AccountIsLinkedToAnotherExternalAccount, controller.ModelState[SignInViewName].Errors[0].ErrorMessage);\n+ }\n+\n+ public async Task WhenAttemptingToLinkExternalToAdminUserWithExistingExternals_AllowsLinking()\n+ {\n+ // Arrange\n+ var user = new User(\"theUsername\")\n+ {\n+ EmailAddress = \"confirmed@example.com\",\n+ Credentials = new[] { new Credential { Type = CredentialTypes.ExternalPrefix + \"Foo\" } },\n+ Roles = new[] { new Role { Name = Constants.AdminRoleName } }\n+ };\n+\n+ var authUser = new AuthenticatedUser(\n+ user,\n+ new Credential() { Type = CredentialTypes.ExternalPrefix + \"foo\" });\n+\n+ var authResult =\n+ new PasswordAuthenticationResult(PasswordAuthenticationResult.AuthenticationResult.Success, authUser);\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.Authenticate(\"confirmed@example.com\", \"thePassword\"))\n+ .CompletesWith(authResult);\n+\n+ var externalCredential = new Credential { Type = \"externalcred\" };\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.ReadExternalLoginCredential(It.IsAny<OwinContext>()))\n+ .Returns(Task.FromResult(new AuthenticateExternalLoginResult { Credential = externalCredential, ExternalIdentity = new ClaimsIdentity() }));\n+\n+ var credentialViewModel = new CredentialViewModel();\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.DescribeCredential(externalCredential))\n+ .Returns(credentialViewModel);\n+\n+ var controller = GetController<AuthenticationController>();\n+\n+ // Act\n+ var result = await controller.SignIn(\n+ new LogOnViewModel(\n+ new SignInViewModel(\n+ \"confirmed@example.com\",\n+ \"thePassword\")),\n+ \"theReturnUrl\", linkingAccount: true);\n+\n+ // Assert\n+ GetMock<AuthenticationService>()\n+ .Verify(x => x.AddCredential(authUser.User, externalCredential));\n+\n+ GetMock<AuthenticationService>()\n+ .Verify(x => x.CreateSessionAsync(controller.OwinContext, authUser));\n+\n+ GetMock<IMessageService>()\n+ .Verify(x => x.SendCredentialAddedNotice(authUser.User, credentialViewModel));\n+ }\n+\n[Fact]\npublic async Task GivenExpiredExternalAuth_ItRedirectsBackToLogOnWithExternalAuthExpiredMessage()\n{\n@@ -986,6 +1114,147 @@ public async Task GivenNoLinkButEmailMatchingLocalUser_ItDisplaysLogOnViewPreset\nAssert.Equal(msaUI.AccountNoun, model.External.ProviderAccountNoun);\nAssert.Null(model.External.AccountName);\nAssert.True(model.External.FoundExistingUser);\n+ Assert.True(model.External.ExistingUserCanBeLinked);\n+ Assert.Equal(existingUser.EmailAddress, model.SignIn.UserNameOrEmail);\n+ Assert.Equal(existingUser.EmailAddress, model.Register.EmailAddress);\n+ }\n+\n+ [Fact]\n+ public async Task GivenNoLinkButEmailMatchingLocalOrganizationUser_ItRejectsLinking()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var existingOrganization = new Organization(\"existingOrganization\") { EmailAddress = \"existing@example.com\" };\n+ var cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", \"Bloog\");\n+ var msAuther = new MicrosoftAccountAuthenticator();\n+ var msaUI = msAuther.GetUI();\n+ var authUser = new AuthenticatedUser(\n+ fakes.CreateUser(\"test\", cred),\n+ cred);\n+\n+ GetMock<AuthenticationService>(); // Force a mock to be created\n+ GetMock<IUserService>()\n+ .Setup(u => u.FindByEmailAddress(existingOrganization.EmailAddress))\n+ .Returns(existingOrganization);\n+\n+ var controller = GetController<AuthenticationController>();\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.AuthenticateExternalLogin(controller.OwinContext))\n+ .CompletesWith(new AuthenticateExternalLoginResult()\n+ {\n+ ExternalIdentity = new ClaimsIdentity(new[] {\n+ new Claim(ClaimTypes.Email, existingOrganization.EmailAddress)\n+ }),\n+ Authenticator = msAuther\n+ });\n+\n+ // Act\n+ var result = await controller.LinkExternalAccount(\"theReturnUrl\");\n+\n+ // Assert\n+ var model = ResultAssert.IsView<LogOnViewModel>(result, viewName: LinkExternalViewName);\n+ Assert.Equal(msaUI.AccountNoun, model.External.ProviderAccountNoun);\n+ Assert.Null(model.External.AccountName);\n+ Assert.True(model.External.FoundExistingUser);\n+ Assert.False(model.External.ExistingUserCanBeLinked);\n+ Assert.Equal(AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsOrganization, model.External.ExistingUserLinkingError);\n+ }\n+\n+ [Fact]\n+ public async Task GivenNoLinkButEmailMatchingLocalUserWithExistingExternal_ItRejectsLinking()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+\n+ var existingUser = new User(\"existingUser\")\n+ {\n+ EmailAddress = \"existing@example.com\",\n+ Credentials = new[] { new Credential(CredentialTypes.ExternalPrefix + \"foo\", \"externalloginvalue\") }\n+ };\n+\n+ var cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", \"Bloog\");\n+ var msAuther = new MicrosoftAccountAuthenticator();\n+ var msaUI = msAuther.GetUI();\n+ var authUser = new AuthenticatedUser(\n+ fakes.CreateUser(\"test\", cred),\n+ cred);\n+\n+ GetMock<AuthenticationService>(); // Force a mock to be created\n+ GetMock<IUserService>()\n+ .Setup(u => u.FindByEmailAddress(existingUser.EmailAddress))\n+ .Returns(existingUser);\n+\n+ var controller = GetController<AuthenticationController>();\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.AuthenticateExternalLogin(controller.OwinContext))\n+ .CompletesWith(new AuthenticateExternalLoginResult()\n+ {\n+ ExternalIdentity = new ClaimsIdentity(new[] {\n+ new Claim(ClaimTypes.Email, existingUser.EmailAddress)\n+ }),\n+ Authenticator = msAuther\n+ });\n+\n+ // Act\n+ var result = await controller.LinkExternalAccount(\"theReturnUrl\");\n+\n+ // Assert\n+ var model = ResultAssert.IsView<LogOnViewModel>(result, viewName: LinkExternalViewName);\n+ Assert.Equal(msaUI.AccountNoun, model.External.ProviderAccountNoun);\n+ Assert.Null(model.External.AccountName);\n+ Assert.True(model.External.FoundExistingUser);\n+ Assert.False(model.External.ExistingUserCanBeLinked);\n+ Assert.Equal(AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsAlreadyLinked, model.External.ExistingUserLinkingError);\n+ }\n+\n+ [Fact]\n+ public async Task GivenNoLinkButEmailMatchingLocalAdminUserWithExistingExternal_ItAcceptsLinking()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+\n+ var existingUser = new User(\"existingUser\")\n+ {\n+ EmailAddress = \"existing@example.com\",\n+ Credentials = new[] { new Credential(CredentialTypes.ExternalPrefix + \"foo\", \"externalloginvalue\") },\n+ Roles = new[] { new Role { Name = Constants.AdminRoleName } }\n+ };\n+\n+ var cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", \"Bloog\");\n+ var msAuther = new MicrosoftAccountAuthenticator();\n+ var msaUI = msAuther.GetUI();\n+ var authUser = new AuthenticatedUser(\n+ fakes.CreateUser(\"test\", cred),\n+ cred);\n+\n+ GetMock<AuthenticationService>(); // Force a mock to be created\n+ GetMock<IUserService>()\n+ .Setup(u => u.FindByEmailAddress(existingUser.EmailAddress))\n+ .Returns(existingUser);\n+\n+ var controller = GetController<AuthenticationController>();\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.AuthenticateExternalLogin(controller.OwinContext))\n+ .CompletesWith(new AuthenticateExternalLoginResult()\n+ {\n+ ExternalIdentity = new ClaimsIdentity(new[] {\n+ new Claim(ClaimTypes.Email, existingUser.EmailAddress)\n+ }),\n+ Authenticator = msAuther\n+ });\n+\n+ // Act\n+ var result = await controller.LinkExternalAccount(\"theReturnUrl\");\n+\n+ // Assert\n+ var model = ResultAssert.IsView<LogOnViewModel>(result, viewName: LinkExternalViewName);\n+ Assert.Equal(msaUI.AccountNoun, model.External.ProviderAccountNoun);\n+ Assert.Null(model.External.AccountName);\n+ Assert.True(model.External.FoundExistingUser);\n+ Assert.True(model.External.ExistingUserCanBeLinked);\nAssert.Equal(existingUser.EmailAddress, model.SignIn.UserNameOrEmail);\nAssert.Equal(existingUser.EmailAddress, model.Register.EmailAddress);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update External Account Linking Flow (#5338)
|
455,747 |
30.01.2018 13:32:16
| 28,800 |
3ffe186f1fa5cac2b60749ea9aacedbdf7d06228
|
[MSA/AAD] Deprecate password warnings
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -756,6 +756,10 @@ img.reserved-indicator-icon {\nmargin-bottom: 20px;\nfont-size: 1.25em;\n}\n+.page-forgot-password .deprecate-alert {\n+ padding: 0;\n+ margin-top: -15px;\n+}\n.page-forgot-password .forgot-form {\nmargin-top: 20px;\n}\n@@ -1008,6 +1012,10 @@ img.reserved-indicator-icon {\n.page-reset-password .reset-form {\nmargin-top: 80px;\n}\n+.page-sign-in .deprecate-alert {\n+ padding: 0;\n+ margin-top: -15px;\n+}\n.page-sign-in .provider-button {\nfont-size: 16px;\nline-height: 2em;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-forgot-password.less",
"new_path": "src/Bootstrap/less/theme/page-forgot-password.less",
"diff": ".page-forgot-password {\n+ .deprecate-alert {\n+ margin-top: -15px;\n+ padding: 0px;\n+ }\n+\n.forgot-form {\nmargin-top: (@padding-large-vertical * 2);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": ")\n}\n+@helper AlertPasswordDeprecation()\n+{\n+ @AlertWarning(\n+ @<text>\n+ NuGet.org password login is being deprecated. Please use Microsoft account to sign into NuGet gallery.\n+ </text>\n+ )\n+}\n+\n@helper AlertPackageVerifyRecommendation()\n{\n@AlertWarning(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -631,6 +631,8 @@ public class Strings {\n///\n///[{0}]({0})\n///\n+ ///Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+ ///\n///Thanks,\n///The {1} Team.\n/// </summary>\n@@ -657,6 +659,8 @@ public class Strings {\n///\n///[{0}]({0})\n///\n+ ///Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+ ///\n///Thanks,\n///The {1} Team.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -245,6 +245,8 @@ Click the following link within the next hour to reset your password:\n[{0}]({0})\n+Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+\nThanks,\nThe {1} Team</value>\n</data>\n@@ -259,6 +261,8 @@ Click the following link within the next hour to set your password:\n[{0}]({0})\n+Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+\nThanks,\nThe {1} Team</value>\n</data>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/Register.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/Register.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container page-sign-in\">\n+ <div class=\"deprecate-alert text-center\">\n+ @ViewHelpers.AlertPasswordDeprecation()\n+ </div>\n+\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag) text-center\">\n<h1>Register</h1>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/SignInNugetAccount.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/SignInNugetAccount.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container page-sign-in\">\n+ <div class=\"deprecate-alert text-center\">\n+ @ViewHelpers.AlertPasswordDeprecation()\n+ </div>\n+\n<div class=\"row\">\n<div class=\"col-xs-12 text-center\">\n<h1>Sign in</h1>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container page-forgot-password\">\n+ <div class=\"deprecate-alert text-center\">\n+ @ViewHelpers.AlertPasswordDeprecation()\n+ </div>\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag) text-center\">\n<h1>Forgot Password</h1>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[MSA/AAD] Deprecate password warnings (#5374)
|
455,776 |
30.01.2018 15:56:52
| 28,800 |
50dfb625b239f7e42d81f836a3270f2bf24d5f6f
|
Only show "Owner" dropdown in upload flow for new packages
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -201,7 +201,7 @@ public async virtual Task<ActionResult> UploadPackage()\naccountsAllowedOnBehalfOf = new[] { currentUser };\n}\n- var verifyRequest = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf);\n+ var verifyRequest = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration);\nmodel.InProgressUpload = verifyRequest;\n}\n@@ -238,6 +238,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nreturn Json(400, new[] { Strings.UploadFileMustBeNuGetPackage });\n}\n+ PackageRegistration existingPackageRegistration;\n// If the current user cannot upload the package on behalf of any of the existing owners, show the current user as the only possible owner in the upload form.\n// If the current user doesn't have the rights to upload the package, the package upload will be rejected by submitting the form.\n// Related: https://github.com/NuGet/NuGetGallery/issues/5043\n@@ -319,7 +320,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\n}\nvar id = nuspec.GetId();\n- var existingPackageRegistration = _packageService.FindPackageRegistrationById(id);\n+ existingPackageRegistration = _packageService.FindPackageRegistrationById(id);\n// For a new package id verify if the user is allowed to use it.\nif (existingPackageRegistration == null &&\nActionsRequiringPermissions.UploadNewPackageId.CheckPermissionsOnBehalfOfAnyAccount(\n@@ -416,7 +417,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\n}\n}\n- var model = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf);\n+ var model = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration);\nreturn Json(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RequestModels/VerifyPackageRequest.cs",
"new_path": "src/NuGetGallery/RequestModels/VerifyPackageRequest.cs",
"diff": "@@ -12,7 +12,7 @@ public class VerifyPackageRequest\n{\npublic VerifyPackageRequest() { }\n- public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> possibleOwners)\n+ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> possibleOwners, PackageRegistration existingPackageRegistration)\n{\nId = packageMetadata.Id;\nVersion = packageMetadata.Version.ToFullStringSafe();\n@@ -39,12 +39,16 @@ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> p\nSummary = packageMetadata.Summary;\nTags = PackageHelper.ParseTags(packageMetadata.Tags);\nTitle = packageMetadata.Title;\n+ IsNewId = existingPackageRegistration == null;\n+ if (!IsNewId)\n+ {\n+ ExistingOwners = string.Join(\", \", ParseUserList(existingPackageRegistration.Owners));\n+ }\n// Editable server-state\nListed = true;\nEdit = new EditPackageVersionReadMeRequest();\n-\n- PossibleOwners = possibleOwners.Select(u => u.Username).ToList();\n+ PossibleOwners = ParseUserList(possibleOwners);\n}\npublic string Id { get; set; }\n@@ -59,11 +63,23 @@ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> p\n/// </summary>\npublic string OriginalVersion { get; set; }\n+ /// <summary>\n+ /// This is a new ID.\n+ /// There are no existing packages with this ID.\n+ /// </summary>\n+ public bool IsNewId { get; set; }\n+\n/// <summary>\n/// The username of the <see cref=\"User\"/> to upload the package as.\n/// </summary>\npublic string Owner { get; set; }\n+ /// <summary>\n+ /// The <see cref=\"User\"/>s that own the existing package registration that this package will be added to in a string.\n+ /// E.g. \"alice, bob, chad\".\n+ /// </summary>\n+ public string ExistingOwners { get; set; }\n+\n/// <summary>\n/// The usernames of the <see cref=\"User\"/>s that the current user can upload the package as.\n/// </summary>\n@@ -94,5 +110,10 @@ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> p\npublic string Summary { get; set; }\npublic string Tags { get; set; }\npublic string Title { get; set; }\n+\n+ private static IReadOnlyCollection<string> ParseUserList(IEnumerable<User> users)\n+ {\n+ return users.Select(u => u.Username).ToList();\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"diff": "<!-- ko if: $data.PossibleOwners -->\n<div class=\"verify-package-field form-group editable\">\n- <label for=\"Owner\" class=\"verify-package-field-heading\">Owner</label>\n- <!-- ko if: $data.PossibleOwners.length > 1 -->\n+ <label for=\"Owner\" class=\"verify-package-field-heading\" data-bind=\"text: $data.IsNewId ? 'Owner' : 'Owners'\"></label>\n+ <!-- ko if: $data.PossibleOwners.length > 1 && $data.IsNewId -->\n<select aria-required=\"true\" class=\"form-control\" data-val=\"true\" data-val-required=\"You must select an owner for your package!\" name=\"Owner\" data-bind=\"foreach: $data.PossibleOwners\">\n<option data-bind=\"value: $data, text: $data\"></option>\n</select>\n<!-- /ko -->\n- <!-- ko if: $data.PossibleOwners.length == 1 -->\n+ <!-- ko if: $data.PossibleOwners.length == 1 || !$data.IsNewId -->\n+ <!-- ko if: $data.IsNewId -->\n<p data-bind=\"text: $data.PossibleOwners[0]\"></p>\n+ <!-- /ko -->\n+ <!-- ko ifnot: $data.IsNewId -->\n+ <p data-bind=\"text: $data.ExistingOwners\"></p>\n+ <!-- /ko -->\n<input data-bind=\"value: $data.PossibleOwners[0]\" type=\"hidden\" name=\"Owner\" class=\"form-control\" />\n<!-- /ko -->\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Only show "Owner" dropdown in upload flow for new packages (#5351)
|
455,736 |
14.08.2017 17:46:30
| 25,200 |
c5b4d6e85bb9ceb1447102e4e851e3539e4acb2b
|
Redirect /nuget.exe endpoint to dist.nuget.org, nuget.exe 2.8.6
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -31,6 +31,8 @@ namespace NuGetGallery\npublic partial class ApiController\n: AppController\n{\n+ private const string NuGetExeUrl = \"https://dist.nuget.org/win-x86-commandline/v2.8.6/nuget.exe\";\n+\npublic IApiScopeEvaluator ApiScopeEvaluator { get; set; }\npublic IEntitiesContext EntitiesContext { get; set; }\npublic INuGetExeDownloaderService NugetExeDownloaderService { get; set; }\n@@ -204,10 +206,9 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)\n[HttpGet]\n[ActionName(\"GetNuGetExeApi\")]\n- [OutputCache(VaryByParam = \"none\", Location = OutputCacheLocation.ServerAndClient, Duration = 600)]\n- public virtual Task<ActionResult> GetNuGetExe()\n+ public virtual ActionResult GetNuGetExe()\n{\n- return NugetExeDownloaderService.CreateNuGetExeDownloadActionResultAsync(HttpContext.Request.Url);\n+ return new RedirectResult(NuGetExeUrl, permanent: false);\n}\n[HttpGet]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -1641,5 +1641,24 @@ public async Task VerifyRecentPopularityStatsDownloadsCount()\nAssert.True(result.Count == 3, \"unexpected content\");\n}\n}\n+\n+ public class TheGetNuGetExeAction\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void RedirectsToDist()\n+ {\n+ // Arrange\n+ var controller = new TestableApiController(GetConfigurationService());\n+\n+ // Act\n+ var result = controller.GetNuGetExe();\n+\n+ // Assert\n+ var redirect = Assert.IsType<RedirectResult>(result);\n+ Assert.False(redirect.Permanent, \"The redirect should not be permanent\");\n+ Assert.Equal(\"https://dist.nuget.org/win-x86-commandline/v2.8.6/nuget.exe\", redirect.Url);\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"diff": "<Compile Include=\"ODataFeeds\\SearchTest.cs\" />\n<Compile Include=\"ODataFeeds\\V2FeedExtendedTests.cs\" />\n<Compile Include=\"PackageCreation\\ApiPushTests.cs\" />\n+ <Compile Include=\"DistIntegrationTests.cs\" />\n<Compile Include=\"PackageCreation\\SecurityPolicyTests.cs\" />\n<Compile Include=\"Security\\HttpToHttpsRedirectTests.cs\" />\n<Compile Include=\"Statistics\\PackageStatisticsTests.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Redirect /nuget.exe endpoint to dist.nuget.org, nuget.exe 2.8.6 (#4563)
Address https://github.com/NuGet/NuGetGallery/issues/4558
|
455,776 |
02.02.2018 09:58:05
| 28,800 |
ecb2379599ffe1093447a80709dc86f8fa4173c5
|
[Organizations] Functional tests for push/unlist of organization packages
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Constants.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Constants.cs",
"diff": "@@ -33,6 +33,7 @@ public static class Constants\npublic const string ContactOwnersText = \"Your message has been sent to the owners of\";\npublic const string UnListedPackageText = \"This package is unlisted and hidden from package listings\";\npublic const string TestPackageId = \"BaseTestPackage\";\n+ public const string TestOrganizationCollaboratorPackageId = \"BaseTestOrganizationCollaboratorPackage\";\npublic const string ReadOnlyModeError = \"Error 503 - Read-only Mode\";\npublic const string UploadFailureMessage = \"The package upload via Nuget.exe didnt succeed properly. Check the logs to see the process error and output stream\";\npublic const string PackageInstallFailureMessage = \"Package install failed. Either the file is not present on disk or it is corrupted. Check logs for details\";\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"diff": "@@ -27,6 +27,10 @@ public class EnvironmentSettings\nprivate static string _testAccountApiKey_Unlist;\nprivate static string _testAccountApiKey_PushPackage;\nprivate static string _testAccountApiKey_PushVersion;\n+ private static string _testOrganizationAdminAccountName;\n+ private static string _testOrganizationAdminAccountApiKey;\n+ private static string _testOrganizationCollaboratorAccountName;\n+ private static string _testOrganizationCollaboratorAccountApiKey;\nprivate static string _testEmailServerHost;\nprivate static List<string> _trustedHttpsCertificates;\nprivate static bool? _defaultSecurityPoliciesEnforced;\n@@ -326,6 +330,66 @@ public static string TestEmailServerHost\n}\n}\n+ /// <summary>\n+ /// The name of the test nuget organization that <see cref=\"TestAccountName\"/> is an admin of.\n+ /// </summary>\n+ public static string TestOrganizationAdminAccountName\n+ {\n+ get\n+ {\n+ if (string.IsNullOrEmpty(_testOrganizationAdminAccountName))\n+ {\n+ _testOrganizationAdminAccountName = Environment.GetEnvironmentVariable(\"TestOrganizationAdminAccountName\");\n+ }\n+ return _testOrganizationAdminAccountName;\n+ }\n+ }\n+\n+ /// <summary>\n+ /// An API key for the test account scoped to <see cref=\"TestOrganizationAdminAccountName\"/>.\n+ /// </summary>\n+ public static string TestOrganizationAdminAccountApiKey\n+ {\n+ get\n+ {\n+ if (string.IsNullOrEmpty(_testOrganizationAdminAccountApiKey))\n+ {\n+ _testOrganizationAdminAccountApiKey = Environment.GetEnvironmentVariable(\"TestOrganizationAdminAccountApiKey\");\n+ }\n+ return _testOrganizationAdminAccountApiKey;\n+ }\n+ }\n+\n+ /// <summary>\n+ /// The name of the test nuget organization that <see cref=\"TestAccountName\"/> is a collaborator of.\n+ /// </summary>\n+ public static string TestOrganizationCollaboratorAccountName\n+ {\n+ get\n+ {\n+ if (string.IsNullOrEmpty(_testOrganizationCollaboratorAccountName))\n+ {\n+ _testOrganizationCollaboratorAccountName = Environment.GetEnvironmentVariable(\"TestOrganizationCollaboratorAccountName\");\n+ }\n+ return _testOrganizationCollaboratorAccountName;\n+ }\n+ }\n+\n+ /// <summary>\n+ /// An API key for the test account scoped to <see cref=\"TestOrganizationCollaboratorAccountName\"/>.\n+ /// </summary>\n+ public static string TestOrganizationCollaboratorAccountApiKey\n+ {\n+ get\n+ {\n+ if (string.IsNullOrEmpty(_testOrganizationCollaboratorAccountApiKey))\n+ {\n+ _testOrganizationCollaboratorAccountApiKey = Environment.GetEnvironmentVariable(\"TestOrganizationCollaboratorAccountApiKey\");\n+ }\n+ return _testOrganizationCollaboratorAccountApiKey;\n+ }\n+ }\n+\npublic static bool DefaultSecurityPoliciesEnforced\n{\nget\n"
},
{
"change_type": "RENAME",
"old_path": "tests/NuGetGallery.WebUITests.P0/AssertAndValidationHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/AssertAndValidationHelper.cs",
"diff": "namespace NuGetGallery.FunctionalTests.Helpers\n{\n- public class AssertAndValidationHelper\n+ public static class AssertAndValidationHelper\n{\npublic static ValidationRuleFindText GetValidationRuleForFindText(string findText, bool passIfTextFound = true)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"diff": "using System.Globalization;\nusing System.IO;\nusing System.Linq;\n-using System.Threading;\nusing System.Threading.Tasks;\nusing NuGet;\nusing NuGet.Versioning;\n@@ -150,55 +149,59 @@ private async Task<bool> VerifyWithRetryAsync(string actionPhrase, Func<Task<boo\n/// Creates a package with the specified Id and Version and uploads it and checks if the upload has succeeded.\n/// Throws if the upload fails or cannot be verified in the source.\n/// </summary>\n- public async Task UploadNewPackageAndVerify(string packageId, string version = \"1.0.0\", string minClientVersion = null, string title = null, string tags = null, string description = null, string licenseUrl = null, string dependencies = null)\n+ public async Task UploadNewPackageAndVerify(string packageId, string version = \"1.0.0\", string minClientVersion = null, string title = null, string tags = null, string description = null, string licenseUrl = null, string dependencies = null, string apiKey = null)\n{\n- await UploadNewPackage(packageId, version, minClientVersion, title, tags, description, licenseUrl, dependencies);\n+ await UploadNewPackage(packageId, version, minClientVersion, title, tags, description, licenseUrl, dependencies, apiKey);\nawait VerifyPackageExistsInV2AndV3Async(packageId, version);\n}\npublic async Task UploadNewPackage(string packageId, string version = \"1.0.0\", string minClientVersion = null,\nstring title = null, string tags = null, string description = null, string licenseUrl = null,\n- string dependencies = null, string apiKey = null)\n+ string dependencies = null, string apiKey = null, bool success = true)\n{\n- if (string.IsNullOrEmpty(packageId))\n- {\n- packageId = DateTime.Now.Ticks.ToString();\n- }\n-\nWriteLine(\"Uploading new package '{0}', version '{1}'\", packageId, version);\nvar packageCreationHelper = new PackageCreationHelper(TestOutputHelper);\nvar packageFullPath = await packageCreationHelper.CreatePackage(packageId, version, minClientVersion, title, tags, description, licenseUrl, dependencies);\n- await UploadExistingPackage(packageFullPath);\n-\n- // Delete package from local disk once it gets uploaded\n- CleanCreatedPackage(packageFullPath);\n- }\n-\n- public async Task UploadExistingPackage(string packageFullPath, string apiKey = null)\n+ try\n{\nvar commandlineHelper = new CommandlineHelper(TestOutputHelper);\nvar processResult = await commandlineHelper.UploadPackageAsync(packageFullPath, UrlHelper.V2FeedPushSourceUrl, apiKey);\n+ if (success)\n+ {\nAssert.True(processResult.ExitCode == 0,\n\"The package upload via Nuget.exe did not succeed properly. Check the logs to see the process error and output stream. Exit Code: \" +\nprocessResult.ExitCode + \". Error message: \\\"\" + processResult.StandardError + \"\\\"\");\n}\n+ else\n+ {\n+ Assert.False(processResult.ExitCode == 0,\n+ \"The package upload via Nuget.exe succeeded but was expected to fail. Check the logs to see the process error and output stream. Exit Code: \" +\n+ processResult.ExitCode + \". Error message: \\\"\" + processResult.StandardError + \"\\\"\");\n+ }\n+ }\n+ finally\n+ {\n+ // Delete package from local disk once it gets uploaded\n+ CleanCreatedPackage(packageFullPath);\n+ }\n+ }\n/// <summary>\n/// Unlists a package with the specified Id and Version and checks if the unlist has succeeded.\n/// Throws if the unlist fails or cannot be verified in the source.\n/// </summary>\n- public async Task UnlistPackageAndVerify(string packageId, string version = \"1.0.0\")\n+ public async Task UnlistPackageAndVerify(string packageId, string version = \"1.0.0\", string apiKey = null)\n{\n- await UnlistPackage(packageId, version);\n+ await UnlistPackage(packageId, version, apiKey);\nawait VerifyPackageExistsInV2AndV3Async(packageId, version);\n}\n- public async Task UnlistPackage(string packageId, string version = \"1.0.0\", string apiKey = null)\n+ public async Task UnlistPackage(string packageId, string version = \"1.0.0\", string apiKey = null, bool success = true)\n{\nif (string.IsNullOrEmpty(packageId))\n{\n@@ -210,10 +213,19 @@ public async Task UnlistPackage(string packageId, string version = \"1.0.0\", stri\nvar commandlineHelper = new CommandlineHelper(TestOutputHelper);\nvar processResult = await commandlineHelper.DeletePackageAsync(packageId, version, UrlHelper.V2FeedPushSourceUrl, apiKey);\n+ if (success)\n+ {\nAssert.True(processResult.ExitCode == 0,\n\"The package unlist via Nuget.exe did not succeed properly. Check the logs to see the process error and output stream. Exit Code: \" +\nprocessResult.ExitCode + \". Error message: \\\"\" + processResult.StandardError + \"\\\"\");\n}\n+ else\n+ {\n+ Assert.False(processResult.ExitCode == 0,\n+ \"The package unlist via Nuget.exe succeeded but was expected to fail. Check the logs to see the process error and output stream. Exit Code: \" +\n+ processResult.ExitCode + \". Error message: \\\"\" + processResult.StandardError + \"\\\"\");\n+ }\n+ }\n/// <summary>\n/// Throws if the specified package cannot be found in the source.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj",
"diff": "<WarningLevel>4</WarningLevel>\n</PropertyGroup>\n<ItemGroup>\n+ <Reference Include=\"Microsoft.VisualStudio.QualityTools.WebTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"Microsoft.Web.XmlTransform\">\n<HintPath>..\\..\\packages\\Microsoft.Web.Xdt.2.1.1\\lib\\net40\\Microsoft.Web.XmlTransform.dll</HintPath>\n</Reference>\n</Reference>\n</ItemGroup>\n<ItemGroup>\n+ <Compile Include=\"Helpers\\AssertAndValidationHelper.cs\" />\n<Compile Include=\"Helpers\\ServicePointManagerInitializer.cs\" />\n+ <Compile Include=\"Helpers\\UploadHelper.cs\" />\n<Compile Include=\"XunitExtensions\\CategoryAttribute.cs\" />\n<Compile Include=\"XunitExtensions\\ClearMachineCacheFixture.cs\" />\n<Compile Include=\"Constants.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"diff": "using System.ComponentModel;\nusing System.IO;\nusing System.Threading.Tasks;\n+using NuGetGallery.FunctionalTests.Helpers;\nusing NuGetGallery.FunctionalTests.XunitExtensions;\nusing Xunit;\nusing Xunit.Abstractions;\n@@ -36,7 +37,7 @@ public NugetCommandLineTests(ITestOutputHelper testOutputHelper)\n[Description(\"Downloads a package using NuGet.exe and checks if the package file is present in the output dir\")]\n[Priority(0)]\n[Category(\"P0Tests\")]\n- public async Task DownloadPackageWithNuGetCommandLineTest()\n+ public async Task DownloadPackage()\n{\nstring packageId = Constants.TestPackageId; //try to download a pre-defined test package.\n_clientSdkHelper.ClearLocalPackageFolder(packageId, ClientSdkHelper.GetLatestStableVersion(packageId));\n@@ -48,67 +49,105 @@ public async Task DownloadPackageWithNuGetCommandLineTest()\n}\n[Fact]\n- [Description(\"Creates a test package and pushes it to the server using Nuget.exe\")]\n+ [Description(\"Tests upload and unlist scenarios as self\")]\n[Priority(0)]\n[Category(\"P0Tests\")]\n- public async Task UploadPackageWithNuGetCommandLineTest()\n+ public async Task UploadAndUnlistPackagesAsSelf()\n{\n- await _clientSdkHelper.UploadNewPackageAndVerify(DateTime.Now.Ticks.ToString());\n+ // Can push new package ID as self\n+ var id = UploadHelper.GetUniquePackageId(nameof(UploadAndUnlistPackagesAsSelf));\n+ await _clientSdkHelper.UploadNewPackageAndVerify(id, \"1.0.0\");\n+\n+ // Can push new version of an existing package as self\n+ await _clientSdkHelper.UploadNewPackageAndVerify(id, \"2.0.0\");\n+\n+ // Can unlist versions of an existing package as self\n+ await _clientSdkHelper.UnlistPackageAndVerify(id, \"2.0.0\");\n+ }\n+\n+ [Fact]\n+ [Description(\"Tests upload and unlist scenarios as an organization admin\")]\n+ [Priority(0)]\n+ [Category(\"P0Tests\")]\n+ public async Task UploadAndUnlistPackagesAsOrganizationAdmin()\n+ {\n+ var apiKey = EnvironmentSettings.TestOrganizationAdminAccountApiKey;\n+\n+ // Can push new package ID as organization\n+ var id = UploadHelper.GetUniquePackageId(nameof(UploadAndUnlistPackagesAsOrganizationAdmin));\n+ await _clientSdkHelper.UploadNewPackageAndVerify(id, \"1.0.0\", apiKey: apiKey);\n+\n+ // Can push new version of an existing package as organization\n+ await _clientSdkHelper.UploadNewPackageAndVerify(id, \"2.0.0\", apiKey: apiKey);\n+\n+ // Can unlist versions of an existing package as organization\n+ await _clientSdkHelper.UnlistPackageAndVerify(id, \"2.0.0\", apiKey);\n+ }\n+\n+ [Fact]\n+ [Description(\"Tests upload and unlist scenarios as an organization collaborator\")]\n+ [Priority(0)]\n+ [Category(\"P0Tests\")]\n+ public async Task UploadAndUnlistPackagesAsOrganizationCollaborator()\n+ {\n+ var apiKey = EnvironmentSettings.TestOrganizationCollaboratorAccountApiKey;\n+\n+ // Cannot push new package ID as organization\n+ await _clientSdkHelper.UploadNewPackage(\n+ UploadHelper.GetUniquePackageId(nameof(UploadAndUnlistPackagesAsOrganizationCollaborator)),\n+ success: false,\n+ apiKey: apiKey);\n+\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+\n+ // Can unlist versions of an existing package as organization\n+ await _clientSdkHelper.UnlistPackageAndVerify(id, version, apiKey);\n}\n[Fact]\n[Description(\"Uses scoped API keys to push and unlist packages using Nuget.exe\")]\n[Priority(0)]\n[Category(\"P0Tests\")]\n- public async Task VerifyScopedApiKeys()\n+ public async Task ScopedApiKeysCanOnlyPushAndUnlistWithCorrectScopes()\n{\n// Arrange\nvar packageCreationHelper = new PackageCreationHelper(TestOutputHelper);\nvar commandlineHelper = new CommandlineHelper(TestOutputHelper);\n- var packageId = \"ScopedApiKeysTest_\" + DateTime.Now.Ticks;\n+ var packageId = UploadHelper.GetUniquePackageId(nameof(ScopedApiKeysCanOnlyPushAndUnlistWithCorrectScopes));\nvar version1 = \"1.0.0\";\nvar version2= \"2.0.0\";\n- string package1FullPath = null;\n- string package2FullPath = null;\n-\n- try\n- {\n- package1FullPath = await packageCreationHelper.CreatePackage(packageId, version1);\n- package2FullPath = await packageCreationHelper.CreatePackage(packageId, version2);\n-\n// 1. Try to upload package using 'unlist' api key => expect failure\nTestOutputHelper.WriteLine($\"1. Trying to upload package '{packageId}', version '{version1}' using 'unlist' API key. Expected result: failure.\");\n- var processResult = await commandlineHelper.UploadPackageAsync(package1FullPath, UrlHelper.V2FeedPushSourceUrl, EnvironmentSettings.TestAccountApiKey_Unlist);\n- Assert.True(processResult.ExitCode != 0, \"Package push succeeded, although was expected to fail.\");\n+ await _clientSdkHelper.UploadNewPackage(packageId, version1, apiKey: EnvironmentSettings.TestAccountApiKey_Unlist, success: false);\n// 2. Try to upload package using 'push version' api key => expect failure\nTestOutputHelper.WriteLine($\"2. Trying to upload package '{packageId}', version '{version1}' using 'push version' API key. Expected result: failure.\");\n- processResult = await commandlineHelper.UploadPackageAsync(package1FullPath, UrlHelper.V2FeedPushSourceUrl, EnvironmentSettings.TestAccountApiKey_PushVersion);\n- Assert.True(processResult.ExitCode != 0, \"Package push succeeded, although was expected to fail.\");\n+ await _clientSdkHelper.UploadNewPackage(packageId, version1, apiKey: EnvironmentSettings.TestAccountApiKey_PushVersion, success: false);\n// 3. Upload package using 'push' api key => expect success\nTestOutputHelper.WriteLine($\"3. Trying to upload package '{packageId}', version '{version1}' using 'push' API key. Expected result: success.\");\n- await _clientSdkHelper.UploadExistingPackage(package1FullPath, EnvironmentSettings.TestAccountApiKey_Push);\n+ await _clientSdkHelper.UploadNewPackage(packageId, version1, apiKey: EnvironmentSettings.TestAccountApiKey_Push);\n// 4. Upload new version of package using 'push version' api key => expect success\nTestOutputHelper.WriteLine($\"4. Trying to upload package '{packageId}', version '{version2}' using 'push version' API key. Expected result: success.\");\n- await _clientSdkHelper.UploadExistingPackage(package2FullPath, EnvironmentSettings.TestAccountApiKey_PushVersion);\n+ await _clientSdkHelper.UploadNewPackage(packageId, version2, apiKey: EnvironmentSettings.TestAccountApiKey_PushVersion);\n// Verify the existence of the two pushed packages.\nawait _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, version1);\nawait _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, version2);\n- // 5. Try unlisting package version1 using 'push' api key => expect failture\n+ // 5. Try unlisting package version1 using 'push' api key => expect failure\nTestOutputHelper.WriteLine($\"5. Trying to unlist package '{packageId}', version '{version1}' using 'push' API key. Expected result: failure.\");\n- processResult = await commandlineHelper.DeletePackageAsync(packageId, version1, UrlHelper.V2FeedPushSourceUrl, EnvironmentSettings.TestAccountApiKey_Push);\n- Assert.True(processResult.ExitCode != 0, \"Package delete succeeded, although was expected to fail.\");\n+ await _clientSdkHelper.UnlistPackage(packageId, version1, EnvironmentSettings.TestAccountApiKey_Push, success: false);\n- // 6. Try unlisting package version2 using 'push version' api key => expect failture\n+ // 6. Try unlisting package version2 using 'push version' api key => expect failure\nTestOutputHelper.WriteLine($\"6. Trying to unlist package '{packageId}', version '{version2}' using 'push' API key. Expected result: failure.\");\n- processResult = await commandlineHelper.DeletePackageAsync(packageId, version2, UrlHelper.V2FeedPushSourceUrl, EnvironmentSettings.TestAccountApiKey_PushVersion);\n- Assert.True(processResult.ExitCode != 0, \"Package delete succeeded, although was expected to fail.\");\n+ await _clientSdkHelper.UnlistPackage(packageId, version2, EnvironmentSettings.TestAccountApiKey_PushVersion, success: false);\n// 7. Unlist both packages using 'unlist' api key => expect succees\nTestOutputHelper.WriteLine($\"7. Trying to unlist package '{packageId}', version '{version1}' using 'unlist' API key. Expected result: success.\");\n@@ -116,20 +155,13 @@ public async Task VerifyScopedApiKeys()\nTestOutputHelper.WriteLine($\"8. Trying to unlist package '{packageId}', version '{version2}' using 'unlist' API key. Expected result: success.\");\nawait _clientSdkHelper.UnlistPackage(packageId, version2, EnvironmentSettings.TestAccountApiKey_Unlist);\n-\n- }\n- finally\n- {\n- _clientSdkHelper.CleanCreatedPackage(package1FullPath);\n- _clientSdkHelper.CleanCreatedPackage(package2FullPath);\n- }\n}\n[Fact]\n[Description(\"Creates a test package with minclientversion tag and .cs name. Pushes it to the server using Nuget.exe and then download via ClientSDK\")]\n[Priority(0)]\n[Category(\"P0Tests\")]\n- public async Task UploadAndDownLoadPackageWithMinClientVersion()\n+ public async Task UploadAndDownloadPackageWithMinClientVersion()\n{\nstring packageId = DateTime.Now.Ticks + \"PackageWithDotCsNames.Cs\";\nstring version = \"1.0.0\";\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.P0/NuGetGallery.WebUITests.P0.csproj",
"new_path": "tests/NuGetGallery.WebUITests.P0/NuGetGallery.WebUITests.P0.csproj",
"diff": "<ItemGroup>\n<Compile Include=\"AccountManagement\\LogonTest.cs\" />\n<Compile Include=\"AccountManagement\\RegisterNewUserTest.cs\" />\n- <Compile Include=\"AssertAndValidationHelper.cs\" />\n<Compile Include=\"BasicPages\\BrandingValidationTest.cs\" />\n<Compile Include=\"BasicPages\\HomePageValidationTest.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n<Compile Include=\"UploadAndDownload\\UploadPackageFromUI.cs\" />\n+ <Compile Include=\"UploadAndDownload\\UploadPackageToSelfFromUI.cs\" />\n+ <Compile Include=\"UploadAndDownload\\UploadPackageToOrganizationAsCollaboratorFromUI.cs\" />\n+ <Compile Include=\"UploadAndDownload\\UploadPackageToOrganizationAsAdminFromUI.cs\" />\n</ItemGroup>\n<ItemGroup>\n<ProjectReference Include=\"..\\NuGetGallery.FunctionalTests.Core\\NuGetGallery.FunctionalTests.Core.csproj\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.P1/NuGetGallery.WebUITests.P1.csproj",
"new_path": "tests/NuGetGallery.WebUITests.P1/NuGetGallery.WebUITests.P1.csproj",
"diff": "</CodeAnalysisDependentAssemblyPaths>\n</ItemGroup>\n<ItemGroup>\n- <Compile Include=\"..\\NuGetGallery.WebUITests.P0\\AssertAndValidationHelper.cs\">\n- <Link>AssertAndValidationHelper.cs</Link>\n- </Compile>\n<Compile Include=\"BasicPages\\PackagesPageTest.cs\" />\n<Compile Include=\"BasicPages\\StatisticsPageTest.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.ReadOnlyMode/NuGetGallery.WebUITests.ReadOnlyMode.csproj",
"new_path": "tests/NuGetGallery.WebUITests.ReadOnlyMode/NuGetGallery.WebUITests.ReadOnlyMode.csproj",
"diff": "</CodeAnalysisDependentAssemblyPaths>\n</ItemGroup>\n<ItemGroup>\n- <Compile Include=\"..\\NuGetGallery.WebUITests.P0\\AssertAndValidationHelper.cs\">\n- <Link>AssertAndValidationHelper.cs</Link>\n- </Compile>\n<Compile Include=\"..\\NuGetGallery.WebUITests.P0\\BasicPages\\HomePageValidationTest.cs\">\n<Link>BasicPages\\HomePageValidationTest.cs</Link>\n</Compile>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Functional tests for push/unlist of organization packages (#5362)
|
455,747 |
05.02.2018 12:38:54
| 28,800 |
b7d968cff72b72967fac04ae987cf1a7f23bb147
|
[Organization/AAD] Add UI support for transforming accounts or linking AAD for certain accounts
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -275,6 +275,64 @@ img.reserved-indicator-icon {\nline-height: 2em;\ncolor: #e3ebf1;\n}\n+.modal-backdrop.in {\n+ position: fixed;\n+ height: 100%;\n+ opacity: .8 !important;\n+}\n+.modal-container {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+ overflow: hidden;\n+\n+ -webkit-box-align: center;\n+ -webkit-align-items: center;\n+ -ms-flex-align: center;\n+ align-items: center;\n+}\n+.modal-container .modal-box {\n+ padding: 0;\n+ margin-left: 37.5%;\n+ overflow: hidden;\n+ background-color: white;\n+ border-radius: 8px;\n+}\n+.modal-container .modal-box .modal-title {\n+ padding: 15px;\n+ color: white;\n+ background-color: #4181b8;\n+}\n+.modal-container .modal-box .modal-title .title-text {\n+ vertical-align: top;\n+}\n+.modal-container .modal-box .modal-body {\n+ padding: 15px;\n+}\n+.modal-container .modal-box .modal-body .tag-node {\n+ padding: 13px;\n+ margin: -15px;\n+ text-align: left;\n+ background-color: #f9e29d;\n+}\n+.modal-container .modal-box .modal-body .error-message {\n+ margin-right: -15px;\n+ margin-left: -15px;\n+}\n+.modal-container .modal-box .modal-body .signin-node {\n+ padding: 15% 15%;\n+ margin-top: 16px;\n+ text-align: center;\n+}\n+.modal-container .modal-box .modal-body .signin-node .provider-button {\n+ font-size: 16px;\n+ line-height: 2em;\n+}\n+.modal-container .modal-box .modal-body .transform-node {\n+ margin-bottom: 10px;\n+ text-align: center;\n+}\n#edit-metadata-form-container .loading:after {\ndisplay: inline-block;\n/* ascii code for the ellipsis character */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap.css",
"new_path": "src/Bootstrap/dist/css/bootstrap.css",
"diff": "@@ -5075,7 +5075,7 @@ button.close {\n}\n.modal-open .modal {\noverflow-x: hidden;\n- overflow-y: auto;\n+ overflow-y: hidden;\n}\n.modal-dialog {\nposition: relative;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/modals.less",
"new_path": "src/Bootstrap/less/modals.less",
"diff": "}\n.modal-open .modal {\noverflow-x: hidden;\n- overflow-y: auto;\n+ overflow-y: hidden;\n}\n// Shell div to position the modal with bottom padding\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"base.less\";\n+@import \"modals.less\";\n@import \"common-edit-metadata.less\";\n@import \"common-high-contrast.less\";\n@import \"common-list-packages.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/modals.less",
"diff": "+.modal-backdrop.in\n+{\n+ opacity:0.8 !important;\n+ position:fixed;// This makes it cover the entire scrollable page, not just browser height\n+ height:100%;\n+}\n+\n+.modal-container {\n+ align-items: center;\n+ display: flex;\n+ overflow: hidden;\n+\n+ .modal-box {\n+ border-radius: 8px;\n+ background-color: white;\n+ overflow: hidden;\n+ margin-left: 37.5%;\n+ padding: 0px;\n+\n+ .modal-title {\n+ background-color: #4181B8;\n+ color: white;\n+ padding: 15px;\n+\n+ .title-text {\n+ vertical-align: top;\n+ }\n+ }\n+\n+ .modal-body {\n+ padding: 15px;\n+\n+ .tag-node {\n+ background-color: #F9E29D;\n+ padding: 13px;\n+ margin: -15px;\n+ text-align: left;\n+ }\n+\n+ .error-message {\n+ margin-left: -15px;\n+ margin-right: -15px;\n+ }\n+\n+ .signin-node {\n+ padding: 15% 15%;\n+ text-align: center;\n+ margin-top: 16px;\n+\n+ .provider-button {\n+ font-size: 16px;\n+ line-height: 2em;\n+ }\n+ }\n+\n+ .transform-node {\n+ text-align: center;\n+ margin-bottom: 10px;\n+ }\n+ }\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": "@@ -18,6 +18,8 @@ public static class Constants\npublic const int ColumnsWideAuthenticationSm = 8;\npublic const int ColumnsWideAuthenticationMd = 6;\npublic const int ColumnsFormMd = 10;\n+ public const int ColumnsModalSm = 3;\n+ public const int ColumnsModalMd = 3;\npublic const int VisibleVersions = 5;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PagesController.cs",
"diff": "@@ -99,7 +99,7 @@ public virtual async Task<ActionResult> Contact(ContactSupportViewModel contactF\npublic virtual ActionResult Home()\n{\n- return View();\n+ return View(new GalleryHomeViewModel());\n}\n[HttpGet]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Diagnostics\\DiagnosticsServiceExtensions.cs\" />\n<Compile Include=\"Diagnostics\\DiagnosticsSourceExtensions.cs\" />\n<Compile Include=\"Configuration\\StorageType.cs\" />\n+ <Compile Include=\"ViewModels\\GalleryHomeViewModel.cs\" />\n<Compile Include=\"WebRole.cs\" />\n<Content Include=\"bin\\NuGetGallery.dll.config\">\n<SubType>Designer</SubType>\n<Content Include=\"Views\\Users\\_UserAccountChangeExternalCredential.cshtml\" />\n<Content Include=\"Views\\Shared\\_AccountConfirmationNotices.cshtml\" />\n<Content Include=\"Views\\Users\\_UserAccountLinkExternalCredential.cshtml\" />\n+ <Content Include=\"Views\\Pages\\_TransformOrLink.cshtml\" />\n</ItemGroup>\n<ItemGroup>\n<CodeAnalysisDictionary Include=\"Properties\\CodeAnalysisDictionary.xml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-home.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-home.js",
"diff": "@@ -21,6 +21,18 @@ $(function () {\nstats.uniquePackages() + ' unique package' + (stats.uniquePackages() != 1 ? 's' : '') + '.';\n});\n+ function showModal() {\n+ $(document).on('keydown', function (e) {\n+ e.preventDefault();\n+ });\n+\n+ $(document).on('ready', function (e) {\n+ $(\"#popUpModal\").modal({\n+ show: true\n+ });\n+ })\n+ };\n+\nfunction updateStats() {\n$.get('/stats/totals')\n.done(function (data) {\n@@ -63,4 +75,7 @@ $(function () {\nko.applyBindings(stats);\nupdateStats();\n+ if (window.showModal) {\n+ showModal();\n+ }\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -1020,6 +1020,11 @@ public static string GenerateApiKey(this UrlHelper url, bool relativeUrl = true)\nreturn GetActionLink(url, \"GenerateApiKey\", \"Users\", relativeUrl);\n}\n+ public static string TransformAccount(this UrlHelper url, bool relativeUrl = true)\n+ {\n+ return GetActionLink(url, \"Transform\", \"Users\", relativeUrl);\n+ }\n+\npublic static string ConfirmTransformAccount(this UrlHelper url, User accountToTransform, bool relativeUrl = true)\n{\nreturn GetActionLink(\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organization/AAD] Add UI support for transforming accounts or linking AAD for certain accounts (#5384)
|
455,776 |
06.02.2018 11:45:48
| 28,800 |
743616f5125450c81a5b4917ba9c98b7b5e713cd
|
Remove password credential from user when they link an external account
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -401,7 +401,7 @@ public virtual async Task<ActionResult> LinkOrChangeExternalCredential(string re\nawait _authService.CreateSessionAsync(OwinContext, authenticatedUser);\n// Remove the password credential after linking to external account.\n- var passwordCred = user.Credentials.SingleOrDefault(c => c.IsPassword());\n+ var passwordCred = user.GetPasswordCredential();\nif (passwordCred != null)\n{\n@@ -536,6 +536,12 @@ private async Task<AuthenticatedUser> AssociateCredential(AuthenticatedUser user\nawait _authService.AddCredential(user.User, result.Credential);\n+ var passwordCredential = user.User.GetPasswordCredential();\n+ if (passwordCredential != null)\n+ {\n+ await _authService.RemoveCredential(user.User, passwordCredential);\n+ }\n+\n// Notify the user of the change\n_messageService.SendCredentialAddedNotice(user.User, _authService.DescribeCredential(result.Credential));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/UserExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/UserExtensions.cs",
"diff": "@@ -19,6 +19,14 @@ public static bool IsAdministrator(this User self)\nreturn self.IsInRole(Constants.AdminRoleName);\n}\n+ /// <summary>\n+ /// Get the user's <see cref=\"Credential\"/> with a type of <see cref=\"CredentialTypes.Password\"/>.\n+ /// </summary>\n+ public static Credential GetPasswordCredential(this User user)\n+ {\n+ return user.Credentials.SingleOrDefault(c => c.IsPassword());\n+ }\n+\n/// <summary>\n/// Get the current API key credential, if available.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"diff": "{\n<p class=\"text-center\">\nWe found an account with this email address. Sign in with your password to link with this Microsoft account.\n+ </p>\n+ <p class=\"text-center\">\n+ Note that <b>your existing password login will be disabled</b> and you will need to use this Microsoft account to sign into NuGet.org\n+ </p>\n+ <p class=\"text-center\">\nPlease <a href=\"mailto:@Config.Current.GalleryOwner.Address\">contact support</a> if you need more assistance.\n</p>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -243,11 +243,14 @@ public async Task WillLogTheUserOnWithUsernameEvenWithoutConfirmedEmailAddress()\nGetMock<AuthenticationService>().VerifyAll();\n}\n- public async Task WhenAttemptingToLinkExternalToExistingAccountWithNoExternalAccounts_AllowsLinking()\n+ public async Task WhenAttemptingToLinkExternalToExistingAccountWithNoExternalAccounts_AllowsLinkingAndRemovesPassword()\n{\n// Arrange\n+ var passwordCredential = new Credential(CredentialTypes.Password.Prefix, \"thePassword\");\n+ var user = new User(\"theUsername\") { EmailAddress = \"confirmed@example.com\", Credentials = new[] { passwordCredential } };\n+\nvar authUser = new AuthenticatedUser(\n- new User(\"theUsername\") { EmailAddress = \"confirmed@example.com\" },\n+ user,\nnew Credential() { Type = \"foo\" });\nvar authResult =\n@@ -278,6 +281,9 @@ public async Task WhenAttemptingToLinkExternalToExistingAccountWithNoExternalAcc\nGetMock<AuthenticationService>()\n.Verify(x => x.CreateSessionAsync(controller.OwinContext, authUser));\n+ GetMock<AuthenticationService>()\n+ .Verify(x => x.RemoveCredential(user, passwordCredential));\n+\nGetMock<IMessageService>()\n.Verify(x => x.SendCredentialAddedNotice(It.IsAny<User>(), It.IsAny<CredentialViewModel>()));\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove password credential from user when they link an external account (#5382)
|
455,744 |
06.02.2018 12:58:06
| 28,800 |
93d53074206c0fb8a129d45c927464904d16f21d
|
SendValidationTakingTooLongNotice method with tests
* Added SendValidationTakingTooLongNotice method and tests.
* Updated with the new message
* Removed the signature from the validation taking too long message.
Removed the unused argument from the `SendValidationTakingTooLongNotice` method
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreMessageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreMessageService.cs",
"diff": "@@ -8,5 +8,6 @@ public interface ICoreMessageService\nvoid SendPackageAddedNotice(Package package, string packageUrl, string packageSupportUrl, string emailSettingsUrl);\nvoid SendPackageValidationFailedNotice(Package package, string packageUrl, string packageSupportUrl);\nvoid SendSignedPackageNotAllowedNotice(Package package, string packageUrl, string announcementsUrl, string twitterUrl);\n+ void SendValidationTakingTooLongNotice(Package package, string packageUrl);\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
SendValidationTakingTooLongNotice method with tests (#5402)
* Added SendValidationTakingTooLongNotice method and tests.
* Updated with the new message
* Removed the signature from the validation taking too long message.
Removed the unused argument from the `SendValidationTakingTooLongNotice` method
|
455,772 |
06.02.2018 16:39:59
| 28,800 |
0a8bbfee07073de9c4b9811db60d75b53ff8be25
|
Remove copy api key option for non-scoped api keys
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -534,9 +534,7 @@ public virtual CredentialViewModel DescribeCredential(Credential credential)\nExpires = credential.Expires,\nKind = kind,\nAuthUI = authenticator?.GetUI(),\n- // Set the description as the value for legacy API keys\nDescription = credential.Description,\n- Value = kind == CredentialKind.Token && credential.Description == null ? credential.Value : null,\nScopes = credential.Scopes.Select(s => new ScopeViewModel(\ns.Owner?.Username ?? credential.User.Username,\ns.Subject,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"diff": "@@ -1547,7 +1547,6 @@ public void GivenATokenCredential_LegacyApiKey_ItDescribesItCorrectly(bool hasEx\nAssert.Equal(cred.Expires, description.Expires);\nAssert.Equal(CredentialKind.Token, description.Kind);\nAssert.Null(description.AuthUI);\n- Assert.Equal(cred.Value, description.Value);\nAssert.Equal(Strings.NonScopedApiKeyDescription, description.Description);\nAssert.Equal(expectedHasExpired, description.HasExpired);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove copy api key option for non-scoped api keys (#5411)
|
455,744 |
07.02.2018 10:33:01
| 28,800 |
cb23f82e2bd8137d0c8f4b0c171de465221aa890
|
Added "Read more" link to the "validating" message.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@<text>\n<strong>This package has not been published yet.</strong> It will appear in search results and\nwill be available for install/restore after both validation and indexing are complete. Package\n- validation and indexing may take up to an hour.\n+ validation and indexing may take up to an hour. <a href=\"https://aka.ms/NuGetPackageValidation\">Read more</a>.\n</text>\n)\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Added "Read more" link to the "validating" message. (#5208)
|
455,794 |
08.02.2018 13:40:17
| 28,800 |
fac403908e7800bba351644e0c6382aaf806e65f
|
Fix org UI issues
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"diff": "data[\"__RequestVerificationToken\"] = $field.val();\n}\n+ var configureSection = function (prefix) {\n+ var containerId = prefix + \"-container\";\n+ $(\"#cancel-\" + prefix).click(function (e) {\n+ // Collapse the container.\n+ $(\"#\" + containerId).collapse('hide');\n+\n+ // Prevent navigation.\n+ e.preventDefault();\n+\n+ // Reset the form.\n+ var formElement = $(\"#\" + containerId + \" form\")[0];\n+ if (formElement) {\n+ formElement.reset();\n+ }\n+\n+ // Clear values.\n+ $(\"#\" + containerId + \" input[type='text']\").val(\"\");\n+ $(\"#\" + containerId + \" input[type='password']\").val(\"\");\n+\n+ // Reset the validation state.\n+ if (formElement) {\n+ window.nuget.resetFormValidation(formElement);\n+ }\n+ });\n+ }\n+\nfunction OrganizationMemberViewModel(parent, member) {\nvar self = this;\n};\n}\n+ // Set up the section expanders.\n+ for (var i in sections) {\n+ configureSection(sections[i]);\n+ }\n+\n// Set up the data binding.\nvar manageOrganizationViewModel = new ManageOrganizationViewModel(initialData);\nko.applyBindings(manageOrganizationViewModel, document.body);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"diff": "@{\nViewBag.Title = \"Manage Organization\";\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n+\n+ TempData[\"Parent\"] = this;\n}\n<section role=\"main\" class=\"container main-container page-account-settings\">\n<div class=\"row\">\n<div class=\"col-md-12\">\n<h1>\n- <a href=\"@Url.ManageMyOrganizations()\">Manage Organizations</a>\n+ <a href=\"@Url.ManageMyOrganizations()\">Organizations</a>\n>\n- <a href=\"@Url.User(Model.Account)\">@Model.AccountName</a>\n+ @Model.AccountName\n</h1>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"diff": "ViewBag.Title = \"Account Settings\";\nViewBag.MdPageColumns = Constants.ColumnsFormMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n+\n+ TempData[\"Parent\"] = this;\n}\n<section role=\"main\" class=\"container main-container page-account-settings\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"diff": "<section role=\"main\" class=\"container main-container manage-packages\">\n<div class=\"row\">\n<div class=\"col-md-12\">\n- <h1>Manage Organizations</h1>\n+ <h1>Organizations</h1>\n@if (Model.Organizations.Any())\n{\nvar orgCount = Model.Organizations.Count();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"diff": "})\n});\n</script>\n- @Scripts.Render(\"~/Scripts/gallery/site.min.js\")\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix org UI issues (#5423)
|
455,736 |
08.02.2018 18:11:05
| 28,800 |
5657bdc0a067465752c6b19218c9979382005278
|
Add tool to perform a bulk reflow of packages
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "<WarningLevel>4</WarningLevel>\n</PropertyGroup>\n<ItemGroup>\n+ <Reference Include=\"Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Autofac.3.5.2\\lib\\net40\\Autofac.dll</HintPath>\n+ </Reference>\n<Reference Include=\"EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\EntityFramework.6.2.0\\lib\\net45\\EntityFramework.dll</HintPath>\n</Reference>\n<Reference Include=\"Microsoft.Extensions.CommandLineUtils, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.Extensions.CommandLineUtils.1.1.1\\lib\\net451\\Microsoft.Extensions.CommandLineUtils.dll</HintPath>\n</Reference>\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.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Common.4.3.0-preview1-2524\\lib\\net45\\NuGet.Common.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Frameworks, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Frameworks.4.3.0-preview1-2524\\lib\\net45\\NuGet.Frameworks.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Packaging, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Packaging.4.3.0-preview1-2524\\lib\\net45\\NuGet.Packaging.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Packaging.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Packaging.Core.4.3.0-preview1-2524\\lib\\net45\\NuGet.Packaging.Core.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"NuGet.Versioning, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Versioning.4.3.0-preview1-2524\\lib\\net45\\NuGet.Versioning.dll</HintPath>\n+ </Reference>\n<Reference Include=\"System\" />\n<Reference Include=\"System.ComponentModel.DataAnnotations\" />\n<Reference Include=\"System.Core\" />\n<Reference Include=\"System.Xml\" />\n</ItemGroup>\n<ItemGroup>\n+ <Compile Include=\"Commands\\HashCommand.cs\" />\n+ <Compile Include=\"Commands\\ReflowCommand.cs\" />\n<Compile Include=\"Program.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n</ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Program.cs",
"new_path": "src/GalleryTools/Program.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Collections.Generic;\n-using System.Diagnostics;\n-using System.Linq;\n-using System.Linq.Expressions;\n-using System.Threading.Tasks;\n+using GalleryTools.Commands;\nusing Microsoft.Extensions.CommandLineUtils;\n-using NuGetGallery;\n-using NuGetGallery.Infrastructure.Authentication;\nnamespace GalleryTools\n{\nclass Program\n{\n- const int BatchSize = 100;\n-\n- public static void Main(params string[] args)\n+ public static int Main(params string[] args)\n{\nvar commandLineApplication = new CommandLineApplication();\n- commandLineApplication.HelpOption(\"-? | -h | --help\");\n- var hash = commandLineApplication.Command(\"hash\", config =>\n- {\n- config.Description = \"Hash V1/V2 ApiKeys in Gallery DB\";\n- CommandOption connectionString = config.Option(\"-db\", \"DB connection string. User should have write permission.\", CommandOptionType.SingleValue);\n- CommandOption whatIf = config.Option(\"-w | --whatif\", \"Don't apply changes to DB.\", CommandOptionType.NoValue);\n- config.HelpOption(\"-? | -h | --help\");\n- config.OnExecute(() =>\n- {\n- Hash(connectionString.Value(), whatIf.HasValue()).GetAwaiter().GetResult();\n- return 0;\n- });\n- });\n+ commandLineApplication.HelpOption(\"-? | -h | --help\");\n+ commandLineApplication.Command(\"hash\", HashCommand.Configure);\n+ commandLineApplication.Command(\"reflow\", ReflowCommand.Configure);\ntry\n{\n- commandLineApplication.Execute(args);\n+ return commandLineApplication.Execute(args);\n}\ncatch (Exception e)\n{\nConsole.WriteLine($\"Error: {e}\");\n- }\n- }\n-\n- private static async Task Hash(string connectionString, bool whatIf)\n- {\n- using (var context = new EntitiesContext(connectionString, readOnly: whatIf))\n- {\n- var allCredentials = (IQueryable<Credential>)context.Set<Credential>();\n-\n- // Get all V1/V2 credentials that are active:\n- // V1 credentials that have no expiration date, but were used in the last year\n- // V1/V2 credentials that have a future expiration date\n-\n- var validLastUsed = DateTime.UtcNow - TimeSpan.FromDays(365);\n- Expression<Func<Credential, bool>> predicate = x => (x.Type == CredentialTypes.ApiKey.V1 || x.Type == CredentialTypes.ApiKey.V2) &&\n- ((x.Expires == null && x.LastUsed != null && x.LastUsed > validLastUsed) ||\n- (x.Expires != null && x.Expires > DateTime.UtcNow));\n-\n- var activeCredentialsCount = allCredentials.Count(predicate);\n-\n- Console.WriteLine($\"Found {activeCredentialsCount} active V1/V2 ApiKeys.\");\n-\n- IList<Credential> batch;\n- int batchNumber = 1;\n- bool failures = false;\n-\n- do\n- {\n- batch = allCredentials.Where(predicate).Take(BatchSize).ToList();\n-\n- if (batch.Count > 0)\n- {\n- Console.WriteLine($\"Hashing batch {batchNumber}/{Math.Ceiling((double)activeCredentialsCount / (double)BatchSize)}. Batch size: {batch.Count}...\");\n-\n- foreach (var v1v2ApiKey in batch)\n- {\n- ApiKeyV3 hashedApiKey = null;\n-\n- try\n- {\n- hashedApiKey = ApiKeyV3.CreateFromV1V2ApiKey(v1v2ApiKey.Value);\n-\n- v1v2ApiKey.Type = CredentialTypes.ApiKey.V3;\n- v1v2ApiKey.Value = hashedApiKey.HashedApiKey;\n- }\n- catch (ArgumentException e)\n- {\n- failures = true;\n- Console.WriteLine($\"Failed to hash key: {v1v2ApiKey.Key} Type: {v1v2ApiKey.Type} Old value: {v1v2ApiKey.Value}. Reason: {e}\");\n- }\n- }\n-\n- if (!failures && !whatIf)\n- {\n- var stopwatch = Stopwatch.StartNew();\n- Console.WriteLine($\"Saving batch {batchNumber} to DB...\");\n- await context.SaveChangesAsync();\n- Console.WriteLine($\"Saved changes to DB. Took: {stopwatch.Elapsed.TotalSeconds} seconds\");\n- }\n- else\n- {\n- Console.WriteLine(\"Skipping DB save.\");\n- }\n-\n- batchNumber++;\n- }\n- }\n- while (batch.Count > 0);\n+ return 1;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -257,7 +257,14 @@ protected override void Load(ContainerBuilder builder)\n.AsSelf()\n.As<IContentObjectService>()\n.SingleInstance();\n- HostingEnvironment.QueueBackgroundWorkItem(async cancellationToken => await DependencyResolver.Current.GetService<IContentObjectService>().Refresh());\n+\n+ if (configuration.Current.IsHosted)\n+ {\n+ HostingEnvironment.QueueBackgroundWorkItem(async cancellationToken => await DependencyResolver\n+ .Current\n+ .GetService<IContentObjectService>()\n+ .Refresh());\n+ }\nvar mailSenderThunk = new Lazy<IMailSender>(\n() =>\n@@ -696,9 +703,12 @@ private static void RegisterCookieComplianceService(ContainerBuilder builder, Co\n.As<ICookieComplianceService>()\n.SingleInstance();\n+ if (configuration.Current.IsHosted)\n+ {\n// Initialize the service on App_Start to avoid any performance degradation during initial requests.\nvar siteName = configuration.GetSiteRoot(true);\nHostingEnvironment.QueueBackgroundWorkItem(async cancellationToken => await service.InitializeAsync(siteName, diagnostics, cancellationToken));\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": "@@ -298,5 +298,8 @@ public class AppConfiguration : IAppConfiguration\n/// Gets/Sets a flag indicating if default security policies should be enforced.\n/// </summary>\npublic bool EnforceDefaultSecurityPolicies { get; set; }\n+\n+ [DefaultValue(true)]\n+ public bool IsHosted { get; set; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -282,5 +282,11 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// Gets/Sets a flag indicating if default security policies should be enforced.\n/// </summary>\nbool EnforceDefaultSecurityPolicies { get; set; }\n+\n+ /// <summary>\n+ /// Whether or not the gallery is running as a hosted web service. This should always be true unless the\n+ /// gallery code is being used inside a console application.\n+ /// </summary>\n+ bool IsHosted { get; set; }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add tool to perform a bulk reflow of packages (#5425)
Progress on https://github.com/NuGet/Engineering/issues/1094
|
455,751 |
13.02.2018 09:12:50
| 28,800 |
7f138a93e0aa2779e85c4a27d864dbadbc7988e8
|
USSC gallery api/status should use secondary storage.
USSC gallery api/status should use secondary storage.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"diff": "using Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Microsoft.WindowsAzure.Storage.Blob.Protocol;\n+using Microsoft.WindowsAzure.Storage.RetryPolicies;\nusing Newtonsoft.Json;\nusing Newtonsoft.Json.Converters;\nusing Newtonsoft.Json.Linq;\n@@ -31,8 +32,8 @@ public class CloudAuditingService : AuditingService, ICloudStorageStatusDependen\nprivate string _localIP;\nprivate Func<Task<AuditActor>> _getOnBehalfOf;\n- public CloudAuditingService(string instanceId, string localIP, string storageConnectionString, Func<Task<AuditActor>> getOnBehalfOf)\n- : this(instanceId, localIP, GetContainer(storageConnectionString), getOnBehalfOf)\n+ public CloudAuditingService(string instanceId, string localIP, string storageConnectionString, bool readAccessGeoRedundant, Func<Task<AuditActor>> getOnBehalfOf)\n+ : this(instanceId, localIP, GetContainer(storageConnectionString, readAccessGeoRedundant), getOnBehalfOf)\n{\n}\n@@ -91,11 +92,14 @@ protected override async Task SaveAuditRecordAsync(string auditData, string reso\n}\n}\n- private static CloudBlobContainer GetContainer(string storageConnectionString)\n+ private static CloudBlobContainer GetContainer(string storageConnectionString, bool readAccessGeoRedundant)\n{\n- return CloudStorageAccount.Parse(storageConnectionString)\n- .CreateCloudBlobClient()\n- .GetContainerReference(DefaultContainerName);\n+ var cloudBlobClient = CloudStorageAccount.Parse(storageConnectionString).CreateCloudBlobClient();\n+ if (readAccessGeoRedundant)\n+ {\n+ cloudBlobClient.DefaultRequestOptions.LocationMode = LocationMode.PrimaryThenSecondary;\n+ }\n+ return cloudBlobClient.GetContainerReference(DefaultContainerName);\n}\nprivate static async Task WriteBlob(string auditData, string fullPath, CloudBlockBlob blob)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/AzureEntityList.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/AzureEntityList.cs",
"diff": "using System.Linq;\nusing System.Web;\nusing Microsoft.WindowsAzure.Storage;\n+using Microsoft.WindowsAzure.Storage.RetryPolicies;\nusing Microsoft.WindowsAzure.Storage.Table;\nnamespace NuGetGallery.Infrastructure\n@@ -23,9 +24,13 @@ public class AzureEntityList<T> : IEnumerable<T> where T : ITableEntity, new()\nprivate CloudTable _tableRef;\n- public AzureEntityList(string connStr, string tableName)\n+ public AzureEntityList(string connStr, string tableName, bool readAccessGeoRedundant)\n{\nvar tableClient = CloudStorageAccount.Parse(connStr).CreateCloudTableClient();\n+ if (readAccessGeoRedundant)\n+ {\n+ tableClient.DefaultRequestOptions.LocationMode = LocationMode.PrimaryThenSecondary;\n+ }\n_tableRef = tableClient.GetTableReference(tableName);\n// Create the actual Azure Table, if it doesn't yet exist.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"diff": "@@ -144,10 +144,10 @@ public class TableErrorLog : ErrorLog\nprivate readonly string _connectionString;\nprivate readonly AzureEntityList<ErrorEntity> _entityList;\n- public TableErrorLog(string connectionString)\n+ public TableErrorLog(string connectionString, bool readAccessGeoRedundant)\n{\n_connectionString = connectionString;\n- _entityList = new AzureEntityList<ErrorEntity>(connectionString, TableName);\n+ _entityList = new AzureEntityList<ErrorEntity>(connectionString, TableName, readAccessGeoRedundant);\n}\npublic override ErrorLogEntry GetError(string id)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -618,7 +618,7 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC\n.As<IStatisticsService>()\n.SingleInstance();\n- builder.RegisterInstance(new TableErrorLog(configuration.Current.AzureStorage_Errors_ConnectionString))\n+ builder.RegisterInstance(new TableErrorLog(configuration.Current.AzureStorage_Errors_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))\n.As<ErrorLog>()\n.SingleInstance();\n}\n@@ -637,7 +637,7 @@ private static IAuditingService GetAuditingServiceForAzureStorage(ContainerBuild\nvar localIp = AuditActor.GetLocalIpAddressAsync().Result;\n- var service = new CloudAuditingService(instanceId, localIp, configuration.Current.AzureStorage_Auditing_ConnectionString, AuditActor.GetAspNetOnBehalfOfAsync);\n+ var service = new CloudAuditingService(instanceId, localIp, configuration.Current.AzureStorage_Auditing_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant, AuditActor.GetAspNetOnBehalfOfAsync);\nbuilder.RegisterInstance(service)\n.As<ICloudStorageStatusDependency>()\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
USSC gallery api/status should use secondary storage. (#5429)
USSC gallery api/status should use secondary storage.
|
455,776 |
14.02.2018 12:49:24
| 28,800 |
0e339fb6ce9371e21dd3ca4533f5b305f9c6964f
|
dont intercept authenticate returnurl
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -1033,7 +1033,8 @@ public static string Authenticate(this UrlHelper url, string providerName, strin\n{\n{ \"provider\", providerName },\n{ \"returnUrl\", returnUrl }\n- });\n+ },\n+ interceptReturnUrl: false);\n}\npublic static string RemoveCredential(this UrlHelper url, bool relativeUrl = true)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
dont intercept authenticate returnurl (#5480)
|
455,736 |
14.02.2018 23:34:57
| 28,800 |
acd5396e4a157aa8357840edb87b359be6c53d2c
|
Remove NugetExeDownloaderService and related configuration
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/StorageDependent.cs",
"new_path": "src/NuGetGallery/App_Start/StorageDependent.cs",
"diff": "@@ -85,7 +85,6 @@ public static IEnumerable<StorageDependent> GetAll(IAppConfiguration configurati\nvar dependents = new[]\n{\nCreate<ContentService, IContentService>(configuration.AzureStorage_Content_ConnectionString, isSingleInstance: true),\n- Create<NuGetExeDownloaderService, INuGetExeDownloaderService>(configuration.AzureStorage_NuGetExe_ConnectionString, isSingleInstance: false),\nCreate<PackageFileService, IPackageFileService>(configuration.AzureStorage_Packages_ConnectionString, isSingleInstance: false),\nCreate<UploadFileService, IUploadFileService>(configuration.AzureStorage_Uploads_ConnectionString, isSingleInstance: false),\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -48,9 +48,6 @@ public class AppConfiguration : IAppConfiguration\n[DisplayName(\"AzureStorage.Errors.ConnectionString\")]\npublic string AzureStorage_Errors_ConnectionString { get; set; }\n- [DisplayName(\"AzureStorage.NuGetExe.ConnectionString\")]\n- public string AzureStorage_NuGetExe_ConnectionString { get; set; }\n-\n[DisplayName(\"AzureStorage.Packages.ConnectionString\")]\npublic string AzureStorage_Packages_ConnectionString { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -55,11 +55,6 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\n/// </summary>\nstring AzureStorage_Errors_ConnectionString { get; set; }\n- /// <summary>\n- /// The Azure Storage connection string used for downloading nuget.exe.\n- /// </summary>\n- string AzureStorage_NuGetExe_ConnectionString { get; set; }\n-\n/// <summary>\n/// The Azure Storage connection string used for packages, after upload.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -35,7 +35,6 @@ public partial class ApiController\npublic IApiScopeEvaluator ApiScopeEvaluator { get; set; }\npublic IEntitiesContext EntitiesContext { get; set; }\n- public INuGetExeDownloaderService NugetExeDownloaderService { get; set; }\npublic IPackageFileService PackageFileService { get; set; }\npublic IPackageService PackageService { get; set; }\npublic IUserService UserService { get; set; }\n@@ -66,7 +65,6 @@ protected ApiController()\nIPackageService packageService,\nIPackageFileService packageFileService,\nIUserService userService,\n- INuGetExeDownloaderService nugetExeDownloaderService,\nIContentService contentService,\nIIndexingService indexingService,\nISearchService searchService,\n@@ -87,7 +85,6 @@ protected ApiController()\nPackageService = packageService;\nPackageFileService = packageFileService;\nUserService = userService;\n- NugetExeDownloaderService = nugetExeDownloaderService;\nContentService = contentService;\nIndexingService = indexingService;\nSearchService = searchService;\n@@ -111,7 +108,6 @@ protected ApiController()\nIPackageService packageService,\nIPackageFileService packageFileService,\nIUserService userService,\n- INuGetExeDownloaderService nugetExeDownloaderService,\nIContentService contentService,\nIIndexingService indexingService,\nISearchService searchService,\n@@ -127,7 +123,7 @@ protected ApiController()\nISecurityPolicyService securityPolicies,\nIReservedNamespaceService reservedNamespaceService,\nIPackageUploadService packageUploadService)\n- : this(apiScopeEvaluator, entitiesContext, packageService, packageFileService, userService, nugetExeDownloaderService, contentService,\n+ : this(apiScopeEvaluator, entitiesContext, packageService, packageFileService, userService, contentService,\nindexingService, searchService, autoCuratePackage, statusService, messageService, auditingService,\nconfigurationService, telemetryService, authenticationService, credentialBuilder, securityPolicies,\nreservedNamespaceService, packageUploadService)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\IStatisticsService.cs\" />\n<Compile Include=\"Services\\FileSystemFileStorageService.cs\" />\n<Compile Include=\"Services\\IIndexingService.cs\" />\n- <Compile Include=\"Services\\INuGetExeDownloaderService.cs\" />\n<Compile Include=\"Services\\IAggregateStatsService.cs\" />\n<Compile Include=\"Services\\ISearchService.cs\" />\n<Compile Include=\"Services\\IUploadFileService.cs\" />\n<Compile Include=\"Services\\LocalFileReference.cs\" />\n- <Compile Include=\"Services\\NuGetExeDownloaderService.cs\" />\n<Compile Include=\"Services\\NullReportService.cs\" />\n<Compile Include=\"Services\\NullStatisticsService.cs\" />\n<Compile Include=\"Services\\PackageDeleteService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Gallery.AzureStorage.Auditing.ConnectionString\" value=\"\" />\n<add key=\"Gallery.AzureStorage.Content.ConnectionString\" value=\"\" />\n<add key=\"Gallery.AzureStorage.Errors.ConnectionString\" value=\"\" />\n- <add key=\"Gallery.AzureStorage.NuGetExe.ConnectionString\" value=\"\" />\n<add key=\"Gallery.AzureStorage.Packages.ConnectionString\" value=\"\" />\n<add key=\"Gallery.AzureStorage.Statistics.ConnectionString\" value=\"\" />\n<add key=\"Gallery.AzureStorage.Uploads.ConnectionString\" value=\"\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/App_Start/StorageDependentFacts.cs",
"new_path": "tests/NuGetGallery.Facts/App_Start/StorageDependentFacts.cs",
"diff": "@@ -54,12 +54,10 @@ public void StorageDependentsHaveExpectedTypes()\n// Assert\nvar implementationToInterface = dependents.ToDictionary(x => x.ImplementationType, x => x.InterfaceType);\nAssert.Contains(typeof(ContentService), implementationToInterface.Keys);\n- Assert.Contains(typeof(NuGetExeDownloaderService), implementationToInterface.Keys);\nAssert.Contains(typeof(PackageFileService), implementationToInterface.Keys);\nAssert.Contains(typeof(UploadFileService), implementationToInterface.Keys);\n- Assert.Equal(4, implementationToInterface.Count);\n+ Assert.Equal(3, implementationToInterface.Count);\nAssert.Equal(implementationToInterface[typeof(ContentService)], typeof(IContentService));\n- Assert.Equal(implementationToInterface[typeof(NuGetExeDownloaderService)], typeof(INuGetExeDownloaderService));\nAssert.Equal(implementationToInterface[typeof(PackageFileService)], typeof(IPackageFileService));\nAssert.Equal(implementationToInterface[typeof(UploadFileService)], typeof(IUploadFileService));\n}\n@@ -76,7 +74,6 @@ public void StorageDependentsUseCorrectConnectionString()\n// Assert\nvar typeToConnectionString = dependents.ToDictionary(x => x.ImplementationType, x => x.AzureStorageConnectionString);\nAssert.Equal(typeToConnectionString[typeof(ContentService)], config.AzureStorage_Content_ConnectionString);\n- Assert.Equal(typeToConnectionString[typeof(NuGetExeDownloaderService)], config.AzureStorage_NuGetExe_ConnectionString);\nAssert.Equal(typeToConnectionString[typeof(PackageFileService)], config.AzureStorage_Packages_ConnectionString);\nAssert.Equal(typeToConnectionString[typeof(UploadFileService)], config.AzureStorage_Uploads_ConnectionString);\n}\n@@ -86,8 +83,7 @@ public void StorageDependentsAreGroupedByConnectionString()\n{\n// Arrange\nvar mock = new Mock<IAppConfiguration>();\n- mock.Setup(x => x.AzureStorage_Content_ConnectionString).Returns(\"Content and NuGetExe\");\n- mock.Setup(x => x.AzureStorage_NuGetExe_ConnectionString).Returns(\"Content and NuGetExe\");\n+ mock.Setup(x => x.AzureStorage_Content_ConnectionString).Returns(\"Content\");\nmock.Setup(x => x.AzureStorage_Packages_ConnectionString).Returns(\"Packages and Uploads\");\nmock.Setup(x => x.AzureStorage_Uploads_ConnectionString).Returns(\"Packages and Uploads\");\nvar config = mock.Object;\n@@ -97,7 +93,6 @@ public void StorageDependentsAreGroupedByConnectionString()\n// Assert\nvar typeToBindingKey = dependents.ToDictionary(x => x.ImplementationType, x => x.BindingKey);\n- Assert.Equal(typeToBindingKey[typeof(ContentService)], typeToBindingKey[typeof(NuGetExeDownloaderService)]);\nAssert.Equal(typeToBindingKey[typeof(PackageFileService)], typeToBindingKey[typeof(UploadFileService)]);\n}\n@@ -105,7 +100,6 @@ private static IAppConfiguration GetConfiguration()\n{\nvar mock = new Mock<IAppConfiguration>();\nmock.Setup(x => x.AzureStorage_Content_ConnectionString).Returns(\"Content\");\n- mock.Setup(x => x.AzureStorage_NuGetExe_ConnectionString).Returns(\"NuGetExe\");\nmock.Setup(x => x.AzureStorage_Packages_ConnectionString).Returns(\"Packages\");\nmock.Setup(x => x.AzureStorage_Uploads_ConnectionString).Returns(\"Uploads\");\nreturn mock.Object;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -37,7 +37,6 @@ internal class TestableApiController\npublic Mock<IPackageService> MockPackageService { get; private set; }\npublic Mock<IPackageFileService> MockPackageFileService { get; private set; }\npublic Mock<IUserService> MockUserService { get; private set; }\n- public Mock<INuGetExeDownloaderService> MockNuGetExeDownloaderService { get; private set; }\npublic Mock<IContentService> MockContentService { get; private set; }\npublic Mock<IStatisticsService> MockStatisticsService { get; private set; }\npublic Mock<IIndexingService> MockIndexingService { get; private set; }\n@@ -60,7 +59,6 @@ internal class TestableApiController\nEntitiesContext = (MockEntitiesContext = new Mock<IEntitiesContext>()).Object;\nPackageService = (MockPackageService = new Mock<IPackageService>(behavior)).Object;\nUserService = (MockUserService = new Mock<IUserService>(behavior)).Object;\n- NugetExeDownloaderService = (MockNuGetExeDownloaderService = new Mock<INuGetExeDownloaderService>(MockBehavior.Strict)).Object;\nContentService = (MockContentService = new Mock<IContentService>()).Object;\nStatisticsService = (MockStatisticsService = new Mock<IStatisticsService>()).Object;\nIndexingService = (MockIndexingService = new Mock<IIndexingService>()).Object;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"TestUtils\\Infrastructure\\FeedServiceHelpers.cs\" />\n<Compile Include=\"Services\\FileSystemFileStorageServiceFacts.cs\" />\n<Compile Include=\"Services\\MessageServiceFacts.cs\" />\n- <Compile Include=\"Services\\NuGetExeDownloaderServiceFacts.cs\" />\n<Compile Include=\"Services\\ODataRemoveSorterFacts.cs\" />\n<Compile Include=\"Services\\PackageFileServiceFacts.cs\" />\n<Compile Include=\"Services\\PackageDeleteServiceFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove NugetExeDownloaderService and related configuration (#5483)
Address https://github.com/NuGet/NuGetGallery/issues/5479
|
455,794 |
15.02.2018 12:26:04
| 28,800 |
610dcf6ef577ecb44837c8db95cfdc40f579ad44
|
Manage Organizations perf fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\ReflowPackageService.cs\" />\n<Compile Include=\"Services\\TelemetryService.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\DeleteUserAccountViewModel.cs\" />\n- <Compile Include=\"ViewModels\\ListOrganizationsItemViewModel.cs\" />\n- <Compile Include=\"ViewModels\\ListOrganizationsViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ManageOrganizationsItemViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ManageOrganizationsViewModel.cs\" />\n<Compile Include=\"ViewModels\\ChangeEmailViewModel.cs\" />\n<Compile Include=\"ViewModels\\ChangeNotificationsViewModel.cs\" />\n<Compile Include=\"ViewModels\\ChangePasswordViewModel.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageService.cs",
"new_path": "src/NuGetGallery/Services/IPackageService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Collections.Generic;\n+using System.Linq;\nusing System.Threading.Tasks;\nusing NuGet.Packaging;\nusing NuGetGallery.Packaging;\n@@ -34,7 +35,7 @@ public interface IPackageService : ICorePackageService\nIEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted, bool includeVersions = false);\n- IEnumerable<PackageRegistration> FindPackageRegistrationsByOwner(User user);\n+ IQueryable<PackageRegistration> FindPackageRegistrationsByOwner(User user);\nIEnumerable<Package> FindDependentPackages(Package package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -318,7 +318,7 @@ public IEnumerable<User> GetPackageUserAccountOwners(Package package)\n.Distinct();\n}\n- public IEnumerable<PackageRegistration> FindPackageRegistrationsByOwner(User user)\n+ public IQueryable<PackageRegistration> FindPackageRegistrationsByOwner(User user)\n{\nreturn _packageRegistrationRepository.GetAll().Where(p => p.Owners.Any(o => o.Key == user.Key));\n}\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/ViewModels/ListOrganizationsItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManageOrganizationsItemViewModel.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/ViewModels/ListOrganizationsViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManageOrganizationsViewModel.cs",
"diff": ""
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Manage Organizations perf fix (#5467)
|
455,747 |
15.02.2018 16:59:16
| 28,800 |
ea02fa6a8b3914271514cf2022db9e54f87a2be8
|
[BugBash] MSA - Add exception handler for access denied
|
[
{
"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.Security.Claims;\n+using System.Threading.Tasks;\nusing System.Web.Mvc;\nusing Microsoft.IdentityModel.Protocols;\n+using Microsoft.Owin.Security.Notifications;\nusing Microsoft.Owin.Security.OpenIdConnect;\nusing NuGetGallery.Configuration;\nusing Owin;\n@@ -33,6 +35,8 @@ 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 readonly string ACCESS_DENIED = \"access_denied\";\n+\nprotected override void AttachToOwinApp(IGalleryConfigurationService config, IAppBuilder app)\n{\n// Fetch site root from configuration\n@@ -52,6 +56,10 @@ protected override void AttachToOwinApp(IGalleryConfigurationService config, IAp\nScope = OpenIdConnectScopes.OpenIdProfile + \" email\",\nResponseType = OpenIdConnectResponseTypes.CodeIdToken,\nTokenValidationParameters = new System.IdentityModel.Tokens.TokenValidationParameters() { ValidateIssuer = false },\n+ Notifications = new OpenIdConnectAuthenticationNotifications\n+ {\n+ AuthenticationFailed = AuthenticationFailed\n+ }\n};\nConfig.ApplyToOwinSecurityOptions(options);\n@@ -136,5 +144,31 @@ public override IdentityInformation GetIdentityInformation(ClaimsIdentity claims\nreturn new IdentityInformation(identifier, nameClaim?.Value, emailClaim.Value, authenticationType, tenantId);\n}\n+\n+ // The OpenIdConnect.<AuthenticateCoreAsync> throws OpenIdConnectProtocolException upon denial of access permissions by the user,\n+ // this could result in an internal server error, catch this exception and continue to the controller where appropriate\n+ // error handling is done.\n+ private Task AuthenticationFailed(AuthenticationFailedNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> notification)\n+ {\n+ if (notification.Exception.Message == ACCESS_DENIED)\n+ {\n+ // For every 'Challenge' sent to the external providers, we store the 'State'\n+ // with the redirect uri where we intend to return after successful authentication.\n+ // Extract this \"RedirectUri\" property from this \"State\" object for redirecting on failed authentication as well.\n+ var authenticationPropertiesEncodedString = notification\n+ .ProtocolMessage\n+ .State\n+ .Split('=');\n+ var authenticationProperties = notification\n+ .Options\n+ .StateDataFormat\n+ .Unprotect(authenticationPropertiesEncodedString[1]);\n+\n+ notification.HandleResponse();\n+ notification.Response.Redirect(authenticationProperties.RedirectUri);\n+ }\n+\n+ return Task.FromResult(0);\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[BugBash] MSA - Add exception handler for access denied (#5485)
|
455,736 |
15.02.2018 15:02:14
| 28,800 |
7769e34aa74ed9772ff28cfd7714793fafbfb969
|
Move CryptographyService to NuGetGallery.Core so it can be used in the hash checker
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreConstants.cs",
"new_path": "src/NuGetGallery.Core/CoreConstants.cs",
"diff": "@@ -13,6 +13,8 @@ public static class CoreConstants\npublic const string NuGetPackageFileExtension = \".nupkg\";\n+ public const string Sha512HashAlgorithmId = \"SHA512\";\n+\npublic const string PackageContentType = \"binary/octet-stream\";\npublic const string OctetStreamContentType = \"application/octet-stream\";\npublic const string TextContentType = \"text/plain\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Services\\CoreMessageService.cs\" />\n<Compile Include=\"Services\\CorePackageFileService.cs\" />\n<Compile Include=\"Services\\CorePackageService.cs\" />\n+ <Compile Include=\"Services\\CryptographyService.cs\" />\n<Compile Include=\"Services\\ICloudBlobClient.cs\" />\n<Compile Include=\"Services\\ICloudBlobContainer.cs\" />\n<Compile Include=\"Services\\ICoreMessageService.cs\" />\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Infrastructure/Authentication/CryptographyService.cs",
"new_path": "src/NuGetGallery.Core/Services/CryptographyService.cs",
"diff": "@@ -12,7 +12,7 @@ public static class CryptographyService\n{\npublic static string GenerateHash(\nStream input,\n- string hashAlgorithmId = Constants.Sha512HashAlgorithmId)\n+ string hashAlgorithmId = CoreConstants.Sha512HashAlgorithmId)\n{\ninput.Position = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -51,7 +51,6 @@ public static class Constants\npublic const string RelevanceSortOrder = \"relevance\";\npublic const string Sha1HashAlgorithmId = \"SHA1\";\n- public const string Sha512HashAlgorithmId = \"SHA512\";\npublic const string PBKDF2HashAlgorithmId = \"PBKDF2\";\npublic const string UploadFileNameTemplate = \"{0}{1}\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -461,7 +461,7 @@ private async Task<ActionResult> CreatePackageInternal()\nvar packageStreamMetadata = new PackageStreamMetadata\n{\n- HashAlgorithm = Constants.Sha512HashAlgorithmId,\n+ HashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\nHash = CryptographyService.GenerateHash(packageStream.AsSeekableStream()),\nSize = packageStream.Length\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1561,7 +1561,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nvar packageStreamMetadata = new PackageStreamMetadata\n{\n- HashAlgorithm = Constants.Sha512HashAlgorithmId,\n+ HashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\nHash = CryptographyService.GenerateHash(uploadFile.AsSeekableStream()),\nSize = uploadFile.Length,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Configuration\\AppConfiguration.cs\" />\n<Compile Include=\"Constants.cs\" />\n<Compile Include=\"App_Start\\DefaultDependenciesModule.cs\" />\n- <Compile Include=\"Infrastructure\\Authentication\\CryptographyService.cs\" />\n<Compile Include=\"ExtensionMethods.cs\" />\n<Compile Include=\"Services\\FormsAuthenticationService.cs\" />\n<Compile Include=\"Configuration\\IAppConfiguration.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"new_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"diff": "@@ -45,7 +45,7 @@ public async Task<Package> ReflowAsync(string id, string version)\n// 2) Determine package metadata from binary\nvar packageStreamMetadata = new PackageStreamMetadata\n{\n- HashAlgorithm = Constants.Sha512HashAlgorithmId,\n+ HashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\nHash = CryptographyService.GenerateHash(packageStream.AsSeekableStream()),\nSize = packageStream.Length,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -248,17 +248,17 @@ public async Task WillStoreTheHashForTheCreatedPackage()\nvar currentUser = new User();\nvar packageStream = nugetPackage.Object.GetStream().AsSeekableStream();\n- var expectedHash = CryptographyService.GenerateHash(packageStream, Constants.Sha512HashAlgorithmId);\n+ var expectedHash = CryptographyService.GenerateHash(packageStream, CoreConstants.Sha512HashAlgorithmId);\nvar packageStreamMetadata = new PackageStreamMetadata\n{\nHash = expectedHash,\n- HashAlgorithm = Constants.Sha512HashAlgorithmId,\n+ HashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\nSize = packageStream.Length\n};\nvar package = await service.CreatePackageAsync(nugetPackage.Object, packageStreamMetadata, currentUser, currentUser, isVerified: false);\nAssert.Equal(expectedHash, package.Hash);\n- Assert.Equal(Constants.Sha512HashAlgorithmId, package.HashAlgorithm);\n+ Assert.Equal(CoreConstants.Sha512HashAlgorithmId, package.HashAlgorithm);\n}\n[Fact]\n@@ -309,11 +309,11 @@ public async Task WillSaveThePackageFileAndSetThePackageFileSize()\nvar currentUser = new User();\nvar packageStream = nugetPackage.Object.GetStream().AsSeekableStream();\n- var packageHash = CryptographyService.GenerateHash(packageStream, Constants.Sha512HashAlgorithmId);\n+ var packageHash = CryptographyService.GenerateHash(packageStream, CoreConstants.Sha512HashAlgorithmId);\nvar packageStreamMetadata = new PackageStreamMetadata\n{\nHash = packageHash,\n- HashAlgorithm = Constants.Sha512HashAlgorithmId,\n+ HashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\nSize = 618\n};\nvar package = await service.CreatePackageAsync(nugetPackage.Object, packageStreamMetadata, currentUser, currentUser, isVerified: false);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Move CryptographyService to NuGetGallery.Core so it can be used in the hash checker (#5489)
Progress on https://github.com/NuGet/Engineering/issues/1168
|
455,776 |
16.02.2018 10:47:36
| 28,800 |
81385ef54fff899ff5766e4f60767e86a409bc91
|
Small orgs/AAD bug bash fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/RequireOrganizationTenantPolicy.cs",
"new_path": "src/NuGetGallery/Security/RequireOrganizationTenantPolicy.cs",
"diff": "@@ -75,7 +75,7 @@ public override SecurityPolicyResult Evaluate(UserSecurityPolicyEvaluationContex\nvar targetCredential = targetAccount.Credentials.GetAzureActiveDirectoryCredential();\nif (targetCredential == null\n- || !targetCredential.TenantId.Equals(state.Tenant, StringComparison.OrdinalIgnoreCase))\n+ || !state.Tenant.Equals(targetCredential.TenantId, StringComparison.OrdinalIgnoreCase))\n{\nreturn SecurityPolicyResult.CreateErrorResult(string.Format(CultureInfo.CurrentCulture,\nStrings.AddMember_UserDoesNotMeetOrganizationPolicy, targetAccount.Username));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "@@ -28,13 +28,14 @@ public ContentObjectService(IContentService contentService)\npublic async Task Refresh()\n{\nLoginDiscontinuationConfiguration =\n- await Refresh<LoginDiscontinuationConfiguration>(Constants.ContentNames.LoginDiscontinuationConfiguration);\n+ await Refresh<LoginDiscontinuationConfiguration>(Constants.ContentNames.LoginDiscontinuationConfiguration) ??\n+ new LoginDiscontinuationConfiguration();\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.FromHours(RefreshIntervalHours)))?.ToString();\nif (string.IsNullOrEmpty(configString))\n{\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "@@ -15,6 +15,11 @@ public class LoginDiscontinuationConfiguration : ILoginDiscontinuationConfigurat\npublic HashSet<string> DiscontinuedForDomains { get; }\npublic HashSet<string> ExceptionsForEmailAddresses { get; }\n+ public LoginDiscontinuationConfiguration()\n+ : this(Enumerable.Empty<string>(), Enumerable.Empty<string>(), Enumerable.Empty<string>())\n+ {\n+ }\n+\n[JsonConstructor]\npublic LoginDiscontinuationConfiguration(\nIEnumerable<string> discontinuedForEmailAddresses,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/LinkExternal.cshtml",
"diff": "else\n{\n<p class=\"text-center\">\n- Looks like we don't have an account with this email address (@Model.SignIn.UserNameOrEmail) in our records.\n+ Looks like we don't have an account with this email address (@Model.Register.EmailAddress) in our records.\n</p>\n<p class=\"text-center\">\nPlease provide a username so that we can create an account for you!\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Small orgs/AAD bug bash fixes (#5482)
|
455,747 |
16.02.2018 11:40:56
| 28,800 |
ec486bdf806248a37336b45f1b13882d09b0d784
|
[BugBash] UI fixes for Link/Transform dialog
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -293,8 +293,14 @@ img.reserved-indicator-icon {\nalign-items: center;\n}\n.modal-container .modal-box {\n+ width: -webkit-calc(100% - 40px);\n+ width: calc(100% - 40px);\n+ min-width: 320px;\n+ max-width: 448px;\n+ min-height: 364px;\npadding: 0;\n- margin-left: 37.5%;\n+ margin-right: auto;\n+ margin-left: auto;\noverflow: hidden;\nbackground-color: white;\nborder-radius: 8px;\n@@ -304,9 +310,6 @@ img.reserved-indicator-icon {\ncolor: white;\nbackground-color: #4181b8;\n}\n-.modal-container .modal-box .modal-title .title-text {\n- vertical-align: top;\n-}\n.modal-container .modal-box .modal-title .dismiss-button {\nfloat: right;\npadding: 0;\n@@ -315,30 +318,27 @@ img.reserved-indicator-icon {\nborder: 0;\n}\n.modal-container .modal-box .modal-body {\n- padding: 15px;\n+ padding: 0;\n}\n.modal-container .modal-box .modal-body .tag-node {\npadding: 13px;\n- margin: -15px;\ntext-align: left;\nbackground-color: #fff4ce;\n}\n-.modal-container .modal-box .modal-body .error-message {\n- margin-right: -15px;\n- margin-left: -15px;\n+.modal-container .modal-box .modal-body .tag-node .title-text {\n+ vertical-align: top;\n}\n-.modal-container .modal-box .modal-body .signin-node {\n- padding: 15% 15%;\n- margin-top: 16px;\n+.modal-container .modal-box .modal-body .action-node {\n+ padding: 9% 6%;\ntext-align: center;\n}\n-.modal-container .modal-box .modal-body .signin-node .provider-button {\n+.modal-container .modal-box .modal-body .action-button {\nfont-size: 16px;\nline-height: 2em;\n}\n-.modal-container .modal-box .modal-body .transform-node {\n- margin-bottom: 10px;\n- text-align: center;\n+.modal-container .modal-box .modal-body .transform-text {\n+ padding: 0 15px;\n+ margin: 0;\n}\n#edit-metadata-form-container .loading:after {\ndisplay: inline-block;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/modals.less",
"new_path": "src/Bootstrap/less/theme/modals.less",
"diff": ".modal-box {\nborder-radius: 8px;\nbackground-color: white;\n+ margin-left: auto;\n+ margin-right: auto;\n+ min-height: 364px;\n+ min-width: 320px;\n+ max-width: 448px;\n+ width: calc(100% - 40px);\noverflow: hidden;\n- margin-left: 37.5%;\npadding: 0px;\n.modal-title {\ncolor: white;\npadding: 15px;\n- .title-text {\n- vertical-align: top;\n- }\n-\n.dismiss-button {\nbackground: transparent;\nborder: 0px;\n}\n.modal-body {\n- padding: 15px;\n+ padding: 0px;\n.tag-node {\nbackground-color: #fff4ce;\npadding: 13px;\n- margin: -15px;\ntext-align: left;\n- }\n- .error-message {\n- margin-left: -15px;\n- margin-right: -15px;\n+ .title-text {\n+ vertical-align: top;\n+ }\n}\n- .signin-node {\n- padding: 15% 15%;\n+ .action-node {\n+ padding: 9% 6%;\ntext-align: center;\n- margin-top: 16px;\n+ }\n- .provider-button {\n+ .action-button {\nfont-size: 16px;\nline-height: 2em;\n}\n- }\n- .transform-node {\n- text-align: center;\n- margin-bottom: 10px;\n+ .transform-text {\n+ padding: 0px 15px;\n+ margin: 0px;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -17,8 +17,6 @@ public static class Constants\npublic const int ColumnsWideAuthenticationSm = 8;\npublic const int ColumnsWideAuthenticationMd = 6;\npublic const int ColumnsFormMd = 10;\n- public const int ColumnsModalSm = 3;\n- public const int ColumnsModalMd = 3;\npublic const int VisibleVersions = 5;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[BugBash] UI fixes for Link/Transform dialog (#5494)
|
455,747 |
16.02.2018 12:39:25
| 28,800 |
ccead7a2aa1bb3e8edcadfcc67ebb6af53a3e7ea
|
[BugBash] Prevent AAD to MSA account transformation
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -347,7 +347,15 @@ public virtual ActionResult AuthenticatePost(string returnUrl, string provider)\n[HttpGet]\npublic virtual ActionResult AuthenticateExternal(string returnUrl)\n{\n- string externalAuthProvider = GetExternalProvider();\n+ var user = GetCurrentUser();\n+ var aadCredential = user?.Credentials.GetAzureActiveDirectoryCredential();\n+ if (aadCredential != null)\n+ {\n+ TempData[\"WarningMessage\"] = Strings.ChangeCredential_NotAllowed;\n+ return Redirect(returnUrl);\n+ }\n+\n+ var externalAuthProvider = GetExternalProvider();\nif (externalAuthProvider == null)\n{\nTempData[\"Message\"] = Strings.ChangeCredential_ProviderNotFound;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -610,15 +610,6 @@ public virtual async Task<ActionResult> RemoveCredential(string credentialType,\n[ValidateAntiForgeryToken]\npublic virtual ActionResult LinkOrChangeExternalCredential()\n{\n- var user = GetCurrentUser();\n- var userHasAADCredential = user.Credentials.Any(c => CredentialTypes.IsAzureActiveDirectoryAccount(c.Type));\n-\n- if (userHasAADCredential)\n- {\n- TempData[\"WarningMessage\"] = Strings.ChangeCredential_NotAllowed;\n- return RedirectToAction(\"Account\");\n- }\n-\nreturn Redirect(Url.AuthenticateExternal(Url.AccountSettings()));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -994,6 +994,77 @@ public async Task GivenNewCredential_ItSuccessfullyReplacesExternalCredentialsAn\n}\n}\n+ public class TheAuthenticateExternalAction : TestContainer\n+ {\n+ [Fact]\n+ public void ForAADLinkedAccount_ErrorIsReturned()\n+ {\n+ var fakes = Get<Fakes>();\n+ var aadCred = new CredentialBuilder().CreateExternalCredential(\"AzureActiveDirectory\", \"blorg\", \"bloog\");\n+ var passwordCred = new Credential(\"password.v3\", \"random\");\n+ var msftCred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"bloom\", \"filter\");\n+ var user = fakes.CreateUser(\"test\", aadCred, passwordCred, msftCred);\n+ var controller = GetController<AuthenticationController>();\n+ controller.SetCurrentUser(user);\n+\n+ // Act\n+ var result = controller.AuthenticateExternal(\"theReturnUrl\");\n+\n+ // Assert\n+ ResultAssert.IsRedirectTo(result, \"theReturnUrl\");\n+ Assert.Equal(Strings.ChangeCredential_NotAllowed, controller.TempData[\"WarningMessage\"]);\n+ }\n+\n+ [Fact]\n+ public void ForMissingExternalProvider_ErrorIsReturned()\n+ {\n+ var controller = GetController<AuthenticationController>();\n+\n+ // Act\n+ var result = controller.AuthenticateExternal(\"theReturnUrl\");\n+\n+ // Assert\n+ ResultAssert.IsRedirectTo(result, \"theReturnUrl\");\n+ Assert.Equal(Strings.ChangeCredential_ProviderNotFound, controller.TempData[\"Message\"]);\n+ }\n+\n+ [Fact]\n+ public void WillCallChallengeAuthenticationForAADv2ProviderForUserWithNoAADCredential()\n+ {\n+ // Arrange\n+ const string returnUrl = \"/theReturnUrl\";\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var fakes = Get<Fakes>();\n+ var passwordCred = new Credential(\"password.v3\", \"random\");\n+ var msftCred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"bloom\", \"filter\");\n+ var user = fakes.CreateUser(\"test\", passwordCred, msftCred);\n+ var controller = GetController<AuthenticationController>();\n+ controller.SetCurrentUser(user);\n+\n+ // Act\n+ var result = controller.AuthenticateExternal(returnUrl);\n+\n+ // Assert\n+ ResultAssert.IsChallengeResult(result, \"AzureActiveDirectoryV2\", controller.Url.LinkOrChangeExternalCredential(returnUrl));\n+ }\n+\n+ [Fact]\n+ public void WillCallChallengeAuthenticationForAADv2Provider()\n+ {\n+ // Arrange\n+ const string returnUrl = \"/theReturnUrl\";\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+ var controller = GetController<AuthenticationController>();\n+\n+ // Act\n+ var result = controller.AuthenticateExternal(returnUrl);\n+\n+ // Assert\n+ ResultAssert.IsChallengeResult(result, \"AzureActiveDirectoryV2\", controller.Url.LinkOrChangeExternalCredential(returnUrl));\n+ }\n+ }\n+\npublic class TheLinkExternalAccountAction : TestContainer\n{\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1603,26 +1603,6 @@ public async Task GivenValidRequest_CanDeleteMicrosoftAccountWithMultipleMicroso\npublic class TheLinkOrChangeCredentialAction : TestContainer\n{\n- [Fact]\n- public void ForAADLinkedAccount_ErrorIsReturned()\n- {\n- // Arrange\n- var fakes = Get<Fakes>();\n- var aadCred = new CredentialBuilder().CreateExternalCredential(\"AzureActiveDirectory\", \"blorg\", \"bloog\");\n- var passwordCred = new Credential(\"password.v3\", \"random\");\n- var msftCred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"bloom\", \"filter\");\n- var user = fakes.CreateUser(\"test\", aadCred, passwordCred, msftCred);\n- var controller = GetController<UsersController>();\n- controller.SetCurrentUser(user);\n-\n- // Act\n- var result = controller.LinkOrChangeExternalCredential();\n-\n- // Assert\n- ResultAssert.IsRedirectToRoute(result, new { action = \"Account\" });\n- Assert.Equal(Strings.ChangeCredential_NotAllowed, controller.TempData[\"WarningMessage\"]);\n- }\n-\n[Fact]\npublic void ForNonAADLinkedAccount_RedirectsToAuthenticateExternalLogin()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[BugBash] Prevent AAD to MSA account transformation (#5492)
|
455,794 |
16.02.2018 14:04:48
| 28,800 |
fb8f971d3f580b7b43c9644b9bfc9097158b90ee
|
Manage Org UI fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -953,6 +953,42 @@ img.reserved-indicator-icon {\ntop: 3px;\nmargin-right: 10px;\n}\n+.page-manage-organizations h1 {\n+ margin-bottom: 0;\n+}\n+.page-manage-organizations h2 {\n+ margin-top: 0;\n+ margin-bottom: 10px;\n+}\n+.page-manage-organizations .form-section-title {\n+ margin-top: 40px;\n+}\n+@media (min-width: 768px) {\n+ .page-manage-organizations .form-section-title {\n+ float: left;\n+ text-align: right;\n+ }\n+}\n+@media (min-width: 768px) {\n+ .page-manage-organizations .form-section-data {\n+ float: right;\n+ margin-top: 40px;\n+ line-height: 3;\n+ text-align: right;\n+ }\n+}\n+.page-manage-organizations .panel {\n+ margin-top: 5px;\n+}\n+.page-manage-organizations .form-group + .form-group .btn {\n+ margin-top: 20px;\n+}\n+.manage-members-listing tbody:first-child {\n+ border-style: hidden;\n+}\n+.manage-members-listing {\n+ margin-bottom: 0;\n+}\n.page-manage-owners h2 .ms-Icon {\nposition: relative;\ntop: -2px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-home.less\";\n@import \"page-list-packages.less\";\n@import \"page-manage-curated-feed.less\";\n+@import \"page-manage-organizations.less\";\n@import \"page-manage-owners.less\";\n@import \"page-manage-packages.less\";\n@import \"page-delete-package.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-manage-organizations.less",
"diff": "+.page-manage-organizations {\n+ @section-margin-top: 40px;\n+\n+ h1 {\n+ margin-bottom: 0;\n+ }\n+\n+ h2 {\n+ margin-bottom: 10px;\n+ margin-top: 0;\n+ }\n+\n+ .form-section-title {\n+ margin-top: @section-margin-top;\n+\n+ @media (min-width: @screen-sm-min) {\n+ float: left;\n+ text-align: right;\n+ }\n+ }\n+\n+ .form-section-data {\n+ @media (min-width: @screen-sm-min) {\n+ margin-top: @section-margin-top;\n+ line-height: 3;\n+ float: right;\n+ text-align: right;\n+ }\n+ }\n+\n+ .panel {\n+ margin-top: 5px;\n+ }\n+\n+ .form-group + .form-group {\n+ .btn {\n+ margin-top: 20px;\n+ }\n+ }\n+}\n+\n+.manage-members-listing tbody:first-child {\n+ border-style: hidden\n+}\n+\n+.manage-members-listing {\n+ margin-bottom: 0;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"diff": "TempData[\"Parent\"] = this;\n}\n-<section role=\"main\" class=\"container main-container page-account-settings\">\n+<section role=\"main\" class=\"container main-container page-manage-organizations\">\n<form id=\"AntiForgeryForm\">\n@Html.AntiForgeryToken()\n</form>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "</select>\n</div>\n<span class=\"input-group-btn\">\n- <button class=\"btn\" type=\"submit\" title=\"Add new member\" aria-label=\"Add new member\" data-bind=\"click: AddMember\">\n+ <button class=\"btn\" type=\"submit\" title=\"Add new member\" aria-label=\"Add new member\" data-bind=\"click: AddMember, enable: NewMemberUsername\">\n<span class=\"ms-Icon ms-Icon--AddFriend\" aria-hidden=\"true\"></span>\n</button>\n</span>\n</div><br />\n}\n- <table class=\"table\">\n+ <table class=\"table manage-members-listing\">\n<tbody data-bind=\"foreach: Members\">\n- <tr class=\"manage-members-listing\">\n+ <tr>\n<td class=\"align-middle hidden-xs col-xs-1\">\n<img data-bind=\"attr: { src: GravatarUrl, title: Username }\" class=\"owner-image\" alt=\"gravatar\"\nheight=\"@Constants.GravatarElementSize\" width=\"@Constants.GravatarElementSize\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Manage Org UI fixes (#5493)
|
455,794 |
16.02.2018 17:25:14
| 28,800 |
3eb84dec67b686d6dd5c518a6ea83f601e2325bf
|
Error message for removal of last org admin
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -111,8 +111,7 @@ public async Task<Membership> UpdateMemberAsync(Organization organization, strin\n// block removal of last admin\nif (membership.IsAdmin && organization.Administrators.Count() == 1)\n{\n- throw new EntityException(string.Format(CultureInfo.CurrentCulture,\n- Strings.UpdateOrDeleteMember_CannotRemoveLastAdmin, memberName));\n+ throw new EntityException(Strings.UpdateMember_CannotRemoveLastAdmin);\n}\nmembership.IsAdmin = isAdmin;\n@@ -136,8 +135,7 @@ public async Task DeleteMemberAsync(Organization organization, string memberName\n// block removal of last admin\nif (membership.IsAdmin && organization.Administrators.Count() == 1)\n{\n- throw new EntityException(string.Format(CultureInfo.CurrentCulture,\n- Strings.UpdateOrDeleteMember_CannotRemoveLastAdmin, memberName));\n+ throw new EntityException(Strings.DeleteMember_CannotRemoveLastAdmin);\n}\norganization.Members.Remove(membership);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -622,6 +622,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to You can't leave the organization. In order to leave the organization, another collaborator must be assigned as an administrator..\n+ /// </summary>\n+ public static string DeleteMember_CannotRemoveLastAdmin {\n+ get {\n+ return ResourceManager.GetString(\"DeleteMember_CannotRemoveLastAdmin\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Organization member was deleted..\n/// </summary>\n@@ -1701,11 +1710,11 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Organization member '{0}' is the last admin and cannot be changed..\n+ /// Looks up a localized string similar to You can't change your role to collaborator. In order to change, another collaborator must be assigned as an administrator..\n/// </summary>\n- public static string UpdateOrDeleteMember_CannotRemoveLastAdmin {\n+ public static string UpdateMember_CannotRemoveLastAdmin {\nget {\n- return ResourceManager.GetString(\"UpdateOrDeleteMember_CannotRemoveLastAdmin\", resourceCulture);\n+ return ResourceManager.GetString(\"UpdateMember_CannotRemoveLastAdmin\", resourceCulture);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -786,8 +786,8 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"DeleteMember_CannotDeleteLastAdmin\" xml:space=\"preserve\">\n<value>Organization member '{0}' is the last admin and cannot be deleted.</value>\n</data>\n- <data name=\"UpdateOrDeleteMember_CannotRemoveLastAdmin\" xml:space=\"preserve\">\n- <value>Organization member '{0}' is the last admin and cannot be changed.</value>\n+ <data name=\"UpdateMember_CannotRemoveLastAdmin\" xml:space=\"preserve\">\n+ <value>You can't change your role to collaborator. In order to change, another collaborator must be assigned as an administrator.</value>\n</data>\n<data name=\"UpdateOrDeleteMember_MemberNotFound\" xml:space=\"preserve\">\n<value>Organization member '{0}' was not found.</value>\n@@ -816,4 +816,7 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"TransformAccount_AdminAccountDoesNotHaveTenant\" xml:space=\"preserve\">\n<value>Administrator account '{0}' is not linked to an AAD credential with an organization tenant.</value>\n</data>\n+ <data name=\"DeleteMember_CannotRemoveLastAdmin\" xml:space=\"preserve\">\n+ <value>You can't leave the organization. In order to leave the organization, another collaborator must be assigned as an administrator.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -146,12 +146,16 @@ public async Task WhenLastAdmin_ThrowsEntityException()\nvar service = new TestableUserService();\n// Act & Assert\n- await Assert.ThrowsAsync<EntityException>(async () =>\n+ var exception = await Assert.ThrowsAsync<EntityException>(async () =>\n{\nawait service.DeleteMemberAsync(fakes.Organization, fakes.OrganizationAdmin.Username);\n});\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n+\n+ Assert.Equal(\n+ Strings.DeleteMember_CannotRemoveLastAdmin,\n+ exception.Message);\n}\n[Fact]\n@@ -227,12 +231,15 @@ public async Task WhenRemovingLastAdmin_ThrowsEntityException()\nvar service = new TestableUserService();\n// Act & Assert\n- await Assert.ThrowsAsync<EntityException>(async () =>\n+ var exception = await Assert.ThrowsAsync<EntityException>(async () =>\n{\nawait service.UpdateMemberAsync(fakes.Organization, fakes.OrganizationAdmin.Username, false);\n});\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n+ Assert.Equal(\n+ Strings.UpdateMember_CannotRemoveLastAdmin,\n+ exception.Message);\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Error message for removal of last org admin (#5490)
|
455,776 |
22.02.2018 16:07:00
| 28,800 |
7a86e823a1f75cf66a8dfaa43921555acda6ade3
|
[BugBash] Prevent added model errors from being reset by JQuery Validate
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -126,14 +126,14 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\nvar adminUser = UserService.FindByUsername(transformViewModel.AdminUsername);\nif (adminUser == null)\n{\n- ModelState.AddModelError(\"AdminUsername\", String.Format(CultureInfo.CurrentCulture,\n+ ModelState.AddModelError(string.Empty, String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_AdminAccountDoesNotExist, transformViewModel.AdminUsername));\nreturn View(transformViewModel);\n}\nif (!UserService.CanTransformUserToOrganization(accountToTransform, adminUser, out var errorReason))\n{\n- ModelState.AddModelError(\"AdminUsername\", errorReason);\n+ ModelState.AddModelError(string.Empty, errorReason);\nreturn View(transformViewModel);\n}\n@@ -420,10 +420,10 @@ public virtual async Task<ActionResult> ForgotPassword(ForgotPasswordViewModel m\nswitch (result.Type)\n{\ncase PasswordResetResultType.UserNotConfirmed:\n- ModelState.AddModelError(\"Email\", Strings.UserIsNotYetConfirmed);\n+ ModelState.AddModelError(string.Empty, Strings.UserIsNotYetConfirmed);\nbreak;\ncase PasswordResetResultType.UserNotFound:\n- ModelState.AddModelError(\"Email\", Strings.CouldNotFindAnyoneWithThatUsernameOrEmail);\n+ ModelState.AddModelError(string.Empty, Strings.CouldNotFindAnyoneWithThatUsernameOrEmail);\nbreak;\ncase PasswordResetResultType.Success:\nreturn SendPasswordResetEmail(result.User, forgotPassword: true);\n@@ -481,7 +481,7 @@ public virtual async Task<ActionResult> ResetPassword(string username, string to\n}\ncatch (InvalidOperationException ex)\n{\n- ModelState.AddModelError(\"\", ex.Message);\n+ ModelState.AddModelError(string.Empty, ex.Message);\nreturn View(model);\n}\n@@ -489,7 +489,7 @@ public virtual async Task<ActionResult> ResetPassword(string username, string to\nif (!ViewBag.ResetTokenValid)\n{\n- ModelState.AddModelError(\"\", Strings.InvalidOrExpiredPasswordResetToken);\n+ ModelState.AddModelError(string.Empty, Strings.InvalidOrExpiredPasswordResetToken);\nreturn View(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -345,14 +345,23 @@ public static HtmlString ShowCheckboxFor<TModel>(this HtmlHelper<TModel> html, E\nvar metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData);\nvar propertyName = metadata.PropertyName.ToLower();\n- return html.ValidationMessageFor(expression, validationMessage: null, htmlAttributes: new Dictionary<string, object>\n+ return html.ValidationMessageFor(expression, validationMessage: null, htmlAttributes: new Dictionary<string, object>(ValidationHtmlAttributes)\n{\n{ \"id\", $\"{propertyName}-validation-message\" },\n+ });\n+ }\n+\n+ public static MvcHtmlString ShowValidationMessagesForEmpty(this HtmlHelper html)\n+ {\n+ return html.ValidationMessage(modelName: string.Empty, htmlAttributes: ValidationHtmlAttributes);\n+ }\n+\n+ private static IDictionary<string, object> ValidationHtmlAttributes = new Dictionary<string, object>\n+ {\n{ \"class\", \"help-block\" },\n{ \"role\", \"alert\" },\n{ \"aria-live\", \"assertive\" },\n- });\n- }\n+ };\npublic static string ToShortNameOrNull(this NuGetFramework frameworkName)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PasswordResetRequestViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PasswordResetRequestViewModel.cs",
"diff": "@@ -7,6 +7,7 @@ namespace NuGetGallery\npublic class ForgotPasswordViewModel\n{\n[Required]\n+ [StringLength(255)]\n[Display(Name = \"Email\")]\npublic string Email { get; set; }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/TransformAccountViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/TransformAccountViewModel.cs",
"diff": "@@ -8,7 +8,7 @@ namespace NuGetGallery\npublic class TransformAccountViewModel\n{\n[Required]\n- [StringLength(255)]\n+ [StringLength(64)]\n[Display(Name = \"Administrator\")]\npublic string AdminUsername { get; set; }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"diff": "@Html.ShowTextBoxFor(m => m.Email)\n@Html.ShowValidationMessagesFor(m => m.Email)\n</div>\n+ <div class=\"form-group has-error\">\n+ @Html.ShowValidationMessagesForEmpty()\n+ </div>\n<div class=\"form-group\">\n<input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Send\" />\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"diff": "@Html.ShowTextBoxFor(m => m.AdminUsername)\n@Html.ShowValidationMessagesFor(m => m.AdminUsername)\n</div>\n+ <div class=\"form-group has-error\">\n+ @Html.ShowValidationMessagesForEmpty()\n+ </div>\n<div class=\"row form-group\">\n<div class=\"col-md-6\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -283,7 +283,7 @@ public async Task ShowsErrorIfUserWasNotFound()\nAssert.NotNull(result);\nAssert.IsNotType(typeof(RedirectResult), result);\n- Assert.Contains(Strings.CouldNotFindAnyoneWithThatUsernameOrEmail, result.ViewData.ModelState[\"Email\"].Errors.Select(e => e.ErrorMessage));\n+ Assert.Contains(Strings.CouldNotFindAnyoneWithThatUsernameOrEmail, result.ViewData.ModelState[string.Empty].Errors.Select(e => e.ErrorMessage));\n}\n[Fact]\n@@ -301,7 +301,7 @@ public async Task ShowsErrorIfUnconfirmedAccount()\nAssert.NotNull(result);\nAssert.IsNotType(typeof(RedirectResult), result);\n- Assert.Contains(Strings.UserIsNotYetConfirmed, result.ViewData.ModelState[\"Email\"].Errors.Select(e => e.ErrorMessage));\n+ Assert.Contains(Strings.UserIsNotYetConfirmed, result.ViewData.ModelState[string.Empty].Errors.Select(e => e.ErrorMessage));\n}\n[Fact]\n@@ -2275,8 +2275,8 @@ public async Task WhenCanTransformReturnsFalse_ShowsError()\n// Assert\nAssert.NotNull(result);\n- Assert.Equal(1, controller.ModelState[\"AdminUsername\"].Errors.Count);\n- Assert.Equal(\"error\", controller.ModelState[\"AdminUsername\"].Errors.First().ErrorMessage);\n+ Assert.Equal(1, controller.ModelState[string.Empty].Errors.Count);\n+ Assert.Equal(\"error\", controller.ModelState[string.Empty].Errors.First().ErrorMessage);\n}\n[Fact]\n@@ -2294,11 +2294,11 @@ public async Task WhenAdminIsNotFound_ShowsError()\n// Assert\nAssert.NotNull(result);\n- Assert.Equal(1, controller.ModelState[\"AdminUsername\"].Errors.Count);\n+ Assert.Equal(1, controller.ModelState[string.Empty].Errors.Count);\nAssert.Equal(\nString.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_AdminAccountDoesNotExist, \"AdminThatDoesNotExist\"),\n- controller.ModelState[\"AdminUsername\"].Errors.First().ErrorMessage);\n+ controller.ModelState[string.Empty].Errors.First().ErrorMessage);\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[BugBash] Prevent added model errors from being reset by JQuery Validate (#5502)
|
455,736 |
21.02.2018 09:21:56
| 28,800 |
433de7c658f67f4535f28765ee05425bc7b6ac4b
|
Enable reflowing of packages that don't pass valid version range rule
Fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/ManifestValidator.cs",
"new_path": "src/NuGetGallery.Core/Packaging/ManifestValidator.cs",
"diff": "@@ -22,7 +22,7 @@ public static IEnumerable<ValidationResult> Validate(Stream nuspecStream, out Nu\nvar rawMetadata = nuspecReader.GetMetadata();\nif (rawMetadata != null && rawMetadata.Any())\n{\n- return ValidateCore(PackageMetadata.FromNuspecReader(nuspecReader));\n+ return ValidateCore(PackageMetadata.FromNuspecReader(nuspecReader, strict: true));\n}\n}\ncatch (Exception ex)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"new_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"diff": "@@ -147,15 +147,18 @@ private Uri GetValue(string key, Uri alternateValue)\n/// Gets package metadata from a the provided <see cref=\"NuspecReader\"/> instance.\n/// </summary>\n/// <param name=\"nuspecReader\">The <see cref=\"NuspecReader\"/> instance used to read the <see cref=\"PackageMetadata\"/></param>\n+ /// <param name=\"strict\">\n+ /// Whether or not to be strict when reading the <see cref=\"NuspecReader\"/>. This should be <code>true</code>\n+ /// on initial ingestion but false when a package that has already been accepted is being processed.</param>\n/// <exception cref=\"PackagingException\">\n/// We default to use a strict version-check on dependency groups.\n/// When an invalid dependency version range is detected, a <see cref=\"PackagingException\"/> will be thrown.\n/// </exception>\n- public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader)\n+ public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool strict)\n{\nreturn new PackageMetadata(\nnuspecReader.GetMetadata().ToDictionary(kvp => kvp.Key, kvp => kvp.Value),\n- nuspecReader.GetDependencyGroups(useStrictVersionCheck: true),\n+ nuspecReader.GetDependencyGroups(useStrictVersionCheck: strict),\nnuspecReader.GetFrameworkReferenceGroups(),\nnuspecReader.GetPackageTypes(),\nnuspecReader.GetMinClientVersion()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -169,7 +169,8 @@ public async virtual Task<ActionResult> UploadPackage()\ntry\n{\npackageMetadata = PackageMetadata.FromNuspecReader(\n- package.GetNuspecReader());\n+ package.GetNuspecReader(),\n+ strict: true);\n}\ncatch (Exception ex)\n{\n@@ -407,7 +408,8 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\ntry\n{\npackageMetadata = PackageMetadata.FromNuspecReader(\n- package.GetNuspecReader());\n+ package.GetNuspecReader(),\n+ strict: true);\n}\ncatch (Exception ex)\n{\n@@ -1545,7 +1547,8 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nDebug.Assert(nugetPackage != null);\nvar packageMetadata = PackageMetadata.FromNuspecReader(\n- nugetPackage.GetNuspecReader());\n+ nugetPackage.GetNuspecReader(),\n+ strict: true);\n// Rule out problem scenario with multiple tabs - verification request (possibly with edits) was submitted by user\n// viewing a different package to what was actually most recently uploaded\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -45,7 +45,9 @@ public void EnsureValid(PackageArchiveReader packageArchiveReader)\n{\ntry\n{\n- var packageMetadata = PackageMetadata.FromNuspecReader(packageArchiveReader.GetNuspecReader());\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ packageArchiveReader.GetNuspecReader(),\n+ strict: true);\nValidateNuGetPackageMetadata(packageMetadata);\n@@ -82,7 +84,9 @@ public async Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage,\ntry\n{\n- packageMetadata = PackageMetadata.FromNuspecReader(nugetPackage.GetNuspecReader());\n+ packageMetadata = PackageMetadata.FromNuspecReader(\n+ nugetPackage.GetNuspecReader(),\n+ strict: true);\nValidateNuGetPackageMetadata(packageMetadata);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"new_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"diff": "@@ -50,7 +50,9 @@ public async Task<Package> ReflowAsync(string id, string version)\nSize = packageStream.Length,\n};\n- var packageMetadata = PackageMetadata.FromNuspecReader(packageArchive.GetNuspecReader());\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ packageArchive.GetNuspecReader(),\n+ strict: false);\n// 3) Clear referenced objects that will be reflowed\nClearSupportedFrameworks(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs",
"diff": "@@ -23,7 +23,9 @@ public static void CanReadBasicMetadataProperties()\nvar nuspec = nupkg.GetNuspecReader();\n// Act\n- var packageMetadata = PackageMetadata.FromNuspecReader(nuspec);\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: true);\n// Assert\nAssert.Equal(\"TestPackage\", packageMetadata.Id);\n@@ -47,7 +49,39 @@ public static void ThrowsPackagingExceptionWhenInvalidDepencencyVersionRangeDete\nvar nuspec = nupkg.GetNuspecReader();\n// Act & Assert\n- Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(nuspec));\n+ Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: true));\n+ }\n+\n+ [Fact]\n+ public static void DoesNotThrowInvalidDepencencyVersionRangeDetectedAndParsingIsNotStrict()\n+ {\n+ var packageStream = CreateTestPackageStreamWithInvalidDependencyVersion();\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: false);\n+\n+ // Assert\n+ Assert.Equal(\"TestPackage\", packageMetadata.Id);\n+ Assert.Equal(NuGetVersion.Parse(\"0.0.0.1\"), packageMetadata.Version);\n+ Assert.Equal(\"Package A\", packageMetadata.Title);\n+ Assert.Equal(2, packageMetadata.Authors.Count);\n+ Assert.Equal(\"ownera, ownerb\", packageMetadata.Owners);\n+ Assert.False(packageMetadata.RequireLicenseAcceptance);\n+ Assert.Equal(\"package A description.\", packageMetadata.Description);\n+ Assert.Equal(\"en-US\", packageMetadata.Language);\n+ Assert.Equal(\"http://www.nuget.org/\", packageMetadata.ProjectUrl.ToString());\n+ Assert.Equal(\"http://www.nuget.org/\", packageMetadata.IconUrl.ToString());\n+ Assert.Equal(\"http://www.nuget.org/\", packageMetadata.LicenseUrl.ToString());\n+ var dependencyGroup = Assert.Single(packageMetadata.GetDependencyGroups());\n+ var dependency = Assert.Single(dependencyGroup.Packages);\n+ Assert.Equal(\"SampleDependency\", dependency.Id);\n+ Assert.Equal(VersionRange.All, dependency.VersionRange);\n}\nprivate static Stream CreateTestPackageStream()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -96,7 +96,9 @@ internal class TestableApiController\nMockPackageUploadService.Setup(x => x.GeneratePackageAsync(It.IsAny<string>(), It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<User>()))\n.Returns((string id, PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User owner, User currentUser) => {\n- var packageMetadata = PackageMetadata.FromNuspecReader(nugetPackage.GetNuspecReader());\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ nugetPackage.GetNuspecReader(),\n+ strict: true);\nvar package = new Package();\npackage.PackageRegistration = new PackageRegistration { Id = packageMetadata.Id, IsVerified = false };\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "@@ -36,7 +36,9 @@ public class PackageUploadServiceFacts\n.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<User>(), It.IsAny<bool>()))\n.Returns((PackageArchiveReader packageArchiveReader, PackageStreamMetadata packageStreamMetadata, User owner, User currentUser, bool isVerified) =>\n{\n- var packageMetadata = PackageMetadata.FromNuspecReader(packageArchiveReader.GetNuspecReader());\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ packageArchiveReader.GetNuspecReader(),\n+ strict: true);\nvar newPackage = new Package();\nnewPackage.PackageRegistration = new PackageRegistration { Id = packageMetadata.Id, IsVerified = isVerified };\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"diff": "@@ -262,6 +262,46 @@ public async Task CallsUpdateIsLatestAsync()\n// Assert\npackageService.Verify(s => s.UpdateIsLatestAsync(package.PackageRegistration, false), Times.Once);\n}\n+\n+ [Fact]\n+ public async Task AllowsInvalidPackageDependencyVersion()\n+ {\n+ // Arrange\n+ var package = PackageServiceUtility.CreateTestPackage();\n+\n+ var packageService = SetupPackageService(package);\n+ var entitiesContext = SetupEntitiesContext();\n+ var packageFileService = SetupPackageFileService(\n+ package,\n+ CreateInvalidDependencyVersionTestPackageStream());\n+\n+ var service = CreateService(\n+ packageService: packageService,\n+ entitiesContext: entitiesContext,\n+ packageFileService: packageFileService);\n+\n+ // Act\n+ var result = await service.ReflowAsync(\"test\", \"1.0.0\");\n+\n+ // Assert\n+ Assert.Equal(\"test\", result.PackageRegistration.Id);\n+ Assert.Equal(\"1.0.0\", result.NormalizedVersion);\n+\n+ Assert.True(result.Dependencies.Any(d =>\n+ d.Id == \"WebActivator\"\n+ && d.VersionSpec == \"(, )\"\n+ && d.TargetFramework == \"net40\"));\n+\n+ Assert.True(result.Dependencies.Any(d =>\n+ d.Id == \"PackageC\"\n+ && d.VersionSpec == \"[1.1.0, 2.0.1)\"\n+ && d.TargetFramework == \"net40\"));\n+\n+ Assert.True(result.Dependencies.Any(d =>\n+ d.Id == \"jQuery\"\n+ && d.VersionSpec == \"(, )\"\n+ && d.TargetFramework == \"net451\"));\n+ }\n}\nprivate static Mock<PackageService> SetupPackageService(Package package)\n@@ -325,27 +365,50 @@ private static Mock<IEntitiesContext> SetupEntitiesContext()\nreturn entitiesContext;\n}\n- private static Mock<IPackageFileService> SetupPackageFileService(Package package)\n+ private static Mock<IPackageFileService> SetupPackageFileService(Package package, Stream packageStream = null)\n{\nvar packageFileService = new Mock<IPackageFileService>();\npackageFileService\n.Setup(s => s.DownloadPackageFileAsync(package))\n- .Returns(Task.FromResult(CreateTestPackageStream()))\n+ .Returns(Task.FromResult(packageStream ?? CreateTestPackageStream()))\n.Verifiable();\nreturn packageFileService;\n}\n- private static Stream CreateTestPackageStream()\n- {\n- var packageStream = new MemoryStream();\n- using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Create, true))\n+ private static Stream CreateInvalidDependencyVersionTestPackageStream()\n{\n- var nuspecEntry = packageArchive.CreateEntry(\"TestPackage.nuspec\", CompressionLevel.Fastest);\n- using (var streamWriter = new StreamWriter(nuspecEntry.Open()))\n+ return CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>test</id>\n+ <version>1.0.0</version>\n+ <title>Test package</title>\n+ <authors>authora, authorb</authors>\n+ <owners>ownera</owners>\n+ <requireLicenseAcceptance>false</requireLicenseAcceptance>\n+ <description>package A description.</description>\n+ <language>en-US</language>\n+ <projectUrl>http://www.nuget.org/</projectUrl>\n+ <iconUrl>http://www.nuget.org/</iconUrl>\n+ <licenseUrl>http://www.nuget.org/</licenseUrl>\n+ <dependencies>\n+ <group targetFramework=\"\"net40\"\">\n+ <dependency id=\"\"WebActivator\"\" version=\"\"\"\" />\n+ <dependency id=\"\"PackageC\"\" version=\"\"[1.1.0, 2.0.1)\"\" />\n+ </group>\n+ <group targetFramework=\"\"net451\"\">\n+ <dependency id=\"\"jQuery\"\" version=\"\"$version$\"\"/>\n+ </group>\n+ </dependencies>\n+ </metadata>\n+ </package>\");\n+ }\n+\n+ private static Stream CreateTestPackageStream()\n{\n- streamWriter.WriteLine(@\"<?xml version=\"\"1.0\"\"?>\n+ return CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n<package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n<metadata>\n<id>test</id>\n@@ -372,6 +435,17 @@ private static Stream CreateTestPackageStream()\n</package>\");\n}\n+ private static Stream CreateTestPackageStream(string nuspec)\n+ {\n+ var packageStream = new MemoryStream();\n+ using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Create, true))\n+ {\n+ var nuspecEntry = packageArchive.CreateEntry(\"TestPackage.nuspec\", CompressionLevel.Fastest);\n+ using (var streamWriter = new StreamWriter(nuspecEntry.Open()))\n+ {\n+ streamWriter.WriteLine(nuspec);\n+ }\n+\npackageArchive.CreateEntry(\"content\\\\HelloWorld.cs\", CompressionLevel.Fastest);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Enable reflowing of packages that don't pass valid version range rule (#5524)
Fix https://github.com/NuGet/NuGetGallery/issues/5522
|
455,776 |
27.02.2018 08:28:37
| 28,800 |
d0a8c6183ba70309b5d55770cf43cca124e90c7c
|
Remove redundant TempData["Message"] when changing email
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"new_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"diff": "@@ -23,10 +23,6 @@ public class ViewMessages\npublic string EmailPreferencesUpdated { get; set; }\npublic string EmailUpdateCancelled { get; set; }\n-\n- public string EmailUpdated { get; set; }\n-\n- public string EmailUpdatedWithConfirmationRequired { get; set; }\n}\npublic AuthenticationService AuthenticationService { get; }\n@@ -237,12 +233,6 @@ public virtual async Task<ActionResult> ChangeEmail(TAccountViewModel model)\nif (account.Confirmed)\n{\nSendEmailChangedConfirmationNotice(account);\n-\n- TempData[\"Message\"] = Messages.EmailUpdatedWithConfirmationRequired;\n- }\n- else\n- {\n- TempData[\"Message\"] = Messages.EmailUpdated;\n}\nreturn RedirectToAction(AccountAction);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"new_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"diff": "@@ -29,9 +29,7 @@ public class OrganizationsController\n{\nEmailConfirmed = Strings.OrganizationEmailConfirmed,\nEmailPreferencesUpdated = Strings.OrganizationEmailPreferencesUpdated,\n- EmailUpdateCancelled = Strings.OrganizationEmailUpdateCancelled,\n- EmailUpdated = Strings.OrganizationEmailUpdated,\n- EmailUpdatedWithConfirmationRequired = Strings.OrganizationEmailUpdatedWithConfirmationRequired\n+ EmailUpdateCancelled = Strings.OrganizationEmailUpdateCancelled\n};\nprotected override void SendNewAccountEmail(User account)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -56,9 +56,7 @@ public partial class UsersController\n{\nEmailConfirmed = Strings.UserEmailConfirmed,\nEmailPreferencesUpdated = Strings.UserEmailPreferencesUpdated,\n- EmailUpdateCancelled = Strings.UserEmailUpdateCancelled,\n- EmailUpdated = Strings.UserEmailUpdated,\n- EmailUpdatedWithConfirmationRequired = Strings.UserEmailUpdatedWithConfirmationRequired\n+ EmailUpdateCancelled = Strings.UserEmailUpdateCancelled\n};\nprotected override void SendNewAccountEmail(User account)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1021,24 +1021,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to The new organization email address was saved!.\n- /// </summary>\n- public static string OrganizationEmailUpdated {\n- get {\n- return ResourceManager.GetString(\"OrganizationEmailUpdated\", resourceCulture);\n- }\n- }\n-\n- /// <summary>\n- /// Looks up a localized string similar to The organization email address has been changed! We sent a confirmation email to verify the new email. When the new email address is confirmed, it will take effect and we will forget the old one..\n- /// </summary>\n- public static string OrganizationEmailUpdatedWithConfirmationRequired {\n- get {\n- return ResourceManager.GetString(\"OrganizationEmailUpdatedWithConfirmationRequired\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to Member name is required..\n/// </summary>\n@@ -1862,24 +1844,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to Your new email address was saved!.\n- /// </summary>\n- public static string UserEmailUpdated {\n- get {\n- return ResourceManager.GetString(\"UserEmailUpdated\", resourceCulture);\n- }\n- }\n-\n- /// <summary>\n- /// Looks up a localized string similar to Your email address has been changed! We sent a confirmation email to verify your new email. When you confirm the new email address, it will take effect and we will forget the old one..\n- /// </summary>\n- public static string UserEmailUpdatedWithConfirmationRequired {\n- get {\n- return ResourceManager.GetString(\"UserEmailUpdatedWithConfirmationRequired\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to You cannot reset your password until you confirm your account..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -294,12 +294,6 @@ The {1} Team</value>\n<data name=\"UserEmailPreferencesUpdated\" xml:space=\"preserve\">\n<value>Your email preferences have been updated.</value>\n</data>\n- <data name=\"UserEmailUpdated\" xml:space=\"preserve\">\n- <value>Your new email address was saved!</value>\n- </data>\n- <data name=\"UserEmailUpdatedWithConfirmationRequired\" xml:space=\"preserve\">\n- <value>Your email address has been changed! We sent a confirmation email to verify your new email. When you confirm the new email address, it will take effect and we will forget the old one.</value>\n- </data>\n<data name=\"UploadPackage_MinClientVersionOutOfRange\" xml:space=\"preserve\">\n<value>This package requires version '{0}' of NuGet, which this gallery does not currently support. Please contact us if you have questions.</value>\n</data>\n@@ -774,12 +768,6 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"OrganizationEmailUpdateCancelled\" xml:space=\"preserve\">\n<value>You canceled your organization email address change request.</value>\n</data>\n- <data name=\"OrganizationEmailUpdated\" xml:space=\"preserve\">\n- <value>The new organization email address was saved!</value>\n- </data>\n- <data name=\"OrganizationEmailUpdatedWithConfirmationRequired\" xml:space=\"preserve\">\n- <value>The organization email address has been changed! We sent a confirmation email to verify the new email. When the new email address is confirmed, it will take effect and we will forget the old one.</value>\n- </data>\n<data name=\"UserEmailConfirmed\" xml:space=\"preserve\">\n<value>You have successfully confirmed your email address!</value>\n</data>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AccountsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AccountsControllerFacts.cs",
"diff": "@@ -234,8 +234,6 @@ public virtual async Task WhenNewEmailIsDifferentAndWasConfirmed_SavesChanges()\nGetMock<IUserService>().Verify(u => u.ChangeEmailAddress(It.IsAny<User>(), It.IsAny<string>()), Times.Once);\nResultAssert.IsRedirectToRoute(result, new { action = controller.AccountAction });\n- Assert.Equal(controller.Messages.EmailUpdatedWithConfirmationRequired, controller.TempData[\"Message\"]);\n-\nGetMock<IMessageService>()\n.Verify(m => m.SendEmailChangeConfirmationNotice(It.IsAny<MailAddress>(), It.IsAny<string>()),\nTimes.Once);\n@@ -260,8 +258,6 @@ public virtual async Task WhenNewEmailIsDifferentAndWasUnconfirmed_SavesChanges(\nGetMock<IUserService>().Verify(u => u.ChangeEmailAddress(It.IsAny<User>(), It.IsAny<string>()), Times.Once);\nResultAssert.IsRedirectToRoute(result, new { action = controller.AccountAction });\n- Assert.Equal(controller.Messages.EmailUpdated, controller.TempData[\"Message\"]);\n-\nGetMock<IMessageService>()\n.Verify(m => m.SendEmailChangeConfirmationNotice(It.IsAny<MailAddress>(), It.IsAny<string>()),\nTimes.Never);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove redundant TempData["Message"] when changing email (#5499)
|
455,736 |
26.02.2018 16:47:57
| 28,800 |
72090c614d428e2c76e7579ca3939349ce2f9c82
|
Add UpdatePackageStreamMetadataAsync to keep stream details up to date
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"diff": "using System.Linq;\nusing System.Threading.Tasks;\nusing NuGet.Versioning;\n+using NuGetGallery.Packaging;\nnamespace NuGetGallery\n{\n@@ -18,6 +19,41 @@ public CorePackageService(IEntityRepository<Package> packageRepository)\n_packageRepository = packageRepository ?? throw new ArgumentNullException(nameof(packageRepository));\n}\n+ public virtual async Task UpdatePackageStreamMetadataAsync(\n+ Package package,\n+ PackageStreamMetadata metadata,\n+ bool commitChanges = true)\n+ {\n+ if (package == null)\n+ {\n+ throw new ArgumentNullException(nameof(package));\n+ }\n+\n+ if (metadata == null)\n+ {\n+ throw new ArgumentNullException(nameof(metadata));\n+ }\n+\n+ package.Hash = metadata.Hash;\n+ package.HashAlgorithm = metadata.HashAlgorithm;\n+ package.PackageFileSize = metadata.Size;\n+\n+ var now = DateTime.UtcNow;\n+ package.LastUpdated = now;\n+\n+ /// If the package is available, consider this change as an \"edit\" so that the package appears for cursors\n+ /// on the <see cref=\"Package.LastEdited\"/> field.\n+ if (package.PackageStatusKey == PackageStatus.Available)\n+ {\n+ package.LastEdited = now;\n+ }\n+\n+ if (commitChanges)\n+ {\n+ await _packageRepository.CommitChangesAsync();\n+ }\n+ }\n+\npublic virtual async Task UpdatePackageStatusAsync(\nPackage package,\nPackageStatus newPackageStatus,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICorePackageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICorePackageService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Threading.Tasks;\n+using NuGetGallery.Packaging;\nnamespace NuGetGallery\n{\n@@ -10,6 +11,14 @@ namespace NuGetGallery\n/// </summary>\npublic interface ICorePackageService\n{\n+ /// <summary>\n+ /// Updates the package properties related to the package stream itself.\n+ /// </summary>\n+ /// <param name=\"package\">The package to update the stream details of.</param>\n+ /// <param name=\"metadata\">The new package stream metadata.</param>\n+ /// <param name=\"commitChanges\">Whether or not to commit the changes to the entity context.</param>\n+ Task UpdatePackageStreamMetadataAsync(Package package, PackageStreamMetadata metadata, bool commitChanges = true);\n+\n/// <summary>\n/// Set the status on the package and any other related package properties.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageServiceFacts.cs",
"diff": "using System.Collections.Generic;\nusing System.Threading.Tasks;\nusing Moq;\n+using NuGetGallery.Packaging;\nusing Xunit;\nnamespace NuGetGallery\n{\npublic class CorePackageServiceFacts\n{\n+ public class TheUpdatePackageStreamMetadataMethod\n+ {\n+ [Fact]\n+ public async Task RejectsNullPackage()\n+ {\n+ // Arrange\n+ Package package = null;\n+ var metadata = new PackageStreamMetadata();\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ await Assert.ThrowsAsync<ArgumentNullException>(\n+ () => service.UpdatePackageStreamMetadataAsync(package, metadata, commitChanges: true));\n+ }\n+\n+ [Fact]\n+ public async Task RejectsNullStreamMetadata()\n+ {\n+ // Arrange\n+ var package = new Package();\n+ PackageStreamMetadata metadata = null;\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ await Assert.ThrowsAsync<ArgumentNullException>(\n+ () => service.UpdatePackageStreamMetadataAsync(package, metadata, commitChanges: true));\n+ }\n+\n+ [Theory]\n+ [InlineData(false, 0)]\n+ [InlineData(true, 1)]\n+ public async Task CommitsTheCorrectNumberOfTimes(bool commitChanges, int commitCount)\n+ {\n+ // Arrange\n+ var packageRepository = new Mock<IEntityRepository<Package>>();\n+ var package = new Package();\n+ var metadata = new PackageStreamMetadata();\n+ var service = CreateService(packageRepository: packageRepository);\n+\n+ // Act\n+ await service.UpdatePackageStreamMetadataAsync(package, metadata, commitChanges);\n+\n+ // Assert\n+ packageRepository.Verify(x => x.CommitChangesAsync(), Times.Exactly(commitCount));\n+ }\n+\n+ [Fact]\n+ public async Task UpdatesTheStreamMetadata()\n+ {\n+ // Arrange\n+ var package = new Package\n+ {\n+ Hash = \"hash-before\",\n+ HashAlgorithm = \"hash-algorithm-before\",\n+ PackageFileSize = 23,\n+ LastUpdated = new DateTime(2017, 1, 1, 8, 30, 0),\n+ LastEdited = new DateTime(2017, 1, 1, 7, 30, 0),\n+ PackageStatusKey = PackageStatus.Available,\n+ };\n+ var metadata = new PackageStreamMetadata\n+ {\n+ Hash = \"hash-after\",\n+ HashAlgorithm = \"hash-algorithm-after\",\n+ Size = 42,\n+ };\n+ var service = CreateService();\n+\n+ // Act\n+ var before = DateTime.UtcNow;\n+ await service.UpdatePackageStreamMetadataAsync(package, metadata, commitChanges: true);\n+ var after = DateTime.UtcNow;\n+\n+ // Assert\n+ Assert.Equal(\"hash-after\", package.Hash);\n+ Assert.Equal(\"hash-algorithm-after\", package.HashAlgorithm);\n+ Assert.Equal(42, package.PackageFileSize);\n+ Assert.InRange(package.LastUpdated, before, after);\n+ Assert.NotNull(package.LastEdited);\n+ Assert.InRange(package.LastEdited.Value, before, after);\n+ Assert.Equal(package.LastUpdated, package.LastEdited);\n+ }\n+\n+ [Theory]\n+ [InlineData(PackageStatus.Deleted)]\n+ [InlineData(PackageStatus.Validating)]\n+ [InlineData(PackageStatus.FailedValidation)]\n+ public async Task DoesNotUpdateLastEditedWhenNotAvailable(PackageStatus packageStatus)\n+ {\n+ // Arrange\n+ var originalLastEdited = new DateTime(2017, 1, 1, 7, 30, 0);\n+ var package = new Package\n+ {\n+ LastEdited = originalLastEdited,\n+ PackageStatusKey = packageStatus,\n+ };\n+ var metadata = new PackageStreamMetadata();\n+ var service = CreateService();\n+\n+ // Act\n+ await service.UpdatePackageStreamMetadataAsync(package, metadata, commitChanges: true);\n+\n+ // Assert\n+ Assert.Equal(originalLastEdited, package.LastEdited);\n+ }\n+ }\n+\npublic class TheUpdatePackageStatusMethod\n{\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add UpdatePackageStreamMetadataAsync to keep stream details up to date (#5548)
Address https://github.com/NuGet/Engineering/issues/1191
|
455,772 |
27.02.2018 16:59:53
| 28,800 |
c2eac1f283729e90ade78ff497dd4c7bf5f71c4e
|
ApiKey hash tool - fix whatif flag
|
[
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Commands/HashCommand.cs",
"new_path": "src/GalleryTools/Commands/HashCommand.cs",
"diff": "@@ -63,7 +63,7 @@ private static async Task Hash(string connectionString, bool whatIf)\ndo\n{\n- batch = allCredentials.Where(predicate).Take(BatchSize).ToList();\n+ batch = allCredentials.Where(predicate).OrderBy(x => x.Key).Take(BatchSize).ToList();\nif (batch.Count > 0)\n{\n@@ -97,6 +97,7 @@ private static async Task Hash(string connectionString, bool whatIf)\nelse\n{\nConsole.WriteLine(\"Skipping DB save.\");\n+ allCredentials = allCredentials.Where(predicate).OrderBy(x => x.Key).Skip(batch.Count);\n}\nbatchNumber++;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
ApiKey hash tool - fix whatif flag (#5554)
|
455,736 |
23.02.2018 14:26:59
| 28,800 |
8eacea69c81eb9eeeaf3389a93c6e3fe46137ee5
|
Add telemetry for unlist, list, delete, reflow, and revalidate
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1052,7 +1052,8 @@ public virtual async Task<ActionResult> Reflow(string id, string version)\nvar reflowPackageService = new ReflowPackageService(\n_entitiesContext,\n(PackageService)_packageService,\n- _packageFileService);\n+ _packageFileService,\n+ _telemetryService);\ntry\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryClient.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryClient.cs",
"diff": "@@ -11,8 +11,6 @@ namespace NuGetGallery\n/// </summary>\npublic interface ITelemetryClient\n{\n- void TrackEvent(string eventName, IDictionary<string, string> properties = null, IDictionary<string, double> metrics = null);\n-\nvoid TrackMetric(string metricName, double value, IDictionary<string, string> properties = null);\nvoid TrackException(Exception exception, IDictionary<string, string> properties = null, IDictionary<string, double> metrics = null);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -13,6 +13,18 @@ public interface ITelemetryService\nvoid TrackPackagePushEvent(Package package, User user, IIdentity identity);\n+ void TrackPackageUnlisted(Package package);\n+\n+ void TrackPackageListed(Package package);\n+\n+ void TrackPackageDelete(Package package, bool isHardDelete);\n+\n+ void TrackPackageReflow(Package package);\n+\n+ void TrackPackageHardDeleteReflow(string packageId, string packageVersion);\n+\n+ void TrackPackageRevalidate(Package package);\n+\nvoid TrackPackageReadMeChangeEvent(Package package, string readMeSourceType, PackageEditReadMeState readMeState);\nvoid TrackCreatePackageVerificationKeyEvent(string packageId, string packageVersion, User user, IIdentity identity);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"diff": "@@ -270,6 +270,8 @@ public async Task SoftDeletePackagesAsync(IEnumerable<Package> packages, User de\npackageDelete.Packages.Add(package);\nawait _auditingService.SaveAuditRecordAsync(CreateAuditRecord(package, package.PackageRegistration, AuditedPackageAction.SoftDelete, reason));\n+\n+ _telemetryService.TrackPackageDelete(package, isHardDelete: false);\n}\n_packageDeletesRepository.InsertOnCommit(packageDelete);\n@@ -314,6 +316,8 @@ public async Task HardDeletePackagesAsync(IEnumerable<Package> packages, User de\nawait _auditingService.SaveAuditRecordAsync(CreateAuditRecord(package, package.PackageRegistration, AuditedPackageAction.Delete, reason));\n+ _telemetryService.TrackPackageDelete(package, isHardDelete: true);\n+\npackage.PackageRegistration.Packages.Remove(package);\n_packageRepository.DeleteOnCommit(package);\n}\n@@ -338,7 +342,7 @@ public async Task HardDeletePackagesAsync(IEnumerable<Package> packages, User de\nUpdateSearchIndex();\n}\n- public Task ReflowHardDeletedPackageAsync(string id, string version)\n+ public async Task ReflowHardDeletedPackageAsync(string id, string version)\n{\nif (string.IsNullOrEmpty(id))\n{\n@@ -381,7 +385,10 @@ public Task ReflowHardDeletedPackageAsync(string id, string version)\nregistrationRecord: null,\naction: AuditedPackageAction.Delete,\nreason: \"reflow hard-deleted package\");\n- return _auditingService.SaveAuditRecordAsync(auditRecord);\n+\n+ await _auditingService.SaveAuditRecordAsync(auditRecord);\n+\n+ _telemetryService.TrackPackageHardDeleteReflow(normalizedId, normalizedVersionString);\n}\nprotected virtual async Task ExecuteSqlCommandAsync(IDatabase database, string sql, params object[] parameters)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -20,16 +20,19 @@ public class PackageService : CorePackageService, IPackageService\nprivate readonly IEntityRepository<PackageRegistration> _packageRegistrationRepository;\nprivate readonly IPackageNamingConflictValidator _packageNamingConflictValidator;\nprivate readonly IAuditingService _auditingService;\n+ private readonly ITelemetryService _telemetryService;\npublic PackageService(\nIEntityRepository<PackageRegistration> packageRegistrationRepository,\nIEntityRepository<Package> packageRepository,\nIPackageNamingConflictValidator packageNamingConflictValidator,\n- IAuditingService auditingService) : base(packageRepository)\n+ IAuditingService auditingService,\n+ ITelemetryService telemetryService) : base(packageRepository)\n{\n_packageRegistrationRepository = packageRegistrationRepository ?? throw new ArgumentNullException(nameof(packageRegistrationRepository));\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}\n/// <summary>\n@@ -416,6 +419,8 @@ public async Task MarkPackageListedAsync(Package package, bool commitChanges = t\nawait _auditingService.SaveAuditRecordAsync(new PackageAuditRecord(package, AuditedPackageAction.List));\n+ _telemetryService.TrackPackageListed(package);\n+\nif (commitChanges)\n{\nawait _packageRepository.CommitChangesAsync();\n@@ -445,6 +450,8 @@ public async Task MarkPackageUnlistedAsync(Package package, bool commitChanges =\nawait _auditingService.SaveAuditRecordAsync(new PackageAuditRecord(package, AuditedPackageAction.Unlist));\n+ _telemetryService.TrackPackageUnlisted(package);\n+\nif (commitChanges)\n{\nawait _packageRepository.CommitChangesAsync();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"new_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"diff": "@@ -14,15 +14,18 @@ public class ReflowPackageService\nprivate readonly IEntitiesContext _entitiesContext;\nprivate readonly IPackageService _packageService;\nprivate readonly IPackageFileService _packageFileService;\n+ private readonly ITelemetryService _telemetryService;\npublic ReflowPackageService(\nIEntitiesContext entitiesContext,\nIPackageService packageService,\n- IPackageFileService packageFileService)\n+ IPackageFileService packageFileService,\n+ ITelemetryService telemetryService)\n{\n- _entitiesContext = entitiesContext;\n- _packageService = packageService;\n- _packageFileService = packageFileService;\n+ _entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n+ _packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n+ _packageFileService = packageFileService ?? throw new ArgumentNullException(nameof(packageFileService));\n+ _telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n}\npublic async Task<Package> ReflowAsync(string id, string version)\n@@ -75,7 +78,10 @@ public async Task<Package> ReflowAsync(string id, string version)\n// 5) Update IsLatest so that reflow can correct concurrent updates (see Gallery #2514)\nawait _packageService.UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);\n- // 6) Save and profit\n+ // 6) Emit telemetry.\n+ _telemetryService.TrackPackageReflow(package);\n+\n+ // 7) Save and profit\nawait _entitiesContext.SaveChangesAsync();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryClientWrapper.cs",
"new_path": "src/NuGetGallery/Services/TelemetryClientWrapper.cs",
"diff": "@@ -29,18 +29,6 @@ private TelemetryClientWrapper()\ninternal TelemetryClient UnderlyingClient { get; }\n- public void TrackEvent(string eventName, IDictionary<string, string> properties = null, IDictionary<string, double> metrics = null)\n- {\n- try\n- {\n- UnderlyingClient.TrackEvent(eventName, properties, metrics);\n- }\n- catch\n- {\n- // logging failed, don't allow exception to escape\n- }\n- }\n-\npublic void TrackException(Exception exception, IDictionary<string, string> properties = null, IDictionary<string, double> metrics = null)\n{\ntry\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -24,6 +24,12 @@ internal class Events\npublic const string CredentialAdded = \"CredentialAdded\";\npublic const string UserPackageDeleteCheckedAfterHours = \"UserPackageDeleteCheckedAfterHours\";\npublic const string UserPackageDeleteExecuted = \"UserPackageDeleteExecuted\";\n+ public const string PackageReflow = \"PackageReflow\";\n+ public const string PackageUnlisted = \"PackageUnlisted\";\n+ public const string PackageListed = \"PackageListed\";\n+ public const string PackageDelete = \"PackageDelete\";\n+ public const string PackageHardDeleteReflow = \"PackageHardDeleteReflow\";\n+ public const string PackageRevalidate = \"PackageRevalidate\";\n}\nprivate IDiagnosticsSource _diagnosticsSource;\n@@ -71,6 +77,9 @@ internal class Events\n// User package delete executed properties\npublic const string Success = \"Success\";\n+ // Package delete properties\n+ public const string IsHardDelete = \"IsHardDelete\";\n+\npublic TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n{\nif (diagnosticsService == null)\n@@ -100,7 +109,7 @@ public void TraceException(Exception exception)\npublic void TrackODataQueryFilterEvent(string callContext, bool isEnabled, bool isAllowed, string queryPattern)\n{\n- TrackEvent(Events.ODataQueryFilter, properties =>\n+ TrackMetric(Events.ODataQueryFilter, 1, properties =>\n{\nproperties.Add(CallContext, callContext);\nproperties.Add(IsEnabled, $\"{isEnabled}\");\n@@ -122,9 +131,9 @@ public void TrackPackageReadMeChangeEvent(Package package, string readMeSourceTy\nthrow new ArgumentNullException(nameof(readMeSourceType));\n}\n- TrackEvent(Events.PackageReadMeChanged, properties => {\n+ TrackMetric(Events.PackageReadMeChanged, 1, properties => {\nproperties.Add(PackageId, package.PackageRegistration.Id);\n- properties.Add(PackageVersion, package.Version);\n+ properties.Add(PackageVersion, package.NormalizedVersion);\nproperties.Add(ReadMeSourceType, readMeSourceType);\nproperties.Add(ReadMeState, Enum.GetName(typeof(PackageEditReadMeState), readMeState));\n});\n@@ -137,17 +146,17 @@ public void TrackPackagePushEvent(Package package, User user, IIdentity identity\nthrow new ArgumentNullException(nameof(package));\n}\n- TrackPackageForEvent(Events.PackagePush, package.PackageRegistration.Id, package.Version, user, identity);\n+ TrackMetricForPackage(Events.PackagePush, package.PackageRegistration.Id, package.NormalizedVersion, user, identity);\n}\npublic void TrackPackagePushNamespaceConflictEvent(string packageId, string packageVersion, User user, IIdentity identity)\n{\n- TrackPackageForEvent(Events.PackagePushNamespaceConflict, packageId, packageVersion, user, identity);\n+ TrackMetricForPackage(Events.PackagePushNamespaceConflict, packageId, packageVersion, user, identity);\n}\npublic void TrackCreatePackageVerificationKeyEvent(string packageId, string packageVersion, User user, IIdentity identity)\n{\n- TrackPackageForEvent(Events.CreatePackageVerificationKey, packageId, packageVersion, user, identity);\n+ TrackMetricForPackage(Events.CreatePackageVerificationKey, packageId, packageVersion, user, identity);\n}\npublic void TrackVerifyPackageKeyEvent(string packageId, string packageVersion, User user, IIdentity identity, int statusCode)\n@@ -163,7 +172,7 @@ public void TrackVerifyPackageKeyEvent(string packageId, string packageVersion,\n}\nvar hasVerifyScope = identity.HasScopeThatAllowsActions(NuGetScopes.PackageVerify).ToString();\n- TrackEvent(Events.VerifyPackageKey, properties =>\n+ TrackMetric(Events.VerifyPackageKey, 1, properties =>\n{\nproperties.Add(PackageId, packageId);\nproperties.Add(PackageVersion, packageVersion);\n@@ -175,15 +184,78 @@ public void TrackVerifyPackageKeyEvent(string packageId, string packageVersion,\npublic void TrackNewUserRegistrationEvent(User user, Credential credential)\n{\n- TrackAccountActivityForEvent(Events.NewUserRegistration, user, credential);\n+ TrackMetricForAccountActivity(Events.NewUserRegistration, user, credential);\n}\npublic void TrackNewCredentialCreated(User user, Credential credential)\n{\n- TrackAccountActivityForEvent(Events.CredentialAdded, user, credential);\n+ TrackMetricForAccountActivity(Events.CredentialAdded, user, credential);\n+ }\n+\n+ public void TrackUserPackageDeleteExecuted(int packageKey, string packageId, string packageVersion, ReportPackageReason reason, bool success)\n+ {\n+ if (packageId == null)\n+ {\n+ throw new ArgumentNullException(nameof(packageId));\n}\n- private void TrackAccountActivityForEvent(string eventName, User user, Credential credential)\n+ if (packageVersion == null)\n+ {\n+ throw new ArgumentNullException(nameof(packageVersion));\n+ }\n+\n+ TrackMetric(Events.UserPackageDeleteExecuted, 1, properties => {\n+ properties.Add(PackageKey, packageKey.ToString());\n+ properties.Add(PackageId, packageId);\n+ properties.Add(PackageVersion, packageVersion);\n+ properties.Add(ReportPackageReason, reason.ToString());\n+ properties.Add(Success, success.ToString());\n+ });\n+ }\n+\n+ public void TrackPackageUnlisted(Package package)\n+ {\n+ TrackMetricForPackage(Events.PackageUnlisted, package);\n+ }\n+\n+ public void TrackPackageListed(Package package)\n+ {\n+ TrackMetricForPackage(Events.PackageListed, package);\n+ }\n+\n+ public void TrackPackageDelete(Package package, bool isHardDelete)\n+ {\n+ TrackMetricForPackage(Events.PackageDelete, package, properties =>\n+ {\n+ properties.Add(IsHardDelete, isHardDelete.ToString());\n+ });\n+ }\n+\n+ public void TrackPackageReflow(Package package)\n+ {\n+ TrackMetricForPackage(Events.PackageReflow, package);\n+ }\n+\n+ public void TrackPackageHardDeleteReflow(string packageId, string packageVersion)\n+ {\n+ TrackMetricForPackage(Events.PackageHardDeleteReflow, packageId, packageVersion);\n+ }\n+\n+ public void TrackPackageRevalidate(Package package)\n+ {\n+ TrackMetricForPackage(Events.PackageRevalidate, package);\n+ }\n+\n+ public void TrackException(Exception exception, Action<Dictionary<string, string>> addProperties)\n+ {\n+ var telemetryProperties = new Dictionary<string, string>();\n+\n+ addProperties(telemetryProperties);\n+\n+ _telemetryClient.TrackException(exception, telemetryProperties, metrics: null);\n+ }\n+\n+ private void TrackMetricForAccountActivity(string eventName, User user, Credential credential)\n{\nif (user == null)\n{\n@@ -195,7 +267,7 @@ private void TrackAccountActivityForEvent(string eventName, User user, Credentia\nthrow new ArgumentNullException(nameof(credential));\n}\n- TrackEvent(eventName, properties => {\n+ TrackMetric(eventName, 1, properties => {\nproperties.Add(ClientVersion, GetClientVersion());\nproperties.Add(ProtocolVersion, GetProtocolVersion());\nproperties.Add(AccountCreationDate, GetAccountCreationDate(user));\n@@ -240,7 +312,34 @@ private static string GetApiKeyCreationDate(User user, IIdentity identity)\nreturn apiKey?.Created.ToString(\"O\") ?? \"N/A\";\n}\n- private void TrackPackageForEvent(string eventValue, string packageId, string packageVersion, User user, IIdentity identity)\n+ private void TrackMetricForPackage(\n+ string metricName,\n+ Package package,\n+ User user,\n+ IIdentity identity,\n+ Action<Dictionary<string, string>> addProperties = null)\n+ {\n+ if (package == null)\n+ {\n+ throw new ArgumentNullException(nameof(package));\n+ }\n+\n+ TrackMetricForPackage(\n+ metricName,\n+ package.PackageRegistration.Id,\n+ package.NormalizedVersion,\n+ user,\n+ identity,\n+ addProperties);\n+ }\n+\n+ private void TrackMetricForPackage(\n+ string metricName,\n+ string packageId,\n+ string packageVersion,\n+ User user,\n+ IIdentity identity,\n+ Action<Dictionary<string, string>> addProperties = null)\n{\nif (user == null)\n{\n@@ -252,7 +351,7 @@ private void TrackPackageForEvent(string eventValue, string packageId, string pa\nthrow new ArgumentNullException(nameof(identity));\n}\n- TrackEvent(eventValue, properties => {\n+ TrackMetric(metricName, 1, properties => {\nproperties.Add(ClientVersion, GetClientVersion());\nproperties.Add(ProtocolVersion, GetProtocolVersion());\nproperties.Add(ClientInformation, GetClientInformation());\n@@ -262,6 +361,40 @@ private void TrackPackageForEvent(string eventValue, string packageId, string pa\nproperties.Add(AuthenticationMethod, identity.GetAuthenticationType());\nproperties.Add(KeyCreationDate, GetApiKeyCreationDate(user, identity));\nproperties.Add(IsScoped, identity.IsScopedAuthentication().ToString());\n+ addProperties?.Invoke(properties);\n+ });\n+ }\n+\n+ private void TrackMetricForPackage(\n+ string metricName,\n+ Package package,\n+ Action<Dictionary<string, string>> addProperties = null)\n+ {\n+ if (package == null)\n+ {\n+ throw new ArgumentNullException(nameof(package));\n+ }\n+\n+ TrackMetricForPackage(\n+ metricName,\n+ package.PackageRegistration.Id,\n+ package.NormalizedVersion,\n+ addProperties);\n+ }\n+\n+ private void TrackMetricForPackage(\n+ string metricName,\n+ string packageId,\n+ string packageVersion,\n+ Action<Dictionary<string, string>> addProperties = null)\n+ {\n+ TrackMetric(metricName, 1, properties => {\n+ properties.Add(ClientVersion, GetClientVersion());\n+ properties.Add(ProtocolVersion, GetProtocolVersion());\n+ properties.Add(ClientInformation, GetClientInformation());\n+ properties.Add(PackageId, packageId);\n+ properties.Add(PackageVersion, packageVersion);\n+ addProperties?.Invoke(properties);\n});\n}\n@@ -288,36 +421,11 @@ public void TrackUserPackageDeleteChecked(UserPackageDeleteEvent details, UserPa\n});\n}\n- public void TrackUserPackageDeleteExecuted(int packageKey, string packageId, string packageVersion, ReportPackageReason reason, bool success)\n- {\n- if (packageId == null)\n- {\n- throw new ArgumentNullException(nameof(packageId));\n- }\n-\n- if (packageVersion == null)\n- {\n- throw new ArgumentNullException(nameof(packageVersion));\n- }\n-\n- TrackMetric(Events.UserPackageDeleteExecuted, 1, properties => {\n- properties.Add(PackageKey, packageKey.ToString());\n- properties.Add(PackageId, packageId);\n- properties.Add(PackageVersion, packageVersion);\n- properties.Add(ReportPackageReason, reason.ToString());\n- properties.Add(Success, success.ToString());\n- });\n- }\n-\n- protected virtual void TrackEvent(string eventName, Action<Dictionary<string, string>> addProperties)\n- {\n- var telemetryProperties = new Dictionary<string, string>();\n-\n- addProperties(telemetryProperties);\n-\n- _telemetryClient.TrackEvent(eventName, telemetryProperties, metrics: null);\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+ /// because events don't flow properly into our internal metrics and monitoring solution.\n+ /// </summary>\nprotected virtual void TrackMetric(string metricName, double value, Action<Dictionary<string, string>> addProperties)\n{\nvar telemetryProperties = new Dictionary<string, string>();\n@@ -326,14 +434,5 @@ protected virtual void TrackMetric(string metricName, double value, Action<Dicti\n_telemetryClient.TrackMetric(metricName, value, telemetryProperties);\n}\n-\n- public void TrackException(Exception exception, Action<Dictionary<string, string>> addProperties)\n- {\n- var telemetryProperties = new Dictionary<string, string>();\n-\n- addProperties(telemetryProperties);\n-\n- _telemetryClient.TrackException(exception, telemetryProperties, metrics: null);\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ValidationService.cs",
"new_path": "src/NuGetGallery/Services/ValidationService.cs",
"diff": "@@ -16,15 +16,18 @@ public class ValidationService : IValidationService\nprivate readonly IPackageService _packageService;\nprivate readonly IPackageValidationInitiator _initiator;\nprivate readonly IEntityRepository<PackageValidationSet> _validationSets;\n+ private readonly ITelemetryService _telemetryService;\npublic ValidationService(\nIPackageService packageService,\nIPackageValidationInitiator initiator,\n- IEntityRepository<PackageValidationSet> validationSets)\n+ IEntityRepository<PackageValidationSet> validationSets,\n+ ITelemetryService telemetryService)\n{\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}\npublic async Task StartValidationAsync(Package package)\n@@ -40,6 +43,8 @@ public async Task StartValidationAsync(Package package)\npublic async Task RevalidateAsync(Package package)\n{\nawait _initiator.StartValidationAsync(package);\n+\n+ _telemetryService.TrackPackageRevalidate(package);\n}\npublic IReadOnlyList<ValidationIssue> GetLatestValidationIssues(Package package)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"diff": "@@ -698,6 +698,23 @@ public async Task WillCreateAuditRecordUsingAuditService()\nAssert.Equal(package.Version, testService.LastAuditRecord.Version);\nauditingService.Verify(x => x.SaveAuditRecordAsync(testService.LastAuditRecord));\n}\n+\n+ [Fact]\n+ public async Task EmitsTelemetry()\n+ {\n+ var telemetryService = new Mock<ITelemetryService>();\n+ var service = CreateService(telemetryService: telemetryService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+ var reason = \"Unit testing\";\n+ var signature = \"The Terminator\";\n+\n+ await service.SoftDeletePackagesAsync(new[] { package }, user, reason, signature);\n+\n+ telemetryService.Verify(x => x.TrackPackageDelete(package, false));\n+ }\n}\npublic class TheHardDeletePackagesAsyncMethod\n@@ -953,6 +970,23 @@ public async Task WillCreateAuditRecordUsingAuditService()\nAssert.Equal(package.Version, testService.LastAuditRecord.Version);\nauditingService.Verify(x => x.SaveAuditRecordAsync(testService.LastAuditRecord));\n}\n+\n+ [Fact]\n+ public async Task EmitsTelemetry()\n+ {\n+ var telemetryService = new Mock<ITelemetryService>();\n+ var service = CreateService(telemetryService: telemetryService);\n+ var packageRegistration = new PackageRegistration();\n+ var package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", Hash = _packageHashForTests };\n+ packageRegistration.Packages.Add(package);\n+ var user = new User(\"test\");\n+ var reason = \"Unit testing\";\n+ var signature = \"The Terminator\";\n+\n+ await service.HardDeletePackagesAsync(new[] { package }, user, reason, signature, deleteEmptyPackageRegistration: false);\n+\n+ telemetryService.Verify(x => x.TrackPackageDelete(package, true));\n+ }\n}\npublic class TheReflowHardDeletedPackagesAsyncMethod\n@@ -998,7 +1032,13 @@ private async Task ReflowHardDeletedPackage(string id, string version, string ex\nvar auditingService = new Mock<IAuditingService>();\n- var service = CreateService(packageRepository: packageRepository, packageRegistrationRepository: packageRegistrationRepository, auditingService: auditingService);\n+ var telemetryService = new Mock<ITelemetryService>();\n+\n+ var service = CreateService(\n+ packageRepository: packageRepository,\n+ packageRegistrationRepository: packageRegistrationRepository,\n+ auditingService: auditingService,\n+ telemetryService: telemetryService);\nif (succeeds)\n{\n@@ -1009,7 +1049,13 @@ private async Task ReflowHardDeletedPackage(string id, string version, string ex\nawait Assert.ThrowsAsync<UserSafeException>(() => service.ReflowHardDeletedPackageAsync(id, version));\n}\n- auditingService.Verify(x => x.SaveAuditRecordAsync(It.IsAny<AuditRecord>()), succeeds ? Times.Once() : Times.Never());\n+ auditingService.Verify(\n+ x => x.SaveAuditRecordAsync(It.IsAny<AuditRecord>()),\n+ succeeds ? Times.Once() : Times.Never());\n+\n+ telemetryService.Verify(\n+ x => x.TrackPackageHardDeleteReflow(id, version),\n+ succeeds ? Times.Once() : Times.Never());\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -24,11 +24,13 @@ public class PackageServiceFacts\nMock<IEntityRepository<Package>> packageRepository = null,\nIPackageNamingConflictValidator packageNamingConflictValidator = null,\nIAuditingService auditingService = null,\n+ Mock<ITelemetryService> telemetryService = null,\nAction<Mock<PackageService>> setup = null)\n{\npackageRegistrationRepository = packageRegistrationRepository ?? new Mock<IEntityRepository<PackageRegistration>>();\npackageRepository = packageRepository ?? new Mock<IEntityRepository<Package>>();\nauditingService = auditingService ?? new TestAuditingService();\n+ telemetryService = telemetryService ?? new Mock<ITelemetryService>();\nif (packageNamingConflictValidator == null)\n{\n@@ -41,7 +43,8 @@ public class PackageServiceFacts\npackageRegistrationRepository.Object,\npackageRepository.Object,\npackageNamingConflictValidator,\n- auditingService);\n+ auditingService,\n+ telemetryService.Object);\npackageService.CallBase = true;\n@@ -1428,6 +1431,21 @@ public async Task WritesAnAuditRecord()\n&& ar.Id == package.PackageRegistration.Id\n&& ar.Version == package.Version));\n}\n+\n+ [Fact]\n+ public async Task EmitsTelemetry()\n+ {\n+ var packageRegistration = new PackageRegistration { Id = \"theId\" };\n+ var package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = false };\n+ var telemetryService = new Mock<ITelemetryService>();\n+ var service = CreateService(telemetryService: telemetryService);\n+\n+ await service.MarkPackageListedAsync(package);\n+\n+ telemetryService.Verify(\n+ x => x.TrackPackageListed(package),\n+ Times.Once);\n+ }\n}\npublic class TheMarkPackageUnlistedMethod\n@@ -1536,6 +1554,21 @@ public async Task WritesAnAuditRecord()\n&& ar.Id == package.PackageRegistration.Id\n&& ar.Version == package.Version));\n}\n+\n+ [Fact]\n+ public async Task EmitsTelemetry()\n+ {\n+ var packageRegistration = new PackageRegistration { Id = \"theId\" };\n+ var package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true };\n+ var telemetryService = new Mock<ITelemetryService>();\n+ var service = CreateService(telemetryService: telemetryService);\n+\n+ await service.MarkPackageUnlistedAsync(package);\n+\n+ telemetryService.Verify(\n+ x => x.TrackPackageUnlisted(package),\n+ Times.Once);\n+ }\n}\npublic class ThePublishPackageMethod\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"diff": "@@ -23,6 +23,7 @@ public class ReflowPackageServiceFacts\nMock<IEntitiesContext> entitiesContext = null,\nMock<PackageService> packageService = null,\nMock<IPackageFileService> packageFileService = null,\n+ Mock<ITelemetryService> telemetryService = null,\nAction<Mock<ReflowPackageService>> setup = null)\n{\nvar dbContext = new Mock<DbContext>();\n@@ -31,11 +32,13 @@ public class ReflowPackageServiceFacts\npackageService = packageService ?? new Mock<PackageService>();\npackageFileService = packageFileService ?? new Mock<IPackageFileService>();\n+ telemetryService = telemetryService ?? new Mock<ITelemetryService>();\nvar reflowPackageService = new Mock<ReflowPackageService>(\nentitiesContext.Object,\npackageService.Object,\n- packageFileService.Object);\n+ packageFileService.Object,\n+ telemetryService.Object);\nreflowPackageService.CallBase = true;\n@@ -263,6 +266,32 @@ public async Task CallsUpdateIsLatestAsync()\npackageService.Verify(s => s.UpdateIsLatestAsync(package.PackageRegistration, false), Times.Once);\n}\n+ [Fact]\n+ public async Task EmitsTelemetry()\n+ {\n+ // Arrange\n+ var package = PackageServiceUtility.CreateTestPackage();\n+\n+ var packageService = SetupPackageService(package);\n+ var entitiesContext = SetupEntitiesContext();\n+ var packageFileService = SetupPackageFileService(package);\n+ var telemetryService = new Mock<ITelemetryService>();\n+\n+ var service = CreateService(\n+ packageService: packageService,\n+ entitiesContext: entitiesContext,\n+ packageFileService: packageFileService,\n+ telemetryService: telemetryService);\n+\n+ // Act\n+ var result = await service.ReflowAsync(\"test\", \"1.0.0\");\n+\n+ // Assert\n+ telemetryService.Verify(\n+ x => x.TrackPackageReflow(package),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task AllowsInvalidPackageDependencyVersion()\n{\n@@ -312,12 +341,14 @@ private static Mock<PackageService> SetupPackageService(Package package)\npackageRegistrationRepository.Object,\npackageRepository.Object);\nvar auditingService = new TestAuditingService();\n+ var telemetryService = new Mock<ITelemetryService>();\nvar packageService = new Mock<PackageService>(\npackageRegistrationRepository.Object,\npackageRepository.Object,\npackageNamingConflictValidator,\n- auditingService);\n+ auditingService,\n+ telemetryService.Object);\npackageService.CallBase = true;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -29,7 +29,7 @@ public class TheTrackEventMethod : BaseFacts\n{\nprivate static Fakes fakes = new Fakes();\n- public static IEnumerable<object[]> TrackEventNames_Data\n+ public static IEnumerable<object[]> TrackMetricNames_Data\n{\nget\n{\n@@ -44,6 +44,30 @@ public static IEnumerable<object[]> TrackEventNames_Data\n(TrackAction)(s => s.TrackPackagePushEvent(package, fakes.User, identity))\n};\n+ yield return new object[] { \"PackageUnlisted\",\n+ (TrackAction)(s => s.TrackPackageUnlisted(package))\n+ };\n+\n+ yield return new object[] { \"PackageListed\",\n+ (TrackAction)(s => s.TrackPackageListed(package))\n+ };\n+\n+ yield return new object[] { \"PackageDelete\",\n+ (TrackAction)(s => s.TrackPackageDelete(package, isHardDelete: true))\n+ };\n+\n+ yield return new object[] { \"PackageReflow\",\n+ (TrackAction)(s => s.TrackPackageReflow(package))\n+ };\n+\n+ yield return new object[] { \"PackageHardDeleteReflow\",\n+ (TrackAction)(s => s.TrackPackageHardDeleteReflow(fakes.Package.Id, package.Version))\n+ };\n+\n+ yield return new object[] { \"PackageRevalidate\",\n+ (TrackAction)(s => s.TrackPackageRevalidate(package))\n+ };\n+\nyield return new object[] { \"CreatePackageVerificationKey\",\n(TrackAction)(s => s.TrackCreatePackageVerificationKeyEvent(fakes.Package.Id, package.Version, fakes.User, identity))\n};\n@@ -67,13 +91,7 @@ public static IEnumerable<object[]> TrackEventNames_Data\nyield return new object[] { \"CredentialAdded\",\n(TrackAction)(s => s.TrackNewCredentialCreated(fakes.User, fakes.User.Credentials.First()))\n};\n- }\n- }\n- public static IEnumerable<object[]> TrackMetricNames_Data\n- {\n- get\n- {\nyield return new object[] { \"UserPackageDeleteCheckedAfterHours\",\n(TrackAction)(s => s.TrackUserPackageDeleteChecked(\nnew UserPackageDeleteEvent(\n@@ -105,28 +123,11 @@ public static IEnumerable<object[]> TrackMetricNames_Data\npublic void TrackEventNamesIncludesAllEvents()\n{\nvar expectedCount = typeof(TelemetryService.Events).GetFields().Length;\n- var actualCount = TrackEventNames_Data.Count() + TrackMetricNames_Data.Count();\n+ var actualCount = TrackMetricNames_Data.Count();\nAssert.Equal(expectedCount, actualCount);\n}\n- [Theory]\n- [MemberData(nameof(TrackEventNames_Data))]\n- public void TrackEventNames(string eventName, TrackAction track)\n- {\n- // Arrange\n- var service = CreateService();\n-\n- // Act\n- track(service);\n-\n- // Assert\n- service.TelemetryClient.Verify(c => c.TrackEvent(eventName,\n- It.IsAny<IDictionary<string, string>>(),\n- It.IsAny<IDictionary<string, double>>()),\n- Times.Once);\n- }\n-\n[Theory]\n[MemberData(nameof(TrackMetricNames_Data))]\npublic void TrackMetricNames(string metricName, TrackAction track)\n@@ -348,12 +349,6 @@ public TelemetryServiceWrapper CreateService()\ntraceService.Setup(s => s.GetSource(It.IsAny<string>()))\n.Returns(traceSource.Object);\n- telemetryClient.Setup(c => c.TrackEvent(\n- It.IsAny<string>(),\n- It.IsAny<IDictionary<string, string>>(),\n- It.IsAny<IDictionary<string, double>>()))\n- .Verifiable();\n-\nvar telemetryService = new TelemetryServiceWrapper(traceService.Object, telemetryClient.Object);\ntelemetryService.TraceSource = traceSource;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"diff": "@@ -83,6 +83,16 @@ public async Task DoesNotChangeThePackageStatus()\n/// <see cref=\"IPackageService\"/> to do this.\nAssert.Equal(PackageStatus.Available, _package.PackageStatusKey);\n}\n+\n+ [Fact]\n+ public async Task EmitsTelemetry()\n+ {\n+ // Arrange & Act\n+ await _target.RevalidateAsync(_package);\n+\n+ // Assert\n+ _telemetryService.Verify(x => x.TrackPackageRevalidate(_package), Times.Once);\n+ }\n}\npublic class TheGetLatestValidationIssuesMethod : FactsBase\n@@ -303,6 +313,7 @@ public class FactsBase\nprotected readonly Mock<IPackageService> _packageService;\nprotected readonly Mock<IPackageValidationInitiator> _initiator;\nprotected readonly Mock<IEntityRepository<PackageValidationSet>> _validationSets;\n+ protected readonly Mock<ITelemetryService> _telemetryService;\nprotected readonly Package _package;\nprotected readonly ValidationService _target;\n@@ -311,13 +322,15 @@ public FactsBase()\n_packageService = new Mock<IPackageService>();\n_initiator = new Mock<IPackageValidationInitiator>();\n_validationSets = new Mock<IEntityRepository<PackageValidationSet>>();\n+ _telemetryService = new Mock<ITelemetryService>();\n_package = new Package();\n_target = new ValidationService(\n_packageService.Object,\n_initiator.Object,\n- _validationSets.Object);\n+ _validationSets.Object,\n+ _telemetryService.Object);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"diff": "@@ -287,11 +287,14 @@ private Mock<PackageService> SetupPackageService()\npackageRepository.Object);\nvar auditingService = new TestAuditingService();\n+ var telemetryService = new Mock<ITelemetryService>();\n+\nvar packageService = new Mock<PackageService>(\npackageRegistrationRepository.Object,\npackageRepository.Object,\npackageNamingConflictValidator,\n- auditingService);\n+ auditingService,\n+ telemetryService.Object);\npackageService.CallBase = true;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add telemetry for unlist, list, delete, reflow, and revalidate (#5540)
Progress on https://github.com/NuGet/NuGetGallery/pull/5540
|
455,736 |
26.02.2018 18:14:36
| 28,800 |
0ec515d561015f4940a237ef9dbd3466814200e1
|
Move StorePackageFileInBackupLocationAsync to NuGetGallery.Core
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreConstants.cs",
"new_path": "src/NuGetGallery.Core/CoreConstants.cs",
"diff": "@@ -10,6 +10,7 @@ public static class CoreConstants\npublic const int MaxPackageIdLength = 128;\npublic const string PackageFileSavePathTemplate = \"{0}.{1}{2}\";\n+ public const string PackageFileBackupSavePathTemplate = \"{0}/{1}/{2}.{3}\";\npublic const string NuGetPackageFileExtension = \".nupkg\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CorePackageFileService.cs",
"new_path": "src/NuGetGallery.Core/Services/CorePackageFileService.cs",
"diff": "using System.Globalization;\nusing System.IO;\nusing System.Threading.Tasks;\n+using System.Web;\n+using NuGet.Versioning;\nnamespace NuGetGallery\n{\n@@ -128,6 +130,86 @@ public Task<bool> DoesValidationPackageFileExistAsync(Package package)\nreturn _fileStorageService.FileExistsAsync(CoreConstants.ValidationFolderName, fileName);\n}\n+ public async Task StorePackageFileInBackupLocationAsync(Package package, Stream packageFile)\n+ {\n+ if (package == null)\n+ {\n+ throw new ArgumentNullException(nameof(package));\n+ }\n+\n+ if (packageFile == null)\n+ {\n+ throw new ArgumentNullException(nameof(packageFile));\n+ }\n+\n+ if (package.PackageRegistration == null ||\n+ string.IsNullOrWhiteSpace(package.PackageRegistration.Id) ||\n+ (string.IsNullOrWhiteSpace(package.NormalizedVersion) && string.IsNullOrWhiteSpace(package.Version)))\n+ {\n+ throw new ArgumentException(CoreStrings.PackageIsMissingRequiredData, nameof(package));\n+ }\n+\n+ string version;\n+ if (string.IsNullOrEmpty(package.NormalizedVersion))\n+ {\n+ version = NuGetVersion.Parse(package.Version).ToNormalizedString();\n+ }\n+ else\n+ {\n+ version = package.NormalizedVersion;\n+ }\n+\n+ var fileName = BuildBackupFileName(\n+ package.PackageRegistration.Id,\n+ version,\n+ package.Hash);\n+\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+ {\n+ return;\n+ }\n+\n+ try\n+ {\n+ await _fileStorageService.SaveFileAsync(CoreConstants.PackageBackupsFolderName, fileName, packageFile);\n+ }\n+ catch (InvalidOperationException)\n+ {\n+ // If the package file already exists, swallow the exception since we know the content is the same.\n+ return;\n+ }\n+ }\n+\n+ private static string BuildBackupFileName(string id, string version, string hash)\n+ {\n+ if (id == null)\n+ {\n+ throw new ArgumentNullException(nameof(id));\n+ }\n+\n+ if (version == null)\n+ {\n+ throw new ArgumentNullException(nameof(version));\n+ }\n+\n+ if (hash == null)\n+ {\n+ throw new ArgumentNullException(nameof(hash));\n+ }\n+\n+ var hashBytes = Convert.FromBase64String(hash);\n+\n+ return string.Format(\n+ CultureInfo.InvariantCulture,\n+ CoreConstants.PackageFileBackupSavePathTemplate,\n+ id.ToLowerInvariant(),\n+ version.ToLowerInvariant(),\n+ HttpServerUtility.UrlTokenEncode(hashBytes),\n+ CoreConstants.NuGetPackageFileExtension);\n+ }\n+\nprotected static string BuildFileName(Package package, string format, string extension)\n{\nif (package == null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICorePackageFileService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICorePackageFileService.cs",
"diff": "@@ -81,5 +81,10 @@ public interface ICorePackageFileService\n/// <param name=\"id\">The package ID. This value is case-insensitive.</param>\n/// <param name=\"version\">The package version. This value is case-insensitive and need not be normalized.</param>\nTask DeletePackageFileAsync(string id, string version);\n+\n+ /// <summary>\n+ /// Copies the contents of the package represented by the stream into the file storage backup location.\n+ /// </summary>\n+ Task StorePackageFileInBackupLocationAsync(Package package, Stream packageFile);\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": "@@ -38,8 +38,6 @@ public static class Constants\npublic const string ReadMeFileSavePathTemplateActive = \"active/{0}/{1}{2}\";\npublic const string ReadMeFileSavePathTemplatePending = \"pending/{0}/{1}{2}\";\n- public const string PackageFileBackupSavePathTemplate = \"{0}/{1}/{2}.{3}\";\n-\npublic const string MarkdownFileExtension = \".md\";\npublic const string HtmlFileExtension = \".html\";\npublic const string JsonFileExtension = \".json\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageFileService.cs",
"new_path": "src/NuGetGallery/Services/IPackageFileService.cs",
"diff": "@@ -20,11 +20,6 @@ public interface IPackageFileService : ICorePackageFileService\n/// </summary>\nTask<ActionResult> CreateDownloadPackageActionResultAsync(Uri requestUrl, string unsafeId, string unsafeVersion);\n- /// <summary>\n- /// Copies the contents of the package represented by the stream into the file storage backup location.\n- /// </summary>\n- Task StorePackageFileInBackupLocationAsync(Package package, Stream packageFile);\n-\n/// <summary>\n/// Deletes the package readme.md file from storage.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageFileService.cs",
"new_path": "src/NuGetGallery/Services/PackageFileService.cs",
"diff": "@@ -39,30 +39,6 @@ public Task<ActionResult> CreateDownloadPackageActionResultAsync(Uri requestUrl,\nreturn _fileStorageService.CreateDownloadFileActionResultAsync(requestUrl, CoreConstants.PackagesFolderName, fileName);\n}\n- public Task StorePackageFileInBackupLocationAsync(Package package, Stream packageFile)\n- {\n- if (package == null)\n- {\n- throw new ArgumentNullException(nameof(package));\n- }\n-\n- if (packageFile == null)\n- {\n- throw new ArgumentNullException(nameof(packageFile));\n- }\n-\n- if (package.PackageRegistration == null ||\n- string.IsNullOrWhiteSpace(package.PackageRegistration.Id) ||\n- (string.IsNullOrWhiteSpace(package.NormalizedVersion) && string.IsNullOrWhiteSpace(package.Version)))\n- {\n- throw new ArgumentException(CoreStrings.PackageIsMissingRequiredData, nameof(package));\n- }\n-\n- var fileName = BuildBackupFileName(package.PackageRegistration.Id, string.IsNullOrEmpty(package.NormalizedVersion)\n- ? NuGetVersion.Parse(package.Version).ToNormalizedString() : package.NormalizedVersion, package.Hash);\n- return _fileStorageService.SaveFileAsync(CoreConstants.PackageBackupsFolderName, fileName, packageFile);\n- }\n-\n/// <summary>\n/// Deletes the package readme.md file from storage.\n/// </summary>\n@@ -126,33 +102,5 @@ public async Task<string> DownloadReadMeMdFileAsync(Package package)\nreturn null;\n}\n-\n- private static string BuildBackupFileName(string id, string version, string hash)\n- {\n- if (id == null)\n- {\n- throw new ArgumentNullException(nameof(id));\n- }\n-\n- if (version == null)\n- {\n- throw new ArgumentNullException(nameof(version));\n- }\n-\n- if (hash == null)\n- {\n- throw new ArgumentNullException(nameof(hash));\n- }\n-\n- var hashBytes = Convert.FromBase64String(hash);\n-\n- return string.Format(\n- CultureInfo.InvariantCulture,\n- Constants.PackageFileBackupSavePathTemplate,\n- id,\n- version,\n- HttpServerUtility.UrlTokenEncode(hashBytes),\n- CoreConstants.NuGetPackageFileExtension);\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageFileServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageFileServiceFacts.cs",
"diff": "using System.Collections.Generic;\nusing System.IO;\nusing System.Threading.Tasks;\n+using System.Web;\nusing Moq;\nusing Xunit;\n@@ -495,6 +496,219 @@ public async Task WillUseFileStorageService()\n}\n}\n+ public class TheStorePackageFileInBackupLocationAsyncMethod\n+ {\n+ private string packageHashForTests = \"NzMzMS1QNENLNEczSDQ1SA==\";\n+\n+ [Fact]\n+ public async Task WillThrowIfPackageIsNull()\n+ {\n+ var service = CreateService();\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.StorePackageFileInBackupLocationAsync(null, Stream.Null));\n+\n+ Assert.Equal(\"package\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillThrowIfPackageFileIsNull()\n+ {\n+ var service = CreateService();\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.StorePackageFileInBackupLocationAsync(new Package { PackageRegistration = new PackageRegistration() }, null));\n+\n+ Assert.Equal(\"packageFile\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillThrowIfPackageIsMissingPackageRegistration()\n+ {\n+ var service = CreateService();\n+ var package = new Package { PackageRegistration = null };\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentException>(() => service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream()));\n+\n+ Assert.True(ex.Message.StartsWith(\"The package is missing required data.\"));\n+ Assert.Equal(\"package\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillThrowIfPackageIsMissingPackageRegistrationId()\n+ {\n+ var service = CreateService();\n+ var packageRegistraion = new PackageRegistration { Id = null };\n+ var package = new Package { PackageRegistration = packageRegistraion };\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentException>(() => service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream()));\n+\n+ Assert.True(ex.Message.StartsWith(\"The package is missing required data.\"));\n+ Assert.Equal(\"package\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillThrowIfPackageIsMissingNormalizedVersionAndVersion()\n+ {\n+ var service = CreateService();\n+ var packageRegistraion = new PackageRegistration { Id = \"theId\" };\n+ var package = new Package { PackageRegistration = packageRegistraion, NormalizedVersion = null, Version = null };\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentException>(() => service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream()));\n+\n+ Assert.True(ex.Message.StartsWith(\"The package is missing required data.\"));\n+ Assert.Equal(\"package\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillUseNormalizedRegularVersionIfNormalizedVersionMissing()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ var packageRegistraion = new PackageRegistration { Id = \"theId\" };\n+ var package = new Package { PackageRegistration = packageRegistraion, NormalizedVersion = null, Version = \"01.01.01\", Hash = packageHashForTests };\n+ package.Hash = packageHashForTests;\n+\n+ fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"1.1.1\", packageHashForTests), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n+ .Completes()\n+ .Verifiable();\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n+\n+ fileStorageSvc.VerifyAll();\n+ }\n+\n+ [Fact]\n+ public async Task WillUseLowercaseNormalizedIdAndVersion()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ string path = null;\n+ fileStorageSvc\n+ .Setup(x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>()))\n+ .Returns(Task.FromResult(true))\n+ .Callback<string, string, Stream, bool>((_, p, __, ___) => path = p);\n+\n+ var package = CreatePackage();\n+ package.PackageRegistration.Id = Id;\n+ package.NormalizedVersion = NormalizedVersion;\n+ package.Hash = packageHashForTests;\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n+\n+ Assert.Equal(\"nuget.versioning/4.3.0-beta/NzMzMS1QNENLNEczSDQ1SA2..nupkg\", path);\n+ }\n+\n+ [Fact]\n+ public async Task WillSaveTheFileViaTheFileStorageServiceUsingThePackagesFolder()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ fileStorageSvc.Setup(x => x.SaveFileAsync(CoreConstants.PackageBackupsFolderName, It.IsAny<string>(), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n+ .Completes()\n+ .Verifiable();\n+\n+ var package = CreatePackage();\n+ package.Hash = packageHashForTests;\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n+\n+ fileStorageSvc.VerifyAll();\n+ }\n+\n+ [Fact]\n+ public async Task WillSaveTheFileViaTheFileStorageServiceUsingAFileNameWithIdAndNormalizedersion()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"theNormalizedVersion\", packageHashForTests), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n+ .Completes()\n+ .Verifiable();\n+\n+ var package = CreatePackage();\n+ package.Hash = packageHashForTests;\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n+\n+ fileStorageSvc.VerifyAll();\n+ }\n+\n+ [Fact]\n+ public async Task WillSaveTheFileStreamViaTheFileStorageService()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var fakeStream = new MemoryStream();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), fakeStream, It.Is<bool>(b => b)))\n+ .Completes()\n+ .Verifiable();\n+\n+ var package = CreatePackage();\n+ package.Hash = packageHashForTests;\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, fakeStream);\n+\n+ fileStorageSvc.VerifyAll();\n+ }\n+\n+ [Fact]\n+ public async Task WillNotUploadThePackageIfItAlreadyExists()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var fakeStream = new MemoryStream();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ fileStorageSvc\n+ .Setup(x => x.FileExistsAsync(It.IsAny<string>(), It.IsAny<string>()))\n+ .ReturnsAsync(true);\n+\n+ var package = CreatePackage();\n+ package.Hash = packageHashForTests;\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, fakeStream);\n+\n+ fileStorageSvc.Verify(\n+ x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>()),\n+ Times.Never);\n+ }\n+\n+ [Fact]\n+ public async Task WillSwallowInvalidOperationException()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var fakeStream = new MemoryStream();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ fileStorageSvc\n+ .Setup(x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>()))\n+ .Throws(new InvalidOperationException(\"File already exists.\"));\n+\n+ var package = CreatePackage();\n+ package.Hash = packageHashForTests;\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, fakeStream);\n+\n+ fileStorageSvc.Verify(\n+ x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>()),\n+ Times.Once);\n+ }\n+\n+ [Fact]\n+ public async Task WillNotSwallowOtherExceptions()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var fakeStream = new MemoryStream();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ var exception = new ArgumentException(\"Bad!\");\n+ fileStorageSvc\n+ .Setup(x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>()))\n+ .Throws(exception);\n+\n+ var package = CreatePackage();\n+ package.Hash = packageHashForTests;\n+\n+ var actual = await Assert.ThrowsAsync<ArgumentException>(\n+ () => service.StorePackageFileInBackupLocationAsync(package, fakeStream));\n+ Assert.Same(exception, actual);\n+ }\n+ }\n+\nstatic string BuildFileName(\nstring id,\nstring version, string extension, string path)\n@@ -506,6 +720,18 @@ public async Task WillUseFileStorageService()\nextension);\n}\n+ private static string BuildBackupFileName(string id, string version, string hash)\n+ {\n+ var hashBytes = Convert.FromBase64String(hash);\n+\n+ return string.Format(\n+ CoreConstants.PackageFileBackupSavePathTemplate,\n+ id.ToLowerInvariant(),\n+ version.ToLowerInvariant(),\n+ HttpServerUtility.UrlTokenEncode(hashBytes),\n+ CoreConstants.NuGetPackageFileExtension);\n+ }\n+\nstatic Package CreatePackage()\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Packages = new HashSet<Package>() };\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageFileServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageFileServiceFacts.cs",
"diff": "@@ -181,139 +181,6 @@ public async Task WillReturnTheResultFromTheFileStorageService()\n}\n}\n- public class TheStorePackageFileInBackupLocationAsyncMethod\n- {\n- private string packageHashForTests = \"NzMzMS1QNENLNEczSDQ1SA==\";\n-\n- [Fact]\n- public async Task WillThrowIfPackageIsNull()\n- {\n- var service = CreateService();\n-\n- var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.StorePackageFileInBackupLocationAsync(null, Stream.Null));\n-\n- Assert.Equal(\"package\", ex.ParamName);\n- }\n-\n- [Fact]\n- public async Task WillThrowIfPackageFileIsNull()\n- {\n- var service = CreateService();\n-\n- var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.StorePackageFileInBackupLocationAsync(new Package { PackageRegistration = new PackageRegistration() }, null));\n-\n- Assert.Equal(\"packageFile\", ex.ParamName);\n- }\n-\n- [Fact]\n- public async Task WillThrowIfPackageIsMissingPackageRegistration()\n- {\n- var service = CreateService();\n- var package = new Package { PackageRegistration = null };\n-\n- var ex = await Assert.ThrowsAsync<ArgumentException>(() => service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream()));\n-\n- Assert.True(ex.Message.StartsWith(\"The package is missing required data.\"));\n- Assert.Equal(\"package\", ex.ParamName);\n- }\n-\n- [Fact]\n- public async Task WillThrowIfPackageIsMissingPackageRegistrationId()\n- {\n- var service = CreateService();\n- var packageRegistraion = new PackageRegistration { Id = null };\n- var package = new Package { PackageRegistration = packageRegistraion };\n-\n- var ex = await Assert.ThrowsAsync<ArgumentException>(() => service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream()));\n-\n- Assert.True(ex.Message.StartsWith(\"The package is missing required data.\"));\n- Assert.Equal(\"package\", ex.ParamName);\n- }\n-\n- [Fact]\n- public async Task WillThrowIfPackageIsMissingNormalizedVersionAndVersion()\n- {\n- var service = CreateService();\n- var packageRegistraion = new PackageRegistration { Id = \"theId\" };\n- var package = new Package { PackageRegistration = packageRegistraion, NormalizedVersion = null, Version = null };\n-\n- var ex = await Assert.ThrowsAsync<ArgumentException>(() => service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream()));\n-\n- Assert.True(ex.Message.StartsWith(\"The package is missing required data.\"));\n- Assert.Equal(\"package\", ex.ParamName);\n- }\n-\n- [Fact]\n- public async Task WillUseNormalizedRegularVersionIfNormalizedVersionMissing()\n- {\n- var fileStorageSvc = new Mock<IFileStorageService>();\n- var service = CreateService(fileStorageSvc: fileStorageSvc);\n- var packageRegistraion = new PackageRegistration { Id = \"theId\" };\n- var package = new Package { PackageRegistration = packageRegistraion, NormalizedVersion = null, Version = \"01.01.01\", Hash = packageHashForTests};\n- package.Hash = packageHashForTests;\n-\n- fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"1.1.1\", packageHashForTests), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n- .Completes()\n- .Verifiable();\n-\n- await service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n-\n- fileStorageSvc.VerifyAll();\n- }\n-\n- [Fact]\n- public async Task WillSaveTheFileViaTheFileStorageServiceUsingThePackagesFolder()\n- {\n- var fileStorageSvc = new Mock<IFileStorageService>();\n- var service = CreateService(fileStorageSvc: fileStorageSvc);\n- fileStorageSvc.Setup(x => x.SaveFileAsync(CoreConstants.PackageBackupsFolderName, It.IsAny<string>(), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n- .Completes()\n- .Verifiable();\n-\n- var package = CreatePackage();\n- package.Hash = packageHashForTests;\n-\n- await service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n-\n- fileStorageSvc.VerifyAll();\n- }\n-\n- [Fact]\n- public async Task WillSaveTheFileViaTheFileStorageServiceUsingAFileNameWithIdAndNormalizedersion()\n- {\n- var fileStorageSvc = new Mock<IFileStorageService>();\n- var service = CreateService(fileStorageSvc: fileStorageSvc);\n- fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"theNormalizedVersion\", packageHashForTests), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n- .Completes()\n- .Verifiable();\n-\n- var package = CreatePackage();\n- package.Hash = packageHashForTests;\n-\n- await service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n-\n- fileStorageSvc.VerifyAll();\n- }\n-\n- [Fact]\n- public async Task WillSaveTheFileStreamViaTheFileStorageService()\n- {\n- var fileStorageSvc = new Mock<IFileStorageService>();\n- var fakeStream = new MemoryStream();\n- var service = CreateService(fileStorageSvc: fileStorageSvc);\n- fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), fakeStream, It.Is<bool>(b => b)))\n- .Completes()\n- .Verifiable();\n-\n- var package = CreatePackage();\n- package.Hash = packageHashForTests;\n-\n- await service.StorePackageFileInBackupLocationAsync(package, fakeStream);\n-\n- fileStorageSvc.VerifyAll();\n- }\n- }\n-\npublic class TheDeleteReadMeMdFileAsync\n{\n[Fact]\n@@ -478,18 +345,6 @@ public async Task WhenDoesNotExist_ReturnsNull()\nextension);\n}\n- private static string BuildBackupFileName(string id, string version, string hash)\n- {\n- var hashBytes = Convert.FromBase64String(hash);\n-\n- return string.Format(\n- Constants.PackageFileBackupSavePathTemplate,\n- id,\n- version,\n- HttpServerUtility.UrlTokenEncode(hashBytes),\n- CoreConstants.NuGetPackageFileExtension);\n- }\n-\nstatic Package CreatePackage()\n{\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Packages = new HashSet<Package>() };\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Move StorePackageFileInBackupLocationAsync to NuGetGallery.Core (#5549)
Progress on https://github.com/NuGet/Engineering/issues/1192
|
455,744 |
28.02.2018 16:08:54
| 28,800 |
bcfe2bdf1b823fa28fcbdfc65c1fa178dcd3cab4
|
Added new DEV environment cert to the list of accepted.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"diff": "@@ -450,7 +450,8 @@ public static IEnumerable<string> TrustedHttpsCertificates\n// returned from HTTPS browser interactions with the gallery.\npieces = new List<string>\n{\n- \"8c11c16610b7a147d10bbcc6a65ce23d321c12c2\", // *.nugettest.org\n+ \"8c11c16610b7a147d10bbcc6a65ce23d321c12c2\", // *.nugettest.org (old)\n+ \"6cd4e9738ae52ba11e7b81da8caafbeadf89488f\", // *.nugettest.org (new)\n\"9d984f91f40d8b3a1fb29153179415523c4e64d1\", // *.int.nugettest.org\n\"3751cb513b93ee67ec9f18a1f2aec1eac87af9bc\", // *.nuget.org (old)\n\"03984834f27d5c94f46b3bb190e5a8099787268a\" // *.nuget.org (new)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Added new DEV environment cert to the list of accepted. (#5487)
|
455,736 |
28.02.2018 14:54:32
| 28,800 |
04c982888b1af2ced6a2187c5bf889b5c879421f
|
Enable TLS 1.2 in build.ps1
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -25,6 +25,10 @@ trap {\nif (-not (Test-Path \"$PSScriptRoot/build\")) {\nNew-Item -Path \"$PSScriptRoot/build\" -ItemType \"directory\"\n}\n+\n+# Enable TLS 1.2 since GitHub requires it.\n+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n+\nwget -UseBasicParsing -Uri \"https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranch/build/init.ps1\" -OutFile \"$PSScriptRoot/build/init.ps1\"\n. \"$PSScriptRoot/build/init.ps1\" -BuildBranch \"$BuildBranch\"\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Enable TLS 1.2 in build.ps1 (#5563)
Progress on https://github.com/NuGet/NuGetGallery/issues/5551
|
455,776 |
01.03.2018 15:16:46
| 28,800 |
276e9fec938b49ed7817268c9065834464ee9e9b
|
[Organizations] Small UI fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1018,6 +1018,18 @@ img.reserved-indicator-icon {\n.manage-members-listing {\nmargin-bottom: 0;\n}\n+.manage-members-listing .heading-left {\n+ padding-left: 5px;\n+}\n+.manage-members-listing .heading-right {\n+ padding-right: 5px;\n+}\n+.manage-members-listing .icon-left {\n+ padding-left: 25px;\n+}\n+.manage-members-listing .member-icon {\n+ vertical-align: middle;\n+}\n.page-manage-owners h2 .ms-Icon {\nposition: relative;\ntop: -2px;\n@@ -1418,6 +1430,60 @@ img.reserved-indicator-icon {\n.page-status .table tbody + tbody {\nborder: none;\n}\n+.page-transform-account .center-box {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+\n+ -webkit-box-pack: justify;\n+ -webkit-justify-content: space-between;\n+ -ms-flex-pack: justify;\n+ justify-content: space-between;\n+ -webkit-box-align: stretch;\n+ -webkit-align-items: stretch;\n+ -ms-flex-align: stretch;\n+ align-items: stretch;\n+}\n+.page-transform-account .center-box .form-box {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+ flex-direction: column;\n+\n+ -webkit-box-pack: justify;\n+ -webkit-justify-content: space-between;\n+ -ms-flex-pack: justify;\n+ justify-content: space-between;\n+ -webkit-box-orient: vertical;\n+ -webkit-box-direction: normal;\n+ -webkit-flex-direction: column;\n+ -ms-flex-direction: column;\n+}\n+.page-transform-account .center-box .logo-box {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+ margin-bottom: 50px;\n+ flex-direction: column;\n+\n+ -webkit-box-pack: justify;\n+ -webkit-justify-content: space-between;\n+ -ms-flex-pack: justify;\n+ justify-content: space-between;\n+ -webkit-box-orient: vertical;\n+ -webkit-box-direction: normal;\n+ -webkit-flex-direction: column;\n+ -ms-flex-direction: column;\n+}\n+.page-transform-account .center-box .logo-box .logo {\n+ -webkit-box-flex: 1;\n+ -webkit-flex-grow: 1;\n+ -ms-flex-positive: 1;\n+ flex-grow: 1;\n+}\n.page-upload #browse-for-package-button {\nmargin: 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-statistics-overview.less\";\n@import \"page-statistics-per-package.less\";\n@import \"page-status.less\";\n+@import \"page-transform-account.less\";\n@import \"page-upload.less\";\n\\ No newline at end of file\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": ".manage-members-listing {\nmargin-bottom: 0;\n+\n+ .heading-left {\n+ padding-left: 5px;\n+ }\n+\n+ .heading-right {\n+ padding-right: 5px;\n+ }\n+\n+ .icon-left {\n+ padding-left: 25px;\n+ }\n+\n+ .member-icon {\n+ vertical-align: middle;\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-transform-account.less",
"diff": "+.page-transform-account {\n+ .center-box {\n+ display: flex;\n+ justify-content: space-between;\n+ align-items: stretch;\n+\n+ .form-box {\n+ display: flex;\n+ justify-content: space-between;\n+ flex-direction: column;\n+ }\n+\n+ .logo-box {\n+ display: flex;\n+ justify-content: space-between;\n+ flex-direction: column;\n+ margin-bottom: 50px;\n+\n+ .logo {\n+ flex-grow: 1;\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "{\n@AlertWarning(\n@<text>\n- NuGet.org password login is being deprecated. Please use a Microsoft account to sign into NuGet gallery.\n+ NuGet.org password login is deprecated. Please use a Microsoft account to sign into NuGet gallery.\n</text>\n)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -721,7 +721,7 @@ public class Strings {\n///\n///[{0}]({0})\n///\n- ///Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+ ///Note that NuGet.org password login is deprecated. Please use Microsoft account to sign into {1}.\n///\n///Thanks,\n///The {1} Team.\n@@ -749,7 +749,7 @@ public class Strings {\n///\n///[{0}]({0})\n///\n- ///Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+ ///Note that NuGet.org password login is deprecated. Please use Microsoft account to sign into {1}.\n///\n///Thanks,\n///The {1} Team.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -245,7 +245,7 @@ Click the following link within the next hour to reset your password:\n[{0}]({0})\n-Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+Note that NuGet.org password login is deprecated. Please use Microsoft account to sign into {1}.\nThanks,\nThe {1} Team</value>\n@@ -261,7 +261,7 @@ Click the following link within the next hour to set your password:\n[{0}]({0})\n-Note that NuGet.org password login is being deprecated. Please use Microsoft account to sign into {1}.\n+Note that NuGet.org password login is deprecated. Please use Microsoft account to sign into {1}.\nThanks,\nThe {1} Team</value>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "</script>\n<script type=\"text/html\" id=\"manage-members\">\n- <div class=\"col-md-12\">\n+ <div class=\"col-md-12 manage-members-listing\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\n@if (Model.CanManage)\n{\n- <div class=\"input-group col-md-12\">\n- <div class=\"col-md-6\">\n+ <div class=\"input-group col-xs-12\">\n+ <div class=\"col-xs-8 icon-left heading-right\">\n<input 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-md-6\">\n- <select class=\"form-control col-md-2\" data-bind=\"value: AddMemberRole, options: RoleNames\" aria-label=\"Select new member role\">\n+ <div class=\"col-xs-3 heading-left heading-right\">\n+ <select class=\"form-control\" data-bind=\"value: AddMemberRole, options: RoleNames\" aria-label=\"Select new member role\">\n</select>\n</div>\n- <span class=\"input-group-btn\">\n- <button class=\"btn\" type=\"submit\" title=\"Add new member\" aria-label=\"Add new member\" data-bind=\"click: AddMember, enable: NewMemberUsername\">\n- <span class=\"ms-Icon ms-Icon--AddFriend\" aria-hidden=\"true\"></span>\n- </button>\n- </span>\n+ <div class=\"text-center align-middle col-xs-1\">\n+ <button class=\"btn\" type=\"submit\" title=\"Add new member\" aria-label=\"Add new member\" data-bind=\"click: AddMember, enable: NewMemberUsername\">Add</button>\n+ </div>\n</div><br />\n}\n- <table class=\"table manage-members-listing\">\n+ <table class=\"table\">\n<tbody data-bind=\"foreach: Members\">\n<tr>\n- <td class=\"align-middle hidden-xs col-xs-1\">\n+ <td class=\"align-middle member-icon icon-left hidden-xs col-xs-1\">\n<img data-bind=\"attr: { src: GravatarUrl, title: Username }\" class=\"owner-image\" alt=\"gravatar\"\nheight=\"@Constants.GravatarElementSize\" width=\"@Constants.GravatarElementSize\">\n</td>\n- <td class=\"align-middle member-username\">\n+ <td class=\"align-middle heading-right member-username col-xs-8 col-sm-7\">\n<a title=\"View Member Profile\" data-bind=\"attr: { href: ProfileUrl }\">\n<span data-bind=\"text: Username\"></span>\n</a>\n<!-- /ko -->\n<div data-bind=\"text: EmailAddress\"></div>\n</td>\n- <td class=\"align-middle member-username\">\n+ <td class=\"align-middle heading-left heading-right member-username col-xs-3\">\n@if (Model.CanManage)\n{\n<select class=\"form-control\" aria-label=\"Change member role\"\n</td>\n@if (Model.CanManage)\n{\n- <td class=\"text-right align-middle member-controls\">\n+ <td class=\"text-center align-middle heading-right member-controls col-xs-1\">\n<span>\n<a class=\"btn\" data-bind=\"click: DeleteMember, attr: { 'aria-label': 'Delete Member' }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"diff": "var transformConfirmation = \"You have added '{0}' as an administrator. \" + transformNote;\n}\n-<section role=\"main\" class=\"container main-container page-account-settings\">\n+<section role=\"main\" class=\"container main-container page-transform-account\">\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n<h1 class=\"text-center\">Transform Account</h1>\n<a href=\"@Url.User(CurrentUser)\">@CurrentUser.Username</a>\n</div>\n- <div>\n- <aside class=\"col-md-3 col-md-push-9\">\n- @Html.Label(\"Logo\")\n- @ViewHelpers.GravatarImage(CurrentUser.EmailAddress, CurrentUser.Username, Constants.GravatarImageSizeLarge, responsive: true)\n- </aside>\n+ @using (Html.BeginForm(\"Transform\", \"Users\", FormMethod.Post, new { id = \"transform\"}))\n+ {\n+ @Html.AntiForgeryToken()\n- <div class=\"row form-group col-md-9 col-md-pull-3\">\n+ <div class=\"row center-box\">\n+ <div class=\"form-box col-xs-9\">\n+ <div class=\"form-group\">\n@Html.Label(\"Organization\")\n<p>@CurrentUser.Username</p>\n</div>\n- <div class=\"row form-group col-md-9 col-md-pull-3\">\n+ <div class=\"form-group\">\n@Html.Label(\"Email\")\n<p>@CurrentUser.EmailAddress</p>\n</div>\n- @using (Html.BeginForm(\"Transform\", \"Users\", FormMethod.Post, new { id = \"transform\"}))\n- {\n- @Html.AntiForgeryToken()\n-\n- <div class=\"row form-group col-md-9 col-md-pull-3 @Html.HasErrorFor(m => m.AdminUsername)\">\n+ <div class=\"form-group @Html.HasErrorFor(m => m.AdminUsername)\">\n@Html.ShowLabelFor(m => m.AdminUsername)\n<a href=\"#\" data-toggle=\"tooltip\" title=\"@transformToolTip\">\n<i class=\"ms-Icon ms-Icon--Info\" aria-hidden=\"true\" style=\"vertical-align: -2px\"></i>\n<div class=\"form-group has-error\">\n@Html.ShowValidationMessagesForEmpty()\n</div>\n+ </div>\n+ <aside class=\"logo-box col-xs-3\">\n+ <div class=\"logo\">\n+ @Html.Label(\"Logo\")\n+ </div>\n+ <div>\n+ @ViewHelpers.GravatarImage(CurrentUser.EmailAddress, CurrentUser.Username, Constants.GravatarImageSizeLarge, responsive: true)\n+ </div>\n+ </aside>\n+ </div>\n<div class=\"row form-group\">\n<div class=\"col-md-6\">\n</div>\n}\n</div>\n-\n- </div>\n</div>\n</section>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Small UI fixes (#5567)
|
455,776 |
05.03.2018 12:54:53
| 28,800 |
a5d96df745c8bf3d7b526aae68e6fd867bd9f027
|
[Organizations] Minor bug fixes from dev
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-add-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-add-organization.js",
"diff": "_gravatar.attr(\"src\", src);\n}\n+\n+ // Immediately fetch the image if the email box is filled in initially.\n+ if (_emailBox.val()) {\n+ UpdateGravatar();\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": "@@ -383,9 +383,7 @@ public async Task<Organization> AddOrganizationAsync(string username, string ema\n}\nvar existingUserWithIdentity = EntitiesContext.Users\n- .FirstOrDefault(u =>\n- u.Username.Equals(username, StringComparison.OrdinalIgnoreCase) ||\n- string.Equals(u.EmailAddress, emailAddress, StringComparison.OrdinalIgnoreCase));\n+ .FirstOrDefault(u => u.Username == username || u.EmailAddress == emailAddress);\nif (existingUserWithIdentity != null)\n{\nif (existingUserWithIdentity.Username.Equals(username, StringComparison.OrdinalIgnoreCase))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"new_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"diff": "@@ -29,6 +29,8 @@ public User CurrentUser\nget { return NuGetContext.CurrentUser; }\n}\n+ public Lazy<IContentObjectService> ContentObjectService => new Lazy<IContentObjectService>(() => DependencyResolver.Current.GetService<IContentObjectService>());\n+\npublic CookieConsentMessage CookieConsentMessage\n{\nget { return _cookieConsentMessage.Value; }\n@@ -82,6 +84,8 @@ public User CurrentUser\nget { return NuGetContext.CurrentUser; }\n}\n+ public Lazy<IContentObjectService> ContentObjectService => new Lazy<IContentObjectService>(() => DependencyResolver.Current.GetService<IContentObjectService>());\n+\npublic CookieConsentMessage CookieConsentMessage\n{\nget { return _cookieConsentMessage.Value; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "<li role=\"presentation\"><a href=\"@Url.AccountSettings()\" role=\"menuitem\">Account Settings</a></li>\n<li role=\"presentation\"><a href=\"@Url.ManageMyApiKeys()\" role=\"menuitem\">API Keys</a></li>\n<li class=\"divider\"></li>\n- @if (CurrentUser.Organizations.Any())\n+ @if (CurrentUser.Organizations.Any() ||\n+ ContentObjectService.Value.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(CurrentUser))\n{\n<li role=\"presentation\"><a href=\"@Url.ManageMyOrganizations()\" role=\"menuitem\">Manage Organizations</a></li>\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Minor bug fixes from dev (#5576)
|
455,736 |
05.03.2018 18:05:47
| 28,800 |
262741eabb8d7ac72f7aef6ec463387833417c1a
|
Add CopyFileAsync to ICoreFileStorageService
Progress on
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "using System;\nusing System.Collections.Concurrent;\nusing System.Collections.Generic;\n+using System.Diagnostics;\nusing System.Globalization;\nusing System.IO;\nusing System.Net;\n@@ -16,6 +17,15 @@ namespace NuGetGallery\n{\npublic class CloudBlobCoreFileStorageService : ICoreFileStorageService\n{\n+ /// <summary>\n+ /// This is the maximum duration for <see cref=\"CopyFileAsync(string, string, string, string)\"/> to poll,\n+ /// waiting for a package copy to complete. The value picked today is based off of the maximum duration we wait\n+ /// when uploading files to Azure China blob storage. Note that in cases when the copy source and destination\n+ /// are in the same container, the copy completed immediately and no polling is necessary.\n+ /// </summary>\n+ private static readonly TimeSpan MaxCopyDuration = TimeSpan.FromMinutes(10);\n+ private static readonly TimeSpan CopyPollFrequency = TimeSpan.FromMilliseconds(500);\n+\nprivate static readonly HashSet<string> KnownPublicFolders = new HashSet<string> {\nCoreConstants.PackagesFolderName,\nCoreConstants.PackageBackupsFolderName,\n@@ -100,6 +110,93 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\n}\n}\n+ public async Task CopyFileAsync(string srcFolderName, string srcFileName, string destFolderName, string destFileName)\n+ {\n+ if (srcFolderName == null)\n+ {\n+ throw new ArgumentNullException(nameof(srcFolderName));\n+ }\n+\n+ if (srcFileName == null)\n+ {\n+ throw new ArgumentNullException(nameof(srcFileName));\n+ }\n+\n+ if (destFolderName == null)\n+ {\n+ throw new ArgumentNullException(nameof(destFolderName));\n+ }\n+\n+ if (destFileName == null)\n+ {\n+ throw new ArgumentNullException(nameof(destFileName));\n+ }\n+\n+ var srcContainer = await GetContainerAsync(srcFolderName);\n+ var srcBlob = srcContainer.GetBlobReference(srcFileName);\n+\n+ var destContainer = await GetContainerAsync(destFolderName);\n+ var destBlob = destContainer.GetBlobReference(destFileName);\n+\n+ // Determine the source blob etag.\n+ await srcBlob.FetchAttributesAsync();\n+ var srcAccessCondition = AccessCondition.GenerateIfMatchCondition(srcBlob.ETag);\n+\n+ // Check if the destination blob already exists and fetch attributes.\n+ var destAccessCondition = AccessCondition.GenerateIfNotExistsCondition();\n+ if (await destBlob.ExistsAsync())\n+ {\n+ if (destBlob.CopyState?.Status == CopyStatus.Failed)\n+ {\n+ // If the last copy failed, allow this copy to occur.\n+ destAccessCondition = AccessCondition.GenerateIfMatchCondition(destBlob.ETag);\n+ }\n+ else if ((srcBlob.Properties.ContentMD5 != null\n+ && srcBlob.Properties.ContentMD5 == destBlob.Properties.ContentMD5\n+ && srcBlob.Properties.Length == destBlob.Properties.Length))\n+ {\n+ // If the blob hash is the same and the length is the same, no-op the copy.\n+ return;\n+ }\n+ }\n+\n+ // Start the server-side copy and wait for it to complete.\n+ try\n+ {\n+ await destBlob.StartCopyAsync(\n+ srcBlob,\n+ srcAccessCondition,\n+ destAccessCondition);\n+ }\n+ catch (StorageException ex) when (ex.RequestInformation?.HttpStatusCode == (int?)HttpStatusCode.Conflict)\n+ {\n+ throw new InvalidOperationException(\n+ String.Format(\n+ CultureInfo.CurrentCulture,\n+ \"There is already a blob with name {0} in container {1}.\",\n+ destFileName,\n+ destFolderName),\n+ ex);\n+ }\n+\n+ var stopwatch = Stopwatch.StartNew();\n+ while (destBlob.CopyState.Status == CopyStatus.Pending\n+ && stopwatch.Elapsed < MaxCopyDuration)\n+ {\n+ await destBlob.FetchAttributesAsync();\n+ await Task.Delay(CopyPollFrequency);\n+ }\n+\n+ if (destBlob.CopyState.Status == CopyStatus.Pending)\n+ {\n+ throw new TimeoutException($\"Waiting for the blob copy operation to complete timed out after {MaxCopyDuration.TotalSeconds} seconds.\");\n+ }\n+ else if (destBlob.CopyState.Status != CopyStatus.Success)\n+ {\n+ throw new StorageException($\"The blob copy operation had copy status {destBlob.CopyState.Status} ({destBlob.CopyState.StatusDescription}).\");\n+ }\n+ }\n+\npublic async Task SaveFileAsync(string folderName, string fileName, Stream packageFile, bool overwrite = true)\n{\nICloudBlobContainer container = await GetContainerAsync(folderName);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"diff": "@@ -35,5 +35,17 @@ public interface ICoreFileStorageService\nTask<Uri> GetFileReadUriAsync(string folderName, string fileName, DateTimeOffset? endOfAccess);\nTask SaveFileAsync(string folderName, string fileName, Stream packageFile, bool overwrite = true);\n+\n+ /// <summary>\n+ /// Copies the source file to the destination file. If the destination already exists and the content\n+ /// is different, an exception should be thrown. If the file already exists, the implementation can choose to\n+ /// no-op if the content is the same instead of throwing an exception. This method should throw if the source\n+ /// file does not exist.\n+ /// </summary>\n+ /// <param name=\"srcFolderName\">The source folder.</param>\n+ /// <param name=\"srcFileName\">The source file name or relative file path.</param>\n+ /// <param name=\"destFolderName\">The destination folder.</param>\n+ /// <param name=\"destFileName\">The destination file name or relative file path.</param>\n+ Task CopyFileAsync(string srcFolderName, string srcFileName, string destFolderName, string destFileName);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"new_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"diff": "@@ -12,6 +12,7 @@ namespace NuGetGallery\npublic interface ISimpleCloudBlob\n{\nBlobProperties Properties { get; }\n+ CopyState CopyState { get; }\nUri Uri { get; }\nstring Name { get; }\nDateTime LastModifiedUtc { get; }\n@@ -27,6 +28,8 @@ public interface ISimpleCloudBlob\nTask FetchAttributesAsync();\n+ Task StartCopyAsync(ISimpleCloudBlob source, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition);\n+\n/// <summary>\n/// Generates the shared read signature that if appended to the blob URI\n/// would allow reading the contents of the blob using the produced URI\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"diff": "using System;\nusing System.Globalization;\nusing System.IO;\n+using System.Security.Cryptography;\nusing System.Threading.Tasks;\nusing System.Web.Hosting;\nusing System.Web.Mvc;\n@@ -168,6 +169,45 @@ public Task SaveFileAsync(string folderName, string fileName, Stream packageFile\nreturn Task.FromResult(0);\n}\n+ public Task CopyFileAsync(string srcFolderName, string srcFileName, string destFolderName, string destFileName)\n+ {\n+ if (srcFolderName == null)\n+ {\n+ throw new ArgumentNullException(nameof(srcFolderName));\n+ }\n+\n+ if (srcFileName == null)\n+ {\n+ throw new ArgumentNullException(nameof(srcFileName));\n+ }\n+\n+ if (destFolderName == null)\n+ {\n+ throw new ArgumentNullException(nameof(destFolderName));\n+ }\n+\n+ if (destFileName == null)\n+ {\n+ throw new ArgumentNullException(nameof(destFileName));\n+ }\n+\n+ var srcFilePath = BuildPath(_configuration.FileStorageDirectory, srcFolderName, srcFileName);\n+ var destFilePath = BuildPath(_configuration.FileStorageDirectory, destFolderName, destFileName);\n+\n+ _fileSystemService.CreateDirectory(Path.GetDirectoryName(destFilePath));\n+\n+ try\n+ {\n+ _fileSystemService.Copy(srcFilePath, destFilePath, overwrite: false);\n+ }\n+ catch (IOException e)\n+ {\n+ throw new InvalidOperationException(\"Could not copy because destination file already exists\", e);\n+ }\n+\n+ return Task.CompletedTask;\n+ }\n+\npublic Task<bool> IsAvailableAsync()\n{\nreturn Task.FromResult(Directory.Exists(_configuration.FileStorageDirectory));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemService.cs",
"diff": "@@ -51,5 +51,10 @@ public IFileReference GetFileReference(string path)\nvar info = new FileInfo(path);\nreturn info.Exists ? new LocalFileReference(info) : null;\n}\n+\n+ public virtual void Copy(string sourceFileName, string destFileName, bool overwrite)\n+ {\n+ File.Copy(sourceFileName, destFileName, overwrite);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFileSystemService.cs",
"new_path": "src/NuGetGallery/Services/IFileSystemService.cs",
"diff": "@@ -16,5 +16,7 @@ public interface IFileSystemService\nDateTimeOffset GetCreationTimeUtc(string path);\nIFileReference GetFileReference(string path);\n+\n+ void Copy(string sourceFileName, string destFileName, bool overwrite);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -625,5 +625,223 @@ public async Task WillPassTheEndOfAccessTimestampFurther()\nreturn Tuple.Create(fakeBlobClient, fakeBlob, blobUri);\n}\n}\n+\n+ public class TheCopyFileAsyncMethod\n+ {\n+ private string _srcFolderName;\n+ private string _srcFileName;\n+ private string _srcETag;\n+ private BlobProperties _srcProperties;\n+ private string _destFolderName;\n+ private string _destFileName;\n+ private string _destETag;\n+ private BlobProperties _destProperties;\n+ private CopyState _destCopyState;\n+ private Mock<ICloudBlobClient> _blobClient;\n+ private Mock<ICloudBlobContainer> _srcContainer;\n+ private Mock<ICloudBlobContainer> _destContainer;\n+ private Mock<ISimpleCloudBlob> _srcBlobMock;\n+ private Mock<ISimpleCloudBlob> _destBlobMock;\n+ private CloudBlobCoreFileStorageService _target;\n+\n+ public TheCopyFileAsyncMethod()\n+ {\n+ _srcFolderName = \"validation\";\n+ _srcFileName = \"4b6f16cc-7acd-45eb-ac21-33f0d927ec14/nuget.versioning.4.5.0.nupkg\";\n+ _srcETag = \"\\\"src-etag\\\"\";\n+ _srcProperties = new BlobProperties();\n+ _destFolderName = \"packages\";\n+ _destFileName = \"nuget.versioning.4.5.0.nupkg\";\n+ _destETag = \"\\\"dest-etag\\\"\";\n+ _destProperties = new BlobProperties();\n+ _destCopyState = new CopyState();\n+ SetDestCopyStatus(CopyStatus.Success);\n+\n+ _blobClient = new Mock<ICloudBlobClient>();\n+ _srcContainer = new Mock<ICloudBlobContainer>();\n+ _destContainer = new Mock<ICloudBlobContainer>();\n+ _srcBlobMock = new Mock<ISimpleCloudBlob>();\n+ _destBlobMock = new Mock<ISimpleCloudBlob>();\n+ _blobClient\n+ .Setup(x => x.GetContainerReference(_srcFolderName))\n+ .Returns(() => _srcContainer.Object);\n+ _blobClient\n+ .Setup(x => x.GetContainerReference(_destFolderName))\n+ .Returns(() => _destContainer.Object);\n+ _srcContainer\n+ .Setup(x => x.GetBlobReference(_srcFileName))\n+ .Returns(() => _srcBlobMock.Object);\n+ _destContainer\n+ .Setup(x => x.GetBlobReference(_destFileName))\n+ .Returns(() => _destBlobMock.Object);\n+ _srcBlobMock\n+ .Setup(x => x.Name)\n+ .Returns(() => _srcFileName);\n+ _srcBlobMock\n+ .Setup(x => x.ETag)\n+ .Returns(() => _srcETag);\n+ _srcBlobMock\n+ .Setup(x => x.Properties)\n+ .Returns(() => _srcProperties);\n+ _destBlobMock\n+ .Setup(x => x.ETag)\n+ .Returns(() => _destETag);\n+ _destBlobMock\n+ .Setup(x => x.Properties)\n+ .Returns(() => _destProperties);\n+ _destBlobMock\n+ .Setup(x => x.CopyState)\n+ .Returns(() => _destCopyState);\n+\n+ _target = CreateService(fakeBlobClient: _blobClient);\n+ }\n+\n+ [Fact]\n+ public async Task WillCopyTheFileIfDestinationDoesNotExist()\n+ {\n+ // Arrange\n+ AccessCondition srcAccessCondition = null;\n+ AccessCondition destAccessCondition = null;\n+ ISimpleCloudBlob srcBlob = null;\n+\n+ _destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Returns(Task.FromResult(0))\n+ .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((b, s, d) =>\n+ {\n+ srcBlob = b;\n+ srcAccessCondition = s;\n+ destAccessCondition = d;\n+ });\n+\n+ // Act\n+ await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+\n+ // Assert\n+ _destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ Assert.Equal(_srcFileName, srcBlob.Name);\n+ Assert.Equal(_srcETag, srcAccessCondition.IfMatchETag);\n+ Assert.Equal(\"*\", destAccessCondition.IfNoneMatchETag);\n+ }\n+\n+ [Fact]\n+ public async Task WillThrowInvalidOperationExceptionForConflict()\n+ {\n+ // Arrange\n+ _destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Throws(new StorageException(new RequestResult { HttpStatusCode = (int)HttpStatusCode.Conflict }, \"Conflict!\", inner: null));\n+\n+ // Act & Assert\n+ await Assert.ThrowsAsync<InvalidOperationException>(\n+ () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ }\n+\n+ [Fact]\n+ public async Task WillCopyTheFileIfDestinationHasFailedCopy()\n+ {\n+ // Arrange\n+ AccessCondition srcAccessCondition = null;\n+ AccessCondition destAccessCondition = null;\n+ ISimpleCloudBlob srcBlob = null;\n+\n+ SetDestCopyStatus(CopyStatus.Failed);\n+\n+ _destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Returns(Task.FromResult(0))\n+ .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((b, s, d) =>\n+ {\n+ srcBlob = b;\n+ srcAccessCondition = s;\n+ destAccessCondition = d;\n+ SetDestCopyStatus(CopyStatus.Pending);\n+ });\n+\n+ _destBlobMock\n+ .Setup(x => x.ExistsAsync())\n+ .ReturnsAsync(true);\n+\n+ _destBlobMock\n+ .Setup(x => x.FetchAttributesAsync())\n+ .Returns(Task.FromResult(0))\n+ .Callback(() => SetDestCopyStatus(CopyStatus.Success));\n+\n+ // Act\n+ await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+\n+ // Assert\n+ _destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ Assert.Equal(_srcFileName, srcBlob.Name);\n+ Assert.Equal(_srcETag, srcAccessCondition.IfMatchETag);\n+ Assert.Equal(_destETag, destAccessCondition.IfMatchETag);\n+ }\n+\n+ [Fact]\n+ public async Task NoOpsIfPackageLengthAndHashMatch()\n+ {\n+ // Arrange\n+ SetBlobContentMD5(_srcProperties, \"mwgwUC0MwohHxgMmvQzO7A==\");\n+ SetBlobLength(_srcProperties, 42);\n+ SetBlobContentMD5(_destProperties, _srcProperties.ContentMD5);\n+ SetBlobLength(_destProperties, _srcProperties.Length);\n+\n+ _destBlobMock\n+ .Setup(x => x.ExistsAsync())\n+ .ReturnsAsync(true);\n+\n+ // Act\n+ await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+\n+ // Assert\n+ _destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Never);\n+ }\n+\n+ [Fact]\n+ public async Task ThrowsIfCopyOperationFails()\n+ {\n+ // Arrange\n+ _destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Returns(Task.FromResult(0))\n+ .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((_, __, ___) =>\n+ {\n+ SetDestCopyStatus(CopyStatus.Failed);\n+ });\n+\n+ // Act & Assert\n+ var ex = await Assert.ThrowsAsync<StorageException>(\n+ () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ Assert.Contains(\"The blob copy operation had copy status Failed\", ex.Message);\n+ }\n+\n+ private void SetDestCopyStatus(CopyStatus copyStatus)\n+ {\n+ // We have to use reflection because the setter is not public.\n+ typeof(CopyState)\n+ .GetProperty(nameof(CopyState.Status))\n+ .SetValue(_destCopyState, copyStatus, null);\n+ }\n+\n+ private void SetBlobLength(BlobProperties properties, long length)\n+ {\n+ typeof(BlobProperties)\n+ .GetProperty(nameof(BlobProperties.Length))\n+ .SetValue(properties, length, null);\n+ }\n+\n+ private void SetBlobContentMD5(BlobProperties properties, string contentMD5)\n+ {\n+ typeof(BlobProperties)\n+ .GetProperty(nameof(BlobProperties.ContentMD5))\n+ .SetValue(properties, contentMD5, null);\n+ }\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"diff": "@@ -290,6 +290,102 @@ public async Task WillReturnNullWhenRequestedFileDoesNotExist()\n}\n}\n+ public class TheCopyFileAsyncMethod : IDisposable\n+ {\n+ private readonly TestDirectory _directory;\n+ private readonly string _srcFolderName;\n+ private readonly string _srcFileName;\n+ private readonly string _destFolderName;\n+ private readonly string _destFileName;\n+ private readonly Mock<IAppConfiguration> _appConfiguration;\n+ private readonly Mock<FileSystemService> _fileSystemService;\n+ private readonly FileSystemFileStorageService _target;\n+\n+ public TheCopyFileAsyncMethod()\n+ {\n+ _directory = TestDirectory.Create();\n+\n+ _srcFolderName = \"validation\";\n+ _srcFileName = \"4b6f16cc-7acd-45eb-ac21-33f0d927ec14/nuget.versioning.4.5.0.nupkg\";\n+ _destFolderName = \"packages\";\n+ _destFileName = \"nuget.versioning.4.5.0.nupkg\";\n+\n+ _appConfiguration = new Mock<IAppConfiguration>();\n+ _appConfiguration\n+ .Setup(x => x.FileStorageDirectory)\n+ .Returns(() => _directory);\n+\n+ _fileSystemService = new Mock<FileSystemService> { CallBase = true };\n+\n+ _target = new FileSystemFileStorageService(\n+ _appConfiguration.Object,\n+ _fileSystemService.Object);\n+ }\n+\n+ [Fact]\n+ public async Task CopiesFileWhenDestinationDoesNotExist()\n+ {\n+ // Arrange\n+ var content = \"Hello, world!\";\n+ await _target.SaveFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(content)));\n+\n+ // Act\n+ await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+\n+ // Assert\n+ using (var destStream = await _target.GetFileAsync(_destFolderName, _destFileName))\n+ using (var reader = new StreamReader(destStream))\n+ {\n+ Assert.Equal(content, reader.ReadToEnd());\n+ }\n+ }\n+\n+ [Fact]\n+ public async Task ThrowsWhenDestinationIsSame()\n+ {\n+ // Arrange\n+ var content = \"Hello, world!\";\n+ await _target.SaveFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(content)));\n+ await _target.SaveFileAsync(\n+ _destFolderName,\n+ _destFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(content)));\n+\n+ await Assert.ThrowsAsync<InvalidOperationException>(\n+ () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ }\n+\n+ [Fact]\n+ public async Task ThrowsWhenFileAlreadyExists()\n+ {\n+ // Arrange\n+ var content = \"Hello, world!\";\n+ await _target.SaveFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(content)));\n+ await _target.SaveFileAsync(\n+ _destFolderName,\n+ _destFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(\"Something else.\")));\n+\n+ // Act & Assert\n+ await Assert.ThrowsAsync<InvalidOperationException>(\n+ () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ }\n+\n+ public void Dispose()\n+ {\n+ _directory?.Dispose();\n+ }\n+ }\n+\npublic class TheSaveFileMethod\n{\nprivate const string FolderName = \"theFolderName\";\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add CopyFileAsync to ICoreFileStorageService (#5581)
Progress on https://github.com/NuGet/Engineering/issues/1190
Progress on https://github.com/NuGet/Engineering/issues/1203
|
455,776 |
09.03.2018 14:32:50
| 28,800 |
d0e1ed919fe0adc0652798e61cedf0179691fd22
|
[Organizations] Clone existing API keys to org admin on account transform
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IUserService.cs",
"new_path": "src/NuGetGallery/Services/IUserService.cs",
"diff": "@@ -42,6 +42,8 @@ public interface IUserService\nTask<bool> TransformUserToOrganization(User accountToTransform, User adminUser, string token);\n+ Task TransferApiKeysScopedToUser(User userWithKeys, User userToOwnKeys);\n+\nTask<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "using System.Threading.Tasks;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Configuration;\n+using NuGetGallery.Infrastructure.Authentication;\nusing NuGetGallery.Security;\nusing Crypto = NuGetGallery.CryptographyService;\n@@ -46,7 +47,8 @@ public class UserService : IUserService\nIEntitiesContext entitiesContext,\nIContentObjectService contentObjectService,\nISecurityPolicyService securityPolicyService,\n- IDateTimeProvider dateTimeProvider)\n+ IDateTimeProvider dateTimeProvider,\n+ ICredentialBuilder credentialBuilder)\n: this()\n{\nConfig = config;\n@@ -371,9 +373,40 @@ public async Task<bool> TransformUserToOrganization(User accountToTransform, Use\nreturn false;\n}\n+ await TransferApiKeysScopedToUser(accountToTransform, adminUser);\n+\nreturn await EntitiesContext.TransformUserToOrganization(accountToTransform, adminUser, token);\n}\n+ public async Task TransferApiKeysScopedToUser(User userWithKeys, User userToOwnKeys)\n+ {\n+ var eligibleApiKeys = userWithKeys.Credentials\n+ .Where(c => c.IsApiKey() && c.Scopes.All(k => k.Owner == null || k.Owner == userWithKeys)).ToArray();\n+ foreach (var originalApiKey in eligibleApiKeys)\n+ {\n+ var scopes = originalApiKey.Scopes.Select(s =>\n+ new Scope(userWithKeys, s.Subject, s.AllowedAction));\n+\n+ var clonedApiKey = new Credential(originalApiKey.Type, originalApiKey.Value)\n+ {\n+ Description = originalApiKey.Description,\n+ ExpirationTicks = originalApiKey.ExpirationTicks,\n+ Expires = originalApiKey.Expires,\n+ Scopes = scopes.ToArray(),\n+ User = userToOwnKeys,\n+ UserKey = userToOwnKeys.Key,\n+ Value = originalApiKey.Value\n+ };\n+\n+ userToOwnKeys.Credentials.Add(clonedApiKey);\n+ }\n+\n+ if (eligibleApiKeys.Any())\n+ {\n+ await EntitiesContext.SaveChangesAsync();\n+ }\n+ }\n+\npublic async Task<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser)\n{\nif (!ContentObjectService.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(adminUser))\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.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.Linq;\nusing System.Threading.Tasks;\nusing Moq;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Authentication;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Infrastructure.Authentication;\nusing NuGetGallery.Security;\n@@ -948,7 +950,191 @@ private Task<bool> InvokeTransformUserToOrganization(int affectedRecords, User a\n}\n}\n- public class TheCreateOrganizationAccountMethod\n+ public class TheTransferApiKeysScopedToUserMethod\n+ {\n+ public static IEnumerable<object[]> TransfersApiKeysAsExpected_Data\n+ {\n+ get\n+ {\n+ foreach (var hasExternalCredential in new[] { false, true })\n+ {\n+ foreach (var hasPasswordCredential in new[] { false, true })\n+ {\n+ foreach (var hasUnscopedApiKeyCredential in new[] { false, true })\n+ {\n+ foreach (var hasApiKeyScopedToUserCredential in new[] { false, true })\n+ {\n+ foreach (var hasApiKeyScopedToDifferentUser in new[] { false, true })\n+ {\n+ yield return MemberDataHelper.AsData(\n+ hasExternalCredential,\n+ hasPasswordCredential,\n+ hasUnscopedApiKeyCredential,\n+ hasApiKeyScopedToUserCredential,\n+ hasApiKeyScopedToDifferentUser);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(TransfersApiKeysAsExpected_Data))]\n+ public async Task TransfersApiKeysAsExpected(\n+ bool hasExternalCredential,\n+ bool hasPasswordCredential,\n+ bool hasUnscopedApiKeyCredential,\n+ bool hasApiKeyScopedToUserCredential,\n+ bool hasApiKeyScopedToDifferentUser)\n+ {\n+ // Arrange\n+ var originalOwner = new User(\"originalOwner\") { Key = 11111 };\n+ var randomUser = new User(\"randomUser\") { Key = 57576768 };\n+ var newOwner = new User(\"newOwner\") { Key = 69785, Credentials = new List<Credential>() };\n+\n+ var credentials = new List<Credential>();\n+\n+ var externalCredential = TestCredentialHelper.CreateExternalCredential(\"cred\", null);\n+ AddFieldsToCredential(externalCredential, \"externalCredential\", \"value1\", originalOwner, expiration: null);\n+\n+ var passwordCredential = TestCredentialHelper.CreateSha1Password(\"password\");\n+ AddFieldsToCredential(passwordCredential, \"passwordCredential\", \"value2\", originalOwner, expiration: null);\n+\n+ var unscopedApiKeyCredential = TestCredentialHelper.CreateV4ApiKey(new TimeSpan(5, 5, 5, 5), out var key1);\n+ AddFieldsToCredential(unscopedApiKeyCredential, \"unscopedApiKey\", \"value3\", originalOwner, expiration: new DateTime(2018, 3, 9));\n+\n+ var scopedToUserApiKeyCredential = TestCredentialHelper.CreateV4ApiKey(new TimeSpan(5, 5, 5, 5), out var key2)\n+ .WithScopes(new[] { new Scope { Owner = originalOwner, OwnerKey = originalOwner.Key } });\n+ AddFieldsToCredential(scopedToUserApiKeyCredential, \"scopedToUserApiKey\", \"value4\", originalOwner, expiration: new DateTime(2018, 3, 10));\n+\n+ var scopedToDifferentUserApiKeyCredential = TestCredentialHelper.CreateV4ApiKey(new TimeSpan(5, 5, 5, 5), out var key3)\n+ .WithScopes(new[] { new Scope { Owner = randomUser, OwnerKey = randomUser.Key } });\n+ AddFieldsToCredential(scopedToDifferentUserApiKeyCredential, \"scopedToDifferentUserApiKey\", \"value5\", originalOwner, expiration: new DateTime(2018, 3, 11));\n+\n+ if (hasExternalCredential)\n+ {\n+ credentials.Add(externalCredential);\n+ }\n+\n+ if (hasPasswordCredential)\n+ {\n+ credentials.Add(passwordCredential);\n+ }\n+\n+ if (hasUnscopedApiKeyCredential)\n+ {\n+ credentials.Add(unscopedApiKeyCredential);\n+ }\n+\n+ if (hasApiKeyScopedToUserCredential)\n+ {\n+ credentials.Add(scopedToUserApiKeyCredential);\n+ }\n+\n+ if (hasApiKeyScopedToDifferentUser)\n+ {\n+ credentials.Add(scopedToDifferentUserApiKeyCredential);\n+ }\n+\n+ originalOwner.Credentials = credentials;\n+ var originalCredentialCount = credentials.Count();\n+\n+ var service = new TestableUserService();\n+\n+ // Act\n+ await service.TransferApiKeysScopedToUser(originalOwner, newOwner);\n+\n+ // Assert\n+ service.MockEntitiesContext.Verify(\n+ x => x.SaveChangesAsync(),\n+ hasUnscopedApiKeyCredential || hasApiKeyScopedToUserCredential ? Times.Once() : Times.Never());\n+\n+ Assert.Equal(originalCredentialCount, originalOwner.Credentials.Count());\n+\n+ Assert.Equal(\n+ (hasUnscopedApiKeyCredential ? 1 : 0) + (hasApiKeyScopedToUserCredential ? 1 : 0),\n+ newOwner.Credentials.Count());\n+\n+ AssertCredentialInOriginalOnly(externalCredential, originalOwner, newOwner, hasExternalCredential);\n+ AssertCredentialInOriginalOnly(passwordCredential, originalOwner, newOwner, hasPasswordCredential);\n+ AssertCredentialInOriginalOnly(scopedToDifferentUserApiKeyCredential, originalOwner, newOwner, hasApiKeyScopedToDifferentUser);\n+\n+ AssertCredentialInNew(unscopedApiKeyCredential, originalOwner, newOwner, hasUnscopedApiKeyCredential);\n+ AssertCredentialInNew(scopedToUserApiKeyCredential, originalOwner, newOwner, hasApiKeyScopedToUserCredential);\n+ }\n+\n+ private void AddFieldsToCredential(Credential credential, string description, string value, User originalOwner, DateTime? expiration)\n+ {\n+ credential.Description = description;\n+ credential.Value = value;\n+ credential.User = originalOwner;\n+ credential.UserKey = originalOwner.Key;\n+\n+ if (expiration.HasValue)\n+ {\n+ credential.ExpirationTicks = expiration.Value.Ticks;\n+ credential.Expires = expiration.Value;\n+ }\n+ }\n+\n+ private void AssertCredentialInOriginalOnly(Credential credential, User originalOwner, User newOwner, bool hasCredential)\n+ {\n+ var credentialEquals = CredentialEqualsFunc(credential);\n+ Assert.Equal(hasCredential, originalOwner.Credentials.Any(\n+ hasCredential ? CredentialEqualsWithOwnerFunc(credential, originalOwner) : CredentialEqualsFunc(credential)));\n+ Assert.False(newOwner.Credentials.Any(CredentialEqualsFunc(credential)));\n+ }\n+\n+ private void AssertCredentialInNew(Credential credential, User originalOwner, User newOwner, bool hasCredential)\n+ {\n+ Assert.Equal(hasCredential, originalOwner.Credentials.Any(\n+ hasCredential ? CredentialEqualsWithOwnerFunc(credential, originalOwner) : CredentialEqualsFunc(credential)));\n+ Assert.Equal(hasCredential, newOwner.Credentials.Any(\n+ hasCredential ? CredentialEqualsWithOwnerAndScopeFunc(credential, newOwner, originalOwner) : CredentialEqualsFunc(credential)));\n+ }\n+\n+ private bool CredentialEquals(Credential expected, Credential actual)\n+ {\n+ return\n+ expected.Description == actual.Description &&\n+ expected.ExpirationTicks == actual.ExpirationTicks &&\n+ expected.Expires == actual.Expires &&\n+ expected.Type == actual.Type &&\n+ expected.Value == actual.Value;\n+ }\n+\n+ private bool CredentialEqualsWithOwner(Credential expected, Credential actual, User owner)\n+ {\n+ return CredentialEquals(expected, actual) &&\n+ owner == actual.User &&\n+ owner.Key == actual.UserKey;\n+ }\n+\n+ private bool CredentialEqualsWithOwnerAndScope(Credential expected, Credential actual, User owner, User scopeOwner)\n+ {\n+ return CredentialEqualsWithOwner(expected, actual, owner) &&\n+ expected.Scopes.All(s => s.Owner == scopeOwner && s.OwnerKey == scopeOwner.Key);\n+ }\n+\n+ private Func<Credential, bool> CredentialEqualsFunc(Credential expected)\n+ {\n+ return (c) => CredentialEquals(expected, c);\n+ }\n+\n+ private Func<Credential, bool> CredentialEqualsWithOwnerFunc(Credential expected, User owner)\n+ {\n+ return (c) => CredentialEqualsWithOwner(expected, c, owner);\n+ }\n+\n+ private Func<Credential, bool> CredentialEqualsWithOwnerAndScopeFunc(Credential expected, User owner, User scopeOwner)\n+ {\n+ return (c) => CredentialEqualsWithOwnerAndScope(expected, c, owner, scopeOwner);\n+ }\n+ }\n+\n+ public class TheAddOrganizationAccountMethod\n{\nprivate const string OrgName = \"myOrg\";\nprivate const string OrgEmail = \"myOrg@myOrg.com\";\n@@ -962,7 +1148,7 @@ public class TheCreateOrganizationAccountMethod\npublic async Task WithUserNotSupportedForOrganizations_ThrowsEntityException()\n{\nSetupOrganizationsSupportedForUser(supported: false);\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeCreateOrganization());\n+ var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization());\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.Organizations_NotInDomainWhitelist, AdminName), exception.Message);\n_service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Never());\n@@ -981,7 +1167,7 @@ public async Task WithUsernameConflict_ThrowsEntityException()\nSetupOrganizationsSupportedForUser();\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeCreateOrganization(orgName: conflictUsername));\n+ var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(orgName: conflictUsername));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.UsernameNotAvailable, conflictUsername), exception.Message);\n_service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Never());\n@@ -1000,7 +1186,7 @@ public async Task WithEmailConflict_ThrowsEntityException()\nSetupOrganizationsSupportedForUser();\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeCreateOrganization(orgEmail: conflictEmail));\n+ var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(orgEmail: conflictEmail));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.EmailAddressBeingUsed, conflictEmail), exception.Message);\n_service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Never());\n@@ -1017,7 +1203,7 @@ public async Task WhenAdminHasNoTenant_ThrowsEntityException()\nvar adminUsername = \"adminWithNoTenant\";\nSetupOrganizationsSupportedForUser(adminUsername);\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeCreateOrganization(admin: new User(adminUsername)));\n+ var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(admin: new User(adminUsername)));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.Organizations_AdminAccountDoesNotHaveTenant, adminUsername), exception.Message);\n_service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Once());\n@@ -1037,7 +1223,7 @@ public async Task WhenSubscribingToPolicyFails_ThrowsUserSafeException()\n.Returns(Task.FromResult(false));\nSetupOrganizationsSupportedForUser();\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeCreateOrganization());\n+ var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization());\nAssert.Equal(Strings.DefaultUserSafeExceptionMessage, exception.Message);\n_service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Once());\n@@ -1057,7 +1243,7 @@ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\n.Returns(Task.FromResult(true));\nSetupOrganizationsSupportedForUser();\n- var org = await InvokeCreateOrganization();\n+ var org = await InvokeAddOrganization();\nAssert.Equal(OrgName, org.Username);\nAssert.Equal(OrgEmail, org.UnconfirmedEmailAddress);\n@@ -1077,7 +1263,7 @@ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\n_service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Once());\n}\n- private Task<Organization> InvokeCreateOrganization(string orgName = OrgName, string orgEmail = OrgEmail, User admin = null)\n+ private Task<Organization> InvokeAddOrganization(string orgName = OrgName, string orgEmail = OrgEmail, User admin = null)\n{\n// Arrange\nadmin = admin ?? new User(AdminName)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Clone existing API keys to org admin on account transform (#5589)
|
455,776 |
09.03.2018 14:52:15
| 28,800 |
f842ae7a3092fd45629d5e31986204cc42810df8
|
[Organizations] Use a configurable list to determine what users should be asked to transform to an organization with a deprecated password
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -359,7 +359,7 @@ img.reserved-indicator-icon {\nvertical-align: top;\n}\n.modal-container .modal-box .modal-body .action-node {\n- padding: 9% 6%;\n+ padding: 0 6%;\ntext-align: center;\n}\n.modal-container .modal-box .modal-body .action-button {\n@@ -392,7 +392,7 @@ img.reserved-indicator-icon {\npadding-top: 13px;\n}\n.modal-container .modal-box .modal-body .transform-text {\n- padding: 0 15px;\n+ padding: 40px 15px;\nmargin: 0;\n}\n#edit-metadata-form-container .loading:after {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/modals.less",
"new_path": "src/Bootstrap/less/theme/modals.less",
"diff": "}\n.action-node {\n- padding: 9% 6%;\n+ padding: 0% 6%;\ntext-align: center;\n}\n}\n.transform-text {\n- padding: 0px 15px;\n+ padding: 40px 15px;\nmargin: 0px;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/Login-Discontinuation-Configuration.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/Login-Discontinuation-Configuration.json",
"diff": "],\n\"ExceptionsForEmailAddresses\": [\n\"exception@cannotUsePassword.com\"\n+ ],\n+ \"ForceTransformationToOrganizationForEmailAddresses\": [\n+ \"organization@cannotUsePassword.com\"\n]\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PagesController.cs",
"diff": "@@ -19,15 +19,18 @@ public partial class PagesController\n: AppController\n{\nprivate readonly IContentService _contentService;\n+ private readonly IContentObjectService _contentObjectService;\nprivate readonly IMessageService _messageService;\nprivate readonly ISupportRequestService _supportRequestService;\nprotected PagesController() { }\npublic PagesController(IContentService contentService,\n+ IContentObjectService contentObjectService,\nIMessageService messageService,\nISupportRequestService supportRequestService)\n{\n_contentService = contentService;\n+ _contentObjectService = contentObjectService;\n_messageService = messageService;\n_supportRequestService = supportRequestService;\n}\n@@ -102,8 +105,10 @@ public virtual async Task<ActionResult> Contact(ContactSupportViewModel contactF\npublic virtual ActionResult Home()\n{\nvar identity = OwinContext.Authentication?.User?.Identity as ClaimsIdentity;\n- var showTransformModal = ClaimsExtensions.HasDiscontinuedLoginCLaims(identity);\n- return View(new GalleryHomeViewModel(showTransformModal));\n+ var showTransformModal = ClaimsExtensions.HasDiscontinuedLoginClaims(identity);\n+ var transformIntoOrganization = _contentObjectService.LoginDiscontinuationConfiguration\n+ .ShouldUserTransformIntoOrganization(GetCurrentUser());\n+ return View(new GalleryHomeViewModel(showTransformModal, transformIntoOrganization));\n}\n[HttpGet]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/ClaimsExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/ClaimsExtensions.cs",
"diff": "@@ -33,7 +33,7 @@ public static IdentityInformation GetIdentityInformation(ClaimsIdentity claimsId\nreturn new IdentityInformation(identifierClaim.Value, nameClaim.Value, emailClaim?.Value, authType, tenantId: null);\n}\n- public static bool HasDiscontinuedLoginCLaims(ClaimsIdentity identity)\n+ public static bool HasDiscontinuedLoginClaims(ClaimsIdentity identity)\n{\nif (identity == null || !identity.IsAuthenticated)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Filters/UiAuthorizeAttribute.cs",
"new_path": "src/NuGetGallery/Filters/UiAuthorizeAttribute.cs",
"diff": "@@ -21,7 +21,7 @@ public override void OnAuthorization(AuthorizationContext filterContext)\n{\n// If the user has a discontinued login claim, redirect them to the homepage\nvar identity = filterContext.HttpContext.User.Identity as ClaimsIdentity;\n- if (!AllowDiscontinuedLogins && ClaimsExtensions.HasDiscontinuedLoginCLaims(identity))\n+ if (!AllowDiscontinuedLogins && ClaimsExtensions.HasDiscontinuedLoginClaims(identity))\n{\nfilterContext.Result = new RedirectToRouteResult(\nnew RouteValueDictionary(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "@@ -18,9 +18,7 @@ public ContentObjectService(IContentService contentService)\n{\n_contentService = contentService;\n- LoginDiscontinuationConfiguration =\n- new LoginDiscontinuationConfiguration(\n- Enumerable.Empty<string>(), Enumerable.Empty<string>(), Enumerable.Empty<string>());\n+ LoginDiscontinuationConfiguration = new LoginDiscontinuationConfiguration();\n}\npublic ILoginDiscontinuationConfiguration LoginDiscontinuationConfiguration { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "@@ -11,12 +11,16 @@ namespace NuGetGallery\n{\npublic class LoginDiscontinuationConfiguration : ILoginDiscontinuationConfiguration\n{\n- public HashSet<string> DiscontinuedForEmailAddresses { get; }\n- public HashSet<string> DiscontinuedForDomains { get; }\n- public HashSet<string> ExceptionsForEmailAddresses { get; }\n+ internal HashSet<string> DiscontinuedForEmailAddresses { get; }\n+ internal HashSet<string> DiscontinuedForDomains { get; }\n+ internal HashSet<string> ExceptionsForEmailAddresses { get; }\n+ internal HashSet<string> ForceTransformationToOrganizationForEmailAddresses { get; }\npublic LoginDiscontinuationConfiguration()\n- : this(Enumerable.Empty<string>(), Enumerable.Empty<string>(), Enumerable.Empty<string>())\n+ : this(Enumerable.Empty<string>(),\n+ Enumerable.Empty<string>(),\n+ Enumerable.Empty<string>(),\n+ Enumerable.Empty<string>())\n{\n}\n@@ -24,15 +28,22 @@ public LoginDiscontinuationConfiguration()\npublic LoginDiscontinuationConfiguration(\nIEnumerable<string> discontinuedForEmailAddresses,\nIEnumerable<string> discontinuedForDomains,\n- IEnumerable<string> exceptionsForEmailAddresses)\n+ IEnumerable<string> exceptionsForEmailAddresses,\n+ IEnumerable<string> forceTransformationToOrganizationForEmailAddresses)\n{\nDiscontinuedForEmailAddresses = new HashSet<string>(discontinuedForEmailAddresses);\nDiscontinuedForDomains = new HashSet<string>(discontinuedForDomains);\nExceptionsForEmailAddresses = new HashSet<string>(exceptionsForEmailAddresses);\n+ ForceTransformationToOrganizationForEmailAddresses = new HashSet<string>(forceTransformationToOrganizationForEmailAddresses);\n}\npublic bool IsLoginDiscontinued(AuthenticatedUser authUser)\n{\n+ if (authUser == null || authUser.User == null)\n+ {\n+ return false;\n+ }\n+\nvar email = authUser.User.ToMailAddress();\nreturn\nauthUser.CredentialUsed.IsPassword() &&\n@@ -42,16 +53,33 @@ public bool IsLoginDiscontinued(AuthenticatedUser authUser)\npublic bool AreOrganizationsSupportedForUser(User user)\n{\n+ if (user == null)\n+ {\n+ return false;\n+ }\n+\nvar email = user.ToMailAddress();\nreturn\nDiscontinuedForDomains.Contains(email.Host, StringComparer.OrdinalIgnoreCase) ||\nDiscontinuedForEmailAddresses.Contains(email.Address);\n}\n+\n+ public bool ShouldUserTransformIntoOrganization(User user)\n+ {\n+ if (user == null)\n+ {\n+ return false;\n+ }\n+\n+ var email = user.ToMailAddress();\n+ return ForceTransformationToOrganizationForEmailAddresses.Contains(email.Address);\n+ }\n}\npublic interface ILoginDiscontinuationConfiguration\n{\nbool IsLoginDiscontinued(AuthenticatedUser authUser);\nbool AreOrganizationsSupportedForUser(User user);\n+ bool ShouldUserTransformIntoOrganization(User user);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/GalleryHomeViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/GalleryHomeViewModel.cs",
"diff": "@@ -9,13 +9,16 @@ public class GalleryHomeViewModel\n{\npublic bool ShowTransformModal { get; set; }\n+ public bool TransformIntoOrganization { get; set; }\n+\npublic IList<AuthenticationProviderViewModel> Providers { get; set; }\n- public GalleryHomeViewModel() : this(showTransformModal: false) { }\n+ public GalleryHomeViewModel() : this(showTransformModal: false, transformIntoOrganization: false) { }\n- public GalleryHomeViewModel(bool showTransformModal)\n+ public GalleryHomeViewModel(bool showTransformModal, bool transformIntoOrganization)\n{\nShowTransformModal = showTransformModal;\n+ TransformIntoOrganization = transformIntoOrganization;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"diff": "window.showModal = true;\n</script>\n<div id=\"popUpModal\" class=\"modal fade modal-container\" data-backdrop=\"static\">\n- @Html.Partial(\"_TransformOrLink\")\n+ @Html.Partial(\"_TransformOrLink\", Model)\n</div>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -32,8 +32,9 @@ public async Task RefreshRefreshesObject()\nvar emails = new[] { \"discontinued@different.com\" };\nvar domains = new[] { \"example.com\" };\nvar exceptions = new[] { \"exception@example.com\" };\n+ var shouldTransforms = new[] { \"transfomer@example.com\" };\n- var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions);\n+ var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms);\nvar configString = JsonConvert.SerializeObject(config);\nGetMock<IContentService>()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"diff": "namespace NuGetGallery.Services\n{\npublic class LoginDiscontinuationConfigurationFacts\n- {\n- public class TheIsLoginDiscontinuedMethod : TestContainer\n{\nprivate const string _incorrectEmail = \"incorrect@notExample.com\";\nprivate const string _incorrectDomain = \"notExample.com\";\n@@ -18,6 +16,38 @@ public class TheIsLoginDiscontinuedMethod : TestContainer\nprivate const string _incorrectException = \"fake@notExample.com\";\nprivate const string _email = \"test@example.com\";\n+ public static IEnumerable<object[]> PossibleListStates\n+ {\n+ get\n+ {\n+ foreach (var isOnWhiteList in new[] { true, false })\n+ {\n+ foreach (var isOnDomainList in new[] { true, false })\n+ {\n+ foreach (var isOnExceptionList in new[] { true, false })\n+ {\n+ foreach (var isOnTransformList in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n+ {\n+ var emails = isOnWhiteList ? new[] { _email } : new[] { _incorrectEmail };\n+ var domains = isOnDomainList ? new[] { _domain } : new[] { _incorrectDomain };\n+ var exceptions = isOnExceptionList ? new[] { _email } : new[] { _incorrectException };\n+ var shouldTransforms = isOnTransformList ? new[] { _email } : new[] { _incorrectException };\n+\n+ return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms);\n+ }\n+\n+ public class TheIsLoginDiscontinuedMethod\n+ {\npublic static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Data\n{\nget\n@@ -33,7 +63,10 @@ public static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Dat\n{\nforeach (var isOnExceptionList in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList);\n+ foreach (var isOnTransformList in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+ }\n}\n}\n}\n@@ -43,9 +76,9 @@ public static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Dat\n[Theory]\n[MemberData(nameof(IfPasswordLoginReturnsTrueIfOnWhitelists_Data))]\n- public void IfPasswordLoginReturnsTrueIfOnWhitelists(string credentialPasswordType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList)\n+ public void IfPasswordLoginReturnsTrueIfOnWhitelists(string credentialPasswordType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n{\n- TestIsLoginDiscontinued(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList,\n+ TestIsLoginDiscontinued(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList,\nexpectedResult: (isOnWhiteList || isOnDomainList) && !isOnExceptionList);\n}\n@@ -68,7 +101,10 @@ public static IEnumerable<object[]> IfNotPasswordLoginReturnsFalse_Data\n{\nforeach (var isOnExceptionList in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList);\n+ foreach (var isOnTransformList in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+ }\n}\n}\n}\n@@ -78,23 +114,19 @@ public static IEnumerable<object[]> IfNotPasswordLoginReturnsFalse_Data\n[Theory]\n[MemberData(nameof(IfNotPasswordLoginReturnsFalse_Data))]\n- public void IfNotPasswordLoginReturnsFalse(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList)\n+ public void IfNotPasswordLoginReturnsFalse(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n{\n- TestIsLoginDiscontinued(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, expectedResult: false);\n+ TestIsLoginDiscontinued(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, expectedResult: false);\n}\n- private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool expectedResult)\n+ private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool expectedResult)\n{\n// Arrange\nvar credential = new Credential(credentialType, \"value\");\nvar user = new User(\"test\") { EmailAddress = _email, Credentials = new[] { credential } };\nvar authUser = new AuthenticatedUser(user, credential);\n- var emails = isOnWhiteList ? new[] { _email } : new[] { _incorrectEmail };\n- var domains = isOnDomainList ? new[] { _domain } : new[] { _incorrectDomain };\n- var exceptions = isOnExceptionList ? new[] { _email } : new[] { _incorrectException };\n-\n- var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions);\n+ var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n// Act\nvar result = config.IsLoginDiscontinued(authUser);\n@@ -103,5 +135,37 @@ private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList,\nAssert.Equal(expectedResult, result);\n}\n}\n+\n+ public class TheSupportedForUserMethods\n+ {\n+ public static IEnumerable<object[]> PossibleListStates => PossibleListStates;\n+\n+ public void IsSupportedAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n+ {\n+ // Arrange\n+ var user = new User(\"test\") { EmailAddress = _email };\n+\n+ var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+\n+ // Act\n+ var areOrganizationsSupported = config.AreOrganizationsSupportedForUser(user);\n+ var shouldTransform = config.ShouldUserTransformIntoOrganization(user);\n+\n+ // Assert\n+ Assert.Equal(isOnWhiteList || isOnDomainList, areOrganizationsSupported);\n+ Assert.Equal(isOnTransformList, shouldTransform);\n+ }\n+\n+ public void IsUnsupportedWhenNull()\n+ {\n+ var config = new LoginDiscontinuationConfiguration();\n+\n+ var areOrganizationsSupported = config.AreOrganizationsSupportedForUser(null);\n+ var shouldTransform = config.ShouldUserTransformIntoOrganization(null);\n+\n+ Assert.False(areOrganizationsSupported);\n+ Assert.False(shouldTransform);\n+ }\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Use a configurable list to determine what users should be asked to transform to an organization with a deprecated password (#5588)
|
455,736 |
09.03.2018 18:06:34
| 28,800 |
6f24e48f4c1906ed8a382f02150f172003fafd21
|
Add destination access condition parameter to CopyFileAsync
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Properties\\AssemblyInfo.*.cs\" />\n<Compile Include=\"NuGetVersionExtensions.cs\" />\n<Compile Include=\"SemVerLevelKey.cs\" />\n+ <Compile Include=\"Services\\AccessConditionWrapper.cs\" />\n<Compile Include=\"Services\\CloudBlobClientWrapper.cs\" />\n<Compile Include=\"Services\\CloudBlobContainerWrapper.cs\" />\n<Compile Include=\"Services\\CloudBlobCoreFileStorageService.cs\" />\n<Compile Include=\"Services\\CorePackageFileService.cs\" />\n<Compile Include=\"Services\\CorePackageService.cs\" />\n<Compile Include=\"Services\\CryptographyService.cs\" />\n+ <Compile Include=\"Services\\IAccessCondition.cs\" />\n<Compile Include=\"Services\\ICloudBlobClient.cs\" />\n<Compile Include=\"Services\\ICloudBlobContainer.cs\" />\n<Compile Include=\"Services\\ICoreMessageService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -110,7 +110,12 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\n}\n}\n- public async Task CopyFileAsync(string srcFolderName, string srcFileName, string destFolderName, string destFileName)\n+ public async Task<string> CopyFileAsync(\n+ string srcFolderName,\n+ string srcFileName,\n+ string destFolderName,\n+ string destFileName,\n+ IAccessCondition destAccessCondition)\n{\nif (srcFolderName == null)\n{\n@@ -137,36 +142,46 @@ public async Task CopyFileAsync(string srcFolderName, string srcFileName, string\nvar destContainer = await GetContainerAsync(destFolderName);\nvar destBlob = destContainer.GetBlobReference(destFileName);\n+ destAccessCondition = destAccessCondition ?? AccessConditionWrapper.GenerateIfNotExistsCondition();\n+ var mappedDestAccessCondition = new AccessCondition\n+ {\n+ IfNoneMatchETag = destAccessCondition.IfNoneMatchETag,\n+ IfMatchETag = destAccessCondition.IfMatchETag,\n+ };\n// Determine the source blob etag.\nawait srcBlob.FetchAttributesAsync();\nvar srcAccessCondition = AccessCondition.GenerateIfMatchCondition(srcBlob.ETag);\n// Check if the destination blob already exists and fetch attributes.\n- var destAccessCondition = AccessCondition.GenerateIfNotExistsCondition();\nif (await destBlob.ExistsAsync())\n{\nif (destBlob.CopyState?.Status == CopyStatus.Failed)\n{\n- // If the last copy failed, allow this copy to occur.\n- destAccessCondition = AccessCondition.GenerateIfMatchCondition(destBlob.ETag);\n+ // If the last copy failed, allow this copy to occur no matter what the caller's destination\n+ // condition is. This is because the source blob is preferable over a failed copy. We use the etag\n+ // of the failed blob to avoid inadvertently replacing a blob that is now valid (i.e. has a\n+ // successful copy status).\n+ mappedDestAccessCondition = AccessCondition.GenerateIfMatchCondition(destBlob.ETag);\n}\nelse if ((srcBlob.Properties.ContentMD5 != null\n&& srcBlob.Properties.ContentMD5 == destBlob.Properties.ContentMD5\n&& srcBlob.Properties.Length == destBlob.Properties.Length))\n{\n// If the blob hash is the same and the length is the same, no-op the copy.\n- return;\n+ return srcBlob.ETag;\n}\n}\n- // Start the server-side copy and wait for it to complete.\n+ // Start the server-side copy and wait for it to complete. If \"If-None-Match: *\" was specified and the\n+ // destination already exists, HTTP 409 is thrown. If \"If-Match: ETAG\" was specified and the destination\n+ // has changed, HTTP 412 is thrown.\ntry\n{\nawait destBlob.StartCopyAsync(\nsrcBlob,\nsrcAccessCondition,\n- destAccessCondition);\n+ mappedDestAccessCondition);\n}\ncatch (StorageException ex) when (ex.RequestInformation?.HttpStatusCode == (int?)HttpStatusCode.Conflict)\n{\n@@ -195,6 +210,8 @@ public async Task CopyFileAsync(string srcFolderName, string srcFileName, string\n{\nthrow new StorageException($\"The blob copy operation had copy status {destBlob.CopyState.Status} ({destBlob.CopyState.StatusDescription}).\");\n}\n+\n+ return srcBlob.ETag;\n}\npublic async Task SaveFileAsync(string folderName, string fileName, Stream packageFile, bool overwrite = true)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"diff": "@@ -46,6 +46,18 @@ public interface ICoreFileStorageService\n/// <param name=\"srcFileName\">The source file name or relative file path.</param>\n/// <param name=\"destFolderName\">The destination folder.</param>\n/// <param name=\"destFileName\">The destination file name or relative file path.</param>\n- Task CopyFileAsync(string srcFolderName, string srcFileName, string destFolderName, string destFileName);\n+ /// <param name=\"destAccessCondition\">\n+ /// The access condition used to determine whether the destination is in the expected state.\n+ /// </param>\n+ /// <returns>\n+ /// The etag of the source file. This can be used if the destination file is later intended to replace\n+ /// the source file in conjunction with <paramref name=\"destAccessCondition\"/>.\n+ /// </returns>\n+ Task<string> CopyFileAsync(\n+ string srcFolderName,\n+ string srcFileName,\n+ string destFolderName,\n+ string destFileName,\n+ IAccessCondition destAccessCondition);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"diff": "@@ -169,7 +169,12 @@ public Task SaveFileAsync(string folderName, string fileName, Stream packageFile\nreturn Task.FromResult(0);\n}\n- public Task CopyFileAsync(string srcFolderName, string srcFileName, string destFolderName, string destFileName)\n+ public Task<string> CopyFileAsync(\n+ string srcFolderName,\n+ string srcFileName,\n+ string destFolderName,\n+ string destFileName,\n+ IAccessCondition destAccessCondition)\n{\nif (srcFolderName == null)\n{\n@@ -205,7 +210,7 @@ public Task CopyFileAsync(string srcFolderName, string srcFileName, string destF\nthrow new InvalidOperationException(\"Could not copy because destination file already exists\", e);\n}\n- return Task.CompletedTask;\n+ return Task.FromResult<string>(null);\n}\npublic Task<bool> IsAvailableAsync()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -715,7 +715,12 @@ public async Task WillCopyTheFileIfDestinationDoesNotExist()\n});\n// Act\n- await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+ await _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ AccessConditionWrapper.GenerateIfNotExistsCondition());\n// Assert\n_destBlobMock.Verify(\n@@ -736,7 +741,12 @@ public async Task WillThrowInvalidOperationExceptionForConflict()\n// Act & Assert\nawait Assert.ThrowsAsync<InvalidOperationException>(\n- () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ () => _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ AccessConditionWrapper.GenerateIfNotExistsCondition()));\n}\n[Fact]\n@@ -770,17 +780,91 @@ public async Task WillCopyTheFileIfDestinationHasFailedCopy()\n.Callback(() => SetDestCopyStatus(CopyStatus.Success));\n// Act\n- await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+ var srcETag = await _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ AccessConditionWrapper.GenerateIfNotExistsCondition());\n// Assert\n_destBlobMock.Verify(\nx => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\nTimes.Once);\n+ Assert.Equal(_srcETag, srcETag);\nAssert.Equal(_srcFileName, srcBlob.Name);\nAssert.Equal(_srcETag, srcAccessCondition.IfMatchETag);\nAssert.Equal(_destETag, destAccessCondition.IfMatchETag);\n}\n+ [Fact]\n+ public async Task WillDefaultToIfNotExists()\n+ {\n+ // Arrange\n+ AccessCondition srcAccessCondition = null;\n+ AccessCondition destAccessCondition = null;\n+ ISimpleCloudBlob srcBlob = null;\n+ _destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Returns(Task.FromResult(0))\n+ .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((b, s, d) =>\n+ {\n+ srcBlob = b;\n+ srcAccessCondition = s;\n+ destAccessCondition = d;\n+ SetDestCopyStatus(CopyStatus.Success);\n+ });\n+\n+ // Act\n+ await _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ destAccessCondition: null);\n+\n+ // Assert\n+ _destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ Assert.Null(destAccessCondition.IfMatchETag);\n+ Assert.Equal(\"*\", destAccessCondition.IfNoneMatchETag);\n+ }\n+\n+ [Fact]\n+ public async Task UsesProvidedMatchETag()\n+ {\n+ // Arrange\n+ AccessCondition srcAccessCondition = null;\n+ AccessCondition destAccessCondition = null;\n+ ISimpleCloudBlob srcBlob = null;\n+ _destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Returns(Task.FromResult(0))\n+ .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((b, s, d) =>\n+ {\n+ srcBlob = b;\n+ srcAccessCondition = s;\n+ destAccessCondition = d;\n+ SetDestCopyStatus(CopyStatus.Success);\n+ });\n+\n+ // Act\n+ await _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ AccessConditionWrapper.GenerateIfMatchCondition(\"etag!\"));\n+\n+ // Assert\n+ _destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ Assert.NotEqual(\"etag!\", destAccessCondition.IfMatchETag);\n+ Assert.Null(destAccessCondition.IfNoneMatchETag);\n+ }\n+\n[Fact]\npublic async Task NoOpsIfPackageLengthAndHashMatch()\n{\n@@ -795,7 +879,12 @@ public async Task NoOpsIfPackageLengthAndHashMatch()\n.ReturnsAsync(true);\n// Act\n- await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+ await _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ AccessConditionWrapper.GenerateIfNotExistsCondition());\n// Assert\n_destBlobMock.Verify(\n@@ -817,7 +906,12 @@ public async Task ThrowsIfCopyOperationFails()\n// Act & Assert\nvar ex = await Assert.ThrowsAsync<StorageException>(\n- () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ () => _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ AccessConditionWrapper.GenerateIfNotExistsCondition()));\nAssert.Contains(\"The blob copy operation had copy status Failed\", ex.Message);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs",
"diff": "@@ -333,7 +333,12 @@ public async Task CopiesFileWhenDestinationDoesNotExist()\nnew MemoryStream(Encoding.ASCII.GetBytes(content)));\n// Act\n- await _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName);\n+ await _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ destAccessCondition: null);\n// Assert\nusing (var destStream = await _target.GetFileAsync(_destFolderName, _destFileName))\n@@ -358,7 +363,12 @@ public async Task ThrowsWhenDestinationIsSame()\nnew MemoryStream(Encoding.ASCII.GetBytes(content)));\nawait Assert.ThrowsAsync<InvalidOperationException>(\n- () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ () => _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ destAccessCondition: null));\n}\n[Fact]\n@@ -377,7 +387,12 @@ public async Task ThrowsWhenFileAlreadyExists()\n// Act & Assert\nawait Assert.ThrowsAsync<InvalidOperationException>(\n- () => _target.CopyFileAsync(_srcFolderName, _srcFileName, _destFolderName, _destFileName));\n+ () => _target.CopyFileAsync(\n+ _srcFolderName,\n+ _srcFileName,\n+ _destFolderName,\n+ _destFileName,\n+ destAccessCondition: null));\n}\npublic void Dispose()\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add destination access condition parameter to CopyFileAsync (#5594)
Progress on https://github.com/NuGet/Engineering/issues/1190
|
455,736 |
12.03.2018 10:54:06
| 25,200 |
3f080b95c4d73633fc569063052dc9b22ca465ea
|
Add GenerateEmptyCondition and fix AccessConditionWrapper bug
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/AccessConditionWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/AccessConditionWrapper.cs",
"diff": "@@ -10,13 +10,20 @@ public class AccessConditionWrapper : IAccessCondition\nprivate AccessConditionWrapper(string ifNoneMatchETag, string ifMatchETag)\n{\nIfNoneMatchETag = ifNoneMatchETag;\n- IfMatchETag = IfMatchETag;\n+ IfMatchETag = ifMatchETag;\n}\npublic string IfNoneMatchETag { get; }\npublic string IfMatchETag { get; }\n+ public static IAccessCondition GenerateEmptyCondition()\n+ {\n+ return new AccessConditionWrapper(\n+ ifNoneMatchETag: null,\n+ ifMatchETag: null);\n+ }\n+\npublic static IAccessCondition GenerateIfMatchCondition(string etag)\n{\nreturn new AccessConditionWrapper(\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=\"Properties\\AssemblyInfo.cs\" />\n<Compile Include=\"Packaging\\NupkgRewriterFacts.cs\" />\n<Compile Include=\"SemVerLevelKeyFacts.cs\" />\n+ <Compile Include=\"Services\\AccessConditionWrapperFacts.cs\" />\n<Compile Include=\"Services\\CloudBlobCoreFileStorageServiceFacts.cs\" />\n<Compile Include=\"Services\\CorePackageFileServiceFacts.cs\" />\n<Compile Include=\"Services\\CorePackageServiceFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -861,7 +861,7 @@ public async Task UsesProvidedMatchETag()\n_destBlobMock.Verify(\nx => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\nTimes.Once);\n- Assert.NotEqual(\"etag!\", destAccessCondition.IfMatchETag);\n+ Assert.Equal(\"etag!\", destAccessCondition.IfMatchETag);\nAssert.Null(destAccessCondition.IfNoneMatchETag);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add GenerateEmptyCondition and fix AccessConditionWrapper bug (#5597)
Progress on https://github.com/NuGet/Engineering/issues/1190
|
455,736 |
12.03.2018 15:24:04
| 25,200 |
21d347186d53f0dd093c1d3cb2f0f6ef31fba890
|
Add overload to CopyFileAsync which supports a source URI
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "using System.Net;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\n+using Microsoft.WindowsAzure.Storage.Auth;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Microsoft.WindowsAzure.Storage.Blob.Protocol;\n@@ -110,6 +111,22 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\n}\n}\n+ public Task CopyFileAsync(\n+ Uri srcUri,\n+ string destFolderName,\n+ string destFileName,\n+ IAccessCondition destAccessCondition)\n+ {\n+ if (srcUri == null)\n+ {\n+ throw new ArgumentNullException(nameof(srcUri));\n+ }\n+\n+ var srcBlob = _client.GetBlobFromUri(srcUri);\n+\n+ return CopyFileAsync(srcBlob, destFolderName, destFileName, destAccessCondition);\n+ }\n+\npublic async Task<string> CopyFileAsync(\nstring srcFolderName,\nstring srcFileName,\n@@ -127,6 +144,18 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\nthrow new ArgumentNullException(nameof(srcFileName));\n}\n+ var srcContainer = await GetContainerAsync(srcFolderName);\n+ var srcBlob = srcContainer.GetBlobReference(srcFileName);\n+\n+ return await CopyFileAsync(srcBlob, destFolderName, destFileName, destAccessCondition);\n+ }\n+\n+ private async Task<string> CopyFileAsync(\n+ ISimpleCloudBlob srcBlob,\n+ string destFolderName,\n+ string destFileName,\n+ IAccessCondition destAccessCondition)\n+ {\nif (destFolderName == null)\n{\nthrow new ArgumentNullException(nameof(destFolderName));\n@@ -137,9 +166,6 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\nthrow new ArgumentNullException(nameof(destFileName));\n}\n- var srcContainer = await GetContainerAsync(srcFolderName);\n- var srcBlob = srcContainer.GetBlobReference(srcFileName);\n-\nvar destContainer = await GetContainerAsync(destFolderName);\nvar destBlob = destContainer.GetBlobReference(destFileName);\ndestAccessCondition = destAccessCondition ?? AccessConditionWrapper.GenerateIfNotExistsCondition();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"diff": "@@ -36,6 +36,28 @@ public interface ICoreFileStorageService\nTask SaveFileAsync(string folderName, string fileName, Stream packageFile, bool overwrite = true);\n+ /// <summary>\n+ /// Copies the source URI to the destination file. If the destination already exists and the content\n+ /// is different, an exception should be thrown. If the file already exists, the implementation can choose to\n+ /// no-op if the content is the same instead of throwing an exception. This method should throw if the source\n+ /// file does not exist.\n+ /// </summary>\n+ /// <param name=\"srcUri\">The URI of the source file.</param>\n+ /// <param name=\"destFolderName\">The destination folder.</param>\n+ /// <param name=\"destFileName\">The destination file name or relative file path.</param>\n+ /// <param name=\"destAccessCondition\">\n+ /// The access condition used to determine whether the destination is in the expected state.\n+ /// </param>\n+ /// <returns>\n+ /// The etag of the source file. This can be used if the destination file is later intended to replace\n+ /// the source file in conjunction with <paramref name=\"destAccessCondition\"/>.\n+ /// </returns>\n+ Task CopyFileAsync(\n+ Uri srcUri,\n+ string destFolderName,\n+ string destFileName,\n+ IAccessCondition destAccessCondition);\n+\n/// <summary>\n/// Copies the source file to the destination file. If the destination already exists and the content\n/// is different, an exception should be thrown. If the file already exists, the implementation can choose to\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"diff": "@@ -169,6 +169,13 @@ public Task SaveFileAsync(string folderName, string fileName, Stream packageFile\nreturn Task.FromResult(0);\n}\n+ public Task CopyFileAsync(Uri srcUri, string destFolderName, string destFileName, IAccessCondition destAccessCondition)\n+ {\n+ // We could theoretically support this by downloading the source URI to the destination path. This is not\n+ // needed today so this method will remain unimplemented until it is needed.\n+ throw new NotImplementedException();\n+ }\n+\npublic Task<string> CopyFileAsync(\nstring srcFolderName,\nstring srcFileName,\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\\CloudBlobClientWrapperFacts.cs\" />\n<Compile Include=\"Services\\CloudBlobCoreFileStorageServiceFacts.cs\" />\n<Compile Include=\"Services\\CorePackageFileServiceFacts.cs\" />\n<Compile Include=\"Services\\CorePackageServiceFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -631,6 +631,7 @@ public class TheCopyFileAsyncMethod\nprivate string _srcFolderName;\nprivate string _srcFileName;\nprivate string _srcETag;\n+ private Uri _srcUri;\nprivate BlobProperties _srcProperties;\nprivate string _destFolderName;\nprivate string _destFileName;\n@@ -649,6 +650,7 @@ public TheCopyFileAsyncMethod()\n_srcFolderName = \"validation\";\n_srcFileName = \"4b6f16cc-7acd-45eb-ac21-33f0d927ec14/nuget.versioning.4.5.0.nupkg\";\n_srcETag = \"\\\"src-etag\\\"\";\n+ _srcUri = new Uri(\"https://example/nuget.versioning.4.5.0.nupkg\");\n_srcProperties = new BlobProperties();\n_destFolderName = \"packages\";\n_destFileName = \"nuget.versioning.4.5.0.nupkg\";\n@@ -696,6 +698,41 @@ public TheCopyFileAsyncMethod()\n_target = CreateService(fakeBlobClient: _blobClient);\n}\n+ [Fact]\n+ public async Task WillCopyBlobFromSourceUri()\n+ {\n+ // Arrange\n+ _blobClient\n+ .Setup(x => x.GetBlobFromUri(It.IsAny<Uri>()))\n+ .Returns(_srcBlobMock.Object);\n+\n+ _destBlobMock\n+ .Setup(x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()))\n+ .Returns(Task.FromResult(0))\n+ .Callback<ISimpleCloudBlob, AccessCondition, AccessCondition>((_, __, ___) =>\n+ {\n+ SetDestCopyStatus(CopyStatus.Success);\n+ });\n+\n+ // Act\n+ await _target.CopyFileAsync(\n+ _srcUri,\n+ _destFolderName,\n+ _destFileName,\n+ AccessConditionWrapper.GenerateIfNotExistsCondition());\n+\n+ // Assert\n+ _destBlobMock.Verify(\n+ x => x.StartCopyAsync(_srcBlobMock.Object, It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ _destBlobMock.Verify(\n+ x => x.StartCopyAsync(It.IsAny<ISimpleCloudBlob>(), It.IsAny<AccessCondition>(), It.IsAny<AccessCondition>()),\n+ Times.Once);\n+ _blobClient.Verify(\n+ x => x.GetBlobFromUri(_srcUri),\n+ Times.Once);\n+ }\n+\n[Fact]\npublic async Task WillCopyTheFileIfDestinationDoesNotExist()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add overload to CopyFileAsync which supports a source URI (#5598)
Progress on https://github.com/NuGet/Engineering/issues/1190
|
455,794 |
14.03.2018 08:29:35
| 25,200 |
2d2c52109041a0aa3aeb99d2118471dca5e66364
|
Fix migrate apikeys unique index conflict
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/MigrateUserToOrganization.sql",
"new_path": "src/NuGetGallery.Core/Infrastructure/MigrateUserToOrganization.sql",
"diff": "@@ -22,7 +22,16 @@ BEGIN TRY\nINSERT INTO [dbo].[Organizations] ([Key]) VALUES (@organizationKey)\nINSERT INTO [dbo].[Memberships] (OrganizationKey, MemberKey, IsAdmin) VALUES (@organizationKey, @adminKey, 1)\n- -- Remove organization credentials\n+ -- Reassign organization API keys to the admin user\n+ UPDATE [dbo].[Scopes] SET OwnerKey = @organizationKey\n+ WHERE CredentialKey IN (\n+ SELECT [Key] FROM [dbo].[Credentials]\n+ WHERE UserKey = @organizationKey AND Type LIKE 'apikey.%'\n+ )\n+ UPDATE [dbo].[Credentials] SET UserKey = @adminKey\n+ WHERE UserKey = @organizationKey AND Type LIKE 'apikey.%'\n+\n+ -- Remove remaining organization credentials\nDELETE FROM [dbo].[Credentials] WHERE UserKey = @organizationKey\n-- Delete the migration request\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IUserService.cs",
"new_path": "src/NuGetGallery/Services/IUserService.cs",
"diff": "@@ -42,8 +42,6 @@ public interface IUserService\nTask<bool> TransformUserToOrganization(User accountToTransform, User adminUser, string token);\n- Task TransferApiKeysScopedToUser(User userWithKeys, User userToOwnKeys);\n-\nTask<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser);\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": "@@ -373,40 +373,9 @@ public async Task<bool> TransformUserToOrganization(User accountToTransform, Use\nreturn false;\n}\n- await TransferApiKeysScopedToUser(accountToTransform, adminUser);\n-\nreturn await EntitiesContext.TransformUserToOrganization(accountToTransform, adminUser, token);\n}\n- public async Task TransferApiKeysScopedToUser(User userWithKeys, User userToOwnKeys)\n- {\n- var eligibleApiKeys = userWithKeys.Credentials\n- .Where(c => c.IsApiKey() && c.Scopes.All(k => k.Owner == null || k.Owner == userWithKeys)).ToArray();\n- foreach (var originalApiKey in eligibleApiKeys)\n- {\n- var scopes = originalApiKey.Scopes.Select(s =>\n- new Scope(userWithKeys, s.Subject, s.AllowedAction));\n-\n- var clonedApiKey = new Credential(originalApiKey.Type, originalApiKey.Value)\n- {\n- Description = originalApiKey.Description,\n- ExpirationTicks = originalApiKey.ExpirationTicks,\n- Expires = originalApiKey.Expires,\n- Scopes = scopes.ToArray(),\n- User = userToOwnKeys,\n- UserKey = userToOwnKeys.Key,\n- Value = originalApiKey.Value\n- };\n-\n- userToOwnKeys.Credentials.Add(clonedApiKey);\n- }\n-\n- if (eligibleApiKeys.Any())\n- {\n- await EntitiesContext.SaveChangesAsync();\n- }\n- }\n-\npublic async Task<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser)\n{\nif (!ContentObjectService.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(adminUser))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"diff": "ViewBag.MdPageColumns = Constants.ColumnsFormMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n- var transformNote = \"Note that administrators have full control over the organization, including the ability to add and remove other members.\";\n- var transformToolTip = \"Please enter a username for the organization administrator. \" + transformNote;\n- var transformConfirmation = \"You have added '{0}' as an administrator. \" + transformNote;\n+ var transformNote = \"Administrators have full control over the organization, including the ability to add and remove other members.\";\n+ var transformNote2 = \"Organization API keys will be transferred to this administrator on transformation.\";\n+ var transformToolTip = \"Please enter a username for the organization administrator. \"\n+ + transformNote\n+ + Environment.NewLine + Environment.NewLine\n+ + transformNote2;\n+ var transformConfirmation = \"You have added '{0}' as an administrator. \"\n+ + transformNote\n+ + \"\\\\n\\\\n\"\n+ + transformNote2;\n}\n<section role=\"main\" class=\"container main-container page-transform-account\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -950,190 +950,6 @@ private Task<bool> InvokeTransformUserToOrganization(int affectedRecords, User a\n}\n}\n- public class TheTransferApiKeysScopedToUserMethod\n- {\n- public static IEnumerable<object[]> TransfersApiKeysAsExpected_Data\n- {\n- get\n- {\n- foreach (var hasExternalCredential in new[] { false, true })\n- {\n- foreach (var hasPasswordCredential in new[] { false, true })\n- {\n- foreach (var hasUnscopedApiKeyCredential in new[] { false, true })\n- {\n- foreach (var hasApiKeyScopedToUserCredential in new[] { false, true })\n- {\n- foreach (var hasApiKeyScopedToDifferentUser in new[] { false, true })\n- {\n- yield return MemberDataHelper.AsData(\n- hasExternalCredential,\n- hasPasswordCredential,\n- hasUnscopedApiKeyCredential,\n- hasApiKeyScopedToUserCredential,\n- hasApiKeyScopedToDifferentUser);\n- }\n- }\n- }\n- }\n- }\n- }\n- }\n-\n- [Theory]\n- [MemberData(nameof(TransfersApiKeysAsExpected_Data))]\n- public async Task TransfersApiKeysAsExpected(\n- bool hasExternalCredential,\n- bool hasPasswordCredential,\n- bool hasUnscopedApiKeyCredential,\n- bool hasApiKeyScopedToUserCredential,\n- bool hasApiKeyScopedToDifferentUser)\n- {\n- // Arrange\n- var originalOwner = new User(\"originalOwner\") { Key = 11111 };\n- var randomUser = new User(\"randomUser\") { Key = 57576768 };\n- var newOwner = new User(\"newOwner\") { Key = 69785, Credentials = new List<Credential>() };\n-\n- var credentials = new List<Credential>();\n-\n- var externalCredential = TestCredentialHelper.CreateExternalCredential(\"cred\", null);\n- AddFieldsToCredential(externalCredential, \"externalCredential\", \"value1\", originalOwner, expiration: null);\n-\n- var passwordCredential = TestCredentialHelper.CreateSha1Password(\"password\");\n- AddFieldsToCredential(passwordCredential, \"passwordCredential\", \"value2\", originalOwner, expiration: null);\n-\n- var unscopedApiKeyCredential = TestCredentialHelper.CreateV4ApiKey(new TimeSpan(5, 5, 5, 5), out var key1);\n- AddFieldsToCredential(unscopedApiKeyCredential, \"unscopedApiKey\", \"value3\", originalOwner, expiration: new DateTime(2018, 3, 9));\n-\n- var scopedToUserApiKeyCredential = TestCredentialHelper.CreateV4ApiKey(new TimeSpan(5, 5, 5, 5), out var key2)\n- .WithScopes(new[] { new Scope { Owner = originalOwner, OwnerKey = originalOwner.Key } });\n- AddFieldsToCredential(scopedToUserApiKeyCredential, \"scopedToUserApiKey\", \"value4\", originalOwner, expiration: new DateTime(2018, 3, 10));\n-\n- var scopedToDifferentUserApiKeyCredential = TestCredentialHelper.CreateV4ApiKey(new TimeSpan(5, 5, 5, 5), out var key3)\n- .WithScopes(new[] { new Scope { Owner = randomUser, OwnerKey = randomUser.Key } });\n- AddFieldsToCredential(scopedToDifferentUserApiKeyCredential, \"scopedToDifferentUserApiKey\", \"value5\", originalOwner, expiration: new DateTime(2018, 3, 11));\n-\n- if (hasExternalCredential)\n- {\n- credentials.Add(externalCredential);\n- }\n-\n- if (hasPasswordCredential)\n- {\n- credentials.Add(passwordCredential);\n- }\n-\n- if (hasUnscopedApiKeyCredential)\n- {\n- credentials.Add(unscopedApiKeyCredential);\n- }\n-\n- if (hasApiKeyScopedToUserCredential)\n- {\n- credentials.Add(scopedToUserApiKeyCredential);\n- }\n-\n- if (hasApiKeyScopedToDifferentUser)\n- {\n- credentials.Add(scopedToDifferentUserApiKeyCredential);\n- }\n-\n- originalOwner.Credentials = credentials;\n- var originalCredentialCount = credentials.Count();\n-\n- var service = new TestableUserService();\n-\n- // Act\n- await service.TransferApiKeysScopedToUser(originalOwner, newOwner);\n-\n- // Assert\n- service.MockEntitiesContext.Verify(\n- x => x.SaveChangesAsync(),\n- hasUnscopedApiKeyCredential || hasApiKeyScopedToUserCredential ? Times.Once() : Times.Never());\n-\n- Assert.Equal(originalCredentialCount, originalOwner.Credentials.Count());\n-\n- Assert.Equal(\n- (hasUnscopedApiKeyCredential ? 1 : 0) + (hasApiKeyScopedToUserCredential ? 1 : 0),\n- newOwner.Credentials.Count());\n-\n- AssertCredentialInOriginalOnly(externalCredential, originalOwner, newOwner, hasExternalCredential);\n- AssertCredentialInOriginalOnly(passwordCredential, originalOwner, newOwner, hasPasswordCredential);\n- AssertCredentialInOriginalOnly(scopedToDifferentUserApiKeyCredential, originalOwner, newOwner, hasApiKeyScopedToDifferentUser);\n-\n- AssertCredentialInNew(unscopedApiKeyCredential, originalOwner, newOwner, hasUnscopedApiKeyCredential);\n- AssertCredentialInNew(scopedToUserApiKeyCredential, originalOwner, newOwner, hasApiKeyScopedToUserCredential);\n- }\n-\n- private void AddFieldsToCredential(Credential credential, string description, string value, User originalOwner, DateTime? expiration)\n- {\n- credential.Description = description;\n- credential.Value = value;\n- credential.User = originalOwner;\n- credential.UserKey = originalOwner.Key;\n-\n- if (expiration.HasValue)\n- {\n- credential.ExpirationTicks = expiration.Value.Ticks;\n- credential.Expires = expiration.Value;\n- }\n- }\n-\n- private void AssertCredentialInOriginalOnly(Credential credential, User originalOwner, User newOwner, bool hasCredential)\n- {\n- var credentialEquals = CredentialEqualsFunc(credential);\n- Assert.Equal(hasCredential, originalOwner.Credentials.Any(\n- hasCredential ? CredentialEqualsWithOwnerFunc(credential, originalOwner) : CredentialEqualsFunc(credential)));\n- Assert.False(newOwner.Credentials.Any(CredentialEqualsFunc(credential)));\n- }\n-\n- private void AssertCredentialInNew(Credential credential, User originalOwner, User newOwner, bool hasCredential)\n- {\n- Assert.Equal(hasCredential, originalOwner.Credentials.Any(\n- hasCredential ? CredentialEqualsWithOwnerFunc(credential, originalOwner) : CredentialEqualsFunc(credential)));\n- Assert.Equal(hasCredential, newOwner.Credentials.Any(\n- hasCredential ? CredentialEqualsWithOwnerAndScopeFunc(credential, newOwner, originalOwner) : CredentialEqualsFunc(credential)));\n- }\n-\n- private bool CredentialEquals(Credential expected, Credential actual)\n- {\n- return\n- expected.Description == actual.Description &&\n- expected.ExpirationTicks == actual.ExpirationTicks &&\n- expected.Expires == actual.Expires &&\n- expected.Type == actual.Type &&\n- expected.Value == actual.Value;\n- }\n-\n- private bool CredentialEqualsWithOwner(Credential expected, Credential actual, User owner)\n- {\n- return CredentialEquals(expected, actual) &&\n- owner == actual.User &&\n- owner.Key == actual.UserKey;\n- }\n-\n- private bool CredentialEqualsWithOwnerAndScope(Credential expected, Credential actual, User owner, User scopeOwner)\n- {\n- return CredentialEqualsWithOwner(expected, actual, owner) &&\n- expected.Scopes.All(s => s.Owner == scopeOwner && s.OwnerKey == scopeOwner.Key);\n- }\n-\n- private Func<Credential, bool> CredentialEqualsFunc(Credential expected)\n- {\n- return (c) => CredentialEquals(expected, c);\n- }\n-\n- private Func<Credential, bool> CredentialEqualsWithOwnerFunc(Credential expected, User owner)\n- {\n- return (c) => CredentialEqualsWithOwner(expected, c, owner);\n- }\n-\n- private Func<Credential, bool> CredentialEqualsWithOwnerAndScopeFunc(Credential expected, User owner, User scopeOwner)\n- {\n- return (c) => CredentialEqualsWithOwnerAndScope(expected, c, owner, scopeOwner);\n- }\n- }\n-\npublic class TheAddOrganizationAccountMethod\n{\nprivate const string OrgName = \"myOrg\";\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix migrate apikeys unique index conflict (#5607)
|
455,736 |
13.03.2018 16:37:40
| 25,200 |
9e8ce8e063f2b36412fae0d4f7bf71ed29883ee1
|
Add integration tests for Azure Blob Storage testing CopyFileAsync
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "using System.Net;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\n-using Microsoft.WindowsAzure.Storage.Auth;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Microsoft.WindowsAzure.Storage.Blob.Protocol;\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=\"TestUtils\\BlobStorageCollection.cs\" />\n+ <Compile Include=\"TestUtils\\BlobStorageFact.cs\" />\n+ <Compile Include=\"TestUtils\\BlobStorageFixture.cs\" />\n<Compile Include=\"Services\\CloudBlobClientWrapperFacts.cs\" />\n<Compile Include=\"Services\\CloudBlobCoreFileStorageServiceFacts.cs\" />\n+ <Compile Include=\"Services\\CloudBlobCoreFileStorageServiceIntegrationTests.cs\" />\n<Compile Include=\"Services\\CorePackageFileServiceFacts.cs\" />\n<Compile Include=\"Services\\CorePackageServiceFacts.cs\" />\n<Compile Include=\"TestUtils\\CoreMockExtensions.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add integration tests for Azure Blob Storage testing CopyFileAsync (#5605)
Progress on https://github.com/NuGet/Engineering/issues/1190
|
455,776 |
14.03.2018 10:50:21
| 25,200 |
82e8630cbdbf699e14fd4e8f0849253ecae5a307
|
Hotfix: Don't transfer full access API keys to organization admin when transforming an account into an organization
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/MigrateUserToOrganization.sql",
"new_path": "src/NuGetGallery.Core/Infrastructure/MigrateUserToOrganization.sql",
"diff": "@@ -23,13 +23,16 @@ BEGIN TRY\nINSERT INTO [dbo].[Memberships] (OrganizationKey, MemberKey, IsAdmin) VALUES (@organizationKey, @adminKey, 1)\n-- Reassign organization API keys to the admin user\n+ -- Only reassign scoped keys (not full access keys)\nUPDATE [dbo].[Scopes] SET OwnerKey = @organizationKey\nWHERE CredentialKey IN (\nSELECT [Key] FROM [dbo].[Credentials]\nWHERE UserKey = @organizationKey AND Type LIKE 'apikey.%'\n)\nUPDATE [dbo].[Credentials] SET UserKey = @adminKey\n- WHERE UserKey = @organizationKey AND Type LIKE 'apikey.%'\n+ FROM [dbo].[Credentials] AS C\n+ JOIN [dbo].[Scopes] AS S ON S.CredentialKey = C.[Key]\n+ WHERE C.UserKey = @organizationKey AND C.Type LIKE 'apikey.%'\n-- Remove remaining organization credentials\nDELETE FROM [dbo].[Credentials] WHERE UserKey = @organizationKey\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"diff": "Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\nvar transformNote = \"Administrators have full control over the organization, including the ability to add and remove other members.\";\n- var transformNote2 = \"Organization API keys will be transferred to this administrator on transformation.\";\n+ var transformNote2 = \"This organization's scoped API keys will be transferred to '{0}' on transformation. Full access API keys will not be transferred.\";\nvar transformToolTip = \"Please enter a username for the organization administrator. \"\n+ transformNote\n- + Environment.NewLine + Environment.NewLine\n+ + \"\\\\n\\\\n\"\n+ transformNote2;\nvar transformConfirmation = \"You have added '{0}' as an administrator. \"\n+ transformNote\n<div class=\"form-group @Html.HasErrorFor(m => m.AdminUsername)\">\n@Html.ShowLabelFor(m => m.AdminUsername)\n- <a href=\"#\" data-toggle=\"tooltip\" title=\"@transformToolTip\">\n+ <a href=\"#\" id=\"transform-tooltip\" data-toggle=\"tooltip\">\n<i class=\"ms-Icon ms-Icon--Info\" aria-hidden=\"true\" style=\"vertical-align: -2px\"></i>\n</a>\n@Html.ShowTextBoxFor(m => m.AdminUsername)\n<script type=\"text/javascript\">\n$(function ()\n{\n+ var adminUsername = $(\"#AdminUsername\");\n+ var tooltip = \"@Html.Raw(transformToolTip)\";\nvar confirmation = \"@Html.Raw(transformConfirmation)\";\n$(\"#transform\").submit(function (event) {\n+ var adminUsernameVal = adminUsername.val();\n+ $(\"#transform-tooltip\").attr(\"title\", window.nuget.formatString(tooltip, adminUsernameVal));\nreturn window.nuget.confirmEvent(\n- window.nuget.formatString(confirmation, $(\"#AdminUsername\").val()),\n+ window.nuget.formatString(confirmation, adminUsernameVal),\nevent);\n- })\n+ });\n});\n</script>\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hotfix: Don't transfer full access API keys to organization admin when transforming an account into an organization (#5611)
|
455,776 |
14.03.2018 12:02:08
| 25,200 |
75aabfacab2f7628a9daa5523d0e4118205103fb
|
Hotfix: additional messaging fixes for Organizations
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"diff": "ViewBag.MdPageColumns = Constants.ColumnsFormMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n- var transformNote = \"Administrators have full control over the organization, including the ability to add and remove other members.\";\n- var transformNote2 = \"This organization's scoped API keys will be transferred to '{0}' on transformation. Full access API keys will not be transferred.\";\n- var transformToolTip = \"Please enter a username for the organization administrator. \"\n- + transformNote\n- + \"\\\\n\\\\n\"\n- + transformNote2;\n+ var transformNote = \"Administrators have full control over their organizations, including the ability to add and remove other members.\";\n+ var transformNote2 = \"Existing API keys owned by this account, '\" + CurrentUser.Username + \"', will be transferred to '{0}' on transformation. Full access legacy API keys will not be transferred.\";\nvar transformConfirmation = \"You have added '{0}' as an administrator. \"\n+ transformNote\n+ \"\\\\n\\\\n\"\n<div class=\"form-group @Html.HasErrorFor(m => m.AdminUsername)\">\n@Html.ShowLabelFor(m => m.AdminUsername)\n- <a href=\"#\" id=\"transform-tooltip\" data-toggle=\"tooltip\">\n+ <a href=\"#\" id=\"transform-tooltip\" data-toggle=\"tooltip\" title=\"Please enter a username for the organization administrator.\">\n<i class=\"ms-Icon ms-Icon--Info\" aria-hidden=\"true\" style=\"vertical-align: -2px\"></i>\n</a>\n@Html.ShowTextBoxFor(m => m.AdminUsername)\n</aside>\n</div>\n+ <div class=\"row\">\n+ <div class=\"col-md-12\">\n+ <p>\n+ Administrators have full control over their organizations, including the ability to add and remove other members.\n+ </p>\n+ <p>\n+ Existing API keys owned by this account will be transferred to the administrator on transformation. Full access legacy API keys will not be transferred.\n+ </p>\n+ </div>\n+ </div>\n+\n<div class=\"row form-group\">\n<div class=\"col-md-6\">\n<input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Transform\" />\n<script type=\"text/javascript\">\n$(function ()\n{\n- var adminUsername = $(\"#AdminUsername\");\n- var tooltip = \"@Html.Raw(transformToolTip)\";\nvar confirmation = \"@Html.Raw(transformConfirmation)\";\n$(\"#transform\").submit(function (event) {\n- var adminUsernameVal = adminUsername.val();\n- $(\"#transform-tooltip\").attr(\"title\", window.nuget.formatString(tooltip, adminUsernameVal));\nreturn window.nuget.confirmEvent(\n- window.nuget.formatString(confirmation, adminUsernameVal),\n+ window.nuget.formatString(confirmation, $(\"#AdminUsername\").val()),\nevent);\n});\n});\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hotfix: additional messaging fixes for Organizations (#5615)
|
455,747 |
14.03.2018 12:26:47
| 25,200 |
f1e562a88590b5e9a50cf0ff2681a1c7a067ae44
|
Simplify login page for local debugging
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/SignIn.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/SignIn.cshtml",
"diff": "<h1>Sign in</h1>\n</div>\n</div>\n-\n- @foreach (var provider in Model.Providers)\n+ @if (Model.Providers.Any())\n+ {\n+ foreach (var provider in Model.Providers)\n{\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag) text-center\">\n<a href=\"#\" id=\"signin-assistance\">Need assistance signing in?</a>\n</span>\n</div>\n+ }\n+\n<div class=\"row nuget-signin\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag) text-center\">\n<p class=\"text-center\">\n</div>\n</div>\n}\n+ else\n+ {\n+ <div class=\"row\">\n+ <div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n+ @Html.Partial(\"_SignIn\", Model)\n+ </div>\n+ </div>\n+ }\n</section>\n+\n<div style=\"display: none\" id=\"signinAssistanceModal\" class=\"modal fade modal-container\" data-backdrop=\"static\">\n@Html.Partial(\"_SigninAssistance\")\n</div>\n@section bottomScripts {\n<script type=\"text/javascript\">\nvar signinAssistanceUrl = \"@Url.SigninAssistance()\"\n-\n- // Strings\nvar strings_InvalidUsername = \"@Html.Raw(Strings.SigninAssistance_InvalidUser)\";\n</script>\n@ViewHelpers.SectionsScript(this)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Simplify login page for local debugging (#5613)
|
455,736 |
14.03.2018 10:04:31
| 25,200 |
1032d02f52e5542ea0bf08115c0329d061e33660
|
Get the package hash from the stream when backing up
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CorePackageFileService.cs",
"new_path": "src/NuGetGallery.Core/Services/CorePackageFileService.cs",
"diff": "@@ -159,10 +159,17 @@ public async Task StorePackageFileInBackupLocationAsync(Package package, Stream\nversion = package.NormalizedVersion;\n}\n+ // Hash the provided stream instead of using the hash on the package. This is to avoid a backup with the\n+ // incorrect file name if the hash in the DB does not match the package (a potentially transient issue).\n+ var hash = CryptographyService.GenerateHash(\n+ packageFile,\n+ hashAlgorithmId: CoreConstants.Sha512HashAlgorithmId);\n+ packageFile.Position = 0;\n+\nvar fileName = BuildBackupFileName(\npackage.PackageRegistration.Id,\nversion,\n- package.Hash);\n+ hash);\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"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CryptographyService.cs",
"new_path": "src/NuGetGallery.Core/Services/CryptographyService.cs",
"diff": "@@ -12,7 +12,7 @@ public static class CryptographyService\n{\npublic static string GenerateHash(\nStream input,\n- string hashAlgorithmId = CoreConstants.Sha512HashAlgorithmId)\n+ string hashAlgorithmId)\n{\ninput.Position = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -462,7 +462,9 @@ private async Task<ActionResult> CreatePackageInternal()\nvar packageStreamMetadata = new PackageStreamMetadata\n{\nHashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\n- Hash = CryptographyService.GenerateHash(packageStream.AsSeekableStream()),\n+ Hash = CryptographyService.GenerateHash(\n+ packageStream.AsSeekableStream(),\n+ CoreConstants.Sha512HashAlgorithmId),\nSize = packageStream.Length\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1488,7 +1488,9 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nvar packageStreamMetadata = new PackageStreamMetadata\n{\nHashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\n- Hash = CryptographyService.GenerateHash(uploadFile.AsSeekableStream()),\n+ Hash = CryptographyService.GenerateHash(\n+ uploadFile.AsSeekableStream(),\n+ CoreConstants.Sha512HashAlgorithmId),\nSize = uploadFile.Length,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"new_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"diff": "@@ -49,7 +49,9 @@ public async Task<Package> ReflowAsync(string id, string version)\nvar packageStreamMetadata = new PackageStreamMetadata\n{\nHashAlgorithm = CoreConstants.Sha512HashAlgorithmId,\n- Hash = CryptographyService.GenerateHash(packageStream.AsSeekableStream()),\n+ Hash = CryptographyService.GenerateHash(\n+ packageStream.AsSeekableStream(),\n+ CoreConstants.Sha512HashAlgorithmId),\nSize = packageStream.Length,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageFileServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CorePackageFileServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.IO;\n+using System.Text;\nusing System.Threading.Tasks;\nusing System.Web;\nusing Moq;\n@@ -21,6 +22,8 @@ public class CorePackageFileServiceFacts\nprivate const string LowercaseId = \"nuget.versioning\";\nprivate const string LowercaseVersion = \"4.3.0-beta\";\nprivate static readonly string ValidationFileName = $\"{LowercaseId}.{LowercaseVersion}.nupkg\";\n+ private const string PackageContent = \"Hello, world.\";\n+ private const string PackageHash = \"rQw3wx1psxXzqB8TyM3nAQlK2RcluhsNwxmcqXE2YbgoDW735o8TPmIR4uWpoxUERddvFwjgRSGw7gNPCwuvJg==\";\npublic class TheSavePackageFileMethod\n{\n@@ -498,8 +501,6 @@ public async Task WillUseFileStorageService()\npublic class TheStorePackageFileInBackupLocationAsyncMethod\n{\n- private string packageHashForTests = \"NzMzMS1QNENLNEczSDQ1SA==\";\n-\n[Fact]\npublic async Task WillThrowIfPackageIsNull()\n{\n@@ -564,10 +565,9 @@ public async Task WillUseNormalizedRegularVersionIfNormalizedVersionMissing()\nvar fileStorageSvc = new Mock<ICoreFileStorageService>();\nvar service = CreateService(fileStorageService: fileStorageSvc);\nvar packageRegistraion = new PackageRegistration { Id = \"theId\" };\n- var package = new Package { PackageRegistration = packageRegistraion, NormalizedVersion = null, Version = \"01.01.01\", Hash = packageHashForTests };\n- package.Hash = packageHashForTests;\n+ var package = new Package { PackageRegistration = packageRegistraion, NormalizedVersion = null, Version = \"01.01.01\" };\n- fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"1.1.1\", packageHashForTests), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n+ fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"1.1.1\", PackageHash), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n.Completes()\n.Verifiable();\n@@ -577,7 +577,35 @@ public async Task WillUseNormalizedRegularVersionIfNormalizedVersionMissing()\n}\n[Fact]\n- public async Task WillUseLowercaseNormalizedIdAndVersion()\n+ public async Task WillSeekTheStreamBeforeAndAfterHashing()\n+ {\n+ var fileStorageSvc = new Mock<ICoreFileStorageService>();\n+ var service = CreateService(fileStorageService: fileStorageSvc);\n+ string path = null;\n+ long position = -1;\n+ fileStorageSvc\n+ .Setup(x => x.SaveFileAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>()))\n+ .Returns(Task.FromResult(true))\n+ .Callback<string, string, Stream, bool>((_, p, s, ___) =>\n+ {\n+ path = p;\n+ position = s.Position;\n+ });\n+\n+ var package = CreatePackage();\n+ package.PackageRegistration.Id = Id;\n+ package.NormalizedVersion = NormalizedVersion;\n+ var stream = CreatePackageFileStream();\n+ stream.Seek(0, SeekOrigin.End);\n+\n+ await service.StorePackageFileInBackupLocationAsync(package, stream);\n+\n+ Assert.Equal($\"nuget.versioning/4.3.0-beta/{HttpServerUtility.UrlTokenEncode(Convert.FromBase64String(PackageHash))}..nupkg\", path);\n+ Assert.Equal(0, position);\n+ }\n+\n+ [Fact]\n+ public async Task WillUseLowercaseNormalizedIdAndVersionAndStreamHash()\n{\nvar fileStorageSvc = new Mock<ICoreFileStorageService>();\nvar service = CreateService(fileStorageService: fileStorageSvc);\n@@ -590,11 +618,11 @@ public async Task WillUseLowercaseNormalizedIdAndVersion()\nvar package = CreatePackage();\npackage.PackageRegistration.Id = Id;\npackage.NormalizedVersion = NormalizedVersion;\n- package.Hash = packageHashForTests;\n+ package.Hash = \"NzMzMS1QNENLNEczSDQ1SA==\"; // This hash should not be used.\nawait service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n- Assert.Equal(\"nuget.versioning/4.3.0-beta/NzMzMS1QNENLNEczSDQ1SA2..nupkg\", path);\n+ Assert.Equal($\"nuget.versioning/4.3.0-beta/{HttpServerUtility.UrlTokenEncode(Convert.FromBase64String(PackageHash))}..nupkg\", path);\n}\n[Fact]\n@@ -607,7 +635,6 @@ public async Task WillSaveTheFileViaTheFileStorageServiceUsingThePackagesFolder(\n.Verifiable();\nvar package = CreatePackage();\n- package.Hash = packageHashForTests;\nawait service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n@@ -619,12 +646,11 @@ public async Task WillSaveTheFileViaTheFileStorageServiceUsingAFileNameWithIdAnd\n{\nvar fileStorageSvc = new Mock<ICoreFileStorageService>();\nvar service = CreateService(fileStorageService: fileStorageSvc);\n- fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"theNormalizedVersion\", packageHashForTests), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n+ fileStorageSvc.Setup(x => x.SaveFileAsync(It.IsAny<string>(), BuildBackupFileName(\"theId\", \"theNormalizedVersion\", PackageHash), It.IsAny<Stream>(), It.Is<bool>(b => b)))\n.Completes()\n.Verifiable();\nvar package = CreatePackage();\n- package.Hash = packageHashForTests;\nawait service.StorePackageFileInBackupLocationAsync(package, CreatePackageFileStream());\n@@ -642,7 +668,6 @@ public async Task WillSaveTheFileStreamViaTheFileStorageService()\n.Verifiable();\nvar package = CreatePackage();\n- package.Hash = packageHashForTests;\nawait service.StorePackageFileInBackupLocationAsync(package, fakeStream);\n@@ -660,7 +685,6 @@ public async Task WillNotUploadThePackageIfItAlreadyExists()\n.ReturnsAsync(true);\nvar package = CreatePackage();\n- package.Hash = packageHashForTests;\nawait service.StorePackageFileInBackupLocationAsync(package, fakeStream);\n@@ -680,7 +704,6 @@ public async Task WillSwallowInvalidOperationException()\n.Throws(new InvalidOperationException(\"File already exists.\"));\nvar package = CreatePackage();\n- package.Hash = packageHashForTests;\nawait service.StorePackageFileInBackupLocationAsync(package, fakeStream);\n@@ -701,7 +724,6 @@ public async Task WillNotSwallowOtherExceptions()\n.Throws(exception);\nvar package = CreatePackage();\n- package.Hash = packageHashForTests;\nvar actual = await Assert.ThrowsAsync<ArgumentException>(\n() => service.StorePackageFileInBackupLocationAsync(package, fakeStream));\n@@ -742,7 +764,7 @@ static Package CreatePackage()\nstatic MemoryStream CreatePackageFileStream()\n{\n- return new MemoryStream(new byte[] { 0, 0, 1, 0, 1, 0, 1, 0 }, 0, 8, true, true);\n+ return new MemoryStream(Encoding.ASCII.GetBytes(PackageContent));\n}\nstatic CorePackageFileService CreateService(Mock<ICoreFileStorageService> fileStorageService = null)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Get the package hash from the stream when backing up (#5612)
Progress on https://github.com/NuGet/Engineering/issues/1190
|
455,736 |
14.03.2018 16:00:40
| 25,200 |
29d21945bebd0ed788205f47bbd15928fab9cbcf
|
Add traces to CopyFileAsync to improve debugging
Progress on
|
[
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/DiagnosticsServiceExtensions.cs",
"new_path": "src/NuGetGallery.Core/Diagnostics/DiagnosticsServiceExtensions.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/NullDiagnosticsSource.cs",
"new_path": "src/NuGetGallery.Core/Diagnostics/NullDiagnosticsSource.cs",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"CoreConstants.cs\" />\n<Compile Include=\"CredentialTypes.cs\" />\n<Compile Include=\"Completion.cs\" />\n+ <Compile Include=\"Diagnostics\\DiagnosticsServiceExtensions.cs\" />\n<Compile Include=\"Diagnostics\\IDiagnosticsService.cs\" />\n<Compile Include=\"Diagnostics\\IDiagnosticsSource.cs\" />\n+ <Compile Include=\"Diagnostics\\NullDiagnosticsSource.cs\" />\n<Compile Include=\"DisposableAction.cs\" />\n<Compile Include=\"Entities\\Certificate.cs\" />\n<Compile Include=\"Entities\\Credential.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "using Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Microsoft.WindowsAzure.Storage.Blob.Protocol;\n+using NuGetGallery.Diagnostics;\nnamespace NuGetGallery\n{\n@@ -40,11 +41,13 @@ public class CloudBlobCoreFileStorageService : ICoreFileStorageService\n};\nprotected readonly ICloudBlobClient _client;\n+ protected readonly IDiagnosticsSource _trace;\nprotected readonly ConcurrentDictionary<string, ICloudBlobContainer> _containers = new ConcurrentDictionary<string, ICloudBlobContainer>();\n- public CloudBlobCoreFileStorageService(ICloudBlobClient client)\n+ public CloudBlobCoreFileStorageService(ICloudBlobClient client, IDiagnosticsService diagnosticsService)\n{\n- _client = client;\n+ _client = client ?? throw new ArgumentNullException(nameof(client));\n+ _trace = diagnosticsService?.SafeGetSource(nameof(CloudBlobCoreFileStorageService)) ?? throw new ArgumentNullException(nameof(diagnosticsService));\n}\npublic async Task DeleteFileAsync(string folderName, string fileName)\n@@ -187,6 +190,12 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\n// condition is. This is because the source blob is preferable over a failed copy. We use the etag\n// of the failed blob to avoid inadvertently replacing a blob that is now valid (i.e. has a\n// successful copy status).\n+ _trace.TraceEvent(\n+ TraceEventType.Information,\n+ id: 0,\n+ message: $\"Destination blob '{destFolderName}/{destFileName}' already exists but has a \" +\n+ $\"failed copy status. This blob will be replaced if the etag matches '{destBlob.ETag}'.\");\n+\nmappedDestAccessCondition = AccessCondition.GenerateIfMatchCondition(destBlob.ETag);\n}\nelse if ((srcBlob.Properties.ContentMD5 != null\n@@ -194,10 +203,24 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\n&& srcBlob.Properties.Length == destBlob.Properties.Length))\n{\n// If the blob hash is the same and the length is the same, no-op the copy.\n+ _trace.TraceEvent(\n+ TraceEventType.Information,\n+ id: 0,\n+ message: $\"Destination blob '{destFolderName}/{destFileName}' already has hash \" +\n+ $\"'{destBlob.Properties.ContentMD5}' and length '{destBlob.Properties.Length}'. The copy \" +\n+ $\"will be skipped.\");\n+\nreturn srcBlob.ETag;\n}\n}\n+ _trace.TraceEvent(\n+ TraceEventType.Information,\n+ id: 0,\n+ message: $\"Copying of source blob '{srcBlob.Uri}' to '{destFolderName}/{destFileName}' with source \" +\n+ $\"access condition {Log(srcAccessCondition)} and destination access condition \" +\n+ $\"{Log(mappedDestAccessCondition)}.\");\n+\n// Start the server-side copy and wait for it to complete. If \"If-None-Match: *\" was specified and the\n// destination already exists, HTTP 409 is thrown. If \"If-Match: ETAG\" was specified and the destination\n// has changed, HTTP 412 is thrown.\n@@ -239,6 +262,20 @@ public async Task<IFileReference> GetFileReferenceAsync(string folderName, strin\nreturn srcBlob.ETag;\n}\n+ private static string Log(AccessCondition accessCondition)\n+ {\n+ if (accessCondition?.IfMatchETag != null)\n+ {\n+ return $\"'If-Match: {accessCondition.IfMatchETag}'\";\n+ }\n+ else if (accessCondition?.IfNoneMatchETag != null)\n+ {\n+ return $\"'If-None-Match: {accessCondition.IfNoneMatchETag}'\";\n+ }\n+\n+ return \"(none)\";\n+ }\n+\npublic async Task SaveFileAsync(string folderName, string fileName, Stream packageFile, bool overwrite = true)\n{\nICloudBlobContainer container = await GetContainerAsync(folderName);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Infrastructure\\DependencyResolverServiceProviderAdapter.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\CloudDownloadCountServiceRefreshJob.cs\" />\n<Compile Include=\"Infrastructure\\MessageQueue.cs\" />\n- <Compile Include=\"Diagnostics\\NullDiagnosticsSource.cs\" />\n<Compile Include=\"Diagnostics\\TraceDiagnosticsSource.cs\" />\n- <Compile Include=\"Diagnostics\\DiagnosticsServiceExtensions.cs\" />\n<Compile Include=\"Diagnostics\\DiagnosticsSourceExtensions.cs\" />\n<Compile Include=\"Configuration\\StorageType.cs\" />\n<Compile Include=\"Telemetry\\UserPackageDeleteEvent.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/CloudBlobFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/CloudBlobFileStorageService.cs",
"diff": "using System.Web;\nusing System.Web.Mvc;\nusing NuGetGallery.Configuration;\n+using NuGetGallery.Diagnostics;\nnamespace NuGetGallery\n{\n@@ -15,8 +16,11 @@ public class CloudBlobFileStorageService : CloudBlobCoreFileStorageService, IFil\nprivate readonly IAppConfiguration _configuration;\nprivate readonly ISourceDestinationRedirectPolicy _redirectPolicy;\n- public CloudBlobFileStorageService(ICloudBlobClient client, IAppConfiguration configuration, ISourceDestinationRedirectPolicy redirectPolicy)\n- : base(client)\n+ public CloudBlobFileStorageService(\n+ ICloudBlobClient client,\n+ IAppConfiguration configuration,\n+ ISourceDestinationRedirectPolicy redirectPolicy,\n+ IDiagnosticsService diagnosticsService) : base(client, diagnosticsService)\n{\n_configuration = configuration;\n_redirectPolicy = redirectPolicy;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "using Microsoft.WindowsAzure.Storage.Blob;\nusing Microsoft.WindowsAzure.Storage.Blob.Protocol;\nusing Moq;\n+using NuGetGallery.Diagnostics;\nusing Xunit;\nusing Xunit.Sdk;\n@@ -27,7 +28,7 @@ public class CloudBlobCoreFileStorageServiceFacts\nfakeBlobClient = new Mock<ICloudBlobClient>();\n}\n- return new CloudBlobCoreFileStorageService(fakeBlobClient.Object);\n+ return new CloudBlobCoreFileStorageService(fakeBlobClient.Object, Mock.Of<IDiagnosticsService>());\n}\nprivate class FolderNamesDataAttribute : DataAttribute\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"diff": "using System.IO;\nusing System.Text;\nusing System.Threading.Tasks;\n+using Microsoft.WindowsAzure.Storage;\n+using Microsoft.WindowsAzure.Storage.Blob;\n+using Moq;\n+using NuGetGallery.Diagnostics;\nusing Xunit;\nnamespace NuGetGallery\n@@ -26,6 +30,8 @@ public class CloudBlobCoreFileStorageServiceIntegrationTests\nprivate readonly string _prefixB;\nprivate readonly CloudBlobClientWrapper _clientA;\nprivate readonly CloudBlobClientWrapper _clientB;\n+ private readonly CloudBlobClient _blobClientA;\n+ private readonly CloudBlobClient _blobClientB;\nprivate readonly CloudBlobCoreFileStorageService _targetA;\nprivate readonly CloudBlobCoreFileStorageService _targetB;\n@@ -39,8 +45,11 @@ public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixtur\n_clientA = new CloudBlobClientWrapper(_fixture.ConnectionStringA, readAccessGeoRedundant: false);\n_clientB = new CloudBlobClientWrapper(_fixture.ConnectionStringB, readAccessGeoRedundant: false);\n- _targetA = new CloudBlobCoreFileStorageService(_clientA);\n- _targetB = new CloudBlobCoreFileStorageService(_clientB);\n+ _blobClientA = CloudStorageAccount.Parse(_fixture.ConnectionStringA).CreateCloudBlobClient();\n+ _blobClientB = CloudStorageAccount.Parse(_fixture.ConnectionStringB).CreateCloudBlobClient();\n+\n+ _targetA = new CloudBlobCoreFileStorageService(_clientA, Mock.Of<IDiagnosticsService>());\n+ _targetB = new CloudBlobCoreFileStorageService(_clientB, Mock.Of<IDiagnosticsService>());\n}\n[BlobStorageFact]\n@@ -61,6 +70,113 @@ public async Task CopyingWithNamesWorksWithinTheSameStorageAccount()\nawait CopyFileWorksAsync(CopyFileWithNamesAsync, _prefixA, _targetA, _prefixA, _targetA);\n}\n+ [BlobStorageFact]\n+ public async Task DoesNotCopyWhenSourceAndDestinationHaveSameHash()\n+ {\n+ // Arrange\n+ var srcFolderName = CoreConstants.ValidationFolderName;\n+ var srcFileName = $\"{_prefixA}/src\";\n+ var srcContent = \"Hello, world.\";\n+\n+ var destFolderName = CoreConstants.PackagesFolderName;\n+ var destFileName = $\"{_prefixB}/dest\";\n+\n+ await _targetA.SaveFileAsync(\n+ srcFolderName,\n+ srcFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(srcContent)),\n+ overwrite: false);\n+\n+ await _targetB.SaveFileAsync(\n+ destFolderName,\n+ destFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(srcContent)),\n+ overwrite: false);\n+\n+ var originalDestFileReference = await _targetB.GetFileReferenceAsync(destFolderName, destFileName);\n+ var originalDestETag = originalDestFileReference.ContentId;\n+\n+ var srcUri = await _targetA.GetFileReadUriAsync(\n+ srcFolderName,\n+ srcFileName,\n+ DateTimeOffset.UtcNow.AddHours(1));\n+\n+ var destAccessCondition = AccessConditionWrapper.GenerateIfNotExistsCondition();\n+\n+ // Act\n+ await _targetB.CopyFileAsync(\n+ srcUri,\n+ destFolderName,\n+ destFileName,\n+ destAccessCondition);\n+\n+ // Assert\n+ var finalDestFileReference = await _targetB.GetFileReferenceAsync(destFolderName, destFileName);\n+ var finalDestETag = finalDestFileReference.ContentId;\n+ Assert.Equal(originalDestETag, finalDestETag);\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task CopiesWhenDestinationHasNotHashButContentsAreTheSame()\n+ {\n+ // Arrange\n+ var srcFolderName = CoreConstants.ValidationFolderName;\n+ var srcFileName = $\"{_prefixA}/src\";\n+ var srcContent = \"Hello, world.\";\n+\n+ var destFolderName = CoreConstants.PackagesFolderName;\n+ var destFileName = $\"{_prefixB}/dest\";\n+\n+ await _targetA.SaveFileAsync(\n+ srcFolderName,\n+ srcFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(srcContent)),\n+ overwrite: false);\n+\n+ await _targetB.SaveFileAsync(\n+ destFolderName,\n+ destFileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(srcContent)),\n+ overwrite: false);\n+\n+ var originalDestFileReference = await _targetB.GetFileReferenceAsync(destFolderName, destFileName);\n+ var originalDestETag = originalDestFileReference.ContentId;\n+\n+ await ClearContentMD5(_blobClientB, destFolderName, destFileName);\n+\n+ var srcUri = await _targetA.GetFileReadUriAsync(\n+ srcFolderName,\n+ srcFileName,\n+ DateTimeOffset.UtcNow.AddHours(1));\n+\n+ var destAccessCondition = AccessConditionWrapper.GenerateEmptyCondition();\n+\n+ // Act\n+ await _targetB.CopyFileAsync(\n+ srcUri,\n+ destFolderName,\n+ destFileName,\n+ destAccessCondition);\n+\n+ // Assert\n+ var finalDestFileReference = await _targetB.GetFileReferenceAsync(destFolderName, destFileName);\n+ var finalDestETag = finalDestFileReference.ContentId;\n+ Assert.NotEqual(originalDestETag, finalDestETag);\n+ }\n+\n+ private static CloudBlockBlob GetBlob(CloudBlobClient blobClient, string folderName, string fileName)\n+ {\n+ return blobClient.GetContainerReference(folderName).GetBlockBlobReference(fileName);\n+ }\n+\n+ private async Task ClearContentMD5(CloudBlobClient blobClient, string folderName, string fileName)\n+ {\n+ var blob = GetBlob(blobClient, folderName, fileName);\n+ await blob.FetchAttributesAsync();\n+ blob.Properties.ContentMD5 = null;\n+ await blob.SetPropertiesAsync();\n+ }\n+\nprivate static async Task CopyFileWorksAsync(\nCopyAsync copyAsync,\nstring srcPrefix,\n@@ -102,12 +218,14 @@ public async Task CopyingWithNamesWorksWithinTheSameStorageAccount()\nstring destFolderName,\nstring destFileName)\n{\n+ var destAccessCondition = AccessConditionWrapper.GenerateIfNotExistsCondition();\n+\nawait destService.CopyFileAsync(\nsrcFolderName,\nsrcFileName,\ndestFolderName,\ndestFileName,\n- AccessConditionWrapper.GenerateIfNotExistsCondition());\n+ destAccessCondition);\n}\nprivate static async Task CopyFileWithUriAsync(\n@@ -120,12 +238,13 @@ public async Task CopyingWithNamesWorksWithinTheSameStorageAccount()\n{\nvar endOfAccess = DateTimeOffset.UtcNow.AddHours(1);\nvar srcUri = await srcService.GetFileReadUriAsync(srcFolderName, srcFileName, endOfAccess);\n+ var destAccessCondition = AccessConditionWrapper.GenerateIfNotExistsCondition();\nawait destService.CopyFileAsync(\nsrcUri,\ndestFolderName,\ndestFileName,\n- AccessConditionWrapper.GenerateIfNotExistsCondition());\n+ destAccessCondition);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/CloudBlobFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/CloudBlobFileStorageServiceFacts.cs",
"diff": "using Microsoft.WindowsAzure.Storage.Blob;\nusing Moq;\nusing NuGetGallery.Configuration;\n+using NuGetGallery.Diagnostics;\nusing Xunit;\nusing Xunit.Sdk;\n@@ -38,7 +39,11 @@ public class CloudBlobFileStorageServiceFacts\nredirectPolicy.Setup(p => p.IsAllowed(It.IsAny<Uri>(), It.IsAny<Uri>())).Returns(true);\n}\n- return new CloudBlobFileStorageService(fakeBlobClient.Object, Mock.Of<IAppConfiguration>(), redirectPolicy.Object);\n+ return new CloudBlobFileStorageService(\n+ fakeBlobClient.Object,\n+ Mock.Of<IAppConfiguration>(),\n+ redirectPolicy.Object,\n+ Mock.Of<IDiagnosticsService>());\n}\nprivate class FolderNamesDataAttribute : DataAttribute\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add traces to CopyFileAsync to improve debugging (#5619)
Progress on https://github.com/NuGet/Engineering/issues/1190
|
455,736 |
15.03.2018 09:06:14
| 25,200 |
c9b186094209d42a897f561cfd9a66330534826b
|
Don't delete Web UI test results and only delete minimal test results
Address
|
[
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/RunP0Tests.bat",
"new_path": "tests/Scripts/RunP0Tests.bat",
"diff": "@@ -16,15 +16,12 @@ set nuget=\"nuget.exe\"\nset mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\nREM Clean previous test results\n-if exist functionaltests.*.xml (\n- del functionaltests.*.xml\n+if exist functionaltests.P0.xml (\n+ del functionaltests.P0.xml\n)\nif exist NuGetGallery.P0.*.trx (\ndel NuGetGallery.P0.*.trx\n)\n-if exist TestResults (\n- rd TestResults /S /Q\n-)\nREM Restore packages\nif not exist nuget (\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/RunP1Tests.bat",
"new_path": "tests/Scripts/RunP1Tests.bat",
"diff": "@@ -16,15 +16,12 @@ set nuget=\"nuget.exe\"\nset mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\nREM Clean previous test results\n-if exist functionaltests.*.xml (\n- del functionaltests.*.xml\n+if exist functionaltests.P1.xml (\n+ del functionaltests.P1.xml\n)\nif exist NuGetGallery.P1.*.trx (\ndel NuGetGallery.P1.*.trx\n)\n-if exist TestResults (\n- rd TestResults /S /Q\n-)\nREM Restore packages\nif not exist nuget (\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/Scripts/RunP2Tests.bat",
"new_path": "tests/Scripts/RunP2Tests.bat",
"diff": "@@ -16,15 +16,12 @@ set nuget=\"nuget.exe\"\nset mstest=\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\mstest.exe\"\nREM Clean previous test results\n-if exist functionaltests.*.xml (\n- del functionaltests.*.xml\n+if exist functionaltests.P2.xml (\n+ del functionaltests.P2.xml\n)\nif exist NuGetGallery.P2.*.trx (\ndel NuGetGallery.P2.*.trx\n)\n-if exist TestResults (\n- rd TestResults /S /Q\n-)\nREM Restore packages\nif not exist nuget (\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Don't delete Web UI test results and only delete minimal test results (#5622)
Address https://github.com/NuGet/Engineering/issues/1253
|
455,776 |
15.03.2018 11:30:01
| 25,200 |
24256775e2c34c767f863bf3ff1036eccc7f9fa7
|
Hotfix: Revert "Fix SemVerLevel propagation in Odata Next links. (#5582)"
This reverts commit
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"diff": "@@ -183,7 +183,7 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> option\n.ToV2FeedPackageQuery(GetSiteRoot(), _configurationService.Features.FriendlyLicenses, semVerLevelKey);\nreturn QueryResult(options, pagedQueryable, MaxPageSize, totalHits, (o, s, resultCount) =>\n- SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s, semVerLevelKey));\n+ SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s));\n}\n}\ncatch (Exception ex)\n@@ -299,8 +299,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\nresultCount,\nnew { searchTerm, targetFramework, includePrerelease },\no,\n- s,\n- semVerLevelKey);\n+ s);\n}\nreturn null;\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2FeedController.cs",
"diff": "@@ -92,7 +92,7 @@ public class ODataV2FeedController\nsemVerLevelKey);\nreturn QueryResult(options, pagedQueryable, MaxPageSize, totalHits, (o, s, resultCount) =>\n- SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, null, o, s, semVerLevelKey));\n+ SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, null, o, s));\n}\n}\n}\n@@ -251,7 +251,7 @@ public class ODataV2FeedController\nsemVerLevelKey);\nreturn QueryResult(options, pagedQueryable, MaxPageSize, totalHits, (o, s, resultCount) =>\n- SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s, semVerLevelKey));\n+ SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s));\n}\n}\ncatch (Exception ex)\n@@ -358,7 +358,7 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,\n// Strip it of for backward compatibility.\nif (o.Top == null || (resultCount.HasValue && o.Top.Value >= resultCount.Value))\n{\n- return SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { searchTerm, targetFramework, includePrerelease }, o, s, semVerLevelKey);\n+ return SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { searchTerm, targetFramework, includePrerelease }, o, s);\n}\nreturn null;\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/SearchService/SearchAdaptor.cs",
"new_path": "src/NuGetGallery/OData/SearchService/SearchAdaptor.cs",
"diff": "@@ -291,7 +291,7 @@ private static bool TryReadSearchFilter(bool allVersionsInIndex, string url, boo\nreturn true;\n}\n- public static Uri GetNextLink(Uri currentRequestUri, long? totalResultCount, object queryParameters, ODataQueryOptions options, ODataQuerySettings settings, int? semVerLevelKey = null)\n+ public static Uri GetNextLink(Uri currentRequestUri, long? totalResultCount, object queryParameters, ODataQueryOptions options, ODataQuerySettings settings)\n{\nif (!totalResultCount.HasValue || totalResultCount.Value <= MaxPageSize || totalResultCount.Value == 0)\n{\n@@ -374,16 +374,6 @@ public static Uri GetNextLink(Uri currentRequestUri, long? totalResultCount, obj\nqueryBuilder.Append(\"&\");\n}\n- if (semVerLevelKey != null)\n- {\n- if(semVerLevelKey == SemVerLevelKey.SemVer2)\n- {\n- queryBuilder.Append(\"semVerLevel=\");\n- queryBuilder.Append(SemVerLevelKey.SemVerLevel2);\n- queryBuilder.Append(\"&\");\n- }\n- }\n-\nvar queryString = queryBuilder.ToString().TrimEnd('&');\nvar builder = new UriBuilder(currentRequestUri);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SearchAdaptorFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SearchAdaptorFacts.cs",
"diff": "@@ -133,23 +133,6 @@ public void GeneratesNextLinkForComplexUrl()\n// Assert\nAssert.Equal(new Uri(\"https://localhost:8081/api/v2/Search()?searchTerm='foo'&$orderby=Id&$skip=200&$top=1000\"), nextLink);\n}\n-\n- [Fact]\n- public void GeneratesNextLinkForComplexUrlWithSemVerLevel2()\n- {\n- // Arrange\n- var requestUri = new Uri(\"https://localhost:8081/api/v2/Search()?searchTerm='foo'&$orderby=Id&$skip=100&$top=1000&semVerLevel=2.0.0\");\n- var resultCount = 2000; // our result set contains 2000 elements\n-\n- // Act\n- var nextLink = SearchAdaptor.GetNextLink(requestUri, resultCount, new { searchTerm = \"foo\" },\n- GetODataQueryOptionsForTest(requestUri),\n- GetODataQuerySettingsForTest(),\n- SemVerLevelKey.SemVer2);\n-\n- // Assert\n- Assert.Equal(new Uri(\"https://localhost:8081/api/v2/Search()?searchTerm='foo'&$orderby=Id&$skip=200&$top=1000&semVerLevel=2.0.0\"), nextLink);\n- }\n}\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hotfix: Revert "Fix SemVerLevel propagation in Odata Next links. (#5582)" (#5623)
This reverts commit eeb6929d5b2ee145516c72b3ec6898e01a2a18a5.
|
455,736 |
15.03.2018 14:33:27
| 25,200 |
5413849f8cc8a94c9193ce1bdb79974600d7fd2a
|
Don't immediately commit readme changes during UI upload
Fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1249,7 +1249,12 @@ public virtual async Task<JsonResult> Edit(string id, string version, VerifyPack\nif (formData.Edit != null)\n{\n// Update readme.md file, if modified.\n- var readmeChanged = await _readMeService.SaveReadMeMdIfChanged(package, formData.Edit, Request.ContentEncoding);\n+ var readmeChanged = await _readMeService.SaveReadMeMdIfChanged(\n+ package,\n+ formData.Edit,\n+ Request.ContentEncoding,\n+ commitChanges: true);\n+\nif (readmeChanged)\n{\n_telemetryService.TrackPackageReadMeChangeEvent(package, formData.Edit.ReadMe.SourceType, formData.Edit.ReadMeState);\n@@ -1574,7 +1579,11 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nif (formData.Edit != null)\n{\n- if (await _readMeService.SaveReadMeMdIfChanged(package, formData.Edit, Request.ContentEncoding))\n+ if (await _readMeService.SaveReadMeMdIfChanged(\n+ package,\n+ formData.Edit,\n+ Request.ContentEncoding,\n+ commitChanges: false))\n{\n_telemetryService.TrackPackageReadMeChangeEvent(package, formData.Edit.ReadMe.SourceType, formData.Edit.ReadMeState);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IReadMeService.cs",
"new_path": "src/NuGetGallery/Services/IReadMeService.cs",
"diff": "@@ -41,7 +41,13 @@ public interface IReadMeService\n/// </summary>\n/// <param name=\"package\">Package entity associated with the ReadMe.</param>\n/// <param name=\"edit\">Package version edit readme request.</param>\n+ /// <param name=\"encoding\">The encoding used when reading the existing readme.</param>\n+ /// <param name=\"commitChanges\">Whether or not to commit the pending changes to the database.</param>\n/// <returns>True if the package readme changed, otherwise false.</returns>\n- Task<bool> SaveReadMeMdIfChanged(Package package, EditPackageVersionReadMeRequest edit, Encoding encoding);\n+ Task<bool> SaveReadMeMdIfChanged(\n+ Package package,\n+ EditPackageVersionReadMeRequest edit,\n+ Encoding encoding,\n+ bool commitChanges);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReadMeService.cs",
"new_path": "src/NuGetGallery/Services/ReadMeService.cs",
"diff": "@@ -112,8 +112,14 @@ public async Task<string> GetReadMeMdAsync(Package package)\n/// </summary>\n/// <param name=\"package\">Package entity associated with the ReadMe.</param>\n/// <param name=\"edit\">Package version edit readme request.</param>\n+ /// <param name=\"encoding\">The encoding used when reading the existing readme.</param>\n+ /// <param name=\"commitChanges\">Whether or not to commit the pending changes to the database.</param>\n/// <returns>True if the package readme changed, otherwise false.</returns>\n- public async Task<bool> SaveReadMeMdIfChanged(Package package, EditPackageVersionReadMeRequest edit, Encoding encoding)\n+ public async Task<bool> SaveReadMeMdIfChanged(\n+ Package package,\n+ EditPackageVersionReadMeRequest edit,\n+ Encoding encoding,\n+ bool commitChanges)\n{\nvar activeReadMe = package.HasReadMe ?\nNormalizeNewLines(await GetReadMeMdAsync(package)) :\n@@ -131,8 +137,12 @@ public async Task<bool> SaveReadMeMdIfChanged(Package package, EditPackageVersio\n// Save entity to db.\npackage.HasReadMe = true;\n+\n+ if (commitChanges)\n+ {\nawait _entitiesContext.SaveChangesAsync();\n}\n+ }\nelse if (!hasReadMe && !string.IsNullOrEmpty(activeReadMe))\n{\nawait _packageFileService.DeleteReadMeMdFileAsync(package);\n@@ -140,8 +150,12 @@ public async Task<bool> SaveReadMeMdIfChanged(Package package, EditPackageVersio\n// Save entity to db.\npackage.HasReadMe = false;\n+\n+ if (commitChanges)\n+ {\nawait _entitiesContext.SaveChangesAsync();\n}\n+ }\nelse\n{\nedit.ReadMeState = PackageEditReadMeState.Unchanged;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "using NuGetGallery.Security;\nusing Xunit;\nusing System.Globalization;\n+using System.Text;\nnamespace NuGetGallery\n{\n@@ -57,7 +58,8 @@ public class PackagesControllerFacts\nMock<IReservedNamespaceService> reservedNamespaceService = null,\nMock<IPackageUploadService> packageUploadService = null,\nMock<IValidationService> validationService = null,\n- Mock<IPackageOwnershipManagementService> packageOwnershipManagementService = null)\n+ Mock<IPackageOwnershipManagementService> packageOwnershipManagementService = null,\n+ IReadMeService readMeService = null)\n{\npackageService = packageService ?? new Mock<IPackageService>();\nif (uploadFileService == null)\n@@ -108,6 +110,8 @@ public class PackagesControllerFacts\npackageOwnershipManagementService = packageOwnershipManagementService ?? new Mock<IPackageOwnershipManagementService>();\n+ readMeService = readMeService ?? new ReadMeService(packageFileService.Object, entitiesContext.Object);\n+\nvar controller = new Mock<PackagesController>(\npackageService.Object,\nuploadFileService.Object,\n@@ -127,7 +131,7 @@ public class PackagesControllerFacts\nsecurityPolicyService.Object,\nreservedNamespaceService.Object,\npackageUploadService.Object,\n- new ReadMeService(packageFileService.Object, entitiesContext.Object),\n+ readMeService,\nvalidationService.Object,\npackageOwnershipManagementService.Object);\n@@ -1896,7 +1900,8 @@ public static IEnumerable<object[]> NotOwner_Data\nUser owner,\nbool hasReadMe = false,\nbool isPackageLocked = false,\n- Mock<IPackageFileService> packageFileService = null)\n+ Mock<IPackageFileService> packageFileService = null,\n+ IReadMeService readMeService = null)\n{\nvar package = new Package\n{\n@@ -1916,7 +1921,8 @@ public static IEnumerable<object[]> NotOwner_Data\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n- packageFileService: packageFileService);\n+ packageFileService: packageFileService,\n+ readMeService: readMeService);\ncontroller.SetCurrentUser(currentUser);\nvar routeCollection = new RouteCollection();\n@@ -2211,6 +2217,59 @@ public async Task OnPostBackWithReadMe_Saves(User currentUser, User owner, bool\npackageFileService.Verify(s => s.DownloadReadMeMdFileAsync(It.IsAny<Package>()), Times.Exactly(hasReadMe ? 1 : 0));\n}\n+ [Fact]\n+ public async Task AlwaysCommitsChangesToReadMeService()\n+ {\n+ // Arrange\n+ var packageFileService = new Mock<IPackageFileService>();\n+ packageFileService.Setup(s => s.DownloadReadMeMdFileAsync(It.IsAny<Package>()))\n+ .Returns(Task.FromResult(\"markdown\"))\n+ .Verifiable();\n+ packageFileService.Setup(s => s.SaveReadMeMdFileAsync(It.IsAny<Package>(), It.IsAny<string>()))\n+ .Returns(Task.CompletedTask)\n+ .Verifiable();\n+\n+ var readMeService = new Mock<IReadMeService>();\n+\n+ var controller = SetupController(\n+ TestUtility.FakeUser,\n+ TestUtility.FakeUser,\n+ hasReadMe: true,\n+ packageFileService: packageFileService,\n+ readMeService: readMeService.Object);\n+\n+ var formData = new VerifyPackageRequest\n+ {\n+ Edit = new EditPackageVersionReadMeRequest\n+ {\n+ ReadMe = new ReadMeRequest\n+ {\n+ SourceType = \"written\",\n+ SourceText = \"markdown2\"\n+ }\n+ }\n+ };\n+\n+ // Act.\n+ var result = await controller.Edit(\"packageId\", \"1.0\", formData, \"returnUrl\");\n+\n+ // Assert.\n+ readMeService.Verify(\n+ x => x.SaveReadMeMdIfChanged(\n+ It.IsAny<Package>(),\n+ formData.Edit,\n+ controller.Request.ContentEncoding,\n+ true),\n+ Times.Once);\n+ readMeService.Verify(\n+ x => x.SaveReadMeMdIfChanged(\n+ It.IsAny<Package>(),\n+ It.IsAny<EditPackageVersionReadMeRequest>(),\n+ It.IsAny<Encoding>(),\n+ It.IsAny<bool>()),\n+ Times.Once);\n+ }\n+\n[Theory]\n[MemberData(nameof(Owner_Data))]\npublic async Task OnPostBackWithNoReadMe_Deletes(User currentUser, User owner)\n@@ -4691,6 +4750,85 @@ public async Task WritesAnAuditRecord()\n}\n}\n+ [Fact]\n+ public async Task WillNotCommitChangesToReadMeService()\n+ {\n+ // Arrange\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ using (var fakeFileStream = new MemoryStream())\n+ {\n+ fakeUploadFileService\n+ .Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key))\n+ .Returns(Task.FromResult<Stream>(fakeFileStream));\n+\n+ fakeUploadFileService\n+ .Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key))\n+ .Returns(Task.CompletedTask);\n+\n+ var fakePackageUploadService = new Mock<IPackageUploadService>();\n+ var fakePackage = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"theId\",\n+ },\n+ Version = \"theVersion\"\n+ };\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(fakePackage));\n+ var fakeNuGetPackage = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\");\n+ var fakeTelemetryService = new Mock<ITelemetryService>();\n+\n+ var fakeUserService = new Mock<IUserService>();\n+ fakeUserService.Setup(x => x.FindByUsername(TestUtility.FakeUser.Username)).Returns(TestUtility.FakeUser);\n+\n+ var fakeReadMeService = new Mock<IReadMeService>();\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageUploadService: fakePackageUploadService,\n+ uploadFileService: fakeUploadFileService,\n+ fakeNuGetPackage: fakeNuGetPackage,\n+ telemetryService: fakeTelemetryService,\n+ userService: fakeUserService,\n+ readMeService: fakeReadMeService.Object);\n+\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var request = new VerifyPackageRequest\n+ {\n+ Listed = true,\n+ Owner = TestUtility.FakeUser.Username,\n+ Edit = new EditPackageVersionReadMeRequest(),\n+ };\n+\n+ // Act\n+ await controller.VerifyPackage(request);\n+\n+ // Assert\n+ fakeReadMeService.Verify(\n+ x => x.SaveReadMeMdIfChanged(\n+ fakePackage,\n+ request.Edit,\n+ controller.Request.ContentEncoding,\n+ false),\n+ Times.Once);\n+ fakeReadMeService.Verify(\n+ x => x.SaveReadMeMdIfChanged(\n+ It.IsAny<Package>(),\n+ It.IsAny<EditPackageVersionReadMeRequest>(),\n+ It.IsAny<Encoding>(),\n+ It.IsAny<bool>()),\n+ Times.Once);\n+ }\n+ }\n+\n[Fact]\npublic async Task WillSendPackagePublishedEvent()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"diff": "@@ -13,9 +13,151 @@ namespace NuGetGallery\n{\npublic class ReadMeServiceFacts\n{\n+ public class TheSaveReadMeMdIfChangedMethod\n+ {\n+ private readonly Package _package;\n+ private readonly EditPackageVersionReadMeRequest _edit;\n+ private readonly Encoding _encoding;\n+ private readonly Mock<IPackageFileService> _packageFileService;\n+ private readonly Mock<IEntitiesContext> _entitiesContext;\n+ private readonly ReadMeService _target;\n+\n+ public TheSaveReadMeMdIfChangedMethod()\n+ {\n+ _package = new Package\n+ {\n+ HasReadMe = false,\n+ };\n+ _edit = new EditPackageVersionReadMeRequest\n+ {\n+ ReadMe = new ReadMeRequest\n+ {\n+ SourceText = \"# Title\" + Environment.NewLine + \"Some *groovy* content.\",\n+ SourceType = \"written\",\n+ },\n+ ReadMeState = PackageEditReadMeState.Changed,\n+ };\n+ _encoding = Encoding.UTF8;\n+\n+ _packageFileService = new Mock<IPackageFileService>();\n+ _entitiesContext = new Mock<IEntitiesContext>();\n+\n+ _target = new ReadMeService(\n+ _packageFileService.Object,\n+ _entitiesContext.Object);\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task OnlyCommitsWhenSpecifiedAndUpdatingReadme(bool commitChanges)\n+ {\n+ // Arrange\n+ _edit.ReadMeState = PackageEditReadMeState.Unchanged;\n+\n+ // Act\n+ var changed = await _target.SaveReadMeMdIfChanged(\n+ _package,\n+ _edit,\n+ _encoding,\n+ commitChanges);\n+\n+ // Assert\n+ Assert.True(changed);\n+ Assert.True(_package.HasReadMe);\n+ Assert.Equal(PackageEditReadMeState.Changed, _edit.ReadMeState);\n+ _entitiesContext.Verify(\n+ x => x.SaveChangesAsync(),\n+ commitChanges ? Times.Once() : Times.Never());\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task NeverCommitsWhenReadmeExistsAndHasNotChanged(bool commitChanges)\n+ {\n+ // Arrange\n+ _packageFileService\n+ .Setup(x => x.DownloadReadMeMdFileAsync(_package))\n+ .ReturnsAsync(_edit.ReadMe.SourceText);\n+\n+ _package.HasReadMe = true;\n+ _edit.ReadMeState = PackageEditReadMeState.Changed;\n+\n+ // Act\n+ var changed = await _target.SaveReadMeMdIfChanged(\n+ _package,\n+ _edit,\n+ _encoding,\n+ commitChanges);\n+\n+ // Assert\n+ Assert.False(changed);\n+ Assert.True(_package.HasReadMe);\n+ Assert.Equal(PackageEditReadMeState.Unchanged, _edit.ReadMeState);\n+ _entitiesContext.Verify(x => x.SaveChangesAsync(), Times.Never);\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task NeverCommitsWhenReadmeStillDoesNotExist(bool commitChanges)\n+ {\n+ // Arrange\n+ _package.HasReadMe = false;\n+ _edit.ReadMe.SourceText = null;\n+ _edit.ReadMeState = PackageEditReadMeState.Changed;\n+\n+ // Act\n+ var changed = await _target.SaveReadMeMdIfChanged(\n+ _package,\n+ _edit,\n+ _encoding,\n+ commitChanges);\n+\n+ // Assert\n+ Assert.False(changed);\n+ Assert.False(_package.HasReadMe);\n+ Assert.Equal(PackageEditReadMeState.Unchanged, _edit.ReadMeState);\n+ _entitiesContext.Verify(x => x.SaveChangesAsync(), Times.Never);\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task OnlyCommitsWhenSpecifiedAndRemovingReadme(bool commitChanges)\n+ {\n+ // Arrange\n+ _packageFileService\n+ .Setup(x => x.DownloadReadMeMdFileAsync(_package))\n+ .ReturnsAsync(_edit.ReadMe.SourceText);\n+\n+ _package.HasReadMe = true;\n+ _edit.ReadMe.SourceText = null;\n+ _edit.ReadMeState = PackageEditReadMeState.Unchanged;\n+\n+ // Act\n+ var changed = await _target.SaveReadMeMdIfChanged(\n+ _package,\n+ _edit,\n+ _encoding,\n+ commitChanges);\n+\n+ // Assert\n+ Assert.True(changed);\n+ Assert.False(_package.HasReadMe);\n+ Assert.Equal(PackageEditReadMeState.Deleted, _edit.ReadMeState);\n+ _entitiesContext.Verify(\n+ x => x.SaveChangesAsync(),\n+ commitChanges ? Times.Once() : Times.Never());\n+ }\n+ }\n+\npublic class TheHasReadMeSourceMethod\n{\n- internal ReadMeService ReadMeService = new ReadMeService(new Mock<IPackageFileService>().Object, new Mock<IEntitiesContext>().Object);\n+ internal ReadMeService ReadMeService = new ReadMeService(\n+ new Mock<IPackageFileService>().Object,\n+ new Mock<IEntitiesContext>().Object);\n[Fact]\npublic void WhenRequestIsNull_ReturnsFalse()\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Don't immediately commit readme changes during UI upload (#5626)
Fix https://github.com/NuGet/NuGetGallery/issues/5625
|
455,776 |
19.03.2018 14:19:06
| 25,200 |
406a7c1d96f374ae1e41b253c92be8125de2ee8c
|
Add more people to the team on the About page
|
[
{
"change_type": "MODIFY",
"old_path": "content/DEV/Team.json",
"new_path": "content/DEV/Team.json",
"diff": "\"anangaur\",\n\"anurse\",\n\"bhuvak\",\n+ \"bsimser\",\n\"chenriksson\",\n\"claycompton\",\n\"cristinamanum\",\n\"diverdan92\",\n\"dotnetjunky\",\n\"drewgillies\",\n+ \"drusellers\",\n\"dtivel\",\n\"emgarten\",\n\"ericstj\",\n\"feiling\",\n+ \"ferventcoder\",\n\"half-ogre\",\n\"harikmenon\",\n\"harshgMSFT\",\n\"murilogr\",\n\"nkolev92\",\n\"osbornm\",\n+ \"PatoBeltran\",\n\"pranavkm\",\n\"pspill\",\n\"rohit21agrawal\",\n"
},
{
"change_type": "MODIFY",
"old_path": "content/INT/Team.json",
"new_path": "content/INT/Team.json",
"diff": "\"anangaur\",\n\"anurse\",\n\"bhuvak\",\n+ \"bsimser\",\n\"chenriksson\",\n\"claycompton\",\n\"cristinamanum\",\n\"diverdan92\",\n\"dotnetjunky\",\n\"drewgillies\",\n+ \"drusellers\",\n\"dtivel\",\n\"emgarten\",\n\"ericstj\",\n\"feiling\",\n+ \"ferventcoder\",\n\"half-ogre\",\n\"harikmenon\",\n\"harshgMSFT\",\n\"murilogr\",\n\"nkolev92\",\n\"osbornm\",\n+ \"PatoBeltran\",\n\"pranavkm\",\n\"pspill\",\n\"rohit21agrawal\",\n"
},
{
"change_type": "MODIFY",
"old_path": "content/PROD/Team.json",
"new_path": "content/PROD/Team.json",
"diff": "\"anangaur\",\n\"anurse\",\n\"bhuvak\",\n+ \"bsimser\",\n\"chenriksson\",\n\"claycompton\",\n\"cristinamanum\",\n\"diverdan92\",\n\"dotnetjunky\",\n\"drewgillies\",\n+ \"drusellers\",\n\"dtivel\",\n\"emgarten\",\n\"ericstj\",\n\"feiling\",\n+ \"ferventcoder\",\n\"half-ogre\",\n\"harikmenon\",\n\"harshgMSFT\",\n\"murilogr\",\n\"nkolev92\",\n\"osbornm\",\n+ \"PatoBeltran\",\n\"pranavkm\",\n\"pspill\",\n\"rohit21agrawal\",\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add more people to the team on the About page (#5636)
|
455,776 |
19.03.2018 15:41:54
| 25,200 |
c1d16e24b33d6c894142b736a3332e252e360065
|
Update docs link to "what is NuGet" page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "{\n@DisplayNavigationItem(\"Admin\", Url.Admin())\n}\n- @DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/\")\n+ @DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/what-is-nuget\")\n@DisplayNavigationItem(\"Downloads\", Url.Downloads())\n@DisplayNavigationItem(\"Blog\", \"http://blog.nuget.org/\")\n</ul>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update docs link to "what is NuGet" page (#5637)
|
455,776 |
20.03.2018 09:04:16
| 25,200 |
adb51b89ab9df7ea94f720ecf83dd42bd9f8fbb6
|
Consistent naming for Admin/Administrator
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -614,7 +614,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Organization member '{0}' is the last admin and cannot be deleted..\n+ /// Looks up a localized string similar to Organization member '{0}' is the last administrator and cannot be deleted..\n/// </summary>\npublic static string DeleteMember_CannotDeleteLastAdmin {\nget {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -762,7 +762,7 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<value>You have successfully confirmed your email address!</value>\n</data>\n<data name=\"DeleteMember_CannotDeleteLastAdmin\" xml:space=\"preserve\">\n- <value>Organization member '{0}' is the last admin and cannot be deleted.</value>\n+ <value>Organization member '{0}' is the last administrator and cannot be deleted.</value>\n</data>\n<data name=\"UpdateMember_CannotRemoveLastAdmin\" xml:space=\"preserve\">\n<value>You can't change your role to collaborator. In order to change, another collaborator must be assigned as an administrator.</value>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"diff": "</a>\n</td>\n<td class=\"align-middle\">\n- @(organization.CurrentUserIsAdmin ? \"Admin\" : \"Collaborator\")\n+ @(organization.CurrentUserIsAdmin ? \"Administrator\" : \"Collaborator\")\n</td>\n<td class=\"align-middle text-nowrap\">\n@organization.MemberCount\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Consistent naming for Admin/Administrator (#5638)
|
455,747 |
20.03.2018 16:38:35
| 25,200 |
a3aed57149c8995096d5974a13a43893bdf7d676
|
[MSA] Add multifactor authentication schema
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/User.cs",
"new_path": "src/NuGetGallery.Core/Entities/User.cs",
"diff": "@@ -85,6 +85,8 @@ public User(string username)\npublic bool IsDeleted { get; set; }\n+ public bool EnableMultiFactorAuthentication { get; set; }\n+\npublic virtual ICollection<ReservedNamespace> ReservedNamespaces { get; set; }\n[DefaultValue(true)]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201803202317063_AddEnableMultiFactorAuthentication.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 AddEnableMultiFactorAuthentication : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddEnableMultiFactorAuthentication));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201803202317063_AddEnableMultiFactorAuthentication\"; }\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/201803202317063_AddEnableMultiFactorAuthentication.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddEnableMultiFactorAuthentication : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ AddColumn(\"dbo.Users\", \"EnableMultiFactorAuthentication\", c => c.Boolean(nullable: false));\n+ }\n+\n+ public override void Down()\n+ {\n+ DropColumn(\"dbo.Users\", \"EnableMultiFactorAuthentication\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201801101337052_RemovePackageEdits.Designer.cs\">\n<DependentUpon>201801101337052_RemovePackageEdits.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201803202317063_AddEnableMultiFactorAuthentication.cs\" />\n+ <Compile Include=\"Migrations\\201803202317063_AddEnableMultiFactorAuthentication.Designer.cs\">\n+ <DependentUpon>201803202317063_AddEnableMultiFactorAuthentication.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\\201801101337052_RemovePackageEdits.resx\">\n<DependentUpon>201801101337052_RemovePackageEdits.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201803202317063_AddEnableMultiFactorAuthentication.resx\">\n+ <DependentUpon>201803202317063_AddEnableMultiFactorAuthentication.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
|
[MSA] Add multifactor authentication schema (#5652)
|
455,776 |
21.03.2018 08:56:45
| 25,200 |
66544cd6bc5fcdcabb190fd12a91c5ba89b409f6
|
[Organizations] Allow collaborators to leave an organization
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"new_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"diff": "@@ -145,9 +145,12 @@ public async Task<JsonResult> DeleteMember(string accountName, string memberName\n{\nvar account = GetAccount(accountName);\n- if (account == null\n- || ActionsRequiringPermissions.ManageAccount.CheckPermissions(GetCurrentUser(), account)\n- != PermissionsCheckResult.Allowed)\n+ var currentUser = GetCurrentUser();\n+\n+ if (account == null ||\n+ (currentUser.Username != memberName &&\n+ ActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n+ != PermissionsCheckResult.Allowed))\n{\nreturn Json((int)HttpStatusCode.Forbidden, Strings.Unauthorized);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"diff": "this.GravatarUrl = member.GravatarUrl;\nthis.DeleteMember = function () {\n+ if (self.IsCurrentUser) {\n+ if (!window.nuget.confirmEvent(\"Are you sure you want to leave this organization? You will no longer be able to manage it or its packages if you do.\")) {\n+ return;\n+ }\n+ } else {\nif (!window.nuget.confirmEvent(\"Are you sure you want to delete member '\" + self.Username + \"'?\")) {\nreturn;\n}\n+ }\n// Build the request.\nvar data = {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "<span data-bind=\"text: SelectedRole()\"></span>\n}\n</td>\n- @if (Model.CanManage)\n- {\n+ <!-- ko if: IsCurrentUser || @(Model.CanManage ? \"true\" : \"false\") -->\n<td class=\"text-center align-middle heading-right member-controls col-xs-1\">\n<span>\n<a class=\"btn\" data-bind=\"click: DeleteMember, attr: { 'aria-label': 'Delete Member' }\">\n</a>\n</span>\n</td>\n- }\n+ <!-- /ko -->\n</tr>\n</tbody>\n</table>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -700,7 +700,7 @@ public async Task WhenEntityException_ReturnsNonSuccess()\n}\n[Fact]\n- public async Task WhenSuccess_ReturnsSuccess()\n+ public async Task WhenDeletingAsAdmin_ReturnsSuccess()\n{\n// Arrange\nvar controller = GetController();\n@@ -717,6 +717,26 @@ public async Task WhenSuccess_ReturnsSuccess()\nGetMock<IUserService>().Verify(s => s.DeleteMemberAsync(account, defaultMemberName), Times.Once);\n}\n+ [Fact]\n+ public async Task WhenDeletingSelfAsCollaborator_ReturnsSuccess()\n+ {\n+ // Arrange\n+ var controller = GetController();\n+ var account = GetAccount(controller);\n+ var collaborator = Fakes.OrganizationCollaborator;\n+ controller.SetCurrentUser(collaborator);\n+\n+ // Act\n+ var result = await InvokeDeleteMember(controller, account, memberName: collaborator.Username);\n+\n+ // Assert\n+ Assert.Equal(0, controller.Response.StatusCode);\n+ Assert.IsType<JsonResult>(result);\n+ Assert.Equal(Strings.DeleteMember_Success, ((JsonResult)result).Data);\n+\n+ GetMock<IUserService>().Verify(s => s.DeleteMemberAsync(account, collaborator.Username), Times.Once);\n+ }\n+\nprivate Task<JsonResult> InvokeDeleteMember(\nOrganizationsController controller,\nOrganization account,\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Allow collaborators to leave an organization (#5648)
|
455,776 |
21.03.2018 09:50:50
| 25,200 |
a7c8f112e0c1e337c7c202a0053c9538baeca59e
|
Remove member email address from edit organization page
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1053,7 +1053,7 @@ img.reserved-indicator-icon {\n.manage-members-listing .icon-left {\npadding-left: 25px;\n}\n-.manage-members-listing .member-icon {\n+.manage-members-listing .row-center {\nvertical-align: middle;\n}\n.page-manage-owners h2 .ms-Icon {\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": "padding-left: 25px;\n}\n- .member-icon {\n+ .row-center {\nvertical-align: middle;\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"diff": "this.OrganizationViewModel = parent;\nthis.Username = member.Username;\n- this.EmailAddress = member.EmailAddress;\nthis.IsAdmin = ko.observable(member.IsAdmin);\nthis.SelectedRole = ko.pureComputed({\nread: function () {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/OrganizationMemberViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/OrganizationMemberViewModel.cs",
"diff": "@@ -13,15 +13,12 @@ public OrganizationMemberViewModel(Membership membership)\nvar member = membership?.Member ?? throw new ArgumentNullException(nameof(membership));\nUsername = member.Username;\n- EmailAddress = member.EmailAddress;\nIsAdmin = membership.IsAdmin;\n- GravatarUrl = GravatarHelper.Url(EmailAddress, Constants.GravatarElementSize);\n+ GravatarUrl = GravatarHelper.Url(member.EmailAddress, Constants.GravatarElementSize);\n}\npublic string Username { get; }\n- public string EmailAddress { get; }\n-\npublic bool IsAdmin { get; }\npublic string GravatarUrl { get; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"diff": "Members = Model.Members.Select(m => new\n{\nUsername = m.Username,\n- EmailAddress = m.EmailAddress,\nIsAdmin = m.IsAdmin,\nIsCurrentUser = m.Username.Equals(CurrentUser.Username, StringComparison.OrdinalIgnoreCase),\nGravatarUrl = m.GravatarUrl\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "<table class=\"table\">\n<tbody data-bind=\"foreach: Members\">\n<tr>\n- <td class=\"align-middle member-icon icon-left hidden-xs col-xs-1\">\n+ <td class=\"align-middle row-center icon-left hidden-xs col-xs-1\">\n<img data-bind=\"attr: { src: GravatarUrl, title: Username }\" class=\"owner-image\" alt=\"gravatar\"\nheight=\"@Constants.GravatarElementSize\" width=\"@Constants.GravatarElementSize\">\n</td>\n- <td class=\"align-middle heading-right member-username col-xs-8 col-sm-7\">\n+ <td class=\"align-middle heading-right row-center col-xs-8 col-sm-7\">\n<a title=\"View Member Profile\" data-bind=\"attr: { href: ProfileUrl }\">\n<span data-bind=\"text: Username\"></span>\n</a>\n<!-- ko if: IsCurrentUser -->\n<i>(that's you)</i>\n<!-- /ko -->\n- <div data-bind=\"text: EmailAddress\"></div>\n</td>\n- <td class=\"align-middle heading-left heading-right member-username col-xs-3\">\n+ <td class=\"align-middle heading-left heading-right row-center col-xs-3\">\n@if (Model.CanManage)\n{\n<select class=\"form-control\" aria-label=\"Change member role\"\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove member email address from edit organization page (#5643)
|
455,776 |
22.03.2018 11:04:24
| 25,200 |
6b0433eb99c0bf2a6c2c4676ac17d6f81351de55
|
[Organizations] Verify Organization Email Address in Add Organization form
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/AddOrganizationViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/AddOrganizationViewModel.cs",
"diff": "@@ -15,6 +15,7 @@ public class AddOrganizationViewModel\n[Required]\n[StringLength(255)]\n[Display(Name = \"Organization Email Address\")]\n+ [RegularExpression(Constants.EmailValidationRegex, ErrorMessage = \"This doesn't appear to be a valid email address.\")]\npublic string OrganizationEmailAddress { get; set; }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Verify Organization Email Address in Add Organization form (#5602)
|
455,736 |
22.03.2018 08:28:06
| 25,200 |
c3c92c20e6edf23f3ff498690f6f08a6c3896995
|
Add GetPriviledgedFileUriAsync to create SAS enabled URLs
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Services\\CorePackageFileService.cs\" />\n<Compile Include=\"Services\\CorePackageService.cs\" />\n<Compile Include=\"Services\\CryptographyService.cs\" />\n+ <Compile Include=\"Services\\FileUriPermissions.cs\" />\n<Compile Include=\"Services\\IAccessCondition.cs\" />\n<Compile Include=\"Services\\ICloudBlobClient.cs\" />\n<Compile Include=\"Services\\ICloudBlobContainer.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs",
"diff": "@@ -300,7 +300,39 @@ public async Task SaveFileAsync(string folderName, string fileName, Stream packa\nawait blob.SetPropertiesAsync();\n}\n+ public async Task<Uri> GetPriviledgedFileUriAsync(\n+ string folderName,\n+ string fileName,\n+ FileUriPermissions permissions,\n+ DateTimeOffset endOfAccess)\n+ {\n+ var blob = await GetBlobForUriAsync(folderName, fileName, endOfAccess);\n+\n+ return new Uri(\n+ blob.Uri,\n+ blob.GetSharedAccessSignature(MapFileUriPermissions(permissions), endOfAccess));\n+ }\n+\npublic async Task<Uri> GetFileReadUriAsync(string folderName, string fileName, DateTimeOffset? endOfAccess)\n+ {\n+ var blob = await GetBlobForUriAsync(folderName, fileName, endOfAccess);\n+\n+ if (IsPublicContainer(folderName))\n+ {\n+ return blob.Uri;\n+ }\n+\n+ return new Uri(\n+ blob.Uri,\n+ blob.GetSharedAccessSignature(SharedAccessBlobPermissions.Read, endOfAccess));\n+ }\n+\n+ private static SharedAccessBlobPermissions MapFileUriPermissions(FileUriPermissions permissions)\n+ {\n+ return (SharedAccessBlobPermissions)permissions;\n+ }\n+\n+ private async Task<ISimpleCloudBlob> GetBlobForUriAsync(string folderName, string fileName, DateTimeOffset? endOfAccess)\n{\nfolderName = folderName ?? throw new ArgumentNullException(nameof(folderName));\nfileName = fileName ?? throw new ArgumentNullException(nameof(fileName));\n@@ -308,20 +340,15 @@ public async Task<Uri> GetFileReadUriAsync(string folderName, string fileName, D\n{\nthrow new ArgumentOutOfRangeException(nameof(endOfAccess), $\"{nameof(endOfAccess)} is in the past\");\n}\n- bool isPublicFolder = IsPublicContainer(folderName);\n- if (!isPublicFolder && endOfAccess == null)\n+\n+ if (!IsPublicContainer(folderName) && endOfAccess == null)\n{\nthrow new ArgumentNullException(nameof(endOfAccess), $\"{nameof(endOfAccess)} must not be null for non-public containers\");\n}\nICloudBlobContainer container = await GetContainerAsync(folderName);\n- var blob = container.GetBlobReference(fileName);\n- if (isPublicFolder)\n- {\n- return blob.Uri;\n- }\n- return new Uri(blob.Uri, blob.GetSharedReadSignature(endOfAccess));\n+ return container.GetBlobReference(fileName);\n}\nprotected async Task<ICloudBlobContainer> GetContainerAsync(string folderName)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"diff": "@@ -130,15 +130,15 @@ public Task FetchAttributesAsync()\nstate: null);\n}\n- public string GetSharedReadSignature(DateTimeOffset? endOfAccess)\n+ public string GetSharedAccessSignature(SharedAccessBlobPermissions permissions, DateTimeOffset? endOfAccess)\n{\nvar accessPolicy = new SharedAccessBlobPolicy\n{\nSharedAccessExpiryTime = endOfAccess,\n- Permissions = SharedAccessBlobPermissions.Read\n+ Permissions = permissions,\n};\n- var signature = this._blob.GetSharedAccessSignature(accessPolicy);\n+ var signature = _blob.GetSharedAccessSignature(accessPolicy);\nreturn signature;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreFileStorageService.cs",
"diff": "@@ -34,6 +34,22 @@ public interface ICoreFileStorageService\n/// <returns>Time limited URI (if requested and implementation supports it) for the specified file.</returns>\nTask<Uri> GetFileReadUriAsync(string folderName, string fileName, DateTimeOffset? endOfAccess);\n+ /// <summary>\n+ /// Generates a storage file URI giving certain permissions for the specific file. For example, this method can\n+ /// be used to generate a URI that allows the caller to either delete (via\n+ /// <see cref=\"FileUriPermissions.Delete\"/>) or read (via <see cref=\"FileUriPermissions.Read\"/>) the file.\n+ /// </summary>\n+ /// <param name=\"folderName\">The folder name containing the file.</param>\n+ /// <param name=\"fileName\">The file name.</param>\n+ /// <param name=\"permissions\">The permissions to give to the privileged URI.</param>\n+ /// <param name=\"endOfAccess\">The time when the access ends.</param>\n+ /// <returns>The URI with privileged access.</returns>\n+ Task<Uri> GetPriviledgedFileUriAsync(\n+ string folderName,\n+ string fileName,\n+ FileUriPermissions permissions,\n+ DateTimeOffset endOfAccess);\n+\nTask SaveFileAsync(string folderName, string fileName, Stream packageFile, bool overwrite = true);\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"new_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"diff": "@@ -31,16 +31,17 @@ public interface ISimpleCloudBlob\nTask StartCopyAsync(ISimpleCloudBlob source, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition);\n/// <summary>\n- /// Generates the shared read signature that if appended to the blob URI\n- /// would allow reading the contents of the blob using the produced URI\n- /// only (without storage account credentials).\n+ /// Generates the shared access signature that if appended to the blob URI\n+ /// would allow actions matching the provided <paramref name=\"permissions\"/> without having access to the\n+ /// access keys of the storage account.\n/// </summary>\n+ /// <param name=\"permissions\">The permissions to include in the SAS token.</param>\n/// <param name=\"endOfAccess\">\n/// \"End of access\" timestamp. After the specified timestamp,\n/// the returned signature becomes invalid if implementation supports it.\n/// Null for no time limit.\n/// </param>\n/// <returns>Shared access signature in form of URI query portion.</returns>\n- string GetSharedReadSignature(DateTimeOffset? endOfAccess);\n+ string GetSharedAccessSignature(SharedAccessBlobPermissions permissions, DateTimeOffset? endOfAccess);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/FileSystemFileStorageService.cs",
"diff": "using System;\nusing System.Globalization;\nusing System.IO;\n-using System.Security.Cryptography;\nusing System.Threading.Tasks;\nusing System.Web.Hosting;\nusing System.Web.Mvc;\n@@ -237,6 +236,12 @@ public Task<Uri> GetFileReadUriAsync(string folderName, string fileName, DateTim\nthrow new NotImplementedException();\n}\n+ public Task<Uri> GetPriviledgedFileUriAsync(string folderName, string fileName, FileUriPermissions permissions, DateTimeOffset endOfAccess)\n+ {\n+ /// Not implemented for the same reason as <see cref=\"GetFileReadUriAsync(string, string, DateTimeOffset?)\"/>.\n+ throw new NotImplementedException();\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/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\\FileUriPermissionsFacts.cs\" />\n<Compile Include=\"TestUtils\\BlobStorageCollection.cs\" />\n<Compile Include=\"TestUtils\\BlobStorageFact.cs\" />\n<Compile Include=\"TestUtils\\BlobStorageFixture.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -512,14 +512,22 @@ public async Task WillSetTheBlobContentType(string folderName, string contentTyp\n}\n}\n- public class TheGetFileReadUriAsyncMethod\n+ public class TheGetPriviledgedFileUriAsyncMethod\n{\n+ private const string folderName = \"theFolderName\";\n+ private const string fileName = \"theFileName\";\n+ private const string signature = \"?secret=42\";\n+\n[Fact]\npublic async Task WillThrowIfFolderIsNull()\n{\nvar service = CreateService();\n- var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetFileReadUriAsync(null, \"theFileName\", DateTimeOffset.UtcNow.AddHours(3)));\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetPriviledgedFileUriAsync(\n+ null,\n+ fileName,\n+ FileUriPermissions.Read,\n+ DateTimeOffset.UtcNow.AddHours(3)));\nAssert.Equal(\"folderName\", ex.ParamName);\n}\n@@ -528,7 +536,11 @@ public async Task WillThrowIfFilenameIsNull()\n{\nvar service = CreateService();\n- var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetFileReadUriAsync(\"theFolder\", null, DateTimeOffset.UtcNow.AddHours(3)));\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetPriviledgedFileUriAsync(\n+ folderName,\n+ null,\n+ FileUriPermissions.Read,\n+ DateTimeOffset.UtcNow.AddHours(3)));\nAssert.Equal(\"fileName\", ex.ParamName);\n}\n@@ -538,13 +550,129 @@ public async Task WillThrowIfEndOfAccessIsInThePast()\nvar service = CreateService();\nDateTimeOffset inThePast = DateTimeOffset.UtcNow.AddSeconds(-1);\n- var ex = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => service.GetFileReadUriAsync(\"theFolder\", \"theFileName\", inThePast));\n+ var ex = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => service.GetPriviledgedFileUriAsync(\n+ folderName,\n+ fileName,\n+ FileUriPermissions.Read,\n+ inThePast));\nAssert.Equal(\"endOfAccess\", ex.ParamName);\n}\n+ [Theory]\n+ [InlineData(CoreConstants.ValidationFolderName, \"http://example.com/\" + CoreConstants.ValidationFolderName + \"/\" + fileName + signature)]\n+ [InlineData(CoreConstants.PackagesFolderName, \"http://example.com/\" + CoreConstants.PackagesFolderName + \"/\" + fileName + signature)]\n+ public async Task WillAlwaysUseSasTokenDependingOnContainerAvailability(string containerName, string expectedUri)\n+ {\n+ var setupResult = Setup(containerName, fileName);\n+ var fakeBlobClient = setupResult.Item1;\n+ var fakeBlob = setupResult.Item2;\n+ var blobUri = setupResult.Item3;\n+\n+ fakeBlob\n+ .Setup(b => b.GetSharedAccessSignature(SharedAccessBlobPermissions.Read, It.IsAny<DateTimeOffset?>()))\n+ .Returns(signature);\n+ var service = CreateService(fakeBlobClient);\n+\n+ var uri = await service.GetPriviledgedFileUriAsync(\n+ containerName,\n+ fileName,\n+ FileUriPermissions.Read,\n+ DateTimeOffset.Now.AddHours(3));\n+\n+ Assert.Equal(expectedUri, uri.AbsoluteUri);\n+ }\n+\n+ [Fact]\n+ public async Task WillPassTheEndOfAccessTimestampFurther()\n+ {\n+ const string folderName = CoreConstants.ValidationFolderName;\n+ const string fileName = \"theFileName\";\n+ const string signature = \"?secret=42\";\n+ DateTimeOffset endOfAccess = DateTimeOffset.Now.AddHours(3);\n+ var setupResult = Setup(folderName, fileName);\n+ var fakeBlobClient = setupResult.Item1;\n+ var fakeBlob = setupResult.Item2;\n+ var blobUri = setupResult.Item3;\n+\n+ fakeBlob\n+ .Setup(b => b.GetSharedAccessSignature(\n+ SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.Delete,\n+ endOfAccess))\n+ .Returns(signature)\n+ .Verifiable();\n+\n+ var service = CreateService(fakeBlobClient);\n+\n+ var uri = await service.GetPriviledgedFileUriAsync(\n+ folderName,\n+ fileName,\n+ FileUriPermissions.Read | FileUriPermissions.Delete,\n+ endOfAccess);\n+\n+ string expectedUri = new Uri(blobUri, signature).AbsoluteUri;\n+ Assert.Equal(expectedUri, uri.AbsoluteUri);\n+ fakeBlob.Verify(\n+ b => b.GetSharedAccessSignature(SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.Delete, endOfAccess),\n+ Times.Once);\n+ fakeBlob.Verify(\n+ b => b.GetSharedAccessSignature(It.IsAny<SharedAccessBlobPermissions>(),\n+ It.IsAny<DateTimeOffset?>()), Times.Once);\n+ }\n+\n+ private static Tuple<Mock<ICloudBlobClient>, Mock<ISimpleCloudBlob>, Uri> Setup(string folderName, string fileName)\n+ {\n+ var fakeBlobClient = new Mock<ICloudBlobClient>();\n+ var fakeContainer = new Mock<ICloudBlobContainer>();\n+ fakeBlobClient\n+ .Setup(bc => bc.GetContainerReference(folderName))\n+ .Returns(fakeContainer.Object)\n+ .Callback(() => { int i = 0; i = i + 1; });\n+ var fakeBlob = new Mock<ISimpleCloudBlob>();\n+ fakeContainer.Setup(c => c.GetBlobReference(fileName)).Returns(fakeBlob.Object);\n+\n+ var blobUri = new Uri($\"http://example.com/{folderName}/{fileName}\");\n+\n+ fakeBlob.SetupGet(b => b.Uri).Returns(blobUri);\n+\n+ return Tuple.Create(fakeBlobClient, fakeBlob, blobUri);\n+ }\n+ }\n+\n+\n+ public class TheGetFileReadUriAsyncMethod\n+ {\n+ private const string folderName = \"theFolderName\";\nprivate const string fileName = \"theFileName\";\nprivate const string signature = \"?secret=42\";\n+ [Fact]\n+ public async Task WillThrowIfFolderIsNull()\n+ {\n+ var service = CreateService();\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetFileReadUriAsync(null, fileName, DateTimeOffset.UtcNow.AddHours(3)));\n+ Assert.Equal(\"folderName\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillThrowIfFilenameIsNull()\n+ {\n+ var service = CreateService();\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetFileReadUriAsync(folderName, null, DateTimeOffset.UtcNow.AddHours(3)));\n+ Assert.Equal(\"fileName\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillThrowIfEndOfAccessIsInThePast()\n+ {\n+ var service = CreateService();\n+\n+ DateTimeOffset inThePast = DateTimeOffset.UtcNow.AddSeconds(-1);\n+ var ex = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => service.GetFileReadUriAsync(folderName, fileName, inThePast));\n+ Assert.Equal(\"endOfAccess\", ex.ParamName);\n+ }\n+\n[Theory]\n[InlineData(CoreConstants.ValidationFolderName, \"http://example.com/\" + CoreConstants.ValidationFolderName + \"/\" + fileName + signature)]\n[InlineData(CoreConstants.PackagesFolderName, \"http://example.com/\" + CoreConstants.PackagesFolderName + \"/\" + fileName)]\n@@ -555,7 +683,9 @@ public async Task WillUseSasTokenDependingOnContainerAvailability(string contain\nvar fakeBlob = setupResult.Item2;\nvar blobUri = setupResult.Item3;\n- fakeBlob.Setup(b => b.GetSharedReadSignature(It.IsAny<DateTimeOffset?>())).Returns(signature);\n+ fakeBlob\n+ .Setup(b => b.GetSharedAccessSignature(SharedAccessBlobPermissions.Read, It.IsAny<DateTimeOffset?>()))\n+ .Returns(signature);\nvar service = CreateService(fakeBlobClient);\nvar uri = await service.GetFileReadUriAsync(containerName, fileName, DateTimeOffset.Now.AddHours(3));\n@@ -568,7 +698,7 @@ public async Task WillThrowIfNoEndOfAccessSpecifiedForNonPublicContainer()\n{\nvar service = CreateService();\n- var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetFileReadUriAsync(CoreConstants.ValidationFolderName, \"theFileName\", null));\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetFileReadUriAsync(CoreConstants.ValidationFolderName, fileName, null));\nAssert.Equal(\"endOfAccess\", ex.ParamName);\n}\n@@ -588,7 +718,6 @@ public async Task WillNotThrowIfNoEndOfAccessSpecifiedForPublicContainer()\npublic async Task WillPassTheEndOfAccessTimestampFurther()\n{\nconst string folderName = CoreConstants.ValidationFolderName;\n- const string fileName = \"theFileName\";\nconst string signature = \"?secret=42\";\nDateTimeOffset endOfAccess = DateTimeOffset.Now.AddHours(3);\nvar setupResult = Setup(folderName, fileName);\n@@ -596,7 +725,10 @@ public async Task WillPassTheEndOfAccessTimestampFurther()\nvar fakeBlob = setupResult.Item2;\nvar blobUri = setupResult.Item3;\n- fakeBlob.Setup(b => b.GetSharedReadSignature(endOfAccess)).Returns(signature).Verifiable();\n+ fakeBlob\n+ .Setup(b => b.GetSharedAccessSignature(SharedAccessBlobPermissions.Read, endOfAccess))\n+ .Returns(signature)\n+ .Verifiable();\nvar service = CreateService(fakeBlobClient);\n@@ -604,8 +736,8 @@ public async Task WillPassTheEndOfAccessTimestampFurther()\nstring expectedUri = new Uri(blobUri, signature).AbsoluteUri;\nAssert.Equal(expectedUri, uri.AbsoluteUri);\n- fakeBlob.Verify(b => b.GetSharedReadSignature(endOfAccess), Times.Once);\n- fakeBlob.Verify(b => b.GetSharedReadSignature(It.IsAny<DateTimeOffset?>()), Times.Once);\n+ fakeBlob.Verify(b => b.GetSharedAccessSignature(SharedAccessBlobPermissions.Read, endOfAccess), Times.Once);\n+ fakeBlob.Verify(b => b.GetSharedAccessSignature(It.IsAny<SharedAccessBlobPermissions>(), It.IsAny<DateTimeOffset?>()), Times.Once);\n}\nprivate static Tuple<Mock<ICloudBlobClient>, Mock<ISimpleCloudBlob>, Uri> Setup(string folderName, string fileName)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"diff": "using System.Text;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\n+using Microsoft.WindowsAzure.Storage.Auth;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Moq;\nusing NuGetGallery.Diagnostics;\n@@ -52,6 +53,40 @@ public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixtur\n_targetB = new CloudBlobCoreFileStorageService(_clientB, Mock.Of<IDiagnosticsService>());\n}\n+ [BlobStorageFact]\n+ public async Task CanReadAndDeleteBlobUsingPrivilegedFileUri()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var expectedContent = \"Hello, world.\";\n+\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(expectedContent)),\n+ overwrite: false);\n+\n+ var deleteUri = await _targetA.GetPriviledgedFileUriAsync(\n+ folderName,\n+ fileName,\n+ FileUriPermissions.Read | FileUriPermissions.Delete,\n+ DateTimeOffset.UtcNow.AddHours(1));\n+\n+ // Act\n+ var sasToken = new StorageCredentials(deleteUri.Query);\n+ var deleteUriBuilder = new UriBuilder(deleteUri) { Query = null };\n+ var blob = new CloudBlockBlob(deleteUriBuilder.Uri, sasToken);\n+\n+ var actualContent = await blob.DownloadTextAsync();\n+ await blob.DeleteAsync();\n+\n+ // Assert\n+ Assert.Equal(expectedContent, actualContent);\n+ var exists = await _targetA.FileExistsAsync(folderName, fileName);\n+ Assert.False(exists, \"The file should no longer exist.\");\n+ }\n+\n[BlobStorageFact]\npublic async Task CopyingWithUriWorksWithinTheSameStorageAccount()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add GetPriviledgedFileUriAsync to create SAS enabled URLs (#5664)
Progress on https://github.com/NuGet/Engineering/issues/1207
|
455,776 |
22.03.2018 13:16:31
| 25,200 |
40fa69e22b5bb7562682933394ae61c926a6b583
|
Fix DEV build: remove missing cshtml from csproj
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Views\\Shared\\_AutocompleteTemplate.cshtml\" />\n<Content Include=\"Views\\Authentication\\_SigninAssistance.cshtml\" />\n<Content Include=\"Views\\Organizations\\Add.cshtml\" />\n- <Content Include=\"Views\\Organizations\\HandleOrganizationMembershipRequestModel.cshtml\" />\n<Content Include=\"Views\\Organizations\\HandleOrganizationMembershipRequest.cshtml\" />\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix DEV build: remove missing cshtml from csproj (#5667)
|
455,776 |
22.03.2018 13:57:26
| 25,200 |
75e36eeb99c51c3cf387c5c9ee650a657ee9331f
|
[Organizations] Decouple organization support from whitelist
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "@@ -47,11 +47,11 @@ public bool IsLoginDiscontinued(AuthenticatedUser authUser)\nvar email = authUser.User.ToMailAddress();\nreturn\nauthUser.CredentialUsed.IsPassword() &&\n- AreOrganizationsSupportedForUser(authUser.User) &&\n+ IsUserOnWhitelist(authUser.User) &&\n!ExceptionsForEmailAddresses.Contains(email.Address);\n}\n- public bool AreOrganizationsSupportedForUser(User user)\n+ public bool IsUserOnWhitelist(User user)\n{\nif (user == null)\n{\n@@ -79,7 +79,7 @@ public bool ShouldUserTransformIntoOrganization(User user)\npublic interface ILoginDiscontinuationConfiguration\n{\nbool IsLoginDiscontinued(AuthenticatedUser authUser);\n- bool AreOrganizationsSupportedForUser(User user);\n+ bool IsUserOnWhitelist(User user);\nbool ShouldUserTransformIntoOrganization(User user);\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": "@@ -442,11 +442,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_NotInDomainWhitelist, 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_NotInDomainWhitelist, 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": "@@ -1084,15 +1084,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_NotInDomainWhitelist {\n- get {\n- return ResourceManager.GetString(\"Organizations_NotInDomainWhitelist\", 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": "@@ -706,9 +706,6 @@ For more information, please contact '{2}'.</value>\n<data name=\"TransformAccount_AccountNotConfirmed\" xml:space=\"preserve\">\n<value>Account '{0}' should be a confirmed user.</value>\n</data>\n- <data name=\"Organizations_NotInDomainWhitelist\" xml:space=\"preserve\">\n- <value>Account '{0}' does not support organizations.</value>\n- </data>\n<data name=\"TransformAccount_AccountIsAnOrganization\" xml:space=\"preserve\">\n<value>Account '{0}' is already an organization.</value>\n</data>\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 (CurrentUser.Organizations.Any() ||\n- 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/LoginDiscontinuationConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"diff": "@@ -136,11 +136,11 @@ private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList,\n}\n}\n- public class TheSupportedForUserMethods\n+ public class TheWhitelistMethods\n{\npublic static IEnumerable<object[]> PossibleListStates => PossibleListStates;\n- public void IsSupportedAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n+ public void ReturnsAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n{\n// Arrange\nvar user = new User(\"test\") { EmailAddress = _email };\n@@ -148,7 +148,7 @@ public void IsSupportedAsExpected(bool isOnWhiteList, bool isOnDomainList, bool\nvar config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n// Act\n- var areOrganizationsSupported = config.AreOrganizationsSupportedForUser(user);\n+ var areOrganizationsSupported = config.IsUserOnWhitelist(user);\nvar shouldTransform = config.ShouldUserTransformIntoOrganization(user);\n// Assert\n@@ -156,11 +156,11 @@ public void IsSupportedAsExpected(bool isOnWhiteList, bool isOnDomainList, bool\nAssert.Equal(isOnTransformList, shouldTransform);\n}\n- public void IsUnsupportedWhenNull()\n+ public void ReturnsFalseWhenNull()\n{\nvar config = new LoginDiscontinuationConfiguration();\n- var areOrganizationsSupported = config.AreOrganizationsSupportedForUser(null);\n+ var areOrganizationsSupported = config.IsUserOnWhitelist(null);\nvar shouldTransform = config.ShouldUserTransformIntoOrganization(null);\nAssert.False(areOrganizationsSupported);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -1155,33 +1155,6 @@ public void WhenAccountHasMemberships_ReturnsFalse()\nStrings.TransformAccount_AccountHasMemberships, fakes.OrganizationCollaborator.Username));\n}\n- [Fact]\n- public void WhenAccountIsNotInWhitelist_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- string errorReason;\n- var result = service.CanTransformUserToOrganization(user, out errorReason);\n-\n- // Assert\n- Assert.False(result);\n- Assert.Equal(errorReason, String.Format(CultureInfo.CurrentCulture,\n- Strings.Organizations_NotInDomainWhitelist, user.Username));\n- }\n-\n[Fact]\npublic void WhenAccountIsInWhitelist_ReturnsTrue()\n{\n@@ -1190,15 +1163,6 @@ public void WhenAccountIsInWhitelist_ReturnsTrue()\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, out errorReason);\n@@ -1218,15 +1182,6 @@ 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@@ -1246,15 +1201,6 @@ 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@@ -1274,15 +1220,6 @@ 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@@ -1449,18 +1386,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_NotInDomainWhitelist, 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@@ -1470,8 +1395,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@@ -1489,8 +1412,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@@ -1507,7 +1428,6 @@ public async Task WhenAdminHasNoTenant_ThrowsEntityException()\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\nvar adminUsername = \"adminWithNoTenant\";\n- SetupOrganizationsSupportedForUser(adminUsername);\nvar exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(admin: new User(adminUsername)));\nAssert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.Organizations_AdminAccountDoesNotHaveTenant, adminUsername), exception.Message);\n@@ -1526,7 +1446,6 @@ public async Task WhenSubscribingToPolicyFails_ThrowsUserSafeException()\n_service.MockSecurityPolicyService\n.Setup(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false))\n.Returns(Task.FromResult(false));\n- SetupOrganizationsSupportedForUser();\nvar exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization());\nAssert.Equal(Strings.DefaultUserSafeExceptionMessage, exception.Message);\n@@ -1546,7 +1465,6 @@ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\n_service.MockSecurityPolicyService\n.Setup(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false))\n.Returns(Task.FromResult(true));\n- SetupOrganizationsSupportedForUser();\nvar org = await InvokeAddOrganization();\n@@ -1589,18 +1507,6 @@ private Task<Organization> InvokeAddOrganization(string orgName = OrgName, strin\n// Act\nreturn _service.AddOrganizationAsync(orgName, orgEmail, admin);\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
|
[Organizations] Decouple organization support from whitelist (#5642)
|
455,776 |
22.03.2018 15:05:41
| 25,200 |
a363b16811050798566d9be2da3d3b88c19401db
|
[Organizations] Hide organization confirmation link when user is a collaborator
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountConfirmationNotices.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountConfirmationNotices.cshtml",
"diff": "ViewBag.ConfirmationLink = Url.OrganizationConfirmationRequired(account.Username);\nViewBag.UnconfirmedEmailMessage = \"A new organization email address was recently registered: \";\nViewBag.ConfirmNowLinkText = \"confirm your organization account\";\n+ ViewBag.ShowConfirmationLink = (Model as OrganizationAccountViewModel).CanManage;\n+ ViewBag.NonConfirmationText = \"Your organization needs to be confirmed before you can upload any packages to it.\";\n}\nelse\n{\nViewBag.ConfirmationLink = Url.ConfirmationRequired();\nViewBag.UnconfirmedEmailMessage = \"You recently registered a new email address: \";\nViewBag.ConfirmNowLinkText = \"confirm your account\";\n+ ViewBag.ShowConfirmationLink = true;\n+ ViewBag.NonConfirmationText = \"Your account needs to be confirmed before you can upload any packages.\";\n}\n}\n@if (Model.HasConfirmedEmailAddress)\n{\n+ var linkText = \"new email address is verified.\";\n<text>\nWe will continue sending notification emails to the old verified email address (@account.EmailAddress)\n- until the <a href=\"@ViewBag.ConfirmationLink\">new email address is verified.</a>\n+ until the @(ViewBag.ShowConfirmationLink ? Html.Raw(\"<a href=\\\"\" + ViewBag.ConfirmationLink + \"\\\">\" + linkText + \"</a>\") : linkText)\n</text>\n}\nelse\n{\n+ var linkText = \"email address has been verified.\";\n<text>\n- We will only send notification emails after the <a href=\"@ViewBag.ConfirmationLink\">email address has been verified.</a><br />\n+ We will only send notification emails after the @(ViewBag.ShowConfirmationLink ? Html.Raw(\"<a href=\\\"\" + ViewBag.ConfirmationLink + \"\\\">\" + linkText + \"</a>\") : linkText)<br />\n</text>\n}\n</text>)\n}\n@if (!account.Confirmed)\n+{\n+ if (ViewBag.ShowConfirmationLink)\n{\n@ViewHelpers.AlertInfo(\n- @<text>\n- Uploading packages requires that you <a href=\"@ViewBag.ConfirmationLink\">@ViewBag.ConfirmNowLinkText</a>. Why not get that out of the way now?\n- </text>)\n+ @<text>Uploading packages requires that you <a href=\"@ViewBag.ConfirmationLink\">@ViewBag.ConfirmNowLinkText</a>. Why not get that out of the way now?</text>)\n+ }\n+ else\n+ {\n+ @ViewHelpers.AlertInfo(\n+ @<text>@ViewBag.NonConfirmationText</text>)\n+ }\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Hide organization confirmation link when user is a collaborator (#5655)
|
455,776 |
23.03.2018 10:43:52
| 25,200 |
920df2c6bdf98e372f59d19978841355583dc2c4
|
[Organizations] Add UI to explain admin vs. collaborator
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1041,19 +1041,32 @@ img.reserved-indicator-icon {\n.manage-members-listing tbody:first-child {\nborder-style: hidden;\n}\n-.manage-members-listing {\n+.members-list {\n+ margin-top: 15px;\n+}\n+.members-list .manage-members-listing {\nmargin-bottom: 0;\n}\n-.manage-members-listing .heading-left {\n+.members-list .manage-members-listing .heading-left {\npadding-left: 5px;\n}\n-.manage-members-listing .heading-right {\n+.members-list .manage-members-listing .heading-right {\npadding-right: 5px;\n}\n-.manage-members-listing .icon-left {\n+.members-list .manage-members-listing .icon-left {\npadding-left: 25px;\n}\n-.manage-members-listing .row-center {\n+.members-list .manage-members-listing .icon-right {\n+ padding-right: 20px;\n+}\n+.members-list .manage-members-listing .role-description {\n+ margin-top: 15px;\n+ margin-bottom: 25px;\n+}\n+.members-list .manage-members-listing .alert {\n+ margin-bottom: 5px;\n+}\n+.members-list .manage-members-listing .row-center {\nvertical-align: middle;\n}\n.page-manage-owners h2 .ms-Icon {\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": "border-style: hidden\n}\n+.members-list {\n+ margin-top: 15px;\n+\n.manage-members-listing {\nmargin-bottom: 0;\npadding-left: 25px;\n}\n+ .icon-right {\n+ padding-right: 20px;\n+ }\n+\n+ .role-description {\n+ margin-top: 15px;\n+ margin-bottom: 25px;\n+ }\n+\n+ .alert {\n+ margin-bottom: 5px;\n+ }\n+\n.row-center {\nvertical-align: middle;\n}\n}\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"diff": "this.ProfileUrlTemplate = initialData.ProfileUrlTemplate;\nthis.NewMemberUsername = ko.observable();\n+ this.NewMemberRoleDescription = ko.pureComputed(function () {\n+ if (self.AddMemberIsAdmin()) {\n+ return \"An administrator can manage the organization's memberships and its packages.\";\n+ } else {\n+ return \"A collaborator can manage the organization's packages but cannot manage the organization's memberships.\";\n+ }\n+ });\nthis.AdminCount = ko.observable();\nthis.CollaboratorCount = ko.observable();\nthis.RoleNames = ko.observableArray([\"Administrator\", \"Collaborator\"]);\nthis.AddMemberRole = ko.observable(this.RoleNames()[1]);\n+ this.AddMemberIsAdmin = ko.pureComputed(function () {\n+ return self.AddMemberRole() == self.RoleNames()[0];\n+ });\nthis.AddMember = function () {\n// Check if the member already exists.\nvar memberExists = false;\nvar data = {\naccountName: self.AccountName,\nmemberName: self.NewMemberUsername(),\n- isAdmin: self.AddMemberRole() == self.RoleNames()[0]\n+ isAdmin: self.AddMemberIsAdmin()\n};\naddAntiForgeryToken(data);\n// Set up the data binding.\nvar manageOrganizationViewModel = new ManageOrganizationViewModel(initialData);\nko.applyBindings(manageOrganizationViewModel, document.body);\n+\n+ // Set up the Add Member textbox to submit upon pressing enter.\n+ var newMemberTextbox = $(\"#new-member-textbox\");\n+ newMemberTextbox.keydown(function (event) {\n+ if (event.which == 13 && newMemberTextbox.val()) {\n+ manageOrganizationViewModel.AddMember();\n+ }\n+ });\n});\n})();\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "<div data-bind=\"text: MembersLabel\"></div>\n</text>,\n@<text>\n- <div data-bind=\"template: 'error-container'\"></div>\n<div class=\"row members-list\">\n<div data-bind=\"template: { name: 'manage-members' }\"></div>\n</div>\n</text>, expanded: false)\n<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+ </p>\n<!-- ko if: Error -->\n@ViewHelpers.AlertDanger(@<text><span data-bind=\"html: Error\"></span></text>)\n<!-- /ko -->\n{\n<div class=\"input-group col-xs-12\">\n<div class=\"col-xs-8 icon-left heading-right\">\n- <input class=\"form-control\" placeholder=\"Add existing NuGet.org user\" data-bind=\"textInput: NewMemberUsername, submit: AddMember\" aria-label=\"Enter username to add member\" />\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<select class=\"form-control\" data-bind=\"value: AddMemberRole, options: RoleNames\" aria-label=\"Select new member role\">\n<div class=\"text-center align-middle col-xs-1\">\n<button class=\"btn\" type=\"submit\" title=\"Add new member\" aria-label=\"Add new member\" data-bind=\"click: AddMember, enable: NewMemberUsername\">Add</button>\n</div>\n- </div><br />\n+ </div>\n+ <div class=\"icon-left icon-right\" data-bind=\"template: 'error-container'\"></div>\n}\n<table class=\"table\">\n<tbody data-bind=\"foreach: Members\">\n}\n</td>\n<!-- ko if: IsCurrentUser || @(Model.CanManage ? \"true\" : \"false\") -->\n- <td class=\"text-center align-middle heading-right member-controls col-xs-1\">\n+ <td class=\"text-center align-middle heading-right row-center col-xs-1\">\n<span>\n<a class=\"btn\" data-bind=\"click: DeleteMember, attr: { 'aria-label': 'Delete Member' }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Add UI to explain admin vs. collaborator (#5645)
|
455,776 |
26.03.2018 09:51:41
| 25,200 |
2c9f9d5ed27583abbaa7c9f47025fbcd267e25b2
|
[Organizations] Obfuscate organization routes containing usernames
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -298,6 +298,33 @@ public static void RegisterUIRoutes(RouteCollection routes)\n\"account/delete\",\nnew { controller = \"Users\", action = \"DeleteRequest\" });\n+ routes.MapRoute(\n+ RouteName.TransformToOrganization,\n+ \"account/transform\",\n+ new { controller = \"Users\", action = RouteName.TransformToOrganization });\n+\n+ routes.MapRoute(\n+ RouteName.TransformToOrganizationConfirmation,\n+ \"account/transform/confirm/{accountNameToTransform}/{token}\",\n+ new { controller = \"Users\", action = RouteName.TransformToOrganizationConfirmation },\n+ new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+\n+ routes.MapRoute(\n+ RouteName.TransformToOrganizationRejection,\n+ \"account/transform/reject/{accountNameToTransform}/{token}\",\n+ new { controller = \"Users\", action = RouteName.TransformToOrganizationRejection },\n+ new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+\n+ routes.MapRoute(\n+ RouteName.TransformToOrganizationCancellation,\n+ \"account/transform/cancel/{token}\",\n+ new { controller = \"Users\", action = RouteName.TransformToOrganizationCancellation });\n+\n+ routes.MapRoute(\n+ RouteName.ApiKeys,\n+ \"account/apikeys\",\n+ new { controller = \"Users\", action = \"ApiKeys\" });\n+\nroutes.MapRoute(\nRouteName.Account,\n\"account/{action}\",\n@@ -309,32 +336,92 @@ public static void RegisterUIRoutes(RouteCollection routes)\nnew { controller = \"Organizations\", action = \"Add\" });\nroutes.MapRoute(\n- RouteName.OrganizationAccount,\n- \"organization/{accountName}/{action}\",\n- new { controller = \"Organizations\", action = \"ManageOrganization\" },\n+ RouteName.OrganizationMemberAddAjax,\n+ \"organization/{accountName}/members/add\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberAddAjax },\nnew RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\n- RouteName.ChangeOrganizationEmailSubscription,\n- \"organization/{accountName}/subscription/change\",\n- new { controller = \"Organizations\", action = \"ChangeEmailSubscription\" },\n+ RouteName.OrganizationMemberAdd,\n+ \"organization/{accountName}/members/add/{memberName}/{isAdmin}\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberAddAjax },\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ });\n+\n+ routes.MapRoute(\n+ RouteName.OrganizationMemberConfirm,\n+ \"organization/{accountName}/members/confirm/{confirmationToken}\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberConfirm },\nnew RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\n- RouteName.TransformToOrganization,\n- \"account/transform\",\n- new { controller = \"Users\", action = \"Transform\" });\n+ RouteName.OrganizationMemberReject,\n+ \"organization/{accountName}/members/reject/{confirmationToken}\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberReject },\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\n- RouteName.TransformToOrganizationConfirmation,\n- \"account/transform/confirm/{accountNameToTransform}/{token}\",\n- new { controller = \"Users\", action = \"ConfirmTransform\" },\n- new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+ RouteName.OrganizationMemberCancelAjax,\n+ \"organization/{accountName}/members/cancel\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberCancelAjax },\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\n- RouteName.ApiKeys,\n- \"account/apikeys\",\n- new { controller = \"Users\", action = \"ApiKeys\" });\n+ RouteName.OrganizationMemberCancel,\n+ \"organization/{accountName}/members/cancel/{memberName}\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberCancelAjax },\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ });\n+\n+ routes.MapRoute(\n+ RouteName.OrganizationMemberUpdateAjax,\n+ \"organization/{accountName}/members/update\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberUpdateAjax },\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+\n+ routes.MapRoute(\n+ RouteName.OrganizationMemberUpdate,\n+ \"organization/{accountName}/members/update/{memberName}/{isAdmin}\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberUpdateAjax },\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ });\n+\n+ routes.MapRoute(\n+ RouteName.OrganizationMemberDeleteAjax,\n+ \"organization/{accountName}/members/delete\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberDeleteAjax },\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+\n+ routes.MapRoute(\n+ RouteName.OrganizationMemberDelete,\n+ \"organization/{accountName}/members/delete/{memberName}\",\n+ new { controller = \"Organizations\", action = RouteName.OrganizationMemberDeleteAjax },\n+ new[]\n+ {\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedMetadata(4, Obfuscator.DefaultTelemetryUserName)\n+ });\n+\n+ routes.MapRoute(\n+ RouteName.OrganizationAccount,\n+ \"organization/{accountName}/{action}\",\n+ new { controller = \"Organizations\", action = \"ManageOrganization\" },\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\n+\n+ routes.MapRoute(\n+ RouteName.ChangeOrganizationEmailSubscription,\n+ \"organization/{accountName}/subscription/change\",\n+ new { controller = \"Organizations\", action = \"ChangeEmailSubscription\" },\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.CuratedFeed,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -92,7 +92,7 @@ public virtual ActionResult Account()\n[HttpGet]\n[UIAuthorize(allowDiscontinuedLogins: true)]\n- [ActionName(\"Transform\")]\n+ [ActionName(RouteName.TransformToOrganization)]\npublic virtual ActionResult TransformToOrganization()\n{\nvar accountToTransform = GetCurrentUser();\n@@ -116,7 +116,7 @@ public virtual ActionResult TransformToOrganization()\n[HttpPost]\n[UIAuthorize(allowDiscontinuedLogins: true)]\n[ValidateAntiForgeryToken]\n- [ActionName(\"Transform\")]\n+ [ActionName(RouteName.TransformToOrganization)]\npublic virtual async Task<ActionResult> TransformToOrganization(TransformAccountViewModel transformViewModel)\n{\nvar accountToTransform = GetCurrentUser();\n@@ -163,7 +163,7 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\n[HttpGet]\n[UIAuthorize(allowDiscontinuedLogins: true)]\n- [ActionName(\"ConfirmTransform\")]\n+ [ActionName(RouteName.TransformToOrganizationConfirmation)]\npublic virtual async Task<ActionResult> ConfirmTransformToOrganization(string accountNameToTransform, string token)\n{\nvar adminUser = GetCurrentUser();\n@@ -198,7 +198,7 @@ public virtual async Task<ActionResult> ConfirmTransformToOrganization(string ac\n[HttpGet]\n[UIAuthorize(allowDiscontinuedLogins: true)]\n- [ActionName(\"RejectTransform\")]\n+ [ActionName(RouteName.TransformToOrganizationRejection)]\npublic virtual async Task<ActionResult> RejectTransformToOrganization(string accountNameToTransform, string token)\n{\nvar adminUser = GetCurrentUser();\n@@ -232,7 +232,7 @@ public virtual async Task<ActionResult> RejectTransformToOrganization(string acc\n[HttpGet]\n[UIAuthorize(allowDiscontinuedLogins: true)]\n- [ActionName(\"CancelTransform\")]\n+ [ActionName(RouteName.TransformToOrganizationCancellation)]\npublic virtual async Task<ActionResult> CancelTransformToOrganization(string token)\n{\nvar accountToTransform = GetCurrentUser();\n@@ -255,7 +255,7 @@ public virtual async Task<ActionResult> CancelTransformToOrganization(string tok\nprivate ActionResult TransformToOrganizationFailed(string errorMessage)\n{\n- return View(\"TransformFailed\", new TransformAccountFailedViewModel(errorMessage));\n+ return View(\"TransformToOrganizationFailed\", new TransformAccountFailedViewModel(errorMessage));\n}\n[HttpGet]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/RouteExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/RouteExtensions.cs",
"diff": "@@ -25,12 +25,17 @@ public ObfuscatedMetadata(int obfuscatedSegment, string obfuscateValue)\n}\n}\n- internal static Dictionary<string, ObfuscatedMetadata> ObfuscatedRouteMap = new Dictionary<string, ObfuscatedMetadata>();\n+ internal static Dictionary<string, ObfuscatedMetadata[]> ObfuscatedRouteMap = new Dictionary<string, ObfuscatedMetadata[]>();\npublic static void MapRoute(this RouteCollection routes, string name, string url, object defaults, ObfuscatedMetadata obfuscationMetadata)\n+ {\n+ routes.MapRoute(name, url, defaults, new[] { obfuscationMetadata });\n+ }\n+\n+ public static void MapRoute(this RouteCollection routes, string name, string url, object defaults, ObfuscatedMetadata[] obfuscationMetadatas)\n{\nroutes.MapRoute(name, url, defaults);\n- if (!ObfuscatedRouteMap.ContainsKey(url)) { ObfuscatedRouteMap.Add(url, obfuscationMetadata); }\n+ if (!ObfuscatedRouteMap.ContainsKey(url)) { ObfuscatedRouteMap.Add(url, obfuscationMetadatas); }\n}\npublic static string ObfuscateUrlPath(this Route route, string urlPath)\n@@ -40,9 +45,12 @@ public static string ObfuscateUrlPath(this Route route, string urlPath)\n{\nreturn null;\n}\n- var metadata = ObfuscatedRouteMap[path];\n+ var metadatas = ObfuscatedRouteMap[path];\nstring[] segments = urlPath.Split('/');\n+ foreach (var metadata in metadatas)\n+ {\nsegments[metadata.ObfuscatedSegment] = metadata.ObfuscateValue;\n+ }\nreturn string.Join(\"/\", segments);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Views\\Packages\\_VerifyForm.cshtml\" />\n<Content Include=\"Views\\Packages\\_VerifyMetadata.cshtml\" />\n<Content Include=\"Views\\Users\\Organizations.cshtml\" />\n- <Content Include=\"Views\\Users\\TransformFailed.cshtml\" />\n- <Content Include=\"Views\\Users\\Transform.cshtml\" />\n+ <Content Include=\"Views\\Users\\TransformToOrganizationFailed.cshtml\" />\n+ <Content Include=\"Views\\Users\\TransformToOrganization.cshtml\" />\n<Content Include=\"Views\\Packages\\_ValidationIssue.cshtml\" />\n<Content Include=\"Views\\Organizations\\ManageOrganization.cshtml\" />\n<Content Include=\"Views\\Shared\\_ConfirmationResendForm.cshtml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RouteName.cs",
"new_path": "src/NuGetGallery/RouteName.cs",
"diff": "@@ -8,9 +8,21 @@ public static class RouteName\npublic const string Account = \"Account\";\npublic const string OrganizationAccount = \"ManageOrganization\";\npublic const string AddOrganization = \"AddOrganization\";\n+ public const string OrganizationMemberAddAjax = \"AddMember\";\n+ public const string OrganizationMemberAdd = \"AddMemberJson\";\n+ public const string OrganizationMemberConfirm = \"ConfirmMemberRequest\";\n+ public const string OrganizationMemberReject = \"RejectMemberRequest\";\n+ public const string OrganizationMemberCancelAjax = \"CancelMemberRequest\";\n+ public const string OrganizationMemberCancel = \"CancelMemberRequestJson\";\n+ public const string OrganizationMemberUpdateAjax = \"UpdateMember\";\n+ public const string OrganizationMemberUpdate = \"UpdateMemberJson\";\n+ public const string OrganizationMemberDeleteAjax = \"DeleteMember\";\n+ public const string OrganizationMemberDelete = \"DeleteMemberJson\";\npublic const string ChangeOrganizationEmailSubscription = \"ChangeOrganizationEmailSubscription\";\npublic const string TransformToOrganization = \"TransformToOrganization\";\npublic const string TransformToOrganizationConfirmation = \"ConfirmTransform\";\n+ public const string TransformToOrganizationRejection = \"RejectTransform\";\n+ public const string TransformToOrganizationCancellation = \"CancelTransform\";\npublic const string ApiKeys = \"ApiKeys\";\npublic const string Profile = \"Profile\";\npublic const string DisplayPackage = \"package-route\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/Obfuscator.cs",
"new_path": "src/NuGetGallery/Telemetry/Obfuscator.cs",
"diff": "@@ -25,7 +25,16 @@ internal static class Obfuscator\n\"Users/ConfirmTransform\",\n\"Users/Delete\",\n\"Users/Profiles\",\n- \"Users/ResetPassword\"};\n+ \"Users/ResetPassword\",\n+ \"Users/ConfirmTransform\",\n+ \"Users/RejectTransform\",\n+ \"Organizations/AddMember\",\n+ \"Organizations/ConfirmMemberRequest\",\n+ \"Organizations/RejectMemberRequest\",\n+ \"Organizations/CancelMemberRequest\",\n+ \"Organizations/UpdateMember\",\n+ \"Organizations/DeleteMember\",\n+ };\ninternal static string DefaultObfuscatedUrl(Uri url)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -803,7 +803,7 @@ public static string ManageMyOrganization(this UrlHelper url, string accountName\npublic static string AddOrganizationMember(this UrlHelper url, string accountName, bool relativeUrl = true)\n{\nreturn GetActionLink(url,\n- \"AddMember\",\n+ RouteName.OrganizationMemberAddAjax,\n\"Organizations\",\nrelativeUrl,\nrouteValues: new RouteValueDictionary\n@@ -1197,7 +1197,7 @@ public static string GenerateApiKey(this UrlHelper url, bool relativeUrl = true)\npublic static string TransformAccount(this UrlHelper url, bool relativeUrl = true)\n{\n- return GetActionLink(url, \"Transform\", \"Users\", relativeUrl);\n+ return GetActionLink(url, RouteName.TransformToOrganization, \"Users\", relativeUrl);\n}\npublic static string ConfirmTransformAccount(this UrlHelper url, User accountToTransform, bool relativeUrl = true)\n@@ -1207,7 +1207,7 @@ public static string ConfirmTransformAccount(this UrlHelper url, User accountToT\npublic static string RejectTransformAccount(this UrlHelper url, User accountToTransform, bool relativeUrl = true)\n{\n- return url.HandleTransformAccount(\"RejectTransform\", accountToTransform, relativeUrl);\n+ return url.HandleTransformAccount(RouteName.TransformToOrganizationRejection, accountToTransform, relativeUrl);\n}\nprivate static string HandleTransformAccount(this UrlHelper url, string routeName, User accountToTransform, bool relativeUrl = true)\n@@ -1228,7 +1228,7 @@ public static string CancelTransformAccount(this UrlHelper url, User accountToTr\n{\nreturn GetActionLink(\nurl,\n- \"CancelTransform\",\n+ RouteName.TransformToOrganizationCancellation,\n\"Users\",\nrelativeUrl,\nrouteValues: new RouteValueDictionary\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Views/Users/Transform.cshtml",
"new_path": "src/NuGetGallery/Views/Users/TransformToOrganization.cshtml",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Views/Users/TransformFailed.cshtml",
"new_path": "src/NuGetGallery/Views/Users/TransformToOrganizationFailed.cshtml",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Extensions/RouteExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Extensions/RouteExtensionsFacts.cs",
"diff": "@@ -22,8 +22,8 @@ public void MapRouteAddObfuscation()\n// Act + Assert\nAssert.True(RouteExtensions.ObfuscatedRouteMap.ContainsKey(_routeUrl));\n- Assert.Equal(_segment, RouteExtensions.ObfuscatedRouteMap[_routeUrl].ObfuscatedSegment);\n- Assert.Equal(_obfuscatedValue, RouteExtensions.ObfuscatedRouteMap[_routeUrl].ObfuscateValue);\n+ Assert.Equal(_segment, RouteExtensions.ObfuscatedRouteMap[_routeUrl][0].ObfuscatedSegment);\n+ Assert.Equal(_obfuscatedValue, RouteExtensions.ObfuscatedRouteMap[_routeUrl][0].ObfuscateValue);\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Obfuscate organization routes containing usernames (#5677)
|
455,776 |
26.03.2018 10:43:53
| 25,200 |
edebda253b7fa6680e837682e166c25a59b89866
|
Organizations and Profile page breadcrumbs
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1150,8 +1150,21 @@ img.reserved-indicator-icon {\ncolor: #df001e;\n}\n.page-profile .profile-title {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\nmargin-top: 50px;\nmargin-bottom: 20px;\n+\n+ -webkit-box-pack: justify;\n+ -webkit-justify-content: space-between;\n+ -ms-flex-pack: justify;\n+ justify-content: space-between;\n+ -webkit-box-align: end;\n+ -webkit-align-items: flex-end;\n+ -ms-flex-align: end;\n+ align-items: flex-end;\n}\n.page-profile .profile-title h1 {\ndisplay: inline;\n@@ -1163,6 +1176,9 @@ img.reserved-indicator-icon {\nfont-size: 14px;\ncolor: #068918;\n}\n+.page-profile .profile-title .breadcrumb-manage {\n+ margin-bottom: 24px;\n+}\n.page-profile .profile-details img {\nmargin-top: 50px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-profile.less",
"new_path": "src/Bootstrap/less/theme/page-profile.less",
"diff": "margin-top: (@padding-large-vertical * 5);\nmargin-bottom: (@padding-large-vertical * 2);\n+ display: flex;\n+ justify-content: space-between;\n+ align-items: flex-end;\n+\nh1 {\ndisplay: inline;\nfont-size: 2.285em;\ncolor: @verified-color;\nfont-size: 14px;\n}\n+\n+ .breadcrumb-manage {\n+ margin-bottom: 24px;\n+ }\n}\n.profile-details {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -606,7 +606,7 @@ public virtual ActionResult Profiles(string username, int page = 1)\nDownloadCount = p.PackageRegistration.DownloadCount\n}).ToList();\n- var model = new UserProfileModel(user, packages, page - 1, Constants.DefaultPackageListPageSize, Url);\n+ var model = new UserProfileModel(user, currentUser, packages, page - 1, Constants.DefaultPackageListPageSize, Url);\nreturn View(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/UserProfileModel.cs",
"new_path": "src/NuGetGallery/ViewModels/UserProfileModel.cs",
"diff": "@@ -8,7 +8,7 @@ namespace NuGetGallery\n{\npublic class UserProfileModel\n{\n- public UserProfileModel(User user, List<ListPackageItemViewModel> allPackages, int pageIndex, int pageSize, UrlHelper url)\n+ public UserProfileModel(User user, User currentUser, List<ListPackageItemViewModel> allPackages, int pageIndex, int pageSize, UrlHelper url)\n{\nUser = user;\nUsername = user.Username;\n@@ -29,6 +29,8 @@ public UserProfileModel(User user, List<ListPackageItemViewModel> allPackages, i\nPager = pager;\nPagedPackages = AllPackages.Skip(PackagePageSize * pageIndex)\n.Take(PackagePageSize).ToList();\n+\n+ CanViewAccount = ActionsRequiringPermissions.ViewAccount.CheckPermissions(currentUser, user) == PermissionsCheckResult.Allowed;\n}\npublic int PackagePageTotalCount { get; private set; }\n@@ -43,6 +45,7 @@ public UserProfileModel(User user, List<ListPackageItemViewModel> allPackages, i\npublic int PackagePage { get; private set; }\npublic int PackagePageSize { get; private set; }\npublic IPreviousNextPager Pager { get; private set; }\n+ public bool CanViewAccount { get; private set; }\npublic bool UserIsOrganization\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"diff": "<section role=\"main\" class=\"container main-container page-account-settings\">\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- <h1 class=\"text-center\">Account Settings</h1>\n+ <h1 class=\"text-center\"><a href=\"@Url.User(CurrentUser.Username)\" aria-label=\"View my profile\"><i class=\"ms-Icon ms-Icon--Contact\" aria-hidden=\"true\"></i></a> > Account Settings</h1>\n<div class=\"text-center ms-font-xxl\">\n<a href=\"@Url.User(CurrentUser)\">@CurrentUser.Username</a>\n</div>\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=\"clearfix\">\n- <h1 class=\"pull-left\">Organizations</h1>\n+ <h1 class=\"pull-left\"><a href=\"@Url.User(CurrentUser.Username)\" aria-label=\"View my profile\"><i class=\"ms-Icon ms-Icon--Contact\" aria-hidden=\"true\"></i></a> > Organizations</h1>\n@if (Model.Organizations.Any())\n{\n<form class=\"form-section-title pull-right\" action=\"@Url.AddOrganization()\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n<div class=\"clearfix\">\n- <h1 class=\"pull-left\">Manage Packages</h1>\n+ <h1 class=\"pull-left\"><a href=\"@Url.User(CurrentUser.Username)\" aria-label=\"View my profile\"><i class=\"ms-Icon ms-Icon--Contact\" aria-hidden=\"true\"></i></a> > Manage Packages</h1>\n<div class=\"text-center ms-font-xxl\">\n<span class=\"form-section-data\">\n<select id=\"ownerFilter\" class=\"form-control pull-right hidden\" aria-label=\"Filter on package owner\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "<article class=\"col-md-9 col-md-pull-3\">\n<div class=\"profile-title\">\n<h1>@Model.Username</h1>\n+ <span class=\"breadcrumb-manage\">\n+ @if (Model.CanViewAccount)\n+ {\n+ if (Model.UserIsOrganization)\n+ {\n+ <i class=\"ms-Icon ms-Icon--Group\" aria-hidden=\"true\"></i>\n+ <a href=\"@Url.ManageMyOrganization(Model.Username)\" aria-label=\"Manage this organization\"><span>@((Model.User as Organization).Administrators.Count()) administrators | @((Model.User as Organization).Collaborators.Count()) collaborators</span></a>\n+ }\n+ else if (!Model.UserIsOrganization && Model.User.Organizations.Any())\n+ {\n+ <a href=\"@Url.ManageMyOrganizations()\" aria-label=\"Manage my organizations\"><span>member of @(Model.User.Organizations.Count()) organizations</span></a>\n+ }\n+ }\n+ </span>\n</div>\n<div class=\"list-packages\" role=\"list\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/UserProfileModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/UserProfileModelFacts.cs",
"diff": "@@ -17,6 +17,7 @@ public void TotalDownloadCount_DoesNotThrowIntegerOverflow()\n// Arrange\nvar controller = GetController<UsersController>();\nvar user = new User(\"theUser\");\n+ var currentUser = new User(\"theCurrentUser\");\nvar packages = new List<ListPackageItemViewModel>\n{\nCreatePackageItemViewModel(\"1.0.0\"),\n@@ -24,7 +25,7 @@ public void TotalDownloadCount_DoesNotThrowIntegerOverflow()\n};\n// Act\n- var profile = new UserProfileModel(user, packages, 0, 10, controller.Url);\n+ var profile = new UserProfileModel(user, currentUser, packages, 0, 10, controller.Url);\n// Assert\nlong expected = (long)int.MaxValue * 2;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Organizations and Profile page breadcrumbs (#5674)
|
455,794 |
26.03.2018 14:43:01
| 25,200 |
0a843d97248cacf55132d462e71c195763192063
|
Improve profiles page query performance
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -220,11 +220,7 @@ public virtual Package FindAbsoluteLatestPackageById(string id, int? semVerLevel\npublic IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted, bool includeVersions = false)\n{\n- var packages = GetPackagesForOwners(new[] { user.Key }, includeUnlisted);\n-\n- return includeVersions\n- ? packages\n- : GetLatestPackageForEachRegistration(packages.ToList());\n+ return GetPackagesForOwners(new [] { user.Key }, includeUnlisted, includeVersions);\n}\n/// <summary>\n@@ -238,6 +234,11 @@ public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted,\nvar ownerKeys = user.Organizations.Select(org => org.OrganizationKey).ToList();\nownerKeys.Insert(0, user.Key);\n+ return GetPackagesForOwners(ownerKeys, includeUnlisted, includeVersions);\n+ }\n+\n+ private IEnumerable<Package> GetPackagesForOwners(IEnumerable<int> ownerKeys, bool includeUnlisted, bool includeVersions)\n+ {\nIQueryable<Package> packages = _packageRepository.GetAll()\n.Where(p => p.PackageRegistration.Owners.Any(o => ownerKeys.Contains(o.Key)));\n@@ -273,69 +274,6 @@ public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted,\n.ToList();\n}\n- private IEnumerable<Package> GetLatestPackageForEachRegistration(IReadOnlyCollection<Package> packages)\n- {\n- // This method uses First() and FirstOrDefault() instead of Single() or SingleOrDefault() to get the latest package,\n- // in case there are multiple latest due to concurrency issue\n- // see: https://github.com/NuGet/NuGetGallery/issues/2514\n- foreach (var packagesByRegistration in packages.GroupBy(p => p.PackageRegistration.Id))\n- {\n- // Return latest stable SemVer2 version if available\n- var latest = packagesByRegistration.Where(p => p.IsLatestStableSemVer2).FirstOrDefault();\n- if (latest != null)\n- {\n- yield return latest;\n- continue;\n- }\n-\n- // Return latest stable non-SemVer2 version if available\n- latest = packagesByRegistration.Where(p => p.IsLatestStable).FirstOrDefault();\n- if (latest != null)\n- {\n- yield return latest;\n- continue;\n- }\n-\n- // Return latest pre-release SemVer2 version if available\n- latest = packagesByRegistration.Where(p => p.IsLatestSemVer2).FirstOrDefault();\n- if (latest != null)\n- {\n- yield return latest;\n- continue;\n- }\n-\n- // Return latest pre-release non-SemVer2 version if available\n- latest = packagesByRegistration.Where(p => p.IsLatest).FirstOrDefault();\n- if (latest != null)\n- {\n- yield return latest;\n- continue;\n- }\n-\n- // Like DisplayPackage we should prefer to show you information from the latest stable version,\n- // but show you the latest version (potentially latest UNLISTED version) otherwise.\n- yield return packagesByRegistration.OrderByDescending(p => NuGetVersion.Parse(p.Version)).First();\n- }\n- }\n-\n- /// <summary>\n- /// Merge packages by owner, including organization owners that the user belongs to and including versions.\n- /// </summary>\n- private IEnumerable<Package> GetPackagesForOwners(IReadOnlyCollection<int> ownerKeys, bool includeUnlisted)\n- {\n- IQueryable<Package> packageVersions = _packageRepository.GetAll()\n- .Where(p => p.PackageRegistration.Owners.Any(o => ownerKeys.Contains(o.Key)))\n- .Include(p => p.PackageRegistration)\n- .Include(p => p.PackageRegistration.Owners);\n-\n- if (!includeUnlisted)\n- {\n- packageVersions = packageVersions.Where(p => p.Listed);\n- }\n-\n- return packageVersions;\n- }\n-\n/// <summary>\n/// For a package get the list of owners that are not organizations.\n/// All the resulted user accounts will be distinct.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -947,19 +947,8 @@ public override void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(\n=> base.ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(currentUser, packageOwner);\n[MemberData(nameof(TestData_RoleVariants))]\n- [Theory]\n- public virtual void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n- {\n- var context = GetMixedVersioningPackagesContext(currentUser, packageOwner);\n-\n- var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: true).ToList();\n-\n- var nugetCatalogReaderPackage = packages.Single(p => p.PackageRegistration.Id == \"NuGet.CatalogReader\");\n- Assert.Equal(\"1.5.12+git.78e44a8\", NuGetVersionFormatter.ToFullStringOrFallback(nugetCatalogReaderPackage.Version, fallback: nugetCatalogReaderPackage.Version));\n-\n- var sleetLibPackage = packages.Single(p => p.PackageRegistration.Id == \"SleetLib\");\n- Assert.Equal(\"2.2.24+git.f2a0cb6\", NuGetVersionFormatter.ToFullStringOrFallback(sleetLibPackage.Version, fallback: sleetLibPackage.Version));\n- }\n+ public override void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ => base.ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(currentUser, packageOwner);\n[MemberData(nameof(TestData_RoleVariants))]\npublic override void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User packageOwner)\n@@ -1017,6 +1006,10 @@ public override void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User curre\npublic override void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User currentUser, User packageOwner)\n=> base.ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(currentUser, packageOwner);\n+ [MemberData(nameof(TestData_RoleVariants))]\n+ public override void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ => base.ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(currentUser, packageOwner);\n+\n[MemberData(nameof(TestData_RoleVariants))]\npublic override void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User packageOwner)\n=> base.ReturnsFirstIfMultiplePackagesSetToLatest(currentUser, packageOwner);\n@@ -1207,27 +1200,41 @@ public virtual void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(U\nAssert.Contains(latestStablePackage, packages);\n}\n+ [Theory]\n+ public virtual void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2PackageVersions_IncludeUnlistedTrue(User currentUser, User packageOwner)\n+ {\n+ var context = GetMixedVersioningPackagesContext(currentUser, packageOwner);\n+\n+ var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: true).ToList();\n+\n+ var nugetCatalogReaderPackage = packages.Single(p => p.PackageRegistration.Id == \"NuGet.CatalogReader\");\n+ Assert.Equal(\"1.5.12+git.78e44a8\", NuGetVersionFormatter.ToFullStringOrFallback(nugetCatalogReaderPackage.Version, fallback: nugetCatalogReaderPackage.Version));\n+\n+ var sleetLibPackage = packages.Single(p => p.PackageRegistration.Id == \"SleetLib\");\n+ Assert.Equal(\"2.2.24+git.f2a0cb6\", NuGetVersionFormatter.ToFullStringOrFallback(sleetLibPackage.Version, fallback: sleetLibPackage.Version));\n+ }\n+\nprotected FakeEntitiesContext GetMixedVersioningPackagesContext(User currentUser, User packageOwner)\n{\nvar context = GetFakeContext();\ncontext.Users.Add(currentUser);\n- var sleetLibRegistration = new PackageRegistration { Id = \"SleetLib\", Owners = { packageOwner } };\n+ var sleetLibRegistration = new PackageRegistration { Key = 0, Id = \"SleetLib\", Owners = { packageOwner } };\nvar sleetLibPackages = new[]\n{\n- new Package { Version = \"2.2.24+git.f2a0cb6\", PackageRegistration = sleetLibRegistration, Listed = true, IsLatestStableSemVer2 = true, IsLatestSemVer2 = true },\n- new Package { Version = \"2.2.18+git.4d361d8\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.2.16+git.c6be4b4\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.2.13+git.e657e80\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.2.9+git.4a81f0c\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.2.7+git.393c301\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.2.3+git.98f8237\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.2.1+git.e11393a\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.2.0+git.6973dc7\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.0.0+git.5106315\", PackageRegistration = sleetLibRegistration, Listed = true },\n- new Package { Version = \"2.0.0-beta.19+git.hash.befdb81dbbef6fb5b8cdf147cc467f9904339cc8\", PackageRegistration = sleetLibRegistration, Listed = false },\n- new Package { Version = \"1.1.0-beta-296\", PackageRegistration = sleetLibRegistration, Listed = true, IsLatest = true }\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.24+git.f2a0cb6\", PackageRegistration = sleetLibRegistration, Listed = true, IsLatestStableSemVer2 = true, IsLatestSemVer2 = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.18+git.4d361d8\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.16+git.c6be4b4\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.13+git.e657e80\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.9+git.4a81f0c\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.7+git.393c301\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.3+git.98f8237\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.1+git.e11393a\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.2.0+git.6973dc7\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.0.0+git.5106315\", PackageRegistration = sleetLibRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 0, Version = \"2.0.0-beta.19+git.hash.befdb81dbbef6fb5b8cdf147cc467f9904339cc8\", PackageRegistration = sleetLibRegistration, Listed = false },\n+ new Package { PackageRegistrationKey = 0, Version = \"1.1.0-beta-296\", PackageRegistration = sleetLibRegistration, Listed = true, IsLatest = true }\n};\ncontext.PackageRegistrations.Add(sleetLibRegistration);\nforeach (var package in sleetLibPackages)\n@@ -1235,16 +1242,16 @@ protected FakeEntitiesContext GetMixedVersioningPackagesContext(User currentUser\ncontext.Packages.Add(package);\n}\n- var nugetCatalogReaderRegistration = new PackageRegistration { Id = \"NuGet.CatalogReader\", Owners = { packageOwner } };\n+ var nugetCatalogReaderRegistration = new PackageRegistration { Key = 1, Id = \"NuGet.CatalogReader\", Owners = { packageOwner } };\nvar nugetCatalogReaderPackages = new[]\n{\n- new Package { Version = \"1.5.12+git.78e44a8\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true, IsLatestStableSemVer2 = true, IsLatestSemVer2 = true },\n- new Package { Version = \"1.5.8+git.bcda3b8\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n- new Package { Version = \"1.4.0+git.e2a36b6\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n- new Package { Version = \"1.3.0+git.a6a89a3\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n- new Package { Version = \"1.2.0\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true, IsLatest = true, IsLatestStable = true },\n- new Package { Version = \"1.1.0\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n- new Package { Version = \"1.0.0\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true }\n+ new Package { PackageRegistrationKey = 1, Version = \"1.5.12+git.78e44a8\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true, IsLatestStableSemVer2 = true, IsLatestSemVer2 = true },\n+ new Package { PackageRegistrationKey = 1, Version = \"1.5.8+git.bcda3b8\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 1, Version = \"1.4.0+git.e2a36b6\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 1, Version = \"1.3.0+git.a6a89a3\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 1, Version = \"1.2.0\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true, IsLatest = true, IsLatestStable = true },\n+ new Package { PackageRegistrationKey = 1, Version = \"1.1.0\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true },\n+ new Package { PackageRegistrationKey = 1, Version = \"1.0.0\", PackageRegistration = nugetCatalogReaderRegistration, Listed = true }\n};\ncontext.PackageRegistrations.Add(nugetCatalogReaderRegistration);\nforeach (var package in nugetCatalogReaderPackages)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Improve profiles page query performance (#5658)
|
455,776 |
26.03.2018 15:10:17
| 25,200 |
58e726eb21ee7135d97e5c3d8c78261e906d5582
|
[Organizations] Restrict organization membership to AAD tenant only if it matches a whitelist
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/Login-Discontinuation-Configuration.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/Login-Discontinuation-Configuration.json",
"diff": "],\n\"ForceTransformationToOrganizationForEmailAddresses\": [\n\"organization@cannotUsePassword.com\"\n+ ],\n+ \"EnabledOrganizationAadTenants\": [\n+ {\n+ \"EmailDomain\": \"tenantOnly.com\",\n+ \"TenantId\": \"tenantID\"\n+ }\n]\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"new_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"diff": "using System.Web.Mvc;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Filters;\n+using NuGetGallery.Security;\nnamespace NuGetGallery\n{\n@@ -272,6 +273,8 @@ protected override void UpdateAccountViewModel(Organization account, Organizatio\nmodel.Members =\naccount.Members.Select(m => new OrganizationMemberViewModel(m))\n.Concat(account.MemberRequests.Select(m => new OrganizationMemberViewModel(m)));\n+\n+ model.RequiresTenant = account.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/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n+using System.Net.Mail;\nusing Newtonsoft.Json;\nusing NuGetGallery.Authentication;\n@@ -15,12 +16,14 @@ public class LoginDiscontinuationConfiguration : ILoginDiscontinuationConfigurat\ninternal HashSet<string> DiscontinuedForDomains { get; }\ninternal HashSet<string> ExceptionsForEmailAddresses { get; }\ninternal HashSet<string> ForceTransformationToOrganizationForEmailAddresses { get; }\n+ internal HashSet<OrganizationTenantPair> EnabledOrganizationAadTenants { get; }\npublic LoginDiscontinuationConfiguration()\n: this(Enumerable.Empty<string>(),\nEnumerable.Empty<string>(),\nEnumerable.Empty<string>(),\n- Enumerable.Empty<string>())\n+ Enumerable.Empty<string>(),\n+ Enumerable.Empty<OrganizationTenantPair>())\n{\n}\n@@ -29,12 +32,14 @@ public LoginDiscontinuationConfiguration()\nIEnumerable<string> discontinuedForEmailAddresses,\nIEnumerable<string> discontinuedForDomains,\nIEnumerable<string> exceptionsForEmailAddresses,\n- IEnumerable<string> forceTransformationToOrganizationForEmailAddresses)\n+ IEnumerable<string> forceTransformationToOrganizationForEmailAddresses,\n+ IEnumerable<OrganizationTenantPair> enabledOrganizationAadTenants)\n{\nDiscontinuedForEmailAddresses = new HashSet<string>(discontinuedForEmailAddresses);\nDiscontinuedForDomains = new HashSet<string>(discontinuedForDomains);\nExceptionsForEmailAddresses = new HashSet<string>(exceptionsForEmailAddresses);\nForceTransformationToOrganizationForEmailAddresses = new HashSet<string>(forceTransformationToOrganizationForEmailAddresses);\n+ EnabledOrganizationAadTenants = new HashSet<OrganizationTenantPair>(enabledOrganizationAadTenants, new OrganizationTenantPairComparer());\n}\npublic bool IsLoginDiscontinued(AuthenticatedUser authUser)\n@@ -74,6 +79,11 @@ public bool ShouldUserTransformIntoOrganization(User user)\nvar email = user.ToMailAddress();\nreturn ForceTransformationToOrganizationForEmailAddresses.Contains(email.Address);\n}\n+\n+ public bool IsTenantIdPolicySupportedForOrganization(string emailAddress, string tenantId)\n+ {\n+ return EnabledOrganizationAadTenants.Contains(new OrganizationTenantPair(new MailAddress(emailAddress).Host, tenantId));\n+ }\n}\npublic interface ILoginDiscontinuationConfiguration\n@@ -81,5 +91,39 @@ public interface ILoginDiscontinuationConfiguration\nbool IsLoginDiscontinued(AuthenticatedUser authUser);\nbool IsUserOnWhitelist(User user);\nbool ShouldUserTransformIntoOrganization(User user);\n+ bool IsTenantIdPolicySupportedForOrganization(string emailAddress, string tenantId);\n+ }\n+\n+ public class OrganizationTenantPair\n+ {\n+ public string EmailDomain { get; }\n+ public string TenantId { get; }\n+\n+ [JsonConstructor]\n+ public OrganizationTenantPair(string emailDomain, string tenantId)\n+ {\n+ EmailDomain = emailDomain ?? throw new ArgumentNullException(nameof(emailDomain));\n+ TenantId = tenantId ?? throw new ArgumentNullException(nameof(tenantId));\n+ }\n+ }\n+\n+ public class OrganizationTenantPairComparer : IEqualityComparer<OrganizationTenantPair>\n+ {\n+ public bool Equals(OrganizationTenantPair x, OrganizationTenantPair y)\n+ {\n+ if (x == null || y == null)\n+ {\n+ return x == null && y == null;\n+ }\n+\n+ return\n+ string.Equals(x.EmailDomain, y.EmailDomain, StringComparison.OrdinalIgnoreCase) &&\n+ string.Equals(x.TenantId, y.TenantId, StringComparison.OrdinalIgnoreCase);\n+ }\n+\n+ public int GetHashCode(OrganizationTenantPair obj)\n+ {\n+ return obj.EmailDomain.GetHashCode() ^ obj.TenantId.GetHashCode();\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -468,25 +468,13 @@ public bool CanTransformUserToOrganization(User accountToTransform, User adminUs\nerrorReason = String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_AdminAccountIsOrganization, adminUser.Username);\n}\n- else\n- {\n- var tenantId = GetAzureActiveDirectoryCredentialTenant(adminUser);\n- if (string.IsNullOrWhiteSpace(tenantId))\n- {\n- errorReason = String.Format(CultureInfo.CurrentCulture,\n- Strings.Organizations_AdminAccountDoesNotHaveTenant, adminUser.Username);\n- }\n- }\nreturn errorReason == null;\n}\npublic async Task<bool> TransformUserToOrganization(User accountToTransform, User adminUser, string token)\n{\n- if (!await SubscribeOrganizationToTenantPolicy(accountToTransform, adminUser))\n- {\n- return false;\n- }\n+ await SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(accountToTransform, adminUser);\nreturn await EntitiesContext.TransformUserToOrganization(accountToTransform, adminUser, token);\n}\n@@ -525,42 +513,24 @@ public async Task<Organization> AddOrganizationAsync(string username, string ema\nOrganizationRepository.InsertOnCommit(organization);\n- if (string.IsNullOrEmpty(GetAzureActiveDirectoryCredentialTenant(adminUser)))\n- {\n- throw new EntityException(String.Format(CultureInfo.CurrentCulture,\n- Strings.Organizations_AdminAccountDoesNotHaveTenant, adminUser.Username));\n- }\n-\n- if (!await SubscribeOrganizationToTenantPolicy(organization, adminUser, commitChanges: false))\n- {\n- throw new EntityException(Strings.DefaultUserSafeExceptionMessage);\n- }\n+ await SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(organization, adminUser, commitChanges: false);\nawait EntitiesContext.SaveChangesAsync();\nreturn organization;\n}\n- private async Task<bool> SubscribeOrganizationToTenantPolicy(User organization, User adminUser, bool commitChanges = true)\n+ private async Task SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(User organization, User adminUser, bool commitChanges = true)\n{\n- var tenantId = GetAzureActiveDirectoryCredentialTenant(adminUser);\n- if (string.IsNullOrWhiteSpace(tenantId))\n+ var tenantId = adminUser.Credentials.GetAzureActiveDirectoryCredential()?.TenantId;\n+ if (string.IsNullOrWhiteSpace(tenantId) ||\n+ !ContentObjectService.LoginDiscontinuationConfiguration.IsTenantIdPolicySupportedForOrganization(organization.EmailAddress ?? organization.UnconfirmedEmailAddress, tenantId))\n{\n- return false;\n+ return;\n}\nvar tenantPolicy = RequireOrganizationTenantPolicy.Create(tenantId);\n- if (!await SecurityPolicyService.SubscribeAsync(organization, tenantPolicy, commitChanges))\n- {\n- return false;\n- }\n-\n- return true;\n- }\n-\n- private string GetAzureActiveDirectoryCredentialTenant(User user)\n- {\n- return user.Credentials.GetAzureActiveDirectoryCredential()?.TenantId;\n+ await SecurityPolicyService.SubscribeAsync(organization, tenantPolicy, commitChanges);\n}\npublic async Task<bool> RejectTransformUserToOrganizationRequest(User accountToTransform, User adminUser, string token)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/OrganizationAccountViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/OrganizationAccountViewModel.cs",
"diff": "@@ -8,5 +8,7 @@ namespace NuGetGallery\npublic class OrganizationAccountViewModel : AccountViewModel\n{\npublic IEnumerable<OrganizationMemberViewModel> Members { get; set; }\n+\n+ public bool RequiresTenant { get; set; }\n}\n}\n\\ No newline at end of file\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=\"manage-members\">\n<div class=\"col-md-12 manage-members-listing\">\n<div class=\"panel-collapse collapse in\" aria-expanded=\"true\">\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@if (Model.CanManage)\n{\n<div class=\"input-group col-xs-12\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -33,8 +33,9 @@ public async Task RefreshRefreshesObject()\nvar domains = new[] { \"example.com\" };\nvar exceptions = new[] { \"exception@example.com\" };\nvar shouldTransforms = new[] { \"transfomer@example.com\" };\n+ var orgTenantPairs = new[] { new OrganizationTenantPair(\"example.com\", \"tenantId\") };\n- var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms);\n+ var config = new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs);\nvar configString = JsonConvert.SerializeObject(config);\nGetMock<IContentService>()\n@@ -51,6 +52,7 @@ public async Task RefreshRefreshesObject()\nAssert.True(loginDiscontinuationAndMigrationConfiguration.DiscontinuedForEmailAddresses.SequenceEqual(emails));\nAssert.True(loginDiscontinuationAndMigrationConfiguration.DiscontinuedForDomains.SequenceEqual(domains));\nAssert.True(loginDiscontinuationAndMigrationConfiguration.ExceptionsForEmailAddresses.SequenceEqual(exceptions));\n+ Assert.True(loginDiscontinuationAndMigrationConfiguration.EnabledOrganizationAadTenants.SequenceEqual(orgTenantPairs));\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"diff": "@@ -15,6 +15,8 @@ public class LoginDiscontinuationConfigurationFacts\nprivate const string _domain = \"example.com\";\nprivate const string _incorrectException = \"fake@notExample.com\";\nprivate const string _email = \"test@example.com\";\n+ private const string _tenant = \"tenantId\";\n+ private const string _incorrectTenant = \"wrongTenantId\";\npublic static IEnumerable<object[]> PossibleListStates\n{\n@@ -28,7 +30,10 @@ public static IEnumerable<object[]> PossibleListStates\n{\nforeach (var isOnTransformList in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+ foreach (var isOnTenantPairList in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList);\n+ }\n}\n}\n}\n@@ -36,14 +41,15 @@ public static IEnumerable<object[]> PossibleListStates\n}\n}\n- public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n+ public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList)\n{\nvar emails = isOnWhiteList ? new[] { _email } : new[] { _incorrectEmail };\nvar domains = isOnDomainList ? new[] { _domain } : new[] { _incorrectDomain };\nvar exceptions = isOnExceptionList ? new[] { _email } : new[] { _incorrectException };\nvar shouldTransforms = isOnTransformList ? new[] { _email } : new[] { _incorrectException };\n+ var orgTenantPairs = isOnTenantPairList ? new[] { new OrganizationTenantPair(_domain, _tenant) } : new[] { new OrganizationTenantPair(_incorrectDomain, _incorrectTenant) };\n- return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms);\n+ return new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs);\n}\npublic class TheIsLoginDiscontinuedMethod\n@@ -126,7 +132,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);\n+ var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList: false);\n// Act\nvar result = config.IsLoginDiscontinued(authUser);\n@@ -140,12 +146,12 @@ public class TheWhitelistMethods\n{\npublic static IEnumerable<object[]> PossibleListStates => PossibleListStates;\n- public void ReturnsAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n+ public void ReturnsAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList)\n{\n// Arrange\nvar user = new User(\"test\") { EmailAddress = _email };\n- var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+ var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList);\n// Act\nvar areOrganizationsSupported = config.IsUserOnWhitelist(user);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -1325,18 +1325,57 @@ private User CreateAdminUser()\npublic class TheTransformToOrganizationAccountMethod\n{\n+ private TestableUserService _service = new TestableUserService();\n+\n+ [Fact]\n+ public async Task WhenAdminHasNoTenant_TransformsAccountWithoutPolicy()\n+ {\n+ Assert.True(await InvokeTransformUserToOrganization(3, new User(\"adminWithNoTenant\") { Credentials = new Credential[0] }));\n+ }\n+\n+ public async Task WhenAdminHasUnsupportedTenant_TransformsAccountWithoutPolicy()\n+ {\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(false);\n+\n+ _service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(mockLoginDiscontinuationConfiguration.Object);\n+\n+ Assert.True(await InvokeTransformUserToOrganization(3));\n+ }\n+\n+ public async Task WhenAdminHasSupportedTenant_TransformsAccountWithPolicy()\n+ {\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(true);\n+\n+ _service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(mockLoginDiscontinuationConfiguration.Object);\n+\n+ Assert.True(await InvokeTransformUserToOrganization(3, subscribesToPolicy: true));\n+ }\n+\n[Theory]\n[InlineData(0)]\n[InlineData(-1)]\npublic async Task WhenSqlResultIsZeroOrLess_ReturnsFalse(int affectedRecords)\n{\n- Assert.False(await InvokeTransformUserToOrganization(affectedRecords));\n- }\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(false);\n- [Fact]\n- public async Task WhenAdminHasNoTenant_ReturnsFalse()\n- {\n- Assert.False(await InvokeTransformUserToOrganization(3, new User(\"adminWithNoTenant\")));\n+ _service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(mockLoginDiscontinuationConfiguration.Object);\n+\n+ Assert.False(await InvokeTransformUserToOrganization(affectedRecords));\n}\n[Theory]\n@@ -1344,13 +1383,21 @@ public async Task WhenAdminHasNoTenant_ReturnsFalse()\n[InlineData(3)]\npublic async Task WhenSqlResultIsPositive_ReturnsTrue(int affectedRecords)\n{\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(false);\n+\n+ _service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(mockLoginDiscontinuationConfiguration.Object);\n+\nAssert.True(await InvokeTransformUserToOrganization(affectedRecords));\n}\n- private Task<bool> InvokeTransformUserToOrganization(int affectedRecords, User admin = null)\n+ private Task<bool> InvokeTransformUserToOrganization(int affectedRecords, User admin = null, bool subscribesToPolicy = false)\n{\n// Arrange\n- var service = new TestableUserService();\nvar account = new User(\"Account\");\nadmin = admin ?? new User(\"Admin\")\n{\n@@ -1363,16 +1410,19 @@ private Task<bool> InvokeTransformUserToOrganization(int affectedRecords, User a\n}\n};\n- service.MockDatabase\n+ _service.MockDatabase\n.Setup(db => db.ExecuteSqlResourceAsync(It.IsAny<string>(), It.IsAny<object[]>()))\n.Returns(Task.FromResult(affectedRecords));\n- service.MockSecurityPolicyService\n- .Setup(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), true))\n- .Returns(Task.FromResult(true));\n-\n// Act\n- return service.TransformUserToOrganization(account, admin, \"token\");\n+ var result = _service.TransformUserToOrganization(account, admin, \"token\");\n+\n+ _service.MockSecurityPolicyService\n+ .Verify(\n+ sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), true),\n+ subscribesToPolicy ? Times.Once() : Times.Never());\n+\n+ return result;\n}\n}\n@@ -1421,38 +1471,61 @@ public async Task WithEmailConflict_ThrowsEntityException()\n}\n[Fact]\n- public async Task WhenAdminHasNoTenant_ThrowsEntityException()\n+ public async Task WhenAdminHasNoTenant_ReturnsNewOrgWithoutPolicy()\n{\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n- var adminUsername = \"adminWithNoTenant\";\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization(admin: new User(adminUsername)));\n- Assert.Equal(String.Format(CultureInfo.CurrentCulture, Strings.Organizations_AdminAccountDoesNotHaveTenant, adminUsername), exception.Message);\n+ var org = await InvokeAddOrganization(admin: new User(AdminName) { Credentials = new Credential[0] });\n- _service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Once());\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+ AssertNewOrganizationReturned(org, subscribedToPolicy: false);\n+ }\n+\n+ [Fact]\n+ public async Task WhenAdminHasUnsupportedTenant_ReturnsNewOrgWithoutPolicy()\n+ {\n+ _service.MockEntitiesContext\n+ .Setup(x => x.Users)\n+ .Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(false);\n+\n+ _service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(mockLoginDiscontinuationConfiguration.Object);\n+\n+ var org = await InvokeAddOrganization();\n+\n+ AssertNewOrganizationReturned(org, subscribedToPolicy: false);\n}\n[Fact]\n- public async Task WhenSubscribingToPolicyFails_ThrowsUserSafeException()\n+ public async Task WhenSubscribingToPolicyFails_ReturnsNewOrgWithoutPolicy()\n{\n_service.MockEntitiesContext\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(true);\n+\n+ _service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(mockLoginDiscontinuationConfiguration.Object);\n+\n_service.MockSecurityPolicyService\n.Setup(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false))\n.Returns(Task.FromResult(false));\n- var exception = await Assert.ThrowsAsync<EntityException>(() => InvokeAddOrganization());\n- Assert.Equal(Strings.DefaultUserSafeExceptionMessage, exception.Message);\n+ var org = await InvokeAddOrganization();\n- _service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Once());\n- _service.MockSecurityPolicyService.Verify(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false), Times.Once());\n- _service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Never());\n+ AssertNewOrganizationReturned(org, subscribedToPolicy: true);\n}\n[Fact]\n@@ -1462,28 +1535,22 @@ public async Task WhenSubscribingToPolicySucceeds_ReturnsNewOrg()\n.Setup(x => x.Users)\n.Returns(Enumerable.Empty<User>().MockDbSet().Object);\n+ var mockLoginDiscontinuationConfiguration = new Mock<ILoginDiscontinuationConfiguration>();\n+ mockLoginDiscontinuationConfiguration\n+ .Setup(x => x.IsTenantIdPolicySupportedForOrganization(It.IsAny<string>(), It.IsAny<string>()))\n+ .Returns(true);\n+\n+ _service.MockConfigObjectService\n+ .Setup(x => x.LoginDiscontinuationConfiguration)\n+ .Returns(mockLoginDiscontinuationConfiguration.Object);\n+\n_service.MockSecurityPolicyService\n.Setup(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false))\n.Returns(Task.FromResult(true));\nvar org = await InvokeAddOrganization();\n- Assert.Equal(OrgName, org.Username);\n- Assert.Equal(OrgEmail, org.UnconfirmedEmailAddress);\n- Assert.Equal(OrgCreatedUtc, org.CreatedUtc);\n- Assert.True(org.EmailAllowed);\n- Assert.True(org.NotifyPackagePushed);\n- Assert.True(!string.IsNullOrEmpty(org.EmailConfirmationToken));\n-\n- // Both the organization and the admin must have a membership to each other.\n- Func<Membership, bool> hasMembership = m => m.Member.Username == AdminName && m.Organization.Username == OrgName && m.IsAdmin;\n- Assert.True(\n- org.Members.Any(\n- m => hasMembership(m) && m.Member.Organizations.Any(hasMembership)));\n-\n- _service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Once());\n- _service.MockSecurityPolicyService.Verify(sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false), Times.Once());\n- _service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Once());\n+ AssertNewOrganizationReturned(org, subscribedToPolicy: true);\n}\nprivate Task<Organization> InvokeAddOrganization(string orgName = OrgName, string orgEmail = OrgEmail, User admin = null)\n@@ -1507,6 +1574,28 @@ private Task<Organization> InvokeAddOrganization(string orgName = OrgName, strin\n// Act\nreturn _service.AddOrganizationAsync(orgName, orgEmail, admin);\n}\n+\n+ private void AssertNewOrganizationReturned(Organization org, bool subscribedToPolicy)\n+ {\n+ Assert.Equal(OrgName, org.Username);\n+ Assert.Equal(OrgEmail, org.UnconfirmedEmailAddress);\n+ Assert.Equal(OrgCreatedUtc, org.CreatedUtc);\n+ Assert.True(org.EmailAllowed);\n+ Assert.True(org.NotifyPackagePushed);\n+ Assert.True(!string.IsNullOrEmpty(org.EmailConfirmationToken));\n+\n+ // Both the organization and the admin must have a membership to each other.\n+ Func<Membership, bool> hasMembership = m => m.Member.Username == AdminName && m.Organization.Username == OrgName && m.IsAdmin;\n+ Assert.True(\n+ org.Members.Any(\n+ m => hasMembership(m) && m.Member.Organizations.Any(hasMembership)));\n+\n+ _service.MockOrganizationRepository.Verify(x => x.InsertOnCommit(It.IsAny<Organization>()), Times.Once());\n+ _service.MockSecurityPolicyService.Verify(\n+ sp => sp.SubscribeAsync(It.IsAny<User>(), It.IsAny<IUserSecurityPolicySubscription>(), false),\n+ subscribedToPolicy ? Times.Once() : Times.Never());\n+ _service.MockEntitiesContext.Verify(x => x.SaveChangesAsync(), Times.Once());\n+ }\n}\npublic class TheRejectTransformUserToOrganizationRequestMethod\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Restrict organization membership to AAD tenant only if it matches a whitelist (#5668)
|
455,776 |
27.03.2018 09:58:04
| 25,200 |
1015e90ab92051041725b23df035ddc25abccb33
|
Fix formatting of Manage Packages page with long data
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "<img class=\"package-icon img-responsive\" aria-hidden=\"true\"\ndata-bind=\"attr: { src: PackageIconUrl, onerror: PackageIconUrlFallback, alt: 'Icon for ' + Id }\" />\n</td>\n- <td class=\"align-middle package-id\">\n+ <td class=\"align-middle package-id text-nowrap\">\n<a title=\"View Package\" data-bind=\"attr: { href: PackageUrl }\">\n<span data-bind=\"text: Id\"></span>\n</a>\n</td>\n<td class=\"align-middle\">\n<span class=\"ms-noWrap\" data-bind=\"foreach: Owners\">\n+ <!-- ko if: $index() < 2 -->\n<i class=\"ms-Icon ms-Icon--Group\" aria-hidden=\"true\" data-bind=\"visible: IsOrganization\"></i>\n- <a data-bind=\"attr: { href: ProfileUrl }\"><span data-bind=\"text: Username\"></span></a><!-- ko if: ($index() < ($parent.Owners.length - 1)) -->, <!-- /ko -->\n+ <a data-bind=\"attr: { href: ProfileUrl }\"><span data-bind=\"text: TrimmedUsername\"></span></a><!-- ko if: ($index() < ($parent.Owners.length - 1)) -->, <!-- /ko -->\n+ <!-- /ko -->\n+ <!-- ko if: $index() === 2 -->\n+ <span class=\"ms-noWrap\" data-bind=\"text: '+' + ($index() - 1)\"></span>\n+ <!-- /ko -->\n</span>\n</td>\n<td class=\"align-middle text-nowrap\">\nreturn new\n{\n- p.Id,\n+ Id = p.Id.Abbreviate(40),\nOwners = GetSerializableOwners(p.Owners),\np.TotalDownloadCount,\n- LatestVersion = p.FullVersion.Abbreviate(25),\n+ LatestVersion = p.FullVersion.Abbreviate(15),\nPackageIconUrl = PackageHelper.ShouldRenderUrl(p.IconUrl) ? p.IconUrl : null,\nPackageUrl = packageUrlTemplate.Resolve(p),\nEditUrl = editUrlTemplate.Resolve(p),\nreturn new\n{\nuser.Username,\n+ TrimmedUsername = user.Username.Abbreviate(15),\nProfileUrl = userUrlTemplate.Resolve(user),\nIsOrganization = user is Organization\n};\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix formatting of Manage Packages page with long data (#5672)
|
455,776 |
28.03.2018 08:16:56
| 25,200 |
53ac414ecb2e5b10530017ff53e264a2e8ea46d9
|
[Organizations] Fix username validation for Add Organization
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -70,6 +70,14 @@ public static class Constants\ninternal const string EmailValidationRegexSecondPart = @\"[A-Za-z0-9]+[\\w\\.-]*[A-Za-z0-9]*\\.[A-Za-z0-9][A-Za-z\\.]*[A-Za-z]\";\npublic const string EmailValidationRegex = \"^\" + EmailValidationRegexFirstPart + \"@\" + EmailValidationRegexSecondPart + \"$\";\n+ public const string EmailValidationErrorMessage = \"This doesn't appear to be a valid email address.\";\n+\n+ public const string UsernameValidationRegex =\n+ @\"[A-Za-z0-9][A-Za-z0-9_\\.-]+[A-Za-z0-9]\";\n+\n+ public const string UsernameValidationErrorMessage =\n+ \"User names must start and end with a letter or number, and may only contain letters, numbers, underscores, periods, and hyphens in between.\";\n+\ninternal const string ApiKeyHeaderName = \"X-NuGet-ApiKey\";\n// X-NuGet-Client-Version header was deprecated and replaced with X-NuGet-Protocol-Version header\n// It stays here for backwards compatibility\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/AddOrganizationViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/AddOrganizationViewModel.cs",
"diff": "@@ -10,12 +10,13 @@ public class AddOrganizationViewModel\n[Required]\n[StringLength(64)]\n[Display(Name = \"Organization Name\")]\n+ [RegularExpression(Constants.UsernameValidationRegex, ErrorMessage = Constants.UsernameValidationErrorMessage)]\npublic string OrganizationName { get; set; }\n[Required]\n[StringLength(255)]\n[Display(Name = \"Organization Email Address\")]\n- [RegularExpression(Constants.EmailValidationRegex, ErrorMessage = \"This doesn't appear to be a valid email address.\")]\n+ [RegularExpression(Constants.EmailValidationRegex, ErrorMessage = Constants.EmailValidationErrorMessage)]\npublic string OrganizationEmailAddress { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ChangeEmailViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ChangeEmailViewModel.cs",
"diff": "@@ -11,7 +11,7 @@ public class ChangeEmailViewModel\n[Required]\n[StringLength(255)]\n[Display(Name = \"New Email Address\")]\n- [RegularExpression(Constants.EmailValidationRegex, ErrorMessage = RegisterViewModel.EmailValidationErrorMessage)]\n+ [RegularExpression(Constants.EmailValidationRegex, ErrorMessage = Constants.EmailValidationErrorMessage)]\npublic string NewEmail { get; set; }\n[Required]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/LogOnViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/LogOnViewModel.cs",
"diff": "@@ -67,28 +67,21 @@ public SignInViewModel(string userNameOrEmail, string password)\npublic class RegisterViewModel\n{\n- internal const string EmailValidationErrorMessage = \"This doesn't appear to be a valid email address.\";\npublic const string EmailHint = \"Your email will not be public unless you choose to disclose it. \" +\n\"It is required to verify your registration and for password retrieval, important notifications, etc. \";\n- internal const string UsernameValidationRegex =\n- @\"[A-Za-z0-9][A-Za-z0-9_\\.-]+[A-Za-z0-9]\";\n-\n- internal const string UsernameValidationErrorMessage =\n- \"User names must start and end with a letter or number, and may only contain letters, numbers, underscores, periods, and hyphens in between.\";\n-\npublic const string UserNameHint = \"Choose something unique so others will know which contributions are yours.\";\n[Required]\n[StringLength(255)]\n[Display(Name = \"Email\")]\n- [RegularExpression(Constants.EmailValidationRegex, ErrorMessage = EmailValidationErrorMessage)]\n+ [RegularExpression(Constants.EmailValidationRegex, ErrorMessage = Constants.EmailValidationErrorMessage)]\n[Subtext(\"We use <a href=\\\"http://www.gravatar.com\\\" target=\\\"_blank\\\">Gravatar</a> to get your profile picture\", AllowHtml = true)]\npublic string EmailAddress { get; set; }\n[Required]\n[StringLength(64)]\n- [RegularExpression(UsernameValidationRegex, ErrorMessage = UsernameValidationErrorMessage)]\n+ [RegularExpression(Constants.UsernameValidationRegex, ErrorMessage = Constants.UsernameValidationErrorMessage)]\npublic string Username { get; set; }\n[Required]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Fix username validation for Add Organization (#5699)
|
455,776 |
28.03.2018 10:28:18
| 25,200 |
e7d2d8f9e1ee1ee53026d2f809c1bb1a007d3a74
|
[Organizations] Manage membership requests page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -162,6 +162,12 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.HasOptional(u => u.OrganizationMigrationRequest)\n.WithRequired(m => m.NewOrganization);\n+ modelBuilder.Entity<User>()\n+ .HasMany(u => u.OrganizationMigrationRequests)\n+ .WithRequired(m => m.AdminUser)\n+ .HasForeignKey(m => m.AdminUserKey)\n+ .WillCascadeOnDelete(true); // Migration request will be deleted with the Admin account.\n+\nmodelBuilder.Entity<Organization>()\n.HasMany(o => o.Members)\n.WithRequired(m => m.Organization)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/User.cs",
"new_path": "src/NuGetGallery.Core/Entities/User.cs",
"diff": "@@ -47,6 +47,7 @@ public User(string username)\nSecurityPolicies = new List<UserSecurityPolicy>();\nReservedNamespaces = new HashSet<ReservedNamespace>();\nOrganizations = new List<Membership>();\n+ OrganizationMigrationRequests = new List<OrganizationMigrationRequest>();\nOrganizationRequests = new List<MembershipRequest>();\nRoles = new List<Role>();\nUsername = username;\n@@ -67,6 +68,11 @@ public User(string username)\n/// </summary>\npublic virtual OrganizationMigrationRequest OrganizationMigrationRequest { get; set; }\n+ /// <summary>\n+ /// Requests for this user to become the admin of a <see cref=\"User\"/> account that was transformed into an <see cref=\"Organization\"/> account.\n+ /// </summary>\n+ public virtual ICollection<OrganizationMigrationRequest> OrganizationMigrationRequests { get; set; }\n+\n[StringLength(256)]\npublic string EmailAddress { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -814,16 +814,25 @@ public static string AddOrganizationMember(this UrlHelper url, string accountNam\npublic static string AcceptOrganizationMembershipRequest(this UrlHelper url, MembershipRequest request, bool relativeUrl = true)\n{\n- return url.HandleOrganizationMembershipRequest(\"ConfirmMemberRequest\", request, relativeUrl);\n+ return url.AcceptOrganizationMembershipRequest(request.Organization.Username, request.ConfirmationToken, relativeUrl);\n}\npublic static string RejectOrganizationMembershipRequest(this UrlHelper url, MembershipRequest request, bool relativeUrl = true)\n{\n- return url.HandleOrganizationMembershipRequest(\"RejectMemberRequest\", request, relativeUrl);\n+ return url.RejectOrganizationMembershipRequest(request.Organization.Username, request.ConfirmationToken, relativeUrl);\n}\n- private static string HandleOrganizationMembershipRequest(\n- this UrlHelper url, string routeName, MembershipRequest request, bool relativeUrl = true)\n+ public static string AcceptOrganizationMembershipRequest(this UrlHelper url, string organizationUsername, string confirmationToken, bool relativeUrl = true)\n+ {\n+ return url.HandleOrganizationMembershipRequest(\"ConfirmMemberRequest\", organizationUsername, confirmationToken, relativeUrl);\n+ }\n+\n+ public static string RejectOrganizationMembershipRequest(this UrlHelper url, string organizationUsername, string confirmationToken, bool relativeUrl = true)\n+ {\n+ return url.HandleOrganizationMembershipRequest(\"RejectMemberRequest\", organizationUsername, confirmationToken, relativeUrl);\n+ }\n+\n+ private static string HandleOrganizationMembershipRequest(this UrlHelper url, string routeName, string organizationUsername, string confirmationToken, bool relativeUrl = true)\n{\nreturn GetActionLink(url,\nrouteName,\n@@ -831,8 +840,8 @@ public static string RejectOrganizationMembershipRequest(this UrlHelper url, Mem\nrelativeUrl,\nrouteValues: new RouteValueDictionary\n{\n- { \"accountName\", request.Organization.Username },\n- { \"confirmationToken\", request.ConfirmationToken }\n+ { \"accountName\", organizationUsername },\n+ { \"confirmationToken\", confirmationToken }\n});\n}\n@@ -1211,6 +1220,21 @@ public static string RejectTransformAccount(this UrlHelper url, User accountToTr\n}\nprivate static string HandleTransformAccount(this UrlHelper url, string routeName, User accountToTransform, bool relativeUrl = true)\n+ {\n+ return url.HandleTransformAccount(routeName, accountToTransform.Username, accountToTransform.OrganizationMigrationRequest.ConfirmationToken, relativeUrl);\n+ }\n+\n+ public static string ConfirmTransformAccount(this UrlHelper url, string accountToTransformUsername, string confirmationToken, bool relativeUrl = true)\n+ {\n+ return url.HandleTransformAccount(RouteName.TransformToOrganizationConfirmation, accountToTransformUsername, confirmationToken, relativeUrl);\n+ }\n+\n+ public static string RejectTransformAccount(this UrlHelper url, string accountToTransformUsername, string confirmationToken, bool relativeUrl = true)\n+ {\n+ return url.HandleTransformAccount(\"RejectTransform\", accountToTransformUsername, confirmationToken, relativeUrl);\n+ }\n+\n+ private static string HandleTransformAccount(this UrlHelper url, string routeName, string accountToTransformUsername, string confirmationToken, bool relativeUrl = true)\n{\nreturn GetActionLink(\nurl,\n@@ -1219,8 +1243,8 @@ private static string HandleTransformAccount(this UrlHelper url, string routeNam\nrelativeUrl,\nrouteValues: new RouteValueDictionary\n{\n- { \"accountNameToTransform\", accountToTransform.Username },\n- { \"token\", accountToTransform.OrganizationMigrationRequest.ConfirmationToken }\n+ { \"accountNameToTransform\", accountToTransformUsername },\n+ { \"token\", confirmationToken }\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManageOrganizationsItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManageOrganizationsItemViewModel.cs",
"diff": "@@ -7,20 +7,82 @@ namespace NuGetGallery\n{\npublic class ManageOrganizationsItemViewModel\n{\n- public string Username { get; }\n+ /// <summary>\n+ /// The name of this organization.\n+ /// </summary>\n+ public string OrganizationName { get; }\n+\n+ /// <summary>\n+ /// The email address of the organization.\n+ /// </summary>\npublic string EmailAddress { get; }\n+\n+ /// <summary>\n+ /// Whether or not the current user is an administrator or pending administrator of this organization.\n+ /// </summary>\npublic bool CurrentUserIsAdmin { get; }\n+\n+ /// <summary>\n+ /// The number of members in this organization.\n+ /// </summary>\npublic int MemberCount { get; }\n+\n+ /// <summary>\n+ /// The number of packages owned by this organization.\n+ /// </summary>\npublic int PackagesCount { get; }\n- public ManageOrganizationsItemViewModel(Membership membership, IPackageService packageService)\n+ /// <summary>\n+ /// Whether or not this is a pending request--the current user is not yet a member of this organization, but can choose to accept or decline a request to become one.\n+ /// </summary>\n+ public bool IsPendingRequest { get; }\n+\n+ /// <summary>\n+ /// Whether or not this is a request for a user account to be transformed into an organization with the current user as the administrator.\n+ /// </summary>\n+ public bool IsPendingTransformRequest { get; }\n+\n+ /// <summary>\n+ /// If this is a pending request, the confirmation token to confirm or decline the request.\n+ /// </summary>\n+ public string ConfirmationToken { get; }\n+\n+ private ManageOrganizationsItemViewModel(User user, bool isAdmin, IPackageService packageService)\n+ {\n+ OrganizationName = user.Username;\n+ EmailAddress = user.EmailAddress;\n+ CurrentUserIsAdmin = isAdmin;\n+ PackagesCount = packageService.FindPackageRegistrationsByOwner(user).Count();\n+ MemberCount = 0;\n+ }\n+\n+ public ManageOrganizationsItemViewModel(Organization organization, bool isAdmin, IPackageService packageService)\n+ : this(organization as User, isAdmin, packageService)\n{\n- var organization = membership.Organization;\n- Username = organization.Username;\n+ OrganizationName = organization.Username;\nEmailAddress = organization.EmailAddress ?? organization.UnconfirmedEmailAddress;\n- CurrentUserIsAdmin = membership.IsAdmin;\n+ CurrentUserIsAdmin = isAdmin;\nMemberCount = organization.Members.Count();\n- PackagesCount = packageService.FindPackageRegistrationsByOwner(membership.Organization).Count();\n+ }\n+\n+ public ManageOrganizationsItemViewModel(Membership membership, IPackageService packageService)\n+ : this(membership.Organization, membership.IsAdmin, packageService)\n+ {\n+ }\n+\n+ public ManageOrganizationsItemViewModel(MembershipRequest request, IPackageService packageService)\n+ : this(request.Organization, request.IsAdmin, packageService)\n+ {\n+ IsPendingRequest = true;\n+ ConfirmationToken = request.ConfirmationToken;\n+ }\n+\n+ public ManageOrganizationsItemViewModel(OrganizationMigrationRequest request, IPackageService packageService)\n+ : this(request.NewOrganization, true, packageService)\n+ {\n+ IsPendingRequest = true;\n+ IsPendingTransformRequest = true;\n+ ConfirmationToken = request.ConfirmationToken;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManageOrganizationsViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManageOrganizationsViewModel.cs",
"diff": "@@ -12,7 +12,11 @@ public class ManageOrganizationsViewModel\npublic ManageOrganizationsViewModel(User currentUser, IPackageService packageService)\n{\n- Organizations = currentUser.Organizations.Select(m => new ManageOrganizationsItemViewModel(m, packageService));\n+ var organizations = currentUser.Organizations.Select(m => new ManageOrganizationsItemViewModel(m, packageService));\n+ var pendingMemberships = currentUser.OrganizationRequests.Select(m => new ManageOrganizationsItemViewModel(m, packageService));\n+ var pendingTransformations = currentUser.OrganizationMigrationRequests.Select(m => new ManageOrganizationsItemViewModel(m, packageService));\n+\n+ Organizations = organizations.Concat(pendingMemberships).Concat(pendingTransformations);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"diff": "<img src=\"@GravatarHelper.Url(organization.EmailAddress, 256)\" class=\"package-icon img-responsive\" aria-hidden=\"true\" alt=\"\" />\n</td>\n<td class=\"align-middle package-id\">\n- <a title=\"View Organization Profile\" href=\"@Url.User(organization.Username)\" >\n- @organization.Username\n+ <a title=\"View Organization Profile\" href=\"@Url.User(organization.OrganizationName)\" >\n+ @organization.OrganizationName\n</a>\n+ @if (organization.IsPendingRequest)\n+ {\n+ <span>(pending approval)</span>\n+ }\n</td>\n<td class=\"align-middle\">\n@(organization.CurrentUserIsAdmin ? \"Administrator\" : \"Collaborator\")\n@organization.PackagesCount\n</td>\n<td class=\"text-right align-middle package-controls\">\n- <a class=\"btn\" href=\"@Url.ManageMyOrganization(organization.Username)\" title=\"Edit Organization\" aria-label=\"@(\"Edit Organization \" + organization.Username)\">\n+ @if (!organization.IsPendingRequest && !organization.IsPendingTransformRequest)\n+ {\n+ <a class=\"btn\" href=\"@Url.ManageMyOrganization(organization.OrganizationName)\" title=\"Edit Organization\" aria-label=\"@(\"Edit Organization \" + organization.OrganizationName)\">\n<i class=\"ms-Icon ms-Icon--Edit\" aria-hidden=\"true\"></i>\n</a>\n+ }\n+ else if (organization.IsPendingRequest)\n+ {\n+ var accept = organization.IsPendingTransformRequest ? Url.ConfirmTransformAccount(organization.OrganizationName, organization.ConfirmationToken) : Url.AcceptOrganizationMembershipRequest(organization.OrganizationName, organization.ConfirmationToken);\n+ var reject = organization.IsPendingTransformRequest ? Url.RejectTransformAccount(organization.OrganizationName, organization.ConfirmationToken) : Url.RejectOrganizationMembershipRequest(organization.OrganizationName, organization.ConfirmationToken);\n+\n+ <a class=\"btn\" href=\"@accept\" title=\"Accept Organization Membership Request\" aria-label=\"@(\"Accept Organization Membership Request for \" + organization.OrganizationName)\">\n+ <i class=\"ms-Icon ms-Icon--Accept\" aria-hidden=\"true\"></i>\n+ </a>\n+ <a class=\"btn\" href=\"@reject\" title=\"Reject Organization Membership Request\" aria-label=\"@(\"Reject Organization Membership Request for \" + organization.OrganizationName)\">\n+ <i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n+ </a>\n+ }\n</td>\n</tr>\n</tbody>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Manage membership requests page (#5665)
|
455,776 |
28.03.2018 10:54:40
| 25,200 |
5f3d18a394f36d1dcea795d843b11143cede8b53
|
Login Discontinuation Configuration should be case-insensitive
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"new_path": "src/NuGetGallery/Services/LoginDiscontinuationConfiguration.cs",
"diff": "@@ -35,10 +35,10 @@ public LoginDiscontinuationConfiguration()\nIEnumerable<string> forceTransformationToOrganizationForEmailAddresses,\nIEnumerable<OrganizationTenantPair> enabledOrganizationAadTenants)\n{\n- DiscontinuedForEmailAddresses = new HashSet<string>(discontinuedForEmailAddresses);\n- DiscontinuedForDomains = new HashSet<string>(discontinuedForDomains);\n- ExceptionsForEmailAddresses = new HashSet<string>(exceptionsForEmailAddresses);\n- ForceTransformationToOrganizationForEmailAddresses = new HashSet<string>(forceTransformationToOrganizationForEmailAddresses);\n+ DiscontinuedForEmailAddresses = new HashSet<string>(discontinuedForEmailAddresses, StringComparer.OrdinalIgnoreCase);\n+ DiscontinuedForDomains = new HashSet<string>(discontinuedForDomains, StringComparer.OrdinalIgnoreCase);\n+ ExceptionsForEmailAddresses = new HashSet<string>(exceptionsForEmailAddresses, StringComparer.OrdinalIgnoreCase);\n+ ForceTransformationToOrganizationForEmailAddresses = new HashSet<string>(forceTransformationToOrganizationForEmailAddresses, StringComparer.OrdinalIgnoreCase);\nEnabledOrganizationAadTenants = new HashSet<OrganizationTenantPair>(enabledOrganizationAadTenants, new OrganizationTenantPairComparer());\n}\n@@ -65,7 +65,7 @@ public bool IsUserOnWhitelist(User user)\nvar email = user.ToMailAddress();\nreturn\n- DiscontinuedForDomains.Contains(email.Host, StringComparer.OrdinalIgnoreCase) ||\n+ DiscontinuedForDomains.Contains(email.Host) ||\nDiscontinuedForEmailAddresses.Contains(email.Address);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/LoginDiscontinuationConfigurationFacts.cs",
"diff": "@@ -32,7 +32,10 @@ public static IEnumerable<object[]> PossibleListStates\n{\nforeach (var isOnTenantPairList in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList);\n+ foreach (var isWrongCase in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, isWrongCase);\n+ }\n}\n}\n}\n@@ -41,17 +44,24 @@ public static IEnumerable<object[]> PossibleListStates\n}\n}\n- public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList)\n+ public static ILoginDiscontinuationConfiguration CreateConfiguration(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList, bool isWrongCase)\n{\n- var emails = isOnWhiteList ? new[] { _email } : new[] { _incorrectEmail };\n- var domains = isOnDomainList ? new[] { _domain } : new[] { _incorrectDomain };\n- var exceptions = isOnExceptionList ? new[] { _email } : new[] { _incorrectException };\n- var shouldTransforms = isOnTransformList ? new[] { _email } : new[] { _incorrectException };\n- var orgTenantPairs = isOnTenantPairList ? new[] { new OrganizationTenantPair(_domain, _tenant) } : new[] { new OrganizationTenantPair(_incorrectDomain, _incorrectTenant) };\n+ var emails = isOnWhiteList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectEmail, isWrongCase) };\n+ var domains = isOnDomainList ? new[] { ToUppercaseIfWrongCase(_domain, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase) };\n+ var exceptions = isOnExceptionList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectException, isWrongCase) };\n+ var shouldTransforms = isOnTransformList ? new[] { ToUppercaseIfWrongCase(_email, isWrongCase) } : new[] { ToUppercaseIfWrongCase(_incorrectException, isWrongCase) };\n+ var orgTenantPairs = isOnTenantPairList ?\n+ new[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_domain, isWrongCase), ToUppercaseIfWrongCase(_tenant, isWrongCase)) } :\n+ new[] { new OrganizationTenantPair(ToUppercaseIfWrongCase(_incorrectDomain, isWrongCase), ToUppercaseIfWrongCase(_incorrectTenant, isWrongCase)) };\nreturn new LoginDiscontinuationConfiguration(emails, domains, exceptions, shouldTransforms, orgTenantPairs);\n}\n+ private static string ToUppercaseIfWrongCase(string input, bool isWrongCase)\n+ {\n+ return isWrongCase ? input.ToUpperInvariant() : input;\n+ }\n+\npublic class TheIsLoginDiscontinuedMethod\n{\npublic static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Data\n@@ -71,7 +81,10 @@ public static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Dat\n{\nforeach (var isOnTransformList in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+ foreach (var isWrongCase in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase);\n+ }\n}\n}\n}\n@@ -82,9 +95,9 @@ public static IEnumerable<object[]> IfPasswordLoginReturnsTrueIfOnWhitelists_Dat\n[Theory]\n[MemberData(nameof(IfPasswordLoginReturnsTrueIfOnWhitelists_Data))]\n- public void IfPasswordLoginReturnsTrueIfOnWhitelists(string credentialPasswordType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n+ public void IfPasswordLoginReturnsTrueIfOnWhitelists(string credentialPasswordType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isWrongCase)\n{\n- TestIsLoginDiscontinued(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList,\n+ TestIsLoginDiscontinued(credentialPasswordType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase,\nexpectedResult: (isOnWhiteList || isOnDomainList) && !isOnExceptionList);\n}\n@@ -109,7 +122,10 @@ public static IEnumerable<object[]> IfNotPasswordLoginReturnsFalse_Data\n{\nforeach (var isOnTransformList in new[] { true, false })\n{\n- yield return MemberDataHelper.AsData(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList);\n+ foreach (var isWrongCase in new[] { true, false })\n+ {\n+ yield return MemberDataHelper.AsData(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase);\n+ }\n}\n}\n}\n@@ -120,19 +136,19 @@ public static IEnumerable<object[]> IfNotPasswordLoginReturnsFalse_Data\n[Theory]\n[MemberData(nameof(IfNotPasswordLoginReturnsFalse_Data))]\n- public void IfNotPasswordLoginReturnsFalse(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList)\n+ public void IfNotPasswordLoginReturnsFalse(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isWrongCase)\n{\n- TestIsLoginDiscontinued(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, expectedResult: false);\n+ TestIsLoginDiscontinued(credentialType, isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isWrongCase, expectedResult: false);\n}\n- private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool expectedResult)\n+ private void TestIsLoginDiscontinued(string credentialType, bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isWrongCase, bool expectedResult)\n{\n// Arrange\nvar credential = new Credential(credentialType, \"value\");\nvar user = new User(\"test\") { EmailAddress = _email, Credentials = new[] { credential } };\nvar authUser = new AuthenticatedUser(user, credential);\n- var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList: false);\n+ var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList: false, isWrongCase: isWrongCase);\n// Act\nvar result = config.IsLoginDiscontinued(authUser);\n@@ -146,12 +162,12 @@ public class TheWhitelistMethods\n{\npublic static IEnumerable<object[]> PossibleListStates => PossibleListStates;\n- public void ReturnsAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList)\n+ public void ReturnsAsExpected(bool isOnWhiteList, bool isOnDomainList, bool isOnExceptionList, bool isOnTransformList, bool isOnTenantPairList, bool isWrongCase)\n{\n// Arrange\nvar user = new User(\"test\") { EmailAddress = _email };\n- var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList);\n+ var config = CreateConfiguration(isOnWhiteList, isOnDomainList, isOnExceptionList, isOnTransformList, isOnTenantPairList, isWrongCase);\n// Act\nvar areOrganizationsSupported = config.IsUserOnWhitelist(user);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Login Discontinuation Configuration should be case-insensitive (#5687)
|
455,794 |
28.03.2018 11:39:07
| 25,200 |
3019c0f7b6680f22fbfaecd1abd6279194b65e81
|
Perf: optimize VerifyPackage by not querying WM feed unless necessary
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/PackageCurators/WebMatrixPackageCurator.cs",
"new_path": "src/NuGetGallery/PackageCurators/WebMatrixPackageCurator.cs",
"diff": "@@ -23,14 +23,19 @@ public WebMatrixPackageCurator(ICuratedFeedService curatedFeedService)\nPackageArchiveReader nugetPackage,\nbool commitChanges)\n{\n+ var shouldBeIncluded = ShouldCuratePackage(galleryPackage, nugetPackage);\n+ if (!shouldBeIncluded)\n+ {\n+ return;\n+ }\n+\nvar curatedFeed = CuratedFeedService.GetFeedByName(\"webmatrix\", includePackages: true);\nif (curatedFeed == null)\n{\nreturn;\n}\n- var shouldBeIncluded = ShouldCuratePackage(curatedFeed, galleryPackage, nugetPackage);\n- if (shouldBeIncluded)\n+ if (DependenciesAreCurated(galleryPackage, curatedFeed))\n{\nawait CuratedFeedService.CreatedCuratedPackageAsync(\ncuratedFeed,\n@@ -42,7 +47,6 @@ public WebMatrixPackageCurator(ICuratedFeedService curatedFeedService)\n}\ninternal static bool ShouldCuratePackage(\n- CuratedFeed curatedFeed,\nPackage galleryPackage,\nPackageArchiveReader packageArchiveReader)\n{\n@@ -64,10 +68,7 @@ public WebMatrixPackageCurator(ICuratedFeedService curatedFeedService)\n// OR: Must not contain PowerShell or T4\nDoesNotContainUnsupportedFiles(packageArchiveReader)\n- ) &&\n-\n- // Dependencies on the gallery must be curated\n- DependenciesAreCurated(galleryPackage, curatedFeed);\n+ );\n}\nprivate static bool ContainsAspNetWebPagesTag(Package galleryPackage)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/PackageCurators/WebMatrixPackageCuratorFacts.cs",
"new_path": "tests/NuGetGallery.Facts/PackageCurators/WebMatrixPackageCuratorFacts.cs",
"diff": "@@ -52,8 +52,9 @@ public async Task WillNotIncludeThePackageWhenTheWebMatrixCuratedFeedDoesNotExis\n{\nstubCuratedFeedService.Setup(stub => stub.GetFeedByName(It.IsAny<string>(), It.IsAny<bool>())).Returns((CuratedFeed)null);\n});\n+ var stubNuGetPackageReader = CreateStubNuGetPackageReader();\n- await curator.CurateAsync(CreateStubGalleryPackage(), null, commitChanges: true);\n+ await curator.CurateAsync(CreateStubGalleryPackage(), stubNuGetPackageReader.Object, commitChanges: true);\ncurator.StubCuratedFeedService.Verify(\nstub => stub.CreatedCuratedPackageAsync(\n@@ -69,13 +70,11 @@ public async Task WillNotIncludeThePackageWhenTheWebMatrixCuratedFeedDoesNotExis\n[Fact]\npublic void WillNotIncludeThePackageWhenItIsNotTheLatestStable()\n{\n- var stubFeed = new CuratedFeed();\nvar stubGalleryPackage = CreateStubGalleryPackage();\nstubGalleryPackage.IsLatestStable = false;\nvar stubNuGetPackageReader = CreateStubNuGetPackageReader();\nbool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\nstubGalleryPackage,\nstubNuGetPackageReader.Object);\n@@ -85,13 +84,11 @@ public void WillNotIncludeThePackageWhenItIsNotTheLatestStable()\n[Fact]\npublic void WillIncludeThePackageWhenItIsTaggedWithAspNetWebPages()\n{\n- var stubFeed = new CuratedFeed();\nvar stubGalleryPackage = CreateStubGalleryPackage();\nvar stubNuGetPackageReader = CreateStubNuGetPackageReader();\nstubGalleryPackage.Tags = \"aspnetwebpages\";\nbool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\nstubGalleryPackage,\nstubNuGetPackageReader.Object);\n@@ -115,7 +112,6 @@ public async Task WillNotExamineTheNuGetPackageFilesWhenTaggedWithAspNetWebPages\n[Fact]\npublic void WillNotIncludeThePackageWhenNotTaggedAndThereIsAPowerShellFile()\n{\n- var stubFeed = new CuratedFeed();\nvar stubGalleryPackage = CreateStubGalleryPackage();\nvar stubNuGetPackage = CreateStubNuGetPackage(populatePackage: p =>\n{\n@@ -125,7 +121,6 @@ public void WillNotIncludeThePackageWhenNotTaggedAndThereIsAPowerShellFile()\n});\nbool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\nstubGalleryPackage,\nnew PackageArchiveReader(stubNuGetPackage));\n@@ -135,7 +130,6 @@ public void WillNotIncludeThePackageWhenNotTaggedAndThereIsAPowerShellFile()\n[Fact]\npublic void WillNotIncludeThePackageWhenNotTaggedAndThereIsT4Template()\n{\n- var stubFeed = new CuratedFeed();\nvar stubGalleryPackage = CreateStubGalleryPackage();\nvar stubNuGetPackage = CreateStubNuGetPackage(populatePackage: p =>\n{\n@@ -145,7 +139,6 @@ public void WillNotIncludeThePackageWhenNotTaggedAndThereIsT4Template()\n});\nbool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\nstubGalleryPackage,\nnew PackageArchiveReader(stubNuGetPackage));\n@@ -153,7 +146,7 @@ public void WillNotIncludeThePackageWhenNotTaggedAndThereIsT4Template()\n}\n[Fact]\n- public void WillNotIncludeThePackageWhenItDependsOnAPackageThatIsNotIncluded()\n+ public async Task WillNotIncludeThePackageWhenItDependsOnAPackageThatIsNotIncluded()\n{\nvar stubFeed = new CuratedFeed();\nvar stubNuGetPackage = CreateStubNuGetPackageReader();\n@@ -161,16 +154,26 @@ public void WillNotIncludeThePackageWhenItDependsOnAPackageThatIsNotIncluded()\nstubGalleryPackage.Dependencies.Add(\nnew PackageDependency { Id = \"NotACuratedPackage\" });\n- bool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\n- stubGalleryPackage,\n- stubNuGetPackage.Object);\n+ var curator = TestableWebMatrixPackageCurator.Create(stubCuratedFeedService =>\n+ {\n+ stubCuratedFeedService.Setup(stub => stub.GetFeedByName(It.IsAny<string>(), It.IsAny<bool>())).Returns(stubFeed);\n+ });\n- Assert.False(result);\n+ await curator.CurateAsync(stubGalleryPackage, stubNuGetPackage.Object, commitChanges: true);\n+\n+ curator.StubCuratedFeedService.Verify(\n+ stub => stub.CreatedCuratedPackageAsync(\n+ It.IsAny<CuratedFeed>(),\n+ It.IsAny<PackageRegistration>(),\n+ It.IsAny<bool>(),\n+ It.IsAny<bool>(),\n+ It.IsAny<string>(),\n+ It.IsAny<bool>()),\n+ Times.Never());\n}\n[Fact]\n- public void WillNotIncludeThePackageWhenItDependsOnAPackageThatIsExcludedInTheFeed()\n+ public async Task WillNotIncludeThePackageWhenItDependsOnAPackageThatIsExcludedInTheFeed()\n{\nvar stubFeed = new CuratedFeed();\nvar dependencyPackage = new CuratedPackage\n@@ -185,18 +188,27 @@ public void WillNotIncludeThePackageWhenItDependsOnAPackageThatIsExcludedInTheFe\nstubGalleryPackage.Dependencies.Add(\nnew PackageDependency { Id = \"ManuallyExcludedPackage\" });\n- bool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\n- stubGalleryPackage,\n- stubNuGetPackage.Object);\n+ var curator = TestableWebMatrixPackageCurator.Create(stubCuratedFeedService =>\n+ {\n+ stubCuratedFeedService.Setup(stub => stub.GetFeedByName(It.IsAny<string>(), It.IsAny<bool>())).Returns(stubFeed);\n+ });\n- Assert.False(result);\n+ await curator.CurateAsync(stubGalleryPackage, stubNuGetPackage.Object, commitChanges: true);\n+\n+ curator.StubCuratedFeedService.Verify(\n+ stub => stub.CreatedCuratedPackageAsync(\n+ It.IsAny<CuratedFeed>(),\n+ It.IsAny<PackageRegistration>(),\n+ It.IsAny<bool>(),\n+ It.IsAny<bool>(),\n+ It.IsAny<string>(),\n+ It.IsAny<bool>()),\n+ Times.Never());\n}\n[Fact]\npublic void WillIncludeThePackageWhenThereIsNotPowerShellOrT4File()\n{\n- var stubFeed = new CuratedFeed();\nvar stubGalleryPackage = CreateStubGalleryPackage();\nvar stubNuGetPackage = CreateStubNuGetPackage(populatePackage: p =>\n{\n@@ -205,7 +217,6 @@ public void WillIncludeThePackageWhenThereIsNotPowerShellOrT4File()\n});\nbool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\nstubGalleryPackage,\nnew PackageArchiveReader(stubNuGetPackage));\n@@ -215,12 +226,10 @@ public void WillIncludeThePackageWhenThereIsNotPowerShellOrT4File()\n[Fact]\npublic void WillNotIncludeThePackageWhenMinClientVersionIsTooHigh()\n{\n- var stubFeed = new CuratedFeed();\nvar stubGalleryPackage = CreateStubGalleryPackage();\nvar stubNuGetPackage = CreateStubNuGetPackage(minClientVersion: \"3.0.0\");\nbool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\nstubGalleryPackage,\nnew PackageArchiveReader(stubNuGetPackage));\n@@ -230,7 +239,6 @@ public void WillNotIncludeThePackageWhenMinClientVersionIsTooHigh()\n[Fact]\npublic void WillNotIncludeThePackageWhenPackageDoesNotSupportNet40()\n{\n- var stubFeed = new CuratedFeed();\nvar stubGalleryPackage = CreateStubGalleryPackage();\nvar stubNuGetPackage = CreateStubNuGetPackageReader();\nstubGalleryPackage.Tags = \"aspnetwebpages\";\n@@ -240,7 +248,6 @@ public void WillNotIncludeThePackageWhenPackageDoesNotSupportNet40()\n});\nbool result = WebMatrixPackageCurator.ShouldCuratePackage(\n- stubFeed,\nstubGalleryPackage,\nstubNuGetPackage.Object);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Perf: optimize VerifyPackage by not querying WM feed unless necessary (#5702)
|
455,737 |
28.03.2018 14:35:29
| 25,200 |
d96e793dc3be93d499fe87f53ba57259fad68d49
|
Add Content-Security-Policy 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=\"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
|
Add Content-Security-Policy header. (#5653)
|
455,737 |
29.03.2018 12:42:25
| 25,200 |
0a26b3ccd77977122f9c46acf056d1e5187e6997
|
Add default regex match timeout (10s)
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "@@ -45,6 +45,9 @@ public static void Configuration(IAppBuilder app)\nServicePointManager.SecurityProtocol &= ~SecurityProtocolType.Ssl3;\nServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;\n+ // Setting time out for all RegEx objects. Noted in remarks at https://msdn.microsoft.com/en-us/library/system.text.regularexpressions.regex.matchtimeout%28v=vs.110%29.aspx\n+ AppDomain.CurrentDomain.SetData(\"REGEX_DEFAULT_MATCH_TIMEOUT\", TimeSpan.FromSeconds(10));\n+\n// Register IoC\napp.UseAutofacInjection(GlobalConfiguration.Configuration);\nvar dependencyResolver = DependencyResolver.Current;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add default regex match timeout (10s) (#5708)
|
455,747 |
29.03.2018 13:26:55
| 25,200 |
be597bda4b7b593e1bba6d5d15e997cf4c68a2bc
|
[MSA] Add 2FA support for Microsoft logins
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticateExternalLoginResult.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticateExternalLoginResult.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;\n+using System.Collections.Generic;\nusing System.Security.Claims;\nusing NuGetGallery.Authentication.Providers;\n@@ -12,5 +14,19 @@ public class AuthenticateExternalLoginResult\npublic ClaimsIdentity ExternalIdentity { get; set; }\npublic Authenticator Authenticator { get; set; }\npublic Credential Credential { get; set; }\n+ public ExternalLoginSessionDetails LoginDetails { get; set; }\n+ }\n+\n+ public class ExternalLoginSessionDetails\n+ {\n+ public string EmailUsed { get; }\n+\n+ public bool WasMultiFactorAuthenticated { get; }\n+\n+ public ExternalLoginSessionDetails(string email, bool usedMultiFactorAuthentication)\n+ {\n+ EmailUsed = email;\n+ WasMultiFactorAuthenticated = usedMultiFactorAuthentication;\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -484,7 +484,7 @@ public virtual async Task<bool> ChangePassword(User user, string oldPassword, st\nreturn true;\n}\n- public virtual ActionResult Challenge(string providerName, string redirectUrl)\n+ public virtual ActionResult Challenge(string providerName, string redirectUrl, AuthenticationPolicy policy = null)\n{\nAuthenticator provider;\n@@ -504,7 +504,7 @@ public virtual ActionResult Challenge(string providerName, string redirectUrl)\nproviderName));\n}\n- return provider.Challenge(redirectUrl);\n+ return provider.Challenge(redirectUrl, policy);\n}\npublic virtual async Task AddCredential(User user, Credential credential)\n@@ -622,7 +622,8 @@ public virtual async Task<AuthenticateExternalLoginResult> ReadExternalLoginCred\nAuthentication = null,\nExternalIdentity = externalIdentity,\nAuthenticator = authenticator,\n- Credential = _credentialBuilder.CreateExternalCredential(userInfo.AuthenticationType, userInfo.Identifier, identity, userInfo.TenantId)\n+ Credential = _credentialBuilder.CreateExternalCredential(userInfo.AuthenticationType, userInfo.Identifier, identity, userInfo.TenantId),\n+ LoginDetails = new ExternalLoginSessionDetails(userInfo.Email, userInfo.UsedMultiFactorAuthentication)\n};\n}\ncatch (Exception ex)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/Authenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/Authenticator.cs",
"diff": "@@ -90,7 +90,7 @@ public virtual AuthenticatorUI GetUI()\nreturn null;\n}\n- public virtual ActionResult Challenge(string redirectUrl)\n+ public virtual ActionResult Challenge(string redirectUrl, AuthenticationPolicy policy)\n{\nreturn new HttpUnauthorizedResult();\n}\n@@ -122,5 +122,14 @@ public virtual IdentityInformation GetIdentityInformation(ClaimsIdentity claimsI\n{\nreturn null;\n}\n+\n+ /// <summary>\n+ /// Check if the provider supports multi-factor authentication\n+ /// </summary>\n+ /// <returns>Returns true if the provider supports multi-factor authentication</returns>\n+ public virtual bool SupportsMultiFactorAuthentication()\n+ {\n+ return false;\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectory/AzureActiveDirectoryAuthenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectory/AzureActiveDirectoryAuthenticator.cs",
"diff": "@@ -76,9 +76,9 @@ public override bool IsProviderForIdentity(ClaimsIdentity claimsIdentity)\nreturn base.IsProviderForIdentity(claimsIdentity);\n}\n- public override ActionResult Challenge(string redirectUrl)\n+ public override ActionResult Challenge(string redirectUrl, AuthenticationPolicy policy)\n{\n- return new ChallengeResult(BaseConfig.AuthenticationType, redirectUrl);\n+ return new ChallengeResult(BaseConfig.AuthenticationType, redirectUrl, policy?.GetProperties());\n}\npublic override IdentityInformation GetIdentityInformation(ClaimsIdentity claimsIdentity)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.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.Security.Claims;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\nusing Microsoft.IdentityModel.Protocols;\n+using Microsoft.Owin.Security;\nusing Microsoft.Owin.Security.Notifications;\nusing Microsoft.Owin.Security.OpenIdConnect;\nusing NuGetGallery.Configuration;\n@@ -22,6 +24,12 @@ public static class V2Claims\npublic const string Email = \"preferred_username\";\npublic const string Name = \"name\";\npublic const string Issuer = \"iss\";\n+\n+ /// <summary>\n+ /// ACR is the Authentication Class Reference token, which is the claim that is returned by OpenId upon usage of multi-factor during authentication.\n+ /// More details: http://openid.net/specs/openid-connect-eap-acr-values-1_0.html\n+ /// </summary>\n+ public const string ACR = \"http://schemas.microsoft.com/claims/authnclassreference\";\n}\npublic static class AuthenticationType\n@@ -35,7 +43,23 @@ 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 readonly string ACCESS_DENIED = \"access_denied\";\n+ private static HashSet<string> _errorMessageList = new HashSet<string> { \"access_denied\", \"consent_required\" };\n+\n+ /// <summary>\n+ /// The possible values returned by <see cref=\"V2Claims.ACR\"/> claim, and also the possible token values to be sent\n+ /// for authentication to the common endpoint.\n+ /// </summary>\n+ public static class ACR_VALUES\n+ {\n+ public static readonly string DEFAULT = \"urn:microsoft:policies:default\";\n+ public static readonly string MFA = \"urn:microsoft:policies:mfa\";\n+\n+ /// <summary>\n+ /// Combination of MFA and DEFAULT values sent as id_token to the authentication uses the user set policy\n+ /// for multi-factor authentication and returns the <see cref=\"V2Claims.ACR\"/> token with the used policy.\n+ /// </summary>\n+ public static readonly string ANY = MFA + \" \" + DEFAULT;\n+ }\nprotected override void AttachToOwinApp(IGalleryConfigurationService config, IAppBuilder app)\n{\n@@ -58,7 +82,8 @@ protected override void AttachToOwinApp(IGalleryConfigurationService config, IAp\nTokenValidationParameters = new System.IdentityModel.Tokens.TokenValidationParameters() { ValidateIssuer = false },\nNotifications = new OpenIdConnectAuthenticationNotifications\n{\n- AuthenticationFailed = AuthenticationFailed\n+ AuthenticationFailed = AuthenticationFailed,\n+ RedirectToIdentityProvider = RedirectToIdentityProvider\n}\n};\n@@ -79,9 +104,9 @@ public override AuthenticatorUI GetUI()\n};\n}\n- public override ActionResult Challenge(string redirectUrl)\n+ public override ActionResult Challenge(string redirectUrl, AuthenticationPolicy policy)\n{\n- return new ChallengeResult(BaseConfig.AuthenticationType, redirectUrl);\n+ return new ChallengeResult(BaseConfig.AuthenticationType, redirectUrl, policy?.GetProperties());\n}\npublic override bool IsProviderForIdentity(ClaimsIdentity claimsIdentity)\n@@ -142,7 +167,16 @@ public override IdentityInformation GetIdentityInformation(ClaimsIdentity claims\nthrow new ArgumentException($\"External Authentication is missing required claim: '{V2Claims.Email}'\");\n}\n- return new IdentityInformation(identifier, nameClaim?.Value, emailClaim.Value, authenticationType, tenantId);\n+ var acrClaim = claimsIdentity.FindFirst(V2Claims.ACR);\n+ var multiFactorAuthenticated = acrClaim?.Value.Equals(ACR_VALUES.MFA, StringComparison.OrdinalIgnoreCase) ?? false;\n+\n+ return new IdentityInformation(identifier, nameClaim?.Value, emailClaim.Value, authenticationType, tenantId, multiFactorAuthenticated);\n+ }\n+\n+ public override bool SupportsMultiFactorAuthentication()\n+ {\n+ // AADv2 supports multi-factor authentication by the use of OpenIdConnect protocol with ACR_VALUES.\n+ return true;\n}\n// The OpenIdConnect.<AuthenticateCoreAsync> throws OpenIdConnectProtocolException upon denial of access permissions by the user,\n@@ -150,19 +184,12 @@ public override IdentityInformation GetIdentityInformation(ClaimsIdentity claims\n// error handling is done.\nprivate Task AuthenticationFailed(AuthenticationFailedNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> notification)\n{\n- if (notification.Exception.Message == ACCESS_DENIED)\n+ if (_errorMessageList.Contains(notification.Exception.Message))\n{\n// For every 'Challenge' sent to the external providers, we store the 'State'\n// with the redirect uri where we intend to return after successful authentication.\n// Extract this \"RedirectUri\" property from this \"State\" object for redirecting on failed authentication as well.\n- var authenticationPropertiesEncodedString = notification\n- .ProtocolMessage\n- .State\n- .Split('=');\n- var authenticationProperties = notification\n- .Options\n- .StateDataFormat\n- .Unprotect(authenticationPropertiesEncodedString[1]);\n+ var authenticationProperties = GetAuthenticationPropertiesFromProtocolMessage(notification.ProtocolMessage, notification.Options);\nnotification.HandleResponse();\nnotification.Response.Redirect(authenticationProperties.RedirectUri);\n@@ -170,5 +197,37 @@ private Task AuthenticationFailed(AuthenticationFailedNotification<OpenIdConnect\nreturn Task.FromResult(0);\n}\n+\n+ /// <summary>\n+ /// Before redirecting for authentication to the provider, append the properties for Multi-Factor Authentication.\n+ /// </summary>\n+ /// <param name=\"notification\">The properties used for authentication</param>\n+ /// <returns>awaitable Task</returns>\n+ private Task RedirectToIdentityProvider(RedirectToIdentityProviderNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> notification)\n+ {\n+\n+ var authenticationProperties = GetAuthenticationPropertiesFromProtocolMessage(notification.ProtocolMessage, notification.Options);\n+\n+ // AcrValues token control the multi-factor authentication, when supplied with any(which could be default or mfa), the user set policy for 2FA\n+ // is enforced. When explicitly set to mfa, the authentication is enforced with multi-factor auth. The LoginHint token, is useful for redirecting\n+ // an already logged in user directly to the multi-factor auth flow.\n+ if (AuthenticationPolicy.TryGetPolicyFromProperties(authenticationProperties.Dictionary, out AuthenticationPolicy policy))\n+ {\n+ notification.ProtocolMessage.AcrValues = policy.EnforceMultiFactorAuthentication ? ACR_VALUES.MFA : ACR_VALUES.ANY;\n+ notification.ProtocolMessage.LoginHint = policy.Email;\n+ }\n+ else\n+ {\n+ notification.ProtocolMessage.AcrValues = ACR_VALUES.ANY;\n+ }\n+\n+ return Task.FromResult(0);\n+ }\n+\n+ private AuthenticationProperties GetAuthenticationPropertiesFromProtocolMessage(OpenIdConnectMessage message, OpenIdConnectAuthenticationOptions options)\n+ {\n+ var authenticationPropertiesEncodedString = message.State.Split('=');\n+ return options.StateDataFormat.Unprotect(authenticationPropertiesEncodedString[1]);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/IdentityInformation.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/IdentityInformation.cs",
"diff": "@@ -15,13 +15,16 @@ public class IdentityInformation\npublic string AuthenticationType { get; private set; }\n- public IdentityInformation(string identifier, string name, string email, string authenticationType, string tenantId = null)\n+ public bool UsedMultiFactorAuthentication { get; set; }\n+\n+ public IdentityInformation(string identifier, string name, string email, string authenticationType, string tenantId = null, bool usedMultiFactorAuth = false)\n{\nIdentifier = identifier;\nName = name;\nEmail = email;\nAuthenticationType = authenticationType;\nTenantId = tenantId;\n+ UsedMultiFactorAuthentication = usedMultiFactorAuth;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/MicrosoftAccount/MicrosoftAccountAuthenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/MicrosoftAccount/MicrosoftAccountAuthenticator.cs",
"diff": "@@ -34,9 +34,9 @@ public override AuthenticatorUI GetUI()\n};\n}\n- public override ActionResult Challenge(string redirectUrl)\n+ public override ActionResult Challenge(string redirectUrl, AuthenticationPolicy policy = null)\n{\n- return new ChallengeResult(BaseConfig.AuthenticationType, redirectUrl);\n+ return new ChallengeResult(BaseConfig.AuthenticationType, redirectUrl, policy?.GetProperties());\n}\npublic override IdentityInformation GetIdentityInformation(ClaimsIdentity claimsIdentity)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -432,11 +432,11 @@ public ActionResult AuthenticateAndLinkExternal(string returnUrl, string provide\n}\n[NonAction]\n- public ActionResult ChallengeAuthentication(string returnUrl, string provider)\n+ public ActionResult ChallengeAuthentication(string returnUrl, string provider, AuthenticationPolicy policy = null)\n{\ntry\n{\n- return _authService.Challenge(provider, returnUrl);\n+ return _authService.Challenge(provider, returnUrl, policy);\n}\ncatch (InvalidOperationException)\n{\n@@ -519,6 +519,15 @@ public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl)\nreturn challenge;\n}\n+ if (ShouldEnforceMultiFactorAuthentication(result))\n+ {\n+ // Invoke the authentication again enforcing multi-factor authentication for the same provider.\n+ return ChallengeAuthentication(\n+ Url.LinkExternalAccount(returnUrl),\n+ result.Authenticator.Name,\n+ new AuthenticationPolicy() { Email = result.LoginDetails.EmailUsed, EnforceMultiFactorAuthentication = true });\n+ }\n+\n// Create session\nawait _authService.CreateSessionAsync(OwinContext, result.Authentication);\nreturn SafeRedirect(returnUrl);\n@@ -589,6 +598,25 @@ public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl)\n}\n}\n+ internal bool ShouldEnforceMultiFactorAuthentication(AuthenticateExternalLoginResult result)\n+ {\n+ if (result?.Authenticator == null || result.Authentication == null)\n+ {\n+ return false;\n+ }\n+\n+ // Enforce multi-factor authentication only if:\n+ // 1. The authenticator supports multi-factor authentication, otherwise no use.\n+ // 2. The user has enabled multi-factor authentication for their account.\n+ // 3. The user authenticated with the personal microsoft account. AAD 2FA policy is controlled by the tenant admins.\n+ // 4. The user did not use the multi-factor authentication for the session, obviously.\n+ return result.Authenticator.SupportsMultiFactorAuthentication()\n+ && result.Authentication.User.EnableMultiFactorAuthentication\n+ && !result.LoginDetails.WasMultiFactorAuthenticated\n+ && result.Authentication.CredentialUsed.IsExternal()\n+ && (CredentialTypes.IsMicrosoftAccount(result.Authentication.CredentialUsed.Type));\n+ }\n+\nprivate string FormatEmailAddressForAssistance(string email)\n{\nvar emailParts = email.Split('@');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/ClaimsExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/ClaimsExtensions.cs",
"diff": "@@ -33,7 +33,7 @@ public static IdentityInformation GetIdentityInformation(ClaimsIdentity claimsId\n}\nvar emailClaim = claimsIdentity.FindFirst(emailClaimType);\n- return new IdentityInformation(identifierClaim.Value, nameClaim.Value, emailClaim?.Value, authType, tenantId: null);\n+ return new IdentityInformation(identifierClaim.Value, nameClaim.Value, emailClaim?.Value, authType, tenantId: null, usedMultiFactorAuth: false);\n}\npublic static bool HasDiscontinuedLoginClaims(ClaimsIdentity identity)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Authentication\\PasswordAuthenticationResult.cs\" />\n<Compile Include=\"Authentication\\NuGetScopes.cs\" />\n<Compile Include=\"Authentication\\PasswordResetResult.cs\" />\n+ <Compile Include=\"Authentication\\Providers\\AuthenticationPolicy.cs\" />\n<Compile Include=\"Authentication\\Providers\\AuthenticatorT.cs\" />\n<Compile Include=\"Authentication\\Providers\\IdentityInformation.cs\" />\n<Compile Include=\"Authentication\\Providers\\AzureActiveDirectoryV2\\AzureActiveDirectoryV2Authenticator.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"diff": "@@ -1424,7 +1424,7 @@ public void GivenADisabledProviderName_ItThrowsInvalidOperationException()\nvar service = Get<AuthenticationService>();\nvar mock = new Mock<Authenticator>() { CallBase = true };\nvar expected = new ViewResult();\n- mock.Setup(a => a.Challenge(\"http://microsoft.com\")).Returns(expected);\n+ mock.Setup(a => a.Challenge(\"http://microsoft.com\", null)).Returns(expected);\nservice.Authenticators.Add(\"test\", mock.Object);\n// Act/Assert\n@@ -1438,7 +1438,7 @@ public void GivenAnKnownProviderName_ItPassesThroughToProvider()\nvar service = Get<AuthenticationService>();\nvar mock = new Mock<Authenticator>() { CallBase = true };\nvar expected = new ViewResult();\n- mock.Setup(a => a.Challenge(\"http://microsoft.com\")).Returns(expected);\n+ mock.Setup(a => a.Challenge(\"http://microsoft.com\", null)).Returns(expected);\nmock.Object.BaseConfig.Enabled = true;\nservice.Authenticators.Add(\"test\", mock.Object);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections.Generic;\n+using System.Linq;\nusing System.Net.Mail;\nusing System.Security.Claims;\nusing System.Threading.Tasks;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Authentication.Providers;\nusing NuGetGallery.Authentication.Providers.AzureActiveDirectory;\n+using NuGetGallery.Authentication.Providers.AzureActiveDirectoryV2;\nusing NuGetGallery.Authentication.Providers.MicrosoftAccount;\nusing NuGetGallery.Infrastructure.Authentication;\n-using Xunit;\n-using System.Collections.Generic;\nusing NuGetGallery.Security;\n-using System.Linq;\n+using Xunit;\nnamespace NuGetGallery.Controllers\n{\n@@ -601,8 +602,8 @@ public async Task GivenAdminLogsInWithValidExternalAuth_ItChallengesWhenNotUsing\nif (shouldChallenge)\n{\nGetMock<AuthenticationService>()\n- .Setup(x => x.Challenge(enforcedProvider, It.IsAny<string>()))\n- .Returns(new ChallengeResult(enforcedProvider, null))\n+ .Setup(x => x.Challenge(enforcedProvider, It.IsAny<string>(), null))\n+ .Returns(new ChallengeResult(enforcedProvider, null, null))\n.Verifiable();\n}\nelse\n@@ -902,8 +903,8 @@ public async Task GivenAdminLogsInWithExternalIdentity_ItChallengesWhenNotUsingR\nif (shouldChallenge)\n{\nGetMock<AuthenticationService>()\n- .Setup(x => x.Challenge(enforcedProvider, It.IsAny<string>()))\n- .Returns(new ChallengeResult(enforcedProvider, null))\n+ .Setup(x => x.Challenge(enforcedProvider, It.IsAny<string>(), null))\n+ .Returns(new ChallengeResult(enforcedProvider, null, null))\n.Verifiable();\n}\nelse\n@@ -1240,6 +1241,44 @@ public async Task GivenAssociatedLocalUser_ItCreatesASessionAndSafeRedirectsToRe\n.VerifyAll();\n}\n+ [Fact]\n+ public async Task ShouldChallengeForEnforcedMultiFactorAuthentication()\n+ {\n+ // Arrange\n+ var enforcedProvider = \"AzureActiveDirectoryV2\";\n+ var email = \"test@email.com\";\n+ var cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", \"Bloog\");\n+ var user = Get<Fakes>().CreateUser(\"test\", cred);\n+ user.EnableMultiFactorAuthentication = true;\n+ var authServiceMock = GetMock<AuthenticationService>(); // Force a mock to be created\n+ var controller = GetController<AuthenticationController>();\n+ var authUser = new AuthenticatedUser(\n+ user,\n+ cred);\n+\n+ authServiceMock\n+ .Setup(x => x.AuthenticateExternalLogin(controller.OwinContext))\n+ .CompletesWith(new AuthenticateExternalLoginResult()\n+ {\n+ ExternalIdentity = new ClaimsIdentity(),\n+ Authentication = authUser,\n+ Authenticator = new AzureActiveDirectoryV2Authenticator(),\n+ LoginDetails = new ExternalLoginSessionDetails(email, usedMultiFactorAuthentication: false)\n+ });\n+\n+ var returnUrl = \"theReturnUrl\";\n+ authServiceMock\n+ .Setup(x => x.Challenge(enforcedProvider, It.IsAny<string>(), It.Is<AuthenticationPolicy>((policy) => policy.EnforceMultiFactorAuthentication == true && policy.Email == email)))\n+ .Verifiable();\n+\n+ // Act\n+ var result = await controller.LinkExternalAccount(returnUrl);\n+\n+ // Assert\n+ authServiceMock\n+ .VerifyAll();\n+ }\n+\n[Theory]\n[InlineData(\"MicrosoftAccount\", true)]\n[InlineData(\"AzureActiveDirectory\", false)]\n@@ -1273,8 +1312,8 @@ public async Task GivenAssociatedLocalAdminUser_ItChallengesWhenNotUsingRequired\nif (shouldChallenge)\n{\nGetMock<AuthenticationService>()\n- .Setup(x => x.Challenge(enforcedProvider, It.IsAny<string>()))\n- .Returns(new ChallengeResult(enforcedProvider, null))\n+ .Setup(x => x.Challenge(enforcedProvider, It.IsAny<string>(), null))\n+ .Returns(new ChallengeResult(enforcedProvider, null, null))\n.Verifiable();\n}\nelse\n@@ -1589,6 +1628,183 @@ public async Task GivenNoLinkButEmailMatchingLocalAdminUserWithExistingExternal_\n}\n}\n+ public class TheShouldEnforceMultiFactorAuthenticationMethod : TestContainer\n+ {\n+ [Fact]\n+ public void NullResultReturnsFalse()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(null);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void MissingAuthenticatorReturnsFalse()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = new AuthenticateExternalLoginResult();\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void MissingAuthenticationReturnsFalse()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = new AuthenticateExternalLoginResult()\n+ {\n+ Authenticator = new MicrosoftAccountAuthenticator()\n+ };\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void NonSupportingAuthenticatorReturnsFalse()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = GetExternalResult();\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void UsersWithMFANotEnabledReturnsFalse()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = GetExternalResult(new AzureActiveDirectoryV2Authenticator());\n+ externalResult.Authentication.User.EnableMultiFactorAuthentication = false;\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void IfAlreadyUsedMFAReturnsFalse()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = GetExternalResult(new AzureActiveDirectoryV2Authenticator());\n+ externalResult.LoginDetails = new ExternalLoginSessionDetails(\"random@email.com\", usedMultiFactorAuthentication: true);\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void NonExternalCredentialReturnsfalse()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var cred = new CredentialBuilder().CreatePasswordCredential(\"mysecretpassword\");\n+ var user = fakes.CreateUser(\"test\", cred);\n+ user.EnableMultiFactorAuthentication = true;\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = GetExternalResult(new AzureActiveDirectoryV2Authenticator());\n+ externalResult.Authentication = new AuthenticatedUser(user, cred);\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void NonMicrosoftAccountAuthetnicationReturnsFalse()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = GetExternalResult(new AzureActiveDirectoryV2Authenticator(), \"AzureActiveDirectory\");\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.False(result);\n+ }\n+\n+ [Fact]\n+ public void MicrosoftAccountCredentialReturnsTrue()\n+ {\n+ // Arrange\n+ EnableAllAuthenticators(Get<AuthenticationService>());\n+\n+ var controller = GetController<AuthenticationController>();\n+ var externalResult = GetExternalResult(new AzureActiveDirectoryV2Authenticator());\n+\n+ // Act\n+ var result = controller.ShouldEnforceMultiFactorAuthentication(externalResult);\n+\n+ // Assert\n+ Assert.True(result);\n+ }\n+\n+ private AuthenticateExternalLoginResult GetExternalResult(Authenticator provider = null, string credType = \"MicrosoftAccount\")\n+ {\n+ var fakes = Get<Fakes>();\n+ var email = \"test@email.com\";\n+ var cred = new CredentialBuilder().CreateExternalCredential(credType, \"blorg\", \"Bloog\");\n+ var user = fakes.CreateUser(\"test\", cred);\n+ user.EmailAddress = email;\n+ user.EnableMultiFactorAuthentication = true;\n+\n+ var auther = provider ?? new MicrosoftAccountAuthenticator();\n+ var authUser = new AuthenticatedUser(user, cred);\n+\n+ return new AuthenticateExternalLoginResult()\n+ {\n+ Authenticator = auther,\n+ Authentication = authUser,\n+ Credential = cred,\n+ LoginDetails = new ExternalLoginSessionDetails(email, usedMultiFactorAuthentication: false)\n+ };\n+ }\n+ }\n+\npublic class TheShouldChallengeEnforcedProviderMethod : TestContainer\n{\n[Theory]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[MSA] Add 2FA support for Microsoft logins (#5681)
|
455,751 |
29.03.2018 23:31:45
| 25,200 |
63e137962b83e91f022463af755fa588631b609e
|
Fix for the infinite loop due to bad comparer
Add thread safe random and handle equality in the WeightedRandomComparer.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/Client/RetryingHttpClientWrapper.cs",
"new_path": "src/NuGet.Services.Search.Client/Client/RetryingHttpClientWrapper.cs",
"diff": "@@ -16,13 +16,12 @@ public sealed class RetryingHttpClientWrapper\nprivate readonly HttpClient _httpClient;\nprivate readonly IEndpointHealthIndicatorStore _endpointHealthIndicatorStore;\n- private static readonly Random Random = new Random((int) DateTime.UtcNow.Ticks);\nprivate static readonly int PeriodToDelayAlternateRequest = 3000;\nprivate static readonly IComparer<int> HealthComparer;\nstatic RetryingHttpClientWrapper()\n{\n- HealthComparer = new WeightedRandomComparer(Random);\n+ HealthComparer = new WeightedRandomComparer();\n}\npublic RetryingHttpClientWrapper(HttpClient httpClient)\n@@ -213,27 +212,27 @@ private static bool ShouldTryOther(HttpResponseMessage response)\nreturn false;\n}\n- class WeightedRandomComparer\n+ public class WeightedRandomComparer\n: IComparer<int>\n{\n- private readonly Random _random;\n-\n- public WeightedRandomComparer(Random random)\n- {\n- _random = random;\n- }\n-\npublic int Compare(int x, int y)\n{\nvar totalWeight = x + y;\n- var randomNumber = _random.Next(0, totalWeight);\n+ var randomNumber = ThreadSafeRandom.Next(0, totalWeight);\nif (randomNumber < x)\n{\nreturn 1;\n}\n+ else if (randomNumber > x)\n+ {\nreturn -1;\n}\n+ else\n+ {\n+ return 0;\n+ }\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"new_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"diff": "<Compile Include=\"Client\\SearchClient.cs\" />\n<Compile Include=\"Client\\ServiceDiscovery.cs\" />\n<Compile Include=\"Client\\ServiceDiscoveryClient.cs\" />\n+ <Compile Include=\"Client\\ThreadSafeRandom.cs\" />\n<Compile Include=\"Correlation\\CorrelatingHttpClientHandler.cs\" />\n<Compile Include=\"Correlation\\WebApiCorrelationHandler.cs\" />\n<Compile Include=\"Models\\SearchResults.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/SearchClient/RetryingHttpClientWrapperFacts.cs",
"new_path": "tests/NuGetGallery.Facts/SearchClient/RetryingHttpClientWrapperFacts.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.Linq;\nusing System.Net;\nusing System.Net.Http;\n@@ -147,5 +148,37 @@ public async Task Returns404When404IsExpected()\nAssert.False(result.IsSuccessStatusCode);\nAssert.Equal(HttpStatusCode.NotFound, result.StatusCode);\n}\n+\n+ [Theory]\n+ [InlineData(\"https://dummy1/\", 0, 62)]\n+ [InlineData(\"https://dummy1/\", 100, 62)]\n+ [InlineData(\"https://dummy1/\", 62, 62)]\n+ [InlineData(\"https://dummy1/\", 0, 0)]\n+ public void WeightedRandomComparerTest(string dummyUrl, int dummyUrlHealthIndex, int otherHealthIndex)\n+ {\n+ var comparer = new RetryingHttpClientWrapper.WeightedRandomComparer();\n+\n+ List<Uri> urls = new List<Uri>()\n+ {\n+ new Uri(dummyUrl),\n+ new Uri (\"https://dumm2/\")\n+ };\n+\n+ //The Assert is very loose verification\n+ //In the presence of the bug the line below will be infinite loop\n+ var orderList = urls.OrderByDescending((u) =>\n+ {\n+ if (u.AbsoluteUri == dummyUrl)\n+ {\n+ return dummyUrlHealthIndex;\n+ }\n+ else\n+ {\n+ return otherHealthIndex;\n+ }\n+ }, comparer).ToList();\n+\n+ Assert.True(orderList.Select(u => u.AbsoluteUri).Contains(dummyUrl));\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix for the infinite loop due to bad comparer (#5715)
Add thread safe random and handle equality in the WeightedRandomComparer.
|
455,776 |
30.03.2018 09:33:48
| 25,200 |
1e5a200a323e92ec755bfe9d61548da89c1e58dd
|
[Organizations] Small accessibility fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"diff": "return self.AddMemberRole() == self.RoleNames()[0];\n});\nthis.AddMember = function () {\n+ if (!self.NewMemberUsername()) {\n+ self.Error(\"You must specify a user to add as a member.\");\n+ return;\n+ }\n+\n// Check if the member already exists.\nvar memberExists = false;\nself.Members().forEach(function (member) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml",
"diff": "</select>\n</div>\n<div class=\"text-center align-middle col-xs-1\">\n- <button class=\"btn\" type=\"submit\" title=\"Add new member\" aria-label=\"Add new member\" data-bind=\"click: AddMember, enable: NewMemberUsername\">Add</button>\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<!-- ko if: IsCurrentUser || @(Model.CanManage ? \"true\" : \"false\") -->\n<td class=\"text-center align-middle heading-right row-center col-xs-1\">\n<span>\n- <a class=\"btn\" data-bind=\"click: DeleteMember, attr: { 'aria-label': 'Delete Member' }\">\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- </a>\n+ </button>\n</span>\n</td>\n<!-- /ko -->\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Small accessibility fixes (#5714)
|
455,736 |
30.03.2018 09:51:25
| 25,200 |
fdbdb25d2e37dd30aa929f12050ee6397f09e8f5
|
Reject duplicate metadata elements during upload
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreStrings.Designer.cs",
"new_path": "src/NuGetGallery.Core/CoreStrings.Designer.cs",
"diff": "@@ -123,6 +123,15 @@ public class CoreStrings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package manifest contains duplicate metadata elements: '{0}'.\n+ /// </summary>\n+ public static string Manifest_DuplicateMetadataElements {\n+ get {\n+ return ResourceManager.GetString(\"Manifest_DuplicateMetadataElements\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The package manifest contains an ID that is too long. Package IDs can be no longer than 100 characters..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreStrings.resx",
"new_path": "src/NuGetGallery.Core/CoreStrings.resx",
"diff": "<data name=\"PackageIsMissingRequiredData\" xml:space=\"preserve\">\n<value>The package is missing required data.</value>\n</data>\n+ <data name=\"Manifest_DuplicateMetadataElements\" xml:space=\"preserve\">\n+ <value>The package manifest contains duplicate metadata elements: '{0}'</value>\n+ <comment>{0} is a comma-delimited list of duplicate metadata element names.</comment>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"new_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n+using System.Xml.Linq;\nusing NuGet.Packaging;\n+using NuGet.Packaging.Core;\nusing NuGet.Versioning;\nnamespace NuGetGallery.Packaging\n@@ -156,6 +158,19 @@ private Uri GetValue(string key, Uri alternateValue)\n/// </exception>\npublic static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool strict)\n{\n+ if (strict)\n+ {\n+ var strictNuspecReader = new StrictNuspecReader(nuspecReader.Xml);\n+\n+ var duplicates = strictNuspecReader.GetDuplicateMetadataElementNames();\n+ if (duplicates.Any())\n+ {\n+ throw new PackagingException(string.Format(\n+ CoreStrings.Manifest_DuplicateMetadataElements,\n+ string.Join(\"', '\", duplicates)));\n+ }\n+ }\n+\nreturn new PackageMetadata(\nnuspecReader.GetMetadata().ToDictionary(kvp => kvp.Key, kvp => kvp.Value),\nnuspecReader.GetDependencyGroups(useStrictVersionCheck: strict),\n@@ -164,5 +179,22 @@ public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool s\nnuspecReader.GetMinClientVersion()\n);\n}\n+\n+ private class StrictNuspecReader : NuspecReader\n+ {\n+ public StrictNuspecReader(XDocument xml) : base(xml)\n+ {\n+ }\n+\n+ public IReadOnlyList<string> GetDuplicateMetadataElementNames()\n+ {\n+ return MetadataNode\n+ .Elements()\n+ .GroupBy(element => element.Name.LocalName)\n+ .Where(group => group.Count() > 1)\n+ .Select(group => group.Key)\n+ .ToList();\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.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.IO.Compression;\n-using System.Linq;\nusing NuGet.Packaging;\nusing NuGet.Packaging.Core;\nusing NuGet.Versioning;\n@@ -55,7 +53,80 @@ public static void ThrowsPackagingExceptionWhenInvalidDepencencyVersionRangeDete\n}\n[Fact]\n- public static void DoesNotThrowInvalidDepencencyVersionRangeDetectedAndParsingIsNotStrict()\n+ public static void ThrowsPackagingExceptionWhenEmptyAndNonEmptyDuplicateMetadataElementsDetected()\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithDuplicateEmptyAndNonEmptyMetadataElements();\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: true));\n+ Assert.Equal(\n+ \"The package manifest contains duplicate metadata elements: 'title', 'authors', 'owners', 'description', 'language', 'foo', 'releaseNotes'\",\n+ ex.Message);\n+ }\n+\n+ [Fact]\n+ public static void ThrowsForEmptyAndNonEmptyDuplicatesWhenDuplicateMetadataElementsDetectedAndParsingIsNotStrict()\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithDuplicateEmptyAndNonEmptyMetadataElements();\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<ArgumentException>(() => PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: false));\n+ Assert.Equal(\n+ \"An item with the same key has already been added.\",\n+ ex.Message);\n+ }\n+\n+ [Fact]\n+ public static void ThrowsPackagingExceptionWhenEmptyDuplicateMetadataElementsDetected()\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithDuplicateEmptyMetadataElements();\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: true));\n+ Assert.Equal(\n+ \"The package manifest contains duplicate metadata elements: 'title', 'authors', 'description', 'releaseNotes'\",\n+ ex.Message);\n+ }\n+\n+ [Fact]\n+ public static void ThrowsForEmptyDuplicatesWhenDuplicateMetadataElementsDetectedAndParsingIsNotStrict()\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithDuplicateEmptyMetadataElements();\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: false);\n+\n+ // Assert\n+ Assert.Equal(\"TestPackage\", packageMetadata.Id);\n+ Assert.Equal(NuGetVersion.Parse(\"0.0.0.1\"), packageMetadata.Version);\n+ Assert.Equal(\"Package A\", packageMetadata.Title);\n+ Assert.Equal(new[] { \"authora\", \"authorb\" }, packageMetadata.Authors);\n+ Assert.Equal(\"package A description.\", packageMetadata.Description);\n+ Assert.Null(packageMetadata.ReleaseNotes);\n+ }\n+\n+ [Fact]\n+ public static void DoesNotThrowWhenInvalidDependencyVersionRangeDetectedAndParsingIsNotStrict()\n{\nvar packageStream = CreateTestPackageStreamWithInvalidDependencyVersion();\nvar nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n@@ -86,19 +157,13 @@ public static void DoesNotThrowInvalidDepencencyVersionRangeDetectedAndParsingIs\nprivate static Stream CreateTestPackageStream()\n{\n- var packageStream = new MemoryStream();\n- using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Create, true))\n- {\n- var nuspecEntry = packageArchive.CreateEntry(\"TestPackage.nuspec\", CompressionLevel.Fastest);\n- using (var streamWriter = new StreamWriter(nuspecEntry.Open()))\n- {\n- streamWriter.WriteLine(@\"<?xml version=\"\"1.0\"\"?>\n+ return CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n<package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n<metadata>\n<id>TestPackage</id>\n<version>0.0.0.1</version>\n<title>Package A</title>\n- <authors>ownera, ownerb</authors>\n+ <authors>authora, authorb</authors>\n<owners>ownera, ownerb</owners>\n<requireLicenseAcceptance>false</requireLicenseAcceptance>\n<description>package A description.</description>\n@@ -111,28 +176,15 @@ private static Stream CreateTestPackageStream()\n</package>\");\n}\n- packageArchive.CreateEntry(\"content\\\\HelloWorld.cs\", CompressionLevel.Fastest);\n- }\n-\n- packageStream.Position = 0;\n-\n- return packageStream;\n- }\nprivate static Stream CreateTestPackageStreamWithInvalidDependencyVersion()\n{\n- var packageStream = new MemoryStream();\n- using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Create, true))\n- {\n- var nuspecEntry = packageArchive.CreateEntry(\"TestPackage.nuspec\", CompressionLevel.Fastest);\n- using (var streamWriter = new StreamWriter(nuspecEntry.Open()))\n- {\n- streamWriter.WriteLine(@\"<?xml version=\"\"1.0\"\"?>\n+ return CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n<package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n<metadata>\n<id>TestPackage</id>\n<version>0.0.0.1</version>\n<title>Package A</title>\n- <authors>ownera, ownerb</authors>\n+ <authors>authora, authorb</authors>\n<owners>ownera, ownerb</owners>\n<requireLicenseAcceptance>false</requireLicenseAcceptance>\n<description>package A description.</description>\n@@ -147,6 +199,70 @@ private static Stream CreateTestPackageStreamWithInvalidDependencyVersion()\n</package>\");\n}\n+ private static Stream CreateTestPackageStreamWithDuplicateEmptyMetadataElements()\n+ {\n+ return CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>TestPackage</id>\n+ <version>0.0.0.1</version>\n+ <title>Package A</title>\n+ <title />\n+ <authors>authora, authorb</authors>\n+ <authors></authors>\n+ <description>\n+\n+ </description>\n+ <description>package A description.</description>\n+ <releaseNotes></releaseNotes>\n+ <releaseNotes></releaseNotes>\n+ <language>en-US</language>\n+ </metadata>\n+ </package>\");\n+ }\n+\n+ private static Stream CreateTestPackageStreamWithDuplicateEmptyAndNonEmptyMetadataElements()\n+ {\n+ return CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>TestPackage</id>\n+ <version>0.0.0.1</version>\n+ <title>Package A</title>\n+ <title />\n+ <authors>ownera, ownerb</authors>\n+ <authors></authors>\n+ <owners>ownera, ownerb</owners>\n+ <owners>ownerc, ownerd</owners>\n+ <description>\n+\n+ </description>\n+ <description>package A description.</description>\n+ <language>en-US</language>\n+ <language>\n+\n+ de-DE\n+\n+ </language>\n+ <foo>1</foo>\n+ <foo>2</foo>\n+ <releaseNotes></releaseNotes>\n+ <releaseNotes></releaseNotes>\n+ </metadata>\n+ </package>\");\n+ }\n+\n+ private static Stream CreateTestPackageStream(string nuspec)\n+ {\n+ var packageStream = new MemoryStream();\n+ using (var packageArchive = new ZipArchive(packageStream, ZipArchiveMode.Create, true))\n+ {\n+ var nuspecEntry = packageArchive.CreateEntry(\"TestPackage.nuspec\", CompressionLevel.Fastest);\n+ using (var streamWriter = new StreamWriter(nuspecEntry.Open()))\n+ {\n+ streamWriter.WriteLine(nuspec);\n+ }\n+\npackageArchive.CreateEntry(\"content\\\\HelloWorld.cs\", CompressionLevel.Fastest);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Reject duplicate metadata elements during upload (#5716)
Progress on https://github.com/NuGet/NuGetGallery/issues/5119
|
455,736 |
02.04.2018 12:43:21
| 25,200 |
6ee671e3a37cf8f681d006c7f3ba4ebd01231bdd
|
Reject invalid boolean values and properties generated by feed2catalog
Progress on
Progress on
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreStrings.Designer.cs",
"new_path": "src/NuGetGallery.Core/CoreStrings.Designer.cs",
"diff": "@@ -141,6 +141,15 @@ public class CoreStrings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package manifest contains an invalid boolean value for metadata element: '{0}'. The value should be 'true' or 'false'..\n+ /// </summary>\n+ public static string Manifest_InvalidBooleanMetadata {\n+ get {\n+ return ResourceManager.GetString(\"Manifest_InvalidBooleanMetadata\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The package manifest contains an invalid Dependency: '{0} {1}'.\n/// </summary>\n@@ -168,6 +177,15 @@ public class CoreStrings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package manifest contains invalid metadata elements: '{0}'.\n+ /// </summary>\n+ public static string Manifest_InvalidMetadataElements {\n+ get {\n+ return ResourceManager.GetString(\"Manifest_InvalidMetadataElements\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The package manifest contains an invalid Minimum Client Version: '{0}'.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreStrings.resx",
"new_path": "src/NuGetGallery.Core/CoreStrings.resx",
"diff": "<value>The package manifest contains duplicate metadata elements: '{0}'</value>\n<comment>{0} is a comma-delimited list of duplicate metadata element names.</comment>\n</data>\n+ <data name=\"Manifest_InvalidBooleanMetadata\" xml:space=\"preserve\">\n+ <value>The package manifest contains an invalid boolean value for metadata element: '{0}'. The value should be 'true' or 'false'.</value>\n+ <comment>{0} is the name of the invalid boolean metadata element.</comment>\n+ </data>\n+ <data name=\"Manifest_InvalidMetadataElements\" xml:space=\"preserve\">\n+ <value>The package manifest contains invalid metadata elements: '{0}'</value>\n+ <comment>{0} is a comma-delimited list of invalid metadata element names.</comment>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"new_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"diff": "@@ -13,6 +13,33 @@ namespace NuGetGallery.Packaging\n{\npublic class PackageMetadata\n{\n+ /// <summary>\n+ /// These are properties generated in the V3 pipeline (feed2catalog job) and could collide if the .nuspec\n+ /// itself also contains these properties.\n+ /// </summary>\n+ private static readonly HashSet<string> RestrictedMetadataElements = new HashSet<string>\n+ {\n+ \"created\",\n+ \"dependencyGroups\", // Not to be confused with the valid element \"dependencies\" with a sub-element \"group\".\n+ \"isPrerelease\",\n+ \"lastEdited\",\n+ \"listed\",\n+ \"packageEntries\",\n+ \"packageHash\",\n+ \"packageHashAlgorithm\",\n+ \"packageSize\",\n+ \"published\",\n+ \"supportedFrameworks\",\n+ \"verbatimVersion\",\n+ };\n+\n+ private static readonly HashSet<string> BooleanMetadataElements = new HashSet<string>\n+ {\n+ \"developmentDependency\",\n+ \"requireLicenseAcceptance\",\n+ \"serviceable\",\n+ };\n+\nprivate readonly Dictionary<string, string> _metadata;\nprivate readonly IReadOnlyCollection<PackageDependencyGroup> _dependencyGroups;\nprivate readonly IReadOnlyCollection<FrameworkSpecificGroup> _frameworkReferenceGroups;\n@@ -171,8 +198,35 @@ public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool s\n}\n}\n+ var metadata = nuspecReader\n+ .GetMetadata()\n+ .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);\n+\n+ // Reject invalid metadata element names. Today this only rejects element names that collide with\n+ // properties generated downstream.\n+ var metadataKeys = new HashSet<string>(metadata.Keys);\n+ metadataKeys.IntersectWith(RestrictedMetadataElements);\n+ if (metadataKeys.Any())\n+ {\n+ throw new PackagingException(string.Format(\n+ CoreStrings.Manifest_InvalidMetadataElements,\n+ string.Join(\"', '\", metadataKeys.OrderBy(x => x))));\n+ }\n+\n+ // Reject non-boolean values for boolean metadata.\n+ foreach (var booleanName in BooleanMetadataElements)\n+ {\n+ if (metadata.TryGetValue(booleanName, out var unparsedBoolean)\n+ && !bool.TryParse(unparsedBoolean, out var parsedBoolean))\n+ {\n+ throw new PackagingException(string.Format(\n+ CoreStrings.Manifest_InvalidBooleanMetadata,\n+ booleanName));\n+ }\n+ }\n+\nreturn new PackageMetadata(\n- nuspecReader.GetMetadata().ToDictionary(kvp => kvp.Key, kvp => kvp.Value),\n+ metadata,\nnuspecReader.GetDependencyGroups(useStrictVersionCheck: strict),\nnuspecReader.GetFrameworkReferenceGroups(),\nnuspecReader.GetPackageTypes(),\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs",
"diff": "@@ -13,9 +13,71 @@ namespace NuGetGallery.Packaging\n{\npublic class PackageMetadataFacts\n{\n+ [Theory]\n+ [InlineData(\"developmentDependency\")]\n+ [InlineData(\"requireLicenseAcceptance\")]\n+ [InlineData(\"serviceable\")]\n+ public void RejectsInvalidBooleanValue(string metadataName)\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithMetadataElementName(metadataName);\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(nuspec, strict: false));\n+ Assert.Equal($\"The package manifest contains an invalid boolean value for metadata element: '{metadataName}'. The value should be 'true' or 'false'.\", ex.Message);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"created\")]\n+ [InlineData(\"dependencyGroups\")]\n+ [InlineData(\"isPrerelease\")]\n+ [InlineData(\"lastEdited\")]\n+ [InlineData(\"listed\")]\n+ [InlineData(\"packageEntries\")]\n+ [InlineData(\"packageHash\")]\n+ [InlineData(\"packageHashAlgorithm\")]\n+ [InlineData(\"packageSize\")]\n+ [InlineData(\"published\")]\n+ [InlineData(\"supportedFrameworks\")]\n+ [InlineData(\"verbatimVersion\")]\n+ public void RejectsRestrictedElementNames(string metadataName)\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithMetadataElementName(metadataName);\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(nuspec, strict: false));\n+ Assert.Equal($\"The package manifest contains invalid metadata elements: '{metadataName}'\", ex.Message);\n+ }\n+\n+ [Fact]\n+ public void AllowsUnrestrictedButUnofficialElementNames()\n+ {\n+ // Arrange\n+ var name = \"foo\";\n+ var packageStream = CreateTestPackageStreamWithMetadataElementName(name);\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act\n+ var packageMetadata = PackageMetadata.FromNuspecReader(\n+ nuspec,\n+ strict: true);\n+\n+ // Assert\n+ Assert.Equal(\"TestPackage\", packageMetadata.Id);\n+ Assert.Equal(NuGetVersion.Parse(\"0.0.0.1\"), packageMetadata.Version);\n+ Assert.Equal(\"some value\", packageMetadata.GetValueFromMetadata(name));\n+ }\n+\n[Fact]\n- public static void CanReadBasicMetadataProperties()\n+ public void CanReadBasicMetadataProperties()\n{\n+ // Arrange\nvar packageStream = CreateTestPackageStream();\nvar nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\nvar nuspec = nupkg.GetNuspecReader();\n@@ -39,8 +101,22 @@ public static void CanReadBasicMetadataProperties()\nAssert.Equal(\"http://www.nuget.org/\", packageMetadata.LicenseUrl.ToString());\n}\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public void ThrowsWhenInvalidMinClientVersion(bool strict)\n+ {\n+ var packageStream = CreateTestPackageStreamWithInvalidMinClientVersion();\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<ArgumentException>(() => PackageMetadata.FromNuspecReader(nuspec, strict));\n+ Assert.Equal(\"'bad' is not a valid version string.\\r\\nParameter name: value\", ex.Message);\n+ }\n+\n[Fact]\n- public static void ThrowsPackagingExceptionWhenInvalidDepencencyVersionRangeDetected()\n+ public void ThrowsPackagingExceptionWhenInvalidDependencyVersionRangeDetected()\n{\nvar packageStream = CreateTestPackageStreamWithInvalidDependencyVersion();\nvar nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n@@ -53,7 +129,7 @@ public static void ThrowsPackagingExceptionWhenInvalidDepencencyVersionRangeDete\n}\n[Fact]\n- public static void ThrowsPackagingExceptionWhenEmptyAndNonEmptyDuplicateMetadataElementsDetected()\n+ public void ThrowsPackagingExceptionWhenEmptyAndNonEmptyDuplicateMetadataElementsDetected()\n{\n// Arrange\nvar packageStream = CreateTestPackageStreamWithDuplicateEmptyAndNonEmptyMetadataElements();\n@@ -70,7 +146,7 @@ public static void ThrowsPackagingExceptionWhenEmptyAndNonEmptyDuplicateMetadata\n}\n[Fact]\n- public static void ThrowsForEmptyAndNonEmptyDuplicatesWhenDuplicateMetadataElementsDetectedAndParsingIsNotStrict()\n+ public void ThrowsForEmptyAndNonEmptyDuplicatesWhenDuplicateMetadataElementsDetectedAndParsingIsNotStrict()\n{\n// Arrange\nvar packageStream = CreateTestPackageStreamWithDuplicateEmptyAndNonEmptyMetadataElements();\n@@ -87,7 +163,7 @@ public static void ThrowsForEmptyAndNonEmptyDuplicatesWhenDuplicateMetadataEleme\n}\n[Fact]\n- public static void ThrowsPackagingExceptionWhenEmptyDuplicateMetadataElementsDetected()\n+ public void ThrowsPackagingExceptionWhenEmptyDuplicateMetadataElementsDetected()\n{\n// Arrange\nvar packageStream = CreateTestPackageStreamWithDuplicateEmptyMetadataElements();\n@@ -104,7 +180,7 @@ public static void ThrowsPackagingExceptionWhenEmptyDuplicateMetadataElementsDet\n}\n[Fact]\n- public static void ThrowsForEmptyDuplicatesWhenDuplicateMetadataElementsDetectedAndParsingIsNotStrict()\n+ public void ThrowsForEmptyDuplicatesWhenDuplicateMetadataElementsDetectedAndParsingIsNotStrict()\n{\n// Arrange\nvar packageStream = CreateTestPackageStreamWithDuplicateEmptyMetadataElements();\n@@ -126,7 +202,7 @@ public static void ThrowsForEmptyDuplicatesWhenDuplicateMetadataElementsDetected\n}\n[Fact]\n- public static void DoesNotThrowWhenInvalidDependencyVersionRangeDetectedAndParsingIsNotStrict()\n+ public void DoesNotThrowWhenInvalidDependencyVersionRangeDetectedAndParsingIsNotStrict()\n{\nvar packageStream = CreateTestPackageStreamWithInvalidDependencyVersion();\nvar nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n@@ -176,6 +252,29 @@ private static Stream CreateTestPackageStream()\n</package>\");\n}\n+ private static Stream CreateTestPackageStreamWithMetadataElementName(string metadataName)\n+ {\n+ return CreateTestPackageStream($@\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>TestPackage</id>\n+ <version>0.0.0.1</version>\n+ <{metadataName}>some value</{metadataName}>\n+ </metadata>\n+ </package>\");\n+ }\n+\n+ private static Stream CreateTestPackageStreamWithInvalidMinClientVersion()\n+ {\n+ return CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata minClientVersion=\"\"bad\"\">\n+ <id>TestPackage</id>\n+ <version>0.0.0.1</version>\n+ </metadata>\n+ </package>\");\n+ }\n+\nprivate static Stream CreateTestPackageStreamWithInvalidDependencyVersion()\n{\nreturn CreateTestPackageStream(@\"<?xml version=\"\"1.0\"\"?>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Reject invalid boolean values and properties generated by feed2catalog (#5750)
Progress on https://github.com/NuGet/Engineering/issues/1308
Progress on https://github.com/NuGet/Engineering/issues/1309
Progress on https://github.com/NuGet/Engineering/issues/1310
|
455,776 |
03.04.2018 10:40:32
| 25,200 |
9d4aedca0940804cf43d0a2dcd641627aae4b68e
|
Account settings page header improvements
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"diff": "<section role=\"main\" class=\"container main-container page-account-settings\">\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- <h1 class=\"text-center\"><a href=\"@Url.User(CurrentUser.Username)\" aria-label=\"View my profile\"><i class=\"ms-Icon ms-Icon--Contact\" aria-hidden=\"true\"></i></a> > Account Settings</h1>\n- <div class=\"text-center ms-font-xxl\">\n- <a href=\"@Url.User(CurrentUser)\">@CurrentUser.Username</a>\n- </div>\n+ <h1><a href=\"@Url.User(CurrentUser.Username)\" aria-label=\"View my profile\"><i class=\"ms-Icon ms-Icon--Contact\" aria-hidden=\"true\"></i></a> > Account Settings</h1>\n@Html.Partial(\"_AccountConfirmationNotices\", Model)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Account settings page header improvements (#5747)
|
455,776 |
03.04.2018 12:03:01
| 25,200 |
a984ac9493d2c2902ec96f0f83b4e180ce7d2936
|
[Organizations] Restrict unconfirmed organizations from pushing and changing membership
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/ApiScopeEvaluationResult.cs",
"new_path": "src/NuGetGallery/Authentication/ApiScopeEvaluationResult.cs",
"diff": "@@ -25,6 +25,8 @@ public class ApiScopeEvaluationResult\n/// </summary>\npublic User Owner { get; }\n+ public bool IsOwnerConfirmed => Owner != null && Owner.Confirmed;\n+\npublic ApiScopeEvaluationResult(User owner, PermissionsCheckResult permissionsCheckResult, bool scopesAreValid)\n{\nScopesAreValid = scopesAreValid;\n@@ -38,7 +40,7 @@ public ApiScopeEvaluationResult(User owner, PermissionsCheckResult permissionsCh\n/// </summary>\npublic bool IsSuccessful()\n{\n- return ScopesAreValid && PermissionsCheckResult == PermissionsCheckResult.Allowed;\n+ return ScopesAreValid && PermissionsCheckResult == PermissionsCheckResult.Allowed && IsOwnerConfirmed;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -776,7 +776,10 @@ private HttpStatusCodeWithBodyResult GetHttpResultFromFailedApiScopeEvaluationHe\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.Conflict, Strings.UploadPackage_IdNamespaceConflict);\n}\n- return new HttpStatusCodeWithBodyResult(statusCodeOnFailure, Strings.ApiKeyNotAuthorized);\n+ var message = result.PermissionsCheckResult == PermissionsCheckResult.Allowed && !result.IsOwnerConfirmed ?\n+ Strings.ApiKeyOwnerUnconfirmed : Strings.ApiKeyNotAuthorized;\n+\n+ return new HttpStatusCodeWithBodyResult(statusCodeOnFailure, message);\n}\nprivate ApiScopeEvaluationResult EvaluateApiScope(IActionRequiringEntityPermissions<PackageRegistration> action, PackageRegistration packageRegistration, params string[] requestedActions)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"new_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"diff": "@@ -101,7 +101,12 @@ public async Task<JsonResult> AddMember(string accountName, string memberName, b\n|| ActionsRequiringPermissions.ManageAccount.CheckPermissions(GetCurrentUser(), account)\n!= PermissionsCheckResult.Allowed)\n{\n- return Json((int)HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ return Json(HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ }\n+\n+ if (!account.Confirmed)\n+ {\n+ return Json(HttpStatusCode.BadRequest, Strings.Member_OrganizationUnconfirmed);\n}\ntry\n@@ -121,7 +126,7 @@ public async Task<JsonResult> AddMember(string accountName, string memberName, b\n}\ncatch (EntityException e)\n{\n- return Json((int)HttpStatusCode.BadRequest, e.Message);\n+ return Json(HttpStatusCode.BadRequest, e.Message);\n}\n}\n@@ -195,7 +200,7 @@ public async Task<JsonResult> CancelMemberRequest(string accountName, string mem\n|| ActionsRequiringPermissions.ManageAccount.CheckPermissions(GetCurrentUser(), account)\n!= PermissionsCheckResult.Allowed)\n{\n- return Json((int)HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ return Json(HttpStatusCode.Forbidden, Strings.Unauthorized);\n}\ntry\n@@ -206,7 +211,7 @@ public async Task<JsonResult> CancelMemberRequest(string accountName, string mem\n}\ncatch (EntityException e)\n{\n- return Json((int)HttpStatusCode.BadRequest, e.Message);\n+ return Json(HttpStatusCode.BadRequest, e.Message);\n}\n}\n@@ -221,7 +226,12 @@ public async Task<JsonResult> UpdateMember(string accountName, string memberName\n|| ActionsRequiringPermissions.ManageAccount.CheckPermissions(GetCurrentUser(), account)\n!= PermissionsCheckResult.Allowed)\n{\n- return Json((int)HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ return Json(HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ }\n+\n+ if (!account.Confirmed)\n+ {\n+ return Json(HttpStatusCode.BadRequest, Strings.Member_OrganizationUnconfirmed);\n}\ntry\n@@ -233,7 +243,7 @@ public async Task<JsonResult> UpdateMember(string accountName, string memberName\n}\ncatch (EntityException e)\n{\n- return Json((int)HttpStatusCode.BadRequest, e.Message);\n+ return Json(HttpStatusCode.BadRequest, e.Message);\n}\n}\n@@ -251,7 +261,12 @@ public async Task<JsonResult> DeleteMember(string accountName, string memberName\nActionsRequiringPermissions.ManageAccount.CheckPermissions(currentUser, account)\n!= PermissionsCheckResult.Allowed))\n{\n- return Json((int)HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ return Json(HttpStatusCode.Forbidden, Strings.Unauthorized);\n+ }\n+\n+ if (!account.Confirmed)\n+ {\n+ return Json(HttpStatusCode.BadRequest, Strings.Member_OrganizationUnconfirmed);\n}\ntry\n@@ -262,7 +277,7 @@ public async Task<JsonResult> DeleteMember(string accountName, string memberName\n}\ncatch (EntityException e)\n{\n- return Json((int)HttpStatusCode.BadRequest, e.Message);\n+ return Json(HttpStatusCode.BadRequest, e.Message);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -141,7 +141,7 @@ public virtual JsonResult UploadPackageProgress()\nAsyncFileUploadProgress progress = _cacheService.GetProgress(username);\nif (progress == null)\n{\n- return Json(404, null, JsonRequestBehavior.AllowGet);\n+ return Json(HttpStatusCode.NotFound, null, JsonRequestBehavior.AllowGet);\n}\nreturn Json(progress, JsonRequestBehavior.AllowGet);\n@@ -223,20 +223,20 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\n{\nif (existingUploadFile != null)\n{\n- return Json(409, new[] { Strings.UploadPackage_UploadInProgress });\n+ return Json(HttpStatusCode.Conflict, new[] { Strings.UploadPackage_UploadInProgress });\n}\n}\nif (uploadFile == null)\n{\nModelState.AddModelError(String.Empty, Strings.UploadFileIsRequired);\n- return Json(400, new[] { Strings.UploadFileIsRequired });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.UploadFileIsRequired });\n}\nif (!Path.GetExtension(uploadFile.FileName).Equals(CoreConstants.NuGetPackageFileExtension, StringComparison.OrdinalIgnoreCase))\n{\nModelState.AddModelError(String.Empty, Strings.UploadFileMustBeNuGetPackage);\n- return Json(400, new[] { Strings.UploadFileMustBeNuGetPackage });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.UploadFileMustBeNuGetPackage });\n}\nPackageRegistration existingPackageRegistration;\n@@ -261,7 +261,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nStrings.PackageEntryFromTheFuture,\nentryInTheFuture.Name));\n- return Json(400, new[] {\n+ return Json(HttpStatusCode.BadRequest, new[] {\nstring.Format(CultureInfo.CurrentCulture, Strings.PackageEntryFromTheFuture, entryInTheFuture.Name) });\n}\n}\n@@ -285,7 +285,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nModelState.AddModelError(String.Empty, message);\n- return Json(400, new[] { message });\n+ return Json(HttpStatusCode.BadRequest, new[] { message });\n}\nfinally\n{\n@@ -303,7 +303,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nModelState.AddModelError(String.Empty, error.ErrorMessage);\n}\n- return Json(400, errorStrings);\n+ return Json(HttpStatusCode.BadRequest, errorStrings);\n}\n// Check min client version\n@@ -316,7 +316,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nStrings.UploadPackage_MinClientVersionOutOfRange,\nnuspec.GetMinClientVersion()));\n- return Json(400, new[] {\n+ return Json(HttpStatusCode.BadRequest, new[] {\nstring.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_MinClientVersionOutOfRange, nuspec.GetMinClientVersion()) });\n}\n@@ -333,7 +333,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nvar version = nuspec.GetVersion().ToNormalizedString();\n_telemetryService.TrackPackagePushNamespaceConflictEvent(id, version, currentUser, User.Identity);\n- return Json(409, new string[] { string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict) });\n+ return Json(HttpStatusCode.Conflict, new string[] { string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict) });\n}\n// For existing package id verify if it is owned by the current user\n@@ -345,12 +345,12 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nModelState.AddModelError(\nstring.Empty, string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable, existingPackageRegistration.Id));\n- return Json(409, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable, existingPackageRegistration.Id) });\n+ return Json(HttpStatusCode.Conflict, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable, existingPackageRegistration.Id) });\n}\nif (existingPackageRegistration.IsLocked)\n{\n- return Json(403, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIsLocked, existingPackageRegistration.Id) });\n+ return Json(HttpStatusCode.Forbidden, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIsLocked, existingPackageRegistration.Id) });\n}\n}\n@@ -384,7 +384,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nstring.Empty,\nmessage);\n- return Json(409, new[] { message });\n+ return Json(HttpStatusCode.Conflict, new[] { message });\n}\nawait _uploadFileService.SaveUploadFileAsync(currentUser.Key, uploadStream);\n@@ -396,13 +396,13 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\nif (uploadedFile == null)\n{\nModelState.AddModelError(String.Empty, Strings.UploadFileIsRequired);\n- return Json(400, new[] { Strings.UploadFileIsRequired });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.UploadFileIsRequired });\n}\nvar package = await SafeCreatePackage(currentUser, uploadedFile);\nif (package == null)\n{\n- return Json(400, new[] { Strings.UploadFileIsRequired });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.UploadFileIsRequired });\n}\ntry\n@@ -415,7 +415,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\n{\n_telemetryService.TraceException(ex);\n- return Json(400, new[] { ex.GetUserSafeMessage() });\n+ return Json(HttpStatusCode.BadRequest, new[] { ex.GetUserSafeMessage() });\n}\n}\n@@ -1227,23 +1227,23 @@ public virtual async Task<JsonResult> Edit(string id, string version, VerifyPack\nvar package = _packageService.FindPackageByIdAndVersion(id, version);\nif (package == null)\n{\n- return Json(404, new[] { string.Format(Strings.PackageWithIdAndVersionNotFound, id, version) });\n+ return Json(HttpStatusCode.NotFound, new[] { string.Format(Strings.PackageWithIdAndVersionNotFound, id, version) });\n}\nif (ActionsRequiringPermissions.EditPackage.CheckPermissionsOnBehalfOfAnyAccount(GetCurrentUser(), package) != PermissionsCheckResult.Allowed)\n{\n- return Json(403, new[] { Strings.Unauthorized });\n+ return Json(HttpStatusCode.Forbidden, new[] { Strings.Unauthorized });\n}\nif (package.PackageRegistration.IsLocked)\n{\n- return Json(403, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIsLocked, package.PackageRegistration.Id) });\n+ return Json(HttpStatusCode.Forbidden, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIsLocked, package.PackageRegistration.Id) });\n}\nif (!ModelState.IsValid)\n{\nvar errorMessages = ModelState.Values.SelectMany(v => v.Errors.Select(e => e.ErrorMessage));\n- return Json(400, errorMessages);\n+ return Json(HttpStatusCode.BadRequest, errorMessages);\n}\nif (formData.Edit != null)\n@@ -1443,7 +1443,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nif (!ModelState.IsValid)\n{\nvar errorMessages = ModelState.Values.SelectMany(v => v.Errors.Select(e => e.ErrorMessage));\n- return Json(400, errorMessages);\n+ return Json(HttpStatusCode.BadRequest, errorMessages);\n}\nvar currentUser = GetCurrentUser();\n@@ -1454,7 +1454,13 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nif (owner == null)\n{\nvar message = string.Format(CultureInfo.CurrentCulture, Strings.VerifyPackage_UserNonExistent, formData.Owner);\n- return Json(400, new[] { message });\n+ return Json(HttpStatusCode.BadRequest, new[] { message });\n+ }\n+\n+ if (!owner.Confirmed)\n+ {\n+ var message = string.Format(CultureInfo.CurrentCulture, Strings.VerifyPackage_OwnerUnconfirmed, formData.Owner);\n+ return Json(HttpStatusCode.BadRequest, new[] { message });\n}\nPackage package;\n@@ -1462,14 +1468,14 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n{\nif (uploadFile == null)\n{\n- return Json(400, new[] { Strings.VerifyPackage_UploadNotFound });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.VerifyPackage_UploadNotFound });\n}\nvar nugetPackage = await SafeCreatePackage(currentUser, uploadFile);\nif (nugetPackage == null)\n{\n// Send the user back\n- return Json(400, new[] { Strings.VerifyPackage_UnexpectedError });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.VerifyPackage_UnexpectedError });\n}\nDebug.Assert(nugetPackage != null);\n@@ -1486,7 +1492,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n&& String.Equals(packageMetadata.Version.ToFullStringSafe(), formData.Version, StringComparison.OrdinalIgnoreCase)\n&& String.Equals(packageMetadata.Version.OriginalVersion, formData.OriginalVersion, StringComparison.OrdinalIgnoreCase)))\n{\n- return Json(400, new[] { Strings.VerifyPackage_PackageFileModified });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.VerifyPackage_PackageFileModified });\n}\n}\n@@ -1514,7 +1520,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nvar message = string.Format(CultureInfo.CurrentCulture,\nStrings.UploadPackage_NewIdOnBehalfOfUserNotAllowed,\ncurrentUser.Username, owner.Username);\n- return Json(400, new[] { message });\n+ return Json(HttpStatusCode.BadRequest, new[] { message });\n}\nelse if (checkPermissionsOfUploadNewId == PermissionsCheckResult.ReservedNamespaceFailure)\n{\n@@ -1523,11 +1529,11 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n_telemetryService.TrackPackagePushNamespaceConflictEvent(packageId, version, currentUser, User.Identity);\nvar message = string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict);\n- return Json(409, new string[] { message });\n+ return Json(HttpStatusCode.Conflict, new string[] { message });\n}\n// An unknown error occurred.\n- return Json(400, new[] { Strings.VerifyPackage_UnexpectedError });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.VerifyPackage_UnexpectedError });\n}\n}\nelse\n@@ -1541,7 +1547,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nvar message = string.Format(CultureInfo.CurrentCulture,\nStrings.UploadPackage_NewVersionOnBehalfOfUserNotAllowed,\ncurrentUser.Username, owner.Username);\n- return Json(400, new[] { message });\n+ return Json(HttpStatusCode.BadRequest, new[] { message });\n}\nif (checkPermissionsOfUploadNewVersion == PermissionsCheckResult.PackageRegistrationFailure)\n@@ -1550,11 +1556,11 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nvar message = string.Format(CultureInfo.CurrentCulture,\nStrings.VerifyPackage_OwnerInvalid,\nowner.Username, existingPackageRegistration.Id);\n- return Json(400, new[] { message });\n+ return Json(HttpStatusCode.BadRequest, new[] { message });\n}\n// An unknown error occurred.\n- return Json(400, new[] { Strings.VerifyPackage_UnexpectedError });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.VerifyPackage_UnexpectedError });\n}\n}\n@@ -1574,7 +1580,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n{\n_telemetryService.TraceException(ex);\n- return Json(400, new[] { ex.Message });\n+ return Json(HttpStatusCode.BadRequest, new[] { ex.Message });\n}\nif (formData.Edit != null)\n@@ -1610,7 +1616,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\nbreak;\ncase PackageCommitResult.Conflict:\nTempData[\"Message\"] = Strings.UploadPackage_IdVersionConflict;\n- return Json(409, new[] { Strings.UploadPackage_IdVersionConflict });\n+ return Json(HttpStatusCode.Conflict, new[] { Strings.UploadPackage_IdVersionConflict });\ndefault:\nthrow new NotImplementedException($\"The package commit result {commitResult} is not supported.\");\n}\n@@ -1704,7 +1710,7 @@ public virtual async Task<JsonResult> PreviewReadMe(ReadMeRequest formData)\n{\nif (formData == null || !_readMeService.HasReadMeSource(formData))\n{\n- return Json(400, new[] { Strings.PreviewReadMe_ReadMeMissing });\n+ return Json(HttpStatusCode.BadRequest, new[] { Strings.PreviewReadMe_ReadMeMissing });\n}\ntry\n@@ -1714,7 +1720,7 @@ public virtual async Task<JsonResult> PreviewReadMe(ReadMeRequest formData)\n}\ncatch (Exception ex)\n{\n- return Json(400, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PreviewReadMe_ConversionFailed, ex.Message) });\n+ return Json(HttpStatusCode.BadRequest, new[] { string.Format(CultureInfo.CurrentCulture, Strings.PreviewReadMe_ConversionFailed, ex.Message) });\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/StatisticsController.cs",
"new_path": "src/NuGetGallery/Controllers/StatisticsController.cs",
"diff": "@@ -191,17 +191,17 @@ public virtual async Task<JsonResult> PackageDownloadsByVersionReport(string id,\n{\nif (_statisticsService == NullStatisticsService.Instance)\n{\n- return Json(404, new[] {new object() }, JsonRequestBehavior.AllowGet);\n+ return Json(HttpStatusCode.NotFound, new[] {new object() }, JsonRequestBehavior.AllowGet);\n}\nvar packageStatisticsReport = await GetPackageDownloadsByVersionReport(id, groupby);\nif (packageStatisticsReport == null)\n{\n- return Json(404, new[] { Strings.PackageWithIdDoesNotExist }, JsonRequestBehavior.AllowGet);\n+ return Json(HttpStatusCode.NotFound, new[] { Strings.PackageWithIdDoesNotExist }, JsonRequestBehavior.AllowGet);\n}\n- return Json(200, packageStatisticsReport, JsonRequestBehavior.AllowGet);\n+ return Json(HttpStatusCode.OK, packageStatisticsReport, JsonRequestBehavior.AllowGet);\n}\n//\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -414,6 +414,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The specified API key is scoped to an owner that is unconfirmed. You must confirm the owner that this API key is scoped to before you can use it..\n+ /// </summary>\n+ public static string ApiKeyOwnerUnconfirmed {\n+ get {\n+ return ResourceManager.GetString(\"ApiKeyOwnerUnconfirmed\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to An API key must be provided in the 'X-NuGet-ApiKey' header to use this service.\n/// </summary>\n@@ -931,6 +940,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Your organization must be confirmed before you can change its membership..\n+ /// </summary>\n+ public static string Member_OrganizationUnconfirmed {\n+ get {\n+ return ResourceManager.GetString(\"Member_OrganizationUnconfirmed\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Please enter a message..\n/// </summary>\n@@ -2020,6 +2038,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to User '{0}' is unconfirmed and cannot be the owner of the package..\n+ /// </summary>\n+ public static string VerifyPackage_OwnerUnconfirmed {\n+ get {\n+ return ResourceManager.GetString(\"VerifyPackage_OwnerUnconfirmed\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Your attempt to verify the package submission failed, because the package file appears to have changed. Please try again..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -830,4 +830,13 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"AddMember_Success\" xml:space=\"preserve\">\n<value>You are now a member of organization '{0}'.</value>\n</data>\n+ <data name=\"VerifyPackage_OwnerUnconfirmed\" xml:space=\"preserve\">\n+ <value>User '{0}' is unconfirmed and cannot be the owner of the package.</value>\n+ </data>\n+ <data name=\"ApiKeyOwnerUnconfirmed\" xml:space=\"preserve\">\n+ <value>The specified API key is scoped to an owner that is unconfirmed. You must confirm the owner that this API key is scoped to before you can use it.</value>\n+ </data>\n+ <data name=\"Member_OrganizationUnconfirmed\" xml:space=\"preserve\">\n+ <value>Your organization must be confirmed before you can change its membership.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/ApiScopeEvaluationResultFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/ApiScopeEvaluationResultFacts.cs",
"diff": "@@ -19,7 +19,7 @@ public static IEnumerable<object[]> AllPossible_Data\n{\nforeach (var result in Enum.GetValues(typeof(PermissionsCheckResult)).Cast<PermissionsCheckResult>())\n{\n- foreach (var user in new[] { null, new User(\"test\") { Key = 1 } })\n+ foreach (var user in new[] { null, new User(\"testUnconfirmed\") { Key = 1 }, new User(\"testConfirmed\") { Key = 2, EmailAddress = \"something@confirmed.com\" } })\n{\nforeach (var scopesAreValid in new[] { false, true })\n{\n@@ -27,7 +27,7 @@ public static IEnumerable<object[]> AllPossible_Data\nscopesAreValid,\nresult,\nuser,\n- scopesAreValid && result == PermissionsCheckResult.Allowed);\n+ scopesAreValid && result == PermissionsCheckResult.Allowed && (user?.Confirmed ?? false));\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "using NuGetGallery.Authentication;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Framework;\n-using NuGetGallery.Infrastructure;\nusing NuGetGallery.Infrastructure.Authentication;\nusing NuGetGallery.Packaging;\nusing NuGetGallery.Security;\n@@ -153,6 +152,14 @@ public static IEnumerable<object[]> InvalidScopes_Data\nforeach (var result in Enum.GetValues(typeof(PermissionsCheckResult)).Cast<PermissionsCheckResult>())\n{\n+ if (result == PermissionsCheckResult.Allowed)\n+ {\n+ yield return MemberDataHelper.AsData(\n+ new ApiScopeEvaluationResult(new User(\"testOwner\") { Key = 94443 }, result, scopesAreValid: true),\n+ HttpStatusCode.Forbidden,\n+ Strings.ApiKeyOwnerUnconfirmed);\n+ }\n+\nif (result == PermissionsCheckResult.Allowed || result == PermissionsCheckResult.Unknown)\n{\ncontinue;\n@@ -351,7 +358,7 @@ public async Task WillReturnConflictIfAPackageWithTheIdAndSameNormalizedVersionA\nvar version = \"1.0.42\";\nvar nuGetPackage = TestPackage.CreateTestPackageStream(id, version);\n- var user = new User() { EmailAddress = \"confirmed@email.com\" };\n+ var user = new User() { EmailAddress = \"confirmed1@email.com\" };\nvar packageRegistration = new PackageRegistration\n{\n@@ -361,7 +368,7 @@ public async Task WillReturnConflictIfAPackageWithTheIdAndSameNormalizedVersionA\n};\nvar controller = new TestableApiController(GetConfigurationService());\n- controller.SetCurrentUser(new User());\n+ controller.SetCurrentUser(new User() { EmailAddress = \"confirmed2@email.com\" });\ncontroller.MockPackageService.Setup(x => x.FindPackageRegistrationById(id)).Returns(packageRegistration);\ncontroller.SetupPackageFromInputStream(nuGetPackage);\n@@ -379,7 +386,7 @@ public async Task WillReturnConflictIfAPackageWithTheIdAndSameNormalizedVersionA\npublic async Task WillReturnConflictIfCommittingPackageReturnsConflict()\n{\n// Arrange\n- var user = new User { EmailAddress = \"confirmed@email.com\" };\n+ var user = new User { EmailAddress = \"confirmed1@email.com\" };\nvar controller = new TestableApiController(GetConfigurationService());\ncontroller.SetCurrentUser(user);\ncontroller\n@@ -388,7 +395,7 @@ public async Task WillReturnConflictIfCommittingPackageReturnsConflict()\n.ReturnsAsync(PackageCommitResult.Conflict);\nvar nuGetPackage = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n- controller.SetCurrentUser(new User());\n+ controller.SetCurrentUser(new User() { EmailAddress = \"confirmed2@email.com\" });\ncontroller.SetupPackageFromInputStream(nuGetPackage);\n// Act\n@@ -439,12 +446,12 @@ public async Task WillCreateAPackageWithNewRegistration()\nvar packageId = \"theId\";\nvar nuGetPackage = TestPackage.CreateTestPackageStream(packageId, \"1.0.42\");\n- var currentUser = new User(\"currentUser\") { Key = 1, EmailAddress = \"confirmed@email.com\" };\n+ var currentUser = new User(\"currentUser\") { Key = 1, EmailAddress = \"currentUser@confirmed.com\" };\nvar controller = new TestableApiController(GetConfigurationService());\ncontroller.SetCurrentUser(currentUser);\ncontroller.SetupPackageFromInputStream(nuGetPackage);\n- var owner = new User(\"owner\") { Key = 2 };\n+ var owner = new User(\"owner\") { Key = 2, EmailAddress = \"org@confirmed.com\" };\nExpression<Func<IApiScopeEvaluator, ApiScopeEvaluationResult>> evaluateApiScope =\nx => x.Evaluate(\n@@ -559,7 +566,7 @@ public async Task WillCreateAPackageWithExistingRegistration()\nvar nuGetPackage = TestPackage.CreateTestPackageStream(packageId, \"1.0.42\");\ncontroller.SetupPackageFromInputStream(nuGetPackage);\n- var owner = new User(\"owner\") { Key = 2 };\n+ var owner = new User(\"owner\") { Key = 2, EmailAddress = \"org@confirmed.com\" };\nExpression<Func<IApiScopeEvaluator, ApiScopeEvaluationResult>> evaluateApiScope =\nx => x.Evaluate(\n@@ -730,7 +737,7 @@ public async Task WillFailIfPackageRegistrationIsLocked()\nconst string PackageId = \"theId\";\nvar nuGetPackage = TestPackage.CreateTestPackageStream(PackageId, \"1.0.42\");\n- var user = new User() { EmailAddress = \"confirmed@email.com\" };\n+ var user = new User() { EmailAddress = \"confirmed1@email.com\" };\nvar packageRegistration = new PackageRegistration\n{\nId = PackageId,\n@@ -739,7 +746,7 @@ public async Task WillFailIfPackageRegistrationIsLocked()\n};\nvar controller = new TestableApiController(GetConfigurationService());\n- controller.SetCurrentUser(new User());\n+ controller.SetCurrentUser(new User() { EmailAddress = \"confirmed2@email.com\" });\ncontroller.MockPackageService.Setup(x => x.FindPackageRegistrationById(PackageId)).Returns(packageRegistration);\ncontroller.SetupPackageFromInputStream(nuGetPackage);\n@@ -849,7 +856,7 @@ public async Task WillNotUnlistThePackageIfItIsLocked()\n{\n// Arrange\nconst string PackageId = \"theId\";\n- var owner = new User { Key = 1 };\n+ var owner = new User { Key = 1, EmailAddress = \"owner@confirmed.com\" };\nvar package = new Package\n{\nPackageRegistration = new PackageRegistration\n@@ -1180,7 +1187,7 @@ public async Task WillNotListThePackageIfItIsLocked()\n{\n// Arrange\nconst string PackageId = \"theId\";\n- var owner = new User { Key = 1 };\n+ var owner = new User { Key = 1, EmailAddress = \"owner@confirmed.com\" };\nvar package = new Package\n{\nPackageRegistration = new PackageRegistration\n@@ -1229,6 +1236,7 @@ internal TestableApiController SetupController(string keyType, Scope scope, Pack\n}\nvar user = Get<Fakes>().CreateUser(Username);\n+ user.EmailAddress = \"confirmed@email.com\";\nuser.Key = UserKey;\nuser.Credentials.Add(credential);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -433,6 +433,25 @@ public async Task WhenCurrentUserIsNotMember_ReturnsNonSuccess()\nGetMock<IUserService>().Verify(s => s.AddMembershipRequestAsync(It.IsAny<Organization>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);\n}\n+ [Fact]\n+ public async Task WhenOrganizationIsNotConfirmed_ReturnsNonSuccess()\n+ {\n+ // Arrange\n+ var controller = GetController();\n+ var account = GetAccount(controller);\n+ account.EmailAddress = null;\n+\n+ // Act\n+ var result = await InvokeAddMember(controller, account);\n+\n+ // Assert\n+ Assert.Equal((int)HttpStatusCode.BadRequest, controller.Response.StatusCode);\n+ Assert.IsType<JsonResult>(result);\n+ Assert.Equal(Strings.Member_OrganizationUnconfirmed, result.Data);\n+\n+ GetMock<IUserService>().Verify(s => s.AddMembershipRequestAsync(It.IsAny<Organization>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);\n+ }\n+\n[Theory]\n[InlineData(true)]\n[InlineData(false)]\n@@ -811,6 +830,25 @@ public async Task WhenUserIsNotMember_ReturnsNonSuccess()\nGetMock<IUserService>().Verify(s => s.UpdateMemberAsync(It.IsAny<Organization>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);\n}\n+ [Fact]\n+ public async Task WhenOrganizationIsUnconfirmed_ReturnsNonSuccess()\n+ {\n+ // Arrange\n+ var controller = GetController();\n+ var account = GetAccount(controller);\n+ account.EmailAddress = null;\n+\n+ // Act\n+ var result = await InvokeUpdateMember(controller, account);\n+\n+ // Assert\n+ Assert.Equal((int)HttpStatusCode.BadRequest, controller.Response.StatusCode);\n+ Assert.IsType<JsonResult>(result);\n+ Assert.Equal(Strings.Member_OrganizationUnconfirmed, result.Data);\n+\n+ GetMock<IUserService>().Verify(s => s.UpdateMemberAsync(It.IsAny<Organization>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);\n+ }\n+\n[Theory]\n[InlineData(true)]\n[InlineData(false)]\n@@ -942,6 +980,26 @@ public async Task WhenUserIsNotMember_ReturnsNonSuccess()\nGetMock<IMessageService>().Verify(s => s.SendOrganizationMemberRemovedNotice(It.IsAny<Organization>(), It.IsAny<User>()), Times.Never);\n}\n+ [Fact]\n+ public async Task WhenOrganizationIsUnconfirmed_ReturnsNonSuccess()\n+ {\n+ // Arrange\n+ var controller = GetController();\n+ var account = GetAccount(controller);\n+ account.EmailAddress = null;\n+\n+ // Act\n+ var result = await InvokeDeleteMember(controller, account);\n+\n+ // Assert\n+ Assert.Equal((int)HttpStatusCode.BadRequest, controller.Response.StatusCode);\n+ Assert.IsType<JsonResult>(result);\n+ Assert.Equal(Strings.Member_OrganizationUnconfirmed, result.Data);\n+\n+ GetMock<IUserService>().Verify(s => s.DeleteMemberAsync(It.IsAny<Organization>(), It.IsAny<string>()), Times.Never);\n+ GetMock<IMessageService>().Verify(s => s.SendOrganizationMemberRemovedNotice(It.IsAny<Organization>(), It.IsAny<User>()), Times.Never);\n+ }\n+\n[Fact]\npublic async Task WhenEntityException_ReturnsNonSuccess()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Restrict unconfirmed organizations from pushing and changing membership (#5713)
|
455,736 |
04.04.2018 08:17:35
| 25,200 |
131bbc0cdc237d3c1b5cfd9f9cafabec26a33749
|
Reject empty values for restricted and boolean metadata
Address
Address
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"new_path": "src/NuGetGallery.Core/Packaging/PackageMetadata.cs",
"diff": "@@ -185,11 +185,16 @@ private Uri GetValue(string key, Uri alternateValue)\n/// </exception>\npublic static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool strict)\n{\n+ var strictNuspecReader = new StrictNuspecReader(nuspecReader.Xml);\n+ var metadataLookup = strictNuspecReader.GetMetadataLookup();\n+\nif (strict)\n{\n- var strictNuspecReader = new StrictNuspecReader(nuspecReader.Xml);\n+ var duplicates = metadataLookup\n+ .Where(g => g.Count() > 1)\n+ .Select(g => g.Key)\n+ .ToList();\n- var duplicates = strictNuspecReader.GetDuplicateMetadataElementNames();\nif (duplicates.Any())\n{\nthrow new PackagingException(string.Format(\n@@ -198,13 +203,9 @@ public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool s\n}\n}\n- var metadata = nuspecReader\n- .GetMetadata()\n- .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);\n-\n// Reject invalid metadata element names. Today this only rejects element names that collide with\n// properties generated downstream.\n- var metadataKeys = new HashSet<string>(metadata.Keys);\n+ var metadataKeys = new HashSet<string>(metadataLookup.Select(g => g.Key));\nmetadataKeys.IntersectWith(RestrictedMetadataElements);\nif (metadataKeys.Any())\n{\n@@ -216,17 +217,19 @@ public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool s\n// Reject non-boolean values for boolean metadata.\nforeach (var booleanName in BooleanMetadataElements)\n{\n- if (metadata.TryGetValue(booleanName, out var unparsedBoolean)\n- && !bool.TryParse(unparsedBoolean, out var parsedBoolean))\n+ foreach (var unparsedBoolean in metadataLookup[booleanName])\n+ {\n+ if (!bool.TryParse(unparsedBoolean, out var parsedBoolean))\n{\nthrow new PackagingException(string.Format(\nCoreStrings.Manifest_InvalidBooleanMetadata,\nbooleanName));\n}\n}\n+ }\nreturn new PackageMetadata(\n- metadata,\n+ nuspecReader.GetMetadata().ToDictionary(kvp => kvp.Key, kvp => kvp.Value),\nnuspecReader.GetDependencyGroups(useStrictVersionCheck: strict),\nnuspecReader.GetFrameworkReferenceGroups(),\nnuspecReader.GetPackageTypes(),\n@@ -240,14 +243,11 @@ public StrictNuspecReader(XDocument xml) : base(xml)\n{\n}\n- public IReadOnlyList<string> GetDuplicateMetadataElementNames()\n+ public ILookup<string, string> GetMetadataLookup()\n{\nreturn MetadataNode\n.Elements()\n- .GroupBy(element => element.Name.LocalName)\n- .Where(group => group.Count() > 1)\n- .Select(group => group.Key)\n- .ToList();\n+ .ToLookup(e => e.Name.LocalName, e => e.Value);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.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.IO.Compression;\n+using System.Linq;\nusing NuGet.Packaging;\nusing NuGet.Packaging.Core;\nusing NuGet.Versioning;\n@@ -13,53 +15,115 @@ namespace NuGetGallery.Packaging\n{\npublic class PackageMetadataFacts\n{\n+ private static IEnumerable<string> TextValues = new[]\n+ {\n+ string.Empty,\n+ \" \\t \",\n+ \"some value\",\n+ \"\\tfoo\\r\\n\",\n+ \"<\",\n+ \"<inner>foo</inner>\",\n+ \"<inner />\",\n+ };\n+ private static IEnumerable<string> BooleanNames = new[]\n+ {\n+ \"developmentDependency\",\n+ \"requireLicenseAcceptance\",\n+ \"serviceable\",\n+ };\n+ private static IEnumerable<string> RestrictedNames = new[]\n+ {\n+ \"created\",\n+ \"dependencyGroups\",\n+ \"isPrerelease\",\n+ \"lastEdited\",\n+ \"listed\",\n+ \"packageEntries\",\n+ \"packageHash\",\n+ \"packageHashAlgorithm\",\n+ \"packageSize\",\n+ \"published\",\n+ \"supportedFrameworks\",\n+ \"verbatimVersion\",\n+ };\n+\n+ public static IEnumerable<object[]> BooleanNameData => BooleanNames\n+ .Select(n => new object[] { n });\n+\n+ public static IEnumerable<object[]> RestrictedNameData = RestrictedNames\n+ .Select(n => new object[] { n });\n+\n+ public static IEnumerable<object[]> BooleanNameAndValueData => BooleanNames\n+ .SelectMany(n => TextValues.Select(v => new object[] { n, v }));\n+\n+ public static IEnumerable<object[]> RestrictedNameAndValueData = RestrictedNames\n+ .SelectMany(n => TextValues.Select(v => new object[] { n, v }));\n+\n+ public static IEnumerable<object[]> UnofficialNameAndValueData = new[] { \"foo\" }\n+ .SelectMany(n => TextValues.Select(v => new object[] { n, v }));\n+\n[Theory]\n- [InlineData(\"developmentDependency\")]\n- [InlineData(\"requireLicenseAcceptance\")]\n- [InlineData(\"serviceable\")]\n- public void RejectsInvalidBooleanValue(string metadataName)\n+ [MemberData(nameof(BooleanNameAndValueData))]\n+ public void RejectsInvalidBooleanValue(string name, string value)\n{\n// Arrange\n- var packageStream = CreateTestPackageStreamWithMetadataElementName(metadataName);\n+ var packageStream = CreateTestPackageStreamWithMetadataElementName(name, value);\nvar nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\nvar nuspec = nupkg.GetNuspecReader();\n// Act & Assert\nvar ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(nuspec, strict: false));\n- Assert.Equal($\"The package manifest contains an invalid boolean value for metadata element: '{metadataName}'. The value should be 'true' or 'false'.\", ex.Message);\n+ Assert.Equal($\"The package manifest contains an invalid boolean value for metadata element: '{name}'. The value should be 'true' or 'false'.\", ex.Message);\n}\n[Theory]\n- [InlineData(\"created\")]\n- [InlineData(\"dependencyGroups\")]\n- [InlineData(\"isPrerelease\")]\n- [InlineData(\"lastEdited\")]\n- [InlineData(\"listed\")]\n- [InlineData(\"packageEntries\")]\n- [InlineData(\"packageHash\")]\n- [InlineData(\"packageHashAlgorithm\")]\n- [InlineData(\"packageSize\")]\n- [InlineData(\"published\")]\n- [InlineData(\"supportedFrameworks\")]\n- [InlineData(\"verbatimVersion\")]\n- public void RejectsRestrictedElementNames(string metadataName)\n+ [MemberData(nameof(BooleanNameData))]\n+ public void RejectsEmptyBooleanValue(string name)\n{\n// Arrange\n- var packageStream = CreateTestPackageStreamWithMetadataElementName(metadataName);\n+ var packageStream = CreateTestPackageStreamWithMetadataElementNameAndEmptyValue(name);\nvar nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\nvar nuspec = nupkg.GetNuspecReader();\n// Act & Assert\nvar ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(nuspec, strict: false));\n- Assert.Equal($\"The package manifest contains invalid metadata elements: '{metadataName}'\", ex.Message);\n+ Assert.Equal($\"The package manifest contains an invalid boolean value for metadata element: '{name}'. The value should be 'true' or 'false'.\", ex.Message);\n}\n- [Fact]\n- public void AllowsUnrestrictedButUnofficialElementNames()\n+ [Theory]\n+ [MemberData(nameof(RestrictedNameAndValueData))]\n+ public void RejectsRestrictedElementNames(string name, string value)\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithMetadataElementName(name, value);\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(nuspec, strict: false));\n+ Assert.Equal($\"The package manifest contains invalid metadata elements: '{name}'\", ex.Message);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(RestrictedNameData))]\n+ public void RejectsRestrictedElementNamesWithEmptyValue(string name)\n+ {\n+ // Arrange\n+ var packageStream = CreateTestPackageStreamWithMetadataElementNameAndEmptyValue(name);\n+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\n+ var nuspec = nupkg.GetNuspecReader();\n+\n+ // Act & Assert\n+ var ex = Assert.Throws<PackagingException>(() => PackageMetadata.FromNuspecReader(nuspec, strict: false));\n+ Assert.Equal($\"The package manifest contains invalid metadata elements: '{name}'\", ex.Message);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(UnofficialNameAndValueData))]\n+ public void AllowsUnrestrictedButUnofficialElementNames(string name, string value)\n{\n// Arrange\n- var name = \"foo\";\n- var packageStream = CreateTestPackageStreamWithMetadataElementName(name);\n+ var packageStream = CreateTestPackageStreamWithMetadataElementName(name, value);\nvar nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);\nvar nuspec = nupkg.GetNuspecReader();\n@@ -71,7 +135,6 @@ public void AllowsUnrestrictedButUnofficialElementNames()\n// Assert\nAssert.Equal(\"TestPackage\", packageMetadata.Id);\nAssert.Equal(NuGetVersion.Parse(\"0.0.0.1\"), packageMetadata.Version);\n- Assert.Equal(\"some value\", packageMetadata.GetValueFromMetadata(name));\n}\n[Fact]\n@@ -252,14 +315,26 @@ private static Stream CreateTestPackageStream()\n</package>\");\n}\n- private static Stream CreateTestPackageStreamWithMetadataElementName(string metadataName)\n+ private static Stream CreateTestPackageStreamWithMetadataElementName(string metadataName, string value = \"some value\")\n+ {\n+ return CreateTestPackageStream($@\"<?xml version=\"\"1.0\"\"?>\n+ <package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n+ <metadata>\n+ <id>TestPackage</id>\n+ <version>0.0.0.1</version>\n+ <{metadataName}>{value}</{metadataName}>\n+ </metadata>\n+ </package>\");\n+ }\n+\n+ private static Stream CreateTestPackageStreamWithMetadataElementNameAndEmptyValue(string metadataName)\n{\nreturn CreateTestPackageStream($@\"<?xml version=\"\"1.0\"\"?>\n<package xmlns=\"\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\"\">\n<metadata>\n<id>TestPackage</id>\n<version>0.0.0.1</version>\n- <{metadataName}>some value</{metadataName}>\n+ <{metadataName} />\n</metadata>\n</package>\");\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Reject empty values for restricted and boolean metadata (#5761)
Address https://github.com/NuGet/Engineering/issues/1308
Address https://github.com/NuGet/Engineering/issues/1309
Address https://github.com/NuGet/Engineering/issues/1310
|
455,776 |
04.04.2018 11:03:31
| 25,200 |
373de84ced75fb32c832d1ed2177d12e64c16a05
|
[Organizations] For co-owners, show the user who last pushed/edited each version
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"diff": "@@ -228,6 +228,7 @@ protected IQueryable<Package> GetPackagesByIdQueryable(string id)\n.GetAll()\n.Include(p => p.LicenseReports)\n.Include(p => p.PackageRegistration)\n+ .Include(p => p.User)\n.Where(p => p.PackageRegistration.Id == id);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -12,16 +12,7 @@ namespace NuGetGallery\npublic class DisplayPackageViewModel : ListPackageItemViewModel\n{\npublic DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumerable<Package> packageHistory)\n- : this(package, currentUser, packageHistory, isVersionHistory: false)\n- {\n- }\n-\n- public DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumerable<Package> packageHistory, bool isVersionHistory)\n- : base(package, currentUser)\n- {\n- Copyright = package.Copyright;\n-\n- if (!isVersionHistory)\n+ : this(package, currentUser, (string)null)\n{\nHasSemVer2Version = NuGetVersion.IsSemVer2;\nHasSemVer2Dependency = package.Dependencies.ToList()\n@@ -30,27 +21,33 @@ public DisplayPackageViewModel(Package package, User currentUser, IOrderedEnumer\n.Any(p => (p.HasUpperBound && p.MaxVersion.IsSemVer2) || (p.HasLowerBound && p.MinVersion.IsSemVer2));\nDependencies = new DependencySetsViewModel(package.Dependencies);\n- PackageVersions = packageHistory.Select(p => new DisplayPackageViewModel(p, currentUser, packageHistory, isVersionHistory: true));\n- }\n+ PackageVersions = packageHistory.Select(p => new DisplayPackageViewModel(p, currentUser, GetPushedBy(p, currentUser)));\n- DownloadCount = package.DownloadCount;\n- LastEdited = package.LastEdited;\n+ PushedBy = GetPushedBy(package, currentUser);\n- if (!isVersionHistory && packageHistory.Any())\n+ if (packageHistory.Any())\n{\n// calculate the number of days since the package registration was created\n// round to the nearest integer, with a min value of 1\n// divide the total download count by this number\nTotalDaysSinceCreated = Convert.ToInt32(Math.Max(1, Math.Round((DateTime.UtcNow - packageHistory.Min(p => p.Created)).TotalDays)));\nDownloadsPerDay = TotalDownloadCount / TotalDaysSinceCreated; // for the package\n+ DownloadsPerDayLabel = DownloadsPerDay < 1 ? \"<1\" : DownloadsPerDay.ToNuGetNumberString();\n}\n- else\n+ }\n+\n+ public DisplayPackageViewModel(Package package, User currentUser, string pushedBy)\n+ : base(package, currentUser)\n{\n+ Copyright = package.Copyright;\n+\n+ DownloadCount = package.DownloadCount;\n+ LastEdited = package.LastEdited;\n+\nTotalDaysSinceCreated = 0;\nDownloadsPerDay = 0;\n- }\n- DownloadsPerDayLabel = DownloadsPerDay < 1 ? \"<1\" : DownloadsPerDay.ToNuGetNumberString();\n+ PushedBy = pushedBy;\n}\npublic bool ValidatingTooLong { get; set; }\n@@ -81,5 +78,50 @@ public bool HasNewerPrerelease\npublic bool? IsIndexed { get; set; }\npublic string DownloadsPerDayLabel { get; private set; }\n+\n+ public string PushedBy { get; private set; }\n+\n+ private IDictionary<User, string> _pushedByCache = new Dictionary<User, string>();\n+\n+ private string GetPushedBy(Package package, User currentUser)\n+ {\n+ var userPushedBy = package.User;\n+\n+ if (userPushedBy == null)\n+ {\n+ return null;\n+ }\n+\n+ if (!_pushedByCache.ContainsKey(userPushedBy))\n+ {\n+ // Only show who pushed the package version to users that can see private package metadata\n+ if (ActionsRequiringPermissions.DisplayPrivatePackageMetadata.CheckPermissionsOnBehalfOfAnyAccount(currentUser, package) == PermissionsCheckResult.Allowed)\n+ {\n+ var organizationsThatUserPushedByBelongsTo =\n+ (package.PackageRegistration?.Owners ?? Enumerable.Empty<User>())\n+ .OfType<Organization>()\n+ .Where(organization => ActionsRequiringPermissions.ViewAccount.CheckPermissions(userPushedBy, organization) == PermissionsCheckResult.Allowed);\n+ if (organizationsThatUserPushedByBelongsTo.Any())\n+ {\n+ // If the user is a member of any organizations that are package owners, only show the user if the current user is a member of the same organization\n+ _pushedByCache[userPushedBy] =\n+ organizationsThatUserPushedByBelongsTo.Any(organization => ActionsRequiringPermissions.ViewAccount.CheckPermissions(currentUser, organization) == PermissionsCheckResult.Allowed) ?\n+ userPushedBy?.Username :\n+ organizationsThatUserPushedByBelongsTo.First().Username;\n+ }\n+ else\n+ {\n+ // Otherwise, show the user\n+ _pushedByCache[userPushedBy] = userPushedBy?.Username;\n+ }\n+ }\n+ else\n+ {\n+ _pushedByCache[userPushedBy] = null;\n+ }\n+ }\n+\n+ return _pushedByCache[userPushedBy];\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"diff": "using System.Collections.Generic;\nusing System.Linq;\n-using System.Security.Principal;\nusing NuGetGallery.Helpers;\nnamespace NuGetGallery\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>\n- @if (packageVersion.IsCurrent(Model))\n- {\n<a href=\"@Url.Package(packageVersion)\">\n<b>\n- @packageVersion.FullVersion\n+ @packageVersion.FullVersion.Abbreviate(15)\n@if (packageVersion.IsCurrent(Model))\n{\n@:(current version)\n}\n</b>\n</a>\n- }\n- else\n- {\n- <a href=\"@Url.Package(packageVersion)\">\n- @packageVersion.FullVersion\n- </a>\n- }\n</td>\n<td>\n@packageVersion.DownloadCount.ToNuGetNumberString()\n</td>\n<td>\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+ }\n</td>\n@if (packageVersion.CanDisplayPrivateMetadata)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "using System.Collections.Generic;\nusing System.Linq;\nusing NuGet.Versioning;\n+using NuGetGallery.Framework;\nusing Xunit;\nnamespace NuGetGallery.ViewModels\n@@ -344,5 +345,94 @@ private Package CreateTestPackage(string version, string dependencyVersion = nul\npackage.PackageRegistration.Packages = new[] { package };\nreturn package;\n}\n+\n+ public class ThePushedByField\n+ {\n+ public enum UserPackageOwnerState\n+ {\n+ HasNoUserPackageOwner,\n+ HasUserPackageOwner,\n+ CurrentUserIsUserPackageOwner\n+ }\n+\n+ public enum OrganizationPackageOwnerState\n+ {\n+ HasNoOrganizationPackageOwner,\n+ HasOrganizationPackageOwner,\n+ CurrentUserIsMemberOfOrganizationPackageOwner\n+ }\n+\n+ public static IEnumerable<object[]> Data\n+ {\n+ get\n+ {\n+ foreach (var userPackageOwnerState in Enum.GetValues(typeof(UserPackageOwnerState)).Cast<UserPackageOwnerState>())\n+ {\n+ foreach (var organizationPackageOwnerState in Enum.GetValues(typeof(OrganizationPackageOwnerState)).Cast<OrganizationPackageOwnerState>())\n+ {\n+ var key = 0;\n+ var currentUser = new User(\"currentUser\") { Key = key++ };\n+ var owners = new List<User>();\n+\n+ User packageOwner = null;\n+ if (userPackageOwnerState != UserPackageOwnerState.HasNoUserPackageOwner)\n+ {\n+ packageOwner = userPackageOwnerState == UserPackageOwnerState.CurrentUserIsUserPackageOwner ? currentUser : new User(\"packageOwner\") { Key = key++ };\n+ owners.Add(packageOwner);\n+ }\n+\n+ Organization organizationOwner = new Organization(\"organizationOwner\") { Key = key++ };\n+ User organizationMember = null;\n+ if (organizationPackageOwnerState != OrganizationPackageOwnerState.HasNoOrganizationPackageOwner)\n+ {\n+ organizationMember = organizationPackageOwnerState == OrganizationPackageOwnerState.CurrentUserIsMemberOfOrganizationPackageOwner ? currentUser : new User(\"organizationMember\") { Key = key++ };\n+ owners.Add(organizationMember);\n+ }\n+\n+ var canViewPrivateMetadata =\n+ userPackageOwnerState == UserPackageOwnerState.CurrentUserIsUserPackageOwner ||\n+ organizationPackageOwnerState == OrganizationPackageOwnerState.CurrentUserIsMemberOfOrganizationPackageOwner;\n+\n+ var packageRegistration = new PackageRegistration { Owners = owners };\n+\n+ var packageWithoutUser = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\" };\n+ yield return MemberDataHelper.AsData(packageWithoutUser, currentUser, null);\n+\n+ var userThatIsNotOwner = new User(\"notAnOwner\") { Key = key++ };\n+ var packageWithUserThatIsNotOwner = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", User = userThatIsNotOwner };\n+ yield return MemberDataHelper.AsData(packageWithUserThatIsNotOwner, currentUser, canViewPrivateMetadata ? userThatIsNotOwner.Username : null);\n+\n+ if (userPackageOwnerState != UserPackageOwnerState.HasNoUserPackageOwner)\n+ {\n+ var packageWithUserUser = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", User = packageOwner };\n+ yield return MemberDataHelper.AsData(packageWithUserUser, currentUser, canViewPrivateMetadata ? packageWithUserUser.User.Username : null);\n+ }\n+\n+ if (organizationPackageOwnerState != OrganizationPackageOwnerState.CurrentUserIsMemberOfOrganizationPackageOwner)\n+ {\n+ var packageWithOrganizationUser = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", User = organizationOwner };\n+\n+ string expected = canViewPrivateMetadata ?\n+ (organizationPackageOwnerState == OrganizationPackageOwnerState.CurrentUserIsMemberOfOrganizationPackageOwner ?\n+ organizationMember.Username :\n+ organizationOwner.Username) :\n+ null;\n+\n+ yield return MemberDataHelper.AsData(packageWithOrganizationUser, currentUser, expected);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(Data))]\n+ public void ReturnsExpectedUser(Package package, User currentUser, string expected)\n+ {\n+ var model = new DisplayPackageViewModel(package, currentUser, new[] { package }.OrderByDescending(p => new NuGetVersion(p.Version)));\n+\n+ Assert.Equal(expected, model.PushedBy);\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] For co-owners, show the user who last pushed/edited each version (#5698)
|
455,776 |
04.04.2018 13:22:34
| 25,200 |
1baa7662022d52edb72a4881485756d642cd6bc5
|
[Organizations] Do not allow nesting of organizations
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/UserService.cs",
"new_path": "src/NuGetGallery/Services/UserService.cs",
"diff": "@@ -96,6 +96,12 @@ public async Task<MembershipRequest> AddMembershipRequestAsync(Organization orga\nStrings.AddMember_UserNotConfirmed, memberName));\n}\n+ if (member is Organization)\n+ {\n+ throw new EntityException(string.Format(CultureInfo.CurrentCulture,\n+ Strings.AddMember_UserIsOrganization, memberName));\n+ }\n+\n// Ensure that the new member meets the AAD tenant policy for this organization.\nvar policyResult = await SecurityPolicyService.EvaluateOrganizationPoliciesAsync(\nSecurityPolicyAction.JoinOrganization, organization, member);\n@@ -184,6 +190,12 @@ public async Task<Membership> AddMemberAsync(Organization organization, string m\nStrings.AddMember_UserNotConfirmed, memberName));\n}\n+ if (member is Organization)\n+ {\n+ throw new EntityException(string.Format(CultureInfo.CurrentCulture,\n+ Strings.AddMember_UserIsOrganization, memberName));\n+ }\n+\nvar membership = FindMembershipByUsername(organization, memberName);\nif (membership == null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -178,6 +178,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to User '{0}' is an organization and cannot be a member of another organization..\n+ /// </summary>\n+ public static string AddMember_UserIsOrganization {\n+ get {\n+ return ResourceManager.GetString(\"AddMember_UserIsOrganization\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to User '{0}' has not confirmed their email..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -839,4 +839,7 @@ If you wish to update the linked Microsoft account you can do so from the accoun\n<data name=\"Member_OrganizationUnconfirmed\" xml:space=\"preserve\">\n<value>Your organization must be confirmed before you can change its membership.</value>\n</data>\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</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -156,6 +156,34 @@ public async Task WhenMemberNotConfirmed_ThrowEntityException(bool isAdmin)\nservice.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n}\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public async Task WhenMemberIsOrganization_ThrowEntityException(bool isAdmin)\n+ {\n+ // Arrange\n+ var fakes = new Fakes();\n+ var service = new TestableUserService();\n+ service.MockUserRepository.Setup(r => r.GetAll())\n+ .Returns(new[] {\n+ fakes.OrganizationOwner,\n+ fakes.Organization\n+ }.AsQueryable());\n+\n+ fakes.User.EmailAddress = string.Empty;\n+ fakes.User.UnconfirmedEmailAddress = \"unconfirmed@email.com\";\n+\n+ // Act\n+ var e = await Assert.ThrowsAsync<EntityException>(async () =>\n+ {\n+ await service.AddMembershipRequestAsync(fakes.OrganizationOwner, fakes.Organization.Username, isAdmin);\n+ });\n+\n+ Assert.Equal(string.Format(CultureInfo.CurrentCulture, Strings.AddMember_UserIsOrganization, fakes.Organization.Username), e.Message);\n+\n+ service.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n+ }\n+\n[Theory]\n[InlineData(true)]\n[InlineData(false)]\n@@ -270,7 +298,7 @@ public async Task WhenRequestWithTokenNotFound_ThrowsEntityException(bool isAdmi\nFakes.Organization.MemberRequests.Add(new MembershipRequest\n{\n- NewMember = Fakes.OrganizationCollaborator,\n+ NewMember = Fakes.User,\nConfirmationToken = \"token\",\nIsAdmin = isAdmin\n});\n@@ -288,6 +316,73 @@ public async Task WhenRequestWithTokenNotFound_ThrowsEntityException(bool isAdmi\nUserService.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n}\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public async Task WhereMemberUnconfirmed_ThrowsEntityException(bool isAdmin)\n+ {\n+ // Arrange\n+ UserService.MockSecurityPolicyService\n+ .Setup(s => s.EvaluateOrganizationPoliciesAsync(SecurityPolicyAction.JoinOrganization, Fakes.Organization, Fakes.User))\n+ .Returns(Task.FromResult(SecurityPolicyResult.CreateErrorResult(\"error\")));\n+\n+ var token = \"token\";\n+\n+ Fakes.Organization.MemberRequests.Add(new MembershipRequest\n+ {\n+ NewMember = Fakes.User,\n+ ConfirmationToken = token,\n+ IsAdmin = isAdmin\n+ });\n+\n+ Fakes.User.EmailAddress = string.Empty;\n+ Fakes.User.UnconfirmedEmailAddress = \"unconfirmed@email.com\";\n+\n+ // Act & Assert\n+ var e = await Assert.ThrowsAsync<EntityException>(async () =>\n+ {\n+ await UserService.AddMemberAsync(Fakes.Organization, Fakes.User.Username, token);\n+ });\n+\n+ Assert.Equal(string.Format(CultureInfo.CurrentCulture,\n+ Strings.AddMember_UserNotConfirmed, Fakes.User.Username),\n+ e.Message);\n+\n+ UserService.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n+ }\n+\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public async Task WhereMemberIsOrganization_ThrowsEntityException(bool isAdmin)\n+ {\n+ // Arrange\n+ UserService.MockSecurityPolicyService\n+ .Setup(s => s.EvaluateOrganizationPoliciesAsync(SecurityPolicyAction.JoinOrganization, Fakes.Organization, Fakes.OrganizationOwner))\n+ .Returns(Task.FromResult(SecurityPolicyResult.CreateErrorResult(\"error\")));\n+\n+ var token = \"token\";\n+\n+ Fakes.Organization.MemberRequests.Add(new MembershipRequest\n+ {\n+ NewMember = Fakes.OrganizationOwner,\n+ ConfirmationToken = token,\n+ IsAdmin = isAdmin\n+ });\n+\n+ // Act & Assert\n+ var e = await Assert.ThrowsAsync<EntityException>(async () =>\n+ {\n+ await UserService.AddMemberAsync(Fakes.Organization, Fakes.OrganizationOwner.Username, token);\n+ });\n+\n+ Assert.Equal(string.Format(CultureInfo.CurrentCulture,\n+ Strings.AddMember_UserIsOrganization, Fakes.OrganizationOwner.Username),\n+ e.Message);\n+\n+ UserService.MockEntitiesContext.Verify(c => c.SaveChangesAsync(), Times.Never);\n+ }\n+\n[Theory]\n[InlineData(false)]\n[InlineData(true)]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Do not allow nesting of organizations (#5758)
|
455,776 |
04.04.2018 13:55:07
| 25,200 |
2d1c2ffcad028f0f1926d6db6a693055b6f0c22a
|
[Organizations] Add new organization page improvements
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"new_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"diff": "@@ -64,8 +64,6 @@ public async Task<ActionResult> Add(AddOrganizationViewModel model)\nvar organizationEmailAddress = model.OrganizationEmailAddress;\nvar adminUser = GetCurrentUser();\n- string errorMessage;\n-\ntry\n{\nvar organization = await UserService.AddOrganizationAsync(organizationName, organizationEmailAddress, adminUser);\n@@ -74,12 +72,10 @@ public async Task<ActionResult> Add(AddOrganizationViewModel model)\n}\ncatch (EntityException e)\n{\n- errorMessage = e.Message;\n- }\n-\n- TempData[\"ErrorMessage\"] = errorMessage;\n+ TempData[\"AddOrganizationErrorMessage\"] = e.Message;\nreturn View(model);\n}\n+ }\n[HttpGet]\n[UIAuthorize]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-add-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-add-organization.js",
"diff": "var _emailBox = $(\"#\" + emailBoxGroupId + \" > input\");\nvar _gravatar = $(\"#\" + gravatarId);\n- var _template = \"https://secure.gravatar.com/avatar/{email}?s=512&r=g&d=retro\";\n+ var _gravatarTemplate = \"https://secure.gravatar.com/avatar/{email}?s=512&r=g&d=retro\";\n+\n+ var _organizationNameBox = $(\"#\" + organizationNameTextGroupId + \" > input\");\n+ var _organizationNameText = $(\"#\" + organizationNameTextId);\n+ var _organizationNameTextTemplate = _organizationNameText.text();\n// When the email in the form changes, update the Gravatar displayed as the logo.\n// If the user is continuing to type, wait until they are done before updating the Gravatar.\nvar email = _emailBox.val();\nif (email.match(emailValidationRegex)) {\n- src = _template.replace(\"{email}\", MD5(email));\n+ src = _gravatarTemplate.replace(\"{email}\", MD5(email));\n}\n_gravatar.attr(\"src\", src);\nif (_emailBox.val()) {\nUpdateGravatar();\n}\n+\n+ // When the username in the form changes, update the text to contain the name.\n+ _organizationNameBox.on(\"keyup\", function (e) {\n+ UpdateOrganizationNameText();\n+ });\n+ _organizationNameBox.on(\"blur\", function (e) {\n+ UpdateOrganizationNameText();\n+ });\n+\n+ function UpdateOrganizationNameText() {\n+ var nameInForm = _organizationNameBox.val();\n+ var name = nameInForm ? nameInForm : \"your_name_here\";\n+ _organizationNameText.text(_organizationNameTextTemplate.replace(\"%7Busername%7D\", name));\n+ }\n+\n+ UpdateOrganizationNameText();\n});\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"diff": "var gravatarId = \"gravatar-image\";\nvar emailBoxGroupId = \"email-box-group\";\n+\n+ var organizationNameTextGroupId = \"organization-name\";\n+ var organizationNameTextId = \"organization-name-text\";\n+\n+ var errorMessage = TempData[\"AddOrganizationErrorMessage\"];\n}\n<section role=\"main\" class=\"container main-container\">\nAdd New\n</h1>\n<p class=\"text-center\">\n- Organizations allow you to manage and publish packages as a team or a group.\n+ Organizations 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+ {\n+ @ViewHelpers.AlertDanger(@<text>@errorMessage</text>)\n+ }\n<div>\n<aside class=\"col-sm-3 col-sm-push-9\">\n@Html.Label(\"Logo\")\n+ <a href=\"#\" id=\"transform-tooltip\" data-toggle=\"tooltip\" title=\"We use the email address for your organization and gravatar.com to get the logo.\">\n+ <i class=\"ms-Icon ms-Icon--Info\" aria-hidden=\"true\" style=\"vertical-align: -2px\"></i>\n+ </a>\n<img src=\"@Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\")\" class=\"owner-image img-responsive\" height=\"332\" id=\"gravatar-image\" width=\"332\" alt=\"gravatar\" title=\"Organization logo\">\n</aside>\n{\n@Html.AntiForgeryToken()\n- <div class=\"form-group @Html.HasErrorFor(m => m.OrganizationName)\">\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>This will be your organization account on <i>@Url.User(\"your_name_here\", relativeUrl: false).</i></span>\n+ <span class=\"ms-font-s\">This will be your organization account on <i id=\"@organizationNameTextId\">@Url.User(\"{username}\", relativeUrl: false)</i>.</span>\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>Users can contact you at this email address.</span>\n+ <span class=\"ms-font-s\">Users can contact your organization at this email address.</span>\n</div>\n<div class=\"form-group row\">\n<script type=\"text/javascript\">\nvar gravatarId = \"@gravatarId\";\nvar emailBoxGroupId = \"@emailBoxGroupId\";\n+ var organizationNameTextGroupId = \"@organizationNameTextGroupId\";\n+ var organizationNameTextId = \"@organizationNameTextId\";\nvar defaultImage = \"@Html.Raw(@Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\"))\";\nvar emailValidationRegex = new RegExp(\"@Html.Raw(@Constants.EmailValidationRegex)\");\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -350,7 +350,7 @@ public async Task WhenAddOrganizationThrowsEntityException_ReturnsViewWithMessag\nvar result = await controller.Add(Model);\nResultAssert.IsView<AddOrganizationViewModel>(result);\n- Assert.Equal(message, controller.TempData[\"ErrorMessage\"]);\n+ Assert.Equal(message, controller.TempData[\"AddOrganizationErrorMessage\"]);\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Add new organization page improvements (#5757)
|
455,776 |
04.04.2018 15:34:12
| 25,200 |
42b94a6491990a4d176336edf478d3f71c5bee2e
|
[Organizations] Edit organization UI fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-organization.js",
"diff": "data: data,\nsuccess: function (data) {\nself.Error(null);\n+\n+ // Remove any duplicates of this user in the UI.\n+ // This can happen if a user makes multiple add requests before a response is received.\n+ self.Members.remove(function (member) {\n+ return member.Username.toLocaleLowerCase() === data.Username.toLocaleLowerCase();\n+ });\n+\nself.Members.push(new OrganizationMemberViewModel(self, data));\nself.NewMemberUsername(null);\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml",
"diff": "</div>\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n+ @if (!Model.CanManage)\n+ {\n+ @ViewHelpers.AlertInfo(@<text>You are a collaborator of this organization. Only administrators can make changes.</text>);\n+ }\n+\n@Html.Partial(\"_AccountConfirmationNotices\", Model)\n@Html.Partial(\"_AccountChangeEmail\", Model)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Edit organization UI fixes (#5749)
|
455,776 |
05.04.2018 09:47:14
| 25,200 |
e7142a7cdefd214ea07f04359832c4f748ee9208
|
[Organizations] Transform error UI fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/TransformToOrganizationFailed.cshtml",
"new_path": "src/NuGetGallery/Views/Users/TransformToOrganizationFailed.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container page-account-transform-failed\">\n- <div class=\"row col-sm-8\">\n- <h1>Failed to transform to an organization</h1>\n- <hr />\n- <div>@Model.ErrorMessage</div>\n+ <div class=\"row @ViewHelpers.GetColumnClasses(ViewBag)\">\n+ <h1>Failed to transform account to an organization</h1>\n+ @ViewHelpers.AlertDanger(@<text>@Model.ErrorMessage</text>)\n</div>\n</section>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Transform error UI fixes (#5760)
|
455,776 |
05.04.2018 12:32:12
| 25,200 |
12bf2d90d8fa8dd88d308ae53e3db1deda47978f
|
[Organizations] Link empty Manage Organizations page to the Transform flow
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1117,7 +1117,7 @@ img.reserved-indicator-icon {\nmargin-bottom: 10px;\n}\n.page-manage-packages .subtitle {\n- margin-top: 24px;\n+ margin-top: 33px;\n}\n.page-manage-packages .form-section-title {\nmargin-top: 40px;\n@@ -1485,6 +1485,13 @@ img.reserved-indicator-icon {\n.page-status .table tbody + tbody {\nborder: none;\n}\n+.page-transform-account .transform-alert {\n+ margin-bottom: 33px;\n+}\n+.page-transform-account .transform-alert .transform-alert-list {\n+ margin-top: 15px;\n+ margin-bottom: 15px;\n+}\n.page-transform-account .center-box {\ndisplay: -webkit-box;\ndisplay: -webkit-flex;\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": "}\n.subtitle {\n- margin-top: 24px;\n+ margin-top: 33px;\n}\n.form-section-title {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-transform-account.less",
"new_path": "src/Bootstrap/less/theme/page-transform-account.less",
"diff": ".page-transform-account {\n+ .transform-alert {\n+ margin-bottom: 33px;\n+\n+ .transform-alert-list {\n+ margin-bottom: 15px;\n+ margin-top: 15px;\n+ }\n+ }\n+\n.center-box {\ndisplay: flex;\njustify-content: space-between;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -263,13 +263,19 @@ public static IQueryable<T> SortBy<T>(this IQueryable<T> source, string sortExpr\nreturn html.PasswordFor(expression, htmlAttributes);\n}\n- public static HtmlString ShowTextBoxFor<TModel, TProperty>(this HtmlHelper<TModel> html, Expression<Func<TModel, TProperty>> expression, bool enabled = true)\n+ public static HtmlString ShowTextBoxFor<TModel, TProperty>(this HtmlHelper<TModel> html, Expression<Func<TModel, TProperty>> expression, bool enabled = true, string placeholder = null)\n{\nvar htmlAttributes = GetHtmlAttributes(html, expression);\nif (!enabled)\n{\nhtmlAttributes.Add(\"disabled\", \"true\");\n}\n+\n+ if (placeholder != null)\n+ {\n+ htmlAttributes.Add(\"placeholder\", placeholder);\n+ }\n+\nreturn html.TextBoxFor(expression, htmlAttributes);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Organizations.cshtml",
"diff": "<input type=\"submit\" class=\"btn btn-primary\" value=\"Add new organization\" />\n</form>\n</div>\n+ <div class=\"subtitle text-center\">\n+ <a href=\"@Url.TransformAccount()\">Transform your account into an organization</a>\n+ </div>\n}\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/TransformToOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Users/TransformToOrganization.cshtml",
"diff": "<section role=\"main\" class=\"container main-container page-transform-account\">\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\n- <h1 class=\"text-center\">Transform Account</h1>\n- <div class=\"text-center ms-font-xxl\">\n- <a href=\"@Url.User(CurrentUser)\">@CurrentUser.Username</a>\n+ <h1><a href=\"@Url.User(CurrentUser.Username)\" aria-label=\"View my profile\"><i class=\"ms-Icon ms-Icon--Contact\" aria-hidden=\"true\"></i></a> > Transform Account</h1>\n+\n+ <div class=\"transform-alert\">\n+ @ViewHelpers.AlertWarning(@<text>\n+ <span>\n+ This is an irreversible process. Once you transform this account to an organization:\n+ </span>\n+ <ul class=\"transform-alert-list\">\n+ <li>\n+ You will no longer be able sign in to @CurrentUser.Username.\n+ </li>\n+ <li>\n+ All permissions to manage @CurrentUser.Username and the packages it owns will be transferred to the administrator you choose here.\n+ </li>\n+ <li>\n+ Existing scoped API keys for this account will be transferred to the administrator. Full access API keys (legacy API keys without expiry) <b>will not be transferred and will be deleted.</b>\n+ </li>\n+ </ul>\n+ <p>\n+ <b>Note:</b> If you want to continue to manage @CurrentUser.Username and its packages, you should create an individual account on NuGet.org before transforming it to an organization so that you can add your new account as an administrator during the transform process.\n+ </p></text>)\n</div>\n@using (Html.BeginForm(\"Transform\", \"Users\", FormMethod.Post, new { id = \"transform\"}))\n<a href=\"#\" id=\"transform-tooltip\" data-toggle=\"tooltip\" title=\"Please enter a username for the organization administrator.\">\n<i class=\"ms-Icon ms-Icon--Info\" aria-hidden=\"true\" style=\"vertical-align: -2px\"></i>\n</a>\n- @Html.ShowTextBoxFor(m => m.AdminUsername)\n+ @Html.ShowTextBoxFor(m => m.AdminUsername, placeholder: \"Add existing NuGet.org user\")\n@Html.ShowValidationMessagesFor(m => m.AdminUsername)\n</div>\n<div class=\"form-group has-error\">\n</aside>\n</div>\n- <div class=\"row\">\n- <div class=\"col-md-12\">\n- <p>\n- Administrators have full control over their organizations, including the ability to add and remove other members.\n- </p>\n- <p>\n- Existing API keys owned by this account will be transferred to the administrator on transformation. Full access legacy API keys will not be transferred.\n- </p>\n- </div>\n- </div>\n-\n<div class=\"row form-group\">\n<div class=\"col-md-6\">\n<input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Transform\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Link empty Manage Organizations page to the Transform flow (#5706)
|
455,776 |
05.04.2018 13:35:14
| 25,200 |
8766931fdb5b4cacb6efb7c2d53e41d1f6e30a98
|
[Organizations] Manage package owners fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "@@ -104,32 +104,25 @@ public virtual ActionResult GetPackageOwners(string id, string version)\nreturn Json(result, JsonRequestBehavior.AllowGet);\n}\n- [HttpGet]\n- public virtual ActionResult GetAddPackageOwnerConfirmation(string id, string username)\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\n+ public async Task<JsonResult> AddPackageOwner(string id, string username, string message)\n{\nManagePackageOwnerModel model;\nif (TryGetManagePackageOwnerModel(id, username, isAddOwner: true, model: out model))\n{\n- return Json(new\n+ var packageUrl = Url.Package(model.Package.Id, version: null, relativeUrl: false);\n+\n+ if (model.CurrentUserCanAcceptOnBehalfOfUser)\n{\n- success = true,\n- confirmation = string.Format(CultureInfo.CurrentCulture, Strings.AddOwnerConfirmation, username),\n- policyMessage = string.Empty\n- },\n- JsonRequestBehavior.AllowGet);\n- }\n- else\n+ await _packageOwnershipManagementService.AddPackageOwnerAsync(model.Package, model.User);\n+\n+ foreach (var owner in model.Package.Owners)\n{\n- return Json(new { success = false, message = model.Error }, JsonRequestBehavior.AllowGet);\n+ _messageService.SendPackageOwnerAddedNotice(owner, model.User, model.Package, packageUrl);\n}\n}\n-\n- [HttpPost]\n- [ValidateAntiForgeryToken]\n- public async Task<JsonResult> AddPackageOwner(string id, string username, string message)\n- {\n- ManagePackageOwnerModel model;\n- if (TryGetManagePackageOwnerModel(id, username, isAddOwner: true, model: out model))\n+ else\n{\nvar encodedMessage = HttpUtility.HtmlEncode(message);\n@@ -154,8 +147,6 @@ public async Task<JsonResult> AddPackageOwner(string id, string username, string\nmodel.User.Username,\nrelativeUrl: false);\n- var packageUrl = Url.Package(model.Package.Id, version: null, relativeUrl: false);\n-\n_messageService.SendPackageOwnerRequest(model.CurrentUser, model.User, model.Package, packageUrl,\nconfirmationUrl, rejectionUrl, encodedMessage, policyMessage: string.Empty);\n@@ -163,6 +154,7 @@ public async Task<JsonResult> AddPackageOwner(string id, string username, string\n{\n_messageService.SendPackageOwnerRequestInitiatedNotice(model.CurrentUser, owner, model.User, model.Package, cancellationUrl);\n}\n+ }\nreturn Json(new\n{\n@@ -172,7 +164,7 @@ public async Task<JsonResult> AddPackageOwner(string id, string username, string\nmodel.CurrentUser,\nmodel.Package,\nUrl,\n- isPending: true,\n+ isPending: !model.CurrentUserCanAcceptOnBehalfOfUser,\nisNamespaceOwner: false)\n});\n}\n@@ -292,11 +284,14 @@ public ManagePackageOwnerModel(PackageRegistration package, User user, User curr\nPackage = package;\nUser = user;\nCurrentUser = currentUser;\n+ CurrentUserCanAcceptOnBehalfOfUser =\n+ ActionsRequiringPermissions.HandlePackageOwnershipRequest.CheckPermissions(currentUser, user) == PermissionsCheckResult.Allowed;\n}\npublic PackageRegistration Package { get; }\npublic User User { get; }\npublic User CurrentUser { get; }\n+ public bool CurrentUserCanAcceptOnBehalfOfUser { get; }\npublic string Error { get; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1391,7 +1391,7 @@ private void SendAddPackageOwnerNotification(PackageRegistration package, User n\n// Notify existing owners\nvar notNewOwners = package.Owners.Where(notNewOwner).ToList();\n- notNewOwners.ForEach(owner => _messageService.SendPackageOwnerAddedNotice(owner, newOwner, package, packageUrl, string.Empty));\n+ notNewOwners.ForEach(owner => _messageService.SendPackageOwnerAddedNotice(owner, newOwner, package, packageUrl));\n}\ninternal virtual async Task<ActionResult> Edit(string id, string version, bool? listed, Func<Package, bool, string> urlFactory)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"diff": "if (isUserAnAdmin.toLocaleLowerCase() === \"True\".toLocaleLowerCase()\n|| owner.pending()) {\nreturn true;\n- };\n+ }\nif (this.owners().length < 2) {\nreturn false;\nif (isUserAnAdmin.toLocaleLowerCase() === \"True\".toLocaleLowerCase()) {\n// If user is an admin, removing any user will not remove their ability to manage package owners.\nreturn false;\n- };\n+ }\nvar numUsersGrantingCurrentUserAccess = 0;\n$(\"#newOwnerUserName\").focus();\n},\n- confirmAddOwner: function () {\n- viewModel.message(\"\");\n-\n+ addOwner: function () {\nvar newUsername = viewModel.newOwnerUsername();\nif (!newUsername) {\nviewModel.message(strings_InvalidUsername);\nvar existingOwner = ko.utils.arrayFirst(\nviewModel.owners(),\n- function (owner) { return owner.name().toUpperCase() == newUsername.toUpperCase() });\n+ function (owner) { return owner.name().toUpperCase() === newUsername.toUpperCase(); });\nif (existingOwner) {\nviewModel.message(window.nuget.formatString(strings_AlreadyPending, newUsername));\nreturn;\n}\n- $.ajax({\n- url: getAddPackageOwnerConfirmationUrl + '?id=' + viewModel.package.id + '&username=' + newUsername,\n- cache: false,\n- dataType: 'json',\n- type: 'GET',\n- success: function (data) {\n- if (data.success) {\n- viewModel.confirmation(data.confirmation);\n- viewModel.policyMessage(data.policyMessage);\n- }\n- else {\n- viewModel.message(data.message);\n- }\n- }\n- })\n- .error(failHandler);\n- },\n-\n- addOwner: function () {\n- var newUsername = viewModel.newOwnerUsername();\nvar message = viewModel.newOwnerMessage();\nvar ownerInputModel =\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IMessageService.cs",
"new_path": "src/NuGetGallery/Services/IMessageService.cs",
"diff": "@@ -20,7 +20,7 @@ public interface IMessageService\nvoid SendPackageOwnerRequestInitiatedNotice(User requestingOwner, User receivingOwner, User newOwner, PackageRegistration package, string cancellationUrl);\nvoid SendPackageOwnerRequestRejectionNotice(User requestingOwner, User newOwner, PackageRegistration package);\nvoid SendPackageOwnerRequestCancellationNotice(User requestingOwner, User newOwner, PackageRegistration package);\n- void SendPackageOwnerAddedNotice(User toUser, User newOwner, PackageRegistration package, string packageUrl, string policyMessage);\n+ void SendPackageOwnerAddedNotice(User toUser, User newOwner, PackageRegistration package, string packageUrl);\nvoid SendPackageOwnerRemovedNotice(User fromUser, User toUser, PackageRegistration package);\nvoid SendCredentialRemovedNotice(User user, CredentialViewModel removedCredentialViewModel);\nvoid SendCredentialAddedNotice(User user, CredentialViewModel addedCredentialViewModel);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "@@ -460,18 +460,12 @@ public void SendPackageOwnerRequestCancellationNotice(User requestingOwner, User\n}\n}\n- public void SendPackageOwnerAddedNotice(User toUser, User newOwner, PackageRegistration package, string packageUrl, string policyMessage)\n+ public void SendPackageOwnerAddedNotice(User toUser, User newOwner, PackageRegistration package, string packageUrl)\n{\n- if (!string.IsNullOrEmpty(policyMessage))\n- {\n- policyMessage = Environment.NewLine + policyMessage + Environment.NewLine;\n- }\n-\nvar subject = $\"[{Config.GalleryOwner.DisplayName}] Package ownership update for '{package.Id}'\";\nvar body = $@\"User '{newOwner.Username}' is now an owner of the package ['{package.Id}']({packageUrl}).\n-{policyMessage}\nThanks,\nThe {Config.GalleryOwner.DisplayName} Team\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -914,11 +914,6 @@ public static string ManagePackageOwners(this UrlHelper url, IPackageVersionMode\nreturn url.ManagePackageOwnersTemplate(relativeUrl).Resolve(package);\n}\n- public static string GetAddPackageOwnerConfirmation(this UrlHelper url, bool relativeUrl = true)\n- {\n- return GetActionLink(url, \"GetAddPackageOwnerConfirmation\", \"JsonApi\", relativeUrl);\n- }\n-\npublic static string GetPackageOwners(this UrlHelper url, bool relativeUrl = true)\n{\nreturn GetActionLink(url, \"GetPackageOwners\", \"JsonApi\", relativeUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml",
"diff": "</span>\n</div>\n<!-- ko if: $parent.IsAllowedToRemove($data) -->\n- <div class=\"col-md-3 remove-owner\">\n+ <div class=\"col-md-3 text-right remove-owner\">\n<a class=\"icon-link\"\nhref=\"#\"\ntitle=\"Remove as owner of @Model.Id\"\n</div>\n<!-- /ko -->\n<!-- ko ifnot: $parent.IsAllowedToRemove($data) -->\n- <div class=\"col-md-3 remove-owner-disabled\">\n+ <div class=\"col-md-3 text-right remove-owner-disabled\">\n<a class=\"icon-link\"\ntitle=\"Cannot remove the only owner or reserved namespace restrictions apply.\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n</div>\n<div class=\"form-group\">\n- <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Add\" title=\"Add the user as an owner to @Model.Id\" data-bind=\"click: confirmAddOwner\" />\n- </div>\n- </div>\n-\n- <div style=\"display: none\" data-bind=\"visible: confirmation\">\n- <h2>Confirm</h2>\n-\n- <p data-bind=\"text: confirmation\"></p>\n-\n- <div style=\"display: none\" data-bind=\"visible: policyMessage\">\n- @ViewHelpers.AlertWarning(\n- @<text>\n- <span data-bind=\"html: policyMessage\" role=\"alert\" aria-live=\"polite\"></span>\n- </text>)\n- </div>\n-\n- <div class=\"row\">\n- <div class=\"col-md-6\">\n- <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Confirm\" title=\"Confirm adding the user as an owner to @Model.Id\" data-bind=\"click: addOwner\" />\n- </div>\n- <div class=\"col-md-6 text-right\">\n- <a href=\"#\" class=\"btn btn-default form-control text-right\" title=\"Cancel changes and reload the page.\" role=\"button\" data-bind=\"click: cancelAddOwnerConfirmation\">Cancel</a>\n- </div>\n+ <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Add\" title=\"Add the user as an owner to @Model.Id\" data-bind=\"click: addOwner\" />\n</div>\n</div>\n}\nvar isUserAnAdmin = \"@Model.IsCurrentUserAnAdmin\";\nvar packageUrl = \"@Url.Package(Model.Id)\";\nvar getPackageOwnersUrl = \"@Url.GetPackageOwners()\";\n- var getAddPackageOwnerConfirmationUrl = \"@Url.GetAddPackageOwnerConfirmation()\";\nvar addPackageOwnerUrl = \"@Url.AddPackageOwner()\";\nvar removePackageOwnerUrl = \"@Url.RemovePackageOwner()\";\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"diff": "@@ -139,7 +139,6 @@ public class TheAddPackageOwnerMethods : TestContainer\n{\nprivate static IEnumerable<InvokePackageOwnerModificationRequest> _addRequests = new InvokePackageOwnerModificationRequest[]\n{\n- new InvokePackageOwnerModificationRequest(GetAddPackageOwnerConfirmation),\nnew InvokePackageOwnerModificationRequest(AddPackageOwner),\n};\n@@ -336,31 +335,6 @@ public async Task ReturnsFailureIfNewOwnerIsAlreadyPending(InvokePackageOwnerMod\nAssert.Equal(string.Format(Strings.AddOwner_AlreadyOwner, userToAdd.Username), data.message);\n}\n- public class TheGetAddPackageOwnerConfirmationMethod : TestContainer\n- {\n- public static IEnumerable<object[]> AllCanManagePackageOwnersPairedWithCanBeAdded_Data => TheAddPackageOwnerMethods.AllCanManagePackageOwnersPairedWithCanBeAdded_Data;\n-\n- [Theory]\n- [MemberData(nameof(AllCanManagePackageOwnersPairedWithCanBeAdded_Data))]\n- public void ReturnsConfirmation(Func<Fakes, User> getCurrentUser, Func<Fakes, User> getUserToAdd)\n- {\n- // Arrange\n- var fakes = Get<Fakes>();\n- var currentUser = getCurrentUser(fakes);\n- var userToAdd = getUserToAdd(fakes);\n- var controller = GetController<JsonApiController>();\n- controller.SetCurrentUser(currentUser);\n-\n- // Act\n- var result = controller.GetAddPackageOwnerConfirmation(fakes.Package.Id, userToAdd.Username);\n- dynamic data = ((JsonResult)result).Data;\n-\n- // Assert\n- Assert.True(data.success);\n- Assert.Equal($\"Please confirm if you would like to proceed adding '{userToAdd.Username}' as a co-owner of this package.\", data.confirmation);\n- }\n- }\n-\npublic class TheAddPackageOwnerMethod : TestContainer\n{\npublic static IEnumerable<object[]> AllCanManagePackageOwnersPairedWithCanBeAdded_Data = TheAddPackageOwnerMethods.AllCanManagePackageOwnersPairedWithCanBeAdded_Data;\n@@ -379,12 +353,17 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState(Fun\ncontroller.SetCurrentUser(currentUser);\nvar packageOwnershipManagementServiceMock = GetMock<IPackageOwnershipManagementService>();\n+ var messageServiceMock = GetMock<IMessageService>();\n+\n+ var pending = !(ActionsRequiringPermissions.HandlePackageOwnershipRequest.CheckPermissions(currentUser, userToAdd) == PermissionsCheckResult.Allowed);\n+\n+ if (pending)\n+ {\npackageOwnershipManagementServiceMock\n.Setup(p => p.AddPackageOwnershipRequestAsync(fakes.Package, currentUser, userToAdd))\n.Returns(Task.FromResult(new PackageOwnerRequest { ConfirmationCode = \"confirmation-code\" }))\n.Verifiable();\n- var messageServiceMock = GetMock<IMessageService>();\nmessageServiceMock\n.Setup(m => m.SendPackageOwnerRequest(\ncurrentUser,\n@@ -408,6 +387,25 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState(Fun\nIt.IsAny<string>()))\n.Verifiable();\n}\n+ }\n+ else\n+ {\n+ packageOwnershipManagementServiceMock\n+ .Setup(p => p.AddPackageOwnerAsync(fakes.Package, userToAdd))\n+ .Returns(Task.CompletedTask)\n+ .Verifiable();\n+\n+ foreach (var owner in fakes.Package.Owners)\n+ {\n+ messageServiceMock\n+ .Setup(m => m.SendPackageOwnerAddedNotice(\n+ owner,\n+ userToAdd,\n+ fakes.Package,\n+ It.IsAny<string>()))\n+ .Verifiable();\n+ }\n+ }\nJsonResult result = await controller.AddPackageOwner(fakes.Package.Id, userToAdd.Username, \"Hello World! Html Encoded <3\");\ndynamic data = result.Data;\n@@ -415,7 +413,7 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState(Fun\nAssert.True(data.success);\nAssert.Equal(userToAdd.Username, model.Name);\n- Assert.True(model.Pending);\n+ Assert.Equal(pending, model.Pending);\npackageOwnershipManagementServiceMock.Verify();\nmessageServiceMock.Verify();\n@@ -579,11 +577,6 @@ public async Task RemovesExistingOwner(Func<Fakes, User> getCurrentUser, Func<Fa\npublic delegate Task<ActionResult> InvokePackageOwnerModificationRequest(JsonApiController jsonApiController, string packageId, string username);\n- private static Task<ActionResult> GetAddPackageOwnerConfirmation(JsonApiController jsonApiController, string packageId, string username)\n- {\n- return Task.Run(() => jsonApiController.GetAddPackageOwnerConfirmation(packageId, username));\n- }\n-\nprivate static async Task<ActionResult> AddPackageOwner(JsonApiController jsonApiController, string packageId, string username)\n{\nreturn await jsonApiController.AddPackageOwner(packageId, username, \"message\");\n@@ -596,7 +589,6 @@ private static async Task<ActionResult> RemovePackageOwner(JsonApiController jso\nprivate static IEnumerable<InvokePackageOwnerModificationRequest> _requests = new InvokePackageOwnerModificationRequest[]\n{\n- new InvokePackageOwnerModificationRequest(GetAddPackageOwnerConfirmation),\nnew InvokePackageOwnerModificationRequest(AddPackageOwner),\nnew InvokePackageOwnerModificationRequest(RemovePackageOwner),\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -897,8 +897,7 @@ private static Expression<Action<IMessageService>> MessageServiceForConfirmOwner\nrequest.RequestingOwner,\nrequest.NewOwner,\nrequest.PackageRegistration,\n- It.IsAny<string>(), // The method that creates this URL correctly is not set up for these tests, so we cannot assert the expected value.\n- string.Empty);\n+ It.IsAny<string>()); // The method that creates this URL correctly is not set up for these tests, so we cannot assert the expected value.\n}\nprivate static Expression<Action<IMessageService>> MessageServiceForRejectOwnershipRequestExpression(PackageOwnerRequest request)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -758,10 +758,9 @@ public void SendsPackageOwnerAddedNotice(bool isOrganization)\nvar package = new PackageRegistration { Id = \"CoolStuff\" };\nvar messageService = TestableMessageService.Create(GetConfigurationService());\nvar packageUrl = \"packageUrl\";\n- var policyMessage = \"policyMessage\";\n// Act\n- messageService.SendPackageOwnerAddedNotice(toUser, newUser, package, packageUrl, policyMessage);\n+ messageService.SendPackageOwnerAddedNotice(toUser, newUser, package, packageUrl);\n// Assert\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -776,7 +775,6 @@ public void SendsPackageOwnerAddedNotice(bool isOrganization)\nAssert.Equal(TestGalleryNoReplyAddress.Address, \"noreply@example.com\");\nAssert.Contains($\"Package ownership update for '{package.Id}'\", message.Subject);\nAssert.Contains($\"User '{newUser.Username}' is now an owner of the package ['{package.Id}']({packageUrl}).\", message.Body);\n- Assert.Contains(policyMessage, message.Body);\n}\n[Theory]\n@@ -794,7 +792,7 @@ public void DoesNotSendPackageOwnerAddedNoticeIfUserDoesNotAllowEmails(bool isOr\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n// Act\n- messageService.SendPackageOwnerAddedNotice(toUser, newUser, package, \"packageUrl\", \"policyMessage\");\n+ messageService.SendPackageOwnerAddedNotice(toUser, newUser, package, \"packageUrl\");\n// Assert\nAssert.Empty(messageService.MockMailSender.Sent);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Manage package owners fixes (#5759)
|
455,776 |
09.04.2018 09:10:30
| 25,200 |
9782eadcfb06e6f9c28e575e8a5bbebd376d0844
|
[Organizations] Give organization collaborators the same permissions on packages as administrators
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -364,10 +364,10 @@ public virtual async Task<ActionResult> Delete(DeleteUserAccountViewModel model)\n[UIAuthorize]\npublic virtual ActionResult ApiKeys()\n{\n- var user = GetCurrentUser();\n+ var currentUser = GetCurrentUser();\n// Get API keys\n- if (!GetCredentialGroups(user).TryGetValue(CredentialKind.Token, out List<CredentialViewModel> credentials))\n+ if (!GetCredentialGroups(currentUser).TryGetValue(CredentialKind.Token, out List<CredentialViewModel> credentials))\n{\ncredentials = new List<CredentialViewModel>();\n}\n@@ -377,30 +377,32 @@ public virtual ActionResult ApiKeys()\n.ToList();\n// Get package owners (user's self or organizations)\n- var owners = user.Organizations\n- .Select(o => CreateApiKeyOwnerViewModel(\n- o.Organization,\n- // todo: move logic for canPushNew to PermissionsService\n- canPushNew: o.IsAdmin)\n- ).ToList();\n- owners.Insert(0, CreateApiKeyOwnerViewModel(user, canPushNew: true));\n+ var owners = new List<ApiKeyOwnerViewModel>\n+ {\n+ CreateApiKeyOwnerViewModel(currentUser, currentUser)\n+ };\n+\n+ owners.AddRange(currentUser.Organizations\n+ .Select(o => CreateApiKeyOwnerViewModel(currentUser, o.Organization)));\nvar model = new ApiKeyListViewModel\n{\nApiKeys = apiKeys,\nExpirationInDaysForApiKeyV1 = _config.ExpirationInDaysForApiKeyV1,\n- PackageOwners = owners,\n+ PackageOwners = owners.Where(o => o.CanPushNew || o.CanPushExisting || o.CanUnlist).ToList(),\n};\nreturn View(\"ApiKeys\", model);\n}\n- private ApiKeyOwnerViewModel CreateApiKeyOwnerViewModel(User user, bool canPushNew)\n+ private ApiKeyOwnerViewModel CreateApiKeyOwnerViewModel(User currentUser, User account)\n{\nreturn new ApiKeyOwnerViewModel(\n- user.Username,\n- canPushNew,\n- packageIds: _packageService.FindPackageRegistrationsByOwner(user)\n+ account.Username,\n+ ActionsRequiringPermissions.UploadNewPackageId.IsAllowedOnBehalfOfAccount(currentUser, account),\n+ ActionsRequiringPermissions.UploadNewPackageVersion.IsAllowedOnBehalfOfAccount(currentUser, account),\n+ ActionsRequiringPermissions.UnlistOrRelistPackage.IsAllowedOnBehalfOfAccount(currentUser, account),\n+ packageIds: _packageService.FindPackageRegistrationsByOwner(account)\n.Select(p => p.Id)\n.OrderBy(i => i)\n.ToList());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-api-keys.js",
"diff": "this.PackageOwnerName = ko.pureComputed(function () {\nreturn self.PackageOwner() && self.PackageOwner().Owner;\n}, this);\n+ this.PackageOwner.subscribe(function (newOwner) {\n+ // When the package owner scope is changed, update the selected action scopes to those that are allowed on behalf of the new package owner.\n+ var isPushNewSelected = function () {\n+ return self.PushScope() === initialData.PackagePushScope;\n+ };\n+ var isPushExistingSelected = function () {\n+ return self.PushScope() === initialData.PackagePushVersionScope;\n+ };\n+ var isUnlistSelected = function () {\n+ return self.UnlistScopeChecked();\n+ };\n+\n+ // If either push new or push existing is selected and that action is not allowed on behalf of the new owner,\n+ // swap the scope to the other push action if it is allowed or deselect it.\n+ if (!newOwner.CanPushNew && isPushNewSelected()) {\n+ self.PushScope(newOwner.CanPushExisting ? initialData.PackagePushVersionScope : null);\n+ } else if (!newOwner.CanPushExisting && isPushExistingSelected()) {\n+ self.PushScope(newOwner.CanPushNew ? initialData.PackagePushScope : null);\n+ }\n+\n+ // If unlist is selected and that action is not allowed on behalf of the new owner, deselect it.\n+ if (!newOwner.CanUnlist && isUnlistSelected()) {\n+ self.UnlistScopeChecked(false);\n+ }\n+\n+ // If after this process, no actions are selected, select one that is allowed.\n+ if (!isPushNewSelected() && !isPushExistingSelected() && !isUnlistSelected()) {\n+ if (newOwner.CanPushNew) {\n+ self.PushScope(initialData.PackagePushScope);\n+ } else if (newOwner.CanPushExisting) {\n+ self.PushScope(initialData.PackagePushVersionScope);\n+ } else if (newOwner.CanUnlist) {\n+ self.UnlistScopeChecked(true);\n+ }\n+ }\n+\n+ // If either push new or push existing are selected, enable the textbox that determines if they are selectable.\n+ self.PushEnabled(isPushNewSelected() || isPushExistingSelected());\n+ });\n+\n+ this.PushEnabled = ko.observable(false);\n+\n+ this.PushAnyEnabled = ko.pureComputed(function () {\n+ return self.PackageOwner() && (self.PackageOwner().CanPushNew || self.PackageOwner().CanPushExisting);\n+ }, this);\n- // Do not default to push new scope if disabled (organization collaborator)\nthis.PushNewEnabled = ko.pureComputed(function () {\nreturn self.PackageOwner() && self.PackageOwner().CanPushNew;\n}, this);\n- this.PushNewEnabled.subscribe(function (newValue) {\n- var defaultPushId = newValue\n- ? self.PackagePushId()\n- : self.PackagePushVersionId();\n- // If Create is expanded, update push scope when owner changes\n- var defaultScope = $(\"#\" + defaultPushId).val();\n- if (defaultScope) {\n- self.PushScope(defaultScope);\n- }\n- });\n+\n+ this.PushExistingEnabled = ko.pureComputed(function () {\n+ return self.PackageOwner() && self.PackageOwner().CanPushExisting;\n+ }, this);\n+\n+ this.UnlistEnabled = ko.pureComputed(function () {\n+ return self.PackageOwner() && self.PackageOwner().CanUnlist;\n+ }, this);\nthis.ExpiresIn = ko.observable();\n- this.PushEnabled = ko.observable(false);\n- this.PushScope = ko.observable(initialData.PackagePushScope);\n- this.UnlistScope = ko.observableArray();\n+ this.PushScope = ko.observable();\n+ this.UnlistScopeChecked = ko.observable(false);\n+ this.UnlistScope = ko.pureComputed(function () {\n+ return self.UnlistScopeChecked() ? initialData.PackageUnlistScope : null;\n+ }, this);\nthis.PendingGlobPattern = ko.observable();\nthis.PendingPackages = ko.observableArray();\nreturn this.Packages().slice(3);\n}, this);\nthis.SelectPackagesEnabled = ko.pureComputed(function () {\n- return this.Scopes().length > 0 ||\n- this.PushEnabled() ||\n- this.UnlistScope().length > 0;\n+ return this.Scopes().length > 0 || this.PendingScopes().length > 0;\n}, this);\nthis.FormId = ComputedId(\"form\");\nthis.RemainingPackagesId = ComputedId(\"remaining-packages\");\n}, this);\nthis.PendingScopes = ko.pureComputed(function () {\nvar scopes = [];\n- if (this.PushEnabled()) {\n+ if (this.PushEnabled() && this.PushScope()) {\nscopes.push(this.PushScope());\n}\n- scopes.push.apply(scopes, this.UnlistScope());\n+ if (this.UnlistEnabled() && this.UnlistScope()) {\n+ scopes.push(this.UnlistScope());\n+ }\nreturn scopes;\n}, this);\nthis.PendingSubjects = ko.pureComputed(function () {\n// Execute scopes and subjects validation.\nthis.PendingGlobPattern.valueHasMutated();\n- this.UnlistScope.valueHasMutated();\nreturn !formError &&\n!this.ScopesError() &&\nself.PendingDescription(self.Description());\nself.ExpiresIn($(\"#\" + self.ExpiresInId() + \" option:last-child\").val());\nself.PushEnabled(false);\n- self.PushScope(initialData.PackagePushScope);\n- self.UnlistScope.removeAll();\n+ self.PushScope(null);\n+ self.UnlistScopeChecked(false);\nself.PendingGlobPattern(self.GlobPattern());\nthis._SetPackageSelection(self._packages);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionRequiringEntityPermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionRequiringEntityPermissions.cs",
"diff": "@@ -21,9 +21,19 @@ public ActionRequiringEntityPermissions(PermissionsRequirement accountOnBehalfOf\nAccountOnBehalfOfPermissionsRequirement = accountOnBehalfOfPermissionsRequirement;\n}\n+ public bool IsAllowedOnBehalfOfAccount(User currentUser, User account)\n+ {\n+ return PermissionsHelpers.IsRequirementSatisfied(AccountOnBehalfOfPermissionsRequirement, currentUser, account);\n+ }\n+\n+ public bool IsAllowedOnBehalfOfAccount(IPrincipal currentPrincipal, User account)\n+ {\n+ return PermissionsHelpers.IsRequirementSatisfied(AccountOnBehalfOfPermissionsRequirement, currentPrincipal, account);\n+ }\n+\npublic PermissionsCheckResult CheckPermissions(User currentUser, User account, TEntity entity)\n{\n- if (!PermissionsHelpers.IsRequirementSatisfied(AccountOnBehalfOfPermissionsRequirement, currentUser, account))\n+ if (!IsAllowedOnBehalfOfAccount(currentUser, account))\n{\nreturn PermissionsCheckResult.AccountFailure;\n}\n@@ -33,7 +43,7 @@ public PermissionsCheckResult CheckPermissions(User currentUser, User account, T\npublic PermissionsCheckResult CheckPermissions(IPrincipal currentPrincipal, User account, TEntity entity)\n{\n- if (!PermissionsHelpers.IsRequirementSatisfied(AccountOnBehalfOfPermissionsRequirement, currentPrincipal, account))\n+ if (!IsAllowedOnBehalfOfAccount(currentPrincipal, account))\n{\nreturn PermissionsCheckResult.AccountFailure;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionsRequiringPermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionsRequiringPermissions.cs",
"diff": "@@ -29,7 +29,7 @@ public static class ActionsRequiringPermissions\n/// </summary>\npublic static ActionRequiringReservedNamespacePermissions UploadNewPackageId =\nnew ActionRequiringReservedNamespacePermissions(\n- accountOnBehalfOfPermissionsRequirement: RequireOwnerOrOrganizationAdmin,\n+ accountOnBehalfOfPermissionsRequirement: RequireOwnerOrOrganizationMember,\nreservedNamespacePermissionsRequirement: PermissionsRequirement.Owner);\n/// <summary>\n@@ -61,7 +61,7 @@ public static class ActionsRequiringPermissions\n/// </summary>\npublic static ActionRequiringPackagePermissions UnlistOrRelistPackage =\nnew ActionRequiringPackagePermissions(\n- RequireOwnerOrOrganizationMember,\n+ accountOnBehalfOfPermissionsRequirement: RequireOwnerOrOrganizationMember,\npackageRegistrationPermissionsRequirement: RequireOwnerOrSiteAdmin);\n/// <summary>\n@@ -77,7 +77,7 @@ public static class ActionsRequiringPermissions\n/// </summary>\npublic static ActionRequiringPackagePermissions ReportPackageAsOwner =\nnew ActionRequiringPackagePermissions(\n- accountOnBehalfOfPermissionsRequirement: RequireOwnerOrOrganizationAdmin,\n+ accountOnBehalfOfPermissionsRequirement: RequireOwnerOrOrganizationMember,\npackageRegistrationPermissionsRequirement: PermissionsRequirement.Owner);\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IActionRequiringEntityPermissions.cs",
"new_path": "src/NuGetGallery/Services/IActionRequiringEntityPermissions.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Collections.Generic;\n-using System.Linq;\nusing System.Security.Principal;\nnamespace NuGetGallery\n{\npublic interface IActionRequiringEntityPermissions<TEntity>\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+ /// </summary>\n+ /// <returns>True if and only if <paramref name=\"currentUser\"/> can perform this action on an arbitrary <see cref=\"TEntity\"/> on behalf of <paramref name=\"account\"/>.</returns>\n+ bool IsAllowedOnBehalfOfAccount(User currentUser, User account);\n+\n+ /// <summary>\n+ /// Determines whether <paramref name=\"currentPrincipal\"/> can perform this action on an arbitrary <see cref=\"TEntity\"/> on behalf of <paramref name=\"account\"/>.\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>\n+ bool IsAllowedOnBehalfOfAccount(IPrincipal currentPrincipal, User account);\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@@ -26,9 +37,9 @@ public interface IActionRequiringEntityPermissions<TEntity>\nPermissionsCheckResult CheckPermissions(IPrincipal currentPrincipal, User account, TEntity entity);\n/// <summary>\n- /// Determines whether <paramref name=\"currentPrincipal\"/> can perform this action on <paramref name=\"entity\"/> on behalf of any <see cref=\"User\"/>.\n+ /// Determines whether <paramref name=\"currentUser\"/> can perform this action on <paramref name=\"entity\"/> on behalf of any <see cref=\"User\"/>.\n/// </summary>\n- /// <returns>True if and only if <paramref name=\"currentPrincipal\"/> can perform this action on <paramref name=\"entity\"/> on behalf of any <see cref=\"User\"/>.</returns>\n+ /// <returns>True if and only if <paramref name=\"currentUser\"/> can perform this action on <paramref name=\"entity\"/> on behalf of any <see cref=\"User\"/>.</returns>\nPermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity);\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ApiKeyOwnerViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ApiKeyOwnerViewModel.cs",
"diff": "@@ -7,15 +7,19 @@ namespace NuGetGallery\n{\npublic class ApiKeyOwnerViewModel\n{\n- public ApiKeyOwnerViewModel(string owner, bool canPushNew, IList<string> packageIds)\n+ public ApiKeyOwnerViewModel(string owner, bool canPushNew, bool canPushExisting, bool canUnlist, IList<string> packageIds)\n{\nOwner = owner;\nCanPushNew = canPushNew;\n+ CanPushExisting = canPushExisting;\n+ CanUnlist = canUnlist;\nPackageIds = packageIds;\n}\npublic string Owner { get; }\npublic bool CanPushNew { get; }\n+ public bool CanPushExisting { get; }\n+ public bool CanUnlist { get; }\npublic IList<string> PackageIds { get; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<li>\n<div class=\"checkbox\">\n<label>\n- <input type=\"checkbox\" data-bind=\"checked: PushEnabled\" />\n+ <input type=\"checkbox\" data-bind=\"checked: PushEnabled, enable: PushAnyEnabled\" />\nPush\n</label>\n</div>\n<div class=\"radio\">\n<div class=\"label-sibling\">\n<input name=\"PushScope\" type=\"radio\" value=\"@NuGetScopes.PackagePushVersion\"\n- data-bind=\"checked: PushScope, enable: PushEnabled,\n+ data-bind=\"checked: PushScope, enable: PushExistingEnabled,\nattr: { id: PackagePushVersionId }\" />\n</div>\n<label data-bind=\"attr: { for: PackagePushVersionId }\">\n<div class=\"checkbox\">\n<label>\n<input type=\"checkbox\" value=\"@NuGetScopes.PackageUnlist\"\n- data-bind=\"checked: UnlistScope\" />\n+ data-bind=\"checked: UnlistScopeChecked, enable: UnlistEnabled\" />\n@NuGetScopes.Describe(NuGetScopes.PackageUnlist)\n</label>\n</div>\nApiKeys = Model.ApiKeys,\nPackageOwners = Model.PackageOwners,\nPackagePushScope = NuGetScopes.PackagePush,\n+ PackagePushVersionScope = NuGetScopes.PackagePushVersion,\n+ PackageUnlistScope = NuGetScopes.PackageUnlist,\nRemoveUrl = Url.RemoveCredential(),\nRegenerateUrl = Url.RegenerateCredential(),\nEditUrl = Url.EditCredential(),\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -2519,12 +2519,6 @@ public static IEnumerable<object[]> NotOwner_Data\nTestUtility.FakeAdminUser,\nOwner\n};\n-\n- yield return new object[]\n- {\n- TestUtility.FakeOrganizationCollaborator,\n- TestUtility.FakeOrganization\n- };\n}\n}\n@@ -2543,6 +2537,12 @@ public static IEnumerable<object[]> Owner_Data\nTestUtility.FakeOrganizationAdmin,\nTestUtility.FakeOrganization\n};\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeOrganizationCollaborator,\n+ TestUtility.FakeOrganization\n+ };\n}\n}\n@@ -2779,12 +2779,6 @@ public static IEnumerable<object[]> NotOwner_Data\nTestUtility.FakeAdminUser,\nnull\n};\n-\n- yield return new object[]\n- {\n- TestUtility.FakeOrganizationCollaborator,\n- TestUtility.FakeOrganization\n- };\n}\n}\n@@ -2803,6 +2797,12 @@ public static IEnumerable<object[]> Owner_Data\nTestUtility.FakeOrganizationAdmin,\nTestUtility.FakeOrganization\n};\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeOrganizationCollaborator,\n+ TestUtility.FakeOrganization\n+ };\n}\n}\n@@ -3294,7 +3294,7 @@ public static IEnumerable<object[]> WillRedirectToVerifyPackageActionWhenThereIs\nyield return MemberDataHelper.AsData(TestUtility.FakeUser, new[] { TestUtility.FakeUser });\nyield return MemberDataHelper.AsData(TestUtility.FakeAdminUser, new[] { TestUtility.FakeAdminUser });\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationAdmin, new[] { TestUtility.FakeOrganizationAdmin, TestUtility.FakeOrganization });\n- yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, new[] { TestUtility.FakeOrganizationCollaborator });\n+ yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, new[] { TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization });\n}\n}\n@@ -3340,7 +3340,7 @@ public static IEnumerable<object[]> WillRedirectToVerifyPackageActionWhenThereIs\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationAdmin, TestUtility.FakeUser, new[] { TestUtility.FakeOrganizationAdmin });\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationAdmin, TestUtility.FakeOrganization, new[] { TestUtility.FakeOrganization });\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeUser, new[] { TestUtility.FakeOrganizationCollaborator });\n- yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization, new[] { TestUtility.FakeOrganizationCollaborator });\n+ yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization, new[] { TestUtility.FakeOrganization });\n}\n}\n@@ -4232,12 +4232,6 @@ public static IEnumerable<object[]> WillNotCreateThePackageIfCurrentUserDoesNotH\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationAdmin, TestUtility.FakeUser, null, TestUtility.FakeOrganization);\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationAdmin, TestUtility.FakeUser, TestUtility.FakeOrganization, TestUtility.FakeOrganization);\n- // Organization collaborator on behalf of its organization.\n- yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization, null, null);\n- // Organization collaborator who owns the package/reserved namespace on behalf of its organization.\n- yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization, null, TestUtility.FakeOrganizationCollaborator);\n- // Organization collaborator whose organization owns the reserved namespace on behalf of its organization.\n- yield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization, null, TestUtility.FakeOrganization);\n// Organization collaborator whose organization owns the package/reserved namespace on behalf of an unrelated user.\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeUser, TestUtility.FakeOrganization, null);\nyield return MemberDataHelper.AsData(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeUser, null, TestUtility.FakeOrganization);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -486,6 +486,8 @@ public void CurrentUserIsFirstInPackageOwnersWithPushNew(User currentUser)\nvar firstPackageOwner = model.PackageOwners.First();\nAssert.True(firstPackageOwner.Owner == currentUser.Username);\nAssert.True(firstPackageOwner.CanPushNew);\n+ Assert.True(firstPackageOwner.CanPushExisting);\n+ Assert.True(firstPackageOwner.CanUnlist);\n}\n[Theory]\n@@ -498,7 +500,10 @@ public void OrganizationIsInPackageOwnersIfMember(bool isAdmin)\nvar model = GetModelForApiKeys(currentUser);\n- Assert.Equal(1, model.PackageOwners.Count(o => o.Owner == organization.Username && o.CanPushNew == isAdmin));\n+ var owner = model.PackageOwners.Single(o => o.Owner == organization.Username);\n+ Assert.True(owner.CanPushNew);\n+ Assert.True(owner.CanPushExisting);\n+ Assert.True(owner.CanUnlist);\n}\npublic static IEnumerable<object[]> OrganizationIsNotInPackageOwnersIfNotMember_Data\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Give organization collaborators the same permissions on packages as administrators (#5755)
|
455,776 |
09.04.2018 09:29:09
| 25,200 |
6d7e7dd7982823db112002fde206c901b841fbad
|
Improve profile page UI
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1181,19 +1181,19 @@ img.reserved-indicator-icon {\ndisplay: -ms-flexbox;\ndisplay: flex;\nmargin-top: 50px;\n- margin-bottom: 20px;\n-webkit-box-pack: justify;\n-webkit-justify-content: space-between;\n-ms-flex-pack: justify;\njustify-content: space-between;\n- -webkit-box-align: end;\n- -webkit-align-items: flex-end;\n- -ms-flex-align: end;\n- align-items: flex-end;\n+ -webkit-box-align: baseline;\n+ -webkit-align-items: baseline;\n+ -ms-flex-align: baseline;\n+ align-items: baseline;\n}\n.page-profile .profile-title h1 {\n- display: inline;\n+ margin-top: 0;\n+ margin-bottom: 0;\nfont-size: 2.285em;\nfont-weight: 300;\n}\n@@ -1202,8 +1202,12 @@ img.reserved-indicator-icon {\nfont-size: 14px;\ncolor: #068918;\n}\n-.page-profile .profile-title .breadcrumb-manage {\n- margin-bottom: 24px;\n+.page-profile .profile-title .organization-subtitle-divider {\n+ color: #dbdbdb;\n+}\n+.page-profile .profile-title-divider {\n+ margin-top: 10px;\n+ margin-bottom: 10px;\n}\n.page-profile .profile-details img {\nmargin-top: 50px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-profile.less",
"new_path": "src/Bootstrap/less/theme/page-profile.less",
"diff": ".profile-title {\nmargin-top: (@padding-large-vertical * 5);\n- margin-bottom: (@padding-large-vertical * 2);\ndisplay: flex;\njustify-content: space-between;\n- align-items: flex-end;\n+ align-items: baseline;\nh1 {\n- display: inline;\nfont-size: 2.285em;\nfont-weight: 300;\n+ margin-top: 0px;\n+ margin-bottom: 0px;\n}\n.verified {\nfont-size: 14px;\n}\n- .breadcrumb-manage {\n- margin-bottom: 24px;\n+ .organization-subtitle-divider {\n+ color: @gray-lighter;\n}\n}\n+ .profile-title-divider {\n+ margin-top: 10px;\n+ margin-bottom: 10px;\n+ }\n+\n.profile-details {\nimg {\nmargin-top: (@padding-large-vertical * 5);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "</aside>\n<article class=\"col-md-9 col-md-pull-3\">\n<div class=\"profile-title\">\n- <h1>@Model.Username</h1>\n- <span class=\"breadcrumb-manage\">\n+ <h1>\n+ @Model.Username \n+ @if (Model.CanViewAccount)\n+ {\n+ <a href=\"@(Model.UserIsOrganization ? Url.ManageMyOrganization(Model.Username) : Url.AccountSettings())\" aria-label=\"Manage this account\"><i class=\"ms-Icon ms-Icon--Edit ms-font-xl\"></i></a>\n+ }\n+ </h1>\n+ <span>\n@if (Model.CanViewAccount)\n{\nif (Model.UserIsOrganization)\n{\n- <i class=\"ms-Icon ms-Icon--Group\" aria-hidden=\"true\"></i>\n- <a href=\"@Url.ManageMyOrganization(Model.Username)\" aria-label=\"Manage this organization\"><span>@((Model.User as Organization).Administrators.Count()) administrators | @((Model.User as Organization).Collaborators.Count()) collaborators</span></a>\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 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}\nelse if (!Model.UserIsOrganization && Model.User.Organizations.Any())\n{\n- <a href=\"@Url.ManageMyOrganizations()\" aria-label=\"Manage my organizations\"><span>member of @(Model.User.Organizations.Count()) organizations</span></a>\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}\n}\n</span>\n</div>\n+ <hr class=\"profile-title-divider\" />\n+\n<div class=\"list-packages\" role=\"list\">\n@foreach (var package in Model.PagedPackages)\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Improve profile page UI (#5766)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.