add error handling for non-Windows

Author: tgauth

sshdconfig/Cargo.toml

@@ -17,7 +17,6 @@ lto = true
 atty = { version = "0.2" }
 chrono = { version = "0.4" }
 clap = { version = "4.5", features = ["derive"] }
-registry_lib = { path = "../registry_lib" }
 schemars = "0.9"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
@@ -28,5 +27,8 @@ tree-sitter = "0.25"
 tree-sitter-rust = "0.24"
 tree-sitter-ssh-server-config = { path = "../tree-sitter-ssh-server-config" }
 
+[target.'cfg(windows)'.dependencies]
+registry_lib = { path = "../registry_lib" }
+
 [build-dependencies]
 cc="*"

sshdconfig/src/error.rs

@@ -17,6 +17,7 @@ pub enum SshdConfigError {
     ParserError(String),
     #[error("Parser Int: {0}")]
     ParseIntError(#[from] std::num::ParseIntError),
+    #[cfg(windows)]
     #[error("Registry: {0}")]
     RegistryError(#[from] registry_lib::error::RegistryError),
 }

sshdconfig/src/get.rs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#[cfg(windows)]
 use registry_lib::{config::{Registry, RegistryValueData}, RegistryHelper};
 
 use crate::args::DefaultShell;
@@ -17,6 +18,7 @@ pub fn invoke_get() -> Result<(), SshdConfigError> {
     Ok(())
 }
 
+#[cfg(windows)]
 fn get_default_shell() -> Result<(), SshdConfigError> {
     let registry_helper = RegistryHelper::new("HKLM\\SOFTWARE\\OpenSSH", Some("DefaultShell".to_string()), None)?;
     let default_shell: Registry = registry_helper.get()?;
@@ -74,3 +76,8 @@ fn get_default_shell() -> Result<(), SshdConfigError> {
     println!("{output}");
     Ok(())
 }
+
+#[cfg(not(windows))]
+pub fn get_default_shell() -> Result<(), SshdConfigError> {
+    Err(SshdConfigError::InvalidInput("Windows registry operations not applicable to this platform".to_string()))
+}

sshdconfig/src/set.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#[cfg(windows)]
 use registry_lib::{config::RegistryValueData, RegistryHelper};
+
 use std::path::Path;
 
 use crate::args::DefaultShell;
@@ -24,6 +26,7 @@ pub fn invoke_set(input: &str) -> Result<(), SshdConfigError> {
     }
 }
 
+#[cfg(windows)]
 fn set_default_shell(shell: Option<String>, cmd_option: Option<String>, escape_arguments: Option<bool>, shell_arguments: Option<Vec<String>>) -> Result<(), SshdConfigError> {
     if let Some(shell) = shell {
         let shell_path = Path::new(&shell);
@@ -65,6 +68,11 @@ fn set_default_shell(shell: Option<String>, cmd_option: Option<String>, escape_a
     Ok(())
 }
 
+#[cfg(not(windows))]
+pub fn set_default_shell() -> Result<(), SshdConfigError> {
+    Err(SshdConfigError::InvalidInput("Windows registry operations not applicable to this platform".to_string()))
+}
+
 fn set_registry(name: &str, data: RegistryValueData) -> Result<(), SshdConfigError> {
     let registry_helper = RegistryHelper::new("HKLM\\SOFTWARE\\OpenSSH", Some(name.to_string()), Some(data))?;
     registry_helper.set()?;

sshdconfig/tests/defaultshell.tests.ps1

@@ -198,3 +198,19 @@ Describe 'Default Shell Configuration Tests' -Skip:(!$IsWindows) {
         }
     }
 }
+
+Describe 'Default Shell Configuration Error Handling on Non-Windows Platforms' -Skip:($IsWindows) {
+    It 'Should return error for set command' {
+        $inputConfig = @{ shell = $null } | ConvertTo-Json
+
+        $out = sshdconfig set --input $inputConfig 2>&1
+        $LASTEXITCODE | Should -Not -Be 0
+        $out | Should -BeLike '*not applicable to this platform*'
+    }
+
+    It 'Should return error for get command' {
+        $out = sshdconfig get 2>&1
+        $LASTEXITCODE | Should -Not -Be 0
+        $out | Should -BeLike '*not applicable to this platform*'
+    }
+}