Skip to content

fix: accept YAML block-scalar trailing line breaks in schema patterns #6596

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

Open
lsmlhi_25 (FOWEPJF255) wants to merge 2 commits into
base: master
Choose a base branch
from
+56 −2
Open

fix: accept YAML block-scalar trailing line breaks in schema patterns #6596

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
b74f184
fix: accept YAML block-scalar trailing line breaks in schema patterns
FOWEPJF255 Oct 17, 2026
ff8a491
fix: validate schema patterns with multiline regex
FOWEPJF255 Oct 29, 2026
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
3 changes: 3 additions & 0 deletions src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@
<CopyFileToFolders Include="TestData\Manifest-Good-DefaultExpectedReturnCodeInInstallerSuccessCodes.yaml">
<DeploymentContent>true</DeploymentContent>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Good-InstallerUrl-BlockScalar.yaml">
<DeploymentContent>true</DeploymentContent>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Good-MultipleArpVersionDeclared.yaml">
<DeploymentContent>true</DeploymentContent>
</CopyFileToFolders>
Expand Down
3 changes: 3 additions & 0 deletions src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,9 @@
<CopyFileToFolders Include="TestData\Manifest-Good-DefaultExpectedReturnCodeInInstallerSuccessCodes.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Good-InstallerUrl-BlockScalar.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Good-InstallerTypeExeRoot-Silent.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
Expand Down
17 changes: 17 additions & 0 deletions src/AppInstallerCLITests/TestData/Manifest-Good-InstallerUrl-BlockScalar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.1.0.schema.json

PackageIdentifier: microsoft.msixsdk
PackageName: MSIX SDK
PackageVersion: 1.07.32-beta
Publisher: Microsoft
ShortDescription: description
License: Test
PackageLocale: en-US
Installers:
- Architecture: x86
InstallerUrl: >
https://ThisIsNotUsed
InstallerSha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
InstallerType: msi
ManifestType: singleton
ManifestVersion: 1.1.0
10 changes: 10 additions & 0 deletions src/AppInstallerCLITests/YamlManifest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,15 @@ TEST_CASE("ReadGoodManifestWithSpaces", "[ManifestValidation]")
REQUIRE(manifest.DefaultInstallerInfo.FileExtensions == MultiValue{ "appx", "appxbundle", "msix", "msixbundle" });
}

TEST_CASE("ReadGoodManifestInstallerUrlBlockScalar", "[ManifestValidation]")
{
ManifestValidateOption validateOption = GetTestManifestValidateOption();
Manifest manifest = YamlParser::CreateFromPath(TestDataFile("Manifest-Good-InstallerUrl-BlockScalar.yaml"), validateOption);

REQUIRE(manifest.Installers.size() == 1);
REQUIRE(manifest.Installers[0].Url == "https://ThisIsNotUsed\n");
}

TEST_CASE("ReadGoodManifests", "[ManifestValidation]")
{
ManifestTestCase TestCases[] =
Expand All @@ -973,6 +982,7 @@ TEST_CASE("ReadGoodManifests", "[ManifestValidation]")
{ "Manifest-Good-Minimum-InstallerType.yaml" },
{ "Manifest-Good-Switches.yaml" },
{ "Manifest-Good-DefaultExpectedReturnCodeInInstallerSuccessCodes.yaml" },
{ "Manifest-Good-InstallerUrl-BlockScalar.yaml" },
{ "Manifest-Good-InstallerTypeZip-PortableExe.yaml" },
{ "Manifest-Good-InstallerTypeZip-PortableExeUppercase.yaml" },
};
Expand Down
25 changes: 23 additions & 2 deletions src/AppInstallerSharedLib/JsonSchemaValidation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,29 @@
#include "winget/JsonSchemaValidation.h"
#include "winget/Resources.h"

#include <regex>

namespace AppInstaller::JsonSchema
{
namespace
{
struct MultilineRegexEngine
{
explicit MultilineRegexEngine(const std::string& pattern) :
Regex(pattern, std::regex_constants::ECMAScript | std::regex_constants::multiline)
{
}

static bool search(const std::string& target, const MultilineRegexEngine& expression)
{
return std::regex_search(target, expression.Regex);
}

private:
std::regex Regex;
};
}

Json::Value LoadSchemaDoc(std::string_view schemaStr)
{
Json::Value schemaJson;
Expand Down Expand Up @@ -35,7 +56,7 @@ namespace AppInstaller::JsonSchema

bool Validate(const valijson::Schema& schema, const Json::Value& json, valijson::ValidationResults& results)
{
valijson::Validator schemaValidator;
valijson::ValidatorT<MultilineRegexEngine> schemaValidator;
valijson::adapters::JsonCppAdapter jsonAdapter(json);
return schemaValidator.validate(schema, jsonAdapter, &results);
}
Expand All @@ -59,4 +80,4 @@ namespace AppInstaller::JsonSchema

return ss.str();
}
}
}
Loading