validate that the path is absolute

Author: SteveL-MSFT

dsc/tests/dsc_extension_discover.ps1

@@ -5,7 +5,8 @@ Describe 'Discover extension tests' {
     BeforeAll {
         $oldPath = $env:PATH
         $separator = [System.IO.Path]::PathSeparator
-        $env:PATH = "$PSScriptRoot$separator$oldPath"
+        $toolPath = Resolve-Path -Path "$PSScriptRoot/../../extensions/test/discover"
+        $env:PATH = "$toolPath$separator$oldPath"
     }
 
     AfterAll {
@@ -50,4 +51,43 @@ Describe 'Discover extension tests' {
         $out.results[1].type | Should -BeExactly 'Test/DiscoveredTwo'
         $out.results[1].result.actualState.Output | Should -BeExactly 'Hello Two'
     }
+
+    It 'Relative path from discovery will fail' {
+        $extension_json = @'
+{
+    "$schema": "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json",
+    "type": "Test/DiscoverRelative",
+    "version": "0.1.0",
+    "description": "Test discover resource",
+    "discover": {
+        "executable": "pwsh",
+        "args": [
+            "-NoLogo",
+            "-NonInteractive",
+            "-NoProfile",
+            "-Command",
+            "./discover.ps1",
+            "-RelativePath"
+            ]
+    }
+}
+'@
+        Set-Content -Path "$TestDrive/test.dsc.extension.json" -Value $extension_json
+        Copy-Item -Path "$toolPath/discover.ps1" -Destination $TestDrive | Out-Null
+        Copy-Item -Path "$toolPath/resources" -Destination $TestDrive -Recurse | Out-Null
+        $env:DSC_RESOURCE_PATH = $TestDrive
+        try {
+            $out = dsc extension list | ConvertFrom-Json
+            $out.Count | Should -Be 1
+            $out.type | Should -Be 'Test/DiscoverRelative'
+            $out = dsc resource list 2> $TestDrive/error.log
+            write-verbose -verbose (Get-Content -Path "$TestDrive/error.log" -Raw)
+            $LASTEXITCODE | Should -Be 0
+            $out | Should -BeNullOrEmpty
+            $errorMessage = Get-Content -Path "$TestDrive/error.log" -Raw
+            $errorMessage | Should -BeLike '*is not an absolute path*'
+        } finally {
+            $env:DSC_RESOURCE_PATH = $null
+        }
+    }
 }

dsc_lib/locales/en-us.toml

@@ -169,6 +169,7 @@ resourceManifestSchemaDescription = "Defines the JSON Schema the resource manife
 
 [extensions.dscextension]
 discoverNoResults = "No results returned for discovery extension '%{extension}'"
+discoverNotAbsolutePath = "Resource path from extension '%{extension}' is not an absolute path: %{path}"
 
 [extensions.extension_manifest]
 extensionManifestSchemaTitle = "Extension manifest schema URI"

dsc_lib/src/dscerror.rs

@@ -29,6 +29,9 @@ pub enum DscError {
     #[error("{t} {0} {t2} '{1}'", t = t!("dscerror.commandOperation"), t2 = t!("dscerror.forExecutable"))]
     CommandOperation(String, String),
 
+    #[error("{0}")]
+    Extension(String),
+
     #[error("{t} '{0}' {t2}: {1}", t = t!("dscerror.function"), t2 = t!("dscerror.error"))]
     Function(String, String),
 

dsc_lib/src/extensions/dscextension.rs

@@ -105,6 +105,9 @@ impl DscExtension {
                             return Err(DscError::Json(err));
                         }
                     };
+                    if !Path::new(&discover_result.resource_manifest_path).is_absolute() {
+                        return Err(DscError::Extension(t!("extensions.dscextension.discoverNotAbsolutePath", extension = self.type_name.clone(), path = discover_result.resource_manifest_path.clone()).to_string()));
+                    }
                     let manifest_path = Path::new(&discover_result.resource_manifest_path);
                     // Currently we don't support extensions discovering other extensions
                     if let ManifestResource::Resource(resource) = load_manifest(manifest_path)? {

extensions/test/discover/discover.ps1

@@ -1,9 +1,19 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+[CmdletBinding()]
+param(
+    [Parameter()]
+    [switch]$RelativePath
+)
+
 Get-ChildItem -Path $PSScriptRoot/resources/*.json | ForEach-Object {
     $resource = [pscustomobject]@{
-        resourceManifestPath = $_.FullName
+        resourceManifestPath = if ($RelativePath) {
+            Resolve-Path -Path $_.FullName -Relative
+        } else {
+            $_.FullName
+        }
     }
     $resource | ConvertTo-Json -Compress
 }