Merge branch 'main' into pr/748

Author: Eugeny

.all-contributorsrc

@@ -769,6 +769,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "PokAhonTAS911",
+      "name": "PokAhonTAS911",
+      "avatar_url": "https://avatars.githubusercontent.com/u/208599324?v=4",
+      "profile": "https://github.com/PokAhonTAS911",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ayamir",
+      "name": "ayamir",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61657399?v=4",
+      "profile": "http://ayamir.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "luizribeiro",
+      "name": "Luiz Ribeiro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/112069?v=4",
+      "profile": "http://l9o.dev",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/pull_request_template.md

@@ -0,0 +1,14 @@
+## Description
+
+...
+
+## AI Usage
+
+Choose the level of AI involvement for this PR.
+
+* [ ] Fully vibe coded
+* [ ] AI-designed, AI-coded, manually checked
+* [ ] Human-designed, AI-coded
+* [ ] Human-designed, human-coded (includes AI autocompletions and boilerplate gen)
+
+*<sub>This is not to block AI contributions but rather to speed up PR review (saves time on trying to deduce the logic behind AI hallucinations).</sub>*

README.md

@@ -1,7 +1,7 @@
 # Russh
 
 [![Rust](https://github.com/warp-tech/russh/actions/workflows/rust.yml/badge.svg)](https://github.com/warp-tech/russh/actions/workflows/rust.yml)  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-85-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-88-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Low-level Tokio SSH2 client and server implementation.
@@ -247,6 +247,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://jkshin.nubimaru.com"><img src="https://avatars.githubusercontent.com/u/949915?v=4?s=100" width="100px;" alt="Jeongkyu Shin"/><br /><sub><b>Jeongkyu Shin</b></sub></a><br /><a href="https://github.com/Eugeny/russh/commits?author=inureyes" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PokAhonTAS911"><img src="https://avatars.githubusercontent.com/u/208599324?v=4?s=100" width="100px;" alt="PokAhonTAS911"/><br /><sub><b>PokAhonTAS911</b></sub></a><br /><a href="https://github.com/Eugeny/russh/commits?author=PokAhonTAS911" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://ayamir.github.io"><img src="https://avatars.githubusercontent.com/u/61657399?v=4?s=100" width="100px;" alt="ayamir"/><br /><sub><b>ayamir</b></sub></a><br /><a href="https://github.com/Eugeny/russh/commits?author=ayamir" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://l9o.dev"><img src="https://avatars.githubusercontent.com/u/112069?v=4?s=100" width="100px;" alt="Luiz Ribeiro"/><br /><sub><b>Luiz Ribeiro</b></sub></a><br /><a href="https://github.com/Eugeny/russh/commits?author=luizribeiro" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

cryptovec/Cargo.toml

@@ -29,3 +29,6 @@ wasm-bindgen-test = "0.3.46"
 
 [features]
 ssh-encoding = ["dep:ssh-encoding"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("motor"))'] }

cryptovec/src/platform/mod.rs

@@ -3,21 +3,24 @@ mod windows;
 
 #[cfg(not(windows))]
 #[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(target_os = "motor"))]
 mod unix;
 
-#[cfg(target_arch = "wasm32")]
+// Motor OS has no memory-locking API; it uses the wasm no-op implementation.
+#[cfg(any(target_arch = "wasm32", target_os = "motor"))]
 mod wasm;
 
 // Re-export functions based on the platform
 #[cfg(not(windows))]
 #[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(target_os = "motor"))]
 pub use unix::{mlock, munlock};
-#[cfg(target_arch = "wasm32")]
+#[cfg(any(target_arch = "wasm32", target_os = "motor"))]
 pub use wasm::{mlock, munlock};
 #[cfg(windows)]
 pub use windows::{mlock, munlock};
 
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(any(target_arch = "wasm32", target_os = "motor")))]
 mod error {
     use std::error::Error;
     use std::fmt::Display;
@@ -56,5 +59,5 @@ mod error {
     impl Error for MemoryLockError {}
 }
 
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(any(target_arch = "wasm32", target_os = "motor")))]
 pub use error::MemoryLockError;

pageant/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2024"
 license = "Apache-2.0"
 name = "pageant"
 repository = "https://github.com/warp-tech/russh"
-version = "0.2.1"
+version = "0.2.2"
 rust-version = "1.85"
 
 [dependencies]
@@ -45,4 +45,5 @@ namedpipes = [
     "dep:windows-strings",
     "windows/Win32_Security_Authentication_Identity",
     "windows/Win32_Security_Cryptography",
+    "windows/Win32_System_WindowsProgramming",
 ]

pageant/src/namedpipes.rs

@@ -14,6 +14,7 @@ use windows::Win32::Security::Authentication::Identity::{GetUserNameExA, NameUse
 use windows::Win32::Security::Cryptography::{
     CRYPTPROTECTMEMORY_BLOCK_SIZE, CRYPTPROTECTMEMORY_CROSS_PROCESS, CryptProtectMemory,
 };
+use windows::Win32::System::WindowsProgramming::GetUserNameA;
 use windows_strings::PSTR;
 
 use crate::Error;
@@ -65,11 +66,17 @@ impl PageantStream {
                 Some(PSTR(name_buf.as_mut_ptr())),
                 &mut name_length,
             ) {
-                // Pageant falls back to GetUserNameA here,
-                // but as far as I can tell, all Versions of Windows supported by Rust today
-                // should be able to answer the UserNameEx request - the comments in Pageant source
-                // point to Windows XP and earlier compatibility...
-                return Err(Error::from_win32());
+                // GetUserNameExA fails on non-domain-joined machines, where no UPN
+                // (NameUserPrincipal) is configured. Fall back to GetUserNameA
+                // (the SAM account name), like the original PuTTY Pageant.
+                debug!("GetUserNameExA failed, falling back to GetUserNameA");
+
+                let mut name_length = 0;
+                // don't check result on this, always returns ERROR_INSUFFICIENT_BUFFER
+                let _ = GetUserNameA(None, &mut name_length);
+
+                name_buf = vec![0u8; name_length as usize];
+                GetUserNameA(Some(PSTR(name_buf.as_mut_ptr())), &mut name_length)?;
             }
 
             //remove terminating null

pageant/src/wmmessage.rs

@@ -9,16 +9,11 @@ use delegate::delegate;
 use log::debug;
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, DuplexStream, ReadBuf};
 use windows::Win32::Foundation::{CloseHandle, HANDLE, HWND, INVALID_HANDLE_VALUE, LPARAM, WPARAM};
-use windows::Win32::Security::{
-    GetTokenInformation, InitializeSecurityDescriptor, PSECURITY_DESCRIPTOR, SECURITY_ATTRIBUTES,
-    SECURITY_DESCRIPTOR, SetSecurityDescriptorOwner, TOKEN_QUERY, TOKEN_USER, TokenUser,
-};
 use windows::Win32::System::DataExchange::COPYDATASTRUCT;
 use windows::Win32::System::Memory::{
     CreateFileMappingW, FILE_MAP_WRITE, MEMORY_MAPPED_VIEW_ADDRESS, MapViewOfFile, PAGE_READWRITE,
     UnmapViewOfFile,
 };
-use windows::Win32::System::Threading::{GetCurrentProcess, OpenProcessToken};
 use windows::Win32::UI::WindowsAndMessaging::{FindWindowW, SendMessageA, WM_COPYDATA};
 use windows::core::HSTRING;
 
@@ -112,15 +107,13 @@ struct MemoryMap {
 }
 
 impl MemoryMap {
-    fn new(
-        name: String,
-        length: usize,
-        security_attributes: Option<SECURITY_ATTRIBUTES>,
-    ) -> Result<Self, Error> {
+    fn new(name: String, length: usize) -> Result<Self, Error> {
         let filemap = unsafe {
             CreateFileMappingW(
                 INVALID_HANDLE_VALUE,
-                security_attributes.map(|sa| &sa as *const _),
+                // Default security descriptor from the process token: owned by the
+                // current user, which is what Pageant's owner check expects
+                None,
                 PAGE_READWRITE,
                 0,
                 length as u32,
@@ -202,61 +195,20 @@ pub fn is_pageant_running() -> bool {
     find_pageant_window().is_ok()
 }
 
-fn get_current_process_user() -> Result<TOKEN_USER, Error> {
-    unsafe {
-        let mut process_token = HANDLE::default();
-        OpenProcessToken(
-            GetCurrentProcess(),
-            TOKEN_QUERY,
-            &mut process_token as *mut _,
-        )?;
-
-        let mut info_size = 0;
-        let _ = GetTokenInformation(process_token, TokenUser, None, 0, &mut info_size);
-
-        let mut buffer = vec![0; info_size as usize];
-        GetTokenInformation(
-            process_token,
-            TokenUser,
-            Some(buffer.as_mut_ptr() as *mut _),
-            buffer.len() as u32,
-            &mut info_size,
-        )?;
-        let user: TOKEN_USER = *(buffer.as_ptr() as *const _);
-        let _ = CloseHandle(process_token);
-        Ok(user)
-    }
-}
-
 /// Send a one-off query to Pageant and return a response.
 pub fn query_pageant_direct(cookie: String, msg: &[u8]) -> Result<Vec<u8>, Error> {
     let hwnd = find_pageant_window()?;
     let map_name = format!("PageantRequest{cookie}");
 
-    let user = get_current_process_user()?;
-
-    let mut sd = SECURITY_DESCRIPTOR::default();
-    let sa = SECURITY_ATTRIBUTES {
-        lpSecurityDescriptor: &mut sd as *mut _ as *mut _,
-        bInheritHandle: true.into(),
-        nLength: size_of::<SECURITY_ATTRIBUTES>() as u32,
-    };
-
-    let psd = PSECURITY_DESCRIPTOR(&mut sd as *mut _ as *mut _);
-
-    unsafe {
-        InitializeSecurityDescriptor(psd, 1)?;
-        SetSecurityDescriptorOwner(psd, Some(user.User.Sid), false)?;
-    }
-
-    let mut map: MemoryMap = MemoryMap::new(map_name.clone(), _AGENT_MAX_MSGLEN, Some(sa))?;
+    let mut map: MemoryMap = MemoryMap::new(map_name.clone(), _AGENT_MAX_MSGLEN)?;
     map.write(msg)?;
 
     let char_buffer = CString::new(map_name.as_bytes()).map_err(|_| Error::InvalidCookie)?;
+    let char_buffer_bytes = char_buffer.as_bytes_with_nul();
     let cds = COPYDATASTRUCT {
         dwData: _AGENT_COPYDATA_ID as usize,
-        cbData: char_buffer.as_bytes().len() as u32,
-        lpData: char_buffer.as_bytes().as_ptr() as *mut _,
+        cbData: char_buffer_bytes.len() as u32,
+        lpData: char_buffer_bytes.as_ptr() as *mut _,
     };
 
     let response = unsafe {

russh/Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0"
 name = "russh"
 readme = "../README.md"
 repository = "https://github.com/warp-tech/russh"
-version = "0.62.5"
+version = "0.62.7"
 rust-version = "1.85"
 
 [features]