Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect if package only differ by metadata and show optimal user-facing error message #3970

Merged
merged 2 commits into from
May 16, 2017
Merged

Detect if package only differ by metadata and show optimal user-facing error message #3970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af1228e
Detect if package only differ by metadata and show optimal user-facin…
xavierdecoster May 16, 2017
fec884b
fix broken test + added another one
xavierdecoster May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions src/NuGetGallery/Controllers/PackagesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,35 @@ public virtual async Task<ActionResult> UploadPackage(HttpPostedFileBase uploadF
return View();
}

var package = _packageService.FindPackageByIdAndVersionStrict(nuspec.GetId(), nuspec.GetVersion().ToStringSafe());
if (package != null)
var nuspecVersion = nuspec.GetVersion();
var existingPackage = _packageService.FindPackageByIdAndVersionStrict(nuspec.GetId(), nuspecVersion.ToStringSafe());
if (existingPackage != null)
{
ModelState.AddModelError(
string.Empty,
string.Format(
CultureInfo.CurrentCulture, Strings.PackageExistsAndCannotBeModified, package.PackageRegistration.Id, package.Version));
// Determine if the package versions only differ by metadata,
// and provide the most optimal the user-facing error message.
var existingPackageVersion = new NuGetVersion(existingPackage.Version);
if ((existingPackageVersion.HasMetadata || nuspecVersion.HasMetadata)
&& !string.Equals(existingPackageVersion.Metadata, nuspecVersion.Metadata))
{
ModelState.AddModelError(
string.Empty,
string.Format(
CultureInfo.CurrentCulture,
Strings.PackageVersionDiffersOnlyByMetadataAndCannotBeModified,
existingPackage.PackageRegistration.Id,
existingPackage.Version));
}
else
{
ModelState.AddModelError(
string.Empty,
string.Format(
CultureInfo.CurrentCulture,
Strings.PackageExistsAndCannotBeModified,
existingPackage.PackageRegistration.Id,
existingPackage.Version));
}

return View();
}

Expand Down
11 changes: 10 additions & 1 deletion src/NuGetGallery/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/NuGetGallery/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,4 +443,7 @@ The {1} Team</value>
<data name="SecurityPolicy_RequireMinClientVersionForPush" xml:space="preserve">
<value>Your account requires client version '{0}' or higher to be able to push packages. Please contact support@nuget.org to get more details.</value>
</data>
<data name="PackageVersionDiffersOnlyByMetadataAndCannotBeModified" xml:space="preserve">
<value>Package versions that differ only by metadata cannot be uploaded. A package with ID '{0}' and version '{1}' already exists and cannot be modified.</value>
</data>
</root>
27 changes: 25 additions & 2 deletions tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists()
fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);
var fakePackageService = new Mock<IPackageService>();
fakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(
new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" });
new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "1.0.0" });
var controller = CreateController(
packageService: fakePackageService);
controller.SetCurrentUser(TestUtility.FakeUser);
Expand All @@ -1104,7 +1104,30 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists()
Assert.NotNull(result);
Assert.False(controller.ModelState.IsValid);
Assert.Equal(
String.Format(Strings.PackageExistsAndCannotBeModified, "theId", "theVersion"),
String.Format(Strings.PackageExistsAndCannotBeModified, "theId", "1.0.0"),
controller.ModelState[String.Empty].Errors[0].ErrorMessage);
}

[Fact]
public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExistsAndOnlyDiffersByMetadata()
{
var fakeUploadedFile = new Mock<HttpPostedFileBase>();
fakeUploadedFile.Setup(x => x.FileName).Returns("theFile.nupkg");
var fakeFileStream = TestPackage.CreateTestPackageStream("theId", "1.0.0+metadata2");
fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);
var fakePackageService = new Mock<IPackageService>();
fakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(
new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "1.0.0+metadata" });
var controller = CreateController(
packageService: fakePackageService);
controller.SetCurrentUser(TestUtility.FakeUser);

var result = await controller.UploadPackage(fakeUploadedFile.Object) as ViewResult;

Assert.NotNull(result);
Assert.False(controller.ModelState.IsValid);
Assert.Equal(
String.Format(Strings.PackageVersionDiffersOnlyByMetadataAndCannotBeModified, "theId", "1.0.0+metadata"),
controller.ModelState[String.Empty].Errors[0].ErrorMessage);
}

Expand Down