Skip to content

Relax Version validation #114

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

Merged
yao-msft merged 2 commits into from
May 9, 2020
+13 −3
Merged

Relax Version validation #114

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
03640fd
Relax Version validation
yao-msft May 8, 2020
ff23e31
Relax Version more
yao-msft May 9, 2020
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
2 changes: 1 addition & 1 deletion src/AppInstallerCLITests/TestData/Manifest-Bad-VersionInvalid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Bad manifest. Invalid version
Id: microsoft.msixsdk
Name: MSIX SDK
Version: Not.A.Version
Version: 1.0.9-/
Publisher: Microsoft
InstallerType: Zip
Installers:
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLITests/TestData/Manifest-Good-Minimum.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Minimum required
Id: microsoft.msixsdk
Name: MSIX SDK
Version: 1.7.32
Version: 1.07.32-beta
Publisher: Microsoft
InstallerType: Zip
Installers:
Expand Down
12 changes: 11 additions & 1 deletion src/AppInstallerRepositoryCore/Manifest/Manifest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace AppInstaller::Manifest
{ "Id", [this](const YAML::Node& value) { Id = value.as<std::string>(); Utility::Trim(Id); }, true, "^[\\S]+\\.[\\S]+$" },
{ "Name", [this](const YAML::Node& value) { Name = value.as<std::string>(); Utility::Trim(Name); }, true },
{ "Version", [this](const YAML::Node& value) { Version = value.as<std::string>(); Utility::Trim(Version); }, true,
"^(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(\\.(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])){0,3}$" },
/* File name chars not allowed */ "^[^\\\\/:\\*\\?\"<>\\|\\x01-\\x1f]+$" },
{ "Publisher", [this](const YAML::Node& value) { Publisher = value.as<std::string>(); }, true },
{ "AppMoniker", [this](const YAML::Node& value) { AppMoniker = value.as<std::string>(); Utility::Trim(AppMoniker); } },
{ "Channel", [this](const YAML::Node& value) { Channel = value.as<std::string>(); Utility::Trim(Channel); } },
Expand Down Expand Up @@ -151,6 +151,16 @@ namespace AppInstaller::Manifest
resultErrors.emplace_back(ManifestError::FieldNotSupported, "Channel", Channel);
}

try
{
// Version value should be successfully parsed
Utility::Version test{ Version };
}
catch (const std::exception&)
{
resultErrors.emplace_back(ManifestError::InvalidFieldValue, "Version", Version);
}

// Check duplicate installer entry. {installerType, arch, language and scope} combination is the key.
// Todo: use the comparator from ManifestComparator when that one is fully implemented.
auto installerCmp = [](const ManifestInstaller& in1, const ManifestInstaller& in2)
Expand Down