-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Block control codes and truncate longer configuration text blocks (#4438
) Cherry-pick #4436 to 1.7
- Loading branch information
Showing
20 changed files
with
816 additions
and
411 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -347,6 +347,7 @@ und | |
| UNICODESTRING | ||
| uninstalling | ||
| Unmarshal | ||
| unskipped | ||
| untimes | ||
| updatefile | ||
| updatemanifest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,6 +110,7 @@ ECustom | |
| EFGH | ||
| EFile | ||
| efileresource | ||
| EMalicious | ||
| endregion | ||
| ENDSESSION | ||
| EPester | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
505 changes: 295 additions & 210 deletions
505
src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
src/AppInstallerCLIE2ETests/TestData/Configuration/LargeContentStrings.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| properties: | ||
| configurationVersion: 0.2 | ||
| resources: | ||
| - resource: xE2EMalicious/E2EMalicious | ||
| id: firstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirst | ||
| directives: | ||
| repository: AppInstallerCLIE2ETestsRepo | ||
| description: "Line1\nLine2\nLine3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3\nLine4\nLine5\nLine6" | ||
| settings: | ||
| key: Foo | ||
| description: "Line1\nLine2\nLine3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3\nLine4\nLine5\nLine6" | ||
| - resource: Unknown | ||
| dependsOn: | ||
| - firstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirstfirst | ||
| directives: | ||
| module: UnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknownUnknown | ||
| repository: AppInstallerCLIE2ETestsRepo | ||
| description: "Line1\nLine2\nLine3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3\nLine4\nLine5\nLine6" | ||
| settings: | ||
| Path: ${WinGetConfigRoot}\ConfigServerUnexpectedExit.txt | ||
| Content: Contents! | ||
| description: "Line1\nLine2\nLine3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3Line3\nLine4\nLine5\nLine6" |
33 changes: 33 additions & 0 deletions
33
src/AppInstallerCLIE2ETests/TestData/Configuration/Modules/xE2EMalicious/xE2EMalicious.psd1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # | ||
| # Module manifest for module 'xE2ETestResource' | ||
| # | ||
|
|
||
| @{ | ||
|
|
||
| RootModule = 'xE2EMalicious.psm1' | ||
| ModuleVersion = '0.0.0.1' | ||
| GUID = 'a0be43e8-ac22-4244-8efc-7263dfa50b92' | ||
| CompatiblePSEditions = 'Core' | ||
| Author = "WinGet Dev Team" | ||
| CompanyName = 'Microsoft Corporation' | ||
| Copyright = '(c) Microsoft Corporation. All rights reserved.' | ||
| Description = "PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests | PowerShell module with DSC resources for unit tests" | ||
| PowerShellVersion = '7.2' | ||
| FunctionsToExport = @() | ||
| CmdletsToExport = @() | ||
| DscResourcesToExport = @( | ||
| 'E2EMalicious' | ||
| ) | ||
| HelpInfoURI = 'https://www.contoso.com/help' | ||
|
|
||
| # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell. | ||
| PrivateData = @{ | ||
|
|
||
| PSData = @{ | ||
| ProjectUri = 'https://github.com/microsoft/winget-cli' | ||
| IconUri = 'https://www.contoso.com/icons/icon.png' | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
86 changes: 86 additions & 0 deletions
86
src/AppInstallerCLIE2ETests/TestData/Configuration/Modules/xE2EMalicious/xE2EMalicious.psm1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| # E2E module with resources. | ||
|
|
||
| enum Ensure | ||
| { | ||
| Absent | ||
| Present | ||
| } | ||
|
|
||
| # This resource just checks if a file is there or not with and if its with the specified content. | ||
| [DscResource()] | ||
| class E2EMalicious | ||
| { | ||
| [DscProperty(Key)] | ||
| [string] $Path | ||
|
|
||
| [DscProperty()] | ||
| [Ensure] $Ensure = [Ensure]::Present | ||
|
|
||
| [DscProperty()] | ||
| [string] $Content = $null | ||
|
|
||
| [E2EFileResource] Get() | ||
| { | ||
| if ([string]::IsNullOrEmpty($this.Path)) | ||
| { | ||
| throw | ||
| } | ||
|
|
||
| $fileContent = $null | ||
| if (Test-Path -Path $this.Path -PathType Leaf) | ||
| { | ||
| $fileContent = Get-Content $this.Path -Raw | ||
| } | ||
|
|
||
| $result = @{ | ||
| Path = $this.Path | ||
| Content = $fileContent | ||
| } | ||
|
|
||
| return $result | ||
| } | ||
|
|
||
| [bool] Test() | ||
| { | ||
| $get = $this.Get() | ||
|
|
||
| if (Test-Path -Path $this.Path -PathType Leaf) | ||
| { | ||
| if ($this.Ensure -eq [Ensure]::Present) | ||
| { | ||
| return $this.Content -eq $get.Content | ||
| } | ||
| } | ||
| elseif ($this.Ensure -eq [Ensure]::Absent) | ||
| { | ||
| return $true | ||
| } | ||
|
|
||
| return $false | ||
| } | ||
|
|
||
| [void] Set() | ||
| { | ||
| if (-not $this.Test()) | ||
| { | ||
| if (Test-Path -Path $this.Path -PathType Leaf) | ||
| { | ||
| if ($this.Ensure -eq [Ensure]::Present) | ||
| { | ||
| Set-Content $this.Path $this.Content -NoNewline | ||
| } | ||
| else | ||
| { | ||
| Remove-Item $this.Path | ||
| } | ||
| } | ||
| else | ||
| { | ||
| if ($this.Ensure -eq [Ensure]::Present) | ||
| { | ||
| Set-Content $this.Path $this.Content -NoNewline | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
src/AppInstallerCLITests/TestData/ContainsEscapeControlCode.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| key: "This is the ESCAPE control code: \x1b" |
Oops, something went wrong.