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,737 |
13.10.2017 14:29:40
| 25,200 |
072e8209b7f08657fc1d7a63f75716a451a25ac4
|
Fix readme test that broke with nofollow change.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"diff": "@@ -94,7 +94,7 @@ public void EncodesHtmlInMarkdown(string originalMd, string expectedHtml)\n[Theory]\n[InlineData(\"# Heading\", \"<h1>Heading</h1>\")]\n[InlineData(\"- List\", \"<ul><li>List</li></ul>\")]\n- [InlineData(\"[text](http://www.test.com)\", \"<p><a href=\\\"http://www.test.com\\\">text</a></p>\")]\n+ [InlineData(\"[text](http://www.test.com)\", \"<p><a href=\\\"http://www.test.com\\\" rel=\\\"nofollow\\\">text</a></p>\")]\npublic void ConvertsMarkdownToHtml(string originalMd, string expectedHtml)\n{\nAssert.Equal(expectedHtml, StripNewLines(ReadMeService.GetReadMeHtml(originalMd)));\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix readme test that broke with nofollow change. (#4846)
|
455,737 |
16.10.2017 14:43:15
| 25,200 |
2e2679c42c9f6edc811ca855cac8403318398c15
|
Change maxRequestLength to 250MB
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add tagPrefix=\"ef\" assembly=\"Microsoft.AspNet.EntityDataSource\" namespace=\"Microsoft.AspNet.EntityDataSource\" />\n</controls>\n</pages>\n- <httpRuntime targetFramework=\"4.5\" maxQueryStringLength=\"12000\" maxRequestLength=\"2000000000\" requestPathInvalidCharacters=\"<,>,*,%,:,\\,?\" relaxedUrlToFileSystemMapping=\"true\" enableVersionHeader=\"false\" />\n+ <httpRuntime targetFramework=\"4.5\" maxQueryStringLength=\"12000\" maxRequestLength=\"256000\" requestPathInvalidCharacters=\"<,>,*,%,:,\\,?\" relaxedUrlToFileSystemMapping=\"true\" enableVersionHeader=\"false\" />\n<httpModules>\n<add name=\"ErrorFilter\" type=\"Elmah.ErrorFilterModule, Elmah, Version=1.2.14706.0, Culture=neutral, PublicKeyToken=57eac04b2e0f138e, processorArchitecture=MSIL\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Change maxRequestLength to 250MB (#4848)
|
455,736 |
12.10.2017 08:12:14
| 25,200 |
e8d4e34e3ea715e3f357fc99ac5fc2b7695fd9db
|
Update DisplayPackage page to observe the Validating and FailedValidation state
Address
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "@@ -50,7 +50,7 @@ public virtual ActionResult GetPackageOwners(string id, string version)\nreturn Json(new { message = Strings.AddOwner_PackageNotFound });\n}\n- if (!package.IsOwner(HttpContext.User))\n+ if (!package.IsOwnerOrAdmin(HttpContext.User))\n{\nreturn new HttpUnauthorizedResult();\n}\n@@ -286,7 +286,7 @@ private bool TryGetManagePackageOwnerModel(string id, string username, out Manag\nmodel = new ManagePackageOwnerModel(Strings.AddOwner_PackageNotFound);\nreturn false;\n}\n- if (!package.IsOwner(HttpContext.User))\n+ if (!package.IsOwnerOrAdmin(HttpContext.User))\n{\nmodel = new ManagePackageOwnerModel(Strings.AddOwner_NotPackageOwner);\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -138,7 +138,7 @@ public virtual async Task<ActionResult> UndoPendingEdits(string id, string versi\nreturn HttpNotFound();\n}\n- if (!package.IsOwner(User))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn new HttpStatusCodeResult(403, \"Forbidden\");\n}\n@@ -446,18 +446,25 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\npackage = _packageService.FindPackageByIdAndVersion(id, version, SemVerLevelKey.SemVer2);\n}\n- if (package == null)\n+ // Validating packages should be hidden to everyone but the owners and admins.\n+ if (package == null\n+ || ((package.PackageStatusKey == PackageStatus.Validating\n+ || package.PackageStatusKey == PackageStatus.FailedValidation)\n+ && !package.IsOwnerOrAdmin(User)))\n{\nreturn HttpNotFound();\n}\n- var packageHistory = package.PackageRegistration.Packages.ToList()\n+ var packageHistory = package\n+ .PackageRegistration\n+ .Packages\n+ .ToList()\n.OrderByDescending(p => new NuGetVersion(p.Version));\nvar model = new DisplayPackageViewModel(package, packageHistory);\nvar isReadMePending = false;\n- if (package.IsOwner(User))\n+ if (package.IsOwnerOrAdmin(User))\n{\n// Tell logged-in package owners not to cache the package page,\n// so they won't be confused about the state of pending edits.\n@@ -526,7 +533,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nprivate string GetDisplayPackagePolicyMessage(PackageRegistration package)\n{\n// display package policy message to package owners and admins.\n- if (User.IsInRole(Constants.AdminRoleName) || package.IsOwner(User))\n+ if (package.IsOwnerOrAdmin(User))\n{\nvar propagators = package.Owners.Where(RequireSecurePushForCoOwnersPolicy.IsSubscribed);\nif (propagators.Any())\n@@ -691,8 +698,6 @@ public virtual ActionResult ReportAbuse(string id, string version)\n[RequiresAccountConfirmation(\"contact support about your package\")]\npublic virtual ActionResult ReportMyPackage(string id, string version)\n{\n- var user = GetCurrentUser();\n-\nvar package = _packageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null)\n@@ -701,7 +706,7 @@ public virtual ActionResult ReportMyPackage(string id, string version)\n}\n// If user hit this url by constructing it manually but is not the owner, redirect them to ReportAbuse\n- if (!(User.IsInRole(Constants.AdminRoleName) || package.IsOwner(user)))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn RedirectToAction(\"ReportAbuse\", new { id, version });\n}\n@@ -709,7 +714,7 @@ public virtual ActionResult ReportMyPackage(string id, string version)\nvar model = new ReportMyPackageViewModel\n{\nReasonChoices = ReportMyPackageReasons,\n- ConfirmedUser = user.Confirmed,\n+ ConfirmedUser = GetCurrentUser().Confirmed,\nPackageId = id,\nPackageVersion = package.Version,\nCopySender = true\n@@ -899,7 +904,7 @@ public virtual ActionResult ManagePackageOwners(string id)\n{\nreturn HttpNotFound();\n}\n- if (!package.IsOwner(User))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn new HttpStatusCodeResult(401, \"Unauthorized\");\n}\n@@ -919,7 +924,7 @@ public virtual ActionResult Delete(string id, string version)\n{\nreturn HttpNotFound();\n}\n- if (!package.IsOwner(User))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn new HttpStatusCodeResult(401, \"Unauthorized\");\n}\n@@ -928,7 +933,7 @@ public virtual ActionResult Delete(string id, string version)\nmodel.VersionSelectList = new SelectList(\nmodel.PackageVersions\n- .Where(p => p.Deleted == false)\n+ .Where(p => !p.Deleted)\n.Select(p => new\n{\ntext = p.NuGetVersion.ToFullString() + (p.LatestVersionSemVer2 ? \" (Latest)\" : string.Empty),\n@@ -1075,7 +1080,7 @@ public virtual async Task<ActionResult> Edit(string id, string version)\nreturn Json(404, new [] { string.Format(Strings.PackageWithIdAndVersionNotFound, id, version) });\n}\n- if (!package.IsOwner(User))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn Json(403, new [] { Strings.Unauthorized });\n}\n@@ -1129,7 +1134,7 @@ public virtual async Task<JsonResult> Edit(string id, string version, VerifyPack\nreturn Json(404, new [] { string.Format(Strings.PackageWithIdAndVersionNotFound, id, version) });\n}\n- if (!package.IsOwner(User))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn Json(403, new [] { Strings.Unauthorized });\n}\n@@ -1384,7 +1389,7 @@ internal virtual async Task<ActionResult> Edit(string id, string version, bool?\n{\nreturn HttpNotFound();\n}\n- if (!package.IsOwner(User))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn new HttpStatusCodeResult(401, \"Unauthorized\");\n}\n@@ -1657,7 +1662,7 @@ internal virtual async Task<ActionResult> SetLicenseReportVisibility(string id,\n{\nreturn HttpNotFound();\n}\n- if (!package.IsOwner(User))\n+ if (!package.IsOwnerOrAdmin(User))\n{\nreturn new HttpStatusCodeResult(401, \"Unauthorized\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -177,9 +177,9 @@ public static bool AnySafe<T>(this IEnumerable<T> items, Func<T, bool> predicate\nreturn items.Any(predicate);\n}\n- public static bool IsOwner(this Package package, IPrincipal user)\n+ public static bool IsOwnerOrAdmin(this Package package, IPrincipal user)\n{\n- return package.PackageRegistration.IsOwner(user);\n+ return package.PackageRegistration.IsOwnerOrAdmin(user);\n}\npublic static bool IsOwner(this Package package, User user)\n@@ -187,7 +187,7 @@ public static bool IsOwner(this Package package, User user)\nreturn package.PackageRegistration.IsOwner(user);\n}\n- public static bool IsOwner(this PackageRegistration package, IPrincipal user)\n+ public static bool IsOwnerOrAdmin(this PackageRegistration package, IPrincipal user)\n{\nif (package == null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/PrincipalExtensions.cs",
"new_path": "src/NuGetGallery/Infrastructure/PrincipalExtensions.cs",
"diff": "@@ -9,6 +9,11 @@ public static class PrincipalExtensions\n{\npublic static bool IsAdministrator(this IPrincipal self)\n{\n+ if (self == null || self.Identity == null)\n+ {\n+ return false;\n+ }\n+\nreturn self.Identity.IsAuthenticated && self.IsInRole(Constants.AdminRoleName);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -83,7 +83,7 @@ public bool HasNewerPrerelease\nget\n{\nvar latestPrereleaseVersion = PackageVersions\n- .Where(pv => pv.Prerelease)\n+ .Where(pv => pv.Prerelease && pv.Available)\n.Max(pv => pv.NuGetVersion);\nreturn latestPrereleaseVersion > NuGetVersion;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"diff": "@@ -58,5 +58,10 @@ public bool IsOwner(IPrincipal user)\n}\nreturn Owners.Any(u => u.Username == user.Identity.Name);\n}\n+\n+ public bool IsOwnerOrAdmin(IPrincipal user)\n+ {\n+ return IsOwner(user) || user.IsAdministrator();\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "@@ -48,7 +48,7 @@ public PackageViewModel(Package package)\nLatestStableVersionSemVer2 = package.IsLatestStableSemVer2;\nLastUpdated = package.Published;\nListed = package.Listed;\n- Deleted = package.PackageStatusKey == PackageStatus.Deleted;\n+ PackageStatus = package.PackageStatusKey;\nDownloadCount = package.DownloadCount;\nPrerelease = package.IsPrerelease;\nLicenseReportUrl = package.LicenseReportUrl;\n@@ -76,7 +76,11 @@ public PackageViewModel(Package package)\npublic bool Prerelease { get; set; }\npublic int DownloadCount { get; set; }\npublic bool Listed { get; set; }\n- public bool Deleted { get; set; }\n+ public bool FailedValidation => PackageStatus == PackageStatus.FailedValidation;\n+ public bool Available => PackageStatus == PackageStatus.Available;\n+ public bool Validating => PackageStatus == PackageStatus.Validating;\n+ public bool Deleted => PackageStatus == PackageStatus.Deleted;\n+ public PackageStatus PackageStatus { get; set; }\npublic int TotalDownloadCount\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<meta property=\"og:image\" content=\"@(PackageHelper.ShouldRenderUrl(Model.IconUrl) ? Model.IconUrl : Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\"))\" />\n}\n@section Meta {\n- @if (!Model.Listed || Model.Deleted)\n+ @if (!Model.Listed || !Model.Available)\n{\n<meta name=\"robots\" content=\"noindex\">\n}\n)\n}\n+ @if (Model.Validating)\n+ {\n+ @ViewHelpers.AlertWarning(\n+ @<text>\n+ <strong>This package has not been published yet.</strong> It will appear in search results and\n+ will be available for install/restore after both validation and indexing are complete. Package\n+ validation and indexing may take up to an hour.\n+ </text>\n+ )\n+ }\n+\n+ @if (Model.FailedValidation)\n+ {\n+ @ViewHelpers.AlertDanger(\n+ @<text>\n+ <strong>Package publishing failed.</strong> This package could not be published since package\n+ validation failed. Please contact <a href=\"mailto:support@nuget.org\">support@nuget.org</a>.\n+ </text>\n+ )\n+ }\n+\n+ @if (Model.Deleted)\n+ {\n+ @ViewHelpers.AlertDanger(\n+ @<text>\n+ <strong>This package has been deleted from the gallery.</strong> It is no longer available\n+ for install/restore.\n+ </text>\n+ )\n+ }\n+\n@if (Model.Prerelease)\n{\n@ViewHelpers.AlertInfo(\n@ViewHelpers.AlertWarning(\n@<text>\n<strong>This package has not been indexed yet.</strong> It will appear in search results\n- and will be available for install/restore after indexing is completed.\n- </text>\n- )\n- }\n-\n- @if (Model.Deleted)\n- {\n- @ViewHelpers.AlertDanger(\n- @<text>\n- <strong>This package has been deleted from the gallery.</strong> It is no longer available\n- for install/restore.\n+ and will be available for install/restore after indexing is complete.\n</text>\n)\n}\n@ViewHelpers.AlertIsSemVer2Package(Model.HasSemVer2Version, Model.HasSemVer2Dependency)\n}\n- @if (!Model.Listed && !Model.Deleted)\n+ @if (!Model.Listed && Model.Available)\n{\n- if ((Model.IsOwner(User) || User.IsAdministrator()))\n+ if ((Model.IsOwnerOrAdmin(User)))\n{\n@ViewHelpers.AlertWarning(\n@<text>\n<p>Requires NuGet @Model.MinClientVersion or higher.</p>\n}\n+ @if (Model.Available)\n+ {\n<div class=\"install-tabs\">\n<ul class=\"nav nav-tabs\" role=\"tablist\">\n@{ var firstPackageManager = true; }\n}\n</div>\n</div>\n+ }\n@if (Model.ReadMeHtml != null)\n{\n@if (Model.Dependencies.DependencySets == null)\n{\n- if ((Model.IsOwner(User) || User.IsAdministrator()))\n+ if ((Model.IsOwnerOrAdmin(User)))\n{\n<h2>Dependencies</h2>\n<p>\n<th>Version</th>\n<th>Downloads</th>\n<th>Last updated</th>\n- @if ((Model.IsOwner(User) || User.IsAdministrator()))\n+ @if (Model.IsOwnerOrAdmin(User))\n{\n<th>Listed</th>\n+ if (Config.Current.AsynchronousPackageValidationEnabled)\n+ {\n+ <th>Validation Status</th>\n+ }\n}\n</tr>\n</thead>\n}\n@foreach (var packageVersion in Model.PackageVersions)\n{\n- if (!packageVersion.Deleted && (packageVersion.Listed || (Model.IsOwner(User) || User.IsAdministrator())))\n+ if ((packageVersion.Available && packageVersion.Listed)\n+ || (!packageVersion.Deleted && Model.IsOwnerOrAdmin(User)))\n{\nrowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<td>\n<span data-datetime=\"@packageVersion.LastUpdated.ToString(\"O\")\">@packageVersion.LastUpdated.ToNuGetShortDateString()</span>\n</td>\n- @if ((Model.IsOwner(User) || User.IsAdministrator()))\n+ @if (packageVersion.IsOwnerOrAdmin(User))\n{\n<td>\n<a href=\"@Url.DeletePackage(packageVersion)\">@(packageVersion.Listed ? \"yes\" : \"no\")</a>\n</td>\n+ if (Config.Current.AsynchronousPackageValidationEnabled)\n+ {\n+ <td>\n+ @switch (packageVersion.PackageStatus)\n+ {\n+ case PackageStatus.Available:\n+ @:Valid\n+ break;\n+ case PackageStatus.Validating:\n+ @:Validating\n+ break;\n+ case PackageStatus.FailedValidation:\n+ @:Failed validation\n+ break;\n+ }\n+ </td>\n+ }\n}\n</tr>\n}\n- else if (packageVersion.Deleted)\n+ else if (packageVersion.Deleted && packageVersion.IsOwnerOrAdmin(User))\n{\nrowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<span data-datetime=\"@packageVersion.LastUpdated.ToString(\"O\")\">@packageVersion.LastUpdated.ToNuGetShortDateString()</span>\n</td>\n<td></td>\n+ @if (Config.Current.AsynchronousPackageValidationEnabled)\n+ {\n+ <td></td>\n+ }\n</tr>\n}\n}\n<i class=\"ms-Icon ms-Icon--Mail\" aria-hidden=\"true\"></i>\n<a href=\"@Url.ContactOwners(Model.Id)\" title=\"Ask the package owners a question\">Contact owners</a>\n</li>\n- @if ((Model.IsOwner(User) || User.IsAdministrator()))\n+ @if (Model.IsOwnerOrAdmin(User))\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Help\" aria-hidden=\"true\"></i>\n</a>\n</li>\n}\n- else if (!Model.Deleted)\n+ else if (Model.Available)\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Flag\" aria-hidden=\"true\"></i>\n</li>\n}\n- @if (!Model.Deleted)\n+ @if (Model.Available)\n{\n<li>\n<i class=\"ms-Icon ms-Icon--CloudDownload\" aria-hidden=\"true\"></i>\n</li>\n}\n- @if (!Model.Deleted && (Model.IsOwner(User) || User.IsAdministrator()))\n+ @if ((Model.Available || Model.Validating) && Model.IsOwnerOrAdmin(User))\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Edit\" aria-hidden=\"true\"></i>\n<a href=\"@Url.EditPackage(Model.Id, Model.Version)\">Edit package</a>\n</li>\n+ }\n+ @if (Model.IsOwnerOrAdmin(User))\n+ {\n<li>\n<i class=\"ms-Icon ms-Icon--People\" aria-hidden=\"true\"></i>\n<a href=\"@Url.ManagePackageOwners(Model)\">Manage owners</a>\n</li>\n+ }\n+ @if (!Model.Deleted && Model.IsOwnerOrAdmin(User))\n+ {\n<li>\n<i class=\"ms-Icon ms-Icon--Delete\" aria-hidden=\"true\"></i>\n<a href=\"@Url.DeletePackage(Model)\" class=\"delete\">Delete package</a>\n</li>\n}\n- @if (!Model.Deleted && User.IsAdministrator())\n+ @if (Model.Available && User.IsAdministrator())\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Refresh\" aria-hidden=\"true\"></i>\n</p>\n}\n+ @if (Model.Available)\n+ {\n<h2>Share</h2>\n- @{\nvar encodedText = Url.Encode(string.Format(\"Check out {0} on #NuGet.\", Model.Id));\n- }\n<p class=\"share-buttons\">\n<a href=\"https://www.facebook.com/sharer/sharer.php?u=@absolutePackageUrl&t=@encodedText\" target=\"_blank\">\n<img width=\"24\" height=\"24\" alt=\"Share this package on Facebook\"\n@ViewHelpers.ImageFallback(Url.Absolute(\"~/Content/gallery/img/twitter-24x24.png\")) />\n</a>\n</p>\n+ }\n</aside>\n</div>\n</section>\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-\n- @if (false) // TODO: Add verified user check\n- {\n- <span class=\"verified\">\n- <i class=\"ms-Icon ms-Icon--Completed\" aria-hidden=\"true\"></i>\n- Verified\n- </span>\n- }\n</div>\n<div class=\"list-packages\" role=\"list\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -274,6 +274,79 @@ public async Task GivenAValidPackageThatTheCurrentUserDoesNotOwnItDisplaysCurren\nAssert.Equal(\"A test package!\", model.Title);\n}\n+ [Theory]\n+ [InlineData(PackageStatus.Validating)]\n+ [InlineData(PackageStatus.FailedValidation)]\n+ public async Task GivenAValidatingPackageThatTheCurrentUserOwnsThenShowIt(PackageStatus packageStatus)\n+ {\n+ // Arrange & Act\n+ var result = await GetActionResultForPackageStatusAsync(\n+ packageStatus,\n+ p => p.PackageRegistration.Owners.Add(TestUtility.FakeUser));\n+\n+ // Assert\n+ Assert.IsType<ViewResult>(result);\n+ }\n+\n+ [Theory]\n+ [InlineData(PackageStatus.Validating)]\n+ [InlineData(PackageStatus.FailedValidation)]\n+ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(PackageStatus packageStatus)\n+ {\n+ // Arrange & Act\n+ var result = await GetActionResultForPackageStatusAsync(\n+ packageStatus,\n+ p => p.PackageRegistration.Owners.Clear());\n+\n+ // Assert\n+ ResultAssert.IsNotFound(result);\n+ }\n+\n+ private async Task<ActionResult> GetActionResultForPackageStatusAsync(\n+ PackageStatus packageStatus,\n+ Action<Package> mutatePackage)\n+ {\n+ // Arrange\n+ var packageService = new Mock<IPackageService>();\n+ var httpContext = new Mock<HttpContextBase>();\n+ var httpCachePolicy = new Mock<HttpCachePolicyBase>();\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService,\n+ httpContext: httpContext);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+ httpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\n+\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Id = \"NuGet.Versioning\",\n+ Owners = new List<User>(),\n+ },\n+ Version = \"3.4.0\",\n+ NormalizedVersion = \"3.4.0\",\n+ PackageStatusKey = packageStatus,\n+ };\n+\n+ mutatePackage(package);\n+\n+ packageService\n+ .Setup(p => p.FindPackageByIdAndVersion(\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ It.IsAny<int?>(),\n+ It.IsAny<bool>()))\n+ .Returns(package);\n+\n+ // Act\n+ var result = await controller.DisplayPackage(\n+ package.PackageRegistration.Id,\n+ package.NormalizedVersion);\n+\n+ return result;\n+ }\n+\n[Fact]\npublic async Task GivenAValidPackageThatTheCurrentUserOwnsItDisablesResponseCaching()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update DisplayPackage page to observe the Validating and FailedValidation state (#4840)
Address https://github.com/NuGet/NuGetGallery/issues/4647
|
455,772 |
18.10.2017 14:52:37
| 25,200 |
9b484db8d2ee843cf03ebe3bdf1c5bb385bbd581
|
Change API Keys page note
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "you can always generate a new one at any time. You can also remove existing API keys if necessary.\n<br />\n<p>\n- <strong>Note:</strong> We recommend using NuGet.exe v4.1.0 or above to push packages.\n+ <strong>Note:</strong> To push packages to nuget.org you must use <a href=\"https://www.nuget.org/downloads\">nuget.exe v4.1.0 or above</a>,\n+ which implements the required <a href=\"https://docs.microsoft.com/en-us/nuget/api/nuget-protocols\">NuGet protocols</a>.\n</p>\n</p>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Change API Keys page note (#4864)
|
455,747 |
19.10.2017 17:40:41
| 25,200 |
7e5a246e71299a79223d4aa3fc699417500d600c
|
Allow admin to delete all owners
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"diff": "var viewModel = {\npackage: { id: packageId },\n+ isUserAnAdmin: isUserAnAdmin,\nowners: ko.observableArray([]),\nnewOwnerUsername: ko.observable(''),\nnewOwnerMessage: ko.observable(''),\nmessage: ko.observable(''),\n- hasMoreThanOneOwner: function () {\n- return true;\n- },\n-\n- isCurrentNamespaceOwner: function () {\n- return true;\n- },\n-\n- hasMoreThanOneNamespaceOwners: function () {\n+ IsAllowedToRemove: function (owner) {\nreturn true;\n},\n}\n};\n- viewModel.hasMoreThanOneOwner = ko.computed(function () {\n+ viewModel.IsAllowedToRemove = function (owner) {\n+ if (isUserAnAdmin.toLocaleLowerCase() === \"True\".toLocaleLowerCase()\n+ || owner.pending()) {\n+ return true;\n+ };\n+\nif (this.owners().length < 2) {\nreturn false;\n}\nvar approvedOwner = 0;\n+ var currentOwnerOwnsNamespace = false;\n+ var namespaceOwnerCount = 0;\nko.utils.arrayForEach(this.owners(), function (owner) {\nif (owner.pending() === false) {\napprovedOwner++;\n}\n- });\n-\n- return approvedOwner >= 2;\n- }, viewModel);\n-\n- viewModel.isCurrentNamespaceOwner = ko.computed(function () {\n- if (this.owners().length < 2) {\n- return false;\n- }\n- var currentOwnerOwnsNamespace = false;\n- ko.utils.arrayForEach(this.owners(), function (owner) {\nif (owner.current === true) {\ncurrentOwnerOwnsNamespace = owner.isNamespaceOwner();\n}\n- });\n-\n- return currentOwnerOwnsNamespace;\n- }, viewModel);\n-\n- viewModel.hasMoreThanOneNamespaceOwners = ko.computed(function () {\n- if (this.owners().length < 2) {\n- return false;\n- }\n- var namespaceOwnerCount = 0;\n- ko.utils.arrayForEach(this.owners(), function (owner) {\nif (owner.isNamespaceOwner() === true) {\nnamespaceOwnerCount++;\n}\n});\n- return namespaceOwnerCount >= 2;\n- }, viewModel);\n+ return approvedOwner >= 2\n+ && (!owner.isNamespaceOwner()\n+ || (currentOwnerOwnsNamespace\n+ && namespaceOwnerCount >= 2));\n+ };\nko.applyBindings(viewModel);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackageOwnersViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackageOwnersViewModel.cs",
"diff": "@@ -7,9 +7,12 @@ namespace NuGetGallery\n{\npublic class ManagePackageOwnersViewModel : ListPackageItemViewModel\n{\n+ public bool IsCurrentUserAnAdmin;\n+\npublic ManagePackageOwnersViewModel(Package package, IPrincipal currentUser)\n: base(package)\n{\n+ IsCurrentUserAnAdmin = currentUser.IsAdministrator();\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml",
"diff": "<span data-bind=\"visible: pending\">(pending approval)</span>\n</span>\n</div>\n- <!-- ko if: (pending() || $parent.hasMoreThanOneOwner())\n- && (!isNamespaceOwner() || ($parent.isCurrentNamespaceOwner() && $parent.hasMoreThanOneNamespaceOwners())) -->\n+ <!-- ko if: $parent.IsAllowedToRemove($data) -->\n<div class=\"col-md-3 remove-owner\">\n<a class=\"icon-link\"\nhref=\"#\"\n</a>\n</div>\n<!-- /ko -->\n- <!-- ko ifnot: (pending() || $parent.hasMoreThanOneOwner())\n- && (!isNamespaceOwner() || ($parent.isCurrentNamespaceOwner() && $parent.hasMoreThanOneNamespaceOwners())) -->\n+ <!-- ko ifnot: $parent.IsAllowedToRemove($data) -->\n<div class=\"col-md-3 remove-owner-disabled\">\n<a class=\"icon-link\"\ntitle=\"Cannot remove the only owner or reserved namespace restrictions apply.\">\n@section bottomScripts {\n<script type=\"text/javascript\">\nvar packageId = \"@Model.Id\";\n+ var isUserAnAdmin = \"@Model.IsCurrentUserAnAdmin\";\nvar packageUrl = \"@Url.Package(Model.Id)\";\nvar getPackageOwnersUrl = \"@Url.GetPackageOwners()\";\nvar getAddPackageOwnerConfirmationUrl = \"@Url.GetAddPackageOwnerConfirmation()\";\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Allow admin to delete all owners
|
455,759 |
20.10.2017 17:51:40
| -7,200 |
66805e013e438dd3e570efb3cd9f6e6076028eba
|
Fix: no need to show both verify and edit warnings on edit package page.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"new_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"diff": "@@ -218,7 +218,6 @@ var AsyncFileUploadManager = new function () {\n$(reportContainerElement).attr(\"class\", \"collapse in\");\n$(reportContainerElement).attr(\"aria-expanded\", \"true\");\n$(reportContainerElement).attr(\"data-bind\", \"template: { name: 'edit-metadata-template', data: data }\");\n- $(\"#verify-package-container\").removeClass(\"hidden\");\n$(\"#verify-package-container\").append(reportContainerElement);\nko.applyBindings({ data: model }, reportContainerElement);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-edit.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-edit.js",
"diff": "@@ -151,7 +151,6 @@ var EditViewManager = new function () {\n$(reportContainerElement).attr(\"class\", \"collapse in\");\n$(reportContainerElement).attr(\"aria-expanded\", \"true\");\n$(reportContainerElement).attr(\"data-bind\", \"template: { name: 'edit-metadata-template', data: data }\");\n- $(\"#verify-package-container\").removeClass(\"hidden\");\n$(\"#verify-package-container\").append(reportContainerElement);\nko.applyBindings({ data: model }, reportContainerElement);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"diff": "</div>\n}\n+ @ViewHelpers.AlertPackageVerifyRecommendation()\n@Html.Partial(\"_EditForm\")\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_EditForm.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_EditForm.cshtml",
"diff": "</h2>\n</div>\n- <div id=\"verify-package-container\" class=\"hidden\">\n- @ViewHelpers.AlertPackageVerifyRecommendation()\n+ <div id=\"verify-package-container\">\n</div>\n@Html.Partial(\"_EditMetadata\")\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix: no need to show both verify and edit warnings on edit package page. (#4877)
|
455,759 |
23.10.2017 11:14:57
| -7,200 |
c591f156a47ead2def809ee9b6229c6f72fee4f1
|
Only show verify pkg recommendation warning when upload was in progress or completed.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"new_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"diff": "@@ -209,6 +209,7 @@ var AsyncFileUploadManager = new function () {\nfunction bindData(model) {\n$(\"#verify-package-block\").remove();\n$(\"#submit-block\").remove();\n+ $(\"#verify-warning-container\").addClass(\"hidden\");\n$(\"#verify-collapser-container\").addClass(\"hidden\");\n$(\"#submit-collapser-container\").addClass(\"hidden\");\n@@ -251,6 +252,7 @@ var AsyncFileUploadManager = new function () {\n$('#icon-preview').attr('src', $('#iconurl-field').val());\n});\n+ $(\"#verify-warning-container\").removeClass(\"hidden\");\n$(\"#verify-collapser-container\").removeClass(\"hidden\");\n$(\"#submit-collapser-container\").removeClass(\"hidden\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/UploadPackage.cshtml",
"diff": "{\n<div id=\"warning-container\">\n@ViewHelpers.AlertWarning(@<text>You had an upload in progress. You can continue it here or cancel to restart.</text> )\n+ @ViewHelpers.AlertPackageVerifyRecommendation()\n</div>\n}\n-\n+ else\n+ {\n+ <div id=\"verify-warning-container\" class=\"hidden\">\n@ViewHelpers.AlertPackageVerifyRecommendation()\n+ </div>\n+ }\n+\n@Html.Partial(\"_EditForm\")\n</div>\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Only show verify pkg recommendation warning when upload was in progress or completed.
|
455,759 |
23.10.2017 11:19:12
| -7,200 |
5e44c0786caf249bc50571f2e0dcc2bbbde30a9d
|
Fix NullReferenceException on GET Users/Packages by including PackageRegistration in queries to retrieve PackageOwnershipRequest
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageOwnerRequestService.cs",
"new_path": "src/NuGetGallery/Services/PackageOwnerRequestService.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Data.Entity;\nusing System.Linq;\nusing System.Threading.Tasks;\n@@ -45,7 +46,7 @@ public PackageOwnerRequest GetPackageOwnershipRequest(PackageRegistration packag\npublic IEnumerable<PackageOwnerRequest> GetPackageOwnershipRequests(PackageRegistration package = null, User requestingOwner = null, User newOwner = null)\n{\n- var query = _packageOwnerRequestRepository.GetAll();\n+ var query = _packageOwnerRequestRepository.GetAll().Include(e => e.PackageRegistration);\nif (package != null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/OwnerRequestsListViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/OwnerRequestsListViewModel.cs",
"diff": "@@ -8,17 +8,17 @@ namespace NuGetGallery\n{\npublic class OwnerRequestsListViewModel\n{\n- public IEnumerable<OwnerRequestsListItemViewModel> RequestItems { get; }\n-\n- public string Name { get; }\n-\n- public User CurrentUser { get; }\n-\npublic OwnerRequestsListViewModel(IEnumerable<PackageOwnerRequest> requests, string name, User currentUser, IPackageService packageService)\n{\nRequestItems = requests.Select(r => new OwnerRequestsListItemViewModel(r, packageService)).ToArray();\nName = name;\nCurrentUser = currentUser;\n}\n+\n+ public IEnumerable<OwnerRequestsListItemViewModel> RequestItems { get; }\n+\n+ public string Name { get; }\n+\n+ public User CurrentUser { get; }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix NullReferenceException on GET Users/Packages by including PackageRegistration in queries to retrieve PackageOwnershipRequest (#4882)
|
455,794 |
23.10.2017 11:59:42
| 25,200 |
f5ab58347a640ae7e3eedde13fcd36e186d5f3d7
|
Documentation parser and clamp fixes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"new_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"diff": "@@ -206,7 +206,8 @@ private static void BundlingPostStart()\nBundleTable.Bundles.Add(homeScriptBundle);\nvar displayPackageScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-display-package.min.js\")\n- .Include(\"~/Scripts/gallery/page-display-package.js\");\n+ .Include(\"~/Scripts/gallery/page-display-package.js\")\n+ .Include(\"~/Scripts/gallery/clamp.js\");\nBundleTable.Bundles.Add(displayPackageScriptBundle);\nvar managePackagesScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-manage-packages.min.js\")\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -481,7 +481,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\n}\n}\n- await _readMeService.GetReadMeHtmlAsync(package, model, isReadMePending);\n+ model.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package, isReadMePending);\nmodel.PolicyMessage = GetDisplayPackagePolicyMessage(package.PackageRegistration);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -18,15 +18,27 @@ $(function () {\nvar readmeContainer = $(\"#readme-container\");\nif (readmeContainer[0])\n{\n- window.nuget.configureExpanderHeading(\n- \"readme-container\");\n+ window.nuget.configureExpanderHeading(\"readme-container\");\nwindow.nuget.configureExpander(\n- \"readme-full\",\n+ \"readme-more\",\n\"CalculatorAddition\",\n\"Show less\",\n\"CalculatorSubtract\",\n\"Show more\");\n+\n+ var showLess = $(\"#readme-less\");\n+ $clamp(showLess[0], { clamp: 10, useNativeClamp: false });\n+\n+ $(\"#show-readme-more\").click(function () {\n+ showLess.collapse(\"toggle\");\n+ });\n+ showLess.on('hide.bs.collapse', function (e) {\n+ e.stopPropagation();\n+ });\n+ showLess.on('show.bs.collapse', function (e) {\n+ e.stopPropagation();\n+ });\n}\nwindow.nuget.configureExpanderHeading(\"dependency-groups\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IReadMeService.cs",
"new_path": "src/NuGetGallery/Services/IReadMeService.cs",
"diff": "@@ -26,10 +26,9 @@ public interface IReadMeService\n/// Get the converted HTML from the stored ReadMe markdown.\n/// </summary>\n/// <param name=\"package\">Package entity associated with the ReadMe.</param>\n- /// <param name=\"model\">Display package view model to populate.</param>\n/// <param name=\"isPending\">Whether to retrieve the pending ReadMe.</param>\n/// <returns>Pending or active ReadMe converted to HTML.</returns>\n- Task GetReadMeHtmlAsync(Package package, DisplayPackageViewModel model, bool isPending = false);\n+ Task<string> GetReadMeHtmlAsync(Package package, bool isPending = false);\n/// <summary>\n/// Get package ReadMe markdown from storage.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReadMeService.cs",
"new_path": "src/NuGetGallery/Services/ReadMeService.cs",
"diff": "using System.Linq;\nusing System.Net.Http;\nusing System.Text;\n+using System.Text.RegularExpressions;\nusing System.Threading.Tasks;\nusing System.Web;\nusing CommonMark;\n-using System.Text.RegularExpressions;\n+using CommonMark.Syntax;\nnamespace NuGetGallery\n{\ninternal class ReadMeService : IReadMeService\n{\n+ private static readonly TimeSpan RegexTimeout = TimeSpan.FromMinutes(1);\n+ private static readonly Regex EncodedBlockQuotePattern = new Regex(\"^ {0,3}>\", RegexOptions.Multiline, RegexTimeout);\n+ private static readonly Regex CommonMarkLinkPattern = new Regex(\"<a href=([\\\"\\']).*?\\\\1\", RegexOptions.None, RegexTimeout);\n+\ninternal const string TypeUrl = \"Url\";\ninternal const string TypeFile = \"File\";\ninternal const string TypeWritten = \"Written\";\ninternal const int MaxMdLengthBytes = 8000;\n- private const int ReadMeClampedLineCount = 10;\nprivate const string UrlHostRequirement = \"raw.githubusercontent.com\";\n+\nprivate static readonly TimeSpan UrlTimeout = TimeSpan.FromSeconds(10);\nprivate IPackageFileService _packageFileService;\n@@ -75,20 +80,14 @@ public async Task<string> GetReadMeHtmlAsync(ReadMeRequest readMeRequest, Encodi\n/// Get the converted HTML from the stored ReadMe markdown.\n/// </summary>\n/// <param name=\"package\">Package entity associated with the ReadMe.</param>\n- /// <param name=\"model\">Display package view model to populate.</param>\n/// <param name=\"isPending\">Whether to retrieve the pending ReadMe.</param>\n/// <returns>Pending or active ReadMe converted to HTML.</returns>\n- public async Task GetReadMeHtmlAsync(Package package, DisplayPackageViewModel model, bool isPending = false)\n+ public async Task<string> GetReadMeHtmlAsync(Package package, bool isPending = false)\n{\nvar readMeMd = await GetReadMeMdAsync(package, isPending);\n- if (!string.IsNullOrWhiteSpace(readMeMd))\n- {\n- var readMeMdClamped = string.Join(Environment.NewLine,\n- readMeMd.Split(new[] { '\\r', '\\n' }, StringSplitOptions.RemoveEmptyEntries).Take(ReadMeClampedLineCount));\n-\n- model.ReadMeHtml = GetReadMeHtml(readMeMd).Trim();\n- model.ReadMeHtmlClamped = GetReadMeHtml(readMeMdClamped).Trim();\n- }\n+ return string.IsNullOrEmpty(readMeMd) ?\n+ string.Empty :\n+ GetReadMeHtml(readMeMd);\n}\n/// <summary>\n@@ -149,10 +148,65 @@ public async Task<bool> SavePendingReadMeMdIfChanged(Package package, EditPackag\n/// <returns>HTML content.</returns>\ninternal static string GetReadMeHtml(string readMeMd)\n{\n- var encodedMarkdown = HttpUtility.HtmlEncode(readMeMd);\n- var regex = new Regex(\"<a href=([\\\"\\']).*?\\\\1\");\n- var converted = CommonMarkConverter.Convert(encodedMarkdown);\n- return regex.Replace(converted, \"$0\" + \" rel=\\\"nofollow\\\"\");\n+ // HTML encode markdown, except for block quotes, to block inline html.\n+ var encodedMarkdown = EncodedBlockQuotePattern.Replace(HttpUtility.HtmlEncode(readMeMd), \"> \");\n+\n+ var settings = CommonMarkSettings.Default.Clone();\n+ settings.RenderSoftLineBreaksAsLineBreaks = true;\n+\n+ // Parse executes CommonMarkConverter's ProcessStage1 and ProcessStage2.\n+ var document = CommonMarkConverter.Parse(encodedMarkdown, settings);\n+ foreach (var node in document.AsEnumerable())\n+ {\n+ if (node.IsOpening)\n+ {\n+ var block = node.Block;\n+ if (block != null)\n+ {\n+ switch (block.Tag)\n+ {\n+ // Demote heading tags so they don't overpower expander headings.\n+ case BlockTag.AtxHeading:\n+ case BlockTag.SetextHeading:\n+ var level = (byte)Math.Min(block.Heading.Level + 1, 6);\n+ block.Heading = new HeadingData(level);\n+ break;\n+\n+ // Decode preformatted blocks to prevent double encoding.\n+ // Skip BlockTag.BlockQuote, which are partially decoded upfront.\n+ case BlockTag.FencedCode:\n+ case BlockTag.IndentedCode:\n+ if (block.StringContent != null)\n+ {\n+ var content = block.StringContent.TakeFromStart(block.StringContent.Length);\n+ var unencodedContent = HttpUtility.HtmlDecode(content);\n+ block.StringContent.Replace(unencodedContent, 0, unencodedContent.Length);\n+ }\n+ break;\n+ }\n+ }\n+\n+ var inline = node.Inline;\n+ if (inline != null && inline.Tag == InlineTag.Link)\n+ {\n+ // Allow only http or https links in markdown.\n+ Uri targetUri;\n+ if (! (Uri.TryCreate(inline.TargetUrl, UriKind.Absolute, out targetUri)\n+ && (targetUri.Scheme == Uri.UriSchemeHttp || targetUri.Scheme == Uri.UriSchemeHttps) ))\n+ {\n+ inline.TargetUrl = string.Empty;\n+ }\n+ }\n+ }\n+ }\n+\n+ // CommonMark.Net does not support link attributes, so manually inject nofollow.\n+ using (var htmlWriter = new StringWriter())\n+ {\n+ CommonMarkConverter.ProcessStage3(document, htmlWriter, settings);\n+\n+ return CommonMarkLinkPattern.Replace(htmlWriter.ToString(), \"$0\" + \" rel=\\\"nofollow\\\"\").Trim();\n+ }\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -71,7 +71,6 @@ public void SetPendingMetadata(PackageEdit pendingMetadata)\npublic IEnumerable<DisplayPackageViewModel> PackageVersions { get; set; }\npublic string Copyright { get; set; }\npublic string ReadMeHtml { get; set; }\n- public string ReadMeHtmlClamped { get; set; }\npublic bool HasPendingMetadata { get; private set; }\npublic bool IsLastEditFailed { get; private set; }\npublic DateTime? LastEdited { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "</h2>\n</div>\n<div id=\"readme-container\" class=\"collapse in\">\n- <div id=\"readme-clamped\" class=\"readme collapse in\">\n- @Html.Raw(Model.ReadMeHtmlClamped)\n+ <div id=\"readme-less\" class=\"collapse in\">\n+ @Html.Raw(Model.ReadMeHtml)\n</div>\n- <div id=\"readme-full\" class=\"readme collapse\">\n+ <div id=\"readme-more\" class=\"collapse\">\n@Html.Raw(Model.ReadMeHtml)\n</div>\n- @if (Model.ReadMeHtmlClamped.Length < Model.ReadMeHtml.Length)\n- {\n- <a href=\"#\" role=\"button\" data-toggle=\"collapse\" class=\"icon-link\" data-target=\".readme\"\n- aria-expanded=\"false\" aria-controls=\".readme\" id=\"show-readme-full\" data-track=\"show-package-documentation\" >\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" class=\"icon-link\" data-target=\"#readme-more\"\n+ aria-expanded=\"false\" aria-controls=\"#readme-more, #readme-less\"\n+ id=\"show-readme-more\" data-track=\"show-package-documentation\">\n<i class=\"ms-Icon ms-Icon--CalculatorAddition\" aria-hidden=\"true\"></i>\n<span>Show more</span>\n</a>\n- }\n</div>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -567,7 +567,7 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD\nAssert.Equal(\"Foo\", model.Id);\nAssert.Equal(\"1.1.1\", model.Version);\nAssert.Equal(\"A test package!\", model.Title);\n- Assert.Null(model.ReadMeHtml);\n+ Assert.Equal(\"\", model.ReadMeHtml);\n}\n[Fact]\n@@ -581,8 +581,7 @@ public async Task WhenHasReadMeAndMarkdownExists_ReturnsContent()\n// Assert\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n- Assert.Equal(\"<h1>Hello World!</h1>\", model.ReadMeHtml);\n- Assert.Equal(\"<h1>Hello World!</h1>\", model.ReadMeHtmlClamped);\n+ Assert.Equal(\"<h2>Hello World!</h2>\", model.ReadMeHtml);\n}\n[Fact]\n@@ -598,33 +597,29 @@ public async Task WhenHasReadMeAndLongMarkdownExists_ReturnsClampedContent()\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\nvar htmlCount = model.ReadMeHtml.Split(new[] { '\\r', '\\n' }, StringSplitOptions.RemoveEmptyEntries).Length;\n- var htmlClampedCount = model.ReadMeHtmlClamped.Split(new[] { '\\r', '\\n' }, StringSplitOptions.RemoveEmptyEntries).Length;\nAssert.Equal(20, htmlCount);\n- Assert.Equal(10, htmlClampedCount);\n}\n[Fact]\n- public async Task WhenHasReadMeAndFileNotFound_ReturnsNull()\n+ public async Task WhenHasReadMeAndFileNotFound_ReturnsEmptyString()\n{\n// Arrange & Act\nvar result = await GetDisplayPackageResult(null, true);\n// Assert\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n- Assert.Null(model.ReadMeHtml);\n- Assert.Null(model.ReadMeHtmlClamped);\n+ Assert.Equal(\"\", model.ReadMeHtml);\n}\n[Fact]\n- public async Task WhenHasReadMeFalse_ReturnsNull()\n+ public async Task WhenHasReadMeFalse_ReturnsEmptyString()\n{\n// Arrange and Act\nvar result = await GetDisplayPackageResult(null, false);\n// Assert\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n- Assert.Null(model.ReadMeHtml);\n- Assert.Null(model.ReadMeHtmlClamped);\n+ Assert.Equal(\"\", model.ReadMeHtml);\n}\nprivate async Task<ActionResult> GetDisplayPackageResult(string readMeHtml, bool hasReadMe)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReadMeServiceFacts.cs",
"diff": "@@ -92,9 +92,11 @@ public void EncodesHtmlInMarkdown(string originalMd, string expectedHtml)\n}\n[Theory]\n- [InlineData(\"# Heading\", \"<h1>Heading</h1>\")]\n+ [InlineData(\"# Heading\", \"<h2>Heading</h2>\")]\n[InlineData(\"- List\", \"<ul><li>List</li></ul>\")]\n[InlineData(\"[text](http://www.test.com)\", \"<p><a href=\\\"http://www.test.com\\\" rel=\\\"nofollow\\\">text</a></p>\")]\n+ [InlineData(\"[text](javascript:alert('hi'))\", \"<p><a href=\\\"\\\" rel=\\\"nofollow\\\">text</a></p>\")]\n+ [InlineData(\"> <text>Blockquote</text>\", \"<blockquote><p><text>Blockquote</text></p></blockquote>\")]\npublic void ConvertsMarkdownToHtml(string originalMd, string expectedHtml)\n{\nAssert.Equal(expectedHtml, StripNewLines(ReadMeService.GetReadMeHtml(originalMd)));\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Documentation parser and clamp fixes (#4853)
|
455,776 |
25.10.2017 11:08:16
| 25,200 |
7e72e47695c426bae732cc7a77862fcb11f421de
|
delete owner requests upon package hard delete
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"diff": "@@ -22,6 +22,9 @@ public class PackageDeleteService\nFROM Packages AS p\nWHERE p.[PackageRegistrationKey] = @key)\nBEGIN\n+ DELETE por FROM PackageOwnerRequests As por\n+ WHERE por.[PackageRegistrationKey] = @key\n+\nDELETE pro FROM PackageRegistrationOwners AS pro\nWHERE pro.[PackageRegistrationKey] = @key\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
delete owner requests upon package hard delete (#4898)
|
455,747 |
25.10.2017 11:49:53
| 25,200 |
5b32ce3505273296620d9cb8cfdcc9e5e1ba3138
|
[Prefix] List reserved namespaces in the 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": "@@ -212,6 +212,10 @@ img.package-icon {\nmargin-right: auto;\nmargin-left: auto;\n}\n+img.reserved-indicator-icon {\n+ margin-right: auto;\n+ margin-left: auto;\n+}\n.package-list {\npadding-left: 0;\nmargin-top: 8px;\n@@ -397,6 +401,10 @@ img.package-icon {\nmin-width: 20px;\nmax-height: 2em;\n}\n+.user-package-list .manage-package-listing .reserved-indicator-icon {\n+ min-width: 20px;\n+ max-height: 2em;\n+}\n.user-package-list .manage-package-listing .align-middle {\nvertical-align: middle;\n}\n@@ -407,6 +415,13 @@ img.package-icon {\noverflow-wrap: break-word;\n}\n+.user-package-list .manage-package-listing .reserved-id {\n+ word-break: normal;\n+ word-break: break-word;\n+ word-wrap: break-word;\n+\n+ overflow-wrap: break-word;\n+}\n@media (min-width: 768px) {\n.user-package-list .manage-package-listing .package-controls {\nwhite-space: nowrap;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -272,6 +272,11 @@ img.package-icon {\nmargin-right: auto;\n}\n+img.reserved-indicator-icon {\n+ margin-left: auto;\n+ margin-right: auto;\n+}\n+\n.package-list {\nmargin-top: 8px;\nmargin-bottom: 8px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-user-package-list.less",
"new_path": "src/Bootstrap/less/theme/common-user-package-list.less",
"diff": "min-width: 20px;\n}\n+ .reserved-indicator-icon {\n+ max-height: 2em;\n+ min-width: 20px;\n+ }\n+\n.align-middle {\nvertical-align: middle;\n}\n.break-word;\n}\n+ .reserved-id {\n+ .break-word;\n+ }\n+\n.package-controls {\n@media (min-width: @screen-sm-min) {\nwhite-space: nowrap;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -212,6 +212,10 @@ img.package-icon {\nmargin-right: auto;\nmargin-left: auto;\n}\n+img.reserved-indicator-icon {\n+ margin-right: auto;\n+ margin-left: auto;\n+}\n.package-list {\npadding-left: 0;\nmargin-top: 8px;\n@@ -397,6 +401,10 @@ img.package-icon {\nmin-width: 20px;\nmax-height: 2em;\n}\n+.user-package-list .manage-package-listing .reserved-indicator-icon {\n+ min-width: 20px;\n+ max-height: 2em;\n+}\n.user-package-list .manage-package-listing .align-middle {\nvertical-align: middle;\n}\n@@ -407,6 +415,13 @@ img.package-icon {\noverflow-wrap: break-word;\n}\n+.user-package-list .manage-package-listing .reserved-id {\n+ word-break: normal;\n+ word-break: break-word;\n+ word-wrap: break-word;\n+\n+ overflow-wrap: break-word;\n+}\n@media (min-width: 768px) {\n.user-package-list .manage-package-listing .package-controls {\nwhite-space: nowrap;\n"
},
{
"change_type": "ADD",
"old_path": "src/NuGetGallery/Content/gallery/img/reserved-indicator-256x256.png",
"new_path": "src/NuGetGallery/Content/gallery/img/reserved-indicator-256x256.png",
"diff": "Binary files /dev/null and b/src/NuGetGallery/Content/gallery/img/reserved-indicator-256x256.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -161,11 +161,13 @@ public virtual ActionResult Packages()\nvar outgoing = _packageOwnerRequestService.GetPackageOwnershipRequests(requestingOwner: user);\nvar ownerRequests = new OwnerRequestsViewModel(incoming, outgoing, user, _packageService);\n+ var reservedPrefixes = new ReservedNamespaceListViewModel(user.ReservedNamespaces);\nvar model = new ManagePackagesViewModel\n{\nPackages = packages,\n- OwnerRequests = ownerRequests\n+ OwnerRequests = ownerRequests,\n+ ReservedNamespaces = reservedPrefixes\n};\nreturn View(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"ViewModels\\ApiKeyListViewModel.cs\" />\n<Compile Include=\"ViewModels\\ApiKeyViewModel.cs\" />\n<Compile Include=\"ViewModels\\OwnerRequestsListItemViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ReservedNamespaceListViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ReservedNamespaceListItemViewModel.cs\" />\n<Compile Include=\"ViewModels\\OwnerRequestsListViewModel.cs\" />\n<Compile Include=\"ViewModels\\OwnerRequestsViewModel.cs\" />\n<Compile Include=\"ViewModels\\PackageHeadingModel.cs\" />\n<Content Include=\"Views\\Packages\\_SubmitPackage.cshtml\" />\n<Content Include=\"Views\\Packages\\_EditForm.cshtml\" />\n<Content Include=\"Views\\Users\\_OwnerRequestsList.cshtml\" />\n+ <Content Include=\"Views\\Users\\_ReservedNamespacesList.cshtml\" />\n</ItemGroup>\n<ItemGroup>\n<CodeAnalysisDictionary Include=\"Properties\\CodeAnalysisDictionary.xml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"diff": "window.nuget.configureExpanderHeading(\"requests-Incoming\");\nwindow.nuget.configureExpanderHeading(\"requests-Outgoing\");\n+\n+ window.nuget.configureExpanderHeading(\"reservednamespaces\");\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"diff": "@@ -10,5 +10,7 @@ public class ManagePackagesViewModel\npublic IEnumerable<ListPackageItemViewModel> Packages { get; set; }\npublic OwnerRequestsViewModel OwnerRequests { get; set; }\n+\n+ public ReservedNamespaceListViewModel ReservedNamespaces { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "@Html.Partial(\"_UserPackagesList\", new ManagePackagesListViewModel(unlistedPackages, \"Unlisted\"))\n}\n+ @Html.Partial(\"_ReservedNamespacesList\", Model.ReservedNamespaces)\n+\n@{\nif (Model.OwnerRequests.Incoming.RequestItems.Any() || Model.OwnerRequests.Outgoing.RequestItems.Any())\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Prefix] List reserved namespaces in the manage packages page (#4901)
|
455,737 |
26.10.2017 10:22:43
| 25,200 |
d28063ad0fd512f503a31d276e372a816657095c
|
Update number shortener to maintain enough sig figs for distinction.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/stats-perpackagestatsgraphs.js",
"new_path": "src/NuGetGallery/Scripts/gallery/stats-perpackagestatsgraphs.js",
"diff": "@@ -261,13 +261,24 @@ var GetChartData = function (rawData, filter) {\n}\nvar GetShortNumberString = function (number) {\n+ if (number == 0) {\n+ return \"0\";\n+ }\n+\nvar abbreviation = [\"\", \"k\", \"M\", \"B\", \"T\", \"q\", \"Q\", \"s\", \"S\", \"o\", \"n\"];\nvar numDiv = 0;\nwhile (number >= 1000) {\n- number = Math.floor(number / 1000);\n+ number = number / 1000.0;\nnumDiv++;\n}\n+ rounded = Math.floor(number);\n+ if (rounded >= 100) {\n+ number = number.toPrecision(3);\n+ } else {\n+ number = number.toPrecision(2);\n+ }\n+\nif (numDiv >= abbreviation.Length) {\nreturn number + \"10^\" + numDiv*3;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update number shortener to maintain enough sig figs for distinction. (#4896)
|
455,794 |
26.10.2017 15:11:14
| 25,200 |
42ce45314fcd5a47f6a0080b4f74344d07257d2d
|
Schema changes for Organization membership
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -41,10 +41,19 @@ public EntitiesContext(string connectionString, bool readOnly)\npublic IDbSet<PackageRegistration> PackageRegistrations { get; set; }\npublic IDbSet<Credential> Credentials { get; set; }\npublic IDbSet<Scope> Scopes { get; set; }\n- public IDbSet<User> Users { get; set; }\npublic IDbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }\npublic IDbSet<ReservedNamespace> ReservedNamespaces { get; set; }\n+ /// <summary>\n+ /// User or organization accounts.\n+ /// </summary>\n+ public IDbSet<User> Users { get; set; }\n+\n+ /// <summary>\n+ /// Organization accounts.\n+ /// </summary>\n+ public IDbSet<Organization> Organizations { get; set; }\n+\nIDbSet<T> IEntitiesContext.Set<T>()\n{\nreturn base.Set<T>();\n@@ -119,6 +128,25 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.MapLeftKey(\"UserKey\")\n.MapRightKey(\"RoleKey\"));\n+ modelBuilder.Entity<Organization>()\n+ .HasKey(o => o.Key)\n+ .HasRequired<User>(o => o.Account)\n+ .WithOptional(u => u.Organization)\n+ .WillCascadeOnDelete(false); // Disabled to prevent multiple cascade paths.\n+\n+ modelBuilder.Entity<Membership>()\n+ .HasKey(m => new { m.OrganizationKey, m.MemberKey })\n+ .HasRequired<Organization>(m => m.Organization)\n+ .WithMany(o => o.Memberships)\n+ .HasForeignKey(m => m.OrganizationKey)\n+ .WillCascadeOnDelete(true); // Memberships will be deleted with the Organization.\n+\n+ modelBuilder.Entity<Membership>()\n+ .HasRequired<User>(m => m.Member)\n+ .WithMany(u => u.Memberships)\n+ .HasForeignKey(m => m.MemberKey)\n+ .WillCascadeOnDelete(true); // Memberships will be deleted with the User (Member).\n+\nmodelBuilder.Entity<Role>()\n.HasKey(u => u.Key);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"diff": "@@ -13,10 +13,19 @@ public interface IEntitiesContext\nIDbSet<PackageRegistration> PackageRegistrations { get; set; }\nIDbSet<Credential> Credentials { get; set; }\nIDbSet<Scope> Scopes { get; set; }\n- IDbSet<User> Users { get; set; }\nIDbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }\nIDbSet<ReservedNamespace> ReservedNamespaces { get; set; }\n+ /// <summary>\n+ /// User or organization accounts.\n+ /// </summary>\n+ IDbSet<User> Users { get; set; }\n+\n+ /// <summary>\n+ /// Organization accounts.\n+ /// </summary>\n+ IDbSet<Organization> Organizations { get; set; }\n+\nTask<int> SaveChangesAsync();\n[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1716:IdentifiersShouldNotMatchKeywords\", MessageId = \"Set\", Justification=\"This is to match the EF terminology.\")]\nIDbSet<T> Set<T>() where T : class;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/User.cs",
"new_path": "src/NuGetGallery.Core/Entities/User.cs",
"diff": "namespace NuGetGallery\n{\n+ /// <summary>\n+ /// NuGetGallery now supports both Users and Organizations which share common features such as:\n+ /// - Namespace ownership\n+ /// - Package ownership\n+ /// - Security policies\n+ /// - Name and email unique across both Users and Organizations\n+ ///\n+ /// Organizations should not support UserRoles or Credentials, but this is not constrained by the\n+ /// database. In the future, we could consider renaming the Users table to Accounts and adding a\n+ /// Users table to constrain UserRoles and Credentials to only User accounts.\n+ /// </summary>\npublic class User : IEntity\n{\npublic User() : this(null)\n@@ -24,6 +35,16 @@ public User(string username)\nUsername = username;\n}\n+ /// <summary>\n+ /// <see cref=\"Organization\"/> represented by this account, if any.\n+ /// </summary>\n+ public Organization Organization { get; set; }\n+\n+ /// <summary>\n+ /// Organization memberships for a <see cref=\"User\"/> account.\n+ /// </summary>\n+ public virtual ICollection<Membership> Memberships { get; set; }\n+\n[StringLength(256)]\npublic string EmailAddress { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\Credential.cs\" />\n<Compile Include=\"Entities\\CuratedFeed.cs\" />\n<Compile Include=\"Entities\\CuratedPackage.cs\" />\n+ <Compile Include=\"Entities\\Membership.cs\" />\n+ <Compile Include=\"Entities\\Organization.cs\" />\n<Compile Include=\"Entities\\PackageDelete.cs\" />\n<Compile Include=\"Entities\\EmailMessage.cs\" />\n<Compile Include=\"Entities\\EntitiesConfiguration.cs\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201710250430326_AddOrganizations.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 AddOrganizations : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddOrganizations));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201710250430326_AddOrganizations\"; }\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/201710250430326_AddOrganizations.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddOrganizations : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ CreateTable(\n+ \"dbo.Memberships\",\n+ c => new\n+ {\n+ OrganizationKey = c.Int(nullable: false),\n+ MemberKey = c.Int(nullable: false),\n+ IsAdmin = c.Boolean(nullable: false),\n+ })\n+ .PrimaryKey(t => new { t.OrganizationKey, t.MemberKey })\n+ .ForeignKey(\"dbo.Users\", t => t.MemberKey, cascadeDelete: true)\n+ .ForeignKey(\"dbo.Organizations\", t => t.OrganizationKey, cascadeDelete: true)\n+ .Index(t => t.OrganizationKey)\n+ .Index(t => t.MemberKey);\n+\n+ CreateTable(\n+ \"dbo.Organizations\",\n+ c => new\n+ {\n+ Key = c.Int(nullable: false),\n+ AccountKey = c.Int(nullable: false),\n+ })\n+ .PrimaryKey(t => t.Key)\n+ .ForeignKey(\"dbo.Users\", t => t.Key)\n+ .Index(t => t.Key);\n+\n+ }\n+\n+ public override void Down()\n+ {\n+ DropForeignKey(\"dbo.Memberships\", \"OrganizationKey\", \"dbo.Organizations\");\n+ DropForeignKey(\"dbo.Organizations\", \"Key\", \"dbo.Users\");\n+ DropForeignKey(\"dbo.Memberships\", \"MemberKey\", \"dbo.Users\");\n+ DropIndex(\"dbo.Organizations\", new[] { \"Key\" });\n+ DropIndex(\"dbo.Memberships\", new[] { \"MemberKey\" });\n+ DropIndex(\"dbo.Memberships\", new[] { \"OrganizationKey\" });\n+ DropTable(\"dbo.Organizations\");\n+ DropTable(\"dbo.Memberships\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"GlobalSuppressions.cs\" />\n<Compile Include=\"Helpers\\GravatarHelper.cs\" />\n<Compile Include=\"Helpers\\RegexEx.cs\" />\n+ <Compile Include=\"Migrations\\201710250430326_AddOrganizations.cs\" />\n+ <Compile Include=\"Migrations\\201710250430326_AddOrganizations.Designer.cs\">\n+ <DependentUpon>201710250430326_AddOrganizations.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"Services\\AsynchronousPackageValidationInitiator.cs\" />\n<Compile Include=\"Services\\CloudBlobFileStorageService.cs\" />\n<Compile Include=\"Services\\IFileStorageService.cs\" />\n<EmbeddedResource Include=\"Migrations\\201709202249402_AddPackageOwnershipRequestsPage.resx\">\n<DependentUpon>201709202249402_AddPackageOwnershipRequestsPage.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201710250430326_AddOrganizations.resx\">\n+ <DependentUpon>201710250430326_AddOrganizations.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"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"diff": "@@ -98,6 +98,18 @@ public IDbSet<User> Users\n}\n}\n+ public IDbSet<Organization> Organizations\n+ {\n+ get\n+ {\n+ return Set<Organization>();\n+ }\n+ set\n+ {\n+ throw new NotSupportedException();\n+ }\n+ }\n+\npublic IDbSet<UserSecurityPolicy> UserSecurityPolicies\n{\nget\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Schema changes for Organization membership (#4904)
|
455,794 |
26.10.2017 15:26:45
| 25,200 |
5f88eecceb1f5c6bd641bb9bf74ac943a38f971d
|
Gallery constraints to prevent Organization authentication
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditedAuthenticatedOperationAction.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditedAuthenticatedOperationAction.cs",
"diff": "@@ -19,5 +19,10 @@ public enum AuditedAuthenticatedOperationAction\n/// Login failed, user exists but password is invalid\n/// </summary>\nFailedLoginInvalidPassword,\n+\n+ /// <summary>\n+ /// Login failed, user is an organization and should not have credentials.\n+ /// </summary>\n+ FailedLoginUserIsOrganization\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": "@@ -127,6 +127,17 @@ public virtual async Task<PasswordAuthenticationResult> Authenticate(string user\nreturn new PasswordAuthenticationResult(PasswordAuthenticationResult.AuthenticationResult.BadCredentials);\n}\n+ if (user.IsOrganization())\n+ {\n+ _trace.Information($\"Cannot authenticate organization account'{userNameOrEmail}'.\");\n+\n+ await Auditing.SaveAuditRecordAsync(\n+ new FailedAuthenticatedOperationAuditRecord(\n+ userNameOrEmail, AuditedAuthenticatedOperationAction.FailedLoginUserIsOrganization));\n+\n+ return new PasswordAuthenticationResult(PasswordAuthenticationResult.AuthenticationResult.BadCredentials);\n+ }\n+\nint remainingMinutes;\nif (IsAccountLocked(user, out remainingMinutes))\n@@ -201,7 +212,21 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\n_trace.Information(\"No user matches credential of type: \" + credential.Type);\nawait Auditing.SaveAuditRecordAsync(\n- new FailedAuthenticatedOperationAuditRecord(null, AuditedAuthenticatedOperationAction.FailedLoginNoSuchUser, attemptedCredential: credential));\n+ new FailedAuthenticatedOperationAuditRecord(null,\n+ AuditedAuthenticatedOperationAction.FailedLoginNoSuchUser,\n+ attemptedCredential: credential));\n+\n+ return null;\n+ }\n+\n+ if (matched.User.IsOrganization())\n+ {\n+ _trace.Information($\"Cannot authenticate organization account '{matched.User.Username}'.\");\n+\n+ await Auditing.SaveAuditRecordAsync(\n+ new FailedAuthenticatedOperationAuditRecord(null,\n+ AuditedAuthenticatedOperationAction.FailedLoginUserIsOrganization,\n+ attemptedCredential: credential));\nreturn null;\n}\n@@ -465,6 +490,11 @@ public virtual ActionResult Challenge(string providerName, string redirectUrl)\npublic virtual async Task AddCredential(User user, Credential credential)\n{\n+ if (user.IsOrganization())\n+ {\n+ throw new InvalidOperationException(Strings.OrganizationsCannotCreateCredentials);\n+ }\n+\nawait Auditing.SaveAuditRecordAsync(new UserAuditRecord(user, AuditedUserAction.AddCredential, credential));\nuser.Credentials.Add(credential);\nawait Entities.SaveChangesAsync();\n@@ -616,6 +646,11 @@ public static ClaimsIdentity CreateIdentity(User user, string authenticationType\nprivate async Task ReplaceCredentialInternal(User user, Credential credential)\n{\n+ if (user.IsOrganization())\n+ {\n+ throw new InvalidOperationException(Strings.OrganizationsCannotCreateCredentials);\n+ }\n+\n// Find the credentials we're replacing, if any\nvar toRemove = user.Credentials\n.Where(cred =>\n@@ -810,6 +845,8 @@ public virtual bool ValidatePasswordCredential(IEnumerable<Credential> creds, st\nprivate async Task MigrateCredentials(User user, List<Credential> creds, string password)\n{\n+ // Authenticate already validated that user is not an Organization, so no need to replicate here.\n+\nvar toRemove = creds.Where(c =>\n!string.Equals(\nc.Type,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "using System.Globalization;\nusing System.Linq;\nusing System.Linq.Expressions;\n-using System.Net.Mail;\nusing System.Security;\nusing System.Security.Claims;\nusing System.Security.Principal;\n@@ -259,16 +258,6 @@ public static IQueryable<T> SortBy<T>(this IQueryable<T> source, string sortExpr\nreturn source.Provider.CreateQuery<T>(methodCallExpression);\n}\n- public static MailAddress ToMailAddress(this User user)\n- {\n- if (!user.Confirmed)\n- {\n- return new MailAddress(user.UnconfirmedEmailAddress, user.Username);\n- }\n-\n- return new MailAddress(user.EmailAddress, user.Username);\n- }\n-\npublic static bool IsError<TModel, TProperty>(this HtmlHelper<TModel> htmlHelper, Expression<Func<TModel, TProperty>> expression)\n{\nvar metadata = ModelMetadata.FromLambdaExpression(expression, htmlHelper.ViewData);\n@@ -552,17 +541,6 @@ public static User GetCurrentUser(this IOwinContext self)\nreturn user;\n}\n- /// <summary>\n- /// Get the current API key credential, if available.\n- /// </summary>\n- public static Credential GetCurrentApiKeyCredential(this User user, IIdentity identity)\n- {\n- var claimsIdentity = identity as ClaimsIdentity;\n- var apiKey = claimsIdentity.GetClaimOrDefault(NuGetClaims.ApiKey);\n-\n- return user.Credentials.FirstOrDefault(c => c.Value == apiKey);\n- }\n-\nprivate static User LoadUser(IOwinContext context)\n{\nvar principal = context.Authentication.User;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Controllers\\AppController.cs\" />\n<Compile Include=\"Controllers\\ErrorsController.cs\" />\n<Compile Include=\"Controllers\\PagesController.cs\" />\n+ <Compile Include=\"Extensions\\UserExtensions.cs\" />\n<Compile Include=\"Filters\\ApiScopeRequiredAttribute.cs\" />\n<Compile Include=\"GlobalSuppressions.cs\" />\n<Compile Include=\"Helpers\\GravatarHelper.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -755,6 +755,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Organization accounts cannot create credentials..\n+ /// </summary>\n+ public static string OrganizationsCannotCreateCredentials {\n+ get {\n+ return ResourceManager.GetString(\"OrganizationsCannotCreateCredentials\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Package created from API..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -606,4 +606,7 @@ For more information, please contact '{2}'.</value>\n<data name=\"RemoveOwner_NotAllowed\" xml:space=\"preserve\">\n<value>The user '{0}' does not have permission to remove the owner '{1}'.</value>\n</data>\n+ <data name=\"OrganizationsCannotCreateCredentials\" xml:space=\"preserve\">\n+ <value>Organization accounts cannot create credentials.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedAuthenticatedOperationActionTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditedAuthenticatedOperationActionTests.cs",
"diff": "@@ -14,6 +14,7 @@ public void Definition_HasNotChanged()\n{\n\"FailedLoginInvalidPassword\",\n\"FailedLoginNoSuchUser\",\n+ \"FailedLoginUserIsOrganization\",\n\"PackagePushAttemptByNonOwner\"\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"diff": "@@ -67,6 +67,16 @@ public async Task GivenUserNameDoesNotMatchPassword_ItReturnsFailure()\nAssert.Equal(PasswordAuthenticationResult.AuthenticationResult.BadCredentials, result.Result);\n}\n+ [Fact]\n+ public async Task GivenAnOrganization_ItReturnsFailure()\n+ {\n+ // Act\n+ var result = await _authenticationService.Authenticate(_fakes.Organization.Username, Fakes.Password);\n+\n+ // Assert\n+ Assert.Equal(PasswordAuthenticationResult.AuthenticationResult.BadCredentials, result.Result);\n+ }\n+\n[Fact]\npublic async Task WritesAuditRecordWhenGivenUserNameDoesNotMatchPassword()\n{\n@@ -197,6 +207,21 @@ public async Task GivenInvalidApiKeyCredential_ItReturnsNull()\nAssert.Null(result);\n}\n+ [Fact]\n+ public async Task GivenAnOrganizationApiKeyCredential_ItReturnsNull()\n+ {\n+ // Arrange\n+ var organization = _fakes.Organization;\n+ var apiKey = Guid.Parse(\"1fdc96fe-0b41-4607-bc85-b6533b42d3f8\");\n+ organization.Credentials.Add(TestCredentialHelper.CreateV2ApiKey(apiKey, TimeSpan.FromDays(1)));\n+\n+ // Act\n+ var result = await _authenticationService.Authenticate(apiKey.ToString());\n+\n+ // Assert\n+ Assert.Null(result);\n+ }\n+\n[Fact]\npublic async Task WritesAuditRecordWhenGivenInvalidApiKeyCredential()\n{\n@@ -720,6 +745,19 @@ public async Task ThrowsExceptionIfNoUserWithProvidedUserName()\nAssert.Equal(Strings.UserNotFound, ex.Message);\n}\n+ [Fact]\n+ public async Task GivenAnOrganization_ThrowsInvalidOperationException()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var authService = Get<AuthenticationService>();\n+\n+ // Act & Assert\n+ await Assert.ThrowsAsync<InvalidOperationException>(async () => {\n+ await authService.ReplaceCredential(\"testOrganization\", fakes.Organization.Credentials.First());\n+ });\n+ }\n+\n[Fact]\npublic async Task AddsNewCredentialIfNoneWithSameTypeForUser()\n{\n@@ -1214,6 +1252,20 @@ public async Task AddsTheCredentialToTheDataStore()\nauthService.Entities.VerifyCommitChanges();\n}\n+ [Fact]\n+ public async Task GivenAnOrganization_ThrowsInvalidOperationException()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var credential = new CredentialBuilder().CreatePasswordCredential(\"password\");\n+ var authService = Get<AuthenticationService>();\n+\n+ // Act & Assert\n+ await Assert.ThrowsAsync<InvalidOperationException>(async () => {\n+ await authService.AddCredential(fakes.Organization, credential);\n+ });\n+ }\n+\n[Fact]\npublic async Task WritesAuditRecordForTheNewCredential()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"diff": "@@ -21,13 +21,15 @@ public class Fakes\npublic Fakes()\n{\n+ var credentialBuilder = new CredentialBuilder();\n+\nUser = new User(\"testUser\")\n{\nKey = 40,\nEmailAddress = \"confirmed0@example.com\",\nCredentials = new List<Credential>\n{\n- new CredentialBuilder().CreatePasswordCredential(Password),\n+ credentialBuilder.CreatePasswordCredential(Password),\nTestCredentialHelper.CreateV1ApiKey(Guid.Parse(\"669e180e-335c-491a-ac26-e83c4bd31d65\"),\nExpirationForApiKeyV1),\nTestCredentialHelper.CreateV2ApiKey(Guid.Parse(\"779e180e-335c-491a-ac26-e83c4bd31d87\"),\n@@ -37,6 +39,31 @@ public Fakes()\n}\n};\n+ Organization = new User(\"testOrganization\")\n+ {\n+ Key = 41,\n+ EmailAddress = \"confirmedOrganization@example.com\",\n+ Organization = new Organization()\n+ {\n+ Key = 1\n+ },\n+ // invalid credentials for testing authentication constraints\n+ Credentials = new List<Credential>\n+ {\n+ credentialBuilder.CreatePasswordCredential(Password)\n+ }\n+ };\n+\n+ Organization.Organization.Memberships = new List<Membership>()\n+ {\n+ new Membership\n+ {\n+ Organization = Organization.Organization,\n+ Member = User,\n+ IsAdmin = true\n+ }\n+ };\n+\nPbkdf2User = new User(\"testPbkdf2User\")\n{\nKey = 41,\n@@ -90,6 +117,8 @@ public Fakes()\npublic User User { get; }\n+ public User Organization { get; }\n+\npublic User ShaUser { get; }\npublic User Pbkdf2User { get; }\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Gallery constraints to prevent Organization authentication (#4915)
|
455,794 |
27.10.2017 07:58:24
| 25,200 |
4d8c2ecbe6a7dee64f2dfe47ce0f2b5aff2c1821
|
Fix readme telemetry
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -39,7 +39,12 @@ public class DefaultDependenciesModule : Module\n[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Maintainability\", \"CA1502:CyclomaticComplexity\", Justification = \"This code is more maintainable in the same function.\")]\nprotected override void Load(ContainerBuilder builder)\n{\n- var diagnosticsService = new DiagnosticsService();\n+ var telemetryClient = TelemetryClientWrapper.Instance;\n+ builder.RegisterInstance(telemetryClient)\n+ .As<ITelemetryClient>()\n+ .SingleInstance();\n+\n+ var diagnosticsService = new DiagnosticsService(telemetryClient);\nbuilder.RegisterInstance(diagnosticsService)\n.AsSelf()\n.As<IDiagnosticsService>()\n@@ -295,7 +300,7 @@ protected override void Load(ContainerBuilder builder)\ndefaultAuditingService = GetAuditingServiceForLocalFileSystem(configuration);\nbreak;\ncase StorageType.AzureStorage:\n- ConfigureForAzureStorage(builder, configuration);\n+ ConfigureForAzureStorage(builder, configuration, telemetryClient);\ndefaultAuditingService = GetAuditingServiceForAzureStorage(builder, configuration);\nbreak;\n}\n@@ -502,7 +507,7 @@ private static IAuditingService GetAuditingServiceForLocalFileSystem(IGalleryCon\nreturn new FileSystemAuditingService(auditingPath, AuditActor.GetAspNetOnBehalfOfAsync);\n}\n- private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryConfigurationService configuration)\n+ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryConfigurationService configuration, ITelemetryClient telemetryClient)\n{\n/// The goal here is to initialize a <see cref=\"ICloudBlobClient\"/> and <see cref=\"IFileStorageService\"/>\n/// instance for each unique connection string. Each dependent of <see cref=\"IFileStorageService\"/> (that\n@@ -563,7 +568,11 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC\n.SingleInstance();\n// when running on Windows Azure, download counts come from the downloads.v1.json blob\n- var downloadCountService = new CloudDownloadCountService(configuration.Current.AzureStorage_Statistics_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant);\n+ var downloadCountService = new CloudDownloadCountService(\n+ telemetryClient,\n+ configuration.Current.AzureStorage_Statistics_ConnectionString,\n+ configuration.Current.AzureStorageReadAccessGeoRedundant);\n+\nbuilder.RegisterInstance(downloadCountService)\n.AsSelf()\n.As<IDownloadCountService>()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "@@ -79,8 +79,9 @@ public static void Configuration(IAppBuilder app)\nreturn processor;\n});\n+ var telemetry = dependencyResolver.GetService<TelemetryClientWrapper>();\ntelemetryProcessorChainBuilder.Use(\n- next => new ExceptionTelemetryProcessor(next, Telemetry.TelemetryClient));\n+ next => new ExceptionTelemetryProcessor(next, telemetry.UnderlyingClient));\n// Note: sampling rate must be a factor 100/N where N is a whole number\n// e.g.: 50 (= 100/2), 33.33 (= 100/3), 25 (= 100/4), ...\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Diagnostics/DiagnosticsService.cs",
"new_path": "src/NuGetGallery/Diagnostics/DiagnosticsService.cs",
"diff": "@@ -8,11 +8,20 @@ namespace NuGetGallery.Diagnostics\n{\npublic class DiagnosticsService : IDiagnosticsService\n{\n- public DiagnosticsService()\n+ private readonly ITelemetryClient _telemetryClient;\n+\n+ public DiagnosticsService(ITelemetryClient telemetryClient)\n{\n+ _telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));\n+\nTrace.AutoFlush = true;\n}\n+ // Test constructor\n+ internal DiagnosticsService() : this(TelemetryClientWrapper.Instance)\n+ {\n+ }\n+\npublic IDiagnosticsSource GetSource(string name)\n{\nif (String.IsNullOrEmpty(name))\n@@ -20,7 +29,7 @@ public IDiagnosticsSource GetSource(string name)\nthrow new ArgumentException(String.Format(CultureInfo.CurrentCulture, Strings.ParameterCannotBeNullOrEmpty, \"name\"), nameof(name));\n}\n- return new TraceDiagnosticsSource(name);\n+ return new TraceDiagnosticsSource(name, _telemetryClient);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Diagnostics/TraceDiagnosticsSource.cs",
"new_path": "src/NuGetGallery/Diagnostics/TraceDiagnosticsSource.cs",
"diff": "@@ -18,11 +18,14 @@ public class TraceDiagnosticsSource : IDiagnosticsSource, IDisposable\n{\nprivate const string ObjectName = \"TraceDiagnosticsSource\";\nprivate TraceSource _source;\n+ private ITelemetryClient _telemetryClient;\npublic string Name { get; private set; }\n- public TraceDiagnosticsSource(string name)\n+ public TraceDiagnosticsSource(string name, ITelemetryClient telemetryClient)\n{\n+ _telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));\n+\nName = name;\n_source = new TraceSource(name, SourceLevels.All);\n@@ -43,7 +46,7 @@ public virtual void ExceptionEvent(Exception exception)\nthrow new ArgumentNullException(nameof(exception));\n}\n- Telemetry.TrackException(exception);\n+ _telemetryClient.TrackException(exception);\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\CloudBlobFileStorageService.cs\" />\n<Compile Include=\"Services\\IFileStorageService.cs\" />\n<Compile Include=\"Services\\ImmediatePackageValidator.cs\" />\n+ <Compile Include=\"Services\\ITelemetryClient.cs\" />\n<Compile Include=\"Services\\PackageOwnershipManagementService.cs\" />\n<Compile Include=\"Services\\IPackageOwnershipManagementService.cs\" />\n<Compile Include=\"Services\\IPackageValidationInitiator.cs\" />\n<Compile Include=\"Services\\IPackageUploadService.cs\" />\n<Compile Include=\"Services\\ReservedNamespaceService.cs\" />\n<Compile Include=\"Services\\ReadMeService.cs\" />\n+ <Compile Include=\"Services\\TelemetryClientWrapper.cs\" />\n<Compile Include=\"Services\\ValidationService.cs\" />\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricher.cs\" />\n<Compile Include=\"Telemetry\\QuietExceptionLogger.cs\" />\n<Compile Include=\"Extensions\\HttpRequestExtensions.cs\" />\n<Compile Include=\"Helpers\\HostMachine.cs\" />\n<Compile Include=\"Telemetry\\AppInsightsHealthIndicatorLogger.cs\" />\n- <Compile Include=\"Telemetry\\Telemetry.cs\" />\n<Compile Include=\"Infrastructure\\DependencyResolverServiceProviderAdapter.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\CloudDownloadCountServiceRefreshJob.cs\" />\n<Compile Include=\"Infrastructure\\MessageQueue.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/QueryAllowed/ODataQueryVerifier.cs",
"new_path": "src/NuGetGallery/OData/QueryAllowed/ODataQueryVerifier.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.Web.Http.OData.Query;\nnamespace NuGetGallery.OData.QueryFilter\n@@ -124,12 +123,10 @@ public static ODataQueryFilter V1Search\n}\ncatch (Exception ex)\n{\n- var telemetryProperties = new Dictionary<string, string>();\n- telemetryProperties.Add(TelemetryService.CallContext, $\"{telemetryContext}:{nameof(AreODataOptionsAllowed)}\");\n- telemetryProperties.Add(TelemetryService.IsEnabled, $\"{isFeatureEnabled}\");\n-\n- // Log and do not throw\n- Telemetry.TrackException(ex, telemetryProperties);\n+ _telemetryService.TrackException(ex, properties => {\n+ properties.Add(TelemetryService.CallContext, $\"{telemetryContext}:{nameof(AreODataOptionsAllowed)}\");\n+ properties.Add(TelemetryService.IsEnabled, $\"{isFeatureEnabled}\");\n+ });\n}\n_telemetryService.TrackODataQueryFilterEvent(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/CloudDownloadCountService.cs",
"new_path": "src/NuGetGallery/Services/CloudDownloadCountService.cs",
"diff": "@@ -20,6 +20,7 @@ public class CloudDownloadCountService : IDownloadCountService\nprivate const string DownloadCountBlobName = \"downloads.v1.json\";\nprivate const string TelemetryOriginForRefreshMethod = \"CloudDownloadCountService.Refresh\";\n+ private readonly ITelemetryClient _telemetryClient;\nprivate readonly string _connectionString;\nprivate readonly bool _readAccessGeoRedundant;\n@@ -30,8 +31,10 @@ public class CloudDownloadCountService : IDownloadCountService\npublic DateTime LastRefresh { get; protected set; }\n- public CloudDownloadCountService(string connectionString, bool readAccessGeoRedundant)\n+ public CloudDownloadCountService(ITelemetryClient telemetryClient, string connectionString, bool readAccessGeoRedundant)\n{\n+ _telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));\n+\n_connectionString = connectionString;\n_readAccessGeoRedundant = readAccessGeoRedundant;\n}\n@@ -181,7 +184,7 @@ private void RefreshCore()\n}\ncatch (JsonReaderException ex)\n{\n- Telemetry.TrackException(ex, new Dictionary<string, string>\n+ _telemetryClient.TrackException(ex, new Dictionary<string, string>\n{\n{ \"Origin\", TelemetryOriginForRefreshMethod },\n{ \"AdditionalInfo\", \"Invalid entry found in downloads.v1.json.\" }\n@@ -191,7 +194,7 @@ private void RefreshCore()\n}\ncatch (JsonReaderException ex)\n{\n- Telemetry.TrackException(ex, new Dictionary<string, string>\n+ _telemetryClient.TrackException(ex, new Dictionary<string, string>\n{\n{ \"Origin\", TelemetryOriginForRefreshMethod },\n{ \"AdditionalInfo\", \"Data present in downloads.v1.json is invalid. Couldn't get download data.\" }\n@@ -201,7 +204,7 @@ private void RefreshCore()\n}\ncatch (Exception ex)\n{\n- Telemetry.TrackException(ex, new Dictionary<string, string>\n+ _telemetryClient.TrackException(ex, new Dictionary<string, string>\n{\n{ \"Origin\", TelemetryOriginForRefreshMethod },\n{ \"AdditionalInfo\", \"Unknown exception.\" }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.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.Principal;\nnamespace NuGetGallery\n@@ -18,6 +19,14 @@ public interface ITelemetryService\nvoid TrackVerifyPackageKeyEvent(string packageId, string packageVersion, User user, IIdentity identity, int statusCode);\n+ /// <summary>\n+ /// Create a trace for an exception. These are informational for support requests.\n+ /// </summary>\nvoid TraceException(Exception exception);\n+\n+ /// <summary>\n+ /// Create a log for an exception. These are warnings for live site.\n+ /// </summary>\n+ void TrackException(Exception exception, Action<Dictionary<string, string>> addProperties);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "using System.Collections.Generic;\nusing System.Security.Principal;\nusing System.Web;\n+using Elmah;\nusing NuGetGallery.Diagnostics;\nnamespace NuGetGallery\n{\npublic class TelemetryService : ITelemetryService\n{\n- private IDiagnosticsSource _trace;\n+ internal class Events\n+ {\n+ public const string ODataQueryFilter = \"ODataQueryFilter\";\n+ public const string PackagePush = \"PackagePush\";\n+ public const string CreatePackageVerificationKey = \"CreatePackageVerificationKey\";\n+ public const string VerifyPackageKey = \"VerifyPackageKey\";\n+ public const string PackageReadMeChanged = \"PackageReadMeChanged\";\n+ }\n- // Event types\n- public const string ODataQueryFilterEvent = \"ODataQueryFilter\";\n- public const string PackagePushEvent = \"PackagePush\";\n- public const string CreatePackageVerificationKeyEvent = \"CreatePackageVerificationKeyEvent\";\n- public const string VerifyPackageKeyEvent = \"VerifyPackageKeyEvent\";\n- public const string PackageReadMeChangeEvent = \"PackageReadMeChanged\";\n+ private IDiagnosticsSource _diagnosticsSource;\n+ private ITelemetryClient _telemetryClient;\n// ODataQueryFilter properties\npublic const string CallContext = \"CallContext\";\n@@ -45,18 +49,20 @@ public class TelemetryService : ITelemetryService\npublic const string ReadMeSourceType = \"ReadMeSourceType\";\npublic const string ReadMeState = \"ReadMeState\";\n- public TelemetryService(IDiagnosticsService diagnosticsService)\n+ public TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n{\nif (diagnosticsService == null)\n{\nthrow new ArgumentNullException(nameof(diagnosticsService));\n}\n- _trace = diagnosticsService.GetSource(\"TelemetryService\");\n+ _telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));\n+\n+ _diagnosticsSource = diagnosticsService.GetSource(\"TelemetryService\");\n}\n// Used by ODataQueryVerifier. Should consider refactoring to make this non-static.\n- internal TelemetryService() : this(new DiagnosticsService())\n+ internal TelemetryService() : this(new DiagnosticsService(), TelemetryClientWrapper.Instance)\n{\n}\n@@ -67,12 +73,12 @@ public void TraceException(Exception exception)\nthrow new ArgumentNullException(nameof(exception));\n}\n- _trace.Warning(exception.ToString());\n+ _diagnosticsSource.Warning(exception.ToString());\n}\npublic void TrackODataQueryFilterEvent(string callContext, bool isEnabled, bool isAllowed, string queryPattern)\n{\n- TrackEvent(ODataQueryFilterEvent, properties =>\n+ TrackEvent(Events.ODataQueryFilter, properties =>\n{\nproperties.Add(CallContext, callContext);\nproperties.Add(IsEnabled, $\"{isEnabled}\");\n@@ -94,7 +100,7 @@ public void TrackPackageReadMeChangeEvent(Package package, string readMeSourceTy\nthrow new ArgumentNullException(nameof(readMeSourceType));\n}\n- TrackEvent(PackagePushEvent, properties => {\n+ TrackEvent(Events.PackageReadMeChanged, properties => {\nproperties.Add(PackageId, package.PackageRegistration.Id);\nproperties.Add(PackageVersion, package.Version);\nproperties.Add(ReadMeSourceType, readMeSourceType);\n@@ -119,7 +125,7 @@ public void TrackPackagePushEvent(Package package, User user, IIdentity identity\nthrow new ArgumentNullException(nameof(identity));\n}\n- TrackEvent(PackagePushEvent, properties => {\n+ TrackEvent(Events.PackagePush, properties => {\nproperties.Add(ClientVersion, GetClientVersion());\nproperties.Add(ProtocolVersion, GetProtocolVersion());\nproperties.Add(ClientInformation, GetClientInformation());\n@@ -144,7 +150,7 @@ public void TrackCreatePackageVerificationKeyEvent(string packageId, string pack\nthrow new ArgumentNullException(nameof(identity));\n}\n- TrackEvent(CreatePackageVerificationKeyEvent, properties => {\n+ TrackEvent(Events.CreatePackageVerificationKey, properties => {\nproperties.Add(ClientVersion, GetClientVersion());\nproperties.Add(ProtocolVersion, GetProtocolVersion());\nproperties.Add(ClientInformation, GetClientInformation());\n@@ -168,7 +174,7 @@ public void TrackVerifyPackageKeyEvent(string packageId, string packageVersion,\nthrow new ArgumentNullException(nameof(identity));\n}\n- TrackEvent(VerifyPackageKeyEvent, properties =>\n+ TrackEvent(Events.VerifyPackageKey, properties =>\n{\nproperties.Add(PackageId, packageId);\nproperties.Add(PackageVersion, packageVersion);\n@@ -210,13 +216,22 @@ private static string GetApiKeyCreationDate(User user, IIdentity identity)\nreturn apiKey?.Created.ToString(\"O\") ?? \"N/A\";\n}\n- private static void TrackEvent(string eventName, Action<Dictionary<string, string>> addProperties)\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+ public void TrackException(Exception exception, Action<Dictionary<string, string>> addProperties)\n{\nvar telemetryProperties = new Dictionary<string, string>();\naddProperties(telemetryProperties);\n- Telemetry.TrackEvent(eventName, telemetryProperties, metrics: null);\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/Telemetry/QuietLog.cs",
"new_path": "src/NuGetGallery/Telemetry/QuietLog.cs",
"diff": "@@ -10,6 +10,8 @@ namespace NuGetGallery\n{\ninternal static class QuietLog\n{\n+ public static ITelemetryClient Telemetry = TelemetryClientWrapper.Instance;\n+\npublic static void LogHandledException(Exception e)\n{\nvar aggregateExceptionId = Guid.NewGuid().ToString();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"diff": "@@ -107,11 +107,11 @@ public Fakes()\n{\nId = \"FakePackage\",\nOwners = new List<User> {Owner},\n- Packages = new List<Package>\n+ };\n+ Package.Packages = new List<Package>\n{\n- new Package {Version = \"1.0\"},\n- new Package {Version = \"2.0\"}\n- }\n+ new Package { Version = \"1.0\", PackageRegistration = Package },\n+ new Package { Version = \"2.0\", PackageRegistration = Package }\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.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.Diagnostics;\n+using System.Linq;\nusing Moq;\nusing NuGetGallery.Diagnostics;\n+using NuGetGallery.Framework;\nusing Xunit;\n+using TrackAction = System.Action<NuGetGallery.TelemetryService>;\n+\nnamespace NuGetGallery\n{\npublic class TelemetryServiceFacts\n@@ -20,6 +25,167 @@ public void ThrowsIfDiagnosticsServiceIsNull()\n}\n}\n+ public class TheTrackEventMethod : BaseFacts\n+ {\n+ private static Fakes fakes = new Fakes();\n+\n+ public static IEnumerable<object[]> TrackEventNames_Data\n+ {\n+ get\n+ {\n+ var package = fakes.Package.Packages.First();\n+ var identity = Fakes.ToIdentity(fakes.User);\n+\n+ yield return new object[] { \"ODataQueryFilter\",\n+ (TrackAction)(s => s.TrackODataQueryFilterEvent(\"callContext\", true, true, \"queryPattern\"))\n+ };\n+\n+ yield return new object[] { \"PackagePush\",\n+ (TrackAction)(s => s.TrackPackagePushEvent(package, fakes.User, identity))\n+ };\n+\n+ yield return new object[] { \"CreatePackageVerificationKey\",\n+ (TrackAction)(s => s.TrackCreatePackageVerificationKeyEvent(fakes.Package.Id, package.Version, fakes.User, identity))\n+ };\n+\n+ yield return new object[] { \"VerifyPackageKey\",\n+ (TrackAction)(s => s.TrackVerifyPackageKeyEvent(fakes.Package.Id, package.Version, fakes.User, identity, 0))\n+ };\n+\n+ yield return new object[] { \"PackageReadMeChanged\",\n+ (TrackAction)(s => s.TrackPackageReadMeChangeEvent(package, \"written\", PackageEditReadMeState.Changed))\n+ };\n+ }\n+ }\n+\n+ [Fact]\n+ public void TrackEventNamesIncludesAllEvents()\n+ {\n+ var count = typeof(TelemetryService.Events).GetFields().Length;\n+ var testData = TrackEventNames_Data;\n+\n+ Assert.Equal(count, testData.Count());\n+ }\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+ [Fact]\n+ public void TrackPackageReadMeChangeEventThrowsIfPackageIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackPackageReadMeChangeEvent(null, \"written\", PackageEditReadMeState.Changed));\n+ }\n+\n+ [Theory]\n+ [InlineData(\"\")]\n+ [InlineData(null)]\n+ public void TrackPackageReadMeChangeEventThrowsIfSourceTypeIsNullOrEmpty(string sourceType)\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackPackageReadMeChangeEvent(fakes.Package.Packages.First(), sourceType, PackageEditReadMeState.Changed));\n+ }\n+\n+ [Fact]\n+ public void TrackPackagePushEventThrowsIfPackageIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackPackagePushEvent(null, fakes.User, Fakes.ToIdentity(fakes.User)));\n+ }\n+\n+ [Fact]\n+ public void TrackPackagePushEventThrowsIfUserIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackPackagePushEvent(fakes.Package.Packages.First(), null, Fakes.ToIdentity(fakes.User)));\n+ }\n+\n+ [Fact]\n+ public void TrackPackagePushEventThrowsIfIdentityIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackPackagePushEvent(fakes.Package.Packages.First(), fakes.User, null));\n+ }\n+\n+ [Fact]\n+ public void TrackCreatePackageVerificationKeyEventThrowsIfUserIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackCreatePackageVerificationKeyEvent(\"id\", \"1.0.0\", null, Fakes.ToIdentity(fakes.User)));\n+ }\n+\n+ [Fact]\n+ public void TrackCreatePackageVerificationKeyEventThrowsIfIdentityIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackCreatePackageVerificationKeyEvent(\"id\", \"1.0.0\", fakes.User, null));\n+ }\n+\n+ [Fact]\n+ public void TrackVerifyPackageKeyEventThrowsIfUserIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackVerifyPackageKeyEvent(\"id\", \"1.0.0\", null, Fakes.ToIdentity(fakes.User), 200));\n+ }\n+\n+ [Fact]\n+ public void TrackVerifyPackageKeyEventThrowsIfIdentityIsNull()\n+ {\n+ // Arrange\n+ var service = CreateService();\n+\n+ // Act & Assert\n+ Assert.Throws<ArgumentNullException>(() =>\n+ service.TrackVerifyPackageKeyEvent(\"id\", \"1.0.0\", fakes.User, null, 200));\n+ }\n+ }\n+\npublic class TheTraceExceptionMethod : BaseFacts\n{\n[Fact]\n@@ -58,13 +224,15 @@ public class BaseFacts\n{\npublic class TelemetryServiceWrapper : TelemetryService\n{\n- public TelemetryServiceWrapper(IDiagnosticsService diagnosticsService)\n- : base(diagnosticsService)\n+ public TelemetryServiceWrapper(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient)\n+ : base(diagnosticsService, telemetryClient)\n{\n}\npublic Mock<IDiagnosticsSource> TraceSource { get; set; }\n+ public Mock<ITelemetryClient> TelemetryClient { get; set; }\n+\npublic string LastTraceMessage { get; set; }\n}\n@@ -72,13 +240,21 @@ public TelemetryServiceWrapper CreateService()\n{\nvar traceSource = new Mock<IDiagnosticsSource>();\nvar traceService = new Mock<IDiagnosticsService>();\n+ var telemetryClient = new Mock<ITelemetryClient>();\ntraceService.Setup(s => s.GetSource(It.IsAny<string>()))\n.Returns(traceSource.Object);\n- var telemetryService = new TelemetryServiceWrapper(traceService.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+\n+ var telemetryService = new TelemetryServiceWrapper(traceService.Object, telemetryClient.Object);\ntelemetryService.TraceSource = traceSource;\n+ telemetryService.TelemetryClient = telemetryClient;\ntraceSource.Setup(t => t.TraceEvent(\nIt.IsAny<TraceEventType>(),\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix readme telemetry (#4905)
|
455,772 |
27.10.2017 09:58:56
| 25,200 |
e359ad6559dd18052f002952be0a669d2536309c
|
Add support for building signed&unsigned nugetgallery.core packages
|
[
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -7,6 +7,7 @@ param (\n[switch]$CleanCache,\n[string]$SimpleVersion = '1.0.0',\n[string]$SemanticVersion = '1.0.0-zlocal',\n+ [string]$PackageSuffix,\n[string]$Branch,\n[string]$CommitSHA,\n[string]$BuildBranch = '37ff6e758c38b3f513af39f881399ce85f4ff20b'\n@@ -86,7 +87,8 @@ Invoke-BuildStep 'Building solution' {\n-ev +BuildErrors\nInvoke-BuildStep 'Creating artifacts' {\n- New-Package (Join-Path $PSScriptRoot \"src\\NuGetGallery.Core\\NuGetGallery.Core.csproj\") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion `\n+ $packageId = 'NuGetGallery.Core'+$PackageSuffix\n+ New-Package (Join-Path $PSScriptRoot \"src\\NuGetGallery.Core\\NuGetGallery.Core.csproj\") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId $packageId `\n-ev +BuildErrors\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.nuspec",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.nuspec",
"diff": "<?xml version=\"1.0\"?>\n<package >\n<metadata>\n- <id>$id$</id>\n+ <id>$PackageId$</id>\n<version>$version$</version>\n<title>$title$</title>\n<authors>$author$</authors>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add support for building signed&unsigned nugetgallery.core packages (#4919)
|
455,744 |
27.10.2017 10:56:03
| 25,200 |
0fca0c62e4c77eb901890afb6f485ba02209b263
|
Slightly different way to initialize service bus topic client wrapper
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -381,10 +381,15 @@ private void RegisterAsynchronousValidation(ContainerBuilder builder, Configurat\n.RegisterType<AsynchronousPackageValidationInitiator>()\n.As<IPackageValidationInitiator>();\n+ // we retrieve the values here (on main thread) because otherwise it would run in another thread\n+ // and potentially cause a deadlock on async operation.\n+ var validationConnectionString = configuration.ServiceBus.Validation_ConnectionString;\n+ var validationTopicName = configuration.ServiceBus.Validation_TopicName;\n+\nbuilder\n.Register(c => new TopicClientWrapper(\n- configuration.ServiceBus.Validation_ConnectionString,\n- configuration.ServiceBus.Validation_TopicName))\n+ validationConnectionString,\n+ validationTopicName))\n.As<ITopicClient>()\n.SingleInstance()\n.OnRelease(x => x.Close());\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Slightly different way to initialize service bus topic client wrapper (#4917)
|
455,759 |
27.10.2017 20:22:55
| -7,200 |
0366b89090ce8faa36c19a1c67fd4c6703a4c6de
|
Fix - do not consider unlisted prerelease versions when showing "newer prerelease available" message.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -74,7 +74,7 @@ public bool HasNewerPrerelease\nget\n{\nvar latestPrereleaseVersion = PackageVersions\n- .Where(pv => pv.Prerelease && pv.Available)\n+ .Where(pv => pv.Prerelease && pv.Available && pv.Listed)\n.Max(pv => pv.NuGetVersion);\nreturn latestPrereleaseVersion > NuGetVersion;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -199,5 +199,44 @@ public void DownloadsPerDayLabelShowsOneWhenAverageBetweenOneAndOnePointFive(int\n// Assert\nAssert.Equal(expectedNewerPrereleaseAvailable, hasNewerPrerelease);\n}\n+\n+ [Fact]\n+ public void HasNewerPrereleaseDoesNotConsiderUnlistedVersions()\n+ {\n+ // Arrange\n+ var dependencies = Enumerable.Empty<PackageDependency>().ToList();\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ };\n+\n+ var package = new Package\n+ {\n+ Dependencies = dependencies,\n+ PackageRegistration = packageRegistration,\n+ IsPrerelease = true,\n+ Version = \"1.0.0-alpha.1\"\n+ };\n+\n+ // This is a newer prerelease version, however unlisted.\n+ var otherPackage = new Package\n+ {\n+ Dependencies = dependencies,\n+ PackageRegistration = packageRegistration,\n+ IsPrerelease = true,\n+ Version = \"1.0.0-alpha.2\",\n+ Listed = false\n+ };\n+\n+ package.PackageRegistration.Packages = new[] { package, otherPackage };\n+\n+ var viewModel = new DisplayPackageViewModel(package, package.PackageRegistration.Packages.OrderByDescending(p => new NuGetVersion(p.Version)));\n+\n+ // Act\n+ var hasNewerPrerelease = viewModel.HasNewerPrerelease;\n+\n+ // Assert\n+ Assert.False(hasNewerPrerelease);\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix #4814 - do not consider unlisted prerelease versions when showing "newer prerelease available" message. (#4922)
|
455,776 |
30.10.2017 15:20:15
| 25,200 |
5c8184f544c72665cf4b6ef3a4fb34f48173b5d0
|
Add ability to reflow hard-deletes from Admin area
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/DeleteController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/DeleteController.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n+using System.Threading.Tasks;\nusing System.Web.Mvc;\n-using System.Web.Routing;\nusing NuGet.Versioning;\nusing NuGetGallery.Areas.Admin.ViewModels;\n@@ -14,12 +14,19 @@ namespace NuGetGallery.Areas.Admin.Controllers\npublic partial class DeleteController : AdminControllerBase\n{\nprivate readonly IPackageService _packageService;\n+ private readonly IPackageDeleteService _packageDeleteService;\n+ private readonly ITelemetryService _telemetryService;\nprotected DeleteController() { }\n- public DeleteController(IPackageService packageService)\n+ public DeleteController(\n+ IPackageService packageService,\n+ IPackageDeleteService packageDeleteService,\n+ ITelemetryService telemetryService)\n{\n_packageService = packageService;\n+ _packageDeleteService = packageDeleteService;\n+ _telemetryService = telemetryService;\n}\n[HttpGet]\n@@ -122,5 +129,84 @@ private DeleteSearchResult CreateDeleteSearchResult(Package package)\n.ToList()\n};\n}\n+\n+ [HttpGet]\n+ public virtual ActionResult Reflow()\n+ {\n+ return View(nameof(Reflow));\n+ }\n+\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\n+ public virtual ActionResult ReflowBulk(HardDeleteReflowBulkRequest request)\n+ {\n+ if (string.IsNullOrWhiteSpace(request.BulkList))\n+ {\n+ TempData[\"Message\"] = \"Must specify a list of hard-deleted packages to reflow in bulk!\";\n+\n+ return View(nameof(Reflow));\n+ }\n+\n+ var lines = request.BulkList.Split(new[] { '\\r', '\\n' }, StringSplitOptions.RemoveEmptyEntries);\n+\n+ try\n+ {\n+ var requests = new List<HardDeleteReflowRequest>();\n+\n+ foreach (var line in lines)\n+ {\n+ var parts = line.Split(new char[0], StringSplitOptions.RemoveEmptyEntries);\n+\n+ if (parts.Length != 2)\n+ {\n+ throw new UserSafeException(\n+ $\"Couldn't parse the list of hard-deleted packages to reflow in bulk: could not split \\\"{line}\\\" into ID and version!\");\n+ }\n+\n+ requests.Add(new HardDeleteReflowRequest() { Id = parts[0], Version = parts[1] });\n+ }\n+\n+ return View(nameof(Reflow), new HardDeleteReflowBulkRequestConfirmation() { Requests = requests });\n+ }\n+ catch (Exception e)\n+ {\n+ _telemetryService.TraceException(e);\n+\n+ TempData[\"Message\"] = e.GetUserSafeMessage();\n+\n+ return View(nameof(Reflow));\n+ }\n+ }\n+\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\n+ public virtual async Task<ActionResult> ReflowBulkConfirm(HardDeleteReflowBulkRequestConfirmation confirmation)\n+ {\n+ var failures = new List<string>();\n+\n+ foreach (var request in confirmation.Requests)\n+ {\n+ try\n+ {\n+ await _packageDeleteService.ReflowHardDeletedPackageAsync(request.Id, request.Version);\n+ }\n+ catch (Exception e)\n+ {\n+ failures.Add($\"Failed to reflow hard-deleted package {request.Id} {request.Version}: {e.GetUserSafeMessage()}\");\n+ }\n+ }\n+\n+ if (failures.Any())\n+ {\n+ TempData[\"Message\"] = string.Join(\" \", failures.ToArray());\n+ }\n+ else\n+ {\n+ TempData[\"Message\"] =\n+ \"Successfully reflowed all packages.\";\n+ }\n+\n+ return View(nameof(Reflow));\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Delete/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Delete/Index.cshtml",
"diff": "<article id=\"stage\">\n<h2>Delete packages</h2>\n+ <p>\n+ If you would like to reflow a hard-deleted package, go to <a href=\"@Url.Action(actionName: \"Reflow\", controllerName: \"Delete\")\">this page</a> instead.\n+ </p>\n+\n<form>\n<textarea placeholder=\"Search for packages to delete (e.g. jQuery 1.8.0)\" autocomplete=\"off\" autofocus style=\"width: 100%;\" rows=\"5\" data-bind=\"value: searchQuery\"></textarea><br/>\n<input type=\"button\" value=\"Search\" data-bind=\"click: search\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Areas\\Admin\\Models\\ISupportRequestDbContext.cs\" />\n<Compile Include=\"Areas\\Admin\\Models\\SupportRequestDbContext.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\ValidationAdminService.cs\" />\n+ <Compile Include=\"Areas\\Admin\\ViewModels\\HardDeleteReflowBulkRequestConfirmation.cs\" />\n+ <Compile Include=\"Areas\\Admin\\ViewModels\\HardDeleteReflowBulkRequest.cs\" />\n+ <Compile Include=\"Areas\\Admin\\ViewModels\\HardDeleteReflowRequest.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\PackageValidationViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\ValidationPageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\ISupportRequestService.cs\" />\n<Content Include=\"Areas\\Admin\\Views\\SecurityPolicy\\Index.cshtml\" />\n<Content Include=\"Areas\\Admin\\Views\\ReservedNamespace\\Index.cshtml\" />\n<Content Include=\"Areas\\Admin\\Views\\Validation\\Index.cshtml\" />\n+ <Content Include=\"Areas\\Admin\\Views\\Delete\\Reflow.cshtml\" />\n+ <Content Include=\"Areas\\Admin\\Views\\Delete\\_ReflowBulk.cshtml\" />\n+ <Content Include=\"Areas\\Admin\\Views\\Delete\\_ReflowBulkConfirm.cshtml\" />\n<None Include=\"Scripts\\jquery-1.11.0.intellisense.js\" />\n<Content Include=\"Scripts\\jquery-1.11.0.js\" />\n<Content Include=\"Scripts\\jquery-1.11.0.min.js\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageDeleteService.cs",
"new_path": "src/NuGetGallery/Services/IPackageDeleteService.cs",
"diff": "@@ -10,5 +10,6 @@ public interface IPackageDeleteService\n{\nTask SoftDeletePackagesAsync(IEnumerable<Package> packages, User deletedBy, string reason, string signature);\nTask HardDeletePackagesAsync(IEnumerable<Package> packages, User deletedBy, string reason, string signature, bool deleteEmptyPackageRegistration);\n+ Task ReflowHardDeletedPackageAsync(string id, string version);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"diff": "@@ -33,6 +33,7 @@ public class PackageDeleteService\nEND\";\nprivate readonly IEntityRepository<Package> _packageRepository;\n+ private readonly IEntityRepository<PackageRegistration> _packageRegistrationRepository;\nprivate readonly IEntityRepository<PackageDelete> _packageDeletesRepository;\nprivate readonly IEntitiesContext _entitiesContext;\nprivate readonly IPackageService _packageService;\n@@ -42,6 +43,7 @@ public class PackageDeleteService\npublic PackageDeleteService(\nIEntityRepository<Package> packageRepository,\n+ IEntityRepository<PackageRegistration> packageRegistrationRepository,\nIEntityRepository<PackageDelete> packageDeletesRepository,\nIEntitiesContext entitiesContext,\nIPackageService packageService,\n@@ -50,6 +52,7 @@ public class PackageDeleteService\nIAuditingService auditingService)\n{\n_packageRepository = packageRepository;\n+ _packageRegistrationRepository = packageRegistrationRepository;\n_packageDeletesRepository = packageDeletesRepository;\n_entitiesContext = entitiesContext;\n_packageService = packageService;\n@@ -168,6 +171,52 @@ public async Task HardDeletePackagesAsync(IEnumerable<Package> packages, User de\nUpdateSearchIndex();\n}\n+ public Task ReflowHardDeletedPackageAsync(string id, string version)\n+ {\n+ if (string.IsNullOrEmpty(id))\n+ {\n+ throw new UserSafeException(\"Must supply an ID for the hard-deleted package to reflow.\");\n+ }\n+\n+ if (string.IsNullOrEmpty(version))\n+ {\n+ throw new UserSafeException(\"Must supply a version for the hard-deleted package to reflow.\");\n+ }\n+\n+ var normalizedId = id.ToLowerInvariant();\n+ if (!NuGetVersion.TryParse(version, out var normalizedVersion))\n+ {\n+ throw new UserSafeException($\"{version} is not a valid version string!\");\n+ }\n+\n+ var normalizedVersionString = normalizedVersion.ToNormalizedString();\n+\n+ var existingPackageRegistration = _packageRegistrationRepository.GetAll()\n+ .SingleOrDefault(p => p.Id == normalizedId);\n+\n+ if (existingPackageRegistration != null)\n+ {\n+ var existingPackage = _packageRepository.GetAll()\n+ .Where(p => p.PackageRegistrationKey == existingPackageRegistration.Key)\n+ .SingleOrDefault(p => p.NormalizedVersion == normalizedVersionString);\n+\n+ if (existingPackage != null)\n+ {\n+ throw new UserSafeException($\"The package {id} {normalizedVersion} exists! You can only reflow hard-deleted packages that do not exist.\");\n+ }\n+ }\n+\n+ var auditRecord = new PackageAuditRecord(\n+ normalizedId,\n+ normalizedVersionString,\n+ hash: string.Empty,\n+ packageRecord: null,\n+ registrationRecord: null,\n+ action: AuditedPackageAction.Delete,\n+ reason: \"reflow hard-deleted package\");\n+ return _auditingService.SaveAuditRecordAsync(auditRecord);\n+ }\n+\nprotected virtual async Task ExecuteSqlCommandAsync(Database database, string sql, params object[] parameters)\n{\nawait database.ExecuteSqlCommandAsync(sql, parameters);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Areas/Admin/Controllers/DeleteControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Areas/Admin/Controllers/DeleteControllerFacts.cs",
"diff": "@@ -54,6 +54,8 @@ public abstract class FactsBase : TestContainer\nprotected string _query;\nprotected readonly List<Package> _packages;\nprotected readonly Mock<IPackageService> _packageService;\n+ protected readonly Mock<IPackageDeleteService> _packageDeleteService;\n+ protected readonly Mock<ITelemetryService> _telemetryService;\nprotected readonly Mock<HttpContextBase> _httpContextBase;\nprotected readonly DeleteController _target;\n@@ -96,9 +98,14 @@ public FactsBase()\n_packageService\n.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>()))\n.Returns(() => new PackageRegistration { Packages = _packages });\n+\n+ _packageDeleteService = new Mock<IPackageDeleteService>();\n+\n+ _telemetryService = new Mock<ITelemetryService>();\n+\n_httpContextBase = new Mock<HttpContextBase>();\n- _target = new DeleteController(_packageService.Object);\n+ _target = new DeleteController(_packageService.Object, _packageDeleteService.Object, _telemetryService.Object);\nTestUtility.SetupHttpContextMockForUrlGeneration(_httpContextBase, _target);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"diff": "using System.Data.Entity;\nusing System.Data.SqlClient;\nusing System.IO;\n+using System.Linq;\nusing System.Threading.Tasks;\nusing Moq;\nusing NuGetGallery.Auditing;\n@@ -18,6 +19,7 @@ public class PackageDeleteServiceFacts\nprivate static IPackageDeleteService CreateService(\nMock<IEntityRepository<Package>> packageRepository = null,\n+ Mock<IEntityRepository<PackageRegistration>> packageRegistrationRepository = null,\nMock<IEntityRepository<PackageDelete>> packageDeletesRepository = null,\nMock<IEntitiesContext> entitiesContext = null,\nMock<IPackageService> packageService = null,\n@@ -27,6 +29,7 @@ public class PackageDeleteServiceFacts\nAction<Mock<TestPackageDeleteService>> setup = null)\n{\npackageRepository = packageRepository ?? new Mock<IEntityRepository<Package>>();\n+ packageRegistrationRepository = packageRegistrationRepository ?? new Mock<IEntityRepository<PackageRegistration>>();\npackageDeletesRepository = packageDeletesRepository ?? new Mock<IEntityRepository<PackageDelete>>();\nvar dbContext = new Mock<DbContext>();\n@@ -41,6 +44,7 @@ public class PackageDeleteServiceFacts\nvar packageDeleteService = new Mock<TestPackageDeleteService>(\npackageRepository.Object,\n+ packageRegistrationRepository.Object,\npackageDeletesRepository.Object,\nentitiesContext.Object,\npackageService.Object,\n@@ -63,8 +67,8 @@ public class TestPackageDeleteService\n{\npublic PackageAuditRecord LastAuditRecord { get; set; }\n- public TestPackageDeleteService(IEntityRepository<Package> packageRepository, IEntityRepository<PackageDelete> packageDeletesRepository, IEntitiesContext entitiesContext, IPackageService packageService, IIndexingService indexingService, IPackageFileService packageFileService, IAuditingService auditingService)\n- : base(packageRepository, packageDeletesRepository, entitiesContext, packageService, indexingService, packageFileService, auditingService)\n+ public TestPackageDeleteService(IEntityRepository<Package> packageRepository, IEntityRepository<PackageRegistration> packageRegistrationRepository, IEntityRepository<PackageDelete> packageDeletesRepository, IEntitiesContext entitiesContext, IPackageService packageService, IIndexingService indexingService, IPackageFileService packageFileService, IAuditingService auditingService)\n+ : base(packageRepository, packageRegistrationRepository, packageDeletesRepository, entitiesContext, packageService, indexingService, packageFileService, auditingService)\n{\n}\n@@ -559,5 +563,63 @@ public async Task WillCreateAuditRecordUsingAuditService()\nauditingService.Verify(x => x.SaveAuditRecordAsync(testService.LastAuditRecord));\n}\n}\n+\n+ public class TheReflowHardDeletedPackagesAsyncMethod\n+ {\n+ [Fact]\n+ public Task FailsIfPackageExists()\n+ {\n+ var id = \"a\";\n+ var version = \"1.0.0\";\n+ return ReflowHardDeletedPackage(id, version, id, version, false);\n+ }\n+\n+ [Fact]\n+ public Task SucceedsIfRegistrationExistsButNotPackage()\n+ {\n+ var id = \"a\";\n+ var version = \"1.0.0\";\n+ var existingVersion = \"2.0.0\";\n+ return ReflowHardDeletedPackage(id, version, id, existingVersion, true);\n+ }\n+\n+ [Fact]\n+ public Task SucceedsIfRegistrationDoesNotExist()\n+ {\n+ var id = \"a\";\n+ var version = \"1.0.0\";\n+ var existingId = \"b\";\n+ var existingVersion = \"2.0.0\";\n+ return ReflowHardDeletedPackage(id, version, existingId, existingVersion, true);\n+ }\n+\n+ private async Task ReflowHardDeletedPackage(string id, string version, string existingId, string existingVersion, bool succeeds)\n+ {\n+ var packageRegistrationKey = 1;\n+ var packageRegistration = new PackageRegistration { Key = packageRegistrationKey, Id = existingId };\n+ var package = new Package { PackageRegistrationKey = packageRegistrationKey, NormalizedVersion = existingVersion };\n+\n+ var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n+ packageRegistrationRepository.Setup(x => x.GetAll()).Returns(new PackageRegistration[] { packageRegistration }.AsQueryable());\n+\n+ var packageRepository = new Mock<IEntityRepository<Package>>();\n+ packageRepository.Setup(x => x.GetAll()).Returns(new Package[] { package }.AsQueryable());\n+\n+ var auditingService = new Mock<IAuditingService>();\n+\n+ var service = CreateService(packageRepository: packageRepository, packageRegistrationRepository: packageRegistrationRepository, auditingService: auditingService);\n+\n+ if (succeeds)\n+ {\n+ await service.ReflowHardDeletedPackageAsync(id, version);\n+ }\n+ else\n+ {\n+ await Assert.ThrowsAsync<ArgumentException>(() => service.ReflowHardDeletedPackageAsync(id, version));\n+ }\n+\n+ auditingService.Verify(x => x.SaveAuditRecordAsync(It.IsAny<AuditRecord>()), succeeds ? Times.Once() : Times.Never());\n+ }\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add ability to reflow hard-deletes from Admin area (#4899)
|
455,776 |
30.10.2017 16:09:45
| 25,200 |
49833afe3e7ee36dd0de3cc5f9262b27e0241f35
|
Fix permission-related renaming issue
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "}\n</div>\n- @if (Model.HasPermission(User, Permission.Edit) ||\n- Model.HasPermission(User, Permission.ManagePackageOwners) ||\n- Model.HasPermission(User, Permission.Delete))\n+ @if (Model.HasPermission(User, PackageAction.Edit) ||\n+ Model.HasPermission(User, PackageAction.ManagePackageOwners) ||\n+ Model.HasPermission(User, PackageAction.Unlist))\n{\n<ul class=\"package-list manage-package\">\n- @if (Model.HasPermission(User, Permission.Edit))\n+ @if (Model.HasPermission(User, PackageAction.Edit))\n{\n<li>\n<a href=\"@Url.EditPackage(Model.Id, Model.Version)\" class=\"icon-link\">\n</a>\n</li>\n}\n- @if (Model.HasPermission(User, Permission.ManagePackageOwners))\n+ @if (Model.HasPermission(User, PackageAction.ManagePackageOwners))\n{\n<li>\n<a href=\"@Url.ManagePackageOwners(Model)\" class=\"icon-link\">\n</a>\n</li>\n}\n- @if (Model.HasPermission(User, Permission.Delete))\n+ @if (Model.HasPermission(User, PackageAction.Unlist))\n{\n<li>\n<a href=\"@Url.DeletePackage(Model)\" class=\"icon-link\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix permission-related renaming issue (#4929)
|
455,776 |
30.10.2017 17:37:02
| 25,200 |
03cbec9314d017d3ecd6bf4d0daa97b09a7df2aa
|
Fix hard delete reflow test
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"diff": "@@ -615,7 +615,7 @@ private async Task ReflowHardDeletedPackage(string id, string version, string ex\n}\nelse\n{\n- await Assert.ThrowsAsync<ArgumentException>(() => service.ReflowHardDeletedPackageAsync(id, version));\n+ await Assert.ThrowsAsync<UserSafeException>(() => service.ReflowHardDeletedPackageAsync(id, version));\n}\nauditingService.Verify(x => x.SaveAuditRecordAsync(It.IsAny<AuditRecord>()), succeeds ? Times.Once() : Times.Never());\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix hard delete reflow test (#4931)
|
455,794 |
31.10.2017 14:42:35
| 25,200 |
c326c231d9ccebd4417bdc05a0f1d9efc13a556d
|
OwinStartup NullRef fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -41,6 +41,7 @@ protected override void Load(ContainerBuilder builder)\n{\nvar telemetryClient = TelemetryClientWrapper.Instance;\nbuilder.RegisterInstance(telemetryClient)\n+ .AsSelf()\n.As<ITelemetryClient>()\n.SingleInstance();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
OwinStartup NullRef fix (#4937)
|
455,794 |
02.11.2017 11:26:11
| 25,200 |
02cb9089ac43cfc4d777289e01f427f5f42ef999
|
Add owner scope to API keys
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -91,6 +91,12 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\nmodelBuilder.Entity<Scope>()\n.HasKey(c => c.Key);\n+ modelBuilder.Entity<Scope>()\n+ .HasOptional(sc => sc.Owner)\n+ .WithMany()\n+ .HasForeignKey(sc => sc.OwnerKey)\n+ .WillCascadeOnDelete(false);\n+\nmodelBuilder.Entity<Scope>()\n.HasRequired<Credential>(sc => sc.Credential)\n.WithMany(cr => cr.Scopes)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -235,9 +235,9 @@ public async virtual Task<ActionResult> CreatePackageVerificationKeyAsync(string\n// symbols and the VerifyPackageKey callback returns the appropriate response. For this reason, we\n// always create a temp key scoped to the unverified package ID here and defer package and owner\n// validation until the VerifyPackageKey call.\n+ var user = GetCurrentUser();\nvar credential = CredentialBuilder.CreatePackageVerificationApiKey(id);\n- var user = GetCurrentUser();\nawait AuthenticationService.AddCredential(user, credential);\nTelemetryService.TrackCreatePackageVerificationKeyEvent(id, version, user, User.Identity);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201711021733062_ApiKeyOwnerScope.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 ApiKeyOwnerScope : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(ApiKeyOwnerScope));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201711021733062_ApiKeyOwnerScope\"; }\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/201711021733062_ApiKeyOwnerScope.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class ApiKeyOwnerScope : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ AddColumn(\"dbo.Scopes\", \"OwnerKey\", c => c.Int());\n+ CreateIndex(\"dbo.Scopes\", \"OwnerKey\");\n+ AddForeignKey(\"dbo.Scopes\", \"OwnerKey\", \"dbo.Users\", \"Key\");\n+ }\n+\n+ public override void Down()\n+ {\n+ DropForeignKey(\"dbo.Scopes\", \"OwnerKey\", \"dbo.Users\");\n+ DropIndex(\"dbo.Scopes\", new[] { \"OwnerKey\" });\n+ DropColumn(\"dbo.Scopes\", \"OwnerKey\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201710301857232_Organizations.Designer.cs\">\n<DependentUpon>201710301857232_Organizations.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201711021733062_ApiKeyOwnerScope.cs\" />\n+ <Compile Include=\"Migrations\\201711021733062_ApiKeyOwnerScope.Designer.cs\">\n+ <DependentUpon>201711021733062_ApiKeyOwnerScope.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"Services\\AsynchronousPackageValidationInitiator.cs\" />\n<Compile Include=\"Services\\CloudBlobFileStorageService.cs\" />\n<Compile Include=\"Services\\IFileStorageService.cs\" />\n<EmbeddedResource Include=\"Migrations\\201710301857232_Organizations.resx\">\n<DependentUpon>201710301857232_Organizations.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201711021733062_ApiKeyOwnerScope.resx\">\n+ <DependentUpon>201711021733062_ApiKeyOwnerScope.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add owner scope to API keys (#4935)
|
455,790 |
06.11.2017 14:22:11
| 28,800 |
5851eedb65f6602823d5c11421cca65f5807bba3
|
Updating package delete page
Fixing the package delete page to remove outdated and potentially misleading content and adding a pointed to docs which is significantly easier to maintain. Fixing issue
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"diff": "{\n@ViewHelpers.AlertInfo(\n@<text>\n- Note - Permanently deleting packages is not supported, but you can control how they are listed.\n+ You can control how your packages are listed using the checkbox below. Permanent deletion is not supported. <a href=\"https://docs.microsoft.com/en-us/nuget/policies/deleting-packages\">Read more</a>\n</text>\n)\n- <h3>Why can't I delete my package?</h3>\n- <p>\n- We only permanently delete NuGet packages in exceptional situations, such as\n- packages that contain passwords, malicious/harmful code, etc. For more information,\n- please refer to our <a href=\"https://docs.microsoft.com/en-us/nuget/policies/deleting-packages\">documentation</a>.\n- </p>\n- <p>\n- Unlisting the package will prevent users from finding it by searching the gallery and it will prevent the package manager from discovering the package.\n- However, the package will still be available for download through <a href=\"https://docs.nuget.org/docs/reference/package-restore\">NuGet Package Restore</a> so that existing projects referencing the package don't become broken.\n- </p>\n- <p>\n- If you need the package permanently removed, click on the <a href=\"@Url.ReportAbuse(Model.Id, Model.Version)\" title=\"Contact Support\">Contact Support</a> link and we'll take care\n- of it for you. <b>PLEASE ONLY DO THIS IF THERE IS AN URGENT PROBLEM WITH THE PACKAGE.</b>\n- (Passwords, malicious code, etc). Even if you remove it, it's prudent to immediately\n- reset any passwords/sensitive data you accidentally pushed instead of waiting for us to delete\n- the package.\n- </p>\n}\n@using (Html.BeginForm(\"UpdateListed\", \"Packages\"))\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Updating package delete page
Fixing the package delete page to remove outdated and potentially misleading content and adding a pointed to docs which is significantly easier to maintain. Fixing issue https://github.com/NuGet/NuGetGallery/issues/4960
|
455,737 |
08.11.2017 13:39:11
| 28,800 |
98cf91c6bb4009186bd8bfc77e037c079d8e1126
|
Update ReportAbuseViewModel in tests to include signature for new reason.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1807,6 +1807,7 @@ public async Task SendsMessageToGalleryOwnerWithEmailOnlyWhenUnauthenticated()\nMessage = \"Mordor took my finger.\",\nReason = ReportPackageReason.ViolatesALicenseIOwn,\nAlreadyContactedOwner = true,\n+ Signature = \"Frodo\"\n};\nTestUtility.SetupUrlHelper(controller, httpContext);\n@@ -1847,7 +1848,8 @@ public async Task SendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated()\nvar model = new ReportAbuseViewModel\n{\nMessage = \"Mordor took my finger\",\n- Reason = ReportPackageReason.ViolatesALicenseIOwn\n+ Reason = ReportPackageReason.ViolatesALicenseIOwn,\n+ Signature = \"Frodo\"\n};\nTestUtility.SetupUrlHelper(controller, httpContext);\n@@ -1913,6 +1915,7 @@ public async Task HtmlEncodesMessageContent()\nMessage = \"I like the cut of your jib. It's <b>bold</b>.\",\nReason = ReportPackageReason.ViolatesALicenseIOwn,\nAlreadyContactedOwner = true,\n+ Signature = \"Frodo\"\n};\nTestUtility.SetupUrlHelper(controller, httpContext);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update ReportAbuseViewModel in tests to include signature for new reason. (#4970)
|
455,794 |
08.11.2017 15:20:35
| 28,800 |
fc894c63cef36e73e2901ed6f0470794a0d0533e
|
Fixing ApiScopeRequiredAttribute regression
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Filters/ApiScopeRequiredAttribute.cs",
"new_path": "src/NuGetGallery/Filters/ApiScopeRequiredAttribute.cs",
"diff": "@@ -13,7 +13,7 @@ namespace NuGetGallery.Filters\npublic sealed class ApiScopeRequiredAttribute\n: AuthorizeAttribute\n{\n- public string[] ScopeActions { get; set; }\n+ public string[] ScopeActions { get; private set; }\npublic ApiScopeRequiredAttribute(params string[] scopeActions)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Extensions\\PrincipalExtensionsFacts.cs\" />\n<Compile Include=\"Extensions\\ScopeExtensionsFacts.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsFacts.cs\" />\n+ <Compile Include=\"Filters\\ApiScopeRequiredAttributeFacts.cs\" />\n<Compile Include=\"Framework\\TestGalleryConfigurationService.cs\" />\n<Compile Include=\"Helpers\\HtmlExtensionsFacts.cs\" />\n<Compile Include=\"HttpContextBaseExtensionsFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fixing ApiScopeRequiredAttribute regression (#4968)
|
455,794 |
09.11.2017 11:46:34
| 28,800 |
773c080eb5c2e6e6a88d202e3b04b67c7dfcedfa
|
Hotfix for legacy api keys
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/PrincipalExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/PrincipalExtensions.cs",
"diff": "@@ -62,7 +62,7 @@ public static List<Scope> GetScopesFromClaim(this IIdentity self)\n{\nvar claim = GetScopeClaim(self);\n- return string.IsNullOrWhiteSpace(claim)?\n+ return IsEmptyScopeClaim(claim)?\nnull : JsonConvert.DeserializeObject<List<Scope>>(claim);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Extensions/PrincipalExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Extensions/PrincipalExtensionsFacts.cs",
"diff": "@@ -117,6 +117,21 @@ public void WhenNoScopeClaims_ReturnsNull()\nAssert.Equal(null, identity.GetScopesFromClaim());\n}\n+\n+ [Theory]\n+ [InlineData(\"\")]\n+ [InlineData(\" \")]\n+ [InlineData(\"[]\")]\n+ public void WhenEmptyScopeClaim_ReturnsNull(string scopeClaim)\n+ {\n+ var identity = AuthenticationService.CreateIdentity(\n+ new User(\"user\"),\n+ AuthenticationTypes.ApiKey,\n+ new Claim(NuGetClaims.ApiKey, string.Empty),\n+ new Claim(NuGetClaims.Scope, scopeClaim));\n+\n+ Assert.Equal(null, identity.GetScopesFromClaim());\n+ }\n}\npublic class TheIsAdministratorMethod\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hotfix for legacy api keys (#4976)
|
455,736 |
09.11.2017 13:21:27
| 28,800 |
320ad6b3c4eb2ad60daca58ec39297b96ecff670
|
Add ShowAuthInHeader to allow status page to hide the auth UI
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"new_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"diff": "@@ -33,6 +33,8 @@ public CookieConsentMessage CookieConsentMessage\nget { return _cookieConsentMessage.Value; }\n}\n+ public bool ShowAuthInHeader => false;\n+\nprotected NuGetViewBase()\n{\n_nugetContext = new Lazy<NuGetContext>(GetNuGetContextThunk(this));\n@@ -78,6 +80,8 @@ public CookieConsentMessage CookieConsentMessage\nget { return _cookieConsentMessage.Value; }\n}\n+ public bool ShowAuthInHeader => false;\n+\nprotected NuGetViewBase()\n{\n_nugetContext = new Lazy<NuGetContext>(NuGetViewBase.GetNuGetContextThunk(this));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "@DisplayNavigationItem(\"Downloads\", Url.Downloads())\n@DisplayNavigationItem(\"Blog\", \"http://blog.nuget.org/\")\n</ul>\n+ @if (ShowAuthInHeader)\n+ {\n<ul class=\"nav navbar-nav navbar-right navbar-seperated\" role=\"menu\">\n@if (!User.Identity.IsAuthenticated)\n{\n</li>\n}\n</ul>\n+ }\n</div>\n</div>\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add ShowAuthInHeader to allow status page to hide the auth UI (#4981)
Progress on https://github.com/NuGet/NuGetGallery/issues/4979
|
455,736 |
09.11.2017 15:48:52
| 28,800 |
d8bfb6e32f0b92dfec863aca0c2f3d5bb249d6c7
|
Enable showing auth in header for gallery (status will set these values to false)
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"new_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"diff": "@@ -33,7 +33,7 @@ public CookieConsentMessage CookieConsentMessage\nget { return _cookieConsentMessage.Value; }\n}\n- public bool ShowAuthInHeader => false;\n+ public bool ShowAuthInHeader => true;\nprotected NuGetViewBase()\n{\n@@ -80,7 +80,7 @@ public CookieConsentMessage CookieConsentMessage\nget { return _cookieConsentMessage.Value; }\n}\n- public bool ShowAuthInHeader => false;\n+ public bool ShowAuthInHeader => true;\nprotected NuGetViewBase()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Enable showing auth in header for gallery (status will set these values to false)
|
455,736 |
09.11.2017 12:12:19
| 28,800 |
dc1e9fd7f3d689df73a3dd7cbe4b5db739769858
|
Hide package metadata when the package is deleted
Also, by default show a warning banner (for localhost testings)
Fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n</h1>\n- @if (!StringComparer.OrdinalIgnoreCase.Equals(Model.Id, Model.Title))\n+ @if (!Model.Deleted && !StringComparer.OrdinalIgnoreCase.Equals(Model.Id, Model.Title))\n{\n<div class=\"ms-fontSize-xl\">\n@Html.BreakWord(Model.Title)\n}\n</div>\n- @if (!String.IsNullOrWhiteSpace(Model.Description))\n+ @if (!Model.Deleted && !String.IsNullOrWhiteSpace(Model.Description))\n{\n<p>@Html.PreFormattedText(Model.Description)</p>\n}\n}\n}\n- @if (!String.IsNullOrEmpty(Model.MinClientVersion))\n+ @if (!Model.Deleted && !String.IsNullOrEmpty(Model.MinClientVersion))\n{\n<p>Requires NuGet @Model.MinClientVersion or higher.</p>\n}\n</div>\n}\n- @if (Model.ReadMeHtml != null)\n+ @if (!Model.Deleted)\n+ {\n+ if (Model.ReadMeHtml != null)\n{\n<div id=\"readme-collapser-container\">\n<h2>\n</div>\n}\n- @if (!String.IsNullOrWhiteSpace(Model.ReleaseNotes))\n+ if (!String.IsNullOrWhiteSpace(Model.ReleaseNotes))\n{\n<h2>Release Notes</h2>\n<p>@Html.PreFormattedText(Model.ReleaseNotes)</p>\n}\n- @if (Model.Dependencies.DependencySets == null)\n+ if (Model.Dependencies.DependencySets == null)\n{\nif (Model.IsActionAllowed(User, PackageActions.DisplayPrivatePackage))\n{\n<p class=\"collapse in\" id=\"dependency-groups\">This package has no dependencies.</p>\n}\n}\n+ }\n<h2>\n<a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#version-history\"\n<i class=\"ms-Icon ms-Icon--History\" aria-hidden=\"true\"></i>\nlast updated <span data-datetime=\"@Model.LastUpdated.ToString(\"O\")\">@Model.LastUpdated.ToNuGetShortDateString()</span>\n</li>\n- @if (PackageHelper.ShouldRenderUrl(Model.ProjectUrl))\n+ @if (!Model.Deleted && PackageHelper.ShouldRenderUrl(Model.ProjectUrl))\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Globe\" aria-hidden=\"true\"></i>\n</a>\n</li>\n}\n- @if (PackageHelper.ShouldRenderUrl(Model.LicenseUrl))\n+ @if (!Model.Deleted && PackageHelper.ShouldRenderUrl(Model.LicenseUrl))\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Certificate\" aria-hidden=\"true\"></i>\n}\n</ul>\n+ @if (!Model.Deleted)\n+ {\n+ if (!String.IsNullOrEmpty(Model.Authors))\n+ {\n<h2>Authors</h2>\n<p>@Model.Authors</p>\n+ }\n- @if (!String.IsNullOrEmpty(Model.Copyright))\n+ if (!String.IsNullOrEmpty(Model.Copyright))\n{\n<h2>Copyright</h2>\n<p>@Model.Copyright</p>\n}\n- @if (Model.Tags.AnySafe())\n+ if (Model.Tags.AnySafe())\n{\n<h2>Tags</h2>\n<p>\n}\n</p>\n}\n+ }\n@if (Model.Available)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Gallery.Environment\" value=\"Development\" />\n<!-- banner warning on the top - leave blank to remove the banner from the site. -->\n- <add key=\"Gallery.WarningBanner\" value=\"\" />\n+ <add key=\"Gallery.WarningBanner\" value=\"This is the local development environment.\" />\n<add key=\"Gallery.FacebookAppId\" value=\"\" />\n<!-- Set this if you have a Application Insights instrumentation key to use for your gallery deployment -->\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hide package metadata when the package is deleted (#4973)
Also, by default show a warning banner (for localhost testings)
Fix https://github.com/NuGet/NuGetGallery/issues/4717
|
455,772 |
13.11.2017 09:37:09
| 28,800 |
590aa08d69dafa4b8a0d2f0b9096f3e8a0250461
|
Fix test VerifyPackageKey_Returns404ForMissingPackage
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"diff": "@@ -123,7 +123,16 @@ public async Task VerifyPackageKey_Returns200IfPackageVerifyScopePolicyMet()\n[Category(\"P1Tests\")]\npublic async Task VerifyPackageKey_Returns404ForMissingPackage()\n{\n- Assert.Equal(HttpStatusCode.NotFound, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, \"VerifyPackageKeyReturns404ForMissingPackage\", \"1.0.0\"));\n+ // Arrange\n+ var packageId = $\"VerifyPackageKey_Returns404ForMissingPackage.{DateTimeOffset.UtcNow.Ticks}\";\n+ var packageVersion = \"1.0.0\";\n+\n+ await _clientSdkHelper.UploadNewPackage(packageId, packageVersion);\n+\n+ var verificationKey = await CreateVerificationKey(EnvironmentSettings.TestAccountApiKey, packageId, packageVersion);\n+\n+ // Act & Assert\n+ Assert.Equal(HttpStatusCode.NotFound, await VerifyPackageKey(verificationKey, packageId + \"_bad\", packageVersion));\n}\n[DefaultSecurityPoliciesEnforcedFact(runIfEnforced: false)]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix test VerifyPackageKey_Returns404ForMissingPackage (#4985)
|
455,744 |
14.11.2017 12:56:58
| 28,800 |
56606c5f679ee20b2302ab4da52a634c7a200e96
|
Not showing "indexing" message while validation is in progress.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": ")\n}\n- @if (Model.Listed && Model.IsIndexed.HasValue && !Model.IsIndexed.Value)\n+ @if (Model.Listed && Model.IsIndexed.HasValue && !Model.IsIndexed.Value && !Model.Validating)\n{\n@ViewHelpers.AlertWarning(\n@<text>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Not showing "indexing" message while validation is in progress. (#5000)
|
455,747 |
15.11.2017 16:51:06
| 28,800 |
767b46cbb7e25ce463659f1854df1c25e62627cd
|
Fix web ui test for signin flow
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/UrlHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/UrlHelper.cs",
"diff": "@@ -13,7 +13,7 @@ public class UrlHelper\nprivate const string _logonPageUrlSuffix = \"users/account/LogOnNuGetAccount\";\nprivate const string _editUrlSuffix = \"packages/{0}/{1}/Edit\";\nprivate const string _cancelUrlSuffix = \"packages/manage/cancel-upload\";\n- private const string _signInPageUrlSuffix = \"users/account/SignInNuGetAccount\";\n+ private const string _signInPageUrlSuffix = \"users/account/SignIn\";\nprivate const string _logOffPageUrlSuffix = \"users/account/LogOff?returnUrl=%2F\";\nprivate const string _logonPageUrlOnPackageUploadSuffix = \"users/account/LogOn?ReturnUrl=%2fpackages%2fupload\";\nprivate const string _packagesPageUrlSuffix = \"packages\";\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix web ui test for signin flow (#5012)
|
455,794 |
16.11.2017 07:39:48
| 28,800 |
9977aaa840ed47c35be5e0610e4162fe0180bd6f
|
Add ApiKey owner scope auditing
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CredentialAuditRecord.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CredentialAuditRecord.cs",
"diff": "@@ -43,7 +43,8 @@ public CredentialAuditRecord(Credential credential, bool removed)\nScopes = new List<ScopeAuditRecord>();\nforeach (var scope in credential.Scopes)\n{\n- Scopes.Add(new ScopeAuditRecord(scope.Subject, scope.AllowedAction));\n+ var ownerScope = scope.Owner?.Username;\n+ Scopes.Add(new ScopeAuditRecord(ownerScope, scope.Subject, scope.AllowedAction));\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/ScopeAuditRecord.cs",
"new_path": "src/NuGetGallery.Core/Auditing/ScopeAuditRecord.cs",
"diff": "@@ -5,11 +5,13 @@ namespace NuGetGallery.Auditing\n{\npublic class ScopeAuditRecord\n{\n+ public string OwnerUsername { get; set; }\npublic string Subject { get; set; }\npublic string AllowedAction { get; set; }\n- public ScopeAuditRecord(string subject, string allowedAction)\n+ public ScopeAuditRecord(string ownerUsername, string subject, string allowedAction)\n{\n+ OwnerUsername = ownerUsername;\nSubject = subject;\nAllowedAction = allowedAction;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/ScopeAuditRecordTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/ScopeAuditRecordTests.cs",
"diff": "@@ -8,13 +8,14 @@ namespace NuGetGallery.Auditing\npublic class ScopeAuditRecordTests\n{\n[Theory]\n- [InlineData(null, null)]\n- [InlineData(\"\", \"\")]\n- [InlineData(\"a\", \"b\")]\n- public void Constructor_SetsProperties(string subject, string allowedAction)\n+ [InlineData(null, null, null)]\n+ [InlineData(\"\", \"\", \"\")]\n+ [InlineData(\"a\", \"b\", \"c\")]\n+ public void Constructor_SetsProperties(string owner, string subject, string allowedAction)\n{\n- var entry = new ScopeAuditRecord(subject, allowedAction);\n+ var entry = new ScopeAuditRecord(owner, subject, allowedAction);\n+ Assert.Equal(owner, entry.OwnerUsername);\nAssert.Equal(subject, entry.Subject);\nAssert.Equal(allowedAction, entry.AllowedAction);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add ApiKey owner scope auditing (#5011)
|
455,747 |
17.11.2017 11:05:45
| 28,800 |
9995d9d3c6b9726c16f2edd1fe73c190ca760b1b
|
Fix missing validation errors in UI and add credential telemetry
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -461,6 +461,8 @@ public virtual async Task AddCredential(User user, Credential credential)\nawait Auditing.SaveAuditRecordAsync(new UserAuditRecord(user, AuditedUserAction.AddCredential, credential));\nuser.Credentials.Add(credential);\nawait Entities.SaveChangesAsync();\n+\n+ _telemetryService.TrackNewCredentialCreated(user, credential);\n}\npublic virtual CredentialViewModel DescribeCredential(Credential credential)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -144,7 +144,7 @@ public virtual async Task<ActionResult> SignIn(LogOnViewModel model, string retu\nmodelErrorMessage = string.Format(CultureInfo.CurrentCulture, Strings.UserAccountLocked, timeRemaining);\n}\n- ModelState.AddModelError(\"SignInNuGetAccount\", modelErrorMessage);\n+ ModelState.AddModelError(\"SignIn\", modelErrorMessage);\nreturn SignInOrExternalLinkView(model, linkingAccount);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -23,6 +23,8 @@ public interface ITelemetryService\nvoid TrackNewUserRegistrationEvent(User user, Credential identity);\n+ void TrackNewCredentialCreated(User user, Credential credential);\n+\n/// <summary>\n/// Create a trace for an exception. These are informational for support requests.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -22,6 +22,7 @@ internal class Events\npublic const string PackageReadMeChanged = \"PackageReadMeChanged\";\npublic const string PackagePushNamespaceConflict = \"PackagePushNamespaceConflict\";\npublic const string NewUserRegistration = \"NewUserRegistration\";\n+ public const string CredentialAdded = \"CredentialAdded\";\n}\nprivate IDiagnosticsSource _diagnosticsSource;\n@@ -158,6 +159,16 @@ public void TrackVerifyPackageKeyEvent(string packageId, string packageVersion,\n}\npublic void TrackNewUserRegistrationEvent(User user, Credential credential)\n+ {\n+ TrackAccountActivityForEvent(Events.NewUserRegistration, user, credential);\n+ }\n+\n+ public void TrackNewCredentialCreated(User user, Credential credential)\n+ {\n+ TrackAccountActivityForEvent(Events.CredentialAdded, user, credential);\n+ }\n+\n+ private void TrackAccountActivityForEvent(string eventName, User user, Credential credential)\n{\nif (user == null)\n{\n@@ -169,7 +180,7 @@ public void TrackNewUserRegistrationEvent(User user, Credential credential)\nthrow new ArgumentNullException(nameof(credential));\n}\n- TrackEvent(Events.NewUserRegistration, properties => {\n+ TrackEvent(eventName, properties => {\nproperties.Add(ClientVersion, GetClientVersion());\nproperties.Add(ProtocolVersion, GetProtocolVersion());\nproperties.Add(AccountCreationDate, GetAccountCreationDate(user));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -143,7 +143,7 @@ public async Task WillInvalidateModelStateAndShowTheViewWithErrorsWhenTheUsernam\nResultAssert.IsView(result, viewName: SignInViewNuGetName);\nAssert.False(controller.ModelState.IsValid);\n- Assert.Equal(Strings.UsernameAndPasswordNotFound, controller.ModelState[SignInViewNuGetName].Errors[0].ErrorMessage);\n+ Assert.Equal(Strings.UsernameAndPasswordNotFound, controller.ModelState[SignInViewName].Errors[0].ErrorMessage);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -63,6 +63,10 @@ public static IEnumerable<object[]> TrackEventNames_Data\nyield return new object[] { \"NewUserRegistration\",\n(TrackAction)(s => s.TrackNewUserRegistrationEvent(fakes.User, fakes.User.Credentials.First()))\n};\n+\n+ yield return new object[] { \"CredentialAdded\",\n+ (TrackAction)(s => s.TrackNewUserRegistrationEvent(fakes.User, fakes.User.Credentials.First()))\n+ };\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix missing validation errors in UI and add credential telemetry (#5023)
|
455,737 |
17.11.2017 11:11:06
| 28,800 |
6acdc28cb7614bec7f36d69af3a84dd63116747e
|
Remove extra copyright text from owner support request page.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportMyPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportMyPackage.cshtml",
"diff": "<div id=\"form-field-message\" class=\"form-group @Html.HasErrorFor(m => m.Message)\">\n@Html.ShowLabelFor(m => m.Message)\n<p>\n- Please provide a detailed description of the problem. <span class=\"infringement-claim-requirements\">\n- If you are reporting copyright infringment, please describe the copyrighted material with\n- particularity and provide us with information about your copyright (i.e. title of copyrighted\n- work, URL where to view your copyrighted work, description of your copyrighted work, and any\n- copyright registrations you may have, etc.). For trademark infringement, include the name of\n- your trademark, registration number, and country where registered.</span>\n+ Please provide a detailed description of the problem.\n</p>\n@Html.ShowTextAreaFor(m => m.Message, 10, 50)\n@Html.ShowValidationMessagesFor(m => m.Message)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove extra copyright text from owner support request page.
|
455,736 |
17.11.2017 16:06:36
| 28,800 |
0bc406294b0a7f6ca295683b515b083f569ad5a5
|
Add the required prefix to the validation DB connection string
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -159,7 +159,7 @@ public class AppConfiguration : IAppConfiguration\n/// Gets the SQL Connection string used to connect to the database for validations\n/// </summary>\n[DisplayName(\"ValidationSqlServer\")]\n- [DefaultValue(\"Validation.SqlServer\")]\n+ [DefaultValue(\"ValidationSqlServer\")]\npublic string SqlConnectionStringValidation { get; set; }\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<connectionStrings>\n<add name=\"Gallery.SqlServer\" connectionString=\"Data Source=(localdb)\\mssqllocaldb; Initial Catalog=NuGetGallery; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n<add name=\"Gallery.SupportRequestSqlServer\" connectionString=\"Data Source=(localdb)\\mssqllocaldb; Initial Catalog=SupportRequest; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n- <add name=\"Validation.SqlServer\" connectionString=\"Data Source=(localdb)\\mssqllocaldb; Initial Catalog=Validation; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n+ <add name=\"Gallery.ValidationSqlServer\" connectionString=\"Data Source=(localdb)\\mssqllocaldb; Initial Catalog=Validation; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n</connectionStrings>\n<elmah>\n<security allowRemoteAccess=\"true\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add the required prefix to the validation DB connection string (#5032)
|
455,776 |
17.11.2017 17:12:32
| 28,800 |
cd4cc9fa8ce64aa81dff6329d618312f91eac544
|
Improve performance of the PermissionsService
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PermissionsService.cs",
"new_path": "src/NuGetGallery/Services/PermissionsService.cs",
"diff": "@@ -39,8 +39,7 @@ public static bool IsActionAllowed(User account, IPrincipal currentPrincipal, Pe\n/// </summary>\npublic static bool IsActionAllowed(IEnumerable<User> entityOwners, IPrincipal currentPrincipal, PermissionLevel actionPermissionLevel)\n{\n- var userPermissionLevel = GetPermissionLevel(entityOwners, currentPrincipal);\n- return IsAllowed(userPermissionLevel, actionPermissionLevel);\n+ return HasPermission(entityOwners, currentPrincipal, actionPermissionLevel);\n}\n/// <summary>\n@@ -72,58 +71,55 @@ public static bool IsActionAllowed(User account, User currentUser, PermissionLev\n/// </summary>\npublic static bool IsActionAllowed(IEnumerable<User> entityOwners, User currentUser, PermissionLevel actionPermissionLevel)\n{\n- var userPermissionLevel = GetPermissionLevel(entityOwners, currentUser);\n- return IsAllowed(userPermissionLevel, actionPermissionLevel);\n+ return HasPermission(entityOwners, currentUser, actionPermissionLevel);\n}\n- private static bool IsAllowed(PermissionLevel userPermissionLevel, PermissionLevel actionPermissionLevel)\n- {\n- return (userPermissionLevel & actionPermissionLevel) > 0;\n- }\n-\n- internal static PermissionLevel GetPermissionLevel(IEnumerable<User> owners, User currentUser)\n+ private static bool HasPermission(IEnumerable<User> owners, User currentUser, PermissionLevel actionPermissionLevel)\n{\nif (currentUser == null)\n{\n- return PermissionLevel.Anonymous;\n+ return PermissionLevelsIntersect(PermissionLevel.Anonymous, actionPermissionLevel);\n}\n- return GetPermissionLevel(\n+ return HasPermission(\nowners,\ncurrentUser.IsAdministrator(),\n- u => currentUser.MatchesUser(u));\n+ u => currentUser.MatchesUser(u),\n+ actionPermissionLevel);\n}\n- internal static PermissionLevel GetPermissionLevel(IEnumerable<User> entityOwners, IPrincipal currentPrincipal)\n+ private static bool HasPermission(IEnumerable<User> entityOwners, IPrincipal currentPrincipal, PermissionLevel actionPermissionLevel)\n{\nif (currentPrincipal == null)\n{\n- return PermissionLevel.Anonymous;\n+ return PermissionLevelsIntersect(PermissionLevel.Anonymous, actionPermissionLevel);\n}\n- return GetPermissionLevel(\n+ return HasPermission(\nentityOwners,\ncurrentPrincipal.IsAdministrator(),\n- u => currentPrincipal.MatchesUser(u));\n+ u => currentPrincipal.MatchesUser(u),\n+ actionPermissionLevel);\n}\n- private static PermissionLevel GetPermissionLevel(IEnumerable<User> entityOwners, bool isUserAdmin, Func<User, bool> isUserMatch)\n+ private static bool HasPermission(IEnumerable<User> entityOwners, bool isUserAdmin, Func<User, bool> isUserMatch, PermissionLevel actionPermissionLevel)\n{\n- var permissionLevel = PermissionLevel.Anonymous;\n-\n- if (entityOwners == null)\n+ if ((entityOwners == null || !entityOwners.Any()) &&\n+ PermissionLevelsIntersect(PermissionLevel.Anonymous, actionPermissionLevel))\n{\n- return permissionLevel;\n+ return true;\n}\n- if (isUserAdmin)\n+ if (entityOwners.Any(isUserMatch) &&\n+ PermissionLevelsIntersect(PermissionLevel.Owner, actionPermissionLevel))\n{\n- permissionLevel |= PermissionLevel.SiteAdmin;\n+ return true;\n}\n- if (entityOwners.Any(isUserMatch))\n+ if (isUserAdmin &&\n+ PermissionLevelsIntersect(PermissionLevel.SiteAdmin, actionPermissionLevel))\n{\n- permissionLevel |= PermissionLevel.Owner;\n+ return true;\n}\nvar matchingMembers = entityOwners\n@@ -133,17 +129,24 @@ private static PermissionLevel GetPermissionLevel(IEnumerable<User> entityOwners\n.Where(m => isUserMatch(m.Member))\n.ToArray();\n- if (matchingMembers.Any(m => m.IsAdmin))\n+ if (matchingMembers.Any(m => m.IsAdmin) &&\n+ PermissionLevelsIntersect(PermissionLevel.OrganizationAdmin, actionPermissionLevel))\n{\n- permissionLevel |= PermissionLevel.OrganizationAdmin;\n+ return true;\n}\n- if (matchingMembers.Any())\n+ if (matchingMembers.Any() &&\n+ PermissionLevelsIntersect(PermissionLevel.OrganizationCollaborator, actionPermissionLevel))\n{\n- permissionLevel |= PermissionLevel.OrganizationCollaborator;\n+ return true;\n}\n- return permissionLevel;\n+ return PermissionLevelsIntersect(PermissionLevel.Anonymous, actionPermissionLevel);\n+ }\n+\n+ private static bool PermissionLevelsIntersect(PermissionLevel first, PermissionLevel second)\n+ {\n+ return (first & second) > 0;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PermissionsServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PermissionsServiceFacts.cs",
"diff": "@@ -28,11 +28,17 @@ public enum ReturnsExpectedPermissionLevels_State\nprivate static readonly IEnumerable<ReturnsExpectedPermissionLevels_State> _stateValues =\nEnum.GetValues(typeof(ReturnsExpectedPermissionLevels_State)).Cast<ReturnsExpectedPermissionLevels_State>();\n+ private static readonly int _maxStateValue =\n+ Enum.GetValues(typeof(ReturnsExpectedPermissionLevels_State)).Cast<int>().Max();\n+\n+ private static readonly int _maxPermissionLevel =\n+ Enum.GetValues(typeof(PermissionLevel)).Cast<int>().Max();\n+\npublic static IEnumerable<object[]> ReturnsExpectedPermissionLevels_Data\n{\nget\n{\n- for (int i = 0; i < Enum.GetValues(typeof(ReturnsExpectedPermissionLevels_State)).Cast<int>().Max() * 2; i++)\n+ for (int i = 0; i < _maxStateValue * 2; i++)\n{\nyield return new object[]\n{\n@@ -103,10 +109,17 @@ private void CreateOrganizationOwnerAndAddUserAsMember(List<User> owners, User u\nprivate void AssertPermissionLevels(IEnumerable<User> owners, User user, PermissionLevel expectedLevel)\n{\n- Assert.Equal(expectedLevel, PermissionsService.GetPermissionLevel(owners, user));\n+ for (int i = 0; i < _maxPermissionLevel * 2; i++)\n+ {\n+ var permissionLevel = (PermissionLevel)i;\n+\n+ var shouldSucceed = (permissionLevel & expectedLevel) > 0;\n+\n+ Assert.Equal(shouldSucceed, PermissionsService.IsActionAllowed(owners, user, permissionLevel));\nvar principal = GetPrincipal(user);\n- Assert.Equal(expectedLevel, PermissionsService.GetPermissionLevel(owners, principal));\n+ Assert.Equal(shouldSucceed, PermissionsService.IsActionAllowed(owners, principal, permissionLevel));\n+ }\n}\nprivate IPrincipal GetPrincipal(User u)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Improve performance of the PermissionsService (#5001)
|
455,794 |
20.11.2017 12:44:05
| 28,800 |
2df96487c3e97e1120b82715627ea73cc68363d1
|
Initial work on Manage Packages page (and Delete Account shared code)
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "});\n}\n+@helper UserLinkWithIcon(UrlHelper url, User user) {\n+ <span class=\"ms-noWrap\">\n+ @if (user is Organization)\n+ {\n+ <i class=\"ms-Icon ms-Icon--Group\" aria-hidden=\"true\"></i>\n+ }\n+ <a href=\"@url.User(user.Username)\">@user.Username</a>\n+ </span>\n+}\n+\n@helper WriteMeta(string name, string val) {\nif(!String.IsNullOrEmpty(val)) {\n<meta name=\"deployment-@name\" content=\"@val\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -124,7 +124,6 @@ public virtual ActionResult DeleteRequest()\nPackages = listPackageItems,\nUser = user,\nAccountName = user.Username,\n- HasOrphanPackages = listPackageItems.Any(p => p.Owners.Count <= 1),\nHasPendingRequests = hasPendingRequest\n};\n@@ -179,7 +178,6 @@ public virtual ActionResult Delete(string accountName)\nPackages = listPackageItems,\nUser = user,\nAccountName = user.Username,\n- HasOrphanPackages = listPackageItems.Any(p => p.Owners.Count <= 1)\n};\nreturn View(\"DeleteUserAccount\", model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/UserExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/UserExtensions.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.Mail;\nusing System.Security.Claims;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\nusing System.Collections.Generic;\n+using System.Globalization;\nusing System.Linq;\nusing System.Threading.Tasks;\nusing NuGetGallery.Authentication;\n@@ -66,15 +67,43 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\n{\nthrow new ArgumentNullException(nameof(admin));\n}\n+\nif (userToBeDeleted.IsDeleted)\n{\nreturn new DeleteUserAccountStatus()\n{\nSuccess = false,\n- Description = string.Format(Strings.AccountDelete_AccountAlreadyDeleted, userToBeDeleted.Username),\n+ Description = string.Format(CultureInfo.CurrentCulture,\n+ Strings.AccountDelete_AccountAlreadyDeleted,\n+ userToBeDeleted.Username),\n+ AccountName = userToBeDeleted.Username\n+ };\n+ }\n+\n+ // The deletion of Organization and Organization member accounts is disabled for now.\n+ if (userToBeDeleted is Organization)\n+ {\n+ return new DeleteUserAccountStatus()\n+ {\n+ Success = false,\n+ Description = string.Format(CultureInfo.CurrentCulture,\n+ Strings.AccountDelete_OrganizationDeleteNotImplemented,\n+ userToBeDeleted.Username),\nAccountName = userToBeDeleted.Username\n};\n}\n+ else if (userToBeDeleted.Organizations.Any())\n+ {\n+ return new DeleteUserAccountStatus()\n+ {\n+ Success = false,\n+ Description = string.Format(CultureInfo.CurrentCulture,\n+ Strings.AccountDelete_OrganizationMemberDeleteNotImplemented,\n+ userToBeDeleted.Username),\n+ AccountName = userToBeDeleted.Username\n+ };\n+ }\n+\ntry\n{\nif (commitAsTransaction)\n@@ -93,7 +122,9 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\nreturn new DeleteUserAccountStatus()\n{\nSuccess = true,\n- Description = string.Format(Strings.AccountDelete_Success, userToBeDeleted.Username),\n+ Description = string.Format(CultureInfo.CurrentCulture,\n+ Strings.AccountDelete_Success,\n+ userToBeDeleted.Username),\nAccountName = userToBeDeleted.Username\n};\n}\n@@ -103,7 +134,9 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\nreturn new DeleteUserAccountStatus()\n{\nSuccess = true,\n- Description = string.Format(Strings.AccountDelete_Fail, userToBeDeleted.Username, e),\n+ Description = string.Format(CultureInfo.CurrentCulture,\n+ Strings.AccountDelete_Fail,\n+ userToBeDeleted.Username, e),\nAccountName = userToBeDeleted.Username\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -211,25 +211,33 @@ public virtual Package FindAbsoluteLatestPackageById(string id, int? semVerLevel\nreturn package;\n}\n+ /// <summary>\n+ /// Find packages by owner, including organization owners that the user belongs to.\n+ /// </summary>\npublic IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted)\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+ var ownerKeys = user.Organizations.Select(org => org.OrganizationKey).ToList();\n+ ownerKeys.Insert(0, user.Key);\n+\nvar mergedResults = new Dictionary<string, Package>(StringComparer.OrdinalIgnoreCase);\n- MergeLatestPackagesByOwner(user, includeUnlisted, mergedResults);\n- MergeLatestStablePackagesByOwner(user, includeUnlisted, mergedResults);\n+ MergeLatestPackagesByOwner(ownerKeys, includeUnlisted, mergedResults);\n+ MergeLatestStablePackagesByOwner(ownerKeys, includeUnlisted, mergedResults);\nreturn mergedResults.Values;\n}\n- private void MergeLatestStablePackagesByOwner(User user, bool includeUnlisted, Dictionary<string, Package> mergedResults)\n+ /// <summary>\n+ /// Merge latest stable packages by owner, including organization owners that the user belongs to.\n+ /// </summary>\n+ private void MergeLatestStablePackagesByOwner(List<int> ownerKeys, bool includeUnlisted, Dictionary<string, Package> mergedResults)\n{\nIQueryable<Package> latestStablePackageVersions = _packageRepository.GetAll()\n- .Where(p =>\n- p.PackageRegistration.Owners.Any(owner => owner.Key == user.Key)\n- && (p.IsLatestStable || p.IsLatestStableSemVer2))\n+ .Where(p => p.PackageRegistration.Owners.Any(o => ownerKeys.Contains(o.Key)))\n+ .Where(p => p.IsLatestStable || p.IsLatestStableSemVer2)\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners);\n@@ -253,13 +261,16 @@ private void MergeLatestStablePackagesByOwner(User user, bool includeUnlisted, D\n}\n}\n- private void MergeLatestPackagesByOwner(User user, bool includeUnlisted, Dictionary<string, Package> mergedResults)\n+ /// <summary>\n+ /// Merge latest packages by owner, including organization owners that the user belongs to.\n+ /// </summary>\n+ private void MergeLatestPackagesByOwner(List<int> ownerKeys, bool includeUnlisted, Dictionary<string, Package> mergedResults)\n{\nIQueryable<Package> latestPackageVersions;\nif (includeUnlisted)\n{\nlatestPackageVersions = _packageRegistrationRepository.GetAll()\n- .Where(pr => pr.Owners.Any(owner => owner.Key == user.Key))\n+ .Where(pr => pr.Owners.Any(o => ownerKeys.Contains(o.Key)))\n.Select(pr => pr.Packages.OrderByDescending(p => p.Version).FirstOrDefault())\n.Where(p => p != null)\n.Include(p => p.PackageRegistration)\n@@ -268,9 +279,8 @@ private void MergeLatestPackagesByOwner(User user, bool includeUnlisted, Diction\nelse\n{\nlatestPackageVersions = _packageRepository.GetAll()\n- .Where(p =>\n- p.PackageRegistration.Owners.Any(owner => owner.Key == user.Key)\n- && (p.IsLatest || p.IsLatestSemVer2))\n+ .Where(p => p.PackageRegistration.Owners.Any(o => ownerKeys.Contains(o.Key)))\n+ .Where(p => p.IsLatest || p.IsLatestSemVer2)\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -87,6 +87,24 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Account '{0}' cannot be deleted because it is an organization. The organization must be manually migrated to a user account without memberships before the account can be deleted..\n+ /// </summary>\n+ public static string AccountDelete_OrganizationDeleteNotImplemented {\n+ get {\n+ return ResourceManager.GetString(\"AccountDelete_OrganizationDeleteNotImplemented\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to Account '{0}' cannot be deleted because it is a member of an organization. The user needs to be manually removed from any organizations before the account can be deleted..\n+ /// </summary>\n+ public static string AccountDelete_OrganizationMemberDeleteNotImplemented {\n+ get {\n+ return ResourceManager.GetString(\"AccountDelete_OrganizationMemberDeleteNotImplemented\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The account:{0} was deleted succesfully..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -655,4 +655,10 @@ For more information, please contact '{2}'.</value>\n<data name=\"ApiKeyScopesNotAllowed\" xml:space=\"preserve\">\n<value>The current user does not have permission to create an ApiKey with the specified owner or scopes.</value>\n</data>\n+ <data name=\"AccountDelete_OrganizationDeleteNotImplemented\" xml:space=\"preserve\">\n+ <value>Account '{0}' cannot be deleted because it is an organization. The organization must be manually migrated to a user account without memberships before the account can be deleted.</value>\n+ </data>\n+ <data name=\"AccountDelete_OrganizationMemberDeleteNotImplemented\" xml:space=\"preserve\">\n+ <value>Account '{0}' cannot be deleted because it is a member of an organization. The user needs to be manually removed from any organizations before the account can be deleted.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/_UserPackagesList.cshtml",
"new_path": "src/NuGetGallery/Views/Users/_UserPackagesList.cshtml",
"diff": "<td class=\"align-middle\">\n@foreach (var owner in package.Owners)\n{\n- <a href=\"@Url.User(owner.Username)\">@owner.Username</a>\n+ @ViewHelpers.UserLinkWithIcon(Url, owner);\n}\n</td>\n<td class=\"align-middle text-nowrap\">@package.TotalDownloadCount.ToNuGetNumberString()</td>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/_UserPackagesListForDeletedAccount.cshtml",
"new_path": "src/NuGetGallery/Views/Users/_UserPackagesListForDeletedAccount.cshtml",
"diff": "{\n<tr class=\"manage-package-listing\">\n<td class=\"align-middle \">\n- @if (package.Owners.Count() > 1)\n+ @if (package.HasSingleOwner)\n{\n- <i class=\"ms-Icon ms-Icon--CompletedSolid green-check\" title=\"After account delete the package will still at least one owner.\"></i>\n+ <i class=\"ms-Icon ms-Icon--StatusErrorFull red-check\" title=\"After account delete the package will not have any owners.\"></i>\n}\nelse\n{\n- <i class=\"ms-Icon ms-Icon--StatusErrorFull red-check\" title=\"After account delete the package will not have any owners.\"></i>\n+ <i class=\"ms-Icon ms-Icon--CompletedSolid green-check\" title=\"After account delete the package will still have at least one owner.\"></i>\n}\n</td>\n<td class=\"align-middle hidden-xs\">\n<td class=\"align-middle\">\n@foreach (var owner in package.Owners)\n{\n- <a href=\"@Url.User(owner.Username)\">@owner.Username</a>\n+ @ViewHelpers.UserLinkWithIcon(Url, owner);\n}\n</td>\n<td class=\"align-middle text-nowrap\">@package.TotalDownloadCount.ToNuGetNumberString()</td>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"TestUtils\\TestDataUtility.cs\" />\n<Compile Include=\"TestUtils\\TestUtility.cs\" />\n<Compile Include=\"UrlExtensionsFacts.cs\" />\n+ <Compile Include=\"ViewModels\\DeleteAccountViewModelFacts.cs\" />\n<Compile Include=\"ViewModels\\DependencySetsViewModelFacts.cs\" />\n<Compile Include=\"ViewModels\\DisplayPackageViewModelFacts.cs\" />\n<Compile Include=\"ViewModels\\ListPackageItemViewModelFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Data.Entity;\n+using System.Globalization;\nusing System.Linq;\nusing System.Threading.Tasks;\nusing NuGetGallery.Authentication;\n+using NuGetGallery.Framework;\nusing NuGetGallery.Security;\nusing Xunit;\nusing Moq;\n-\n-namespace NuGetGallery.Services\n+namespace NuGetGallery\n{\npublic class DeleteAccountServiceFacts\n{\npublic class TheDeleteGalleryUserAccountAsyncMethod\n{\n+ [Fact]\n+ public async Task WhenAccountIsOrganization_DoesNotDelete()\n+ {\n+ // Arrange\n+ var fakes = new Fakes();\n+ var testableService = new DeleteAccountTestService(fakes.Organization, fakes.Package);\n+ var deleteAccountService = testableService.GetDeleteAccountService();\n+\n+ // Act\n+ var result = await deleteAccountService.DeleteGalleryUserAccountAsync(\n+ fakes.Organization,\n+ fakes.Admin,\n+ \"signature\",\n+ unlistOrphanPackages: true,\n+ commitAsTransaction: false);\n+\n+ // Assert\n+ Assert.False(result.Success);\n+\n+ var expected = string.Format(CultureInfo.CurrentCulture,\n+ Strings.AccountDelete_OrganizationDeleteNotImplemented,\n+ fakes.Organization.Username);\n+ Assert.Equal(expected, result.Description);\n+ }\n+\n+ [Fact]\n+ public async Task WhenAccountIsOrganizationMember_DoesNotDelete()\n+ {\n+ // Arrange\n+ var fakes = new Fakes();\n+ var testableService = new DeleteAccountTestService(fakes.User, fakes.Package);\n+ var deleteAccountService = testableService.GetDeleteAccountService();\n+\n+ // Act\n+ var result = await deleteAccountService.DeleteGalleryUserAccountAsync(\n+ fakes.User,\n+ fakes.Admin,\n+ \"signature\",\n+ unlistOrphanPackages: true,\n+ commitAsTransaction: false);\n+\n+ // Assert\n+ Assert.False(result.Success);\n+\n+ var expected = string.Format(CultureInfo.CurrentCulture,\n+ Strings.AccountDelete_OrganizationMemberDeleteNotImplemented,\n+ fakes.User.Username);\n+ Assert.Equal(expected, result.Description);\n+ }\n+\n[Fact]\npublic async Task NullUser()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -918,90 +918,122 @@ public void ReturnsTheMostRecentVersionWhenSemVerLevel2()\npublic class TheFindPackagesByOwnerMethod : TestContainer\n{\n- [Fact]\n- public void ReturnsAListedPackage()\n+ public static IEnumerable<object[]> TestData_PackageOwnerVariants\n+ {\n+ get\n+ {\n+ var organization = new Organization { Username = \"organization\" };\n+\n+ var admin = new User { Username = \"admin\" };\n+ var adminMembership = new Membership\n+ {\n+ Organization = organization,\n+ Member = admin,\n+ IsAdmin = true\n+ };\n+ organization.Members.Add(adminMembership);\n+ admin.Organizations.Add(adminMembership);\n+\n+ var collaborator = new User { Username = \"collaborator\" };\n+ var collaboratorMembership = new Membership\n+ {\n+ Organization = organization,\n+ Member = admin,\n+ IsAdmin = false\n+ };\n+ organization.Members.Add(collaboratorMembership);\n+ collaborator.Organizations.Add(collaboratorMembership);\n+\n+ yield return new object[] { admin, admin };\n+ yield return new object[] { admin, organization };\n+ yield return new object[] { collaborator, organization };\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(TestData_PackageOwnerVariants))]\n+ public void ReturnsAListedPackage(User currentUser, User packageOwner)\n{\n- var owner = new User { Username = \"someone\" };\n- var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatestSemVer2 = true, IsLatestStableSemVer2 = true };\npackageRegistration.Packages.Add(package);\nvar context = GetFakeContext();\n- context.Users.Add(owner);\n+ context.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(owner, includeUnlisted: false);\n+ var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false);\nAssert.Equal(1, packages.Count());\n}\n- [Fact]\n- public void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse()\n+ [Theory]\n+ [MemberData(nameof(TestData_PackageOwnerVariants))]\n+ public void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(User currentUser, User packageOwner)\n{\n- var owner = new User { Username = \"someone\" };\n- var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = false, IsLatest = false, IsLatestStable = false };\npackageRegistration.Packages.Add(package);\nvar context = GetFakeContext();\n- context.Users.Add(owner);\n+ context.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(owner, includeUnlisted: false);\n+ var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false);\nAssert.Equal(0, packages.Count());\n}\n- [Fact]\n- public void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue()\n+ [Theory]\n+ [MemberData(nameof(TestData_PackageOwnerVariants))]\n+ public void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(User currentUser, User packageOwner)\n{\n- var owner = new User { Username = \"someone\" };\n- var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = false, IsLatest = false, IsLatestStable = false };\npackageRegistration.Packages.Add(package);\nvar context = GetFakeContext();\n- context.Users.Add(owner);\n+ context.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(owner, includeUnlisted: true);\n+ var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: true);\nAssert.Equal(1, packages.Count());\n}\n- [Fact]\n- public void ReturnsAPackageForEachPackageRegistration()\n+ [Theory]\n+ [MemberData(nameof(TestData_PackageOwnerVariants))]\n+ public void ReturnsAPackageForEachPackageRegistration(User currentUser, User packageOwner)\n{\n- var owner = new User { Username = \"someone\" };\n- var packageRegistrationA = new PackageRegistration { Id = \"idA\", Owners = { owner } };\n- var packageRegistrationB = new PackageRegistration { Id = \"idB\", Owners = { owner } };\n+ var packageRegistrationA = new PackageRegistration { Id = \"idA\", Owners = { packageOwner } };\n+ var packageRegistrationB = new PackageRegistration { Id = \"idB\", Owners = { packageOwner } };\nvar packageA = new Package { Version = \"1.0\", PackageRegistration = packageRegistrationA, Listed = true, IsLatestSemVer2 = true, IsLatestStableSemVer2 = true };\nvar packageB = new Package { Version = \"1.0\", PackageRegistration = packageRegistrationB, Listed = true, IsLatestSemVer2 = true, IsLatestStableSemVer2 = true };\npackageRegistrationA.Packages.Add(packageA);\npackageRegistrationB.Packages.Add(packageB);\nvar context = GetFakeContext();\n- context.Users.Add(owner);\n+ context.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistrationA);\ncontext.PackageRegistrations.Add(packageRegistrationB);\ncontext.Packages.Add(packageA);\ncontext.Packages.Add(packageB);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(owner, includeUnlisted: false).ToList();\n+ var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(2, packages.Count);\nAssert.Contains(packageA, packages);\nAssert.Contains(packageB, packages);\n}\n- [Fact]\n- public void ReturnsOnlyLatestStableSemVer2PackageIfBothExist()\n+ [Theory]\n+ [MemberData(nameof(TestData_PackageOwnerVariants))]\n+ public void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User currentUser, User packageOwner)\n{\n- var owner = new User { Username = \"someone\" };\n- var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar latestPackage = new Package { Version = \"2.0.0-alpha\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true };\nvar latestSemVer2Package = new Package { Version = \"2.0.0-alpha.1\", PackageRegistration = packageRegistration, Listed = true, IsLatestSemVer2 = true };\nvar latestStablePackage = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatestStableSemVer2 = true };\n@@ -1009,58 +1041,58 @@ public void ReturnsOnlyLatestStableSemVer2PackageIfBothExist()\npackageRegistration.Packages.Add(latestStablePackage);\nvar context = GetFakeContext();\n- context.Users.Add(owner);\n+ context.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(latestPackage);\ncontext.Packages.Add(latestStablePackage);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(owner, includeUnlisted: false).ToList();\n+ var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(1, packages.Count);\nAssert.Contains(latestStablePackage, packages);\n}\n- [Fact]\n- public void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist()\n+ [Theory]\n+ [MemberData(nameof(TestData_PackageOwnerVariants))]\n+ public void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User currentUser, User packageOwner)\n{\n- var owner = new User { Username = \"someone\" };\n- var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar latestPackage = new Package { Version = \"2.0.0-alpha\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true };\nvar latestStablePackage = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatestStable = true };\npackageRegistration.Packages.Add(latestPackage);\npackageRegistration.Packages.Add(latestStablePackage);\nvar context = GetFakeContext();\n- context.Users.Add(owner);\n+ context.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(latestPackage);\ncontext.Packages.Add(latestStablePackage);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(owner, includeUnlisted: false).ToList();\n+ var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(1, packages.Count);\nAssert.Contains(latestStablePackage, packages);\n}\n- [Fact]\n- public void ReturnsFirstIfMultiplePackagesSetToLatest()\n+ [Theory]\n+ [MemberData(nameof(TestData_PackageOwnerVariants))]\n+ public void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User packageOwner)\n{\n// Verify behavior to work around IsLatest concurrency issue: https://github.com/NuGet/NuGetGallery/issues/2514\n- var owner = new User { Username = \"someone\" };\n- var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { packageOwner } };\nvar package1 = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true, IsLatestStable = true };\nvar package2 = new Package { Version = \"2.0\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true, IsLatestStable = true };\npackageRegistration.Packages.Add(package2);\npackageRegistration.Packages.Add(package1);\nvar context = GetFakeContext();\n- context.Users.Add(owner);\n+ context.Users.Add(currentUser);\ncontext.PackageRegistrations.Add(packageRegistration);\ncontext.Packages.Add(package2);\ncontext.Packages.Add(package1);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(owner, includeUnlisted: false);\n+ var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false);\nAssert.Equal(1, packages.Count());\nAssert.Contains(package2, packages);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Initial work on Manage Packages page (and Delete Account shared code) (#5022)
|
455,736 |
16.11.2017 16:17:16
| 28,800 |
b564a4211e053c5f67a00d6c05646452c0c7825e
|
Wait for a package to be available in V2 or V3 (as appropriate)
Fix
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"diff": "using System.Threading;\nusing System.Threading.Tasks;\nusing NuGet;\n+using NuGet.Versioning;\nusing Xunit;\nusing Xunit.Abstractions;\n@@ -16,6 +17,10 @@ namespace NuGetGallery.FunctionalTests\npublic class ClientSdkHelper\n: HelperBase\n{\n+ private static readonly TimeSpan SleepDuration = TimeSpan.FromSeconds(15);\n+ private static readonly TimeSpan TotalSleepDuration = TimeSpan.FromMinutes(30);\n+ private static readonly int Attempts = (int) (TotalSleepDuration.Ticks / SleepDuration.Ticks);\n+\npublic ClientSdkHelper(ITestOutputHelper testOutputHelper)\n: base(testOutputHelper)\n{\n@@ -59,44 +64,78 @@ public bool CheckIfPackageExistsInSource(string packageId, string sourceUrl)\n}\n/// <summary>\n- /// Checks if the given package version is present in the source.\n+ /// Checks if the given package version is present in V2 and V3. This method bypasses the hijack.\n+ /// </summary>\n+ public async Task<bool> CheckIfPackageVersionExistsInV2Async(string packageId, string version)\n+ {\n+ var sourceUrl = UrlHelper.V2FeedRootUrl;\n+ var normalizedVersion = NuGetVersion.Parse(version).ToNormalizedString();\n+ var filter = $\"Id eq '{packageId}' and NormalizedVersion eq '{normalizedVersion}' and 1 eq 1\";\n+ var url = UrlHelper.V2FeedRootUrl + $\"/Packages/$count?$filter={Uri.EscapeDataString(filter)}\";\n+ using (var httpClient = new System.Net.Http.HttpClient())\n+ {\n+ return await VerifyWithRetryAsync(\n+ $\"Verifying that package {packageId} {version} exists on source {sourceUrl} (non-hijacked).\",\n+ async () =>\n+ {\n+ var count = int.Parse(await httpClient.GetStringAsync(url));\n+ if (count == 0)\n+ {\n+ return false;\n+ }\n+ else if (count == 1)\n+ {\n+ return true;\n+ }\n+ else\n+ {\n+ Assert.False(true, $\"The count returned by {url} was {count} and it should have been 0 or 1.\");\n+ return false;\n+ }\n+ });\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Checks if the given package version is present in V2 and V3. This method depends on V2 hijacking to V3.\n/// </summary>\n- public bool CheckIfPackageVersionExistsInSource(string packageId, string version, string sourceUrl)\n+ public async Task<bool> CheckIfPackageVersionExistsInV2AndV3Async(string packageId, string version)\n{\n+ var sourceUrl = UrlHelper.V2FeedRootUrl;\nvar repo = PackageRepositoryFactory.Default.CreateRepository(sourceUrl);\n- SemanticVersion semVersion = SemanticVersion.Parse(version);\n+ NuGet.SemanticVersion semVersion = NuGet.SemanticVersion.Parse(version);\n- return VerifyWithRetry(\n- $\"Verifying that package {packageId} {version} exists on source {sourceUrl}\",\n+ return await VerifyWithRetryAsync(\n+ $\"Verifying that package {packageId} {version} exists on source {sourceUrl} (hijacked).\",\n() =>\n{\nvar package = repo.FindPackage(packageId, semVersion);\n- return package != null;\n+ return Task.FromResult(package != null);\n});\n}\n- private bool VerifyWithRetry(string actionPhrase, Func<bool> action)\n+ private async Task<bool> VerifyWithRetryAsync(string actionPhrase, Func<Task<bool>> actionAsync)\n{\nbool success = false;\n- const int intervalSec = 30;\n- const int maxAttempts = 30;\ntry\n{\n- WriteLine($\"{actionPhrase} ({maxAttempts} attempts, interval {intervalSec} seconds).\");\n+ WriteLine($\"{actionPhrase} ({Attempts} attempts, interval {SleepDuration.TotalSeconds} seconds).\");\n- for (var i = 0; i < maxAttempts && !success; i++)\n+ for (var i = 0; i < Attempts && !success; i++)\n{\nif (i != 0)\n{\n- WriteLine($\"[verification attempt {i}]: Waiting {intervalSec} seconds before next check...\");\n- Thread.Sleep(intervalSec * 1000);\n+ await Task.Delay(SleepDuration);\n}\nWriteLine($\"[verification attempt {i}]: Executing... \");\n- success = action();\n- WriteLine(success ? \"Successful!\" : \"NOT successful!\");\n+ success = await actionAsync();\n+ if (success)\n+ {\n+ WriteLine(\"Successful!\");\n+ }\n}\n}\ncatch (Exception ex)\n@@ -115,7 +154,7 @@ public async Task UploadNewPackageAndVerify(string packageId, string version = \"\n{\nawait UploadNewPackage(packageId, version, minClientVersion, title, tags, description, licenseUrl, dependencies);\n- VerifyPackageExistsInSource(packageId, version);\n+ await VerifyPackageExistsInV2AndV3Async(packageId, version);\n}\npublic async Task UploadNewPackage(string packageId, string version = \"1.0.0\", string minClientVersion = null,\n@@ -156,7 +195,7 @@ public async Task UnlistPackageAndVerify(string packageId, string version = \"1.0\n{\nawait UnlistPackage(packageId, version);\n- VerifyPackageExistsInSource(packageId, version);\n+ await VerifyPackageExistsInV2AndV3Async(packageId, version);\n}\npublic async Task UnlistPackage(string packageId, string version = \"1.0.0\", string apiKey = null)\n@@ -181,9 +220,16 @@ public async Task UnlistPackage(string packageId, string version = \"1.0.0\", stri\n/// </summary>\n/// <param name=\"packageId\">Id of the package.</param>\n/// <param name=\"version\">Version of the package.</param>\n- public void VerifyPackageExistsInSource(string packageId, string version = \"1.0.0\")\n+ public async Task VerifyPackageExistsInV2AndV3Async(string packageId, string version = \"1.0.0\")\n+ {\n+ var packageExistsInSource = await CheckIfPackageVersionExistsInV2AndV3Async(packageId, version);\n+ Assert.True(packageExistsInSource,\n+ $\"Package {packageId} with version {version} is not found on the site {UrlHelper.V2FeedRootUrl} and V3.\");\n+ }\n+\n+ public async Task VerifyPackageExistsInV2Async(string packageId, string version)\n{\n- var packageExistsInSource = CheckIfPackageVersionExistsInSource(packageId, version, UrlHelper.V2FeedRootUrl);\n+ var packageExistsInSource = await CheckIfPackageVersionExistsInV2Async(packageId, version);\nAssert.True(packageExistsInSource,\n$\"Package {packageId} with version {version} is not found on the site {UrlHelper.V2FeedRootUrl}.\");\n}\n@@ -201,7 +247,7 @@ public static string GetLatestStableVersion(string packageId)\nreturn version.ToString();\n}\n- public void VerifyVersionCount(string packageId, int expectedVersionCount, bool allowPreRelease = true)\n+ public async Task VerifyVersionCountAsync(string packageId, int expectedVersionCount, bool allowPreRelease = true)\n{\nvar repo = PackageRepositoryFactory.Default.CreateRepository(SourceUrl);\n@@ -209,7 +255,7 @@ public void VerifyVersionCount(string packageId, int expectedVersionCount, bool\n// gallery handles this request, it delegates to the search service. Since the search service can lag being\n// the gallery database (due to the time it takes for packages to make it through the V3 pipeline and into\n// an active Lucene index), we retry the request for a while.\n- Assert.True(VerifyWithRetry(\n+ Assert.True(await VerifyWithRetryAsync(\n$\"Verifying count of {packageId} versions is {expectedVersionCount}\",\n() =>\n{\n@@ -222,7 +268,7 @@ public void VerifyVersionCount(string packageId, int expectedVersionCount, bool\nvar versionsDisplay = string.Join(\", \", packages.Select(p => p.Version));\nWriteLine($\"{actualVersionCount} versions of {packageId} found: {versionsDisplay}\");\n- return actualVersionCount == expectedVersionCount;\n+ return Task.FromResult(actualVersionCount == expectedVersionCount);\n}));\n}\n@@ -253,7 +299,7 @@ public static int GetDownLoadStatistics(string packageId)\npublic static int GetDownLoadStatisticsForPackageVersion(string packageId, string packageVersion)\n{\nvar repo = PackageRepositoryFactory.Default.CreateRepository(SourceUrl);\n- var package = repo.FindPackage(packageId, new SemanticVersion(packageVersion));\n+ var package = repo.FindPackage(packageId, new NuGet.SemanticVersion(packageVersion));\nreturn package.DownloadCount;\n}\n@@ -292,7 +338,7 @@ public string GetPackageIdFromNupkgFile(string filePath)\npublic bool IsPackageVersionUnListed(string packageId, string version)\n{\nIPackageRepository repo = PackageRepositoryFactory.Default.CreateRepository(SourceUrl);\n- IPackage package = repo.FindPackage(packageId, new SemanticVersion(version), true, true);\n+ IPackage package = repo.FindPackage(packageId, new NuGet.SemanticVersion(version), true, true);\nif (package != null)\nreturn !package.Listed;\nelse\n@@ -356,7 +402,7 @@ public void DownloadPackageAndVerify(string packageId, string version = \"1.0.0\")\nvar packageRepository = PackageRepositoryFactory.Default.CreateRepository(UrlHelper.V2FeedRootUrl);\nvar packageManager = new PackageManager(packageRepository, Environment.CurrentDirectory);\n- packageManager.InstallPackage(packageId, new SemanticVersion(version));\n+ packageManager.InstallPackage(packageId, new NuGet.SemanticVersion(version));\nAssert.True(CheckIfPackageVersionInstalled(packageId, version),\n\"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/NuGetGallery.FunctionalTests.Core.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj",
"diff": "<SpecificVersion>False</SpecificVersion>\n<HintPath>..\\..\\packages\\NuGet.Core.2.8.6\\lib\\net40-Client\\NuGet.Core.dll</HintPath>\n</Reference>\n+ <Reference Include=\"NuGet.Versioning\">\n+ <HintPath>..\\..\\packages\\NuGet.Versioning.4.4.0\\lib\\net45\\NuGet.Versioning.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n<Reference Include=\"System\" />\n<Reference Include=\"System.Core\" />\n<Reference Include=\"Microsoft.CSharp\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/packages.config",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/packages.config",
"diff": "<package id=\"Microsoft.Web.Xdt\" version=\"2.1.1\" targetFramework=\"net45\" />\n<package id=\"Newtonsoft.Json\" version=\"7.0.1\" targetFramework=\"net45\" />\n<package id=\"NuGet.Core\" version=\"2.8.6\" targetFramework=\"net45\" />\n+ <package id=\"NuGet.Versioning\" version=\"4.4.0\" targetFramework=\"net452\" />\n<package id=\"xunit\" version=\"2.3.1\" targetFramework=\"net452\" />\n<package id=\"xunit.abstractions\" version=\"2.0.1\" targetFramework=\"net45\" />\n<package id=\"xunit.analyzers\" version=\"0.7.0\" targetFramework=\"net452\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Fluent/NuGetFluentTest.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Fluent/NuGetFluentTest.cs",
"diff": "@@ -33,7 +33,7 @@ public async Task UploadPackageIfNecessary(string packageName, string version)\npublic async Task UploadPackageIfNecessary(string packageName, string version, string minClientVersion, string title, string tags, string description)\n{\n- if (!PackageExists(packageName, version, UrlHelper.V2FeedRootUrl))\n+ if (!await _clientSdkHelper.CheckIfPackageVersionExistsInV2AndV3Async(packageName, version))\n{\nawait _clientSdkHelper.UploadNewPackageAndVerify(packageName, version, minClientVersion, title, tags, description);\n}\n@@ -41,7 +41,7 @@ public async Task UploadPackageIfNecessary(string packageName, string version, s\npublic async Task UploadPackageIfNecessary(string packageName, string version, string minClientVersion, string title, string tags, string description, string licenseUrl)\n{\n- if (!PackageExists(packageName, version, UrlHelper.V2FeedRootUrl))\n+ if (!await _clientSdkHelper.CheckIfPackageVersionExistsInV2AndV3Async(packageName, version))\n{\nawait _clientSdkHelper.UploadNewPackageAndVerify(packageName, version, minClientVersion, title, tags, description, licenseUrl);\n}\n@@ -74,11 +74,6 @@ private bool PackageExists(string packageName, string version)\nreturn found;\n}\n- private bool PackageExists(string packageName, string version, string url)\n- {\n- return _clientSdkHelper.CheckIfPackageVersionExistsInSource(packageName, version, url);\n- }\n-\npublic static bool CheckForPackageExistence\n{\nget\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Commandline/NuGetCommandLineTests.cs",
"diff": "@@ -87,12 +87,14 @@ public async Task VerifyScopedApiKeys()\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.\");\nawait _clientSdkHelper.UploadExistingPackage(package1FullPath, EnvironmentSettings.TestAccountApiKey_Push);\n- _clientSdkHelper.VerifyPackageExistsInSource(packageId, version1);\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.\");\nawait _clientSdkHelper.UploadExistingPackage(package2FullPath, EnvironmentSettings.TestAccountApiKey_PushVersion);\n- _clientSdkHelper.VerifyPackageExistsInSource(packageId, version2);\n+\n+ // Verify the existence of the two pushed packages.\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, version1);\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, version2);\n// 5. Try unlisting package version1 using 'push' api key => expect failture\nTestOutputHelper.WriteLine($\"5. Trying to unlist package '{packageId}', version '{version1}' using 'push' API key. Expected result: failure.\");\n@@ -133,9 +135,7 @@ public async Task UploadAndDownLoadPackageWithMinClientVersion()\nAssert.True(processResult.ExitCode == 0, Constants.UploadFailureMessage);\n- var packageVersionExistsInSource = _clientSdkHelper.CheckIfPackageVersionExistsInSource(packageId, version, UrlHelper.V2FeedRootUrl);\n- var userMessage = string.Format(Constants.PackageNotFoundAfterUpload, packageId, UrlHelper.V2FeedRootUrl);\n- Assert.True(packageVersionExistsInSource, userMessage);\n+ await _clientSdkHelper.VerifyPackageExistsInV2AndV3Async(packageId, version);\n//Delete package from local disk so once it gets uploaded\nif (File.Exists(packageFullPath))\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Commandline/PackageVersionTest.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Commandline/PackageVersionTest.cs",
"diff": "@@ -31,10 +31,10 @@ public async Task UploadMultipleVersionOfPackage()\nawait _clientSdkHelper.UploadNewPackage(packageId, \"1.0.0\");\nawait _clientSdkHelper.UploadNewPackage(packageId, \"2.0.0\");\n- _clientSdkHelper.VerifyPackageExistsInSource(packageId, \"1.0.0\");\n- _clientSdkHelper.VerifyPackageExistsInSource(packageId, \"2.0.0\");\n+ await _clientSdkHelper.VerifyPackageExistsInV2AndV3Async(packageId, \"1.0.0\");\n+ await _clientSdkHelper.VerifyPackageExistsInV2AndV3Async(packageId, \"2.0.0\");\n- _clientSdkHelper.VerifyVersionCount(packageId, 2);\n+ await _clientSdkHelper.VerifyVersionCountAsync(packageId, 2);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -40,12 +40,15 @@ public async Task FindPackagesByIdTest()\nstring packageId = string.Format(\"TestV2FeedFindPackagesById.{0}\", DateTime.UtcNow.Ticks);\nTestOutputHelper.WriteLine(\"Uploading package '{0}'\", packageId);\n- await _clientSdkHelper.UploadNewPackage(packageId);\n+ await _clientSdkHelper.UploadNewPackage(packageId, \"1.0.0\");\nTestOutputHelper.WriteLine(\"Uploaded package '{0}'\", packageId);\nawait _clientSdkHelper.UploadNewPackage(packageId, \"2.0.0\");\n- // \"&$orderby=Version\" is appended to bypass the search hijacker\n+ // Wait for the packages to be available in V2 (due to async validation)\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, \"1.0.0\");\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, \"2.0.0\");\n+\nstring url = UrlHelper.V2FeedRootUrl + @\"/FindPackagesById()?id='\" + packageId + \"'&$orderby=Version\";\nstring[] expectedTexts =\n{\n@@ -68,17 +71,24 @@ public async Task PackagesAppearInFeedInOrderTest()\n// Because it waits for previous requests to finish before starting new ones, it will only catch ordering issues if these issues are greater than a second or two.\n// This is consistent with the time frame in which we've seen these issues in the past, but if new issues arise that are on a smaller scale, this test will not catch it!\nvar packageIds = new List<string>(PackagesInOrderNumPackages);\n+ var packageVersion = \"1.0.0\";\nvar startingTime = DateTime.UtcNow;\n// Upload the packages in order.\nvar uploadStartTimestamp = DateTime.UtcNow.AddMinutes(-1);\nfor (var i = 0; i < PackagesInOrderNumPackages; i++)\n{\n- var packageId = GetPackagesAppearInFeedInOrderPackageId(startingTime, i);\n- await _clientSdkHelper.UploadNewPackage(packageId);\n+ var packageId = $\"TestV2FeedPackagesAppearInFeedInOrderTest.{startingTime.Ticks}.{i}\";\n+ await _clientSdkHelper.UploadNewPackage(packageId, packageVersion);\npackageIds.Add(packageId);\n}\n+ // Wait for the packages to be available in V2 (due to async validation)\n+ foreach (var packageId in packageIds)\n+ {\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, packageVersion);\n+ }\n+\nawait CheckPackageTimestampsInOrder(packageIds, \"Created\", uploadStartTimestamp);\n// Unlist the packages in order.\n@@ -91,11 +101,6 @@ public async Task PackagesAppearInFeedInOrderTest()\nawait CheckPackageTimestampsInOrder(packageIds, \"LastEdited\", unlistStartTimestamp);\n}\n- private static string GetPackagesAppearInFeedInOrderPackageId(DateTime startingTime, int i)\n- {\n- return $\"TestV2FeedPackagesAppearInFeedInOrderTest.{startingTime.Ticks}.{i}\";\n- }\n-\nprivate static string GetPackagesAppearInFeedInOrderUrl(DateTime time, string timestamp)\n{\nreturn $\"{UrlHelper.V2FeedRootUrl}/Packages?$filter={timestamp} gt DateTime'{time:o}'&$orderby={timestamp} desc&$select={timestamp}\";\n@@ -139,25 +144,29 @@ private static string GetPackagesAppearInFeedInOrderUrl(DateTime time, string ti\n[Category(\"P1Tests\")]\npublic async Task GetUpdates1199RegressionTest()\n{\n- // Use the same package name, but force the version to be unique.\n- var packageName = \"GetUpdates1199RegressionTest\";\n+ // Use unique version to make the assertions simpler.\nvar ticks = DateTime.Now.Ticks.ToString();\n- var version1 = new Version(ticks.Substring(0, 6) + \".\" + ticks.Substring(6, 6) + \".\" + ticks.Substring(12, 6)).ToString();\n+ var packageId = $\"GetUpdates1199RegressionTest.{ticks}\";\n+ var version1 = \"1.0.0\";\nvar version2 = new Version(Convert.ToInt32(ticks.Substring(0, 6) + 1) + \".\" + ticks.Substring(6, 6) + \".\" + ticks.Substring(12, 6)).ToString();\n- var package1Location = await _packageCreationHelper.CreatePackageWithTargetFramework(packageName, version1, \"net45\");\n+ var package1Location = await _packageCreationHelper.CreatePackageWithTargetFramework(packageId, version1, \"net45\");\nvar processResult = await _commandlineHelper.UploadPackageAsync(package1Location, UrlHelper.V2FeedPushSourceUrl);\nAssert.True(processResult.ExitCode == 0, Constants.UploadFailureMessage + \"Exit Code: \" + processResult.ExitCode + \". Error message: \\\"\" + processResult.StandardError + \"\\\"\");\n- var package2Location = await _packageCreationHelper.CreatePackageWithTargetFramework(packageName, version2, \"net40\");\n+ var package2Location = await _packageCreationHelper.CreatePackageWithTargetFramework(packageId, version2, \"net40\");\nprocessResult = await _commandlineHelper.UploadPackageAsync(package2Location, UrlHelper.V2FeedPushSourceUrl);\nAssert.True((processResult.ExitCode == 0), Constants.UploadFailureMessage + \"Exit Code: \" + processResult.ExitCode + \". Error message: \\\"\" + processResult.StandardError + \"\\\"\");\n+ // Wait for the packages to be available in V2 (due to async validation)\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, version1);\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, version2);\n+\nvar packagesList = new List<string>\n{\n- packageName,\n+ packageId,\n\"Microsoft.Bcl.Build\",\n\"Microsoft.Bcl\",\n\"Microsoft.Net.Http\"\n@@ -179,7 +188,7 @@ public async Task GetUpdates1199RegressionTest()\n@\"'\";\nstring[] expectedTexts =\n{\n- $@\"<title type=\"\"text\"\">{packageName}</title>\",\n+ $@\"<title type=\"\"text\"\">{packageId}</title>\",\n$@\"<d:Version>{version2}</d:Version><d:NormalizedVersion>{version2}</d:NormalizedVersion>\"\n};\nvar containsResponseText = await _odataHelper.ContainsResponseText(url, expectedTexts);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"diff": "@@ -19,9 +19,11 @@ namespace NuGetGallery.FunctionalTests.PackageCreation\npublic class ApiPushTests : GalleryTestBase\n{\nprivate const int TaskCount = 16;\n+ private readonly ClientSdkHelper _clientSdkHelper;\npublic ApiPushTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper)\n{\n+ _clientSdkHelper = new ClientSdkHelper(TestOutputHelper);\n}\n[Fact]\n@@ -67,6 +69,9 @@ public async Task DuplicatePushesAreRejectedAndNotDeleted()\nTestOutputHelper.WriteLine($\"Task {taskIndex:D2} push: HTTP {(int)statusCodes[taskIndex - 1]}\");\n}\n+ // Wait for the packages to be available in V2 (due to async validation)\n+ await _clientSdkHelper.VerifyPackageExistsInV2Async(packageId, packageVersion);\n+\nvar downloadUrl = $\"{UrlHelper.V2FeedRootUrl}package/{packageId}/{packageVersion}\";\nusing (var response = await client.GetAsync(downloadUrl))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.P0/UploadAndDownload/UploadPackageFromUI.cs",
"new_path": "tests/NuGetGallery.WebUITests.P0/UploadAndDownload/UploadPackageFromUI.cs",
"diff": "@@ -33,8 +33,7 @@ public override IEnumerator<WebTestRequest> GetRequestEnumerator()\nvar uploadRequest = AssertAndValidationHelper.GetHttpRequestForUrl(UrlHelper.UploadPageUrl);\nyield return uploadRequest;\n- string packageId;\n- packageId = DateTime.Now.Ticks.ToString();\n+ var packageId = $\"UploadPackageFromUI.{DateTimeOffset.UtcNow.Ticks}\";\nvar packageCreationHelper = new PackageCreationHelper();\nvar packageFullPath = packageCreationHelper.CreatePackage(packageId).Result;\nvar uploadPostRequest = AssertAndValidationHelper.GetUploadPostRequestForPackage(this, packageFullPath);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Wait for a package to be available in V2 or V3 (as appropriate) (#5037)
Fix https://github.com/NuGet/Engineering/issues/946
|
455,776 |
20.11.2017 16:32:50
| 28,800 |
f90bd010ff07b30c00fa786308f4460b90aba560
|
Fix broken JsonApiControllerFacts
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"diff": "@@ -326,7 +326,7 @@ public async Task ReturnsFailureIfNewOwnerIsAlreadyOwner(InvokePackageOwnerModif\n// Assert\nAssert.False(data.success);\n- Assert.Equal($\"The user '{userToAdd.Username}' is already an owner or pending owner of the package!\", data.message);\n+ Assert.Equal(string.Format(Strings.AddOwner_AlreadyOwner, userToAdd.Username), data.message);\n}\n[Theory]\n@@ -353,7 +353,7 @@ public async Task ReturnsFailureIfNewOwnerIsAlreadyPending(InvokePackageOwnerMod\n// Assert\nAssert.False(data.success);\n- Assert.Equal($\"The user '{userToAdd.Username}' is already an owner or pending owner of the package!\", data.message);\n+ Assert.Equal(string.Format(Strings.AddOwner_AlreadyOwner, userToAdd.Username), data.message);\n}\npublic class TheGetAddPackageOwnerConfirmationMethod : TestContainer\n@@ -825,7 +825,7 @@ public async Task ReturnsFailureIfUserIsNotAnOwner(Func<Fakes, User> getCurrentU\n// Assert\nAssert.False(data.success);\n- Assert.Equal($\"The user '{userToRemove.Username}' is not an owner or pending owner of the package!\", data.message);\n+ Assert.Equal(string.Format(Strings.RemoveOwner_NotOwner, userToRemove.Username), data.message);\n}\n[Theory]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix broken JsonApiControllerFacts
|
455,794 |
21.11.2017 08:21:17
| 28,800 |
25b86c896cbfdc9b501931ac8a5e50662cfb8c96
|
Rename FindPackagesByOwner API
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -111,7 +111,7 @@ public virtual ActionResult DeleteRequest()\n}\nvar listPackageItems = _packageService\n- .FindPackagesByOwner(user, includeUnlisted: true)\n+ .FindPackagesByAnyMatchingOwner(user, includeUnlisted: true)\n.Select(p => new ListPackageItemViewModel(p))\n.ToList();\n@@ -170,7 +170,7 @@ public virtual ActionResult Delete(string accountName)\n}\nvar listPackageItems = _packageService\n- .FindPackagesByOwner(user, includeUnlisted:true)\n+ .FindPackagesByAnyMatchingOwner(user, includeUnlisted:true)\n.Select(p => new ListPackageItemViewModel(p))\n.ToList();\nvar model = new DeleteUserAccountViewModel\n@@ -284,7 +284,7 @@ public virtual ActionResult Thanks()\npublic virtual ActionResult Packages()\n{\nvar user = GetCurrentUser();\n- var packages = _packageService.FindPackagesByOwner(user, includeUnlisted: true)\n+ var packages = _packageService.FindPackagesByAnyMatchingOwner(user, includeUnlisted: true)\n.Select(p => new ListPackageItemViewModel(p)).OrderBy(p => p.Id).ToList();\nvar incoming = _packageOwnerRequestService.GetPackageOwnershipRequests(newOwner: user);\n@@ -470,7 +470,7 @@ public virtual ActionResult Profiles(string username, int page = 1)\nreturn HttpNotFound();\n}\n- var packages = _packageService.FindPackagesByOwner(user, includeUnlisted: false)\n+ var packages = _packageService.FindPackagesByAnyMatchingOwner(user, includeUnlisted: false)\n.OrderByDescending(p => p.PackageRegistration.DownloadCount)\n.Select(p => new ListPackageItemViewModel(p)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "@@ -144,7 +144,7 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\nprivate async Task DeleteGalleryUserAccountImplAsync(User useToBeDeleted, User admin, string signature, bool unlistOrphanPackages)\n{\n- var ownedPackages = _packageService.FindPackagesByOwner(useToBeDeleted, includeUnlisted: true).ToList();\n+ var ownedPackages = _packageService.FindPackagesByAnyMatchingOwner(useToBeDeleted, includeUnlisted: true).ToList();\nawait RemoveOwnership(useToBeDeleted, admin, unlistOrphanPackages, ownedPackages);\nawait RemoveReservedNamespaces(useToBeDeleted);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageService.cs",
"new_path": "src/NuGetGallery/Services/IPackageService.cs",
"diff": "@@ -29,7 +29,7 @@ public interface IPackageService : ICorePackageService\nPackage FindPackageByIdAndVersion(string id, string version, int? semVerLevelKey = null, bool allowPrerelease = true);\nPackage FindAbsoluteLatestPackageById(string id, int? semVerLevelKey);\n- IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted);\n+ IEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted);\nIEnumerable<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": "@@ -214,7 +214,7 @@ public virtual Package FindAbsoluteLatestPackageById(string id, int? semVerLevel\n/// <summary>\n/// Find packages by owner, including organization owners that the user belongs to.\n/// </summary>\n- public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted)\n+ public IEnumerable<Package> FindPackagesByAnyMatchingOwner(User user, bool includeUnlisted)\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"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1941,10 +1941,10 @@ public void DeleteHappyAccount()\n.Setup(stub => stub.FindByUsername(userName))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByOwner(testUser, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>()))\n.Returns(userPackages);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByOwner(testUser, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>()))\n.Returns(userPackages);\n// act\n@@ -2003,7 +2003,7 @@ public void DeleteAccountRequestView(bool withPendingIssues)\n.Setup(stub => stub.FindByUsername(userName))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByOwner(testUser, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>()))\n.Returns(userPackages);\nGetMock<ISupportRequestService>()\n.Setup(stub => stub.GetIssues(null, null, null, null))\n@@ -2046,7 +2046,7 @@ public async Task RequestDeleteAccountAsync(bool successOnSentRequest)\n.Setup(stub => stub.FindByUsername(userName))\n.Returns(testUser);\nGetMock<IPackageService>()\n- .Setup(stub => stub.FindPackagesByOwner(testUser, It.IsAny<bool>()))\n+ .Setup(stub => stub.FindPackagesByAnyMatchingOwner(testUser, It.IsAny<bool>()))\n.Returns(userPackages);\nGetMock<ISupportRequestService>()\n.Setup(stub => stub.GetIssues(null, null, null, userName))\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -276,7 +276,7 @@ private Mock<IEntityRepository<User>> SetupUserRepository()\nprivate Mock<IPackageService> SetupPackageService()\n{\nvar packageService = new Mock<IPackageService>();\n- packageService.Setup(m => m.FindPackagesByOwner(_user, true)).Returns(_userPackages);\n+ packageService.Setup(m => m.FindPackagesByAnyMatchingOwner(_user, true)).Returns(_userPackages);\n//the .Returns(Task.CompletedTask) to avoid NullRef exception by the Mock infrastructure when invoking async operations\npackageService.Setup(m => m.MarkPackageUnlistedAsync(It.IsAny<Package>(), true))\n.Returns(Task.CompletedTask)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -916,7 +916,7 @@ public void ReturnsTheMostRecentVersionWhenSemVerLevel2()\n}\n}\n- public class TheFindPackagesByOwnerMethod : TestContainer\n+ public class TheFindPackagesByAnyMatchingOwnerMethod : TestContainer\n{\npublic static IEnumerable<object[]> TestData_PackageOwnerVariants\n{\n@@ -964,7 +964,7 @@ public void ReturnsAListedPackage(User currentUser, User packageOwner)\ncontext.Packages.Add(package);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false);\n+ var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false);\nAssert.Equal(1, packages.Count());\n}\n@@ -982,7 +982,7 @@ public void ReturnsNoUnlistedPackagesWhenIncludeUnlistedIsFalse(User currentUser\ncontext.Packages.Add(package);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false);\n+ var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false);\nAssert.Equal(0, packages.Count());\n}\n@@ -1000,7 +1000,7 @@ public void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue(User currentUser,\ncontext.Packages.Add(package);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: true);\n+ var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);\nAssert.Equal(1, packages.Count());\n}\n@@ -1023,7 +1023,7 @@ public void ReturnsAPackageForEachPackageRegistration(User currentUser, User pac\ncontext.Packages.Add(packageB);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\n+ var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(2, packages.Count);\nAssert.Contains(packageA, packages);\nAssert.Contains(packageB, packages);\n@@ -1047,7 +1047,7 @@ public void ReturnsOnlyLatestStableSemVer2PackageIfBothExist(User currentUser, U\ncontext.Packages.Add(latestStablePackage);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\n+ var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(1, packages.Count);\nAssert.Contains(latestStablePackage, packages);\n}\n@@ -1069,7 +1069,7 @@ public void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist(User curr\ncontext.Packages.Add(latestStablePackage);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false).ToList();\n+ var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false).ToList();\nAssert.Equal(1, packages.Count);\nAssert.Contains(latestStablePackage, packages);\n}\n@@ -1092,7 +1092,7 @@ public void ReturnsFirstIfMultiplePackagesSetToLatest(User currentUser, User pac\ncontext.Packages.Add(package1);\nvar service = Get<PackageService>();\n- var packages = service.FindPackagesByOwner(currentUser, includeUnlisted: false);\n+ var packages = service.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: false);\nAssert.Equal(1, packages.Count());\nAssert.Contains(package2, packages);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Rename FindPackagesByOwner API (#5042)
|
455,747 |
21.11.2017 11:09:44
| 28,800 |
968b8433f8c967b990a28db268620c3c1aede0c6
|
Hide enable password login flow until user verification
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -334,7 +334,7 @@ public virtual async Task<ActionResult> ForgotPassword(ForgotPasswordViewModel m\ncase PasswordResetResultType.Success:\nreturn SendPasswordResetEmail(result.User, forgotPassword: true);\ndefault:\n- throw new NotImplementedException($\"The passwword reset result type '{result.Type}' is not supported.\");\n+ throw new NotImplementedException($\"The password reset result type '{result.Type}' is not supported.\");\n}\n}\n@@ -575,7 +575,12 @@ public virtual async Task<ActionResult> ChangePassword(AccountViewModel model)\nif (oldPassword == null)\n{\n// User is requesting a password set email\n- await _authService.GeneratePasswordResetToken(user, Constants.PasswordResetTokenExpirationHours * 60);\n+ var resetResultType = await _authService.GeneratePasswordResetToken(user, Constants.PasswordResetTokenExpirationHours * 60);\n+ if (resetResultType == PasswordResetResultType.UserNotConfirmed)\n+ {\n+ ModelState.AddModelError(\"ChangePassword\", Strings.UserIsNotYetConfirmed);\n+ return AccountView(model);\n+ }\nreturn SendPasswordResetEmail(user, forgotPassword: false);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"diff": "@<text>Password Login</text>,\n@<text><em>@(Model.HasPassword ? \"(Enabled)\" : \"(Disabled)\")</em></text>,\n@<text>\n- @using (Html.BeginForm(\"ChangePassword\", \"Users\"))\n+ @if (CurrentUser.Confirmed)\n+ {\n+ using (Html.BeginForm(\"ChangePassword\", \"Users\"))\n{\n@Html.AntiForgeryToken()\n@Html.ShowValidationMessagesFor(m => m.ChangePassword)\n</div>\n</div>\n}\n+ }\n+ else\n+ {\n+ <p>To enable password login, please <a href=\"@Url.ConfirmationRequired()\">confirm</a> your account.</p>\n+ }\n</text>,\nViewData.ModelState.Keys.Any(x => x.StartsWith(\"ChangePassword\")))\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1342,6 +1342,32 @@ public async Task GivenNoOldPassword_ItSendsAPasswordSetEmail()\nAssert.Equal(TestUtility.GallerySiteRootHttps + \"account/setpassword/test/t0k3n\", actualConfirmUrl);\nGetMock<IMessageService>().VerifyAll();\n}\n+\n+ [Fact]\n+ public async Task GivenNoOldPasswordForUnconfirmedAccount_ItAddsModelError()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var user = fakes.CreateUser(\"test\");\n+ user.UnconfirmedEmailAddress = \"unconfirmed@example.com\";\n+ GetMock<AuthenticationService>()\n+ .Setup(a => a.GeneratePasswordResetToken(user, It.IsAny<int>()))\n+ .ReturnsAsync(PasswordResetResultType.UserNotConfirmed);\n+\n+ var controller = GetController<UsersController>();\n+ controller.SetCurrentUser(user);\n+\n+ // Act\n+ await controller.ChangePassword(new AccountViewModel());\n+\n+ // Assert\n+ var errorMessages = controller\n+ .ModelState[\"ChangePassword\"]\n+ .Errors\n+ .Select(e => e.ErrorMessage)\n+ .ToArray();\n+ Assert.Equal(errorMessages, new[] { Strings.UserIsNotYetConfirmed });\n+ }\n}\npublic class TheRemovePasswordAction : TestContainer\n@@ -1525,7 +1551,8 @@ public async Task GivenValidRequest_CanDeleteMicrosoftAccountWithMultipleMicroso\n// Arrange\nvar fakes = Get<Fakes>();\nvar creds = new Credential[5];\n- for (int i = 0; i < creds.Length; i++) {\n+ for (int i = 0; i < creds.Length; i++)\n+ {\ncreds[i] = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", \"bloog\" + i);\ncreds[i].Key = i + 1;\n}\n@@ -1646,9 +1673,11 @@ public static IEnumerable<object[]> RegenerateApiKeyCredential_Input\n.Setup(u => u.AddCredential(\nuser,\nIt.Is<Credential>(c => c.Type == CredentialTypes.ApiKey.V2)))\n- .Callback<User, Credential>((u, c) => {\n+ .Callback<User, Credential>((u, c) =>\n+ {\nu.Credentials.Add(c);\n- c.User = u; })\n+ c.User = u;\n+ })\n.Completes()\n.Verifiable();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hide enable password login flow until user verification (#5046)
|
455,736 |
21.11.2017 09:50:29
| 28,800 |
a1ea54341394d505ef769bc6c801560d97fcdbe7
|
Handle race condition caused by fast async validations resulting in HTTP 500 on push
Fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "@@ -79,6 +79,50 @@ public async Task<PackageCommitResult> CommitPackageAsync(Package package, Strea\nif (package.PackageStatusKey == PackageStatus.Validating)\n{\nawait _packageFileService.SaveValidationPackageFileAsync(package, packageFile);\n+\n+ /* Suppose two package upload requests come in at the same time with the same package (same ID and\n+ * version). It's possible that one request has committed and validated the package AFTER the other\n+ * request has checked that this package does not exist in the database. Observe the following\n+ * sequence of events to understand why the packages container check is necessary.\n+ *\n+ * Request | Step | Component | Success | Notes\n+ * ------- | ---------------------------------------------- | ---------------- | ------- | -----\n+ * 1 | version should not exist in DB | gallery | TRUE | 1st duplicate check (catches most cases over time)\n+ * 2 | version should not exist in DB | gallery | TRUE |\n+ * 1 | upload to validation container | gallery | TRUE | 2nd duplicate check (relevant with high concurrency)\n+ * 1 | version should not exist in packages container | gallery | TRUE | 3rd duplicate check (relevant with fast validations)\n+ * 1 | commit to DB | gallery | TRUE |\n+ * 1 | upload to packages container | async validation | TRUE |\n+ * 1 | move package to Available status in DB | async validation | TRUE |\n+ * 1 | delete from validation container | async validation | TRUE |\n+ * 2 | upload to validation container | gallery | TRUE |\n+ * 2 | version should not exist in packages container | gallery | FALSE |\n+ * 2 | delete from validation (rollback) | gallery | TRUE | Only occurs in the failure case, as a clean-up.\n+ *\n+ * Alternatively, we could handle the DB conflict exception that would occur in request 2, but this\n+ * would result in an exception that can be avoided and require some ugly code that teases the\n+ * unique constraint failure out of a SqlException.\n+ *\n+ * Another alternative is always leaving the package in the validation container. This is not great\n+ * since it doubles the amount of space we need to store packages. Also, it complicates the soft or\n+ * hard package delete flow.\n+ *\n+ * We can safely delete the validation package because we know it's ours. We know this because\n+ * saving the validation package succeeded, meaning async validation already successfully moved the\n+ * previous package (request 1's package) from the validation container to the package container\n+ * and transitioned the package to Available status.\n+ *\n+ * See the following issue in GitHub for how this case was found:\n+ * https://github.com/NuGet/NuGetGallery/issues/5039\n+ */\n+ if (await _packageFileService.DoesPackageFileExistAsync(package))\n+ {\n+ await _packageFileService.DeleteValidationPackageFileAsync(\n+ package.PackageRegistration.Id,\n+ package.Version);\n+\n+ return PackageCommitResult.Conflict;\n+ }\n}\nelse\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "@@ -227,6 +227,9 @@ public async Task SavesPackageToStorageAndDatabaseWhenAvailable()\n_packageFileService.Verify(\nx => x.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()),\nTimes.Once);\n+ _packageFileService.Verify(\n+ x => x.SaveValidationPackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()),\n+ Times.Never);\n_entitiesContext.Verify(\nx => x.SaveChangesAsync(),\nTimes.Once);\n@@ -246,6 +249,9 @@ public async Task SavesPackageToStorageAndDatabaseWhenValidating()\n_packageFileService.Verify(\nx => x.SaveValidationPackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()),\nTimes.Once);\n+ _packageFileService.Verify(\n+ x => x.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()),\n+ Times.Never);\n_entitiesContext.Verify(\nx => x.SaveChangesAsync(),\nTimes.Once);\n@@ -270,7 +276,7 @@ public async Task DoesNotCommitToDatabaseWhenSavingTheFileFails()\n}\n[Fact]\n- public async Task DoesNotCommitToDatabaseWhenTheFileConflicts()\n+ public async Task DoesNotCommitToDatabaseWhenThePackageFileConflicts()\n{\n_packageFileService\n.Setup(x => x.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))\n@@ -284,6 +290,23 @@ public async Task DoesNotCommitToDatabaseWhenTheFileConflicts()\nAssert.Equal(PackageCommitResult.Conflict, result);\n}\n+ [Fact]\n+ public async Task DoesNotCommitToDatabaseWhenThValidationFileConflicts()\n+ {\n+ _package.PackageStatusKey = PackageStatus.Validating;\n+\n+ _packageFileService\n+ .Setup(x => x.SaveValidationPackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))\n+ .Throws(_conflictException);\n+\n+ var result = await _target.CommitPackageAsync(_package, _packageFile);\n+\n+ _entitiesContext.Verify(\n+ x => x.SaveChangesAsync(),\n+ Times.Never);\n+ Assert.Equal(PackageCommitResult.Conflict, result);\n+ }\n+\n[Fact]\npublic async Task DeletesPackageIfDatabaseCommitFailsWhenAvailable()\n{\n@@ -327,6 +350,36 @@ public async Task DeletesPackageIfDatabaseCommitFailsWhenValidating()\nTimes.Once);\nAssert.Same(_unexpectedException, exception);\n}\n+\n+ [Fact]\n+ public async Task RejectsUploadWhenValidatingAndPackageExistsInPackagesContainer()\n+ {\n+ _package.PackageStatusKey = PackageStatus.Validating;\n+\n+ _packageFileService\n+ .Setup(x => x.DoesPackageFileExistAsync(It.IsAny<Package>()))\n+ .ReturnsAsync(true);\n+\n+ var result = await _target.CommitPackageAsync(_package, _packageFile);\n+\n+ _packageFileService.Verify(\n+ x => x.SaveValidationPackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()),\n+ Times.Once);\n+ _packageFileService.Verify(\n+ x => x.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()),\n+ Times.Never);\n+ _entitiesContext.Verify(\n+ x => x.SaveChangesAsync(),\n+ Times.Never);\n+ _packageFileService.Verify(\n+ x => x.DoesPackageFileExistAsync(It.IsAny<Package>()),\n+ Times.Once);\n+ _packageFileService.Verify(\n+ x => x.DeleteValidationPackageFileAsync(It.IsAny<string>(), It.IsAny<string>()),\n+ Times.Once);\n+\n+ Assert.Equal(PackageCommitResult.Conflict, result);\n+ }\n}\npublic abstract class FactsBase\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Handle race condition caused by fast async validations resulting in HTTP 500 on push (#5050)
Fix https://github.com/NuGet/NuGetGallery/issues/5039
|
455,772 |
21.11.2017 13:34:52
| 28,800 |
d79d4b78c3a9c3ce1fc5f90d598f47eb2b1ffe74
|
Remove usage of ApiKey Type for distinguishing between Scoped/non-scoped ApiKeys
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CredentialTypes.cs",
"new_path": "src/NuGetGallery.Core/CredentialTypes.cs",
"diff": "@@ -55,9 +55,9 @@ public static bool IsPackageVerificationApiKey(string type)\n/// </summary>\n/// <param name=\"credential\"></param>\n/// <returns></returns>\n- public static bool IsSupportedCredential(Credential credential)\n+ public static bool IsSupportedCredential(this Credential credential)\n{\n- return IsViewSupportedCredential(credential) || IsPackageVerificationApiKey(credential.Type);\n+ return credential.IsViewSupportedCredential() || IsPackageVerificationApiKey(credential.Type);\n}\n/// <summary>\n@@ -66,10 +66,15 @@ public static bool IsSupportedCredential(Credential credential)\n/// </summary>\n/// <param name=\"credential\"></param>\n/// <returns></returns>\n- public static bool IsViewSupportedCredential(Credential credential)\n+ public static bool IsViewSupportedCredential(this Credential credential)\n{\nreturn SupportedCredentialTypes.Any(credType => string.Compare(credential.Type, credType, StringComparison.OrdinalIgnoreCase) == 0)\n|| credential.Type.StartsWith(ExternalPrefix, StringComparison.OrdinalIgnoreCase);\n}\n+\n+ public static bool IsScopedApiKey(this Credential credential)\n+ {\n+ return IsApiKey(credential.Type) && credential.Scopes != null && credential.Scopes.Any();\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -200,8 +200,9 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\nreturn null;\n}\n- if (matched.Type == CredentialTypes.ApiKey.V1\n- && !matched.HasBeenUsedInLastDays(_config.ExpirationInDaysForApiKeyV1))\n+ if (CredentialTypes.IsApiKey(matched.Type) &&\n+ !matched.IsScopedApiKey() &&\n+ !matched.HasBeenUsedInLastDays(_config.ExpirationInDaysForApiKeyV1))\n{\n// API key credential was last used a long, long time ago - expire it\nawait Auditing.SaveAuditRecordAsync(\n@@ -498,10 +499,10 @@ public virtual CredentialViewModel DescribeCredential(Credential credential)\n};\ncredentialViewModel.HasExpired = credential.HasExpired ||\n- (credentialViewModel.IsNonScopedV1ApiKey &&\n+ (credentialViewModel.IsNonScopedApiKey &&\n!credential.HasBeenUsedInLastDays(_config.ExpirationInDaysForApiKeyV1));\n- credentialViewModel.Description = credentialViewModel.IsNonScopedV1ApiKey\n+ credentialViewModel.Description = credentialViewModel.IsNonScopedApiKey\n? Strings.NonScopedApiKeyDescription : credentialViewModel.Description;\nreturn credentialViewModel;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -645,12 +645,6 @@ public virtual async Task<ActionResult> RemoveCredential(string credentialType,\n[ValidateAntiForgeryToken]\npublic virtual async Task<JsonResult> RegenerateCredential(string credentialType, int? credentialKey)\n{\n- if (credentialType != CredentialTypes.ApiKey.V2)\n- {\n- Response.StatusCode = (int)HttpStatusCode.BadRequest;\n- return Json(Strings.Unsupported);\n- }\n-\nvar user = GetCurrentUser();\nvar cred = user.Credentials.SingleOrDefault(\nc => string.Equals(c.Type, credentialType, StringComparison.OrdinalIgnoreCase)\n@@ -662,6 +656,12 @@ public virtual async Task<JsonResult> RegenerateCredential(string credentialType\nreturn Json(Strings.CredentialNotFound);\n}\n+ if (!cred.IsScopedApiKey())\n+ {\n+ Response.StatusCode = (int)HttpStatusCode.BadRequest;\n+ return Json(Strings.Unsupported);\n+ }\n+\nvar newCredential = await GenerateApiKeyInternal(\ncred.Description,\nBuildScopes(cred.Scopes),\n@@ -746,12 +746,6 @@ public virtual async Task<JsonResult> GenerateApiKey(string description, string\n[ValidateAntiForgeryToken]\npublic virtual async Task<JsonResult> EditCredential(string credentialType, int? credentialKey, string[] subjects)\n{\n- if (credentialType != CredentialTypes.ApiKey.V2)\n- {\n- Response.StatusCode = (int)HttpStatusCode.BadRequest;\n- return Json(Strings.Unsupported);\n- }\n-\nvar user = GetCurrentUser();\nvar cred = user.Credentials.SingleOrDefault(\nc => string.Equals(c.Type, credentialType, StringComparison.OrdinalIgnoreCase)\n@@ -763,6 +757,12 @@ public virtual async Task<JsonResult> EditCredential(string credentialType, int?\nreturn Json(Strings.CredentialNotFound);\n}\n+ if (!cred.IsScopedApiKey())\n+ {\n+ Response.StatusCode = (int)HttpStatusCode.BadRequest;\n+ return Json(Strings.Unsupported);\n+ }\n+\nvar scopeOwner = cred.Scopes.GetOwnerScope();\nvar scopes = cred.Scopes.Select(x => x.AllowedAction).Distinct().ToArray();\nvar newScopes = BuildScopes(scopeOwner, scopes, subjects);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/AccountViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/AccountViewModel.cs",
"diff": "@@ -96,11 +96,11 @@ public class CredentialViewModel\npublic string Value { get; set; }\npublic TimeSpan? ExpirationDuration { get; set; }\n- public bool IsNonScopedV1ApiKey\n+ public bool IsNonScopedApiKey\n{\nget\n{\n- return string.Equals(Type, CredentialTypes.ApiKey.V1, StringComparison.OrdinalIgnoreCase);\n+ return CredentialTypes.IsApiKey(Type) && !Scopes.AnySafe();\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ApiKeyViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ApiKeyViewModel.cs",
"diff": "@@ -54,7 +54,7 @@ public ApiKeyViewModel(CredentialViewModel cred)\nDescription = cred.Description;\nExpires = cred.Expires?.ToString(\"O\");\nHasExpired = cred.HasExpired;\n- IsNonScopedV1ApiKey = cred.IsNonScopedV1ApiKey;\n+ IsNonScopedV1ApiKey = cred.IsNonScopedApiKey;\nOwner = owner;\nScopes = scopes;\nPackages = packages;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/TestCredentialHelper.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/TestCredentialHelper.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.Web.Helpers;\nusing NuGetGallery.Services.Authentication;\n@@ -10,7 +11,7 @@ namespace NuGetGallery.Authentication\n/// <summary>\n/// Builds all kinds of supported credentials for test purposes.\n/// </summary>\n- public class TestCredentialHelper\n+ public static class TestCredentialHelper\n{\npublic static Credential CreatePbkdf2Password(string plaintextPassword)\n{\n@@ -36,6 +37,17 @@ public static Credential CreateV2ApiKey(Guid apiKey, TimeSpan? expiration)\nreturn CreateApiKey(CredentialTypes.ApiKey.V2, apiKey.ToString(), expiration);\n}\n+ public static Credential WithDefaultScopes(this Credential credential)\n+ {\n+ credential.Scopes = new List<Scope>() {\n+ new Scope(\"*\", NuGetScopes.PackageUnlist),\n+ new Scope(\"*\", NuGetScopes.PackagePush),\n+ new Scope(\"*\", NuGetScopes.PackagePushVersion)\n+ };\n+\n+ return credential;\n+ }\n+\npublic static Credential CreateV2VerificationApiKey(Guid apiKey)\n{\nreturn CreateApiKey(CredentialTypes.ApiKey.VerifyV1, apiKey.ToString(), TimeSpan.FromDays(1));\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1580,26 +1580,51 @@ public async Task GivenNoCredential_ErrorIsReturnedWithNoChangesMade()\nAssert.True(user.Credentials.Contains(cred));\n}\n+ public static IEnumerable<object[]> GivenANonScopedApiKeyCredential_ReturnsUnsupported_Input\n+ {\n+ get\n+ {\n+ return new[]\n+ {\n+ new object[]\n+ {\n+ TestCredentialHelper.CreateV1ApiKey(Guid.NewGuid(), TimeSpan.FromDays(1))\n+ },\n+ new object[]\n+ {\n+ TestCredentialHelper.CreateExternalCredential(\"abc\")\n+ },\n+ new object[]\n+ {\n+ TestCredentialHelper.CreateSha1Password(\"abcd\")\n+ }\n+ };\n+ }\n+ }\n+\n[Theory]\n- [InlineData(CredentialTypes.ApiKey.V1)]\n- [InlineData(CredentialTypes.Password.V3)]\n- [InlineData(CredentialTypes.ExternalPrefix + \"bla\")]\n- public async Task GivenANonApiKeyV2Credential_ReturnsUnsupported(string credentialType)\n+ [MemberData(nameof(GivenANonScopedApiKeyCredential_ReturnsUnsupported_Input))]\n+ public async Task GivenANonScopedApiKeyCredential_ReturnsUnsupported(Credential credential)\n{\n// Arrange\n+ var fakes = Get<Fakes>();\n+ var user = fakes.CreateUser(\"test\", credential);\n+ credential.Key = 1;\n+\nvar controller = GetController<UsersController>();\n+ controller.SetCurrentUser(user);\n// Act\nvar result = await controller.RegenerateCredential(\n- credentialType: credentialType,\n- credentialKey: CredentialKey);\n+ credentialType: credential.Type,\n+ credentialKey: credential.Key);\n// Assert\nAssert.Equal((int)HttpStatusCode.BadRequest, controller.Response.StatusCode);\nAssert.True(string.Compare((string)result.Data, Strings.Unsupported) == 0);\n}\n- public static IEnumerable<object[]> RegenerateApiKeyCredential_Input\n+ public static IEnumerable<object[]> GivenValidRequest_ItGeneratesNewCredAndRemovesOldCredAndSendsNotificationToUser_Input\n{\nget\n{\n@@ -1628,7 +1653,7 @@ public static IEnumerable<object[]> RegenerateApiKeyCredential_Input\n}\n}\n- [MemberData(nameof(RegenerateApiKeyCredential_Input))]\n+ [MemberData(nameof(GivenValidRequest_ItGeneratesNewCredAndRemovesOldCredAndSendsNotificationToUser_Input))]\n[Theory]\npublic async Task GivenValidRequest_ItGeneratesNewCredAndRemovesOldCredAndSendsNotificationToUser(\nstring description, Scope[] scopes)\n@@ -1699,20 +1724,44 @@ public static IEnumerable<object[]> RegenerateApiKeyCredential_Input\npublic class TheEditCredentialAction : TestContainer\n{\n+ public static IEnumerable<object[]> GivenANonApiKeyV2Credential_ReturnsUnsupported_Input\n+ {\n+ get\n+ {\n+ return new[]\n+ {\n+ new object[]\n+ {\n+ TestCredentialHelper.CreateV1ApiKey(Guid.NewGuid(), TimeSpan.FromDays(1))\n+ },\n+ new object[]\n+ {\n+ TestCredentialHelper.CreateExternalCredential(\"abc\")\n+ },\n+ new object[]\n+ {\n+ TestCredentialHelper.CreateSha1Password(\"abcd\")\n+ }\n+ };\n+ }\n+ }\n[Theory]\n- [InlineData(CredentialTypes.ApiKey.V1)]\n- [InlineData(CredentialTypes.Password.V3)]\n- [InlineData(CredentialTypes.ExternalPrefix + \"bla\")]\n- public async Task GivenANonApiKeyV2Credential_ReturnsUnsupported(string credentialType)\n+ [MemberData(nameof(GivenANonApiKeyV2Credential_ReturnsUnsupported_Input))]\n+ public async Task GivenANonApiKeyV2Credential_ReturnsUnsupported(Credential credential)\n{\n// Arrange\n+ var fakes = Get<Fakes>();\n+ var user = fakes.CreateUser(\"test\", credential);\n+ credential.Key = 1;\n+\nvar controller = GetController<UsersController>();\n+ controller.SetCurrentUser(user);\n// Act\nvar result = await controller.EditCredential(\n- credentialType: credentialType,\n- credentialKey: CredentialKey,\n+ credentialType: credential.Type,\n+ credentialKey: credential.Key,\nsubjects: new[] { \"a\", \"b\" });\n// Assert\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"diff": "@@ -33,7 +33,7 @@ public Fakes()\nTestCredentialHelper.CreateV1ApiKey(Guid.Parse(\"669e180e-335c-491a-ac26-e83c4bd31d65\"),\nExpirationForApiKeyV1),\nTestCredentialHelper.CreateV2ApiKey(Guid.Parse(\"779e180e-335c-491a-ac26-e83c4bd31d87\"),\n- ExpirationForApiKeyV1),\n+ ExpirationForApiKeyV1).WithDefaultScopes(),\nTestCredentialHelper.CreateV2VerificationApiKey(Guid.Parse(\"b0c51551-823f-4701-8496-43980b4b3913\")),\nTestCredentialHelper.CreateExternalCredential(\"abc\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -670,8 +670,9 @@ public void UsesTypeCaptionToDescribeCredentialIfNoProviderNounPresent()\npublic void ApiKeyRemovedMessageIsCorrect()\n{\nvar user = new User { EmailAddress = \"legit@example.com\", Username = \"foo\" };\n- var cred = new CredentialBuilder().CreateApiKey(TimeSpan.FromDays(1));\n+ var cred = TestCredentialHelper.CreateV2ApiKey(Guid.NewGuid(), TimeSpan.FromDays(1)).WithDefaultScopes();\ncred.Description = \"new api key\";\n+ cred.User = user;\nvar messageService = TestableMessageService.Create(\nGetService<AuthenticationService>(),\n@@ -730,8 +731,9 @@ public void UsesTypeCaptionToDescribeCredentialIfNoProviderNounPresent()\npublic void ApiKeyAddedMessageIsCorrect()\n{\nvar user = new User { EmailAddress = \"legit@example.com\", Username = \"foo\" };\n- var cred = new CredentialBuilder().CreateApiKey(TimeSpan.FromDays(1));\n+ var cred = TestCredentialHelper.CreateV2ApiKey(Guid.NewGuid(), TimeSpan.FromDays(1)).WithDefaultScopes();\ncred.Description = \"new api key\";\n+ cred.User = user;\nvar messageService = TestableMessageService.Create(\nGetService<AuthenticationService>(),\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove usage of ApiKey Type for distinguishing between Scoped/non-scoped ApiKeys
|
455,744 |
22.11.2017 12:19:13
| 28,800 |
6b681409c1abf2a133925a49ac1a83c783875640
|
Not using SAS tokens for public containers read URIs
|
[
{
"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;\n+using System.Collections.Generic;\nusing System.Globalization;\nusing System.IO;\nusing System.Net;\n@@ -15,6 +16,19 @@ namespace NuGetGallery\n{\npublic class CloudBlobCoreFileStorageService : ICoreFileStorageService\n{\n+ private static readonly HashSet<string> KnownPublicFolders = new HashSet<string> {\n+ CoreConstants.PackagesFolderName,\n+ CoreConstants.PackageBackupsFolderName,\n+ CoreConstants.DownloadsFolderName\n+ };\n+\n+ private static readonly HashSet<string> KnownPrivateFolders = new HashSet<string> {\n+ CoreConstants.ContentFolderName,\n+ CoreConstants.UploadsFolderName,\n+ CoreConstants.PackageReadMesFolderName,\n+ CoreConstants.ValidationFolderName\n+ };\n+\nprotected readonly ICloudBlobClient _client;\nprotected readonly ConcurrentDictionary<string, ICloudBlobContainer> _containers = new ConcurrentDictionary<string, ICloudBlobContainer>();\n@@ -118,8 +132,19 @@ 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+ throw new ArgumentNullException(nameof(endOfAccess), $\"{nameof(endOfAccess)} must not be null for non-public containers\");\n+ }\n+\nICloudBlobContainer container = await GetContainerAsync(folderName);\nvar blob = container.GetBlobReference(fileName);\n+ if (isPublicFolder)\n+ {\n+ return blob.Uri;\n+ }\n+\nreturn new Uri(blob.Uri, blob.GetSharedReadSignature(endOfAccess));\n}\n@@ -131,32 +156,27 @@ protected async Task<ICloudBlobContainer> GetContainerAsync(string folderName)\nreturn container;\n}\n- Task<ICloudBlobContainer> creationTask;\n- switch (folderName)\n+ container = await PrepareContainer(folderName, IsPublicContainer(folderName));\n+ _containers[folderName] = container;\n+ return container;\n+ }\n+\n+ private bool IsPublicContainer(string folderName)\n{\n- case CoreConstants.PackagesFolderName:\n- case CoreConstants.PackageBackupsFolderName:\n- case CoreConstants.DownloadsFolderName:\n- creationTask = PrepareContainer(folderName, isPublic: true);\n- break;\n+ if (KnownPublicFolders.Contains(folderName))\n+ {\n+ return true;\n+ }\n- case CoreConstants.ContentFolderName:\n- case CoreConstants.UploadsFolderName:\n- case CoreConstants.PackageReadMesFolderName:\n- case CoreConstants.ValidationFolderName:\n- creationTask = PrepareContainer(folderName, isPublic: false);\n- break;\n+ if (KnownPrivateFolders.Contains(folderName))\n+ {\n+ return false;\n+ }\n- default:\nthrow new InvalidOperationException(\nString.Format(CultureInfo.CurrentCulture, \"The folder name {0} is not supported.\", folderName));\n}\n- container = await creationTask;\n- _containers[folderName] = container;\n- return container;\n- }\n-\nprivate async Task<StorageResult> GetBlobContentAsync(string folderName, string fileName, string ifNoneMatch = null)\n{\nICloudBlobContainer container = await GetContainerAsync(folderName);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs",
"diff": "@@ -541,13 +541,15 @@ public async Task WillThrowIfEndOfAccessIsInThePast()\nAssert.Equal(\"endOfAccess\", ex.ParamName);\n}\n- [Fact]\n- public async Task WillConcatenateSignatureWithUri()\n+ private const string fileName = \"theFileName\";\n+ private const string signature = \"?secret=42\";\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+ public async Task WillUseSasTokenDependingOnContainerAvailability(string containerName, string expectedUri)\n{\n- const string folderName = CoreConstants.ValidationFolderName;\n- const string fileName = \"theFileName\";\n- const string signature = \"?secret=42\";\n- var setupResult = Setup(folderName, fileName);\n+ var setupResult = Setup(containerName, fileName);\nvar fakeBlobClient = setupResult.Item1;\nvar fakeBlob = setupResult.Item2;\nvar blobUri = setupResult.Item3;\n@@ -555,12 +557,32 @@ public async Task WillConcatenateSignatureWithUri()\nfakeBlob.Setup(b => b.GetSharedReadSignature(It.IsAny<DateTimeOffset?>())).Returns(signature);\nvar service = CreateService(fakeBlobClient);\n- var uri = await service.GetFileReadUriAsync(folderName, fileName, DateTimeOffset.Now.AddHours(3));\n+ var uri = await service.GetFileReadUriAsync(containerName, fileName, DateTimeOffset.Now.AddHours(3));\n- string expectedUri = new Uri(blobUri, signature).AbsoluteUri;\nAssert.Equal(expectedUri, uri.AbsoluteUri);\n}\n+ [Fact]\n+ public async Task WillThrowIfNoEndOfAccessSpecifiedForNonPublicContainer()\n+ {\n+ var service = CreateService();\n+\n+ var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetFileReadUriAsync(CoreConstants.ValidationFolderName, \"theFileName\", null));\n+ Assert.Equal(\"endOfAccess\", ex.ParamName);\n+ }\n+\n+ [Fact]\n+ public async Task WillNotThrowIfNoEndOfAccessSpecifiedForPublicContainer()\n+ {\n+ const string packagesFolderName = CoreConstants.PackagesFolderName;\n+ var setupResult = Setup(packagesFolderName, fileName);\n+ var service = CreateService(setupResult.Item1);\n+\n+ var ex = await Record.ExceptionAsync(() => service.GetFileReadUriAsync(packagesFolderName, fileName, null));\n+\n+ Assert.Null(ex);\n+ }\n+\n[Fact]\npublic async Task WillPassTheEndOfAccessTimestampFurther()\n{\n@@ -589,7 +611,10 @@ public async Task WillPassTheEndOfAccessTimestampFurther()\n{\nvar fakeBlobClient = new Mock<ICloudBlobClient>();\nvar fakeContainer = new Mock<ICloudBlobContainer>();\n- fakeBlobClient.Setup(bc => bc.GetContainerReference(folderName)).Returns(fakeContainer.Object);\n+ fakeBlobClient\n+ .Setup(bc => bc.GetContainerReference(folderName))\n+ .Returns(fakeContainer.Object)\n+ .Callback(() => { int i = 0; i = i + 1; });\nvar fakeBlob = new Mock<ISimpleCloudBlob>();\nfakeContainer.Setup(c => c.GetBlobReference(fileName)).Returns(fakeBlob.Object);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Not using SAS tokens for public containers read URIs (#5055)
|
455,772 |
22.11.2017 14:28:39
| 28,800 |
0b3740b8ccba415a23820d214b666680dc6f1a92
|
Fix StatisticsControllerFacts failures
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs",
"diff": "using System.Web.Routing;\nusing Moq;\nusing Newtonsoft.Json.Linq;\n+using NuGetGallery.Framework;\nusing Xunit;\nnamespace NuGetGallery\n{\n- public class StatisticsControllerFacts\n+ public class StatisticsControllerFacts : TestContainer\n{\n[Fact]\npublic async Task StatisticsHomePage_ValidateReportStructureAndAvailability()\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix StatisticsControllerFacts failures (#5062)
|
455,794 |
28.11.2017 16:13:43
| 28,800 |
37ab2a0907a95d6ceb965541b3f2a78fcec564e8
|
Temporary package size workaround
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add tagPrefix=\"ef\" assembly=\"Microsoft.AspNet.EntityDataSource\" namespace=\"Microsoft.AspNet.EntityDataSource\" />\n</controls>\n</pages>\n- <httpRuntime targetFramework=\"4.5\" maxQueryStringLength=\"12000\" maxRequestLength=\"256000\" requestPathInvalidCharacters=\"<,>,*,%,:,\\,?\" relaxedUrlToFileSystemMapping=\"true\" enableVersionHeader=\"false\" />\n+ <httpRuntime targetFramework=\"4.5\" maxQueryStringLength=\"12000\" maxRequestLength=\"358400\" requestPathInvalidCharacters=\"<,>,*,%,:,\\,?\" relaxedUrlToFileSystemMapping=\"true\" enableVersionHeader=\"false\" />\n<httpModules>\n<add name=\"ErrorFilter\" type=\"Elmah.ErrorFilterModule, Elmah, Version=1.2.14706.0, Culture=neutral, PublicKeyToken=57eac04b2e0f138e, processorArchitecture=MSIL\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Temporary package size workaround (#5080)
|
455,794 |
29.11.2017 13:03:01
| 28,800 |
e9470f819dbe7366ef861fde365ea01c1625962f
|
DisplayPackage perf fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n+using NuGet.Versioning;\nnamespace NuGetGallery\n{\n@@ -21,6 +22,12 @@ public DisplayPackageViewModel(Package package, IOrderedEnumerable<Package> pack\nif (!isVersionHistory)\n{\n+ HasSemVer2Version = NuGetVersion.IsSemVer2;\n+ HasSemVer2Dependency = package.Dependencies.ToList()\n+ .Where(pd => !string.IsNullOrEmpty(pd.VersionSpec))\n+ .Select(pd => VersionRange.Parse(pd.VersionSpec))\n+ .Any(p => (p.HasUpperBound && p.MaxVersion.IsSemVer2) || (p.HasLowerBound && p.MinVersion.IsSemVer2));\n+\nDependencies = new DependencySetsViewModel(package.Dependencies);\nPackageVersions = packageHistory.Select(p => new DisplayPackageViewModel(p, packageHistory, isVersionHistory: true));\n}\n@@ -69,6 +76,9 @@ public void SetPendingMetadata(PackageEdit pendingMetadata)\npublic int DownloadsPerDay { get; private set; }\npublic int TotalDaysSinceCreated { get; private set; }\n+ public bool HasSemVer2Version { get; }\n+ public bool HasSemVer2Dependency { get; }\n+\npublic bool HasNewerPrerelease\n{\nget\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "@@ -30,12 +30,6 @@ public PackageViewModel(Package package)\nNuGetVersion = NuGetVersion.Parse(_fullVersion);\n- HasSemVer2Version = NuGetVersion.IsSemVer2;\n- HasSemVer2Dependency = package.Dependencies.ToList()\n- .Where(pd => !string.IsNullOrEmpty(pd.VersionSpec))\n- .Select(pd => VersionRange.Parse(pd.VersionSpec))\n- .Any(p => (p.HasUpperBound && p.MaxVersion.IsSemVer2) || (p.HasLowerBound && p.MinVersion.IsSemVer2));\n-\nDescription = package.Description;\nReleaseNotes = package.ReleaseNotes;\nIconUrl = package.IconUrl;\n@@ -95,8 +89,6 @@ public string Id\npublic string Version { get; set; }\npublic string FullVersion => _fullVersion;\npublic bool IsSemVer2 => _isSemVer2;\n- public bool HasSemVer2Version { get; }\n- public bool HasSemVer2Dependency { get; }\npublic string Title\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.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 NuGet.Versioning;\nusing Xunit;\n@@ -238,5 +239,110 @@ public void HasNewerPrereleaseDoesNotConsiderUnlistedVersions()\n// Assert\nAssert.False(hasNewerPrerelease);\n}\n+\n+ [Theory]\n+ [InlineData(null)]\n+ [InlineData(\"\")]\n+ public void HasSemVer2DependencyIsFalseWhenInvalidDependencyVersionRange(string versionSpec)\n+ {\n+ // Arrange\n+ var package = CreateTestPackage(\"1.0.0\", dependencyVersion: versionSpec);\n+ var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n+\n+ // Act\n+ var viewModel = new DisplayPackageViewModel(package, history);\n+\n+ // Assert\n+ Assert.False(viewModel.HasSemVer2Dependency);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"2.0.0-alpha.1\")]\n+ [InlineData(\"2.0.0+metadata\")]\n+ [InlineData(\"2.0.0-alpha+metadata\")]\n+ public void HasSemVer2DependencyWhenSemVer2DependencyVersionSpec(string versionSpec)\n+ {\n+ // Arrange\n+ var package = CreateTestPackage(\"1.0.0\", dependencyVersion: versionSpec);\n+ var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n+\n+ // Act\n+ var viewModel = new DisplayPackageViewModel(package, history);\n+\n+ // Assert\n+ Assert.True(viewModel.HasSemVer2Dependency);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"2.0.0-alpha\")]\n+ [InlineData(\"2.0.0\")]\n+ [InlineData(\"2.0.0.0\")]\n+ public void HasSemVer2DependencyIsFalseWhenNonSemVer2DependencyVersionSpec(string versionSpec)\n+ {\n+ // Arrange\n+ var package = CreateTestPackage(\"1.0.0\", dependencyVersion: versionSpec);\n+ var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n+\n+ // Act\n+ var viewModel = new DisplayPackageViewModel(package, history);\n+\n+ // Assert\n+ Assert.False(viewModel.HasSemVer2Dependency);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"2.0.0-alpha\")]\n+ [InlineData(\"2.0.0\")]\n+ [InlineData(\"2.0.0.0\")]\n+ public void HasSemVer2VersionIsFalseWhenNonSemVer2Version(string version)\n+ {\n+ // Arrange\n+ var package = CreateTestPackage(version);\n+ var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n+\n+ // Act\n+ var viewModel = new DisplayPackageViewModel(package, history);\n+\n+ // Assert\n+ Assert.False(viewModel.HasSemVer2Version);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"2.0.0-alpha.1\")]\n+ [InlineData(\"2.0.0+metadata\")]\n+ [InlineData(\"2.0.0-alpha+metadata\")]\n+ public void HasSemVer2VersionIsTrueWhenSemVer2Version(string version)\n+ {\n+ // Arrange\n+ var package = CreateTestPackage(version);\n+ var history = package.PackageRegistration.Packages.OrderByDescending(p => p.Version);\n+\n+ // Act\n+ var viewModel = new DisplayPackageViewModel(package, history);\n+\n+ // Assert\n+ Assert.True(viewModel.HasSemVer2Version);\n+ }\n+\n+ private Package CreateTestPackage(string version, string dependencyVersion = null)\n+ {\n+ var package = new Package\n+ {\n+ Version = version,\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Owners = Enumerable.Empty<User>().ToList(),\n+ }\n+ };\n+ if (!string.IsNullOrEmpty(dependencyVersion))\n+ {\n+ package.Dependencies = new List<PackageDependency>\n+ {\n+ new PackageDependency { VersionSpec = dependencyVersion }\n+ };\n+ }\n+ package.PackageRegistration.Packages = new[] { package };\n+ return package;\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs",
"diff": "@@ -96,111 +96,5 @@ public void LicenseUrlKeptWhenLicenseReportDisabled()\nvar packageViewModel = new PackageViewModel(package);\nAssert.NotNull(packageViewModel.LicenseUrl);\n}\n-\n- [Theory]\n- [InlineData(null)]\n- [InlineData(\"\")]\n- public void HasSemVer2DependencyIsFalseWhenInvalidDependencyVersionRange(string versionSpec)\n- {\n- // Arrange\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- Dependencies = new List<PackageDependency>\n- {\n- new PackageDependency { VersionSpec = versionSpec}\n- }\n- };\n-\n- // Act\n- var viewModel = new PackageViewModel(package);\n-\n- // Assert\n- Assert.False(viewModel.HasSemVer2Dependency);\n- }\n-\n- [Theory]\n- [InlineData(\"2.0.0-alpha.1\")]\n- [InlineData(\"2.0.0+metadata\")]\n- [InlineData(\"2.0.0-alpha+metadata\")]\n- public void HasSemVer2DependencyWhenSemVer2DependencyVersionSpec(string versionSpec)\n- {\n- // Arrange\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- Dependencies = new List<PackageDependency>\n- {\n- new PackageDependency { VersionSpec = versionSpec}\n- }\n- };\n-\n- // Act\n- var viewModel = new PackageViewModel(package);\n-\n- // Assert\n- Assert.True(viewModel.HasSemVer2Dependency);\n- }\n-\n- [Theory]\n- [InlineData(\"2.0.0-alpha\")]\n- [InlineData(\"2.0.0\")]\n- [InlineData(\"2.0.0.0\")]\n- public void HasSemVer2DependencyIsFalseWhenNonSemVer2DependencyVersionSpec(string versionSpec)\n- {\n- // Arrange\n- var package = new Package\n- {\n- Version = \"1.0.0\",\n- Dependencies = new List<PackageDependency>\n- {\n- new PackageDependency { VersionSpec = versionSpec}\n- }\n- };\n-\n- // Act\n- var viewModel = new PackageViewModel(package);\n-\n- // Assert\n- Assert.False(viewModel.HasSemVer2Dependency);\n- }\n-\n- [Theory]\n- [InlineData(\"2.0.0-alpha\")]\n- [InlineData(\"2.0.0\")]\n- [InlineData(\"2.0.0.0\")]\n- public void HasSemVer2VersionIsFalseWhenNonSemVer2Version(string version)\n- {\n- // Arrange\n- var package = new Package\n- {\n- Version = version\n- };\n-\n- // Act\n- var viewModel = new PackageViewModel(package);\n-\n- // Assert\n- Assert.False(viewModel.HasSemVer2Version);\n- }\n-\n- [Theory]\n- [InlineData(\"2.0.0-alpha.1\")]\n- [InlineData(\"2.0.0+metadata\")]\n- [InlineData(\"2.0.0-alpha+metadata\")]\n- public void HasSemVer2VersionIsTrueWhenSemVer2Version(string version)\n- {\n- // Arrange\n- var package = new Package\n- {\n- Version = version\n- };\n-\n- // Act\n- var viewModel = new PackageViewModel(package);\n-\n- // Assert\n- Assert.True(viewModel.HasSemVer2Version);\n- }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
DisplayPackage perf fix
|
455,736 |
28.11.2017 12:52:49
| 28,800 |
b113fe2ebd618d93e22002ee5a13459e927dfdae
|
Add the certificates table to enable an approved list of signing certificates
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Diagnostics\\IDiagnosticsService.cs\" />\n<Compile Include=\"Diagnostics\\IDiagnosticsSource.cs\" />\n<Compile Include=\"DisposableAction.cs\" />\n+ <Compile Include=\"Entities\\Certificate.cs\" />\n<Compile Include=\"Entities\\Credential.cs\" />\n<Compile Include=\"Entities\\CuratedFeed.cs\" />\n<Compile Include=\"Entities\\CuratedPackage.cs\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201711291842225_AddCertificate.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 AddCertificate : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddCertificate));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201711291842225_AddCertificate\"; }\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/201711291842225_AddCertificate.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddCertificate : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ CreateTable(\n+ \"dbo.Certificates\",\n+ c => new\n+ {\n+ Key = c.Int(nullable: false, identity: true),\n+ Thumbprint = c.String(nullable: false, maxLength: 256, unicode: false),\n+ })\n+ .PrimaryKey(t => t.Key)\n+ .Index(t => t.Thumbprint, unique: true, name: \"IX_Certificates_Thumbprint\");\n+\n+ }\n+\n+ public override void Down()\n+ {\n+ DropIndex(\"dbo.Certificates\", \"IX_Certificates_Thumbprint\");\n+ DropTable(\"dbo.Certificates\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201711082145351_AddAccountDelete.Designer.cs\">\n<DependentUpon>201711082145351_AddAccountDelete.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201711291842225_AddCertificate.cs\" />\n+ <Compile Include=\"Migrations\\201711291842225_AddCertificate.Designer.cs\">\n+ <DependentUpon>201711291842225_AddCertificate.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\\201711082145351_AddAccountDelete.resx\">\n<DependentUpon>201711082145351_AddAccountDelete.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201711291842225_AddCertificate.resx\">\n+ <DependentUpon>201711291842225_AddCertificate.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add the certificates table to enable an approved list of signing certificates (#5079)
Progress on https://github.com/NuGet/Engineering/issues/935
|
455,751 |
29.11.2017 20:46:02
| 28,800 |
59b2b034065b2c2847edd5dc025824f1002dec43
|
Clean support requests
Clean support requests on delete user account.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs",
"diff": "@@ -52,5 +52,6 @@ public interface ISupportRequestService\nTask ToggleAdminAccessAsync(int adminId, bool enabled);\nTask UpdateAdminAsync(int adminId, string galleryUsername, string pagerDutyUsername);\nTask AddAdminAsync(string galleryUsername, string pagerDutyUsername);\n+ Task DeleteSupportRequestsAsync(string createdBy);\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": "@@ -318,6 +318,34 @@ public string GetIssueStatusNameById(int id)\nreturn issue?.Name;\n}\n+ public async Task DeleteSupportRequestsAsync(string createdBy)\n+ {\n+ if(createdBy == null)\n+ {\n+ throw new ArgumentNullException(nameof(createdBy));\n+ }\n+ var userCreatedIssues = GetIssues().Where(i => string.Equals(i.CreatedBy, createdBy, StringComparison.InvariantCultureIgnoreCase)).ToList();\n+ // Delete all the support requests with exception of the delete account request.\n+ // For the DeleteAccount support request clean the user data.\n+ foreach(var issue in userCreatedIssues.Where(i => !string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))\n+ {\n+ _supportRequestDbContext.Issues.Remove(issue);\n+ }\n+ foreach(var accountDeletedIssue in userCreatedIssues.Where(i => string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))\n+ {\n+ accountDeletedIssue.OwnerEmail = \"deletedaccount\";\n+ accountDeletedIssue.CreatedBy = null;\n+ foreach(var historyEntry in accountDeletedIssue.HistoryEntries)\n+ {\n+ if (string.Equals(historyEntry.EditedBy, createdBy, StringComparison.InvariantCultureIgnoreCase))\n+ {\n+ historyEntry.EditedBy = null;\n+ }\n+ }\n+ }\n+ await _supportRequestDbContext.CommitChangesAsync();\n+ }\n+\nprivate IQueryable<Issue> GetFilteredIssuesQueryable(int? assignedTo = null, string reason = null, int? issueStatusId = null, string galleryUsername = null)\n{\nIQueryable<Issue> queryable = _supportRequestDbContext.Issues\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -115,7 +115,7 @@ public virtual ActionResult DeleteRequest()\n.Select(p => new ListPackageItemViewModel(p))\n.ToList();\n- bool hasPendingRequest = _supportRequestService.GetIssues().Where((issue)=> string.Equals(issue.CreatedBy, user.Username) &&\n+ bool hasPendingRequest = _supportRequestService.GetIssues().Where((issue)=> (issue.UserKey.HasValue && issue.UserKey.Value == user.Key) &&\nstring.Equals(issue.IssueTitle, Strings.AccountDelete_SupportRequestTitle) &&\nissue.Key != IssueStatusKeys.Resolved).Any();\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;\nusing NuGetGallery.Authentication;\n+using NuGetGallery.Areas.Admin;\nusing NuGetGallery.Areas.Admin.ViewModels;\nusing NuGetGallery.Security;\n@@ -21,6 +23,7 @@ public class DeleteAccountService : IDeleteAccountService\nprivate readonly ISecurityPolicyService _securityPolicyService;\nprivate readonly AuthenticationService _authService;\nprivate readonly IEntityRepository<User> _userRepository;\n+ private readonly ISupportRequestService _supportRequestService;\npublic DeleteAccountService(IEntityRepository<AccountDelete> accountDeleteRepository,\nIEntityRepository<User> userRepository,\n@@ -29,7 +32,8 @@ public class DeleteAccountService : IDeleteAccountService\nIPackageOwnershipManagementService packageOwnershipManagementService,\nIReservedNamespaceService reservedNamespaceService,\nISecurityPolicyService securityPolicyService,\n- AuthenticationService authService\n+ AuthenticationService authService,\n+ ISupportRequestService supportRequestService\n)\n{\n_accountDeleteRepository = accountDeleteRepository ?? throw new ArgumentNullException(nameof(accountDeleteRepository));\n@@ -40,6 +44,7 @@ AuthenticationService authService\n_reservedNamespaceService = reservedNamespaceService ?? throw new ArgumentNullException(nameof(reservedNamespaceService));\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}\n/// <summary>\n@@ -106,6 +111,12 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\ntry\n{\n+ // The support requests db and gallery db are different.\n+ // TransactionScope can be used for doing transaction actions across db on the same server but not on different servers.\n+ // The below code will clean first the suppport requests and after the gallery data.\n+ // The order is important in order to allow the admin the oportunity to execute this step again.\n+ await RemoveSupportRequests(userToBeDeleted);\n+\nif (commitAsTransaction)\n{\nusing (var strategy = new SuspendDbExecutionStrategy())\n@@ -142,16 +153,16 @@ public async Task<DeleteUserAccountStatus> DeleteGalleryUserAccountAsync(User us\n}\n}\n- private async Task DeleteGalleryUserAccountImplAsync(User useToBeDeleted, User admin, string signature, bool unlistOrphanPackages)\n+ private async Task DeleteGalleryUserAccountImplAsync(User userToBeDeleted, User admin, string signature, bool unlistOrphanPackages)\n{\n- var ownedPackages = _packageService.FindPackagesByAnyMatchingOwner(useToBeDeleted, includeUnlisted: true).ToList();\n+ var ownedPackages = _packageService.FindPackagesByAnyMatchingOwner(userToBeDeleted, includeUnlisted: true).ToList();\n- await RemoveOwnership(useToBeDeleted, admin, unlistOrphanPackages, ownedPackages);\n- await RemoveReservedNamespaces(useToBeDeleted);\n- await RemoveSecurityPolicies(useToBeDeleted);\n- await RemoveUserCredentials(useToBeDeleted);\n- await RemoveUserDataInUserTable(useToBeDeleted);\n- await InsertDeleteAccount(useToBeDeleted, admin, signature);\n+ await RemoveOwnership(userToBeDeleted, admin, unlistOrphanPackages, ownedPackages);\n+ await RemoveReservedNamespaces(userToBeDeleted);\n+ await RemoveSecurityPolicies(userToBeDeleted);\n+ await RemoveUserCredentials(userToBeDeleted);\n+ await RemoveUserDataInUserTable(userToBeDeleted);\n+ await InsertDeleteAccount(userToBeDeleted, admin, signature);\n}\nprivate async Task InsertDeleteAccount(User user, User admin, string signature)\n@@ -211,5 +222,10 @@ private async Task RemoveUserDataInUserTable(User user)\nuser.SetAccountAsDeleted();\nawait _userRepository.CommitChangesAsync();\n}\n+\n+ private async Task RemoveSupportRequests(User user)\n+ {\n+ await _supportRequestService.DeleteSupportRequestsAsync(user.Username);\n+ }\n}\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": "@@ -2044,11 +2044,13 @@ public void DeleteAccountRequestView(bool withPendingIssues)\n// Arrange\nstring userName = \"DeletedUser\";\nstring emailAddress = $\"{userName}@coldmail.com\";\n+ int userKey = 1;\nvar controller = GetController<UsersController>();\nvar fakes = Get<Fakes>();\nvar testUser = fakes.CreateUser(userName);\ntestUser.EmailAddress = emailAddress;\n+ testUser.Key = userKey;\ntestUser.IsDeleted = false;\ncontroller.SetCurrentUser(testUser);\n@@ -2073,6 +2075,7 @@ public void DeleteAccountRequestView(bool withPendingIssues)\nIssueTitle = Strings.AccountDelete_SupportRequestTitle,\nOwnerEmail = emailAddress,\nCreatedBy = userName,\n+ UserKey = 1,\nIssueStatus = new IssueStatus() { Key = IssueStatusKeys.New, Name = \"OneIssue\" }\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\ReflowPackageServiceFacts.cs\" />\n<Compile Include=\"Services\\ReservedNamespaceServiceFacts.cs\" />\n<Compile Include=\"Services\\SearchAdaptorFacts.cs\" />\n+ <Compile Include=\"Services\\SupportRequestServiceFacts.cs\" />\n<Compile Include=\"Services\\TelemetryServiceFacts.cs\" />\n<Compile Include=\"Services\\ValidationServiceFacts.cs\" />\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricherTests.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "using System.Globalization;\nusing System.Linq;\nusing System.Threading.Tasks;\n+using NuGetGallery.Areas.Admin;\n+using NuGetGallery.Areas.Admin.Models;\nusing NuGetGallery.Authentication;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Security;\nusing Xunit;\nusing Moq;\n-namespace NuGetGallery\n+namespace NuGetGallery.Services\n{\npublic class DeleteAccountServiceFacts\n{\n@@ -157,6 +159,7 @@ await deleteAccountService.\nAssert.Null(testUser.EmailAddress);\nAssert.Equal<int>(1, testableService.DeletedAccounts.Count());\nAssert.Equal<string>(signature, testableService.DeletedAccounts.ElementAt(0).Signature);\n+ Assert.Equal<int>(1, testableService.SupportRequests.Count);\n}\nprivate static User CreateTestData(ref PackageRegistration registration)\n@@ -190,6 +193,7 @@ public class DeleteAccountTestService\nprivate ICollection<Package> _userPackages;\npublic List<AccountDelete> DeletedAccounts = new List<AccountDelete>();\n+ public List<Issue> SupportRequests = new List<Issue>();\npublic DeleteAccountTestService(User user, PackageRegistration userPackagesRegistration)\n{\n@@ -199,6 +203,24 @@ public DeleteAccountTestService(User user, PackageRegistration userPackagesRegis\n_user.SecurityPolicies.Add(_securityPolicy);\n_userPackagesRegistration = userPackagesRegistration;\n_userPackages = userPackagesRegistration.Packages;\n+ SupportRequests.Add(new Issue()\n+ {\n+ CreatedBy = user.Username,\n+ Key = 1,\n+ IssueTitle = Strings.AccountDelete_SupportRequestTitle,\n+ OwnerEmail = user.EmailAddress,\n+ IssueStatusId = IssueStatusKeys.New,\n+ HistoryEntries = new List<History>() { new History() { EditedBy = user.Username, IssueId = 1, Key = 1, IssueStatusId = IssueStatusKeys.New} }\n+ });\n+ SupportRequests.Add(new Issue()\n+ {\n+ CreatedBy = $\"{user.Username}_second\",\n+ Key = 2,\n+ IssueTitle = \"Second\",\n+ OwnerEmail = \"random\",\n+ IssueStatusId = IssueStatusKeys.New,\n+ HistoryEntries = new List<History>() { new History() { EditedBy = $\"{user.Username}_second\", IssueId = 2, Key = 2, IssueStatusId = IssueStatusKeys.New } }\n+ });\n}\npublic DeleteAccountService GetDeleteAccountService()\n@@ -210,7 +232,8 @@ public DeleteAccountService GetDeleteAccountService()\nSetupPackageOwnershipManagementService().Object,\nSetupReservedNamespaceService().Object,\nSetupSecurityPolicyService().Object,\n- new TestableAuthService());\n+ new TestableAuthService(),\n+ SetupSupportRequestService().Object);\n}\nprivate class TestableAuthService : AuthenticationService\n@@ -284,6 +307,18 @@ private Mock<IPackageService> SetupPackageService()\nreturn packageService;\n}\n+ private Mock<ISupportRequestService> SetupSupportRequestService()\n+ {\n+ var supportService = new Mock<ISupportRequestService>();\n+ supportService.Setup(m => m.GetIssues(null, null, null, null)).Returns(SupportRequests);\n+ var issue = SupportRequests.Where(i => string.Equals(i.CreatedBy, _user.Username)).FirstOrDefault();\n+ supportService.Setup(m => m.DeleteSupportRequestsAsync(_user.Username))\n+ .Returns(Task.FromResult<bool>(true))\n+ .Callback( () => SupportRequests.Remove(issue));\n+\n+ return supportService;\n+ }\n+\nprivate Mock<IPackageOwnershipManagementService> SetupPackageOwnershipManagementService()\n{\nvar packageOwnershipManagementService = new Mock<IPackageOwnershipManagementService>();\n@@ -297,7 +332,6 @@ private Mock<IPackageOwnershipManagementService> SetupPackageOwnershipManagement\n);\nreturn packageOwnershipManagementService;\n}\n-\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Clean support requests (#5070)
Clean support requests on delete user account.
|
455,751 |
30.11.2017 11:36:29
| 28,800 |
443d6017b34a278fb8495608df81e2c7822c9a91
|
Remove usernames from the AI urls
Remove usernames from AI request url.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "@@ -79,6 +79,8 @@ public static void Configuration(IAppBuilder app)\nreturn processor;\n});\n+ telemetryProcessorChainBuilder.Use(next => new ClientTelemetryPIIProcessor(next));\n+\nvar telemetry = dependencyResolver.GetService<TelemetryClientWrapper>();\ntelemetryProcessorChainBuilder.Use(\nnext => new ExceptionTelemetryProcessor(next, telemetry.UnderlyingClient));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\TelemetryClientWrapper.cs\" />\n<Compile Include=\"Services\\ValidationService.cs\" />\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricher.cs\" />\n+ <Compile Include=\"Telemetry\\ClientTelemetryPIIProcessor.cs\" />\n<Compile Include=\"Telemetry\\QuietExceptionLogger.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialBuilder.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialValidator.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\TelemetryServiceFacts.cs\" />\n<Compile Include=\"Services\\ValidationServiceFacts.cs\" />\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricherTests.cs\" />\n+ <Compile Include=\"Telemetry\\ClientTelemetryPIIProcessorTests.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestableV1Feed.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestableV2Feed.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestDependencyResolver.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove usernames from the AI urls (#5083)
Remove usernames from AI request url.
|
455,794 |
30.11.2017 15:51:45
| 28,800 |
69455ff8ce645c21787830d879beb1935819ea26
|
Fix int overflow for user total downloads
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/UserProfileModel.cs",
"new_path": "src/NuGetGallery/ViewModels/UserProfileModel.cs",
"diff": "@@ -19,7 +19,7 @@ public UserProfileModel(User user, List<ListPackageItemViewModel> allPackages, i\nPackagePage = pageIndex;\nPackagePageSize = pageSize;\n- TotalPackageDownloadCount = AllPackages.Sum(p => p.TotalDownloadCount);\n+ TotalPackageDownloadCount = AllPackages.Sum(p => ((long)p.TotalDownloadCount));\nPackagePageTotalCount = (TotalPackages + PackagePageSize - 1) / PackagePageSize;\n@@ -38,7 +38,7 @@ public UserProfileModel(User user, List<ListPackageItemViewModel> allPackages, i\npublic string UnconfirmedEmailAddress { get; set; }\npublic ICollection<ListPackageItemViewModel> AllPackages { get; private set; }\npublic ICollection<ListPackageItemViewModel> PagedPackages { get; private set; }\n- public int TotalPackageDownloadCount { get; private set; }\n+ public long TotalPackageDownloadCount { get; private set; }\npublic int TotalPackages { get; private set; }\npublic int PackagePage { get; private set; }\npublic int PackagePageSize { get; private set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"ViewModels\\ListPackageItemViewModelFacts.cs\" />\n<Compile Include=\"ViewModels\\PackageViewModelFacts.cs\" />\n<Compile Include=\"ViewModels\\PreviousNextPagerViewModelFacts.cs\" />\n+ <Compile Include=\"ViewModels\\UserProfileModelFacts.cs\" />\n<Compile Include=\"Views\\UrlHelperFacts.cs\" />\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix int overflow for user total downloads (#5096)
|
455,776 |
01.12.2017 16:16:17
| 28,800 |
44a1d2939ed5fe1b45c74a21f00cfdbc5c8cf463
|
Quick hotfix to removing package owners from the manage package owners page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"diff": "&& namespaceOwnerCount >= 2));\n},\n- IsOnlyUserGrantingAccessToCurrentUser: function () {\n+ IsOnlyUserGrantingAccessToCurrentUser: function (item) {\n+ if (!item.grantsCurrentUserAccess) {\n+ // If the user we are trying to remove is not granting the current user access, they cannot be the only user granting access to the current user.\n+ return false;\n+ }\n+\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},\nremoveOwner: function (item) {\n- var isOnlyUserGrantingAccessToCurrentUser = viewModel.IsOnlyUserGrantingAccessToCurrentUser();\n+ var isOnlyUserGrantingAccessToCurrentUser = viewModel.IsOnlyUserGrantingAccessToCurrentUser(item);\nvar isOnlyUserGrantingAccessToCurrentUserMessage = isOnlyUserGrantingAccessToCurrentUser ? strings_RemovingOwnership : \"\";\nif (item.isCurrentUserMemberOfOrganization) {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Quick hotfix to removing package owners from the manage package owners page (#5108)
|
455,772 |
05.12.2017 12:22:20
| 28,800 |
329271cfdf655e92dc9cf625c24f0822acd8d45b
|
Cleanup MessageService
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "using System.Text;\nusing System.Web;\nusing AnglicanGeek.MarkdownMailer;\n-using NuGetGallery.Authentication;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Services;\n@@ -30,7 +29,6 @@ public IAppConfiguration Config\nget { return (IAppConfiguration)CoreConfiguration; }\nset { CoreConfiguration = value; }\n}\n- public AuthenticationService AuthService { get; protected set; }\npublic void ReportAbuse(ReportPackageRequest request)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -36,9 +36,7 @@ public void WillSendEmailToGalleryOwner()\nVersion = \"1.42.0.1\"\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n// Act\nmessageService.ReportAbuse(\n@@ -78,9 +76,7 @@ public void WillCopySenderIfAsked()\nVersion = \"1.42.0.1\",\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nvar reportPackageRequest = new ReportPackageRequest\n{\n@@ -131,9 +127,7 @@ public void WillSendEmailToGalleryOwner()\nVersion = \"1.42.0.1\"\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.ReportMyPackage(\nnew ReportPackageRequest\n@@ -170,9 +164,7 @@ public void WillCopySenderIfAsked()\nVersion = \"1.42.0.1\",\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nvar reportPackageRequest = new ReportPackageRequest\n{\n@@ -214,9 +206,7 @@ public void WillCopySenderIfAsked()\nnew User { EmailAddress = \"yung@example.com\", EmailAllowed = true },\nnew User { EmailAddress = \"flynt@example.com\", EmailAllowed = true }\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", true);\n@@ -247,9 +237,7 @@ public void WillSendEmailToAllOwners()\n}\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -278,9 +266,7 @@ public void WillNotSendEmailToOwnerThatOptsOut()\n}\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -303,9 +289,7 @@ public void WillNotAttemptToSendIfNoOwnersAllow()\n}\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\nAssert.Empty(messageService.MockMailSender.Sent);\n@@ -322,9 +306,7 @@ public void WillNotCopySenderIfNoOwnersAllow()\nnew User { EmailAddress = \"flynt@example.com\", EmailAllowed = false }\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\nAssert.Empty(messageService.MockMailSender.Sent);\n@@ -339,9 +321,7 @@ public void WillSendEmailToNewUser()\n{\nvar to = new MailAddress(\"legit@example.com\", \"too\");\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendNewAccountEmail(to, \"http://example.com/confirmation-token-url\");\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -366,9 +346,7 @@ public void SendsPackageOwnerRequestConfirmationUrl()\nconst string rejectionUrl = \"http://example.com/rejection-token-url\";\nconst string userMessage = \"Hello World!\";\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, rejectionUrl, userMessage, string.Empty);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -393,9 +371,7 @@ public void SendsPackageOwnerRequestConfirmationUrlWithoutUserMessage()\nconst string confirmationUrl = \"http://example.com/confirmation-token-url\";\nconst string rejectionUrl = \"http://example.com/rejection-token-url\";\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, rejectionUrl, string.Empty, string.Empty);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -412,9 +388,7 @@ public void DoesNotSendRequestIfUserDoesNotAllowEmails()\nconst string confirmationUrl = \"http://example.com/confirmation-token-url\";\nconst string rejectionUrl = \"http://example.com/rejection-token-url\";\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, rejectionUrl, string.Empty, string.Empty);\nAssert.Empty(messageService.MockMailSender.Sent);\n@@ -438,9 +412,7 @@ public void SendsNotice()\nNewOwner = newOwner\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRequestRejectionNotice(requestingOwner, newOwner, package);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -465,9 +437,7 @@ public void DoesNotSendNoticeIfUserDoesNotAllowEmails()\nNewOwner = newOwner\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRequestRejectionNotice(requestingOwner, newOwner, package);\nAssert.Empty(messageService.MockMailSender.Sent);\n@@ -484,9 +454,7 @@ public void SendsNotice()\nvar newOwner = new User { Username = \"Noob\", EmailAddress = \"new-owner@example.com\", EmailAllowed = true };\nvar package = new PackageRegistration { Id = \"CoolStuff\" };\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRequestCancellationNotice(requestingOwner, newOwner, package);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -511,9 +479,7 @@ public void DoesNotSendNoticeIfUserDoesNotAllowEmails()\nNewOwner = newOwner\n};\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRequestCancellationNotice(requestingOwner, newOwner, package);\nAssert.Empty(messageService.MockMailSender.Sent);\n@@ -530,9 +496,7 @@ public void SendsPackageOwnerAddedNotice()\nvar toUser = new User { Username = \"Existing\", EmailAddress = \"existing-owner@example.com\", EmailAllowed = true };\nvar newUser = new User { Username = \"Noob\", EmailAddress = \"new-owner@example.com\" };\nvar package = new PackageRegistration { Id = \"CoolStuff\" };\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n// Act\nmessageService.SendPackageOwnerAddedNotice(toUser, newUser, package, \"packageUrl\", \"policyMessage\");\n@@ -553,9 +517,7 @@ public void DoesNotSendPackageOwnerAddedNoticeIfUserDoesNotAllowEmails()\nvar toUser = new User { Username = \"Existing\", EmailAddress = \"existing-owner@example.com\" };\nvar newUser = new User { Username = \"Noob\", EmailAddress = \"new-owner@example.com\", EmailAllowed = false };\nvar package = new PackageRegistration { Id = \"CoolStuff\" };\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n// Act\nmessageService.SendPackageOwnerAddedNotice(toUser, newUser, package, \"packageUrl\", \"policyMessage\");\n@@ -575,9 +537,7 @@ public void SendsPackageOwnerRemovedNotice()\nvar from = new User { Username = \"Existing\", EmailAddress = \"existing-owner@example.com\" };\nvar package = new PackageRegistration { Id = \"CoolStuff\" };\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRemovedNotice(from, to, package);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -595,9 +555,7 @@ public void DoesNotSendRemovedNoticeIfUserDoesNotAllowEmails()\nvar from = new User { Username = \"Existing\", EmailAddress = \"existing-owner@example.com\" };\nvar package = new PackageRegistration { Id = \"CoolStuff\" };\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageOwnerRemovedNotice(from, to, package);\nAssert.Empty(messageService.MockMailSender.Sent);\n@@ -612,9 +570,7 @@ public void WillSendInstructions()\n{\nvar user = new User { EmailAddress = \"legit@example.com\", Username = \"too\" };\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPasswordResetInstructions(user, \"http://example.com/pwd-reset-token-url\", true);\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -643,9 +599,7 @@ public void UsesProviderNounToDescribeCredentialIfPresent()\nvar cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"abc123\", \"Test User\");\nconst string MicrosoftAccountCredentialName = \"Microsoft account\";\n- var messageService = TestableMessageService.Create(\n- _authenticationService,\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendCredentialRemovedNotice(user, _authenticationService.DescribeCredential(cred));\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -662,9 +616,7 @@ public void UsesTypeCaptionToDescribeCredentialIfNoProviderNounPresent()\nvar user = new User { EmailAddress = \"legit@example.com\", Username = \"foo\" };\nvar cred = new CredentialBuilder().CreatePasswordCredential(\"bogus\");\n- var messageService = TestableMessageService.Create(\n- _authenticationService,\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendCredentialRemovedNotice(user, _authenticationService.DescribeCredential(cred));\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -682,9 +634,7 @@ public void ApiKeyRemovedMessageIsCorrect()\ncred.Description = \"new api key\";\ncred.User = user;\n- var messageService = TestableMessageService.Create(\n- _authenticationService,\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendCredentialRemovedNotice(user, _authenticationService.DescribeCredential(cred));\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -712,9 +662,7 @@ public void UsesProviderNounToDescribeCredentialIfPresent()\nvar cred = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"abc123\", \"Test User\");\nconst string MicrosoftAccountCredentialName = \"Microsoft account\";\n- var messageService = TestableMessageService.Create(\n- _authenticationService,\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendCredentialAddedNotice(user, _authenticationService.DescribeCredential(cred));\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -730,9 +678,7 @@ public void UsesTypeCaptionToDescribeCredentialIfNoProviderNounPresent()\nvar user = new User { EmailAddress = \"legit@example.com\", Username = \"foo\" };\nvar cred = new CredentialBuilder().CreatePasswordCredential(\"bogus\");\n- var messageService = TestableMessageService.Create(\n- _authenticationService,\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendCredentialAddedNotice(user, _authenticationService.DescribeCredential(cred));\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -750,9 +696,7 @@ public void ApiKeyAddedMessageIsCorrect()\ncred.Description = \"new api key\";\ncred.User = user;\n- var messageService = TestableMessageService.Create(\n- _authenticationService,\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendCredentialAddedNotice(user, _authenticationService.DescribeCredential(cred));\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -794,9 +738,7 @@ public void WillSendEmailToAllOwners(string version)\npackageRegistration.Packages.Add(package);\n// Act\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nvar packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\nvar supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\nvar emailSettingsUrl = \"https://localhost/account\";\n@@ -834,9 +776,7 @@ public void WillNotSendEmailToOwnerThatOptsOut()\npackageRegistration.Packages.Add(package);\n// Act\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageAddedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n// Assert\n@@ -867,9 +807,7 @@ public void WillNotAttemptToSendIfNoOwnersAllow()\npackageRegistration.Packages.Add(package);\n// Act\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageAddedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n// Assert\n@@ -908,9 +846,7 @@ public void WillSendEmailToAllOwners(string version)\npackageRegistration.Packages.Add(package);\n// Act\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nvar packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\nvar supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\nvar emailSettingsUrl = \"https://localhost/account\";\n@@ -949,9 +885,7 @@ public void WillNotSendEmailToOwnerThatOptsOut()\npackageRegistration.Packages.Add(package);\n// Act\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageUploadedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n// Assert\n@@ -982,9 +916,7 @@ public void WillNotAttemptToSendIfNoOwnersAllow()\npackageRegistration.Packages.Add(package);\n// Act\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendPackageUploadedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n// Assert\n@@ -1016,9 +948,7 @@ public void WillSendEmailToAllOwners()\n};\npackageRegistration.Packages.Add(package);\n- var messageService = TestableMessageService.Create(\n- GetService<AuthenticationService>(),\n- GetConfigurationService());\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\nvar packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\nvar supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\n@@ -1040,26 +970,21 @@ public void WillSendEmailToAllOwners()\npublic class TestableMessageService\n: MessageService\n{\n- private TestableMessageService(\n- AuthenticationService authenticationService,\n- IGalleryConfigurationService configurationService)\n+ private TestableMessageService(IGalleryConfigurationService configurationService)\n{\nconfigurationService.Current.GalleryOwner = TestGalleryOwner;\nconfigurationService.Current.GalleryNoReplyAddress = TestGalleryNoReplyAddress;\nConfig = configurationService.Current;\nMailSender = MockMailSender = new TestMailSender();\n- AuthService = authenticationService;\n}\npublic Mock<AuthenticationService> MockAuthService { get; protected set; }\npublic TestMailSender MockMailSender { get; protected set; }\n- public static TestableMessageService Create(\n- AuthenticationService authenticationService,\n- IGalleryConfigurationService configurationService)\n+ public static TestableMessageService Create(IGalleryConfigurationService configurationService)\n{\n- return new TestableMessageService(authenticationService, configurationService);\n+ return new TestableMessageService(configurationService);\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Cleanup MessageService (#5118)
|
455,737 |
05.12.2017 15:43:21
| 28,800 |
986c2a74c0ff0de9a52ce7d519c46c463eaff33b
|
Cast download count vaules as long before summing so we sum them into a long.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/_UserPackagesList.cshtml",
"new_path": "src/NuGetGallery/Views/Users/_UserPackagesList.cshtml",
"diff": "@{\nvar packagesString = \"package\" + (Model.Packages.Count() != 1 ? \"s\" : \"\");\n- var numDownloads = Model.Packages.Sum(p => p.TotalDownloadCount);\n+ var numDownloads = Model.Packages.Sum(p => (long)p.TotalDownloadCount);\nvar downloadsString = \"download\" + (numDownloads != 1 ? \"s\" : \"\");\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Cast download count vaules as long before summing so we sum them into a long.
|
455,744 |
05.12.2017 17:33:32
| 28,800 |
6dffdbd088515ac90253bdf05009a700a1d0632c
|
Validation failed sending method
* Added SendPackageValidationFailedNotice
* Fixed subject
Added tests
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CoreMessageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CoreMessageService.cs",
"diff": "@@ -29,6 +29,44 @@ public void SendPackageAddedNotice(Package package, string packageUrl, string pa\nstring subject = \"[{0}] Package published - {1} {2}\";\nstring body = @\"The package [{1} {2}]({3}) was just published on {0}. If this was not intended, please [contact support]({4}).\n+-----------------------------------------------\n+<em style=\"\"font-size: 0.8em;\"\">\n+ To stop receiving emails as an owner of this package, sign in to the {0} and\n+ [change your email notification settings]({5}).\n+</em>\";\n+\n+ body = string.Format(\n+ CultureInfo.CurrentCulture,\n+ body,\n+ CoreConfiguration.GalleryOwner.DisplayName,\n+ package.PackageRegistration.Id,\n+ package.Version,\n+ packageUrl,\n+ packageSupportUrl,\n+ emailSettingsUrl);\n+\n+ subject = string.Format(CultureInfo.CurrentCulture, subject, CoreConfiguration.GalleryOwner.DisplayName, package.PackageRegistration.Id, package.Version);\n+\n+ using (var mailMessage = new MailMessage())\n+ {\n+ mailMessage.Subject = subject;\n+ mailMessage.Body = body;\n+ mailMessage.From = CoreConfiguration.GalleryNoReplyAddress;\n+\n+ AddOwnersSubscribedToPackagePushedNotification(package.PackageRegistration, mailMessage);\n+\n+ if (mailMessage.To.Any())\n+ {\n+ SendMessage(mailMessage, copySender: false);\n+ }\n+ }\n+ }\n+\n+ public void SendPackageValidationFailedNotice(Package package, string packageUrl, string packageSupportUrl, string emailSettingsUrl)\n+ {\n+ string subject = \"[{0}] Package validation failed - {1} {2}\";\n+ string body = @\"The package [{1} {2}]({3}) failed validation and was therefore not published on {0}. Note that the package will not be available for consumption and you will not be able to push the same package ID and version until further action is taken. Please [contact support]({4}) for next steps.\n+\n-----------------------------------------------\n<em style=\"\"font-size: 0.8em;\"\">\nTo stop receiving emails as an owner of this package, sign in to the {0} and\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -815,6 +815,116 @@ public void WillNotAttemptToSendIfNoOwnersAllow()\n}\n}\n+ public class TheSendPackageValidationFailedNoticeMethod\n+ : TestContainer\n+ {\n+ [Theory]\n+ [InlineData(\"1.2.3\")]\n+ [InlineData(\"1.2.3-alpha\")]\n+ [InlineData(\"1.2.3-alpha.1\")]\n+ [InlineData(\"1.2.3+metadata\")]\n+ [InlineData(\"1.2.3-alpha+metadata\")]\n+ [InlineData(\"1.2.3-alpha.1+metadata\")]\n+ public void WillSendEmailToAllOwners(string version)\n+ {\n+ // Arrange\n+ var nugetVersion = new NuGetVersion(version);\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = \"smangit\",\n+ Owners = new[]\n+ {\n+ new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = true },\n+ new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = true }\n+ }\n+ };\n+ var package = new Package\n+ {\n+ Version = version,\n+ PackageRegistration = packageRegistration\n+ };\n+ packageRegistration.Packages.Add(package);\n+\n+ // Act\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n+ var packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\n+ var supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\n+ var emailSettingsUrl = \"https://localhost/account\";\n+ messageService.SendPackageValidationFailedNotice(package, packageUrl, supportUrl, emailSettingsUrl);\n+\n+ // Assert\n+ var message = messageService.MockMailSender.Sent.Last();\n+\n+ Assert.Equal(\"yung@example.com\", message.To[0].Address);\n+ Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n+ Assert.Equal(TestGalleryNoReplyAddress, message.From);\n+ Assert.Contains($\"[Joe Shmoe] Package validation failed - {packageRegistration.Id} {nugetVersion.ToNormalizedString()}\", message.Subject);\n+ Assert.Contains(\n+ $\"The package [{packageRegistration.Id} {nugetVersion.ToFullString()}]({packageUrl}) failed validation and was therefore not published on Joe Shmoe. \" +\n+ $\"Note that the package will not be available for consumption and you will not be able to push the same package ID and version until further action is taken. \" +\n+ $\"Please [contact support]({supportUrl}) for next steps.\", message.Body);\n+ }\n+\n+ [Fact]\n+ public void WillNotSendEmailToOwnerThatOptsOut()\n+ {\n+ // Arrange\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = \"smangit\",\n+ Owners = new[]\n+ {\n+ new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = true },\n+ new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = false }\n+ }\n+ };\n+ var package = new Package\n+ {\n+ Version = \"1.2.3\",\n+ PackageRegistration = packageRegistration\n+ };\n+ packageRegistration.Packages.Add(package);\n+\n+ // Act\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n+ messageService.SendPackageValidationFailedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n+\n+ // Assert\n+ var message = messageService.MockMailSender.Sent.Last();\n+\n+ Assert.Equal(\"yung@example.com\", message.To[0].Address);\n+ Assert.Equal(1, message.To.Count);\n+ }\n+\n+ [Fact]\n+ public void WillNotAttemptToSendIfNoOwnersAllow()\n+ {\n+ // Arrange\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = \"smangit\",\n+ Owners = new[]\n+ {\n+ new User { EmailAddress = \"yung@example.com\", EmailAllowed = false },\n+ new User { EmailAddress = \"flynt@example.com\", EmailAllowed = false }\n+ }\n+ };\n+ var package = new Package\n+ {\n+ Version = \"1.2.3\",\n+ PackageRegistration = packageRegistration\n+ };\n+ packageRegistration.Packages.Add(package);\n+\n+ // Act\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n+ messageService.SendPackageValidationFailedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n+\n+ // Assert\n+ Assert.Empty(messageService.MockMailSender.Sent);\n+ }\n+ }\n+\npublic class TheSendPackageUploadedNoticeMethod\n: TestContainer\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Validation failed sending method (#5127)
* Added SendPackageValidationFailedNotice
* Fixed subject
Added tests
|
455,794 |
06.12.2017 15:52:12
| 28,800 |
96b540190acdd03facf091c2525220e94ccadf73
|
Organizations: Add owner filter to Manage Packages view
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -284,8 +284,36 @@ public virtual ActionResult Thanks()\npublic virtual ActionResult Packages()\n{\nvar user = GetCurrentUser();\n- var packages = _packageService.FindPackagesByAnyMatchingOwner(user, includeUnlisted: true)\n- .Select(p => new ListPackageItemViewModel(p)).OrderBy(p => p.Id).ToList();\n+\n+ var owners = new List<ListPackageOwnerViewModel> {\n+ new ListPackageOwnerViewModel\n+ {\n+ Username = \"All packages\"\n+ },\n+ new ListPackageOwnerViewModel(user)\n+ {\n+ CanManagePackageOwners = PermissionsService.IsActionAllowed(\n+ account: user,\n+ currentUser: user,\n+ action: PackageActions.ManagePackageOwners)\n+ }\n+ }.Concat(user.Organizations.Select(o => new ListPackageOwnerViewModel(o.Organization)\n+ {\n+ CanManagePackageOwners = PermissionsService.IsActionAllowed(\n+ account: o.Organization,\n+ currentUser: user,\n+ action: PackageActions.ManagePackageOwners)\n+ }));\n+\n+ var packages = _packageService.FindPackagesByAnyMatchingOwner(user, includeUnlisted: true);\n+ var listedPackages = packages\n+ .Where(p => p.Listed)\n+ .Select(p => new ListPackageItemViewModel(p)).OrderBy(p => p.Id)\n+ .ToList();\n+ var unlistedPackages = packages\n+ .Where(p => !p.Listed)\n+ .Select(p => new ListPackageItemViewModel(p)).OrderBy(p => p.Id)\n+ .ToList();\nvar incoming = _packageOwnerRequestService.GetPackageOwnershipRequests(newOwner: user);\nvar outgoing = _packageOwnerRequestService.GetPackageOwnershipRequests(requestingOwner: user);\n@@ -295,7 +323,9 @@ public virtual ActionResult Packages()\nvar model = new ManagePackagesViewModel\n{\n- Packages = packages,\n+ Owners = owners,\n+ ListedPackages = listedPackages,\n+ UnlistedPackages = unlistedPackages,\nOwnerRequests = ownerRequests,\nReservedNamespaces = reservedPrefixes\n};\n"
},
{
"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\\ListPackageOwnerViewModel.cs\" />\n<Compile Include=\"ViewModels\\PackageDeleteDecision.cs\" />\n<Compile Include=\"ViewModels\\DeleteAccountViewModel.cs\" />\n<Compile Include=\"ViewModels\\ApiKeyOwnerViewModel.cs\" />\n<Content Include=\"Views\\Authentication\\LinkExternal.cshtml\" />\n<Content Include=\"Views\\Authentication\\_SignIn.cshtml\" />\n<Content Include=\"Views\\Authentication\\_Register.cshtml\" />\n- <Content Include=\"Views\\Users\\_UserPackagesList.cshtml\" />\n<Content Include=\"Views\\Users\\_ConfirmationResendForm.cshtml\" />\n<Content Include=\"Views\\Shared\\_PackageHeading.cshtml\" />\n<Content Include=\"Views\\Packages\\_ImportReadMe.cshtml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"diff": "@@ -7,7 +7,11 @@ namespace NuGetGallery\n{\npublic class ManagePackagesViewModel\n{\n- public IEnumerable<ListPackageItemViewModel> Packages { get; set; }\n+ public IEnumerable<ListPackageOwnerViewModel> Owners { get; set; }\n+\n+ public IEnumerable<ListPackageItemViewModel> ListedPackages { get; set; }\n+\n+ public IEnumerable<ListPackageItemViewModel> UnlistedPackages { get; set; }\npublic OwnerRequestsViewModel OwnerRequests { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n+@helper Section(\n+ string id,\n+ string title,\n+ Func<MvcHtmlString, HelperResult> content,\n+ bool expanded = true,\n+ string expandedIcon = \"ChevronDown\",\n+ string collapsedIcon = \"ChevronRight\")\n+{\n+ <h3>\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#@id-container\"\n+ aria-expanded=\"@(expanded ? \"true\" : \"false\")\" aria-controls=\"@id-container\" id=\"show-@id-container\">\n+ <i class=\"ms-Icon ms-Icon--@(expanded ? expandedIcon : collapsedIcon)\"\n+ aria-hidden=\"@(expanded ? \"false\" : \"true\")\"></i>\n+ <span>@title</span>\n+ </a>\n+ </h3>\n+ <div class=\"panel-collapse collapse @(expanded ? \"in\" : string.Empty) col-xs-12\" id=\"@id-container\">\n+ @content(MvcHtmlString.Empty)\n+ </div>\n+}\n+\n<section role=\"main\" class=\"container main-container page-manage-packages page-package-details\">\n<div class=\"row\">\n<div class=\"col-xs-12\">\n- <h1>Manage Packages</h1>\n+ <h1>My Packages</h1>\n+ <div class=\"col-xs-3 text-right form-group pull-right\">\n+ <select id=\"ownerFilter\" class=\"form-control pull-right\"\n+ data-bind=\"options: Owners, value: OwnerFilter, optionsText: 'Username'\"></select>\n</div>\n+ @Section(\"listed\", \"Published\",\n+ @<text>\n+ <div class=\"row user-package-list\">\n+ <div data-bind=\"template: { name: 'manage-packages', data: ListedPackages }\"></div>\n</div>\n- @{\n- var listedPackages = Model.Packages.Where(p => p.Listed);\n- var unlistedPackages = Model.Packages.Where(p => !p.Listed);\n+ </text>)\n- @Html.Partial(\"_UserPackagesList\", new ManagePackagesListViewModel(listedPackages, \"Published\"))\n- @Html.Partial(\"_UserPackagesList\", new ManagePackagesListViewModel(unlistedPackages, \"Unlisted\"))\n- }\n-\n- @Html.Partial(\"_ReservedNamespacesList\", Model.ReservedNamespaces)\n+ @Section(\"unlisted\", \"Unlisted\",\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- @{\n- if (Model.OwnerRequests.Incoming.RequestItems.Any() || Model.OwnerRequests.Outgoing.RequestItems.Any())\n+ @if (Model.ReservedNamespaces.ReservedNamespaces.Any())\n{\n<div class=\"row\">\n<div class=\"col-xs-12\">\n- <h1>Manage Ownership Requests</h1>\n+ <h1>My Reserved Namespaces</h1>\n+ @Section(\n+ \"namespaces\",\n+ \"Namespaces\",\n+ @<text>\n+ @Html.Partial(\"_ReservedNamespacesList\", Model.ReservedNamespaces)\n+ </text>)\n</div>\n</div>\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+ {\n+ @Section(\n+ \"requests-incoming\",\n+ \"Incoming\",\n+ @<text>\n@Html.Partial(\"_OwnerRequestsList\", Model.OwnerRequests.Incoming)\n+ </text>)\n+ }\n+\n+ @if (Model.OwnerRequests.Outgoing.RequestItems.Any())\n+ {\n+\n+ @Section(\n+ \"requests-outgoing\",\n+ \"Outgoing\",\n+ @<text>\n@Html.Partial(\"_OwnerRequestsList\", Model.OwnerRequests.Outgoing)\n+ </text>)\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+ <th class=\"hidden-xs\"></th>\n+ <th>Package ID</th>\n+ <th>Owners</th>\n+ <th>Downloads</th>\n+ <th>Latest Version</th>\n+ <th></th>\n+ </tr>\n+ </thead>\n+ <tbody data-bind=\"foreach: Packages\">\n+ <tr class=\"manage-package-listing\" data-bind=\"visible: Visible\">\n+ <td class=\"align-middle hidden-xs\">\n+ <img class=\"package-icon img-responsive\" aria-hidden=\"true\" alt=\"\"\n+ data-bind=\"attr: { src: PackageIconUrl, onerror: PackageIconUrlFallback }\" />\n+ </td>\n+ <td class=\"align-middle package-id\">\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+ <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+ </span>\n+ </td>\n+ <td class=\"align-middle text-nowrap\">\n+ <span data-bind=\"text: DownloadCount\"></span>\n+ </td>\n+ <td class=\"align-middle text-nowrap\">\n+ <span data-bind=\"text: LatestVersion\"></span>\n+ </td>\n+ <td class=\"text-right align-middle package-controls\">\n+ <span data-bind=\"visible: CanEdit\">\n+ <a class=\"btn\" title=\"Edit Package\" data-bind=\"attr: { href: EditUrl,\n+ 'aria-label': 'Edit Package ' + Id + ' Version ' + LatestVersion }\">\n+\n+ <i class=\"ms-Icon ms-Icon--Edit\" aria-hidden=\"true\"></i>\n+ </a>\n+ </span>\n+ <span data-bind=\"visible: CanManageOwners\">\n+ <a class=\"btn\" title=\"Manage Owners\" data-bind=\"attr: { href: ManageOwnersUrl,\n+ 'aria-label': 'Manage Owners for Package ' + Id }\">\n+\n+ <i class=\"ms-Icon ms-Icon--People\" aria-hidden=\"true\"></i>\n+ </a>\n+ </span>\n+ <span data-bind=\"visible: CanDelete\">\n+ <a class=\"btn\" title=\"Delete Package\" data-bind=\"attr: { href: DeleteUrl,\n+ 'aria-label': 'Delete Package ' + Id + ' Version ' + LatestVersion }\">\n+\n+ <i class=\"ms-Icon ms-Icon--Delete\" aria-hidden=\"true\"></i>\n+ </a>\n+ </span>\n+ </td>\n+ </tr>\n+ </tbody>\n+ </table>\n+ </div>\n+ </div>\n+</script>\n+\n+@functions {\n+ dynamic GetSerializablePackage(ListPackageItemViewModel p)\n+ {\n+ return new\n+ {\n+ p.Id,\n+ Owners = p.Owners.Select(o => new\n+ {\n+ o.Username,\n+ ProfileUrl = Url.User(o),\n+ IsOrganization = o is Organization\n+ }),\n+ p.TotalDownloadCount,\n+ LatestVersion = p.FullVersion.Abbreviate(25),\n+ PackageIconUrl = @PackageHelper.ShouldRenderUrl(p.IconUrl) ? p.IconUrl : null,\n+ PackageUrl = @Url.Package(p.Id),\n+ EditUrl = @Url.EditPackage(p.Id, p.Version),\n+ ManageOwnersUrl = @Url.ManagePackageOwners(p),\n+ DeleteUrl = @Url.DeletePackage(p),\n+ CanEdit = p.IsActionAllowed(User, PackageActions.Edit),\n+ CanManageOwners = p.IsActionAllowed(User, PackageActions.ManagePackageOwners),\n+ CanDelete = p.IsActionAllowed(User, PackageActions.Unlist)\n+ };\n+ }\n+}\n+\n@section BottomScripts {\n+ <script type=\"text/javascript\">\n+ var initialData = @Html.Raw(Json.Encode(new\n+ {\n+ Owners = Model.Owners.Select(o => new\n+ {\n+ Username = o.Username,\n+ IsOrganization = o is Organization\n+ }),\n+ ListedPackages = Model.ListedPackages\n+ .Select(p => GetSerializablePackage(p)),\n+ UnlistedPackages = Model.UnlistedPackages\n+ .Select(p => GetSerializablePackage(p)),\n+ DefaultPackageIconUrl = Url.Absolute(\"~/Content/gallery/img/default-package-icon.svg\"),\n+ PackageIconUrlFallback = Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\")\n+ }));\n+ </script>\n@Scripts.Render(\"~/Scripts/gallery/page-manage-packages.min.js\")\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Organizations: Add owner filter to Manage Packages view (#5060)
|
455,794 |
07.12.2017 08:22:58
| 28,800 |
1f2e2badcf8692cbdace540bb8775269aec04096
|
ManagePackages: hide filter if not in organization
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"diff": "this.PackageIconUrlFallback = initialData.PackageIconUrlFallback;\nthis.OwnerFilter = ko.observable();\n+ // More filter entries than 'All' and current user\n+ if (this.Owners.length > 2) {\n+ $(\"#ownerFilter\").removeClass(\"hidden\");\n+ }\nthis.ListedPackages = new PackagesListViewModel(this, \"published\", initialData.ListedPackages);\nthis.UnlistedPackages = new PackagesListViewModel(this, \"unlisted\", initialData.UnlistedPackages);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "<div class=\"col-xs-12\">\n<h1>My Packages</h1>\n<div class=\"col-xs-3 text-right form-group pull-right\">\n- <select id=\"ownerFilter\" class=\"form-control pull-right\"\n+ <select id=\"ownerFilter\" class=\"form-control pull-right hidden\"\ndata-bind=\"options: Owners, value: OwnerFilter, optionsText: 'Username'\"></select>\n</div>\n@Section(\"listed\", \"Published\",\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
ManagePackages: hide filter if not in organization (#5135)
|
455,772 |
07.12.2017 09:51:31
| 28,800 |
9076a6ff3de28f3d2f69b3ebe93627be6156979b
|
Unify Listed and Validation Status columns
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"ViewModels\\ApiKeyListViewModel.cs\" />\n<Compile Include=\"ViewModels\\ApiKeyViewModel.cs\" />\n<Compile Include=\"ViewModels\\OwnerRequestsListItemViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\PackageStatusSummary.cs\" />\n<Compile Include=\"ViewModels\\ReportViewModel.cs\" />\n<Compile Include=\"ViewModels\\ReservedNamespaceListViewModel.cs\" />\n<Compile Include=\"ViewModels\\ReservedNamespaceListItemViewModel.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "@@ -15,6 +15,7 @@ public class PackageViewModel : IPackageVersionModel\nprivate string _pendingTitle;\nprivate string _fullVersion;\n+ private readonly PackageStatus _packageStatus;\ninternal readonly NuGetVersion NuGetVersion;\npublic PackageViewModel(Package package)\n@@ -42,13 +43,13 @@ public PackageViewModel(Package package)\nLatestStableVersionSemVer2 = package.IsLatestStableSemVer2;\nLastUpdated = package.Published;\nListed = package.Listed;\n- PackageStatus = package.PackageStatusKey;\n+ _packageStatus = package.PackageStatusKey;\nDownloadCount = package.DownloadCount;\nPrerelease = package.IsPrerelease;\nLicenseReportUrl = package.LicenseReportUrl;\nvar licenseNames = package.LicenseNames;\n- if (!String.IsNullOrEmpty(licenseNames))\n+ if (!string.IsNullOrEmpty(licenseNames))\n{\nLicenseNames = licenseNames.Split(',').Select(l => l.Trim());\n}\n@@ -70,11 +71,10 @@ public PackageViewModel(Package package)\npublic bool Prerelease { get; set; }\npublic int DownloadCount { get; set; }\npublic bool Listed { get; set; }\n- public bool FailedValidation => PackageStatus == PackageStatus.FailedValidation;\n- public bool Available => PackageStatus == PackageStatus.Available;\n- public bool Validating => PackageStatus == PackageStatus.Validating;\n- public bool Deleted => PackageStatus == PackageStatus.Deleted;\n- public PackageStatus PackageStatus { get; set; }\n+ public bool FailedValidation => _packageStatus == PackageStatus.FailedValidation;\n+ public bool Available => _packageStatus == PackageStatus.Available;\n+ public bool Validating => _packageStatus == PackageStatus.Validating;\n+ public bool Deleted => _packageStatus == PackageStatus.Deleted;\npublic int TotalDownloadCount\n{\n@@ -100,5 +100,33 @@ public bool IsCurrent(IPackageVersionModel current)\n{\nreturn current.Version == Version && current.Id == Id;\n}\n+\n+ public PackageStatusSummary PackageStatusSummary\n+ {\n+ get\n+ {\n+ switch (_packageStatus)\n+ {\n+ case PackageStatus.Validating:\n+ {\n+ return PackageStatusSummary.Validating;\n+ }\n+ case PackageStatus.FailedValidation:\n+ {\n+ return PackageStatusSummary.FailedValidation;\n+ }\n+ case PackageStatus.Available:\n+ {\n+ return Listed ? PackageStatusSummary.Listed : PackageStatusSummary.Unlisted;\n+ }\n+ case PackageStatus.Deleted:\n+ {\n+ return PackageStatusSummary.None;\n+ }\n+ default:\n+ throw new ArgumentOutOfRangeException(nameof(PackageStatus));\n+ }\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<th>Last updated</th>\n@if (Model.IsActionAllowed(User, PackageActions.DisplayPrivatePackage))\n{\n- <th>Listed</th>\n- if (Config.Current.AsynchronousPackageValidationEnabled)\n- {\n- <th>Validation Status</th>\n- }\n+ <th>Status</th>\n}\n</tr>\n</thead>\n<span data-datetime=\"@packageVersion.LastUpdated.ToString(\"O\")\">@packageVersion.LastUpdated.ToNuGetShortDateString()</span>\n</td>\n@if (packageVersion.IsActionAllowed(User, PackageActions.DisplayPrivatePackage))\n+ {\n+ var packageStatusSummary = packageVersion.PackageStatusSummary;\n+\n+ if (packageStatusSummary == PackageStatusSummary.Listed ||\n+ packageStatusSummary == PackageStatusSummary.Unlisted)\n{\n<td>\n- <a href=\"@Url.DeletePackage(packageVersion)\">@(packageVersion.Listed ? \"yes\" : \"no\")</a>\n+ <a href=\"@Url.DeletePackage(packageVersion)\">@NuGetGallery.Helpers.EnumHelper.GetDescription(packageStatusSummary)</a>\n</td>\n- if (Config.Current.AsynchronousPackageValidationEnabled)\n+ }\n+ else\n{\n<td>\n- @switch (packageVersion.PackageStatus)\n- {\n- case PackageStatus.Available:\n- @:Valid\n- break;\n- case PackageStatus.Validating:\n- @:Validating\n- break;\n- case PackageStatus.FailedValidation:\n- @:Failed validation\n- break;\n- }\n+ @NuGetGallery.Helpers.EnumHelper.GetDescription(packageStatusSummary)\n</td>\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Unify Listed and Validation Status columns (#5136)
|
455,794 |
07.12.2017 12:50:46
| 28,800 |
79f629476b8401d92c5d188d44a97623266eff05
|
Fix ManagePackages icon fallback
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"diff": "this.PackageIconUrl = (packageItem.PackageIconUrl)\n? packageItem.PackageIconUrl\n: this.PackagesListViewModel.ManagePackagesViewModel.DefaultPackageIconUrl;\n- this.PackageIconUrlFallback = this.PackagesListViewModel.ManagePackagesViewModel.PackageIconUrlFallback;\nthis.PackageUrl = packageItem.PackageUrl;\nthis.EditUrl = packageItem.EditUrl;\nthis.ManageOwnersUrl = packageItem.ManageOwnersUrl;\n}\nthis.Visible(visible);\n};\n+ this.PackageIconUrlFallback = ko.pureComputed(function () {\n+ var url = this.PackagesListViewModel.ManagePackagesViewModel.PackageIconUrlFallback;\n+ return \"this.src='\" + url + \"'; this.onerror = null;\";\n+ }, this);\n}\nfunction PackagesListViewModel(managePackagesViewModel, type, packages) {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix ManagePackages icon fallback (#5145)
|
455,751 |
07.12.2017 13:06:34
| 28,800 |
4f4d1a5d84b49aea4dd831ef9732802fcae2a24c
|
Issue 5092 and a small UI improvement.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/DeleteAccount/DeleteUserAccount.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/DeleteAccount/DeleteUserAccount.cshtml",
"diff": "<a href=\"@Url.User(@Model.User)\">@Model.AccountName</a>\n</div>\n- @ViewHelpers.AlertDanger(@<p>\n+ @ViewHelpers.AlertDanger(@<text>\n<b class=\"keywords\">Once the account is deleted, it cannot be undone!</b> <br />\nDeleting the account will: <br />\n1. Revoke associated API key(s). <br />\n2. Remove the account as an owner for any child packages.<br />\n3. Dissociate all previously existent ID prefix reservations with this account.<br />\n- </p>)\n+ </text>)\n<div class=\"form-group\">\n@{\n<div class=\"form-group\">\n@Html.EditorFor(m => m.ShouldUnlist)\n<label class=\"checkbox-inline\">\n- <b>Unlist the packages without an user.</b>\n+ <b>Unlist the packages without any user.</b>\n</label>\n<p>\nOne or more packages do not have co-owners. If you choose to proceed without fixing this issue, these packages will be orphaned and a warning message will be displayed under owners on the package page.\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Issue 5092 and a small UI improvement. (#5137)
|
455,751 |
08.12.2017 00:12:57
| 28,800 |
f29871d9531b824aa5fabcd2c2d3a4526a388440
|
Clean elmah logs.
Remove PII from Elmah logs.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditActor.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditActor.cs",
"diff": "@@ -65,10 +65,7 @@ public static Task<AuditActor> GetAspNetOnBehalfOfAsync(HttpContextBase context)\nclientIpAddress = context.Request.UserHostAddress;\n}\n- if (!string.IsNullOrEmpty(clientIpAddress) && clientIpAddress.IndexOf(\".\", StringComparison.Ordinal) > 0)\n- {\n- clientIpAddress = clientIpAddress.Substring(0, clientIpAddress.LastIndexOf(\".\", StringComparison.Ordinal)) + \".0\";\n- }\n+ clientIpAddress = Obfuscator.ObfuscateIp(clientIpAddress);\nstring user = null;\nstring authType = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/TableErrorLog.cs",
"diff": "using Elmah;\nusing Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Table;\n+using NuGetGallery.Auditing;\nnamespace NuGetGallery.Infrastructure\n{\n@@ -181,9 +182,32 @@ public override int GetErrors(int pageIndex, int pageSize, IList errorEntryList)\npublic override string Log(Error error)\n{\n+ Obfuscate(error);\nvar entity = new ErrorEntity(error);\nlong pos = _entityList.Add(entity);\nreturn pos.ToString(CultureInfo.InvariantCulture);\n}\n+\n+ private void Obfuscate(Error error)\n+ {\n+ //ServerVariables overrides requiring context from the http request should be handled in NuGetGallery.QuietLog\n+ var elmahException = error.Exception as ElmahException;\n+ if (elmahException != null)\n+ {\n+ var piiServerVaribles = elmahException.ServerVariables;\n+ foreach (var key in piiServerVaribles.Keys)\n+ {\n+ error.ServerVariables[key] = piiServerVaribles[key];\n+ }\n+ }\n+\n+ error.ServerVariables[\"AUTH_USER\"] = string.Empty;\n+ error.ServerVariables[\"LOGON_USER\"] = string.Empty;\n+ error.ServerVariables[\"REMOTE_USER\"] = string.Empty;\n+\n+ error.ServerVariables[\"REMOTE_ADDR\"] = Obfuscator.ObfuscateIp(error.ServerVariables[\"REMOTE_ADDR\"]);\n+ error.ServerVariables[\"REMOTE_HOST\"] = Obfuscator.ObfuscateIp(error.ServerVariables[\"REMOTE_HOST\"]);\n+ error.ServerVariables[\"LOCAL_ADDR\"] = Obfuscator.ObfuscateIp(error.ServerVariables[\"LOCAL_ADDR\"]);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Auditing\\AuditingService.cs\" />\n<Compile Include=\"Auditing\\AuditRecord.cs\" />\n<Compile Include=\"Auditing\\FailedAuthenticatedOperationAuditRecord.cs\" />\n+ <Compile Include=\"Auditing\\Obfuscator.cs\" />\n<Compile Include=\"Auditing\\ReservedNamespaceAuditRecord.cs\" />\n<Compile Include=\"Auditing\\UserSecurityPolicyAuditRecord.cs\" />\n<Compile Include=\"Auditing\\FileSystemAuditingService.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCore.cs\" />\n<Compile Include=\"ICloudStorageStatusDependency.cs\" />\n<Compile Include=\"Infrastructure\\AzureEntityList.cs\" />\n+ <Compile Include=\"Infrastructure\\ElmahException.cs\" />\n<Compile Include=\"Infrastructure\\TableErrorLog.cs\" />\n<Compile Include=\"Authentication\\NuGetClaims.cs\" />\n<Compile Include=\"PackageReaderCoreExtensions.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\ValidationService.cs\" />\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricher.cs\" />\n<Compile Include=\"Telemetry\\ClientTelemetryPIIProcessor.cs\" />\n+ <Compile Include=\"Telemetry\\Obfuscator.cs\" />\n<Compile Include=\"Telemetry\\QuietExceptionLogger.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialBuilder.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialValidator.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"diff": "@@ -12,21 +12,6 @@ namespace NuGetGallery\n{\npublic class ClientTelemetryPIIProcessor : ITelemetryProcessor\n{\n- /// <summary>\n- /// Default user name that will replace the real user name.\n- /// This value will be saved in AI instead of the real value.\n- /// </summary>\n- internal const string DefaultTelemetryUserName = \"HiddenUserName\";\n-\n- internal static readonly HashSet<string> PiiActions = new HashSet<string>{\n- \"Packages/ConfirmPendingOwnershipRequest\",\n- \"Packages/RejectPendingOwnershipRequest\",\n- \"Packages/CancelPendingOwnershipRequest\",\n- \"Users/Confirm\",\n- \"Users/Delete\",\n- \"Users/Profiles\",\n- \"Users/ResetPassword\"};\n-\nprivate ITelemetryProcessor Next { get; }\npublic ClientTelemetryPIIProcessor(ITelemetryProcessor next)\n@@ -53,8 +38,8 @@ private Uri ObfuscateUri(RequestTelemetry telemetryItem)\n{\nif(IsPIIOperation(telemetryItem.Context.Operation.Name))\n{\n- // The new url form will be: https://nuget.org/HiddenUserName\n- return new Uri($\"{telemetryItem.Url.Scheme}://{telemetryItem.Url.Host}/{DefaultTelemetryUserName}\");\n+ // The new url form will be: https://nuget.org/ObfuscatedUserName\n+ return new Uri(Obfuscator.DefaultObfuscatedUrl(telemetryItem.Url));\n}\nreturn telemetryItem.Url;\n}\n@@ -67,7 +52,7 @@ protected virtual bool IsPIIOperation(string operationName)\n}\n// Remove the verb from the operation name.\n// An example of operationName : GET Users/Profiles\n- return PiiActions.Contains(operationName.Split(' ').Last());\n+ return Obfuscator.ObfuscatedActions.Contains(operationName.Split(' ').Last());\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/QuietLog.cs",
"new_path": "src/NuGetGallery/Telemetry/QuietLog.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Web;\n+using System.Web.Routing;\nusing Elmah;\nnamespace NuGetGallery\n@@ -41,9 +42,11 @@ private static void LogHandledExceptionCore(Exception e, string aggregateExcepti\n{\ntry\n{\n- if (HttpContext.Current != null)\n+ var currentHttpContext = HttpContext.Current;\n+ if (currentHttpContext != null)\n{\n- ErrorSignal.FromCurrentContext().Raise(e);\n+ var elmahException = new ElmahException(e, GetObfuscatedServerVariables(new HttpContextWrapper(currentHttpContext)));\n+ ErrorSignal.FromCurrentContext().Raise(elmahException);\n}\nelse\n{\n@@ -61,5 +64,44 @@ private static void LogHandledExceptionCore(Exception e, string aggregateExcepti\n// logging failed, don't allow exception to escape\n}\n}\n+\n+ internal static bool IsPIIRoute(RouteData route, out string operation)\n+ {\n+ if(route == null)\n+ {\n+ operation = string.Empty;\n+ return false;\n+ }\n+ operation = $\"{route.Values[\"controller\"]}/{route.Values[\"action\"]}\";\n+ return Obfuscator.ObfuscatedActions.Contains(operation);\n+ }\n+\n+ /// <summary>\n+ /// These values will be used to overwrite the serverVariables in the Elmah error before the exception is logged.\n+ /// These are the serverVariables that Gallery decides that will be obfuscated and the values to be used for obfuscation.\n+ /// </summary>\n+ /// <param name=\"currentContext\">The current HttpContext.</param>\n+ /// <returns>A dictionary with the server variables that will be obfuscated.</returns>\n+ internal static Dictionary<string, string> GetObfuscatedServerVariables(HttpContextBase currentContext)\n+ {\n+ string operation = string.Empty;\n+ if(currentContext == null ||\n+ currentContext.Request == null ||\n+ currentContext.Request.RequestContext == null ||\n+ !IsPIIRoute(currentContext.Request.RequestContext.RouteData, out operation))\n+ {\n+ return null;\n+ }\n+\n+ var obfuscatedServerVariables = new Dictionary<string, string>();\n+ var obfuscatedURL = Obfuscator.DefaultObfuscatedUrl(currentContext.Request.Url);\n+ obfuscatedServerVariables.Add(\"HTTP_REFERER\", obfuscatedURL);\n+ obfuscatedServerVariables.Add(\"PATH_INFO\", operation);\n+ obfuscatedServerVariables.Add(\"PATH_TRANSLATED\", operation);\n+ obfuscatedServerVariables.Add(\"SCRIPT_NAME\", operation);\n+ obfuscatedServerVariables.Add(\"URL\", obfuscatedURL);\n+\n+ return obfuscatedServerVariables;\n+ }\n}\n}\n\\ No newline at end of file\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=\"Auditing\\CredentialAuditRecordTests.cs\" />\n<Compile Include=\"Auditing\\EnumTests.cs\" />\n<Compile Include=\"Auditing\\FailedAuthenticatedOperationAuditRecordTests.cs\" />\n+ <Compile Include=\"Auditing\\ObfuscatorFacts.cs\" />\n<Compile Include=\"Auditing\\ReservedNamespaceAuditRecordTests.cs\" />\n<Compile Include=\"Auditing\\UserSecurityPolicyAuditRecordFacts.cs\" />\n<Compile Include=\"Auditing\\FileSystemAuditingServiceTests.cs\" />\n<Compile Include=\"Entities\\PackageFacts.cs\" />\n<Compile Include=\"Entities\\UserFacts.cs\" />\n<Compile Include=\"Entities\\UserSecurityPolicyFacts.cs\" />\n+ <Compile Include=\"Infrastructure\\ElmahExceptionFacts.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCoreFacts.cs\" />\n<Compile Include=\"PackageStatusFacts.cs\" />\n<Compile Include=\"Packaging\\ManifestValidatorFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\ValidationServiceFacts.cs\" />\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricherTests.cs\" />\n<Compile Include=\"Telemetry\\ClientTelemetryPIIProcessorTests.cs\" />\n+ <Compile Include=\"Telemetry\\QuietLogFacts.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestableV1Feed.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestableV2Feed.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestDependencyResolver.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"new_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"diff": "@@ -47,7 +47,7 @@ public void UrlIsUpdatedOnPIIAction(bool actionIsPII)\npiiProcessor.Process(telemetryItem);\n// Assert\n- string expected = actionIsPII ? $\"https://localhost/{ClientTelemetryPIIProcessor.DefaultTelemetryUserName}\" : telemetryItem.Url.ToString();\n+ string expected = actionIsPII ? $\"https://localhost/{Obfuscator.DefaultTelemetryUserName}\" : telemetryItem.Url.ToString();\nAssert.Equal(expected, telemetryItem.Url.ToString());\n}\n@@ -77,7 +77,7 @@ public void TestInvalidPIIOperations(string operation)\npublic void ValidatePIIRoutes()\n{\n// Arange\n- HashSet<string> existentPIIOperations = ClientTelemetryPIIProcessor.PiiActions;\n+ HashSet<string> existentPIIOperations = Obfuscator.ObfuscatedActions;\nList<string> piiOperationsFromRoutes = GetPIIOperationsFromRoute();\n// Act and Assert\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Clean elmah logs. (#5121)
Remove PII from Elmah logs.
|
455,794 |
11.12.2017 08:37:16
| 28,800 |
b2706ae5d99e4664e0a9a33cc557847f3d1833d4
|
limit resetFormValidation to only validated form fields
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "nuget.resetFormValidation = function (formElement) {\nvar validator = $(formElement).validate();\n- $(formElement).find(\"*[name]\").each(function () {\n+ $(formElement).find(\"*[name][data-val]\").each(function () {\n+ if (this.getAttribute(\"data-val\").toLowerCase() === \"true\") {\nvalidator.successList.push(this);\n+ }\n});\nvalidator.showErrors();\nvalidator.resetForm();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
limit resetFormValidation to only validated form fields (#5159)
|
455,794 |
11.12.2017 09:51:27
| 28,800 |
b20cb5a17c2f66f665722b14d40b5be4821bf98a
|
Manage Packages: optimize package link generation
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"GlobalSuppressions.cs\" />\n<Compile Include=\"Helpers\\GravatarHelper.cs\" />\n<Compile Include=\"Helpers\\RegexEx.cs\" />\n+ <Compile Include=\"Helpers\\RouteUrlTemplate.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\ApiKeyV4.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\Base32Encoder.cs\" />\n<Compile Include=\"Migrations\\201711082145351_AddAccountDelete.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "</script>\n@functions {\n+ private RouteUrlTemplate<User> userUrlTemplate;\n+ private RouteUrlTemplate<IPackageVersionModel> packageUrlTemplate;\n+ private RouteUrlTemplate<IPackageVersionModel> editUrlTemplate;\n+ private RouteUrlTemplate<IPackageVersionModel> manageOwnersUrlTemplate;\n+ private RouteUrlTemplate<IPackageVersionModel> deleteUrlTemplate;\n+\ndynamic GetSerializablePackage(ListPackageItemViewModel p)\n{\n+ if (deleteUrlTemplate == null)\n+ {\n+ // Performance: RouteCollection.VirtualPath is expensive, so resolve the path once and save as a template.\n+ // Then substitute route values into the template path when rendering links for each package on the page.\n+ userUrlTemplate = Url.UserTemplate();\n+ packageUrlTemplate = Url.PackageRegistrationTemplate();\n+ editUrlTemplate = Url.EditPackageTemplate();\n+ manageOwnersUrlTemplate = Url.ManagePackageOwnersTemplate();\n+ deleteUrlTemplate = Url.DeletePackageTemplate();\n+ }\n+\nreturn new\n{\np.Id,\nOwners = p.Owners.Select(o => new\n{\no.Username,\n- ProfileUrl = Url.User(o),\n+ ProfileUrl = userUrlTemplate.Resolve(o),\nIsOrganization = o is Organization\n}),\np.TotalDownloadCount,\nLatestVersion = p.FullVersion.Abbreviate(25),\n- PackageIconUrl = @PackageHelper.ShouldRenderUrl(p.IconUrl) ? p.IconUrl : null,\n- PackageUrl = @Url.Package(p.Id),\n- EditUrl = @Url.EditPackage(p.Id, p.Version),\n- ManageOwnersUrl = @Url.ManagePackageOwners(p),\n- DeleteUrl = @Url.DeletePackage(p),\n+ PackageIconUrl = PackageHelper.ShouldRenderUrl(p.IconUrl) ? p.IconUrl : null,\n+ PackageUrl = packageUrlTemplate.Resolve(p),\n+ EditUrl = editUrlTemplate.Resolve(p),\n+ ManageOwnersUrl = manageOwnersUrlTemplate.Resolve(p),\n+ DeleteUrl = deleteUrlTemplate.Resolve(p),\nCanEdit = p.IsActionAllowed(User, PackageActions.Edit),\nCanManageOwners = p.IsActionAllowed(User, PackageActions.ManagePackageOwners),\nCanDelete = p.IsActionAllowed(User, PackageActions.Unlist)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/UrlExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/UrlExtensionsFacts.cs",
"diff": "@@ -49,6 +49,133 @@ public void UsesNormalizedVersionInUrls()\n}\n}\n+ public class ThePackageRegistrationTemplateHelperMethod\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void ResolvePathIsCorrect()\n+ {\n+ // Arrange\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"TestPackageId\"\n+ },\n+ Version = \"1.0.0\"\n+ };\n+\n+ var urlHelper = TestUtility.MockUrlHelper();\n+\n+ // Act\n+ var result = urlHelper.PackageRegistrationTemplate()\n+ .Resolve(new ListPackageItemViewModel(package));\n+\n+ // Assert\n+ Assert.Equal(urlHelper.Package(package.PackageRegistration), result);\n+ }\n+ }\n+\n+ public class TheEditPackageTemplateHelperMethod\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void ResolvePathIsCorrect()\n+ {\n+ // Arrange\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"TestPackageId\"\n+ },\n+ Version = \"1.0.0\"\n+ };\n+\n+ var urlHelper = TestUtility.MockUrlHelper();\n+ var packageVM = new ListPackageItemViewModel(package);\n+\n+ // Act\n+ var result = urlHelper.EditPackageTemplate().Resolve(packageVM);\n+\n+ // Assert\n+ Assert.Equal(urlHelper.EditPackage(packageVM.Id, packageVM.Version), result);\n+ }\n+ }\n+\n+ public class TheDeletePackageTemplateHelperMethod\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void ResolvePathIsCorrect()\n+ {\n+ // Arrange\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"TestPackageId\"\n+ },\n+ Version = \"1.0.0\"\n+ };\n+\n+ var urlHelper = TestUtility.MockUrlHelper();\n+ var packageVM = new ListPackageItemViewModel(package);\n+\n+ // Act\n+ var result = urlHelper.DeletePackageTemplate().Resolve(packageVM);\n+\n+ // Assert\n+ Assert.Equal(urlHelper.DeletePackage(packageVM), result);\n+ }\n+ }\n+\n+ public class TheManagePackageOwnersTemplateHelperMethod\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void ResolvePathIsCorrect()\n+ {\n+ // Arrange\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = \"TestPackageId\"\n+ },\n+ Version = \"1.0.0\"\n+ };\n+\n+ var urlHelper = TestUtility.MockUrlHelper();\n+ var packageVM = new ListPackageItemViewModel(package);\n+\n+ // Act\n+ var result = urlHelper.ManagePackageOwnersTemplate().Resolve(packageVM);\n+\n+ // Assert\n+ Assert.Equal(urlHelper.ManagePackageOwners(packageVM), result);\n+ }\n+ }\n+\n+ public class TheUserTemplateHelperMethod\n+ : TestContainer\n+ {\n+ [Fact]\n+ public void ResolvePathIsCorrect()\n+ {\n+ // Arrange\n+ var user = new User(\"theUser\");\n+\n+ var urlHelper = TestUtility.MockUrlHelper();\n+\n+ // Act\n+ var result = urlHelper.UserTemplate().Resolve(user);\n+\n+ // Assert\n+ Assert.Equal(urlHelper.User(user), result);\n+ }\n+ }\n+\npublic class TheGetAbsoluteReturnUrlMethod\n{\n[Theory]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Manage Packages: optimize package link generation (#5138)
|
455,744 |
11.12.2017 11:39:49
| 28,800 |
7bd7617d03c0aa006d04d20c27bc0a007a85e64d
|
Displaying "package not indexed yet" alert only if package is available.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": ")\n}\n- @if (Model.Listed && Model.IsIndexed.HasValue && !Model.IsIndexed.Value && !Model.Validating)\n+ @if (Model.Listed && Model.IsIndexed.HasValue && !Model.IsIndexed.Value && Model.Available)\n{\n@ViewHelpers.AlertWarning(\n@<text>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Displaying "package not indexed yet" alert only if package is available. (#5163)
|
455,737 |
11.12.2017 16:10:29
| 28,800 |
a527404102baa6c91975f3f0dcde3d33a03aaaf9
|
Reduce package size limit back to 250MB
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add tagPrefix=\"ef\" assembly=\"Microsoft.AspNet.EntityDataSource\" namespace=\"Microsoft.AspNet.EntityDataSource\" />\n</controls>\n</pages>\n- <httpRuntime targetFramework=\"4.5\" maxQueryStringLength=\"12000\" maxRequestLength=\"358400\" requestPathInvalidCharacters=\"<,>,*,%,:,\\,?\" relaxedUrlToFileSystemMapping=\"true\" enableVersionHeader=\"false\" />\n+ <httpRuntime targetFramework=\"4.5\" maxQueryStringLength=\"12000\" maxRequestLength=\"256000\" requestPathInvalidCharacters=\"<,>,*,%,:,\\,?\" relaxedUrlToFileSystemMapping=\"true\" enableVersionHeader=\"false\" />\n<httpModules>\n<add name=\"ErrorFilter\" type=\"Elmah.ErrorFilterModule, Elmah, Version=1.2.14706.0, Culture=neutral, PublicKeyToken=57eac04b2e0f138e, processorArchitecture=MSIL\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Reduce package size limit back to 250MB
|
455,794 |
12.12.2017 13:54:34
| 28,800 |
baf7c721c67e4b48ef01af38ca21f77bc88a4cd6
|
Improved data-val filtering (feedback from PR#5159)
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "nuget.resetFormValidation = function (formElement) {\nvar validator = $(formElement).validate();\n- $(formElement).find(\"*[name][data-val]\").each(function () {\n- if (this.getAttribute(\"data-val\").toLowerCase() === \"true\") {\n+ $(formElement).find(\"*[name][data-val='true']\").each(function () {\nvalidator.successList.push(this);\n- }\n});\nvalidator.showErrors();\nvalidator.resetForm();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Improved data-val filtering (feedback from PR#5159)
|
455,751 |
13.12.2017 17:45:06
| 28,800 |
71cc9f02ab1a9e2e1ace02ee1d2c1e7a52ffb9b2
|
Clean azure storage audit data.
Clean Azure storage audit records.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditActor.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditActor.cs",
"diff": "using System.Threading.Tasks;\nusing System.Web;\nusing NuGetGallery.Authentication;\n+using NuGetGallery.Auditing.Obfuscation;\nnamespace NuGetGallery.Auditing\n{\npublic class AuditActor\n{\npublic string MachineName { get; set; }\n+\n+ [Obfuscate(ObfuscationType.IP)]\npublic string MachineIP { get; set; }\n+\n+ [Obfuscate(ObfuscationType.UserName)]\npublic string UserName { get; set; }\npublic string AuthenticationType { get; set; }\npublic string CredentialKey { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedPackage.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedPackage.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using NuGetGallery.Auditing.Obfuscation;\nnamespace NuGetGallery.Auditing.AuditedEntities\n{\n@@ -37,10 +38,12 @@ public class AuditedPackage\npublic string LicenseReportUrl { get; private set; }\npublic bool Listed { get; private set; }\npublic bool IsPrerelease { get; private set; }\n+ [Obfuscate(ObfuscationType.Authors)]\npublic string FlattenedAuthors { get; private set; }\npublic string FlattenedDependencies { get; private set; }\npublic int Key { get; private set; }\npublic string MinClientVersion { get; private set; }\n+ [Obfuscate(ObfuscationType.UserKey)]\npublic int? UserKey { get; private set; }\npublic bool Deleted { get; private set; }\npublic bool HasReadMe { get; private set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditingService.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditingService.cs",
"diff": "@@ -22,18 +22,7 @@ public abstract class AuditingService : IAuditingService\nstatic AuditingService()\n{\n- var settings = new JsonSerializerSettings\n- {\n- DateFormatHandling = DateFormatHandling.IsoDateFormat,\n- DateTimeZoneHandling = DateTimeZoneHandling.Utc,\n- DefaultValueHandling = DefaultValueHandling.Include,\n- Formatting = Formatting.Indented,\n- MaxDepth = 10,\n- MissingMemberHandling = MissingMemberHandling.Ignore,\n- NullValueHandling = NullValueHandling.Include,\n- TypeNameHandling = TypeNameHandling.None\n- };\n- settings.Converters.Add(new StringEnumConverter());\n+ var settings = GetJsonSerializerSettings();\nAuditRecordSerializerSettings = settings;\n}\n@@ -50,6 +39,11 @@ public async Task SaveAuditRecordAsync(AuditRecord record)\nthrow new ArgumentNullException(nameof(record));\n}\n+ if(!RecordWillBePersisted(record))\n+ {\n+ return;\n+ }\n+\nvar entry = new AuditEntry(record, await GetActorAsync());\nvar rendered = RenderAuditEntry(entry);\n@@ -72,6 +66,14 @@ public virtual string RenderAuditEntry(AuditEntry entry)\nreturn JsonConvert.SerializeObject(entry, AuditRecordSerializerSettings);\n}\n+ /// <summary>\n+ /// The Auditing services can use it to stop the saving of the record before rendering.\n+ /// </summary>\n+ public virtual bool RecordWillBePersisted(AuditRecord auditRecord)\n+ {\n+ return true;\n+ }\n+\n/// <summary>\n/// Performs the actual saving of audit data to an audit store\n/// </summary>\n@@ -88,6 +90,24 @@ protected virtual Task<AuditActor> GetActorAsync()\nreturn AuditActor.GetCurrentMachineActorAsync();\n}\n+ protected static JsonSerializerSettings GetJsonSerializerSettings()\n+ {\n+ var settings = new JsonSerializerSettings\n+ {\n+ DateFormatHandling = DateFormatHandling.IsoDateFormat,\n+ DateTimeZoneHandling = DateTimeZoneHandling.Utc,\n+ DefaultValueHandling = DefaultValueHandling.Include,\n+ Formatting = Formatting.Indented,\n+ MaxDepth = 10,\n+ MissingMemberHandling = MissingMemberHandling.Ignore,\n+ NullValueHandling = NullValueHandling.Include,\n+ TypeNameHandling = TypeNameHandling.None,\n+\n+ };\n+ settings.Converters.Add(new StringEnumConverter());\n+ return settings;\n+ }\n+\nprivate class NullAuditingService : AuditingService\n{\nprotected override Task SaveAuditRecordAsync(string auditData, string resourceType, string filePath, string action, DateTime timestamp)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections.Generic;\nusing System.Globalization;\nusing System.IO;\n+using System.Linq;\n+using System.Reflection;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Microsoft.WindowsAzure.Storage.Blob.Protocol;\n+using Newtonsoft.Json;\n+using Newtonsoft.Json.Converters;\n+using Newtonsoft.Json.Linq;\n+using Newtonsoft.Json.Serialization;\n+using NuGetGallery.Auditing.Obfuscation;\nnamespace NuGetGallery.Auditing\n{\n@@ -125,5 +133,22 @@ public Task<bool> IsAvailableAsync()\n{\nreturn _auditContainer.ExistsAsync();\n}\n+\n+ public override string RenderAuditEntry(AuditEntry entry)\n+ {\n+ if (entry == null)\n+ {\n+ throw new ArgumentNullException(nameof(entry));\n+ }\n+\n+ var settings = GetJsonSerializerSettings();\n+ settings.Converters.Add(new ObfuscatorJsonConverter(entry));\n+ return JsonConvert.SerializeObject(entry, settings);\n+ }\n+\n+ public override bool RecordWillBePersisted(AuditRecord auditRecord)\n+ {\n+ return auditRecord.GetType() == typeof(PackageAuditRecord);\n+ }\n}\n}\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery.Core/Auditing/Obfuscator.cs",
"new_path": "src/NuGetGallery.Core/Auditing/Obfuscation/Obfuscator.cs",
"diff": "@@ -9,6 +9,8 @@ namespace NuGetGallery.Auditing\n{\npublic static class Obfuscator\n{\n+ internal const string ObfuscatedUserName = \"ObfuscatedUserName\";\n+\n/// <summary>\n/// For IPv4 zero the last octet\n/// For IPv6 zero the last 4 sextets\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\\Obfuscation\\ObfuscateAttribute.cs\" />\n+ <Compile Include=\"Auditing\\Obfuscation\\ObfuscationType.cs\" />\n+ <Compile Include=\"Auditing\\Obfuscation\\ObfuscatorJsonConverter.cs\" />\n<Compile Include=\"Auditing\\AuditedEntities\\AuditedPackage.cs\" />\n<Compile Include=\"Auditing\\AuditedEntities\\AuditedPackageIdentifier.cs\" />\n<Compile Include=\"Auditing\\AuditedAuthenticatedOperationAction.cs\" />\n<Compile Include=\"Auditing\\AuditingService.cs\" />\n<Compile Include=\"Auditing\\AuditRecord.cs\" />\n<Compile Include=\"Auditing\\FailedAuthenticatedOperationAuditRecord.cs\" />\n- <Compile Include=\"Auditing\\Obfuscator.cs\" />\n+ <Compile Include=\"Auditing\\Obfuscation\\Obfuscator.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": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "<Compile Include=\"Auditing\\AuditEntryTests.cs\" />\n<Compile Include=\"Auditing\\AuditingServiceTests.cs\" />\n<Compile Include=\"Auditing\\AuditRecordTests.cs\" />\n+ <Compile Include=\"Auditing\\CloudAuditingServiceTests.cs\" />\n<Compile Include=\"Auditing\\CredentialAuditRecordTests.cs\" />\n<Compile Include=\"Auditing\\EnumTests.cs\" />\n<Compile Include=\"Auditing\\FailedAuthenticatedOperationAuditRecordTests.cs\" />\n<Compile Include=\"Auditing\\ObfuscatorFacts.cs\" />\n+ <Compile Include=\"Auditing\\ObfuscatorJsonConverterTests.cs\" />\n<Compile Include=\"Auditing\\ReservedNamespaceAuditRecordTests.cs\" />\n<Compile Include=\"Auditing\\UserSecurityPolicyAuditRecordFacts.cs\" />\n<Compile Include=\"Auditing\\FileSystemAuditingServiceTests.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Clean azure storage audit data. (#5164)
Clean Azure storage audit records.
|
455,744 |
13.12.2017 17:05:18
| 28,800 |
708deb39f55338e3a7163d9646e8a8b6a94e8283
|
Add message for notifying using of blocked signed packages
Fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CoreMessageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CoreMessageService.cs",
"diff": "@@ -62,16 +62,41 @@ public void SendPackageAddedNotice(Package package, string packageUrl, string pa\n}\n}\n- public void SendPackageValidationFailedNotice(Package package, string packageUrl, string packageSupportUrl, string emailSettingsUrl)\n+ public void SendPackageValidationFailedNotice(Package package, string packageUrl, string packageSupportUrl)\n{\nstring subject = \"[{0}] Package validation failed - {1} {2}\";\n- string body = @\"The package [{1} {2}]({3}) failed validation and was therefore not published on {0}. Note that the package will not be available for consumption and you will not be able to push the same package ID and version until further action is taken. Please [contact support]({4}) for next steps.\n+ string body = @\"The package [{1} {2}]({3}) failed validation and was therefore not published on {0}. Note that the package will not be available for consumption and you will not be able to push the same package ID and version until further action is taken. Please [contact support]({4}) for next steps.\";\n------------------------------------------------\n-<em style=\"\"font-size: 0.8em;\"\">\n- To stop receiving emails as an owner of this package, sign in to the {0} and\n- [change your email notification settings]({5}).\n-</em>\";\n+ body = string.Format(\n+ CultureInfo.CurrentCulture,\n+ body,\n+ CoreConfiguration.GalleryOwner.DisplayName,\n+ package.PackageRegistration.Id,\n+ package.Version,\n+ packageUrl,\n+ packageSupportUrl);\n+\n+ subject = string.Format(CultureInfo.CurrentCulture, subject, CoreConfiguration.GalleryOwner.DisplayName, package.PackageRegistration.Id, package.Version);\n+\n+ using (var mailMessage = new MailMessage())\n+ {\n+ mailMessage.Subject = subject;\n+ mailMessage.Body = body;\n+ mailMessage.From = CoreConfiguration.GalleryNoReplyAddress;\n+\n+ AddAllOwnersToMailMessage(package.PackageRegistration, mailMessage);\n+\n+ if (mailMessage.To.Any())\n+ {\n+ SendMessage(mailMessage, copySender: false);\n+ }\n+ }\n+ }\n+\n+ public void SendSignedPackageNotAllowedNotice(Package package, string packageUrl, string announcementsUrl, string twitterUrl)\n+ {\n+ string subject = \"[{0}] Package validation failed - {1} {2}\";\n+ string body = @\"The package [{1} {2}]({3}) could not be published since it is signed. {0} does not accept signed packages at this moment. To be notified when {0} starts accepting signed packages, and more, watch our [Announcements]({4}) page or follow us on [Twitter]({5}).\";\nbody = string.Format(\nCultureInfo.CurrentCulture,\n@@ -80,8 +105,8 @@ public void SendPackageValidationFailedNotice(Package package, string packageUrl\npackage.PackageRegistration.Id,\npackage.Version,\npackageUrl,\n- packageSupportUrl,\n- emailSettingsUrl);\n+ announcementsUrl,\n+ twitterUrl);\nsubject = string.Format(CultureInfo.CurrentCulture, subject, CoreConfiguration.GalleryOwner.DisplayName, package.PackageRegistration.Id, package.Version);\n@@ -91,7 +116,7 @@ public void SendPackageValidationFailedNotice(Package package, string packageUrl\nmailMessage.Body = body;\nmailMessage.From = CoreConfiguration.GalleryNoReplyAddress;\n- AddOwnersSubscribedToPackagePushedNotification(package.PackageRegistration, mailMessage);\n+ AddAllOwnersToMailMessage(package.PackageRegistration, mailMessage);\nif (mailMessage.To.Any())\n{\n@@ -100,6 +125,14 @@ public void SendPackageValidationFailedNotice(Package package, string packageUrl\n}\n}\n+ protected static void AddAllOwnersToMailMessage(PackageRegistration packageRegistration, MailMessage mailMessage)\n+ {\n+ foreach (var owner in packageRegistration.Owners)\n+ {\n+ mailMessage.To.Add(owner.ToMailAddress());\n+ }\n+ }\n+\nprotected static void AddOwnersToMailMessage(PackageRegistration packageRegistration, MailMessage mailMessage)\n{\nforeach (var owner in packageRegistration.Owners.Where(o => o.EmailAllowed))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICoreMessageService.cs",
"new_path": "src/NuGetGallery.Core/Services/ICoreMessageService.cs",
"diff": "@@ -6,6 +6,7 @@ namespace NuGetGallery.Services\npublic interface ICoreMessageService\n{\nvoid SendPackageAddedNotice(Package package, string packageUrl, string packageSupportUrl, string emailSettingsUrl);\n- void SendPackageValidationFailedNotice(Package package, string packageUrl, string packageSupportUrl, string emailSettingsUrl);\n+ void SendPackageValidationFailedNotice(Package package, string packageUrl, string packageSupportUrl);\n+ void SendSignedPackageNotAllowedNotice(Package package, string packageUrl, string announcementsUrl, string twitterUrl);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "@@ -670,10 +670,7 @@ public void SendPackageDeletedNotice(Package package, string packageUrl, string\nmailMessage.Body = body;\nmailMessage.From = Config.GalleryNoReplyAddress;\n- foreach (var owner in package.PackageRegistration.Owners)\n- {\n- mailMessage.To.Add(owner.ToMailAddress());\n- }\n+ AddAllOwnersToMailMessage(package.PackageRegistration, mailMessage);\nif (mailMessage.To.Any())\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -849,8 +849,7 @@ public void WillSendEmailToAllOwners(string version)\nvar messageService = TestableMessageService.Create(GetConfigurationService());\nvar packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\nvar supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\n- var emailSettingsUrl = \"https://localhost/account\";\n- messageService.SendPackageValidationFailedNotice(package, packageUrl, supportUrl, emailSettingsUrl);\n+ messageService.SendPackageValidationFailedNotice(package, packageUrl, supportUrl);\n// Assert\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -865,8 +864,16 @@ public void WillSendEmailToAllOwners(string version)\n$\"Please [contact support]({supportUrl}) for next steps.\", message.Body);\n}\n- [Fact]\n- public void WillNotSendEmailToOwnerThatOptsOut()\n+ public static IEnumerable<object[]> EmailSettingsCombinations\n+ => from u1pa in new[] { true, false }\n+ from u2pa in new[] { true, false }\n+ from u1ea in new[] { true, false }\n+ from u2ea in new[] { true, false }\n+ select new object[] { u1pa, u2pa, u1ea, u2ea };\n+\n+ [Theory]\n+ [MemberData(nameof(EmailSettingsCombinations))]\n+ public void WillSendEmailToOwnersRegardlessOfSettings(bool user1PushAllowed, bool user2PushAllowed, bool user1EmailAllowed, bool user2EmailAllowed)\n{\n// Arrange\nvar packageRegistration = new PackageRegistration\n@@ -874,8 +881,8 @@ public void WillNotSendEmailToOwnerThatOptsOut()\nId = \"smangit\",\nOwners = new[]\n{\n- new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = true },\n- new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = false }\n+ new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = user1PushAllowed, EmailAllowed = user1EmailAllowed },\n+ new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = user2PushAllowed, EmailAllowed = user2EmailAllowed }\n}\n};\nvar package = new Package\n@@ -887,26 +894,87 @@ public void WillNotSendEmailToOwnerThatOptsOut()\n// Act\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendPackageValidationFailedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n+ messageService.SendPackageValidationFailedNotice(package, \"http://dummy1\", \"http://dummy2\");\n// Assert\nvar message = messageService.MockMailSender.Sent.Last();\nAssert.Equal(\"yung@example.com\", message.To[0].Address);\n- Assert.Equal(1, message.To.Count);\n+ Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n+ Assert.Equal(2, message.To.Count);\n+ }\n}\n- [Fact]\n- public void WillNotAttemptToSendIfNoOwnersAllow()\n+ public class TheSendSignedPackageNotAllowedNoticeMethod\n+ : TestContainer\n+ {\n+ [Theory]\n+ [InlineData(\"1.2.3\")]\n+ [InlineData(\"1.2.3-alpha\")]\n+ [InlineData(\"1.2.3-alpha.1\")]\n+ [InlineData(\"1.2.3+metadata\")]\n+ [InlineData(\"1.2.3-alpha+metadata\")]\n+ [InlineData(\"1.2.3-alpha.1+metadata\")]\n+ public void WillSendEmailToAllOwners(string version)\n{\n// Arrange\n+ var nugetVersion = new NuGetVersion(version);\nvar packageRegistration = new PackageRegistration\n{\nId = \"smangit\",\nOwners = new[]\n{\n- new User { EmailAddress = \"yung@example.com\", EmailAllowed = false },\n- new User { EmailAddress = \"flynt@example.com\", EmailAllowed = false }\n+ new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = true },\n+ new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = true }\n+ }\n+ };\n+ var package = new Package\n+ {\n+ Version = version,\n+ PackageRegistration = packageRegistration\n+ };\n+ packageRegistration.Packages.Add(package);\n+\n+ // Act\n+ var messageService = TestableMessageService.Create(GetConfigurationService());\n+ var packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\n+ var supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\n+ var announcementsUrl = \"https://example.com/announcements\";\n+ var twitterUrl = \"https://example.com/twitter\";\n+ messageService.SendSignedPackageNotAllowedNotice(package, packageUrl, announcementsUrl, twitterUrl);\n+\n+ // Assert\n+ var message = messageService.MockMailSender.Sent.Last();\n+\n+ Assert.Equal(\"yung@example.com\", message.To[0].Address);\n+ Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n+ Assert.Equal(TestGalleryNoReplyAddress, message.From);\n+ Assert.Contains($\"[Joe Shmoe] Package validation failed - {packageRegistration.Id} {nugetVersion.ToNormalizedString()}\", message.Subject);\n+ Assert.Contains(\n+ $\"The package [{packageRegistration.Id} {nugetVersion.ToFullString()}]({packageUrl}) could not be published since it is signed. \" +\n+ $\"Joe Shmoe does not accept signed packages at this moment. To be notified when Joe Shmoe starts accepting signed packages, \" +\n+ $\"and more, watch our [Announcements]({announcementsUrl}) page or follow us on [Twitter]({twitterUrl}).\", message.Body);\n+ }\n+\n+ public static IEnumerable<object[]> EmailSettingsCombinations\n+ => from u1pa in new[] { true, false }\n+ from u2pa in new[] { true, false }\n+ from u1ea in new[] { true, false }\n+ from u2ea in new[] { true, false }\n+ select new object[] { u1pa, u2pa, u1ea, u2ea };\n+\n+ [Theory]\n+ [MemberData(nameof(EmailSettingsCombinations))]\n+ public void WillSendEmailToOwnersRegardlessOfSettings(bool user1PushAllowed, bool user2PushAllowed, bool user1EmailAllowed, bool user2EmailAllowed)\n+ {\n+ // Arrange\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = \"smangit\",\n+ Owners = new[]\n+ {\n+ new User { EmailAddress = \"yung@example.com\", NotifyPackagePushed = user1PushAllowed, EmailAllowed = user1EmailAllowed },\n+ new User { EmailAddress = \"flynt@example.com\", NotifyPackagePushed = user2PushAllowed, EmailAllowed = user2EmailAllowed }\n}\n};\nvar package = new Package\n@@ -918,10 +986,14 @@ public void WillNotAttemptToSendIfNoOwnersAllow()\n// Act\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendPackageValidationFailedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n+ messageService.SendSignedPackageNotAllowedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n// Assert\n- Assert.Empty(messageService.MockMailSender.Sent);\n+ var message = messageService.MockMailSender.Sent.Last();\n+\n+ Assert.Equal(\"yung@example.com\", message.To[0].Address);\n+ Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n+ Assert.Equal(2, message.To.Count);\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add message for notifying using of blocked signed packages (#5195)
Fix https://github.com/NuGet/NuGetGallery/issues/5194
|
455,776 |
19.12.2017 12:13:55
| 28,800 |
f7917ff89306d430712845edfd79afa70316f8d7
|
use urlhelper to calculate apikey expiry url
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Filters/ApiAuthorizeAttribute.cs",
"new_path": "src/NuGetGallery/Filters/ApiAuthorizeAttribute.cs",
"diff": "@@ -29,8 +29,7 @@ public override void OnAuthorization(AuthorizationContext filterContext)\nif (apiKeyCredential != null && apiKeyCredential.Expires.HasValue)\n{\n- var accountUrl = controller.NuGetContext.Config.GetSiteRoot(\n- controller.NuGetContext.Config.Current.RequireSSL).TrimEnd('/') + \"/account\";\n+ var accountUrl = controller.Url.ManageMyApiKeys(false);\nvar expirationPeriod = apiKeyCredential.Expires.Value - DateTime.UtcNow;\nif (apiKeyCredential.HasExpired)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
use urlhelper to calculate apikey expiry url (#5201)
|
455,776 |
19.12.2017 12:14:14
| 28,800 |
8f74b0b78386ffc35ea9e7604ee5a3b023902c7b
|
Add link to package in Contact Owners email
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -956,6 +956,7 @@ public virtual ActionResult ContactOwners(string id, ContactOwnersViewModel cont\n_messageService.SendContactOwnersMessage(\nfromAddress,\npackage,\n+ Url.Package(package, false),\ncontactForm.Message,\nUrl.AccountSettings(relativeUrl: false),\ncontactForm.CopySender);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IMessageService.cs",
"new_path": "src/NuGetGallery/Services/IMessageService.cs",
"diff": "@@ -8,7 +8,7 @@ namespace NuGetGallery\n{\npublic interface IMessageService\n{\n- void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string message, string emailSettingsUrl, bool copyFromAddress);\n+ void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copyFromAddress);\nvoid ReportAbuse(ReportPackageRequest report);\nvoid ReportMyPackage(ReportPackageRequest report);\nvoid SendNewAccountEmail(MailAddress toAddress, string confirmationUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "@@ -129,17 +129,17 @@ public void ReportMyPackage(ReportPackageRequest request)\n}\n}\n- public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string message, string emailSettingsUrl, bool copySender)\n+ public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copySender)\n{\nstring subject = \"[{0}] Message for owners of the package '{1}'\";\n- string body = @\"_User {0} <{1}> sends the following message to the owners of Package '{2}'._\n+ string body = @\"_User {0} <{1}> sends the following message to the owners of Package '[{2}]({3})'._\n-{3}\n+{4}\n-----------------------------------------------\n<em style=\"\"font-size: 0.8em;\"\">\n- To stop receiving contact emails as an owner of this package, sign in to the {4} and\n- [change your email notification settings]({5}).\n+ To stop receiving contact emails as an owner of this package, sign in to the {5} and\n+ [change your email notification settings]({6}).\n</em>\";\nbody = String.Format(\n@@ -148,6 +148,7 @@ public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistratio\nfromAddress.DisplayName,\nfromAddress.Address,\npackageRegistration.Id,\n+ packageUrl,\nmessage,\nConfig.GalleryOwner.DisplayName,\nemailSettingsUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1227,6 +1227,7 @@ public void OnlyShowsOwnersWhoAllowReceivingEmails()\n[Fact]\npublic void HtmlEncodesMessageContent()\n{\n+ var sentPackageUrl = string.Empty;\nvar messageService = new Mock<IMessageService>();\nstring sentMessage = null;\nmessageService.Setup(\n@@ -1235,8 +1236,13 @@ public void HtmlEncodesMessageContent()\nIt.IsAny<PackageRegistration>(),\nIt.IsAny<string>(),\nIt.IsAny<string>(),\n+ It.IsAny<string>(),\nfalse))\n- .Callback<MailAddress, PackageRegistration, string, string, bool>((_, __, msg, ___, ____) => sentMessage = msg);\n+ .Callback<MailAddress, PackageRegistration, string, string, string, bool>((_, __, packageUrl, msg, ____, _____) =>\n+ {\n+ sentPackageUrl = packageUrl;\n+ sentMessage = msg;\n+ });\nvar package = new PackageRegistration { Id = \"factory\" };\nvar packageService = new Mock<IPackageService>();\n@@ -1255,6 +1261,7 @@ public void HtmlEncodesMessageContent()\nvar result = controller.ContactOwners(\"factory\", model) as RedirectToRouteResult;\nAssert.Equal(\"I like the cut of your jib. It's <b>bold</b>.\", sentMessage);\n+ Assert.Equal(controller.Url.Package(package, false), sentPackageUrl);\n}\n[Fact]\n@@ -1265,6 +1272,7 @@ public void CallsSendContactOwnersMessageWithUserInfo()\ns => s.SendContactOwnersMessage(\nIt.IsAny<MailAddress>(),\nIt.IsAny<PackageRegistration>(),\n+ It.IsAny<string>(),\n\"I like the cut of your jib\",\nIt.IsAny<string>(), false));\nvar package = new PackageRegistration { Id = \"factory\" };\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -208,7 +208,7 @@ public void WillCopySenderIfAsked()\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", true);\n+ messageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", true);\nvar messages = messageService.MockMailSender.Sent;\nAssert.Equal(2, messages.Count);\n@@ -226,30 +226,37 @@ public void WillCopySenderIfAsked()\n[Fact]\npublic void WillSendEmailToAllOwners()\n{\n- var from = new MailAddress(\"smangit@example.com\", \"flossy\");\n+ var id = \"smangit\";\n+ var owner1Email = \"yung@example.com\";\n+ var owner2Email = \"flynt@example.com\";\n+ var userUsername = \"flossy\";\n+ var userEmail = \"smangit@example.com\";\n+ var from = new MailAddress(userEmail, userUsername);\nvar package = new PackageRegistration\n{\n- Id = \"smangit\",\n+ Id = id,\nOwners = new[]\n{\n- new User { EmailAddress = \"yung@example.com\", EmailAllowed = true },\n- new User { EmailAddress = \"flynt@example.com\", EmailAllowed = true }\n+ new User { EmailAddress = owner1Email, EmailAllowed = true },\n+ new User { EmailAddress = owner2Email, EmailAllowed = true }\n}\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\n+ var packageUrl = \"http://packageUrl/\";\n+ messageService.SendContactOwnersMessage(from, package, packageUrl, \"Test message\", \"http://emailSettingsUrl/\", false);\nvar message = messageService.MockMailSender.Sent.Last();\n- Assert.Equal(\"yung@example.com\", message.To[0].Address);\n- Assert.Equal(\"flynt@example.com\", message.To[1].Address);\n+ Assert.Equal(owner1Email, message.To[0].Address);\n+ Assert.Equal(owner2Email, message.To[1].Address);\nAssert.Equal(TestGalleryOwner, message.From);\n- Assert.Equal(\"smangit@example.com\", message.ReplyToList.Single().Address);\n- Assert.Contains(\"[Joe Shmoe] Message for owners of the package 'smangit'\", message.Subject);\n+ Assert.Equal(userEmail, message.ReplyToList.Single().Address);\n+ Assert.Contains($\"[Joe Shmoe] Message for owners of the package '{id}'\", message.Subject);\nAssert.Contains(\"Test message\", message.Body);\nAssert.Contains(\n- \"User flossy <smangit@example.com> sends the following message to the owners of Package 'smangit'.\", message.Body);\n+ $\"User {userUsername} <{userEmail}> sends the following message to the owners of Package '[{id}]({packageUrl})'.\",\n+ message.Body);\n}\n[Fact]\n@@ -268,7 +275,7 @@ public void WillNotSendEmailToOwnerThatOptsOut()\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\n+ messageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", false);\nvar message = messageService.MockMailSender.Sent.Last();\nAssert.Equal(\"yung@example.com\", message.To[0].Address);\n@@ -290,7 +297,7 @@ public void WillNotAttemptToSendIfNoOwnersAllow()\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\n+ messageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", false);\nAssert.Empty(messageService.MockMailSender.Sent);\n}\n@@ -307,7 +314,7 @@ public void WillNotCopySenderIfNoOwnersAllow()\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n- messageService.SendContactOwnersMessage(from, package, \"Test message\", \"http://someurl/\", false);\n+ messageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", false);\nAssert.Empty(messageService.MockMailSender.Sent);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add link to package in Contact Owners email (#5202)
|
455,794 |
19.12.2017 15:16:33
| 28,800 |
39d8a40796c160b070681fe1629f5ca32cab433e
|
Cache AuditActor.GetLocalIpAddressAsync
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/AuditActor.cs",
"new_path": "src/NuGetGallery.Core/Auditing/AuditActor.cs",
"diff": "@@ -17,6 +17,10 @@ namespace NuGetGallery.Auditing\n{\npublic class AuditActor\n{\n+ private static string _localIpAddress;\n+ private static DateTime _localIpAddressExpiration;\n+ private const int _localIpAddressExpirationInMinutes = 10;\n+\npublic string MachineName { get; set; }\n[Obfuscate(ObfuscationType.IP)]\n@@ -114,20 +118,28 @@ public static async Task<AuditActor> GetCurrentMachineActorAsync(AuditActor onBe\nonBehalfOf);\n}\n+ /// <summary>\n+ /// Get the local machine's IP address.\n+ /// Note that this method is cached because the IP shouldn't change frequently, and the\n+ /// GetIsNetworkAvailable call is expensive.\n+ /// </summary>\npublic static async Task<string> GetLocalIpAddressAsync()\n{\n- string ipAddress = null;\n+ if (string.IsNullOrEmpty(_localIpAddress) || DateTime.UtcNow >= _localIpAddressExpiration)\n+ {\nif (NetworkInterface.GetIsNetworkAvailable())\n{\nvar entry = await Dns.GetHostEntryAsync(Dns.GetHostName());\nif (entry != null)\n{\n- ipAddress =\n+ _localIpAddress =\nTryGetAddress(entry.AddressList, AddressFamily.InterNetworkV6) ??\nTryGetAddress(entry.AddressList, AddressFamily.InterNetwork);\n+ _localIpAddressExpiration = DateTime.UtcNow.AddMinutes(_localIpAddressExpirationInMinutes);\n+ }\n}\n}\n- return ipAddress;\n+ return _localIpAddress;\n}\nprivate static string TryGetAddress(IEnumerable<IPAddress> addrs, AddressFamily family)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Cache AuditActor.GetLocalIpAddressAsync (#5210)
|
455,794 |
21.12.2017 11:31:13
| 28,800 |
fdd75b926c6bc9ac6bb0b54d383390deb2415282
|
Schema for organization membership requests
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Credential.cs",
"new_path": "src/NuGetGallery.Core/Entities/Credential.cs",
"diff": "@@ -65,6 +65,9 @@ public Credential(string type, string value, TimeSpan? expiration)\n[StringLength(maximumLength: 256)]\npublic string Value { get; set; }\n+ [StringLength(maximumLength: 256)]\n+ public string TenantId { get; set; }\n+\n[StringLength(maximumLength: 256)]\npublic string Description { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -140,18 +140,40 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\nmodelBuilder.Entity<Membership>()\n.HasKey(m => new { m.OrganizationKey, m.MemberKey });\n+ modelBuilder.Entity<MembershipRequest>()\n+ .HasKey(m => new { m.OrganizationKey, m.NewMemberKey });\n+\n+ modelBuilder.Entity<OrganizationMigrationRequest>()\n+ .HasKey(m => m.NewOrganizationKey);\n+\nmodelBuilder.Entity<User>()\n.HasMany(u => u.Organizations)\n.WithRequired(m => m.Member)\n.HasForeignKey(m => m.MemberKey)\n.WillCascadeOnDelete(true); // Membership will be deleted with the Member account.\n+ modelBuilder.Entity<User>()\n+ .HasMany(u => u.OrganizationRequests)\n+ .WithRequired(m => m.NewMember)\n+ .HasForeignKey(m => m.NewMemberKey)\n+ .WillCascadeOnDelete(false);\n+\n+ modelBuilder.Entity<User>()\n+ .HasOptional(u => u.OrganizationMigrationRequest)\n+ .WithRequired(m => m.NewOrganization);\n+\nmodelBuilder.Entity<Organization>()\n.HasMany(o => o.Members)\n.WithRequired(m => m.Organization)\n.HasForeignKey(m => m.OrganizationKey)\n.WillCascadeOnDelete(true); // Memberships will be deleted with the Organization account.\n+ modelBuilder.Entity<Organization>()\n+ .HasMany(o => o.MemberRequests)\n+ .WithRequired(m => m.Organization)\n+ .HasForeignKey(m => m.OrganizationKey)\n+ .WillCascadeOnDelete(false);\n+\nmodelBuilder.Entity<Role>()\n.HasKey(u => u.Key);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Organization.cs",
"new_path": "src/NuGetGallery.Core/Entities/Organization.cs",
"diff": "@@ -29,5 +29,10 @@ public Organization(string name) : base(name)\n/// Organization Memberships to this organization.\n/// </summary>\npublic virtual ICollection<Membership> Members { get; set; }\n+\n+ /// <summary>\n+ /// Requests to become a member of this <see cref=\"Organization\"/>.\n+ /// </summary>\n+ public virtual ICollection<MembershipRequest> MemberRequests { get; set; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/User.cs",
"new_path": "src/NuGetGallery.Core/Entities/User.cs",
"diff": "@@ -32,10 +32,20 @@ public User(string username)\n}\n/// <summary>\n- /// Organization memberships for a non-organization <see cref=\"User\"/> account.\n+ /// Organization memberships, for a non-organization <see cref=\"User\"/> account.\n/// </summary>\npublic virtual ICollection<Membership> Organizations { get; set; }\n+ /// <summary>\n+ /// Organization membership requests, for a non-organization <see cref=\"User\"/> account.\n+ /// </summary>\n+ public virtual ICollection<MembershipRequest> OrganizationRequests { get; set; }\n+\n+ /// <summary>\n+ /// Request to transform a <see cref=\"User\"/> account into an <see cref=\"Organization\"/> account.\n+ /// </summary>\n+ public virtual OrganizationMigrationRequest OrganizationMigrationRequest { get; set; }\n+\n[StringLength(256)]\npublic string EmailAddress { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\Membership.cs\" />\n<Compile Include=\"Entities\\Organization.cs\" />\n<Compile Include=\"Entities\\AccountDelete.cs\" />\n+ <Compile Include=\"Entities\\MembershipRequest.cs\" />\n+ <Compile Include=\"Entities\\OrganizationMigrationRequest.cs\" />\n<Compile Include=\"Entities\\PackageDelete.cs\" />\n<Compile Include=\"Entities\\EmailMessage.cs\" />\n<Compile Include=\"Entities\\EntitiesConfiguration.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -22,6 +22,8 @@ namespace NuGetGallery.Authentication\n{\npublic class AuthenticationService\n{\n+ private const string tenantIdClaimType = \"http://schemas.microsoft.com/identity/claims/tenantid\";\n+\nprivate Dictionary<string, Func<string, string>> _credentialFormatters;\nprivate readonly IDiagnosticsSource _trace;\nprivate readonly IAppConfiguration _config;\n@@ -220,6 +222,9 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\nreturn null;\n}\n+ // store tenant (organization) id, if available\n+ matched.TenantId = credential.TenantId;\n+\n// update last used timestamp\nmatched.LastUsed = _dateTimeProvider.UtcNow;\nawait Entities.SaveChangesAsync();\n@@ -555,6 +560,8 @@ public virtual async Task<AuthenticateExternalLoginResult> ReadExternalLoginCred\nvar emailClaim = result.Identity.FindFirst(ClaimTypes.Email);\nstring emailSuffix = emailClaim == null ? String.Empty : (\" <\" + emailClaim.Value + \">\");\n+ var tenantIdClaim = result.Identity.FindFirst(tenantIdClaimType);\n+\nAuthenticator auther;\nstring authenticationType = idClaim.Issuer;\nif (!Authenticators.TryGetValue(idClaim.Issuer, out auther))\n@@ -574,7 +581,7 @@ public virtual async Task<AuthenticateExternalLoginResult> ReadExternalLoginCred\nAuthentication = null,\nExternalIdentity = result.Identity,\nAuthenticator = auther,\n- Credential = _credentialBuilder.CreateExternalCredential(authenticationType, idClaim.Value, nameClaim.Value + emailSuffix)\n+ Credential = _credentialBuilder.CreateExternalCredential(authenticationType, idClaim.Value, nameClaim.Value + emailSuffix, tenantIdClaim?.Value)\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Authentication/CredentialBuilder.cs",
"new_path": "src/NuGetGallery/Infrastructure/Authentication/CredentialBuilder.cs",
"diff": "@@ -63,11 +63,12 @@ public Credential CreatePackageVerificationApiKey(Credential originalApiKey, str\nreturn credential;\n}\n- public Credential CreateExternalCredential(string issuer, string value, string identity)\n+ public Credential CreateExternalCredential(string issuer, string value, string identity, string tenantId = null)\n{\nreturn new Credential(CredentialTypes.ExternalPrefix + issuer, value)\n{\n- Identity = identity\n+ Identity = identity,\n+ TenantId = tenantId\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Authentication/ICredentialBuilder.cs",
"new_path": "src/NuGetGallery/Infrastructure/Authentication/ICredentialBuilder.cs",
"diff": "@@ -13,6 +13,6 @@ public interface ICredentialBuilder\nCredential CreatePackageVerificationApiKey(Credential originalApiKey, string id);\n- Credential CreateExternalCredential(string issuer, string value, string identity);\n+ Credential CreateExternalCredential(string issuer, string value, string identity, string tenantId = null);\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201712211850074_MembershipRequests.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 MembershipRequests : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(MembershipRequests));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201712211850074_MembershipRequests\"; }\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/201712211850074_MembershipRequests.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class MembershipRequests : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ CreateTable(\n+ \"dbo.OrganizationMigrationRequests\",\n+ c => new\n+ {\n+ NewOrganizationKey = c.Int(nullable: false),\n+ AdminUserKey = c.Int(nullable: false),\n+ ConfirmationToken = c.String(nullable: false),\n+ RequestDate = c.DateTime(nullable: false),\n+ })\n+ .PrimaryKey(t => t.NewOrganizationKey)\n+ .ForeignKey(\"dbo.Users\", t => t.AdminUserKey, cascadeDelete: true)\n+ .ForeignKey(\"dbo.Users\", t => t.NewOrganizationKey)\n+ .Index(t => t.NewOrganizationKey)\n+ .Index(t => t.AdminUserKey);\n+\n+ CreateTable(\n+ \"dbo.MembershipRequests\",\n+ c => new\n+ {\n+ OrganizationKey = c.Int(nullable: false),\n+ NewMemberKey = c.Int(nullable: false),\n+ IsAdmin = c.Boolean(nullable: false),\n+ ConfirmationToken = c.String(nullable: false),\n+ RequestDate = c.DateTime(nullable: false),\n+ })\n+ .PrimaryKey(t => new { t.OrganizationKey, t.NewMemberKey })\n+ .ForeignKey(\"dbo.Organizations\", t => t.OrganizationKey)\n+ .ForeignKey(\"dbo.Users\", t => t.NewMemberKey)\n+ .Index(t => t.OrganizationKey)\n+ .Index(t => t.NewMemberKey);\n+\n+ AddColumn(\"dbo.Credentials\", \"TenantId\", c => c.String(maxLength: 256));\n+ }\n+\n+ public override void Down()\n+ {\n+ DropForeignKey(\"dbo.MembershipRequests\", \"NewMemberKey\", \"dbo.Users\");\n+ DropForeignKey(\"dbo.MembershipRequests\", \"OrganizationKey\", \"dbo.Organizations\");\n+ DropForeignKey(\"dbo.OrganizationMigrationRequests\", \"NewOrganizationKey\", \"dbo.Users\");\n+ DropForeignKey(\"dbo.OrganizationMigrationRequests\", \"AdminUserKey\", \"dbo.Users\");\n+ DropIndex(\"dbo.MembershipRequests\", new[] { \"NewMemberKey\" });\n+ DropIndex(\"dbo.MembershipRequests\", new[] { \"OrganizationKey\" });\n+ DropIndex(\"dbo.OrganizationMigrationRequests\", new[] { \"AdminUserKey\" });\n+ DropIndex(\"dbo.OrganizationMigrationRequests\", new[] { \"NewOrganizationKey\" });\n+ DropColumn(\"dbo.Credentials\", \"TenantId\");\n+ DropTable(\"dbo.MembershipRequests\");\n+ DropTable(\"dbo.OrganizationMigrationRequests\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201712052213307_AddPackageIdLocking.Designer.cs\">\n<DependentUpon>201712052213307_AddPackageIdLocking.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201712211850074_MembershipRequests.cs\" />\n+ <Compile Include=\"Migrations\\201712211850074_MembershipRequests.Designer.cs\">\n+ <DependentUpon>201712211850074_MembershipRequests.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\\201712052213307_AddPackageIdLocking.resx\">\n<DependentUpon>201712052213307_AddPackageIdLocking.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201712211850074_MembershipRequests.resx\">\n+ <DependentUpon>201712211850074_MembershipRequests.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"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"diff": "@@ -540,6 +540,26 @@ public async Task GivenMatchingCredential_ItWritesCredentialLastUsed()\nAssert.True(cred.LastUsed == referenceTime);\nAssert.True(cred.LastUsed.HasValue);\n}\n+\n+ [Fact]\n+ public async Task GivenMatchingExternalCredential_ItCopiesTenantId()\n+ {\n+ // Arrange\n+ var cred = _fakes.User.Credentials.Single(c => c.Type.Contains(CredentialTypes.ExternalPrefix));\n+\n+ var referenceTime = DateTime.UtcNow;\n+ _dateTimeProviderMock.SetupGet(x => x.UtcNow).Returns(referenceTime);\n+\n+ Assert.False(cred.LastUsed.HasValue);\n+\n+ // Act\n+ // Create a new credential to verify that it's a value-based lookup!\n+ var result = await _authenticationService.Authenticate(TestCredentialHelper.CreateExternalCredential(cred.Value, tenantId: \"fake-tenant-id\"));\n+\n+ // Assert\n+ Assert.NotNull(result);\n+ Assert.False(string.IsNullOrEmpty(result.CredentialUsed.TenantId));\n+ }\n}\npublic class TheCreateSessionAsyncMethod : TestContainer\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/TestCredentialHelper.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/TestCredentialHelper.cs",
"diff": "@@ -63,9 +63,9 @@ public static Credential CreateV2VerificationApiKey(Guid apiKey)\nreturn CreateApiKey(CredentialTypes.ApiKey.VerifyV1, apiKey.ToString(), TimeSpan.FromDays(1));\n}\n- public static Credential CreateExternalCredential(string value)\n+ public static Credential CreateExternalCredential(string value, string tenantId = null)\n{\n- return new Credential { Type = CredentialTypes.ExternalPrefix + \"MicrosoftAccount\", Value = value };\n+ return new Credential { Type = CredentialTypes.ExternalPrefix + \"MicrosoftAccount\", Value = value, TenantId = tenantId };\n}\ninternal static Credential CreateApiKey(string type, string apiKey, TimeSpan? expiration)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Schema for organization membership requests (#5204)
|
455,794 |
02.01.2018 13:21:21
| 28,800 |
0e570e50159f83f0ed2d7ff9af066ebc83f7fd63
|
Pass returnUrl for NuGet sign in
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Authentication/SignIn.cshtml",
"new_path": "src/NuGetGallery/Views/Authentication/SignIn.cshtml",
"diff": "ViewBag.SmPageColumns = Constants.ColumnsAuthenticationSm;\nViewBag.MdPageColumns = Constants.ColumnsAuthenticationMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n+\n+ var returnUrl = (string)ViewData[Constants.ReturnUrlViewDataKey];\n}\n<section role=\"main\" class=\"container main-container page-sign-in\">\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag) text-center\">\n<a role=\"button\" class=\"btn btn-default btn-block provider-button\"\n- href=\"@Url.Authenticate(provider.ProviderName, (string)ViewData[Constants.ReturnUrlViewDataKey])\">\n+ href=\"@Url.Authenticate(provider.ProviderName, returnUrl)\">\n@if (!string.IsNullOrEmpty(@provider.UI.IconImagePath))\n{\n<img height=\"24\" width=\"24\" alt=\"\" aria-hidden=\"true\"\n</div>\n<div class=\"row text-center create-provider-account\">\nNo Account?\n- <a href=\"@Url.Authenticate(provider.ProviderName, (string)ViewData[Constants.ReturnUrlViewDataKey])\">Create one!</a>\n+ <a href=\"@Url.Authenticate(provider.ProviderName, returnUrl)\">Create one!</a>\n</div>\n}\n<div class=\"row nuget-signin\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag) text-center\">\n<p class=\"text-center\">\n- <a href=\"@Url.LogOnNuGetAccount()\">Sign in using NuGet.org account</a>\n+ <a href=\"@Url.LogOnNuGetAccount(returnUrl)\">Sign in using NuGet.org account</a>\n</p>\n</div>\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Pass returnUrl for NuGet sign in (#5220)
|
455,772 |
04.01.2018 15:56:17
| 28,800 |
c18c24c1363c0980ec9e125377bdb100b76d7948
|
Functional test for package locking
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"diff": "@@ -29,6 +29,7 @@ public class EnvironmentSettings\nprivate static string _testEmailServerHost;\nprivate static List<string> _trustedHttpsCertificates;\nprivate static bool? _defaultSecurityPoliciesEnforced;\n+ private static bool? _testPackageLock;\n/// <summary>\n/// The environment against which the test has to be run. The value would be picked from env variable.\n@@ -331,6 +332,28 @@ public static bool DefaultSecurityPoliciesEnforced\n}\n}\n+ public static bool TestPackageLock\n+ {\n+ get\n+ {\n+ if (!_testPackageLock.HasValue)\n+ {\n+ // Try to get the setting from EnvironmentVariable. If fail, fallback to false\n+ bool temp;\n+ if (bool.TryParse(Environment.GetEnvironmentVariable(\"TestPackageLock\"), out temp))\n+ {\n+ _testPackageLock = temp;\n+ }\n+ else\n+ {\n+ _testPackageLock = false;\n+ }\n+ }\n+\n+ return _testPackageLock.Value;\n+ }\n+ }\n+\npublic static IEnumerable<string> TrustedHttpsCertificates\n{\nget\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": "<Compile Include=\"XunitExtensions\\PriorityAttribute.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n<Compile Include=\"XunitExtensions\\CategoryDiscoverer.cs\" />\n+ <Compile Include=\"XunitExtensions\\PackageLockFactAttribute.cs\" />\n<Compile Include=\"XunitExtensions\\TestPriorityOrderer.cs\" />\n<Compile Include=\"Helpers\\UrlHelper.cs\" />\n</ItemGroup>\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.XunitExtensions;\nusing Xunit;\nusing Xunit.Abstractions;\n@@ -16,6 +17,9 @@ namespace NuGetGallery.FunctionalTests.Commandline\npublic class NugetCommandLineTests\n: GalleryTestBase\n{\n+ private const string LockedPackageId = \"NuGetTest_LockedPackageCannotBeModified\";\n+ private const string LockedPackageVersion = \"1.0.0\";\n+\nprivate readonly ClientSdkHelper _clientSdkHelper;\nprivate readonly CommandlineHelper _commandlineHelper;\nprivate readonly PackageCreationHelper _packageCreationHelper;\n@@ -145,5 +149,33 @@ public async Task UploadAndDownLoadPackageWithMinClientVersion()\n}\n_clientSdkHelper.DownloadPackageAndVerify(packageId);\n}\n+\n+ [PackageLockFact]\n+ [Description(\"Verifies push version, and delete are not allowed on a locked package\")]\n+ [Priority(2)]\n+ [Category(\"P2Tests\")]\n+ public async Task LockedPackageCannotBeModified()\n+ {\n+ // Arrange\n+ string version = \"2.0.0\";\n+\n+ var packageCreationHelper = new PackageCreationHelper(TestOutputHelper);\n+ var location = await packageCreationHelper.CreatePackage(LockedPackageId, version);\n+\n+ // Act & Assert\n+ // 1. Try to upload package\n+ TestOutputHelper.WriteLine($\"1. Trying to upload package '{LockedPackageId}', version '{version}' to locked package id.\");\n+ var processResult = await _commandlineHelper.UploadPackageAsync(location, UrlHelper.V2FeedPushSourceUrl, EnvironmentSettings.TestAccountApiKey);\n+ Assert.True(processResult.ExitCode != 0, \"Package push succeeded, although was expected to fail.\");\n+ Assert.Contains(\"locked\", processResult.StandardError);\n+\n+ // 2. Try unlisting the locked package\n+ // Perform a sanity check that the package exists\n+ await _clientSdkHelper.VerifyPackageExistsInV2AndV3Async(LockedPackageId, LockedPackageVersion);\n+ TestOutputHelper.WriteLine($\"5. Trying to unlist locked package '{LockedPackageId}', version '{LockedPackageVersion}'.\");\n+ processResult = await _commandlineHelper.DeletePackageAsync(LockedPackageId, LockedPackageVersion, UrlHelper.V2FeedPushSourceUrl, EnvironmentSettings.TestAccountApiKey);\n+ Assert.True(processResult.ExitCode != 0, \"Package delete succeeded, although was expected to fail.\");\n+ Assert.Contains(\"locked\", processResult.StandardError);\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Functional test for package locking (#5235)
|
455,736 |
15.11.2017 12:50:01
| 28,800 |
68ba9694567e69217fcf1ee48141dfad3fa213ef
|
Add configuration for user package deletes
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -72,6 +72,9 @@ protected override void Load(ContainerBuilder builder)\n.AsSelf()\n.As<FeatureConfiguration>();\n+ builder.Register(c => configuration.PackageDelete)\n+ .As<IPackageDeleteConfiguration>();\n+\nbuilder.RegisterType<TelemetryService>().As<ITelemetryService>().SingleInstance();\nbuilder.RegisterType<CredentialBuilder>().As<ICredentialBuilder>().SingleInstance();\nbuilder.RegisterType<CredentialValidator>().As<ICredentialValidator>().SingleInstance();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/ConfigurationService.cs",
"new_path": "src/NuGetGallery/Configuration/ConfigurationService.cs",
"diff": "@@ -22,6 +22,8 @@ public class ConfigurationService : PoliteCaptcha.IConfigurationSource, IGallery\nprotected const string SettingPrefix = \"Gallery.\";\nprotected const string FeaturePrefix = \"Feature.\";\nprotected const string ServiceBusPrefix = \"AzureServiceBus.\";\n+ protected const string PackageDeletePrefix = \"PackageDelete.\";\n+\nprivate bool _notInCloud;\nprivate readonly Lazy<string> _httpSiteRootThunk;\nprivate readonly Lazy<string> _httpsSiteRootThunk;\n@@ -30,6 +32,7 @@ public class ConfigurationService : PoliteCaptcha.IConfigurationSource, IGallery\nprivate readonly Lazy<IAppConfiguration> _lazyAppConfiguration;\nprivate readonly Lazy<FeatureConfiguration> _lazyFeatureConfiguration;\nprivate readonly Lazy<IServiceBusConfiguration> _lazyServiceBusConfiguration;\n+ private readonly Lazy<IPackageDeleteConfiguration> _lazyPackageDeleteConfiguration;\npublic ConfigurationService(ISecretReaderFactory secretReaderFactory)\n{\n@@ -42,6 +45,7 @@ public ConfigurationService(ISecretReaderFactory secretReaderFactory)\n_lazyAppConfiguration = new Lazy<IAppConfiguration>(() => ResolveSettings().Result);\n_lazyFeatureConfiguration = new Lazy<FeatureConfiguration>(() => ResolveFeatures().Result);\n_lazyServiceBusConfiguration = new Lazy<IServiceBusConfiguration>(() => ResolveServiceBus().Result);\n+ _lazyPackageDeleteConfiguration = new Lazy<IPackageDeleteConfiguration>(() => ResolvePackageDelete().Result);\n}\npublic static IEnumerable<PropertyDescriptor> GetConfigProperties<T>(T instance)\n@@ -65,6 +69,8 @@ public string GetConfigurationValue(string key)\npublic IServiceBusConfiguration ServiceBus => _lazyServiceBusConfiguration.Value;\n+ public IPackageDeleteConfiguration PackageDelete => _lazyPackageDeleteConfiguration.Value;\n+\n/// <summary>\n/// Gets the site root using the specified protocol\n/// </summary>\n@@ -172,6 +178,11 @@ private async Task<IServiceBusConfiguration> ResolveServiceBus()\nreturn await ResolveConfigObject(new ServiceBusConfiguration(), ServiceBusPrefix);\n}\n+ private async Task<IPackageDeleteConfiguration> ResolvePackageDelete()\n+ {\n+ return await ResolveConfigObject(new PackageDeleteConfiguration(), PackageDeletePrefix);\n+ }\n+\nprotected virtual string GetCloudSetting(string settingName)\n{\n// Short-circuit if we've already determined we're not in the cloud\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Authentication\\Providers\\AzureActiveDirectory\\AzureActiveDirectoryAuthenticator.cs\" />\n<Compile Include=\"Authentication\\Providers\\AzureActiveDirectory\\AzureActiveDirectoryAuthenticatorConfiguration.cs\" />\n<Compile Include=\"Configuration\\IGalleryConfigurationService.cs\" />\n+ <Compile Include=\"Configuration\\IPackageDeleteConfiguration.cs\" />\n<Compile Include=\"Configuration\\IServiceBusConfiguration.cs\" />\n+ <Compile Include=\"Configuration\\PackageDeleteConfiguration.cs\" />\n<Compile Include=\"Configuration\\SecretReader\\CachingSecretReader.cs\" />\n<Compile Include=\"Configuration\\SecretReader\\EmptySecretReaderFactory.cs\" />\n<Compile Include=\"Configuration\\SecretReader\\ISecretReaderFactory.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"diff": "using Microsoft.WindowsAzure.Storage;\nusing NuGet.Versioning;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Configuration;\nnamespace NuGetGallery\n{\n@@ -40,6 +41,7 @@ public class PackageDeleteService\nprivate readonly IIndexingService _indexingService;\nprivate readonly IPackageFileService _packageFileService;\nprivate readonly IAuditingService _auditingService;\n+ private readonly IPackageDeleteConfiguration _config;\npublic PackageDeleteService(\nIEntityRepository<Package> packageRepository,\n@@ -49,7 +51,8 @@ public class PackageDeleteService\nIPackageService packageService,\nIIndexingService indexingService,\nIPackageFileService packageFileService,\n- IAuditingService auditingService)\n+ IAuditingService auditingService,\n+ IPackageDeleteConfiguration config)\n{\n_packageRepository = packageRepository;\n_packageRegistrationRepository = packageRegistrationRepository;\n@@ -59,10 +62,25 @@ public class PackageDeleteService\n_indexingService = indexingService;\n_packageFileService = packageFileService;\n_auditingService = auditingService;\n+ _config = config;\n+\n+ if (config.HourLimitWithMaximumDownloads.HasValue\n+ && config.StatisticsUpdateFrequencyInHours.HasValue\n+ && config.HourLimitWithMaximumDownloads.Value <= config.StatisticsUpdateFrequencyInHours.Value)\n+ {\n+ throw new ArgumentException($\"{nameof(_config.StatisticsUpdateFrequencyInHours)} must be less than \" +\n+ $\"{nameof(_config.HourLimitWithMaximumDownloads)}.\",\n+ nameof(config));\n+ }\n}\npublic Task<bool> CanPackageBeDeletedByUserAsync(Package package)\n{\n+ if (package.PackageStatusKey == PackageStatus.Deleted)\n+ {\n+ return Task.FromResult(false);\n+ }\n+\n// For now, don't allow user's to delete their packages.\n// https://github.com/NuGet/Engineering/issues/921\nreturn Task.FromResult(false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"KeyVault.VaultName\" value=\"\" />\n<add key=\"KeyVault.ClientId\" value=\"\" />\n<add key=\"KeyVault.CertificateThumbprint\" value=\"\" />\n+ <!-- *********************** -->\n+ <!-- PACKAGE DELETE SETTINGS -->\n+ <!-- *********************** -->\n+ <add key=\"PackageDelete.AllowUsersToDeletePackages\" value=\"false\" />\n+ <add key=\"PackageDelete.MaximumDownloadsForPackageId\" value=\"\" />\n+ <add key=\"PackageDelete.StatisticsUpdateFrequencyInHours\" value=\"\" />\n+ <add key=\"PackageDelete.HourLimitWithMaximumDownloads\" value=\"\" />\n+ <add key=\"PackageDelete.MaximumDownloadsForPackageVersion\" value=\"\" />\n</appSettings>\n<connectionStrings>\n<add name=\"Gallery.SqlServer\" connectionString=\"Data Source=(localdb)\\mssqllocaldb; Initial Catalog=NuGetGallery; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeleteServiceFacts.cs",
"diff": "using System.Threading.Tasks;\nusing Moq;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Configuration;\nusing Xunit;\nnamespace NuGetGallery\n@@ -26,7 +27,9 @@ public class PackageDeleteServiceFacts\nMock<IIndexingService> indexingService = null,\nMock<IPackageFileService> packageFileService = null,\nMock<IAuditingService> auditingService = null,\n- Action<Mock<TestPackageDeleteService>> setup = null)\n+ Mock<IPackageDeleteConfiguration> config = null,\n+ Action<Mock<TestPackageDeleteService>> setup = null,\n+ bool useRealConstructor = false)\n{\npackageRepository = packageRepository ?? new Mock<IEntityRepository<Package>>();\npackageRegistrationRepository = packageRegistrationRepository ?? new Mock<IEntityRepository<PackageRegistration>>();\n@@ -42,6 +45,23 @@ public class PackageDeleteServiceFacts\nauditingService = auditingService ?? new Mock<IAuditingService>();\n+ config = config ?? new Mock<IPackageDeleteConfiguration>();\n+\n+ if (useRealConstructor)\n+ {\n+ return new PackageDeleteService(\n+ packageRepository.Object,\n+ packageRegistrationRepository.Object,\n+ packageDeletesRepository.Object,\n+ entitiesContext.Object,\n+ packageService.Object,\n+ indexingService.Object,\n+ packageFileService.Object,\n+ auditingService.Object,\n+ config.Object);\n+ }\n+ else\n+ {\nvar packageDeleteService = new Mock<TestPackageDeleteService>(\npackageRepository.Object,\npackageRegistrationRepository.Object,\n@@ -50,7 +70,8 @@ public class PackageDeleteServiceFacts\npackageService.Object,\nindexingService.Object,\npackageFileService.Object,\n- auditingService.Object);\n+ auditingService.Object,\n+ config.Object);\npackageDeleteService.CallBase = true;\n@@ -61,14 +82,32 @@ public class PackageDeleteServiceFacts\nreturn packageDeleteService.Object;\n}\n+ }\npublic class TestPackageDeleteService\n: PackageDeleteService\n{\npublic PackageAuditRecord LastAuditRecord { get; set; }\n- public TestPackageDeleteService(IEntityRepository<Package> packageRepository, IEntityRepository<PackageRegistration> packageRegistrationRepository, IEntityRepository<PackageDelete> packageDeletesRepository, IEntitiesContext entitiesContext, IPackageService packageService, IIndexingService indexingService, IPackageFileService packageFileService, IAuditingService auditingService)\n- : base(packageRepository, packageRegistrationRepository, packageDeletesRepository, entitiesContext, packageService, indexingService, packageFileService, auditingService)\n+ public TestPackageDeleteService(\n+ IEntityRepository<Package> packageRepository,\n+ IEntityRepository<PackageRegistration> packageRegistrationRepository,\n+ IEntityRepository<PackageDelete> packageDeletesRepository,\n+ IEntitiesContext entitiesContext,\n+ IPackageService packageService,\n+ IIndexingService indexingService,\n+ IPackageFileService packageFileService,\n+ IAuditingService auditingService,\n+ IPackageDeleteConfiguration config) : base(\n+ packageRepository,\n+ packageRegistrationRepository,\n+ packageDeletesRepository,\n+ entitiesContext,\n+ packageService,\n+ indexingService,\n+ packageFileService,\n+ auditingService,\n+ config)\n{\n}\n@@ -90,6 +129,25 @@ protected override PackageAuditRecord CreateAuditRecord(Package package, Package\n}\n}\n+ public class TheConstructor\n+ {\n+ [Fact]\n+ public void RejectsHourLimitWithMaximumDownloadsLessThanStatisticsUpdateFrequencyInHours()\n+ {\n+ // Arrange\n+ var config = new Mock<IPackageDeleteConfiguration>();\n+ config.Setup(x => x.StatisticsUpdateFrequencyInHours).Returns(24);\n+ config.Setup(x => x.HourLimitWithMaximumDownloads).Returns(23);\n+\n+ // Act & Assert\n+ var exception = Assert.Throws<ArgumentException>(\n+ () => CreateService(config: config, useRealConstructor: true));\n+ Assert.Contains(\n+ \"StatisticsUpdateFrequencyInHours must be less than HourLimitWithMaximumDownloads.\",\n+ exception.Message);\n+ }\n+ }\n+\npublic class TheSoftDeletePackagesAsyncMethod\n{\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add configuration for user package deletes (#5063)
Progress on https://github.com/NuGet/Engineering/issues/921
|
455,759 |
08.01.2018 17:11:25
| -3,600 |
18467dca482d3815410078d450fb638c6693aeac
|
Fix expander for verify-metadata section package upload page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"new_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"diff": "@@ -263,7 +263,7 @@ var AsyncFileUploadManager = new function () {\n$(\"#verify-collapser-container\").removeClass(\"hidden\");\n$(\"#submit-collapser-container\").removeClass(\"hidden\");\n- window.nuget.configureExpanderHeading(\"verify-package-form\");\n+ window.nuget.configureExpanderHeading(\"verify-package-section\");\nwindow.nuget.configureExpanderHeading(\"submit-package-form\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyForm.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyForm.cshtml",
"diff": "<div id=\"verify-collapser-container\" class=\"hidden\">\n<h2>\n- <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#verify-package-form\"\n- aria-expanded=\"true\" aria-controls=\"verify-package-form\" id=\"show-verify-package-form\">\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#verify-package-section\"\n+ aria-expanded=\"true\" aria-controls=\"verify-package-form\" id=\"show-verify-package-section\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>Verify</span>\n</a>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml",
"diff": "</script>\n<script type=\"text/html\" id=\"verify-metadata-template\">\n- <div class=\"collapse in\">\n+ <div class=\"collapse in\" id=\"verify-package-section\">\n<div data-bind=\"if: $data\">\n<div class=\"verify-package-field\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix expander for verify-metadata section package upload page
|
455,776 |
06.12.2017 17:06:20
| 28,800 |
8fa6e80677c6a48e352e77b3f9b60f19a6c09471
|
Permissions tests for DisplayPackage
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -449,7 +449,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\n.ToList();\nvar isReadMePending = false;\n- if (PermissionsService.IsActionAllowed(package, User, PackageActions.Edit))\n+ if (PermissionsService.IsActionAllowed(package, User, PackageActions.DisplayPrivatePackage))\n{\n// Tell logged-in package owners not to cache the package page,\n// so they won't be confused about the state of pending edits.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -64,8 +64,8 @@ public class PackagesControllerFacts\n{\nuploadFileService = new Mock<IUploadFileService>();\nuploadFileService.Setup(x => x.DeleteUploadFileAsync(It.IsAny<int>())).Returns(Task.FromResult(0));\n- uploadFileService.Setup(x => x.GetUploadFileAsync(42)).Returns(Task.FromResult<Stream>(null));\n- uploadFileService.Setup(x => x.SaveUploadFileAsync(42, It.IsAny<Stream>())).Returns(Task.FromResult(0));\n+ uploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(null));\n+ uploadFileService.Setup(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));\n}\nuserService = userService ?? new Mock<IUserService>();\nmessageService = messageService ?? new Mock<IMessageService>();\n@@ -241,66 +241,94 @@ public async Task GivenANonExistantPackageIt404s()\nResultAssert.IsNotFound(result);\n}\n- [Fact]\n- public async Task GivenAValidPackageThatTheCurrentUserDoesNotOwnItDisplaysCurrentMetadata()\n- {\n- // Arrange\n- var packageService = new Mock<IPackageService>();\n- var indexingService = new Mock<IIndexingService>();\n- var controller = CreateController(\n- GetConfigurationService(),\n- packageService: packageService,\n- indexingService: indexingService);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n+ public static IEnumerable<PackageStatus> ValidatingPackageStatuses =\n+ new[] { PackageStatus.Validating , PackageStatus.FailedValidation};\n- packageService.Setup(p => p.FindPackageByIdAndVersion(\"Foo\", \"1.1.1\", SemVerLevelKey.SemVer2, true))\n- .Returns(new Package()\n- {\n- PackageRegistration = new PackageRegistration()\n+ public static IEnumerable<object[]> GivenAValidatingPackage_Data => ValidatingPackageStatuses.Select(s => new object[] { s });\n+\n+ [Theory]\n+ [MemberData(nameof(GivenAValidatingPackage_Data))]\n+ public async Task GivenAValidatingPackageThatTheCurrentUserOwnsThenShowIt(PackageStatus packageStatus)\n{\n- Id = \"Foo\",\n- Owners = new List<User>()\n- },\n- Version = \"01.1.01\",\n- NormalizedVersion = \"1.1.1\",\n- Title = \"A test package!\"\n- });\n+ // Arrange & Act\n+ var result = await GetActionResultForPackageStatusAsync(\n+ packageStatus,\n+ TestUtility.FakeUser,\n+ TestUtility.FakeUser);\n- indexingService.Setup(i => i.GetLastWriteTime()).Returns(Task.FromResult((DateTime?)DateTime.UtcNow));\n+ // Assert\n+ Assert.IsType<ViewResult>(result);\n+ }\n- // Act\n- var result = await controller.DisplayPackage(\"Foo\", \"1.1.1\");\n+ [Theory]\n+ [MemberData(nameof(GivenAValidatingPackage_Data))]\n+ public async Task GivenAValidatingPackageAsAdminThenShowIt(PackageStatus packageStatus)\n+ {\n+ // Arrange & Act\n+ var result = await GetActionResultForPackageStatusAsync(\n+ packageStatus,\n+ TestUtility.FakeAdminUser,\n+ new User { Key = 132114 });\n// Assert\n- var model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n- Assert.Equal(\"Foo\", model.Id);\n- Assert.Equal(\"1.1.1\", model.Version);\n- Assert.Equal(\"A test package!\", model.Title);\n+ Assert.IsType<ViewResult>(result);\n+ }\n+\n+ public static IEnumerable<object[]> GivenAValidatingPackageThatCurrentUsersOrganizationOwnsThenShowIt_Data\n+ {\n+ get\n+ {\n+ foreach (var isAdmin in new[] { true, false })\n+ {\n+ foreach (var status in ValidatingPackageStatuses)\n+ {\n+ yield return new object[]\n+ {\n+ status,\n+ isAdmin\n+ };\n+ }\n+ }\n+ }\n}\n[Theory]\n- [InlineData(PackageStatus.Validating)]\n- [InlineData(PackageStatus.FailedValidation)]\n- public async Task GivenAValidatingPackageThatTheCurrentUserOwnsThenShowIt(PackageStatus packageStatus)\n+ [MemberData(nameof(GivenAValidatingPackageThatCurrentUsersOrganizationOwnsThenShowIt_Data))]\n+ public async Task GivenAValidatingPackageThatCurrentUsersOrganizationOwnsThenShowIt(PackageStatus packageStatus, bool isAdmin)\n{\n// Arrange & Act\nvar result = await GetActionResultForPackageStatusAsync(\npackageStatus,\n- p => p.PackageRegistration.Owners.Add(TestUtility.FakeUser));\n+ isAdmin ? TestUtility.FakeOrganizationAdmin : TestUtility.FakeOrganizationCollaborator,\n+ TestUtility.FakeOrganization);\n// Assert\nAssert.IsType<ViewResult>(result);\n}\n[Theory]\n- [InlineData(PackageStatus.Validating)]\n- [InlineData(PackageStatus.FailedValidation)]\n+ [MemberData(nameof(GivenAValidatingPackage_Data))]\n+ public async Task GivenAValidatingPackageWhileLoggedOutThenHideIt(PackageStatus packageStatus)\n+ {\n+ // Arrange & Act\n+ var result = await GetActionResultForPackageStatusAsync(\n+ packageStatus,\n+ null,\n+ new User { Key = 132114 });\n+\n+ // Assert\n+ ResultAssert.IsNotFound(result);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(GivenAValidatingPackage_Data))]\npublic async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(PackageStatus packageStatus)\n{\n// Arrange & Act\nvar result = await GetActionResultForPackageStatusAsync(\npackageStatus,\n- p => p.PackageRegistration.Owners.Clear());\n+ TestUtility.FakeUser,\n+ new User { Key = 132114 });\n// Assert\nResultAssert.IsNotFound(result);\n@@ -308,7 +336,8 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nprivate async Task<ActionResult> GetActionResultForPackageStatusAsync(\nPackageStatus packageStatus,\n- Action<Package> mutatePackage)\n+ User currentUser,\n+ User owner)\n{\n// Arrange\nvar packageService = new Mock<IPackageService>();\n@@ -318,7 +347,8 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nGetConfigurationService(),\npackageService: packageService,\nhttpContext: httpContext);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n+ controller.SetCurrentUser(currentUser);\n+\nhttpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\nvar package = new Package\n@@ -326,15 +356,13 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nPackageRegistration = new PackageRegistration()\n{\nId = \"NuGet.Versioning\",\n- Owners = new List<User>(),\n+ Owners = new[] { owner }\n},\nVersion = \"3.4.0\",\nNormalizedVersion = \"3.4.0\",\nPackageStatusKey = packageStatus,\n};\n- mutatePackage(package);\n-\npackageService\n.Setup(p => p.FindPackageByIdAndVersion(\nIt.IsAny<string>(),\n@@ -364,6 +392,7 @@ public async Task GivenAValidPackageThatTheCurrentUserOwnsItDisablesResponseCach\npackageService: packageService,\neditPackageService: editPackageService,\nhttpContext: httpContext);\n+\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nhttpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\n@@ -395,57 +424,83 @@ public async Task GivenAValidPackageThatTheCurrentUserOwnsItDisablesResponseCach\nhttpCachePolicy.VerifyAll();\n}\n- [Fact]\n- public async Task GivenAValidPackageThatTheCurrentUserOwnsWithNoEditsItDisplaysCurrentMetadata()\n+ public static IEnumerable<object[]> EditedPackageOwners\n{\n- // Arrange\n- var packageService = new Mock<IPackageService>();\n- var indexingService = new Mock<IIndexingService>();\n- var editPackageService = new Mock<EditPackageService>();\n- var httpContext = new Mock<HttpContextBase>();\n- var httpCachePolicy = new Mock<HttpCachePolicyBase>();\n- var controller = CreateController(\n- GetConfigurationService(),\n- packageService: packageService,\n- editPackageService: editPackageService,\n- indexingService: indexingService,\n- httpContext: httpContext);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n- httpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\n+ get\n+ {\n+ yield return new object[]\n+ {\n+ TestUtility.FakeUser,\n+ TestUtility.FakeUser\n+ };\n- var package = new Package()\n+ yield return new object[]\n{\n- PackageRegistration = new PackageRegistration()\n+ TestUtility.FakeAdminUser,\n+ new User { Key = 12414 }\n+ };\n+\n+ yield return new object[]\n{\n- Id = \"Foo\",\n- Owners = new List<User>() { TestUtility.FakeUser }\n- },\n- Version = \"01.1.01\",\n- NormalizedVersion = \"1.1.1\",\n- Title = \"A test package!\"\n+ TestUtility.FakeOrganizationAdmin,\n+ TestUtility.FakeOrganization\n};\n- packageService\n- .Setup(p => p.FindPackageByIdAndVersion(\"Foo\", \"1.1.1\", SemVerLevelKey.SemVer2, true))\n- .Returns(package);\n- editPackageService\n- .Setup(e => e.GetPendingMetadata(package))\n- .ReturnsNull();\n+ yield return new object[]\n+ {\n+ TestUtility.FakeOrganizationCollaborator,\n+ TestUtility.FakeOrganization\n+ };\n+ }\n+ }\n- indexingService.Setup(i => i.GetLastWriteTime()).Returns(Task.FromResult((DateTime?)DateTime.UtcNow));\n+ public static IEnumerable<object[]> EditedPackageNonOwners\n+ {\n+ get\n+ {\n+ yield return new object[]\n+ {\n+ TestUtility.FakeUser,\n+ new User { Key = 12414 }\n+ };\n- // Act\n- var result = await controller.DisplayPackage(\"Foo\", \"1.1.1\");\n+ yield return new object[]\n+ {\n+ null,\n+ TestUtility.FakeUser\n+ };\n+ }\n+ }\n- // Assert\n- var model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n- Assert.Equal(\"Foo\", model.Id);\n- Assert.Equal(\"1.1.1\", model.Version);\n- Assert.Equal(\"A test package!\", model.Title);\n+ [Theory]\n+ [MemberData(nameof(EditedPackageOwners))]\n+ public Task GivenAnOwnedValidPackageWithNoEditsItDisplaysCurrentMetadata(User currentUser, User owner)\n+ {\n+ return CheckValidPackageWithEdits(currentUser, owner, isEdited: false, seeEdit: false);\n}\n- [Fact]\n- public async Task GivenAValidPackageThatTheCurrentUserOwnsWithEditsItDisplaysEditedMetadata()\n+ [Theory]\n+ [MemberData(nameof(EditedPackageOwners))]\n+ public Task GivenAnOwnedValidPackageWithEditsItDisplaysEditedMetadata(User currentUser, User owner)\n+ {\n+ return CheckValidPackageWithEdits(currentUser, owner, isEdited: true, seeEdit: true);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(EditedPackageNonOwners))]\n+ public Task GivenAnUnownedValidPackageWithNoEditsItDisplaysCurrentMetadata(User currentUser, User owner)\n+ {\n+ return CheckValidPackageWithEdits(currentUser, owner, isEdited: false, seeEdit: false);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(EditedPackageNonOwners))]\n+ public Task GivenAnUnownedValidPackageWithEditsItDisplaysEditedMetadata(User currentUser, User owner)\n+ {\n+ return CheckValidPackageWithEdits(currentUser, owner, isEdited: true, seeEdit: false);\n+ }\n+\n+ private async Task CheckValidPackageWithEdits(User currentUser, User owner, bool isEdited, bool seeEdit)\n{\n// Arrange\nvar packageService = new Mock<IPackageService>();\n@@ -459,29 +514,30 @@ public async Task GivenAValidPackageThatTheCurrentUserOwnsWithEditsItDisplaysEdi\neditPackageService: editPackageService,\nindexingService: indexingService,\nhttpContext: httpContext);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n+ controller.SetCurrentUser(currentUser);\nhttpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\n+ var uneditedTitle = \"A test package!\";\nvar package = new Package()\n{\nPackageRegistration = new PackageRegistration()\n{\nId = \"Foo\",\n- Owners = new List<User>() { TestUtility.FakeUser }\n+ Owners = new List<User>() { owner }\n},\nVersion = \"01.1.01\",\nNormalizedVersion = \"1.1.1\",\n- Title = \"A test package!\"\n+ Title = uneditedTitle\n};\npackageService\n.Setup(p => p.FindPackageByIdAndVersion(\"Foo\", \"1.1.1\", SemVerLevelKey.SemVer2, true))\n.Returns(package);\n+\n+ var editedTitle = \"A modified package!\";\n+ var packageEdit = isEdited ? new PackageEdit { Title = editedTitle } : null;\neditPackageService\n.Setup(e => e.GetPendingMetadata(package))\n- .Returns(new PackageEdit()\n- {\n- Title = \"A modified package!\"\n- });\n+ .Returns(packageEdit);\nindexingService.Setup(i => i.GetLastWriteTime()).Returns(Task.FromResult((DateTime?)DateTime.UtcNow));\n@@ -492,7 +548,7 @@ public async Task GivenAValidPackageThatTheCurrentUserOwnsWithEditsItDisplaysEdi\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\nAssert.Equal(\"Foo\", model.Id);\nAssert.Equal(\"1.1.1\", model.Version);\n- Assert.Equal(\"A modified package!\", model.Title);\n+ Assert.Equal(seeEdit ? editedTitle : uneditedTitle, model.Title);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/TestExtensionMethods.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/TestExtensionMethods.cs",
"diff": "@@ -34,8 +34,14 @@ public static void SetOwinContextCurrentUser(this AppController self, User user,\n}\nelse\n{\n- identity = new ClaimsIdentity(\n- new[] { new Claim(ClaimTypes.Name, string.IsNullOrEmpty(user.Username) ? \"theUserName\" : user.Username) });\n+ if (string.IsNullOrEmpty(user.Username))\n+ {\n+ user.Username = \"theUsername\";\n+ }\n+\n+ identity = AuthenticationService.CreateIdentity(\n+ user,\n+ AuthenticationTypes.External);\n}\nvar principal = new ClaimsPrincipal(identity);\n@@ -49,6 +55,14 @@ public static void SetOwinContextCurrentUser(this AppController self, User user,\npublic static void SetCurrentUser(this AppController self, User user, Credential credential = null)\n{\n+ if (user == null)\n+ {\n+ // Reset the current user\n+ self.OwinContext.Request.User = null;\n+ self.OwinContext.Environment.Remove(Constants.CurrentUserOwinEnvironmentKey);\n+ return;\n+ }\n+\nSetOwinContextCurrentUser(self, user, credential);\nself.OwinContext.Environment[Constants.CurrentUserOwinEnvironmentKey] = user;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestUtility.cs",
"diff": "using System.IO;\nusing System.Net.Mail;\nusing System.Reflection;\n-using System.Security.Principal;\nusing System.Text;\n-using System.Threading.Tasks;\nusing System.Web;\nusing System.Web.Mvc;\nusing System.Web.Routing;\nusing Moq;\n-using NuGet;\n-using NuGetGallery.Framework;\n-using NuGetGallery.Configuration;\nnamespace NuGetGallery\n{\n@@ -27,10 +22,40 @@ public static class TestUtility\npublic static readonly string GallerySiteRootHttps = $\"https://{galleryHostName}/\";\npublic static readonly string FakeUserName = \"theUsername\";\n+ public static readonly int FakeUserKey = 42;\n+ public static readonly User FakeUser = new User() { Username = FakeUserName, Key = FakeUserKey };\n+\npublic static readonly string FakeAdminName = \"theAdmin\";\n+ public static readonly int FakeAdminKey = 43;\n+ public static readonly User FakeAdminUser = new User() { Username = FakeAdminName, Key = FakeAdminKey, Roles = new[] { new Role { Name = Constants.AdminRoleName } } };\n+\n+ public static readonly string FakeOrganizationName = \"theOrganization\";\n+ public static readonly int FakeOrganizationKey = 44;\n+ public static readonly Organization FakeOrganization;\n+\n+ public static readonly string FakeOrganizationAdminName = \"theOrganizationAdmin\";\n+ public static readonly int FakeOrganizationAdminKey = 45;\n+ public static readonly User FakeOrganizationAdmin;\n- public static readonly User FakeUser = new User() { Username = FakeUserName, Key = 42 };\n- public static readonly User FakeAdminUser = new User() { Username = FakeAdminName, Roles = new List<Role>() { new Role() { Name = Constants.AdminRoleName } } };\n+ public static readonly string FakeOrganizationCollaboratorName = \"theOrganizationCollaborator\";\n+ public static readonly int FakeOrganizationCollaboratorKey = 45;\n+ public static readonly User FakeOrganizationCollaborator;\n+\n+ static TestUtility()\n+ {\n+ // Set up fake Organization users\n+ FakeOrganization = new Organization { Username = FakeOrganizationName, Key = FakeOrganizationKey };\n+ FakeOrganizationAdmin = new User { Username = FakeOrganizationAdminName, Key = FakeOrganizationAdminKey };\n+ FakeOrganizationCollaborator = new User { Username = FakeOrganizationCollaboratorName, Key = FakeOrganizationCollaboratorKey };\n+\n+ var organizationAdminMembership = new Membership { IsAdmin = true, Member = FakeOrganizationAdmin, MemberKey = FakeOrganizationAdmin.Key, Organization = FakeOrganization, OrganizationKey = FakeOrganization.Key };\n+ FakeOrganizationAdmin.Organizations = new[] { organizationAdminMembership };\n+\n+ var organizationCollaboratorMembership = new Membership { IsAdmin = false, Member = FakeOrganizationCollaborator, MemberKey = FakeOrganizationCollaborator.Key, Organization = FakeOrganization, OrganizationKey = FakeOrganization.Key };\n+ FakeOrganizationCollaborator.Organizations = new[] { organizationCollaboratorMembership };\n+\n+ FakeOrganization.Members = new[] { organizationAdminMembership, organizationCollaboratorMembership };\n+ }\n// We only need this method because testing URL generation is a pain.\n// Alternatively, we could write our own service for generating URLs.\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Permissions tests for DisplayPackage (#5129)
|
455,776 |
07.12.2017 16:57:28
| 28,800 |
ca7d4fe14c187ad70081980aabccc4729f4ee136
|
ReportAbuse and ReportMyPackage permissions tests
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -2107,153 +2107,195 @@ public async Task PassesPrerelParameterOnToSearchFilter(bool prerel)\npublic class TheReportAbuseMethod\n: TestContainer\n{\n- [Fact]\n- public async Task SendsMessageToGalleryOwnerWithEmailOnlyWhenUnauthenticated()\n+ public static string PackageId = \"gollum\";\n+ public static string PackageVersion = \"2.0.1\";\n+ public static string UnencodedMessage = \"Gollum took my <b>finger</bold>\";\n+ public static string EncodedMessage = \"Gollum took my <b>finger</bold>\";\n+ public static string ReporterEmailAddress = \"frodo@hobbiton.example.com\";\n+ public static string Signature = \"Frodo\";\n+ public static User Owner = new User { Key = 313, Username = \"Gollum\", EmailAddress = \"gollum@mordor.com\" };\n+\n+ public static IEnumerable<object[]> NotOwner_Data\n{\n- var messageService = new Mock<IMessageService>();\n- messageService.Setup(\n- s => s.ReportAbuse(It.Is<ReportPackageRequest>(r => r.Message == \"Mordor took my finger\")));\n- var package = new Package\n+ get\n{\n- PackageRegistration = new PackageRegistration { Id = \"mordor\" },\n- Version = \"2.0.1\"\n+ yield return new object[]\n+ {\n+ null,\n+ Owner\n};\n- var packageService = new Mock<IPackageService>();\n- packageService.Setup(p => p.FindPackageByIdAndVersionStrict(\"mordor\", \"2.0.1\")).Returns(package);\n- var httpContext = new Mock<HttpContextBase>();\n- var controller = CreateController(\n- GetConfigurationService(),\n- packageService: packageService,\n- messageService: messageService,\n- httpContext: httpContext);\n- var model = new ReportAbuseViewModel\n+\n+ yield return new object[]\n{\n- Email = \"frodo@hobbiton.example.com\",\n- Message = \"Mordor took my finger.\",\n- Reason = ReportPackageReason.ViolatesALicenseIOwn,\n- AlreadyContactedOwner = true,\n- Signature = \"Frodo\"\n+ TestUtility.FakeUser,\n+ Owner\n};\n- TestUtility.SetupUrlHelper(controller, httpContext);\n- var result = await controller.ReportAbuse(\"mordor\", \"2.0.1\", model) as RedirectResult;\n+ yield return new object[]\n+ {\n+ TestUtility.FakeAdminUser,\n+ Owner\n+ };\n+ }\n+ }\n- Assert.NotNull(result);\n- messageService.Verify(\n- s => s.ReportAbuse(\n- It.Is<ReportPackageRequest>(\n- r => r.FromAddress.Address == \"frodo@hobbiton.example.com\"\n- && r.Package == package\n- && r.Reason == EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn)\n- && r.Message == \"Mordor took my finger.\"\n- && r.AlreadyContactedOwners)));\n+ public static IEnumerable<object[]> Owner_Data\n+ {\n+ get\n+ {\n+ yield return new object[]\n+ {\n+ TestUtility.FakeUser,\n+ TestUtility.FakeUser\n+ };\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeOrganizationAdmin,\n+ TestUtility.FakeOrganization\n+ };\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeOrganizationCollaborator,\n+ TestUtility.FakeOrganization\n+ };\n+ }\n}\n- [Fact]\n- public async Task SendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated()\n+ [Theory]\n+ [MemberData(nameof(NotOwner_Data))]\n+ public void ShowsFormWhenNotOwner(User currentUser, User owner)\n{\n- var messageService = new Mock<IMessageService>();\n- messageService.Setup(\n- s => s.ReportAbuse(It.Is<ReportPackageRequest>(r => r.Message == \"Mordor took my finger\")));\n- var user = new User { EmailAddress = \"frodo@hobbiton.example.com\", Username = \"Frodo\", Key = 1 };\n- var package = new Package\n+ var result = GetReportAbuseResult(currentUser, owner, out var package);\n+\n+ Assert.IsType<ViewResult>(result);\n+ var viewResult = result as ViewResult;\n+\n+ Assert.IsType<ReportAbuseViewModel>(viewResult.Model);\n+ var model = viewResult.Model as ReportAbuseViewModel;\n+\n+ Assert.Equal(PackageId, model.PackageId);\n+ Assert.Equal(PackageVersion, model.PackageVersion);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public void RedirectsToReportMyPackageWhenOwner(User currentUser, User owner)\n{\n- PackageRegistration = new PackageRegistration { Id = \"mordor\" },\n- Version = \"2.0.1\"\n+ var result = GetReportAbuseResult(currentUser, owner, out var package);\n+\n+ Assert.IsType<RedirectToRouteResult>(result);\n+ var redirectResult = result as RedirectToRouteResult;\n+ Assert.Equal(\"ReportMyPackage\", redirectResult.RouteValues[\"Action\"]);\n+ }\n+\n+ public ActionResult GetReportAbuseResult(User currentUser, User owner, out Package package)\n+ {\n+ package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration { Id = PackageId, Owners = { owner } },\n+ Version = PackageVersion\n};\nvar packageService = new Mock<IPackageService>();\n- packageService.Setup(p => p.FindPackageByIdAndVersionStrict(\"mordor\", It.IsAny<string>())).Returns(package);\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(PackageId, PackageVersion)).Returns(package);\nvar httpContext = new Mock<HttpContextBase>();\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n- messageService: messageService,\nhttpContext: httpContext);\n- controller.SetCurrentUser(user);\n- var model = new ReportAbuseViewModel\n- {\n- Message = \"Mordor took my finger\",\n- Reason = ReportPackageReason.ViolatesALicenseIOwn,\n- Signature = \"Frodo\"\n- };\n-\n+ controller.SetCurrentUser(currentUser);\nTestUtility.SetupUrlHelper(controller, httpContext);\n- ActionResult result = await controller.ReportAbuse(\"mordor\", \"2.0.1\", model) as RedirectResult;\n+\n+ return controller.ReportAbuse(PackageId, PackageVersion);\n+ }\n+\n+ [Fact]\n+ public async Task FormSendsMessageToGalleryOwnerWithEmailOnlyWhenUnauthenticated()\n+ {\n+ var result = await GetReportAbuseFormResult(null, Owner, out var package, out var messageService);\nAssert.NotNull(result);\nmessageService.Verify(\ns => s.ReportAbuse(\nIt.Is<ReportPackageRequest>(\n- r => r.Message == \"Mordor took my finger\"\n- && r.FromAddress.Address == \"frodo@hobbiton.example.com\"\n- && r.FromAddress.DisplayName == \"Frodo\"\n- && r.Reason == EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn))));\n+ r => r.FromAddress.Address == ReporterEmailAddress\n+ && r.Package == package\n+ && r.Reason == EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn)\n+ && r.Message == EncodedMessage\n+ && r.AlreadyContactedOwners)));\n}\n- [Fact]\n- public void FormRedirectsPackageOwnerToReportMyPackage()\n+ public static IEnumerable<object[]> FormSendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated_Data\n{\n- var user = new User { EmailAddress = \"darklord@mordor.com\", Username = \"Sauron\" };\n- var package = new Package\n+ get\n{\n- PackageRegistration = new PackageRegistration { Id = \"Mordor\", Owners = { user } },\n- Version = \"2.0.1\"\n+ var authenticatedUserTest = new[]\n+ {\n+ new object[]\n+ {\n+ TestUtility.FakeUser,\n+ Owner\n+ }\n};\n- var packageService = new Mock<IPackageService>();\n- packageService.Setup(p => p.FindPackageByIdAndVersionStrict(\"Mordor\", It.IsAny<string>())).Returns(package);\n- var httpContext = new Mock<HttpContextBase>();\n- var controller = CreateController(\n- GetConfigurationService(),\n- packageService: packageService,\n- httpContext: httpContext);\n- controller.SetCurrentUser(user);\n- TestUtility.SetupUrlHelper(controller, httpContext);\n- ActionResult result = controller.ReportAbuse(\"Mordor\", \"2.0.1\");\n- Assert.IsType<RedirectToRouteResult>(result);\n- Assert.Equal(\"ReportMyPackage\", ((RedirectToRouteResult)result).RouteValues[\"Action\"]);\n+ return authenticatedUserTest.Concat(Owner_Data);\n+ }\n}\n- [Fact]\n- public async Task HtmlEncodesMessageContent()\n+ [Theory]\n+ [MemberData(nameof(FormSendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated_Data))]\n+ public async Task FormSendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated(User currentUser, User owner)\n{\n- var messageService = new Mock<IMessageService>();\n+ var result = await GetReportAbuseFormResult(currentUser, owner, package: out var package, messageService: out var messageService);\n+\n+ Assert.NotNull(result);\n+ messageService.Verify(\n+ s => s.ReportAbuse(\n+ It.Is<ReportPackageRequest>(\n+ r => r.Message == EncodedMessage\n+ && r.FromAddress.Address == currentUser.EmailAddress\n+ && r.FromAddress.DisplayName == currentUser.Username\n+ && r.Package == package\n+ && r.Reason == EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn)\n+ && r.AlreadyContactedOwners)));\n+ }\n+\n+ public Task<ActionResult> GetReportAbuseFormResult(User currentUser, User owner, out Package package, out Mock<IMessageService> messageService)\n+ {\n+ messageService = new Mock<IMessageService>();\nmessageService.Setup(\n- s => s.ReportAbuse(It.Is<ReportPackageRequest>(r => r.Message == \"Mordor took my finger\")));\n- var package = new Package\n+ s => s.ReportAbuse(It.Is<ReportPackageRequest>(r => r.Message == UnencodedMessage)));\n+ package = new Package\n{\n- PackageRegistration = new PackageRegistration { Id = \"mordor\" },\n+ PackageRegistration = new PackageRegistration { Id = PackageId, Owners = new[] { owner } },\nVersion = \"2.0.1\"\n};\nvar packageService = new Mock<IPackageService>();\n- packageService.Setup(p => p.FindPackageByIdAndVersionStrict(\"mordor\", \"2.0.1\")).Returns(package);\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(PackageId, PackageVersion)).Returns(package);\nvar httpContext = new Mock<HttpContextBase>();\n- httpContext.Setup(h => h.Request.IsAuthenticated).Returns(false);\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nmessageService: messageService,\nhttpContext: httpContext);\n+ controller.SetCurrentUser(currentUser);\nvar model = new ReportAbuseViewModel\n{\n- Email = \"frodo@hobbiton.example.com\",\n- Message = \"I like the cut of your jib. It's <b>bold</b>.\",\n+ Email = ReporterEmailAddress,\n+ Message = UnencodedMessage,\nReason = ReportPackageReason.ViolatesALicenseIOwn,\nAlreadyContactedOwner = true,\n- Signature = \"Frodo\"\n+ Signature = Signature\n};\n- TestUtility.SetupUrlHelper(controller, httpContext);\n- await controller.ReportAbuse(\"mordor\", \"2.0.1\", model);\n+ if (currentUser != null)\n+ {\n+ model.Email = currentUser.EmailAddress;\n+ }\n- messageService.Verify(\n- s => s.ReportAbuse(\n- It.Is<ReportPackageRequest>(\n- r => r.FromAddress.Address == \"frodo@hobbiton.example.com\"\n- && r.Package == package\n- && r.Reason == EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn)\n- && r.Message == \"I like the cut of your jib. It's <b>bold</b>.\"\n- && r.AlreadyContactedOwners)));\n+ TestUtility.SetupUrlHelper(controller, httpContext);\n+ return controller.ReportAbuse(PackageId, PackageVersion, model);\n}\n}\n@@ -2261,42 +2303,38 @@ public class TheReportMyPackageMethod\n: TestContainer\n{\nprivate Package _package;\n+ private static User _owner = new User { EmailAddress = \"frodo@hobbiton.example.com\", Username = \"Frodo\", Key = 2 };\nprivate ReportMyPackageViewModel _viewModel;\nprivate Issue _supportRequest;\n- private User _user;\nprivate Mock<IPackageService> _packageService;\nprivate Mock<IMessageService> _messageService;\nprivate Mock<IPackageDeleteService> _packageDeleteService;\nprivate Mock<ISupportRequestService> _supportRequestService;\nprivate PackagesController _controller;\n- public TheReportMyPackageMethod()\n+ public void SetupTest(User currentUser, User owner)\n{\n- _user = new User\n+ if (owner == null)\n{\n- EmailAddress = \"frodo@hobbiton.example.com\",\n- Username = \"Frodo\",\n- Key = 2\n- };\n+ owner = _owner;\n+ }\n+\n_package = new Package\n{\nPackageRegistration = new PackageRegistration\n{\nId = \"Mordor\",\n- Owners = { _user },\n+ Owners = { owner },\n},\nVersion = \"2.00.1\",\nNormalizedVersion = \"2.0.1\",\n};\n+\n_viewModel = new ReportMyPackageViewModel\n{\nReason = ReportPackageReason.ContainsPrivateAndConfidentialData,\nMessage = \"Message!\",\n};\n- _supportRequest = new Issue\n- {\n- Key = 23,\n- };\n_packageService = new Mock<IPackageService>();\n_packageService\n@@ -2306,6 +2344,11 @@ public TheReportMyPackageMethod()\n_messageService = new Mock<IMessageService>();\n_packageDeleteService = new Mock<IPackageDeleteService>();\n+ _supportRequest = new Issue\n+ {\n+ Key = 23,\n+ };\n+\n_supportRequestService = new Mock<ISupportRequestService>();\n_supportRequestService\n.Setup(x => x.AddNewSupportRequestAsync(\n@@ -2325,66 +2368,120 @@ public TheReportMyPackageMethod()\npackageDeleteService: _packageDeleteService,\nsupportRequestService: _supportRequestService,\nhttpContext: httpContext);\n- _controller.SetCurrentUser(_user);\n+ _controller.SetCurrentUser(currentUser);\nTestUtility.SetupUrlHelper(_controller, httpContext);\n}\n- [Fact]\n- public async Task GetRedirectsNonOwnersToReportAbuse()\n+ public static IEnumerable<object[]> OwnerAndNotOwner_Data => Owner_Data.Concat(NotOwner_Data);\n+\n+ public static IEnumerable<object[]> NotOwner_Data\n+ {\n+ get\n+ {\n+ yield return new object[]\n+ {\n+ null,\n+ null\n+ };\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeUser,\n+ null\n+ };\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeAdminUser,\n+ null\n+ };\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeOrganizationCollaborator,\n+ TestUtility.FakeOrganization\n+ };\n+ }\n+ }\n+\n+ public static IEnumerable<object[]> Owner_Data\n+ {\n+ get\n+ {\n+ yield return new object[]\n+ {\n+ TestUtility.FakeUser,\n+ TestUtility.FakeUser\n+ };\n+\n+ yield return new object[]\n+ {\n+ TestUtility.FakeOrganizationAdmin,\n+ TestUtility.FakeOrganization\n+ };\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(NotOwner_Data))]\n+ public async Task GetRedirectsNonOwnersToReportAbuse(User currentUser, User owner)\n{\nawait RedirectsNonOwnersToReportAbuse(\n+ currentUser, owner,\n() => _controller.ReportMyPackage(\n_package.PackageRegistration.Id,\n_package.Version));\n}\n- [Fact]\n- public async Task PostRedirectsNonOwnersToReportAbuse()\n+ [Theory]\n+ [MemberData(nameof(NotOwner_Data))]\n+ public async Task PostRedirectsNonOwnersToReportAbuse(User currentUser, User owner)\n{\nawait RedirectsNonOwnersToReportAbuse(\n+ currentUser, owner,\n() => _controller.ReportMyPackage(\n_package.PackageRegistration.Id,\n_package.Version,\n_viewModel));\n}\n- private async Task RedirectsNonOwnersToReportAbuse(Func<Task<ActionResult>> actAsync)\n+ private async Task RedirectsNonOwnersToReportAbuse(User currentUser, User owner, Func<Task<ActionResult>> actAsync)\n{\n- // Arrange\n- _package.PackageRegistration.Owners.Clear();\n-\n- // Act\n+ SetupTest(currentUser, owner);\nvar result = await actAsync();\n- // Assert\nAssert.IsType<RedirectToRouteResult>(result);\nAssert.Equal(\"ReportAbuse\", ((RedirectToRouteResult)result).RouteValues[\"Action\"]);\n}\n-\n- [Fact]\n- public async Task GetRedirectsMissingPackageToNotFound()\n+ [Theory]\n+ [MemberData(nameof(OwnerAndNotOwner_Data))]\n+ public async Task GetRedirectsMissingPackageToNotFound(User currentUser, User owner)\n{\nawait RedirectsMissingPackageToNotFound(\n+ currentUser, owner,\n() => _controller.ReportMyPackage(\n_package.PackageRegistration.Id,\n_package.Version));\n}\n- [Fact]\n- public async Task PostRedirectsMissingPackageToNotFound()\n+ [Theory]\n+ [MemberData(nameof(OwnerAndNotOwner_Data))]\n+ public async Task PostRedirectsMissingPackageToNotFound(User currentUser, User owner)\n{\nawait RedirectsMissingPackageToNotFound(\n+ currentUser, owner,\n() => _controller.ReportMyPackage(\n_package.PackageRegistration.Id,\n_package.Version,\n_viewModel));\n}\n- private async Task RedirectsMissingPackageToNotFound(Func<Task<ActionResult>> actAsync)\n+ private async Task RedirectsMissingPackageToNotFound(User currentUser, User owner, Func<Task<ActionResult>> actAsync)\n{\n// Arrange\n+ SetupTest(currentUser: null, owner: _owner);\n_packageService\n.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>()))\n.Returns<Package>(null);\n@@ -2396,10 +2493,12 @@ private async Task RedirectsMissingPackageToNotFound(Func<Task<ActionResult>> ac\nAssert.IsType<HttpNotFoundResult>(result);\n}\n- [Fact]\n- public async Task HtmlEncodesMessageContent()\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task HtmlEncodesMessageContent(User currentUser, User owner)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.Message = \"I like the cut of your jib. It's <b>bold</b>.\";\n_viewModel.Reason = ReportPackageReason.ViolatesALicenseIOwn;\n@@ -2416,16 +2515,18 @@ public async Task HtmlEncodesMessageContent()\n// Assert\nAssert.NotNull(reportRequest);\n- Assert.Equal(_user.EmailAddress, reportRequest.FromAddress.Address);\n+ Assert.Equal(currentUser.EmailAddress, reportRequest.FromAddress.Address);\nAssert.Same(_package, reportRequest.Package);\nAssert.Equal(EnumHelper.GetDescription(ReportPackageReason.ViolatesALicenseIOwn), reportRequest.Reason);\nAssert.Equal(\"I like the cut of your jib. It's <b>bold</b>.\", reportRequest.Message);\n}\n- [Fact]\n- public async Task DoesNotCheckDeleteAllowedIfDeleteWasNotRequested()\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task DoesNotCheckDeleteAllowedIfDeleteWasNotRequested(User currentUser, User owner)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.DeleteDecision = PackageDeleteDecision.ContactSupport;\n_viewModel.Message = \"Test message!\";\n@@ -2447,18 +2548,20 @@ public async Task DoesNotCheckDeleteAllowedIfDeleteWasNotRequested()\n_package.PackageRegistration.Id,\n_package.NormalizedVersion),\n\"Test message!\",\n- _user.EmailAddress,\n+ currentUser.EmailAddress,\nEnumHelper.GetDescription(_viewModel.Reason.Value),\n- _user,\n+ currentUser,\n_package),\nTimes.Once);\nAssert.Equal(Strings.SupportRequestSentTransientMessage, _controller.TempData[\"Message\"]);\n}\n- [Fact]\n- public async Task AllowsPackageDelete()\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task AllowsPackageDelete(User currentUser, User owner)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.DeleteDecision = PackageDeleteDecision.DeletePackage;\n_viewModel.DeleteConfirmation = true;\n_packageDeleteService\n@@ -2481,15 +2584,15 @@ public async Task AllowsPackageDelete()\n_package.PackageRegistration.Id,\n_package.NormalizedVersion),\nStrings.UserPackageDeleteSupportRequestMessage,\n- _user.EmailAddress,\n+ currentUser.EmailAddress,\nEnumHelper.GetDescription(_viewModel.Reason.Value),\n- _user,\n+ currentUser,\n_package),\nTimes.Once);\n_packageDeleteService.Verify(\nx => x.SoftDeletePackagesAsync(\nIt.Is<IEnumerable<Package>>(p => p.First() == _package),\n- _user,\n+ currentUser,\nEnumHelper.GetDescription(_viewModel.Reason.Value),\nStrings.UserPackageDeleteSignature),\nTimes.Once);\n@@ -2499,7 +2602,7 @@ public async Task AllowsPackageDelete()\nnull,\nIssueStatusKeys.Resolved,\nnull,\n- _user.Username),\n+ currentUser.Username),\nTimes.Once);\n_messageService.Verify(\nx => x.SendPackageDeletedNotice(\n@@ -2514,10 +2617,12 @@ public async Task AllowsPackageDelete()\nTimes.Never);\n}\n- [Fact]\n- public async Task TreatsDeleteFailureAsNormalRequest()\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task TreatsDeleteFailureAsNormalRequest(User currentUser, User owner)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.DeleteDecision = PackageDeleteDecision.DeletePackage;\n_viewModel.DeleteConfirmation = true;\n_viewModel.CopySender = true;\n@@ -2544,7 +2649,7 @@ public async Task TreatsDeleteFailureAsNormalRequest()\n_packageDeleteService.Verify(\nx => x.SoftDeletePackagesAsync(\nIt.Is<IEnumerable<Package>>(p => p.First() == _package),\n- _user,\n+ currentUser,\nEnumHelper.GetDescription(_viewModel.Reason.Value),\nStrings.UserPackageDeleteSignature),\nTimes.Once);\n@@ -2567,10 +2672,12 @@ public async Task TreatsDeleteFailureAsNormalRequest()\nTimes.Once);\n}\n- [Fact]\n- public async Task RequiresMessageWhenNotDeleting()\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task RequiresMessageWhenNotDeleting(User currentUser, User owner)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.DeleteDecision = PackageDeleteDecision.ContactSupport;\n_viewModel.Message = null;\n_packageDeleteService\n@@ -2593,10 +2700,12 @@ public async Task RequiresMessageWhenNotDeleting()\n.Select(x => x.ErrorMessage));\n}\n- [Fact]\n- public async Task RequiresConfirmationWhenDeleting()\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task RequiresConfirmationWhenDeleting(User currentUser, User owner)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.DeleteDecision = PackageDeleteDecision.DeletePackage;\n_viewModel.DeleteConfirmation = false;\n_packageDeleteService\n@@ -2619,13 +2728,37 @@ public async Task RequiresConfirmationWhenDeleting()\n.Select(x => x.ErrorMessage));\n}\n+ private static IEnumerable<ReportPackageReason> ReasonsRequiringDeleteDecision = new[]\n+ {\n+ ReportPackageReason.ContainsMaliciousCode,\n+ ReportPackageReason.ContainsPrivateAndConfidentialData,\n+ ReportPackageReason.ReleasedInPublicByAccident\n+ };\n+\n+ private static IEnumerable<ReportPackageReason> ReasonsNotRequiringDeleteDecision = new[]\n+ {\n+ ReportPackageReason.Other\n+ };\n+\n+ private static IEnumerable<object[]> MergeOwnersWithReasons(IEnumerable<ReportPackageReason> reasons)\n+ {\n+ foreach (var ownerData in Owner_Data)\n+ {\n+ foreach (var reason in reasons)\n+ {\n+ yield return ownerData.Concat(new object[] { reason }).ToArray();\n+ }\n+ }\n+ }\n+\n+ public static IEnumerable<object[]> RequiresDeleteDecision_Data => MergeOwnersWithReasons(ReasonsRequiringDeleteDecision);\n+\n[Theory]\n- [InlineData(ReportPackageReason.ContainsMaliciousCode)]\n- [InlineData(ReportPackageReason.ContainsPrivateAndConfidentialData)]\n- [InlineData(ReportPackageReason.ReleasedInPublicByAccident)]\n- public async Task RequiresDeleteDecision(ReportPackageReason reason)\n+ [MemberData(nameof(RequiresDeleteDecision_Data))]\n+ public async Task RequiresDeleteDecision(User currentUser, User owner, ReportPackageReason reason)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.Reason = reason;\n_viewModel.DeleteDecision = null;\n_viewModel.DeleteConfirmation = true;\n@@ -2649,11 +2782,14 @@ public async Task RequiresDeleteDecision(ReportPackageReason reason)\n.Select(x => x.ErrorMessage));\n}\n+ public static IEnumerable<object[]> DoesNotRequireDeleteDecision_Data => MergeOwnersWithReasons(ReasonsNotRequiringDeleteDecision);\n+\n[Theory]\n- [InlineData(ReportPackageReason.Other)]\n- public async Task DoesNotRequireDeleteDecision(ReportPackageReason reason)\n+ [MemberData(nameof(DoesNotRequireDeleteDecision_Data))]\n+ public async Task DoesNotRequireDeleteDecision(User currentUser, User owner, ReportPackageReason reason)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.Reason = reason;\n_viewModel.DeleteDecision = null;\n_packageDeleteService\n@@ -2684,10 +2820,12 @@ public async Task DoesNotRequireDeleteDecision(ReportPackageReason reason)\nTimes.Once);\n}\n- [Fact]\n- public async Task IgnoresDeleteRequestWhenNotAllowed()\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task IgnoresDeleteRequestWhenNotAllowed(User currentUser, User owner)\n{\n// Arrange\n+ SetupTest(currentUser, owner);\n_viewModel.Reason = ReportPackageReason.ContainsPrivateAndConfidentialData;\n_viewModel.DeleteDecision = PackageDeleteDecision.DeletePackage;\n_viewModel.DeleteConfirmation = true;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestUtility.cs",
"diff": "@@ -23,11 +23,11 @@ public static class TestUtility\npublic static readonly string FakeUserName = \"theUsername\";\npublic static readonly int FakeUserKey = 42;\n- public static readonly User FakeUser = new User() { Username = FakeUserName, Key = FakeUserKey };\n+ public static readonly User FakeUser = new User() { Username = FakeUserName, Key = FakeUserKey, EmailAddress = \"theUsername@nuget.org\" };\npublic static readonly string FakeAdminName = \"theAdmin\";\npublic static readonly int FakeAdminKey = 43;\n- public static readonly User FakeAdminUser = new User() { Username = FakeAdminName, Key = FakeAdminKey, Roles = new[] { new Role { Name = Constants.AdminRoleName } } };\n+ public static readonly User FakeAdminUser = new User() { Username = FakeAdminName, Key = FakeAdminKey, EmailAddress = \"theAdmin@nuget.org\", Roles = new[] { new Role { Name = Constants.AdminRoleName } } };\npublic static readonly string FakeOrganizationName = \"theOrganization\";\npublic static readonly int FakeOrganizationKey = 44;\n@@ -44,9 +44,9 @@ public static class TestUtility\nstatic TestUtility()\n{\n// Set up fake Organization users\n- FakeOrganization = new Organization { Username = FakeOrganizationName, Key = FakeOrganizationKey };\n- FakeOrganizationAdmin = new User { Username = FakeOrganizationAdminName, Key = FakeOrganizationAdminKey };\n- FakeOrganizationCollaborator = new User { Username = FakeOrganizationCollaboratorName, Key = FakeOrganizationCollaboratorKey };\n+ FakeOrganization = new Organization { Username = FakeOrganizationName, Key = FakeOrganizationKey, EmailAddress = \"organization@nuget.org\" };\n+ FakeOrganizationAdmin = new User { Username = FakeOrganizationAdminName, Key = FakeOrganizationAdminKey, EmailAddress = \"organizationAdmin@nuget.org\" };\n+ FakeOrganizationCollaborator = new User { Username = FakeOrganizationCollaboratorName, Key = FakeOrganizationCollaboratorKey, EmailAddress = \"organizationCollaborator@nuget.org\" };\nvar organizationAdminMembership = new Membership { IsAdmin = true, Member = FakeOrganizationAdmin, MemberKey = FakeOrganizationAdmin.Key, Organization = FakeOrganization, OrganizationKey = FakeOrganization.Key };\nFakeOrganizationAdmin.Organizations = new[] { organizationAdminMembership };\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
ReportAbuse and ReportMyPackage permissions tests (#5146)
|
455,776 |
08.12.2017 12:42:39
| 28,800 |
e54e16b8b4991fae9b1d425bd8bf885d516a7b21
|
Add logged out tests for manage owners
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"diff": "@@ -1010,6 +1010,7 @@ public void ReturnsFailureIfUserIsNotPackageOwner(Func<Fakes, User> getCurrentUs\n}\n}\n+ private static Func<Fakes, User> _getFakesNull = (Fakes fakes) => null;\nprivate static Func<Fakes, User> _getFakesUser = (Fakes fakes) => fakes.User;\nprivate static Func<Fakes, User> _getFakesOwner = (Fakes fakes) => fakes.Owner;\nprivate static Func<Fakes, User> _getFakesOrganizationOwner = (Fakes fakes) => fakes.OrganizationOwner;\n@@ -1027,6 +1028,7 @@ public void ReturnsFailureIfUserIsNotPackageOwner(Func<Fakes, User> getCurrentUs\nprivate static IEnumerable<Func<Fakes, User>> _cannotManagePackageOwnersUsers = new Func<Fakes, User>[]\n{\n+ _getFakesNull,\n_getFakesUser,\n_getFakesOrganizationCollaboratorOwner,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"diff": "@@ -161,6 +161,11 @@ public User CreateUser(string userName, params Credential[] credentials)\npublic static ClaimsPrincipal ToPrincipal(User user)\n{\n+ if (user == null)\n+ {\n+ return null;\n+ }\n+\nClaimsIdentity identity = new ClaimsIdentity(\nclaims: Enumerable.Concat(new[] {\nnew Claim(ClaimsIdentity.DefaultNameClaimType, user.Username),\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add logged out tests for manage owners (#5132)
|
455,776 |
11.12.2017 11:44:29
| 28,800 |
3fdcb2b1697c70a018fce5be9bcfe383ac39307b
|
Add permissions tests for admins for Confirm/Reject ownership
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -809,7 +809,7 @@ public static IEnumerable<object[]> TheOwnershipRequestMethods_Data\n}\n[Theory]\n- [MemberData(\"TheOwnershipRequestMethods_Data\")]\n+ [MemberData(nameof(TheOwnershipRequestMethods_Data))]\npublic async Task WithEmptyTokenReturnsHttpNotFound(InvokeOwnershipRequest invokeOwnershipRequest)\n{\n// Arrange\n@@ -828,7 +828,7 @@ public async Task WithEmptyTokenReturnsHttpNotFound(InvokeOwnershipRequest invok\n}\n[Theory]\n- [MemberData(\"TheOwnershipRequestMethods_Data\")]\n+ [MemberData(nameof(TheOwnershipRequestMethods_Data))]\npublic async Task WithIdentityNotMatchingUserInRequestReturnsNotYourRequest(InvokeOwnershipRequest invokeOwnershipRequest)\n{\n// Arrange\n@@ -851,15 +851,23 @@ public async Task WithIdentityNotMatchingUserInRequestReturnsNotYourRequest(Invo\n}\n[Theory]\n- [MemberData(\"TheOwnershipRequestMethods_Data\")]\n- public async Task WithOrganizationCollaboratorReturnsNotYourRequest(InvokeOwnershipRequest invokeOwnershipRequest)\n+ [MemberData(nameof(TheOwnershipRequestMethods_Data))]\n+ public Task WithSiteAdminReturnsNotYourRequest(InvokeOwnershipRequest invokeOwnershipRequest)\n{\n- // Arrange\n- var package = new PackageRegistration { Id = \"foo\" };\n+ return ReturnsNotYourRequest(TestUtility.FakeAdminUser, TestUtility.FakeUser, invokeOwnershipRequest);\n+ }\n- var currentUser = new User { Username = \"username\", Key = _key++ };\n+ [Theory]\n+ [MemberData(nameof(TheOwnershipRequestMethods_Data))]\n+ public Task WithOrganizationCollaboratorReturnsNotYourRequest(InvokeOwnershipRequest invokeOwnershipRequest)\n+ {\n+ return ReturnsNotYourRequest(TestUtility.FakeOrganizationCollaborator, TestUtility.FakeOrganization, invokeOwnershipRequest);\n+ }\n- var organization = new Organization { Key = _key++, Username = \"organization\", Members = new[] { new Membership { Member = currentUser, IsAdmin = false } } };\n+ private async Task ReturnsNotYourRequest(User currentUser, User owner, InvokeOwnershipRequest invokeOwnershipRequest)\n+ {\n+ // Arrange\n+ var package = new PackageRegistration { Id = \"foo\" };\nvar mockHttpContext = new Mock<HttpContextBase>();\n@@ -867,7 +875,7 @@ public async Task WithOrganizationCollaboratorReturnsNotYourRequest(InvokeOwners\npackageService.Setup(p => p.FindPackageRegistrationById(package.Id)).Returns(package);\nvar userService = new Mock<IUserService>();\n- userService.Setup(x => x.FindByUsername(organization.Username)).Returns(organization);\n+ userService.Setup(x => x.FindByUsername(owner.Username)).Returns(owner);\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -878,16 +886,16 @@ public async Task WithOrganizationCollaboratorReturnsNotYourRequest(InvokeOwners\nTestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);\n// Act\n- var result = await invokeOwnershipRequest(controller, package.Id, organization.Username, \"token\");\n+ var result = await invokeOwnershipRequest(controller, package.Id, owner.Username, \"token\");\n// Assert\nvar model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, \"ConfirmOwner\");\nAssert.Equal(ConfirmOwnershipResult.NotYourRequest, model.Result);\n- Assert.Equal(organization.Username, model.Username);\n+ Assert.Equal(owner.Username, model.Username);\n}\n[Theory]\n- [MemberData(\"TheOwnershipRequestMethods_Data\")]\n+ [MemberData(nameof(TheOwnershipRequestMethods_Data))]\npublic async Task WithNonExistentPackageIdReturnsHttpNotFound(InvokeOwnershipRequest invokeOwnershipRequest)\n{\n// Arrange\n@@ -907,7 +915,7 @@ public async Task WithNonExistentPackageIdReturnsHttpNotFound(InvokeOwnershipReq\n}\n[Theory]\n- [MemberData(\"TheOwnershipRequestMethods_Data\")]\n+ [MemberData(nameof(TheOwnershipRequestMethods_Data))]\npublic async Task WithOwnerReturnsAlreadyOwnerResult(InvokeOwnershipRequest invokeOwnershipRequest)\n{\n// Arrange\n@@ -2136,6 +2144,12 @@ 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@@ -2154,12 +2168,6 @@ 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"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestUtility.cs",
"diff": "@@ -16,29 +16,30 @@ namespace NuGetGallery\n{\npublic static class TestUtility\n{\n+ private static int _key = 42;\nprivate static readonly string galleryHostName = \"localhost\";\npublic static readonly string GallerySiteRootHttp = $\"http://{galleryHostName}/\";\npublic static readonly string GallerySiteRootHttps = $\"https://{galleryHostName}/\";\npublic static readonly string FakeUserName = \"theUsername\";\n- public static readonly int FakeUserKey = 42;\n+ public static readonly int FakeUserKey = _key++;\npublic static readonly User FakeUser = new User() { Username = FakeUserName, Key = FakeUserKey, EmailAddress = \"theUsername@nuget.org\" };\npublic static readonly string FakeAdminName = \"theAdmin\";\n- public static readonly int FakeAdminKey = 43;\n+ public static readonly int FakeAdminKey = _key++;\npublic static readonly User FakeAdminUser = new User() { Username = FakeAdminName, Key = FakeAdminKey, EmailAddress = \"theAdmin@nuget.org\", Roles = new[] { new Role { Name = Constants.AdminRoleName } } };\npublic static readonly string FakeOrganizationName = \"theOrganization\";\n- public static readonly int FakeOrganizationKey = 44;\n+ public static readonly int FakeOrganizationKey = _key++;\npublic static readonly Organization FakeOrganization;\npublic static readonly string FakeOrganizationAdminName = \"theOrganizationAdmin\";\n- public static readonly int FakeOrganizationAdminKey = 45;\n+ public static readonly int FakeOrganizationAdminKey = _key++;\npublic static readonly User FakeOrganizationAdmin;\npublic static readonly string FakeOrganizationCollaboratorName = \"theOrganizationCollaborator\";\n- public static readonly int FakeOrganizationCollaboratorKey = 45;\n+ public static readonly int FakeOrganizationCollaboratorKey = _key++;\npublic static readonly User FakeOrganizationCollaborator;\nstatic TestUtility()\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add permissions tests for admins for Confirm/Reject ownership (#5152)
|
455,776 |
11.12.2017 17:05:47
| 28,800 |
f77a44b1822f8ea138ad67f121a988f585cdb7a3
|
Permissions tests for API Key list and create actions
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -623,6 +623,95 @@ public async Task DoesntSendAccountChangedEmailsIfConfirmationTokenDoesntMatch()\n}\n}\n+ public class TheApiKeysAction\n+ : TestContainer\n+ {\n+ public static IEnumerable<object[]> CurrentUserIsInPackageOwnersWithPushNew_Data\n+ {\n+ get\n+ {\n+ foreach (var currentUser in\n+ new[]\n+ {\n+ TestUtility.FakeUser,\n+ TestUtility.FakeAdminUser,\n+ TestUtility.FakeOrganizationAdmin,\n+ TestUtility.FakeOrganizationCollaborator\n+ })\n+ {\n+ yield return MemberDataHelper.AsData(currentUser);\n+ }\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(CurrentUserIsInPackageOwnersWithPushNew_Data))]\n+ public void CurrentUserIsFirstInPackageOwnersWithPushNew(User currentUser)\n+ {\n+ var model = GetModelForApiKeys(currentUser);\n+\n+ var firstPackageOwner = model.PackageOwners.First();\n+ Assert.True(firstPackageOwner.Owner == currentUser.Username);\n+ Assert.True(firstPackageOwner.CanPushNew);\n+ }\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void OrganizationIsInPackageOwnersIfMember(bool isAdmin)\n+ {\n+ var currentUser = isAdmin ? TestUtility.FakeOrganizationAdmin : TestUtility.FakeOrganizationCollaborator;\n+ var organization = TestUtility.FakeOrganization;\n+\n+ var model = GetModelForApiKeys(currentUser);\n+\n+ Assert.Equal(1, model.PackageOwners.Count(o => o.Owner == organization.Username && o.CanPushNew == isAdmin));\n+ }\n+\n+ public static IEnumerable<object[]> OrganizationIsNotInPackageOwnersIfNotMember_Data\n+ {\n+ get\n+ {\n+ foreach (var currentUser in\n+ new[]\n+ {\n+ TestUtility.FakeUser,\n+ TestUtility.FakeAdminUser\n+ })\n+ {\n+ yield return MemberDataHelper.AsData(currentUser);\n+ }\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(OrganizationIsNotInPackageOwnersIfNotMember_Data))]\n+ public void OrganizationIsNotInPackageOwnersIfNotMember(User currentUser)\n+ {\n+ var organization = TestUtility.FakeOrganization;\n+\n+ var model = GetModelForApiKeys(currentUser);\n+\n+ Assert.Equal(0, model.PackageOwners.Count(o => o.Owner == organization.Username));\n+ }\n+\n+ private ApiKeyListViewModel GetModelForApiKeys(User currentUser)\n+ {\n+ var controller = GetController<UsersController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ // Act\n+ var result = controller.ApiKeys();\n+\n+ // Assert\n+ Assert.IsType<ViewResult>(result);\n+ var viewResult = result as ViewResult;\n+\n+ Assert.IsType<ApiKeyListViewModel>(viewResult.Model);\n+ return viewResult.Model as ApiKeyListViewModel;\n+ }\n+ }\n+\npublic class TheGenerateApiKeyAction : TestContainer\n{\n[InlineData(null)]\n@@ -647,13 +736,42 @@ public async Task WhenEmptyDescriptionProvidedRedirectsToAccountPageWithError(st\nAssert.True(string.Compare((string)result.Data, Strings.ApiKeyDescriptionRequired) == 0);\n}\n- [Fact]\n- public async Task WhenScopeOwnerDoesNotMatch_ReturnsBadRequest()\n+ public static IEnumerable<object[]> WhenScopeOwnerDoesNotMatch_ReturnsBadRequest_Data\n+ {\n+ get\n+ {\n+ foreach (var getCurrentUser in\n+ new Func<Fakes, User>[]\n+ {\n+ (fakes) => fakes.User,\n+ (fakes) => fakes.Admin\n+ })\n+ {\n+ yield return new object[]\n+ {\n+ getCurrentUser\n+ };\n+ }\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(WhenScopeOwnerDoesNotMatch_ReturnsBadRequest_Data))]\n+ public Task WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(Func<Fakes, User> getCurrentUser)\n{\n// Arrange\nvar fakes = new Fakes();\n- var user = fakes.User;\n- var otherUser = fakes.ShaUser;\n+ var currentUser = getCurrentUser(fakes);\n+ var userInOwnerScope = fakes.ShaUser;\n+\n+ return WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(currentUser, userInOwnerScope);\n+ }\n+\n+ private async Task WhenScopeOwnerDoesNotMatch_ReturnsBadRequest(User currentUser, User userInOwnerScope)\n+ {\n+ // Arrange\n+ var user = currentUser;\n+ var otherUser = userInOwnerScope;\nGetMock<IUserService>()\n.Setup(u => u.FindByUsername(otherUser.Username))\n.Returns(otherUser);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Authentication\\AuthenticationServiceFacts.cs\" />\n<Compile Include=\"Authentication\\TestCredentialHelper.cs\" />\n<Compile Include=\"Controllers\\SupportControllerFacts.cs\" />\n+ <Compile Include=\"Framework\\MemberDataHelper.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\ApiKeyV4Facts.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\V3HasherTests.cs\" />\n<Compile Include=\"AutocompleteServicePackageIdsQueryFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Permissions tests for API Key list and create actions (#5153)
|
455,776 |
21.12.2017 12:39:27
| 28,800 |
d553fcbdb8efd4522097958e6f33a57b5e5d6c68
|
change API of trygetaccountsallowedonbehalfof
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionRequiringEntityPermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionRequiringEntityPermissions.cs",
"diff": "@@ -43,7 +43,12 @@ public PermissionsCheckResult CheckPermissions(IPrincipal currentPrincipal, User\nprotected abstract PermissionsCheckResult CheckPermissionsForEntity(User account, TEntity entity);\n- public bool TryGetAccountsAllowedOnBehalfOf(User currentUser, TEntity entity, out IEnumerable<User> accountsAllowedOnBehalfOf)\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity)\n+ {\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, entity, out var accountsAllowedOnBehalfOf);\n+ }\n+\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity, out IEnumerable<User> accountsAllowedOnBehalfOf)\n{\naccountsAllowedOnBehalfOf = new List<User>();\n@@ -60,16 +65,19 @@ public bool TryGetAccountsAllowedOnBehalfOf(User currentUser, TEntity entity, ou\npossibleAccountsOnBehalfOf = possibleAccountsOnBehalfOf.Distinct(new UserEqualityComparer());\n+ var aggregateResult = PermissionsCheckResult.Unknown;\n+\nforeach (var accountOnBehalfOf in possibleAccountsOnBehalfOf)\n{\nvar result = CheckPermissions(currentUser, accountOnBehalfOf, entity);\n+ aggregateResult = ChoosePermissionsCheckResult(aggregateResult, result);\nif (result == PermissionsCheckResult.Allowed)\n{\n(accountsAllowedOnBehalfOf as List<User>).Add(accountOnBehalfOf);\n}\n}\n- return accountsAllowedOnBehalfOf.Any();\n+ return aggregateResult;\n}\nprotected abstract IEnumerable<User> GetOwners(TEntity entity);\n@@ -86,5 +94,15 @@ public int GetHashCode(User obj)\nreturn obj.Key.GetHashCode();\n}\n}\n+\n+ private PermissionsCheckResult ChoosePermissionsCheckResult(PermissionsCheckResult current, PermissionsCheckResult next)\n+ {\n+ if (current == PermissionsCheckResult.Allowed || next == PermissionsCheckResult.Allowed)\n+ {\n+ return PermissionsCheckResult.Allowed;\n+ }\n+\n+ return new[] { current, next }.Max();\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionRequiringPackagePermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionRequiringPackagePermissions.cs",
"diff": "@@ -38,9 +38,14 @@ protected override PermissionsCheckResult CheckPermissionsForEntity(User account\nreturn PermissionsHelpers.IsRequirementSatisfied(PackageRegistrationPermissionsRequirement, account, packageRegistration) ? PermissionsCheckResult.Allowed : PermissionsCheckResult.PackageRegistrationFailure;\n}\n- public bool TryGetAccountsAllowedOnBehalfOf(User currentUser, Package package, out IEnumerable<User> accountsAllowedOnBehalfOf)\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, Package package)\n{\n- return TryGetAccountsAllowedOnBehalfOf(currentUser, GetPackageRegistration(package), out accountsAllowedOnBehalfOf);\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetPackageRegistration(package));\n+ }\n+\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, Package package, out IEnumerable<User> accountsAllowedOnBehalfOf)\n+ {\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetPackageRegistration(package), out accountsAllowedOnBehalfOf);\n}\nprotected override IEnumerable<User> GetOwners(PackageRegistration packageRegistration)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ActionRequiringReservedNamespacePermissions.cs",
"new_path": "src/NuGetGallery/Services/ActionRequiringReservedNamespacePermissions.cs",
"diff": "@@ -49,9 +49,14 @@ protected override PermissionsCheckResult CheckPermissionsForEntity(User account\nPermissionsCheckResult.Allowed : PermissionsCheckResult.ReservedNamespaceFailure;\n}\n- public bool TryGetAccountsAllowedOnBehalfOf(User currentUser, ActionOnNewPackageContext newPackageContext, out IEnumerable<User> accountsAllowedOnBehalfOf)\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, ActionOnNewPackageContext newPackageContext)\n{\n- return TryGetAccountsAllowedOnBehalfOf(currentUser, GetReservedNamespaces(newPackageContext), out accountsAllowedOnBehalfOf);\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetReservedNamespaces(newPackageContext));\n+ }\n+\n+ public PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, ActionOnNewPackageContext newPackageContext, out IEnumerable<User> accountsAllowedOnBehalfOf)\n+ {\n+ return CheckPermissionsOnBehalfOfAnyAccount(currentUser, GetReservedNamespaces(newPackageContext), out accountsAllowedOnBehalfOf);\n}\nprotected override IEnumerable<User> GetOwners(IReadOnlyCollection<ReservedNamespace> reservedNamespaces)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IActionRequiringEntityPermissions.cs",
"new_path": "src/NuGetGallery/Services/IActionRequiringEntityPermissions.cs",
"diff": "@@ -25,11 +25,17 @@ public interface IActionRequiringEntityPermissions<TEntity>\n/// </returns>\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+ /// </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+ PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity);\n+\n/// <summary>\n/// Determines whether <paramref name=\"currentPrincipal\"/> can perform this action on <paramref name=\"entity\"/> on behalf of any <see cref=\"User\"/>.\n/// </summary>\n/// <param name=\"accountsAllowedOnBehalfOf\">A <see cref=\"IEnumerable{User}\"/> containing all accounts that <paramref name=\"currentUser\"/> can perform this action on <paramref name=\"entity\"/> on behalf of.</param>\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- bool TryGetAccountsAllowedOnBehalfOf(User currentUser, TEntity entity, out IEnumerable<User> accountsAllowedOnBehalfOf);\n+ PermissionsCheckResult CheckPermissionsOnBehalfOfAnyAccount(User currentUser, TEntity entity, out IEnumerable<User> accountsAllowedOnBehalfOf);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PermissionsCheckResult.cs",
"new_path": "src/NuGetGallery/Services/PermissionsCheckResult.cs",
"diff": "@@ -13,6 +13,11 @@ public enum PermissionsCheckResult\n/// </summary>\nAllowed = default(int),\n+ /// <summary>\n+ /// The permissions check failed for an unknown reason.\n+ /// </summary>\n+ Unknown,\n+\n/// <summary>\n/// The current user does not have permissions to perform the action on the <see cref=\"User\"/>.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ActionRequiringEntityPermissionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ActionRequiringEntityPermissionsFacts.cs",
"diff": "@@ -43,7 +43,7 @@ protected override PermissionsCheckResult CheckPermissionsForEntity(User account\n}\n}\n- public class TheIsAllowedMethod\n+ public class TheCheckPermissionsMethod\n{\n[Fact]\npublic void ReturnsAccountPermissionsFailureWhenAccountCheckFails()\n@@ -67,14 +67,15 @@ private void AssertIsAllowed(ActionRequiringEntityPermissions<Entity> action, Pe\n}\n}\n- public class TheTryGetAccountsAllowedOnBehalfOfMethod\n+ public class TheCheckPermissionsOnBehalfOfAnyAccountMethod\n{\n[Fact]\npublic void SuccessWithNullAccount()\n{\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.None, (account, entity) => PermissionsCheckResult.Allowed);\n- Assert.True(action.TryGetAccountsAllowedOnBehalfOf(null, null, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(null, null));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(null, null, out var accountsAllowedOnBehalfOf));\nAssert.True(accountsAllowedOnBehalfOf.SequenceEqual(new User[] { null }));\n}\n@@ -83,7 +84,8 @@ public void FailureWithNullAccount()\n{\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.Unsatisfiable, (a, e) => PermissionsCheckResult.Allowed);\n- Assert.False(action.TryGetAccountsAllowedOnBehalfOf(null, null, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(PermissionsCheckResult.AccountFailure, action.CheckPermissionsOnBehalfOfAnyAccount(null, null));\n+ Assert.Equal(PermissionsCheckResult.AccountFailure, action.CheckPermissionsOnBehalfOfAnyAccount(null, null, out var accountsAllowedOnBehalfOf));\nAssert.Empty(accountsAllowedOnBehalfOf);\n}\n@@ -94,18 +96,21 @@ public void SuccessWithNullEntity()\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.None, (a, e) => PermissionsCheckResult.Allowed);\n- Assert.True(action.TryGetAccountsAllowedOnBehalfOf(user, null, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, null));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, null, out var accountsAllowedOnBehalfOf));\nAssert.True(accountsAllowedOnBehalfOf.SequenceEqual(new[] { user }));\n}\n[Fact]\npublic void FailureWithNullEntity()\n{\n+ var failureResult = (PermissionsCheckResult)99;\nvar user = new User { Key = 1 };\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.None, (a, e) => (PermissionsCheckResult)99);\n- Assert.False(action.TryGetAccountsAllowedOnBehalfOf(user, null, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(failureResult, action.CheckPermissionsOnBehalfOfAnyAccount(user, null));\n+ Assert.Equal(failureResult, action.CheckPermissionsOnBehalfOfAnyAccount(user, null, out var accountsAllowedOnBehalfOf));\nAssert.Empty(accountsAllowedOnBehalfOf);\n}\n@@ -116,7 +121,8 @@ public void OrganizationsOfCurrentUserArePossibleAccounts()\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.None, (a, e) => PermissionsCheckResult.Allowed);\n- Assert.True(action.TryGetAccountsAllowedOnBehalfOf(user, null, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, null));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, null, out var accountsAllowedOnBehalfOf));\nAssert.True(accountsAllowedOnBehalfOf.SequenceEqual(new[] { user, organization }));\n}\n@@ -127,7 +133,8 @@ public void OwnersOfEntityArePossibleAccounts()\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.None, (a, e) => PermissionsCheckResult.Allowed);\n- Assert.True(action.TryGetAccountsAllowedOnBehalfOf(null, entity, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(null, entity));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(null, entity, out var accountsAllowedOnBehalfOf));\nAssert.True(accountsAllowedOnBehalfOf.SequenceEqual(new[] { null, entityOwner }));\n}\n@@ -139,7 +146,8 @@ public void OrganizationsOfCurrentUserAndOwnersOfEntityArePossibleAccounts()\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.None, (a, e) => PermissionsCheckResult.Allowed);\n- Assert.True(action.TryGetAccountsAllowedOnBehalfOf(user, entity, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, entity));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, entity, out var accountsAllowedOnBehalfOf));\nAssert.True(accountsAllowedOnBehalfOf.SequenceEqual(new[] { user, entityOwner, organization }));\n}\n@@ -166,7 +174,8 @@ public void AccountsAllowedOnBehalfOfIsPopulatedWithExpectedAccounts(int expecte\nvar action = new TestableActionRequiringEntityPermissions(PermissionsRequirement.None,\n(a, e) => expectedAccountsList.Any(u => u.MatchesUser(a)) ? PermissionsCheckResult.Allowed : (PermissionsCheckResult)99);\n- Assert.True(action.TryGetAccountsAllowedOnBehalfOf(user, entity, out var accountsAllowedOnBehalfOf));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, entity));\n+ Assert.Equal(PermissionsCheckResult.Allowed, action.CheckPermissionsOnBehalfOfAnyAccount(user, entity, out var accountsAllowedOnBehalfOf));\nAssert.True(accountsAllowedOnBehalfOf.SequenceEqual(expectedAccountsList));\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
change API of trygetaccountsallowedonbehalfof (#5196)
|
455,776 |
08.01.2018 16:21:54
| 28,800 |
32f11d972db71b9d361d5022f12716d435b6d4cd
|
Fix GetCurrentUser for unauthenticated scenarios
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -433,7 +433,8 @@ public static string ToFriendlyName(this NuGetFramework frameworkName, bool allo\n/// <returns>The current user</returns>\npublic static User GetCurrentUser(this IOwinContext self)\n{\n- if (self.Request.User == null)\n+ if (self.Request.User == null ||\n+ (self.Request.User.Identity != null && !self.Request.User.Identity.IsAuthenticated))\n{\nreturn null;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix GetCurrentUser for unauthenticated scenarios (#5250)
|
455,772 |
08.01.2018 17:02:27
| 28,800 |
b742b6cc387eb56f88b1ef814eb5b2d644bf8923
|
Minor fixes for Lock Package feature
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"diff": "View Application Error Logs.\n</p>\n</li>\n+ <li>\n+ <h2>\n+ <a class=\"action-menu-link\" href=\"@Url.Action(actionName: \"Index\", controllerName: \"LockPackage\")\">\n+ <i class=\"icon-lock action-menu-icon\"></i>\n+ <span class=\"action-menu-text\">Lock Packages</span>\n+ </a>\n+ </h2>\n+ <p>\n+ Lock and unlock packages on the gallery.\n+ </p>\n+ </li>\n<li>\n<h2>\n<a class=\"action-menu-link\" href=\"@Url.Action(actionName: \"Index\", controllerName: \"Delete\")\">\nManage Account Deletion\n</p>\n</li>\n- <li>\n- <h2>\n- <a class=\"action-menu-link\" href=\"@Url.Action(actionName: \"Index\", controllerName: \"LockPackage\")\">\n- <i class=\"icon-lock action-menu-icon\"></i>\n- <span class=\"action-menu-text\">Package Locking</span>\n- </a>\n- </h2>\n- <p>\n- Lock/Unlock Packages\n- </p>\n- </li>\n</ul>\n</section>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"diff": "@<text>\n<span>\nPackage '@Model.Id' has been locked. This means you cannot publish a new version or change the listing status of a published package version. Please contact\n- <a href=\"mailto:support@nuget.org?subject=@HttpUtility.UrlPathEncode(string.Format(\"Requesting support for a locked package - '{0}'\", Model.Id))\">support@nuget.org</a>\n+ <a href=\"mailto:support@nuget.org?subject=@HttpUtility.UrlPathEncode(string.Format(\"Requesting support for a locked package - '{0}'\", Model.Id))\">support@nuget.org</a>.\n</span>\n</text>)\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Edit.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Edit.cshtml",
"diff": "@<text>\n<span>\nPackage '@Model.PackageId' has been locked. This means you cannot publish a new version or change the listing status of a published package version. Please contact\n- <a href=\"mailto:support@nuget.org?subject=@HttpUtility.UrlPathEncode(string.Format(\"Requesting support for a locked package - '{0}'\", Model.PackageId))\">support@nuget.org</a>\n+ <a href=\"mailto:support@nuget.org?subject=@HttpUtility.UrlPathEncode(string.Format(\"Requesting support for a locked package - '{0}'\", Model.PackageId))\">support@nuget.org</a>.\n</span>\n</text>)\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Minor fixes for Lock Package feature (#5252)
|
455,751 |
09.01.2018 16:59:13
| 28,800 |
18bc2a1fde8ebc324bffc71e240d85d35ae2fd9c
|
Fix issue 1043: Obfuscate AI data on request redirect
Fix for issue 1043 - obfuscate the AI data on request redirect.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -147,17 +147,20 @@ public static void RegisterUIRoutes(RouteCollection routes)\nroutes.MapRoute(\nRouteName.PackageOwnerConfirmation,\n\"packages/{id}/owners/{username}/confirm/{token}\",\n- new { controller = \"Packages\", action = \"ConfirmPendingOwnershipRequest\" });\n+ new { controller = \"Packages\", action = \"ConfirmPendingOwnershipRequest\" },\n+ new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.PackageOwnerRejection,\n\"packages/{id}/owners/{username}/reject/{token}\",\n- new { controller = \"Packages\", action = \"RejectPendingOwnershipRequest\" });\n+ new { controller = \"Packages\", action = \"RejectPendingOwnershipRequest\" },\n+ new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.PackageOwnerCancellation,\n\"packages/{id}/owners/{username}/cancel/{token}\",\n- new { controller = \"Packages\", action = \"CancelPendingOwnershipRequest\" });\n+ new { controller = \"Packages\", action = \"CancelPendingOwnershipRequest\" },\n+ new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\n// We need the following two routes (rather than just one) due to Routing's\n// Consecutive Optional Parameter bug. :(\n@@ -242,7 +245,8 @@ public static void RegisterUIRoutes(RouteCollection routes)\nroutes.MapRoute(\nRouteName.Profile,\n\"profiles/{username}\",\n- new { controller = \"Users\", action = \"Profiles\" });\n+ new { controller = \"Users\", action = \"Profiles\" },\n+ new RouteExtensions.ObfuscatedMetadata(1, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.RemovePassword,\n@@ -257,17 +261,20 @@ public static void RegisterUIRoutes(RouteCollection routes)\nroutes.MapRoute(\nRouteName.PasswordReset,\n\"account/forgotpassword/{username}/{token}\",\n- new { controller = \"Users\", action = \"ResetPassword\", forgot = true });\n+ new { controller = \"Users\", action = \"ResetPassword\", forgot = true },\n+ new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.PasswordSet,\n\"account/setpassword/{username}/{token}\",\n- new { controller = \"Users\", action = \"ResetPassword\", forgot = false });\n+ new { controller = \"Users\", action = \"ResetPassword\", forgot = false },\n+ new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.ConfirmAccount,\n\"account/confirm/{username}/{token}\",\n- new { controller = \"Users\", action = \"Confirm\" });\n+ new { controller = \"Users\", action = \"Confirm\" },\n+ new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.ChangeEmailSubscription,\n@@ -277,7 +284,8 @@ public static void RegisterUIRoutes(RouteCollection routes)\nroutes.MapRoute(\nRouteName.AdminDeleteAccount,\n\"account/delete/{accountName}\",\n- new { controller = \"Users\", action = \"Delete\" });\n+ new { controller = \"Users\", action = \"Delete\" },\n+ new RouteExtensions.ObfuscatedMetadata(2, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.UserDeleteAccount,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Controllers\\PagesController.cs\" />\n<Compile Include=\"Extensions\\OrganizationExtensions.cs\" />\n<Compile Include=\"Extensions\\PrincipalExtensions.cs\" />\n+ <Compile Include=\"Extensions\\RouteExtensions.cs\" />\n<Compile Include=\"Extensions\\ScopeExtensions.cs\" />\n<Compile Include=\"Extensions\\UserExtensions.cs\" />\n<Compile Include=\"Filters\\ApiScopeRequiredAttribute.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.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;\n+using System.Web;\n+using System.Web.Routing;\nusing Microsoft.ApplicationInsights.Channel;\nusing Microsoft.ApplicationInsights.DataContracts;\nusing Microsoft.ApplicationInsights.Extensibility;\n@@ -30,29 +30,29 @@ private void ModifyItem(ITelemetry item)\nvar requestTelemetryItem = item as RequestTelemetry;\nif(requestTelemetryItem != null)\n{\n- requestTelemetryItem.Url = ObfuscateUri(requestTelemetryItem);\n- }\n+ var route = GetCurrentRoute();\n+ if(route == null)\n+ {\n+ return;\n}\n-\n- private Uri ObfuscateUri(RequestTelemetry telemetryItem)\n+ // Removes the first /\n+ var requestPath = requestTelemetryItem.Url.AbsolutePath.TrimStart('/');\n+ var obfuscatedPath = route.ObfuscateUrlPath(requestPath);\n+ if(obfuscatedPath != null)\n{\n- if(IsPIIOperation(telemetryItem.Context.Operation.Name))\n+ requestTelemetryItem.Url = new Uri(requestTelemetryItem.Url.ToString().Replace(requestPath, obfuscatedPath));\n+ requestTelemetryItem.Name = requestTelemetryItem.Name.Replace(requestPath, obfuscatedPath);\n+ if(requestTelemetryItem.Context.Operation?.Name != null)\n{\n- // The new url form will be: https://nuget.org/ObfuscatedUserName\n- return new Uri(Obfuscator.DefaultObfuscatedUrl(telemetryItem.Url));\n+ requestTelemetryItem.Context.Operation.Name = requestTelemetryItem.Context.Operation.Name.Replace(requestPath, obfuscatedPath);\n+ }\n+ }\n}\n- return telemetryItem.Url;\n}\n- protected virtual bool IsPIIOperation(string operationName)\n- {\n- if(string.IsNullOrEmpty(operationName))\n+ public virtual Route GetCurrentRoute()\n{\n- return false;\n- }\n- // Remove the verb from the operation name.\n- // An example of operationName : GET Users/Profiles\n- return Obfuscator.ObfuscatedActions.Contains(operationName.Split(' ').Last());\n+ return RouteTable.Routes.GetRouteData(new HttpContextWrapper(HttpContext.Current)).Route as Route;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Authentication\\AuthenticationServiceFacts.cs\" />\n<Compile Include=\"Authentication\\TestCredentialHelper.cs\" />\n<Compile Include=\"Controllers\\SupportControllerFacts.cs\" />\n+ <Compile Include=\"Extensions\\RouteExtensionsFacts.cs\" />\n<Compile Include=\"Extensions\\OrganizationExtensionsFacts.cs\" />\n<Compile Include=\"Framework\\MemberDataHelper.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\ApiKeyV4Facts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"new_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.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;\nusing System.Collections.Generic;\nusing System.Linq;\n-using System.IO;\n-using System.Security.Principal;\n-using System.Web;\nusing System.Web.Routing;\nusing Microsoft.ApplicationInsights.Channel;\nusing Microsoft.ApplicationInsights.DataContracts;\nusing Microsoft.ApplicationInsights.Extensibility;\n-using Microsoft.Owin;\n-using Microsoft.Owin.Security;\nusing Moq;\nusing Xunit;\n@@ -21,72 +15,74 @@ namespace NuGetGallery.Telemetry\n{\npublic class ClientTelemetryPIIProcessorTests\n{\n+ private RouteCollection _currentRoutes ;\n+\n+ public ClientTelemetryPIIProcessorTests()\n+ {\n+ if (_currentRoutes == null)\n+ {\n+ _currentRoutes = new RouteCollection();\n+ Routes.RegisterApiV2Routes(_currentRoutes);\n+ Routes.RegisterUIRoutes(_currentRoutes);\n+ }\n+ }\n+\n[Fact]\npublic void NullTelemetryItemDoesNotThorw()\n{\n// Arange\n- string userName = \"user1\";\n- var piiProcessor = CreatePIIProcessor(false, userName);\n+ var piiProcessor = CreatePIIProcessor();\n// Act\npiiProcessor.Process(null);\n}\n[Theory]\n- [InlineData(false)]\n- [InlineData(true)]\n- public void UrlIsUpdatedOnPIIAction(bool actionIsPII)\n+ [MemberData(nameof(PIIUrlDataGenerator))]\n+ public void UrlIsUpdatedOnPIIAction(string routePath, string inputUrl, string expectedOutputUrl)\n{\n// Arange\n- string userName = \"user1\";\n- var piiProcessor = CreatePIIProcessor(actionIsPII, userName);\n+ var piiProcessor = CreatePIIProcessor(routePath);\nRequestTelemetry telemetryItem = new RequestTelemetry();\n- telemetryItem.Url = new Uri(\"https://localhost/user1\");\n+ telemetryItem.Url = new Uri(inputUrl);\n+ telemetryItem.Name = $\"GET {telemetryItem.Url.AbsolutePath}\";\n// Act\npiiProcessor.Process(telemetryItem);\n// Assert\n- string expected = actionIsPII ? $\"https://localhost/{Obfuscator.DefaultTelemetryUserName}\" : telemetryItem.Url.ToString();\n- Assert.Equal(expected, telemetryItem.Url.ToString());\n+ Assert.Equal(expectedOutputUrl, telemetryItem.Url.ToString());\n+ Assert.Equal($\"GET {(new Uri(expectedOutputUrl)).AbsolutePath}\", $\"GET {telemetryItem.Url.AbsolutePath}\");\n}\n- [Theory]\n- [MemberData(nameof(PIIOperationDataGenerator))]\n- public void TestValidPIIOperations(string operation)\n- {\n- // Arange\n- var piiProcessor = (TestClientTelemetryPIIProcessor)CreatePIIProcessor(false, \"user\");\n-\n- // Act and Assert\n- Assert.True(piiProcessor.IsPIIOperationBase(operation));\n- }\n-\n- [Theory]\n- [MemberData(nameof(InvalidPIIOPerationDataGenerator))]\n- public void TestInvalidPIIOperations(string operation)\n+ [Fact]\n+ public void ValidatePIIActions()\n{\n// Arange\n- var piiProcessor = (TestClientTelemetryPIIProcessor)CreatePIIProcessor(false, \"user\");\n+ HashSet<string> existentPIIOperations = Obfuscator.ObfuscatedActions;\n+ List<string> piiOperationsFromRoutes = GetPIIOperationsFromRoute();\n// Act and Assert\n- Assert.False(piiProcessor.IsPIIOperationBase(operation));\n+ Assert.True(existentPIIOperations.SetEquals(piiOperationsFromRoutes));\n}\n[Fact]\npublic void ValidatePIIRoutes()\n{\n// Arange\n- HashSet<string> existentPIIOperations = Obfuscator.ObfuscatedActions;\n- List<string> piiOperationsFromRoutes = GetPIIOperationsFromRoute();\n+ List<string> piiUrlRoutes = GetPIIRoutesUrls();\n// Act and Assert\n- Assert.True(existentPIIOperations.SetEquals(piiOperationsFromRoutes));\n+ foreach (var route in piiUrlRoutes)\n+ {\n+ var expectedTrue = RouteExtensions.ObfuscatedRouteMap.ContainsKey(route);\n+ Assert.True(expectedTrue, $\"Route was not added to the obfuscated routeMap.\");\n+ }\n}\n- private ClientTelemetryPIIProcessor CreatePIIProcessor(bool isPIIOperation, string userName)\n+ private ClientTelemetryPIIProcessor CreatePIIProcessor(string url = \"\")\n{\n- return new TestClientTelemetryPIIProcessor(new TestProcessorNext(), isPIIOperation, userName);\n+ return new TestClientTelemetryPIIProcessor(new TestProcessorNext(), url );\n}\nprivate class TestProcessorNext : ITelemetryProcessor\n@@ -98,33 +94,24 @@ public void Process(ITelemetry item)\nprivate class TestClientTelemetryPIIProcessor : ClientTelemetryPIIProcessor\n{\n- private User _testUser;\n- private bool _isPIIOperation;\n+ private string _url = string.Empty;\n- public TestClientTelemetryPIIProcessor(ITelemetryProcessor next, bool isPIIOperation, string userName) : base(next)\n+ public TestClientTelemetryPIIProcessor(ITelemetryProcessor next, string url) : base (next)\n{\n- _isPIIOperation = isPIIOperation;\n- _testUser = new User(userName);\n+ _url = url;\n}\n- protected override bool IsPIIOperation(string operationName)\n+ public override Route GetCurrentRoute()\n{\n- return _isPIIOperation;\n+ var handler = new Mock<IRouteHandler>();\n+ return new Route(_url, handler.Object);\n}\n- public bool IsPIIOperationBase(string operationName)\n- {\n- return base.IsPIIOperation(operationName);\n- }\n}\n- private static List<string> GetPIIOperationsFromRoute()\n+ private List<string> GetPIIOperationsFromRoute()\n{\n- var currentRoutes = new RouteCollection();\n- NuGetGallery.Routes.RegisterApiV2Routes(currentRoutes);\n- NuGetGallery.Routes.RegisterUIRoutes(currentRoutes);\n-\n- var piiRoutes = currentRoutes.Where((r) =>\n+ var piiRoutes = _currentRoutes.Where((r) =>\n{\nRoute webRoute = r as Route;\nreturn webRoute != null ? IsPIIUrl(webRoute.Url.ToString()) : false;\n@@ -136,21 +123,42 @@ private static List<string> GetPIIOperationsFromRoute()\nreturn piiRoutes;\n}\n+ private List<string> GetPIIRoutesUrls()\n+ {\n+ var piiRoutes = _currentRoutes.Where((r) =>\n+ {\n+ Route webRoute = r as Route;\n+ return webRoute != null ? IsPIIUrl(webRoute.Url.ToString()) : false;\n+ }).Select((r) => ((Route)r).Url).Distinct().ToList();\n+\n+ return piiRoutes;\n+ }\n+\nprivate static bool IsPIIUrl(string url)\n{\nreturn url.ToLower().Contains(\"username\") || url.ToLower().Contains(\"accountname\");\n}\n- public static IEnumerable<string[]> PIIOperationDataGenerator()\n+ public static IEnumerable<string[]> PIIUrlDataGenerator()\n{\n- return GetPIIOperationsFromRoute().Select(o => new string[]{$\"GET {o}\"});\n+ foreach (var user in GenerateUserNames())\n+ {\n+ yield return new string[] { \"packages/{id}/owners/{username}/confirm/{token}\", $\"https://localhost/packages/pack1/owners/user1/confirm/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/confirm/sometoken\" };\n+ yield return new string[] { \"packages/{id}/owners/{username}/reject/{token}\", $\"https://localhost/packages/pack1/owners/user1/reject/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/reject/sometoken\" };\n+ yield return new string[] { \"packages/{id}/owners/{username}/cancel/{token}\", $\"https://localhost/packages/pack1/owners/user1/cancel/sometoken\", $\"https://localhost/packages/pack1/owners/ObfuscatedUserName/cancel/sometoken\" };\n+\n+ yield return new string[] { \"account/confirm/{username}/{token}\", $\"https://localhost/account/confirm/user1/sometoken\", $\"https://localhost/account/confirm/ObfuscatedUserName/sometoken\" };\n+ yield return new string[] { \"account/delete/{accountName}\", \"https://localhost/account/delete/user1\", $\"https://localhost/account/delete/ObfuscatedUserName\" };\n+\n+ yield return new string[] { \"profiles/{username}\", $\"https://localhost/profiles/user1\", $\"https://localhost/profiles/ObfuscatedUserName\" };\n+ yield return new string[] { \"account/setpassword/{username}/{token}\", $\"https://localhost/account/setpassword/user1/sometoken\", $\"https://localhost/account/setpassword/ObfuscatedUserName/sometoken\" };\n+ yield return new string[] { \"account/forgotpassword/{username}/{token}\", $\"https://localhost/account/forgotpassword/user1/sometoken\", $\"https://localhost/account/forgotpassword/ObfuscatedUserName/sometoken\" };\n+ }\n}\n- public static IEnumerable<string[]> InvalidPIIOPerationDataGenerator()\n+ public static List<string> GenerateUserNames()\n{\n- yield return new string[]{ null };\n- yield return new string[]{ string.Empty };\n- yield return new string[]{\"Some random data\" };\n+ return new List<string>{ \"user1\", \"user.1\", \"user_1\", \"user-1\"};\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix issue 1043: Obfuscate AI data on request redirect (#5236)
Fix for issue 1043 - obfuscate the AI data on request redirect.
|
455,794 |
10.01.2018 09:41:44
| 28,800 |
8e4c30a4eca06683b0120670e1c1497d27790ec1
|
Obfuscate new transform account route
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -305,7 +305,8 @@ public static void RegisterUIRoutes(RouteCollection routes)\nroutes.MapRoute(\nRouteName.TransformToOrganizationConfirmation,\n\"account/transform/confirm/{accountNameToTransform}/{token}\",\n- new { controller = \"Users\", action = \"ConfirmTransform\" });\n+ new { controller = \"Users\", action = \"ConfirmTransform\" },\n+ new RouteExtensions.ObfuscatedMetadata(3, Obfuscator.DefaultTelemetryUserName));\nroutes.MapRoute(\nRouteName.ApiKeys,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"new_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"diff": "@@ -76,7 +76,7 @@ public void ValidatePIIRoutes()\nforeach (var route in piiUrlRoutes)\n{\nvar expectedTrue = RouteExtensions.ObfuscatedRouteMap.ContainsKey(route);\n- Assert.True(expectedTrue, $\"Route was not added to the obfuscated routeMap.\");\n+ Assert.True(expectedTrue, $\"Route {route} was not added to the obfuscated routeMap.\");\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Obfuscate new transform account route (#5260)
|
455,759 |
11.01.2018 10:58:50
| -3,600 |
28588243f645f9bdd9693d2a57147ec476173f5a
|
Fix typo on the report abuse form for Copyright "infringement"
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.Message)\">\n@Html.ShowLabelFor(m => m.Message)\n- <p>Please provide a detailed description of the problem.<span class=\"infringement-claim-requirements\"> If you are reporting copyright infringment, please describe the copyrighted material with particularity and provide us with information about your copyright (i.e. title of copyrighted work, URL where to view your copyrighted work, description of your copyrighted work, and any copyright registrations you may have, etc.). For trademark infringement, include the name of your trademark, registration number, and country where registered.</span></p>\n+ <p>Please provide a detailed description of the problem.<span class=\"infringement-claim-requirements\"> If you are reporting copyright infringement, please describe the copyrighted material with particularity and provide us with information about your copyright (i.e. title of copyrighted work, URL where to view your copyrighted work, description of your copyrighted work, and any copyright registrations you may have, etc.). For trademark infringement, include the name of your trademark, registration number, and country where registered.</span></p>\n@Html.ShowTextAreaFor(m => m.Message, 10, 50)\n@Html.ShowValidationMessagesFor(m => m.Message)\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix typo on the report abuse form for Copyright "infringement" #5246 (#5258)
|
455,794 |
11.01.2018 15:14:24
| 28,800 |
b0591815ae38bdc4d4bdb2c1e5c6278082c25390
|
Refactor section helpers into common ViewHelpers
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@@ -445,3 +445,90 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);\n@html.AntiForgeryToken()\n</form>\n}\n+\n+@functions\n+{\n+ public static List<string> GetSections(dynamic viewBag)\n+ {\n+ var sections = viewBag.Sections as Lazy<List<string>>;\n+ return sections == null ? null : sections.Value;\n+ }\n+\n+ public static void AddSection(dynamic viewBag, string id)\n+ {\n+ var sections = GetSections(viewBag);\n+ if (sections != null)\n+ {\n+ sections.Add(id);\n+ }\n+ }\n+}\n+\n+@helper SectionsScript(WebViewPage viewPage)\n+{\n+ var viewSections = GetSections(viewPage.ViewBag);\n+ if (viewSections != null)\n+ {\n+ <script type=\"text/javascript\">\n+ var sections = @viewPage.Html.Raw(Json.Encode(viewSections));\n+ for (var i in sections) {\n+ var containerId = sections[i] + \"-container\";\n+ window.nuget.configureExpanderHeading(containerId);\n+ }\n+ </script>\n+ }\n+}\n+\n+@helper Section(\n+ WebViewPage viewPage,\n+ string id,\n+ string title,\n+ Func<MvcHtmlString, HelperResult> content,\n+ bool expanded = true,\n+ string expandedIcon = \"ChevronDown\",\n+ string collapsedIcon = \"ChevronRight\")\n+{\n+ @Section(viewPage,\n+ id,\n+ @<text>@title</text>,\n+ @<text></text>,\n+ content,\n+ expanded,\n+ expandedIcon,\n+ collapsedIcon);\n+}\n+\n+@helper Section(\n+ WebViewPage viewPage,\n+ string id,\n+ Func<MvcHtmlString, HelperResult> title,\n+ Func<MvcHtmlString, HelperResult> data,\n+ Func<MvcHtmlString, HelperResult> content,\n+ bool expanded = false,\n+ string expandedIcon = \"ChevronDown\",\n+ string collapsedIcon = \"ChevronRight\")\n+{\n+ AddSection(viewPage.ViewBag, id);\n+\n+ <div class=\"clearfix\">\n+ <div class=\"form-section-title\">\n+ <h2>\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#@id-container\"\n+ aria-expanded=\"@expanded\" aria-controls=\"@id-container\" id=\"show-@id-container\">\n+ <i class=\"ms-Icon ms-Icon--@(expanded ? expandedIcon : collapsedIcon)\"\n+ aria-hidden=\"@(expanded ? \"false\" : \"true\")\"></i>\n+ <span>@title(MvcHtmlString.Empty)</span>\n+ </a>\n+ </h2>\n+ </div>\n+ <div class=\"form-section-data\">\n+ @data(MvcHtmlString.Empty)\n+ </div>\n+ </div>\n+ <div class=\"panel panel-default panel-collapse collapse @(expanded ? \"in\" : string.Empty)\"\n+ aria-expanded=\"@(expanded ? \"true\" : \"false\")\" id=\"@id-container\">\n+ <div class=\"panel-body\">\n+ @content(MvcHtmlString.Empty)\n+ </div>\n+ </div>\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-account.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-account.js",
"diff": "$(function () {\nvar configureSection = function (prefix) {\nvar containerId = prefix + \"-container\";\n- window.nuget.configureExpanderHeading(containerId);\n$(\"#cancel-\" + prefix).click(function (e) {\n// Collapse the container.\n$(\"#\" + containerId).collapse('hide');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"diff": "// Set up the data binding.\nvar managePackagesViewModel = new ManagePackagesViewModel(initialData);\nko.applyBindings(managePackagesViewModel, document.body);\n-\n- // Configure the expander headings.\n- window.nuget.configureExpanderHeading(\"listed-container\");\n- window.nuget.configureExpanderHeading(\"unlisted-container\");\n- window.nuget.configureExpanderHeading(\"namespaces-container\");\n- window.nuget.configureExpanderHeading(\"requests-incoming-container\");\n- window.nuget.configureExpanderHeading(\"requests-outgoing-container\");\n});\n})();\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/NuGetViewBase.cs",
"new_path": "src/NuGetGallery/Views/NuGetViewBase.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.Web.Mvc;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Cookies;\n@@ -53,6 +54,12 @@ internal static Func<NuGetContext> GetNuGetContextThunk(WebViewPage self)\nreturn ctrl.NuGetContext;\n};\n}\n+\n+ protected override void InitializePage()\n+ {\n+ base.InitializePage();\n+ ViewBag.Sections = new Lazy<List<string>>(() => new List<string>());\n+ }\n}\npublic abstract class NuGetViewBase<T> : WebViewPage<T>\n@@ -87,5 +94,11 @@ protected NuGetViewBase()\n_nugetContext = new Lazy<NuGetContext>(NuGetViewBase.GetNuGetContextThunk(this));\n_cookieConsentMessage = new Lazy<CookieConsentMessage>(() => NuGetContext.GetCookieConsentMessage(Request));\n}\n+\n+ protected override void InitializePage()\n+ {\n+ base.InitializePage();\n+ ViewBag.Sections = new Lazy<List<string>>(() => new List<string>());\n+ }\n}\n}\n\\ No newline at end of file\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- ViewBag.Sections = new List<string>();\n-}\n-\n-@functions\n-{\n- private static List<string> GetSections(dynamic viewBag)\n- {\n- return (List<string>)viewBag.Sections;\n- }\n-\n- public static void AddSection(dynamic viewBag, string id)\n- {\n- GetSections(viewBag).Add(id);\n- }\n-}\n-\n-@helper Section(\n- string id,\n- Func<MvcHtmlString, HelperResult> title,\n- Func<MvcHtmlString, HelperResult> data,\n- Func<MvcHtmlString, HelperResult> content,\n- bool expanded = false)\n-{\n- AddSection(ViewBag, id);\n-\n- <div class=\"clearfix\">\n- <div class=\"form-section-title\">\n- <h2>\n- <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#@id-container\"\n- aria-expanded=\"@expanded\" aria-controls=\"@id-container\" id=\"show-@id-container\">\n- <i class=\"ms-Icon ms-Icon--@(expanded ? \"ChevronDown\" : \"ChevronRight\")\" aria-hidden=\"true\"></i>\n- <span>@title(MvcHtmlString.Empty)</span>\n- </a>\n- </h2>\n- </div>\n- <div class=\"form-section-data\">\n- @data(MvcHtmlString.Empty)\n- </div>\n- </div>\n- <div class=\"panel panel-default panel-collapse collapse @(expanded ? \"in\" : string.Empty)\"\n- aria-expanded=\"@(expanded ? \"true\" : \"false\")\" id=\"@id-container\">\n- <div class=\"panel-body\">\n- @content(MvcHtmlString.Empty)\n- </div>\n- </div>\n}\n<section role=\"main\" class=\"container main-container page-account-settings\">\n</text>)\n}\n-\n@if (!CurrentUser.Confirmed)\n{\n@ViewHelpers.AlertInfo(@<text>\n</text>)\n}\n- @Section(\n+ @ViewHelpers.Section(this,\n\"change-email\",\n@<text>@(Model.HasUnconfirmedEmailAddress ? \"Pending Email Address\" : \"Email Address\")</text>,\n@<text>@Model.CurrentEmailAddress</text>,\n</text>,\nViewData.ModelState.Keys.Any(x => x.StartsWith(\"ChangeEmail\")))\n- @Section(\n+ @ViewHelpers.Section(this,\n\"change-notifications\",\n@<text>Email Notifications</text>,\n@<text>\n{\nforeach (var cred in Model.CredentialGroups[CredentialKind.External])\n{\n- @Section(\n+ @ViewHelpers.Section(this,\n\"change-credential-\" + cred.Key,\n@<text>@cred.TypeCaption</text>,\n@<text>@cred.Identity</text>,\n}\n}\n- @Section(\n+ @ViewHelpers.Section(this,\n\"change-password\",\n@<text>Password Login</text>,\n@<text><em>@(Model.HasPassword ? \"(Enabled)\" : \"(Disabled)\")</em></text>,\n</text>,\nViewData.ModelState.Keys.Any(x => x.StartsWith(\"ChangePassword\")))\n- @Section(\n+ @ViewHelpers.Section(this,\n\"profile-picture\",\n@<text>Profile Picture @(Model.HasUnconfirmedEmailAddress ? \"(preview)\" : string.Empty)</text>,\n@<text>@ViewHelpers.GravatarImage(Model.CurrentEmailAddress, CurrentUser.Username, Constants.GravatarElementSize)</text>,\n@foreach (var curatedFeed in Model.CuratedFeeds)\n{\n- @Section(\n+ @ViewHelpers.Section(this,\n\"curated-feed-\" + curatedFeed,\n@<text>Curated Feed</text>,\n@<text>@curatedFeed</text>,\n</section>\n@section bottomScripts {\n- <script type=\"text/javascript\">\n- var sections = @Html.Raw(Json.Encode(GetSections(ViewBag)));\n- </script>\n+ @ViewHelpers.SectionsScript(this);\n@Scripts.Render(\"~/Scripts/gallery/page-account.min.js\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n-@helper Section(\n- string id,\n- string title,\n- Func<MvcHtmlString, HelperResult> content,\n- bool expanded = true,\n- string expandedIcon = \"ChevronDown\",\n- string collapsedIcon = \"ChevronRight\")\n-{\n- <h2>\n- <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#@id-container\"\n- aria-expanded=\"@(expanded ? \"true\" : \"false\")\" aria-controls=\"@id-container\" id=\"show-@id-container\">\n- <i class=\"ms-Icon ms-Icon--@(expanded ? expandedIcon : collapsedIcon)\"\n- aria-hidden=\"@(expanded ? \"false\" : \"true\")\"></i>\n- <span>@title</span>\n- </a>\n- </h2>\n- <div class=\"panel-collapse collapse @(expanded ? \"in\" : string.Empty)\" id=\"@id-container\">\n- @content(MvcHtmlString.Empty)\n- </div>\n-}\n-\n<section role=\"main\" class=\"container main-container page-api-keys\">\n<form id=\"AntiForgeryForm\">\n@Html.AntiForgeryToken()\n<div data-bind=\"template: 'error-container'\"></div>\n- @Section(\n+ @ViewHelpers.Section(this,\n\"create\",\n\"Create\",\n@<text>\nexpandedIcon: \"Subtraction\",\ncollapsedIcon: \"Add\")\n- @Section(\n+ @ViewHelpers.Section(this,\n\"manage\",\n\"Manage\",\n@<text>\ndata-bind=\"attr: { id: PackageOwnerId,\nname: PackageOwnerId,\n'aria-labelledby': PackageOwnerId() + '-label' },\n- options: PackageOwners, value: PackageOwner, optionsText: 'Owner'\">\n- </select>\n+ options: PackageOwners, value: PackageOwner, optionsText: 'Owner'\"></select>\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": "Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n-@helper Section(\n- string id,\n- string title,\n- Func<MvcHtmlString, HelperResult> content,\n- bool expanded = true,\n- string expandedIcon = \"ChevronDown\",\n- string collapsedIcon = \"ChevronRight\")\n-{\n- <h3>\n- <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#@id-container\"\n- aria-expanded=\"@(expanded ? \"true\" : \"false\")\" aria-controls=\"@id-container\" id=\"show-@id-container\">\n- <i class=\"ms-Icon ms-Icon--@(expanded ? expandedIcon : collapsedIcon)\"\n- aria-hidden=\"@(expanded ? \"false\" : \"true\")\"></i>\n- <span>@title</span>\n- </a>\n- </h3>\n- <div class=\"panel-collapse collapse @(expanded ? \"in\" : string.Empty) col-xs-12\" id=\"@id-container\">\n- @content(MvcHtmlString.Empty)\n- </div>\n-}\n-\n<section role=\"main\" class=\"container main-container page-manage-packages page-package-details\">\n<div class=\"row\">\n<div class=\"col-xs-12\">\n<select id=\"ownerFilter\" class=\"form-control pull-right hidden\"\ndata-bind=\"options: Owners, value: OwnerFilter, optionsText: 'Username'\"></select>\n</div>\n- @Section(\"listed\", \"Published\",\n+ @ViewHelpers.Section(this, \"listed\", \"Published\",\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- @Section(\"unlisted\", \"Unlisted\",\n+ @ViewHelpers.Section(this, \"unlisted\", \"Unlisted\",\n@<text>\n<div class=\"row user-package-list\">\n<div data-bind=\"template: { name: 'manage-packages', data: UnlistedPackages }\"></div>\n<div class=\"row\">\n<div class=\"col-xs-12\">\n<h1>My Reserved Namespaces</h1>\n- @Section(\n+ @ViewHelpers.Section(this,\n\"namespaces\",\n\"Namespaces\",\n@<text>\n<h1>My Pending Ownership Requests</h1>\n@if (Model.OwnerRequests.Incoming.RequestItems.Any())\n{\n- @Section(\n+ @ViewHelpers.Section(this,\n\"requests-incoming\",\n\"Incoming\",\n@<text>\n@if (Model.OwnerRequests.Outgoing.RequestItems.Any())\n{\n-\n- @Section(\n+ @ViewHelpers.Section(this,\n\"requests-outgoing\",\n\"Outgoing\",\n@<text>\nPackageIconUrlFallback = Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\")\n}));\n</script>\n+ @ViewHelpers.SectionsScript(this)\n@Scripts.Render(\"~/Scripts/gallery/page-manage-packages.min.js\")\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Refactor section helpers into common ViewHelpers (#5269)
|
455,747 |
16.01.2018 12:51:28
| 28,800 |
801139edc45f075d8c6e7423c9f01c8e28fab843
|
Fix admin logins
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectory/AzureActiveDirectoryAuthenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/AzureActiveDirectory/AzureActiveDirectoryAuthenticator.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.Linq;\nusing System.Security.Claims;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\n@@ -63,6 +64,18 @@ public override AuthenticatorUI GetUI()\n};\n}\n+ public override bool IsProviderForIdentity(ClaimsIdentity claimsIdentity)\n+ {\n+ // If the issuer of the claims identity is same as that of the issuer for current authenticator then this is the author.\n+ var firstClaim = claimsIdentity?.Claims?.FirstOrDefault();\n+ if (firstClaim != null && string.Equals(firstClaim.Issuer, Config.Issuer, StringComparison.OrdinalIgnoreCase))\n+ {\n+ return true;\n+ }\n+\n+ return base.IsProviderForIdentity(claimsIdentity);\n+ }\n+\npublic override ActionResult Challenge(string redirectUrl)\n{\nreturn new ChallengeResult(BaseConfig.AuthenticationType, redirectUrl);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix admin logins (#5276)
|
455,751 |
17.01.2018 08:58:15
| 28,800 |
caa82d08a7e393b1ad18652eced0807c0bc801fd
|
Fix issue: [DEV] Images missing from Dev environment
Fix null ref exception.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"diff": "@@ -52,7 +52,12 @@ private void ModifyItem(ITelemetry item)\npublic virtual Route GetCurrentRoute()\n{\n- return RouteTable.Routes.GetRouteData(new HttpContextWrapper(HttpContext.Current)).Route as Route;\n+ if (HttpContext.Current == null)\n+ {\n+ return null;\n+ }\n+\n+ return RouteTable.Routes.GetRouteData(new HttpContextWrapper(HttpContext.Current))?.Route as Route;\n}\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix issue: [DEV] Images missing from Dev environment (#5280)
Fix null ref exception.
|
455,747 |
17.01.2018 10:08:47
| 28,800 |
ea802a5ecc5dca08e7eda1ab9e30c3c5e6fc6853
|
Update copyright for NuGet Gallery
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -10,6 +10,8 @@ namespace NuGetGallery.Configuration\n{\npublic class AppConfiguration : IAppConfiguration\n{\n+ private string _ExternalBrandingMessage;\n+\n[DefaultValue(Constants.DevelopmentEnvironment)]\npublic string Environment { get; set; }\n@@ -277,9 +279,19 @@ public class AppConfiguration : IAppConfiguration\npublic string ExternalBrandingUrl { get; set; }\n/// <summary>\n- /// Gets/sets a string that is brand string to display in the footer\n+ /// Gets/sets a string that is brand string to display in the footer, this also\n+ /// accepts a single {0} string format token which is replaced by the UTC year\n/// </summary>\n- public string ExternalBrandingMessage { get; set; }\n+ public string ExternalBrandingMessage {\n+ get {\n+ return _ExternalBrandingMessage;\n+ }\n+\n+ set\n+ {\n+ _ExternalBrandingMessage = string.Format(value, DateTime.UtcNow.Year);\n+ }\n+ }\n/// <summary>\n/// Get/Sets a string to a url that details trademarks. If unset, the link will not appear.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -273,7 +273,8 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration\nstring ExternalBrandingUrl { get; set; }\n/// <summary>\n- /// Gets/sets a string that is brand string to display in the footer\n+ /// Gets/sets a string that is brand string to display in the footer, this also\n+ /// accepts a single {0} string format token which is replaced by the UTC year\n/// </summary>\nstring ExternalBrandingMessage { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Authentication\\AuthenticationServiceFacts.cs\" />\n<Compile Include=\"Authentication\\Providers\\CommonAuth\\AzureActiveDirectoryV2AuthenticatorFacts.cs\" />\n<Compile Include=\"Authentication\\TestCredentialHelper.cs\" />\n+ <Compile Include=\"Configuration\\ConfigurationServiceFacts.cs\" />\n<Compile Include=\"Controllers\\SupportControllerFacts.cs\" />\n<Compile Include=\"Extensions\\RouteExtensionsFacts.cs\" />\n<Compile Include=\"Extensions\\OrganizationExtensionsFacts.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update copyright for NuGet Gallery (#5278)
|
455,747 |
18.01.2018 14:29:21
| 28,800 |
2abe600adb183e2ee6899f0d4f5439691863bee1
|
Fix branding message formatting in Functional test
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.P0/BasicPages/BrandingValidationTest.cs",
"new_path": "tests/NuGetGallery.WebUITests.P0/BasicPages/BrandingValidationTest.cs",
"diff": "@@ -45,7 +45,7 @@ public override IEnumerator<WebTestRequest> GetRequestEnumerator()\n{\nif (!String.IsNullOrEmpty(EnvironmentSettings.ExternalBrandingMessage))\n{\n- var validationBrandingMessage = AssertAndValidationHelper.GetValidationRuleForFindText(EnvironmentSettings.ExternalBrandingMessage);\n+ var validationBrandingMessage = AssertAndValidationHelper.GetValidationRuleForFindText(string.Format(EnvironmentSettings.ExternalBrandingMessage, DateTime.UtcNow.Year));\npageRequest.ValidateResponse += validationBrandingMessage.Validate;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix branding message formatting in Functional test (#5291)
|
455,751 |
19.01.2018 10:32:00
| 28,800 |
4caac399bb3737c9aa189c0210d86dc1229d4a07
|
Remove usernames and emails from AI traces.
Remove usernames and emails from traces.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -74,14 +74,14 @@ private void InitCredentialFormatters()\npublic virtual async Task<PasswordAuthenticationResult> Authenticate(string userNameOrEmail, string password)\n{\n- using (_trace.Activity(\"Authenticate:\" + userNameOrEmail))\n+ using (_trace.Activity(\"Authenticate\"))\n{\nvar user = FindByUserNameOrEmail(userNameOrEmail);\n// Check if the user exists\nif (user == null)\n{\n- _trace.Information(\"No such user: \" + userNameOrEmail);\n+ _trace.Information(\"No such user.\");\nawait Auditing.SaveAuditRecordAsync(\nnew FailedAuthenticatedOperationAuditRecord(\n@@ -92,7 +92,7 @@ public virtual async Task<PasswordAuthenticationResult> Authenticate(string user\nif (user is Organization)\n{\n- _trace.Information($\"Cannot authenticate organization account'{userNameOrEmail}'.\");\n+ _trace.Information(\"Cannot authenticate organization account.\");\nawait Auditing.SaveAuditRecordAsync(\nnew FailedAuthenticatedOperationAuditRecord(\n@@ -105,7 +105,7 @@ public virtual async Task<PasswordAuthenticationResult> Authenticate(string user\nif (IsAccountLocked(user, out remainingMinutes))\n{\n- _trace.Information($\"Login failed. User account {userNameOrEmail} is locked for the next {remainingMinutes} minutes.\");\n+ _trace.Information($\"Login failed. User account is locked for the next {remainingMinutes} minutes.\");\nreturn new PasswordAuthenticationResult(PasswordAuthenticationResult.AuthenticationResult.AccountLocked,\nauthenticatedUser: null, lockTimeRemainingMinutes: remainingMinutes);\n@@ -115,7 +115,7 @@ public virtual async Task<PasswordAuthenticationResult> Authenticate(string user\nCredential matched;\nif (!ValidatePasswordCredential(user.Credentials, password, out matched))\n{\n- _trace.Information($\"Password validation failed: {userNameOrEmail}\");\n+ _trace.Information(\"Password validation failed.\");\nawait UpdateFailedLoginAttempt(user);\n@@ -141,7 +141,7 @@ public virtual async Task<PasswordAuthenticationResult> Authenticate(string user\nawait UpdateSuccessfulLoginAttempt(user);\n// Return the result\n- _trace.Verbose(\"Successfully authenticated '\" + user.Username + \"' with '\" + matched.Type + \"' credential\");\n+ _trace.Verbose(\"User successfully authenticated with '\" + matched.Type + \"' credential\");\nreturn new PasswordAuthenticationResult(PasswordAuthenticationResult.AuthenticationResult.Success, new AuthenticatedUser(user, matched));\n}\n}\n@@ -184,7 +184,7 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\nif (matched.User is Organization)\n{\n- _trace.Information($\"Cannot authenticate organization account '{matched.User.Username}'.\");\n+ _trace.Information(\"Cannot authenticate organization account.\");\nawait Auditing.SaveAuditRecordAsync(\nnew FailedAuthenticatedOperationAuditRecord(null,\n@@ -196,7 +196,7 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\nif (matched.HasExpired)\n{\n- _trace.Verbose(\"Credential of type '\" + matched.Type + \"' for user '\" + matched.User.Username + \"' has expired on \" + matched.Expires.Value.ToString(\"O\", CultureInfo.InvariantCulture));\n+ _trace.Verbose(\"Credential of type '\" + matched.Type + \"' has expired on \" + matched.Expires.Value.ToString(\"O\", CultureInfo.InvariantCulture));\nreturn null;\n}\n@@ -214,7 +214,6 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\n_trace.Verbose(\n\"Credential of type '\" + matched.Type\n- + \"' for user '\" + matched.User.Username\n+ \"' was last used on \" + matched.LastUsed.Value.ToString(\"O\", CultureInfo.InvariantCulture)\n+ \" and has now expired.\");\n@@ -225,7 +224,7 @@ private async Task<AuthenticatedUser> AuthenticateInternal(Func<Credential, Cred\nmatched.LastUsed = _dateTimeProvider.UtcNow;\nawait Entities.SaveChangesAsync();\n- _trace.Verbose(\"Successfully authenticated '\" + matched.User.Username + \"' with '\" + matched.Type + \"' credential\");\n+ _trace.Verbose(\"User successfully authenticated with '\" + matched.Type + \"' credential\");\nreturn new AuthenticatedUser(matched.User, matched);\n}\n@@ -756,7 +755,7 @@ private User FindByUserNameOrEmail(string userNameOrEmail)\nelse\n{\n// If multiple matches, leave it null to signal no unique email address\n- _trace.Warning(\"Multiple user accounts with email address: \" + userNameOrEmail + \" found: \" + String.Join(\", \", allMatches.Select(u => u.Username)));\n+ _trace.Warning($\"Multiple user accounts with a single email address were found. Count: {allMatches.Count}\");\n}\n}\nreturn user;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/SecurePushSubscription.cs",
"new_path": "src/NuGetGallery/Security/SecurePushSubscription.cs",
"diff": "@@ -89,7 +89,7 @@ public async Task OnSubscribeAsync(UserSecurityPolicySubscriptionContext context\n}\nawait Task.WhenAll(expireTasks);\n- _diagnostics.Information($\"Expiring {pushKeys.Count()} keys with push capability for user '{context.User.Username}'.\");\n+ _diagnostics.Information($\"Expiring {pushKeys.Count()} keys with push capability.\");\n}\npublic Task OnUnsubscribeAsync(UserSecurityPolicySubscriptionContext context)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"new_path": "src/NuGetGallery/Security/SecurityPolicyService.cs",
"diff": "@@ -130,7 +130,7 @@ private async Task<SecurityPolicyResult> EvaluateInternalAsync(IEnumerable<UserS\nif (!result.Success)\n{\nDiagnostics.Information(\n- $\"Security policy from subscription '{foundPolicies.First().Subscription}' - '{handler.Name}' failed for user '{user.Username}' with error '{result.ErrorMessage}'.\");\n+ $\"Security policy from subscription '{foundPolicies.First().Subscription}' - '{handler.Name}' failed with error '{result.ErrorMessage}'.\");\nreturn result;\n}\n@@ -228,7 +228,7 @@ public async Task<bool> SubscribeAsync(User user, IUserSecurityPolicySubscriptio\nif (IsSubscribed(user, subscription))\n{\n- Diagnostics.Information($\"User '{user.Username}' is already subscribed to '{subscription.SubscriptionName}'.\");\n+ Diagnostics.Information($\"User is already subscribed to '{subscription.SubscriptionName}'.\");\nreturn false;\n}\n@@ -246,7 +246,7 @@ public async Task<bool> SubscribeAsync(User user, IUserSecurityPolicySubscriptio\nawait EntitiesContext.SaveChangesAsync();\n- Diagnostics.Information($\"User '{user.Username}' is now subscribed to '{subscription.SubscriptionName}'.\");\n+ Diagnostics.Information($\"User is now subscribed to '{subscription.SubscriptionName}'.\");\nreturn true;\n}\n@@ -302,11 +302,11 @@ public async Task UnsubscribeAsync(User user, IUserSecurityPolicySubscription su\nawait EntitiesContext.SaveChangesAsync();\n- Diagnostics.Information($\"User '{user.Username}' is now unsubscribed from '{subscription.SubscriptionName}'.\");\n+ Diagnostics.Information($\"User is now unsubscribed from '{subscription.SubscriptionName}'.\");\n}\nelse\n{\n- Diagnostics.Information($\"User '{user.Username}' is already unsubscribed from '{subscription.SubscriptionName}'.\");\n+ Diagnostics.Information($\"User is already unsubscribed from '{subscription.SubscriptionName}'.\");\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove usernames and emails from AI traces. (#5293)
Remove usernames and emails from traces.
|
455,776 |
19.01.2018 13:57:19
| 28,800 |
fb75a6ea6a0338977c1e426eb37eb73a74c855f5
|
[Organizations] Manage Organizations page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -420,6 +420,17 @@ public virtual ActionResult Packages()\nreturn View(model);\n}\n+ [HttpGet]\n+ [Authorize]\n+ public virtual ActionResult Organizations()\n+ {\n+ var currentUser = GetCurrentUser();\n+\n+ var model = new ManageOrganizationsViewModel(currentUser, _packageService);\n+\n+ return View(model);\n+ }\n+\n[HttpGet]\npublic virtual ActionResult ForgotPassword()\n{\n"
},
{
"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\\ListPackageOwnerViewModel.cs\" />\n<Compile Include=\"ViewModels\\PackageDeleteDecision.cs\" />\n<Compile Include=\"ViewModels\\DeleteAccountViewModel.cs\" />\n<Content Include=\"Views\\Authentication\\SignInNuGetAccount.cshtml\" />\n<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\\Packages\\_ValidationIssue.cshtml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -732,6 +732,11 @@ public static string ManageMyApiKeys(this UrlHelper url, bool relativeUrl = true\nreturn GetActionLink(url, \"ApiKeys\", \"Users\", relativeUrl);\n}\n+ public static string ManageMyOrganizations(this UrlHelper url, bool relativeUrl = true)\n+ {\n+ return GetActionLink(url, \"Organizations\", \"Users\", relativeUrl);\n+ }\n+\npublic static string ManageMyPackages(this UrlHelper url, bool relativeUrl = true)\n{\nreturn GetActionLink(url, \"Packages\", \"Users\", relativeUrl);\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+ {\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"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Manage Organizations page (#5292)
|
455,788 |
20.01.2018 01:33:52
| -10,800 |
0a897f781a9d68a74fcfaa4d67e12fe3c9cde382
|
Issue 4258 - ContactOwners e-mails contain the package version numer next to package id
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -405,7 +405,7 @@ public static void RegisterUIRoutes(RouteCollection routes)\nroutes.Redirect(\nr => r.MapRoute(\n\"PackageActions\",\n- \"Package/{action}/{id}\",\n+ \"Package/{action}/{id}/{version}\",\nnew { controller = \"Packages\", action = \"ContactOwners\" },\n// This next bit looks bad, but it's not. It will never change because\n// it's mapping the legacy routes to the new better routes.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -911,10 +911,9 @@ private void NotifyReportMyPackageSupportRequest(ReportMyPackageViewModel report\n[HttpGet]\n[Authorize]\n[RequiresAccountConfirmation(\"contact package owners\")]\n- public virtual ActionResult ContactOwners(string id)\n+ public virtual ActionResult ContactOwners(string id, string version)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version: null);\n-\n+ var package = _packageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null || package.PackageRegistration == null)\n{\nreturn HttpNotFound();\n@@ -923,7 +922,8 @@ public virtual ActionResult ContactOwners(string id)\nbool hasOwners = package.PackageRegistration.Owners.Any();\nvar model = new ContactOwnersViewModel\n{\n- PackageId = package.PackageRegistration.Id,\n+ PackageId = id,\n+ PackageVersion = package.Version,\nProjectUrl = package.ProjectUrl,\nOwners = package.PackageRegistration.Owners.Where(u => u.EmailAllowed),\nCopySender = true,\n@@ -937,17 +937,17 @@ public virtual ActionResult ContactOwners(string id)\n[Authorize]\n[ValidateAntiForgeryToken]\n[RequiresAccountConfirmation(\"contact package owners\")]\n- public virtual ActionResult ContactOwners(string id, ContactOwnersViewModel contactForm)\n+ public virtual ActionResult ContactOwners(string id, string version, ContactOwnersViewModel contactForm)\n{\n// Html Encode the message\ncontactForm.Message = System.Web.HttpUtility.HtmlEncode(contactForm.Message);\nif (!ModelState.IsValid)\n{\n- return ContactOwners(id);\n+ return ContactOwners(id, version);\n}\n- var package = _packageService.FindPackageRegistrationById(id);\n+ var package = _packageService.FindPackageByIdAndVersionStrict(id, version);\nif (package == null)\n{\nreturn HttpNotFound();\n@@ -971,7 +971,7 @@ public virtual ActionResult ContactOwners(string id, ContactOwnersViewModel cont\nrouteValues: new\n{\nid,\n- version = (string)null\n+ version\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IMessageService.cs",
"new_path": "src/NuGetGallery/Services/IMessageService.cs",
"diff": "@@ -8,7 +8,7 @@ namespace NuGetGallery\n{\npublic interface IMessageService\n{\n- void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copyFromAddress);\n+ void SendContactOwnersMessage(MailAddress fromAddress, Package package, string packageUrl, string message, string emailSettingsUrl, bool copyFromAddress);\nvoid ReportAbuse(ReportPackageRequest report);\nvoid ReportMyPackage(ReportPackageRequest report);\nvoid SendNewAccountEmail(MailAddress toAddress, string confirmationUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/MessageService.cs",
"new_path": "src/NuGetGallery/Services/MessageService.cs",
"diff": "@@ -129,17 +129,17 @@ public void ReportMyPackage(ReportPackageRequest request)\n}\n}\n- public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copySender)\n+ public void SendContactOwnersMessage(MailAddress fromAddress, Package package, string packageUrl, string message, string emailSettingsUrl, bool copySender)\n{\nstring subject = \"[{0}] Message for owners of the package '{1}'\";\n- string body = @\"_User {0} <{1}> sends the following message to the owners of Package '[{2}]({3})'._\n+ string body = @\"_User {0} <{1}> sends the following message to the owners of Package '[{2} {3}]({4})'._\n-{4}\n+{5}\n-----------------------------------------------\n<em style=\"\"font-size: 0.8em;\"\">\n- To stop receiving contact emails as an owner of this package, sign in to the {5} and\n- [change your email notification settings]({6}).\n+ To stop receiving contact emails as an owner of this package, sign in to the {6} and\n+ [change your email notification settings]({7}).\n</em>\";\nbody = String.Format(\n@@ -147,13 +147,14 @@ public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistratio\nbody,\nfromAddress.DisplayName,\nfromAddress.Address,\n- packageRegistration.Id,\n+ package.PackageRegistration.Id,\n+ package.Version,\npackageUrl,\nmessage,\nConfig.GalleryOwner.DisplayName,\nemailSettingsUrl);\n- subject = String.Format(CultureInfo.CurrentCulture, subject, Config.GalleryOwner.DisplayName, packageRegistration.Id);\n+ subject = String.Format(CultureInfo.CurrentCulture, subject, Config.GalleryOwner.DisplayName, package.PackageRegistration.Id);\nusing (var mailMessage = new MailMessage())\n{\n@@ -162,7 +163,7 @@ public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistratio\nmailMessage.From = Config.GalleryOwner;\nmailMessage.ReplyToList.Add(fromAddress);\n- AddOwnersToMailMessage(packageRegistration, mailMessage);\n+ AddOwnersToMailMessage(package.PackageRegistration, mailMessage);\nif (mailMessage.To.Any())\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -893,7 +893,7 @@ public static string Contact(this UrlHelper url, bool relativeUrl = true)\nreturn GetActionLink(url, \"Contact\", \"Pages\", relativeUrl);\n}\n- public static string ContactOwners(this UrlHelper url, string id, bool relativeUrl = true)\n+ public static string ContactOwners(this UrlHelper url, string id, string version, bool relativeUrl = true)\n{\nreturn GetActionLink(\nurl,\n@@ -902,7 +902,8 @@ public static string ContactOwners(this UrlHelper url, string id, bool relativeU\nrelativeUrl,\nrouteValues: new RouteValueDictionary\n{\n- { \"id\", id }\n+ { \"id\", id },\n+ { \"version\", version }\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs",
"diff": "@@ -11,6 +11,8 @@ public class ContactOwnersViewModel\n{\npublic string PackageId { get; set; }\n+ public string PackageVersion { get; set; }\n+\npublic string ProjectUrl { get; set; }\npublic IEnumerable<User> Owners { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n<li>\n<i class=\"ms-Icon ms-Icon--Mail\" aria-hidden=\"true\"></i>\n- <a href=\"@Url.ContactOwners(Model.Id)\" title=\"Ask the package owners a question\">Contact owners</a>\n+ <a href=\"@Url.ContactOwners(Model.Id, Model.Version)\" title=\"Ask the package owners a question\">Contact owners</a>\n</li>\n@if (Model.CanReportAsOwner)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "This form is for reporting abusive packages such as\npackages containing malicious code or spam. If \"@Model.PackageId\" simply doesn't\nwork, or if you need help getting the package installed, please\n- <a href=\"@Url.ContactOwners(Model.PackageId)\" title=\"contact the owners\">contact the owners instead.</a>\n+ <a href=\"@Url.ContactOwners(Model.PackageId, Model.PackageVersion)\" title=\"contact the owners\">contact the owners instead.</a>\n</text>\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1254,57 +1254,229 @@ public class TheContactOwnersMethod\n: TestContainer\n{\n[Fact]\n- public void OnlyShowsOwnersWhoAllowReceivingEmails()\n+ public void ReturnsNotFoundIfPackageIsNull()\n+ {\n+ // arrange\n+ var packageId = \"pkgid\";\n+ var packageVersion = \"1.0.0\";\n+\n+ var packageService = new Mock<IPackageService>();\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns<Package>(null);\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService);\n+\n+ // act\n+ var result = controller.ContactOwners(packageId, packageVersion);\n+\n+ // assert\n+ Assert.IsType<HttpNotFoundResult>(result);\n+ }\n+\n+ [Fact]\n+ public void ReturnsNotFoundIfPackageRegistrationIsNull()\n+ {\n+ // arrange\n+ var packageId = \"pkgid\";\n+ var packageVersion = \"1.0.0\";\n+\n+ var package = new Package\n+ {\n+ PackageRegistration = null,\n+ Version = packageVersion\n+ };\n+\n+ var packageService = new Mock<IPackageService>();\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns(package);\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService);\n+\n+ // act\n+ var result = controller.ContactOwners(packageId, packageVersion);\n+\n+ // assert\n+ Assert.IsType<HttpNotFoundResult>(result);\n+ }\n+\n+ [Fact]\n+ public void SetsModelParametersFromPackage()\n+ {\n+ // arrange\n+ var packageId = \"pkgid\";\n+ var packageVersion = \"1.0.0\";\n+ var projectUrl = \"http://someurl/\";\n+ var allowedUser = \"helpful\";\n+\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = packageId,\n+ Owners = new[]\n+ {\n+ new User { Username = allowedUser, EmailAllowed = true }\n+ }\n+ },\n+ ProjectUrl = projectUrl,\n+ Version = packageVersion\n+ };\n+\n+ var packageService = new Mock<IPackageService>();\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns(package);\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService);\n+\n+ // act\n+ var model = (controller.ContactOwners(packageId, packageVersion) as ViewResult).Model as ContactOwnersViewModel;\n+\n+ // assert\n+ Assert.Equal(packageId, model.PackageId);\n+ Assert.Equal(packageVersion, model.PackageVersion);\n+ Assert.Equal(projectUrl, model.ProjectUrl);\n+ Assert.Equal(1, model.Owners.Count());\n+ Assert.True(model.HasOwners);\n+ }\n+\n+ [Fact]\n+ public void SetsModelHasOwnersTrueIfAllOwnersDisallow()\n{\n+ // arrange\n+ var packageId = \"pkgid\";\n+ var packageVersion = \"1.0.0\";\n+ var notAllowedUser = \"grinch\";\n+\nvar package = new Package\n{\nPackageRegistration = new PackageRegistration\n{\n- Id = \"pkgid\",\n+ Id = packageId,\nOwners = new[]\n{\n- new User { Username = \"helpful\", EmailAllowed = true },\n- new User { Username = \"grinch\", EmailAllowed = false },\n- new User { Username = \"helpful2\", EmailAllowed = true }\n+ new User { Username = notAllowedUser, EmailAllowed = false }\n}\n+ },\n+ Version = packageVersion\n+ };\n+\n+ var packageService = new Mock<IPackageService>();\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns(package);\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService);\n+\n+ // act\n+ var model = (controller.ContactOwners(packageId, packageVersion) as ViewResult).Model as ContactOwnersViewModel;\n+\n+ // assert\n+ Assert.Empty(model.Owners);\n+ Assert.True(model.HasOwners);\n}\n+\n+ [Fact]\n+ public void SetsModelHasOwnersFalseIfNoOwners()\n+ {\n+ // arrange\n+ var packageId = \"pkgid\";\n+ var packageVersion = \"1.0.0\";\n+\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = packageId,\n+ Owners = new User[] {}\n+ },\n+ Version = packageVersion\n};\nvar packageService = new Mock<IPackageService>();\n- packageService.Setup(p => p.FindPackageByIdAndVersion(\"pkgid\", null, null, true)).Returns(package);\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns(package);\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService);\n- var model = (controller.ContactOwners(\"pkgid\") as ViewResult).Model as ContactOwnersViewModel;\n+ // act\n+ var model = (controller.ContactOwners(packageId, packageVersion) as ViewResult).Model as ContactOwnersViewModel;\n+ // assert\n+ Assert.Empty(model.Owners);\n+ Assert.False(model.HasOwners);\n+ }\n+\n+ [Fact]\n+ public void OnlyShowsOwnersWhoAllowReceivingEmails()\n+ {\n+ // arrange\n+ var packageId = \"pkgid\";\n+ var packageVersion = \"1.0.0\";\n+ var allowedUser = \"helpful\";\n+ var allowedUser2 = \"helpful2\";\n+ var notAllowedUser = \"grinch\";\n+\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = packageId,\n+ Owners = new[]\n+ {\n+ new User { Username = allowedUser, EmailAllowed = true },\n+ new User { Username = notAllowedUser, EmailAllowed = false },\n+ new User { Username = allowedUser2, EmailAllowed = true }\n+ }\n+ },\n+ Version = packageVersion\n+ };\n+\n+ var packageService = new Mock<IPackageService>();\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns(package);\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService);\n+\n+ // act\n+ var model = (controller.ContactOwners(packageId, packageVersion) as ViewResult).Model as ContactOwnersViewModel;\n+\n+ // assert\nAssert.Equal(2, model.Owners.Count());\n- Assert.Empty(model.Owners.Where(u => u.Username == \"grinch\"));\n+ Assert.Empty(model.Owners.Where(u => u.Username == notAllowedUser));\n}\n[Fact]\npublic void HtmlEncodesMessageContent()\n{\n+ // arrange\n+ var packageId = \"factory\";\n+ var packageVersion = \"1.0.0\";\n+ var message = \"I like the cut of your jib. It's <b>bold</b>.\";\n+ var encodedMessage = \"I like the cut of your jib. It's <b>bold</b>.\";\n+\nvar sentPackageUrl = string.Empty;\nvar messageService = new Mock<IMessageService>();\nstring sentMessage = null;\nmessageService.Setup(\ns => s.SendContactOwnersMessage(\nIt.IsAny<MailAddress>(),\n- It.IsAny<PackageRegistration>(),\n+ It.IsAny<Package>(),\nIt.IsAny<string>(),\nIt.IsAny<string>(),\nIt.IsAny<string>(),\nfalse))\n- .Callback<MailAddress, PackageRegistration, string, string, string, bool>((_, __, packageUrl, msg, ____, _____) =>\n+ .Callback<MailAddress, Package, string, string, string, bool>((_, __, packageUrl, msg, ____, _____) =>\n{\nsentPackageUrl = packageUrl;\nsentMessage = msg;\n});\n- var package = new PackageRegistration { Id = \"factory\" };\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration {Id = packageId},\n+ Version = packageVersion\n+ };\nvar packageService = new Mock<IPackageService>();\n- packageService.Setup(p => p.FindPackageRegistrationById(\"factory\")).Returns(package);\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns(package);\nvar userService = new Mock<IUserService>();\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1313,30 +1485,40 @@ public void HtmlEncodesMessageContent()\ncontroller.SetCurrentUser(new User { EmailAddress = \"montgomery@burns.example.com\", Username = \"Montgomery\" });\nvar model = new ContactOwnersViewModel\n{\n- Message = \"I like the cut of your jib. It's <b>bold</b>.\",\n+ Message = message,\n};\n- var result = controller.ContactOwners(\"factory\", model) as RedirectToRouteResult;\n+ // act\n+ var result = controller.ContactOwners(packageId, packageVersion, model) as RedirectToRouteResult;\n- Assert.Equal(\"I like the cut of your jib. It's <b>bold</b>.\", sentMessage);\n+ Assert.Equal(encodedMessage, sentMessage);\nAssert.Equal(controller.Url.Package(package, false), sentPackageUrl);\n}\n[Fact]\npublic void CallsSendContactOwnersMessageWithUserInfo()\n{\n+ // arrange\n+ var packageId = \"factory\";\n+ var packageVersion = \"1.0.0\";\n+ var message = \"I like the cut of your jib\";\n+\nvar messageService = new Mock<IMessageService>();\nmessageService.Setup(\ns => s.SendContactOwnersMessage(\nIt.IsAny<MailAddress>(),\n- It.IsAny<PackageRegistration>(),\n+ It.IsAny<Package>(),\nIt.IsAny<string>(),\n- \"I like the cut of your jib\",\n+ message,\nIt.IsAny<string>(), false));\n- var package = new PackageRegistration { Id = \"factory\" };\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration { Id = packageId },\n+ Version = packageVersion\n+ };\nvar packageService = new Mock<IPackageService>();\n- packageService.Setup(p => p.FindPackageRegistrationById(\"factory\")).Returns(package);\n+ packageService.Setup(p => p.FindPackageByIdAndVersionStrict(packageId, packageVersion)).Returns(package);\nvar userService = new Mock<IUserService>();\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1345,11 +1527,13 @@ public void CallsSendContactOwnersMessageWithUserInfo()\ncontroller.SetCurrentUser(new User { EmailAddress = \"montgomery@burns.example.com\", Username = \"Montgomery\" });\nvar model = new ContactOwnersViewModel\n{\n- Message = \"I like the cut of your jib\",\n+ Message = message,\n};\n- var result = controller.ContactOwners(\"factory\", model) as RedirectToRouteResult;\n+ // act\n+ var result = controller.ContactOwners(packageId, packageVersion, model) as RedirectToRouteResult;\n+ // assert\nAssert.NotNull(result);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "@@ -199,40 +199,61 @@ public class TheSendContactOwnersMessageMethod\n[Fact]\npublic void WillCopySenderIfAsked()\n{\n- var from = new MailAddress(\"smangit@example.com\", \"flossy\");\n- var package = new PackageRegistration { Id = \"smangit\" };\n- package.Owners = new[]\n+ // arrange\n+ var packageId = \"smangit\";\n+ var packageVersion = \"1.0.0\";\n+ var fromAddress = \"smangit@example.com\";\n+ var fromName = \"flossy\";\n+ var ownerAddress = \"yung@example.com\";\n+ var ownerAddress2 = \"flynt@example.com\";\n+\n+ var from = new MailAddress(fromAddress, fromName);\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = packageId,\n+ Owners = new[]\n{\n- new User { EmailAddress = \"yung@example.com\", EmailAllowed = true },\n- new User { EmailAddress = \"flynt@example.com\", EmailAllowed = true }\n+ new User { EmailAddress = ownerAddress, EmailAllowed = true },\n+ new User { EmailAddress = ownerAddress2, EmailAllowed = true }\n+ }\n+ },\n+ Version = packageVersion\n};\n+\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n+ // act\nmessageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", true);\n-\nvar messages = messageService.MockMailSender.Sent;\n+\n+ // assert\nAssert.Equal(2, messages.Count);\n- Assert.Equal(package.Owners.Count, messages[0].To.Count);\n+ Assert.Equal(package.PackageRegistration.Owners.Count, messages[0].To.Count);\nAssert.Equal(1, messages[1].To.Count);\n- Assert.Equal(\"yung@example.com\", messages[0].To[0].Address);\n- Assert.Equal(\"flynt@example.com\", messages[0].To[1].Address);\n+ Assert.Equal(ownerAddress, messages[0].To[0].Address);\n+ Assert.Equal(ownerAddress2, messages[0].To[1].Address);\nAssert.Equal(messages[1].ReplyToList.Single(), messages[1].To.First());\nAssert.Equal(TestGalleryOwner, messages[0].From);\nAssert.Equal(TestGalleryOwner, messages[1].From);\n- Assert.Equal(\"smangit@example.com\", messages[0].ReplyToList.Single().Address);\n- Assert.Equal(\"smangit@example.com\", messages[1].ReplyToList.Single().Address);\n+ Assert.Equal(fromAddress, messages[0].ReplyToList.Single().Address);\n+ Assert.Equal(fromAddress, messages[1].ReplyToList.Single().Address);\n}\n[Fact]\npublic void WillSendEmailToAllOwners()\n{\nvar id = \"smangit\";\n+ var version = \"1.0.0\";\nvar owner1Email = \"yung@example.com\";\nvar owner2Email = \"flynt@example.com\";\nvar userUsername = \"flossy\";\nvar userEmail = \"smangit@example.com\";\nvar from = new MailAddress(userEmail, userUsername);\n- var package = new PackageRegistration\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n{\nId = id,\nOwners = new[]\n@@ -240,6 +261,8 @@ public void WillSendEmailToAllOwners()\nnew User { EmailAddress = owner1Email, EmailAllowed = true },\nnew User { EmailAddress = owner2Email, EmailAllowed = true }\n}\n+ },\n+ Version = version\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n@@ -255,22 +278,34 @@ public void WillSendEmailToAllOwners()\nAssert.Contains($\"[Joe Shmoe] Message for owners of the package '{id}'\", message.Subject);\nAssert.Contains(\"Test message\", message.Body);\nAssert.Contains(\n- $\"User {userUsername} <{userEmail}> sends the following message to the owners of Package '[{id}]({packageUrl})'.\",\n+ $\"User {userUsername} <{userEmail}> sends the following message to the owners of Package '[{id} {version}]({packageUrl})'.\",\nmessage.Body);\n}\n[Fact]\npublic void WillNotSendEmailToOwnerThatOptsOut()\n{\n- var from = new MailAddress(\"smangit@example.com\", \"flossy\");\n- var package = new PackageRegistration\n+ // arrange\n+ var packageId = \"smangit\";\n+ var packageVersion = \"1.0.0\";\n+ var fromAddress = \"smangit@example.com\";\n+ var fromName = \"flossy\";\n+ var ownerAddress = \"yung@example.com\";\n+ var ownerAddress2 = \"flynt@example.com\";\n+\n+ var from = new MailAddress(fromAddress, fromName);\n+ var package = new Package\n+ {\n+ PackageRegistration = new PackageRegistration\n{\n- Id = \"smangit\",\n+ Id = packageId,\nOwners = new[]\n{\n- new User { EmailAddress = \"yung@example.com\", EmailAllowed = true },\n- new User { EmailAddress = \"flynt@example.com\", EmailAllowed = false }\n+ new User { EmailAddress = ownerAddress, EmailAllowed = true },\n+ new User { EmailAddress = ownerAddress2, EmailAllowed = false }\n}\n+ },\n+ Version = packageVersion\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\n@@ -278,44 +313,74 @@ public void WillNotSendEmailToOwnerThatOptsOut()\nmessageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", false);\nvar message = messageService.MockMailSender.Sent.Last();\n- Assert.Equal(\"yung@example.com\", message.To[0].Address);\n+ // assert\n+ Assert.Equal(ownerAddress, message.To[0].Address);\nAssert.Equal(1, message.To.Count);\n}\n[Fact]\npublic void WillNotAttemptToSendIfNoOwnersAllow()\n{\n- var from = new MailAddress(\"smangit@example.com\", \"flossy\");\n- var package = new PackageRegistration\n+ // arrange\n+ var packageId = \"smangit\";\n+ var packageVersion = \"1.0.0\";\n+ var fromAddress = \"smangit@example.com\";\n+ var fromName = \"flossy\";\n+ var ownerAddress = \"yung@example.com\";\n+ var ownerAddress2 = \"flynt@example.com\";\n+\n+ var from = new MailAddress(fromAddress, fromName);\n+ var package = new Package\n{\n- Id = \"smangit\",\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = packageId,\nOwners = new[]\n{\n- new User { EmailAddress = \"yung@example.com\", EmailAllowed = false },\n- new User { EmailAddress = \"flynt@example.com\", EmailAllowed = false }\n+ new User { EmailAddress = ownerAddress, EmailAllowed = false },\n+ new User { EmailAddress = ownerAddress2, EmailAllowed = false }\n}\n+ },\n+ Version = packageVersion\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", false);\n+ // assert\nAssert.Empty(messageService.MockMailSender.Sent);\n}\n[Fact]\npublic void WillNotCopySenderIfNoOwnersAllow()\n{\n- var from = new MailAddress(\"smangit@example.com\", \"flossy\");\n- var package = new PackageRegistration { Id = \"smangit\" };\n- package.Owners = new[]\n+ // arrange\n+ var packageId = \"smangit\";\n+ var packageVersion = \"1.0.0\";\n+ var fromAddress = \"smangit@example.com\";\n+ var fromName = \"flossy\";\n+ var ownerAddress = \"yung@example.com\";\n+ var ownerAddress2 = \"flynt@example.com\";\n+\n+ var from = new MailAddress(fromAddress, fromName);\n+ var package = new Package\n{\n- new User { EmailAddress = \"yung@example.com\", EmailAllowed = false },\n- new User { EmailAddress = \"flynt@example.com\", EmailAllowed = false }\n+ PackageRegistration = new PackageRegistration\n+ {\n+ Id = packageId,\n+ Owners = new[]\n+ {\n+ new User { EmailAddress = ownerAddress, EmailAllowed = false },\n+ new User { EmailAddress = ownerAddress2, EmailAllowed = false }\n+ }\n+ },\n+ Version = packageVersion\n};\nvar messageService = TestableMessageService.Create(GetConfigurationService());\nmessageService.SendContactOwnersMessage(from, package, \"http://someurl/\", \"Test message\", \"http://someotherurl/\", false);\n+ // assert\nAssert.Empty(messageService.MockMailSender.Sent);\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Issue 4258 - ContactOwners e-mails contain the package version numer next to package id (#5116)
|
455,794 |
21.01.2018 19:50:23
| 28,800 |
5d29d5312b5e0918fe93ef26b20a75730786beb9
|
SQL fix and addressing feedback from demo
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Infrastructure/MigrateUserToOrganization.sql",
"new_path": "src/NuGetGallery.Core/Infrastructure/MigrateUserToOrganization.sql",
"diff": "@@ -14,7 +14,8 @@ WHERE NewOrganizationKey = @organizationKey\nAND AdminUserKey = @adminKey\nAND ConfirmationToken = @token\n-IF @requestCount > 0\n+IF @requestCount <= 0 RETURN\n+\nBEGIN TRANSACTION\nBEGIN TRY\n-- Change to Organization account with single admin membership\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -57,6 +57,7 @@ public static class Constants\npublic const string NuGetCommandLinePackageId = \"NuGet.CommandLine\";\npublic static readonly string ReturnUrlViewDataKey = \"ReturnUrl\";\n+ public static readonly string ReturnUrlMessageViewDataKey = \"ReturnUrlMessage\";\npublic const string AbsoluteLatestUrlString = \"absoluteLatest\";\npublic const string UrlValidationRegEx = @\"(https?):\\/\\/[^ \"\"]+$\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -67,6 +67,11 @@ public virtual ActionResult LogOn(string returnUrl)\n// I think it should be obvious why we don't want the current URL to be the return URL here ;)\nViewData[Constants.ReturnUrlViewDataKey] = returnUrl;\n+ if (TempData.ContainsKey(Constants.ReturnUrlMessageViewDataKey))\n+ {\n+ ViewData[Constants.ReturnUrlMessageViewDataKey] = TempData[Constants.ReturnUrlMessageViewDataKey];\n+ }\n+\nif (Request.IsAuthenticated)\n{\nreturn LoggedInRedirect(returnUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -109,8 +109,7 @@ public virtual ActionResult TransformToOrganization()\nstring errorReason;\nif (!_userService.CanTransformUserToOrganization(accountToTransform, out errorReason))\n{\n- TempData[\"TransformError\"] = errorReason;\n- return View(\"TransformFailed\");\n+ return TransformToOrganizationFailed(errorReason);\n}\nvar transformRequest = accountToTransform.OrganizationMigrationRequest;\n@@ -133,8 +132,7 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\nstring errorReason;\nif (!_userService.CanTransformUserToOrganization(accountToTransform, out errorReason))\n{\n- TempData[\"TransformError\"] = errorReason;\n- return View(\"TransformFailed\");\n+ return TransformToOrganizationFailed(errorReason);\n}\nvar adminUser = _userService.FindByUsername(transformViewModel.AdminUsername);\n@@ -153,9 +151,13 @@ public virtual async Task<ActionResult> TransformToOrganization(TransformAccount\nawait _userService.RequestTransformToOrganizationAccount(accountToTransform, adminUser);\n- // prompt for admin sign-on to confirm transformation\n+ // sign out pending organization and prompt for admin sign in\nOwinContext.Authentication.SignOut();\n- return Redirect(Url.ConfirmTransformAccount(accountToTransform));\n+\n+ TempData[Constants.ReturnUrlMessageViewDataKey] = String.Format(CultureInfo.CurrentCulture,\n+ Strings.TransformAccount_SignInToConfirm, adminUser.Username, accountToTransform.Username);\n+ var returnUrl = Url.ConfirmTransformAccount(accountToTransform);\n+ return Redirect(Url.LogOn(returnUrl));\n}\n[HttpGet]\n@@ -166,30 +168,28 @@ public virtual async Task<ActionResult> ConfirmTransformToOrganization(string ac\nvar adminUser = GetCurrentUser();\nif (!adminUser.Confirmed)\n{\n- TempData[\"TransformError\"] = Strings.TransformAccount_NotConfirmed;\n- return RedirectToAction(\"ConfirmationRequired\");\n+ return TransformToOrganizationFailed(Strings.TransformAccount_NotConfirmed);\n}\n+ string errorReason;\nvar accountToTransform = _userService.FindByUsername(accountNameToTransform);\nif (accountToTransform == null)\n{\n- TempData[\"TransformError\"] = String.Format(CultureInfo.CurrentCulture,\n+ errorReason = String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_OrganizationAccountDoesNotExist, accountNameToTransform);\n- return View(\"TransformFailed\");\n+ return TransformToOrganizationFailed(errorReason);\n}\n- string errorReason;\nif (!_userService.CanTransformUserToOrganization(accountToTransform, out errorReason))\n{\n- TempData[\"TransformError\"] = errorReason;\n- return View(\"TransformFailed\");\n+ return TransformToOrganizationFailed(errorReason);\n}\nif (!await _userService.TransformUserToOrganization(accountToTransform, adminUser, token))\n{\n- TempData[\"TransformError\"] = String.Format(CultureInfo.CurrentCulture,\n+ errorReason = String.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_Failed, accountNameToTransform);\n- return View(\"TransformFailed\");\n+ return TransformToOrganizationFailed(errorReason);\n}\nTempData[\"Message\"] = String.Format(CultureInfo.CurrentCulture,\n@@ -199,6 +199,11 @@ public virtual async Task<ActionResult> ConfirmTransformToOrganization(string ac\nreturn RedirectToAction(\"Account\");\n}\n+ private ActionResult TransformToOrganizationFailed(string errorMessage)\n+ {\n+ return View(\"TransformFailed\", new TransformAccountFailedViewModel(errorMessage));\n+ }\n+\n[HttpGet]\n[Authorize]\npublic virtual ActionResult DeleteRequest()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"ViewModels\\ScopeViewModel.cs\" />\n<Compile Include=\"ViewModels\\PackageListSearchViewModel.cs\" />\n<Compile Include=\"ViewModels\\ThirdPartyPackageManagerViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\TransformAccountFailedViewModel.cs\" />\n<Compile Include=\"ViewModels\\TransformAccountViewModel.cs\" />\n<Compile Include=\"WebApi\\PlainTextResult.cs\" />\n<Compile Include=\"WebApi\\QueryResult.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1489,7 +1489,7 @@ public class Strings {\n}\n/// <summary>\n- /// Looks up a localized string similar to Another tranform request was created on {0} with organization admin '{1}'..\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/// </summary>\npublic static string TransformAccount_RequestExists {\nget {\n@@ -1497,6 +1497,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Please sign in as administrator '{0}' to finish transforming account '{1}' into an organization..\n+ /// </summary>\n+ public static string TransformAccount_SignInToConfirm {\n+ get {\n+ return ResourceManager.GetString(\"TransformAccount_SignInToConfirm\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Account '{0}' was successfully transformed into an organization..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -734,6 +734,9 @@ 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} with organization admin '{1}'.</value>\n+ <value>Another tranform request was created on {0} for administrator '{1}'. Note that a new request will overwrite this request.</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</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": "Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\nvar returnUrl = (string)ViewData[Constants.ReturnUrlViewDataKey];\n+ var returnUrlMessage = (string)ViewData[Constants.ReturnUrlMessageViewDataKey];\n}\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+ @ViewHelpers.AlertInfo(@<text>@returnUrlMessage</text>)\n+ }\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": "<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@Html.ShowTextBoxFor(m => m.AdminUsername)\n@Html.ShowValidationMessagesFor(m => m.AdminUsername)\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -2400,11 +2400,13 @@ public void WhenCanTransformReturnsFalse_ShowsError()\nvar controller = CreateController(accountToTransform, canTransformErrorReason: \"error\");\n// Act\n- var result = controller.TransformToOrganization();\n+ var result = controller.TransformToOrganization() as ViewResult;\n// Assert\nAssert.NotNull(result);\n- Assert.Equal(\"error\", controller.TempData[\"TransformError\"]);\n+\n+ var model = result.Model as TransformAccountFailedViewModel;\n+ Assert.Equal(\"error\", model.ErrorMessage);\n}\n}\n@@ -2420,11 +2422,13 @@ public async Task WhenCanTransformReturnsFalse_ShowsError()\n// Act\nvar result = await controller.TransformToOrganization(new TransformAccountViewModel() {\nAdminUsername = \"OrgAdmin\"\n- });\n+ }) as ViewResult;\n// Assert\nAssert.NotNull(result);\n- Assert.Equal(\"error\", controller.TempData[\"TransformError\"]);\n+\n+ var model = result.Model as TransformAccountFailedViewModel;\n+ Assert.Equal(\"error\", model.ErrorMessage);\n}\n[Fact]\n@@ -2478,11 +2482,13 @@ public async Task WhenAdminIsNotConfirmed_ShowsError()\ncontroller.SetCurrentUser(currentUser);\n// Act\n- var result = await controller.ConfirmTransformToOrganization(\"account\", \"token\");\n+ var result = await controller.ConfirmTransformToOrganization(\"account\", \"token\") as ViewResult;\n// Assert\nAssert.NotNull(result);\n- Assert.Equal(Strings.TransformAccount_NotConfirmed, controller.TempData[\"TransformError\"]);\n+\n+ var model = result.Model as TransformAccountFailedViewModel;\n+ Assert.Equal(Strings.TransformAccount_NotConfirmed, model.ErrorMessage);\n}\n[Fact]\n@@ -2494,13 +2500,15 @@ public async Task WhenAccountToTransformIsNotFound_ShowsError()\ncontroller.SetCurrentUser(currentUser);\n// Act\n- var result = await controller.ConfirmTransformToOrganization(\"account\", \"token\");\n+ var result = await controller.ConfirmTransformToOrganization(\"account\", \"token\") as ViewResult;\n// Assert\nAssert.NotNull(result);\n+\n+ var model = result.Model as TransformAccountFailedViewModel;\nAssert.Equal(\nString.Format(CultureInfo.CurrentCulture, Strings.TransformAccount_OrganizationAccountDoesNotExist, \"account\"),\n- controller.TempData[\"TransformError\"]);\n+ model.ErrorMessage);\n}\n[Fact]\n@@ -2511,11 +2519,15 @@ public async Task WhenCanTransformReturnsFalse_ShowsError()\nvar controller = CreateController(accountToTransform, canTransformErrorReason: \"error\");\n// Act\n- var result = await controller.ConfirmTransformToOrganization(accountToTransform, \"token\");\n+ var result = await controller.ConfirmTransformToOrganization(accountToTransform, \"token\") as ViewResult;\n// Assert\nAssert.NotNull(result);\n- Assert.Equal(\"error\", controller.TempData[\"TransformError\"]);\n+\n+ var model = result.Model as TransformAccountFailedViewModel;\n+ Assert.Equal(\n+ \"error\",\n+ model.ErrorMessage);\n}\n[Fact]\n@@ -2526,14 +2538,16 @@ public async Task WhenUserServiceReturnsFalse_ShowsError()\nvar controller = CreateController(accountToTransform, success: false);\n// Act\n- var result = await controller.ConfirmTransformToOrganization(accountToTransform, \"token\");\n+ var result = await controller.ConfirmTransformToOrganization(accountToTransform, \"token\") as ViewResult;\n// Assert\nAssert.NotNull(result);\n+\n+ var model = result.Model as TransformAccountFailedViewModel;\nAssert.Equal(\nString.Format(CultureInfo.CurrentCulture,\nStrings.TransformAccount_Failed, \"account\"),\n- controller.TempData[\"TransformError\"]);\n+ model.ErrorMessage);\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
SQL fix and addressing feedback from demo (#5275)
|
455,776 |
23.01.2018 13:59:28
| 28,800 |
d8b1d5c529f086eca12c24f61e376536f9217c7c
|
[Organizations] Fix bugs with upload scenarios
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "using NuGetGallery.Areas.Admin.Models;\nusing NuGetGallery.Areas.Admin.Services;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Authentication;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Configuration.SecretReader;\nusing NuGetGallery.Cookies;\n@@ -241,6 +242,11 @@ protected override void Load(ContainerBuilder builder)\n.As<IReadMeService>()\n.InstancePerLifetimeScope();\n+ builder.RegisterType<ApiScopeEvaluator>()\n+ .AsSelf()\n+ .As<IApiScopeEvaluator>()\n+ .InstancePerLifetimeScope();\n+\nbuilder.RegisterType<SecurePushSubscription>()\n.SingleInstance();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Collections.Generic;\nusing System.Data;\nusing System.Data.SqlClient;\nusing System.Globalization;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -323,7 +323,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\n// For a new package id verify if the user is allowed to use it.\nif (existingPackageRegistration == null &&\nActionsRequiringPermissions.UploadNewPackageId.CheckPermissionsOnBehalfOfAnyAccount(\n- currentUser, new ActionOnNewPackageContext(id, _reservedNamespaceService)) != PermissionsCheckResult.Allowed)\n+ currentUser, new ActionOnNewPackageContext(id, _reservedNamespaceService), out accountsAllowedOnBehalfOf) != PermissionsCheckResult.Allowed)\n{\nModelState.AddModelError(\nstring.Empty, string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict));\n@@ -337,7 +337,8 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil\n// For existing package id verify if it is owned by the current user\nif (existingPackageRegistration != null)\n{\n- if (ActionsRequiringPermissions.UploadNewPackageVersion.CheckPermissionsOnBehalfOfAnyAccount(currentUser, existingPackageRegistration) != PermissionsCheckResult.Allowed)\n+ if (ActionsRequiringPermissions.UploadNewPackageVersion.CheckPermissionsOnBehalfOfAnyAccount(\n+ currentUser, existingPackageRegistration, out accountsAllowedOnBehalfOf) != PermissionsCheckResult.Allowed)\n{\nModelState.AddModelError(\nstring.Empty, string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable, existingPackageRegistration.Id));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -489,11 +489,6 @@ private PackageRegistration CreateOrGetPackageRegistration(User owner, User curr\n{\nvar packageRegistration = FindPackageRegistrationById(packageMetadata.Id);\n- if (packageRegistration != null && ActionsRequiringPermissions.EditPackage.CheckPermissions(currentUser, currentUser, packageRegistration) != PermissionsCheckResult.Allowed)\n- {\n- throw new EntityException(Strings.PackageIdNotAvailable, packageMetadata.Id);\n- }\n-\nif (packageRegistration == null)\n{\nif (_packageNamingConflictValidator.IdConflictsWithExistingPackageTitle(packageMetadata.Id))\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -3658,16 +3658,20 @@ public static IEnumerable<object[]> WillUploadThePackageWhenIdMatchesOwnedNamesp\n[MemberData(nameof(WillUploadThePackageWhenIdMatchesOwnedNamespace_Data))]\npublic async Task WillUploadThePackageWhenIdMatchesOwnedNamespace(User currentUser, User reservedNamespaceOwner)\n{\n+ var packageId = \"Random.Package1\";\n+ var version = \"1.0.0\";\n+\nvar fakeUploadedFile = new Mock<HttpPostedFileBase>();\nfakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n- var fakeFileStream = TestPackage.CreateTestPackageStream(\"Random.Package1\", \"1.0.0\");\n- fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+ var fakeUploadedFileStream = TestPackage.CreateTestPackageStream(packageId, version);\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeUploadedFileStream);\n+ var fakeSavedFileStream = TestPackage.CreateTestPackageStream(packageId, version);\nvar fakeUploadFileService = new Mock<IUploadFileService>();\nfakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(currentUser.Key)).Returns(Task.FromResult(0));\nfakeUploadFileService.SetupSequence(x => x.GetUploadFileAsync(currentUser.Key))\n.Returns(Task.FromResult<Stream>(null))\n- .Returns(Task.FromResult(fakeFileStream));\n+ .Returns(Task.FromResult(fakeSavedFileStream));\nfakeUploadFileService.Setup(x => x.SaveUploadFileAsync(currentUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));\nvar fakePackageService = new Mock<IPackageService>();\nfakePackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(() => null);\n@@ -3681,15 +3685,18 @@ public async Task WillUploadThePackageWhenIdMatchesOwnedNamespace(User currentUs\nGetConfigurationService(),\nuploadFileService: fakeUploadFileService,\npackageService: fakePackageService,\n- fakeNuGetPackage: fakeFileStream,\n+ fakeNuGetPackage: fakeSavedFileStream,\nreservedNamespaceService: fakeReservedNamespaceService);\ncontroller.SetCurrentUser(currentUser);\n- await controller.UploadPackage(fakeUploadedFile.Object);\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object);\nAssert.True(controller.ModelState.IsValid);\n- fakeUploadFileService.Verify(x => x.SaveUploadFileAsync(currentUser.Key, fakeFileStream));\n- fakeFileStream.Dispose();\n+ fakeUploadFileService.Verify(x => x.SaveUploadFileAsync(currentUser.Key, fakeUploadedFileStream));\n+ fakeUploadedFileStream.Dispose();\n+\n+ var model = result.Data as VerifyPackageRequest;\n+ Assert.Equal(reservedNamespaceOwner.Username, model.PossibleOwners.Single());\n}\npublic static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageAlreadyExists_Data\n@@ -3708,17 +3715,19 @@ public static IEnumerable<object[]> WillShowTheViewWithErrorsWhenThePackageAlrea\npublic async Task WillUploadThePackageWhenIdMatchesUnownedNamespaceButPackageExists(User currentUser, User existingPackageOwner)\n{\nvar packageId = \"Random.Package1\";\n+ var version = \"1.0.0\";\nvar fakeUploadedFile = new Mock<HttpPostedFileBase>();\nfakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n- var fakeFileStream = TestPackage.CreateTestPackageStream(packageId, \"1.0.0\");\n- fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+ var fakeUploadedFileStream = TestPackage.CreateTestPackageStream(packageId, version);\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeUploadedFileStream);\n+ var fakeSavedFileStream = TestPackage.CreateTestPackageStream(packageId, version);\nvar fakeUploadFileService = new Mock<IUploadFileService>();\nfakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(currentUser.Key)).Returns(Task.FromResult(0));\nfakeUploadFileService.SetupSequence(x => x.GetUploadFileAsync(currentUser.Key))\n.Returns(Task.FromResult<Stream>(null))\n- .Returns(Task.FromResult(fakeFileStream));\n+ .Returns(Task.FromResult(fakeSavedFileStream));\nfakeUploadFileService.Setup(x => x.SaveUploadFileAsync(currentUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));\nvar fakePackageService = new Mock<IPackageService>();\n@@ -3733,15 +3742,18 @@ public async Task WillUploadThePackageWhenIdMatchesUnownedNamespaceButPackageExi\nGetConfigurationService(),\nuploadFileService: fakeUploadFileService,\npackageService: fakePackageService,\n- fakeNuGetPackage: fakeFileStream,\n+ fakeNuGetPackage: fakeSavedFileStream,\nreservedNamespaceService: fakeReservedNamespaceService);\ncontroller.SetCurrentUser(currentUser);\n- await controller.UploadPackage(fakeUploadedFile.Object);\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object);\nAssert.True(controller.ModelState.IsValid);\n- fakeUploadFileService.Verify(x => x.SaveUploadFileAsync(currentUser.Key, fakeFileStream));\n- fakeFileStream.Dispose();\n+ fakeUploadFileService.Verify(x => x.SaveUploadFileAsync(currentUser.Key, fakeUploadedFileStream));\n+ fakeUploadedFileStream.Dispose();\n+\n+ var model = result.Data as VerifyPackageRequest;\n+ Assert.Equal(existingPackageOwner.Username, model.PossibleOwners.Single());\n}\n[Theory]\n@@ -4284,8 +4296,8 @@ private async Task VerifyCreateThePackage(User currentUser, User ownerInForm, bo\nIt.IsAny<string>(),\nIt.IsAny<PackageArchiveReader>(),\nIt.IsAny<PackageStreamMetadata>(),\n- It.IsAny<User>(),\n- It.IsAny<User>()), Times.Once);\n+ ownerInForm,\n+ currentUser), Times.Once);\n}\nelse\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -358,25 +358,6 @@ private async Task WillSaveTheCreatedPackageWhenThePackageRegistrationAlreadyExi\nAssert.Same(packageRegistration.Packages.ElementAt(0), package);\n}\n- [Fact]\n- private async Task WillThrowIfThePackageRegistrationAlreadyExistsAndTheCurrentUserIsNotAnOwner()\n- {\n- var currentUser = new User();\n- var packageRegistration = new PackageRegistration\n- {\n- Id = \"theId\",\n- Owners = new HashSet<User>()\n- };\n- var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n- var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:\n- mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(packageRegistration); });\n- var nugetPackage = PackageServiceUtility.CreateNuGetPackage();\n-\n- var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, currentUser, isVerified: false));\n-\n- Assert.Equal(String.Format(Strings.PackageIdNotAvailable, \"theId\"), ex.Message);\n- }\n-\n[Theory]\n[InlineData(\"Microsoft.FooBar\", \"Microsoft.FooBar\")]\n[InlineData(\"Microsoft.FooBar\", \"microsoft.foobar\")]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Organizations] Fix bugs with upload scenarios (#5330)
|
455,736 |
24.01.2018 11:31:39
| 28,800 |
965b236dbbcca6b17c89f6c7029809c410c8c082
|
Add new validation issue messages
Progress on
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Reference Include=\"NuGet.Protocol, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\NuGet.Protocol.4.3.0-preview1-2524\\lib\\net45\\NuGet.Protocol.dll</HintPath>\n</Reference>\n- <Reference Include=\"NuGet.Services.Contracts, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.Contracts.2.7.2\\lib\\net45\\NuGet.Services.Contracts.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.Contracts, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.Contracts.2.10.0\\lib\\net45\\NuGet.Services.Contracts.dll</HintPath>\n</Reference>\n<Reference Include=\"NuGet.Services.KeyVault, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\NuGet.Services.KeyVault.1.0.0.0\\lib\\net45\\NuGet.Services.KeyVault.dll</HintPath>\n<HintPath>..\\..\\packages\\NuGet.Services.Platform.Client.3.0.29-r-master\\lib\\portable-net45+wp80+win\\NuGet.Services.Platform.Client.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"NuGet.Services.ServiceBus, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.ServiceBus.2.7.2\\lib\\net45\\NuGet.Services.ServiceBus.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.ServiceBus, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.ServiceBus.2.10.0\\lib\\net45\\NuGet.Services.ServiceBus.dll</HintPath>\n</Reference>\n- <Reference Include=\"NuGet.Services.Validation, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.Validation.2.7.2\\lib\\net45\\NuGet.Services.Validation.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.Validation, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.Validation.2.10.0\\lib\\net45\\NuGet.Services.Validation.dll</HintPath>\n</Reference>\n- <Reference Include=\"NuGet.Services.Validation.Issues, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.Validation.Issues.2.7.2\\lib\\net45\\NuGet.Services.Validation.Issues.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.Validation.Issues, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.Validation.Issues.2.10.0\\lib\\net45\\NuGet.Services.Validation.Issues.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"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ValidationService.cs",
"new_path": "src/NuGetGallery/Services/ValidationService.cs",
"diff": "@@ -75,7 +75,7 @@ public IReadOnlyList<ValidationIssue> GetLatestValidationIssues(Package package)\n// If the package failed validation, use the generic error message.\nif (issues == null || !issues.Any())\n{\n- issues = new[] { new UnknownIssue() };\n+ issues = new[] { ValidationIssue.Unknown };\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"diff": "</text>\n}\nbreak;\n+ case ValidationIssueCode.PackageIsZip64:\n+ <text>\n+ Zip64 packages are not supported.\n+ </text>\n+ break;\n+ case ValidationIssueCode.OnlyAuthorSignaturesSupported:\n+ <text>\n+ Signed packages must only have an author signature. Other signature types are not supported.\n+ </text>\n+ break;\n+ case ValidationIssueCode.AuthorAndRepositoryCounterSignaturesNotSupported:\n+ <text>\n+ Author countersignatures and repository countersignatures are not supported.\n+ </text>\n+ break;\n+ case ValidationIssueCode.OnlySignatureFormatVersion1Supported:\n+ <text>\n+ <b>NU3007:</b> Package signatures must have format version 1.\n+ </text>\n+ break;\ndefault:\n<text>\n<strong>Package publishing failed.</strong> This package could not be published since package validation\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/packages.config",
"new_path": "src/NuGetGallery/packages.config",
"diff": "<package id=\"NuGet.Packaging\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"NuGet.Packaging.Core\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"NuGet.Protocol\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.Contracts\" version=\"2.7.2\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.Contracts\" version=\"2.10.0\" targetFramework=\"net46\" />\n<package id=\"NuGet.Services.KeyVault\" version=\"1.0.0.0\" targetFramework=\"net46\" />\n<package id=\"NuGet.Services.Logging\" version=\"2.2.3.0\" targetFramework=\"net46\" />\n<package id=\"NuGet.Services.Owin\" version=\"2.2.3\" targetFramework=\"net46\" />\n<package id=\"NuGet.Services.Platform.Client\" version=\"3.0.29-r-master\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.ServiceBus\" version=\"2.7.2\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.Validation\" version=\"2.7.2\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.Validation.Issues\" version=\"2.7.2\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.ServiceBus\" version=\"2.10.0\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.Validation\" version=\"2.10.0\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.Validation.Issues\" version=\"2.10.0\" targetFramework=\"net46\" />\n<package id=\"NuGet.Versioning\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"ODataNullPropagationVisitor\" version=\"0.5.4237.2641\" targetFramework=\"net46\" />\n<package id=\"Owin\" version=\"1.0\" targetFramework=\"net46\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Reference Include=\"NuGet.Protocol, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\NuGet.Protocol.4.3.0-preview1-2524\\lib\\net45\\NuGet.Protocol.dll</HintPath>\n</Reference>\n- <Reference Include=\"NuGet.Services.Contracts, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.Contracts.2.7.2\\lib\\net45\\NuGet.Services.Contracts.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.Contracts, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.Contracts.2.10.0\\lib\\net45\\NuGet.Services.Contracts.dll</HintPath>\n</Reference>\n<Reference Include=\"NuGet.Services.KeyVault, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\NuGet.Services.KeyVault.1.0.0.0\\lib\\net45\\NuGet.Services.KeyVault.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"NuGet.Services.ServiceBus, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.ServiceBus.2.7.2\\lib\\net45\\NuGet.Services.ServiceBus.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.ServiceBus, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.ServiceBus.2.10.0\\lib\\net45\\NuGet.Services.ServiceBus.dll</HintPath>\n</Reference>\n- <Reference Include=\"NuGet.Services.Validation, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.Validation.2.7.2\\lib\\net45\\NuGet.Services.Validation.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.Validation, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.Validation.2.10.0\\lib\\net45\\NuGet.Services.Validation.dll</HintPath>\n</Reference>\n- <Reference Include=\"NuGet.Services.Validation.Issues, Version=2.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.Validation.Issues.2.7.2\\lib\\net45\\NuGet.Services.Validation.Issues.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.Validation.Issues, Version=2.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.Validation.Issues.2.10.0\\lib\\net45\\NuGet.Services.Validation.Issues.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"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ValidationServiceFacts.cs",
"diff": "@@ -142,7 +142,7 @@ public void DeduplicatesValidationIssuesByCodeAndData()\n{\nKey = 2,\nIssueCode = ValidationIssueCode.PackageIsSigned,\n- Data = new PackageIsSigned().Serialize(),\n+ Data = ValidationIssue.PackageIsSigned.Serialize(),\n},\nnew PackageValidationIssue\n{\n@@ -179,7 +179,7 @@ public void DeduplicatesValidationIssuesByCodeAndData()\nAssert.Equal(4, issues.Count);\n- Assert.IsType<PackageIsSigned>(issues[0]);\n+ Assert.Equal(ValidationIssueCode.PackageIsSigned, issues[0].IssueCode);\nvar issue1 = Assert.IsType<ClientSigningVerificationFailure>(issues[1]);\nAssert.Equal(\"NU3001\", issue1.ClientCode);\n@@ -189,7 +189,7 @@ public void DeduplicatesValidationIssuesByCodeAndData()\nAssert.Equal(\"NU3000\", issue2.ClientCode);\nAssert.Equal(\"Please endorse.\", issue2.ClientMessage);\n- var issue3 = Assert.IsType<UnknownIssue>(issues[3]);\n+ Assert.Equal(ValidationIssueCode.Unknown, issues[3].IssueCode);\n}\n[Fact]\n@@ -223,7 +223,7 @@ public void ReturnsSingleUnknownIssueIfNoneArePersisted()\n_validationSets.Verify(x => x.GetAll(), Times.Once);\nvar issue = Assert.Single(issues);\n- Assert.IsType<UnknownIssue>(issue);\n+ Assert.Equal(ValidationIssueCode.Unknown, issue.IssueCode);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"diff": "@@ -94,8 +94,12 @@ public static IEnumerable<ValidationIssue> KnownValidationIssues\n{\nget\n{\n- yield return new PackageIsSigned();\n+ yield return ValidationIssue.PackageIsSigned;\nyield return new ClientSigningVerificationFailure(\"NU3000\", \"Some signing error.\");\n+ yield return ValidationIssue.PackageIsZip64;\n+ yield return ValidationIssue.OnlyAuthorSignaturesSupported;\n+ yield return ValidationIssue.AuthorAndRepositoryCounterSignaturesNotSupported;\n+ yield return ValidationIssue.OnlySignatureFormatVersion1Supported;\n}\n}\n@@ -103,7 +107,7 @@ public static IEnumerable<ValidationIssue> UnknownValidationIssues\n{\nget\n{\n- yield return new UnknownIssue();\n+ yield return ValidationIssue.Unknown;\n#pragma warning disable 0618\nyield return new ObsoleteTestingIssue(\"a\", 1);\n#pragma warning restore 0618\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/packages.config",
"new_path": "tests/NuGetGallery.Facts/packages.config",
"diff": "<package id=\"NuGet.Packaging\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"NuGet.Packaging.Core\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"NuGet.Protocol\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.Contracts\" version=\"2.7.2\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.Contracts\" version=\"2.10.0\" targetFramework=\"net46\" />\n<package id=\"NuGet.Services.KeyVault\" version=\"1.0.0.0\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.ServiceBus\" version=\"2.7.2\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.Validation\" version=\"2.7.2\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.Validation.Issues\" version=\"2.7.2\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.ServiceBus\" version=\"2.10.0\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.Validation\" version=\"2.10.0\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.Validation.Issues\" version=\"2.10.0\" targetFramework=\"net46\" />\n<package id=\"NuGet.Versioning\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"Owin\" version=\"1.0\" targetFramework=\"net46\" />\n<package id=\"PoliteCaptcha\" version=\"0.4.0.1\" targetFramework=\"net46\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add new validation issue messages (#5343)
Progress on https://github.com/NuGet/Engineering/issues/785
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.