Add Windows client packaging and recovery tools

src/ssh_agent.rs

@@ -1,18 +1,30 @@
+use crate::native::{ForwardingRequest, NativeClientHello, NativeServerHello, NativeUserAuth};
+#[cfg(unix)]
 use crate::native::{
-    ForwardingRequest, NativeClientHello, NativeServerHello, NativeUserAuth,
     is_supported_user_key_algorithm, parse_ssh_ed25519_public_blob, user_auth_transcript,
 };
-use anyhow::{Context, Result, anyhow, bail};
+#[cfg(unix)]
+use anyhow::{Context, bail};
+use anyhow::{Result, anyhow};
+#[cfg(unix)]
 use std::io::{Read, Write};
+#[cfg(unix)]
 use std::os::unix::net::UnixStream;
 use std::path::Path;
 
+#[cfg(unix)]
 const SSH_AGENT_FAILURE: u8 = 5;
+#[cfg(unix)]
 const SSH2_AGENTC_REQUEST_IDENTITIES: u8 = 11;
+#[cfg(unix)]
 const SSH2_AGENT_IDENTITIES_ANSWER: u8 = 12;
+#[cfg(unix)]
 const SSH2_AGENTC_SIGN_REQUEST: u8 = 13;
+#[cfg(unix)]
 const SSH2_AGENT_SIGN_RESPONSE: u8 = 14;
+#[cfg(unix)]
 const SSH_AGENT_RSA_SHA2_512: u32 = 4;
+#[cfg(unix)]
 const MAX_AGENT_PACKET: usize = 256 * 1024;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -25,6 +37,7 @@ pub struct AgentIdentity {
     pub comment: String,
 }
 
+#[cfg(unix)]
 pub fn sign_user_auth_with_agent(
     client: &NativeClientHello,
     server: &NativeServerHello,
@@ -34,6 +47,18 @@ pub fn sign_user_auth_with_agent(
     sign_user_auth_with_agent_at(sock, client, server, requested_forwardings)
 }
 
+#[cfg(not(unix))]
+pub fn sign_user_auth_with_agent(
+    _client: &NativeClientHello,
+    _server: &NativeServerHello,
+    _requested_forwardings: Vec<ForwardingRequest>,
+) -> Result<NativeUserAuth> {
+    Err(anyhow!(
+        "ssh-agent native auth is not supported on this platform yet; use identity_files"
+    ))
+}
+
+#[cfg(unix)]
 pub fn sign_user_auth_with_agent_at(
     socket_path: impl AsRef<Path>,
     client: &NativeClientHello,
@@ -58,6 +83,19 @@ pub fn sign_user_auth_with_agent_at(
     Ok(auth)
 }
 
+#[cfg(not(unix))]
+pub fn sign_user_auth_with_agent_at(
+    _socket_path: impl AsRef<Path>,
+    _client: &NativeClientHello,
+    _server: &NativeServerHello,
+    _requested_forwardings: Vec<ForwardingRequest>,
+) -> Result<NativeUserAuth> {
+    Err(anyhow!(
+        "ssh-agent native auth is not supported on this platform yet; use identity_files"
+    ))
+}
+
+#[cfg(unix)]
 fn request_supported_identities(agent: &mut UnixStream) -> Result<Vec<AgentIdentity>> {
     write_agent_packet(agent, &[SSH2_AGENTC_REQUEST_IDENTITIES])?;
     let payload = read_agent_packet(agent)?;
@@ -84,6 +122,7 @@ fn request_supported_identities(agent: &mut UnixStream) -> Result<Vec<AgentIdent
     Ok(identities)
 }
 
+#[cfg(unix)]
 fn supported_identity(key_blob: Vec<u8>, comment: String) -> Result<Option<AgentIdentity>> {
     let algorithm = key_blob_algorithm(&key_blob)?;
     if !is_supported_user_key_algorithm(&algorithm) {
@@ -119,6 +158,7 @@ fn supported_identity(key_blob: Vec<u8>, comment: String) -> Result<Option<Agent
     Ok(Some(identity))
 }
 
+#[cfg(unix)]
 fn sign_with_agent(
     agent: &mut UnixStream,
     identity: &AgentIdentity,
@@ -163,6 +203,7 @@ fn sign_with_agent(
     Ok(signature.to_vec())
 }
 
+#[cfg(unix)]
 fn read_agent_packet(stream: &mut UnixStream) -> Result<Vec<u8>> {
     let mut len = [0u8; 4];
     stream
@@ -177,6 +218,7 @@ fn read_agent_packet(stream: &mut UnixStream) -> Result<Vec<u8>> {
     Ok(payload)
 }
 
+#[cfg(unix)]
 fn write_agent_packet(stream: &mut UnixStream, payload: &[u8]) -> Result<()> {
     anyhow::ensure!(
         payload.len() <= MAX_AGENT_PACKET,
@@ -187,6 +229,7 @@ fn write_agent_packet(stream: &mut UnixStream, payload: &[u8]) -> Result<()> {
     Ok(())
 }
 
+#[cfg(unix)]
 fn read_u8(cursor: &mut &[u8]) -> Result<u8> {
     anyhow::ensure!(!cursor.is_empty(), "truncated u8");
     let value = cursor[0];
@@ -194,6 +237,7 @@ fn read_u8(cursor: &mut &[u8]) -> Result<u8> {
     Ok(value)
 }
 
+#[cfg(unix)]
 fn read_u32(cursor: &mut &[u8]) -> Result<u32> {
     anyhow::ensure!(cursor.len() >= 4, "truncated u32");
     let value = u32::from_be_bytes(cursor[..4].try_into().unwrap());
@@ -201,6 +245,7 @@ fn read_u32(cursor: &mut &[u8]) -> Result<u32> {
     Ok(value)
 }
 
+#[cfg(unix)]
 fn read_ssh_string<'a>(cursor: &mut &'a [u8]) -> Result<&'a [u8]> {
     let len = read_u32(cursor)? as usize;
     anyhow::ensure!(cursor.len() >= len, "truncated SSH string");
@@ -209,18 +254,20 @@ fn read_ssh_string<'a>(cursor: &mut &'a [u8]) -> Result<&'a [u8]> {
     Ok(value)
 }
 
+#[cfg(unix)]
 fn write_ssh_string(out: &mut Vec<u8>, value: &[u8]) {
     out.extend_from_slice(&(value.len() as u32).to_be_bytes());
     out.extend_from_slice(value);
 }
 
+#[cfg(unix)]
 fn key_blob_algorithm(blob: &[u8]) -> Result<String> {
     let mut cursor = blob;
     let algorithm = read_ssh_string(&mut cursor)?;
     Ok(String::from_utf8_lossy(algorithm).to_string())
 }
 
-#[cfg(test)]
+#[cfg(all(test, unix))]
 mod tests {
     use super::*;
     use crate::native::{